diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..ed3c36d
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,172 @@
+# Strata Continuous Improvement — Claude Code Guide
+
+## About
+
+Healthcare finance analytics microservice owned by **The-Outliers** team. Helps hospitals identify cost-saving opportunities across encounter, charge code, general ledger, payroll, utilization variation, quality variation, network, and strategic opportunity domains.
+
+**Tech stack:** .NET 8 (C# 12) + React 17 + TypeScript 4.9 + PostgreSQL + SQL Server + Snowflake
+
+## Shell / repo navigation
+
+- Claude is launched from the repo root (`C:/git/microservices/continuousimprovement`). Do not `cd` to the repo in commands.
+- Avoid compound commands that combine `cd` with pipes/redirection (e.g., `cd ... && ... 2>/dev/null | head ...`) because they trigger manual-approval warnings.
+- Prefer:
+  - `find . ...` (when already in repo root), or
+  - `find "C:/git/microservices/continuousimprovement" ...` (when an explicit path is needed).
+- If output limiting is needed, prefer `| head -50` without `2>/dev/null`, or run redirection in a separate step.
+
+## Commands
+
+```bash
+# Backend
+dotnet restore
+dotnet build
+dotnet test
+
+# Frontend (run from src/Strata.ContinuousImprovement.Web/continuousimprovement/)
+npm install
+npm start          # Dev server
+npm test           # Interactive test runner
+npm run test-ci    # CI test runner (no watch)
+```
+
+## Coding Standards
+
+Follow `.github/copilot-instructions.md` for naming, capitalization, project organization, API routes, DTOs, and principles. Key points:
+- Booleans: `is`, `has`, `can` prefix
+- Methods/properties/constants: PascalCase; variables: camelCase
+- No full acronyms (`EntityIdsCsv` not `EntityIdsCSV`)
+- Organize by business domain, not by type
+- RESTful routes: plural nouns, kebab-case
+- DTOs: no `DTO` suffix, only create when restricting/combining models
+
+## Architecture
+
+### Backend (C#/.NET 8)
+
+| Project | Purpose | Path |
+|---------|---------|------|
+| **Api** | ASP.NET Core Web API host, controllers | `src/Strata.ContinuousImprovement.Api/` |
+| **Biz** | All business logic, services, DI registration | `src/Strata.ContinuousImprovement.Biz/` |
+| **Client** | HTTP client wrapper (`IContinuousImprovementService`) | `src/Strata.ContinuousImprovement.Client/` |
+| **Service** | Windows/hosted service, Hangfire worker host | `src/Strata.ContinuousImprovement.Service/` |
+| **Dashboard** | Separate web host (Startup + Program) | `src/Strata.ContinuousImprovement.Dashboard/` |
+| **DecisionSupport.Biz** | Encounter query services, Snowflake queries | `src/Strata.DecisionSupport.Biz/` |
+| **DecisionSupport.Models** | Shared encounter/Jazz/Snowflake DTOs | `src/Strata.DecisionSupport.Models/` |
+
+### Frontend (React 17 + TypeScript)
+
+**Root:** `src/Strata.ContinuousImprovement.Web/continuousimprovement/`
+
+Feature modules live directly under `src/` (not a `features/` folder):
+- `charge-code/`, `encounter/`, `exploration/`, `free-form/`, `general-ledger/`, `initiatives/`, `network/`, `opportunities/`, `payroll/`, `quality-variation/`, `strategic-opportunities/`, `utilization-variation/`, `configuration/`
+
+Each module follows: page component + `/components` + `/hooks` + `/data` + `/utils`
+
+**Shared module:** `src/shared/` — components, hooks, data services, contexts, constants
+
+### Key Constraints
+- **React 17** — do NOT use React 18 features (useId, automatic batching, etc.)
+- **react-router v5** — use `Switch`/`Route`/`Redirect`, NOT v6 patterns
+- **Create React App** (`react-scripts ^5.0.1`) — not Vite
+
+## Strata Ecosystem (Proprietary — No Public Docs)
+
+These packages are internal to Strata. No public documentation exists. Read source/types when needed:
+
+| Package | Purpose |
+|---------|---------|
+| `@strata/tempo` | Design system (v6.33+). Import: `@strata/tempo/lib/<component>`. Query Tempo MCP server for docs. |
+| `@strata/core` | Auth (`useOidcSession`), HTTP (`getSecureService`), URL helpers |
+| `@strata/charts` | Charting library |
+| `@strata/jazz` | Jazz platform integration |
+| `@strata/logging` | Client-side logging |
+| `@strata/navbar` | Shared navigation bar |
+| `@strata/score` | Score calculations |
+| `@strata/signalr` | SignalR client wrapper |
+| `@strata/settings` | Settings service |
+| `@strata/intl` | Internationalization |
+| `Strata.CS.Jazz.*` | Backend Jazz platform libraries (DI, EF, auth, caching) |
+| `Riok.Mapperly` | Compile-time object mapping source generator |
+| `EasyCaching` | In-memory caching (provider: `continuousImprovement_cache`) |
+
+## Commit Requirements
+
+Format: `type(scope): subject` — enforced by `.commitlintrc.js`
+
+**Types:** `build`, `feat`, `fix`, `docs`, `style`, `refactor`, `test`, `chore`
+**Scopes:** `api`, `biz`, `client`, `dashboard`, `service`, `web`, `ds-web`, `ds-models`
+
+Rules:
+- Subject max 72 chars, no period, no sentence/start/pascal/upper case
+- Scope required (warning), lowercase only
+- Body and footer must have leading blank line
+- Footer: `Refs: JAZZ-XXXX` (Jira ticket reference)
+
+Example:
+```
+feat(biz): add case type family drill-down for exploration
+
+Refs: JAZZ-12345
+```
+
+## Testing
+
+### Backend (NUnit + Moq)
+- Unit tests: `tests/Strata.ContinuousImprovement.*.Test.Unit/`
+- Integration tests: `tests/Strata.ContinuousImprovement.*.Test.Integration/`
+- Jazz EF stub: `tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/`
+- Pattern: `[TestFixture]`, `[Test]`, `[SetUp]`/`[OneTimeSetUp]`, `Mock<IService>`
+- Run: `dotnet test`
+
+### Frontend (Jest + Testing Library)
+- Test files: `<Component>.test.tsx` co-located with components
+- Custom render wrapper: `src/test-utils/testUtils.tsx` (wraps MemoryRouter + contexts)
+- Pattern: `render()`, `screen.findByRole()`, `jest.spyOn(service, 'method')`
+- Run: `npm test` (from `continuousimprovement/` dir) or `npm run test-ci` for CI
+
+### E2E (Playwright)
+- Located in separate test infrastructure
+
+## Feature Flags
+
+Backend pattern:
+```csharp
+// Inject IFeatureFlagWrapper, call named convenience method or generic:
+await featureFlagWrapper.IsCiBenchmarkingEnabled();
+await featureFlagWrapper.IsFeatureFlagOn(FeatureFlag.ChargeCodeBeta, clientId);
+```
+
+Frontend pattern:
+```tsx
+const { isBenchmarkingEnabled } = useFeatureFlags();
+```
+
+Centralized definitions: `Biz/Utilities/FeatureFlag.cs` (enum) + `FeatureFlagLookup.cs` (key mapping)
+
+See `docs/FeatureFlagUsage.md` for full flag inventory.
+
+## Key Patterns
+
+- **Interface-based DI** — All services have `IXxxService` interface, registered in `Biz/Configurations/ContinuousImprovementServiceExtensions.cs` via `services.AddScoped<IXxxService, XxxService>()`
+- **Primary constructor DI** (C# 12) — Services use `public class XxxService(IDep1 dep1, IDep2 dep2) : IXxxService`
+- **Riok.Mapperly** — Compile-time mapping via `[Mapper]` attribute on static partial classes (in `DecisionSupport.Biz/Mapperly/`)
+- **Embedded SQL resources** — `.sql` files as embedded resources, loaded via `Assembly.GetExecutingAssembly().ReadResource("QueryName.sql")` (see `Biz/Utilities/ResourceExtensions.cs`)
+- **EasyCaching** — In-memory provider named `continuousImprovement_cache`
+- **SignalR** — Typed hub `NotificationHub : Hub<INotificationHub>`, mapped at `/api/NotificationHub`
+- **Multi-database** — PostgreSQL (CentralDbContext), SQL Server (JazzDbContext via async factory), Snowflake (SnowflakeDatabaseContext)
+- **API versioning** — `[ApiVersion("1.0")]` + `[Route("api/v{api-version:apiVersion}/[controller]")]` + `SlugifyParameterTransformer`
+- **Frontend data services** — `getSecureService()` from `@strata/core/lib` providing typed HTTP helpers, exported as plain objects implementing interfaces
+- **Frontend state** — React Context pattern (`FeatureFlagContext`, `ConfigurationsContext`, `UserSettingsContext`) + custom hooks
+
+## MCP Servers
+
+- **Tempo** — Query `@strata/tempo` component docs, props, examples. Always check before using Tempo components.
+- **Jira/Atlassian** — Fetch ticket details, search issues, manage PRs via `mcp__atlassian__*` tools.
+
+## Reference Docs
+
+- `.claude/docs/backend-patterns.md` — Biz module anatomy, DI, controllers, EF, SQL, testing
+- `.claude/docs/frontend-patterns.md` — Feature modules, hooks, data services, Tempo, testing
+- `.claude/docs/agent-workflow.md` — AI-assisted development pipeline and context management
+- `.claude/docs/adversarial-prompts.md` — Review criteria templates
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..362adc2
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,183 @@
+# Contributing Guidelines
+
+Welcome, brave engineer. Before you type `git commit -m "oops"` and vanish for 3 weeks of PTO, let's align on how commits work in this repo.
+
+We follow [**Conventional Commits**](https://www.conventionalcommits.org/) with **semantic versioning**.\
+This gives us:
+
+- Automatic changelogs (no one likes writing them manually)
+- Predictable version bumps
+- Clear history that future-you (or your replacement) can actually read
+
+---
+
+## 1. Commit Message Format
+
+Every commit **MUST** follow this format:
+
+```
+<type>(<scope>): <description>
+
+[optional body]
+
+[optional BREAKING CHANGE: ...]
+
+[optional footer(s)]
+```
+
+- \`\` → what you did
+- \`\` *(optional, but strongly encouraged)* → where you did it
+- \`\` → short explanation (imperative tense)
+- **Body** → additional details, rationale, or context (wrap at 72 chars if possible)
+- **Footer** → metadata such as references to backlog items or related issues
+
+> ❗ There must be a blank line separating `BREAKING CHANGE:` from any footer lines.
+
+### Examples
+
+```
+feat(auth): add token refresh endpoint
+
+Added a new endpoint for refreshing authentication tokens to reduce
+full login frequency.
+
+Refs: JIRA-1234
+```
+
+```
+fix(api): correctly parse null values
+
+Previously, null values in payloads caused 500 errors due to improper
+validation. Updated parser to handle null safely.
+
+BREAKING CHANGE: Parser behavior has changed for null payloads.
+
+Refs: JIRA-9876
+```
+
+---
+
+## 2. Allowed Commit Types
+
+| Type       | When to Use                               |
+| ---------- | ----------------------------------------- |
+| `build`    | Build system changes (configs, scripts)   |
+| `feat`     | A new feature                             |
+| `fix`      | A bug fix                                 |
+| `docs`     | Documentation updates                     |
+| `style`    | Non-functional style changes (formatting) |
+| `refactor` | Code change that isn’t a bug or feature   |
+| `test`     | Adding/fixing tests                       |
+| `chore`    | Maintenance tasks (deps, configs)         |
+
+---
+
+## 3. Scopes
+
+Scopes keep commits relevant. Commonly you'll find service, or module names, used as the scope:
+
+```
+feat(api): add user endpoint
+fix(web): handle expired token
+```
+> While unrelated areas should be split into separate commits, multiple scopes can be combined in a single commit if they are related:
+`refactor(web,api): clean up regex for widget payloads`
+
+If you're touching multiple unrelated areas, split the work.\
+If you’re touching the **entire repo**, you may omit the scope (e.g. `chore: update prettier config`).
+
+---
+
+## 4. Commit Body
+
+Use the body to:
+
+- Explain **why** the change was made
+- Add context or reasoning (if it’s not obvious from the diff)
+- Mention relevant technical details
+
+> ❗ Keep the body wrapped at 72 characters where possible for better readability in CLI tools.
+
+Example:
+
+```
+fix(auth): improve token handling
+
+Added stricter validation to prevent expired tokens from being used
+in refresh calls. This fixes intermittent 401 errors for long-lived
+sessions.
+```
+
+---
+
+## 5. Commit Footer
+
+Use the footer for:
+
+- `BREAKING CHANGE:` declarations (with a blank line after it)
+- References to backlog items, tickets, or issues
+- Co-authorship metadata if needed (`Co-authored-by:`)
+
+Example:
+
+```
+feat(ui): add dark mode toggle
+
+Added a dark mode toggle in the user settings page.
+
+BREAKING CHANGE: Removed old theme switcher.
+
+Refs: JIRA-4567
+```
+
+---
+
+## 6. Linting & Enforcement
+
+This repo uses:
+
+- [**commitlint**](https://github.com/conventional-changelog/commitlint) to reject bad commit messages
+- [**husky**](https://typicode.github.io/husky) to run lint checks pre-commit
+
+After cloning the repository, run `npm install` to ensure husky hooks are installed and initialized locally. If you skip this step, GitHub Actions will run the same commit linting on your pull requests. Any bad commits that bypass local checks will result in a failed PR check.
+
+If you try to commit `do some stuff`, the hook will fail and mock you.\
+Run `npm run commit` if you want a guided prompt.
+
+---
+
+## 7. Pull Requests
+
+- Keep PRs small and focused.
+- Please use `--amend` commits or `--fixup` commits where appropriate
+- Squash `fixup:` commits, and any commits that don’t add value (e.g. `chore: typo`).
+- Ensure commit messages still follow Conventional Commits after squashing.
+
+---
+
+## 8. Versioning
+
+We use **semantic versioning**:
+
+- `fix:` → Patch (`1.0.1`)
+- `feat:` → Minor (`1.1.0`)
+- `BREAKING CHANGE:` → Major (`2.0.0`)
+
+Your commit messages drive the versioning calculation.
+
+---
+
+### TL;DR
+
+- Use Conventional Commits.
+- Include a scope if it makes sense.
+- Write meaningful bodies when needed.
+- Use footers for breaking changes or ticket references.
+- Leave a blank line between BREAKING CHANGE and footer.
+- Your branch's commit history should tell the story of what you did.
+- Bad commits will be rejected by hooks, mocked by your peers, and possibly framed on Slack or in some PowerPoint presentation as "what not to do."
+
+---
+
+Happy committing!
+
diff --git a/Dockerfile.api b/Dockerfile.api
new file mode 100644
index 0000000..28462aa
--- /dev/null
+++ b/Dockerfile.api
@@ -0,0 +1,284 @@
+ARG PROJECT=Strata.ContinuousImprovement
+ARG DSPROJECT=Strata.DecisionSupport
+ARG VERSION=0.0.0
+ARG SONARURL=''
+ARG SONARLOGIN=''
+ARG SONARBRANCH=''
+
+##############
+# Base image #
+##############
+FROM ecr.ops.stratanetwork.net/strata.microsoft.dotnet.aspnet:8.0 AS base
+
+# Add TMZ files for CST
+RUN cp /usr/share/zoneinfo/America/Chicago "/usr/share/zoneinfo/Central Standard Time"
+
+RUN sed -i 's/^Components: main$/& contrib/' /etc/apt/sources.list.d/debian.sources \
+    && apt-get -qq update --allow-releaseinfo-change \
+    && apt-get -qq install -y \
+    libc6 \
+    libc6-dev \
+    libgdiplus \
+    libx11-dev \
+    ttf-mscorefonts-installer \
+    fontconfig \
+    && rm -rf /var/lib/apt/lists/* \
+    && ln -s /usr/lib/x86_64-linux-gnu/libdl.so.2 /usr/lib/x86_64-linux-gnu/libdl.so
+
+###############
+# Build image #
+###############
+FROM ecr.ops.stratanetwork.net/strata.microsoft.dotnet.sdk:8.0 AS build
+ARG PROJECT
+ARG DSPROJECT
+ARG VERSION
+ARG SONARURL
+ARG SONARLOGIN
+ARG SONARBRANCH
+
+# Add TMZ files for CST
+RUN cp /usr/share/zoneinfo/America/Chicago "/usr/share/zoneinfo/Central Standard Time"
+
+RUN sed -i 's/^Components: main$/& contrib/' /etc/apt/sources.list.d/debian.sources \
+    && apt-get -qq update --allow-releaseinfo-change \
+    && apt-get -qq install -y \
+    libc6 \
+    libc6-dev \
+    libgdiplus \
+    libx11-dev \
+    ttf-mscorefonts-installer \
+    fontconfig \
+    awscli \
+    jq \
+    && rm -rf /var/lib/apt/lists/*\
+    && ln -s /usr/lib/x86_64-linux-gnu/libdl.so.2 /usr/lib/x86_64-linux-gnu/libdl.so
+
+WORKDIR /src
+
+
+# Copy project files and restore
+COPY ["${PROJECT}.sln", "${PROJECT}.sln"]
+COPY src/**/*.csproj ./
+RUN for file in $(ls *.csproj); do mkdir -p src/${file%.*}/ && mv $file src/${file%.*}/; done
+COPY tests/**/*.csproj ./
+RUN for file in $(ls *.csproj); do mkdir -p tests/${file%.*}/ && mv $file tests/${file%.*}/; done
+
+RUN dotnet restore "${PROJECT}.sln" \
+    --source https://api.nuget.org/v3/index.json \
+    --source https://proget.sdt.local/nuget/nuget/v3/index.json
+
+
+# Copy files and build
+COPY . .
+
+RUN if [ "${SONARLOGIN}" != "" ] ; then dotnet sonarscanner begin \
+   /k:"${PROJECT}" \
+   /d:sonar.scm.provider=git \
+   /d:sonar.host.url="${SONARURL}" \
+   ${SONARBRANCH} \
+   /d:sonar.login="${SONARLOGIN}" \
+   /d:sonar.cs.opencover.reportsPaths="/test-results/cover.xml" \
+   /d:sonar.cs.vstest.reportsPaths="/test-results/*.trx" \
+   /d:sonar.dependencyCheck.jsonReportPath=/src/buildlogs/dependency-check-report.json \
+   /d:sonar.dependencyCheck.htmlReportPath=/src/buildlogs/dependency-check-report.html \
+   /v:sonar.projectVersion="${VERSION}"; fi
+
+
+RUN dotnet build "${PROJECT}.sln" \
+    --configuration Release \
+    --no-restore
+
+# Run tests
+# #############################
+# # ContinuousImprovement Api #
+# #############################
+
+RUN dotnet test "tests/${PROJECT}.Api.Test.Unit/${PROJECT}.Api.Test.Unit.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --verbosity=normal \
+    --logger="trx;LogFileName=/test-results/api-api-tests.trx" \
+    -p:CollectCoverage=true \
+    -p:CoverletOutput='/test-results/' \
+    -p:Exclude=\"[Strata.ContinuousImprovement.Biz.Test.Unit]*,[Strata.ContinuousImprovement.JazzEntityFrameworkStub]*\"
+	
+RUN CREDS=$(aws sts assume-role --role-arn arn:aws:iam::809820578507:role/sdt-continuous-improvement-service-role --role-session-name "DockerBuildSession"); \
+    export AWS_ACCESS_KEY_ID="$(echo $CREDS | jq -r '.Credentials.AccessKeyId')"; \
+    export AWS_SECRET_ACCESS_KEY="$(echo $CREDS | jq -r '.Credentials.SecretAccessKey')"; \
+    export AWS_SESSION_TOKEN="$(echo $CREDS | jq -r '.Credentials.SessionToken')"; \
+    dotnet test "tests/${PROJECT}.Api.Test.Integration/${PROJECT}.Api.Test.Integration.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --verbosity=normal \
+    --logger="trx;LogFileName=/test-results/integration-tests-api.trx" \
+    -p:CollectCoverage=true \
+    -p:CoverletOutputFormat=opencover \
+    -p:CoverletOutput='/test-results/' \
+    -p:MergeWith='/test-results/coverage.json' \
+    -p:Exclude=\"[Strata.ContinuousImprovement.Api.Test.Unit]*,[Strata.ContinuousImprovement.JazzEntityFrameworkStub]*\"
+
+# #############################
+# # ContinuousImprovement Biz #
+# #############################
+
+RUN dotnet test "/src/tests/${PROJECT}.Biz.Test.Unit/${PROJECT}.Biz.Test.Unit.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --verbosity=normal \
+    --logger="trx;LogFileName=/test-results/unit-tests-biz.trx" \
+    -p:CollectCoverage=true \
+    -p:CoverletOutput='/test-results/' \
+    -p:MergeWith='/test-results/coverage.json' \
+    -p:Exclude=\"[Strata.ContinuousImprovement.Biz.Test.Unit]*,[Strata.ContinuousImprovement.JazzEntityFrameworkStub]*\"
+
+RUN CREDS=$(aws sts assume-role --role-arn arn:aws:iam::809820578507:role/sdt-continuous-improvement-service-role --role-session-name "DockerBuildSession"); \
+    export AWS_ACCESS_KEY_ID="$(echo $CREDS | jq -r '.Credentials.AccessKeyId')"; \
+    export AWS_SECRET_ACCESS_KEY="$(echo $CREDS | jq -r '.Credentials.SecretAccessKey')"; \
+    export AWS_SESSION_TOKEN="$(echo $CREDS | jq -r '.Credentials.SessionToken')"; \
+    dotnet test "tests/${PROJECT}.Biz.Test.Integration/${PROJECT}.Biz.Test.Integration.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --verbosity=normal \
+    --logger="trx;LogFileName=/test-results/integration-tests-biz.trx" \
+    -p:CollectCoverage=true \
+    -p:CoverletOutputFormat=opencover \
+    -p:CoverletOutput='/test-results/' \
+    -p:MergeWith='/test-results/coverage.json' \
+    -p:Exclude=\"[Strata.ContinuousImprovement.Biz.Test.Unit]*,[Strata.ContinuousImprovement.JazzEntityFrameworkStub]*\"
+
+# ################################
+# # ContinuousImprovement Client #
+# ################################
+
+RUN dotnet test "tests/${PROJECT}.Client.Test.Unit/${PROJECT}.Client.Test.Unit.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --verbosity=normal \
+    --logger="trx;LogFileName=/test-results/unit-tests-client.trx" \
+    -p:CollectCoverage=true \
+    -p:CoverletOutputFormat=opencover \
+    -p:CoverletOutput='/test-results/' \
+    -p:MergeWith='/test-results/coverage.json' \
+    -p:Exclude=\"[Strata.ContinuousImprovement.Client.Test.Unit]*,[Strata.ContinuousImprovement.JazzEntityFrameworkStub]*\"
+
+RUN CREDS=$(aws sts assume-role --role-arn arn:aws:iam::809820578507:role/sdt-continuous-improvement-service-role --role-session-name "DockerBuildSession"); \
+    export AWS_ACCESS_KEY_ID="$(echo $CREDS | jq -r '.Credentials.AccessKeyId')"; \
+    export AWS_SECRET_ACCESS_KEY="$(echo $CREDS | jq -r '.Credentials.SecretAccessKey')"; \
+    export AWS_SESSION_TOKEN="$(echo $CREDS | jq -r '.Credentials.SessionToken')"; \
+    dotnet test "tests/${PROJECT}.Client.Test.Integration/${PROJECT}.Client.Test.Integration.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --verbosity=normal \
+    --logger="trx;LogFileName=/test-results/integration-tests-client.trx" \
+    -p:CollectCoverage=true \
+    -p:CoverletOutputFormat=opencover \
+    -p:CoverletOutput='/test-results/' \
+    -p:MergeWith='/test-results/coverage.json' \
+    -p:Exclude=\"[Strata.ContinuousImprovement.Client.Test.Integration]*,[Strata.ContinuousImprovement.JazzEntityFrameworkStub]*\"
+
+# ###################
+# # DecisionSupport #
+# ###################
+
+RUN dotnet test "tests/${DSPROJECT}.Biz.Test.Unit/${DSPROJECT}.Biz.Test.Unit.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --verbosity=normal \
+    --logger="trx;LogFileName=/test-results/unit-tests-dsbiz.trx" \
+    -p:CollectCoverage=true \
+    -p:CoverletOutputFormat=opencover \
+    -p:CoverletOutput='/test-results/' \
+    -p:MergeWith='/test-results/coverage.json' \
+    -p:Exclude=\"[Strata.ContinuousImprovement.Biz.Test.Unit]*,[Strata.ContinuousImprovement.JazzEntityFrameworkStub]*\"
+
+RUN CREDS=$(aws sts assume-role --role-arn arn:aws:iam::809820578507:role/sdt-continuous-improvement-service-role --role-session-name "DockerBuildSession"); \
+    export AWS_ACCESS_KEY_ID="$(echo $CREDS | jq -r '.Credentials.AccessKeyId')"; \
+    export AWS_SECRET_ACCESS_KEY="$(echo $CREDS | jq -r '.Credentials.SecretAccessKey')"; \
+    export AWS_SESSION_TOKEN="$(echo $CREDS | jq -r '.Credentials.SessionToken')"; \
+    dotnet test "tests/${DSPROJECT}.Biz.Test.Integration/${DSPROJECT}.Biz.Test.Integration.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --verbosity=normal \
+    --logger="trx;LogFileName=/test-results/integration-tests-dsbiz.trx" \
+    -p:CollectCoverage=true \
+    -p:CoverletOutputFormat=opencover \
+    -p:CoverletOutput='/test-results/' \
+    -p:MergeWith='/test-results/coverage.json' \
+    -p:Exclude=\"[Strata.ContinuousImprovement.Biz.Test.Unit]*,[Strata.ContinuousImprovement.JazzEntityFrameworkStub]*\"
+
+RUN mv /test-results/coverage.opencover.xml /test-results/cover.xml
+
+# Publish project
+RUN dotnet publish "src/${PROJECT}.Api/${PROJECT}.Api.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --output /app
+
+# Pack client project
+RUN dotnet pack "src/${PROJECT}.Client/${PROJECT}.Client.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --include-symbols \
+    --include-source \
+    --output /pack \
+    -property:PackageVersion=${VERSION}
+
+# Pack DS Biz project
+RUN dotnet pack "src/${DSPROJECT}.Biz/${DSPROJECT}.Biz.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --include-symbols \
+    --include-source \
+    --output /pack \
+    -property:PackageVersion=${VERSION}
+
+# Pack DS models project
+RUN dotnet pack "src/${DSPROJECT}.Models/${DSPROJECT}.Models.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --include-symbols \
+    --include-source \
+    --output /pack \
+    -property:PackageVersion=${VERSION}
+
+RUN if [ "${SONARLOGIN}" != "" ] ; then \
+    /dc/dependency-check/bin/dependency-check.sh -f JSON -f HTML -s . -o ./buildlogs \
+    --suppression ./sonarsuppressions.xml \
+    --noupdate --nodeAuditSkipDevDependencies --disableNodeJS --disableRetireJS --ossIndexRemoteErrorWarnOnly true \
+    --dbDriverName "com.microsoft.sqlserver.jdbc.SQLServerDriver" \
+    --connectionString "jdbc:sqlserver://ddensqldevops01.sdt.local;Database=DependencyCheck;encrypt=true;trustServerCertificate=true;" \
+    --dbUser "dcuser" --dbPassword "${SONARLOGIN}" && \
+    dotnet sonarscanner end /d:sonar.login="${SONARLOGIN}"; \
+    fi
+
+RUN mkdir -p /src/buildlogs && touch /src/buildlogs/dependency-check-report.html
+
+###############
+# Final image #
+###############
+FROM base AS final
+ARG PROJECT
+WORKDIR /app
+ARG PROJECT
+ENV PROJECTDLL=${PROJECT}.Api.dll
+ENV DOTNET_ENVIRONMENT=Development
+ENV ASPNETCORE_ENVIRONMENT=Development
+
+COPY --from=build /app /app
+COPY --from=build /pack /pack
+COPY --from=build /test-results /test-results
+COPY --from=build /src/buildlogs/dependency-check-report.html /dc/dependency-check-report.html
+
+ENTRYPOINT dotnet ${PROJECTDLL}
\ No newline at end of file
diff --git a/Dockerfile.dashboard b/Dockerfile.dashboard
new file mode 100644
index 0000000..024e111
--- /dev/null
+++ b/Dockerfile.dashboard
@@ -0,0 +1,73 @@
+ARG PROJECT=Strata.ContinuousImprovement
+ARG VERSION=0.0.0
+
+
+##############
+# Base image #
+##############
+FROM ecr.ops.stratanetwork.net/strata.microsoft.dotnet.aspnet:8.0 AS base
+# Add TMZ files for CST
+RUN cp /usr/share/zoneinfo/America/Chicago "/usr/share/zoneinfo/Central Standard Time"
+
+RUN sed -i 's/^Components: main$/& contrib/' /etc/apt/sources.list.d/debian.sources \ 
+    && apt-get update --allow-releaseinfo-change \
+    && apt-get install -y \
+    libc6 \
+    libc6-dev \
+    libgdiplus \
+    libx11-dev \
+    ttf-mscorefonts-installer \
+    fontconfig \
+    && rm -rf /var/lib/apt/lists/*\
+    && ln -s /usr/lib/x86_64-linux-gnu/libdl.so.2 /usr/lib/x86_64-linux-gnu/libdl.so
+
+###############
+# Build image #
+###############
+FROM ecr.ops.stratanetwork.net/strata.microsoft.dotnet.sdk:8.0 as build
+ARG PROJECT
+ARG VERSION
+
+# Add TMZ files for CST
+RUN cp /usr/share/zoneinfo/America/Chicago "/usr/share/zoneinfo/Central Standard Time"
+
+WORKDIR /src
+
+# Copy project files and restore
+COPY ["${PROJECT}.sln", "${PROJECT}.sln"]
+COPY src/**/*.csproj ./
+RUN for file in $(ls *.csproj); do mkdir -p src/${file%.*}/ && mv $file src/${file%.*}/; done
+COPY tests/**/*.csproj ./
+RUN for file in $(ls *.csproj); do mkdir -p tests/${file%.*}/ && mv $file tests/${file%.*}/; done
+
+RUN dotnet restore "${PROJECT}.sln" \
+    --source https://api.nuget.org/v3/index.json \
+    --source https://proget.sdt.local/nuget/nuget/v3/index.json
+
+# Copy files and build
+COPY . .
+
+RUN dotnet build "${PROJECT}.sln" \
+    --configuration Release \
+    --no-restore
+
+# Publish project
+RUN dotnet publish "src/${PROJECT}.Dashboard/${PROJECT}.Dashboard.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --output /app
+
+###############
+# Final image #
+###############
+FROM base AS final
+ARG PROJECT
+WORKDIR /app
+ARG PROJECT
+ENV PROJECTDLL=${PROJECT}.Dashboard.dll
+ENV DOTNET_ENVIRONMENT=Development
+ENV ASPNETCORE_ENVIRONMENT=Development
+
+COPY --from=build /app /app
+ENTRYPOINT dotnet ${PROJECTDLL}
diff --git a/Dockerfile.hangfire b/Dockerfile.hangfire
new file mode 100644
index 0000000..bb0197c
--- /dev/null
+++ b/Dockerfile.hangfire
@@ -0,0 +1,73 @@
+ARG PROJECT=Strata.ContinuousImprovement
+ARG VERSION=0.0.0
+
+
+##############
+# Base image #
+##############
+FROM ecr.ops.stratanetwork.net/strata.microsoft.dotnet.aspnet:8.0 AS base
+# Add TMZ files for CST
+RUN cp /usr/share/zoneinfo/America/Chicago "/usr/share/zoneinfo/Central Standard Time"
+
+RUN sed -i 's/^Components: main$/& contrib/' /etc/apt/sources.list.d/debian.sources \ 
+    && apt-get update --allow-releaseinfo-change \
+    && apt-get install -y \
+    libc6 \
+    libc6-dev \
+    libgdiplus \
+    libx11-dev \
+    ttf-mscorefonts-installer \
+    fontconfig \
+    && rm -rf /var/lib/apt/lists/*\
+    && ln -s /usr/lib/x86_64-linux-gnu/libdl.so.2 /usr/lib/x86_64-linux-gnu/libdl.so
+
+###############
+# Build image #
+###############
+FROM ecr.ops.stratanetwork.net/strata.microsoft.dotnet.sdk:8.0 as build
+ARG PROJECT
+ARG VERSION
+
+# Add TMZ files for CST
+RUN cp /usr/share/zoneinfo/America/Chicago "/usr/share/zoneinfo/Central Standard Time"
+
+WORKDIR /src
+
+# Copy project files and restore
+COPY ["${PROJECT}.sln", "${PROJECT}.sln"]
+COPY src/**/*.csproj ./
+RUN for file in $(ls *.csproj); do mkdir -p src/${file%.*}/ && mv $file src/${file%.*}/; done
+COPY tests/**/*.csproj ./
+RUN for file in $(ls *.csproj); do mkdir -p tests/${file%.*}/ && mv $file tests/${file%.*}/; done
+
+RUN dotnet restore "${PROJECT}.sln" \
+    --source https://api.nuget.org/v3/index.json \
+    --source https://proget.sdt.local/nuget/nuget/v3/index.json
+
+# Copy files and build
+COPY . .
+
+RUN dotnet build "${PROJECT}.sln" \
+    --configuration Release \
+    --no-restore
+
+# Publish project
+RUN dotnet publish "src/${PROJECT}.Service/${PROJECT}.Service.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --output /app
+
+###############
+# Final image #
+###############
+FROM base AS final
+ARG PROJECT
+WORKDIR /app
+ARG PROJECT
+ENV PROJECTDLL=${PROJECT}.Service.dll
+ENV DOTNET_ENVIRONMENT=Development
+ENV ASPNETCORE_ENVIRONMENT=Development
+
+COPY --from=build /app /app
+ENTRYPOINT dotnet ${PROJECTDLL}
diff --git a/Dockerfile.local b/Dockerfile.local
new file mode 100644
index 0000000..aecdf18
--- /dev/null
+++ b/Dockerfile.local
@@ -0,0 +1,199 @@
+ARG PROJECT=Strata.ContinuousImprovement
+ARG DSPROJECT=Strata.DecisionSupport
+ARG VERSION=0.0.0
+ARG SONARURL=''
+ARG SONARLOGIN=''
+ARG SONARBRANCH=''
+
+##############
+# Base image #
+##############
+FROM ecr.ops.stratanetwork.net/strata.microsoft.dotnet.aspnet:8.0 AS base
+
+# Add TMZ files for CST
+RUN cp /usr/share/zoneinfo/America/Chicago "/usr/share/zoneinfo/Central Standard Time"
+
+RUN sed -i 's/^Components: main$/& contrib/' /etc/apt/sources.list.d/debian.sources \
+    && apt-get -qq update --allow-releaseinfo-change \
+    && apt-get -qq install -y \
+    libc6 \
+    libc6-dev \
+    libgdiplus \
+    libx11-dev \
+    ttf-mscorefonts-installer \
+    fontconfig \
+    && rm -rf /var/lib/apt/lists/* \
+    && ln -s /usr/lib/x86_64-linux-gnu/libdl.so.2 /usr/lib/x86_64-linux-gnu/libdl.so
+
+###############
+# Build image #
+###############
+FROM ecr.ops.stratanetwork.net/strata.microsoft.dotnet.sdk:8.0 AS build
+ARG PROJECT
+ARG DSPROJECT
+ARG VERSION
+ARG SONARURL
+ARG SONARLOGIN
+ARG SONARBRANCH
+
+# Add TMZ files for CST
+RUN cp /usr/share/zoneinfo/America/Chicago "/usr/share/zoneinfo/Central Standard Time"
+
+RUN sed -i 's/^Components: main$/& contrib/' /etc/apt/sources.list.d/debian.sources \
+    && apt-get -qq update --allow-releaseinfo-change \
+    && apt-get -qq install -y \
+    libc6 \
+    libc6-dev \
+    libgdiplus \
+    libx11-dev \
+    ttf-mscorefonts-installer \
+    fontconfig \
+    && rm -rf /var/lib/apt/lists/*\
+    && ln -s /usr/lib/x86_64-linux-gnu/libdl.so.2 /usr/lib/x86_64-linux-gnu/libdl.so
+
+WORKDIR /src
+
+# Copy project files and restore
+COPY ["${PROJECT}.sln", "${PROJECT}.sln"]
+COPY src/**/*.csproj ./
+RUN for file in $(ls *.csproj); do mkdir -p src/${file%.*}/ && mv $file src/${file%.*}/; done
+COPY tests/**/*.csproj ./
+RUN for file in $(ls *.csproj); do mkdir -p tests/${file%.*}/ && mv $file tests/${file%.*}/; done
+
+RUN dotnet restore "${PROJECT}.sln" \
+    --source https://api.nuget.org/v3/index.json \
+    --source https://proget.sdt.local/nuget/nuget/v3/index.json
+
+
+# Copy files and build
+COPY . .
+
+RUN if [ "${SONARLOGIN}" != "" ] ; then dotnet sonarscanner begin \
+   /k:"${PROJECT}" \
+   /d:sonar.scm.provider=git \
+   /d:sonar.host.url="${SONARURL}" \
+   ${SONARBRANCH} \
+   /d:sonar.login="${SONARLOGIN}" \
+   /d:sonar.cs.opencover.reportsPaths="/test-results/cover.xml" \
+   /d:sonar.cs.vstest.reportsPaths="/test-results/*.trx" \
+   /d:sonar.dependencyCheck.jsonReportPath=/src/buildlogs/dependency-check-report.json \
+   /d:sonar.dependencyCheck.htmlReportPath=/src/buildlogs/dependency-check-report.html \
+   /v:sonar.projectVersion="${VERSION}"; fi
+
+
+RUN dotnet build "${PROJECT}.sln" \
+    --configuration Release \
+    --no-restore
+
+# Run tests
+RUN dotnet test "tests/${PROJECT}.Api.Test.Unit/${PROJECT}.Api.Test.Unit.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --verbosity=normal \
+    --logger="trx;LogFileName=/test-results/api-api-tests.trx" \
+    -p:CollectCoverage=true \
+    -p:CoverletOutput='/test-results/' \
+    -p:Exclude=\"[Strata.ContinuousImprovement.Biz.Test.Unit]*,[Strata.ContinuousImprovement.JazzEntityFrameworkStub]*\" 
+
+RUN dotnet test "/src/tests/${PROJECT}.Biz.Test.Unit/${PROJECT}.Biz.Test.Unit.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --verbosity=normal \
+    --logger="trx;LogFileName=/test-results/unit-tests-biz.trx" \
+    -p:CollectCoverage=true \
+    -p:CoverletOutput='/test-results/' \
+    -p:MergeWith='/test-results/coverage.json' \
+    -p:Exclude=\"[Strata.ContinuousImprovement.Biz.Test.Unit]*,[Strata.ContinuousImprovement.JazzEntityFrameworkStub]*\" 
+
+RUN dotnet test "tests/${PROJECT}.Client.Test.Unit/${PROJECT}.Client.Test.Unit.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --verbosity=normal \
+    --logger="trx;LogFileName=/test-results/unit-tests-client.trx" \
+    -p:CollectCoverage=true \
+    -p:CoverletOutput='/test-results/' \
+    -p:MergeWith='/test-results/coverage.json' \
+    -p:Exclude=\"[Strata.ContinuousImprovement.Biz.Test.Unit]*,[Strata.ContinuousImprovement.JazzEntityFrameworkStub]*\" 
+
+RUN dotnet test "tests/${DSPROJECT}.Biz.Test.Unit/${DSPROJECT}.Biz.Test.Unit.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --verbosity=normal \
+    --logger="trx;LogFileName=/test-results/unit-tests-dsbiz.trx" \
+    -p:CollectCoverage=true \
+    -p:CoverletOutputFormat=opencover \
+    -p:CoverletOutput='/test-results/' \
+    -p:MergeWith='/test-results/coverage.json' \
+    -p:Exclude=\"[Strata.ContinuousImprovement.Biz.Test.Unit]*,[Strata.ContinuousImprovement.JazzEntityFrameworkStub]*\" 
+
+RUN mv /test-results/coverage.opencover.xml /test-results/cover.xml
+
+# Publish project
+RUN dotnet publish "src/${PROJECT}.Api/${PROJECT}.Api.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --output /app
+
+# Pack client project
+RUN dotnet pack "src/${PROJECT}.Client/${PROJECT}.Client.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --include-symbols \
+    --include-source \
+    --output /pack \
+    -property:PackageVersion=${VERSION}
+
+# Pack DS Biz project
+RUN dotnet pack "src/${DSPROJECT}.Biz/${DSPROJECT}.Biz.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --include-symbols \
+    --include-source \
+    --output /pack \
+    -property:PackageVersion=${VERSION}
+
+# Pack DS models project
+RUN dotnet pack "src/${DSPROJECT}.Models/${DSPROJECT}.Models.csproj" \
+    --configuration Release \
+    --no-restore \
+    --no-build \
+    --include-symbols \
+    --include-source \
+    --output /pack \
+    -property:PackageVersion=${VERSION}
+
+# /* Running locally
+# RUN if [ "${SONARLOGIN}" != "" ] ; then \
+#     /dc/dependency-check/bin/dependency-check.sh -f JSON -f HTML -s . -o ./buildlogs \
+#     --suppression ./sonarsuppressions.xml \
+#     --noupdate --nodeAuditSkipDevDependencies --disableNodeJS --disableRetireJS --ossIndexRemoteErrorWarnOnly true \
+#     --dbDriverName "com.microsoft.sqlserver.jdbc.SQLServerDriver" \
+#     --connectionString "jdbc:sqlserver://ddensqldevops01.sdt.local;Database=DependencyCheck;encrypt=true;trustServerCertificate=true;" \
+#     --dbUser "dcuser" --dbPassword "${SONARLOGIN}" && \
+#     dotnet sonarscanner end /d:sonar.login="${SONARLOGIN}"; \
+#     fi
+# */
+
+###############
+# Final image #
+###############
+FROM base AS final
+ARG PROJECT
+WORKDIR /app
+ARG PROJECT
+ENV PROJECTDLL=${PROJECT}.Api.dll
+ENV DOTNET_ENVIRONMENT=Development
+ENV ASPNETCORE_ENVIRONMENT=Development
+
+COPY --from=build /app /app
+COPY --from=build /pack /pack
+COPY --from=build /test-results /test-results
+
+ENTRYPOINT dotnet ${PROJECTDLL}
diff --git a/Dockerfile.web b/Dockerfile.web
new file mode 100644
index 0000000..e3a8a4e
--- /dev/null
+++ b/Dockerfile.web
@@ -0,0 +1,28 @@
+ARG SONARLOGIN=''
+ARG VERSION=0.0.0
+
+FROM node:18.17.0 as build
+ARG SONARLOGIN
+ARG VERSION
+
+# Set working directory
+WORKDIR /app
+
+# Install dependencies
+RUN npm config set @strata:registry http://proget.sdt.local/npm/npm
+RUN npm config set strict-ssl false
+COPY src/Strata.ContinuousImprovement.Web/continuousimprovement/package*.json ./
+RUN npm install --legacy-peer-deps
+RUN npm ci --legacy-peer-deps
+
+# Copy in rest of app and build
+COPY src/Strata.ContinuousImprovement.Web/continuousimprovement/ .
+RUN npm run build
+
+# Run tests
+# RUN npm run test-ci
+
+# Build release container
+FROM nginx:alpine
+COPY --from=build /app/build /usr/share/nginx/html
+COPY src/Strata.ContinuousImprovement.Web/nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/README.md b/README.md
index fb41789..2cbc50d 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,55 @@
-# continuousimprovement
+# Strata.ContinuousImprovement
 
+[![build](https://github.com/stratadecision/continuousimprovement/actions/workflows/build.yaml/badge.svg)](https://github.com/stratadecision/continuousimprovement/actions/workflows/build.yaml)
+[![End-to-end tests](https://github.com/stratadecision/continuousimprovement/actions/workflows/e2e-testrunner.yml/badge.svg)](https://github.com/stratadecision/continuousimprovement/actions/workflows/e2e-testrunner.yml)
+
+## General Information
+This microserivce and react UI provide access for the Continuous Improvements Opportunities
+* whenever a change is made locally, i think the continuousimprovement needs to be unistalled and reinstalled
+
+## Credits
+This microservice is developed and maintained by The-Outliers
+
+## install continuousimprovement
+dotnet new -i C:\git\strata.continuousimprovements.microservices\continuousimprovements\strata.microservice
+## unistall continuousimprovement
+dotnet new -u C:\git\strata.continuousimprovements.microservices\continuousimprovements\strata.microservice
+
+# create new api project with postgres project from continuousimprovement
+dotnet new strata.microservice -o C:\git\strata.foobar -n Strata.Foobar --api --biz --postgres
+
+## Branching and Versioning
+
+| branch     | version format        | example         |
+| ---------- | --------------------- | --------------- |
+| master     | #.#.#                 | 1.2.3           |
+| feature/\* | #.#+1.0-featureName.# | 1.3.0-newfeat.1 |
+| fix/\*     | #.#.#+1-fixName.#     | 1.2.4-bug.1     |
+
+See our [confluence page](https://confluence.sdt.local/display/DOP/Branching+and+Versioning) for more information
+
+## Usage
+
+### Build and Run
+
+```
+docker-compose up -d --build
+```
+
+- https://localhost:8443/index (swagger api)
+- https://localhost:8443/hangfire (hangfire dashboard)
+- http://localhost:8081 (redis commander)
+
+### Extracting nuget package
+
+```
+docker create --name throwaway stratacontinuousimprovement_continuousimprovement-api
+docker cp throwaway:/pack .
+docker rm throwaway
+```
+
+### Cleanup
+
+```
+docker-compose down
+```
diff --git a/Strata.ContinuousImprovement.sln b/Strata.ContinuousImprovement.sln
new file mode 100644
index 0000000..3b20e1c
--- /dev/null
+++ b/Strata.ContinuousImprovement.sln
@@ -0,0 +1,120 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33403.182
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.ContinuousImprovement.Api", "src\Strata.ContinuousImprovement.Api\Strata.ContinuousImprovement.Api.csproj", "{C4CD8DC4-3B88-4BA6-9F78-C641D365C2EE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.ContinuousImprovement.Biz.Test.Unit", "tests\Strata.ContinuousImprovement.Biz.Test.Unit\Strata.ContinuousImprovement.Biz.Test.Unit.csproj", "{775E79BD-A8F5-4756-8E94-390A72018BF8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.ContinuousImprovement.Service", "src\Strata.ContinuousImprovement.Service\Strata.ContinuousImprovement.Service.csproj", "{EB523C92-2FED-4631-A73B-17F37B742E7C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.ContinuousImprovement.Biz", "src\Strata.ContinuousImprovement.Biz\Strata.ContinuousImprovement.Biz.csproj", "{533D0BEF-FBF2-47E2-98E7-11AE930E2E65}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.ContinuousImprovement.Web", "src\Strata.ContinuousImprovement.Web\Strata.ContinuousImprovement.Web.csproj", "{ABCB26F8-6044-41A8-BBBE-B00E95BB585D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.ContinuousImprovement.Dashboard", "src\Strata.ContinuousImprovement.Dashboard\Strata.ContinuousImprovement.Dashboard.csproj", "{51D04755-17C4-49CF-944B-D4347E7C550F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.ContinuousImprovement.Client", "src\Strata.ContinuousImprovement.Client\Strata.ContinuousImprovement.Client.csproj", "{EDBE4F6B-46D0-4332-9A38-7F2C011AA490}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.ContinuousImprovement.Api.Test.Unit", "tests\Strata.ContinuousImprovement.Api.Test.Unit\Strata.ContinuousImprovement.Api.Test.Unit.csproj", "{DA1AE588-5B04-43CA-BA0C-9DF8F737C97A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.ContinuousImprovement.JazzEntityFrameworkStub", "tests\Strata.ContinuousImprovement.JazzEntityFrameworkStub\Strata.ContinuousImprovement.JazzEntityFrameworkStub.csproj", "{D04952E8-BDF1-44C6-819C-A066BADE165B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.DecisionSupport.Biz", "src\Strata.DecisionSupport.Biz\Strata.DecisionSupport.Biz.csproj", "{12F6978F-C62B-4268-8B7B-72887B53C223}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.DecisionSupport.Biz.Test.Unit", "tests\Strata.DecisionSupport.Biz.Test.Unit\Strata.DecisionSupport.Biz.Test.Unit.csproj", "{EAB9B29E-CAA6-4974-A8D5-D0AAF3FF2B0C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.DecisionSupport.Models", "src\Strata.DecisionSupport.Models\Strata.DecisionSupport.Models.csproj", "{7743C7CC-91E6-4347-95EC-F18B2F173291}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strata.ContinuousImprovement.Client.Test.Unit", "tests\Strata.ContinuousImprovement.Client.Test.Unit\Strata.ContinuousImprovement.Client.Test.Unit.csproj", "{F4FCAF36-CDD7-4341-8546-5BF6DD8501CE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Strata.DecisionSupport.Biz.Test.Integration", "tests\Strata.DecisionSupport.Biz.Test.Integration\Strata.DecisionSupport.Biz.Test.Integration.csproj", "{0DE4A5ED-BA94-40AD-9553-3C4312DCC86C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Strata.ContinuousImprovement.Biz.Test.Integration", "tests\Strata.ContinuousImprovement.Biz.Test.Integration\Strata.ContinuousImprovement.Biz.Test.Integration.csproj", "{EFC6B15D-C22B-480B-9E50-9BBAA33A9030}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Strata.ContinuousImprovement.Client.Test.Integration", "tests\Strata.ContinuousImprovement.Client.Test.Integration\Strata.ContinuousImprovement.Client.Test.Integration.csproj", "{4515A4CD-906B-4204-86A4-5DE5BCE43E1D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Strata.ContinuousImprovement.Api.Test.Integration", "tests\Strata.ContinuousImprovement.Api.Test.Integration\Strata.ContinuousImprovement.Api.Test.Integration.csproj", "{A730D5B3-50A1-5419-8945-E1C70294B5B0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C4CD8DC4-3B88-4BA6-9F78-C641D365C2EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4CD8DC4-3B88-4BA6-9F78-C641D365C2EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4CD8DC4-3B88-4BA6-9F78-C641D365C2EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4CD8DC4-3B88-4BA6-9F78-C641D365C2EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{775E79BD-A8F5-4756-8E94-390A72018BF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{775E79BD-A8F5-4756-8E94-390A72018BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{775E79BD-A8F5-4756-8E94-390A72018BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{775E79BD-A8F5-4756-8E94-390A72018BF8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB523C92-2FED-4631-A73B-17F37B742E7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB523C92-2FED-4631-A73B-17F37B742E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB523C92-2FED-4631-A73B-17F37B742E7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB523C92-2FED-4631-A73B-17F37B742E7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{533D0BEF-FBF2-47E2-98E7-11AE930E2E65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{533D0BEF-FBF2-47E2-98E7-11AE930E2E65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{533D0BEF-FBF2-47E2-98E7-11AE930E2E65}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{533D0BEF-FBF2-47E2-98E7-11AE930E2E65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABCB26F8-6044-41A8-BBBE-B00E95BB585D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABCB26F8-6044-41A8-BBBE-B00E95BB585D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABCB26F8-6044-41A8-BBBE-B00E95BB585D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABCB26F8-6044-41A8-BBBE-B00E95BB585D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51D04755-17C4-49CF-944B-D4347E7C550F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51D04755-17C4-49CF-944B-D4347E7C550F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51D04755-17C4-49CF-944B-D4347E7C550F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51D04755-17C4-49CF-944B-D4347E7C550F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDBE4F6B-46D0-4332-9A38-7F2C011AA490}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDBE4F6B-46D0-4332-9A38-7F2C011AA490}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDBE4F6B-46D0-4332-9A38-7F2C011AA490}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDBE4F6B-46D0-4332-9A38-7F2C011AA490}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA1AE588-5B04-43CA-BA0C-9DF8F737C97A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA1AE588-5B04-43CA-BA0C-9DF8F737C97A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA1AE588-5B04-43CA-BA0C-9DF8F737C97A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA1AE588-5B04-43CA-BA0C-9DF8F737C97A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D04952E8-BDF1-44C6-819C-A066BADE165B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D04952E8-BDF1-44C6-819C-A066BADE165B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D04952E8-BDF1-44C6-819C-A066BADE165B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D04952E8-BDF1-44C6-819C-A066BADE165B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12F6978F-C62B-4268-8B7B-72887B53C223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12F6978F-C62B-4268-8B7B-72887B53C223}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12F6978F-C62B-4268-8B7B-72887B53C223}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12F6978F-C62B-4268-8B7B-72887B53C223}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAB9B29E-CAA6-4974-A8D5-D0AAF3FF2B0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAB9B29E-CAA6-4974-A8D5-D0AAF3FF2B0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAB9B29E-CAA6-4974-A8D5-D0AAF3FF2B0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAB9B29E-CAA6-4974-A8D5-D0AAF3FF2B0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7743C7CC-91E6-4347-95EC-F18B2F173291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7743C7CC-91E6-4347-95EC-F18B2F173291}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7743C7CC-91E6-4347-95EC-F18B2F173291}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7743C7CC-91E6-4347-95EC-F18B2F173291}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4FCAF36-CDD7-4341-8546-5BF6DD8501CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4FCAF36-CDD7-4341-8546-5BF6DD8501CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4FCAF36-CDD7-4341-8546-5BF6DD8501CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4FCAF36-CDD7-4341-8546-5BF6DD8501CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DE4A5ED-BA94-40AD-9553-3C4312DCC86C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DE4A5ED-BA94-40AD-9553-3C4312DCC86C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DE4A5ED-BA94-40AD-9553-3C4312DCC86C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DE4A5ED-BA94-40AD-9553-3C4312DCC86C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFC6B15D-C22B-480B-9E50-9BBAA33A9030}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFC6B15D-C22B-480B-9E50-9BBAA33A9030}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFC6B15D-C22B-480B-9E50-9BBAA33A9030}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFC6B15D-C22B-480B-9E50-9BBAA33A9030}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4515A4CD-906B-4204-86A4-5DE5BCE43E1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4515A4CD-906B-4204-86A4-5DE5BCE43E1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4515A4CD-906B-4204-86A4-5DE5BCE43E1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4515A4CD-906B-4204-86A4-5DE5BCE43E1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A730D5B3-50A1-5419-8945-E1C70294B5B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A730D5B3-50A1-5419-8945-E1C70294B5B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A730D5B3-50A1-5419-8945-E1C70294B5B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A730D5B3-50A1-5419-8945-E1C70294B5B0}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F6CD834D-51B1-4B10-9DE1-DFE5A16D4177}
+	EndGlobalSection
+EndGlobal
diff --git a/Strata.ContinuousImprovement.sln.DotSettings b/Strata.ContinuousImprovement.sln.DotSettings
new file mode 100644
index 0000000..82ab1f3
--- /dev/null
+++ b/Strata.ContinuousImprovement.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters&gt;&lt;Filter ModuleMask="Strata.ContinuousImprovement.Biz" ModuleVersionMask="*" ClassMask="Microsoft.Extensions.DependencyInjection.*" FunctionMask="*" IsEnabled="True" /&gt;&lt;/ExcludeFilters&gt;&lt;/data&gt;</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/docs/FeatureFlagUsage.md b/docs/FeatureFlagUsage.md
new file mode 100644
index 0000000..14f4aa2
--- /dev/null
+++ b/docs/FeatureFlagUsage.md
@@ -0,0 +1,347 @@
+# Feature Flag Usage Documentation - IFeatureFlagServiceClient.IsEnabledAsync
+
+This document provides a comprehensive overview of all feature flags used throughout the Continuous Improvement codebase via the `IFeatureFlagServiceClient.IsEnabledAsync` method.
+
+## Overview
+
+The application uses feature flags to control functionality on a per-client basis in this multi-tenant system. Feature flags are checked using the `IFeatureFlagServiceClient` service and are typically scoped to a specific database GUID.
+
+### Feature Flag Index
+
+| # | Feature Flag | Description | Section |
+|---|--------------|-------------|---------|
+| 1 | `ciflexibleexplorationenabled` | Controls access to flexible exploration features for non-SDT employees | [Section 1](#1-ciflexibleexplorationenabled) |
+| 2 | `enableencounteropportunityintempo` | Controls whether encounter opportunities are enabled in the Tempo interface | [Section 2](#2-enableencounteropportunityintempo) |
+| 3 | `ciflexibleexplorationpage3enabled` | Controls access to the flexible exploration information page (third page) | [Section 3](#3-ciflexibleexplorationpage3enabled) |
+| 4 | `enablepayrollopportunityintempo` | Controls whether payroll opportunities are enabled in the Tempo interface | [Section 4](#4-enablepayrollopportunityintempo) |
+| 5 | `chargecodebeta` | Controls access to charge code beta features | [Section 5](#5-chargecodebeta) |
+| 6 | `cibenchmarkingenabled` | Controls benchmarking features in continuous improvement | [Section 6](#6-cibenchmarkingenabled) |
+| 7 | `ciopportunityworkbooks` | Controls opportunity workbook features | [Section 7](#7-ciopportunityworkbooks) |
+| 8 | `networkopportunitiesenabled` | Controls network opportunity features | [Section 8](#8-networkopportunitiesenabled) |
+| 9 | `strategicopportunityforchargecode` | Controls strategic opportunity features specifically for charge codes | [Section 9](#9-strategicopportunityforchargecode) |
+| 10 | `ciexplorationpopulationmanagementlaunchesstrategicopportunitywizard` | Controls if the Add Opportunity button on the Exploration Population page launches the Strategic Opportunity Wizard |
+## Feature Flag Keys and Usage
+
+### 1. "ciflexibleexplorationenabled"
+**Purpose**: Controls access to flexible exploration features for non-SDT employees
+
+**Usage Locations**:
+- `AllOpportunitiesController.cs` (line 40)
+- `ExplorationOpportunitiesController.cs` (line 45)
+
+**Implementation Pattern**:
+```csharp
+// C# example
+public async Task<IActionResult> SomeAction()
+{
+    if (await _featureFlagServiceClient.IsEnabledAsync("ciflexibleexplorationenabled"))
+    {
+        // Code for flexible exploration features
+    }
+    else
+    {
+        // Fallback or default behavior
+    }
+}
+```
+
+**Context**: Enables flexible exploration functionality. SDT employees always have access, while client users need this feature flag enabled.
+
+---
+
+### 2. "enableencounteropportunityintempo"
+**Purpose**: Controls whether encounter opportunities are enabled in the Tempo interface
+
+**Usage Locations**:
+- `EncounterOpportunitiesController.cs` (lines 90, 175)
+
+**Implementation Pattern**:
+```csharp
+// C# example
+public async Task<IActionResult> TempoAction()
+{
+    if (await _featureFlagServiceClient.IsEnabledAsync("enableencounteropportunityintempo"))
+    {
+        // Code for encounter opportunities in Tempo
+    }
+    else
+    {
+        // Fallback to Jazz interface or show message
+    }
+}
+```
+
+**Context**: Feature flag to enable encounter opportunity functionality in the modern Tempo interface versus legacy Jazz interface.
+
+---
+
+### 3. "ciflexibleexplorationpage3enabled"
+**Purpose**: Controls access to the flexible exploration information page (third page)
+
+**Usage Locations**:
+- `ExplorationController.cs` (line 45)
+
+**Implementation Pattern**:
+```csharp
+// C# example
+public async Task<IActionResult> ExplorationPageAction()
+{
+    if (await _featureFlagServiceClient.IsEnabledAsync("ciflexibleexplorationpage3enabled"))
+    {
+        // Code for the third page of flexible exploration
+    }
+    else
+    {
+        // Redirect or show less data
+    }
+}
+```
+
+**Context**: Enables the third page of flexible exploration functionality for enhanced data exploration capabilities.
+
+---
+
+### 4. "enablepayrollopportunityintempo"
+**Purpose**: Controls whether payroll opportunities are enabled in the Tempo interface
+
+**Usage Locations**:
+- `PayrollOpportunitiesController.cs` (line 85)
+
+**Implementation Pattern**:
+```csharp
+// C# example
+public async Task<IActionResult> PayrollTempoAction()
+{
+    if (await _featureFlagServiceClient.IsEnabledAsync("enablepayrollopportunityintempo"))
+    {
+        // Code for payroll opportunities in Tempo
+    }
+    else
+    {
+        // Fallback to other methods or show message
+    }
+}
+```
+
+**Context**: Feature flag to enable payroll opportunity functionality in the modern Tempo interface.
+
+---
+
+### 5. "chargecodebeta"
+**Purpose**: Controls access to charge code beta features
+
+**Usage Locations**:
+- `ChargeCodeOpportunitiesController.cs` (line 243)
+
+**Implementation Pattern**:
+```csharp
+// C# example
+public async Task<IActionResult> ChargeCodeBetaAction()
+{
+    if (await _featureFlagServiceClient.IsEnabledAsync("chargecodebeta"))
+    {
+        // Code for charge code beta features
+    }
+    else
+    {
+        // Hide or disable beta features
+    }
+}
+```
+
+**Context**: Beta feature flag for charge code opportunities functionality, controlling access to new charge code features.
+
+---
+
+### 6. "cibenchmarkingenabled"
+**Purpose**: Controls benchmarking features in continuous improvement
+
+**Usage Locations**:
+- Frontend TypeScript components
+- Configuration and peer group functionality
+
+**Implementation Pattern**:
+```typescript
+// TypeScript example
+if (featureFlagService.isEnabled("cibenchmarkingenabled")) {
+    // Code for benchmarking features
+} else {
+    // Alternative code path
+}
+```
+
+**Context**: Enables benchmarking functionality in the CI application, allowing comparison against peer groups.
+
+---
+
+### 7. "ciopportunityworkbooks"
+**Purpose**: Controls opportunity workbook features
+
+**Usage Locations**:
+- Referenced in TypeScript interface definitions
+- Workbook management components
+
+**Context**: Feature flag for workbook functionality related to opportunities.
+
+---
+
+### 8. "networkopportunitiesenabled"
+**Purpose**: Controls network opportunity features
+
+**Usage Locations**:
+- Frontend navigation and components
+- Network opportunity controllers
+
+**Implementation Pattern**:
+```typescript
+// TypeScript example
+if (featureFlagService.isEnabled("networkopportunitiesenabled")) {
+    // Code for network opportunity features
+} else {
+    // Code for standard opportunities
+}
+```
+
+**Context**: Enables network opportunity functionality for multi-client opportunity management.
+
+---
+
+### 9. "strategicopportunityforchargecode"
+**Purpose**: Controls strategic opportunity features specifically for charge codes
+
+**Usage Locations**:
+- Frontend configuration components
+- Strategic opportunity management
+
+**Implementation Pattern**:
+```typescript
+// TypeScript example
+if (featureFlagService.isEnabled("strategicopportunityforchargecode")) {
+    // Code for strategic opportunities for charge codes
+} else {
+    // Fallback code
+}
+```
+
+**Context**: Enables strategic opportunity functionality specifically for charge code-based opportunities.
+
+---
+
+### 10. "ciexplorationpopulationmanagementlaunchesstrategicopportunitywizard"
+**Purpose**: Controls strategic opportunity features specifically for charge codes
+
+**Usage Locations**:
+- Frontend configuration components
+- Strategic opportunity management
+
+**Implementation Pattern**:
+```typescript
+// TypeScript example
+if (featureFlagService.isEnabled("ciexplorationpopulationmanagementlaunchesstrategicopportunitywizard")) {
+    // Code to launch strategic opportunities wizard
+} else {
+    // Fallback code
+}
+```
+
+**Context**: Enables the Add Opportunity button on the Exploration Population page to launch the Strategic Opportunity wizard.
+
+
+## Key Controllers Using Feature Flags
+
+| Controller | Feature Flags Used | Purpose |
+|------------|-------------------|---------|
+| `AllOpportunitiesController` | `ciflexibleexplorationenabled` | Flexible exploration access control |
+| `ExplorationOpportunitiesController` | `ciflexibleexplorationenabled` | Exploration features |
+| `ExplorationController` | `ciflexibleexplorationpage3enabled` | Advanced exploration pages |
+| `EncounterOpportunitiesController` | `enableencounteropportunityintempo` | Tempo interface integration |
+| `PayrollOpportunitiesController` | `enablepayrollopportunityintempo` | Payroll Tempo integration |
+| `ChargeCodeOpportunitiesController` | `chargecodebeta` | Beta charge code features |
+| `SettingsController` | All CI area flags | Global feature management |
+
+## Frontend Integration
+
+The frontend TypeScript code integrates with feature flags through:
+
+- **Navigation Control**: Menu items visibility based on feature flags
+- **Component Rendering**: Conditional rendering of UI components
+- **Service Availability**: API service availability checks
+- **User Interface**: Feature-specific UI elements and workflows
+
+### Example Frontend Usage
+```typescript
+// TypeScript example
+async function loadOpportunities() {
+    if (await featureFlagService.isEnabled("ciflexibleexplorationenabled")) {
+        // Load flexible exploration opportunities
+    } else {
+        // Load standard opportunities
+    }
+}
+```
+
+## Database Scope
+
+All feature flags are scoped to specific database GUIDs, enabling per-client feature control in the multi-tenant architecture. This allows different clients to have different features enabled based on their subscription level or beta participation.
+
+## Testing Considerations
+
+When testing feature flag functionality:
+
+1. **Mock the `IFeatureFlagServiceClient`** in unit tests
+2. **Test both enabled and disabled states** for each feature
+3. **Verify SDT employee bypass logic** where applicable
+4. **Test database GUID scoping** for multi-tenant scenarios
+
+### Example Test Mock
+```csharp
+// C# example using Moq
+var featureFlagMock = new Mock<IFeatureFlagServiceClient>();
+featureFlagMock.Setup(ff => ff.IsEnabledAsync("ciflexibleexplorationenabled"))
+    .ReturnsAsync(true);
+
+// Use featureFlagMock.Object in tests
+```
+
+## Service Registration
+
+Feature flags are registered in the dependency injection container via the `IFeatureFlagServiceClient` service, typically configured in the `Startup.cs` or `Program.cs` file for the application.
+
+## Logging and Monitoring
+
+Many feature flag checks include structured logging to track usage patterns:
+
+```csharp
+// C# example
+if (await _featureFlagServiceClient.IsEnabledAsync("ciflexibleexplorationenabled"))
+{
+    _logger.LogInformation("Flexible exploration feature enabled");
+}
+else
+{
+    _logger.LogInformation("Flexible exploration feature disabled");
+}
+```
+
+## Maintenance Notes
+
+- All feature flag keys should be documented when added
+- Consider feature flag lifecycle and removal strategy for permanent features
+- Monitor feature flag usage through logging for analysis
+- Ensure consistent naming conventions for new feature flags
+- Regularly review and clean up obsolete feature flags
+- Update this documentation when new feature flags are added
+
+## Feature Flag Lifecycle
+
+1. **Development**: New feature flags are added for experimental or beta features
+2. **Testing**: Features are tested with flags enabled/disabled
+3. **Rollout**: Gradual enabling of features for specific clients
+4. **Stabilization**: Features become stable and widely adopted
+5. **Cleanup**: Feature flags are removed once features are permanent
+
+---
+
+*Last Updated: November 2025*
+*Document Version: 1.0*
+*Total Feature Flags Documented: 9*
\ No newline at end of file
diff --git a/docs/add-opportunity-type-playbook.md b/docs/add-opportunity-type-playbook.md
new file mode 100644
index 0000000..a889251
--- /dev/null
+++ b/docs/add-opportunity-type-playbook.md
@@ -0,0 +1,602 @@
+# Add Opportunity Type Playbook
+
+Single source of truth for adding a new strategic opportunity type. Derived from the Charge Code (CC) and General Ledger (GL) implementations.
+
+## Quick-Scan Checklist
+
+Use this to track progress. Each item references a detailed section below.
+
+### Backend
+- [ ] [Entity](#1-entity) — `StrategicOpportunity{Type}.cs` (TPT child table)
+- [ ] [Enums](#2-enums) — `OpportunityTypes` value + `MeasureType` values
+- [ ] [DTOs](#3-dtos) — Create DTO + Update DTO
+- [ ] [Detail Service](#4-detail-service) — `IStrategic{Type}OpportunityDetailService` + implementation
+- [ ] [Query Layer](#5-query-layer) — SQL files, ServiceQuery, QueryBuilder
+- [ ] [Distribution Process](#6-distribution-process) — `DistributionProcess{Type}.cs` + SQL builder
+- [ ] [Dimension Config](#7-dimension-config) — `{Type}DimensionsConfig` in `StrategicOpportunityService`
+- [ ] [Service Methods](#8-service-methods) — CRUD on `IStrategicOpportunityService`
+- [ ] [Controller Endpoints](#9-controller-endpoints) — REST endpoints
+- [ ] [DI Registration](#10-di-registration) — `ContinuousImprovementServiceExtensions.cs`
+- [ ] [Migration](#11-database-migration) — EF Core migration for child table
+
+### Frontend
+- [ ] [Data Model](#f1-data-model) — `IStrategicOpportunity{Type}Data.ts`
+- [ ] [Measure Types](#f2-measure-types) — enum values + display names in `MeasureType.ts`
+- [ ] [Strategy Hook](#f3-strategy-hook) — `use{Type}Strategy.ts` implementing `IOpportunityTypeStrategy`
+- [ ] [Define Component](#f4-define-component) — `{Type}Define.tsx`
+- [ ] [Detail Store](#f5-detail-store) — `StrategicOpportunity{Type}DetailStoreTreeData.ts`
+- [ ] [Detail Grid](#f6-detail-grid) — `StrategicOpportunity{Type}DetailGrid.tsx`
+- [ ] [Layout Config](#f7-layout-config) — entry in `IStrategicOpportunityLayout.ts`
+- [ ] [Dimension Enums](#f8-dimension-enums) — fields/sections/columns in `StrategicOpportunityDetailDimension.ts`
+- [ ] [Service Methods](#f9-service-methods) — HTTP calls in `strategicOpportunityService.tsx`
+- [ ] [Wizard Integration](#f10-wizard-integration) — hook call + strategy switch in `StrategicOpportunity.tsx`
+- [ ] [Routes](#f11-routes) — create/edit routes in `Navigation.tsx`
+- [ ] [List Page](#f12-list-page) — ButtonMenu option in `StrategicItems.tsx`
+
+### Cross-Cutting
+- [ ] [OpportunityTypes enum](#x1-opportunitytypes-enum) — both backend + frontend must match
+- [ ] [Detail Page Integration](#x2-detail-page-integration) — `StrategicOpportunityDetailPage.tsx` branches
+- [ ] [Tests](#x3-testing)
+
+---
+
+## Backend Steps
+
+### 1. Entity
+
+Create `Biz/StrategicOpportunities/StrategicOpportunity{Type}.cs` inheriting from `StrategicOpportunity` (TPT pattern).
+
+**Pattern:**
+```csharp
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    [Table("strategic_opportunity_{type}")]
+    public class StrategicOpportunity{Type} : StrategicOpportunity
+    {
+        // Type-specific properties
+        public string SomeHPath { get; set; }
+
+        public StrategicOpportunity{Type}() { }
+
+        // Copy constructor (used by CopyStrategicOpportunity)
+        public StrategicOpportunity{Type}(StrategicOpportunity{Type} opportunity, string opportunityName)
+        {
+            // Copy all base properties
+            Name = opportunityName;
+            OpportunityType = opportunity.OpportunityType;
+            OpportunityFiltersJSON = opportunity.OpportunityFiltersJSON;
+            Rollup1Id = opportunity.Rollup1Id;
+            Rollup2Id = opportunity.Rollup2Id;
+            Rollup3Id = opportunity.Rollup3Id;
+            BaselineType = opportunity.BaselineType;
+            BaselineDistribution = opportunity.BaselineDistribution;
+            BaselineStartDate = opportunity.BaselineStartDate;
+            BaselineEndDate = opportunity.BaselineEndDate;
+            EstimatedTrackingDuration = opportunity.EstimatedTrackingDuration;
+            StrataId = opportunity.StrataId;
+            LayoutJSON = opportunity.LayoutJSON;
+            TeamMembers = opportunity.TeamMembers;
+            OwnerGuid = opportunity.OwnerGuid;
+            ExecutiveSponsorGuid = opportunity.ExecutiveSponsorGuid;
+            CostLeaderGuid = opportunity.CostLeaderGuid;
+
+            // Copy type-specific properties
+            SomeHPath = opportunity.SomeHPath;
+        }
+    }
+}
+```
+
+**DbContext:** Add `DbSet<StrategicOpportunity{Type}>` to `CentralDbContext` and configure in `OnModelCreating`.
+
+**References:**
+- `Biz/StrategicOpportunities/StrategicOpportunityChargeCode.cs`
+- `Biz/StrategicOpportunities/StrategicOpportunityGL.cs`
+- Base: `Biz/StrategicOpportunities/StrategicOpportunity.cs`
+
+### 2. Enums
+
+**OpportunityTypes** (`Biz/Generics/OpportunityTypes.cs` or wherever defined):
+Add a new enum value. Current values:
+- `StrategicOpportunityChargeCode` (value in `IAllOpportunity.ts` frontend)
+- `StrategicOpportunityGL`
+
+**MeasureType** (`Biz/StrategicOpportunities/Enums/MeasureType.cs`):
+Add new measure type values after the last GL value (currently 37 = `GLMarginPerAdjDischarge`).
+```csharp
+// {Type} measure types (38+)
+{Type}Measure1 = 38,
+{Type}Measure2,
+// ...
+```
+
+Also add a `{TYPE}_MEASURE_TYPES` constant list in `MeasureTypeConstants`.
+
+**Other enums:** If the type has a concept like GL's `GLAccountType`, create a new enum file in `Biz/StrategicOpportunities/Enums/`.
+
+### 3. DTOs
+
+Create two DTOs in `Biz/StrategicOpportunities/Dtos/`:
+
+**Create DTO** — `StrategicOpportunity{Type}Dto.cs`:
+```csharp
+public class StrategicOpportunity{Type}Dto : StrategicOpportunityDto
+{
+    // Type-specific properties matching the entity
+    public string SomeHPath { get; set; }
+}
+```
+
+**Update DTO** — `StrategicOpportunity{Type}UpdateDto.cs`:
+```csharp
+public class StrategicOpportunity{Type}UpdateDto
+{
+    public StrategicOpportunity{Type}Dto Opportunity { get; set; }
+    public bool ShouldPopulateOpportunityDetails { get; set; }
+}
+```
+
+**References:**
+- `Dtos/StrategicOpportunityGLDto.cs` / `StrategicOpportunityGLUpdateDto.cs`
+- `Dtos/StrategicOpportunityChargeCodeDto.cs` / `StrategicOpportunityChargeCodeUpdateDto.cs`
+
+### 4. Detail Service
+
+Create interface + implementation for populating detail data.
+
+**Interface** — `IStrategic{Type}OpportunityDetailService.cs`:
+```csharp
+public interface IStrategic{Type}OpportunityDetailService
+{
+    Task PopulateOpportunityDetailsAsync(StrategicOpportunity{Type} opportunity, CancellationToken ct);
+    Task<StrategicOpportunityDetailData> GetDetailDataAsync(long opportunityId, bool isTracking, List<int> dimensions, CancellationToken ct);
+}
+```
+
+**Implementation** — `Strategic{Type}OpportunityDetailService.cs`:
+Uses primary constructor DI, queries Snowflake/SQL for dimension data, populates `StrategicOpportunityDetail` rows.
+
+**References:**
+- `IStrategicChargeCodeOpportunityDetailService.cs` + `StrategicChargeCodeOpportunityDetailService.cs`
+- `IStrategicGLOpportunityDetailService.cs` + `StrategicGLOpportunityDetailService.cs`
+
+### 5. Query Layer
+
+**SQL files** (embedded resources in `Biz/StrategicOpportunities/Queries/` or similar):
+- `StrategicOpportunity{Type}DetailCTE.sql` — main detail data query
+- Dimension-specific queries as needed
+
+**ServiceQuery** — `StrategicOpportunity{Type}ServiceQuery.cs`:
+Loads SQL from embedded resources, provides query text to the detail service.
+
+**QueryBuilder** — `StrategicOpportunity{Type}DetailQueryBuilder.cs`:
+Implements `IStrategicOpportunityDetailQueryBuilder`, builds parameterized queries for dimensions.
+
+**References:**
+- `Queries/StrategicOpportunityGLDetailQueryBuilder.cs`
+- `Queries/StrategicOpportunityGLServiceQuery.cs`
+- `StrategicOpportunityServiceQuery.cs` (CC version)
+
+### 6. Distribution Process
+
+Create in `Biz/StrategicOpportunities/DistributionProcess/{Type}/`:
+
+- `DistributionProcess{Type}.cs` — orchestrates data distribution
+- `DistributionProcess{Type}SqlBuilder.cs` — builds SQL for distribution
+- `Distribution{Type}Summary.cs` — summary model
+
+Update `DistributionProcessFactory.cs` to handle the new type.
+
+**References:**
+- `DistributionProcess/ChargeCode/DistributionProcessChargeCode.cs`
+- `DistributionProcess/GL/DistributionProcessGL.cs`
+- `DistributionProcess/DistributionProcessFactory.cs`
+
+### 7. Dimension Config
+
+In `StrategicOpportunityService.cs`, add a `{Type}DimensionsConfig` that maps dimension IDs to dimension names/hierarchy paths for the new type.
+
+### 8. Service Methods
+
+Add to `IStrategicOpportunityService.cs`:
+```csharp
+Task<long> CreateOpportunity{Type}Async(StrategicOpportunity{Type}Dto dto, CancellationToken ct);
+Task<long> UpdateOpportunity{Type}(long id, StrategicOpportunity{Type}UpdateDto dto, CancellationToken ct);
+Task<StrategicOpportunityEditData> GetStrategicOpportunity{Type}(long id, CancellationToken ct);
+Task<bool> Delete{Type}OpportunityAsync(long id, CancellationToken ct);
+```
+
+Implement in `StrategicOpportunityService.cs`.
+
+### 9. Controller Endpoints
+
+Add endpoints to the strategic opportunities controller (or create a new controller if separation is needed):
+```
+POST   /api/v1.0/strategic-opportunities/{type}          — Create
+PUT    /api/v1.0/strategic-opportunities/{type}/{id}      — Update
+GET    /api/v1.0/strategic-opportunities/{id}/{type}      — Get for edit
+DELETE /api/v1.0/strategic-opportunities/{type}/{id}      — Delete
+POST   /api/v1.0/strategic-opportunities/{id}/{type}-detail — Get detail data
+PUT    /api/v1.0/strategic-opportunities/{id}/{type}-details — Update goal values
+```
+
+### 10. DI Registration
+
+In `Biz/Configurations/ContinuousImprovementServiceExtensions.cs`:
+```csharp
+services.AddScoped<IStrategic{Type}OpportunityDetailService, Strategic{Type}OpportunityDetailService>();
+```
+
+### 11. Database Migration
+
+```bash
+dotnet ef migrations add AddStrategicOpportunity{Type}Table -p src/Strata.ContinuousImprovement.Biz -s src/Strata.ContinuousImprovement.Api
+```
+
+**TPT gotcha:** EF Core generates the child table PK with the same name as the parent (`pk_strategic_opportunity`). You must manually rename it in the migration file:
+```csharp
+// Change this:
+name: "pk_strategic_opportunity",
+// To this:
+name: "pk_strategic_opportunity_{type}",
+```
+
+---
+
+## Frontend Steps
+
+All paths relative to `src/Strata.ContinuousImprovement.Web/continuousimprovement/src/`.
+
+### F1. Data Model
+
+Create `strategic-opportunities/data/IStrategicOpportunity{Type}Data.ts`:
+```typescript
+import { IStrategicOpportunityData, defaultStrategicOpportunityData } from './IStrategicOpportunityData';
+
+export interface IStrategicOpportunity{Type}Data extends IStrategicOpportunityData {
+  // Type-specific properties
+  someHPath: string;
+}
+
+export const defaultStrategicOpportunity{Type}Data: IStrategicOpportunity{Type}Data = {
+  ...defaultStrategicOpportunityData,
+  someHPath: ''
+};
+```
+
+**References:**
+- `data/IStrategicOpportunityChargeCodeData.ts`
+- `data/IStrategicOpportunityGLData.ts`
+
+### F2. Measure Types
+
+In `strategic-opportunities/data/MeasureType.ts`:
+
+1. Add enum values (must match backend `MeasureType.cs`):
+```typescript
+// {Type} measure types (sync with backend, values N-M)
+{Type}Measure1 = N,
+{Type}Measure2,
+```
+
+2. Add display names array:
+```typescript
+export const {type}MeasureTypeData: IKeyNameItem[] = [
+  { key: MeasureType.{Type}Measure1, name: 'Display Name 1' },
+  // ...
+];
+```
+
+3. Add entries to `mapMeasureTypeToDesiredResult`.
+
+4. Add helper like `is{Type}PerMeasureType()` if the type has "per unit" style measures.
+
+### F3. Strategy Hook
+
+Create `strategic-opportunities/wizard/{type}/use{Type}Strategy.ts`:
+
+Must implement `IOpportunityTypeStrategy` from `wizard/types/IOpportunityTypeStrategy.ts`:
+
+```typescript
+export interface IOpportunityTypeStrategy {
+  getDefaultData(): IStrategicOpportunityData;
+  renderDefineStep(context: IDefineStepContext): React.ReactElement | null;
+  renderModals(context: IModalContext): React.ReactElement | null;
+  validateDefineStep(formValues: any): string | true;
+  marshalDefineStep(formValues: any, context: IMarshalContext): Partial<IStrategicOpportunityData>;
+  onFormValuesChanged(changedValues: any, context: IFormChangeContext): void;
+  loadEditData(data: IStrategicOpportunityEditData, context: IEditLoadContext): void;
+  loadPrePopulationData?(params: URLSearchParams, context: IPrePopContext): Promise<void>;
+  create(data: IStrategicOpportunityData): Promise<number>;
+  update(opportunityId: number, data: IStrategicOpportunityData, shouldPopulate: boolean): Promise<boolean>;
+  shouldRepopulateOnEdit(context: IRepopulateContext): boolean;
+  getMeasureTypeData(): IKeyNameItem[];
+}
+```
+
+**Key responsibilities:**
+- `getDefaultData()` — return `defaultStrategicOpportunity{Type}Data` with correct `opportunityType`
+- `renderDefineStep()` — render the type-specific Define component via `React.createElement`
+- `validateDefineStep()` — return error string or `true`
+- `marshalDefineStep()` — convert form values to data model fields
+- `create()/update()` — call type-specific service methods
+- `getMeasureTypeData()` — return the type-specific measure list
+
+**Props pattern:**
+```typescript
+export interface I{Type}StrategyProps {
+  form: FormInstance;
+  isActive: boolean;
+}
+```
+
+**References:**
+- `wizard/charge-code/useChargeCodeStrategy.ts`
+- `wizard/general-ledger/useGLStrategy.ts`
+
+### F4. Define Component
+
+Create `strategic-opportunities/wizard/{type}/{Type}Define.tsx`:
+
+Type-specific Step 2 content — pickers, filters, measure type selection, desired result.
+
+**References:**
+- `wizard/charge-code/ChargeCodeDefine.tsx`
+- `wizard/general-ledger/GeneralLedgerDefine.tsx`
+
+### F5. Detail Store
+
+Create `strategic-opportunities/data/store/StrategicOpportunity{Type}DetailStoreTreeData.ts`:
+
+Extends `StoreTreeData` with the type-specific grid item interface. Handles:
+- Loading data into tree structure
+- Goal editing (onChange)
+- Row config by dimensions
+
+**References:**
+- `data/store/StrategicOpportunityDetailStoreTreeData.ts` (CC)
+- `data/store/StrategicOpportunityGLDetailStoreTreeData.ts` (GL)
+
+### F6. Detail Grid
+
+Create `strategic-opportunities/detail/StrategicOpportunity{Type}DetailGrid.tsx`:
+
+DataGrid component with type-specific columns. Receives `root`, `columns`, `levelsCount`, `loading`, `expandedKeys`, `onChange`, `isEditable`.
+
+**References:**
+- `detail/StrategicOpportunityDetailGrid.tsx` (CC)
+- `detail/StrategicOpportunityGLDetailGrid.tsx` (GL)
+
+### F7. Layout Config
+
+In `strategic-opportunities/detail/data/IStrategicOpportunityLayout.ts`:
+
+1. Add default layout:
+```typescript
+export const defaultStrategicOpportunity{Type}Layout: IStrategicOpportunityLayout = {
+  rows: [strategicOpportunityDetailDimensionTotal, ...default{Type}Dimensions],
+  columns: [...default{Type}Columns]
+};
+```
+
+2. Add layout config:
+```typescript
+export const {type}OpportunityLayoutConfig: IDetailLayoutConfig = {
+  defaultLayout: defaultStrategicOpportunity{Type}Layout,
+  rowLayoutList: {type}RowLayoutList,
+  columnLayoutList: {type}ColumnLayoutList,
+  requiredRows: [StrategicOpportunityDetailDimension.{TypeDimension}],
+  requiredColumns: [{Type}DetailField.{RequiredColumn}]
+};
+```
+
+3. Update factory function:
+```typescript
+export function getDetailLayoutConfig(...): IDetailLayoutConfig {
+  if (opportunityType === OpportunityTypes.StrategicOpportunity{Type}) {
+    return {type}OpportunityLayoutConfig;
+  }
+  // ... existing cases
+}
+```
+
+### F8. Dimension Enums
+
+In `strategic-opportunities/detail/data/StrategicOpportunityDetailDimension.ts`:
+
+1. Add dimension values to `StrategicOpportunityDetailDimension` enum (if new dimensions needed)
+2. Add dimension ID to `StrategicOpportunityDetailDimensionId` enum
+3. Create detail field enum:
+```typescript
+export enum StrategicOpportunity{Type}DetailField {
+  // Type-specific grid columns
+}
+```
+4. Create column name/header maps
+5. Create field section enum + section-to-field mappings
+6. Add helper functions for parsing columns/dimensions by string
+
+### F9. Service Methods
+
+In `strategic-opportunities/data/strategicOpportunityService.tsx`, add:
+```typescript
+createOpportunity{Type}: async (opportunity) => httpPost(`${url}/{type}`, opportunity),
+updateOpportunity{Type}: async (id, opportunity, shouldPopulate) =>
+  httpPut(`${url}/{type}/${id}`, { opportunity, shouldPopulateOpportunityDetails: shouldPopulate }),
+getOpportunity{Type}: async (id) => httpGet(`${url}/${id}/GetOpportunity{Type}`),
+getOpportunity{Type}DetailData: async (id, isTracking, dimensions) =>
+  httpPost(`${url}/${id}/${isTracking ? '{type}-tracking-detail' : '{type}-detail'}`, dimensions),
+updateOpportunity{Type}DetailsData: async (id, data) =>
+  httpPut(`${url}/${id}/{type}-details`, data),
+```
+
+Also update `IStrategicOpportunityService.ts` interface with the new methods.
+
+### F10. Wizard Integration
+
+In `strategic-opportunities/wizard/StrategicOpportunity.tsx`:
+
+1. Import the new strategy hook:
+```typescript
+import { use{Type}Strategy } from './{type}/use{Type}Strategy';
+```
+
+2. Add hook call (must always be called — React rules of hooks):
+```typescript
+const {type}Strategy = use{Type}Strategy({ form, isActive: opportunityType === OpportunityTypes.StrategicOpportunity{Type} });
+```
+
+3. Update `activeStrategy` selection:
+```typescript
+const is{Type} = opportunityType === OpportunityTypes.StrategicOpportunity{Type};
+// All hooks always called
+const ccStrategy = useChargeCodeStrategy({ form, isActive: !isGL && !is{Type} });
+const glStrategy = useGLStrategy({ form, isActive: isGL });
+const {type}Strategy = use{Type}Strategy({ form, isActive: is{Type} });
+const activeStrategy = is{Type} ? {type}Strategy : isGL ? glStrategy : ccStrategy;
+```
+
+### F11. Routes
+
+In `shared/Navigation.tsx`, add create and edit routes:
+```tsx
+<Route
+  path={['/strategic-opportunities/create/{type}']}
+  exact
+  component={(props) => StrategicOpportunity({ ...props, opportunityType: OpportunityTypes.StrategicOpportunity{Type} })}
+  key='/strategic-opportunities/create/{type}'
+/>
+<Route
+  path={['/strategic-opportunities/edit/{type}/:id']}
+  exact
+  component={(props) => StrategicOpportunity({ ...props, opportunityType: OpportunityTypes.StrategicOpportunity{Type} })}
+  key='/strategic-opportunities/edit/{type}'
+/>
+```
+
+### F12. List Page
+
+In `strategic-opportunities/opportunities/StrategicItems.tsx`, add to the ButtonMenu items:
+```typescript
+items={[
+  { key: 'charge-code', label: 'Charge Code' },
+  { key: 'general-ledger', label: 'General Ledger' },
+  { key: '{type}', label: '{Display Name}' }
+]}
+```
+
+And handle the click:
+```typescript
+onClick={(e) => {
+  // ... existing cases
+  else if (e.key === '{type}') {
+    history.push('/strategic-opportunities/create/{type}');
+  }
+}}
+```
+
+---
+
+## Cross-Cutting
+
+### X1. OpportunityTypes Enum
+
+Both backend and frontend must have matching values:
+
+**Backend** — `Biz/Generics/OpportunityTypes.cs` (or wherever `OpportunityTypes` is defined)
+**Frontend** — `opportunities/opportunities/data/IAllOpportunity.ts`
+
+Current values:
+```
+StrategicOpportunityChargeCode = 17 (approx)
+StrategicOpportunityGL = 18 (approx)
+```
+New type should be the next sequential value.
+
+### X2. Detail Page Integration
+
+In `strategic-opportunities/detail/StrategicOpportunityDetailPage.tsx`, add branches for:
+
+1. `storeTreeData` selection (around line 181):
+```typescript
+if (is{Type}) {
+  return new StrategicOpportunity{Type}DetailStoreTreeData(DefaultGridItem);
+}
+```
+
+2. Detail data fetching (around line 252):
+```typescript
+if (is{Type}) {
+  // Fetch type-specific detail data
+}
+```
+
+3. Grid column parsing (around line 305):
+```typescript
+if (is{Type}) {
+  _gridColumns = getStrategicOpportunity{Type}DetailColumnsByString(layout.columns);
+}
+```
+
+4. Grid rendering (around line 853):
+```typescript
+is{Type} ? (
+  <StrategicOpportunity{Type}DetailGrid ... />
+) : isGL ? (
+  ...
+)
+```
+
+5. Save handler — map dirty data to goal values for the new type.
+
+6. Edit navigation path:
+```typescript
+const typePath = is{Type} ? '{type}' : isGL ? 'general-ledger' : 'charge-code';
+```
+
+7. Comments drawer `opportunityType` prop.
+
+### X3. Testing
+
+**Backend:**
+- Unit tests for the detail service
+- Unit tests for the distribution process
+- Unit tests for new service methods
+
+**Frontend:**
+- Unit test for the strategy hook (validate, marshal, create/update)
+- Unit test for the Define component
+- Unit test for the detail grid component
+
+---
+
+## File Reference Table
+
+| Pattern | CC Reference | GL Reference |
+|---------|-------------|--------------|
+| Entity | `StrategicOpportunityChargeCode.cs` | `StrategicOpportunityGL.cs` |
+| Create DTO | `StrategicOpportunityChargeCodeDto.cs` | `StrategicOpportunityGLDto.cs` |
+| Update DTO | `StrategicOpportunityChargeCodeUpdateDto.cs` | `StrategicOpportunityGLUpdateDto.cs` |
+| Detail Service | `StrategicChargeCodeOpportunityDetailService.cs` | `StrategicGLOpportunityDetailService.cs` |
+| Distribution | `DistributionProcess/ChargeCode/` | `DistributionProcess/GL/` |
+| Query Builder | `StrategicOpportunityDetailQueryBuilder.cs` | `StrategicOpportunityGLDetailQueryBuilder.cs` |
+| Service Query | `StrategicOpportunityServiceQuery.cs` | `StrategicOpportunityGLServiceQuery.cs` |
+| Data Model | `IStrategicOpportunityChargeCodeData.ts` | `IStrategicOpportunityGLData.ts` |
+| Strategy Hook | `useChargeCodeStrategy.ts` | `useGLStrategy.ts` |
+| Define Component | `ChargeCodeDefine.tsx` | `GeneralLedgerDefine.tsx` |
+| Store | `StrategicOpportunityDetailStoreTreeData.ts` | `StrategicOpportunityGLDetailStoreTreeData.ts` |
+| Detail Grid | `StrategicOpportunityDetailGrid.tsx` | `StrategicOpportunityGLDetailGrid.tsx` |
+
+## Tips and Gotchas
+
+1. **TPT PK collision**: Always check the generated migration for duplicate PK constraint names. Rename `pk_strategic_opportunity` to `pk_strategic_opportunity_{type}`.
+
+2. **React hooks order**: All strategy hooks must be called unconditionally in `StrategicOpportunity.tsx` (React rules of hooks). Use the `isActive` prop to no-op inactive strategies.
+
+3. **MeasureType sync**: Backend `MeasureType` enum values must exactly match frontend `MeasureType` const enum values. Double-check after adding.
+
+4. **Layout compatibility**: The `isLayoutCompatible()` function checks `requiredColumns`. Make sure your type's required columns are unique to avoid stale layouts from other types being loaded.
+
+5. **Formatting**: Run `npx eslint --fix <files>` after editing (not `npx prettier --write`).
diff --git a/docs/strategic-opportunity-wizard-refactor.md b/docs/strategic-opportunity-wizard-refactor.md
new file mode 100644
index 0000000..24ede22
--- /dev/null
+++ b/docs/strategic-opportunity-wizard-refactor.md
@@ -0,0 +1,404 @@
+# Strategic Opportunity Wizard Refactor — Migration Guide
+
+## Who This Is For
+
+If you wrote or maintain `StrategicOpportunity.tsx` (the wizard orchestrator) or any of its step components, this document explains what's changing, why, and how your code maps to the new structure.
+
+---
+
+## Why Are We Doing This?
+
+The wizard was built for **Charge Code** opportunities only. Now we need to add **General Ledger (GL)** opportunities that use the same 5-step wizard flow but have completely different "Define Opportunity" logic (departments + GL accounts instead of encounter groups + charge codes).
+
+The current orchestrator (`StrategicOpportunity.tsx`, 670 lines) has charge-code-specific state, validation, data marshaling, and service calls baked directly in. If we added GL logic the same way, the file would balloon with `if (opportunityType === 'GL')` branches everywhere.
+
+Instead, we're extracting type-specific logic into **strategy hooks** — one for Charge Code, one for GL — and keeping the orchestrator focused on what's shared: wizard navigation, form management, and the steps that are identical for both types.
+
+---
+
+## The Big Picture: Before vs After
+
+### Before (today)
+
+```
+StrategicOpportunity.tsx (670 lines)
+  ├── Wizard navigation + form setup
+  ├── 12+ CC-specific state variables (chargeCodeMembers, selectedChargeCodes, etc.)
+  ├── CC-specific functions (loadChargeCodePickerModels, etc.)
+  ├── CC-specific validation in handleChange (step 1)
+  ├── CC-specific data marshaling in updateOpportunity (step 1)
+  ├── CC-specific edit loading in loadEditData
+  ├── CC-specific pre-population from exploration
+  ├── CC-specific create/update service calls
+  └── CC-specific repopulation detection on edit
+```
+
+Everything lives in one file. There's no separation between "wizard infrastructure" and "charge code logic."
+
+### After (refactored)
+
+```
+StrategicOpportunity.tsx (~300 lines) — Generic orchestrator
+  ├── Wizard navigation + form setup (unchanged)
+  ├── Shared state only (primaryMeasures, filters, rollups, workbooks, baseline)
+  ├── Calls activeStrategy.validateDefineStep() instead of inline CC validation
+  ├── Calls activeStrategy.marshalDefineStep() instead of inline CC marshaling
+  ├── Calls activeStrategy.loadEditData() for type-specific edit fields
+  ├── Calls activeStrategy.create() / activeStrategy.update()
+  └── Renders activeStrategy.renderDefineStep() for step 1
+
+charge-code/useChargeCodeStrategy.ts (~250 lines) — All the CC logic extracted
+  ├── CC state (chargeCodeMembers, selectedChargeCodes, etc.)
+  ├── CC functions (loadChargeCodePickerModels, etc.)
+  ├── CC step 1 validation + marshaling
+  ├── CC edit loading + pre-population
+  └── CC create/update service calls
+
+general-ledger/useGLStrategy.ts — New GL logic
+  ├── GL state (accountType, departments, GL accounts)
+  ├── GL step 1 validation + marshaling
+  ├── GL edit loading
+  └── GL create/update service calls
+```
+
+---
+
+## What Stays the Same
+
+These things are **not changing** (or changing only trivially):
+
+| Component | What's happening |
+|-----------|-----------------|
+| **StrategicOpportunityDetail.tsx** (Step 0) | Shared. No change except minor display support for GL type. |
+| **StrategicOpportunityDefineTimeframe.tsx** (Step 3) | Shared. No change. |
+| **StrategicOpportunityExternalLinks.tsx** (Step 4) | Shared. No change. |
+| **StrategicOpportunityRenameMeasure.tsx** | Shared utility. No change. |
+| **StrategicOpportunityFilters.tsx** | Shared utility. No change. |
+| **All data/ files** | No changes to interfaces, services, enums. |
+| **Wizard step validation for steps 0, 2, 3, 4** | Stays in the orchestrator — these steps are identical for both types. |
+
+---
+
+## What's Moving
+
+### Files that move (same code, new location)
+
+| Old Location | New Location | Why |
+|-------------|-------------|-----|
+| `wizard/StrategicOpportunityDefine.tsx` | `wizard/charge-code/ChargeCodeDefine.tsx` | This component is 100% charge-code-specific. Renaming makes that explicit. |
+| `wizard/ChargeCodeCustomPickerModal.tsx` | `wizard/charge-code/ChargeCodeCustomPickerModal.tsx` | Only used by charge code define step. |
+
+These are **moves + renames**, not rewrites. The component logic inside is the same.
+
+### State that moves from orchestrator → CC strategy hook
+
+All of these `useState` calls currently in `StrategicOpportunity.tsx` will move into `useChargeCodeStrategy.ts`:
+
+```typescript
+// These move OUT of the orchestrator:
+const [chargeCodeMembers, setChargeCodeMembers] = useState(...);
+const [selectedChargeCodes, setSelectedChargeCodes] = useState(...);
+const [selectedChargeCodesInitial, setSelectedChargeCodesInitial] = useState(...);
+const [expPopulationMembers, setExpPopulationMembers] = useState(...);
+const [selectedExpPopulations, setSelectedExpPopulations] = useState(...);
+const [patientPopulationsInitial, setPatientPopulationsInitial] = useState(...);
+const [expPopulationsInitial, setExpPopulationsInitial] = useState(...);
+const [expPopCostDriver, setExpPopCostDriver] = useState(...);
+const [uploadModalVisible, setUploadModalVisible] = useState(...);
+const [isPrePopulated, setIsPrePopulated] = useState(...);
+```
+
+```typescript
+// These STAY in the orchestrator (shared by both types):
+const [stepNumber, setStepNumber] = useState(0);
+const [opportunity, setOpportunity] = useState(...);   // now typed as IStrategicOpportunityData (base)
+const [primaryMeasures, setPrimaryMeasures] = useState(...);
+const [workbooks, setWorkbooks] = useState(...);
+const [opportunityFilters, setOpportunityFilters] = useState(...);
+const [baselinePeriodInitial, setBaselinePeriodInitial] = useState(...);
+const [rollupColumns, setRollupColumns] = useState(...);
+const [isEditMode, setIsEditMode] = useState(false);
+const [loading, setLoading] = useState(false);
+```
+
+### Functions that move from orchestrator → CC strategy hook
+
+| Function | Why it's CC-specific |
+|----------|---------------------|
+| `loadChargeCodePickerModels()` | Fetches charge code picker data |
+| `loadExpPopulationPickerModels()` | Fetches exploration populations |
+| `setPrimaryMeasureChargeCodes()` | Sets CC-specific form field |
+| `setExplorationPopulations()` | Sets CC-specific encounter group |
+| `handleChargeCodesUploaded()` | Handles CC upload modal result |
+| Pre-population `useEffect` (lines 584-642) | Only applies to CC from exploration |
+| CC-specific parts of `loadEditData` | Loading encounter groups, charge codes |
+| CC-specific parts of `handleFormValuesChanged` | CC form field change handling |
+| Step 1 block in `handleChange` | CC-specific validation checks |
+| Step 1 block in `updateOpportunity` | CC-specific data marshaling |
+| `handleSubmit` service calls | `createOpportunityChargeCode` / `updateOpportunityChargeCode` |
+| Repopulation detection logic | Comparing CC-specific initial vs current state |
+
+---
+
+## The Strategy Interface
+
+Both hooks implement this common interface so the orchestrator doesn't need to know which type it's working with:
+
+```typescript
+interface IOpportunityTypeStrategy {
+  // Default data for creating a new opportunity of this type
+  getDefaultData(): IStrategicOpportunityData;
+
+  // Renders the "Define Opportunity" step (step 1) — CC shows encounter groups + charge codes, GL shows departments + accounts
+  renderDefineStep(context): JSX.Element;
+
+  // Renders any modals this type needs (CC has upload modal, GL has none)
+  renderModals(context): JSX.Element | null;
+
+  // Returns true if step 1 form values are valid for this type
+  validateDefineStep(formValues): boolean;
+
+  // Converts form values into opportunity data fields for step 1
+  marshalDefineStep(formValues, context): Partial<IStrategicOpportunityData>;
+
+  // Handles form value changes that need type-specific reactions
+  onFormValuesChanged(changedValues, context): void;
+
+  // Loads type-specific fields when editing an existing opportunity
+  loadEditData(data, form, context): void;
+
+  // (CC only) Pre-populates from exploration population URL params
+  loadPrePopulationData?(params, form, context): Promise<void>;
+
+  // Calls the correct create API
+  create(data): Promise<number>;
+
+  // Calls the correct update API
+  update(opportunityId, data, shouldPopulate): Promise<boolean>;
+
+  // Determines if editing has changed enough to require goal recalculation
+  shouldRepopulateOnEdit(context): boolean;
+
+  // Returns the measure type list for the "Additional Measures" step dropdown
+  getMeasureTypeData(): { key: number; name: string }[];
+}
+```
+
+---
+
+## How the Orchestrator Changes
+
+### Before: inline CC logic
+
+```typescript
+// In handleChange, step 1 validation:
+} else if (currentStep === 1) {
+  if (!detailValues.encounterGroup || !detailValues.encounterGroups || ...) {
+    return;
+  }
+}
+```
+
+### After: delegates to strategy
+
+```typescript
+} else if (currentStep === 1) {
+  if (!activeStrategy.validateDefineStep(detailValues)) {
+    return;
+  }
+}
+```
+
+### Before: inline CC rendering
+
+```typescript
+<Wizard.Step key='1' title='Define Opportunity'>
+  <StrategicOpportunityDefine
+    encounterGroup={opportunity.encounterGroup}
+    chargeCodeMembers={chargeCodeMembers}
+    selectedChargeCodes={selectedChargeCodes}
+    // ... 14 props
+  />
+</Wizard.Step>
+```
+
+### After: strategy renders its own step
+
+```typescript
+<Wizard.Step key='1' title='Define Opportunity'>
+  {activeStrategy.renderDefineStep({ form, filters, updateFilters, ... })}
+</Wizard.Step>
+```
+
+### Before: inline CC service call
+
+```typescript
+const opportunityId = await strategicOpportunityService.createOpportunityChargeCode(data);
+```
+
+### After: strategy handles service call
+
+```typescript
+const opportunityId = await activeStrategy.create(data);
+```
+
+---
+
+## Hook Selection: Both Hooks Always Called
+
+React requires hooks to be called unconditionally (same hooks, same order, every render). So the orchestrator calls **both** hooks every time:
+
+```typescript
+const ccStrategy = useChargeCodeStrategy({ form, ... });
+const glStrategy = useGLStrategy({ form, ... });
+
+const activeStrategy = opportunityType === OpportunityTypes.StrategicOpportunityGL
+  ? glStrategy
+  : ccStrategy;
+```
+
+The inactive hook holds trivial default state — a few empty arrays and `false` booleans. No API calls, no heavy computation. This is a standard React pattern.
+
+---
+
+## New Folder Structure
+
+```
+strategic-opportunities/
+  wizard/
+    StrategicOpportunity.tsx              ← Slimmed-down orchestrator
+    StrategicOpportunityDetail.tsx        ← Step 0 (unchanged)
+    StrategicOpportunityDefineAdditional.tsx  ← Step 2 (adds measureTypeData prop)
+    StrategicOpportunityDefineTimeframe.tsx   ← Step 3 (unchanged)
+    StrategicOpportunityExternalLinks.tsx     ← Step 4 (unchanged)
+    StrategicOpportunityRenameMeasure.tsx     ← Shared utility (unchanged)
+    StrategicOpportunityFilters.tsx           ← Shared utility (unchanged)
+    types/
+      IOpportunityTypeStrategy.ts         ← Strategy interface + context types
+    charge-code/
+      useChargeCodeStrategy.ts            ← CC strategy hook (extracted from orchestrator)
+      ChargeCodeDefine.tsx                ← Moved from StrategicOpportunityDefine.tsx
+      ChargeCodeCustomPickerModal.tsx     ← Moved from wizard root
+    general-ledger/
+      useGLStrategy.ts                    ← GL strategy hook (new)
+      GeneralLedgerDefine.tsx             ← GL define step (new)
+```
+
+---
+
+## StrategicOpportunityDefineAdditional Change
+
+This component currently hardcodes the charge code measure type list:
+
+```typescript
+// Line 18 — imports CC-only measure types
+import { getDesiredResultByMeasureType, measureTypeData } from '../data/MeasureType';
+
+// Line 31 — hardcoded to CC measures
+const secondaryMeasureItems = useMemo(() => measureTypeData.map(...), []);
+```
+
+After the refactor, it receives `measureTypeData` as a **prop** from the orchestrator, which gets it from `activeStrategy.getMeasureTypeData()`. This way CC shows CC measures and GL shows GL measures in the "Add Additional Measure" dropdown.
+
+```typescript
+// Before
+<StrategicOpportunityDefineAdditional
+  getMeasureItem={getMeasureItem}
+  updateFiltersForSecondaryMeasure={updateFiltersForSecondaryMeasure}
+  validateAndUpdateMeasureName={validateAndUpdateMeasureName}
+/>
+
+// After — adds measureTypeData prop
+<StrategicOpportunityDefineAdditional
+  getMeasureItem={getMeasureItem}
+  updateFiltersForSecondaryMeasure={updateFiltersForSecondaryMeasure}
+  validateAndUpdateMeasureName={validateAndUpdateMeasureName}
+  measureTypeData={activeStrategy.getMeasureTypeData()}
+/>
+```
+
+---
+
+## New Routes
+
+Two new routes added to `Navigation.tsx`:
+
+| Route | Purpose |
+|-------|---------|
+| `/strategic-opportunities/create/general-ledger` | Create a new GL strategic opportunity |
+| `/strategic-opportunities/edit/general-ledger/:strategicOpportunityId` | Edit an existing GL strategic opportunity |
+
+These follow the exact same pattern as the existing CC routes (lines 226-236 in Navigation.tsx).
+
+---
+
+## What the GL Define Step Looks Like
+
+Instead of Encounter Groups + Charge Codes + Upload, the GL define step has:
+
+1. **Account Type** — Radio: Revenue / Expense / Margin
+2. **Department** — ScoreMemberPicker for GL departments
+3. **GL Accounts** — Conditional pickers based on account type:
+   - Revenue → Revenue account picker
+   - Expense → Expense account picker
+   - Margin → Both revenue + expense pickers
+   - Optional statistic account picker (checkbox toggle)
+4. **Filters** — Same shared StrategicFilterBar component
+5. **Primary Measure** — Dropdown from `glMeasureTypeData` (instead of `measureTypeData`)
+6. **Desired Result + Threshold** — Same UI as CC
+
+---
+
+## How to Verify Nothing Broke
+
+After the refactor, test these CC flows — they should behave **identically** to today:
+
+1. **Create CC opportunity**: Navigate to `/strategic-opportunities/create/charge-code`, complete all 5 steps, verify it saves
+2. **Edit CC opportunity**: Open an existing CC strategic opportunity, click Edit, verify all fields load correctly, make a change, save
+3. **Pre-populate from exploration**: From an exploration population, click "Create Strategic Opportunity" — verify encounter group, charge codes, and baseline are pre-filled
+4. **Goal reset warning**: Edit an opportunity, change the filters or baseline period, click Save — verify the "resets goals" confirmation modal appears
+5. **Run frontend tests**: `cd src/Strata.ContinuousImprovement.Web/continuousimprovement && npm run test-ci`
+
+---
+
+## Mapping Cheat Sheet: "Where Did My Code Go?"
+
+| If you're looking for... | It's now in... |
+|--------------------------|---------------|
+| `chargeCodeMembers` state | `useChargeCodeStrategy.ts` |
+| `selectedChargeCodes` state | `useChargeCodeStrategy.ts` |
+| `loadChargeCodePickerModels()` | `useChargeCodeStrategy.ts` |
+| `loadExpPopulationPickerModels()` | `useChargeCodeStrategy.ts` |
+| `handleChargeCodesUploaded()` | `useChargeCodeStrategy.ts` |
+| Pre-population `useEffect` | `useChargeCodeStrategy.ts` → `loadPrePopulationData()` |
+| `StrategicOpportunityDefine` component | `charge-code/ChargeCodeDefine.tsx` (same code, new name) |
+| `ChargeCodeCustomPickerModal` | `charge-code/ChargeCodeCustomPickerModal.tsx` (moved) |
+| Step 1 validation in `handleChange` | `useChargeCodeStrategy.ts` → `validateDefineStep()` |
+| Step 1 marshaling in `updateOpportunity` | `useChargeCodeStrategy.ts` → `marshalDefineStep()` |
+| `createOpportunityChargeCode` call | `useChargeCodeStrategy.ts` → `create()` |
+| `updateOpportunityChargeCode` call | `useChargeCodeStrategy.ts` → `update()` |
+| Repopulation check (`shouldPopulateOpportunityDetails`) | `useChargeCodeStrategy.ts` → `shouldRepopulateOnEdit()` |
+| Wizard navigation (`handleChange`, `setStepNumber`) | `StrategicOpportunity.tsx` (stayed) |
+| Form setup (`Form.useForm()`) | `StrategicOpportunity.tsx` (stayed) |
+| Shared state (primaryMeasures, filters, rollups) | `StrategicOpportunity.tsx` (stayed) |
+| Steps 0, 2, 3, 4 validation | `StrategicOpportunity.tsx` (stayed) |
+| `handleCancel`, `handleSubmit` skeleton | `StrategicOpportunity.tsx` (stayed) |
+
+---
+
+## FAQ
+
+**Q: Why not just use `if/else` for GL vs CC in the existing orchestrator?**
+A: The orchestrator would grow to 1000+ lines with interleaved branching. Strategy hooks keep each type's logic cohesive and independently testable.
+
+**Q: Why hooks instead of classes?**
+A: React state (`useState`, `useEffect`) only works inside hooks or components. A class-based strategy would need workarounds to manage React state.
+
+**Q: Does the inactive strategy hook waste memory?**
+A: Negligible. It holds a few empty arrays and `false` booleans. No API calls fire for the inactive type.
+
+**Q: Will this break existing CC tests?**
+A: No. The CC behavior is identical — logic is just relocated. Import paths in tests may need updating if they reference moved files.
+
+**Q: Can I still debug the CC flow the same way?**
+A: Yes. Set breakpoints in `useChargeCodeStrategy.ts` for CC-specific logic, or in `StrategicOpportunity.tsx` for wizard navigation. The call chain is just one level deeper for type-specific operations.
diff --git a/nuget.config b/nuget.config
new file mode 100644
index 0000000..bde477f
--- /dev/null
+++ b/nuget.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <config>
+        <add key="defaultPushSource" value="https://proget.ops.stratanetwork.net/nuget/nuget" />
+    </config>
+    <packageSources>
+        <add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
+        <add key="Strata package source" value="https://proget.ops.stratanetwork.net/nuget/nuget" />
+    </packageSources>
+</configuration>
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..81bfdf9
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,1717 @@
+{
+  "name": "continuousimprovement",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "devDependencies": {
+        "@commitlint/cli": "^19.2.1",
+        "@commitlint/config-conventional": "^19.1.0",
+        "@commitlint/prompt-cli": "^19.2.1",
+        "husky": "^9.0.11"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@commitlint/cli": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-19.8.1.tgz",
+      "integrity": "sha512-LXUdNIkspyxrlV6VDHWBmCZRtkEVRpBKxi2Gtw3J54cGWhLCTouVD/Q6ZSaSvd2YaDObWK8mDjrz3TIKtaQMAA==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/format": "^19.8.1",
+        "@commitlint/lint": "^19.8.1",
+        "@commitlint/load": "^19.8.1",
+        "@commitlint/read": "^19.8.1",
+        "@commitlint/types": "^19.8.1",
+        "tinyexec": "^1.0.0",
+        "yargs": "^17.0.0"
+      },
+      "bin": {
+        "commitlint": "cli.js"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/config-conventional": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-19.8.1.tgz",
+      "integrity": "sha512-/AZHJL6F6B/G959CsMAzrPKKZjeEiAVifRyEwXxcT6qtqbPwGw+iQxmNS+Bu+i09OCtdNRW6pNpBvgPrtMr9EQ==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/types": "^19.8.1",
+        "conventional-changelog-conventionalcommits": "^7.0.2"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/config-validator": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-19.8.1.tgz",
+      "integrity": "sha512-0jvJ4u+eqGPBIzzSdqKNX1rvdbSU1lPNYlfQQRIFnBgLy26BtC0cFnr7c/AyuzExMxWsMOte6MkTi9I3SQ3iGQ==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/types": "^19.8.1",
+        "ajv": "^8.11.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/ensure": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-19.8.1.tgz",
+      "integrity": "sha512-mXDnlJdvDzSObafjYrOSvZBwkD01cqB4gbnnFuVyNpGUM5ijwU/r/6uqUmBXAAOKRfyEjpkGVZxaDsCVnHAgyw==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/types": "^19.8.1",
+        "lodash.camelcase": "^4.3.0",
+        "lodash.kebabcase": "^4.1.1",
+        "lodash.snakecase": "^4.1.1",
+        "lodash.startcase": "^4.4.0",
+        "lodash.upperfirst": "^4.3.1"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/execute-rule": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-19.8.1.tgz",
+      "integrity": "sha512-YfJyIqIKWI64Mgvn/sE7FXvVMQER/Cd+s3hZke6cI1xgNT/f6ZAz5heND0QtffH+KbcqAwXDEE1/5niYayYaQA==",
+      "dev": true,
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/format": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-19.8.1.tgz",
+      "integrity": "sha512-kSJj34Rp10ItP+Eh9oCItiuN/HwGQMXBnIRk69jdOwEW9llW9FlyqcWYbHPSGofmjsqeoxa38UaEA5tsbm2JWw==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/types": "^19.8.1",
+        "chalk": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/is-ignored": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-19.8.1.tgz",
+      "integrity": "sha512-AceOhEhekBUQ5dzrVhDDsbMaY5LqtN8s1mqSnT2Kz1ERvVZkNihrs3Sfk1Je/rxRNbXYFzKZSHaPsEJJDJV8dg==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/types": "^19.8.1",
+        "semver": "^7.6.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/lint": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-19.8.1.tgz",
+      "integrity": "sha512-52PFbsl+1EvMuokZXLRlOsdcLHf10isTPlWwoY1FQIidTsTvjKXVXYb7AvtpWkDzRO2ZsqIgPK7bI98x8LRUEw==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/is-ignored": "^19.8.1",
+        "@commitlint/parse": "^19.8.1",
+        "@commitlint/rules": "^19.8.1",
+        "@commitlint/types": "^19.8.1"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/load": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-19.8.1.tgz",
+      "integrity": "sha512-9V99EKG3u7z+FEoe4ikgq7YGRCSukAcvmKQuTtUyiYPnOd9a2/H9Ak1J9nJA1HChRQp9OA/sIKPugGS+FK/k1A==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/config-validator": "^19.8.1",
+        "@commitlint/execute-rule": "^19.8.1",
+        "@commitlint/resolve-extends": "^19.8.1",
+        "@commitlint/types": "^19.8.1",
+        "chalk": "^5.3.0",
+        "cosmiconfig": "^9.0.0",
+        "cosmiconfig-typescript-loader": "^6.1.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.merge": "^4.6.2",
+        "lodash.uniq": "^4.5.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/message": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-19.8.1.tgz",
+      "integrity": "sha512-+PMLQvjRXiU+Ae0Wc+p99EoGEutzSXFVwQfa3jRNUZLNW5odZAyseb92OSBTKCu+9gGZiJASt76Cj3dLTtcTdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/parse": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-19.8.1.tgz",
+      "integrity": "sha512-mmAHYcMBmAgJDKWdkjIGq50X4yB0pSGpxyOODwYmoexxxiUCy5JJT99t1+PEMK7KtsCtzuWYIAXYAiKR+k+/Jw==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/types": "^19.8.1",
+        "conventional-changelog-angular": "^7.0.0",
+        "conventional-commits-parser": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/prompt": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/prompt/-/prompt-19.8.1.tgz",
+      "integrity": "sha512-IH3zJBJ2GSffgAJtW5EklK72skEAa3PZsbWQ5+Ybumd9QjKMnI9vagz5lprGRImdysaFREsMCOVpmcWjxpxPxg==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/ensure": "^19.8.1",
+        "@commitlint/load": "^19.8.1",
+        "@commitlint/types": "^19.8.1",
+        "chalk": "^5.3.0",
+        "inquirer": "^9.2.15"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/prompt-cli": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/prompt-cli/-/prompt-cli-19.8.1.tgz",
+      "integrity": "sha512-rK92LywMpGKpBg730sRVRujUF3yP+xSLdfYpYSPK6jCbhVvTRPcBYVi3plIBR1VETto97+hN1HHTTpZsN8jSUA==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/prompt": "^19.8.1",
+        "inquirer": "^9.2.15",
+        "tinyexec": "^1.0.0"
+      },
+      "bin": {
+        "commit": "cli.js"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/read": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-19.8.1.tgz",
+      "integrity": "sha512-03Jbjb1MqluaVXKHKRuGhcKWtSgh3Jizqy2lJCRbRrnWpcM06MYm8th59Xcns8EqBYvo0Xqb+2DoZFlga97uXQ==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/top-level": "^19.8.1",
+        "@commitlint/types": "^19.8.1",
+        "git-raw-commits": "^4.0.0",
+        "minimist": "^1.2.8",
+        "tinyexec": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/resolve-extends": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-19.8.1.tgz",
+      "integrity": "sha512-GM0mAhFk49I+T/5UCYns5ayGStkTt4XFFrjjf0L4S26xoMTSkdCf9ZRO8en1kuopC4isDFuEm7ZOm/WRVeElVg==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/config-validator": "^19.8.1",
+        "@commitlint/types": "^19.8.1",
+        "global-directory": "^4.0.1",
+        "import-meta-resolve": "^4.0.0",
+        "lodash.mergewith": "^4.6.2",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/rules": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-19.8.1.tgz",
+      "integrity": "sha512-Hnlhd9DyvGiGwjfjfToMi1dsnw1EXKGJNLTcsuGORHz6SS9swRgkBsou33MQ2n51/boIDrbsg4tIBbRpEWK2kw==",
+      "dev": true,
+      "dependencies": {
+        "@commitlint/ensure": "^19.8.1",
+        "@commitlint/message": "^19.8.1",
+        "@commitlint/to-lines": "^19.8.1",
+        "@commitlint/types": "^19.8.1"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/to-lines": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-19.8.1.tgz",
+      "integrity": "sha512-98Mm5inzbWTKuZQr2aW4SReY6WUukdWXuZhrqf1QdKPZBCCsXuG87c+iP0bwtD6DBnmVVQjgp4whoHRVixyPBg==",
+      "dev": true,
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/top-level": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-19.8.1.tgz",
+      "integrity": "sha512-Ph8IN1IOHPSDhURCSXBz44+CIu+60duFwRsg6HqaISFHQHbmBtxVw4ZrFNIYUzEP7WwrNPxa2/5qJ//NK1FGcw==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@commitlint/types": {
+      "version": "19.8.1",
+      "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-19.8.1.tgz",
+      "integrity": "sha512-/yCrWGCoA1SVKOks25EGadP9Pnj0oAIHGpl2wH2M2Y46dPM2ueb8wyCVOD7O3WCTkaJ0IkKvzhl1JY7+uCT2Dw==",
+      "dev": true,
+      "dependencies": {
+        "@types/conventional-commits-parser": "^5.0.0",
+        "chalk": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=v18"
+      }
+    },
+    "node_modules/@inquirer/figures": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.13.tgz",
+      "integrity": "sha512-lGPVU3yO9ZNqA7vTYz26jny41lE7yoQansmqdMLBEfqaGsmdg7V3W9mK9Pvb5IL4EVZ9GnSDGMO/cJXud5dMaw==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@types/conventional-commits-parser": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/conventional-commits-parser/-/conventional-commits-parser-5.0.1.tgz",
+      "integrity": "sha512-7uz5EHdzz2TqoMfV7ee61Egf5y6NkcO4FB/1iCCQnbeiI1F3xzv3vK5dBCXUCLQgGYS+mUeigK1iKQzvED+QnQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.0.tgz",
+      "integrity": "sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~7.10.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/array-ify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
+      "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==",
+      "dev": true
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.5.0.tgz",
+      "integrity": "sha512-1tm8DTaJhPBG3bIkVeZt1iZM9GfSX2lzOeDVZH9R9ffRHpmHvxZ/QhgQH/aDTkswQVt+YHdXAdS/In/30OjCbg==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-spinners": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
+      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-width": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
+      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/compare-func": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz",
+      "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==",
+      "dev": true,
+      "dependencies": {
+        "array-ify": "^1.0.0",
+        "dot-prop": "^5.1.0"
+      }
+    },
+    "node_modules/conventional-changelog-angular": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz",
+      "integrity": "sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==",
+      "dev": true,
+      "dependencies": {
+        "compare-func": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/conventional-changelog-conventionalcommits": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-7.0.2.tgz",
+      "integrity": "sha512-NKXYmMR/Hr1DevQegFB4MwfM5Vv0m4UIxKZTTYuD98lpTknaZlSRrDOG4X7wIXpGkfsYxZTghUN+Qq+T0YQI7w==",
+      "dev": true,
+      "dependencies": {
+        "compare-func": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/conventional-commits-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz",
+      "integrity": "sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA==",
+      "dev": true,
+      "dependencies": {
+        "is-text-path": "^2.0.0",
+        "JSONStream": "^1.3.5",
+        "meow": "^12.0.1",
+        "split2": "^4.0.0"
+      },
+      "bin": {
+        "conventional-commits-parser": "cli.mjs"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/cosmiconfig": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
+      "dev": true,
+      "dependencies": {
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/cosmiconfig-typescript-loader": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-6.1.0.tgz",
+      "integrity": "sha512-tJ1w35ZRUiM5FeTzT7DtYWAFFv37ZLqSRkGi2oeCK1gPhvaWjkAtfXvLmvE1pRfxxp9aQo6ba/Pvg1dKj05D4g==",
+      "dev": true,
+      "dependencies": {
+        "jiti": "^2.4.1"
+      },
+      "engines": {
+        "node": ">=v18"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "cosmiconfig": ">=9",
+        "typescript": ">=5"
+      }
+    },
+    "node_modules/dargs": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/dargs/-/dargs-8.1.0.tgz",
+      "integrity": "sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/dot-prop": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+      "dev": true,
+      "dependencies": {
+        "is-obj": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
+      "dependencies": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-uri": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ]
+    },
+    "node_modules/find-up": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-7.0.0.tgz",
+      "integrity": "sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^7.2.0",
+        "path-exists": "^5.0.0",
+        "unicorn-magic": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/git-raw-commits": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-4.0.0.tgz",
+      "integrity": "sha512-ICsMM1Wk8xSGMowkOmPrzo2Fgmfo4bMHLNX6ytHjajRJUqvHOw/TFapQ+QG75c3X/tTDDhOSRPGC52dDbNM8FQ==",
+      "dev": true,
+      "dependencies": {
+        "dargs": "^8.0.0",
+        "meow": "^12.0.1",
+        "split2": "^4.0.0"
+      },
+      "bin": {
+        "git-raw-commits": "cli.mjs"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/global-directory": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz",
+      "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==",
+      "dev": true,
+      "dependencies": {
+        "ini": "4.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/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,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/husky": {
+      "version": "9.1.7",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
+      "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
+      "dev": true,
+      "bin": {
+        "husky": "bin.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/typicode"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-meta-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
+      "integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/ini": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
+      "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/inquirer": {
+      "version": "9.3.7",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.3.7.tgz",
+      "integrity": "sha512-LJKFHCSeIRq9hanN14IlOtPSTe3lNES7TYDTE2xxdAy1LS5rYphajK1qtwvj3YmQXvvk0U2Vbmcni8P9EIQW9w==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/figures": "^1.0.3",
+        "ansi-escapes": "^4.3.2",
+        "cli-width": "^4.1.0",
+        "external-editor": "^3.1.0",
+        "mute-stream": "1.0.0",
+        "ora": "^5.4.1",
+        "run-async": "^3.0.0",
+        "rxjs": "^7.8.1",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-text-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz",
+      "integrity": "sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==",
+      "dev": true,
+      "dependencies": {
+        "text-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jiti": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.5.1.tgz",
+      "integrity": "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==",
+      "dev": true,
+      "bin": {
+        "jiti": "lib/jiti-cli.mjs"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+      "dev": true,
+      "engines": [
+        "node >= 0.2.0"
+      ]
+    },
+    "node_modules/JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "dependencies": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/locate-path": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^6.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
+      "dev": true
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "dev": true
+    },
+    "node_modules/lodash.kebabcase": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
+      "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.mergewith": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
+      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
+      "dev": true
+    },
+    "node_modules/lodash.snakecase": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz",
+      "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==",
+      "dev": true
+    },
+    "node_modules/lodash.startcase": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz",
+      "integrity": "sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==",
+      "dev": true
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+      "dev": true
+    },
+    "node_modules/lodash.upperfirst": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz",
+      "integrity": "sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/meow": {
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz",
+      "integrity": "sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/mute-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
+      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^4.1.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/run-async": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
+      "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/split2": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
+    "node_modules/string_decoder": {
+      "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==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/text-extensions": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-2.4.0.tgz",
+      "integrity": "sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
+    },
+    "node_modules/tinyexec": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.1.tgz",
+      "integrity": "sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==",
+      "dev": true
+    },
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
+      "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "7.10.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
+      "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
+      "dev": true
+    },
+    "node_modules/unicorn-magic": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
+      "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "node_modules/wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+      "dev": true,
+      "dependencies": {
+        "defaults": "^1.0.3"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "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"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.1.tgz",
+      "integrity": "sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yoctocolors-cjs": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
+      "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..b00d202
--- /dev/null
+++ b/package.json
@@ -0,0 +1,13 @@
+{
+  "scripts": {
+    "commit": "commit",
+    "prepare": "husky",
+    "generate-swagger": "node scripts/fetch-swagger.js"
+  },
+  "devDependencies": {
+    "@commitlint/cli": "^19.2.1",
+    "@commitlint/prompt-cli": "^19.2.1",
+    "@commitlint/config-conventional": "^19.1.0",
+    "husky": "^9.0.11"
+  }
+}
\ No newline at end of file
diff --git a/scripts/fetch-swagger.js b/scripts/fetch-swagger.js
new file mode 100644
index 0000000..bcc22f4
--- /dev/null
+++ b/scripts/fetch-swagger.js
@@ -0,0 +1,37 @@
+#!/usr/bin/env node
+/**
+ * Generates swagger.json from the API DLL using the Swashbuckle CLI.
+ * Does NOT require the API to be running.
+ *
+ * Prerequisites:
+ *   dotnet tool install --global Swashbuckle.AspNetCore.Cli --version 6.8.1
+ *   dotnet build src/Strata.ContinuousImprovement.Api/
+ *
+ * Usage: npm run generate-swagger
+ */
+
+const { execSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+
+const ROOT = path.join(__dirname, '..');
+const DLL = path.join(ROOT, 'src/Strata.ContinuousImprovement.Api/bin/Debug/net8.0/Strata.ContinuousImprovement.Api.dll');
+const OUTPUT = path.join(ROOT, 'src/Strata.ContinuousImprovement.Web/continuousimprovement/swagger.json');
+const DOC_NAME = 'v1';
+
+if (!fs.existsSync(DLL)) {
+  console.log('API DLL not found — building first...');
+  execSync('dotnet build src/Strata.ContinuousImprovement.Api/ --configuration Debug', {
+    cwd: ROOT,
+    stdio: 'inherit',
+  });
+}
+
+console.log('Generating swagger.json from API DLL...');
+execSync(`swagger tofile --output "${OUTPUT}" "${DLL}" ${DOC_NAME}`, {
+  cwd: ROOT,
+  stdio: 'inherit',
+});
+
+const size = fs.statSync(OUTPUT).size;
+console.log(`swagger.json written to ${OUTPUT} (${(size / 1024).toFixed(1)} KB)`);
diff --git a/src/Get_Octo_Information.ps1 b/src/Get_Octo_Information.ps1
new file mode 100644
index 0000000..31ceaca
--- /dev/null
+++ b/src/Get_Octo_Information.ps1
@@ -0,0 +1,105 @@
+<#
+.SYNOPSIS
+    Get Octopus Deploy release information for a specific project and environments.
+
+.DESCRIPTION
+    This script retrieves the latest release information from Octopus Deploy for a specified project across multiple environments
+    and generates a markdown report.
+
+.PARAMETER yourApiKey
+    The API key for authenticating with the Octopus Deploy server (mandatory).
+.PARAMETER pr_projectName
+    The name of the Octopus Deploy project (default is "strata.continuousimprovement").
+.PARAMETER pr_path
+    The path to the git repository (default is the parent directory of the script).
+
+.EXAMPLE
+    ``` powershell
+    .\src\Get_Octo_Information.ps1 -yourApiKey
+    ```
+#>
+[CmdletBinding()]
+param (
+    [parameter(Mandatory=$true)] [string]$yourApiKey,
+    [string]$pr_projectName = "strata.continuousimprovement",
+    [string]$pr_path = (Join-Path $PSScriptRoot "..")
+)
+
+# Set variables
+$apiKey = $yourApiKey
+$octopusUrl = "https://octopus.sdt.local/"
+$projectName = $pr_projectName # "strata.continuousimprovement"
+
+#region Classes
+class octoRelease {
+    [string]$environmentName
+    [string]$release
+    [string]$releaseNotes
+
+    # Default constructor
+    octoRelease() { $this.Init(@{}) }
+
+    # Convenience constructor
+    octoRelease([hashtable]$properties) { $this.Init($properties) }
+
+    octoRelease([string]$envName, [string]$rels, [string]$notes)
+    {
+        $this.Init(@{ environmentName = $envName; release = $rels; releaseNotes = $notes  })
+    }
+
+    # Shared initializer method
+    [void] Init([hashtable]$Properties) {
+        foreach ($Property in $Properties.Keys) {
+            $this.$Property = $Properties.$Property
+        }
+        #$this.end = $this.range[-1];
+    }
+
+}
+#endregion
+
+# Set headers
+$headers = @{
+    "X-Octopus-ApiKey" = $apiKey
+}
+
+$octoReleaseList = @()
+@("Dev","QA","Prod") | ForEach-Object {
+    $environmentName = $_
+    # Get project ID
+    $projectResponse = Invoke-RestMethod -Uri "$octopusUrl/api/projects/all" -Headers $headers
+    $project = $projectResponse | Where-Object { $_.Name -eq $projectName }
+    $projectId = $project.Id
+
+    # Get environment ID
+    $envResponse = Invoke-RestMethod -Uri "$octopusUrl/api/environments" -Headers $headers
+    $environment = $envResponse.Items | Where-Object { $_.Name -eq $environmentName }
+    $environmentId = $environment.Id
+    # Get latest deployment
+    $deploymentResponse = Invoke-RestMethod -Uri "$octopusUrl/api/deployments?projects=$projectId&environments=$environmentId&take=1&order=desc" -Headers $headers
+    $latestDeployment = $deploymentResponse.Items[0]
+    $releaseId = $latestDeployment.ReleaseId
+
+    # Get release details
+    $releaseDetails = Invoke-RestMethod -Uri "$octopusUrl/api/releases/$releaseId" -Headers $headers
+
+    # Output results
+    $release = $releaseDetails.Version
+    $releaseNotes = $releaseDetails.ReleaseNotes
+    $octoReleaseList += [octoRelease]::new($environmentName, $release, $releaseNotes)
+    #Write-Host $releaseDetails
+}
+
+$filePath = Join-Path $pr_path "/Octo_Release$((Get-Date).ToString("yyyyMMdd")).md"
+$report = "# " + $projectName +" Octo Releases " + (Get-Date).ToString("yyyy-MM-dd")+ "`n## Details`n"
+
+$report += $octoReleaseList | `
+    Format-Table @{name="environment"; Expression={$_.environmentName}}, @{Name="| release"; Expression={"| " + $_.release}}, @{Name="| notes"; Expression={"| " + $_.releaseNotes}} -AutoSize | `
+    Out-String
+
+$report = $report -replace "--\s+--", "-- | --"
+Write-Output $report.Replace("- | -", "- + -")
+
+Set-Content -Path $filePath -Value $report
+
+Write-Host -ForegroundColor DarkRed $filePath
diff --git a/src/Get_Tags_and_messages.ps1 b/src/Get_Tags_and_messages.ps1
new file mode 100644
index 0000000..9fbc634
--- /dev/null
+++ b/src/Get_Tags_and_messages.ps1
@@ -0,0 +1,241 @@
+<#
+.SYNOPSIS
+    Get git tags and messages from multiple repositories.
+
+.DESCRIPTION
+    This script retrieves git tags and their associated messages from multiple repositories and generates a markdown report.
+
+.PARAMETER pr_patch
+    The patch version number to start from (default is 0).
+.PARAMETER pr_minor_start
+    The starting minor version number (mandatory).
+.PARAMETER pr_minor_end
+    The ending minor version number (mandatory).
+.PARAMETER pr_tag
+    The tag string to filter by (default is "- CI -").
+.PARAMETER pr_path
+    The path to the git repository (default is the parent directory of the script).
+.PARAMETER pr_giturl
+    The base URL for the git repository (default is "https://github.com/stratadecision/continuousimprovement/pull/").
+.PARAMETER pr_codeFreeze
+    The code freeze version string (optional).
+.PARAMETER pr_qaRelease
+    The QA release version string (optional).
+.PARAMETER pr_withPRLinks
+    Boolean indicating whether to include PR links in the report (default is false).
+
+.EXAMPLE
+    ``` powershell
+    .\src\Get_Tags_and_messages.ps1 -pr_patch 0 -pr_minor_start 587 -pr_minor_end 630 -pr_codeFreeze "0.30.4" -pr_qaRelease "0.30.4"
+    ```
+#>
+[CmdletBinding()]
+param (
+    [int]$pr_patch,
+    [parameter(Mandatory=$true)] [int]$pr_minor_start,
+    [parameter(Mandatory=$true)] [int]$pr_minor_end,
+    [string]$pr_tag = "- CI -",
+    [string]$pr_path = (Join-Path $PSScriptRoot ".."),
+    [string]$pr_giturl = "https://github.com/stratadecision/continuousimprovement/pull/",
+    [string]$pr_codeFreeze,
+    [string]$pr_qaRelease,
+    [bool]$pr_withPRLinks = $false
+)
+
+if ($pr_minor_start -eq 0) { $pr_minor_start = 587 }
+if ($pr_minor_end -eq 0) { $pr_minor_end = 630 }
+
+#region Classes
+class gitGroup {
+    [string]$tag
+    [string]$path
+    [int]$idx
+    [int[]]$range
+    [string]$codeFreeze
+    [string]$qaRelease
+    [string]$docName
+    [int]$end
+
+    # Default constructor
+    gitGroup() { $this.Init(@{}) }
+
+    # Convenience constructor
+    gitGroup([hashtable]$properties) { $this.Init($properties) }
+
+    gitGroup([string]$pth, [int]$id, [int[]]$rng)
+    {
+        $this.Init(@{ path = $pth; idx = $id; range = $rng})
+    }
+
+    # Shared initializer method
+    [void] Init([hashtable]$Properties) {
+        foreach ($Property in $Properties.Keys) {
+            $this.$Property = $Properties.$Property
+        }
+        $this.end = $this.range[-1];
+    }
+
+    updateEnd([int]$end)
+    {
+        $this.end = $end;
+    }
+}
+
+class gitInfo {
+    [string]$Release
+    [string]$PR
+    [string]$Team
+    [string]$Name
+    [int]$Feature
+    [int]$Bugfix
+    [string]$Pipe
+
+    # Default constructor
+    gitInfo() { $this.Init(@{}) }
+    # Convenience constructor from hashtable
+    gitInfo([hashtable]$Properties) { $this.Init($Properties) }
+    
+    gitInfo([string]$id, [string]$pr, [string]$name, [string]$team) 
+    {
+        $this.Init(@{ Release =  $id; PR = $pr; Name = $name; Team = $team; })
+    }
+
+    gitInfo([string]$vars, [int]$feature, [int]$bugfix, [bool]$withPRLink, [string]$giturl)
+    {
+        try{
+            if ($vars -match '(?s)^([\d.]*)\s{2,}(.*)$')
+            {
+                $vars = $vars -creplace '(?s)^([\d.]*)\s{2,}(.*)$', '$1|||$2'
+            }
+            $vars += "||||"
+            Write-Output $vars
+            $vars
+            $arr = $vars.Split("|")
+            $arr | ForEach-Object { Write-Output '{0}' -f $_ }
+            $arr
+            $prTag = $arr[1];
+            if (![string]::IsNullOrEmpty($prTag) -and $withPRLink) {
+                $prTag = "[{0}]({1}{2})" -f $arr[1], $giturl, $arr[1];
+            }
+            $this.Init(@{
+                Release = $arr[0];
+                PR = $prTag;
+                Team = if ($arr[2].Trim() -eq 'snowflake') { 'the-outliers' } else { $arr[2] };
+                Name = $arr[3]; 
+                Feature = $feature;
+                Bugfix = $bugfix;
+                Pipe = "|";
+            })
+        } catch {
+            $msg = "`n`nInput ERROR`n`n{0}" -f $_.Exception.Message
+            Write-Host -ForegroundColor Red $msg
+        }
+    }
+
+    
+    # Shared initializer method
+    [void] Init([hashtable]$Properties) {
+        foreach ($Property in $Properties.Keys) {
+            if ($Properties.$Property -is [string]) {
+                $this.$Property = $Properties.$Property.Trim()
+            } else {
+                $this.$Property = $Properties.$Property
+            }
+        }
+    }
+}
+#endregion
+
+$date = Get-Date
+$dateTag = $date.ToString('yyyyMMdd')
+$gitGroups = @(
+    [gitGroup]::new(@{
+        tag = $pr_tag # "- CI -"
+        path = $pr_path # "C:\Git\continuousimprovement"
+        idx = $pr_patch # 7
+        range = $pr_minor_start..$pr_minor_end # 587..630
+        codeFreeze = $pr_codeFreeze # "0.614.0"
+        qaRelease = $pr_qaRelease # "0.602.1"
+        docName = "PR_Report_"+$dateTag+".md"
+    })
+)
+
+$gitGroups  | `
+    #Sort-Object -Property Team, Release  | `
+    Sort-Object -Property path | `
+    Format-Table tag, path, range, idx, codeFreeze -Autosize
+
+$regExp = '^([\d.]*)[^#]*#([\d]*).*\/(.*)\/(.*)$'
+
+$currDir = (Get-Location).Path
+$gitGroups | ForEach-Object {
+    Clear-Host
+    $gitGrp = $_
+    $_ | `
+        Sort-Object -Property path | `
+        Format-Table tag, path, range, idx, codeFreeze -Autosize
+
+    $path = $_.path
+    Set-Location $path
+    $idx = $_.idx
+    $range = $_.range
+    $codeFreeze = if ($_.codeFreeze -ne "") { 
+        "Code Freeze: {0}\`n" -f $_.codeFreeze 
+    } else {""};
+    Write-Host $codeFreeze.Replace("\`n", "`n")
+    $qaRelease = $_.qaRelease
+    $end = $_.end
+
+    $gitList = @()
+
+    $range | ForEach-Object {
+        $feature = $_
+        $idx..9 | ForEach-Object {
+            $bugfix = $_
+            $x = (git tag 0.$feature.$bugfix -n)
+            if ($x -ne $null -and $x -ne "") 
+            {
+                $vars = $x -replace $regExp,'$1|$2|$3|$4|'
+                $arr = $vars.Split('|')
+                if ($arr.Length -lt 5)
+                {
+                    $vars = $x -replace '^([\d.]*)\s*(JAZZ.*)$','$1|||$2|'
+                }
+                if ($vars -ne $null)
+                {
+                    $gitList += [gitInfo]::new($vars, $feature, $bugfix, $pr_withPRLinks, $pr_giturl)
+                }
+                $end = $feature
+                $gitGrp.updateEnd($end)
+            }
+        }
+        $idx = 0
+    }
+
+    $myDocuments = [Environment]::GetFolderPath("MyDocuments")
+    $tempText = Join-Path $myDocuments $_.docName
+    $tempText = Join-Path "./" $_.docName
+    $report = "# " + $_.tag +" " + (Get-Date).ToString("yyyy-MM-dd")+ "`n## Summary`nFrom: {0} -> {1} ({2}){5}\`n{3}QA Release: {4}`n## Details" -f `
+        $range[0], `
+        $end, `
+        ($gitList | Measure-Object -Property Release).Count, `
+        $codeFreeze, $qaRelease,
+        ($pr_withPRLinks ? "\`n*PR links included*" : "")
+
+    $report += $gitList | `
+        Sort-Object -Property Feature, Bugfix | `
+        Format-Table Release, @{Name="| PR"; Expression={"| " + $_.PR}}, @{Name="| Name"; Expression={"| " + $_.Name}} -Autosize  | Out-String
+
+    # Clean up the report formatting for markdown
+    while ($report -match '--\s+--') {
+        $report = $report -replace '--\s+--', '-- | --'  # Replace spaces with pipe
+    }
+    Set-Content -Path $tempText -Value $report
+    
+    $report = $report.Replace('-- | --','-- + --')  # Replace pipe with plus
+    Write-Output $report
+
+    Write-Host -ForegroundColor DarkRed $tempText
+}
+
+Set-Location $currDir
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/ActionResults/ExcelContentResult.cs b/src/Strata.ContinuousImprovement.Api/ActionResults/ExcelContentResult.cs
new file mode 100644
index 0000000..5a964d2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/ActionResults/ExcelContentResult.cs
@@ -0,0 +1,49 @@
+using ClosedXML.Excel;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api
+{
+    public class ExcelContentResult : ActionResult
+    {
+        public IXLWorkbook Workbook { get; set; }
+        public string FileName { get; set; }
+
+        public ExcelContentResult()
+        {
+        }
+
+        public ExcelContentResult(IXLWorkbook workbook, string fileName = "Export") : base()
+        {
+            Workbook = workbook;
+            FileName = fileName;
+        }
+
+        public override void ExecuteResult(ActionContext context)
+        {
+            GetFileContentResult().ExecuteResult(context);
+        }
+
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            return GetFileContentResult().ExecuteResultAsync(context);
+        }
+
+        protected FileContentResult GetFileContentResult()
+        {
+            // Flush the workbook to the Response.OutputStream
+            using (var memoryStream = new MemoryStream())
+            {
+                Workbook.SaveAs(memoryStream);
+
+                return new FileContentResult(memoryStream.ToArray(),
+                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+                {
+                    FileDownloadName = $"{FileName}_{DateTime.UtcNow:MM-dd-yyyy}.xlsx"
+                };
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Attributes/DisableFormValueModelBindingAttribute.cs b/src/Strata.ContinuousImprovement.Api/Attributes/DisableFormValueModelBindingAttribute.cs
new file mode 100644
index 0000000..c619ae7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Attributes/DisableFormValueModelBindingAttribute.cs
@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using System;
+
+namespace Strata.ContinuousImprovement.Api.Attributes
+{
+    /// <summary>
+    /// Used to disable model binding to prevent buffering the entire request body before entering the controller action.
+    /// We need this to stream the file as it is being uploaded to the server.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
+    public class DisableFormValueModelBindingAttribute : Attribute, IResourceFilter
+    {
+        public void OnResourceExecuting(ResourceExecutingContext context)
+        {
+            var factories = context.ValueProviderFactories;
+            factories.RemoveType<FormValueProviderFactory>();
+            factories.RemoveType<FormFileValueProviderFactory>();
+            factories.RemoveType<JQueryFormValueProviderFactory>();
+        }
+
+        public void OnResourceExecuted(ResourceExecutedContext context)
+        {
+
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/AllOpportunitiesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/AllOpportunitiesController.cs
new file mode 100644
index 0000000..84a7798
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/AllOpportunitiesController.cs
@@ -0,0 +1,107 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.All.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class AllOpportunitiesController : OpportunityController<AllOpportunity>
+    {
+        private readonly IFeatureFlagServiceClient _featureFlagServiceClient;
+        private readonly ILogger<AllOpportunitiesController> _logger;
+        private readonly ClaimsPrincipal _user;
+
+        public AllOpportunitiesController(IAllOpportunityService opportunityService,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IFeatureFlagServiceClient featureFlagServiceClient,
+            ILogger<AllOpportunitiesController> logger)
+            : base(opportunityService)
+        {
+            _featureFlagServiceClient = featureFlagServiceClient;
+            _logger = logger;
+            _user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+        }
+
+        [HttpPost("")]
+        public async Task<PagedApiResponse<AllOpportunity>> GetOpportunities(AllOpportunityLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user.GetDatabaseGuid();
+            var hasFlexibleExplorartion = _user.IsSdtEmployee()
+                || (await _featureFlagServiceClient.IsEnabledAsync("ciflexibleexplorationenabled", databaseGuid, cancellationToken: cancellationToken));
+            var dict = new Dictionary<string, object> { { "isSdtEmployee", _user.IsSdtEmployee() }, { "hasFlexibleExploration", hasFlexibleExplorartion } };
+            _logger.LogServiceInformation("CI Flexible Exploration Enabled", dict);
+            loadOptions.Filters.HasFlexibleExploration = hasFlexibleExplorartion;
+            return await OpportunityService.GetPagedAsync(loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        public async Task<bool> IsNameValid(ValidateName name, CancellationToken cancellationToken)
+        {
+            return await ((IAllOpportunityService)OpportunityService).NameIsValid(name.ConfigurationGuid, name.OpportunityType, name.Name, name?.OpportunityGuid, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status201Created)]
+        public async Task<IActionResult> Export(AllOpportunityExportOptions exportOptions, CancellationToken cancellationToken)
+        {
+            var workbook = await ((IAllOpportunityService)OpportunityService).ExportAsync(exportOptions.SortOptions, exportOptions.Filters, cancellationToken);
+            return new ExcelContentResult(workbook, "EN_Opportunities");
+
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<AllFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            var isStrataUser = _user.IsSdtEmployee();
+            var filterOptions = await ((IAllOpportunityService)OpportunityService).GetFilterOptionsAsync(configurationGuid, cancellationToken);
+            if (!isStrataUser)
+            {
+                filterOptions.OpportunityTypes = filterOptions.OpportunityTypes.Where(type => Int32.Parse(type.Id) != (int)OpportunityTypes.Blank);
+            }
+            return filterOptions;
+        }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class ValidateName
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public int OpportunityType { get; set; }
+        public string Name { get; set; }
+        public Guid? OpportunityGuid { get; set; }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class AllOpportunityLoadOptions
+    {
+        public PagingOptions PagingOptions { get; set; }
+        public AllFilters Filters { get; set; }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class AllOpportunityExportOptions
+    {
+        public SortOptions SortOptions { get; set; }
+        public AllFilters Filters { get; set; }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/BackgroundClientJobController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/BackgroundClientJobController.cs
new file mode 100644
index 0000000..6ed8bea
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/BackgroundClientJobController.cs
@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.BackgroundClientJob;
+using System.Threading;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class BackgroundClientJobController(IBackgroundClientJobService backgroundClientJobService) : ControllerBase
+    {
+        [HttpGet("{jobId}/status")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public ActionResult<string> GetJobStatus(string jobId, CancellationToken cancellationToken)
+        {
+            var status = backgroundClientJobService.GetJobStatus(jobId, cancellationToken);
+            if (status == "NotFound")
+            {
+                return NotFound(status);
+            }
+            return Ok(status);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ChargeCodeInitiativesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ChargeCodeInitiativesController.cs
new file mode 100644
index 0000000..a40e9e6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ChargeCodeInitiativesController.cs
@@ -0,0 +1,52 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ChargeCodeInitiativesController : ControllerBase
+    {
+        private readonly IClaimsPrincipalAccessor _claimsPrincipalAccessor;
+        private readonly ICCInitiativeService _chargeCodeInitiativeService;
+        private readonly IStakeholderUser _stakeholderUser;
+
+        public ChargeCodeInitiativesController(
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            ICCInitiativeService chargeCodeInitiativeService,
+            IStakeholderUser stakeholderUser)
+        {
+            _claimsPrincipalAccessor = claimsPrincipalAccessor;
+            _chargeCodeInitiativeService = chargeCodeInitiativeService;
+            _stakeholderUser = stakeholderUser;
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<Guid>> Create(InitiativeDto initiative, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var user = _claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+                var newInitiative = initiative.MapToInitiative(_stakeholderUser);
+                var dbGuid = user.GetDatabaseGuid();
+                return await _chargeCodeInitiativeService.CreateChargeCodeInitiative(dbGuid, newInitiative, initiative.OpportunityGuid, cancellationToken);
+            }
+            catch
+            {
+                return Guid.Empty;
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ChargeCodeOpportunitiesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ChargeCodeOpportunitiesController.cs
new file mode 100644
index 0000000..73b316a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ChargeCodeOpportunitiesController.cs
@@ -0,0 +1,264 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.OrgDefined;
+using Strata.ContinuousImprovement.Biz.OrgDefined.Queries;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ChargeCodeOpportunitiesController : OpportunityController<CCOpportunityDataModel>
+    {
+        private readonly IClaimsPrincipalAccessor _claimsPrincipalAccessor;
+        private readonly IConfigurationService _configurationService;
+        private readonly ICCOpportunityService _opportunityService;
+        private readonly ICCInitiativeService _initiativeService;
+        private readonly IOpportunityMetricCohortService _opportunityMetricCohortService;
+        private readonly IFeatureFlagServiceClient _featureFlagServiceClient;
+        private readonly IAllOpportunityService _allOpportunityService;
+
+        public ChargeCodeOpportunitiesController(
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IConfigurationService configurationService,
+            ICCOpportunityService opportunityService,
+            ICCInitiativeService initiativeService,
+            IOpportunityMetricCohortService opportunityMetricCohortService,
+            IFeatureFlagServiceClient featureFlagServiceClient,
+            IAllOpportunityService allOpportunityService) : base(opportunityService)
+        {
+            _configurationService = configurationService;
+            _claimsPrincipalAccessor = claimsPrincipalAccessor;
+            _opportunityService = opportunityService;
+            _initiativeService = initiativeService;
+            _opportunityMetricCohortService = opportunityMetricCohortService;
+            _featureFlagServiceClient = featureFlagServiceClient;
+            _allOpportunityService = allOpportunityService;
+        }
+
+        [HttpPut("{opportunityGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<Guid>> UpdateOpportunity(Guid opportunityGuid, [FromBody] CCOpportunitySaveModel opportunity, CancellationToken cancellationToken)
+        {
+            var isNameValid = await _allOpportunityService.NameIsValid(opportunity.ConfigurationGuid, (int)OpportunityTypes.ChargeCode, opportunity.Name,
+                opportunity?.OpportunityGuid, cancellationToken);
+            if (!isNameValid)
+            {
+                return BadRequest();
+            }
+            var user = _claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+            var updatedOpportunity = opportunity.MapToDataModel();
+            var dbGuid = user?.GetDatabaseGuid() ?? Guid.Empty;
+            var result = await _opportunityService.UpdateAsync(dbGuid, updatedOpportunity, cancellationToken);
+            return Ok(result);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> ValidateChargeCodesAsync([FromBody] ValidateChargeCodeDto dto, CancellationToken cancellationToken)
+        {
+            var result = await _opportunityService.ValidateChargeCodesAsync(dto.ChargeCodes, cancellationToken);
+            return Ok(result);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<ChargeCodePickerModel>>> GetChargeCodeMembers([FromBody] List<string> hPaths, CancellationToken cancellationToken)
+        {
+            var result = await _opportunityService.GetChargeCodePickerModelMembers(hPaths, cancellationToken);
+            return Ok(result);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> ValidateOpportunityLevelsAsync([FromBody] OpportunityLevelSelectionInfo info, CancellationToken cancellationToken)
+        {
+            var result = await _opportunityService.ValidateOpportunityLevelsAsync(info.OpportunityLevel, info.OpportunityLevels, info.Configuration, cancellationToken);
+            return Ok(result);
+        }
+
+        [HttpDelete("{id}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<bool> Delete(Guid id, CancellationToken cancellationToken)
+          => await OpportunityService.DeleteAsync<CCOpportunityDataModel>(id, cancellationToken);
+
+        [HttpGet("{opportunityGuid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<CCOpportunityDto>> GetById(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var opportunity = await _opportunityService.GetById(opportunityGuid, cancellationToken);
+            if (opportunity == null)
+            {
+                return NotFound();
+            }
+            var opportunityDto = opportunity.MapToDto();
+            return Ok(opportunityDto);
+        }
+
+        [HttpGet("{opportunityGuid}/[action]")]
+        public async Task<CCOpportunitySaveModel> GetEditModel(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var opportunity = await _opportunityService.GetById(opportunityGuid, cancellationToken);
+            return opportunity.MapToSaveModel();
+        }
+
+        [HttpPut("{opportunityGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<bool> UpdateGoalTotalUnitsOfService(Guid opportunityGuid, [FromBody] GoalSetDto goalSetDto, CancellationToken cancellationToken)
+        {
+            var hasUpdatedUOS = await _opportunityService.UpdateGoalTotalUnitsOfServiceAsync(opportunityGuid, goalSetDto.Key, goalSetDto.GoalValue, cancellationToken);
+            if (hasUpdatedUOS)
+            {
+                return await _initiativeService.UpdateSavings(opportunityGuid, cancellationToken);
+            }
+
+            return false;
+        }
+
+        [HttpPut("{opportunityGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<bool> UpdateGoalCostPerUnit(Guid opportunityGuid, [FromBody] GoalSetDto goalSetDto, CancellationToken cancellationToken)
+        {
+            var hasUpdatedCostPerUnit = await _opportunityService.UpdateGoalCostPerUnitAsync(opportunityGuid, goalSetDto.Key, goalSetDto.GoalValue, cancellationToken);
+            if (hasUpdatedCostPerUnit)
+            {
+                return await _initiativeService.UpdateSavings(opportunityGuid, cancellationToken);
+            }
+
+            return false;
+        }
+
+        [HttpPut("{opportunityGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> UpdateGoals(Guid opportunityGuid, [FromBody] IEnumerable<ChargeCodeOpportunityDetailChanges> changes, CancellationToken cancellationToken)
+        {
+            var existsOpportunity = await _opportunityService.Contains(opportunityGuid, cancellationToken);
+            if (!existsOpportunity)
+            {
+                return NotFound();
+            }
+
+            var hasUpdatedCostPerUnit = await _opportunityService.UpdateGoalsAsync(opportunityGuid, changes, cancellationToken);
+
+            if (hasUpdatedCostPerUnit)
+            {
+                return await _initiativeService.UpdateSavings(opportunityGuid, cancellationToken);
+            }
+
+            return false;
+        }
+
+        [HttpPost("{opportunityGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status202Accepted)]
+        public async Task<IActionResult> Export(
+            [FromRoute] Guid opportunityGuid,
+            [FromBody] ChargeCodeItems chargeCodes, CancellationToken cancellationToken)
+        {
+            var user = _claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+            var workbook = await _opportunityService.ExportAsync(opportunityGuid, chargeCodes.ChargeCodes, user.Identity?.Name, cancellationToken);
+            return new ExcelContentResult(workbook, "ChargeCodeTemplate");
+        }
+
+        [HttpGet("[action]")]
+        public async Task<bool> OpportunityCreateEnabled(CancellationToken cancellationToken)
+        {
+            var user = _claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+            return await _featureFlagServiceClient.IsEnabledAsync("chargecodebeta", user.GetDatabaseGuid(), cancellationToken: cancellationToken);
+        }
+
+        public class GoalSetDto
+        {
+            public string Key { get; set; }
+            public double GoalValue { get; set; }
+        }
+
+        [HttpGet("{opportunityGuid}/[action]")]
+        public async Task<InitiativeInfo> GetInitiativeInfo(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            return await _opportunityService.GetInitiativeInfoAsync(opportunityGuid, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        public async Task<string> Refresh(RefreshData refreshData, CancellationToken cancellationToken)
+        {
+            return await _opportunityService.RefreshOpportunityTrackingData(refreshData.DatabaseGuid, refreshData.Guid, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<OpportunityMetricCohortData>>> OpportunityMetricCohortData([FromBody] OpportunityMetricCohortOptions options, CancellationToken cancellationToken)
+        {
+            var config = await _configurationService.GetConfigurationAsync(options.ConfigurationGuid, cancellationToken);
+            if (config == null)
+            {
+                return BadRequest();
+            }
+            var result = Enumerable.Empty<OpportunityMetricCohortData>();
+            result = await _opportunityMetricCohortService.GetChargeCodeOpportunityMetricCohortData(config, options.Data, options.InnerJoin, cancellationToken);
+            return Ok(result);
+        }
+
+        public class RefreshData
+        {
+            public Guid DatabaseGuid { get; set; }
+            public Guid Guid { get; set; }
+        }
+
+        public class ChargeCodeItems
+        {
+            public IEnumerable<string> ChargeCodes { get; set; }
+
+        }
+
+        public class OpportunityLevelSelectionInfo
+        {
+            public OpportunityLevel OpportunityLevel { get; set; }
+            public List<string> OpportunityLevels { get; set; }
+            public Guid Configuration { get; set; }
+        }
+
+        public class ValidateChargeCodeDto 
+        { 
+            public List<string> ChargeCodes { get; set; }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ChargeCodeOpportunityDetailsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ChargeCodeOpportunityDetailsController.cs
new file mode 100644
index 0000000..2dcfaa1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ChargeCodeOpportunityDetailsController.cs
@@ -0,0 +1,98 @@
+using Hangfire;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Jobs;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ChargeCodeOpportunityDetailsController : ControllerBase
+    {
+        private readonly IBackgroundJobClient _backgroundJobClient;
+        private readonly ICCOpportunityClientJob _ccOpportunityClientJob;
+        private readonly ILogger<ChargeCodeOpportunityDetailsController> _logger;
+
+        public ChargeCodeOpportunityDetailsController(IBackgroundJobClient backgroundJobClient, ICCOpportunityClientJob ccOpportunityClientJob, ILogger<ChargeCodeOpportunityDetailsController> logger)
+        {
+            _backgroundJobClient = backgroundJobClient;
+            _ccOpportunityClientJob = ccOpportunityClientJob;
+            _logger = logger;
+        }
+
+        [Obsolete("Replacing w/ explicitly named endpoints")]
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public void Create([FromBody] ChargeCodeDetailInfo detailInfo, CancellationToken cancellationToken)
+        {
+            _backgroundJobClient.Enqueue<CCOpportunityDetailJob>(job
+                   => job.PopulateOpportunityDetailsAsync(detailInfo.StrataId, string.Empty, detailInfo.OpportunityGuid, detailInfo.IsBaseline, detailInfo.IsUpdate, false, cancellationToken));
+        }
+
+
+        [HttpPost("refresh-baseline-details")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public async Task<IActionResult> RefreshBaselineDetails(
+               [FromBody] ChargeCodeOpportunityJobRequestInfo request,
+               CancellationToken cancellationToken)
+        {
+            try
+            {
+                var jobId = await _ccOpportunityClientJob.RefreshClientOpportunityBaselineDetails(
+                    request.StrataId, request.OpportunityGuid, cancellationToken);
+                return Ok(jobId);
+            }
+            catch (InvalidOperationException ex)
+            {
+                _logger.LogServiceError(ex);
+                return BadRequest();
+            }
+        }
+
+        [HttpPost("refresh-tracking-details")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public async Task<IActionResult> RefreshTrackingDetails(
+            [FromBody] ChargeCodeOpportunityJobRequestInfo request,
+            CancellationToken cancellationToken)
+        {
+            try
+            {
+                var jobId = await _ccOpportunityClientJob.RefreshClientOpportunityTrackingDetails(
+                    request.StrataId, request.OpportunityGuid, cancellationToken);
+                return Ok(jobId);
+            }
+            catch (InvalidOperationException ex)
+            {
+                _logger.LogServiceError(ex);
+                return BadRequest();
+            }
+        }
+
+        /// <summary>
+        /// Contains information required to request a charge code opportunity job.
+        /// </summary>
+        public class ChargeCodeOpportunityJobRequestInfo
+        {
+            public int StrataId { get; set; }
+            public Guid OpportunityGuid { get; set; }
+        }
+
+        public class ChargeCodeDetailInfo
+        {
+            public int StrataId { get; set; }
+            public Guid OpportunityGuid { get; set; }
+            public bool IsBaseline { get; set; }
+            public bool IsUpdate { get; set; }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ChargeCodeOppsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ChargeCodeOppsController.cs
new file mode 100644
index 0000000..273f8fd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ChargeCodeOppsController.cs
@@ -0,0 +1,60 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ChargeCodeOppsController : OpportunityController<CCOpportunity>
+    {
+
+        public ChargeCodeOppsController(ICCOpportunityViewService opportunityService) : base(opportunityService)
+        {
+        }
+
+        [HttpPost("")]
+        public async Task<PagedApiResponse<CCOpportunity>> GetOpportunities(CCOpportunityLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            return await OpportunityService.GetPagedAsync(loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status201Created)]
+        public async Task<IActionResult> Export(CCOpportunityExportOptions exportOptions, CancellationToken cancellationToken)
+        {
+            var workbook = await ((ICCOpportunityViewService)OpportunityService).ExportAsync(exportOptions.SortOptions, exportOptions.Filters, cancellationToken);
+            return new ExcelContentResult(workbook, "CC_Opportunities");
+
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<CCFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            return await ((ICCOpportunityViewService)OpportunityService).GetFilterOptionsAsync(configurationGuid, cancellationToken);
+        }
+
+        [ExcludeFromCodeCoverage]
+        public class CCOpportunityLoadOptions
+        {
+            public PagingOptions PagingOptions { get; set; }
+            public CCFilters Filters { get; set; }
+        }
+
+        [ExcludeFromCodeCoverage]
+        public class CCOpportunityExportOptions
+        {
+            public SortOptions SortOptions { get; set; }
+            public CCFilters Filters { get; set; }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ClientNetworkOpportunitiesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ClientNetworkOpportunitiesController.cs
new file mode 100644
index 0000000..23e8e3b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ClientNetworkOpportunitiesController.cs
@@ -0,0 +1,175 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.Network.Filters;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ClientNetworkOpportunitiesController : ControllerBase
+    {
+        private readonly IClientNetworkOpportunityService _clientNetworkOpportunityService;
+        private readonly ILogger<ClientNetworkOpportunitiesController> _logger;
+        private readonly ClaimsPrincipal _user;
+
+        public ClientNetworkOpportunitiesController(
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IClientNetworkOpportunityService clientNetworkOpportunityService,
+            ILogger<ClientNetworkOpportunitiesController> logger)
+        {
+            _clientNetworkOpportunityService = clientNetworkOpportunityService;
+            _logger = logger;
+            _user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<PagedApiResponse<NetworkOpportunitySummary>>> GetOpportunities(NetworkOpportunityLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user.GetDatabaseGuid();
+            if (databaseGuid != Guid.Empty)
+            {
+                return await _clientNetworkOpportunityService.GetOpportunitiesAsync(databaseGuid, loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+            }
+
+            return NoContent();
+        }
+
+        [HttpGet("{networkOpportunityId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<ClientNetworkOpportunityDto>> GetById(int networkOpportunityId, CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user.GetDatabaseGuid();
+            if (databaseGuid != Guid.Empty)
+            {
+                try
+                {
+                    var clientNetworkOpportunity = await _clientNetworkOpportunityService.GetByIdAsync(databaseGuid, networkOpportunityId, cancellationToken);
+                    return new ClientNetworkOpportunityDto(clientNetworkOpportunity);
+                }
+                catch (CreateWorkbookFromTemplateException ex)
+                {
+                    _logger.LogServiceError(ex);
+                    return StatusCode(500, new { message = "Error creating client workbook. Verify template data source is a published standard data source with client permissions set." });
+                }
+            }
+
+            return NoContent();
+        }
+
+        [HttpPut("{networkOpportunityId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<IActionResult> Save(int networkOpportunityId, ClientNetworkOpportunityDto dto, CancellationToken cancellationToken)
+        {
+            if (networkOpportunityId != dto.NetworkOpportunityId)
+            {
+                return BadRequest();
+            }
+
+            var databaseGuid = _user.GetDatabaseGuid();
+            if (databaseGuid != Guid.Empty)
+            {
+                ClientNetworkOpportunity clientOpportunity = dto.MappedtoClientOpportunity();
+                NetworkOpportunitySaveModel networkOpportunity = dto.MappedtoNetworkOpportunitySaveModel();
+                await _clientNetworkOpportunityService.ConfigureAsync(databaseGuid, networkOpportunityId, clientOpportunity, networkOpportunity, cancellationToken);
+            }
+
+            return NoContent();
+        }
+
+        [HttpDelete("{networkOpportunityId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<IActionResult> Delete(int networkOpportunityId, CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user.GetDatabaseGuid();
+            if (databaseGuid != Guid.Empty)
+            {
+                await _clientNetworkOpportunityService.DeleteAsync(databaseGuid, networkOpportunityId, CancellationToken.None);
+            }
+
+            return NoContent();
+        }
+
+        [HttpPut("{networkOpportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> Publish(int networkOpportunityId, bool isPublished, CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user.GetDatabaseGuid();
+            if (databaseGuid == Guid.Empty)
+            {
+                return BadRequest();
+            }
+            var opportunity = await _clientNetworkOpportunityService.GetByIdAsync(databaseGuid, networkOpportunityId, cancellationToken);
+            if (opportunity is null)
+            {
+                return BadRequest();
+            }
+
+            return Ok(await _clientNetworkOpportunityService.PublishAsync(databaseGuid, opportunity, isPublished, cancellationToken));
+        }
+
+        [HttpPut("[action]/{networkOpportunityId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<IActionResult> UpdateInitiativeStatus(int networkOpportunityId, [FromBody] InitiativeStatuses status, CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user.GetDatabaseGuid();
+            if (databaseGuid != Guid.Empty)
+            {
+                await _clientNetworkOpportunityService.UpdateInitiativeStatusAsync(databaseGuid, networkOpportunityId, status, cancellationToken);
+            }
+
+            return NoContent();
+        }
+
+        [HttpPut("{networkOpportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> RevertWorkbookToTemplate(int networkOpportunityId, CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user.GetDatabaseGuid();
+            if (databaseGuid == Guid.Empty)
+            {
+                return BadRequest();
+            }
+
+            var opportunity = await _clientNetworkOpportunityService.GetByIdAsync(databaseGuid, networkOpportunityId, cancellationToken);
+            if (opportunity is null)
+            {
+                return BadRequest();
+            }
+
+            return Ok(await _clientNetworkOpportunityService.RevertWorkbookToTemplateAsync(databaseGuid, opportunity, cancellationToken));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ClientNetworkOpportunityLinkController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ClientNetworkOpportunityLinkController.cs
new file mode 100644
index 0000000..4746349
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ClientNetworkOpportunityLinkController.cs
@@ -0,0 +1,205 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ClientNetworkOpportunityLinkController : Controller
+    {
+        private readonly IClientNetworkOpportunityService _clientNetworkOpportunityService;
+        private readonly IClientNetworkOpportunityLinkService _clientNetworkOpportunityLinkService;
+        private readonly IAllOpportunityService _allOpportunityService;
+        private readonly IInitiativeService _initiativeService;
+        private readonly ILogger<ClientNetworkOpportunityLinkController> _logger;
+        private readonly ClaimsPrincipal _user;
+
+        public ClientNetworkOpportunityLinkController(
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IClientNetworkOpportunityService clientNetworkOpportunityService,
+            IClientNetworkOpportunityLinkService clientNetworkOpportunityLinkService,
+            IAllOpportunityService allOpportunityService,
+            IInitiativeService initiativeService,
+            ILogger<ClientNetworkOpportunityLinkController> logger)
+        {
+            _clientNetworkOpportunityService = clientNetworkOpportunityService;
+            _clientNetworkOpportunityLinkService = clientNetworkOpportunityLinkService;
+            _allOpportunityService = allOpportunityService;
+            _initiativeService = initiativeService;
+            _logger = logger;
+            _user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+        }
+
+        [HttpPut]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<ClientNetworkOpportunityResultDto>> AddOpportunityLink([FromBody] CreateNetworkOpportunityLinkDto createNetworkOpportunityLink, CancellationToken cancellationToken)
+        {
+            if (createNetworkOpportunityLink.OpportunityGuid == Guid.Empty) { return BadRequest(); }
+            var databaseGuid = _user.GetDatabaseGuid();
+            if (databaseGuid == Guid.Empty) { return BadRequest(); }
+            var cnoExists = await _clientNetworkOpportunityService.ContainsAsync(databaseGuid, createNetworkOpportunityLink.NetworkOpportunityId, cancellationToken);
+            if (!cnoExists) { return NotFound(); }
+            var opportunityExists = await _allOpportunityService.ContainsAsync(createNetworkOpportunityLink.OpportunityGuid, cancellationToken);
+            if (!opportunityExists) { return NotFound(); }
+            var link = await _clientNetworkOpportunityLinkService.AddOpportunityLinkAsync(databaseGuid, createNetworkOpportunityLink.NetworkOpportunityId, createNetworkOpportunityLink.OpportunityGuid, cancellationToken);
+            return Ok(new ClientNetworkOpportunityResultDto(link));
+        }
+
+        [HttpPost]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public async Task<ActionResult<ClientNetworkOpportunityResultDto>> RolloverOpportunityLink([FromBody] RolloverOpportunityDto rolloverOpportunityInfo, CancellationToken cancellationToken)
+        {
+            var databaseGuid = rolloverOpportunityInfo.DatabaseGuid ?? _user.GetDatabaseGuid();
+            if (databaseGuid == Guid.Empty) { return BadRequest(); }
+            try
+            {
+                var link = await _clientNetworkOpportunityLinkService.RolloverOpportunityLinkAsync(databaseGuid,
+                        rolloverOpportunityInfo.SourceConfigurationGuid, rolloverOpportunityInfo.SourceOpportunityGuid,
+                        rolloverOpportunityInfo.RolloverConfigurationGuid, rolloverOpportunityInfo.RolloverOpportunityGuid, rolloverOpportunityInfo.RolloverInitiativeGuid, cancellationToken);
+                return Ok(new ClientNetworkOpportunityResultDto(link));
+            }
+            catch (OpportunityNotFoundException nfe)
+            {
+                _logger.LogServiceError(nfe);
+                return NotFound(nfe.OpportunityGuid);
+            }
+            catch (ClientNetworkOpportunityLinkNotFoundException lnfe)
+            {
+                _logger.LogServiceError(lnfe);
+                return NotFound(new { lnfe.StrataId, lnfe.ConfigurationGuid, lnfe.OpportunityGuid });
+            }
+            catch (ClientNetworkOpportunityLinkExistsException linkExists)
+            {
+                _logger.LogServiceError(linkExists);
+                return Ok(new ClientNetworkOpportunityResultDto(linkExists.ClientNetworkOpportunityLink));
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+                return BadRequest();
+            }
+        }
+
+        [HttpDelete("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> DeleteOpportunityLink([FromBody] ClientNetworkOpportunityLinkDto opportunity, CancellationToken cancellationToken)
+        {
+            var databaseGuid = opportunity.DatabaseGuid ?? _user.GetDatabaseGuid();
+            if (databaseGuid == Guid.Empty) { return BadRequest(); }
+            var cnoLinkExists = await _clientNetworkOpportunityLinkService.ContainsOpportunityLinkAsync(databaseGuid, opportunity.ConfigurationGuid, opportunity.Id, cancellationToken);
+            if (!cnoLinkExists) { return NotFound(); }
+            await _clientNetworkOpportunityLinkService.DeleteOpportunityLinkAsync(databaseGuid, opportunity.ConfigurationGuid, opportunity.Id, cancellationToken);
+            return Ok();
+        }
+
+        [HttpDelete("{opportunityGuid}/{configurationGuid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> DeleteOpportunityLinkIfExists(Guid opportunityGuid, Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user.GetDatabaseGuid();
+            if (databaseGuid == Guid.Empty) { return BadRequest(); }
+
+            var cnoLinkExists = await _clientNetworkOpportunityLinkService.ContainsOpportunityLinkAsync(databaseGuid, configurationGuid, opportunityGuid, cancellationToken);
+            if (!cnoLinkExists) { return Ok(); }
+            await _clientNetworkOpportunityLinkService.DeleteOpportunityLinkAsync(databaseGuid, configurationGuid, opportunityGuid, cancellationToken);
+            return Ok();
+        }
+
+        [HttpDelete("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> DeleteInitiativeLink([FromBody] ClientNetworkOpportunityLinkDto initiative, CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user.GetDatabaseGuid();
+            if (databaseGuid == Guid.Empty) { return BadRequest(); }
+            var cnoLinkExists = await _clientNetworkOpportunityLinkService.ContainsInitiativeLinkAsync(databaseGuid, initiative.ConfigurationGuid, initiative.Id, cancellationToken);
+            if (!cnoLinkExists) { return NotFound(); }
+            await _clientNetworkOpportunityLinkService.DeleteInitiativeLinkAsync(databaseGuid, initiative.ConfigurationGuid, initiative.Id, cancellationToken);
+            return Ok();
+        }
+
+        [HttpDelete("{initiativeGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> DeleteInitiativeLink(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user.GetDatabaseGuid();
+            if (databaseGuid == Guid.Empty) { return BadRequest(); }
+
+            var initiative = await _initiativeService.GetById(initiativeGuid, cancellationToken);
+            var cnoLinkExists = await _clientNetworkOpportunityLinkService.ContainsInitiativeLinkAsync(databaseGuid, initiative.ConfigurationGUID, initiative.InitiativeGUID, cancellationToken);
+            if (!cnoLinkExists) { return NotFound(); }
+            await _clientNetworkOpportunityLinkService.DeleteInitiativeLinkAsync(databaseGuid, initiative.ConfigurationGUID, initiative.InitiativeGUID, cancellationToken);
+            return Ok();
+        }
+
+        public class RolloverOpportunityDto
+        {
+            public Guid? DatabaseGuid { get; set; }
+            public Guid SourceConfigurationGuid { get; set; }
+            public Guid SourceOpportunityGuid { get; set; }
+            public Guid RolloverConfigurationGuid { get; set; }
+            public Guid RolloverOpportunityGuid { get; set; }
+            public Guid RolloverInitiativeGuid { get; set; }
+        }
+
+        public class ClientNetworkOpportunityLinkDto
+        {
+            public Guid? DatabaseGuid { get; set; }
+            public Guid ConfigurationGuid { get; set; }
+            public Guid Id { get; set; }
+        }
+
+        public class CreateNetworkOpportunityLinkDto
+        {
+            public int NetworkOpportunityId { get; set; }
+            public Guid OpportunityGuid { get; set; }
+        }
+
+        public class ClientNetworkOpportunityResultDto
+        {
+            public int NetworkOpportunityId { get; set; }
+            public Guid ConfigurationGuid { get; set; }
+            public Guid OpportunityGuid { get; set; }
+            public Guid InitiativeGuid { get; set; }
+            public string Name { get; set; }
+            public ClientNetworkOpportunityResultDto(ClientNetworkOpportunityLink link, NetworkOpportunity networkOpportunity = default)
+            {
+                if (link == null) return;
+                NetworkOpportunityId = link.ClientNetworkOpportunity.NetworkOpportunityId;
+                ConfigurationGuid = link.ConfigurationGuid;
+                OpportunityGuid = link.OpportunityGuid;
+                InitiativeGuid = link.InitiativeGuid;
+                Name = link.ClientNetworkOpportunity.NetworkOpportunity?.Name ?? networkOpportunity?.Name ?? "";
+            }
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ClientOpportunityTypeWorkbooksController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ClientOpportunityTypeWorkbooksController.cs
new file mode 100644
index 0000000..197e37b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ClientOpportunityTypeWorkbooksController.cs
@@ -0,0 +1,60 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.Analytics.Models.Utils;
+using Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks;
+using Strata.ContinuousImprovement.Biz.WorkbookClient;
+using Strata.DecisionSupport.Models.Jazz;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ClientOpportunityTypeWorkbooksController : ControllerBase
+    {
+        private readonly IOpportunityTypeWorkbookService _opportunityTypeWorkbookService;
+
+        public ClientOpportunityTypeWorkbooksController(IOpportunityTypeWorkbookService opportunityTypeWorkbookService)
+        {
+            _opportunityTypeWorkbookService = opportunityTypeWorkbookService;
+
+        }
+
+        [HttpGet("{opportunityType}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<OpportunityTypeWorkbookClientInfo>>> GetOpportunityTypeWorkbooks([FromRoute] int opportunityType, CancellationToken cancellationToken)
+        {
+            var oppTypeWorkbooks = await _opportunityTypeWorkbookService.GetOpportunityTypeWorkbooksAsync(opportunityType, cancellationToken);
+            return Ok(oppTypeWorkbooks.Select(workbook => workbook.Mapped()));
+        }
+
+        [HttpPost]
+        [ProducesResponseType(StatusCodes.Status201Created)]
+        public async Task<ActionResult<IEnumerable<OpportunityTypeWorkbook>>> CreateOpportunityTypeWorkbooks([FromBody] IEnumerable<OpportunityTypeWorkbook> opportunityTypeWorkbooks, CancellationToken cancellationToken)
+        {
+            var createdOppTypeWorkbooks = await _opportunityTypeWorkbookService.CreateOpportunityTypeWorkbooksAsync(opportunityTypeWorkbooks, cancellationToken);
+            return CreatedAtAction(nameof(CreateOpportunityTypeWorkbooks), createdOppTypeWorkbooks);
+        }
+
+        [HttpDelete("{opportunityType}/workbooks/{workbookId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<IActionResult> Delete([FromRoute] int opportunityType, [FromRoute] int workbookId, CancellationToken cancellationToken)
+        {
+            if (!await _opportunityTypeWorkbookService.ContainsAsync(opportunityType, workbookId, cancellationToken))
+            {
+                return NotFound();
+            }
+
+            await _opportunityTypeWorkbookService.DeleteAsync(opportunityType, workbookId, cancellationToken);
+            return NoContent();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ClientOpportunityWorkbooksController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ClientOpportunityWorkbooksController.cs
new file mode 100644
index 0000000..327666a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ClientOpportunityWorkbooksController.cs
@@ -0,0 +1,68 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.Analytics.Models.Utils;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Biz.WorkbookClient;
+using Strata.DecisionSupport.Models.Jazz;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ClientOpportunityWorkbooksController : ControllerBase
+    {
+        private readonly IOpportunityWorkbookService _opportunityWorkbookService;
+
+        public ClientOpportunityWorkbooksController(IOpportunityWorkbookService opportunityWorkbookService)
+        {
+            _opportunityWorkbookService = opportunityWorkbookService;
+        }
+
+        [HttpGet("workbooks")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<WorkbookClientInfo>>> GetWorkbooks(CancellationToken cancellationToken)
+        {
+            var workbooks = await _opportunityWorkbookService.GetAllOpportunityWorkbooksAsync(false, cancellationToken);
+            return Ok(workbooks.Select(workbook => workbook.Mapped()));
+        }
+
+        [HttpGet("{opportunityGuid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<OpportunityWorkbookClientInfo>>> GetOpportunityWorkbooks([FromRoute] Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var oppWorkbooks = await _opportunityWorkbookService.GetOpportunityWorkbooksAsync(opportunityGuid, cancellationToken);
+            return Ok(oppWorkbooks.Select(workbook => workbook.Mapped()));
+        }
+
+        [HttpPost]
+        [ProducesResponseType(StatusCodes.Status201Created)]
+        public async Task<ActionResult<IEnumerable<OpportunityWorkbook>>> CreateOpportunityWorkbooks([FromBody] IEnumerable<OpportunityWorkbook> opportunityWorkbooks, CancellationToken cancellationToken)
+        {
+            var createdOppWorkbooks = await _opportunityWorkbookService.CreateOpportunityWorkbooksAsync(opportunityWorkbooks, cancellationToken);
+            return CreatedAtAction(nameof(CreateOpportunityWorkbooks), createdOppWorkbooks);
+        }
+
+        [HttpDelete("{opportunityGuid}/workbooks/{workbookId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<IActionResult> Delete([FromRoute] Guid opportunityGuid, [FromRoute] int workbookId, CancellationToken cancellationToken)
+        {
+            if (!await _opportunityWorkbookService.ContainsAsync(opportunityGuid, workbookId, cancellationToken))
+            {
+                return NotFound();
+            }
+
+            await _opportunityWorkbookService.DeleteAsync(opportunityGuid, workbookId, cancellationToken);
+            return NoContent();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ClientWarehousesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ClientWarehousesController.cs
new file mode 100644
index 0000000..b1b8730
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ClientWarehousesController.cs
@@ -0,0 +1,52 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.ClientWarehouses;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    [ApiController]
+    public class ClientWarehousesController(IClientWarehouseService clientWarehouseService) : ControllerBase
+    {
+        [HttpGet]
+        [Authorize(Policy = Policies.StrataOnly)]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<List<ClientWarehouse>>> GetClientWarehouses(CancellationToken cancellationToken)
+        {
+            var clientWarehouses = await clientWarehouseService.GetAll(cancellationToken);
+            if (clientWarehouses.Count != 0)
+            {
+                return Ok(clientWarehouses);
+            }
+
+            return NoContent();
+        }
+
+        [HttpPost]
+        [Authorize(Policy = Policies.StrataOnly)]
+        [ProducesResponseType(StatusCodes.Status201Created)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<int>> AddClientWarehouse([FromBody] ClientWarehouse clientWarehouse, CancellationToken cancellationToken)
+        {
+            return CreatedAtAction(nameof(AddClientWarehouse), await clientWarehouseService.Add(clientWarehouse, cancellationToken));
+        }
+
+        [HttpDelete("{databaseGuid}")]
+        [Authorize(Policy = Policies.StrataOnly)]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public async Task<ActionResult> DeleteClientWarehouse([FromRoute] Guid databaseGuid, CancellationToken cancellationToken)
+        {
+            await clientWarehouseService.Delete(databaseGuid, cancellationToken);
+            return NoContent();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/CommentsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/CommentsController.cs
new file mode 100644
index 0000000..3d847fd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/CommentsController.cs
@@ -0,0 +1,61 @@
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class CommentsController : ControllerBase
+    {
+        private readonly ICommentService _commentService;
+        private readonly IClaimsPrincipalAccessor _claimsPrincipalAccessor;
+
+        public CommentsController(ICommentService commentService,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor)
+        {
+            _commentService = commentService;
+            _claimsPrincipalAccessor = claimsPrincipalAccessor;
+        }
+
+        [HttpPost("")]
+        public async Task<IEnumerable<Comment>> GetComments(CommentOptions options, CancellationToken cancellationToken)
+        {
+            var user = _claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+            var databaseGuid = options.IsGlobal ? Guid.Empty : user?.GetDatabaseGuid() ?? Guid.Empty;
+            var opportunityType = int.Parse(options.OpportunityType);
+            return await _commentService.GetCommentsAsync(databaseGuid, opportunityType, options.OpportunityId, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        public async Task<Comment> Create(NewComment comment, CancellationToken cancellationToken)
+        {
+            var user = _claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+            if (user == null || string.IsNullOrEmpty(comment.Comment)) { return default; }
+            var databaseGuid = comment.IsGlobal ? Guid.Empty : user.GetDatabaseGuid();
+            var author = $"{user.GetUserLastName()}, {user.GetUserFirstName()}";
+            var opportunityType = int.Parse(comment.OpportunityType);
+            return await _commentService.AddCommentAsync(databaseGuid, opportunityType, comment.OpportunityId, comment.Comment, comment.CommentDate, author, cancellationToken);
+        }
+
+        public class CommentOptions
+        {
+            public bool IsGlobal { get; set; }
+            public string OpportunityType { get; set; }
+            public long OpportunityId { get; set; }
+        }
+
+        public class NewComment : CommentOptions
+        {
+            public string Comment { get; set; }
+            public DateTimeOffset? CommentDate { get; set; }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ConfigurationsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ConfigurationsController.cs
new file mode 100644
index 0000000..073d03d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ConfigurationsController.cs
@@ -0,0 +1,131 @@
+using Microsoft.AspNetCore.Mvc;
+using MoreLinq;
+using Pluralize.NET;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.Schema.Client;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ConfigurationsController : ControllerBase
+    {
+        private readonly IConfigurationService _configurationService;
+        private readonly ISchemaServiceClient _schemaServiceClient;
+
+        public ConfigurationsController(IConfigurationService configurationService, ISchemaServiceClient schemaServiceClient)
+
+        {
+            _configurationService = configurationService;
+            _schemaServiceClient = schemaServiceClient;
+        }
+
+        [HttpGet("")]
+        public async Task<IEnumerable<Biz.Configuration.Configuration>> GetAllConfigurations(CancellationToken cancellationToken)
+        {
+            var configurations = await _configurationService.GetConfigurationsAsync(cancellationToken);
+            return configurations.OrderBy(c => c.DisplayOrder);
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<IEnumerable<Member>> GetConfigurationEntities(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            var configuration = await _configurationService.GetConfigurationAsync(configurationGuid, cancellationToken);
+
+            var globalId = configuration.IsUsingCustomEntityDimension ? configuration.DepartmentRollupGlobalId : "Entity";
+            var members = await _schemaServiceClient.GetDimensionMembersByGlobalIdAsync<Member>(globalId);
+
+            var configuredEntitiesLookup = new HashSet<int>(configuration.ConfiguredEntityIds);
+            var configuredMembers = members.Where(member => configuredEntitiesLookup.Contains(member.Id));
+
+            return configuredMembers;
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<EntityInfo> GetConfigurationEntityInfo(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            var configuration = await _configurationService.GetConfigurationAsync(configurationGuid, cancellationToken);
+
+            var globalId = configuration.IsUsingCustomEntityDimension ? configuration.DepartmentRollupGlobalId : "Entity";
+            var entity = await _schemaServiceClient.GetDimensionByGlobalIdAsync(globalId);
+            var pluralize = new Pluralizer();
+            var entityInfo = new EntityInfo
+            {
+                EntityTitle = pluralize.Pluralize(entity.FriendlyName),
+                EntityLabel = entity.FriendlyName,
+                EntityText = entity.FriendlyName,
+                DepartmentRollupGlobalId = globalId,
+                HierarchicalGuid = entity.DefaultHierarchyGuid.ToString()
+            };
+            return entityInfo;
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<ServiceLineInfo> GetConfigurationServiceLineInfo(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            var configuration = await _configurationService.GetConfigurationAsync(configurationGuid, cancellationToken);
+            var dimensionGuid = configuration.ServiceLineDimensionGuid;
+            Schema.Client.Dtos.Info.ScoreDimensionInfoDto serviceLine = null;
+
+            if (dimensionGuid == Guid.Empty)
+            {
+                serviceLine = await _schemaServiceClient.GetDimensionByGlobalIdAsync("Service Line");
+            }
+            else
+            {
+                try
+                {
+                    serviceLine = await _schemaServiceClient.GetDimensionByIdAsync(dimensionGuid);
+                }
+                catch
+                {
+                    // empty to ensure code will fall thru to next block
+                }
+                if (serviceLine is null)
+                {
+                    serviceLine = await _schemaServiceClient.GetDimensionByGlobalIdAsync("Service Line");
+                }
+
+            }
+
+            var pluralize = new Pluralizer();
+            var serviceLineInfo = new ServiceLineInfo
+            {
+                ServiceLineGlobalId = string.Empty,
+                ServiceLineDimensionGuid = dimensionGuid.ToString(),
+                ServiceLineHierarchicalGuid = serviceLine.DefaultHierarchyGuid.ToString(),
+                ServiceLineName = serviceLine.FriendlyName,
+                ServiceLineTitle = pluralize.Pluralize(serviceLine.FriendlyName)
+            };
+            return serviceLineInfo;
+        }
+
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class EntityInfo
+    {
+        public string EntityTitle { get; set; }
+        public string EntityLabel { get; set; }
+        public string EntityText { get; set; }
+        public string DepartmentRollupGlobalId { get; set; }
+        public string HierarchicalGuid { get; set; }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class ServiceLineInfo
+    {
+        public string ServiceLineGlobalId { get; set; }
+        public string ServiceLineTitle { get; set; }
+        public string ServiceLineName { get; set; }
+        public string ServiceLineDimensionGuid { get; set; }
+        public string ServiceLineHierarchicalGuid { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/DatabasesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/DatabasesController.cs
new file mode 100644
index 0000000..0ed184e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/DatabasesController.cs
@@ -0,0 +1,36 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.Databases;
+using Strata.ContinuousImprovement.Biz.Replication;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    [ApiController]
+    public class DatabasesController : ControllerBase
+    {
+        private readonly IDatabaseService _databaseService;
+
+        public DatabasesController(IDatabaseService databaseService)
+        {
+            _databaseService = databaseService;
+        }
+
+        [HttpGet]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<List<Database>>> Get(CancellationToken cancellationToken)
+        {
+            var databases = await _databaseService.GetDatabasesAsync(cancellationToken);
+            if (databases.Count != 0)
+            {
+                return Ok(databases);
+            }
+            return NoContent();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/DeviceIdentifiersController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/DeviceIdentifiersController.cs
new file mode 100644
index 0000000..ab8d311
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/DeviceIdentifiersController.cs
@@ -0,0 +1,33 @@
+using Hangfire;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.GMDN.Jobs;
+using System.Threading;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    [Authorize(Policy = Policies.StrataOnly)]
+    public class DeviceIdentifiersController(IBackgroundJobClient backgroundJobClient) : ControllerBase
+    {
+        private readonly IBackgroundJobClient _backgroundJobClient = backgroundJobClient;
+
+        /// <summary>
+        /// Clears device identifier data from all non-licensed CI clients
+        /// </summary>
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public ActionResult<string> ClearDeviceIdentifiers(CancellationToken cancellationToken)
+        {
+            var jobId = _backgroundJobClient.Enqueue<DeviceIdentifierClearingJob>(job
+                => job.ClearDimDeviceIdentifierFromJazz(cancellationToken));
+
+            return Ok(jobId);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/EncounterOpportunitiesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/EncounterOpportunitiesController.cs
new file mode 100644
index 0000000..e326090
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/EncounterOpportunitiesController.cs
@@ -0,0 +1,216 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Encounter.Initiatives;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.OrgDefined;
+using Strata.ContinuousImprovement.Biz.OrgDefined.Queries;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class EncounterOpportunitiesController : OpportunityController<ENOpportunity>
+    {
+        private readonly IClaimsPrincipalAccessor _claimsPrincipalAccessor;
+        private readonly IConfigurationService _configurationService;
+        private readonly IENOpportunityService _opportunityService;
+        private readonly IENInitiativeService _initiativeService;
+        private readonly IOpportunityMetricCohortService _opportunityMetricCohortService;
+        private readonly IFeatureFlagServiceClient _featureFlagServiceClient;
+        private readonly IAllOpportunityService _allOpportunityService;
+
+        public EncounterOpportunitiesController(
+            IConfigurationService configurationService,
+            IENOpportunityService opportunityService,
+            IENInitiativeService initiativeService,
+            IOpportunityMetricCohortService opportunityMetricCohortService,
+            IFeatureFlagServiceClient featureFlagServiceClient,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IAllOpportunityService allOpportunityService)
+            : base(opportunityService)
+        {
+            _configurationService = configurationService;
+            _opportunityService = opportunityService;
+            _initiativeService = initiativeService;
+            _opportunityMetricCohortService = opportunityMetricCohortService;
+            _featureFlagServiceClient = featureFlagServiceClient;
+            _claimsPrincipalAccessor = claimsPrincipalAccessor;
+            _allOpportunityService = allOpportunityService;
+        }
+
+        [HttpPost("")]
+        public async Task<PagedApiResponse<ENOpportunity>> GetOpportunities(ENOpportunityLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            return await OpportunityService.GetPagedAsync(loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<OpportunityJobResultsDto>> Create(ENOpportunityDto opportunity, CancellationToken cancellationToken)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest();
+            }
+
+            var opportunityWithFilters = opportunity.MapToDataModel(User);
+            await ((IENOpportunityService)OpportunityService).SetOpportunityFilters(opportunityWithFilters, cancellationToken);
+            var newOpportunity = opportunityWithFilters.MapToDataModel(User);
+            var dbGuid = User?.GetDatabaseGuid() ?? Guid.Empty;
+            if (dbGuid == Guid.Empty)
+            {
+                return BadRequest();
+            }
+            var isTempoPage = await _featureFlagServiceClient.IsEnabledAsync("enableencounteropportunityintempo", dbGuid, cancellationToken: cancellationToken);
+
+            var result = await ((IENOpportunityService)OpportunityService).CreateAsync(newOpportunity, dbGuid, isTempoPage, cancellationToken);
+            return Ok(new OpportunityJobResultsDto(result, newOpportunity.OpportunityGuid));
+        }
+
+        [HttpDelete("{id}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<bool> Delete(Guid id, CancellationToken cancellationToken)
+          => await OpportunityService.DeleteAsync<ENOpportunityDataModel>(id, cancellationToken);
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status201Created)]
+        public async Task<IActionResult> Export(ENOpportunityExportOptions exportOptions, CancellationToken cancellationToken)
+        {
+            var workbook = await ((IENOpportunityService)OpportunityService).ExportAsync(exportOptions.SortOptions, exportOptions.Filters, cancellationToken);
+            return new ExcelContentResult(workbook, "EN_Opportunities");
+
+        }
+
+        [HttpGet("{opportunityGuid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<ENOpportunityDto>> GetById(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var opportunityDto = await _opportunityService.GetENOpportunityById(opportunityGuid, cancellationToken);
+            if (opportunityDto == null)
+            {
+                return NotFound();
+            }
+
+            return Ok(opportunityDto);
+        }
+
+        [HttpPut("{opportunityGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> UpdateGoals(Guid opportunityGuid, [FromBody] IEnumerable<ENOpportunityRowDataChanges> changes, CancellationToken cancellationToken)
+        {
+            var existsOpportunity = await _opportunityService.Contains(opportunityGuid, cancellationToken);
+            if (!existsOpportunity)
+            {
+                return NotFound();
+            }
+
+            var hasUpdatedCostPerUnit = await _opportunityService.UpdateGoalsAsync(opportunityGuid, changes, cancellationToken);
+
+            if (hasUpdatedCostPerUnit)
+            {
+                return await _initiativeService.UpdateSavings(opportunityGuid, cancellationToken);
+            }
+
+            return false;
+        }
+
+        [HttpGet("{opportunityGuid}/[action]")]
+        public async Task<ENOpportunitySaveModel> GetEditModel(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var opportunity = await _opportunityService.GetENOpportunityById(opportunityGuid, cancellationToken);
+            return opportunity.MapToSaveModel();
+        }
+
+        [HttpGet("{opportunityGuid}/[action]")]
+        public async Task<InitiativeInfo> GetInitiativeInfo(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            return await _opportunityService.GetInitiativeInfoAsync(opportunityGuid, cancellationToken);
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<ENFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            return await ((IENOpportunityService)OpportunityService).GetFilterOptionsAsync(configurationGuid, cancellationToken);
+        }
+
+        [HttpGet("[action]")]
+        public async Task<bool> TempoPageEnabled(CancellationToken cancellationToken)
+            => await _featureFlagServiceClient.IsEnabledAsync("enableencounteropportunityintempo", User?.GetDatabaseGuid() ?? Guid.Empty, cancellationToken: cancellationToken);
+
+        [HttpPut("{opportunityGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<Guid>> UpdateOpportunity(Guid opportunityGuid, [FromBody] ENOpportunityDto opportunityDto, CancellationToken cancellationToken)
+        {
+            var dbGuid = User?.GetDatabaseGuid() ?? Guid.Empty;
+            var isNameValid = await _allOpportunityService.NameIsValid(opportunityDto.ConfigurationGuid, (int)OpportunityTypes.Encounter, opportunityDto.Name,
+                opportunityDto?.OpportunityGuid, cancellationToken);
+            if (dbGuid == Guid.Empty || !isNameValid)
+            {
+                return BadRequest();
+            }
+            var opportunityWithFilters = opportunityDto.MapToDataModel(User, false);
+            var result = await ((IENOpportunityService)OpportunityService).UpdateAsync(dbGuid, opportunityWithFilters, cancellationToken);
+            return Ok(result);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<OpportunityMetricCohortData>>> OpportunityMetricCohortData([FromBody] OpportunityMetricCohortOptions options, CancellationToken cancellationToken)
+        {
+            var config = await _configurationService.GetConfigurationAsync(options.ConfigurationGuid, cancellationToken);
+            if (config == null)
+            {
+                return BadRequest();
+            }
+            var result = Enumerable.Empty<OpportunityMetricCohortData>();
+            result = await _opportunityMetricCohortService.GetEncounterOpportunityMetricCohortData(config, options.Data, options.InnerJoin, cancellationToken);
+            return Ok(result);
+        }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class ENOpportunityLoadOptions
+    {
+        public PagingOptions PagingOptions { get; set; }
+        public ENFilters Filters { get; set; }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class ENOpportunityExportOptions
+    {
+        public SortOptions SortOptions { get; set; }
+        public ENFilters Filters { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ExplorationController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ExplorationController.cs
new file mode 100644
index 0000000..21cfa6f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ExplorationController.cs
@@ -0,0 +1,129 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.Benchmark;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ExplorationController : ControllerBase
+    {
+        private readonly IExplorationService _explorationService;
+        private readonly IConfigurationService _configurationService;
+        private readonly IFeatureFlagServiceClient _featureFlagServiceClient;
+        private readonly ILogger<ExplorationController> _logger;
+
+        public ExplorationController(IExplorationService explorationService,
+            IConfigurationService configurationService,
+            IFeatureFlagServiceClient featureFlagServiceClient,
+            ILogger<ExplorationController> logger)
+        {
+            _explorationService = explorationService;
+            _configurationService = configurationService;
+            _featureFlagServiceClient = featureFlagServiceClient;
+            _logger = logger;
+        }
+
+        [HttpPost("case-type-family-summary")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<List<CaseTypeFamilySummaryData>>> GetCaseTypeFamilySummaries([FromBody] ExplorationInfo explorationInfo, CancellationToken cancellationToken)
+        {
+            Stopwatch performanceTimer = null;
+            var isFlexExPerfLoggingEnabled = await _explorationService.IsFlexExPerfLogging(cancellationToken);
+
+            if (isFlexExPerfLoggingEnabled)
+            {
+                _logger.LogPerformanceInformation($"CI FlexEx Perf * GetCaseTypeFamilySummaries Controller Entered");
+                performanceTimer = Stopwatch.StartNew();
+            }
+
+            if (!await _configurationService.IsConfigurationValid(explorationInfo.ConfigurationGuid, cancellationToken)) { return BadRequest(); }
+            var summaries = await _explorationService.GetCaseTypeFamilySummariesAsync(explorationInfo, cancellationToken);
+            if (isFlexExPerfLoggingEnabled) _logger.LogPerformanceInformation($"CI FlexEx Perf * GetCaseTypeFamilySummaries Controller * Total Elapsed time: {performanceTimer.Elapsed}");
+
+            return Ok(summaries);
+        }
+
+        [HttpPost("case-type-family-cost-driver-info")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<List<CaseTypeFamilySummaryData>>> GetCaseTypeFamilyCostDriverInfo([FromBody] ExplorationCostDriverInfo explorationCostDriverInfo, CancellationToken cancellationToken)
+        {
+            Stopwatch performanceTimer = null;
+            var isFlexExPerfLoggingEnabled = await _explorationService.IsFlexExPerfLogging(cancellationToken);
+
+            if (isFlexExPerfLoggingEnabled)
+            {
+                _logger.LogPerformanceInformation($"CI FlexEx Perf * GetCaseTypeFamilyCostDriverInfo Controller Entered");
+                performanceTimer = Stopwatch.StartNew();
+            }
+
+            if (!await _configurationService.IsConfigurationValid(explorationCostDriverInfo.ConfigurationGuid, cancellationToken)) { return BadRequest(); }
+            var summaries = await _explorationService.GetCaseTypeFamilySummaryDetailsAsync(explorationCostDriverInfo, cancellationToken);
+            if (isFlexExPerfLoggingEnabled) _logger.LogPerformanceInformation($"CI FlexEx Perf * GetCaseTypeFamilyCostDriverInfo Controller * Total Elapsed time: {performanceTimer.Elapsed}");
+
+            return Ok(summaries);
+        }
+
+        [HttpPost("case-type-family-details")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<CaseTypeFamilyDetailInfo>> GetCaseTypeFamilyDetails([FromBody] ExplorationDetailInfo explorationInfo, CancellationToken cancellationToken)
+        {
+            Stopwatch performanceTimer = null;
+            var isFlexExPerfLoggingEnabled = await _explorationService.IsFlexExPerfLogging(cancellationToken);
+
+            if (isFlexExPerfLoggingEnabled)
+            {
+                _logger.LogPerformanceInformation($"CI FlexEx Perf * GetCaseTypeFamilyDetails Controller Entered");
+                performanceTimer = Stopwatch.StartNew();
+            }
+
+            if (!await _configurationService.IsConfigurationValid(explorationInfo.ConfigurationGuid, cancellationToken)) { return BadRequest(); }
+            await _configurationService.GetQualityVariationAprdrgFlagAsync(explorationInfo.ConfigurationGuid, cancellationToken);
+            var ctfEntityDetails = await _explorationService.GetCaseTypeFamilyDetailsAsync(explorationInfo, cancellationToken);
+            if (isFlexExPerfLoggingEnabled) _logger.LogPerformanceInformation($"CI FlexEx Perf * GetCaseTypeFamilyDetails Controller * Total Elapsed time: {performanceTimer.Elapsed}");
+
+            return Ok(ctfEntityDetails);
+        }
+
+        [HttpPost("case-type-family-summary-heatmap")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<List<HeatMapData>>> GetHeatMapSummary([FromBody] ExplorationInfo explorationInfo, CancellationToken cancellationToken)
+        {
+            if (!await _configurationService.IsConfigurationValid(explorationInfo.ConfigurationGuid, cancellationToken)) { return BadRequest(); }
+            var summaries = await _explorationService.GetBenchmarkingDataForHeatMapAsync(explorationInfo, explorationInfo.Granularity, cancellationToken);
+            return Ok(summaries);
+        }
+
+        [HttpGet("flexible-exploration-information-page")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> IsFlexibleExplorationInformationPageEnabled(CancellationToken cancellationToken)
+        {
+            var databaseGuid = User?.GetDatabaseGuid() ?? Guid.Empty;
+            var isExplorationInformationPageEnable = await _featureFlagServiceClient.IsEnabledAsync("ciflexibleexplorationpage3enabled", databaseGuid, cancellationToken: cancellationToken);
+            return Ok(isExplorationInformationPageEnable);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ExplorationOpportunitiesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ExplorationOpportunitiesController.cs
new file mode 100644
index 0000000..326f82e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ExplorationOpportunitiesController.cs
@@ -0,0 +1,179 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Exploration.Opportunities;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ExplorationOpportunitiesController : OpportunityController<EXOpportunity>
+    {
+        private readonly IEXOpportunityService _opportunityService;
+        private readonly ICommentService _commentService;
+        private readonly IFeatureFlagServiceClient _featureFlagServiceClient;
+        private readonly ILogger<ExplorationOpportunitiesController> _logger;
+
+        public ExplorationOpportunitiesController(IEXOpportunityService opportunityService,
+            ICommentService commentService,
+            IFeatureFlagServiceClient featureFlagServiceClient,
+            ILogger<ExplorationOpportunitiesController> logger) : base(opportunityService)
+        {
+            _opportunityService = opportunityService;
+            _commentService = commentService;
+            _featureFlagServiceClient = featureFlagServiceClient;
+            _logger = logger;
+        }
+
+        [HttpGet("[action]")]
+        public async Task<bool> GetEnabled(CancellationToken cancellationToken)
+        {
+            var databaseGuid = User?.GetDatabaseGuid() ?? Guid.Empty;
+            var hasFlexibleExplorartion = User.IsSdtEmployee()
+                || (await _featureFlagServiceClient.IsEnabledAsync("ciflexibleexplorationenabled", databaseGuid, cancellationToken: cancellationToken));
+            var dict = new Dictionary<string, object> { { "isSdtEmployee", User.IsSdtEmployee() }, { "hasFlexibleExploration", hasFlexibleExplorartion } };
+            _logger.LogServiceInformation("CI Flexible Exploration Enabled", dict);
+            return hasFlexibleExplorartion;
+        }
+
+        [HttpPost("")]
+        public async Task<PagedApiResponse<EXOpportunity>> GetOpportunities(EXOpportunityLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            return await OpportunityService.GetPagedAsync(loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+        }
+
+        [HttpGet("{opportunityGuid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<EXOpportunity>> GetById(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            return Ok(await _opportunityService.GetById(opportunityGuid, cancellationToken));
+        }
+
+        [HttpPut("{opportunityGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesDefaultResponseType]
+        public async Task CheckWorkbook(Guid opportunityGuid, CancellationToken cancellationToken)
+            => await _opportunityService.CheckWorkbook(opportunityGuid, cancellationToken);
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<EXOpportunity>> Create(EXOpportunityDto savedOpportunity, CancellationToken cancellationToken)
+        {
+            var newOpportunity = new EXOpportunity
+            {
+                ConfigurationGuid = savedOpportunity.ConfigurationGuid,
+                Name = savedOpportunity.Name,
+                Description = savedOpportunity.Description
+            };
+
+            return Ok(await _opportunityService.CreateAsync(newOpportunity, User?.Identity?.Name, cancellationToken));
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status201Created)]
+        public async Task<IActionResult> Export(EXOpportunityExportOptions exportOptions, CancellationToken cancellationToken)
+        {
+            var workbook = await ((IEXOpportunityService)OpportunityService).ExportAsync(exportOptions.SortOptions, exportOptions.Filters, cancellationToken);
+            return new ExcelContentResult(workbook, "EX_Opportunities");
+
+        }
+
+        [HttpPut("{opportunityGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<EXOpportunity>> Update(Guid opportunityGuid, EXOpportunity opportunity, CancellationToken cancellationToken)
+        {
+            var opp = await _opportunityService.GetById(opportunityGuid, cancellationToken);
+            if (opp == null)
+            {
+                return BadRequest();
+            }
+            return Ok(await _opportunityService.UpdateAsync(opportunity, cancellationToken));
+        }
+
+        [HttpPut("{opportunityGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<EXOpportunity>> SetStatus(Guid opportunityGuid, [FromBody] InitiativeStatuses status, CancellationToken cancellationToken)
+        {
+            var opp = await _opportunityService.GetById(opportunityGuid, cancellationToken);
+            if (opp == null)
+            {
+                return BadRequest();
+            }
+            opp.InitiativeStatus = status;
+            return Ok(await _opportunityService.UpdateAsync(opp, cancellationToken));
+        }
+
+        [HttpDelete("{opportunityGuid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult> Delete(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var opp = await _opportunityService.GetById(opportunityGuid, cancellationToken);
+            if (opp == null)
+            {
+                return BadRequest();
+            }
+            await ((IEXOpportunityService)_opportunityService).DeleteAsync(opportunityGuid, cancellationToken);
+            var databaseGuid = User?.GetDatabaseGuid() ?? Guid.Empty;
+            await _commentService.DeleteCommentsAsync(databaseGuid, (int)OpportunityTypes.Blank, opp.OpportunityId, cancellationToken);
+            return Ok();
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<EXFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            return await ((IEXOpportunityService)OpportunityService).GetFilterOptionsAsync(configurationGuid, cancellationToken);
+        }
+
+        public class EXOpportunityDto
+        {
+            [Required]
+            [StringLength(200)]
+            public string Name { get; set; }
+            public string Description { get; set; }
+            public Guid ConfigurationGuid { get; set; }
+        }
+
+        [ExcludeFromCodeCoverage]
+        public class EXOpportunityLoadOptions
+        {
+            public PagingOptions PagingOptions { get; set; }
+            public EXFilters Filters { get; set; }
+        }
+
+        [ExcludeFromCodeCoverage]
+        public class EXOpportunityExportOptions
+        {
+            public SortOptions SortOptions { get; set; }
+            public EXFilters Filters { get; set; }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ExplorationPopulationsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ExplorationPopulationsController.cs
new file mode 100644
index 0000000..0bd9688
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ExplorationPopulationsController.cs
@@ -0,0 +1,241 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Population;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.DecisionSupport.Models.Encounters;
+using Strata.DecisionSupport.Models.Jazz;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ExplorationPopulationsController : ControllerBase
+    {
+        private readonly IUserSettingService _userSettingService;
+        private readonly IExplorationPopulationService _populationService;
+        private readonly IExplorationService _explorationService;
+        private readonly ILogger<ExplorationPopulationsController> _logger;
+        public ExplorationPopulationsController(IUserSettingService userSettingService, IExplorationPopulationService populationService, IExplorationService explorationService,
+            ILogger<ExplorationPopulationsController> logger)
+        {
+            _userSettingService = userSettingService;
+            _populationService = populationService;
+            _explorationService = explorationService;
+            _logger = logger;
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<bool> IsNameUnique([FromBody] string name, CancellationToken cancellationToken)
+        {
+            var isValid = await _populationService.IsNameUnique(name, cancellationToken);
+            return isValid;
+        }
+
+        [HttpPost("")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> AddPopulation([FromBody] ExplorationPopulationDto populationDto, CancellationToken cancellationToken)
+        {
+            var isAdded = await _populationService.AddPopulationAsync(populationDto, cancellationToken);
+            return Ok(isAdded);
+        }
+
+        [HttpGet("{populationId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<Tuple<DateTime, DateTime>>> GetDischargeDates(long populationId, CancellationToken cancellationToken)
+        {
+            var population = await _populationService.ContainsPopulation(populationId, cancellationToken);
+            if (!population) return NotFound();
+
+            var result = await _populationService.GetDischargeDates(populationId, cancellationToken);
+            return Ok(new Tuple<DateTime, DateTime>(result.Item1, result.Item2));
+        }
+
+        [HttpPut("{populationId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult> UpdatePopulation(long populationId, ExplorationPopulationDto populationDto, CancellationToken cancellationToken)
+        {
+            var population = await _populationService.ContainsPopulation(populationId, cancellationToken);
+            if (!population) return NotFound();
+
+            var isUpdated = await _populationService.UpdatePopulationAsync(populationDto, cancellationToken);
+
+            if (isUpdated)
+            {
+                var counts = await _populationService.GetPopulationCountOpportunitiesAsync([populationId], cancellationToken);
+                if (counts.TryGetValue(populationId, out int opportunitiesCount) && opportunitiesCount > 0)
+                {
+                    var userGuid = User?.GetUserGuid() ?? Guid.Empty;
+                    var userSetting = await _userSettingService.GetById(userGuid, cancellationToken);
+                    if (userSetting != null)
+                    {
+                        await _populationService.CreateExplorationPopulationOpportunity(userSetting.ConfigurationGuid, populationId, false, cancellationToken);
+                    }
+                }
+                return NoContent();
+            }
+            return BadRequest();
+        }
+
+        [HttpGet("")]
+        public async Task<ActionResult<IEnumerable<ExplorationPopulationDataDto>>> GetPopulations(CancellationToken cancellationToken)
+        {
+            var result = await _populationService.GetPopulationsAsync(cancellationToken);
+            return Ok(result);
+        }
+
+        [HttpPut("{populationId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> UpdatePopulationName(long populationId,[FromBody] string name, CancellationToken cancellationToken)
+        {
+            var isUpdated = await _populationService.UpdatePopulationName(populationId, name, cancellationToken);
+            return Ok(isUpdated);
+        }
+
+        [HttpGet("{populationId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public async Task<ActionResult<ExplorationPopulationDto>> GetPopulationData(long populationId, CancellationToken cancellationToken)
+        {
+            var population = await _populationService.ContainsPopulation(populationId, cancellationToken);
+            if (!population) return NotFound();
+
+            var result = await _populationService.GetPopulationDataAsync(populationId, cancellationToken);
+            return result != null ? Ok(result) : BadRequest();
+        }
+
+        [HttpGet("{populationId}/details")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<ExplorationPopulationDetailsDto>> GetPopulationDetails(long populationId, CancellationToken cancellationToken)
+        {
+            var result = await _populationService.GetPopulationDetailsAsync(populationId, cancellationToken);
+            if (result == null)
+            {
+                return BadRequest();
+            }
+            return Ok(result);
+        }
+
+        [HttpGet("info/{populationId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IExplorationPopulationInfo>> GetPopulationInfo(long populationId, CancellationToken cancellationToken)
+        {
+            var result = await _populationService.GetPopulationInfoAsync(populationId, cancellationToken);
+            if (result == null)
+            {
+                return BadRequest();
+            }
+            return Ok(result);
+        }
+
+        [HttpGet("{populationId}/encounters")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<IJazzExplorationEncounterInfo>>> GetEncounters(long populationId, Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            _logger.LogServiceInformation($"Performing {nameof(GetEncounters)} for configuration: {configurationGuid}, populationid: {populationId}");
+
+            var populationData = await _populationService.GetPopulationDataAsync(populationId, cancellationToken);
+            if (populationData != null)
+            {
+                _logger.LogServiceInformation($"{nameof(GetEncounters)} populationData is not null, totalEncounters:{populationData.TotalEncounters}");
+
+                var encounterPhysicians = await _explorationService.GetEncountersAsync(populationData.MapToExplorationDetailInfo(), configurationGuid, cancellationToken);
+                if (encounterPhysicians != null)
+                {
+                    if (configurationGuid == Guid.Empty)
+                    {
+                        var newIncludedEncounterIds = encounterPhysicians.Where(e => !e.IsExcluded).Select(x => x.EncounterId);
+                        var newExcludedEncounterIds = encounterPhysicians.Where(e => e.IsExcluded).Select(x => x.EncounterId);
+                        var updated = await _populationService.UpdatePopulationMappingsAsync(populationId, newIncludedEncounterIds, newExcludedEncounterIds, cancellationToken);
+                    }
+
+                    var result = encounterPhysicians.Where(enc => !enc.IsExcluded).Select(x => x.MapToExplorationEncounterInfo());
+                    return Ok(result);
+                }
+            }
+            else
+            {
+                _logger.LogServiceInformation($"{nameof(GetEncounters)} populationData is null");
+            }
+
+            _logger.LogServiceInformation($"{nameof(GetEncounters)} returned a BadRequest()");
+            return BadRequest();
+        }
+
+        [HttpDelete("{populationId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        [Authorize(Policy = Policies.IsAdmin)]
+        public async Task<IActionResult> DeletePopulation(long populationId, CancellationToken cancellationToken)
+        {
+            var population = await _populationService.ContainsPopulation(populationId, cancellationToken);
+            if (!population) return NotFound();
+
+            var result = await _populationService.DeletePopulation(populationId, cancellationToken);
+            return result ? NoContent() : BadRequest();
+        }
+
+        [HttpPost("{populationId}/duplicate")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<ExplorationPopulationDataDto>> DuplicatePopulation(long populationId, [FromBody] string name, CancellationToken cancellationToken)
+        {
+            var populationData = await _populationService.DuplicatePopulation(populationId, name, cancellationToken);
+            return populationData != null ? Ok(populationData) : BadRequest();
+        }
+
+        [HttpPost("{populationId}/opportunities")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<ExplorationPopulationOpportunityDto>> CreateOpportunity(long populationId, CancellationToken cancellationToken)
+        {
+            var userGuid = User?.GetUserGuid() ?? Guid.Empty;
+            var userSetting = await _userSettingService.GetById(userGuid, cancellationToken);
+            if (userSetting != null)
+            {
+                var result = await _populationService.CreateExplorationPopulationOpportunity(userSetting.ConfigurationGuid, populationId, true, cancellationToken);
+                if (result)
+                {
+                    var opportunity = (await _populationService.GetPopulationOpportunitiesAsync([populationId], cancellationToken)).FirstOrDefault()?.FirstOrDefault();
+                    return Ok(opportunity);
+                }
+            }
+
+            return BadRequest();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/FiltersController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/FiltersController.cs
new file mode 100644
index 0000000..0f7d6c1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/FiltersController.cs
@@ -0,0 +1,60 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.ChargeCode;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Filter;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    [ApiController]
+    public class FiltersController : ControllerBase
+    {
+        private readonly IChargeCodeService _chargeCodeService;
+        private readonly IFilterService _filterService;
+
+        public FiltersController(IChargeCodeService chargeCodeService, IFilterService filterService)
+        {
+            _chargeCodeService = chargeCodeService;
+            _filterService = filterService;
+        }
+
+        [HttpGet("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<List<FilterListItem>> GetCostDriverFilters(CancellationToken cancellationToken)
+        {
+            var costDrivers = await _chargeCodeService.GetChargeCodeCostDrivers(cancellationToken);
+            return costDrivers.Select(costDriver => new FilterListItem { Key = costDriver, Title = costDriver }).ToList();
+        }
+
+        [HttpGet("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<List<FilterListItem>> GetSupplyFilters(CancellationToken cancellationToken)
+        {
+            return await _filterService.GetSupplyList(cancellationToken);
+        }
+
+        [HttpGet("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<List<FilterListItem>> GetCostComponentFilters(CancellationToken cancellationToken)
+        {
+            return await _filterService.GetCostComponentList(cancellationToken);
+        }
+
+
+        [HttpGet("[action]/{chipKey}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<List<FilterListItem>> GetSphCriteriaFilters([FromRoute] ChipKey chipKey, CancellationToken cancellationToken)
+        {
+            return await _filterService.GetSphCriteriaList(chipKey, cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/FreeFormOpportunitiesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/FreeFormOpportunitiesController.cs
new file mode 100644
index 0000000..29d8262
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/FreeFormOpportunitiesController.cs
@@ -0,0 +1,131 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.FreeForm.Initiatives;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class FreeFormOpportunitiesController : OpportunityController<FFOpportunity>
+    {
+        private readonly IInitiativeService _initiativeService;
+        private readonly IFFOpportunityService _ffOpportunityService;
+
+        public FreeFormOpportunitiesController(IFFOpportunityService opportunityService,
+            IInitiativeService initiativeService) : base(opportunityService)
+        {
+            _initiativeService = initiativeService;
+            _ffOpportunityService = opportunityService;
+        }
+
+        [HttpPost("")]
+        public async Task<PagedApiResponse<FFOpportunity>> GetOpportunities(FFOpportunityLoadOptions loadOptions, CancellationToken cancellationToken)
+            => await OpportunityService.GetPagedAsync(loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+
+        [HttpGet("{opportunityGuid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<FFOpportunityDetailModel>> GetById(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var dataModel = await _ffOpportunityService.GetDataModelById(opportunityGuid, cancellationToken);
+            var detailModel = dataModel.MapToDetailModel(dataModel.Configuration.FiscalMonthResolver);
+            return Ok(detailModel);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<Guid>> Create(FFOpportunityDto opportunity, CancellationToken cancellationToken)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest();
+            }
+
+            var newOpportunity = opportunity.MapToDataModel();
+            newOpportunity.AuthorGuid = User.GetUserGuid();
+            newOpportunity.AuthorName = User.Identity.Name;
+
+            var opportunityGuid = await ((IFFOpportunityService)OpportunityService).CreateAsync(newOpportunity, cancellationToken);
+            return Ok(opportunityGuid);
+        }
+
+        [HttpDelete("{id}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<bool> Delete(Guid id, CancellationToken cancellationToken)
+          => await OpportunityService.DeleteAsync<FFOpportunityDataModel>(id, cancellationToken);
+
+        [HttpGet("{opportunityGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<FreeFormInitiativeDto>> GetInitiative(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var opportunity = await ((IFFOpportunityService)OpportunityService).GetDataModelById(opportunityGuid, cancellationToken);
+            if (opportunity == null) { return BadRequest(); }
+            var initiative = await _initiativeService.GetById(opportunity.InitiativeGuid, cancellationToken);
+            return initiative.MapToFreeFormInitiative(opportunity);
+        }
+
+        [HttpPost("{opportunityGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task SetGoalsAsync(Guid opportunityGuid, [FromBody] FFOpportunityMonthValuesDto dto, CancellationToken cancellationToken)
+            => await ((IFFOpportunityService)OpportunityService).SetGoalsAsync(opportunityGuid, dto.OpportunityDetail, dto.MonthValues, cancellationToken);
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status201Created)]
+        public async Task<IActionResult> Export(FFOpportunityExportOptions exportOptions, CancellationToken cancellationToken)
+        {
+            var workbook = await ((IFFOpportunityService)OpportunityService).ExportAsync(exportOptions.SortOptions, exportOptions.Filters, cancellationToken);
+            return new ExcelContentResult(workbook, "FF_Opportunities");
+
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<FFFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+            => await ((IFFOpportunityService)OpportunityService).GetFilterOptionsAsync(configurationGuid, cancellationToken);
+
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class FFOpportunityLoadOptions
+    {
+        public PagingOptions PagingOptions { get; set; }
+        public FFFilters Filters { get; set; }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class FFOpportunityExportOptions
+    {
+        public SortOptions SortOptions { get; set; }
+        public FFFilters Filters { get; set; }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class FFOpportunityMonthValuesDto
+    {
+        public FFOpportunityDetailModel OpportunityDetail { get; set; }
+        public IList<FFOpportunityDetailRowData> MonthValues { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/GMDNFileUploadController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/GMDNFileUploadController.cs
new file mode 100644
index 0000000..1b19727
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/GMDNFileUploadController.cs
@@ -0,0 +1,48 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.GMDN;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class GMDNFileUploadController : ControllerBase
+    {
+        private readonly IGMDNService _gmdnService;
+
+        public GMDNFileUploadController(IGMDNService gmdnService)
+        {
+            _gmdnService = gmdnService;
+        }
+
+        [HttpPost("{fileType}/[action]")]
+        [DisableRequestSizeLimit, RequestFormLimits(MultipartBodyLengthLimit = int.MaxValue, ValueLengthLimit = int.MaxValue)]
+        public async Task<ActionResult> UploadGMDNFile(GMDNFileType fileType, IFormFile file, CancellationToken cancellationToken)
+        {
+            var userName = User?.Identity?.Name;
+            switch (fileType)
+            {
+                case GMDNFileType.Term:
+                    await _gmdnService.SeedGMDNTerms(file, userName, cancellationToken);
+                    break;
+                case GMDNFileType.TermCategory:
+                    await _gmdnService.SeedGMDNTermCategories(file, userName, cancellationToken);
+                    break;
+                case GMDNFileType.Category:
+                    await _gmdnService.SeedGMDNCategories(file, userName, cancellationToken);
+                    break;
+            }
+            return Ok();
+        }
+    }
+
+    public enum GMDNFileType
+    {
+        Term,
+        TermCategory,
+        Category
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/GeneralLedgerDetailsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/GeneralLedgerDetailsController.cs
new file mode 100644
index 0000000..7be485d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/GeneralLedgerDetailsController.cs
@@ -0,0 +1,35 @@
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Details;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class GeneralLedgerDetailsController : ControllerBase
+    {
+        private readonly IGLDetailService _glDetailService;
+
+        public GeneralLedgerDetailsController(IGLDetailService glDetailService)
+        {
+            _glDetailService = glDetailService;
+        }
+
+        [HttpPost("{configurationGuid}/[action]")]
+        public async Task<GLDetail> GetDepartmentData(Guid configurationGuid, GLDepartmentAccountData departmentAccountData, CancellationToken cancellationToken)
+        {
+            var result = await _glDetailService.GetOverallDetailAsync(configurationGuid, departmentAccountData, cancellationToken);
+            return result;
+        }
+
+        [HttpPost("{configurationGuid}/[action]")]
+        public async Task<GLDetail> GetStatisticData(Guid configurationGuid, GLDepartmentAccountData departmentAccountData, CancellationToken cancellationToken)
+        {
+            var result = await _glDetailService.GetStatisticDetailAsync(configurationGuid, departmentAccountData, cancellationToken);
+            return result;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/GeneralLedgerOpportunitiesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/GeneralLedgerOpportunitiesController.cs
new file mode 100644
index 0000000..5e5703f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/GeneralLedgerOpportunitiesController.cs
@@ -0,0 +1,87 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class GeneralLedgerOpportunitiesController : OpportunityController<GLOpportunity>
+    {
+
+        public GeneralLedgerOpportunitiesController(IGLOpportunityService opportunityService)
+            : base(opportunityService)
+        {
+        }
+
+        [HttpPost("")]
+        public async Task<PagedApiResponse<GLOpportunity>> GetOpportunities(GLOpportunityLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            return await OpportunityService.GetPagedAsync(loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status201Created)]
+        public async Task<IActionResult> Export(GLOpportunityExportOptions exportOptions, CancellationToken cancellationToken)
+        {
+            var workbook = await ((IGLOpportunityService)OpportunityService).ExportAsync(exportOptions.SortOptions, exportOptions.Filters, cancellationToken);
+            return new ExcelContentResult(workbook, "GL_Opportunities");
+
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<GLFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            return await ((IGLOpportunityService)OpportunityService).GetFilterOptionsAsync(configurationGuid, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<Guid>> Create(GLOpportunitySaveModel opportunity, CancellationToken cancellationToken)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest();
+            }
+
+            opportunity.AuthorGuid = User.GetUserGuid();
+            opportunity.AuthorName = User.Identity.Name;
+
+            var newOpportunityId = await ((IGLOpportunityService)OpportunityService).CreateAsync(opportunity, cancellationToken);
+            return Ok(newOpportunityId);
+        }
+
+        [HttpDelete("{id}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<bool> Delete(Guid id, CancellationToken cancellationToken)
+          => await OpportunityService.DeleteAsync<GLOpportunityDataModel>(id, cancellationToken);
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class GLOpportunityLoadOptions
+    {
+        public PagingOptions PagingOptions { get; set; }
+        public GLFilters Filters { get; set; }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class GLOpportunityExportOptions
+    {
+        public SortOptions SortOptions { get; set; }
+        public GLFilters Filters { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/GudidFileController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/GudidFileController.cs
new file mode 100644
index 0000000..85e447b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/GudidFileController.cs
@@ -0,0 +1,87 @@
+using Hangfire;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using System.Threading;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Strata.ContinuousImprovement.Biz.GMDN;
+using Strata.ContinuousImprovement.Api.Extensions;
+using Strata.ContinuousImprovement.Api.Attributes;
+using Strata.ContinuousImprovement.Biz.GMDN.Jobs;
+using System;
+using Microsoft.Extensions.Options;
+using Strata.ContinuousImprovement.Biz.Hangfire;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+
+    public class GudidFileController : ControllerBase
+    {
+        private readonly IGUDIDService _gudidService;
+        private readonly IBatchJobClient _batchJobClient;
+        private readonly string _datadogUrl;
+        private readonly string _hangfireUrl;
+
+
+        public GudidFileController(
+            IBatchJobClient batchJobClient,
+            IGUDIDService gudidService,
+            IOptions<AccessGudidSection> accessGudidAccessor,
+            IOptions<DatadogSection> datadogAccessor,
+            IOptions<HangfireSection> sectionAccessor)
+        {
+            _gudidService = gudidService;
+            _batchJobClient = batchJobClient;
+            var datadog = datadogAccessor.Value ?? throw new ArgumentNullException(nameof(datadogAccessor));
+            _datadogUrl = datadog.SeedGMDNJob;
+            var hangfire = sectionAccessor.Value ?? throw new ArgumentNullException(nameof(sectionAccessor));
+            _hangfireUrl = hangfire.Url;
+        }
+
+        [HttpPost("{dataGroup}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status415UnsupportedMediaType)]
+        [DisableFormValueModelBinding]
+        [DisableRequestSizeLimit, RequestFormLimits(MultipartBodyLengthLimit = int.MaxValue, ValueLengthLimit = int.MaxValue)]
+        public async Task<ActionResult<string>> SeedGUDID(DataGroupGudId dataGroup, [BindNever] IFormFile file, CancellationToken cancellationToken)
+        {
+            var userName = User?.Identity?.Name;
+            var fileSection = await HttpContext.Request.GetFileFromMultipartUpload(cancellationToken);
+            if (fileSection?.FileStream == null)
+            {
+                // prob should return something to indicate exactly what went wrong.
+                return new UnsupportedMediaTypeResult();
+            }
+
+            switch (dataGroup)
+            {
+                case DataGroupGudId.Identifiers:
+                    await _gudidService.SeedGUDID("tmp", "gudid_identifiers", fileSection.FileStream, fileSection.FileName, userName, cancellationToken);
+                    var jobId = _batchJobClient.StartNew(batch => { batch.Enqueue<SeedGUDIDIdentifierDataJob>(job => job.MergeGUDIDIdentifierData(cancellationToken)); });
+                    return $"{_hangfireUrl}/jobs/details/{jobId}";
+                case DataGroupGudId.Terms:
+                    await _gudidService.SeedGUDID("public", "gudid_terms", fileSection.FileStream, fileSection.FileName, userName, cancellationToken);
+                    break;
+                case DataGroupGudId.Devices:
+                    await _gudidService.SeedGUDID("public", "gudid_devices", fileSection.FileStream, fileSection.FileName, userName, cancellationToken);
+                    break;
+            }
+            return Ok();
+        }
+
+        [HttpGet("[action]")]
+        public string DatadogUrl()
+        { return _datadogUrl; }
+
+        public enum DataGroupGudId
+        {
+            Terms,
+            Devices,
+            Identifiers
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/HangfireController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/HangfireController.cs
new file mode 100644
index 0000000..f1fb510
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/HangfireController.cs
@@ -0,0 +1,62 @@
+using Hangfire;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Strata.ContinuousImprovement.Biz.GMDN;
+using Strata.ContinuousImprovement.Biz.Hangfire;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Hangfire.Jazz.Client.Models;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class HangfireController : ControllerBase
+    {
+        private readonly IJazzHangfireServiceClient _hangfireService;
+        private readonly string _accessGudidUrl;
+        private readonly string _datadogUrl;
+
+        public HangfireController(
+            IJazzHangfireServiceClient jazzHangfireServiceClient,
+            IOptions<AccessGudidSection> accessGudidAccessor,
+            IOptions<DatadogSection> datadogAccessor,
+            IOptions<HangfireSection> sectionAccessor)
+        {
+            _hangfireService = jazzHangfireServiceClient;
+            var accessGudid = accessGudidAccessor.Value ?? throw new ArgumentNullException(nameof(accessGudidAccessor));
+            _accessGudidUrl = accessGudid.Url;
+            var datadog = datadogAccessor.Value ?? throw new ArgumentNullException(nameof(datadogAccessor));
+            _datadogUrl = datadog.SeedGMDNJob;
+            var hangfire = sectionAccessor.Value ?? throw new ArgumentNullException(nameof(sectionAccessor));
+
+        }
+
+        [HttpGet("{jobId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<ActionResult<JobInfoDto>> JobStatus(Guid jobId, CancellationToken cancellationToken)
+        {
+            var result = await _hangfireService.GetJobInfoAsync(jobId, cancellationToken);
+            return Ok(result);
+        }
+
+        [HttpGet("[action]")]
+        public string DatadogUrl()
+        { return _datadogUrl; }
+
+        [HttpGet("[action]")]
+        public string AccessGudidUrl()
+        { return _accessGudidUrl; }
+
+        public enum DataGroup
+        {
+            Terms,
+            Devices,
+            Identifiers
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/InitiativeDetailColumnsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/InitiativeDetailColumnsController.cs
new file mode 100644
index 0000000..8c41436
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/InitiativeDetailColumnsController.cs
@@ -0,0 +1,91 @@
+using Microsoft.AspNetCore.Mvc;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.InitiativeDetailColumns;
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class InitiativeDetailColumnsController : ControllerBase
+    {
+        private readonly IInitiativeDetailColumnService _initiativeDetailColumnService;
+        private readonly IInitiativeRollupColumnService _initiativeRollupColumnService;
+
+        public InitiativeDetailColumnsController(IInitiativeDetailColumnService initiativeDetailColumnService, IInitiativeRollupColumnService initiativeRollupColumnService)
+        {
+            _initiativeDetailColumnService = initiativeDetailColumnService;
+            _initiativeRollupColumnService = initiativeRollupColumnService;
+        }
+
+        [HttpGet("[action]")]
+        public async Task<IEnumerable<InitiativeDetailColumn>> GetColumnList(CancellationToken cancellationToken)
+        {
+            var userGuid = User?.GetUserGuid() ?? Guid.Empty;
+            return await ManageRollupColumns((await _initiativeDetailColumnService.GetColumnList(userGuid, cancellationToken)), cancellationToken);
+        }
+
+        [HttpGet("[action]")]
+        public async Task<IEnumerable<InitiativeDetailColumn>> GetDefaultColumnList(CancellationToken cancellationToken)
+        {
+            return await ManageRollupColumns(_initiativeDetailColumnService.GetDefaultColumnList(), cancellationToken);
+        }
+
+        private async Task<IEnumerable<InitiativeDetailColumn>> ManageRollupColumns(IEnumerable<InitiativeDetailColumn> columns, CancellationToken cancellationToken)
+        {
+            var columnList = columns.ToList();
+            // Add any custom rollups to default list
+            var rollupColumns = (await _initiativeRollupColumnService.GetAllAsync(cancellationToken))
+
+                .OrderBy(x => x.InitiativeRollupColumnId).ToList();
+            if (rollupColumns.Any())
+            {
+                Enumerable.Range(1, 3).ForEach(id =>
+                {
+                    var column = columnList.Find(dflt => rollupColumns.Any(rc => dflt.Name.StartsWith($"InitiativeRollup{id}", StringComparison.CurrentCultureIgnoreCase)));
+                    if (column != null)
+                    {
+                        var rollupColumn = rollupColumns.Find(rc => rc.InitiativeRollupColumnId == id);
+                        if (rollupColumn != null)
+                        {
+                            column.Heading = rollupColumn.Name;
+                            column.InitiativeRollupColumnId = rollupColumn.InitiativeRollupColumnId;
+                        }
+                        else
+                        {
+                            columnList.Remove(column);
+                        }
+                    }
+                });
+            }
+            else
+            {
+                // no rollups configured - remove rollup columns
+                columnList.RemoveAll(x => x.Name.StartsWith("InitiativeRollup"));
+            }
+            return columnList;
+        }
+
+        [HttpPost("[action]")]
+        public async Task SetColumnList(InitiativeDetailColumnSaveInfo columnInfo, CancellationToken cancellationToken)
+        {
+            var userGuid = User?.GetUserGuid() ?? Guid.Empty;
+            await _initiativeDetailColumnService.SetColumnList(userGuid, columnInfo.Columns, cancellationToken);
+        }
+
+        [ExcludeFromCodeCoverage]
+        public class InitiativeDetailColumnSaveInfo
+        {
+            public IEnumerable<InitiativeDetailColumn> Columns { get; set; }
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/InitiativeRollupColumnsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/InitiativeRollupColumnsController.cs
new file mode 100644
index 0000000..7f840fb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/InitiativeRollupColumnsController.cs
@@ -0,0 +1,127 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class InitiativeRollupColumnsController : ControllerBase
+    {
+        private readonly IInitiativeRollupColumnService _initiativeRollupColumnService;
+
+        public InitiativeRollupColumnsController(IInitiativeRollupColumnService initiativeRollupColumnService)
+        {
+            _initiativeRollupColumnService = initiativeRollupColumnService;
+        }
+
+        [HttpGet]
+        public async Task<IEnumerable<InitiativeRollupColumn>> GetInitiativeRollupColumnsAsync(CancellationToken cancellationToken)
+        {
+            return await _initiativeRollupColumnService.GetAllAsync(cancellationToken);
+        }
+
+        [HttpGet("{initiativeRollupColumnId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<InitiativeRollupColumn>> GetByIdAsync([FromRoute] int initiativeRollupColumnId, CancellationToken cancellationToken)
+        {
+            var rollupColumn = await _initiativeRollupColumnService.GetByIdAsync(initiativeRollupColumnId, cancellationToken);
+            if (rollupColumn != null)
+            {
+                return Ok(rollupColumn);
+            }
+            return NotFound();
+        }
+
+        [HttpPost("[action]/{initiativeRollupColumnId}")]
+        public async Task<bool> IsNameValid([FromRoute] int initiativeRollupColumnId, [FromBody] string name, CancellationToken cancellationToken)
+        {
+            return await _initiativeRollupColumnService.IsNameValid(name, cancellationToken, initiativeRollupColumnId);
+        }
+
+        [HttpPost]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [Authorize(Policy = Policies.IsAdmin)]
+        public async Task<ActionResult<InitiativeRollupColumn>> Create(InitiativeRollupColumnCreateInfo createInfo, CancellationToken cancellationToken)
+        {
+            if (await _initiativeRollupColumnService.ContainsNameAsync(createInfo.Name, cancellationToken))
+            {
+                return BadRequest();
+            }
+            return await _initiativeRollupColumnService.CreateAsync(createInfo, cancellationToken);
+        }
+
+        [HttpPut("{initiativeRollupColumnId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        [Authorize(Policy = Policies.IsAdmin)]
+        public async Task<ActionResult<InitiativeRollupColumn>> Update([FromRoute] int initiativeRollupColumnId, [FromBody] InitiativeRollupColumnSaveInfo initiativeRollupColumnSaveInfo, CancellationToken cancellationToken)
+        {
+            if (await _initiativeRollupColumnService.ContainsNameAsync(initiativeRollupColumnSaveInfo.Name, cancellationToken, initiativeRollupColumnId))
+            {
+                return BadRequest();
+            }
+            if (!await _initiativeRollupColumnService.ContainsAsync(initiativeRollupColumnId, cancellationToken))
+            {
+                return NotFound();
+            }
+
+            return await _initiativeRollupColumnService.UpdateAsync(initiativeRollupColumnId, initiativeRollupColumnSaveInfo, cancellationToken);
+        }
+
+        [HttpDelete("{initiativeRollupColumnId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        [Authorize(Policy = Policies.IsAdmin)]
+        public async Task<IActionResult> Delete([FromRoute] int initiativeRollupColumnId, CancellationToken cancellationToken)
+        {
+            if (!await _initiativeRollupColumnService.ContainsAsync(initiativeRollupColumnId, cancellationToken))
+            {
+                return NotFound();
+            }
+
+            await _initiativeRollupColumnService.DeleteAsync(initiativeRollupColumnId, cancellationToken);
+            return NoContent();
+        }
+
+        [HttpGet("{initiativeRollupColumnId}/values")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public async Task<ActionResult<IEnumerable<InitiativeRollupValue>>> GetInitiativeRollupValuesAsync([FromRoute] int initiativeRollupColumnId, CancellationToken cancellationToken)
+        {
+            var values = await _initiativeRollupColumnService.GetByRollupValuesById(initiativeRollupColumnId, cancellationToken);
+            if (values != null)
+            {
+                return Ok(values);
+            }
+
+            return NotFound();
+        }
+
+        [HttpPut("{initiativeRollupColumnId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [Authorize(Policy = Policies.IsAdmin)]
+        public async Task<ActionResult<InitiativeRollupValue>> AddRollupValueAsync([FromRoute] int initiativeRollupColumnId, [FromBody] string value, CancellationToken cancellationToken)
+        {
+            var values = await _initiativeRollupColumnService.GetByRollupValuesById(initiativeRollupColumnId, cancellationToken);
+            if (values == null) { return NotFound(); }
+            if (values.Select(v => v.Value).Contains(value)) { return BadRequest(); }
+            return await _initiativeRollupColumnService.AddRollupValue(initiativeRollupColumnId, value, cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/InitiativesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/InitiativesController.cs
new file mode 100644
index 0000000..59448d6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/InitiativesController.cs
@@ -0,0 +1,643 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
+using Microsoft.OpenApi.Extensions;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Jobs;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Encounter.Initiatives;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.FreeForm.Initiatives;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Initiatives;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Initiatives.Filters;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Payroll.Initiatives;
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.FeatureFlags.Client;
+using Strata.Hangfire.Jazz.Client;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class InitiativesController : ControllerBase
+    {
+        private readonly IInitiativeService _initiativeService;
+        private readonly ICCOpportunityService _ccOpportunityService;
+        private readonly ICCInitiativeService _ccInitiativeService;
+        private readonly IENOpportunityService _enOpportunityService;
+        private readonly IENInitiativeService _enInitiativeService;
+        private readonly IFFOpportunityService _ffOpportunityService;
+        private readonly IFFInitiativeService _ffInitiativeService;
+        private readonly IGLOpportunityService _glOpportunityService;
+        private readonly IGLInitiativeService _glInitiativeService;
+        private readonly IPROpportunityService _prOpportunityService;
+        private readonly IPRInitiativeService _prInitiativeService;
+        private readonly IStakeholderUser _stakeholderUser;
+        private readonly IHubContext<NotificationHub, INotificationHub> _notificationHubContext;
+        private readonly ILogger<InitiativesController> _logger;
+        private readonly ICCInitiativeJob _ccInitiativeJob;
+        private readonly IJazzHangfireServiceClient _hangfireService;
+        private readonly IInitiativeRollupColumnService _initiativeRollupColumnService;
+        private readonly IFeatureFlagServiceClient _featureFlagServiceClient;
+        private readonly IAllOpportunityService _allOpportunityService;
+
+#pragma warning disable S107 // Constructor has NN parameters, which is greater than the 7 authorized
+        public InitiativesController(IInitiativeService initiativeService,
+            ICCOpportunityService ccOpportunityService,
+            ICCInitiativeService ccInitiativeService,
+            IENOpportunityService enOpportunityService,
+            IENInitiativeService enInitiativeService,
+            IFFOpportunityService ffOpportunityService,
+            IFFInitiativeService ffInitiativeService,
+            IGLOpportunityService glOpportunityService,
+            IGLInitiativeService glInitiativeService,
+            IPROpportunityService prOpportunityService,
+            IPRInitiativeService prInitiativeService,
+            IStakeholderUser stakeholderUser,
+            IHubContext<NotificationHub, INotificationHub> notificationHubContext,
+            ILogger<InitiativesController> logger,
+            ICCInitiativeJob ccInitiativeJob,
+            IJazzHangfireServiceClient hangfireService,
+            IInitiativeRollupColumnService initiativeRollupColumnService,
+            IFeatureFlagServiceClient featureFlagServiceClient,
+            IAllOpportunityService allOpportunityService)
+#pragma warning restore S107 // Constructor has NN parameters, which is greater than the 7 authorized
+        {
+            _initiativeService = initiativeService;
+            _ccOpportunityService = ccOpportunityService;
+            _ccInitiativeService = ccInitiativeService;
+            _enOpportunityService = enOpportunityService;
+            _enInitiativeService = enInitiativeService;
+            _ffOpportunityService = ffOpportunityService;
+            _ffInitiativeService = ffInitiativeService;
+            _glOpportunityService = glOpportunityService;
+            _glInitiativeService = glInitiativeService;
+            _prOpportunityService = prOpportunityService;
+            _prInitiativeService = prInitiativeService;
+            _stakeholderUser = stakeholderUser;
+            _notificationHubContext = notificationHubContext;
+            _logger = logger;
+            _ccInitiativeJob = ccInitiativeJob;
+            _hangfireService = hangfireService;
+            _initiativeRollupColumnService = initiativeRollupColumnService;
+            _featureFlagServiceClient = featureFlagServiceClient;
+            _allOpportunityService = allOpportunityService;
+        }
+
+        [HttpPost()]
+        public async Task<IEnumerable<InitiativeDetailTreeGridModel>> GetInitiatives(InitiativeFilters filters, CancellationToken cancellationToken)
+        {
+            var userGuid = User?.GetUserGuid() ?? Guid.Empty;
+            var initiatives = await _initiativeService.GetInitiatives(filters, cancellationToken);
+            await _initiativeService.SetFilterSettings(userGuid, filters, cancellationToken);
+            return initiatives;
+        }
+
+        [HttpGet("{initiativeGuid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<InitiativeDetail>> GetById(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            var initiative = await _initiativeService.GetById(initiativeGuid, cancellationToken);
+            return initiative.MapToDetail();
+        }
+
+        [HttpGet("{initiativeGuid}/[action]")]
+        public async Task<InitiativeInfo> GetInitiativeInfo(Guid initiativeGuid, CancellationToken cancellationToken)
+            => await _initiativeService.GetInitiativeInfoAsync(initiativeGuid, cancellationToken);
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status202Accepted)]
+        public async Task<IActionResult> Export(bool exportAll, [FromBody] InitiativeExportOptions filters, CancellationToken cancellationToken)
+        {
+            var workbook = await _initiativeService.ExportAsync(exportAll, User.GetUserGuid(), filters.SortOptions, filters.Filters, cancellationToken);
+            return new ExcelContentResult(workbook, "Initiatives");
+        }
+
+        [HttpGet("[action]")]
+        public async Task<IEnumerable<WorkstreamDto>> GetWorkstreams(CancellationToken cancellationToken)
+        {
+            return await _initiativeService.GetWorkstreams(cancellationToken);
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<InitiativeFilterOptions> GetFilterOptions(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            return await _initiativeService.GetFilterOptions(configurationGuid, cancellationToken);
+        }
+
+        [HttpGet("[action]")]
+        public async Task<InitiativeFilters> GetFilterSettings(CancellationToken cancellationToken)
+        {
+            var userGuid = User?.GetUserGuid() ?? Guid.Empty;
+            return await _initiativeService.GetFilterSettings(userGuid, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        public async Task<InitiativeFilters> SetFilterSettings(InitiativeFilters filters, CancellationToken cancellationToken)
+        {
+            var userGuid = User?.GetUserGuid() ?? Guid.Empty;
+            return await _initiativeService.SetFilterSettings(userGuid, filters, cancellationToken);
+        }
+
+        [HttpPut("[action]")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public async Task<IActionResult> SetRampupInfo(InitiativeDto initiative, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var found = await _initiativeService.GetById(initiative.InitiativeGuid, cancellationToken);
+                if (found == null)
+                {
+                    return NotFound();
+                }
+
+                await _initiativeService.SetRampupInfo(initiative, cancellationToken);
+                return NoContent();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, info: new Dictionary<string, object> { { nameof(initiative), initiative } });
+                return BadRequest();
+            }
+        }
+
+        [HttpPut("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [Authorize(Policy = Policies.IsAdmin)]
+        public async Task<IActionResult> SetInitiativeRollupValue(InitiativeRollupValueInfo initiativeRollupValue, CancellationToken cancellationToken)
+        {
+            if (!await _initiativeService.ContainsAsync(initiativeRollupValue.InitiativeGuid, cancellationToken))
+            {
+                return NotFound();
+            }
+            if (!await _initiativeRollupColumnService.ContainsAsync(initiativeRollupValue.RollupId, cancellationToken))
+            {
+                return BadRequest();
+            }
+            await _initiativeService.SetRollupValue(initiativeRollupValue.InitiativeGuid, initiativeRollupValue.RollupId, initiativeRollupValue.RollupValueId, cancellationToken);
+            return Ok();
+        }
+
+        [ExcludeFromCodeCoverage]
+        public class InitiativeRollupValueInfo
+        {
+            public Guid InitiativeGuid { get; set; }
+            public int RollupId { get; set; }
+            public int RollupValueId { get; set; }
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult> CreateChargeCode(CCInitiativeDto initiative, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(initiative.Initiative.Name);
+            try
+            {
+                var dbGuid = User?.GetDatabaseGuid() ?? Guid.Empty;
+                var isNameValid = await _allOpportunityService.NameIsValid(initiative.Initiative.ConfigurationGuid, (int)OpportunityTypes.ChargeCode, initiative.Initiative.Name,
+                    initiative.Initiative.OpportunityGuid, cancellationToken);
+                if (dbGuid == Guid.Empty || !isNameValid)
+                {
+                    return BadRequest();
+                }
+                await hub.SendOpportunityCreate(initiative.Initiative.Name);
+                if (initiative.Initiative.OpportunityGuid == Guid.Empty)
+                {
+                    await _ccInitiativeJob.CreateChargeCodeInitiative(initiative.Initiative, initiative.NetworkOpportunityId, dbGuid, cancellationToken);
+                }
+                else
+                {
+                    var opportunity = await _ccOpportunityService.GetById(initiative.Initiative.OpportunityGuid, cancellationToken);
+
+                    //  Save Initiative
+                    var newInitiative = initiative.Initiative.MapToInitiative(_stakeholderUser);
+                    var initiativeGuid = await _ccInitiativeService.CreateChargeCodeInitiative(dbGuid, newInitiative, opportunity.OpportunityGuid, cancellationToken);
+                    return Ok(initiativeGuid);
+                }
+
+                return Ok();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, info: new Dictionary<string, object> { { "initiativeName", initiative.Initiative.Name } });
+                await hub.SendOpportunityCreateError(initiative.Initiative.Name, ex.Message);
+                return BadRequest();
+            }
+        }
+
+        [ExcludeFromCodeCoverage]
+        public class CCInitiativeDto
+        {
+            public ChargeCodeInitiativeDto Initiative { get; set; }
+            public int? NetworkOpportunityId { get; set; }
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<Guid>> UpdateChargeCode(CCInitiativeDto initiativeOpportunity, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(initiativeOpportunity.Initiative.Name);
+
+            try
+            {
+                var dbGuid = User?.GetDatabaseGuid() ?? Guid.Empty;
+                var isNameValid = await _allOpportunityService.NameIsValid(initiativeOpportunity.Initiative.ConfigurationGuid, (int)OpportunityTypes.ChargeCode, initiativeOpportunity.Initiative.Name,
+                    initiativeOpportunity.Initiative.OpportunityGuid, cancellationToken);
+                if (dbGuid == Guid.Empty || !isNameValid)
+                {
+                    return BadRequest();
+                }
+                await hub.SendOpportunityUpdate(initiativeOpportunity.Initiative.Name);
+                await _ccInitiativeJob.UpdateChargeCodeInitiative(initiativeOpportunity.Initiative, initiativeOpportunity.NetworkOpportunityId, dbGuid, cancellationToken);
+                return Ok();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, info: new Dictionary<string, object> { { "initiativeName", initiativeOpportunity.Initiative.Name } });
+                await hub.SendOpportunityCreateError(initiativeOpportunity.Initiative.Name, ex.Message);
+                return BadRequest();
+            }
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<Guid>> CreateEncounter(EncounterInitiativeDto initiative, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(initiative.Name);
+            try
+            {
+                var dbGuid = User?.GetDatabaseGuid() ?? Guid.Empty;
+                var isNameValid = await _allOpportunityService.NameIsValid(initiative.ConfigurationGuid, (int)OpportunityTypes.Encounter, initiative.Name,
+                    Guid.Empty, cancellationToken);
+                if (dbGuid == Guid.Empty || !isNameValid)
+                {
+                    return BadRequest();
+                }
+                await hub.SendOpportunityCreate(initiative.Name);
+                var opportunityWithFilters = initiative.MapToDataModel(User);
+                await _enOpportunityService.SetOpportunityFilters(opportunityWithFilters, cancellationToken);
+                var newOpportunity = opportunityWithFilters.MapToDataModel(User);
+                var isTempoPage = await _featureFlagServiceClient.IsEnabledAsync("enableencounteropportunityintempo", dbGuid, cancellationToken: cancellationToken);
+
+                var jobId = await _enOpportunityService.CreateAsync(newOpportunity, dbGuid, isTempoPage, cancellationToken);
+
+                await hub.SendInitiativeCreate(initiative.Name);
+                Initiative newInitiative = initiative.MapToInitiative(_stakeholderUser);
+                await _enInitiativeService.CreateInitiative(dbGuid, newInitiative, newOpportunity.OpportunityGuid, cancellationToken);
+                return newOpportunity.OpportunityGuid;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, ex.Message);
+                return Guid.Empty;
+            }
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<EncounterInitiativeDto>> UpdateEncounter(EncounterInitiativeDto initiativeDto, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(initiativeDto.Name);
+
+            try
+            {
+                var dbGuid = User?.GetDatabaseGuid() ?? Guid.Empty;
+                var isNameValid = await _allOpportunityService.NameIsValid(initiativeDto.ConfigurationGuid, (int)OpportunityTypes.Encounter, initiativeDto.Name,
+                    initiativeDto.OpportunityGuid, cancellationToken);
+                if (dbGuid == Guid.Empty || !isNameValid)
+                {
+                    return BadRequest();
+                }
+                var initiative = initiativeDto.MapToInitiative(_stakeholderUser);
+
+                if (initiativeDto.InitiativeGuid == Guid.Empty)
+                {
+                    await hub.SendInitiativeCreate(initiativeDto.Name);
+                    var newInitiativeGuid = await _enInitiativeService.CreateInitiative(dbGuid, initiative, initiativeDto.OpportunityGuid, cancellationToken);
+                    initiativeDto.InitiativeGuid = newInitiativeGuid;
+                }
+                else
+                {
+                    var updatedOpportunity = initiativeDto.MapToDataModel(User, false);
+                    var jobId = await _enOpportunityService.UpdateAsync(dbGuid, updatedOpportunity, cancellationToken);
+
+                    await _enInitiativeService.UpdateInitiative(initiative, updatedOpportunity.OpportunityGuid, cancellationToken);
+                }
+
+                return Ok(initiativeDto);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, ex.Message);
+                return BadRequest();
+            }
+        }
+
+        /// <summary>
+        /// Hangfire job helper to wait for job completion and check success.
+        /// </summary>
+        /// <param name="jobId"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        private async Task<bool> JobFinishedSuccessfully(Guid jobId, CancellationToken cancellationToken)
+        {
+            // Wait for the job to finish
+            var result = await _hangfireService.GetJobInfoAsync(jobId, cancellationToken);
+            while (result.IsRunningStatus())
+            {
+                await Task.Delay(500, cancellationToken);
+                result = await _hangfireService.GetJobInfoAsync(jobId, cancellationToken);
+            }
+            return result.IsSuccessful();
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<Guid>> CreateFreeForm(FreeFormInitiativeDto initiative, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var dbGuid = User?.GetDatabaseGuid() ?? Guid.Empty;
+                if (dbGuid == Guid.Empty)
+                {
+                    return BadRequest();
+                }
+                var newOpportunity = initiative.MapToDataModel(User);
+                var opportunityGuid = await _ffOpportunityService.CreateAsync(newOpportunity, cancellationToken);
+
+                var newInitiative = initiative.MapToInitiative(_stakeholderUser);
+                await _ffInitiativeService.CreateInitiative(dbGuid, newInitiative, opportunityGuid, cancellationToken);
+                return newOpportunity.OpportunityGuid;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, ex.Message);
+                return Guid.Empty;
+            }
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<FreeFormInitiativeDto>> UpdateFreeForm(FreeFormInitiativeDto initiativeDto, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var dbGuid = User?.GetDatabaseGuid() ?? Guid.Empty;
+                if (dbGuid == Guid.Empty)
+                {
+                    return BadRequest();
+                }
+                var initiative = initiativeDto.MapToInitiative(_stakeholderUser);
+
+                if (initiativeDto.InitiativeGuid == Guid.Empty)
+                {
+                    var newInitiativeGuid = await _ffInitiativeService.CreateInitiative(dbGuid, initiative, initiativeDto.OpportunityGuid, cancellationToken);
+                    initiativeDto.InitiativeGuid = newInitiativeGuid;
+                }
+                else
+                {
+                    var updatedOpportunity = initiativeDto.MapToOpportunity();
+                    await _ffOpportunityService.UpdateAsync(updatedOpportunity, cancellationToken);
+                    await _ffInitiativeService.UpdateAsync(initiative, cancellationToken);
+                }
+
+                return Ok(initiativeDto);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, ex.Message);
+                return BadRequest(default(FreeFormInitiativeDto));
+            }
+        }
+
+        [HttpGet("{initiativeGuid}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult> Finalize(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            try
+            {
+                await _initiativeService.FinalizeInitiative(initiativeGuid, cancellationToken);
+                if (!(await RunTracking(initiativeGuid, cancellationToken)))
+                {
+                    throw new Exception($"Initiative tracking job did not complete successfully for initiative {initiativeGuid}.");
+                }
+                return Ok();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+                return BadRequest();
+            }
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(typeof(Guid), StatusCodes.Status201Created)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<Guid>> CreateGeneralLedger(GeneralLedgerInitiativeDto initiative, CancellationToken cancellationToken)
+        {
+            var opportunityGuid = await CreateOpportunityAndInitiativeWithJob(
+                initiative.MapToDataModel(User),
+                initiative.MapToInitiative(_stakeholderUser),
+                _glOpportunityService.CreateAsync,
+                _glInitiativeService.CreateInitiative,
+                OpportunityTypes.GeneralLedger.GetDisplayName(),
+                cancellationToken);
+
+            return CreatedAtAction(nameof(CreateGeneralLedger), null, opportunityGuid);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(typeof(Guid), StatusCodes.Status201Created)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<Guid>> CreatePayroll(PayrollInitiativeDto initiative, CancellationToken cancellationToken)
+        {
+            var opportunityGuid = await CreateOpportunityAndInitiativeWithJob(
+                initiative.MapToDataModel(User),
+                initiative.MapToInitiative(_stakeholderUser),
+                _prOpportunityService.CreateAsync,
+                _prInitiativeService.CreateInitiative,
+                OpportunityTypes.Payroll.GetDisplayName(),
+                cancellationToken);
+
+            return CreatedAtAction(nameof(CreatePayroll), null, opportunityGuid);
+        }
+
+        private async Task<ActionResult<Guid>> CreateOpportunityAndInitiativeWithJob<TOpportunityDataModel>(
+            TOpportunityDataModel newOpportunity,
+            Initiative initiative,
+            Func<TOpportunityDataModel, CancellationToken, Task<Guid>> createOpportunityFunc,
+            Func<Guid, Initiative, Guid, CancellationToken, Task<Guid>> createInitiativeFunc,
+            string opportunityType,
+            CancellationToken cancellationToken)
+            where TOpportunityDataModel : IOpportunity
+        {
+            ArgumentNullException.ThrowIfNull(initiative);
+
+            var dbGuid = User.GetDatabaseGuid();
+            if (dbGuid == Guid.Empty)
+            {
+                throw new Exception("Invalid database context.");
+            }
+
+            // Use the opportunity GUID from the data model
+            var opportunityGuid = newOpportunity.OpportunityGuid;
+            var jobId = await createOpportunityFunc(newOpportunity, cancellationToken);
+
+            // Result is a job ID - wait for completion
+            var jobFinishedSuccessfully = await JobFinishedSuccessfully(jobId, cancellationToken);
+            if (!jobFinishedSuccessfully)
+            {
+                throw new Exception($"{opportunityType} Opportunity creation job did not complete successfully.");
+            }
+
+            var initiativeGuid = await createInitiativeFunc(dbGuid, initiative, opportunityGuid, cancellationToken);
+            if (initiativeGuid == Guid.Empty)
+            {
+                throw new Exception($"{opportunityType} Initiative creation failed for opportunity {opportunityGuid}.");
+            }
+            return opportunityGuid;
+        }
+
+        [HttpGet("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<IEnumerable<InitiativeCriteriaDto>> GetCriteria(CancellationToken cancellationToken)
+        {
+            return await _initiativeService.GetCriteria(cancellationToken);
+        }
+
+        [HttpGet("[action]/{initiativeGuid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<InitiativeScoresDto> GetScores(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            return await _initiativeService.GetScores(initiativeGuid, cancellationToken);
+        }
+
+        [HttpPut("set-scores")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<bool> SetScores(InitiativeScoresDto scores, CancellationToken cancellationToken)
+        {
+            var result = await _initiativeService.SetScores(scores, cancellationToken);
+            return result;
+        }
+
+        /// <summary>
+        /// Runs tracking for an initiative and waits for completion.
+        /// </summary>
+        /// <param name="initiativeGuid"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        private async Task<bool> RunTracking(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            var jobId = await _initiativeService.RunTracking(initiativeGuid, cancellationToken);
+            var jobFinishedSuccessfully = await JobFinishedSuccessfully(jobId, cancellationToken);
+            if (!jobFinishedSuccessfully)
+            {
+                throw new Exception($"Initiative tracking job did not complete successfully for initiative {initiativeGuid}.");
+            }
+            return jobFinishedSuccessfully;
+        }
+
+        private static readonly List<int> SupportedOpportunityTypesForNameRetrieval =
+        [
+            (int)OpportunityTypes.GeneralLedger,
+            (int)OpportunityTypes.Payroll
+        ];
+
+        /// <summary>
+        /// Retrieves the opportunity ID for a given initiative or opportunity name.
+        /// </summary>
+        /// <param name="name">The name to search for.</param>
+        /// <param name="cancellationToken">Cancellation token for the operation.</param>
+        /// <returns>The opportunity GUID if found.</returns>
+        [HttpGet("[action]")]
+        [ProducesResponseType(typeof(Guid), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public async Task<ActionResult<Guid>> GetOpportunityGuidByName([FromQuery] Guid configurationGuid,
+            [FromQuery] int opportunityType, [FromQuery] string name, CancellationToken cancellationToken)
+        {
+            if (configurationGuid == Guid.Empty) { return BadRequest("Invalid configuration GUID."); }
+            if (!SupportedOpportunityTypesForNameRetrieval.Contains(opportunityType)) { return BadRequest("Invalid opportunity type."); }
+            if (string.IsNullOrWhiteSpace(name)) { return BadRequest("Name parameter is required."); }
+
+            try
+            {
+                var initiative = await _initiativeService.FindInitiativeByPartialName(configurationGuid, name, cancellationToken);
+                if (initiative == null)
+                {
+                    var opp = await _allOpportunityService.GetOpportunityByNamePrefix(configurationGuid, (OpportunityTypes)opportunityType, name, cancellationToken);
+                    return opp == null
+                        ? throw new Exception($"No Initiative/Opportunity found with name: {name}")
+                        : (ActionResult<Guid>)Ok(opp.OpportunityGuid);
+                }
+                var opportunity = await _allOpportunityService.GetByInitiativeId(initiative.InitiativeGUID, configurationGuid, (OpportunityTypes)opportunityType, cancellationToken);
+                return opportunity == null
+                    ? throw new Exception($"Opportunity not found for initiative: {initiative.InitiativeGUID}")
+                    : (ActionResult<Guid>)Ok(opportunity.OpportunityGuid);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, ex.Message);
+                return NotFound();
+            }
+        }
+
+
+        [ExcludeFromCodeCoverage]
+        public class InitiativeExportOptions
+        {
+            public SortOptions SortOptions { get; set; }
+            public InitiativeFilters Filters { get; set; }
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/JazzQvi/NonQviSavingsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/JazzQvi/NonQviSavingsController.cs
new file mode 100644
index 0000000..23b1942
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/JazzQvi/NonQviSavingsController.cs
@@ -0,0 +1,67 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.QualityVariation.QVI;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers.JazzQvi
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/quality-variation-savings/non-qvi")]
+    public class NonQviSavingsController : ControllerBase
+    {
+        private readonly INonQviSavingsService _nonQviSavingsService;
+
+        public NonQviSavingsController(INonQviSavingsService nonQviSavingsService)
+        {
+            _nonQviSavingsService = nonQviSavingsService;
+        }
+
+        [HttpGet("case-type-families")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<NonQviCaseTypeFamilyInfo>>> GetCaseTypeFamilies(
+            [FromQuery] Guid configurationGuid,
+            [FromQuery] bool isBaseline = false,
+            CancellationToken cancellationToken = default)
+        {
+            if (configurationGuid == Guid.Empty)
+            {
+                return BadRequest("configurationGuid is required.");
+            }
+
+            var result = await _nonQviSavingsService.GetCaseTypeFamilyInfoAsync(
+                configurationGuid,
+                isBaseline,
+                cancellationToken);
+
+            return Ok(result);
+        }
+
+        [HttpGet("drg-types")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<NonQviDrgTypeInfo>>> GetDrgTypes(
+            [FromQuery] Guid configurationGuid,
+            [FromQuery] bool isBaseline = false,
+            CancellationToken cancellationToken = default)
+        {
+            if (configurationGuid == Guid.Empty)
+            {
+                return BadRequest("configurationGuid is required.");
+            }
+
+            var result = await _nonQviSavingsService.GetDrgTypeInfoAsync(
+                configurationGuid,
+                isBaseline,
+                cancellationToken);
+
+            return Ok(result);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/JazzQvi/QviEncountersController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/JazzQvi/QviEncountersController.cs
new file mode 100644
index 0000000..eb08bb8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/JazzQvi/QviEncountersController.cs
@@ -0,0 +1,47 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.QualityVariation.QVI;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers.JazzQvi
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/quality-variation-encounters")]
+    public class QviEncountersController : ControllerBase
+    {
+        private readonly IQviEncounterService _qviEncounterService;
+
+        public QviEncountersController(IQviEncounterService qviEncounterService)
+        {
+            _qviEncounterService = qviEncounterService;
+        }
+
+        [HttpGet]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<EncounterInfo>>> Get(
+            [FromQuery] Guid configurationGuid,
+            [FromQuery] DateTime startDate,
+            [FromQuery] DateTime endDate,
+            CancellationToken cancellationToken = default)
+        {
+            if (configurationGuid == Guid.Empty)
+            {
+                return BadRequest("configurationGuid is required.");
+            }
+
+            var result = await _qviEncounterService.GetEncounterInfoAsync(
+                configurationGuid,
+                startDate,
+                endDate,
+                cancellationToken);
+
+            return Ok(result);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/JazzQvi/QviLineItemSavingsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/JazzQvi/QviLineItemSavingsController.cs
new file mode 100644
index 0000000..13fc435
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/JazzQvi/QviLineItemSavingsController.cs
@@ -0,0 +1,91 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.QualityVariation.QVI;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers.JazzQvi
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/quality-variation-savings/line-items")]
+    public class QviLineItemSavingsController : ControllerBase
+    {
+        private readonly IQviLineItemSavingsService _qviLineItemSavingsService;
+
+        public QviLineItemSavingsController(IQviLineItemSavingsService qviLineItemSavingsService)
+        {
+            _qviLineItemSavingsService = qviLineItemSavingsService;
+        }
+
+        [HttpGet("case-type-families")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<QviLineItemCaseTypeFamilyInfo>>> GetCaseTypeFamilies(
+            [FromQuery] Guid configurationGuid,
+            [FromQuery] bool isBaseline = false,
+            CancellationToken cancellationToken = default)
+        {
+            if (configurationGuid == Guid.Empty)
+            {
+                return BadRequest("configurationGuid is required.");
+            }
+
+            var result = await _qviLineItemSavingsService.GetCaseTypeFamilyInfoAsync(
+                configurationGuid,
+                isBaseline,
+                cancellationToken);
+
+            return Ok(result);
+        }
+
+        [HttpGet("drg-types")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<QviLineItemDrgTypeInfo>>> GetDrgTypes(
+            [FromQuery] Guid configurationGuid,
+            [FromQuery] bool isBaseline = false,
+            CancellationToken cancellationToken = default)
+        {
+            if (configurationGuid == Guid.Empty)
+            {
+                return BadRequest("configurationGuid is required.");
+            }
+
+            var result = await _qviLineItemSavingsService.GetDrgTypeInfoAsync(
+                configurationGuid,
+                isBaseline,
+                cancellationToken);
+
+            return Ok(result);
+        }
+
+        [HttpGet("encounter-savings")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<QviLineItemEncounterSavingInfo>>> GetEncounterSavings(
+            [FromQuery] Guid configurationGuid,
+            [FromQuery] Guid? opportunityGuid = null,
+            [FromQuery] bool? isBaseline = null,
+            CancellationToken cancellationToken = default)
+        {
+            if (configurationGuid == Guid.Empty)
+            {
+                return BadRequest("configurationGuid is required.");
+            }
+
+            var result = await _qviLineItemSavingsService.GetEncounterSavingInfoAsync(
+                configurationGuid,
+                opportunityGuid,
+                isBaseline,
+                cancellationToken);
+
+            return Ok(result);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/MappedColumnsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/MappedColumnsController.cs
new file mode 100644
index 0000000..1f9b235
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/MappedColumnsController.cs
@@ -0,0 +1,40 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.MappedColumns;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class MappedColumnsController(
+        IMappedColumnService mappedColumnService
+        ) : ControllerBase
+    {
+        [HttpGet("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<ActionResult<IEnumerable<MappedColumn>>> GetColumnList(string name, CancellationToken cancellationToken)
+        {
+            var result = await mappedColumnService.GetColumnList(name, cancellationToken);
+            return Ok(result);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        public async Task<IActionResult> SetColumnList(ColumnListRequest columnListRequest, CancellationToken cancellationToken)
+        {
+            await mappedColumnService.SetColumnList(columnListRequest.Name, columnListRequest.Columns, cancellationToken);
+            return NoContent();
+        }
+
+        public class ColumnListRequest
+        {
+            public string Name { get; set; }
+            public IEnumerable<MappedColumn> Columns { get; set; }
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/NetworkOpportunitiesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/NetworkOpportunitiesController.cs
new file mode 100644
index 0000000..1afaaf7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/NetworkOpportunitiesController.cs
@@ -0,0 +1,118 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class NetworkOpportunitiesController : ControllerBase
+    {
+        private readonly INetworkOpportunityService _networkOpportunityService;
+        private readonly List<string> _creators;
+        private readonly ILogger<NetworkOpportunitiesController> _logger;
+
+        public NetworkOpportunitiesController(INetworkOpportunityService networkOpportunityService,
+            IOptions<NetworkOpportunitySection> sectionAccessor,
+            ILogger<NetworkOpportunitiesController> logger)
+        {
+            _networkOpportunityService = networkOpportunityService;
+            var networkOpportunity = sectionAccessor.Value ?? throw new ArgumentNullException(nameof(NetworkOpportunitySection));
+            _creators = networkOpportunity.Creators?.Distinct().ToList() ?? new List<string>();
+            _logger = logger;
+            var dict = new Dictionary<string, object> { { "service", nameof(NetworkOpportunitiesController) }, { "creators", _creators } };
+            using (_logger.BeginScope(dict))
+                _logger.LogInformation("Network Opportunity Creators");
+        }
+
+        [HttpGet("[action]")]
+        public async Task<bool> GetEnabled(CancellationToken cancellationToken)
+        {
+            var dict = new Dictionary<string, object> {
+                { "service", nameof(NetworkOpportunitiesController) },
+                { "creators", _creators },
+                { "isSdtEmployee", User.IsSdtEmployee() }
+                };
+            using (_logger.BeginScope(dict))
+                _logger.LogInformation("Network Opportunity Enabled");
+            if (User.IsSdtEmployee()) { return true; }
+            var databaseGuid = ClaimsPrincipalExtensions.GetDatabaseGuid(User);
+            return await _networkOpportunityService.GetEnabledAsync(databaseGuid, cancellationToken);
+        }
+
+        [HttpGet("[action]")]
+        public async Task<bool> IsCreator()
+        {
+            var user = User?.Identity?.Name ?? "";
+            var isCreator = _creators.Any() && (_creators.Contains(user) || _creators.Any(x => x == "*"));
+            var dict = new Dictionary<string, object> {
+                { "service", nameof(NetworkOpportunitiesController) },
+                { "creators", _creators },
+                { "user", user },
+                { "isCreator", isCreator }
+                };
+            using (_logger.BeginScope(dict))
+                _logger.LogInformation("Network Opportunity IsCreator");
+            return isCreator;
+        }
+
+        [HttpPost("[action]")]
+        public async Task<PagedApiResponse<NetworkOpportunitySummary>> GetOpportunities(NetworkOpportunityLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            return await _networkOpportunityService.GetOpportunitiesAsync(User, loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<NetworkOpportunity>> Create([FromBody] NetworkOpportunitySaveModel opportunitySaveModel, CancellationToken cancellationToken)
+        {
+            return await _networkOpportunityService.CreateAsync(opportunitySaveModel, cancellationToken);
+        }
+
+        [HttpPut("{networkOpportunityId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<IActionResult> Update(int networkOpportunityId, NetworkOpportunitySaveModel opportunitySaveModel, CancellationToken cancellationToken)
+        {
+            if (networkOpportunityId != opportunitySaveModel.NetworkOpportunityId)
+            {
+                return BadRequest();
+            }
+
+            await _networkOpportunityService.UpdateAsync(opportunitySaveModel, cancellationToken);
+
+            return NoContent();
+        }
+
+        [HttpDelete("{networkOpportunityId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> Delete(int networkOpportunityId, CancellationToken cancellationToken)
+        {
+            return Ok(await _networkOpportunityService.DeleteAsync(networkOpportunityId, cancellationToken));
+        }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class NetworkOpportunityLoadOptions
+    {
+        public PagingOptions PagingOptions { get; set; }
+        public NetworkOpportunityFilters Filters { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/OpportunityTypeWorkbooksController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/OpportunityTypeWorkbooksController.cs
new file mode 100644
index 0000000..61ba170
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/OpportunityTypeWorkbooksController.cs
@@ -0,0 +1,53 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class OpportunityTypeWorkbooksController : ControllerBase
+    {
+        private readonly IOpportunityTypeWorkbookService _opportunityTypeWorkbookService;
+
+        public OpportunityTypeWorkbooksController(IOpportunityTypeWorkbookService opportunityTypeWorkbook)
+        {
+            _opportunityTypeWorkbookService = opportunityTypeWorkbook;
+        }
+
+        [HttpGet("{opportunityType}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<OpportunityTypeWorkbook>>> GetOpportunityTypeWorkbooks([FromRoute] int opportunityType, CancellationToken cancellationToken)
+        {
+            return Ok(await _opportunityTypeWorkbookService.GetOpportunityTypeWorkbooksAsync(opportunityType, cancellationToken));
+        }
+
+        [HttpPost]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<ActionResult<Guid>> CreateOpportunityTypeWorkbooks([FromBody] IEnumerable<OpportunityTypeWorkbook> opportunityTypeWorkbooks, CancellationToken cancellationToken)
+        {
+            return Ok(await _opportunityTypeWorkbookService.CreateOpportunityTypeWorkbooksAsync(opportunityTypeWorkbooks, cancellationToken));
+        }
+
+        [HttpDelete("{opportunityType}/workbook/{workbookId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<IActionResult> Delete([FromRoute] int opportunityType, [FromRoute] int workbookId, CancellationToken cancellationToken)
+        {
+            if (!await _opportunityTypeWorkbookService.ContainsAsync(opportunityType, workbookId, cancellationToken))
+            {
+                return NotFound();
+            }
+
+            await _opportunityTypeWorkbookService.DeleteAsync(opportunityType, workbookId, cancellationToken);
+            return NoContent();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/OpportunityWorkbooksController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/OpportunityWorkbooksController.cs
new file mode 100644
index 0000000..ce752cc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/OpportunityWorkbooksController.cs
@@ -0,0 +1,101 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class OpportunityWorkbooksController : ControllerBase
+    {
+        private readonly IOpportunityWorkbookService _opportunityWorkbookService;
+        private readonly IFeatureFlagServiceClient _featureFlagServiceClient;
+
+        public OpportunityWorkbooksController(IOpportunityWorkbookService opportunityWorkbook, IFeatureFlagServiceClient featureFlagServiceClient)
+        {
+            _opportunityWorkbookService = opportunityWorkbook;
+            _featureFlagServiceClient = featureFlagServiceClient;
+        }
+
+        [HttpGet("{opportunityGuid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<OpportunityWorkbook>>> GetOpportunityWorkbooks([FromRoute] Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            return Ok(await _opportunityWorkbookService.GetOpportunityWorkbooksAsync(opportunityGuid, cancellationToken));
+        }
+
+        [HttpPost]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<ActionResult<Guid>> CreateOpportunityWorkbooks([FromBody] IEnumerable<OpportunityWorkbook> opportunityWorkbooks, CancellationToken cancellationToken)
+        {
+            return Ok(await _opportunityWorkbookService.CreateOpportunityWorkbooksAsync(opportunityWorkbooks, cancellationToken));
+        }
+
+        [HttpDelete("{opportunityGuid}/workbook/{workbookId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<IActionResult> Delete([FromRoute] Guid opportunityGuid, [FromRoute] int workbookId, CancellationToken cancellationToken)
+        {
+            if (!await _opportunityWorkbookService.ContainsAsync(opportunityGuid, workbookId, cancellationToken))
+            {
+                return NotFound();
+            }
+
+            await _opportunityWorkbookService.DeleteAsync(opportunityGuid, workbookId, cancellationToken);
+            return NoContent();
+        }
+
+
+        [HttpGet("strategic/{opportunityId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<StrategicOpportunityWorkbookDto>>> GetStrategicOpportunityWorkbooks([FromRoute] long opportunityId, CancellationToken cancellationToken)
+        {
+            var workbooks = await _opportunityWorkbookService.GetStrategicOpportunityWorkbooksAsync(opportunityId, cancellationToken);
+            if (workbooks == null)
+            {
+                return NotFound();
+            }
+            return Ok(workbooks);
+        }
+
+        [HttpPost("strategic")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<ActionResult<IEnumerable<StrategicOpportunityWorkbookDto>>> CreateStrategicOpportunityWorkbooks([FromBody] IEnumerable<StrategicOpportunityWorkbook> opportunityWorkbooks, CancellationToken cancellationToken)
+        {
+            return Ok(await _opportunityWorkbookService.CreateStrategicOpportunityWorkbooksAsync(opportunityWorkbooks, cancellationToken));
+        }
+
+        [HttpDelete("strategic/{opportunityId}/workbook/{workbookId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<IActionResult> Delete([FromRoute] long opportunityId, [FromRoute] int workbookId, CancellationToken cancellationToken)
+        {
+            if (!await _opportunityWorkbookService.ContainsStrategicAsync(opportunityId, workbookId, cancellationToken))
+            {
+                return NotFound();
+            }
+
+            await _opportunityWorkbookService.DeleteStrategicOpportunityAsync(opportunityId, workbookId, cancellationToken);
+            return NoContent();
+        }
+
+        [HttpGet("[action]")]
+        public async Task<bool> OpportunityWorkbooksEnabled(CancellationToken cancellationToken)
+            => await _featureFlagServiceClient.IsEnabledAsync("ciopportunityworkbooks", User?.GetDatabaseGuid() ?? Guid.Empty, cancellationToken: cancellationToken);
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/PayrollOpportunitiesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/PayrollOpportunitiesController.cs
new file mode 100644
index 0000000..07524b2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/PayrollOpportunitiesController.cs
@@ -0,0 +1,118 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities;
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities.Filters;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class PayrollOpportunitiesController : OpportunityController<PROpportunity>
+    {
+        private readonly IFeatureFlagServiceClient _featureFlagServiceClient;
+
+        public PayrollOpportunitiesController(IPROpportunityService opportunityService, IFeatureFlagServiceClient featureFlagServiceClient)
+            : base(opportunityService)
+        {
+            _featureFlagServiceClient = featureFlagServiceClient;
+        }
+
+        [HttpPost("")]
+        public async Task<PagedApiResponse<PROpportunity>> GetOpportunities(PROpportunityLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            return await OpportunityService.GetPagedAsync(loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status201Created)]
+        public async Task<IActionResult> Export(PROpportunityExportOptions exportOptions, CancellationToken cancellationToken)
+        {
+            var workbook = await ((IPROpportunityService)OpportunityService).ExportAsync(exportOptions.SortOptions, exportOptions.Filters, cancellationToken);
+            return new ExcelContentResult(workbook, "PR_Opportunities");
+
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<PRFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            return await ((IPROpportunityService)OpportunityService).GetFilterOptionsAsync(configurationGuid, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<Guid>> Create(PROpportunitySaveModel opportunity, CancellationToken cancellationToken)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest();
+            }
+
+            opportunity.AuthorGuid = User.GetUserGuid();
+            opportunity.AuthorName = User.Identity.Name;
+
+            var newOpportunityId = await ((IPROpportunityService)OpportunityService).CreateAsync(opportunity, cancellationToken);
+            return Ok(newOpportunityId);
+        }
+
+        [HttpDelete("{id}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<bool> Delete(Guid id, CancellationToken cancellationToken)
+          => await OpportunityService.DeleteAsync<PROpportunityDataModel>(id, cancellationToken);
+
+        [HttpGet("{opportunityGuid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<PROpportunityDto>> GetById(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var opportunity = await ((IPROpportunityService)OpportunityService).GetPROpportunityById(opportunityGuid, cancellationToken);
+            if (opportunity == null)
+            {
+                return NotFound();
+            }
+            return Ok(opportunity.Mapped());
+        }
+
+        [HttpGet("{opportunityGuid}/[action]")]
+        public async Task<ActionResult<InitiativeInfo>> GetInitiativeInfo(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            return await ((IPROpportunityService)OpportunityService).GetInitiativeInfoAsync(opportunityGuid, cancellationToken);
+        }
+
+        [HttpGet("[action]")]
+        public async Task<bool> TempoPageEnabled(CancellationToken cancellationToken)
+        {
+            return await _featureFlagServiceClient.IsEnabledAsync("enablepayrollopportunityintempo", User?.GetDatabaseGuid() ?? Guid.Empty, cancellationToken: cancellationToken);
+        }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class PROpportunityLoadOptions
+    {
+        public PagingOptions PagingOptions { get; set; }
+        public PRFilters Filters { get; set; }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class PROpportunityExportOptions
+    {
+        public SortOptions SortOptions { get; set; }
+        public PRFilters Filters { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/PeerGroupController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/PeerGroupController.cs
new file mode 100644
index 0000000..8202d5f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/PeerGroupController.cs
@@ -0,0 +1,115 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.PeerGroups;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class PeerGroupController : ControllerBase
+    {
+        private readonly IPeerGroupService _peerGroupService;
+
+        public PeerGroupController(IPeerGroupService peerGroupService)
+        {
+            _peerGroupService = peerGroupService;
+        }
+
+        [HttpGet]
+        public async Task<IEnumerable<PeerGroupDto>> GetPeerGroupsAsync(CancellationToken cancellationToken)
+        {
+            return await _peerGroupService.GetAllAsync(cancellationToken);
+        }
+
+        [HttpGet("{peerGroupId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<PeerGroupDto>> GetByIdAsync([FromRoute] int peerGroupId, CancellationToken cancellationToken)
+        {
+            var peerGroup = await _peerGroupService.GetByIdAsync(peerGroupId, cancellationToken);
+            if (peerGroup != null)
+            {
+                return Ok(peerGroup);
+            }
+
+            return NotFound();
+        }
+
+        [HttpGet("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public ActionResult<PeerGroupDropdownItems> GetDropdownItems()
+        {
+            var dropdownItems = _peerGroupService.GetDropdownItems();
+            if (dropdownItems != null)
+            {
+                return Ok(dropdownItems);
+            }
+
+            return NotFound();
+        }
+
+        [HttpPost("[action]/{peerGroupId}")]
+        public async Task<bool> IsNameValid([FromRoute] int peerGroupId, [FromBody] string name, CancellationToken cancellationToken)
+        {
+            return await _peerGroupService.IsNameValid(name, cancellationToken, peerGroupId);
+        }
+
+        [HttpPost]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [Authorize(Policy = Policies.IsAdmin)]
+        public async Task<ActionResult<bool>> Create(PeerGroupDto createInfo, CancellationToken cancellationToken)
+        {
+            if (!await _peerGroupService.IsNameValid(createInfo.Name, cancellationToken))
+            {
+                return BadRequest();
+            }
+            return await _peerGroupService.CreateAsync(createInfo, cancellationToken);
+        }
+
+        [HttpPut("{peerGroupId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        [Authorize(Policy = Policies.IsAdmin)]
+        public async Task<ActionResult<bool>> Update([FromRoute] int peerGroupId, [FromBody] PeerGroupDto dto, CancellationToken cancellationToken)
+        {
+            if (!await _peerGroupService.IsNameValid(dto.Name, cancellationToken, peerGroupId))
+            {
+                return BadRequest();
+            }
+            if (!await _peerGroupService.ContainsAsync(peerGroupId, cancellationToken))
+            {
+                return NotFound();
+            }
+
+            return await _peerGroupService.UpdateAsync(peerGroupId, dto, cancellationToken);
+        }
+
+        [HttpDelete("{peerGroupId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        [Authorize(Policy = Policies.IsAdmin)]
+        public async Task<IActionResult> Delete([FromRoute] int peerGroupId, CancellationToken cancellationToken)
+        {
+            if (!await _peerGroupService.ContainsAsync(peerGroupId, cancellationToken))
+            {
+                return NotFound();
+            }
+
+            await _peerGroupService.DeleteAsync(peerGroupId, cancellationToken);
+            return NoContent();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/PickerItemsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/PickerItemsController.cs
new file mode 100644
index 0000000..01ba091
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/PickerItemsController.cs
@@ -0,0 +1,33 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.PickerItems;
+using Strata.ContinuousImprovement.Biz.Population;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class PickerItemsController : ControllerBase
+    {
+        private readonly IPickerItemService _pickerItemService;
+
+        public PickerItemsController(IPickerItemService pickerItemService)
+        {
+            _pickerItemService = pickerItemService;
+        }
+
+        [HttpGet("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<IEnumerable<PickerItem>>> GetExplorations(CancellationToken cancellationToken)
+        {
+            var items = await _pickerItemService.GetItems<ExplorationPopulation>((item) => new PickerItem() { Text = item.Name, Value = item.ExplorationPopulationId }, cancellationToken);
+            return Ok(items);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/QualityVariationItemBreakdownsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/QualityVariationItemBreakdownsController.cs
new file mode 100644
index 0000000..a824e70
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/QualityVariationItemBreakdownsController.cs
@@ -0,0 +1,46 @@
+using Microsoft.AspNetCore.Mvc;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns.Filters;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class QualityVariationItemBreakdownsController : ControllerBase
+    {
+        private readonly IQVIBreakdownService _qviBreakdownService;
+
+        public QualityVariationItemBreakdownsController(IQVIBreakdownService qviBreakdownService)
+        {
+            _qviBreakdownService = qviBreakdownService;
+        }
+
+        [HttpPost("")]
+        public async Task<PagedApiResponse<QVIBreakdown>> GetBreakdowns(QVIBreakdownsLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            return await _qviBreakdownService.GetPagedAsync(loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<QVIBreakdownFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            return await _qviBreakdownService.GetFilterOptionsAsync(configurationGuid, cancellationToken);
+        }
+
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class QVIBreakdownsLoadOptions
+    {
+        public PagingOptions PagingOptions { get; set; }
+        public QVIBreakdownFilters Filters { get; set; }
+    }
+}
+
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/QualityVariationItemEventsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/QualityVariationItemEventsController.cs
new file mode 100644
index 0000000..b16eb23
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/QualityVariationItemEventsController.cs
@@ -0,0 +1,45 @@
+using Microsoft.AspNetCore.Mvc;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Events;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Events.Filters;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class QualityVariationItemEventsController : ControllerBase
+    {
+        private readonly IQVIEventService _qviEventService;
+
+        public QualityVariationItemEventsController(IQVIEventService qviEventService)
+        {
+            _qviEventService = qviEventService;
+        }
+
+        [HttpPost("")]
+        public async Task<PagedApiResponse<QVIEvent>> GetEvents(QVIEventsLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            return await _qviEventService.GetPagedAsync(loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<QVIEventFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            return await _qviEventService.GetFilterOptionsAsync(configurationGuid, cancellationToken);
+        }
+
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class QVIEventsLoadOptions
+    {
+        public PagingOptions PagingOptions { get; set; }
+        public QVIEventFilters Filters { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/QualityVariationItemOpportunitiesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/QualityVariationItemOpportunitiesController.cs
new file mode 100644
index 0000000..3d6122e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/QualityVariationItemOpportunitiesController.cs
@@ -0,0 +1,83 @@
+using Hangfire;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Jobs;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities.Filters;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class QualityVariationItemOpportunitiesController : OpportunityController<QVIOpportunity>
+    {
+        private readonly IBackgroundJobClient _backgroundJobClient;
+
+        public QualityVariationItemOpportunitiesController(
+            IQVIOpportunityService opportunityService,
+            IBackgroundJobClient backgroundJobClient)
+            : base(opportunityService)
+        {
+            _backgroundJobClient = backgroundJobClient;
+        }
+
+        [HttpPost("")]
+        public async Task<PagedApiResponse<QVIOpportunity>> GetOpportunities(QVIOpportunityLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            return await OpportunityService.GetPagedAsync(loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status201Created)]
+        public async Task<IActionResult> Export(QVIOpportunityExportOptions exportOptions, CancellationToken cancellationToken)
+        {
+            var workbook = await ((IQVIOpportunityService)OpportunityService).ExportAsync(exportOptions.SortOptions, exportOptions.Filters, cancellationToken);
+            return new ExcelContentResult(workbook, "QVI_Opportunities");
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<QVIFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            return await ((IQVIOpportunityService)OpportunityService).GetFilterOptionsAsync(configurationGuid, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public IActionResult PopulateQviMetrics(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken)
+        {
+            if (configurationGuid == Guid.Empty)
+            {
+                return BadRequest("Invalid request. ConfigurationGuid is required.");
+            }
+
+            var jobId = _backgroundJobClient.Enqueue<QviOpportunityMetricsJob>(job =>
+                job.PopulateQviMetricsAsync(configurationGuid, isBaseline, cancellationToken));
+
+            return Ok(jobId);
+        }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class QVIOpportunityLoadOptions
+    {
+        public PagingOptions PagingOptions { get; set; }
+        public QVIFilters Filters { get; set; }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class QVIOpportunityExportOptions
+    {
+        public SortOptions SortOptions { get; set; }
+        public QVIFilters Filters { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/ReportController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/ReportController.cs
new file mode 100644
index 0000000..756748c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/ReportController.cs
@@ -0,0 +1,99 @@
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.DbContexts.Reports;
+using Strata.ContinuousImprovement.Biz.Reports;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.Stratasphere.Biz.DbContexts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class ReportController : Controller
+    {
+        private readonly IReportService _reportService;
+
+        public ReportController(IReportService reportService)
+        {
+            _reportService = reportService;
+        }
+
+        [HttpGet("{sourceOfSavings}/[action]")]
+        public async Task<IEnumerable<REReport>> GetByModule(int sourceOfSavings, CancellationToken cancellationToken)
+        {
+            var userGuid = User?.GetUserGuid() ?? Guid.Empty;
+            return await _reportService.GetReportsByModule(sourceOfSavings, userGuid, User.IsSdtEmployee(), cancellationToken);
+        }
+
+        [HttpGet("{opportunityGuid:guid}/[action]")]
+        public async Task<IEnumerable<REReport>> GetByOpportunity(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var userGuid = User?.GetUserGuid() ?? Guid.Empty;
+            return await _reportService.GetReportsByOpportunity(opportunityGuid, userGuid, User.IsSdtEmployee(), cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        public async Task<IEnumerable<REReport>> GetReports(ReportRequest request, CancellationToken cancellationToken)
+        {
+            var userGuid = User?.GetUserGuid() ?? Guid.Empty;
+            var moduleRpts = await _reportService.GetReportsByModule(request.SourceOfSavings, userGuid, User.IsSdtEmployee(), cancellationToken);
+            var opportunityRpts = await _reportService.GetReportsByOpportunity(request.OpportunityGuid, userGuid, User.IsSdtEmployee(), cancellationToken);
+            return moduleRpts.Union(opportunityRpts);
+        }
+
+        [HttpGet("[action]")]
+        public async Task<IEnumerable<REReport>> GetReports(CancellationToken cancellationToken)
+        {
+            var userGuid = User?.GetUserGuid() ?? Guid.Empty;
+            return await _reportService.GetReports(userGuid, User.IsSdtEmployee(), cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        public async Task AddByOpportunity(ReportByOpportunity reportRequest, CancellationToken cancellationToken)
+            => await _reportService.AddReportByOpportunity(reportRequest.OpportunityGuid, reportRequest.ReportGuid, cancellationToken);
+
+        [HttpPost("[action]")]
+        public async Task AddByModule(ReportByModule reportRequest, CancellationToken cancellationToken)
+            => await _reportService.AddReportByModule(reportRequest.SourceOfSavings, reportRequest.ReportGuid, cancellationToken);
+
+        [HttpDelete("[action]")]
+        public async Task RemoveByOpportunity(ReportByOpportunity reportRequest, CancellationToken cancellationToken)
+            => await _reportService.DeleteReportByOpportunity(reportRequest.OpportunityGuid, reportRequest.ReportGuid, cancellationToken);
+
+        [HttpDelete("[action]")]
+        public async Task RemoveByModule(ReportByModule reportRequest, CancellationToken cancellationToken)
+            => await _reportService.DeleteReportByModule(reportRequest.SourceOfSavings, reportRequest.ReportGuid, cancellationToken);
+
+        [HttpGet("[action]")]
+        public async Task<FolderTree> GetFolders(CancellationToken cancellationToken)
+            => await _reportService.GetReportFolders(cancellationToken);
+
+        [HttpGet("{folderGuid:guid}[action]")]
+        public async Task<IEnumerable<REReport>> GetFolderReports(Guid folderGuid, CancellationToken cancellationToken)
+            => await _reportService.GetFolderReports(folderGuid, cancellationToken);
+
+        public class ReportRequest
+        {
+            public Guid OpportunityGuid { get; set; }
+            public int SourceOfSavings { get; set; }
+        }
+
+        public class ReportByOpportunity
+        {
+            public Guid ReportGuid { get; set; }
+            public Guid OpportunityGuid { get; set; }
+        }
+
+        public class ReportByModule
+        {
+            public Guid ReportGuid { get; set; }
+            public int SourceOfSavings { get; set; }
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/SecurityController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/SecurityController.cs
new file mode 100644
index 0000000..14b1b48
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/SecurityController.cs
@@ -0,0 +1,61 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.Security;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class SecurityController : ControllerBase
+    {
+        private readonly ISimpleSecurityService _securityService;
+        private readonly IAuthorizationServiceClient _authorizationServiceClient;
+        private readonly Guid CIGeneralAccessLootId = Guid.Parse("33F10831-E42E-4D48-A6FA-A110798B4F63");
+
+        public SecurityController(ISimpleSecurityService securityService,
+                                  IAuthorizationServiceClient authorizationServiceClient)
+        {
+            _securityService = securityService;
+            _authorizationServiceClient = authorizationServiceClient;
+        }
+
+        [HttpGet("[action]")]
+        public async Task<bool> GetGeneralAccessPermission(CancellationToken cancellationToken)
+            => (await _authorizationServiceClient.GetPermissionAsync(CIGeneralAccessLootId, cancellationToken)).CanRead;
+
+        [HttpGet("{lootId}")]
+        public async Task<Permission> GetUserPermissions(Guid lootId, CancellationToken cancellationToken)
+            => await _authorizationServiceClient.GetPermissionAsync(lootId, cancellationToken);
+
+        [HttpGet("[action]")]
+        public async Task<IEnumerable<IdentityNode>> GetIdentities(CancellationToken cancellationToken)
+            => await _securityService.GetAllIdentities(cancellationToken);
+
+        [HttpGet("{lootId}/[action]")]
+        public async Task<IEnumerable<Permission>> GetSimpleSecurities(Guid lootId, CancellationToken cancellationToken)
+            => await _authorizationServiceClient.GetUserPermissionsAsync(lootId, cancellationToken);
+
+        [HttpPut("{lootId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public async Task<ActionResult<bool>> SetSimpleSecurities(Guid lootId, [FromBody] IEnumerable<Permission> permissionSettings, CancellationToken cancellationToken)
+        {
+            if (permissionSettings.Any(ps => !ps.LootId.HasValue || ps.LootId.Value != lootId)) { return BadRequest(); }
+            var isSecurable = await _authorizationServiceClient.IsSecurable(lootId, cancellationToken);
+
+            var userGuid = User?.GetUserGuid() ?? Guid.NewGuid();
+            if (!User.IsSdtEmployee() && !isSecurable) return Ok(false);
+            await _authorizationServiceClient.ReplaceUserPermissionsAsync(lootId, permissionSettings, cancellationToken);
+            return Ok(true);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/SettingsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/SettingsController.cs
new file mode 100644
index 0000000..cb5e68e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/SettingsController.cs
@@ -0,0 +1,158 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Strata.ContinuousImprovement.Biz.ChargeCode;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.PerformanceEngine;
+using Strata.ContinuousImprovement.Biz.Settings;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.DataSchema.Client;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class SettingsController : Controller
+    {
+        private readonly ISettingsService _settingsService;
+        private ChargeCodeOpportunityValidationSection _validationSection;
+        private readonly IDataSchemaService _dataSchemaService;
+        private readonly IFeatureFlagServiceClient _featureFlagServiceClient;
+
+        public SettingsController(ISettingsService settingsService,
+            IOptions<ChargeCodeOpportunityValidationSection> sectionAccessor,
+            IDataSchemaService dataSchemaService,
+            IFeatureFlagServiceClient featureFlagServiceClient)
+        {
+            _settingsService = settingsService;
+            _validationSection = sectionAccessor.Value ?? throw new ArgumentNullException(nameof(ChargeCodeOpportunityValidationSection));
+            _dataSchemaService = dataSchemaService;
+            _featureFlagServiceClient = featureFlagServiceClient;
+        }
+
+        [HttpGet("[action]")]
+        public async Task<Dictionary<string, bool>> GetFeatureFlagsAsync()
+        {
+            var databaseGuid = User?.GetDatabaseGuid() ?? Guid.Empty;
+            var featureFlags = await _featureFlagServiceClient.GetFeatureFlagClientStatesByArea(databaseGuid, "CI", CancellationToken.None);
+            return featureFlags.ToDictionary(key => key.Key.Replace("-", ""), val => val.Enabled);
+        }
+
+        [HttpPost("[action]")]
+        public async Task<Dictionary<string, string>> GetSystemSettings([FromBody] List<string> settings, CancellationToken cancellationToken)
+        {
+            var systemSettings = await _settingsService.GetSystemSettings(settings, cancellationToken);
+            return systemSettings;
+        }
+
+        [HttpGet("[action]")]
+        public int GetOpportunityLevelLimit()
+        {
+            return _validationSection.MaxOpportunityLevelSelections;
+        }
+
+        [HttpGet("[action]")]
+        public int GetChargeCodeLimit()
+        {
+            return _validationSection.MaxChargeCodeSelections;
+        }
+
+        [HttpGet("[action]")]
+        public PerformanceEngingeCalculationData GetPerformanceEngineCalculations()
+        {
+            // this is stubbed with test data taken from the Performance Engine tests to populate the calculations page
+            // we will need to modify this to take inputs from the wizards and return a PerformanceTrackingItem
+
+            var currentYear = DateTime.Now.Year;
+
+            double[] goalUnits = { 13221, 17628, 22035, 22035, 8814, 26442, 8814, 13221, 22035, 17628, 30849, 44070 };
+            double[] baselineUnits = { 12231, 16788, 21605, 21305, 8430, 24648, 8172, 11847, 24535, 16704, 26159, 45000 };
+            double[] baselineStats = { 3, 4, 5, 5, 2, 6, 2, 3, 5, 4, 7, 10 };
+            double[] trackingUnits = { 54314, 8798, 31680, 21415, 25895, 0, 0, 0, 0, 0, 0, 0 };
+            double[] trackingStats = { 13, 2, 8, 5, 5, 0, 0, 0, 0, 0, 0, 0 };
+
+            MonthlyRampUp[] rampUps =
+            {
+                new MonthlyRampUp(1, currentYear, 100), new MonthlyRampUp(2, currentYear, 100), new MonthlyRampUp(3, currentYear, 100), new MonthlyRampUp(4, currentYear, 100),
+                new MonthlyRampUp(5, currentYear, 100),new MonthlyRampUp(6, currentYear, 100),new MonthlyRampUp(7, currentYear, 100),new MonthlyRampUp(8, currentYear, 100),
+                new MonthlyRampUp(9, currentYear, 100),new MonthlyRampUp(10, currentYear, 100),new MonthlyRampUp(11, currentYear, 100),new MonthlyRampUp(12, currentYear, 100)
+            };
+
+            var trackingYearMonths = Enumerable.Range(1, 12).ToList()
+            .ConvertAll(i =>
+            {
+                var ym = new TrackingYearMonth(currentYear, currentYear,
+                    new FiscalMonth(Guid.NewGuid(), (byte)i, (byte)i, $"{i}", "", "", 0, 0, $"Month{i:00}", 0, 0), true, true, true);
+                return ym;
+            }).ToList();
+
+            var performanceBaselineData = PerformanceComparisonData.SetupBaselineDataList(baselineUnits, baselineStats, currentYear - 1);
+            var performanceTrackingData = PerformanceComparisonData.SetupTrackingDataList(goalUnits, trackingUnits, trackingStats, currentYear);
+            var group = new PerformanceGroup(1, "testCalculations");
+            var options = new PerformanceOptions(false, true, true);
+
+            var performanceTrackingItem = new PerformanceTrackingItem(group, rampUps, options, performanceBaselineData, performanceTrackingData, trackingYearMonths);
+            var data = new PerformanceEngingeCalculationData(performanceTrackingItem);
+            return data;
+        }
+    }
+
+    public class PerformanceEngingeCalculationData
+    {
+        // inputs
+        public string entity { get; set; }
+        public string caseTypeEntity { get; set; }
+        public int serviceLineID { get; set; }
+        public int physicianGroupingAffiliationId { get; set; }
+        public string primaryPhysician { get; set; }
+        public string chargeCodeRollup { get; set; }
+        public string costDriver { get; set; }
+        public string baselineStartDate { get; set; }
+        public string baselineEndDate { get; set; }
+
+        // numbers fed into calcs
+        public double totalVolume { get; set; }
+        public double totalGrossCharges { get; set; }
+        public double totalVariableDirectCost { get; set; }
+        public double totalVariableCost { get; set; }
+
+        // calculated results
+        public double goalUnitVariance { get; set; }
+        public double actualUnitVariance { get; set; }
+        public double committedUnits { get; set; }
+        public double committedStats { get; set; }
+        public double baselineAverage { get; set; }
+
+        public PerformanceEngingeCalculationData(PerformanceTrackingItem item)
+        {
+            entity = "n/a";
+            caseTypeEntity = "n/a";
+            serviceLineID = -1;
+            physicianGroupingAffiliationId = -1;
+            primaryPhysician = "n/a";
+            chargeCodeRollup = "n/a";
+            costDriver = "n/a";
+            baselineStartDate = DateTime.Now.ToShortDateString();
+            baselineEndDate = DateTime.Now.ToShortDateString();
+
+            totalVolume = -1;
+            totalGrossCharges = -1;
+            totalVariableDirectCost = -1;
+            totalVariableCost = -1;
+
+            goalUnitVariance = item.MonthlyTrackingData.Sum(month => month.GoalUnitVariance);
+            actualUnitVariance = item.MonthlyTrackingData.Sum(month => month.ActualUnitVariance);
+            committedUnits = item.MonthlyTrackingData.Sum(month => month.CommittedUnits);
+            committedStats = item.MonthlyTrackingData.Sum(month => month.CommittedStats);
+            baselineAverage = item.MonthlyTrackingData.Average(month => month.BaselineAverage);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/StrategicChargeCodeController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/StrategicChargeCodeController.cs
new file mode 100644
index 0000000..8654b4c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/StrategicChargeCodeController.cs
@@ -0,0 +1,132 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class StrategicChargeCodeController : ControllerBase
+    {
+        private readonly IStrategicOpportunityService _strategicOpportunityService;
+        private readonly IStrategicChargeCodeOpportunityDetailService _strategicChargeCodeOpportunityDetailService;
+
+        public StrategicChargeCodeController(IStrategicOpportunityService strategicOpportunityService, IStrategicChargeCodeOpportunityDetailService strategicChargeCodeOpportunityDetailService)
+        {
+            _strategicOpportunityService = strategicOpportunityService;
+            _strategicChargeCodeOpportunityDetailService = strategicChargeCodeOpportunityDetailService;
+        }
+
+        [HttpGet("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<StrategicOpportunityChargeCodeEditData>> GetOpportunityChargeCode(long opportunityId, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.GetStrategicOpportunityChargeCode(opportunityId, cancellationToken);
+            return result != null ? Ok(result) : NotFound();
+        }
+
+        [HttpPost]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public async Task<ActionResult<long>> CreateOpportunityChargeCode([FromBody] StrategicOpportunityChargeCodeDto opportunity, CancellationToken cancellationToken)
+        {
+            var opportunityId = await _strategicOpportunityService.CreateOpportunityChargeCodeAsync(opportunity, cancellationToken);
+            if (opportunityId == 0) return BadRequest();
+            return Ok(opportunityId);
+        }
+
+        [HttpPut("{opportunityId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> UpdateOpportunityChargeCode(long opportunityId, [FromBody] StrategicOpportunityChargeCodeUpdateDto opportunity, CancellationToken cancellationToken)
+        {
+            var strategicOpportunityId = await _strategicOpportunityService.UpdateOpportunityChargeCode(opportunityId, opportunity, cancellationToken);
+            return strategicOpportunityId != 0 ? Ok(true) : NotFound();
+        }
+
+        [HttpDelete("{opportunityId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<IActionResult> DeleteOpportunityChargeCode(long opportunityId, CancellationToken cancellationToken)
+        {
+            if (!await _strategicOpportunityService.ContainsAsync(opportunityId, cancellationToken))
+                return NotFound();
+
+            var isDeleted = await _strategicOpportunityService.DeleteChargeCodeOpportunityAsync(opportunityId, cancellationToken);
+            return isDeleted ? NoContent() : BadRequest();
+        }
+
+        [HttpPost("{opportunityId}/goal-detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<StrategicOpportunityDetailData>> GetGoalDetail(long opportunityId, [FromBody] StrategicOpportunityGetDetailData getData, CancellationToken cancellationToken)
+        {
+            var result = await _strategicChargeCodeOpportunityDetailService.GetStrategicOpportunityDetailData(opportunityId, false, getData, cancellationToken);
+            return result != null ? Ok(result) : NotFound();
+        }
+
+        [HttpPost("{opportunityId}/export")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status202Accepted)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public async Task<IActionResult> ExportInitiative(long opportunityId, [FromBody] StrategicOpportunityGetDetailData getData, CancellationToken cancellationToken)
+        {
+            var workbook = await _strategicChargeCodeOpportunityDetailService.ExportInitiativeAsync(opportunityId, true, getData, cancellationToken);
+            if (workbook == null)
+                return NotFound();
+            return new ExcelContentResult(workbook, $"Strategic Initiative Charge Code {opportunityId} Export");
+        }
+
+        [HttpPost("{opportunityId}/export-opportunity")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public async Task<IActionResult> ExportOpportunity(long opportunityId, [FromBody] StrategicOpportunityGetDetailData getData, CancellationToken cancellationToken)
+        {
+            var workbook = await _strategicChargeCodeOpportunityDetailService.ExportOpportunityAsync(opportunityId, getData, cancellationToken);
+            if (workbook == null)
+                return NotFound();
+            return new ExcelContentResult(workbook, $"Strategic Opportunity {opportunityId} Export");
+        }
+
+        [HttpPost("{opportunityId}/tracking-detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<StrategicOpportunityDetailData>> GetTrackingDetail(long opportunityId, [FromBody] StrategicOpportunityGetDetailData getData, CancellationToken cancellationToken)
+        {
+            var result = await _strategicChargeCodeOpportunityDetailService.GetStrategicOpportunityDetailData(opportunityId, true, getData, cancellationToken);
+            return result != null ? Ok(result) : NotFound();
+        }
+
+        [HttpPut("{opportunityId}/details")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult> UpdateDetails(long opportunityId, [FromBody] UpdateDetailsDto dto, CancellationToken cancellationToken)
+        {
+            if (dto == null || dto.Adjustments?.Any() != true || dto.Rows?.Any() != true)
+                return BadRequest();
+
+            await _strategicChargeCodeOpportunityDetailService.UpdateStrategicOpportunityDetailsData(opportunityId, dto.Adjustments, dto.Rows, cancellationToken);
+            return Ok();
+        }
+
+        public class UpdateDetailsDto
+        {
+            public IEnumerable<StrategicOpportunityChargeCodeAdjustment> Adjustments { get; set; }
+            public IEnumerable<string> Rows { get; set; }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/StrategicGeneralLedgerController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/StrategicGeneralLedgerController.cs
new file mode 100644
index 0000000..9f97b66
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/StrategicGeneralLedgerController.cs
@@ -0,0 +1,102 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class StrategicGeneralLedgerController : ControllerBase
+    {
+        private readonly IStrategicOpportunityService _strategicOpportunityService;
+        private readonly IStrategicGLOpportunityDetailService _strategicGLOpportunityDetailService;
+
+        public StrategicGeneralLedgerController(IStrategicOpportunityService strategicOpportunityService, IStrategicGLOpportunityDetailService strategicGLOpportunityDetailService)
+        {
+            _strategicOpportunityService = strategicOpportunityService;
+            _strategicGLOpportunityDetailService = strategicGLOpportunityDetailService;
+        }
+
+        [HttpGet("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<StrategicOpportunityGLEditData>> GetOpportunityGL(long opportunityId, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.GetStrategicOpportunityGL(opportunityId, cancellationToken);
+            return result != null ? Ok(result) : NotFound();
+        }
+
+        [HttpPost]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public async Task<ActionResult<long>> CreateOpportunityGeneralLedger([FromBody] StrategicOpportunityGLDto opportunity, CancellationToken cancellationToken)
+        {
+            var opportunityId = await _strategicOpportunityService.CreateOpportunityGeneralLedgerAsync(opportunity, cancellationToken);
+            if (opportunityId == 0) return BadRequest();
+            return Ok(opportunityId);
+        }
+
+        [HttpPut("{opportunityId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> UpdateOpportunityGeneralLedger(long opportunityId, [FromBody] StrategicOpportunityGLUpdateDto opportunity, CancellationToken cancellationToken)
+        {
+            var strategicOpportunityId = await _strategicOpportunityService.UpdateOpportunityGeneralLedger(opportunityId, opportunity, cancellationToken);
+            return strategicOpportunityId != 0 ? Ok(true) : NotFound();
+        }
+
+        [HttpDelete("{opportunityId}")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<IActionResult> DeleteOpportunityGeneralLedger(long opportunityId, CancellationToken cancellationToken)
+        {
+            if (!await _strategicOpportunityService.ContainsGLAsync(opportunityId, cancellationToken))
+                return NotFound();
+
+            var isDeleted = await _strategicOpportunityService.DeleteGeneralLedgerOpportunityAsync(opportunityId, cancellationToken);
+            return isDeleted ? NoContent() : BadRequest();
+        }
+
+        [HttpPost("{opportunityId}/detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<StrategicOpportunityGLDetailData>> GetGLDetail(long opportunityId, [FromBody] string[] dimensions, CancellationToken cancellationToken)
+        {
+            var result = await _strategicGLOpportunityDetailService.GetStrategicOpportunityGLDetailData(opportunityId, false, dimensions, cancellationToken);
+            return result != null ? Ok(result) : NotFound();
+        }
+
+        [HttpPost("{opportunityId}/tracking-detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<StrategicOpportunityGLDetailData>> GetGLTrackingDetail(long opportunityId, [FromBody] string[] dimensions, CancellationToken cancellationToken)
+        {
+            var result = await _strategicGLOpportunityDetailService.GetStrategicOpportunityGLDetailData(opportunityId, true, dimensions, cancellationToken);
+            return result != null ? Ok(result) : NotFound();
+        }
+
+        [HttpPut("{opportunityId}/details")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult> UpdateGLDetails(long opportunityId, [FromBody] UpdateGLDetailsDto dto, CancellationToken cancellationToken)
+        {
+            if (dto == null || dto.Adjustments?.Any() != true || dto.Rows?.Any() != true)
+                return BadRequest();
+
+            await _strategicGLOpportunityDetailService.UpdateStrategicOpportunityGLDetailsData(opportunityId, dto.Adjustments, dto.Rows, cancellationToken);
+            return Ok();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/StrategicOpportunityController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/StrategicOpportunityController.cs
new file mode 100644
index 0000000..58caf68
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/StrategicOpportunityController.cs
@@ -0,0 +1,190 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class StrategicOpportunityController : ControllerBase
+    {
+        private readonly IStrategicOpportunityService _strategicOpportunityService;
+
+        public StrategicOpportunityController(IStrategicOpportunityService strategicOpportunityService)
+        {
+            _strategicOpportunityService = strategicOpportunityService;
+        }
+
+        [HttpGet("")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<List<StrategicOpportunityItem>> GetOpportunities(CancellationToken cancellationToken)
+        {
+            return await _strategicOpportunityService.GetStrategicOpportunitiesAsync(cancellationToken);
+        }
+
+        [HttpGet("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<StrategicOpportunityGeneralInfo>> GetGeneralInfo(long opportunityId, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.GetStrategicOpportunityGeneralInfo(opportunityId, cancellationToken);
+            return result != null ? Ok(result) : NotFound();
+        }
+
+        [HttpPost("[action]")]
+        public async Task<bool> IsNameValid([FromBody] string name, CancellationToken cancellationToken)
+        {
+            return await _strategicOpportunityService.NameIsValidAsync(name, cancellationToken);
+        }
+
+        [HttpGet("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<StrategicOpportunityLayout>> GetLayout([FromRoute] long opportunityId, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.GetStrategicOpportunityLayout(opportunityId, cancellationToken);
+            return result;
+        }
+
+        [HttpPut("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> UpdateLayout(long opportunityId, [FromBody] StrategicOpportunityLayout layout, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.UpdateStrategicOpportunityLayout(opportunityId, layout, cancellationToken);
+            return result ? Ok(result) : NotFound();
+        }
+
+        [HttpPut("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> SetStatus(long opportunityId, [FromBody] StrategicOpportunityUpdateStatusDto updateStatusDto, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.UpdateStrategicOpportunityStatus(opportunityId, updateStatusDto, cancellationToken);
+            return result ? Ok(result) : NotFound();
+        }
+
+        [HttpGet("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<List<StrategicInitiativeItem>> GetInitiatives(CancellationToken cancellationToken)
+        {
+            return await _strategicOpportunityService.GetStrategicInitiativesAsync(cancellationToken);
+        }
+
+        [HttpPut("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> UpdateInitiative(long opportunityId, [FromBody] StrategicInitiativeUpdateDto updateInitiativeDto, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.UpdateStrategicInitiative(opportunityId, updateInitiativeDto, cancellationToken);
+            return result ? Ok(result) : NotFound();
+        }
+
+        [HttpPut("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> UpdateRoles(long opportunityId, [FromBody] StrategicRolesUpdate updateRolesDto, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.UpdateRoles(opportunityId, updateRolesDto, cancellationToken);
+            return result ? Ok(result) : NotFound();
+        }
+
+        [HttpPut("{opportunityId}/ramp-ups")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> UpdateRampUps(long opportunityId, [FromBody] List<StrategicOpportunityRampUpDto> rampUps, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.UpdateStrategicOpportunityRampUpsAsync(opportunityId, rampUps, cancellationToken);
+            return result ? Ok(result) : NotFound();
+        }
+
+        [HttpGet("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<List<StrategicOpportunityRampUpDto>>> GetRampUps(long opportunityId, CancellationToken cancellationToken)
+        {
+            var rampUps = await _strategicOpportunityService.GetStrategicOpportunityRampUpsAsync(opportunityId, cancellationToken);
+            return Ok(rampUps);
+        }
+
+        [HttpGet("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> RunTrackingTask(long opportunityId, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.RunTrackingTask(opportunityId, cancellationToken);
+            return result ? Ok(result) : NotFound();
+        }
+
+        [HttpPut("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<bool>> CompleteInitiative(long opportunityId, [FromBody] StrategicOpportunityCompleteInitiativeData completeInitiativeData, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.CompleteInitiative(opportunityId, completeInitiativeData, cancellationToken);
+            return result ? Ok(result) : NotFound();
+        }
+
+        [HttpGet("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<List<StrategicOpportunityMeasureDto>>> GetMeasures(long opportunityId, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.GetStrategicOpportunityMeasures(opportunityId, cancellationToken);
+            return result.Any() ? Ok(result) : NotFound();
+        }
+
+        [HttpGet("{opportunityId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<StrategicOpportunityMeasureDto>> GetPrimaryMeasure(long opportunityId, CancellationToken cancellationToken)
+        {
+            var primaryMeasure = await _strategicOpportunityService.GetStrategicOpportunityPrimaryMeasure(opportunityId, cancellationToken);
+            return Ok(primaryMeasure);
+        }
+
+        [HttpGet("{measureId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<List<StrategicOpportunityMeasureDetail>>> GetMeasureDetails(long measureId, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.GetStrategicOpportunityMeasureDetails(measureId, cancellationToken);
+            return result != null ? Ok(result) : NotFound();
+        }
+
+        [HttpGet("{opportunityId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesDefaultResponseType]
+        public async Task<ActionResult<StrategicOpportunityDrawerDetails>> GetDrawerDetails(long opportunityId, CancellationToken cancellationToken)
+        {
+            var result = await _strategicOpportunityService.GetStrategicOpportunityDrawerDetails(opportunityId, cancellationToken);
+            return result != null ? Ok(result) : NotFound();
+        }
+
+        [HttpPost("{opportunityId}/copy")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public async Task<ActionResult<long>> Copy(long opportunityId, [FromBody] string opportunityName, CancellationToken cancellationToken)
+        {
+            var newOpportunityId = await _strategicOpportunityService.CopyStrategicOpportunity(opportunityId, opportunityName, cancellationToken);
+            return newOpportunityId == 0 ? BadRequest() : Ok(newOpportunityId);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/StrategicOpportunitySecurityController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/StrategicOpportunitySecurityController.cs
new file mode 100644
index 0000000..3177242
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/StrategicOpportunitySecurityController.cs
@@ -0,0 +1,51 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.CoreLib.Claims.Extensions;
+using System.Collections.Generic;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class StrategicOpportunitySecurityController : ControllerBase
+    {
+        private readonly IStrategicOpportunityService _strategicOpportunityService;
+        private readonly IOpportunityRoleAssignmentService _opportunityRoleAssignmentService;
+
+        public StrategicOpportunitySecurityController(IStrategicOpportunityService strategicOpportunityService, IOpportunityRoleAssignmentService opportunityRoleAssignmentService)
+        {
+            _strategicOpportunityService = strategicOpportunityService;
+            _opportunityRoleAssignmentService = opportunityRoleAssignmentService;
+        }
+
+        [HttpGet("{lootId}")]
+        public async Task<RoleAssignmentView> GetUserPermissions(long lootId, CancellationToken cancellationToken)
+            => await _opportunityRoleAssignmentService.GetUserRoleAssignmentsAsync(lootId, cancellationToken);
+
+        [HttpGet("{lootId}/[action]")]
+        public async Task<IEnumerable<OpportunityRoleAssignmentView>> GetSimpleSecurities(long lootId, CancellationToken cancellationToken)
+            => await _opportunityRoleAssignmentService.GetRoleAssignmentsAsync(lootId, cancellationToken);
+
+        [HttpPut("{lootId}/[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public async Task<ActionResult<bool>> SetSimpleSecurities(long lootId, [FromBody] List<OpportunityRoleAssignmentView> permissionSettings, CancellationToken cancellationToken)
+        {
+            if (permissionSettings.Any(ps => ps.LootId != lootId)) { return BadRequest(); }
+            
+            var roleAssignments = await _opportunityRoleAssignmentService.GetUserRoleAssignmentsAsync(lootId, cancellationToken);
+            var isSecurable = roleAssignments.CanSecure;
+            var userGuid = User?.GetUserGuid() ?? Guid.NewGuid();
+            if (!User.IsSdtEmployee() && !isSecurable) return Ok(false);
+            await _opportunityRoleAssignmentService.SaveRoleAssignmentsAsync(lootId, permissionSettings, cancellationToken);
+            return Ok(true);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/UserSettingsController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/UserSettingsController.cs
new file mode 100644
index 0000000..ca1052e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/UserSettingsController.cs
@@ -0,0 +1,33 @@
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class UserSettingsController : ControllerBase
+    {
+        private readonly IUserSettingService _userSettingService;
+
+        public UserSettingsController(IUserSettingService userSettingService)
+        {
+            _userSettingService = userSettingService;
+        }
+
+        [HttpGet("{userGuid}")]
+        public async Task<CciUserSetting> GetUserSetting(Guid userGuid, CancellationToken cancellationToken)
+        {
+            return await _userSettingService.GetById(userGuid, cancellationToken);
+        }
+
+        [HttpPost()]
+        public async Task<CciUserSetting> SetUserSetting([FromBody] CciUserSetting userSetting, CancellationToken cancellationToken)
+        {
+            return await _userSettingService.SetUserSetting(userSetting, cancellationToken);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/UsersController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/UsersController.cs
new file mode 100644
index 0000000..11ff364
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/UsersController.cs
@@ -0,0 +1,66 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.UserService;
+using Strata.Users.Client.UserGroups.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class UsersController : ControllerBase
+    {
+        private readonly IUserService _userService;
+
+        public UsersController(IUserService users)
+        {
+            _userService = users;
+        }
+
+        [HttpGet("[action]")]
+        public async Task<IEnumerable<CIUser>> GetUsers(CancellationToken cancellationToken)
+            => await GetUsersByGlobalId("CCI - Basic User", cancellationToken);
+
+        [HttpGet("[action]")]
+        public async Task<IEnumerable<CIUser>> GetOwners(CancellationToken cancellationToken)
+            => await GetUsers(cancellationToken);
+
+        [HttpGet("[action]")]
+        public async Task<IEnumerable<CIUser>> GetExecutiveSponsors(CancellationToken cancellationToken)
+            => await GetUsersByGlobalId("CCI - Exec Sponsors", cancellationToken);
+
+        [HttpGet("[action]")]
+        public async Task<IEnumerable<CIUser>> GetCostLeaders(CancellationToken cancellationToken)
+            => await GetUsersByGlobalId("CCI - Cost Leader", cancellationToken);
+
+        [HttpGet("[action]")]
+        public async Task<IEnumerable<CIUser>> GetAdministrators(CancellationToken cancellationToken)
+            => await GetUsersByGlobalId("CCI - System Administrator", cancellationToken);
+
+        [HttpGet("[action]")]
+        public async Task<IEnumerable<CIUser>> GetJazzUsers(CancellationToken cancellationToken)
+            => await _userService.GetJazzUsers(cancellationToken);
+
+        [HttpGet("[action]")]
+        public async Task<IEnumerable<UserGroup>> GetUserGroups(CancellationToken cancellationToken)
+            => await _userService.GetUserGroups(cancellationToken);
+
+        [HttpGet("all-ci-users")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesDefaultResponseType]
+        public async Task<IEnumerable<CIUser>> GetAllCIUsers(CancellationToken cancellationToken)
+            => await _userService.GetAllCIUsers(cancellationToken);
+
+        private async Task<IEnumerable<CIUser>> GetUsersByGlobalId(string globalId, CancellationToken cancellationToken)
+            => await _userService.GetUsersByGlobalId(globalId, cancellationToken);
+
+        [HttpGet("{userGuid}/[action]")]
+        public async Task<CIUser> GetUser(Guid userGuid, CancellationToken cancellationToken)
+            => await _userService.GetUser(userGuid, cancellationToken);
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/VariationCaseTypesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/VariationCaseTypesController.cs
new file mode 100644
index 0000000..cd18316
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/VariationCaseTypesController.cs
@@ -0,0 +1,52 @@
+using Microsoft.AspNetCore.Mvc;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes.Filters;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class VariationCaseTypesController : ControllerBase
+    {
+        private readonly IUVCaseTypeService _variationCaseTypeService;
+
+        public VariationCaseTypesController(IUVCaseTypeService variationCaseTypeService)
+        {
+            _variationCaseTypeService = variationCaseTypeService;
+        }
+
+        [HttpPost("")]
+        public async Task<PagedApiResponse<UVCaseType>> GetCaseTypes(UVCaseTypeLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            return await _variationCaseTypeService.GetPagedAsync(loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<UVFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            return await _variationCaseTypeService.GetFilterOptionsAsync(configurationGuid, cancellationToken);
+        }
+
+        [HttpPost("{configurationGuid}/[action]")]
+        public async Task<bool> AddPatientPopulationCaseTypes(Guid configurationGuid, List<string> patientPopulations, CancellationToken cancellationToken)
+        {
+            return await _variationCaseTypeService.AddPatientPopulationCaseTypes(configurationGuid, User?.Identity?.Name ?? "", patientPopulations, cancellationToken);
+        }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class UVCaseTypeLoadOptions
+    {
+        public PagingOptions PagingOptions { get; set; }
+        public UVCaseTypeFilters Filters { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/Controllers/VariationOpportunitiesController.cs b/src/Strata.ContinuousImprovement.Api/Controllers/VariationOpportunitiesController.cs
new file mode 100644
index 0000000..2738cab
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Controllers/VariationOpportunitiesController.cs
@@ -0,0 +1,62 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities.Filters;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class VariationOpportunitiesController : OpportunityController<UVOpportunity>
+    {
+        public VariationOpportunitiesController(IUVOpportunityService opportunityService)
+            : base(opportunityService)
+        {
+        }
+
+        [HttpPost("")]
+        public async Task<PagedApiResponse<UVOpportunity>> GetOpportunities(UVOpportunityLoadOptions loadOptions, CancellationToken cancellationToken)
+        {
+            return await OpportunityService.GetPagedAsync(loadOptions.PagingOptions, loadOptions.Filters, cancellationToken);
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status201Created)]
+        public async Task<IActionResult> Export(UVOpportunityExportOptions exportOptions, CancellationToken cancellationToken)
+        {
+            var workbook = await ((IUVOpportunityService)OpportunityService).ExportAsync(exportOptions.SortOptions, exportOptions.Filters, cancellationToken);
+            return new ExcelContentResult(workbook, "UV_Opportunities");
+
+        }
+
+        [HttpGet("{configurationGuid}/[action]")]
+        public async Task<UVFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            return await ((IUVOpportunityService)OpportunityService).GetFilterOptionsAsync(configurationGuid, cancellationToken);
+        }
+
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class UVOpportunityLoadOptions
+    {
+        public PagingOptions PagingOptions { get; set; }
+        public UVFilters Filters { get; set; }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class UVOpportunityExportOptions
+    {
+        public SortOptions SortOptions { get; set; }
+        public UVFilters Filters { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/Extensions/ControllerBaseExtensions.cs b/src/Strata.ContinuousImprovement.Api/Extensions/ControllerBaseExtensions.cs
new file mode 100644
index 0000000..3e44202
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Extensions/ControllerBaseExtensions.cs
@@ -0,0 +1,40 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Strata.ContinuousImprovement.Api.Extensions
+{
+    public static class ControllerBaseExtensions
+    {
+        public static ObjectResult Problem(this ControllerBase controller, ProblemDetails problemDetails)
+            => controller.Problem(title: problemDetails.Title,
+                detail: problemDetails.Detail,
+                statusCode: problemDetails.Status,
+                instance: problemDetails.Instance,
+                type: problemDetails.Type);
+
+        public static ObjectResult NotFoundProblem(this ControllerBase controller, ProblemDetails problemDetails = default)
+            => controller.Problem(title: problemDetails.Title,
+                detail: problemDetails.Detail,
+                statusCode: problemDetails?.Status ?? StatusCodes.Status404NotFound,
+                instance: problemDetails.Instance,
+                type: problemDetails.Type);
+
+        public static ObjectResult NotFoundProblem(this ControllerBase controller, string title, string detail)
+        {
+            var problemDetails = new ProblemDetails
+            {
+                Title = title,
+                Detail = detail,
+                Status = StatusCodes.Status404NotFound
+            };
+            return controller.Problem(problemDetails);
+        }
+
+        public static ObjectResult NoContentProblem(this ControllerBase controller, ProblemDetails problemDetails = default)
+            => controller.Problem(title: problemDetails?.Title,
+                detail: problemDetails?.Detail,
+                statusCode: problemDetails?.Status ?? StatusCodes.Status204NoContent,
+                instance: problemDetails?.Instance,
+                type: problemDetails?.Type);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Extensions/MultipartFileControllerExtensions.cs b/src/Strata.ContinuousImprovement.Api/Extensions/MultipartFileControllerExtensions.cs
new file mode 100644
index 0000000..544b43d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Extensions/MultipartFileControllerExtensions.cs
@@ -0,0 +1,32 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Net.Http.Headers;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Extensions
+{
+    internal static class MultipartFileControllerExtensions
+    {
+        public static async Task<FileMultipartSection> GetFileFromMultipartUpload(this HttpRequest request, CancellationToken cancellationToken = default)
+        {
+            // validation of Content-Type
+            // 1. first, it must be a form-data request
+            // 2. a boundary should be found in the Content-Type
+            if (!request.HasFormContentType ||
+                !MediaTypeHeaderValue.TryParse(request.ContentType, out var mediaTypeHeader) ||
+                string.IsNullOrEmpty(mediaTypeHeader.Boundary.Value))
+            {
+                return null;
+            }
+
+            var boundary = HeaderUtilities.RemoveQuotes(mediaTypeHeader.Boundary.Value).Value ?? string.Empty;
+            var reader = new MultipartReader(boundary, request.Body);
+            var section = await reader.ReadNextSectionAsync(cancellationToken);
+            var fileSection = section?.AsFileSection();
+            return fileSection is null
+                ? null
+                : section.AsFileSection();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Generics/OpportunityController.cs b/src/Strata.ContinuousImprovement.Api/Generics/OpportunityController.cs
new file mode 100644
index 0000000..b5993d6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Generics/OpportunityController.cs
@@ -0,0 +1,33 @@
+using Microsoft.AspNetCore.Mvc;
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Generics
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class OpportunityController<T> : ControllerBase where T : class, IOpportunity
+    {
+        protected readonly IOpportunityService<T> OpportunityService;
+
+        public OpportunityController(IOpportunityService<T> opportunityService)
+        {
+            OpportunityService = opportunityService;
+        }
+
+        [HttpPut("{opportunityGuid}/[action]")]
+        public async Task SetHiddenAsync(Guid opportunityGuid, [FromBody] bool isHidden, CancellationToken cancellationToken)
+        {
+            await OpportunityService.SetHiddenAsync(opportunityGuid, isHidden, cancellationToken);
+        }
+
+        [HttpPut("{opportunityGuid}/[action]")]
+        public virtual async Task SetNoteAsync(Guid opportunityGuid, [FromBody] string note, CancellationToken cancellationToken)
+        {
+            await OpportunityService.SetNoteAsync(opportunityGuid, note, cancellationToken);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/Generics/Policies.cs b/src/Strata.ContinuousImprovement.Api/Generics/Policies.cs
new file mode 100644
index 0000000..7b4f2b5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Generics/Policies.cs
@@ -0,0 +1,8 @@
+namespace Strata.ContinuousImprovement.Api.Generics
+{
+    public class Policies
+    {
+        public const string StrataOnly = "StrataOnly";
+        public const string IsAdmin = "IsAdmin";
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Generics/ProcessingResult.cs b/src/Strata.ContinuousImprovement.Api/Generics/ProcessingResult.cs
new file mode 100644
index 0000000..efba7f4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Generics/ProcessingResult.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Api.Generics
+{
+    [ExcludeFromCodeCoverage]
+    public class ProcessingResult : StatusCodeResult
+    {
+        public ProcessingResult()
+            : base(StatusCodes.Status102Processing)
+        {
+        }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Program.cs b/src/Strata.ContinuousImprovement.Api/Program.cs
new file mode 100644
index 0000000..ad83480
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Program.cs
@@ -0,0 +1,110 @@
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Serilog;
+using Strata.Configuration.Client.DependencyInjection;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.healthchecks.Biz;
+using Strata.Logging.DependencyInjection;
+using Strata.Snowflake.Migrations.Client;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api
+{
+    [ExcludeFromCodeCoverage]
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            try
+            {
+                var commandLineApplication = new CommandLineApplication(false);
+                var doMigrate = commandLineApplication.Option(
+                    "--ef-migrate",
+                    "Apply entity framework migrations and exit",
+                    CommandOptionType.NoValue);
+
+                commandLineApplication.HelpOption("-? | -h | --help");
+                commandLineApplication.OnExecute(async () =>
+                {
+                    await ExecuteApp(args, doMigrate);
+                    return 0;
+                });
+                commandLineApplication.Execute(args);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "There was an unhandled exception that caused the program to crash");
+
+                //This is for serilog to ensure that all of the cached logs are flushed when the app crashes
+                //This is useful so we can capture logs when the application crashes during startup:
+                Log.CloseAndFlush();
+            }
+        }
+
+        public static async Task ExecuteApp(string[] args, CommandOption doMigrate)
+        {
+            var webHost = CreateWebHostBuilder(args).Build();
+
+            if (doMigrate.HasValue())
+            {
+                using var scope = webHost.Services.CreateScope();
+                var logger = scope.ServiceProvider.GetRequiredService<ILogger<Program>>();
+
+                try
+                {
+                    // Snowflake Migrations
+                    logger.LogInformation("Uploading and applying Snowflake migrations");
+                    var snowflakeMigrationService = scope.ServiceProvider.GetRequiredService<ISnowflakeMigrationService>();
+                    var snowflakeMigrationDirectory = Path.Combine(Environment.CurrentDirectory, "SnowflakeMigrations");
+                    var success = await snowflakeMigrationService.PackageMigrations(snowflakeMigrationDirectory);
+                    if (!success)
+                    {
+                        logger.LogError("Failed to package migrations.");
+                        Environment.Exit(1);
+                    }
+                    logger.LogInformation("Snowflake migrations successfully uploaded to S3. Begin apply migrations.");
+                    success = await snowflakeMigrationService.ApplyClientMigrations();
+                    if (!success)
+                    {
+                        logger.LogError("Failed to apply migrations.");
+                        Environment.Exit(1);
+                    }
+
+                    // EF Migrations
+                    logger.LogInformation("Applying Entity Framework migrations");
+                    using var context = scope.ServiceProvider.GetService<CentralDbContext>();
+                    var hostEnv = scope.ServiceProvider.GetService<IHostEnvironment>();
+
+                    context.Database.SetCommandTimeout(TimeSpan.FromMinutes(10));
+                    context.Database.Migrate();
+                    logger.LogInformation("All done, closing app");
+                    Environment.Exit(Environment.ExitCode);
+                }
+                catch (Exception ex)
+                {
+                    logger.LogError(ex, "There was an unhandled exception that caused the program to crash");
+                    Environment.Exit(1);
+                }
+            }
+
+            // no flags provided, so just run the webhost
+            webHost.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
+                .UseStrataConfiguration()
+                .UseStrataLogging()
+                .UseSetting(WebHostDefaults.HostingStartupAssembliesKey, "Strata.healthchecks.Jazz")
+                .UseStrataHealthChecks()
+                .UseStartup<Startup>();
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/Properties/launchSettings.json b/src/Strata.ContinuousImprovement.Api/Properties/launchSettings.json
new file mode 100644
index 0000000..d2c626b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Properties/launchSettings.json
@@ -0,0 +1,16 @@
+{
+  "profiles": {
+    "Strata.ContinuousImprovement.Api": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "",
+      "applicationUrl": "https://localhost:8443",
+      "environmentVariables": {
+        "Hangfire__RunLocally": "true",
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "AWS_S3_US_EAST_1_REGIONAL_ENDPOINT": "regional",
+        "AWS_Profile": "sdt-continuous-improvement-service-role"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeControllers/EncountersController.cs b/src/Strata.ContinuousImprovement.Api/SnowflakeControllers/EncountersController.cs
new file mode 100644
index 0000000..5cf847c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeControllers/EncountersController.cs
@@ -0,0 +1,124 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Services;
+using Strata.DecisionSupport.Biz.Utilities;
+using Strata.DecisionSupport.Models.Encounters;
+using Strata.DecisionSupport.Models.Jazz;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.SnowflakeControllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class EncountersController : Controller
+    {
+        private readonly IEncounterQueryService _encounterQueryService;
+
+        public EncountersController(IEncounterQueryService encounterQueryService)
+        {
+            _encounterQueryService = encounterQueryService;
+        }
+
+        [HttpPost]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+#pragma warning disable S4457
+        public async Task<ActionResult<IEnumerable<IJazzEncounterInfo>>> GetAsync(
+            [FromBody] EncounterQueryInfo queryInfo, CancellationToken cancellationToken)
+#pragma warning restore
+        {
+            if (queryInfo.EntityIDs.IsEmpty())
+                return BadRequest(queryInfo);
+
+            return Ok(await _encounterQueryService.RunEncounterInfoQuery(queryInfo, cancellationToken));
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+#pragma warning disable S4457
+        public async Task<ActionResult<IEnumerable<EncounterCostInfo>>> GetCostInfoAsync(
+            [FromBody] EncounterCostQueryInfo queryInfo, CancellationToken cancellationToken)
+#pragma warning restore
+        {
+            if (queryInfo.EncounterIds.IsEmpty())
+                return BadRequest(queryInfo);
+
+            return Ok(await _encounterQueryService.RunEncounterCostInfoQuery(queryInfo, cancellationToken));
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+#pragma warning disable S4457
+        public async Task<ActionResult<IEnumerable<DepartmentEncounterUnitOfService>>> GetDepartmentUnitOfServiceInfoAsync(
+            [FromBody] DepartmentEncounterUnitOfServiceQueryInfo queryInfo, CancellationToken cancellationToken)
+#pragma warning restore
+        {
+            if (queryInfo.EncounterIds.IsEmpty())
+                return BadRequest(queryInfo);
+
+            return Ok(await _encounterQueryService.RunDepartmentEncounterUnitOfServiceQuery(queryInfo, cancellationToken));
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+#pragma warning disable S4457
+        public async Task<ActionResult<IEnumerable<EncounterUnitOfService>>> GetUnitOfServiceInfoAsync(
+            [FromBody] EncounterUnitOfServiceQueryInfo queryInfo, CancellationToken cancellationToken)
+#pragma warning restore
+        {
+            if (queryInfo.EncounterIds.IsEmpty())
+                return BadRequest(queryInfo);
+
+            return Ok(await _encounterQueryService.RunEncounterUnitOfServiceQuery(queryInfo, cancellationToken));
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+#pragma warning disable S4457
+        public async Task<ActionResult<IEnumerable<EncounterChargeInfo>>> GetEncounterChargeInfoAsync(
+            [FromBody] EncounterChargeQueryInfo queryInfo, CancellationToken cancellationToken)
+#pragma warning restore
+        {
+            if (queryInfo.OpportunityGuid.Equals(Guid.Empty))
+                return BadRequest(queryInfo);
+
+            return Ok(await _encounterQueryService.RunEncounterChargeQuery(queryInfo, cancellationToken));
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+#pragma warning disable S4457
+        public async Task<ActionResult<IEnumerable<VariationEncounterChargeInfo>>> GetVariationEncounterChargeInfoAsync(
+            [FromBody] VariationEncounterChargeQueryInfo queryInfo, CancellationToken cancellationToken)
+#pragma warning restore
+        {
+            if (queryInfo.OpportunityGuids.IsEmpty())
+                return BadRequest(queryInfo);
+
+            return Ok(await _encounterQueryService.RunVariationEncounterChargeQuery(queryInfo, cancellationToken));
+        }
+
+        [HttpPost("los-opportunity-info")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public async Task<ActionResult<IEnumerable<LOSOpportunityInfo>>> GetLOSOpportunityInfoAsync(
+            [FromBody] LOSOpportunityQueryInfo queryInfo, CancellationToken cancellationToken)
+        {
+            if (queryInfo.OpportunityGuid.Equals(Guid.Empty))
+                return BadRequest(queryInfo);
+
+            return Ok(await _encounterQueryService.RunLOSOpportunityInfoQuery(queryInfo, cancellationToken));
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeControllers/UtilizationVariationController.cs b/src/Strata.ContinuousImprovement.Api/SnowflakeControllers/UtilizationVariationController.cs
new file mode 100644
index 0000000..77e6c9c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeControllers/UtilizationVariationController.cs
@@ -0,0 +1,55 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Services;
+using Strata.DecisionSupport.Biz.Utilities;
+using Strata.DecisionSupport.Models.Jazz;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.SnowflakeControllers
+{
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Route("api/v{api-version:apiVersion}/[controller]")]
+    public class UtilizationVariationController : Controller
+    {
+        private readonly IUtilizationVariationService _utilizationVariationService;
+
+        public UtilizationVariationController(IUtilizationVariationService utilizationVariationService)
+        {
+            _utilizationVariationService = utilizationVariationService;
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public async Task<ActionResult<IEnumerable<AllChargeInfo>>> GetAllChargeInfoAsync(
+            [FromBody] AllChargeQueryInfo queryInfo, CancellationToken cancellationToken)
+        {
+            if (queryInfo.OpportunityGuid.Equals(Guid.Empty))
+                return BadRequest(queryInfo);
+            if (queryInfo.ChargeCodeIds.IsEmpty())
+                return BadRequest(queryInfo);
+
+            return Ok(await _utilizationVariationService.RunAllChargeInfoQuery(queryInfo, cancellationToken));
+        }
+
+        [HttpPost("[action]")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public async Task<ActionResult<IEnumerable<ChargeInfo>>> GetChargeInfoAsync(
+            [FromBody] ChargeQueryInfo queryInfo, CancellationToken cancellationToken)
+        {
+            if (queryInfo.ConfigurationGuid.Equals(Guid.Empty))
+                return BadRequest(queryInfo);
+            if (queryInfo.ChargeCodeIds.IsEmpty())
+                return BadRequest(queryInfo);
+
+            return Ok(await _utilizationVariationService.RunChargeInfoQuery(queryInfo, cancellationToken));
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-06-01-00-00 add CCI schema if not exists.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-06-01-00-00 add CCI schema if not exists.sql
new file mode 100644
index 0000000..a77f4bb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-06-01-00-00 add CCI schema if not exists.sql	
@@ -0,0 +1,6 @@
+--Author: sdt-cloveland
+--Forward
+CREATE SCHEMA IF NOT EXISTS cci;
+
+--Rollback
+--ILB
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-06-24-10-32-CreateCiEncounterCosts.sql.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-06-24-10-32-CreateCiEncounterCosts.sql.sql
new file mode 100644
index 0000000..514cf68
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-06-24-10-32-CreateCiEncounterCosts.sql.sql
@@ -0,0 +1,43 @@
+--Author: tdebolt
+--Forward
+CREATE OR REPLACE DYNAMIC TABLE cci.encounterchargecodecosts
+    TARGET_LAG = DOWNSTREAM --important to set to downstream for creation, manually change to schedule as we enable for clients
+    WAREHOUSE = 'APP_CI_DYNAMICTABLE_WH'
+    COMMENT = 'Populate Charge Data by Encounter and Charge Code for use in CI'
+    REFRESH_MODE = AUTO
+    INITIALIZE = ON_SCHEDULE
+AS 
+WITH pblidGrouping (pblidrowid, unitsofservice, fixeddirectcost, fixedindirectcost, variabledirectcost, variableindirectcost, totalcost) AS (
+    SELECT
+      cd.pblidrowid,
+      min(unitsofservice) AS unitsofservice,
+      sum(fixeddirectcost) as fixeddirectcost, 
+      sum(fixedindirectcost) as fixedindirectcost, 
+      sum(variabledirectcost) as variabledirectcost, 
+      sum(variableindirectcost) as variableindirectcost,
+      sum(fixeddirectcost) + sum(fixedindirectcost) + sum(variabledirectcost) + sum(variableindirectcost) as totalcost
+    FROM dss.factpatientcostdetail cd
+    GROUP BY cd.pblidrowid
+    ORDER BY cd.pblidrowid
+)
+
+SELECT 
+    d.encounterid,
+    d.chargecodeid,
+    sum(d.charge) as charge,
+    sum(g.unitsofservice) as unitsofservice,
+    sum(g.fixeddirectcost) as fixeddirectcost,
+    sum(g.fixedindirectcost) as fixedindirectcost,
+    sum(g.variabledirectcost) as variabledirectcost,
+    sum(g.variableindirectcost) as variableindirectcost,
+    sum(d.fixeddirectunitcost) as fixeddirectunitcost,
+    sum(d.fixedindirectunitcost) as fixedindirectunitcost,
+    sum(d.variabledirectunitcost) as variabledirectunitcost,
+    sum(d.variableindirectunitcost) as variableindirectunitcost,
+    sum(g.totalcost) as totalcost,
+FROM dss.factpatientbillinglineitemdetail d
+LEFT JOIN pblidGrouping g on g.pblidrowid = d.rowid
+GROUP BY d.encounterid, d.chargecodeid
+;
+--Rollback
+DROP DYNAMIC TABLE IF EXISTS cci.encounterchargecodecosts;
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-06-24-15-06 Add StratetgicOpportunityDetail.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-06-24-15-06 Add StratetgicOpportunityDetail.sql
new file mode 100644
index 0000000..f3b049a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-06-24-15-06 Add StratetgicOpportunityDetail.sql	
@@ -0,0 +1,19 @@
+--Author: sdt-cloveland
+--Forward
+CREATE SCHEMA IF NOT EXISTS cci;
+
+CREATE OR REPLACE TABLE cci.StrategicOpportunityDetail (
+    OpportunityId BIGINT,
+    ChargeDepartmentID INT NOT NULL,
+    EncounterID INT NOT NULL,
+    ChargeCodeID INT NOT NULL,
+    EntityID INT NOT NULL,
+    PhysicianID INT NOT NULL,
+    PrimaryServiceLineID INT NOT NULL,
+    PhysicianSpecialtyID INT NOT NULL,
+    CostDriver STRING NOT NULL,
+    UnitsOfService FLOAT NOT NULL
+);
+
+--Rollback
+DROP TABLE cci.StrategicOpportunityDetail;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-07-09-11-55 Add DimExplorationPopulation table.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-07-09-11-55 Add DimExplorationPopulation table.sql
new file mode 100644
index 0000000..3926793
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-07-09-11-55 Add DimExplorationPopulation table.sql	
@@ -0,0 +1,13 @@
+--Author: sdt-dmoroziuk
+--Forward
+CREATE OR REPLACE TABLE cci.DimExplorationPopulation (
+    ExplorationPopulationId INT NOT NULL,
+    Name STRING NOT NULL,
+    CaseTypeFamilyId INT NOT NULL,
+    CostDriver STRING NOT NULL,
+    TotalEncounters INT NOT NULL,
+    TotalVariation FLOAT NOT NULL
+);
+
+--Rollback
+DROP TABLE cci.DimExplorationPopulation;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-07-09-12-05 Add FactExplorationPopulationEncounter table.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-07-09-12-05 Add FactExplorationPopulationEncounter table.sql
new file mode 100644
index 0000000..7165e60
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-07-09-12-05 Add FactExplorationPopulationEncounter table.sql	
@@ -0,0 +1,9 @@
+--Author: sdt-dmoroziuk
+--Forward
+CREATE OR REPLACE TABLE cci.FactExplorationPopulationEncounter (
+    ExplorationPopulationId INT NOT NULL,
+    EncounterId INT NOT NULL
+);
+
+--Rollback
+DROP TABLE cci.FactExplorationPopulationEncounter;
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-07-09-12-09 Add POSTGRES_REPLICATION_DATA stage.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-07-09-12-09 Add POSTGRES_REPLICATION_DATA stage.sql
new file mode 100644
index 0000000..322bbc0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-07-09-12-09 Add POSTGRES_REPLICATION_DATA stage.sql	
@@ -0,0 +1,6 @@
+--Author: sdt-dmoroziuk
+--Forward
+CREATE OR REPLACE STAGE cci.POSTGRES_REPLICATION_DATA;
+
+--Rollback
+DROP STAGE IF EXISTS cci.POSTGRES_REPLICATION_DATA;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-08-05-13-32 Add metrics to StratetgicOpportunityDetail.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-08-05-13-32 Add metrics to StratetgicOpportunityDetail.sql
new file mode 100644
index 0000000..3597665
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-08-05-13-32 Add metrics to StratetgicOpportunityDetail.sql	
@@ -0,0 +1,70 @@
+--Author: sdt-cloveland
+--Forward
+ALTER TABLE cci.StrategicOpportunityDetail
+ADD COLUMN IF NOT EXISTS BaselineCost FLOAT NOT NULL;
+
+ALTER TABLE cci.StrategicOpportunityDetail
+ADD COLUMN IF NOT EXISTS GoalUnits FLOAT NOT NULL;
+
+ALTER TABLE cci.StrategicOpportunityDetail
+ADD COLUMN IF NOT EXISTS GoalCost FLOAT NOT NULL;
+
+BEGIN
+  IF (
+       EXISTS (
+         SELECT 1
+         FROM INFORMATION_SCHEMA.COLUMNS
+         WHERE TABLE_CATALOG = CURRENT_DATABASE()
+           AND TABLE_SCHEMA = 'CCI'
+           AND TABLE_NAME   = 'STRATEGICOPPORTUNITYDETAIL'
+           AND COLUMN_NAME  = 'UNITSOFSERVICE'
+       )
+       AND NOT EXISTS (
+         SELECT 1
+         FROM INFORMATION_SCHEMA.COLUMNS
+         WHERE TABLE_CATALOG = CURRENT_DATABASE()
+           AND TABLE_SCHEMA = 'CCI'
+           AND TABLE_NAME   = 'STRATEGICOPPORTUNITYDETAIL'
+           AND COLUMN_NAME  = 'BASELINEUNITS'
+       )
+     )
+  THEN
+    ALTER TABLE cci.StrategicOpportunityDetail
+      RENAME COLUMN UnitsOfService TO BaselineUnits;
+  END IF;
+END;
+
+--Rollback
+ALTER TABLE cci.StrategicOpportunityDetail
+DROP COLUMN BaselineCost;
+
+ALTER TABLE cci.StrategicOpportunityDetail
+DROP COLUMN GoalCost;
+
+ALTER TABLE cci.StrategicOpportunityDetail
+DROP COLUMN GoalUnits;
+
+BEGIN
+  IF (
+       EXISTS (
+         SELECT 1
+         FROM INFORMATION_SCHEMA.COLUMNS
+         WHERE TABLE_CATALOG = CURRENT_DATABASE()
+           AND TABLE_SCHEMA = 'CCI'
+           AND TABLE_NAME   = 'STRATEGICOPPORTUNITYDETAIL'
+           AND COLUMN_NAME  = 'BASELINEUNITS'
+       )
+       AND NOT EXISTS (
+         SELECT 1
+         FROM INFORMATION_SCHEMA.COLUMNS
+         WHERE TABLE_CATALOG = CURRENT_DATABASE() 
+           AND TABLE_SCHEMA = 'CCI'
+           AND TABLE_NAME   = 'STRATEGICOPPORTUNITYDETAIL'
+           AND COLUMN_NAME  = 'UNITSOFSERVICE'
+       )
+     )
+  THEN
+    ALTER TABLE cci.StrategicOpportunityDetail
+      RENAME COLUMN BaselineUnits TO UnitsOfService;
+  END IF;
+END;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-09-09-10-44-Update CiEncounterCosts Add RowId.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-09-09-10-44-Update CiEncounterCosts Add RowId.sql
new file mode 100644
index 0000000..b6112bf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-09-09-10-44-Update CiEncounterCosts Add RowId.sql	
@@ -0,0 +1,82 @@
+--Author: tdebolt
+--Forward
+CREATE OR REPLACE DYNAMIC TABLE cci.encounterchargecodecosts
+    TARGET_LAG = DOWNSTREAM --important to set to downstream for creation, manually change to schedule as we enable for clients
+    WAREHOUSE = 'APP_CI_DYNAMICTABLE_WH'
+    COMMENT = 'Populate Charge Data by Encounter and Charge Code for use in CI'
+    REFRESH_MODE = AUTO
+    INITIALIZE = ON_SCHEDULE
+AS 
+WITH pblidGrouping (pblidrowid, unitsofservice, fixeddirectcost, fixedindirectcost, variabledirectcost, variableindirectcost, totalcost) AS (
+    SELECT
+      cd.pblidrowid,
+      min(unitsofservice) AS unitsofservice,
+      sum(fixeddirectcost) as fixeddirectcost, 
+      sum(fixedindirectcost) as fixedindirectcost, 
+      sum(variabledirectcost) as variabledirectcost, 
+      sum(variableindirectcost) as variableindirectcost,
+      sum(fixeddirectcost) + sum(fixedindirectcost) + sum(variabledirectcost) + sum(variableindirectcost) as totalcost
+    FROM dss.factpatientcostdetail cd
+    GROUP BY cd.pblidrowid
+    ORDER BY cd.pblidrowid
+)
+
+SELECT 
+    d.encounterid,
+    d.chargecodeid,
+    d.rowid,
+    sum(d.charge) as charge,
+    sum(g.unitsofservice) as unitsofservice,
+    sum(g.fixeddirectcost) as fixeddirectcost,
+    sum(g.fixedindirectcost) as fixedindirectcost,
+    sum(g.variabledirectcost) as variabledirectcost,
+    sum(g.variableindirectcost) as variableindirectcost,
+    sum(d.fixeddirectunitcost) as fixeddirectunitcost,
+    sum(d.fixedindirectunitcost) as fixedindirectunitcost,
+    sum(d.variabledirectunitcost) as variabledirectunitcost,
+    sum(d.variableindirectunitcost) as variableindirectunitcost,
+    sum(g.totalcost) as totalcost
+FROM dss.factpatientbillinglineitemdetail d
+LEFT JOIN pblidGrouping g on g.pblidrowid = d.rowid
+GROUP BY d.encounterid, d.chargecodeid, d.rowid
+;
+--Rollback
+CREATE OR REPLACE DYNAMIC TABLE cci.encounterchargecodecosts
+    TARGET_LAG = DOWNSTREAM --important to set to downstream for creation, manually change to schedule as we enable for clients
+    WAREHOUSE = 'APP_CI_DYNAMICTABLE_WH'
+    COMMENT = 'Populate Charge Data by Encounter and Charge Code for use in CI'
+    REFRESH_MODE = AUTO
+    INITIALIZE = ON_SCHEDULE
+AS 
+WITH pblidGrouping (pblidrowid, unitsofservice, fixeddirectcost, fixedindirectcost, variabledirectcost, variableindirectcost, totalcost) AS (
+    SELECT
+      cd.pblidrowid,
+      min(unitsofservice) AS unitsofservice,
+      sum(fixeddirectcost) as fixeddirectcost, 
+      sum(fixedindirectcost) as fixedindirectcost, 
+      sum(variabledirectcost) as variabledirectcost, 
+      sum(variableindirectcost) as variableindirectcost,
+      sum(fixeddirectcost) + sum(fixedindirectcost) + sum(variabledirectcost) + sum(variableindirectcost) as totalcost
+    FROM dss.factpatientcostdetail cd
+    GROUP BY cd.pblidrowid
+    ORDER BY cd.pblidrowid
+)
+
+SELECT 
+    d.encounterid,
+    d.chargecodeid,
+    sum(d.charge) as charge,
+    sum(g.unitsofservice) as unitsofservice,
+    sum(g.fixeddirectcost) as fixeddirectcost,
+    sum(g.fixedindirectcost) as fixedindirectcost,
+    sum(g.variabledirectcost) as variabledirectcost,
+    sum(g.variableindirectcost) as variableindirectcost,
+    sum(d.fixeddirectunitcost) as fixeddirectunitcost,
+    sum(d.fixedindirectunitcost) as fixedindirectunitcost,
+    sum(d.variabledirectunitcost) as variabledirectunitcost,
+    sum(d.variableindirectunitcost) as variableindirectunitcost,
+    sum(g.totalcost) as totalcost
+FROM dss.factpatientbillinglineitemdetail d
+LEFT JOIN pblidGrouping g on g.pblidrowid = d.rowid
+GROUP BY d.encounterid, d.chargecodeid
+
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-09-30-01-40 Renamed ChargeDepartmentId to DepartmentId of StrategicOpportunityDetail.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-09-30-01-40 Renamed ChargeDepartmentId to DepartmentId of StrategicOpportunityDetail.sql
new file mode 100644
index 0000000..1741175
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-09-30-01-40 Renamed ChargeDepartmentId to DepartmentId of StrategicOpportunityDetail.sql	
@@ -0,0 +1,51 @@
+--Author: sdt-dmoroziuk
+--Forward
+BEGIN
+  IF (
+       EXISTS (
+         SELECT 1
+         FROM INFORMATION_SCHEMA.COLUMNS
+         WHERE TABLE_CATALOG = CURRENT_DATABASE()
+           AND TABLE_SCHEMA = 'CCI'
+           AND TABLE_NAME   = 'STRATEGICOPPORTUNITYDETAIL'
+           AND COLUMN_NAME  = 'ChargeDepartmentID'
+       )
+       AND NOT EXISTS (
+         SELECT 1
+         FROM INFORMATION_SCHEMA.COLUMNS
+         WHERE TABLE_CATALOG = CURRENT_DATABASE()
+           AND TABLE_SCHEMA = 'CCI'
+           AND TABLE_NAME   = 'STRATEGICOPPORTUNITYDETAIL'
+           AND COLUMN_NAME  = 'DepartmentId'
+       )
+     )
+  THEN
+    ALTER TABLE cci.StrategicOpportunityDetail
+    RENAME COLUMN ChargeDepartmentID TO DepartmentId;
+  END IF;
+END;
+--Rollback
+BEGIN
+  IF (
+       EXISTS (
+         SELECT 1
+         FROM INFORMATION_SCHEMA.COLUMNS
+         WHERE TABLE_CATALOG = CURRENT_DATABASE()
+           AND TABLE_SCHEMA = 'CCI'
+           AND TABLE_NAME   = 'STRATEGICOPPORTUNITYDETAIL'
+           AND COLUMN_NAME  = 'DepartmentId'
+       )
+       AND NOT EXISTS (
+         SELECT 1
+         FROM INFORMATION_SCHEMA.COLUMNS
+         WHERE TABLE_CATALOG = CURRENT_DATABASE()
+           AND TABLE_SCHEMA = 'CCI'
+           AND TABLE_NAME   = 'STRATEGICOPPORTUNITYDETAIL'
+           AND COLUMN_NAME  = 'ChargeDepartmentID'
+       )
+     )
+  THEN
+    ALTER TABLE cci.StrategicOpportunityDetail
+    RENAME COLUMN DepartmentId TO ChargeDepartmentID;
+  END IF;
+END;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-10-06-06-56 Add columns to cci.StrategicOpportunityDetail.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-10-06-06-56 Add columns to cci.StrategicOpportunityDetail.sql
new file mode 100644
index 0000000..c58f65b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-10-06-06-56 Add columns to cci.StrategicOpportunityDetail.sql	
@@ -0,0 +1,8 @@
+--Author: yrenz
+--Forward
+ALTER TABLE cci.StrategicOpportunityDetail
+ADD COLUMN IF NOT EXISTS CaseTypeFamilyID INT NOT NULL DEFAULT(0);
+
+--Rollback
+ALTER TABLE cci.StrategicOpportunityDetail
+DROP COLUMN CaseTypeFamilyID;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-10-17-02-23 Add cci.viewEncounterPatientTypeRollup.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-10-17-02-23 Add cci.viewEncounterPatientTypeRollup.sql
new file mode 100644
index 0000000..2ad7cbd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-10-17-02-23 Add cci.viewEncounterPatientTypeRollup.sql	
@@ -0,0 +1,9 @@
+--Author: yrenz
+--Forward
+CREATE OR ALTER VIEW cci.viewEncounterPatientTypeRollup AS
+SELECT fpes.encounterid, ptr.Type as PatientTypeRollup
+FROM clientdss.FactPatientEncounterSummary fpes
+INNER JOIN fw.DimPatientType pt ON fpes.PatientTypeID = pt.PatientTypeID
+INNER JOIN fw.DimPatientTypeRollup ptr ON pt.PatientTypeRollupID = ptr.PatientTypeRollupID;
+--Rollback
+DROP VIEW IF EXISTS cci.viewEncounterPatientTypeRollup;
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-11-03-09-00 Update cci.StrategicOpportunityDetail table.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-11-03-09-00 Update cci.StrategicOpportunityDetail table.sql
new file mode 100644
index 0000000..a342725
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-11-03-09-00 Update cci.StrategicOpportunityDetail table.sql	
@@ -0,0 +1,44 @@
+--Author: sdt-mvasylovskyi
+
+--Forward
+
+CREATE OR REPLACE TABLE cci.FactStrategicChargeCodeDetail (
+    RowId BIGINT AUTOINCREMENT START 1 INCREMENT 1 PRIMARY KEY,
+    IsBaseline BOOLEAN NOT NULL DEFAULT FALSE,
+    DischargeFiscalYearId SMALLINT NOT NULL DEFAULT 0,
+    DischargeFiscalMonthId TINYINT NOT NULL DEFAULT 0,
+    OpportunityId BIGINT,
+    EntityId INT NOT NULL,
+    PrimaryPhysicianId INT NOT NULL,
+    PrimaryServiceLineId INT NOT NULL,
+    DepartmentId INT NOT NULL,
+    PhysicianSpecialtyId INT NOT NULL,
+    ChargeCodeId INT NOT NULL,
+    CaseTypeFamilyId INT NOT NULL,
+    CostDriver VARCHAR(1024) NOT NULL COLLATE 'en-ci',
+    Units FLOAT NOT NULL,
+    Cost FLOAT NOT NULL,
+    GoalUnits FLOAT NOT NULL,
+    GoalCost FLOAT NOT NULL
+);
+DROP TABLE IF EXISTS cci.StrategicOpportunityDetail;
+
+--Rollback
+
+CREATE OR REPLACE TABLE cci.StrategicOpportunityDetail (    
+    OpportunityId BIGINT,
+    EncounterId INT NOT NULL,
+    EntityId INT NOT NULL,
+    PhysicianId INT NOT NULL,
+    PrimaryServiceLineId INT NOT NULL,
+    DepartmentId INT NOT NULL,
+    PhysicianSpecialtyId INT NOT NULL,
+    ChargeCodeId INT NOT NULL,
+    CaseTypeFamilyId INT NOT NULL,
+    CostDriver VARCHAR(1024) NOT NULL COLLATE 'en-ci',
+    BaselineUnits FLOAT NOT NULL,
+    BaselineCost FLOAT NOT NULL,
+    GoalUnits FLOAT NOT NULL,
+    GoalCost FLOAT NOT NULL
+);
+DROP TABLE IF EXISTS cci.FactStrategicChargeCodeDetail;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-12-22-09-00 Update cci.FactStrategicChargeCodeDetail table.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-12-22-09-00 Update cci.FactStrategicChargeCodeDetail table.sql
new file mode 100644
index 0000000..fd1d2f6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2025-12-22-09-00 Update cci.FactStrategicChargeCodeDetail table.sql	
@@ -0,0 +1,63 @@
+--Author: sdt-mvasylovskyi
+
+--Forward
+
+BEGIN
+IF (
+    EXISTS (
+        SELECT 1
+        FROM INFORMATION_SCHEMA.TABLES
+        WHERE TABLE_SCHEMA ILIKE 'cci'
+        AND TABLE_NAME ILIKE 'FactStrategicChargeCodeDetail'
+    )    
+)
+THEN
+    IF (
+        NOT EXISTS (
+            SELECT 1
+            FROM INFORMATION_SCHEMA.COLUMNS
+            WHERE TABLE_SCHEMA ILIKE 'cci'
+            AND TABLE_NAME ILIKE 'FactStrategicChargeCodeDetail'
+            AND COLUMN_NAME ILIKE 'DistributedUnits'
+        )    
+    )
+    THEN
+        ALTER TABLE cci.FactStrategicChargeCodeDetail
+        ADD COLUMN DistributedUnits FLOAT NOT NULL DEFAULT(0);
+    END IF;
+
+    IF (
+        NOT EXISTS (
+            SELECT 1
+            FROM INFORMATION_SCHEMA.COLUMNS
+            WHERE TABLE_SCHEMA ILIKE 'cci'
+            AND TABLE_NAME ILIKE 'FactStrategicChargeCodeDetail'
+            AND COLUMN_NAME ILIKE 'DistributedCost'
+        )    
+    )
+    THEN
+        ALTER TABLE cci.FactStrategicChargeCodeDetail
+        ADD COLUMN DistributedCost FLOAT NOT NULL DEFAULT(0);
+    END IF;
+END IF;
+END;
+
+--Rollback
+
+BEGIN
+IF (
+    EXISTS (
+        SELECT 1
+        FROM INFORMATION_SCHEMA.TABLES
+        WHERE TABLE_SCHEMA ILIKE 'cci'
+        AND TABLE_NAME ILIKE 'FactStrategicChargeCodeDetail'
+    )     
+)
+THEN
+    ALTER TABLE cci.FactStrategicChargeCodeDetail
+    DROP COLUMN IF EXISTS DistributedUnits;
+    ALTER TABLE cci.FactStrategicChargeCodeDetail
+    DROP COLUMN IF EXISTS DistributedCost;
+END IF;
+END;
+
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2026-01-23-12-59 Add StrategicOpportunityMeasureDetail table.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2026-01-23-12-59 Add StrategicOpportunityMeasureDetail table.sql
new file mode 100644
index 0000000..6aa08ef
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2026-01-23-12-59 Add StrategicOpportunityMeasureDetail table.sql	
@@ -0,0 +1,12 @@
+--Author: sdt-ydzoba
+--Forward
+CREATE OR REPLACE TABLE cci.StrategicOpportunityMeasureDetail (
+    MeasureId BIGINT NOT NULL,
+    YearId SMALLINT NOT NULL,
+    MonthId TINYINT NOT NULL,
+    Value FLOAT NOT NULL DEFAULT 0,
+    PRIMARY KEY (MeasureId, YearId, MonthId)
+);
+
+--Rollback
+DROP TABLE IF EXISTS cci.StrategicOpportunityMeasureDetail;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2026-03-03-14-00 Add cci.DimStrategicItem.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2026-03-03-14-00 Add cci.DimStrategicItem.sql
new file mode 100644
index 0000000..b5f9889
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2026-03-03-14-00 Add cci.DimStrategicItem.sql	
@@ -0,0 +1,36 @@
+--Author: sdt-tdebolt
+
+--Forward
+CREATE TABLE IF NOT EXISTS cci.dimstrategicitem (
+    strategic_item_id               NUMBER(38,0)        NOT NULL,
+    name                            STRING,
+    rollup_one_id                   NUMBER(38,0),
+    rollup_two_id                   NUMBER(38,0),
+    rollup_three_id                 NUMBER(38,0),
+    baseline_type                   STRING,
+    strategic_item_type             STRING,
+    opportunity_type                STRING,
+    status                          STRING,
+    baseline_distribution           STRING,
+    baseline_start_date             DATE,
+    baseline_end_date               DATE,
+    estimated_tracking_duration     NUMBER(38,0),
+    tracking_start_date             DATE,
+    tracking_end_date               DATE,
+    estimated_goal                  NUMBER(19,4),
+    total_improvement               NUMBER(19,4),
+    cost_leader                     STRING,
+    executive_sponsor               STRING,
+    owner                           STRING,
+    stakeholders    	            STRING,    
+    team_members                    STRING,
+    last_run_tracking_date          DATE,
+    last_run_tracking_status        STRING,
+
+    CONSTRAINT pk_dimstrategicitem 
+        PRIMARY KEY (strategic_item_id)
+);
+
+--Rollback
+
+DROP TABLE IF EXISTS cci.dimstrategicitem;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2026-03-11-10-00 Add cci.FactStrategicGLDetail table.sql b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2026-03-11-10-00 Add cci.FactStrategicGLDetail table.sql
new file mode 100644
index 0000000..e8c4dae
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/SnowflakeMigrations/2026-03-11-10-00 Add cci.FactStrategicGLDetail table.sql	
@@ -0,0 +1,22 @@
+--Author: sdt-mleitch
+
+--Forward
+
+CREATE TABLE IF NOT EXISTS cci.FactStrategicGLDetail (
+    RowId BIGINT AUTOINCREMENT START 1 INCREMENT 1 PRIMARY KEY,
+    IsBaseline BOOLEAN NOT NULL DEFAULT FALSE,
+    FiscalYearId SMALLINT NOT NULL DEFAULT 0,
+    FiscalMonthId TINYINT NOT NULL DEFAULT 0,
+    OpportunityId BIGINT NOT NULL,
+    EntityId INT NOT NULL,
+    DepartmentId INT NOT NULL,
+    AccountId INT NOT NULL,
+    AccountType TINYINT,
+    Amount FLOAT NOT NULL DEFAULT 0,
+    GoalAmount FLOAT NOT NULL DEFAULT 0,
+    DistributedAmount FLOAT NOT NULL DEFAULT 0
+);
+
+--Rollback
+
+DROP TABLE IF EXISTS cci.FactStrategicGLDetail;
diff --git a/src/Strata.ContinuousImprovement.Api/Startup.cs b/src/Strata.ContinuousImprovement.Api/Startup.cs
new file mode 100644
index 0000000..cc9f8e3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Startup.cs
@@ -0,0 +1,122 @@
+using Amazon.SQS;
+using AutoMapper;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Prometheus;
+using Strata.ApiLib.Core.Cors.Extensions;
+using Strata.ApiLib.Core.ExceptionHandling.DependencyInjection.Bootstrappers;
+using Strata.ApiLib.Core.Logging.Bootstrappers;
+using Strata.ApiLib.Core.StrataAuthentication.Bootstrappers;
+using Strata.ApiLib.Core.Transformers;
+using Strata.ContinuousImprovement.Api.Generics;
+using Strata.ContinuousImprovement.Biz.BackgroundServices;
+using Strata.ContinuousImprovement.Biz.Configurations;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.DecisionSupport.Biz.Configurations;
+using Strata.healthchecks.Biz;
+using Strata.SignalR.Configuration;
+using Strata.SwaggerExtensions;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Mime;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api
+{
+    [ExcludeFromCodeCoverage]
+    public class Startup
+    {
+        private readonly IConfiguration _configuration;
+
+        public Startup(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        // This method gets called by the runtime. Use this method to add services to the container.
+        // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddGlobalExceptionMiddleware(_configuration);
+            services.AddControllers(options =>
+            {
+                //Prevent browsers from caching API responses (this addresses an IE11 issue):
+                options.Filters.Add(
+                    new ResponseCacheAttribute()
+                    {
+                        Location = ResponseCacheLocation.None,
+                        NoStore = false,
+                        Duration = -1
+                    });
+                options.ReturnHttpNotAcceptable = true;
+                options.Filters.Add(new ProducesAttribute(MediaTypeNames.Application.Json));
+                options.Filters.Add(new ConsumesAttribute(MediaTypeNames.Application.Json));
+                options.Conventions.Add(new RouteTokenTransformerConvention(new SlugifyParameterTransformer()));
+
+            })
+            .AddJsonOptions(options =>
+            {
+                options.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
+                options.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
+                options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
+            })
+            .SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
+
+            services.AddAuthorization(options =>
+            {
+                options.AddPolicy(Policies.IsAdmin,
+                    policy => policy.RequireAssertion(context => context.User.IsInRole("CI - System Administrator") || context.User.IsSdtEmployee()));
+                options.AddPolicy(Policies.StrataOnly,
+                    policy => policy.RequireAssertion(context => context.User.IsSdtEmployee()));
+            });
+
+            services.AddStrataAuthentication(_configuration);
+            services.AddStrataHangfire();
+            services.AddContinuousImprovementServices(_configuration);
+            services.AddDecisionSupportServices(_configuration);
+            services.AddRouting();
+            services.AddSwagger(_configuration);
+            services.AddStrataSignalR();
+            services.AddStrataHealthChecks(_configuration);
+            services.AddSnowflakeMigrationServiceClient();
+            services.AddStrataCors(_configuration);
+            services.AddHealthChecks();
+
+            services.AddTransient<IAmazonSQS, AmazonSQSClient>();
+            services.AddHostedService<ReplicationBackgroundService>();
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IApiVersionDescriptionProvider provider)
+        {
+            app.UseGlobalExceptionMiddleware();
+            app.UseRouting();
+            app.UseStrataCorsPolicy(env);
+
+            if (!env.IsDevelopment())
+            {
+                app.UseHsts();
+                app.UseHttpsRedirection();
+            }
+
+            app.UseMetricServer();
+            app.UseHttpMetrics();
+            app.UseAccessTokenQueryStringMiddleware();
+            app.UseStrataAuthentication();
+            app.UseClaimsLogging();
+            app.ConfigureSwagger(env, provider);
+            app.UseEndpoints(endpoints => endpoints.MapControllers().RequireAuthorization());
+            app.UseEndpoints(endpoints => endpoints.MapHangfireHub());
+            app.UseEndpoints(endpoints => endpoints.MapNotificationHub());
+            app.UseStrataHealthChecks(env);
+        }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Api/Strata.ContinuousImprovement.Api.csproj b/src/Strata.ContinuousImprovement.Api/Strata.ContinuousImprovement.Api.csproj
new file mode 100644
index 0000000..16ebccc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/Strata.ContinuousImprovement.Api.csproj
@@ -0,0 +1,77 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>$(NoWarn);1591</NoWarn>
+    <IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
+    <CodeAnalysisRuleSet></CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="AutoMapper\**" />
+    <Content Remove="AutoMapper\**" />
+    <EmbeddedResource Remove="AutoMapper\**" />
+    <None Remove="AutoMapper\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\.sonarlint\strata.continuousimprovement\CSharp\SonarLint.xml" Link="SonarLint.xml" />
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10" />
+    <PackageReference Include="Pluralize.NET" Version="1.0.2" />
+    <PackageReference Include="Strata.ApiLib.Core" Version="8.4.1" />
+    <PackageReference Include="Strata.ApiLib.Standard" Version="8.4.1" />
+    <PackageReference Include="Strata.Authorization" Version="3.1.0" />
+    <PackageReference Include="Strata.Configuration.Client" Version="9.15.1" />
+    <PackageReference Include="Strata.FeatureFlags.Client" Version="6.4.0" />
+    <PackageReference Include="Strata.Hangfire.AspNetCore" Version="5.3.0" />
+    <PackageReference Include="Strata.healthchecks.Biz" Version="3.2.0" />
+    <PackageReference Include="Strata.healthchecks.Jazz" Version="3.2.0" />
+    <PackageReference Include="Strata.healthchecks.Postgres" Version="3.2.0" />
+    <PackageReference Include="Strata.healthchecks.Redis" Version="3.2.0" />
+    <PackageReference Include="Strata.healthchecks.Snowflake" Version="3.2.0" />
+    <PackageReference Include="Strata.Id.Client" Version="4.1.4" />
+    <PackageReference Include="Strata.Logging" Version="4.1.1" />
+    <PackageReference Include="Strata.SignalR" Version="2.0.0" />
+    <PackageReference Include="Strata.Snowflake.Migrations.Client" Version="0.17.0" />
+    <PackageReference Include="Strata.SwaggerExtensions" Version="4.1.1" />
+    <PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
+    <PackageReference Include="System.Linq" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Strata.ContinuousImprovement.Biz\Strata.ContinuousImprovement.Biz.csproj" />
+    <ProjectReference Include="..\Strata.ContinuousImprovement.Client\Strata.ContinuousImprovement.Client.csproj" />
+    <ProjectReference Include="..\Strata.DecisionSupport.Biz\Strata.DecisionSupport.Biz.csproj" />
+    <ProjectReference Include="..\Strata.DecisionSupport.Models\Strata.DecisionSupport.Models.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.Api.Test.Unit</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+  <ItemGroup>
+	  <None Update="SnowflakeMigrations\**\*.sql">
+		<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </None>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Strata.ContinuousImprovement.Api/appsettings.Development.json b/src/Strata.ContinuousImprovement.Api/appsettings.Development.json
new file mode 100644
index 0000000..1a039f2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/appsettings.Development.json
@@ -0,0 +1,37 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  },
+  "config": {
+    "sqsReplicationCompleteQueueName": "sdt-continuous-improvement-replication-status-queue",
+    "sqsEnabled": true
+  },
+  "hangfire": {
+    "url": "https://localhost:44369",
+    "redis": {
+      "prefix": "continuousimprovement-jobs-service",
+      "configOptions": "ddenredisc01.sdt.local:6379,ddenredisc02.sdt.local:6379,ddenredisc03.sdt.local:6379,ddenredisc04.sdt.local:6379,ddenredisc05.sdt.local:6379,ddenredisc06.sdt.local:6379"
+    }
+  },
+  "accessGudid": {
+    "url": "https://accessgudid.nlm.nih.gov/download/delimited"
+  },
+  "datadog": {
+    "seedgmdnjob": "https://app.datadoghq.com/logs/livetail?query=service%3ASeedGMDNTermDataJob%20env%3Adev&cols=status%2Cenv%2C%40db.strata_id%2C%40db.org_pin%2C%40db.name%2C%40db.instance%2C%40process.name%2Cservice&index=%2A&messageDisplay=inline&stream_sort=desc&viz=stream&from_ts=1692207497147&to_ts=1692293897147&live=true"
+  },
+  "strataApi": {
+    "clientSecret": "V_okTrkWYBs-PqMP.inbJShIvMGWcpdqCDq_ZjntVF.ydgRCoYaDVJYEWEIdsjJ_"
+  },
+  "ChargeCodeOpportunityValidation": {
+    "maxChargeCodeSelections": 100,
+    "maxOpportunityLevelSelections": 10
+  },
+  "Snowflake": {
+    "Url": "https://stratadev.us-east-1.privatelink.snowflakecomputing.com",
+    "Account": "stratadev"
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/appsettings.json b/src/Strata.ContinuousImprovement.Api/appsettings.json
new file mode 100644
index 0000000..1416272
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/appsettings.json
@@ -0,0 +1,42 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Warning"
+    }
+  },
+  "AllowedHosts": "*",
+  "Version": "0.0.0",
+  "configuration": {
+    "basicAuthUsername": "BkQsRDdmdjkFNhKVuTI.TpujQJXuKhGDcV.F_hjADMRTaEUWMJnviaesoOrhhfnz",
+    "basicAuthPassword": "GWPIIWECDqh.hjDNdpxVEfeFe-bYFwPSx-oBGFD_od_SUQVk-QqTIkZY_NXMeqeo"
+  },
+  "config": {
+    "sqsReplicationCompleteQueueName": "sdt-continuous-improvement-replication-status-queue",
+    "sqsEnabled": true
+  },
+  "endpoints": {
+    "dataschema": "https://dataschema-api.dev.stratanetwork.net/",
+    "schema": "https://schema-api.dev.stratanetwork.net",
+    "analytics": "https://analytics-api.dev.stratanetwork.net"
+  },
+  "StrataConfigServerBaseUrl": "https://configuration.dev.stratanetwork.net",
+  "NetworkOpportunity": {
+    "Creators": [ "" ]
+  },
+  "HealthCheck": {
+    "PushToDataDog": true,
+    "StrataJazz": true,
+    "JazzDatabaseGuid": "54409f55-5ddf-4748-8222-9ccfb04fb4f5",
+    "Snowflake": true,
+    "Redis": true,
+    "Sqs": false,
+    "Sns": false,
+    "PostgresDatabaseName": "continuousimprovement",
+    "SqsQueueNames": [],
+    "SnsTopicArns": []
+  },
+  "Snowflake": {
+    "Url": "https://stratadev.us-east-1.privatelink.snowflakecomputing.com",
+    "Account": "stratadev"
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Api/runtimeconfig.template.json b/src/Strata.ContinuousImprovement.Api/runtimeconfig.template.json
new file mode 100644
index 0000000..9cbaf60
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Api/runtimeconfig.template.json
@@ -0,0 +1,5 @@
+{
+  "configProperties": {
+    "System.Drawing.EnableUnixSupport":  true
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/All/Opportunities/AllOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/All/Opportunities/AllOpportunity.cs
new file mode 100644
index 0000000..660cb97
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/All/Opportunities/AllOpportunity.cs
@@ -0,0 +1,16 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.All.Opportunities
+{
+    [Table("viewAllOpportunity", Schema = "cci")]
+    public class AllOpportunity : Opportunity
+    {
+        public string Name { get; set; }
+        public int OpportunityType { get; set; }
+        public string OpportunityTypeName { get; set; }
+        public string CostDriver { get; set; }
+        public long OpportunityId { get; set; }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/All/Opportunities/AllOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/All/Opportunities/AllOpportunityService.cs
new file mode 100644
index 0000000..10e13bc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/All/Opportunities/AllOpportunityService.cs
@@ -0,0 +1,242 @@
+using ClosedXML.Excel;
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.All.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Exploration.Opportunities;
+using Strata.ContinuousImprovement.Biz.Export;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities;
+using Strata.CoreLib.Claims;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.All.Opportunities
+{
+    public class AllOpportunityService : OpportunityService<AllOpportunity>, IAllOpportunityService
+    {
+        private readonly IUVOpportunityService _uvOpportunityService;
+        private readonly IQVIOpportunityService _qviOpportunityService;
+        private readonly IGLOpportunityService _glOpportunityService;
+        private readonly IFFOpportunityService _ffOpportunityService;
+        private readonly IPROpportunityService _prOpportunityService;
+        private readonly IENOpportunityService _enOpportunityService;
+        private readonly ICCOpportunityService _ccOpportunityService;
+        private readonly IEXOpportunityService _blankOpportunityService;
+
+        internal AllOpportunityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IInitiativeService initiativeService, IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor, initiativeService, updateFactOpportunitySavingsService)
+        {
+
+        }
+
+#pragma warning disable S107 // Constructor has NN new parameters, which is greater than the 7 authorized
+        public AllOpportunityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IInitiativeService initiativeService, IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            IUVOpportunityService uvOpportunityService,
+            IQVIOpportunityService qviOpportunityService,
+            IGLOpportunityService glOpportunityService,
+            IFFOpportunityService ffOpportunityService,
+            IPROpportunityService prOpportunityService,
+            IENOpportunityService enOpportunityService,
+            ICCOpportunityService ccOpportunityService,
+            IEXOpportunityService blankOpportunityService)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor, initiativeService, updateFactOpportunitySavingsService)
+#pragma warning restore S107
+        {
+            _uvOpportunityService = uvOpportunityService;
+            _qviOpportunityService = qviOpportunityService;
+            _glOpportunityService = glOpportunityService;
+            _ffOpportunityService = ffOpportunityService;
+            _prOpportunityService = prOpportunityService;
+            _enOpportunityService = enOpportunityService;
+            _ccOpportunityService = ccOpportunityService;
+            _blankOpportunityService = blankOpportunityService;
+        }
+
+        public async Task<bool> ContainsAsync(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) return false;
+
+            return await dbContext.AllOpportunities.ContainsAsync(new AllOpportunity() { OpportunityGuid = opportunityGuid }, cancellationToken);
+        }
+
+        public async Task<AllFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) return null;
+
+            var opportunityContext = dbContext.Set<AllOpportunity>();
+            var configuredOpportunities = opportunityContext.Where(en => en.ConfigurationGuid == configurationGuid);
+            var opportunityTypeIds = Enum.GetValues<OpportunityTypes>().Cast<byte>();
+
+            var opportunityTypes = configuredOpportunities
+                .Where(ol => opportunityTypeIds.Contains((byte)ol.OpportunityType))
+                .Select(ol => new FilterMember
+                {
+                    Id = ol.OpportunityType.ToString(),
+                    Text = ((OpportunityTypes)ol.OpportunityType).OpportunityTypeName()
+                })
+                .Distinct().ToList().OrderBy(ol => ol.Text);
+
+            return new AllFilterOptions
+            {
+                OpportunityTypes = opportunityTypes
+            };
+        }
+
+        public async Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, AllFilters filters, CancellationToken cancellationToken)
+        {
+            var exportOptions = this.GetExportOptions();
+
+            // get data
+            var opportunities = await this.GetAllAsync(sortOptions, filters, cancellationToken);
+            var data = opportunities.Select(opp => new
+            {
+                Opportunity = opp.OpportunityKey,
+                Type = opp.OpportunityTypeName,
+                opp.Name,
+                opp.IdentifiedSavings,
+                opp.Initiative,
+                IsHidden = opp.IsHidden ? 1 : 0,
+                opp.Note
+            });
+
+            // configure column formats
+            exportOptions.AddColumnOptions("Identified Savings", "Currency2Dec");
+            exportOptions.AddColumnOptions("Is Hidden", "\"Yes\";-;\"No\"");
+
+            return ExportUtils.CreateExcelWorkbook(data, exportOptions);
+        }
+
+        public async Task<bool> NameIsValid(Guid configurationGuid, int opportunityType, string name, Guid? opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return default;
+            var opportunityContext = dbContext.Set<AllOpportunity>();
+            var opportunityNames = await opportunityContext
+                .Where(opp => opp.ConfigurationGuid == configurationGuid
+                    && opp.OpportunityType == opportunityType
+                    && opp.Name.StartsWith(name)
+                    && opp.OpportunityGuid != opportunityGuid // don't check against current opportunity if editing
+                    ).Select(opp => opp.Name).ToListAsync(cancellationToken);
+            // FreeForm has the Improvement Type in the All name
+            var nameRegex = Regex.Replace(name, @"([()[\]!@#$%^&*])", @"\$1");
+            var regex = opportunityType == (int)OpportunityTypes.FreeForm
+                ? new Regex(@$"^{nameRegex} \(.+\) - FY[\d]{{4}}$", RegexOptions.IgnoreCase)
+                : new Regex(@$"^{nameRegex} - FY[\d]{{4}}$", RegexOptions.IgnoreCase);
+
+            var nameIsValid = !opportunityNames.Exists(opporturnityName => regex.IsMatch(opporturnityName));
+
+            return nameIsValid;
+        }
+
+        public override async Task SetHiddenAsync(Guid opportunityGuid, bool isHidden, CancellationToken cancellationToken)
+        {
+            var opportunityItem = await GetById(opportunityGuid, cancellationToken);
+            if (opportunityItem == null) return;
+            switch ((OpportunityTypes)opportunityItem.OpportunityType)
+            {
+                case OpportunityTypes.Variation:
+                    await _uvOpportunityService.SetHiddenAsync(opportunityGuid, isHidden, cancellationToken);
+                    return;
+                case OpportunityTypes.QualityVariation:
+                    await _qviOpportunityService.SetHiddenAsync(opportunityGuid, isHidden, cancellationToken);
+                    return;
+                case OpportunityTypes.FreeForm:
+                    await _ffOpportunityService.SetHiddenAsync(opportunityGuid, isHidden, cancellationToken);
+                    return;
+                case OpportunityTypes.GeneralLedger:
+                    await _glOpportunityService.SetHiddenAsync(opportunityGuid, isHidden, cancellationToken);
+                    return;
+                case OpportunityTypes.Payroll:
+                    await _prOpportunityService.SetHiddenAsync(opportunityGuid, isHidden, cancellationToken);
+                    return;
+                case OpportunityTypes.Encounter:
+                    await _enOpportunityService.SetHiddenAsync(opportunityGuid, isHidden, cancellationToken);
+                    return;
+                case OpportunityTypes.ChargeCode:
+                    await _ccOpportunityService.SetHiddenAsync(opportunityGuid, isHidden, cancellationToken);
+                    return;
+                case OpportunityTypes.Blank:
+                    await _blankOpportunityService.SetHiddenAsync(opportunityGuid, isHidden, cancellationToken);
+                    return;
+                case OpportunityTypes.Network:
+                    var dbContext = await GetDbContext(cancellationToken);
+                    var nol = await dbContext.NetworkOpportunityLinks
+                        .SingleOrDefaultAsync(n => n.OpportunityGuid == opportunityGuid);
+                    if (nol != null)
+                    {
+                        nol.IsHidden = isHidden;
+                    }
+                    dbContext.Update(nol);
+                    await dbContext.SaveChangesAsync(cancellationToken);
+                    return;
+            }
+        }
+
+        public override async Task SetNoteAsync(Guid opportunityGuid, string note, CancellationToken cancellationToken)
+        {
+            var opportunityItem = await GetById(opportunityGuid, cancellationToken);
+            if (opportunityItem == null) return;
+            switch ((OpportunityTypes)opportunityItem.OpportunityType)
+            {
+                case OpportunityTypes.Variation:
+                    await _uvOpportunityService.SetNoteAsync(opportunityGuid, note, cancellationToken);
+                    return;
+                case OpportunityTypes.QualityVariation:
+                    await _qviOpportunityService.SetNoteAsync(opportunityGuid, note, cancellationToken);
+                    return;
+                case OpportunityTypes.FreeForm:
+                    await _ffOpportunityService.SetNoteAsync(opportunityGuid, note, cancellationToken);
+                    return;
+                case OpportunityTypes.GeneralLedger:
+                    await _glOpportunityService.SetNoteAsync(opportunityGuid, note, cancellationToken);
+                    return;
+                case OpportunityTypes.Payroll:
+                    await _prOpportunityService.SetNoteAsync(opportunityGuid, note, cancellationToken);
+                    return;
+                case OpportunityTypes.Encounter:
+                    await _enOpportunityService.SetNoteAsync(opportunityGuid, note, cancellationToken);
+                    return;
+                case OpportunityTypes.ChargeCode:
+                    await _ccOpportunityService.SetNoteAsync(opportunityGuid, note, cancellationToken);
+                    return;
+                case OpportunityTypes.Blank:
+                    await _blankOpportunityService.SetNoteAsync(opportunityGuid, note, cancellationToken);
+                    return;
+                case OpportunityTypes.Network:
+                    var dbContext = await GetDbContext(cancellationToken);
+                    var nol = await dbContext.NetworkOpportunityLinks
+                        .SingleOrDefaultAsync(n => n.OpportunityGuid == opportunityGuid);
+                    if (nol != null)
+                    {
+                        nol.Note = note;
+                    }
+                    dbContext.Update(nol);
+                    await dbContext.SaveChangesAsync(cancellationToken);
+                    return;
+            }
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/All/Opportunities/Filters/AllFilterOptions.cs b/src/Strata.ContinuousImprovement.Biz/All/Opportunities/Filters/AllFilterOptions.cs
new file mode 100644
index 0000000..04a6a78
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/All/Opportunities/Filters/AllFilterOptions.cs
@@ -0,0 +1,10 @@
+using Strata.ContinuousImprovement.Biz.Filter;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.All.Opportunities.Filters
+{
+    public class AllFilterOptions
+    {
+        public IEnumerable<FilterMember> OpportunityTypes { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/All/Opportunities/Filters/AllFilters.cs b/src/Strata.ContinuousImprovement.Biz/All/Opportunities/Filters/AllFilters.cs
new file mode 100644
index 0000000..e07ac18
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/All/Opportunities/Filters/AllFilters.cs
@@ -0,0 +1,48 @@
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.All.Opportunities.Filters
+{
+    public class AllFilters : FiltersOpportunity<AllOpportunity>
+    {
+        public IEnumerable<string> OpportunityTypes { get; set; }
+        public bool HasFlexibleExploration { get; set; }
+
+        public AllFilters() : base()
+        {
+            OpportunityTypes = new List<string>();
+        }
+
+        public override IEnumerable<Expression<Func<AllOpportunity, bool>>> GetFilters(JazzDbContext context)
+        {
+            var filters = base.GetFilters(context).ToList();
+
+            if (OpportunityTypes.Any())
+            {
+                filters.Add(m => OpportunityTypes.Contains(m.OpportunityType.ToString()));
+            }
+            else
+            {
+                var opportunityTypeIds = Enum.GetValues<Generics.OpportunityTypes>().Cast<byte>().ToList();
+                filters.Add(m => opportunityTypeIds.Contains((byte)m.OpportunityType));
+            }
+            if (!string.IsNullOrEmpty(OpportunitySearch))
+            {
+                filters.Add(m => m.OpportunityKey.Contains(OpportunitySearch)
+                    || m.Name.Contains(OpportunitySearch)
+                    || m.OpportunityTypeName.Contains(OpportunitySearch)
+                    || m.CostDriver.Contains(OpportunitySearch));
+            }
+            if (!HasFlexibleExploration)
+            {
+                filters.Add(m => !(m.OpportunityType == (int)Generics.OpportunityTypes.Blank));
+            }
+
+            return filters;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/All/Opportunities/IAllOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/All/Opportunities/IAllOpportunityService.cs
new file mode 100644
index 0000000..41a5b3e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/All/Opportunities/IAllOpportunityService.cs
@@ -0,0 +1,21 @@
+using ClosedXML.Excel;
+using Strata.ContinuousImprovement.Biz.All.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.All.Opportunities
+{
+    public interface IAllOpportunityService : IOpportunityService<AllOpportunity>
+    {
+        Task<bool> ContainsAsync(Guid opportunityGuid, CancellationToken cancellationToken);
+
+        Task<AllFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken);
+
+        Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, AllFilters filters, CancellationToken cancellationToken);
+
+        Task<bool> NameIsValid(Guid configurationGuid, int opportunityType, string name, Guid? opportunityGuid, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/All/OpportunityTypeExtensions.cs b/src/Strata.ContinuousImprovement.Biz/All/OpportunityTypeExtensions.cs
new file mode 100644
index 0000000..9e79d52
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/All/OpportunityTypeExtensions.cs
@@ -0,0 +1,24 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+
+namespace Strata.ContinuousImprovement.Biz.All
+{
+    public static class OpportunityTypeExtensions
+    {
+        public static string OpportunityTypeName(this OpportunityTypes opportunityType)
+        {
+            return opportunityType switch
+            {
+                OpportunityTypes.Variation => "Utilization Variation",
+                OpportunityTypes.QualityVariation => "Quality Variation",
+                OpportunityTypes.FreeForm => "Free Form",
+                OpportunityTypes.GeneralLedger => "General Ledger",
+                OpportunityTypes.Payroll => "Payroll",
+                OpportunityTypes.Encounter => "Encounter",
+                OpportunityTypes.ChargeCode => "Charge Code",
+                OpportunityTypes.Blank => "Exploration",
+                OpportunityTypes.Exploration => "Exploration",
+                _ => ""
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/BackgroundClientJob/BackgroundClientJobService.cs b/src/Strata.ContinuousImprovement.Biz/BackgroundClientJob/BackgroundClientJobService.cs
new file mode 100644
index 0000000..8122622
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/BackgroundClientJob/BackgroundClientJobService.cs
@@ -0,0 +1,44 @@
+using Hangfire;
+using System.Threading;
+
+namespace Strata.ContinuousImprovement.Biz.BackgroundClientJob
+{
+    public class BackgroundClientJobService : IBackgroundClientJobService
+    {
+        private readonly IBackgroundJobClient _backgroundJobClient;
+
+        public BackgroundClientJobService(IBackgroundJobClient backgroundJobClient)
+        {
+            _backgroundJobClient = backgroundJobClient;
+        }
+
+        public string GetJobStatus(string jobId, CancellationToken cancellationToken)
+        {
+            // Ensure Hangfire DI components are realized.
+            EnsureHangfireInitialized();
+
+            if (string.IsNullOrWhiteSpace(jobId))
+            {
+                return "NotFound";
+            }
+
+            try
+            {
+                var connection = JobStorage.Current.GetConnection();
+                var jobData = connection.GetJobData(jobId);
+                if (jobData == null)
+                {
+                    return "NotFound";
+                }
+                return jobData.State ?? "Unknown";
+            }
+            catch
+            {
+                return "Error";
+            }
+        }
+
+        private void EnsureHangfireInitialized() =>
+            _ = _backgroundJobClient;
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/BackgroundClientJob/IBackgroundClientJobService.cs b/src/Strata.ContinuousImprovement.Biz/BackgroundClientJob/IBackgroundClientJobService.cs
new file mode 100644
index 0000000..1373696
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/BackgroundClientJob/IBackgroundClientJobService.cs
@@ -0,0 +1,12 @@
+using System.Threading;
+
+namespace Strata.ContinuousImprovement.Biz.BackgroundClientJob
+{
+    public interface IBackgroundClientJobService
+    {
+        // Returns the Hangfire job state string.
+        // Possible values: Hangfire states (Enqueued, Scheduled, Processing, Succeeded, Failed, Deleted)
+        // or the sentinel values: NotFound, Unknown, Error
+        string GetJobStatus(string jobId, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/BackgroundServices/ReplicationBackgroundService.cs b/src/Strata.ContinuousImprovement.Biz/BackgroundServices/ReplicationBackgroundService.cs
new file mode 100644
index 0000000..15467f9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/BackgroundServices/ReplicationBackgroundService.cs
@@ -0,0 +1,140 @@
+using Amazon.SQS;
+using Amazon.SQS.Model;
+using Hangfire;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Replication.Client.DTOs;
+using Strata.Replication.Client.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.BackgroundServices
+{
+    public class ReplicationBackgroundService : BackgroundService
+    {
+        private readonly IConfiguration _config;
+        private readonly ILogger<ReplicationBackgroundService> _logger;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+        private readonly IAmazonSQS _sqsClient;
+        private readonly List<string> _strategicOpportunityTables = new List<string>
+        {
+            "dss.FactPatientBillingLineItemDetail",
+            "clientdss.FactPatientEncounterSummary"
+        };
+
+        private string SqsQueueName { get { return "config:sqsReplicationCompleteQueueName"; } }
+
+        public ReplicationBackgroundService(
+            IConfiguration config,
+            ILogger<ReplicationBackgroundService> logger,
+            IAmazonSQS sqsClient,
+            IBackgroundJobClient backgroundJobClient)
+        {
+            _config = config;
+            _logger = logger;
+            _sqsClient = sqsClient;
+            _backgroundJobClient = backgroundJobClient;
+        }
+
+        protected override async Task ExecuteAsync(CancellationToken cancellationToken)
+        {
+            try
+            {
+                var sqsEnabled = _config.GetValue<bool>("config:sqsEnabled");
+                if (!sqsEnabled)
+                {
+                    _logger.LogInformation("SQS is not enabled. Exiting.");
+                    return;
+                }
+
+                _logger.LogInformation("Connecting to SQS queue {sqsQueueName}", SqsQueueName);
+                var queueUrlResponse = await _sqsClient.GetQueueUrlAsync(_config.GetValue<string>(SqsQueueName), cancellationToken);
+                _logger.LogInformation("Found SQS queue {queueUrl}", queueUrlResponse.QueueUrl);
+
+                while (!cancellationToken.IsCancellationRequested)
+                {
+                    var messageRequest = new ReceiveMessageRequest
+                    {
+                        MessageSystemAttributeNames = { "senttimestamp" },
+                        MaxNumberOfMessages = 10,
+                        MessageAttributeNames = { "all" },
+                        QueueUrl = queueUrlResponse.QueueUrl,
+                        WaitTimeSeconds = 20
+                    };
+
+                    var messageResponse = await _sqsClient.ReceiveMessageAsync(messageRequest, cancellationToken);
+                    _logger.LogInformation("Received response on queue {queueUrl} with count of messages {messageCount} and response code {httpStatusCode}", queueUrlResponse.QueueUrl, messageResponse.Messages.Count, messageResponse.HttpStatusCode);
+
+                    if (messageResponse.HttpStatusCode != System.Net.HttpStatusCode.OK)
+                    {
+                        continue;
+                    }
+
+                    await ProcessMessagesAsync(queueUrlResponse.QueueUrl, messageResponse.Messages, cancellationToken);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("Error while processing {sqsQueueName}: {ex}", SqsQueueName, ex);
+                throw;
+            }
+        }
+
+        protected async Task ProcessMessagesAsync(string queueUrl, List<Message> messages, CancellationToken cancellationToken)
+        {
+            foreach (var message in messages)
+            {
+                try
+                {
+                    _logger.LogInformation("Processing message for {queueUrl}: {message}", queueUrl, message); 
+                    if (string.IsNullOrEmpty(message.Body))
+                        return;
+
+                    JToken token = JObject.Parse(message.Body);
+                    var visibiltyRequest = new ChangeMessageVisibilityRequest(queueUrl, message.ReceiptHandle, 720); //set it invisible for 2 hours or until job completes then delete
+                    var messageDetail = JsonConvert.DeserializeObject<ReplicationTableStatusMessage>(token.SelectToken("Message")?.ToString()!);
+                    if (messageDetail.EndTime == null || messageDetail.RowCount == 0 || messageDetail.ReplicationType == ReplicationTaskType.Column)
+                        return;
+
+                    if (_strategicOpportunityTables.Any(t => t.Equals(messageDetail.TableName)))
+                    {
+                        await _sqsClient.ChangeMessageVisibilityAsync(visibiltyRequest, cancellationToken);
+                        _logger.LogInformation("Enqueuing StrategicOpportunityChargeCodeJob for {databaseGuid}", messageDetail.DatabaseGuid);
+                        _backgroundJobClient.Enqueue<StrategicOpportunityJob>(job => job.RunTracking(messageDetail.DatabaseGuid, messageDetail.StrataId, cancellationToken));
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogServiceError(ex, "Error processing SQS message", new Dictionary<string, object> { { "queueUrl", queueUrl } });
+                }
+                finally
+                {
+                    await DeleteMessageAsync(queueUrl, message.ReceiptHandle, cancellationToken);
+                }
+            }
+        }
+
+        protected async Task DeleteMessageAsync(string queueUrl, string msgReceiptHandle, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var deleteRequest = new DeleteMessageRequest(queueUrl, msgReceiptHandle);
+                _logger.LogInformation("Deleting message for {queueUrl}: {deleteRequest}", queueUrl, deleteRequest);
+
+                await _sqsClient.DeleteMessageAsync(deleteRequest, cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, "Error deleting SQS message", new Dictionary<string, object> { { "queueUrl", queueUrl } });
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/ChargeCode.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/ChargeCode.cs
new file mode 100644
index 0000000..1352aa9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/ChargeCode.cs
@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode
+{
+    [Table("DimChargeCode", Schema = "fw")]
+    public class ChargeCode
+    {
+        public int ChargeCodeId { get; set; }
+        public string Rollup { get; set; }
+        public string CostDriver { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/ChargeCodeService.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/ChargeCodeService.cs
new file mode 100644
index 0000000..afb53d1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/ChargeCodeService.cs
@@ -0,0 +1,48 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode
+{
+    public class ChargeCodeService : IChargeCodeService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly ILogger<ChargeCodeService> _logger;
+
+        public ChargeCodeService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory, ILogger<ChargeCodeService> logger)
+        {
+            _dbContextFactory = dbContextFactory;
+            _logger = logger;
+        }
+
+        private async Task<JazzDbContext> GetDbContextAsync(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<List<string>> GetChargeCodeCostDrivers(CancellationToken cancellationToken)
+        {
+            try
+            {
+                var dbContext = await GetDbContextAsync(cancellationToken);
+                return await dbContext.ChargeCodes.Select(x =>
+                    !string.IsNullOrEmpty(x.CostDriver) ? x.CostDriver : "Not Specified")
+                    .Distinct().OrderBy(x => x).ToListAsync(cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+            }
+
+            return new List<string>();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/ChargeCodeValidation.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/ChargeCodeValidation.cs
new file mode 100644
index 0000000..4e5ab0d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/ChargeCodeValidation.cs
@@ -0,0 +1,8 @@
+namespace Strata.ContinuousImprovement.Biz.ChargeCode
+{
+    public class ChargeCodeOpportunityValidationSection
+    {
+        public int MaxChargeCodeSelections { get; set; }
+        public int MaxOpportunityLevelSelections { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Filters/CCFilterOptions.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Filters/CCFilterOptions.cs
new file mode 100644
index 0000000..3afe470
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Filters/CCFilterOptions.cs
@@ -0,0 +1,10 @@
+using Strata.ContinuousImprovement.Biz.Filter;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters
+{
+    public class CCFilterOptions
+    {
+        public IEnumerable<FilterMember> OpportunityLevels { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Filters/CCFilters.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Filters/CCFilters.cs
new file mode 100644
index 0000000..c504f16
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Filters/CCFilters.cs
@@ -0,0 +1,57 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters
+{
+    public partial class CCFilters : FiltersOpportunity<CCOpportunity>
+    {
+        public int Cases { get; set; }
+        public IEnumerable<string> OpportunityLevels { get; set; }
+        public ChargeCodeGroup ChargeCodeGroups { get; set; }
+        public SeasonalityType Seasonality { get; set; }
+
+        public CCFilters() : base()
+        {
+            Cases = 0;
+            OpportunityLevels = new List<string>();
+            ChargeCodeGroups = ChargeCodeGroup.Both;
+            Seasonality = SeasonalityType.WithAndWithout;
+        }
+
+        public override IEnumerable<Expression<Func<CCOpportunity, bool>>> GetFilters(JazzDbContext context)
+        {
+            var filters = base.GetFilters(context).ToList();
+
+            if (Cases > 0)
+                filters.Add(m => m.Cases >= Cases);
+
+            if (OpportunityLevels.Any())
+                filters.Add(m => OpportunityLevels.Contains(m.OpportunityLevel));
+
+            if (ChargeCodeGroups != ChargeCodeGroup.Both)
+                filters.Add(m => (int)ChargeCodeGroups == (int)m.ChargeCodeGroup);
+
+            if (Seasonality != SeasonalityType.WithAndWithout)
+                filters.Add(m => (int)Seasonality == Convert.ToInt32(m.IsSeasonal));
+
+            if (!string.IsNullOrEmpty(OpportunitySearch))
+            {
+                var testSeasonality = Enum.TryParse<SeasonalityType>(OpportunitySearch, true, out var seasonalityType)
+                    && seasonalityType != SeasonalityType.WithAndWithout;
+                filters.Add(m => m.OpportunityKey.Contains(OpportunitySearch)
+                    || m.Name.Contains(OpportunitySearch)
+                    || m.ChargeCodeGroupValue.Contains(OpportunitySearch)
+                    || m.OpportunityLevel.Contains(OpportunitySearch)
+                    || (testSeasonality && m.IsSeasonal == (seasonalityType == SeasonalityType.With)));
+            }
+
+            return filters;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/IChargeCodeService.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/IChargeCodeService.cs
new file mode 100644
index 0000000..cba3a8d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/IChargeCodeService.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode
+{
+    public interface IChargeCodeService
+    {
+        Task<List<string>> GetChargeCodeCostDrivers(CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Initiatives/CCInitiativeService.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Initiatives/CCInitiativeService.cs
new file mode 100644
index 0000000..15fd576
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Initiatives/CCInitiativeService.cs
@@ -0,0 +1,243 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Hangfire.Jazz.Client.Models;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives
+{
+    public class CCInitiativeService : ICCInitiativeService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly ICCOpportunityService _opportunityService;
+        private readonly IInitiativeSavingsService _initiativeSavingsService;
+        private readonly ICCOpportunityDetailService _ccOpportunityDetailService;
+        private readonly IAuthorizationServiceClient _authorizationServiceClient;
+        private readonly IJazzHangfireServiceClient _hangfireServiceClient;
+        private readonly IUpdateFactOpportunitySavingsService _updateFactOpportunitySavingsService;
+        private readonly ILogger<CCInitiativeService> _logger;
+
+#pragma warning disable S107 //
+        public CCInitiativeService(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            ICCOpportunityService opportunityService,
+            IInitiativeSavingsService initiativeSavingsService,
+            ICCOpportunityDetailService ccOpportunityDetailService,
+            IAuthorizationServiceClient authorizationServiceClient,
+            IJazzHangfireServiceClient hangfireServiceClient,
+            IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            ILogger<CCInitiativeService> logger)
+#pragma warning restore
+        {
+            _dbContextFactory = dbContextFactory;
+            _opportunityService = opportunityService;
+            _initiativeSavingsService = initiativeSavingsService;
+            _ccOpportunityDetailService = ccOpportunityDetailService;
+            _authorizationServiceClient = authorizationServiceClient;
+            _hangfireServiceClient = hangfireServiceClient;
+            _updateFactOpportunitySavingsService = updateFactOpportunitySavingsService;
+            _logger = logger;
+        }
+
+        private async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<Guid> CreateChargeCodeInitiative(Guid dbGuid, Initiative initiative, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var opportunity = await dbContext.ChargeCodeOpportunities.SingleOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+            if (opportunity == null) { return Guid.Empty; }
+
+            try
+            {
+                opportunity.LevelCases = await dbContext.ChargeCodeOpportunityLevelCases
+                .Where(cases => cases.OpportunityGuid == opportunity.OpportunityGuid && cases.IsBaseline).ToListAsync();
+
+                _initiativeSavingsService.ConfigureRampUps(dbContext, initiative, opportunity.ConfigurationGuid);
+
+                var details = dbContext.ChargeCodeDetails.Where(detail => detail.OpportunityGUID == opportunityGuid && detail.IsBaseline).AsEnumerable();
+                double identifiedSavings = _ccOpportunityDetailService.CalculateSavings(details);
+
+                opportunity.IdentifiedSavings = identifiedSavings;
+
+                var updateInitiative = await dbContext.Initiatives.SingleOrDefaultAsync(x => x.InitiativeGUID == opportunity.InitiativeGuid);
+                if (updateInitiative != null)
+                {
+                    updateInitiative.Update(initiative);
+                    await dbContext.SaveChangesAsync(cancellationToken);
+
+                    // refreshing tracking data also populates the initiative savings values
+                    await _opportunityService.RefreshOpportunityTrackingData(dbGuid, opportunityGuid, cancellationToken);
+                }
+                else
+                {
+                    opportunity.InitiativeGuid = initiative.InitiativeGUID;
+                    initiative.ConfigurationGUID = opportunity.ConfigurationGuid;
+                    await dbContext.Initiatives.AddAsync(initiative, cancellationToken);
+                }
+                await dbContext.SaveChangesAsync(cancellationToken);
+
+                // refreshing tracking data also populates the initiative savings values
+                await _opportunityService.RefreshOpportunityTrackingData(dbGuid, opportunityGuid, cancellationToken);
+                await _authorizationServiceClient.AddPermissionsFromDefaultsAsync(initiative.InitiativeGUID, SecurableEntityType.Initiative, cancellationToken);
+                await _authorizationServiceClient.AddPermissionAsync(initiative.InitiativeGUID, initiative.OwnerGUID, true, false, false, cancellationToken);
+
+                await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+
+                return opportunity.InitiativeGuid;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInitiativeError(ex, dbContext, initiative.Name, opportunityGuid, initiative.InitiativeGUID);
+                return Guid.Empty;
+            }
+        }
+
+        public async Task<Guid> UpdateChargeCodeInitiative(Guid dbGuid, Initiative initiative, Guid opportunityGuid, bool wasDetailsChanged, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var opportunity = await dbContext.ChargeCodeOpportunities.SingleOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+
+            if (opportunity == null) { return Guid.Empty; }
+            try
+            {
+                var details = dbContext.ChargeCodeDetails.Where(detail => detail.OpportunityGUID == opportunityGuid && detail.IsBaseline).AsEnumerable();
+                double identifiedSavings = _ccOpportunityDetailService.CalculateSavings(details);
+                opportunity.IdentifiedSavings = identifiedSavings;
+
+                var updateInitiative = await dbContext.Initiatives.SingleOrDefaultAsync(x => x.InitiativeGUID == initiative.InitiativeGUID);
+                if (updateInitiative == null) { return Guid.Empty; }
+
+                updateInitiative.Update(initiative);
+                await dbContext.SaveChangesAsync(cancellationToken);
+
+                if (!wasDetailsChanged)
+                {
+                    return Guid.Empty;
+                }
+                // refreshing tracking data also populates the initiative savings values
+                await _opportunityService.RefreshOpportunityTrackingData(dbGuid, opportunityGuid, cancellationToken);
+
+                // Finalized initiatives need tracking re-run
+                if (updateInitiative.CurrentStep == (int)InitiativeSteps.Tracking)
+                {
+                    var job = new EnqueueJobDto
+                    {
+                        TaskName = "Strata.CS.Jazz.Biz.CCI.Tasks.Custom.ChargeCode.RunChargeCodeTrackingTask, Strata.CS.Jazz.Biz.CCI",
+                        ContextData = JsonConvert.SerializeObject(new
+                        {
+                            configurationGuid = opportunity.ConfigurationGuid,
+                            initiativeGuid = initiative.InitiativeGUID
+                        })
+                    };
+
+                    await _hangfireServiceClient.EnqueueJobAsync(job, cancellationToken)
+                        .ContinueWith(job => new EnqueueJobDto
+                        {
+                            TaskName = "Strata.CS.Jazz.Biz.CCI.Tasks.RunUpdateFactOpportunitySavingsTask, Strata.CS.Jazz.Biz.CCI"
+                        }, cancellationToken);
+                }
+
+                return opportunity.InitiativeGuid;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInitiativeError(ex, dbContext, initiative.Name, opportunityGuid, initiative.InitiativeGUID);
+                return Guid.Empty;
+            }
+        }
+
+        public async Task FinalizeChargeCodeInitiative(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var initiative = await dbContext.Initiatives.Where(i => i.InitiativeGUID.Equals(initiativeGuid)).SingleOrDefaultAsync();
+
+            try
+            {
+                initiative.CurrentStep = (int)InitiativeSteps.Tracking;
+                await dbContext.SaveChangesAsync(cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInitiativeError(ex, dbContext, initiative.Name, Guid.Empty, initiativeGuid);
+            }
+        }
+
+        public async Task<Guid> RunTracking(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var initiative = await dbContext.Initiatives.Where(i => i.InitiativeGUID.Equals(initiativeGuid)).SingleOrDefaultAsync();
+
+            try
+            {
+                EnqueueJobDto enqueueJobDto = new EnqueueJobDto
+                {
+                    TaskName = "Strata.CS.Jazz.Biz.CCI.Tasks.Custom.ChargeCode.RunChargeCodeTrackingTask, Strata.CS.Jazz.Biz.CCI",
+                    ContextData = JsonConvert.SerializeObject(new
+                    {
+                        configurationGuid = initiative.ConfigurationGUID,
+                        initiativeGuid
+                    })
+                };
+                var job = enqueueJobDto;
+
+                var response = await _hangfireServiceClient.EnqueueJobAsync(job, cancellationToken);
+                return response.JobId;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInitiativeError(ex, dbContext, initiative.Name, Guid.Empty, initiativeGuid);
+            }
+            return Guid.Empty;
+        }
+
+        public async Task<bool> UpdateSavings(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var opportunity = await dbContext.ChargeCodeOpportunities.SingleOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+            if (opportunity == null) { return false; }
+            var initiative = await dbContext.Initiatives.SingleOrDefaultAsync(init => init.InitiativeGUID == opportunity.InitiativeGuid, cancellationToken);
+
+            try
+            {
+            opportunity.LevelCases = await dbContext.ChargeCodeOpportunityLevelCases
+                .Where(cases => cases.OpportunityGuid == opportunity.OpportunityGuid && cases.IsBaseline).ToListAsync();
+            var details = dbContext.ChargeCodeDetails.Where(detail => detail.OpportunityGUID == opportunityGuid && detail.IsBaseline).AsEnumerable();
+            var identifiedSavings = _ccOpportunityDetailService.CalculateSavings(details);
+
+            opportunity.IdentifiedSavings = identifiedSavings;
+            await dbContext.SaveChangesAsync(cancellationToken);
+            await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+
+            if (opportunity.InitiativeGuid == Guid.Empty) { return true; }   // no initiative to update
+
+            if (initiative == null) { return false; }
+
+            _initiativeSavingsService.ApplySavingsToInitiative(opportunity, initiative, identifiedSavings);
+
+            await dbContext.SaveChangesAsync(cancellationToken);
+            await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+            return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInitiativeError(ex, dbContext, initiative.Name, opportunityGuid, initiative.InitiativeGUID);
+                return false;
+            }
+        }
+    }
+}
+
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Initiatives/ChargeCodeInitiativeDto.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Initiatives/ChargeCodeInitiativeDto.cs
new file mode 100644
index 0000000..09f3173
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Initiatives/ChargeCodeInitiativeDto.cs
@@ -0,0 +1,18 @@
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives
+{
+    public class ChargeCodeInitiativeDto : InitiativeDto
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public double Cases { get; set; }
+        public int EncounterGroup { get; set; }
+        public int OpportunityLevel { get; set; }
+        public List<string> EncounterGroups { get; set; }
+        public List<string> ChargeCodes { get; set; }
+        public List<string> OpportunityLevels { get; set; }
+        public bool isSeasonal { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Initiatives/ICCInitiativeService.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Initiatives/ICCInitiativeService.cs
new file mode 100644
index 0000000..49f9509
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Initiatives/ICCInitiativeService.cs
@@ -0,0 +1,16 @@
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives
+{
+    public interface ICCInitiativeService
+    {
+        Task<Guid> CreateChargeCodeInitiative(Guid dbGuid, Initiative initiative, Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<Guid> UpdateChargeCodeInitiative(Guid dbGuid, Initiative initiative, Guid opportunityGuid, bool wasDetailsChanged, CancellationToken cancellationToken);
+        Task FinalizeChargeCodeInitiative(Guid initiativeGuid, CancellationToken cancellationToken);
+        Task<Guid> RunTracking(Guid initiativeGuid, CancellationToken cancellationToken);
+        Task<bool> UpdateSavings(Guid opportunityGuid, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/CCInitiativeJob.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/CCInitiativeJob.cs
new file mode 100644
index 0000000..9d0e9f7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/CCInitiativeJob.cs
@@ -0,0 +1,156 @@
+using Hangfire;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.Hangfire.Filters;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Jobs
+{
+    public class CCInitiativeJob : ICCInitiativeJob
+    {
+        protected readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly IHubContext<NotificationHub, INotificationHub> _notificationHubContext;
+        private readonly ILogger<CCInitiativeJob> _logger;
+        private readonly ICCOpportunityService _ccOpportunityService;
+        private readonly ICCInitiativeService _ccInitiativeService;
+        private readonly IClientNetworkOpportunityLinkService _clientNetworkOpportunityLinkService;
+        private readonly IStakeholderUser _stakeholderUser;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+
+        public CCInitiativeJob(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            IHubContext<NotificationHub, INotificationHub> notificationHubContext,
+            ILogger<CCInitiativeJob> logger,
+            ICCOpportunityService ccOpportunityService,
+            ICCInitiativeService ccInitiativeService,
+            IClientNetworkOpportunityLinkService clientNetworkOpportunityLinkService,
+            IStakeholderUser stakeholderUser,
+            IBackgroundJobClient backgroundJobClient)
+        {
+            _dbContextFactory = dbContextFactory;
+            _notificationHubContext = notificationHubContext;
+            _logger = logger;
+            _ccOpportunityService = ccOpportunityService;
+            _ccInitiativeService = ccInitiativeService;
+            _clientNetworkOpportunityLinkService = clientNetworkOpportunityLinkService;
+            _stakeholderUser = stakeholderUser;
+            _backgroundJobClient = backgroundJobClient;
+        }
+
+        public async Task<string> CreateChargeCodeInitiative(ChargeCodeInitiativeDto initiative, int? networkOpportunityId, Guid dbGuid, CancellationToken cancellationToken)
+        {
+            var jobId = _backgroundJobClient.Enqueue<CCInitiativeJob>(job
+                => job.CreateChargeCodeInitiativeJob(initiative, networkOpportunityId, dbGuid, cancellationToken));
+            return jobId;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Create Charge Code Opportunity and Initiative on ({2})")]
+        [CaptureClaimsPrincipal]
+        public async Task CreateChargeCodeInitiativeJob(ChargeCodeInitiativeDto initiative, int? networkOpportunityId, Guid dbGuid, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(initiative.Name);
+
+            //  Save Opportunity
+            CCOpportunityDataModel opportunity = default;
+            if (initiative.OpportunityGuid != Guid.Empty)
+            {
+                opportunity = await _ccOpportunityService.GetById(initiative.OpportunityGuid, cancellationToken);
+            }
+            else
+            {
+                opportunity = initiative.MapToDataModel();
+                var jobId = await _ccOpportunityService.CreateAsync(dbGuid, opportunity, cancellationToken);
+
+                // Opportunity needs to finish first
+                await WaitForJob(jobId);
+            }
+
+            //  Save Initiative
+            var newInitiative = initiative.MapToInitiative(_stakeholderUser);
+            await _ccInitiativeService.CreateChargeCodeInitiative(dbGuid, newInitiative, opportunity.OpportunityGuid, cancellationToken);
+
+            if (networkOpportunityId.HasValue)
+            {
+                await _clientNetworkOpportunityLinkService.AddOpportunityLinkAsync(dbGuid, networkOpportunityId.Value, opportunity.OpportunityGuid, cancellationToken);
+            }
+            await hub.SendInitiativeCreateSuccess(opportunity.OpportunityGuid, opportunity.Name);
+        }
+
+        public async Task<string> UpdateChargeCodeInitiative(ChargeCodeInitiativeDto initiative, int? networkOpportunityId, Guid dbGuid, CancellationToken cancellationToken)
+        {
+            var jobId = _backgroundJobClient.Enqueue<CCInitiativeJob>(job
+                => job.UpdateChargeCodeInitiativeJob(initiative, networkOpportunityId, dbGuid, cancellationToken));
+            return jobId;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Update Charge Code Opportunity and Initiative on ({2})")]
+        [CaptureClaimsPrincipal]
+        public async Task UpdateChargeCodeInitiativeJob(ChargeCodeInitiativeDto initiativeOpportunity, int? networkOpportunityId, Guid dbGuid, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(initiativeOpportunity.Name);
+
+            //  Update Opportunity
+            var opportunity = initiativeOpportunity.MapToDataModel();
+            var jobId = await _ccOpportunityService.UpdateAsync(dbGuid, opportunity, cancellationToken);
+
+            var detailsChanged = jobId != Guid.Empty.ToString();
+            // Opportunity needs to finish first
+            if (detailsChanged)
+                await WaitForJob(jobId);
+
+            //  Update Initiative
+            var initiative = initiativeOpportunity.MapToInitiative(_stakeholderUser);
+            var result = await _ccInitiativeService.UpdateChargeCodeInitiative(dbGuid, initiative, opportunity.OpportunityGuid, detailsChanged, cancellationToken);
+            if (!detailsChanged)
+            {
+                await hub.SendOpportunityCreateUpdateSuccess(opportunity.OpportunityGuid, true, opportunity.Name, true, OpportunityTypes.ChargeCode);
+                return;
+            }
+
+            if (result == Guid.Empty)
+            {
+                await hub.SendOpportunityUpdateError(opportunity.Name, "Unable to update initiative.");
+                return;
+            }
+
+            if (networkOpportunityId.HasValue)
+            {
+                await _clientNetworkOpportunityLinkService.AddOpportunityLinkAsync(dbGuid, networkOpportunityId.Value, opportunity.OpportunityGuid, cancellationToken);
+            }
+            await hub.SendOpportunityCreateUpdateSuccess(opportunity.OpportunityGuid, true, opportunity.Name, true, OpportunityTypes.ChargeCode);
+        }
+
+        private async Task<bool> WaitForJob(string jobId)
+        {
+            var storageConnection = JobStorage.Current.GetConnection();
+            var jobData = storageConnection.GetJobData(jobId);
+            var states = new List<string> { "Enqueued", "Processing" };
+
+            while (states.Contains(jobData.State))
+            {
+                await Task.Delay(500);
+                jobData = storageConnection.GetJobData(jobId);
+            }
+            if (jobData.State == "Deleted") { return false; }
+
+            return true;
+        }
+
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/CCOpportunityClientJob.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/CCOpportunityClientJob.cs
new file mode 100644
index 0000000..e80faa0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/CCOpportunityClientJob.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Hangfire;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.FeatureFlags.Client;
+using Strata.Hangfire.Filters;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Jobs
+{
+    public class CCOpportunityClientJob : ICCOpportunityClientJob
+    {
+        protected readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+        private readonly ILogger<CCOpportunityClientJob> _logger;
+        private readonly IFeatureFlagServiceClient _featureFlagServiceClient;
+
+        public CCOpportunityClientJob(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            IBackgroundJobClient backgroundJobClient,
+            ILogger<CCOpportunityClientJob> logger,
+            IFeatureFlagServiceClient featureFlagServiceClient)
+        {
+            _dbContextFactory = dbContextFactory;
+            _backgroundJobClient = backgroundJobClient;
+            _logger = logger;
+            _featureFlagServiceClient = featureFlagServiceClient;
+        }
+
+        public async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<string> RefreshClientOpportunityBaselineDetails(int strataId, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            return await EnqueueOpportunityDetailJobAsync(strataId, opportunityGuid, true, cancellationToken);
+        }
+
+        [CaptureClaimsPrincipal]
+        public async Task<string> RefreshClientOpportunityTrackingDetails(int strataId, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            return await EnqueueOpportunityDetailJobAsync(strataId, opportunityGuid, false, cancellationToken);
+        }
+
+        private async Task<string> EnqueueOpportunityDetailJobAsync(int strataId, Guid opportunityGuid, bool isBaseline, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await GetDbContext(cancellationToken);
+
+            var opportunity = await dbContext.ChargeCodeOpportunities
+                .FirstOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken)
+                    ?? throw new InvalidOperationException($"Opportunity with Guid '{opportunityGuid}' not found.");
+
+            if (isBaseline)
+            {
+                return _backgroundJobClient.Enqueue<CCOpportunityDetailJob>(job =>
+                    job.PopulateOpportunityBaselineDetailsAsync(
+                        strataId,
+                        opportunity.Name,
+                        opportunity.OpportunityGuid,
+                        cancellationToken));
+            }
+            else
+            {
+                _ = await dbContext.Initiatives
+                    .FirstOrDefaultAsync(i => i.InitiativeGUID == opportunity.InitiativeGuid, cancellationToken)
+                          ?? throw new InvalidOperationException($"Initiative with Guid '{opportunity.InitiativeGuid}' not found for Opportunity '{opportunityGuid}'.");
+
+                return _backgroundJobClient.Enqueue<CCOpportunityDetailJob>(job =>
+                    job.PopulateOpportunityTrackingDetailsAsync(
+                        strataId,
+                        opportunity.Name,
+                        opportunity.OpportunityGuid,
+                        cancellationToken));
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/CCOpportunityDetailJob.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/CCOpportunityDetailJob.cs
new file mode 100644
index 0000000..5900d68
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/CCOpportunityDetailJob.cs
@@ -0,0 +1,350 @@
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Hangfire.Filters;
+using Strata.Id.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Jobs
+{
+    public class CCOpportunityDetailJob
+    {
+        protected readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly IFiscalMonthResolver _fiscalMonthResolver;
+        private readonly ICCOpportunityDetailService _ccOpportunityDetailService;
+        private readonly IInitiativeSavingsService _initiativeSavingsService;
+        private readonly IHubContext<NotificationHub, INotificationHub> _notificationHubContext;
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly ILogger<CCOpportunityDetailJob> _logger;
+        private readonly IConfigurationService _configurationService;
+        private readonly ICCOpportunityLevelCaseService _ccopportunityLevelCaseService;
+
+        public CCOpportunityDetailJob(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            IFiscalMonthResolver fiscalMonthResolver,
+            ICCOpportunityDetailService ccOpportunityDetailService,
+            IInitiativeSavingsService initiativeSavingsService,
+            IHubContext<NotificationHub, INotificationHub> notificationHubContext,
+            IIdServiceClient idServiceClient,
+            ILogger<CCOpportunityDetailJob> logger,
+            IConfigurationService configurationService,
+            ICCOpportunityLevelCaseService ccopportunityLevelCaseService)
+        {
+            _dbContextFactory = dbContextFactory;
+            _fiscalMonthResolver = fiscalMonthResolver;
+            _ccOpportunityDetailService = ccOpportunityDetailService;
+            _initiativeSavingsService = initiativeSavingsService;
+            _notificationHubContext = notificationHubContext;
+            _idServiceClient = idServiceClient;
+            _logger = logger;
+            _configurationService = configurationService;
+            _ccopportunityLevelCaseService = ccopportunityLevelCaseService;
+        }
+
+        public async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Populate Charge Code details for {1} on ({0})")]
+        [CaptureClaimsPrincipal]
+        public async Task PopulateOpportunityDetailsAsync(int strataId, string name, Guid opportunityGuid, bool isBaseline, bool isUpdate, bool willRedirect, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            dbContext.Database.SetCommandTimeout(TimeSpan.FromMinutes(30));
+
+            try
+            {
+                var hub = _notificationHubContext.Clients.Group(name);
+                if (isUpdate)
+                {
+                    await hub.SendOpportunityUpdateDetails(name, 0);
+                }
+                else
+                {
+                    await hub.SendOpportunityCreateDetails(name, 0);
+                }
+
+                var opportunity = await dbContext.ChargeCodeOpportunities
+                    .SingleOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid);
+                if (opportunity == null)
+                {
+                    throw new ArgumentException($"Opportunity Not Found for opportunty guid {opportunityGuid}", nameof(opportunityGuid));
+                }
+                var configuration = opportunity.Configuration
+                    ?? await dbContext.Configurations.SingleOrDefaultAsync(c => c.ConfigurationGuid == opportunity.ConfigurationGuid, cancellationToken);
+                if (opportunity.Configuration == null)
+                {
+                    opportunity.Configuration = configuration;
+                }
+                opportunity.Configuration.FiscalMonthResolver = _fiscalMonthResolver;
+                var opportunityLevel = Enum.TryParse<OpportunityLevel>(opportunity.OpportunityLevel, out var level)
+                    ? level : OpportunityLevel.Organization;
+
+                var detailResults = new List<DetailResults>();
+                List<CCOpportunityDetailQueryResult> queryResults = default;
+                List<ChargeCodeOpportunityDetail> detailRows = default;
+                IEnumerable<DetailResults> detailQuery = default;
+
+                try
+                {
+                    var databaseGuid = await _idServiceClient.GetDatabaseGUID(strataId, cancellationToken);
+                    queryResults = await _ccOpportunityDetailService.GetCCOpportunityDetailQueryResult(opportunity, configuration, cancellationToken, isBaseline);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogContextError(ex, dbContext, nameof(_ccOpportunityDetailService.GetCCOpportunityDetailQueryResult),
+                        new Dictionary<string, object> {
+                            { nameof(opportunityGuid), opportunityGuid },
+                            { nameof(isBaseline), isBaseline }
+                        });
+                }
+
+                try
+                {
+                    detailRows = await dbContext.ChargeCodeDetails
+                        .Where(cc => cc.OpportunityGUID == opportunityGuid && cc.IsBaseline == isBaseline)
+                        .ToListAsync();
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogContextError(ex, dbContext, nameof(dbContext.ChargeCodeDetails),
+                        new Dictionary<string, object> {
+                            { nameof(opportunityGuid), opportunityGuid },
+                            { nameof(isBaseline), isBaseline }
+                        });
+                }
+
+                try
+                {
+                    if (!queryResults.IsEmpty() && !detailRows.IsEmpty())
+                    {
+                        detailQuery = from item in queryResults
+                                      join row in detailRows
+                                      on new { item.OpportunityLevelId, item.ChargeCodeId, item.Month, item.IsBaseline }
+                                          equals new { row.OpportunityLevelId, row.ChargeCodeId, row.Month, row.IsBaseline }
+                                      into itemRow
+                                      select new DetailResults(item, itemRow.DefaultIfEmpty().FirstOrDefault());
+                    }
+                    else if (!queryResults.IsEmpty())
+                    {
+                        detailQuery = queryResults.Select(item => new DetailResults(item, null));
+                    }
+
+                    if (!detailQuery.IsEmpty())
+                    {
+                        detailQuery.Batch(1000)
+                            .ForEach(batch => detailResults.AddRange(batch));
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogQueryError(ex, dbContext, nameof(dbContext.ChargeCodeDetails),
+                        $"Where(cc => cc.OpportunityGUID == '{opportunityGuid}' && cc.IsBaseline == {isBaseline})");
+                }
+
+                var chargeCodesMembers = opportunity.ChargeCodeSelections.Where(cc => cc.Id != null);
+                var chargeCodeNameLookup = chargeCodesMembers.ToDictionary(key => key.Id, value => value.Name);
+                var opportunityLevelMembers = opportunity.OpportunityLevelSelections;
+                var opportunityLevelNameLookup = opportunityLevel is not OpportunityLevel.Organization ? opportunityLevelMembers.ToDictionary(key => key.Id, value => value.Name)
+                : new Dictionary<string, string>() { { "0", "System" } };
+
+                var batches = detailResults
+                    .GroupBy(result => new { result.Item.OpportunityLevelId, result.Item.ChargeCodeId },
+                        (Key, chargeCodeDetailResults) => new { Key, chargeCodeDetailResults })
+                    .Batch(20);
+                var batchCount = batches.Count();
+                var progress = 0;
+                foreach (var batch in batches)
+                {
+                    if (isUpdate)
+                    {
+                        await hub.SendOpportunityUpdateDetails(name, (++progress).DivideBy(batchCount));
+                    }
+                    else
+                    {
+                        await hub.SendOpportunityCreateDetails(name, (++progress).DivideBy(batchCount));
+                    }
+
+                    var chargeCodeOpportunityDetails = new List<ChargeCodeOpportunityDetail>();
+                    foreach (var result in batch)
+                    {
+                        foreach (var detail in result.chargeCodeDetailResults)
+                        {
+                            if (detail.Row != null)
+                            {
+                                var detailRow = detail.Row;
+                                detailRow.TotalUnitsOfService = detail.Item.TotalUnitsOfService;
+                                detailRow.TotalCost = configuration.IsUsingIndirectCost ? detail.Item.VariableIndirectCost + detail.Item.VariableDirectCost : detail.Item.VariableDirectCost;
+                                detailRow.TotalCases = detail.Item.TotalCases;
+                            }
+                            else if (!chargeCodeNameLookup.ContainsKey(detail.Item.ChargeCodeId.ToString())
+                                || !opportunityLevelNameLookup.ContainsKey(detail.Item.OpportunityLevelId.ToString()))
+                            {
+                                _logger.LogContextWarning(dbContext, "chargeCodeNameLookup or opportunityLevelNameLookup failed",
+                                    new Dictionary<string, object>
+                                    {
+                                        { nameof(detail.Item.ChargeCodeId), detail.Item.ChargeCodeId.ToString() },
+                                        { nameof(detail.Item.OpportunityLevelId), detail.Item.OpportunityLevelId.ToString() }
+                                    });
+                            }
+                            else
+                            {
+                                var chargeCodeOpportunityDetail = detail.Item.MapFromQueryResult();
+                                chargeCodeOpportunityDetail.TotalCost = configuration.IsUsingIndirectCost ? detail.Item.VariableIndirectCost + detail.Item.VariableDirectCost : detail.Item.VariableDirectCost;
+                                chargeCodeOpportunityDetail.OpportunityGUID = opportunity.OpportunityGuid;
+                                chargeCodeOpportunityDetail.ChargeCodeName = chargeCodeNameLookup[detail.Item.ChargeCodeId.ToString()];
+                                chargeCodeOpportunityDetail.OpportunityLevelName = opportunityLevelNameLookup[detail.Item.OpportunityLevelId.ToString()];
+                                chargeCodeOpportunityDetail.GoalTotalUnitsOfService = chargeCodeOpportunityDetail.TotalUnitsOfService;
+                                chargeCodeOpportunityDetails.Add(chargeCodeOpportunityDetail);
+                            }
+                        }
+                    }
+
+                    if (chargeCodeOpportunityDetails.Any())
+                    {
+                        var chargeCodeGroups = chargeCodeOpportunityDetails
+                            .Where(detail => detail.IsBaseline.Equals(isBaseline))
+                            .GroupBy(detail => new { detail.OpportunityLevelId, detail.ChargeCodeId })
+                            .Select(group => new
+                            {
+                                group.Key,
+                                ChargeCodeDetails = group.OrderBy(detail => detail.ChargeCodeOpportunityDetailId)
+                            });
+
+                        foreach (var chargeCodeGroup in chargeCodeGroups)
+                        {
+                            var totalCostSum = chargeCodeGroup.ChargeCodeDetails.Sum(detail => detail.TotalCost);
+                            var totalUnitsOfServiceSum = chargeCodeGroup.ChargeCodeDetails.Sum(detail => detail.TotalUnitsOfService);
+                            chargeCodeGroup.ChargeCodeDetails.ForEach(detail => detail.GoalCostPerUnit = (totalCostSum.DivideBy(totalUnitsOfServiceSum)));
+                            dbContext.ChargeCodeDetails.AddRange(chargeCodeGroup.ChargeCodeDetails.ToList());
+                        }
+                    }
+                    await dbContext.SaveChangesAsync(cancellationToken);
+                }
+
+                if (isBaseline)
+                {
+                    var details = dbContext.ChargeCodeDetails.Where(detail => detail.OpportunityGUID == opportunityGuid && detail.IsBaseline).AsEnumerable();
+                    var identifiedSavings = _ccOpportunityDetailService.CalculateSavings(details);
+                    opportunity.IdentifiedSavings = identifiedSavings;
+
+                    var databaseGuid = await _idServiceClient.GetDatabaseGUID(strataId, cancellationToken);
+                    var levelCases = await PopulateBaselineLevelCases(opportunity, cancellationToken);
+                    opportunity.Cases = levelCases.Where(x => x.IsBaseline).Sum(x => x.Cases);
+                    await _ccopportunityLevelCaseService.AddOrUpdateLevelCases(levelCases, cancellationToken);
+                }
+
+                if (opportunity.InitiativeGuid != Guid.Empty)
+                {
+                    opportunity.LevelCases = await dbContext.ChargeCodeOpportunityLevelCases
+                    .Where(cases => cases.OpportunityGuid == opportunity.OpportunityGuid && cases.IsBaseline).ToListAsync();
+                    var initiative = await dbContext.Initiatives.SingleOrDefaultAsync(i => i.InitiativeGUID == opportunity.InitiativeGuid);
+                    _initiativeSavingsService.ApplySavingsToInitiative(opportunity, initiative, opportunity.IdentifiedSavings);
+                }
+                await dbContext.SaveChangesAsync();
+                if (willRedirect)
+                    await hub.SendOpportunityCreateUpdateSuccess(opportunity.OpportunityGuid, true, opportunity.Name, true, OpportunityTypes.ChargeCode);
+            }
+            catch (Exception ex)
+            {
+                var db = (await _idServiceClient.GetStrataIds()).SingleOrDefault(i => i.StrataId == strataId);
+                if (db == null)
+                {
+                    _logger.LogContextError(ex, dbContext, nameof(PopulateOpportunityDetailsAsync),
+                        new Dictionary<string, object>
+                        {
+                            { nameof(strataId), strataId  },
+                            { nameof(name), name },
+                            { nameof(opportunityGuid), opportunityGuid },
+                            { nameof(isBaseline), isBaseline },
+                            { nameof(isUpdate), isUpdate }
+                        });
+                }
+                else
+                {
+                    _logger.LogContextError(ex, db, nameof(PopulateOpportunityDetailsAsync),
+                        new Dictionary<string, object>
+                        {
+                            { nameof(strataId), strataId  },
+                            { nameof(name), name },
+                            { nameof(opportunityGuid), opportunityGuid },
+                            { nameof(isBaseline), isBaseline },
+                            { nameof(isUpdate), isUpdate }
+                        });
+                }
+                await _notificationHubContext.Clients.Group(name).SendOpportunityCreateError(name);
+            }
+        }
+
+        internal class DetailResults
+        {
+            public CCOpportunityDetailQueryResult Item { get; set; }
+            public ChargeCodeOpportunityDetail? Row { get; set; }
+            public DetailResults(CCOpportunityDetailQueryResult item, ChargeCodeOpportunityDetail? row)
+            {
+                Item = item;
+                Row = row;
+            }
+        }
+
+        private async Task<List<ChargeCodeOpportunityLevelCase>> PopulateBaselineLevelCases(CCOpportunityDataModel opportunity, CancellationToken cancellationToken)
+        {
+            var configuration = await _configurationService.GetConfigurationAsync(opportunity.ConfigurationGuid, cancellationToken);
+            var levelCaseQueryResult = await _ccOpportunityDetailService.CCOpportunityLevelCasesQuery(opportunity, configuration, cancellationToken);
+
+            List<ChargeCodeOpportunityLevelCase> levelCases = new List<ChargeCodeOpportunityLevelCase>();
+            foreach (var result in levelCaseQueryResult)
+            {
+                var levelCase = new ChargeCodeOpportunityLevelCase
+                {
+                    OpportunityGuid = opportunity.OpportunityGuid,
+                    IsBaseline = true,
+                    Month = result.Month,
+                    Cases = result.TotalCases,
+                    OpportunityLevelId = result.OpportunityLevelId
+                };
+                levelCases.Add(levelCase);
+            }
+
+            return levelCases;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Populate Charge Code Baseline Details for {1} on ({0})")]
+        [Semaphore(nameof(CCOpportunityDetailJob.PopulateOpportunityBaselineDetailsAsync))]
+        [CaptureClaimsPrincipal]
+        public async Task PopulateOpportunityBaselineDetailsAsync(int strataId, string name, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await PopulateOpportunityDetailsAsync(strataId, name, opportunityGuid, isBaseline: true, isUpdate: false, willRedirect: false, cancellationToken);
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Populate Charge Code Tracking Details for {1} on ({0})")]
+        [Semaphore(nameof(CCOpportunityDetailJob.PopulateOpportunityTrackingDetailsAsync))]
+        [CaptureClaimsPrincipal]
+        public async Task PopulateOpportunityTrackingDetailsAsync(int strataId, string name, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await PopulateOpportunityDetailsAsync(strataId, name, opportunityGuid, isBaseline: false, isUpdate: false, willRedirect: false, cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/ICCInitiativeJob.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/ICCInitiativeJob.cs
new file mode 100644
index 0000000..46d6078
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/ICCInitiativeJob.cs
@@ -0,0 +1,14 @@
+using Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Jobs
+{
+    public interface ICCInitiativeJob
+    {
+        Task<string> CreateChargeCodeInitiative(ChargeCodeInitiativeDto initiative, int? networkOpportunityId, Guid dbGuid, CancellationToken cancellationToken);
+
+        Task<string> UpdateChargeCodeInitiative(ChargeCodeInitiativeDto initiative, int? networkOpportunityId, Guid dbGuid, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/ICCOpportunityClientJob.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/ICCOpportunityClientJob.cs
new file mode 100644
index 0000000..b4195a6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Jobs/ICCOpportunityClientJob.cs
@@ -0,0 +1,14 @@
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Jobs
+{
+    public interface ICCOpportunityClientJob
+    {
+        Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken);
+        Task<string> RefreshClientOpportunityBaselineDetails(int strataId, Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<string> RefreshClientOpportunityTrackingDetails(int strataId, Guid opportunityGuid, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunity.cs
new file mode 100644
index 0000000..25bd5e4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunity.cs
@@ -0,0 +1,18 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    [Table("viewChargeCodeOpportunity", Schema = "cci")]
+    public class CCOpportunity : Opportunity
+    {
+        public string Name { get; set; }
+        public double Cases { get; set; }
+        public ChargeCodeGroup ChargeCodeGroup { get; set; }
+        public string ChargeCodeGroupValue { get; set; }
+        public string OpportunityLevel { get; set; }
+        public bool IsSeasonal { get; set; }
+        public long OpportunityId { get; set; }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDataModel.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDataModel.cs
new file mode 100644
index 0000000..f1117a1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDataModel.cs
@@ -0,0 +1,129 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Schema.Client.Dtos;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    [Table("ChargeCodeOpportunity", Schema = "cci")]
+    public class CCOpportunityDataModel : Opportunity, IOpportunity
+    {
+        public CCOpportunityDataModel()
+        {
+            OpportunityGuid = Guid.NewGuid();
+            DateCreated = DateTime.Now;
+            ChargeCodeJson = JsonSerializer.Serialize(new List<object>());
+            ClinicalIndicatorJson = JsonSerializer.Serialize(new object());
+            CaseTypeJson = JsonSerializer.Serialize(new object());
+            OpportunityLevelJson = JsonSerializer.Serialize(new List<object>());
+        }
+
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long OpportunityId { get; set; }
+        public string Name { get; set; }
+        public bool IsSeasonal { get; set; }
+        public string ChargeCodeJson { get; set; }
+        public string OpportunityLevel { get; set; }
+        public string OpportunityLevelJson { get; set; }
+        public int Cases { get; set; }
+        public DateTime DateCreated { get; set; }
+
+        [NotMapped]
+        public int EncounterGroup { get; set; }
+        public string ClinicalIndicatorJson { get; set; }
+        public string CaseTypeJson { get; set; }
+
+        [NotMapped]
+        public IEnumerable<ChargeCodeOpportunityDetail> Details { get; set; }
+        [NotMapped]
+        public IEnumerable<ChargeCodeOpportunityLevelCase> LevelCases { get; set; }
+
+        // For persisting DTO selections from UI
+        [NotMapped]
+        public List<string> PatientPopulations { get; set; }
+        [NotMapped]
+        public List<string> CaseTypes { get; set; }
+        [NotMapped]
+        public List<string> ChargeCodes { get; set; }
+        [NotMapped]
+        public List<string> OpportunityLevels { get; set; }
+
+        [NotMapped]
+        public OpportunityLevel OpportunityLevelEnum
+            => Enum.TryParse<OpportunityLevel>(OpportunityLevel, out var result)
+                ? result
+                : Shared.OpportunityLevel.Organization;
+        [NotMapped]
+        public IEnumerable<MemberDto> OpportunityLevelSelections
+            => OpportunityLevelJson.Selections();
+        [NotMapped]
+        public IEnumerable<MemberDto> ChargeCodeSelections
+            => ChargeCodeJson.Selections();
+        [NotMapped]
+        public IEnumerable<MemberDto> ClinicalIndicatorSelections
+            => ClinicalIndicatorJson.Selections();
+        [NotMapped]
+        public IEnumerable<MemberDto> CaseTypeSelections
+            => CaseTypeJson.Selections();
+
+        [NotMapped]
+        public virtual Configuration.Configuration Configuration { get; set; }
+
+        // IOpportunity properties needed to implement interface
+        [NotMapped]
+        public string OpportunityKey
+        {
+            get
+            {
+                return $"CC - {OpportunityId}";
+            }
+            set { }
+        }
+        [NotMapped]
+        public new bool HasInitiative { get; set; }
+        [NotMapped]
+        public new string Initiative { get; set; }
+
+        public override void Update(IOpportunity updates)
+        {
+            base.Update(updates);
+            var ccUpdates = updates as CCOpportunityDataModel;
+            if (ccUpdates == null) return;
+            Name = ccUpdates.Name;
+        }
+
+        public bool IsDetailsShouldBeUpdated(CCOpportunityDataModel originalObject) 
+        {
+            return originalObject.ClinicalIndicatorJson != ClinicalIndicatorJson 
+                || originalObject.ChargeCodeJson != ChargeCodeJson 
+                || originalObject.IsSeasonal != IsSeasonal 
+                || originalObject.OpportunityLevel != OpportunityLevel 
+                || originalObject.OpportunityLevelJson != OpportunityLevelJson 
+                || originalObject.CaseTypeJson != CaseTypeJson;
+        }
+    }
+
+    internal class HierarchyPathsAndMembers
+    {
+        public List<string> HierarchyPaths { get; set; }
+        public List<MemberDto> Members { get; set; }
+
+        public HierarchyPathsAndMembers()
+        {
+            HierarchyPaths = new List<string>();
+            Members = new List<MemberDto>();
+        }
+    }
+
+    public enum ChargeCodeGroup
+    {
+        Both = -1,
+        CaseType = 0,
+        PatientPopulation = 1
+    }
+
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDataModelMapper.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDataModelMapper.cs
new file mode 100644
index 0000000..d3a2894
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDataModelMapper.cs
@@ -0,0 +1,113 @@
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class CCOpportunityDataModelMapper
+    {
+        public static CCOpportunityDataModel MapToDataModel(this ChargeCodeInitiativeDto src)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) { return default; }
+            mapped.OpportunityLevel = Enum.GetName(typeof(OpportunityLevel), src.OpportunityLevel);
+            mapped.IsSeasonal = src.isSeasonal;
+            if (src.EncounterGroup == (int)EncounterGroup.CaseType)
+            {
+                mapped.CaseTypes = src.EncounterGroups;
+            }
+            else
+            {
+                mapped.PatientPopulations = src.EncounterGroups;
+            }
+            return mapped;
+        }
+
+        public static CCOpportunityDataModel MapToDataModel(this CCOpportunityDto src)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) { return default; }
+            mapped.OpportunityLevel = Enum.GetName(typeof(OpportunityLevel), src.OpportunityLevel);
+            if (src.EncounterGroup == (int)EncounterGroup.CaseType)
+            {
+                mapped.CaseTypes = src.EncounterGroups;
+            }
+            else
+            {
+                mapped.PatientPopulations = src.EncounterGroups;
+            }
+            return mapped;
+        }
+
+        public static CCOpportunityDto MapToDto(this CCOpportunityDataModel src)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) { return default; }
+            mapped.EncounterGroups = src.EncounterGroup == (int)EncounterGroup.CaseType
+                ? src.CaseTypeJson.GetNodeNames().ToList()
+                : src.ClinicalIndicatorJson.GetNodeNames().ToList();
+            mapped.ChargeCodes = src.ChargeCodeJson.GetNodeNames().ToList();
+            mapped.OpportunityLevels = src.OpportunityLevelJson.GetNodeNames().ToList();
+            mapped.BaselineStartDate = src.Configuration.GetBaselineStartDate(Generics.OpportunityTypes.OrgDefined);
+            mapped.BaselineEndDate = src.Configuration.GetBaselineEndDate(Generics.OpportunityTypes.OrgDefined);
+            mapped.TrackingStartDate = src.Configuration.GetTrackingStartDate(Generics.OpportunityTypes.OrgDefined);
+            mapped.TrackingEndDate = src.Configuration.GetTrackingEndDate();
+            return mapped;
+        }
+
+        public static CCOpportunitySaveModel MapToSaveModel(this CCOpportunityDataModel src)
+        {
+            var mapped = MappedToSaveModel(src);
+            if (mapped == null) { return default; }
+            mapped.OpportunityLevel = (int)Enum.Parse<OpportunityLevel>(src.OpportunityLevel, true);
+            mapped.EncounterGroups = src.EncounterGroup == (int)EncounterGroup.CaseType
+                ? src.CaseTypeJson.HierarchyPaths().ToList()
+                : src.ClinicalIndicatorJson.HierarchyPaths().ToList();
+            mapped.ChargeCodes = src.ChargeCodeJson.HierarchyPaths().ToList();
+            mapped.OpportunityLevels = mapped.OpportunityLevel == (int)OpportunityLevel.Organization
+                ? new List<string> { "System" }
+                : src.OpportunityLevelJson.HierarchyPaths().ToList();
+            return mapped;
+        }
+
+        public static CCOpportunityDataModel MapToDataModel(this CCOpportunitySaveModel src)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) { return default; }
+            mapped.OpportunityLevel = Enum.GetName(typeof(OpportunityLevel), src.OpportunityLevel);
+            if (src.EncounterGroup == (int)EncounterGroup.CaseType)
+            {
+                mapped.CaseTypes = src.EncounterGroups.ToList();
+            }
+            else
+            {
+                mapped.PatientPopulations = src.EncounterGroups.ToList();
+            }
+            return mapped;
+        }
+
+        public static partial ChargeCodeOpportunityDetail MapFromQueryResult(this CCOpportunityDetailQueryResult src);
+
+        [MapProperty(nameof(CCOpportunityDataModel.Cases), nameof(CCOpportunityDto.TotalCases))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDto.OpportunityLevel))]
+        private static partial CCOpportunityDto Mapped(CCOpportunityDataModel src);
+
+        [MapperIgnoreSource(nameof(CCOpportunityDataModel.OpportunityLevel))]
+        private static partial CCOpportunitySaveModel MappedToSaveModel(CCOpportunityDataModel src);
+
+        private static partial CCOpportunityDataModel Mapped(ChargeCodeInitiativeDto src);
+
+        private static partial CCOpportunityDataModel Mapped(CCOpportunitySaveModel src);
+
+        [MapProperty(nameof(CCOpportunityDto.EncounterGroup), nameof(CCOpportunityDataModel.EncounterGroup))]
+        [MapperIgnoreSource(nameof(CCOpportunityDto.OpportunityLevel))]
+        private static partial CCOpportunityDataModel Mapped(CCOpportunityDto src);
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetail.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetail.cs
new file mode 100644
index 0000000..1545166
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetail.cs
@@ -0,0 +1,24 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    [Table("ChargeCodeOpportunityDetail", Schema = "cci")]
+    public class ChargeCodeOpportunityDetail
+    {
+        public int ChargeCodeOpportunityDetailId { get; set; }
+        public Guid OpportunityGUID { get; set; }
+        public int OpportunityLevelId { get; set; }
+        public string OpportunityLevelName { get; set; }
+        public int ChargeCodeId { get; set; }
+        public string ChargeCodeName { get; set; }
+        public int TotalCases { get; set; }
+        public double TotalUnitsOfService { get; set; }
+        public double TotalCost { get; set; }
+        public string ChargeCodeRollupName { get; set; }
+        public double GoalTotalUnitsOfService { get; set; }
+        public bool IsBaseline { get; set; }
+        public int Month { get; set; }
+        public double GoalCostPerUnit { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetailQueryResult.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetailQueryResult.cs
new file mode 100644
index 0000000..0b1d1c0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetailQueryResult.cs
@@ -0,0 +1,17 @@
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class CCOpportunityDetailQueryResult
+    {
+        public int ChargeCodeId { get; set; }
+        public string ChargeCodeName { get; set; }
+        public string ChargeCodeRollupName { get; set; }
+        public int OpportunityLevelId { get; set; }
+        public string OpportunityLevelName { get; set; }
+        public int TotalCases { get; set; }
+        public double TotalUnitsOfService { get; set; }
+        public double VariableDirectCost { get; set; }
+        public double VariableIndirectCost { get; set; }
+        public bool IsBaseline { get; set; }
+        public int Month { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetailRowData.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetailRowData.cs
new file mode 100644
index 0000000..4eb3eec
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetailRowData.cs
@@ -0,0 +1,38 @@
+using Strata.ContinuousImprovement.Biz.Utilities;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class CCOpportunityDetailRowData
+    {
+        public string Name { get; set; }
+        public int TotalCases { get; set; }
+        public double BaselineUnitsOfServicePerCase { get; set; }
+        public double BaselineTotalUnitsOfService { get; set; }
+        public double BaselineCostPerUnit { get; set; }
+        public double BaselineCostPerCase { get; set; }
+        public double BaselineTotalCost { get; set; }
+        public double GoalUnitsOfServicePerCase { get; set; }
+        public double GoalTotalUnitsOfService { get; set; }
+        public double GoalCostPerUnit { get; set; }
+        public double GoalCostPerCase { get; set; }
+        public double GoalTotalCost { get; set; }
+        public double Improvement { get; set; }
+
+        public CCOpportunityDetailRowData(string name, int totalCases, double totalCost, double totalUnitsOfService, double goalTotalUnitsOfService, double goalCostPerUnit)
+        {
+            Name = name;
+            TotalCases = totalCases;
+            BaselineTotalCost = totalCost;
+            BaselineTotalUnitsOfService = totalUnitsOfService;
+            BaselineUnitsOfServicePerCase = totalUnitsOfService.DivideBy(totalCases);
+            BaselineCostPerUnit =  totalCost.DivideBy(totalUnitsOfService);
+            BaselineCostPerCase = totalCost.DivideBy(totalCases);
+            GoalTotalUnitsOfService = goalTotalUnitsOfService;
+            GoalTotalCost = goalCostPerUnit * goalTotalUnitsOfService;
+            GoalCostPerUnit = goalCostPerUnit;
+            GoalUnitsOfServicePerCase = GoalTotalUnitsOfService.DivideBy(totalCases);
+            GoalCostPerCase = GoalTotalCost.DivideBy(totalCases);
+            Improvement = BaselineTotalCost - GoalTotalCost;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetailService.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetailService.cs
new file mode 100644
index 0000000..175cf5a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetailService.cs
@@ -0,0 +1,332 @@
+using Microsoft.Data.SqlClient;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.FeatureFlags.Client;
+using Strata.Schema.Client;
+using Strata.Schema.Client.Dtos;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class CCOpportunityDetailService : ICCOpportunityDetailService
+    {
+        private readonly ISchemaServiceClient _schemaServiceClient;
+        private readonly ISnowflakeDatabaseContext _snowflakeDbContext;
+        protected readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly ILogger<CCOpportunityDetailService> _logging;
+        private readonly IFeatureFlagServiceClient _featureFlagServiceClient;
+        private readonly ClaimsPrincipal _user;
+
+        public CCOpportunityDetailService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            ISchemaServiceClient schemaServiceClient,
+            ISnowflakeDatabaseContext snowflakeDatabaseContext,
+            IFeatureFlagServiceClient featureFlagServiceClient,
+            ILogger<CCOpportunityDetailService> logging,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor)
+        {
+            _dbContextFactory = dbContextFactory;
+            _schemaServiceClient = schemaServiceClient;
+            _snowflakeDbContext = snowflakeDatabaseContext;
+            _featureFlagServiceClient = featureFlagServiceClient;
+            _logging = logging;
+            _user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+        }
+
+
+        public async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public double CalculateSavings(IEnumerable<ChargeCodeOpportunityDetail> details)
+        {
+            double identifiedSavings = 0;
+
+            var detailsGroup = details.GroupBy(d => new { d.OpportunityLevelId, d.ChargeCodeId });
+            foreach (var groupedOpportunityDetails in detailsGroup)
+            {
+                var totalCost = groupedOpportunityDetails.Sum(data => data.TotalCost);
+                var goalTotalCost = groupedOpportunityDetails.Sum(data => data.GoalTotalUnitsOfService * data.GoalCostPerUnit);
+
+                identifiedSavings += totalCost - goalTotalCost;
+            }
+
+            return identifiedSavings;
+        }
+
+        public async Task<List<CCOpportunityDetailQueryResult>> GetCCOpportunityDetailQueryResult(CCOpportunityDataModel opportunity,
+            Configuration.Configuration configuration, CancellationToken cancellationToken, bool isBaseline = true)
+        {
+            var results = new List<CCOpportunityDetailQueryResult>();
+            var sqlParams = GetSQLParameters(opportunity, configuration, isBaseline);
+            var isUsingSnowflake = await IsUsingSnowflake(cancellationToken);
+
+            if (!sqlParams.Exists(p => p.ParameterName.StartsWith("@indicatorId"))
+                && !sqlParams.Exists(p => p.ParameterName.StartsWith("@caseTypeId")))
+            {
+                _logging.LogServiceInformation("No Case Types or Patient Populations selected");
+                return results;
+            }
+            else if (sqlParams.Count > 2099)
+            {
+                _logging.LogServiceInformation($"Too many parameters ({sqlParams.Count}) supplied for sql query");
+                return results;
+            }
+
+            var encounterGroupQueryHelper = new EncounterGroupQueryHelper(sqlParams);
+            if (string.IsNullOrEmpty(encounterGroupQueryHelper.WhereClause))
+            {
+                _logging.LogServiceInformation("No Case Types or Patient Populations selected");
+                return results;
+            }
+
+            if (opportunity.OpportunityLevelEnum is not OpportunityLevel.Organization)
+            {
+                // Batch query opportunity level selections
+                foreach (var oppLevelIdBatch in opportunity.OpportunityLevelSelections.Batch(500))
+                {
+                    var oppBatchParams = new List<SqlParameter>();
+                    oppBatchParams.AddRange(sqlParams.Where(p => !p.ParameterName.StartsWith("@oppLevelId", StringComparison.CurrentCultureIgnoreCase)));
+                    oppBatchParams.Add(new SqlParameter("@oppLevelIds", oppLevelIdBatch.GetIdsForMemberDtos()));
+
+                    var serviceLineDimensionName = await GetScoreDimensionFriendlyName(configuration.ServiceLineDimensionGuid);
+                    var serviceLineColumnName = await GetScoreAttributeFriendlyName(configuration.ServiceLineDimensionGuid, cancellationToken);
+
+                    var opportunityLevelQueryHelper = new OpportunityLevelQueryHelper(opportunity.OpportunityLevelEnum, configuration, serviceLineDimensionName, serviceLineColumnName);
+
+                    var query = new OpportunityDetailQuery(opportunity.OpportunityLevelEnum, encounterGroupQueryHelper, opportunityLevelQueryHelper, isUsingSnowflake).GetQuery();
+                    var queryResult = await PerformDetailQuery(query, oppBatchParams, cancellationToken);
+                    results.AddRange(queryResult);
+                }
+            }
+            else
+            {
+                var query = new OpportunityDetailQuery(opportunity.OpportunityLevelEnum, encounterGroupQueryHelper, default, isUsingSnowflake).GetQuery();
+                var queryResult = await PerformDetailQuery(query, sqlParams, cancellationToken);
+                results.AddRange(queryResult);
+            }
+            var allDetailRecords = opportunity.OpportunityLevelEnum == OpportunityLevel.Organization
+                ? await CreateDetailsForAllChargeCodes(opportunity.ChargeCodeSelections, isBaseline, cancellationToken)
+                : await CreateDetailsForAllChargeCodes(opportunity.ChargeCodeSelections, opportunity.OpportunityLevelSelections, isBaseline, cancellationToken);
+            if (!results.Any()) { return allDetailRecords.ToList(); }
+
+            // Add any charge code detail records missing from query dataset
+            var missingChargeCodeDetails = allDetailRecords
+                .Where(record => !results
+                    .Exists(result => record.ChargeCodeId == result.ChargeCodeId
+                        && record.OpportunityLevelId == result.OpportunityLevelId
+                        && record.Month == result.Month
+                        && record.IsBaseline == result.IsBaseline));
+            results.AddRange(missingChargeCodeDetails);
+
+            return results.ToList();
+        }
+
+        /// <summary>
+        /// Creates a LINQ query that calculates the opportunity level cases (unique encounters) 
+        /// </summary>
+        /// <param name="opportunity"></param>
+        /// <param name="configuration">The current fiscal year <see cref="Configuration.Configuration">configuration</see></param>
+        /// <param name="isBaseline"></param>
+        ///<returns>A LINQ query of <see cref="CCOpportunityLevelCaseQueryResult">detail</see> records for further processing</returns>
+        public async Task<IEnumerable<CCOpportunityLevelCaseQueryResult>> CCOpportunityLevelCasesQuery(CCOpportunityDataModel opportunity, Configuration.Configuration configuration, CancellationToken cancellationToken, bool isBaseline = true)
+        {
+            var sqlParams = GetSQLParameters(opportunity, configuration, isBaseline);
+
+            var results = new List<CCOpportunityLevelCaseQueryResult>();
+            var encounterQueryHelper = new EncounterGroupQueryHelper(sqlParams);
+
+            if (opportunity.OpportunityLevelEnum is not OpportunityLevel.Organization)
+            {
+                var serviceLineDimensionName = await GetScoreDimensionFriendlyName(configuration.ServiceLineDimensionGuid);
+                var serviceLineColumnName = await GetScoreAttributeFriendlyName(configuration.ServiceLineDimensionGuid, cancellationToken);
+
+                var opportunityLevelQueryHelper = new OpportunityLevelQueryHelper(opportunity.OpportunityLevelEnum, configuration, serviceLineDimensionName, serviceLineColumnName);
+
+                var query = new OpportunityDetailLevelQuery(opportunity.OpportunityLevelEnum, encounterQueryHelper, opportunityLevelQueryHelper).GetQuery();
+                return await PerformLevelCasesQuery(query, sqlParams, cancellationToken);
+            }
+            else
+            {
+                var query = new OpportunityDetailLevelQuery(opportunity.OpportunityLevelEnum, encounterQueryHelper, default).GetQuery();
+                return await PerformLevelCasesQuery(query, sqlParams, cancellationToken);
+            }
+        }
+
+        private async Task<List<CCOpportunityLevelCaseQueryResult>> PerformLevelCasesQuery(string query, IEnumerable<SqlParameter> sqlParameters, CancellationToken cancellationToken)
+        {
+            var snowflakeDbContext = await IsUsingSnowflake(cancellationToken) ? _snowflakeDbContext : null;
+            await using var jazzDbContext = await GetDbContext(cancellationToken);
+            var result = await query.PerformQuery<CCOpportunityLevelCaseQueryResult, CCOpportunityDetailService>(sqlParameters, snowflakeDbContext, jazzDbContext, _logging, cancellationToken);
+            return result.ToList();
+        }
+
+        private async Task<List<CCOpportunityDetailQueryResult>> PerformDetailQuery(string query, IEnumerable<SqlParameter> sqlParameters, CancellationToken cancellationToken)
+        {
+            var snowflakeDbContext = await IsUsingSnowflake(cancellationToken) ? _snowflakeDbContext : null;
+            await using var jazzDbContext = await GetDbContext(cancellationToken);
+            var result = await query.PerformQuery<CCOpportunityDetailQueryResult, CCOpportunityDetailService>(sqlParameters, snowflakeDbContext, jazzDbContext, _logging, cancellationToken);
+            return result.ToList();
+        }
+
+        private string InterpolateQueryArrayValues(string query, ref IEnumerable<SqlParameter> sqlParameters)
+        {
+            foreach (var parameterName in new[] { "@oppLevelIds", "@caseTypeIds", "@chargeCodeIds", "@indicatorIds" })
+            {
+                var parameter = sqlParameters.SingleOrDefault(p => p.ParameterName.Equals(parameterName, StringComparison.CurrentCultureIgnoreCase));
+                if (parameter == null) { continue; }
+                if (!query.Contains(parameterName, StringComparison.CurrentCultureIgnoreCase))
+                {
+                    sqlParameters = sqlParameters.Where(p => !p.ParameterName.Equals(parameterName, StringComparison.CurrentCultureIgnoreCase)).ToList();
+                }
+                else
+                {
+                    var values = (IEnumerable<int>)parameter.Value;
+                    parameter.Value = string.Join(",", values);
+                    query = query.Replace(parameter.ParameterName, parameter.Value.ToString(), StringComparison.CurrentCultureIgnoreCase);
+                }
+            };
+            return query;
+        }
+
+        private async Task<IEnumerable<CCOpportunityDetailQueryResult>> CreateDetailsForAllChargeCodes(IEnumerable<MemberDto> chargeCodeMembers, bool isBaseline, CancellationToken cancellationToken)
+        {
+            Func<string, int> IdParse = Id => Int32.TryParse(Id, out var id) ? id : 0;
+            var monthList = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
+            await using var jazzDbContext = GetDbContext(cancellationToken).Result;
+            try
+            {
+                return (from chargeCodeMember in chargeCodeMembers
+                        from month in monthList
+                        join chargeCode in jazzDbContext.ChargeCodes on IdParse(chargeCodeMember.Id) equals chargeCode.ChargeCodeId
+                        select new CCOpportunityDetailQueryResult
+                        {
+                            ChargeCodeId = IdParse(chargeCodeMember.Id),
+                            ChargeCodeName = chargeCodeMember.Name,
+                            OpportunityLevelId = 0,
+                            ChargeCodeRollupName = chargeCode.Rollup,
+                            IsBaseline = isBaseline,
+                            Month = month
+                        }).ToList();
+            }
+            catch (Exception ex)
+            {
+
+                _logging.LogContextError(ex, jazzDbContext, nameof(CreateDetailsForAllChargeCodes),
+                    new Dictionary<string, object>
+                    {
+                        { nameof(chargeCodeMembers), chargeCodeMembers.ParamDictionary() },
+                        { nameof(isBaseline), isBaseline }
+                    });
+            }
+            return Enumerable.Empty<CCOpportunityDetailQueryResult>();
+        }
+
+        private async Task<IEnumerable<CCOpportunityDetailQueryResult>> CreateDetailsForAllChargeCodes(IEnumerable<MemberDto> chargeCodeMembers, IEnumerable<MemberDto> opportunityLevelMembers, bool isBaseline, CancellationToken cancellationToken)
+        {
+            Func<string, int> IdParse = Id => Int32.TryParse(Id, out var id) ? id : 0;
+            var monthList = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
+            await using var jazzDbContext = GetDbContext(cancellationToken).Result;
+            try
+            {
+                return (from chargeCodeMember in chargeCodeMembers
+                        from opportunityLevelMember in opportunityLevelMembers
+                        from month in monthList
+                        join chargeCode in jazzDbContext.ChargeCodes on IdParse(chargeCodeMember.Id) equals chargeCode.ChargeCodeId
+                        select new CCOpportunityDetailQueryResult
+                        {
+                            ChargeCodeId = IdParse(chargeCodeMember.Id),
+                            ChargeCodeName = chargeCodeMember.Name,
+                            OpportunityLevelId = IdParse(opportunityLevelMember.Id),
+                            ChargeCodeRollupName = chargeCode.Rollup,
+                            IsBaseline = isBaseline,
+                            Month = month
+                        }).ToList();
+            }
+            catch (Exception ex)
+            {
+                _logging.LogContextError(ex, jazzDbContext, nameof(CreateDetailsForAllChargeCodes),
+                    new Dictionary<string, object>
+                    {
+                        { nameof(chargeCodeMembers), chargeCodeMembers.ParamDictionary() },
+                        { nameof(opportunityLevelMembers), opportunityLevelMembers.ParamDictionary() },
+                        { nameof(isBaseline), isBaseline }
+                    });
+            }
+            return Enumerable.Empty<CCOpportunityDetailQueryResult>();
+        }
+
+        private async Task<bool> IsUsingSnowflake(CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user.GetDatabaseGuid();
+            return await _featureFlagServiceClient.IsEnabledAsync("is-decision-support-queries-enabled", databaseGuid, cancellationToken: cancellationToken);
+        }
+
+        private async Task<string> GetScoreDimensionFriendlyName(Guid dimensionGuid)
+        {
+            var dimension = await _schemaServiceClient.GetDimensionByIdAsync(dimensionGuid);
+            return dimension.FriendlyName;
+        }
+
+        private async Task<string> GetScoreAttributeFriendlyName(Guid dimensionGuid, CancellationToken cancellationToken)
+        {
+            await using var jazzDbContext = GetDbContext(cancellationToken).Result;
+            var dimension = await jazzDbContext.ViewScoreAttributes.Where(dim => dim.DimensionGuid == dimensionGuid).FirstOrDefaultAsync();
+            return dimension.FriendlyName;
+        }
+
+        private static List<SqlParameter> GetSQLParameters(CCOpportunityDataModel opportunity, Configuration.Configuration configuration, bool isBaseline)
+        {
+            var sqlParams = new List<SqlParameter>();
+
+            if (opportunity.OpportunityLevelEnum != OpportunityLevel.Organization)
+            {
+                sqlParams.Add(new SqlParameter("@oppLevelIds", opportunity.OpportunityLevelSelections.GetIdsForMemberDtos()));
+            }
+
+            if (!opportunity.ClinicalIndicatorSelections.IsEmpty())
+            {
+                sqlParams.Add(new SqlParameter("@indicatorIds", opportunity.ClinicalIndicatorSelections.GetIdsForMemberDtos()));
+            }
+            else if (!opportunity.CaseTypeSelections.IsEmpty())
+            {
+                sqlParams.Add(new SqlParameter("@caseTypeIds", opportunity.CaseTypeSelections.GetIdsForMemberDtos()));
+            }
+
+            if (!opportunity.ChargeCodeSelections.IsEmpty())
+            {
+                sqlParams.Add(new SqlParameter("@chargeCodeIds", opportunity.ChargeCodeSelections.GetIdsForMemberDtos()));
+            } 
+
+            var startDate = isBaseline
+              ? configuration.GetBaselineStartDate(OpportunityTypes.ChargeCode)
+              : configuration.GetTrackingStartDate(OpportunityTypes.ChargeCode);
+
+            var endDate = isBaseline
+                ? configuration.GetBaselineEndDate(OpportunityTypes.ChargeCode)
+                : configuration.GetTrackingEndDate();
+
+            sqlParams.Add(new SqlParameter("@startDate", startDate.ToString("yyyy-MM-dd")));
+            sqlParams.Add(new SqlParameter("@endDate", endDate.ToString("yyyy-MM-dd")));
+            sqlParams.Add(new SqlParameter("@isBaseline", isBaseline));
+
+            return sqlParams;
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetailTreeGridModel.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetailTreeGridModel.cs
new file mode 100644
index 0000000..73fdc8c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityDetailTreeGridModel.cs
@@ -0,0 +1,100 @@
+using Microsoft.VisualBasic;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.Shared;
+using AppConstants = Strata.ContinuousImprovement.Biz.Utilities.Constants;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MoreLinq.Extensions;
+using Strata.ContinuousImprovement.Biz.Utilities;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class CCOpportunityDetailTreeGridModel
+    {
+        public string Key { get; set; }
+        public CCOpportunityDetailRowData Data { get; set; }
+        public IEnumerable<CCOpportunityDetailTreeGridModel> Children { get; set; }
+
+        public CCOpportunityDetailTreeGridModel(
+            IGrouping<string, ChargeCodeOpportunityDetail> opportunityLevelGrouping,
+            string parentKey,
+            Func<IGrouping<string, ChargeCodeOpportunityDetail>, string> getChildName,
+            IEnumerable<ChargeCodeOpportunityLevelCase> levelCases,
+            TypeOfChildren typeOfChildren = TypeOfChildren.Rollup)
+        {
+
+            var key = opportunityLevelGrouping.Key.Replace(AppConstants.TREE_DATA_LEVEL_SEPARATOR, String.Empty);
+            Key = string.IsNullOrEmpty(parentKey) ? key : parentKey + AppConstants.TREE_DATA_LEVEL_SEPARATOR + key;
+            var name = (Key == OpportunityLevel.Organization.ToString()) ? "System" : getChildName(opportunityLevelGrouping);
+
+            int totalCases = GetTotalCases(opportunityLevelGrouping, levelCases, typeOfChildren);
+            double goalCostPerUnit = GetGoalCostPerUnit(opportunityLevelGrouping, typeOfChildren);
+
+            Data = new CCOpportunityDetailRowData(
+                name,
+                totalCases,
+                opportunityLevelGrouping.Sum(detail => detail.TotalCost),
+                opportunityLevelGrouping.Sum(detail => detail.TotalUnitsOfService),
+                opportunityLevelGrouping.Sum(detail => detail.GoalTotalUnitsOfService),
+                goalCostPerUnit
+                );
+
+            switch (typeOfChildren)
+            {
+                case TypeOfChildren.Rollup:
+                    Children = opportunityLevelGrouping
+                        .GroupBy(detail => detail.ChargeCodeRollupName)
+                        .Select(rollupGrouping => new CCOpportunityDetailTreeGridModel(rollupGrouping, Key,
+                            rollupGrouping => rollupGrouping.First().ChargeCodeRollupName, levelCases, TypeOfChildren.ChargeCode));
+                    break;
+                case TypeOfChildren.ChargeCode:
+                    Children = opportunityLevelGrouping
+                        .GroupBy(detail => detail.ChargeCodeName)
+                        .Select(rollupGrouping => new CCOpportunityDetailTreeGridModel(rollupGrouping, Key,
+                            rollupGrouping => rollupGrouping.First().ChargeCodeName, levelCases, TypeOfChildren.None));
+                    break;
+                default:
+                    Children = new List<CCOpportunityDetailTreeGridModel>();
+                    break;
+            }
+        }
+
+        private static int GetTotalCases(IGrouping<string, ChargeCodeOpportunityDetail> opportunityLevelGrouping, IEnumerable<ChargeCodeOpportunityLevelCase> levelCases, TypeOfChildren typeOfChildren)
+        {
+            int totalCases = 0;
+            if (typeOfChildren == TypeOfChildren.Rollup)
+            {
+                var levelId = opportunityLevelGrouping.Select(x => x.OpportunityLevelId).FirstOrDefault();
+                totalCases = levelCases.Where(levelCases => levelCases.OpportunityLevelId == levelId).Sum(levelCases => levelCases.Cases);
+
+            }
+            else
+            {
+                totalCases = opportunityLevelGrouping.Sum(detail => detail.TotalCases);
+            }
+
+            return totalCases;
+        }
+
+        private static double GetGoalCostPerUnit(IGrouping<string, ChargeCodeOpportunityDetail> grouping, TypeOfChildren typeOfChildren)
+        {
+            if (typeOfChildren == TypeOfChildren.None)
+            {
+                return grouping.First().GoalCostPerUnit;
+            }
+
+            var goalTotalCost = grouping.Sum(detail => detail.GoalCostPerUnit * detail.GoalTotalUnitsOfService);
+            var goalTotalUnitsOfService = grouping.Sum(detail => detail.GoalTotalUnitsOfService);
+
+            return goalTotalCost.DivideBy(goalTotalUnitsOfService);
+        }
+    }
+
+    public enum TypeOfChildren
+    {
+        None,
+        Rollup,
+        ChargeCode
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityLevelCaseQueryResult.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityLevelCaseQueryResult.cs
new file mode 100644
index 0000000..ce380ad
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityLevelCaseQueryResult.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class CCOpportunityLevelCaseQueryResult
+    {
+        public int Month { get; set; }
+        public int OpportunityLevelId { get; set; }
+        public int TotalCases { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityLevelCaseService.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityLevelCaseService.cs
new file mode 100644
index 0000000..65c37b8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityLevelCaseService.cs
@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class CCOpportunityLevelCaseService : ICCOpportunityLevelCaseService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+
+        public CCOpportunityLevelCaseService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory)
+        {
+            _dbContextFactory = dbContextFactory;
+        }
+
+        private async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task AddOrUpdateLevelCases(List<ChargeCodeOpportunityLevelCase> levelCases, CancellationToken cancellationToken)
+        {
+            if (levelCases?.Count > 0)
+            {
+                await using var dbContext = GetDbContext(cancellationToken).Result;
+
+                foreach (var levelCase in levelCases)
+                {
+                    var exists = await dbContext.ChargeCodeOpportunityLevelCases
+                                                .AnyAsync(x => x.OpportunityGuid == levelCase.OpportunityGuid
+                                                            && x.OpportunityLevelId == levelCase.OpportunityLevelId
+                                                            && x.Month == levelCase.Month
+                                                            && x.IsBaseline == levelCase.IsBaseline);
+                    if (exists)
+                    {
+                        dbContext.ChargeCodeOpportunityLevelCases.Update(levelCase);
+                    }
+                    else
+                    {
+                        await dbContext.ChargeCodeOpportunityLevelCases.AddAsync(levelCase);
+                    }
+                }
+                await dbContext.SaveChangesAsync();
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityNotFoundException.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityNotFoundException.cs
new file mode 100644
index 0000000..8f16f8c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityNotFoundException.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    [Serializable]
+    public class CCOpportunityNotFoundException : Exception
+    {
+        public string Name { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        protected CCOpportunityNotFoundException(SerializationInfo serializationInfo, StreamingContext streamingContext)
+            : base(serializationInfo, streamingContext)
+        {
+
+        }
+
+        public CCOpportunityNotFoundException(string name, Guid opportunityGuid)
+        {
+            Name = name;
+            OpportunityGuid = opportunityGuid;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunitySaveModel.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunitySaveModel.cs
new file mode 100644
index 0000000..f590179
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunitySaveModel.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class CCOpportunitySaveModel
+    {
+        public Guid OpportunityGuid { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public string Name { get; set; }
+        public bool IsSeasonal { get; set; }
+        public string ChargeCodeJson { get; set; }
+        public int OpportunityLevel { get; set; }
+        public string OpportunityLevelJson { get; set; }
+
+        [Required]
+        public int EncounterGroup { get; set; }
+
+        [NotMapped]
+        public bool IsFromWizard { get; set; }
+        [NotMapped]
+        public IEnumerable<string> EncounterGroups { get; set; }
+        [NotMapped]
+        public IEnumerable<string> ChargeCodes { get; set; }
+        [NotMapped]
+        public IEnumerable<string> OpportunityLevels { get; set; }
+    }
+}
+
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityService.cs
new file mode 100644
index 0000000..2fda39b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityService.cs
@@ -0,0 +1,590 @@
+using ClosedXML.Excel;
+using Hangfire;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using MoreLinq;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Jobs;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.Id.Client;
+using Strata.Schema.Client;
+using Strata.Schema.Client.Dtos;
+using Strata.Schema.Client.Dtos.Info;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class CCOpportunityService : OpportunityService<CCOpportunityDataModel>, ICCOpportunityService
+    {
+        private readonly IConfigurationService _configurationService;
+        private readonly IAuthorizationServiceClient _authorizationServiceClient;
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly IFiscalMonthResolver _fiscalMonthResolver;
+        private readonly ISchemaServiceClient _schemaServiceClient;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+        private readonly IHubContext<NotificationHub, INotificationHub> _notificationHubContext;
+        private ChargeCodeOpportunityValidationSection _validationSection;
+        private readonly IInitiativeService _initiativeService;
+        private readonly ISnowflakeDatabaseContext _snowflakeDbContext;
+        private readonly ILogger<CCOpportunityService> _logging;
+
+        public async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+#pragma warning disable S107 // Constructor has NN new parameters, which is greater than the 7 authorized
+        public CCOpportunityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IConfigurationService configurationService,
+            IAuthorizationServiceClient authorizationServiceClient,
+            IIdServiceClient idServiceClient,
+            IFiscalMonthResolver fiscalMonthResolver,
+            ISchemaServiceClient schemaServiceClient,
+            IBackgroundJobClient backgroundJobClient,
+            IHubContext<NotificationHub, INotificationHub> notificationHubContext,
+            IOptions<ChargeCodeOpportunityValidationSection> sectionAccessor,
+            IInitiativeService initiativeService,
+            ISnowflakeDatabaseContext snowflakeDatabaseContext,
+            IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            ILogger<CCOpportunityService> logging)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor, initiativeService, updateFactOpportunitySavingsService)
+#pragma warning restore S107
+        {
+            _configurationService = configurationService;
+            _authorizationServiceClient = authorizationServiceClient;
+            _idServiceClient = idServiceClient;
+            _fiscalMonthResolver = fiscalMonthResolver;
+            _schemaServiceClient = schemaServiceClient;
+            _backgroundJobClient = backgroundJobClient;
+            _notificationHubContext = notificationHubContext;
+            _validationSection = sectionAccessor.Value ?? throw new ArgumentNullException(nameof(ChargeCodeOpportunityValidationSection));
+            _initiativeService = initiativeService;
+            _snowflakeDbContext = snowflakeDatabaseContext;
+            _logging = logging;
+        }
+
+        public async Task<bool> ValidateChargeCodesAsync(List<string> chargeCodes, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var memberNodes = await GetDimensionMembers("Charge Code", chargeCodes, cancellationToken);
+                var maxLimit = _validationSection.MaxChargeCodeSelections;
+
+                return memberNodes.Nodes.Sum(x => x.Count) <= maxLimit;
+            }
+            catch (Exception ex)
+            {
+                _logging.LogServiceError(ex, "Charge code validation failed");
+                return false;
+            }
+        }
+
+        public async Task<IEnumerable<ChargeCodePickerModel>> GetChargeCodePickerModelMembers(List<string> hPaths, CancellationToken cancellationToken)
+        {
+            var dimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync("Charge Code");
+            var chargeCodeMembers = new List<ChargeCodePickerModel>();
+            foreach (var codeHpaths in hPaths.Batch(250))
+            {
+                var members = await _schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid, codeHpaths, cancellationToken);
+                foreach (var member in members.Batch(250)) // prevent from exception
+                {
+                    chargeCodeMembers.AddRange(await _schemaServiceClient.GetFilteredDimensionMembersByGlobalIdAsync<ChargeCodePickerModel>("Charge Code",
+                        member.Select(m => Int32.Parse(m.Id)).ToList()));
+                }
+            }
+            return chargeCodeMembers.DistinctBy(cc => cc.ChargeCodeId).ToList();
+        }
+
+        public async Task<bool> ValidateOpportunityLevelsAsync(OpportunityLevel opportunityLevel, List<string> opportunityLevels, Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var configuration = await _configurationService.GetConfigurationAsync(configurationGuid, cancellationToken);
+                var memberNodes = await GetOpportunityLevelMemberInfos(opportunityLevel, opportunityLevels, configuration, cancellationToken);
+                return memberNodes.Nodes.Sum(x => x.Count) <= _validationSection.MaxOpportunityLevelSelections;
+            }
+            catch (Exception ex)
+            {
+                _logging.LogServiceError(ex, "Opportunity level validation failed");
+                return false;
+            }
+        }
+
+        public async Task<string> CreateAsync(Guid databaseGuid, CCOpportunityDataModel opportunity, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(opportunity.Name);
+            try
+            {
+                var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+                await using var dbContext = GetDbContext(cancellationToken).Result;
+                var configuration = await _configurationService.GetConfigurationAsync(opportunity.ConfigurationGuid, cancellationToken);
+                opportunity.Configuration = configuration;
+                opportunity.Configuration.FiscalMonthResolver = _fiscalMonthResolver;
+
+                await SetChargeCodeSelections(opportunity, cancellationToken);
+                await SetEncounterGroupSelectionJSON(opportunity, cancellationToken);
+                await SetOpportunityLevelSelectionJSON(opportunity, cancellationToken);
+
+                dbContext.ChargeCodeOpportunities.Add(opportunity);
+                await _authorizationServiceClient.AddPermissionsFromDefaultsAsync(opportunity.OpportunityGuid, SecurableEntityType.Opportunity, cancellationToken);
+
+                await dbContext.SaveChangesAsync(cancellationToken);
+
+                await hub.SendOpportunityCreateDetails(opportunity.Name, 0);
+                var jobId = _backgroundJobClient.Enqueue<CCOpportunityDetailJob>(job
+                    => job.PopulateOpportunityDetailsAsync(strataId, opportunity.Name, opportunity.OpportunityGuid, true, true, false, cancellationToken));
+                return jobId;
+            }
+            catch (Exception ex)
+            {
+                _logging.LogOpportunityError(ex, opportunity.Name, opportunity.OpportunityGuid);
+                await hub.SendOpportunityCreateError(opportunity.Name, ex.Message);
+                return null;
+            }
+        }
+
+        public async Task<string> UpdateAsync(Guid databaseGuid, CCOpportunityDataModel opportunity, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(opportunity.Name);
+            var opportunityGuid = opportunity.OpportunityGuid;
+            try
+            {
+                await using var dbContext = GetDbContext(cancellationToken).Result;
+                var originalOpportunity = await dbContext.ChargeCodeOpportunities
+                    .FirstOrDefaultAsync(opp => opp.OpportunityGuid.Equals(opportunityGuid), cancellationToken)
+                    ?? throw new CCOpportunityNotFoundException(opportunity.Name, opportunity.OpportunityGuid);
+                var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+                var configuration = await _configurationService.GetConfigurationAsync(opportunity.ConfigurationGuid, cancellationToken);
+                opportunity.Configuration = configuration;
+                opportunity.Configuration.FiscalMonthResolver = _fiscalMonthResolver;
+
+                await SetChargeCodeSelections(opportunity, cancellationToken);
+                await SetEncounterGroupSelectionJSON(opportunity, cancellationToken);
+                await SetOpportunityLevelSelectionJSON(opportunity, cancellationToken);
+
+                var isDetailsRefreshNeeded = opportunity.IsDetailsShouldBeUpdated(originalOpportunity);
+                if (isDetailsRefreshNeeded)
+                {
+                    var opportunityDetails = await dbContext.ChargeCodeDetails.Where(details => details.OpportunityGUID.Equals(opportunityGuid)).ToListAsync();
+                    dbContext.RemoveRange(opportunityDetails);
+
+                    var opportunityLevelCases = await dbContext.ChargeCodeOpportunityLevelCases.Where(levelCases => levelCases.OpportunityGuid.Equals(opportunityGuid)).ToListAsync();
+                    dbContext.RemoveRange(opportunityLevelCases);
+                }
+
+                originalOpportunity.Name = opportunity.Name;
+                originalOpportunity.ChargeCodeJson = opportunity.ChargeCodeJson;
+                originalOpportunity.CaseTypeJson = opportunity.CaseTypeJson;
+                originalOpportunity.ClinicalIndicatorJson = opportunity.ClinicalIndicatorJson;
+                originalOpportunity.OpportunityLevelJson = opportunity.OpportunityLevelJson;
+                originalOpportunity.OpportunityLevel = opportunity.OpportunityLevel;
+                originalOpportunity.IsSeasonal = opportunity.IsSeasonal;
+
+                await dbContext.SaveChangesAsync(cancellationToken);
+
+                if (isDetailsRefreshNeeded)
+                {
+                    var jobId = _backgroundJobClient.Enqueue<CCOpportunityDetailJob>(job
+                        => job.PopulateOpportunityDetailsAsync(strataId, opportunity.Name, opportunityGuid, true, true, true, cancellationToken));
+                    return jobId;
+                }
+
+                await hub.SendOpportunityCreateUpdateSuccess(opportunity.OpportunityGuid, true, opportunity.Name, true, OpportunityTypes.ChargeCode);
+                return Guid.Empty.ToString();
+            }
+            catch (CCOpportunityNotFoundException nf)
+            {
+                await hub.SendOpportunityUpdateError(nf.Name);
+                return null;
+            }
+            catch (Exception ex)
+            {
+                _logging.LogOpportunityError(ex, opportunity.Name, opportunityGuid);
+                await hub.SendOpportunityUpdateError(opportunity.Name);
+                return null;
+            }
+        }
+
+        public override async Task<CCOpportunityDataModel> GetById(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var opportunity = await dbContext.AddUserFilter(dbContext.Set<CCOpportunityDataModel>().AsQueryable(), _user)
+                .FirstOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+            if (opportunity == null) { return opportunity; }
+            opportunity.Configuration = await dbContext.Configurations.SingleOrDefaultAsync(c => c.ConfigurationGuid == opportunity.ConfigurationGuid, cancellationToken);
+            opportunity.Configuration.FiscalMonthResolver = _fiscalMonthResolver;
+            opportunity.Details = await dbContext.ChargeCodeDetails.Where(detail => detail.OpportunityGUID == opportunity.OpportunityGuid && detail.IsBaseline == true).ToListAsync(cancellationToken);
+            opportunity.LevelCases = await dbContext.ChargeCodeOpportunityLevelCases.Where(cases => cases.OpportunityGuid == opportunity.OpportunityGuid && cases.IsBaseline).ToListAsync(cancellationToken);
+            opportunity.EncounterGroup = (int)(opportunity.CaseTypeSelections?.Any() ?? false ? ChargeCodeGroup.CaseType : ChargeCodeGroup.PatientPopulation);
+            if (opportunity is IWithSourceOpportunity && _centralDbContext != null)
+            {
+                try
+                {
+                    var clientNetworkOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                        .Include(cno => cno.Opportunities)
+                        .Include(cno => cno.NetworkOpportunity)
+                        .SingleOrDefaultAsync(cno => cno.Opportunities.Any(link => link.OpportunityGuid == opportunity.OpportunityGuid));
+                    ((IWithSourceOpportunity)opportunity).SetSourceOpportunity(clientNetworkOpportunity);
+                }
+                catch (Exception ex)
+                {
+                    _logging.LogWarning(ex, "Failed to load source opportunity for {OpportunityGuid}", opportunityGuid.ToString());
+                    throw;
+                }
+            }
+            return opportunity;
+        }
+
+        public async Task<InitiativeInfo> GetInitiativeInfoAsync(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) { return default; }
+            var opportunityItem = await dbContext.AddUserFilter(dbContext.Set<CCOpportunityDataModel>().AsQueryable(), _user)
+                .SingleOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+            if (opportunityItem == null) { return default; }
+            var configuration = await _configurationService.GetConfigurationAsync(opportunityItem.ConfigurationGuid, cancellationToken);
+
+            if (opportunityItem.InitiativeGuid != Guid.Empty)
+            {
+                var initiative = dbContext?.Initiatives.SingleOrDefault(i => i.InitiativeGUID == opportunityItem.InitiativeGuid);
+                var fiscalMonths = configuration.GetTrackingFiscalMonths(OpportunityTypes.OrgDefined, initiative.EffectiveDate);
+                return initiative?.InitiativeInfo(opportunityItem.OpportunityGuid, fiscalMonths, configuration.OrgDefinedTrackingStartDate, configuration.OrgDefinedTrackingEndDate);
+            }
+            var info = new InitiativeInfo
+            {
+                OpportunityGuid = opportunityGuid,
+                Name = opportunityItem.Name,
+                CostDriver = "Charge Code",
+                StartMonth = configuration.OrgDefinedTrackingStartDate.ToString("yyyy-MM-dd"),
+                EndMonth = configuration.OrgDefinedTrackingEndDate.ToString("yyyy-MM-dd")
+            };
+            return info;
+        }
+
+        public async Task<string> RefreshOpportunityTrackingData(Guid databaseGuid, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            return _backgroundJobClient.Enqueue<CCOpportunityClientJob>(job
+                => job.RefreshClientOpportunityTrackingDetails(strataId, opportunityGuid, cancellationToken));
+        }
+
+        internal static async Task CheckForDuplicateName(CCOpportunityDataModel opportunity, JazzDbContext dbContext, CancellationToken cancellationToken)
+        {
+            var nameExists = await dbContext.ChargeCodeOpportunities.AnyAsync(x => x.Name == opportunity.Name, cancellationToken);
+            if (nameExists)
+            {
+                throw new DuplicateNameException();
+            }
+        }
+
+        public async Task<IXLWorkbook> ExportAsync(Guid opportunityGuid, IEnumerable<string> chargeCodes, string user, CancellationToken cancellationToken)
+        {
+            var memberInfo = await GetDimensionMembers("Charge Code", chargeCodes, cancellationToken);
+            var ids = memberInfo.Members.Select(m => int.TryParse(m.Id, out var res) ? res : 0).Where(id => id > 0).ToList();
+            var results = ids.Any()
+                ? await _schemaServiceClient.GetFilteredDimensionMembersByGlobalIdAsync<FilteredResult>("Charge Code", ids)
+                : new List<FilteredResult>();
+
+            var exportChargeCodes = results.Select(r => r.ChargeCode).ToList();
+            if (opportunityGuid != Guid.Empty)
+            {
+                var dbContext = await GetDbContext(cancellationToken);
+                var opportunity = dbContext.ChargeCodeOpportunities.FirstOrDefault(opp => opp.OpportunityGuid == opportunityGuid);
+                var existingChargeCodes = opportunity?.ChargeCodes.ToList() ?? new List<string>();
+                exportChargeCodes.AddRange(existingChargeCodes);
+            }
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet("Charge Codes");
+            ws.Cell(1, 1).InsertData(exportChargeCodes.Distinct().OrderBy(x => x));
+            return workbook;
+        }
+
+        internal class FilteredResult
+        {
+            public string ChargeCode { get; set; }
+        }
+
+        public async Task<bool> UpdateGoalTotalUnitsOfServiceAsync(Guid opportunityGuid, string key, double goalValue, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return false;
+            var opportunity = await GetChargeCodeOpportunityWithDetails(opportunityGuid, key, cancellationToken);
+            var opportunityDetails = opportunity?.Details;
+            if (opportunityDetails == null || !opportunityDetails.Any()) return false;
+
+            var totalCases = opportunityDetails.Sum(d => d.TotalCases);
+            opportunityDetails.ForEach(detail =>
+            {
+                detail.GoalTotalUnitsOfService = (opportunity.IsSeasonal && totalCases != 0)
+                    ? goalValue * (detail.TotalCases.DivideBy(totalCases))
+                    : goalValue.DivideBy(12);
+            });
+            dbContext.ChargeCodeDetails.UpdateRange(opportunityDetails);
+            return (await dbContext.SaveChangesAsync(cancellationToken)) > 0;
+        }
+
+        public async Task<bool> UpdateGoalCostPerUnitAsync(Guid opportunityGuid, string key, double goalValue, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return false;
+            var opportunity = await GetChargeCodeOpportunityWithDetails(opportunityGuid, key, cancellationToken);
+            var opportunityDetails = opportunity.Details;
+            if (opportunityDetails == null) return false;
+
+            opportunityDetails.ForEach(detail => detail.GoalCostPerUnit = goalValue);
+            dbContext.ChargeCodeDetails.UpdateRange(opportunityDetails);
+            return (await dbContext.SaveChangesAsync(cancellationToken)) > 0;
+        }
+
+        public async Task<bool> UpdateGoalsAsync(Guid opportunityGuid, IEnumerable<ChargeCodeOpportunityDetailChanges> changes, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return false;
+
+            var opportunity = await dbContext.ChargeCodeOpportunities.SingleOrDefaultAsync(cc => cc.OpportunityGuid.Equals(opportunityGuid));
+            if (opportunity == null) return false;
+
+            foreach (var change in changes)
+            {
+                var opportunityDetails = await GetChargeCodeOpportunityDetails(opportunityGuid, change.Key, cancellationToken);
+                if (opportunityDetails == null) continue;
+
+                opportunityDetails = opportunityDetails.Where(x => x.IsBaseline).ToList();
+
+                if (change.GoalCostPerUnit.HasValue) opportunityDetails.ForEach(detail => detail.GoalCostPerUnit = change.GoalCostPerUnit.Value);
+
+                if (change.GoalTotalUnitsOfService.HasValue)
+                {
+                    var goalValue = change.GoalTotalUnitsOfService.Value;
+                    var totalCases = opportunityDetails.Sum(d => d.TotalCases);
+                    opportunityDetails.ForEach(detail =>
+                    {
+                        detail.GoalTotalUnitsOfService = (opportunity.IsSeasonal && totalCases != 0)
+                            ? goalValue * (detail.TotalCases.DivideBy(totalCases))
+                            : goalValue.DivideBy(12);
+                    });
+                }
+
+                dbContext.ChargeCodeDetails.UpdateRange(opportunityDetails);
+            }
+
+            var changesNumber = await dbContext.SaveChangesAsync(cancellationToken);
+            return changesNumber > 0;
+        }
+
+        private async Task<CCOpportunityDataModel> GetChargeCodeOpportunityWithDetails(Guid opportunityGuid, string key, CancellationToken cancellationToken)
+        {
+            if (!key.Contains('|')) { return default; }
+            try
+            {
+                var keys = key.Split('|').Select(k => k.Trim()).ToArray();
+                var keySplit = new
+                {
+                    OpportunityLevelId = Int32.TryParse(keys[0].Trim(), out var id) ? id : 0,
+                    ChargeCodeRollupName = keys[1].Trim(),
+                    ChargeCodeName = keys[2].Trim(),
+
+                };
+                var dbContext = await GetDbContext(cancellationToken);
+                if (dbContext == null) return default;
+
+                var opportunity = await dbContext.ChargeCodeOpportunities
+                    .SingleOrDefaultAsync(cc => cc.OpportunityGuid.Equals(opportunityGuid));
+                if (opportunity != null)
+                {
+                    opportunity.Details = await dbContext.ChargeCodeDetails
+                        .Where(detail => detail.OpportunityGUID == opportunityGuid
+                            && detail.OpportunityLevelId == keySplit.OpportunityLevelId
+                            && detail.ChargeCodeRollupName == keySplit.ChargeCodeRollupName
+                            && detail.ChargeCodeName == keySplit.ChargeCodeName)
+                        .ToListAsync(cancellationToken);
+                }
+                return opportunity;
+            }
+            catch (Exception ex)
+            {
+                _logging.LogServiceError(ex);
+                return default;
+            }
+        }
+
+        private async Task<IEnumerable<ChargeCodeOpportunityDetail>> GetChargeCodeOpportunityDetails(Guid opportunityGuid, string key, CancellationToken cancellationToken)
+        {
+            if (!key.Contains('|')) { return default; }
+            try
+            {
+                var dbContext = await GetDbContext(cancellationToken);
+                if (dbContext == null) return default;
+
+                var keys = key.Split('|').Select(k => k.Trim()).ToArray();
+                var keySplit = new
+                {
+                    OpportunityLevelId = Int32.TryParse(keys[0].Trim(), out var id) ? id : 0,
+                    ChargeCodeRollupName = keys[1].Trim(),
+                    ChargeCodeName = keys[2].Trim(),
+
+                };
+
+                var details = await dbContext.ChargeCodeDetails
+                    .Where(detail => detail.OpportunityGUID == opportunityGuid
+                        && detail.OpportunityLevelId == keySplit.OpportunityLevelId
+                        && detail.ChargeCodeRollupName == keySplit.ChargeCodeRollupName
+                        && detail.ChargeCodeName == keySplit.ChargeCodeName)
+                    .ToListAsync(cancellationToken);
+
+                return details;
+            }
+            catch (Exception ex)
+            {
+                _logging.LogServiceError(ex);
+                return default;
+            }
+        }
+
+        private async Task SetEncounterGroupSelectionJSON(CCOpportunityDataModel opportunity, CancellationToken cancellationToken)
+        {
+            NodesAndMembers memberInfo = default;
+
+            if (opportunity.EncounterGroup == (int)EncounterGroup.CaseType)
+            {
+                memberInfo = await GetDimensionMembers("Case Type", opportunity.CaseTypes, cancellationToken);
+                opportunity.CaseTypeJson = JsonSerializer.Serialize(new { memberInfo.HierarchyPaths, memberInfo.Members });
+            }
+            else
+            {
+                memberInfo = await GetDimensionMembers("Clinical Indicator", opportunity.PatientPopulations, cancellationToken);
+                opportunity.ClinicalIndicatorJson = JsonSerializer.Serialize(new { memberInfo.HierarchyPaths, memberInfo.Members });
+            }
+        }
+
+        private async Task SetChargeCodeSelections(CCOpportunityDataModel opportunity, CancellationToken cancellationToken)
+        {
+            var memberInfo = await GetDimensionMembers("Charge Code", opportunity.ChargeCodes, cancellationToken);
+            opportunity.ChargeCodeJson = JsonSerializer.Serialize(new { memberInfo.HierarchyPaths, memberInfo.Members });
+        }
+
+        private async Task SetOpportunityLevelSelectionJSON(CCOpportunityDataModel opportunity, CancellationToken cancellationToken)
+        {
+            NodesAndMembers memberInfo = null;
+            var opportunityLevel = Enum.TryParse<OpportunityLevel>(opportunity.OpportunityLevel, out var level)
+                ? level : OpportunityLevel.Organization;
+            var configuration = opportunity.Configuration;
+
+            memberInfo = await GetOpportunityLevelMemberInfos(opportunityLevel, opportunity.OpportunityLevels, configuration, cancellationToken);
+            opportunity.OpportunityLevelJson = JsonSerializer.Serialize(new { memberInfo.HierarchyPaths, memberInfo.Members });
+        }
+
+        private async Task<NodesAndMembers> GetOpportunityLevelMemberInfos(OpportunityLevel opportunityLevel, List<string> opportunityLevels, Configuration.Configuration configuration, CancellationToken cancellationToken)
+        {
+            var memberInfo = new NodesAndMembers();
+            switch (opportunityLevel)
+            {
+                case OpportunityLevel.Entity:
+                    var globalId = configuration.IsUsingCustomEntityDimension ? configuration.DepartmentRollupGlobalId : "Entity";
+                    memberInfo = await GetDimensionMembers(globalId, opportunityLevels, cancellationToken);
+                    break;
+                case OpportunityLevel.ServiceLine:
+                    var dimension = await _schemaServiceClient.GetDimensionByIdAsync(configuration.ServiceLineDimensionGuid)
+                                    ?? await _schemaServiceClient.GetDimensionByGlobalIdAsync("Service Line");
+                    memberInfo = await GetDimensionMembers(dimension, opportunityLevels, cancellationToken);
+                    break;
+                case OpportunityLevel.Specialty:
+                    memberInfo = await GetDimensionMembers("DSS Physician Specialty", opportunityLevels, cancellationToken);
+                    break;
+                case OpportunityLevel.Provider:
+                    memberInfo = await GetDimensionMembers("Physician Primary", opportunityLevels, cancellationToken);
+                    break;
+                default:
+                    memberInfo = NodesAndMembers.SystemNodeAndMember();
+                    break;
+            }
+
+            return memberInfo;
+        }
+
+        private async Task<NodesAndMembers> GetDimensionMembers(string globalId, IEnumerable<string> codes, CancellationToken cancellationToken)
+        {
+            var dimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync(globalId);
+            return await GetDimensionMembers(dimension, codes, cancellationToken);
+        }
+
+        private async Task<NodesAndMembers> GetDimensionMembers(ScoreDimensionInfoDto dimension, IEnumerable<string> codes, CancellationToken cancellationToken)
+        {
+            var dimensionGuid = dimension.DimensionGuid;
+            var nodesAndMembers = new NodesAndMembers();
+            nodesAndMembers.HierarchyPaths = codes.ToList();
+
+            // Batching is necessary when users are selecting leaf nodes.
+            foreach (var codeHpaths in codes.Batch(250))
+            {
+                var nodes = await _schemaServiceClient.GetHierarchyNodesFromHierarchyPathsAsync(dimensionGuid, codeHpaths, cancellationToken);
+                var members = await _schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimensionGuid, codeHpaths, cancellationToken);
+                nodesAndMembers.Nodes.AddRange(nodes);
+                nodesAndMembers.Members.AddRange(members);
+            }
+            return nodesAndMembers;
+        }
+
+        internal class NodesAndMembers
+        {
+            public List<string> HierarchyPaths { get; set; }
+            public List<HierarchyNodeDto> Nodes { get; set; }
+            public List<MemberDto> Members { get; set; }
+
+            public NodesAndMembers()
+            {
+                Nodes = new List<HierarchyNodeDto>();
+                Members = new List<MemberDto>();
+            }
+
+            public static NodesAndMembers SystemNodeAndMember()
+                => new NodesAndMembers
+                {
+                    Nodes = new List<HierarchyNodeDto>{
+                        new HierarchyNodeDto
+                            {
+                                Name = "System",
+                                Count = 1,
+                                Path =""
+                            }
+                        },
+                    Members = new List<MemberDto>
+                        {
+                            new MemberDto
+                            {
+                                Id = "0",
+                                Name = "System",
+                                MemberGuid = Guid.Empty
+                            }
+                        }
+                };
+        }
+    }
+    public class ChargeCodePickerModel
+    {
+        public int ChargeCodeId { get; set; }
+        public string Name { get; set; }
+        public string CostDriver { get; set; }
+        public string Rollup { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityViewService.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityViewService.cs
new file mode 100644
index 0000000..018c126
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/CCOpportunityViewService.cs
@@ -0,0 +1,91 @@
+using ClosedXML.Excel;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Export;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.CoreLib.Claims;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class CCOpportunityViewService : OpportunityService<CCOpportunity>, ICCOpportunityViewService
+    {
+        private readonly ILogger<CCOpportunityViewService> _logger;
+
+        public async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public CCOpportunityViewService(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IInitiativeService initiativeService, IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            ILogger<CCOpportunityViewService> logger)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor, initiativeService, updateFactOpportunitySavingsService)
+        {
+            _logger = logger;
+        }
+
+        public async Task<CCFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return null;
+
+            var opportunityContext = dbContext.Set<CCOpportunityDataModel>();
+            var configuredOpportunities = opportunityContext.Where(en => en.ConfigurationGuid == configurationGuid);
+
+            var opportunityLevels = configuredOpportunities
+#pragma warning disable S2971 // "IEnumerable" LINQs should be simplified
+                .Select(en => en.OpportunityLevel).Distinct().ToList()
+#pragma warning restore S2971 // "IEnumerable" LINQs should be simplified
+                .Select(ol => new FilterMember { Id = ol, Text = (ol == "ServiceLine" ? "Service Line" : ol) })
+                .OrderBy(ol => ol.Text);
+
+            return new CCFilterOptions
+            {
+                OpportunityLevels = opportunityLevels
+            };
+        }
+
+
+        public async Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, CCFilters filters, CancellationToken cancellationToken)
+        {
+            var exportOptions = this.GetExportOptions();
+
+            // get data
+            var opportunities = await this.GetAllAsync(sortOptions, filters, cancellationToken);
+            var data = opportunities.Select(opp => new
+            {
+                Opportunity = opp.OpportunityKey,
+                opp.Name,
+                opp.IdentifiedSavings,
+                opp.Cases,
+                ChargeCodeGroup = opp.ChargeCodeGroupValue,
+                Level = opp.OpportunityLevel,
+                Seasonality = opp.IsSeasonal ? "With" : "Without",
+                opp.Initiative,
+                IsHidden = opp.IsHidden ? 1 : 0,
+                opp.Note
+            });
+
+            // configure column formats
+            exportOptions.AddColumnOptions("Identified Savings", "Currency2Dec");
+            exportOptions.AddColumnOptions("Cases", "Accounting");
+            exportOptions.AddColumnOptions("Is Hidden", "\"Yes\";-;\"No\"");
+
+            return ExportUtils.CreateExcelWorkbook(data, exportOptions);
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ChargeCodeOpportunityDetailChanges.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ChargeCodeOpportunityDetailChanges.cs
new file mode 100644
index 0000000..e93aed9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ChargeCodeOpportunityDetailChanges.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class ChargeCodeOpportunityDetailChanges
+    {
+        public string Key { get; set; }
+        public double? GoalTotalUnitsOfService { get; set; }
+        public double? GoalCostPerUnit { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ChargeCodeOpportunityLevelCase.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ChargeCodeOpportunityLevelCase.cs
new file mode 100644
index 0000000..462dc38
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ChargeCodeOpportunityLevelCase.cs
@@ -0,0 +1,15 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    [Table("ChargeCodeOpportunityLevelCase", Schema = "cci")]
+    public class ChargeCodeOpportunityLevelCase
+    {
+        public Guid OpportunityGuid { get; set; }
+        public bool IsBaseline { get; set; }
+        public int OpportunityLevelId { get; set; }
+        public int Month { get; set; }
+        public int Cases { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/EncounterGroupQueryHelper.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/EncounterGroupQueryHelper.cs
new file mode 100644
index 0000000..af022c7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/EncounterGroupQueryHelper.cs
@@ -0,0 +1,41 @@
+using Microsoft.Data.SqlClient;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class EncounterGroupQueryHelper : QueryHelper
+    {
+        public EncounterGroupQueryHelper(IEnumerable<SqlParameter> sqlParams)
+        {
+            var hasCaseTypeIdParams = sqlParams.Any(p => p.ParameterName.StartsWith("@caseTypeId", System.StringComparison.CurrentCultureIgnoreCase));
+            var hasIndicatorIdParams = sqlParams.Any(p => p.ParameterName.StartsWith("@indicatorId", System.StringComparison.CurrentCultureIgnoreCase));
+            if (hasCaseTypeIdParams)
+            {
+                Join = @"INNER JOIN dss.DimCaseType dct ON 
+        CASE dct.casetypecategory 
+        WHEN 0 THEN fpes.msdrgcasetypefamilyid
+        WHEN 1 THEN fpes.aprdrgcasetypefamilyid
+        WHEN 3 THEN fpes.cptcodecasetypefamilyid
+        ELSE -1 END = dct.casetypefamilyid";
+                // Case Type Id is unique so the categories should be mutually exclusive as to which CaseTypeCategory the Id belongs.
+                WhereClause = $@"AND dct.casetypeid in (@caseTypeIds)
+    AND ((dct.CaseTypeCategory = 0 AND EXISTS(SELECT 1 
+            FROM dss.CaseTypeFamilyMappingICD10 fid 
+            WHERE fid.CaseTypeFamilyID = dct.CaseTypeFamilyID))
+        OR (dct.CaseTypeCategory = 1 AND EXISTS(SELECT 1 
+            FROM dss.CaseTypeFamilyMappingAPRDRG fid 
+            WHERE fid.CaseTypeFamilyID = dct.CaseTypeFamilyID))
+        OR (dct.CaseTypeCategory = 3 AND  EXISTS(SELECT 1 
+            FROM dss.CaseTypeFamilyMappingCPT fid 
+            WHERE fid.CaseTypeFamilyID = dct.CaseTypeFamilyID))
+        )";
+            }
+            else if (hasIndicatorIdParams)
+            {
+                Join = "INNER JOIN dss.FactPatientEncounterClinicalIndicator ci on ci.EncounterID = fpes.EncounterID and ci.IsDeleted = 0";
+                WhereClause = $"AND ci.ClinicalIndicatorId in (@indicatorIds)";
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ICCOpportunityDetailService.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ICCOpportunityDetailService.cs
new file mode 100644
index 0000000..a52432c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ICCOpportunityDetailService.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public interface ICCOpportunityDetailService
+    {
+        double CalculateSavings(IEnumerable<ChargeCodeOpportunityDetail> details);
+        Task<List<CCOpportunityDetailQueryResult>> GetCCOpportunityDetailQueryResult(CCOpportunityDataModel opportunity,
+            Configuration.Configuration configuration, CancellationToken cancellationToken, bool isBaseline = true);
+        Task<IEnumerable<CCOpportunityLevelCaseQueryResult>> CCOpportunityLevelCasesQuery(CCOpportunityDataModel opportunity,
+            Configuration.Configuration configuration, CancellationToken cancellationToken, bool isBaseline = true);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ICCOpportunityLevelCaseService.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ICCOpportunityLevelCaseService.cs
new file mode 100644
index 0000000..9c80fe4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ICCOpportunityLevelCaseService.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public interface ICCOpportunityLevelCaseService
+    {
+        Task AddOrUpdateLevelCases(List<ChargeCodeOpportunityLevelCase> levelCases, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ICCOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ICCOpportunityService.cs
new file mode 100644
index 0000000..e6db281
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ICCOpportunityService.cs
@@ -0,0 +1,27 @@
+using ClosedXML.Excel;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public interface ICCOpportunityService : IOpportunityService<CCOpportunityDataModel>
+    {
+        Task<string> CreateAsync(Guid databaseGuid, CCOpportunityDataModel opportunity, CancellationToken cancellationToken);
+        Task<string> UpdateAsync(Guid databaseGuid, CCOpportunityDataModel opportunity, CancellationToken cancellationToken);
+        Task<bool> ValidateChargeCodesAsync(List<string> chargeCodes, CancellationToken cancellationToken);
+        Task<IEnumerable<ChargeCodePickerModel>> GetChargeCodePickerModelMembers(List<string> hPaths, CancellationToken cancellationToken);
+        Task<bool> ValidateOpportunityLevelsAsync(OpportunityLevel opportunityLevel, List<string> opportunityLevels, Guid configurationGuid, CancellationToken cancellationToken);
+        Task<CCOpportunityDataModel> GetById(Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<bool> UpdateGoalTotalUnitsOfServiceAsync(Guid opportunityGuid, string key, double goalValue, CancellationToken cancellationToken);
+        Task<bool> UpdateGoalCostPerUnitAsync(Guid opportunityGuid, string key, double goalValue, CancellationToken cancellationToken);
+        Task<bool> UpdateGoalsAsync(Guid opportunityGuid, IEnumerable<ChargeCodeOpportunityDetailChanges> changes, CancellationToken cancellationToken);
+        Task<InitiativeInfo> GetInitiativeInfoAsync(Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<string> RefreshOpportunityTrackingData(Guid databaseGuid, Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<IXLWorkbook> ExportAsync(Guid opportunityGuid, IEnumerable<string> chargeCodes, string user, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ICCOpportunityViewService.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ICCOpportunityViewService.cs
new file mode 100644
index 0000000..af3d0d5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/ICCOpportunityViewService.cs
@@ -0,0 +1,18 @@
+using ClosedXML.Excel;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public interface ICCOpportunityViewService : IOpportunityService<CCOpportunity>
+    {
+        Task<CCFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken);
+
+        Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, CCFilters filters, CancellationToken cancellationToken);
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/OpportunityDetailLevelQuery.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/OpportunityDetailLevelQuery.cs
new file mode 100644
index 0000000..49f8aa7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/OpportunityDetailLevelQuery.cs
@@ -0,0 +1,39 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class OpportunityDetailLevelQuery
+    {
+        private readonly OpportunityLevel _opportunityLevel;
+        private readonly QueryHelper _encounterGroupQuery;
+        private readonly QueryHelper _opportunityLevelQuery;
+
+        public OpportunityDetailLevelQuery(OpportunityLevel opportunityLevel, QueryHelper encounterGroupQuery, QueryHelper opportunityLevelQuery)
+        {
+            _opportunityLevel = opportunityLevel;
+            _encounterGroupQuery = encounterGroupQuery;
+            _opportunityLevelQuery = opportunityLevelQuery;
+        }
+
+        public string GetQuery()
+        {
+            return $@"
+SELECT 
+    CAST(MONTH(fpes.DischargeDateTime) AS INT) Month
+    ,CAST({(_opportunityLevel is not OpportunityLevel.Organization ? _opportunityLevelQuery?.Id : "0")} AS INT) OpportunityLevelId
+    ,COUNT(DISTINCT fpes.EncounterId) AS TotalCases
+FROM clientdss.FactPatientEncounterSummary fpes
+{_encounterGroupQuery.Join}
+{_opportunityLevelQuery?.Join}
+WHERE 
+    fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+    {_encounterGroupQuery.WhereClause}
+    {_opportunityLevelQuery?.WhereClause}
+GROUP BY MONTH(fpes.DischargeDateTime)
+    {(_opportunityLevel is not OpportunityLevel.Organization ? $",{_opportunityLevelQuery?.Id}" : "")};".TightenUp();
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/OpportunityDetailQuery.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/OpportunityDetailQuery.cs
new file mode 100644
index 0000000..f6ac841
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/OpportunityDetailQuery.cs
@@ -0,0 +1,100 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class OpportunityDetailQuery
+    {
+        private readonly OpportunityLevel _opportunityLevel;
+        private readonly QueryHelper _encounterGroupQuery;
+        private readonly QueryHelper _opportunityLevelQuery;
+        private readonly bool _isUsingSnowflake;
+
+        public OpportunityDetailQuery(OpportunityLevel opportunityLevel, QueryHelper encounterGroupQuery, QueryHelper opportunityLevelQuery, bool isUsingSnowflake = false)
+        {
+            _opportunityLevel = opportunityLevel;
+            _encounterGroupQuery = encounterGroupQuery;
+            _opportunityLevelQuery = opportunityLevelQuery;
+            _isUsingSnowflake = isUsingSnowflake;
+        }
+
+        public string GetQuery()
+        {
+            if (_isUsingSnowflake)
+            {
+                return $@"
+SELECT 
+    cc.ChargeCodeId
+    ,'' AS ChargeCodeName
+    ,cc.Rollup AS ChargeCodeRollupName
+    ,MONTH(fpes.DischargeDateTime) AS Month
+    {(_opportunityLevel is not OpportunityLevel.Organization ? $",CAST({_opportunityLevelQuery?.Id} AS INT) OpportunityLevelId" : ",0 OpportunityLevelId")} 
+    ,'' AS OpportunityLevelName
+    ,COUNT(DISTINCT fpes.EncounterId) AS TotalCases
+    ,SUM(billing.UnitsOfService) AS TotalUnitsOfService
+    ,SUM(billing.VariableDirectCost) AS VariableDirectCost 
+    ,SUM(billing.VariableIndirectCost) AS VariableIndirectCost
+    ,@isBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+INNER JOIN cci.EncounterChargeCodeCosts billing on billing.encounterid = fpes.encounterid
+INNER JOIN fw.DimChargeCode cc ON billing.ChargeCodeId = cc.ChargeCodeId 
+{_encounterGroupQuery.Join}
+{_opportunityLevelQuery?.Join}
+WHERE 
+    fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+    AND cc.ChargeCodeId in (@chargeCodeIds)
+    {_encounterGroupQuery.WhereClause}
+    {_opportunityLevelQuery?.WhereClause}
+GROUP BY cc.ChargeCodeID, cc.Rollup, MONTH(fpes.DischargeDateTime)
+        {(_opportunityLevel is not OpportunityLevel.Organization ? $",{_opportunityLevelQuery?.Id}" : "")}
+                ; ".TightenUp();
+            }
+            else
+            {
+                return $@"
+WITH billing AS
+(
+    SELECT 
+		PBLID.*
+		,COALESCE(PBLIC.FixedDirectUnitCost, 0) * PBLID.UnitsOfService FixedDirectCost
+		,COALESCE(PBLIC.FixedIndirectUnitCost, 0) * PBLID.UnitsOfService FixedIndirectCost
+		,COALESCE(PBLIC.VariableDirectUnitCost, 0) * PBLID.UnitsOfService VariableDirectCost
+		,COALESCE(PBLIC.VariableIndirectUnitCost, 0) * PBLID.UnitsOfService VariableIndirectCost
+		,(COALESCE(PBLIC.FixedDirectUnitCost, 0) + COALESCE(PBLIC.FixedIndirectUnitCost, 0)) * PBLID.UnitsOfService FixedCost
+		,(COALESCE(PBLIC.VariableDirectUnitCost, 0) + COALESCE(PBLIC.VariableIndirectUnitCost, 0)) * PBLID.UnitsOfService VariableCost
+		,(COALESCE(PBLIC.VariableDirectUnitCost, 0) + COALESCE(PBLIC.FixedDirectUnitCost, 0)) * PBLID.UnitsOfService DirectCost
+		,(COALESCE(PBLIC.VariableIndirectUnitCost, 0) + COALESCE(PBLIC.FixedIndirectUnitCost, 0)) * PBLID.UnitsOfService IndirectCost
+		,(COALESCE(PBLIC.VariableDirectUnitCost, 0) + COALESCE(PBLIC.VariableIndirectUnitCost, 0) + COALESCE(PBLIC.FixedDirectUnitCost, 0) + COALESCE(PBLIC.FixedIndirectUnitCost, 0)) * PBLID.UnitsOfService TotalCost
+		,COALESCE(PBLIC.CostingResultID, 0) CostingResultID
+	FROM dss.FactPatientBillingLineItemDetail PBLID
+	LEFT JOIN dss.FactPatientBillingLineItemCosts PBLIC on PBLIC.PBLIDRowID = PBLID.RowID
+)
+SELECT 
+    cc.ChargeCodeId
+    ,'' AS ChargeCodeName
+    ,cc.Rollup AS ChargeCodeRollupName
+    ,MONTH(fpes.DischargeDateTime) AS Month
+    {(_opportunityLevel is not OpportunityLevel.Organization ? $",CAST({_opportunityLevelQuery?.Id} AS INT) OpportunityLevelId" : ",0 OpportunityLevelId")} 
+    ,'' AS OpportunityLevelName
+    ,COUNT(DISTINCT fpes.EncounterId) AS TotalCases
+    ,SUM(billing.UnitsOfService) AS TotalUnitsOfService
+    ,SUM(billing.VariableDirectCost) AS VariableDirectCost 
+    ,SUM(billing.VariableIndirectCost) AS VariableIndirectCost
+    ,@isBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+INNER JOIN billing on billing.encounterid = fpes.encounterid
+INNER JOIN fw.DimChargeCode cc ON billing.ChargeCodeId = cc.ChargeCodeId 
+{_encounterGroupQuery.Join}
+{_opportunityLevelQuery?.Join}
+WHERE 
+    fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+    AND billing.UnitsOfService <> 0  
+    AND cc.ChargeCodeId in (@chargeCodeIds)
+    {_encounterGroupQuery.WhereClause}
+    {_opportunityLevelQuery?.WhereClause}
+GROUP BY cc.ChargeCodeID, cc.[Rollup], MONTH(fpes.DischargeDateTime)
+        {(_opportunityLevel is not OpportunityLevel.Organization ? $",{_opportunityLevelQuery?.Id}" : "")};".TightenUp();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/OpportunityLevelQueryHelper.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/OpportunityLevelQueryHelper.cs
new file mode 100644
index 0000000..22da1cc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/OpportunityLevelQueryHelper.cs
@@ -0,0 +1,62 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class OpportunityLevelQueryHelper : QueryHelper
+    {
+
+        public OpportunityLevelQueryHelper(OpportunityLevel opportunityLevel, Configuration.Configuration configuration, string serviceLineDimensionName, string serviceLineColumnName)
+        {
+            switch (opportunityLevel)
+            {
+                case OpportunityLevel.Entity:
+                    if (configuration.DepartmentRollupGlobalId == "")
+                    {
+                        Id = "de.FwEntityID";
+                        Join = $"INNER JOIN clientdss.DimEntity de ON de.EntityID = fpes.EntityID";
+                        WhereClause = $"AND {Id} in (@oppLevelIds)";
+                    }
+                    else if (configuration.DepartmentRollupGlobalId == "Location")
+                    {
+                        Id = "fpes.LocationID";
+                        WhereClause = $"AND {Id} in (@oppLevelIds)";
+                    }
+                    else
+                    {
+                        var rollupLevel = configuration.DepartmentRollupGlobalId.Replace(" ", string.Empty);
+                        Id = "department." + rollupLevel + "ID";
+                        Join = $"INNER JOIN fw.DimDepartment department ON fpes.HighestVariableCostDepartmentID = department.DepartmentId";
+                        WhereClause = $"AND {Id} in (@oppLevelIds)";
+                    }
+                    break;
+                case OpportunityLevel.ServiceLine:
+                    if (serviceLineDimensionName == "Sg2 Service Line Crosswalk")
+                    {
+                        Id = "sl.Sg2ServiceLineCrosswalkId";
+                        Join = @"INNER JOIN dss.DimSg2CareFamily cf ON cf.Sg2CAREFamilyID = fpes.Sg2CAREFamilyID
+INNER JOIN dss.DimSg2ServiceLineCrosswalk sl ON sl.Sg2ServiceLine = cf.ServiceLine";
+                        WhereClause = $"AND {Id} in (@oppLevelIds)";
+                    }
+                    else
+                    {
+                        Id = "fpes." + (String.IsNullOrEmpty(serviceLineColumnName) ? "ServiceLineID" : serviceLineColumnName);
+                        WhereClause = $"AND {Id} in (@oppLevelIds)";
+                    }
+                    break;
+                case OpportunityLevel.Specialty:
+                    Id = "ps.PhysicianSpecialtyID";
+                    Join = @"INNER JOIN dss.DimPhysician pp ON pp.PhysicianID = fpes.PrimaryPhysicianID
+INNER JOIN dss.DimPhysicianSpecialty ps ON ps.PhysicianSpecialtyID = pp.PhysicianSpecialtyID";
+                    WhereClause = $"AND {Id} in (@oppLevelIds)";
+                    break;
+                case OpportunityLevel.Provider:
+                    Id = "fpes.PrimaryPhysicianID";
+                    WhereClause = $"AND {Id} in (@oppLevelIds)";
+                    break;
+            }
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/QueryHelper.cs b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/QueryHelper.cs
new file mode 100644
index 0000000..c25d1f3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ChargeCode/Opportunities/QueryHelper.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities
+{
+    public class QueryHelper
+    {
+        public string Id { get; set; } = "";
+        public string Join { get; set; } = "";
+        public string WhereClause { get; set; } = "";
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ClientLicense/ClientLicenseService.cs b/src/Strata.ContinuousImprovement.Biz/ClientLicense/ClientLicenseService.cs
new file mode 100644
index 0000000..10bf17c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ClientLicense/ClientLicenseService.cs
@@ -0,0 +1,60 @@
+using Microsoft.Extensions.Options;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Id.Client;
+using Strata.Id.Client.DTO;
+using Strata.Licenses.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ClientLicense
+{
+    public class ClientLicenseService : IClientLicenseService
+    {
+        private readonly ILicensesServiceClient _licensesService;
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly DatabaseRegexSection _databaseRegex;
+
+        // Well-known CI license GUID
+        private static readonly Guid _ciLicenseGuid = Guid.Parse("feb1a208-693c-43fc-bdff-306bdfcdaaa4");
+
+        public ClientLicenseService(
+            ILicensesServiceClient licensesService,
+            IIdServiceClient idServiceClient,
+            IOptions<DatabaseRegexSection> sectionAccessor)
+        {
+            _licensesService = licensesService;
+            _idServiceClient = idServiceClient;
+            _databaseRegex = sectionAccessor.Value ?? throw new ArgumentNullException(nameof(DatabaseRegexSection));
+        }
+
+        public async Task<IEnumerable<StrataIdFullDto>> GetEligibleCIClientsAsync(bool isLicensed, CancellationToken cancellationToken)
+        {
+            var licenses = (await _licensesService
+                .GetLicenseLinksByLicenseGuidAsync(_ciLicenseGuid, cancellationToken))
+                .Where(license => license.IsLicensed);
+
+            var licensedDbGuids = licenses
+                .Select(l => l.DatabaseGuid)
+                .ToHashSet();
+
+            var allClients = await _idServiceClient.GetStrataIds(cancellationToken);
+
+            // Filter clients based on standard criteria + licensed status
+            return allClients.Where(client =>
+                client.StrataIdType == Id.Client.Enums.StrataIdType.Live
+                && client.OrgPin != "0000"
+                && client.AppVersion != "Not Specified"
+                && client.AppVersion != "0.0"
+                && client.AppVersion.AppVersion() >= 2023.31m
+                && (_databaseRegex?.DatabaseRegexExpression?.IsMatch(client.ServerName) ?? true)
+                && (isLicensed
+                    ? licensedDbGuids.Contains(client.DatabaseGUID)
+                    : !licensedDbGuids.Contains(client.DatabaseGUID))
+            ).ToList();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ClientLicense/IClientLicenseService.cs b/src/Strata.ContinuousImprovement.Biz/ClientLicense/IClientLicenseService.cs
new file mode 100644
index 0000000..fb3ca3e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ClientLicense/IClientLicenseService.cs
@@ -0,0 +1,12 @@
+using Strata.Id.Client.DTO;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ClientLicense
+{
+    public interface IClientLicenseService
+    {
+        Task<IEnumerable<StrataIdFullDto>> GetEligibleCIClientsAsync(bool isLicensed, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ClientWarehouses/ClientWarehouse.cs b/src/Strata.ContinuousImprovement.Biz/ClientWarehouses/ClientWarehouse.cs
new file mode 100644
index 0000000..6874b26
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ClientWarehouses/ClientWarehouse.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.ClientWarehouses
+{
+    public class ClientWarehouse
+    {
+        public int ClientWarehouseId { get; set; }
+        public Guid DatabaseGuid { get; set; }
+        public string ClientName { get; set; }
+        public WarehouseSize WarehouseSize { get; set; } = WarehouseSize.S; // Default to Small 
+    }
+
+    public enum WarehouseSize
+    {
+        S = 1,
+        M = 2,
+        L = 3,
+        XL = 4
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ClientWarehouses/ClientWarehouseService.cs b/src/Strata.ContinuousImprovement.Biz/ClientWarehouses/ClientWarehouseService.cs
new file mode 100644
index 0000000..eb328b0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ClientWarehouses/ClientWarehouseService.cs
@@ -0,0 +1,49 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ClientWarehouses
+{
+    public class ClientWarehouseService : IClientWarehouseService
+    {
+        private readonly CentralDbContext _centralDbContext;
+
+        public ClientWarehouseService(CentralDbContext centralDbContext)
+        {
+            _centralDbContext = centralDbContext;
+        }
+
+        public async Task<List<ClientWarehouse>> GetAll(CancellationToken cancellationToken)
+        {
+            return await _centralDbContext.ClientWarehouses.ToListAsync(cancellationToken);
+        }
+
+        public async Task<ClientWarehouse> GetByDatabaseGuid(Guid databaseGuid, CancellationToken cancellationToken)
+        {
+            return await _centralDbContext.ClientWarehouses.SingleOrDefaultAsync(x => x.DatabaseGuid == databaseGuid, cancellationToken);
+        }
+
+        public async Task<int> Add(ClientWarehouse clientWarehouse, CancellationToken cancellationToken)
+        {
+            await _centralDbContext.ClientWarehouses.AddAsync(clientWarehouse, cancellationToken);
+            await _centralDbContext.SaveChangesAsync(cancellationToken);
+            return clientWarehouse.ClientWarehouseId;
+        }
+
+        public async Task<bool> Exists(Guid databaseGuid, CancellationToken cancellationToken)
+        {
+            return await _centralDbContext.ClientWarehouses.AnyAsync(x => x.DatabaseGuid == databaseGuid, cancellationToken: cancellationToken);
+        }
+
+        public async Task<bool> Delete(Guid databaseGuid, CancellationToken cancellationToken)
+        {
+            var clientWarehouse = await _centralDbContext.ClientWarehouses.FirstAsync(x => x.DatabaseGuid == databaseGuid, cancellationToken);
+            _centralDbContext.ClientWarehouses.Remove(clientWarehouse);
+            var result = await _centralDbContext.SaveChangesAsync(cancellationToken);
+            return result > 0;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ClientWarehouses/IClientWarehouseService.cs b/src/Strata.ContinuousImprovement.Biz/ClientWarehouses/IClientWarehouseService.cs
new file mode 100644
index 0000000..32ffdb1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ClientWarehouses/IClientWarehouseService.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ClientWarehouses
+{
+    public interface IClientWarehouseService
+    {
+        Task<bool> Exists(Guid databaseGuid, CancellationToken cancellationToken);
+        Task<List<ClientWarehouse>> GetAll(CancellationToken cancellationToken);
+        Task<ClientWarehouse> GetByDatabaseGuid(Guid databaseGuid, CancellationToken cancellationToken);
+        Task<int> Add(ClientWarehouse clientWarehouse, CancellationToken cancellationToken);
+        Task<bool> Delete(Guid databaseGuid, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Configuration/Configuration.cs b/src/Strata.ContinuousImprovement.Biz/Configuration/Configuration.cs
new file mode 100644
index 0000000..582fb7b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Configuration/Configuration.cs
@@ -0,0 +1,329 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Score;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Configuration
+{
+    [Table("Configuration", Schema = "cci")]
+    public class Configuration
+    {
+
+        [Key]
+        public Guid ConfigurationGuid { get; set; }
+        public string Name { get; set; }
+        public byte DisplayOrder { get; set; }
+        public Guid ServiceLineDimensionGuid { get; set; }
+        public string EntityIdsCSV { get; set; }
+        public bool IsUsingIndirectCost { get; set; }
+        public string DepartmentRollupGlobalId { get; set; }
+        public bool IsUsingCustomEntityDimension => !string.IsNullOrEmpty(DepartmentRollupGlobalId);
+
+        public string CustomEntityIdsCSV { get; set; }
+        public QVIOpportunityBreakdowns QVIOpportunityBreakdown { get; set; }
+        public short FiscalYearID { get; set; }
+        public DateTime VariationEndDate { get; set; }
+        public DateTime QualityVariationEndDate { get; set; }
+        public DateTime OrgDefinedEndDate { get; set; }
+        public DateTime OrgDefinedTrackingCurrentMonth { get; set; }
+        public DateTime VariationTrackingCurrentMonth { get; set; }
+        public bool QualityVariationIsUsingAPRDRG { get; set; }
+        private IEnumerable<int> EntityIds => EntityIdsCSV.SplitCSV();
+        public string SourceSystemIdsCSV { get; set; }
+		public DateTime QualityVariationTrackingCurrentMonth { get; set; }
+
+		private IEnumerable<int> CustomEntityIds => CustomEntityIdsCSV.SplitCSV();
+
+        public IEnumerable<int> ConfiguredEntityIds =>
            IsUsingCustomEntityDimension ? CustomEntityIds : EntityIds;
+
+        public int QVIOpportunityBreakdownEnum => (int)QVIOpportunityBreakdown;
+
+        public string QVIOpportunityBreakdownName
+        {
+            get
+            {
+                switch (QVIOpportunityBreakdown)
+                {
+                    case QVIOpportunityBreakdowns.Entity:
+                        return "Entity";
+                    case QVIOpportunityBreakdowns.PhysicianSpecialty:
+                        return "Physician Specialty";
+                    case QVIOpportunityBreakdowns.ServiceLine:
+                        return "Service Line";
+                    default:
+                        return "Breakdown";
+                }
+            }
+        }
+
+        public string QVIOpportunityBreakdownNamePlural
+        {
+            get
+            {
+                switch (QVIOpportunityBreakdown)
+                {
+                    case QVIOpportunityBreakdowns.Entity:
+                        return "Entities";
+                    case QVIOpportunityBreakdowns.PhysicianSpecialty:
+                        return "Physician Specialties";
+                    case QVIOpportunityBreakdowns.ServiceLine:
+                        return "Service Lines";
+                    default:
+                        return "Breakdowns";
+                }
+            }
+        }
+
+        public string GetCaseTypeFamilyIdSqlColumn() =>
+            QualityVariationIsUsingAPRDRG ? "APRDRGCaseTypeFamilyID" : "MSDRGCaseTypeFamilyID";
+
+        public IList<int> GetSourceSystemIds()
+        {
+            return SourceSystemIdsCSV.ParseIntCsv();
+        }
+
+        public IList<int> GetConfiguredEntityIds()
+        {
+            if (IsUsingCustomEntityDimension)
+            {
+                return CustomEntityIdsCSV.ParseIntCsv();
+            }
+            return EntityIdsCSV.ParseIntCsv();
+        }
+
+        // ReSharper disable once InconsistentNaming
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+        public enum QVIOpportunityBreakdowns
+        {
+            Entity = 0,
+            ServiceLine = 1,
+            PhysicianSpecialty = 2
+        }
+
+        #region DateTime Methods
+
+        [NotMapped]
+        public IFiscalMonthResolver FiscalMonthResolver { get; set; }
+
+        [NotMapped]
+        public DateTime OrgDefinedTrackingStartDate { get; set; }
+        [NotMapped]
+        public DateTime OrgDefinedTrackingEndDate { get; set; }
+        [NotMapped]
+        public DateTime LastFiscalYearStartDate { get; set; }
+        [NotMapped]
+        public DateTime LastFiscalYearEndDate { get; set; }
+
+        /// <summary>
+        ///     Gets the baseline start date by opportunity type (variation/qualityvariation/other)
+        /// </summary>
+        public DateTime GetBaselineStartDate(OpportunityTypes opportunityType)
+            => GetBaselineEndDate(opportunityType).GetStartOrEndDateOfYearPeriod(-1);
+
+        /// <summary>
+        ///     Adjust Baseline End Date to the beginning of the next day
+        /// </summary>
+        /// <param name="opportunityType"></param>
+        /// <returns></returns>
+        public DateTime BaselineEndDate(OpportunityTypes opportunityType)
+            => GetBaselineEndDate(opportunityType).AddDays(1).Date;
+
+        /// <summary>
+        ///     Gets the baseline end date by opportunity type (variation/qualityvariation/other)
+        /// </summary>
+        public DateTime GetBaselineEndDate(OpportunityTypes opportunityType)
+        {
+            DateTime endDate;
+
+            switch (opportunityType)
+            {
+                case OpportunityTypes.Variation:
+                case OpportunityTypes.Exploration:
+                    endDate = VariationEndDate;
+                    break;
+                case OpportunityTypes.QualityVariation:
+                    endDate = QualityVariationEndDate;
+                    break;
+                case OpportunityTypes.OrgDefined:
+                case OpportunityTypes.FreeForm:
+                case OpportunityTypes.GeneralLedger:
+                case OpportunityTypes.Payroll:
+                case OpportunityTypes.Encounter:
+                case OpportunityTypes.ChargeCode:
+                    endDate = OrgDefinedEndDate;
+                    break;
+                default:
+                    throw new InvalidEnumArgumentException();
+            }
+
+            return endDate;
+        }
+
+        /// <summary>
+        /// This needs to be updated with the use of the Fiscal Year
+        /// </summary>
+        /// <param name="opportunityType"></param>
+        /// <returns></returns>
+        public DateTime GetTrackingStartDate(OpportunityTypes opportunityType)
+        {
+            var baselineEndDate = GetBaselineEndDate(opportunityType);
+
+            baselineEndDate = new DateTime(baselineEndDate.Year, baselineEndDate.Month, 1);
+
+            var fiscalYearStartDate = GetFiscalYearStartDate();
+
+            while (baselineEndDate >= fiscalYearStartDate)
+            {
+                fiscalYearStartDate = fiscalYearStartDate.AddMonths(1);
+            }
+
+            return fiscalYearStartDate;
+        }
+
+        public DateTime GetTrackingEndDate() => GetFiscalYearEndDate();
+
+        /// <summary>
+        /// This will need to updated when we have the FiscalMonthResolver
+        /// </summary>
+        /// <returns></returns>
+        public DateTime GetFiscalYearEndDate()
+        {
+            var lastFiscalMonth = FiscalMonthResolver.LastFiscalMonth().FiscalMonthId;
+            return new DateTime(FiscalYearID, lastFiscalMonth, DateTime.DaysInMonth(FiscalYearID, lastFiscalMonth));
+        }
+
+        public DateTime GetLastFiscalYearEndDate()
+        {
+            var lastFiscalMonth = FiscalMonthResolver.LastFiscalMonth().FiscalMonthId;
+            short lastFiscalYearID = (short)(FiscalYearID - 1);
+            return new DateTime(lastFiscalYearID, lastFiscalMonth, DateTime.DaysInMonth(lastFiscalYearID, lastFiscalMonth));
+        }
+
+        public DateTime GetLastFiscalYearStartDate()
+        {
+            return GetLastFiscalYearEndDate().GetStartOrEndDateOfYearPeriod(-1);
+        }
+
+        public DateTime GetFiscalYearStartDate()
+        {
+            return GetFiscalYearEndDate().GetStartOrEndDateOfYearPeriod(-1);
+        }
+
+        public DateTime GetTrackingCurrentMonthEndDate(OpportunityTypes opportunityType)
+        {
+            var startDate = GetTrackingCurrentMonthStartDate(opportunityType);
+            return startDate.AddMonths(1).AddDays(-1);
+        }
+
+		/// <summary>
+		/// Adjust Tracking Current Month End Date to the beginning of the next day 
+		/// </summary>
+		/// <param name="opportunityType" cref="OpportunityTypes"></param>
+		/// <returns>Tracking Current Month End Date at Midnight of the next day</returns>
+		public DateTime TrackingCurrentMonthEndDate(OpportunityTypes opportunityType)
+			=> GetTrackingCurrentMonthEndDate(opportunityType).AddDays(1).Date;
+
+
+		public DateTime GetTrackingCurrentMonthStartDate(OpportunityTypes opportunityType)
+        {
+            var currentMonth = GetTrackingCurrentMonth(opportunityType);
+            return new DateTime(currentMonth.Year, currentMonth.Month, 1);
+        }
+
+        private DateTime GetTrackingCurrentMonth(OpportunityTypes opportunityType)
+        {
+            DateTime date;
+
+            switch (opportunityType)
+            {
+                case OpportunityTypes.ChargeCode:
+                    date = OrgDefinedTrackingCurrentMonth;
+                    break;
+                case OpportunityTypes.QualityVariation:
+                    date = QualityVariationTrackingCurrentMonth;
+                    break;
+                default:
+                    date = VariationTrackingCurrentMonth;
+                    break;
+            }
+
+            return date;
+        }
+
+        public IList<TrackingMonth> GetTrackingFiscalMonths(OpportunityTypes opportunityType, DateTime effectiveDate)
+        {
+            var calendarStartDate = GetFiscalYearStartDate();
+            var calendarEndDate = GetFiscalYearEndDate();
+
+            var fiscalMonth = FiscalMonthResolver.FirstFiscalMonth();
+            var sortOrder = 1;
+
+            var currentTrackingDate = GetTrackingCurrentMonthStartDate(opportunityType);
+
+            var trackingMonths = new List<TrackingMonth>();
+
+            while (calendarStartDate <= calendarEndDate)
+            {
+                var isAfterEffectiveDate = calendarStartDate >= effectiveDate;
+                var isBeforeTrackingDate = calendarStartDate <= currentTrackingDate;
+
+                trackingMonths.Add(new TrackingMonth(fiscalMonth.Abbreviation, isAfterEffectiveDate,
+                    isBeforeTrackingDate, calendarStartDate.Month == currentTrackingDate.Month));
+
+                calendarStartDate = calendarStartDate.AddMonths(1);
+                sortOrder++;
+                if (sortOrder <= 12) fiscalMonth = FiscalMonthResolver.GetByFiscalMonthSortOrder(sortOrder);
+            }
+
+            return trackingMonths;
+        }
+
+        [NotMapped]
+        public ScoreDimension ServiceLineDimension { get; set; }
+
+        [NotMapped]
+        public ScoreAttribute ServiceLineAttribute { get; set; }
+
+
+        public async Task<ScoreDimension> GetServiceLineDimension(JazzDbContext jazzDbContext, CancellationToken cancellationToken)
+        {
+            if (ServiceLineDimension != null) { return ServiceLineDimension; }
+            ScoreDimension scoreDimension = default;
+            if (jazzDbContext != null)
+            {
+                scoreDimension = await jazzDbContext.ScoreDimensions
+                    .FirstOrDefaultAsync(x => x.DimensionGuid == ServiceLineDimensionGuid, cancellationToken);
+                if (scoreDimension == null)
+                {
+                    scoreDimension = await jazzDbContext.ScoreDimensions
+                        .FirstOrDefaultAsync(x => x.GlobalId == Dimension.ServiceLine, cancellationToken);
+                }
+                ServiceLineDimension = scoreDimension;
+            }
+            return scoreDimension;
+        }
+
+        public async Task<ScoreAttribute> GetServiceLineAttribute(JazzDbContext jazzDbContext, CancellationToken cancellationToken)
+        {
+            if (ServiceLineAttribute != null) { return ServiceLineAttribute; }
+            var scoreDimension = await GetServiceLineDimension(jazzDbContext, cancellationToken);
+            var attributeGuid = scoreDimension?.DefaultKeyGuid;
+            var scoreAttribute = await jazzDbContext?.ScoreAttributes.FirstOrDefaultAsync(x => x.AttributeGuid == attributeGuid, cancellationToken);
+            ServiceLineAttribute = scoreAttribute;
+            return scoreAttribute;
+        }
+
+        #endregion
+
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Configuration/ConfigurationService.cs b/src/Strata.ContinuousImprovement.Biz/Configuration/ConfigurationService.cs
new file mode 100644
index 0000000..1cb4b6b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Configuration/ConfigurationService.cs
@@ -0,0 +1,92 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Configuration
+{
+    public class ConfigurationService : Generics.JazzDbService<Configuration, Guid>, IConfigurationService
+    {
+
+        private readonly ILogger<ConfigurationService> _logger;
+        private readonly IFiscalMonthResolver _fiscalMonthResolver;
+
+        public ConfigurationService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext, IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            ILogger<ConfigurationService> logger,
+            IFiscalMonthResolver fiscalMonthResolver)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor)
+        {
+            _logger = logger;
+            _fiscalMonthResolver = fiscalMonthResolver;
+        }
+
+        public async Task<IEnumerable<Configuration>> GetConfigurationsAsync(CancellationToken cancellationToken)
+        {
+            try
+            {
+                await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+                if (dbContext is null) return default;
+                var configurations = await dbContext.Configurations.ToListAsync(cancellationToken);
+                configurations.ForEach(config => SetCalculatedConfigurationDates(config));
+                return configurations;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+                throw;
+            }
+        }
+
+        public async Task<Configuration> GetDefaultConfigurationAsync(CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext is null) return default;
+            var configuration = await dbContext.Set<Configuration>()
+                .OrderBy(config => config.DisplayOrder).FirstOrDefaultAsync(cancellationToken);
+            SetCalculatedConfigurationDates(configuration);
+            return configuration;
+        }
+
+        public async Task<Configuration> GetConfigurationAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext is null) return default;
+            var configuration = await dbContext.Configurations.FirstOrDefaultAsync(config => config.ConfigurationGuid == configurationGuid, cancellationToken);
+            if (configuration is null) return default;
+            SetCalculatedConfigurationDates(configuration);
+            return configuration;
+        }
+
+        public async Task<bool> GetQualityVariationAprdrgFlagAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            var config = await GetConfigurationAsync(configurationGuid, cancellationToken);
+            return config?.QualityVariationIsUsingAPRDRG ?? false;
+        }
+
+        private void SetCalculatedConfigurationDates(Configuration configuration)
+        {
+            configuration.FiscalMonthResolver = _fiscalMonthResolver;
+            configuration.OrgDefinedTrackingStartDate = configuration.GetTrackingStartDate(OpportunityTypes.OrgDefined);
+            configuration.OrgDefinedTrackingEndDate = configuration.GetTrackingEndDate();
+            configuration.LastFiscalYearStartDate = configuration.GetLastFiscalYearStartDate();
+            configuration.LastFiscalYearEndDate = configuration.GetLastFiscalYearEndDate();
+        }
+
+        public async Task<bool> IsConfigurationValid(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            var configuration = new Configuration { ConfigurationGuid = configurationGuid };
+            return await this.Contains(configuration, cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Configuration/IConfigurationService.cs b/src/Strata.ContinuousImprovement.Biz/Configuration/IConfigurationService.cs
new file mode 100644
index 0000000..283b5d5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Configuration/IConfigurationService.cs
@@ -0,0 +1,17 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Configuration
+{
+    public interface IConfigurationService : IJazzDbService<Configuration, Guid>
+    {
+        Task<IEnumerable<Configuration>> GetConfigurationsAsync(CancellationToken cancellationToken);
+        Task<Configuration> GetDefaultConfigurationAsync(CancellationToken cancellationToken);
+        Task<Configuration> GetConfigurationAsync(Guid configurationGuid, CancellationToken cancellationToken);
+        Task<bool> GetQualityVariationAprdrgFlagAsync(Guid configurationGuid, CancellationToken cancellationToken);
+        Task<bool> IsConfigurationValid(Guid configurationGuid, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Configuration/Member.cs b/src/Strata.ContinuousImprovement.Biz/Configuration/Member.cs
new file mode 100644
index 0000000..727dc43
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Configuration/Member.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.Configuration
+{ 
+    public class Member
+    {
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Configurations/Constants.cs b/src/Strata.ContinuousImprovement.Biz/Configurations/Constants.cs
new file mode 100644
index 0000000..8a64996
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Configurations/Constants.cs
@@ -0,0 +1,7 @@
+namespace Strata.ContinuousImprovement.Biz.Configurations
+{
+    internal static class Constants
+    {
+        internal static readonly string ApplicationName = "continuous-improvement";
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Configurations/ContinuousImprovementServiceExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Configurations/ContinuousImprovementServiceExtensions.cs
new file mode 100644
index 0000000..6325d97
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Configurations/ContinuousImprovementServiceExtensions.cs
@@ -0,0 +1,359 @@
+using Amazon.Extensions.NETCore.Setup;
+using Dapper;
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.BackgroundClientJob;
+using Strata.ContinuousImprovement.Biz.ChargeCode;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Jobs;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.ClientLicense;
+using Strata.ContinuousImprovement.Biz.ClientWarehouses;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.Cube;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Dapper;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Email;
+using Strata.ContinuousImprovement.Biz.Encounter.Initiatives;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.Opportunities;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.FreeForm.Initiatives;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Details;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Initiatives;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.GMDN;
+using Strata.ContinuousImprovement.Biz.GMDN.Jobs;
+using Strata.ContinuousImprovement.Biz.Hangfire;
+using Strata.ContinuousImprovement.Biz.InitiativeDetailColumns;
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.MappedColumns;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment;
+using Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Biz.OrgDefined;
+using Strata.ContinuousImprovement.Biz.Payroll.Initiatives;
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities;
+using Strata.ContinuousImprovement.Biz.PeerGroups;
+using Strata.ContinuousImprovement.Biz.PickerItems;
+using Strata.ContinuousImprovement.Biz.Population;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Events;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Jobs;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Metrics;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities;
+using Strata.ContinuousImprovement.Biz.QualityVariation.QVI;
+using Strata.ContinuousImprovement.Biz.Replication;
+using Strata.ContinuousImprovement.Biz.Reports;
+using Strata.ContinuousImprovement.Biz.Security;
+using Strata.ContinuousImprovement.Biz.Settings;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Email;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries;
+using Strata.ContinuousImprovement.Biz.UserService;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.Hangfire.Configuration;
+using Strata.Id.Client;
+using Strata.Replication.Client;
+using Strata.SnowflakeLib.Configuration;
+using Strata.SqlTools.Configuration.Postgres;
+using Strata.SqlTools.Configuration.SqlServer;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using ConnectionStringBuilder = Strata.SqlTools.Configuration.Postgres.ConnectionStringBuilder;
+
+// ReSharper disable once CheckNamespace
+
+namespace Strata.ContinuousImprovement.Biz.Configurations
+{
+    [ExcludeFromCodeCoverage]
+    public static class ContinuousImprovementServiceExtensions
+    {
+        private const string CacheProviderName = "continuousImprovement_cache";
+        const int commandTimeoutInSeconds = 300;
+
+        public static IServiceCollection AddContinuousImprovementServices(this IServiceCollection services, IConfiguration configuration,
+            string integrationTesting = null)
+        {
+            if (services == null)
+                throw new ArgumentNullException(nameof(services));
+            services.AddProblemDetails(options =>
+            {
+                options.CustomizeProblemDetails = context =>
+                {
+                    context.ProblemDetails.Title = context.ProblemDetails.Title ?? context.ProblemDetails.Status.ProblemDetailTitle();
+                    context.ProblemDetails.Type = context.ProblemDetails.Type ?? context.ProblemDetails.Status.ProblemDetailType();
+                    context.ProblemDetails.Instance = $"{context.HttpContext.Request.Method} {context.HttpContext.Request.Path}";
+                    context.ProblemDetails.Extensions.TryAdd("requestId", context.HttpContext.TraceIdentifier);
+                    var activity = context.HttpContext.Features.Get<IHttpActivityFeature>()?.Activity;
+                    activity?.Baggage?.ForEach(b => context.ProblemDetails.Extensions.TryAdd(b.Key, b.Value));
+                    var exceptionData = context.Exception?.Data;
+                    if (exceptionData != null)
+                    {
+                        foreach (DictionaryEntry entry in exceptionData)
+                        {
+                            context.ProblemDetails.Extensions.TryAdd(entry.Key.ToString(), entry.Value);
+                        }
+                    }
+                };
+            });
+
+            services.AddAuthorizationServiceClient();
+
+            services.AddOptions<AWSOptions>().BindConfiguration("aws").ValidateDataAnnotations(); //bind the options for aws and validates for missing values 
+
+            //Important step for In-Memory Caching 
+            services.AddEasyCaching(options =>
+            {
+                // use memory cache with your own configuration 
+                options.UseInMemory(config =>
+                {
+                    config.EnableLogging = true;
+                }, CacheProviderName);
+            });
+
+            //hangfire 
+            services.AddTransient<IBatchJobClient, BatchJobClient>();
+            services.AddTransient<IThrottlingManager, ThrottlingManager>();
+            services.ConfigureHangfireOptionsFromAws(options =>
+            {
+                options.Schema = Constants.ApplicationName;
+            });
+
+            services.AddSignalR();
+            services.AddScoped<IUserSettingService, UserSettingService>();
+            services.AddSchemaServiceClient();
+            services.AddDataSchemaService();
+            services.AddUsersServiceClient();
+            services.AddLicensesServiceClient();
+            services.AddJazzHangfireServiceClient();
+            services.AddFeatureFlagsServiceClient();
+            services.AddScoped<IFeatureFlagWrapper, FeatureFlagWrapper>();
+            services.AddIdServiceClient();
+            services.AddAnalyticsService();
+            services.AddReplicationServiceClient();
+            services.AddStrataSphereCompareServiceClient();
+
+            services.AddScoped<ICubeService, CubeService>();
+            services.AddScoped<IConfigurationService, ConfigurationService>();
+            services.AddScoped<IInitiativeSavingsService, InitiativeSavingsService>();
+            services.AddScoped<IAllOpportunityService, AllOpportunityService>();
+            services.AddScoped<IEXOpportunityService, EXOpportunityService>();
+            services.AddScoped<ICCOpportunityViewService, CCOpportunityViewService>();
+            services.AddScoped<ICCOpportunityService, CCOpportunityService>();
+            services.AddScoped<ICCInitiativeJob, CCInitiativeJob>();
+
+            services.AddScoped<IENOpportunityService, ENOpportunityService>();
+            services.AddScoped<IENInitiativeService, ENInitiativeService>();
+
+            services.AddScoped<IFFOpportunityService, FFOpportunityService>();
+            services.AddScoped<IFFInitiativeService, FFInitiativeService>();
+
+            services.AddScoped<IGLOpportunityService, GLOpportunityService>();
+            services.AddScoped<IGLInitiativeService, GLInitiativeService>();
+            services.AddScoped<IGLDetailService, GLDetailService>();
+
+            services.AddScoped<IPROpportunityService, PROpportunityService>();
+            services.AddScoped<IPRInitiativeService, PRInitiativeService>();
+
+            services.AddScoped<IUVOpportunityService, UVOpportunityService>();
+            services.AddScoped<IDatabaseFunctionService, DatabaseFunctionService>();
+            services.AddScoped<IUVCaseTypeService, UVCaseTypeService>();
+            services.AddScoped<IQVIOpportunityService, QVIOpportunityService>();
+            services.AddScoped<IQviMetricService, QviMetricService>();
+            services.AddScoped<INonQviSavingsService, NonQviSavingsService>();
+            services.AddScoped<IQviLineItemSavingsService, QviLineItemSavingsService>();
+            services.AddScoped<IQviEncounterService, QviEncounterService>();
+            services.AddScoped<IQVIBreakdownService, QVIBreakdownService>();
+            services.AddScoped<IQVIEventService, QVIEventService>();
+
+            services.AddScoped<INetworkOpportunityService, NetworkOpportunityService>();
+            services.AddScoped<IClientNetworkOpportunityService, ClientNetworkOpportunityService>();
+            services.AddScoped<IClientNetworkOpportunityLinkService, ClientNetworkOpportunityLinkService>();
+
+            services.AddScoped<IWorkbookService, WorkbookService>();
+            services.AddScoped<IStakeholderUser, StakeholderUser>();
+            services.AddScoped<IUserSettingService, UserSettingService>();
+            services.AddScoped<IUserService, UserService.UserService>();
+
+            services.AddScoped<IReportService, ReportService>();
+            services.AddScoped<ISimpleSecurityService, SimpleSecurityService>();
+
+            services.AddScoped<IInitiativeService, InitiativeService>();
+            services.AddScoped<ICCInitiativeService, CCInitiativeService>();
+
+            services.AddScoped<ICCOpportunityDetailService, CCOpportunityDetailService>();
+            services.AddScoped<ICCOpportunityLevelCaseService, CCOpportunityLevelCaseService>();
+
+            services.AddScoped<IGUDIDDeviceDailyUpdateJob, GUDIDDeviceDailyUpdateJob>();
+            services.AddScoped<QviOpportunityMetricsJob>();
+
+            services.AddScoped<IFiscalMonthResolver, FiscalMonthResolver>();
+
+            services.AddScoped<ICommentService, CommentService>();
+
+            services.AddScoped<IGMDNService, GMDNService>();
+            services.AddScoped<IGUDIDService, GUDIDService>();
+            services.AddScoped<IClientLicenseService, ClientLicenseService>();
+            services.AddScoped<IOpportunityWorkbookService, OpportunityWorkbookService>();
+            services.AddScoped<IOpportunityTypeWorkbookService, OpportunityTypeWorkbookService>();
+            services.AddScoped<IOpportunityRoleAssignmentService, OpportunityRoleAssignmentService>();
+
+            services.AddScoped<IInitiativeRollupColumnService, InitiativeRollupColumnService>();
+            services.AddScoped<IInitiativeDetailColumnService, InitiativeDetailColumnService>();
+            services.AddScoped<IInitiativeRollupColumnAliasService, InitiativeRollupColumnAliasService>();
+
+            services.AddScoped<IExplorationService, ExplorationService>();
+            services.AddScoped<IExplorationFilterService, ExplorationFilterService>();
+            services.AddScoped<IDatabaseService, DatabaseService>();
+            services.AddScoped<IUpdateFactOpportunitySavingsService, UpdateFactOpportunitySavingsService>();
+            services.AddScoped<IChargeCodeService, ChargeCodeService>();
+            services.AddScoped<IUpdateFactOpportunitySavingsService, UpdateFactOpportunitySavingsService>();
+            services.AddScoped<IExplorationPopulationService, ExplorationPopulationService>();
+            services.AddScoped<ISettingsService, SettingsService>();
+            services.AddScoped<IClientWarehouseService, ClientWarehouseService>();
+            services.AddScoped<IFilterService, FilterService>();
+            services.AddScoped<IDatabaseService, DatabaseService>();
+
+            services.AddScoped<IOpportunityMetricCohortService, OpportunityMetricCohortService>();
+
+            services.AddScoped<IStrategicItemDimensionSyncService, StrategicItemDimensionSyncService>();
+            services.AddScoped<IStrategicOpportunityService, StrategicOpportunityService>();
+            services.AddScoped<IStrategicChargeCodeOpportunityDetailService, StrategicChargeCodeOpportunityDetailService>();
+            services.AddScoped<IStrategicOpportunityDetailQueryBuilder, StrategicOpportunityDetailQueryBuilder>();
+            services.AddScoped<IStrategicGLOpportunityDetailService, StrategicGLOpportunityDetailService>();
+            services.AddScoped<IGLDataSourceStrategy, GLDataSourceStrategy>();
+            services.AddScoped<IPeerGroupService, PeerGroupService>();
+            services.AddScoped<IPickerItemService, PickerItemService>();
+            services.AddScoped<IDistributionProcessFactory, DistributionProcessFactory>();
+
+            services.AddScoped<IEmailNotificationService, EmailNotificationService>();
+            services.AddScoped<IPrimaryMeasureMonitoringEmail, PrimaryMeasureMonitoringEmail>();
+            services.AddTransient<IEmailBuilder, EmailBuilder>();
+
+            services.AddScoped<IPostgresReplicationService, PostgresReplicationService>();
+            services.AddScoped<ICCOpportunityClientJob, CCOpportunityClientJob>();
+
+            services.AddScoped<IMappedColumnService, MappedColumnService>();
+            services.AddScoped<IBackgroundClientJobService, BackgroundClientJobService>();
+
+            //bind the options for aws and validates for missing values
+            services.AddOptions<NetworkOpportunitySection>().BindConfiguration("NetworkOpportunity").ValidateDataAnnotations();
+
+            services.AddSchemaServiceClient();
+            services.AddUsersServiceClient();
+            services.AddJazzHangfireServiceClient();
+
+            //strata service clients 
+            services.AddIdServiceClient();
+            services.AddCachedSmcServiceClient();
+
+            services.AddHttpContextAccessor();
+            services.AddClaimsPrincipalAccessor();
+
+            services.AddOptions<HangfireSection>().BindConfiguration("Hangfire").ValidateDataAnnotations();
+            services.AddOptions<DatadogSection>().BindConfiguration("Datadog").ValidateDataAnnotations();
+            services.AddOptions<AccessGudidSection>().BindConfiguration("AccessGudid").ValidateDataAnnotations();
+            services.AddOptions<GMDNFTPSection>().BindConfiguration("GMDNFTP").ValidateDataAnnotations();
+            services.AddOptions<ChargeCodeOpportunityValidationSection>().BindConfiguration("ChargeCodeOpportunityValidation").ValidateDataAnnotations();
+            services.AddOptions<DatabaseRegexSection>().BindConfiguration("Databases").ValidateDataAnnotations();
+
+
+            services.AddTransient<IOptions<MailGunOption>>(provider =>
+            {
+                return new OptionsWrapper<MailGunOption>(new MailGunOption
+                {
+                    ApiKey = configuration.GetValue<string>("mailgun:ApiKey"),
+                    BaseUrl = configuration.GetValue<string>("mailgun:BaseUrl"),
+                    Domain = configuration.GetValue<string>("mailgun:Domain"),
+                    FromEmailAddress = configuration.GetValue<string>("mailgun:FromEmailAddress")
+                });
+            });
+
+            //Postgres
+            var connectionString = string.IsNullOrEmpty(integrationTesting)
+                ? ConnectionStringBuilder.Build(configuration, "continuousimprovement")
+                : ConnectionStringBuilder.Build(configuration, integrationTesting);
+
+            services.AddSnowflakeServices(configuration);
+            services.AddDapperServices(configuration);
+
+            services.AddPostgres<CentralDbContext>((options, provider) =>
+            {
+                options.ConnectionString = connectionString;
+            });
+
+            if (!string.IsNullOrEmpty(integrationTesting)) return services;
+
+            services.AddAsyncDbContextFactory<JazzDbContext>(options =>
+            {
+                options
+                    .WithConnectionString((provider, token) => provider.GetConnectionStringFromSmc(token))
+                    .WithDbContextOptions((connectionString, provider, builder) =>
+                        builder.UseSqlServer(connectionString,
+                            options => { options.CommandTimeout(commandTimeoutInSeconds); }));
+            });
+            return services;
+        }
+
+        private static void AddSnowflakeServices(this IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddSnowflake(configuration);
+            services.AddScoped<ISnowflakeDatabaseContextFactory, SnowflakeDatabaseContextFactory>();
+            services.AddScoped<ISnowflakeDatabaseContext, SnowflakeDatabaseContext>(provider =>
+            {
+                if (!IsDatabaseGuidKnown(provider))
+                {
+                    return null;
+                }
+
+                ISnowflakeDatabaseContextFactory snowflakeDatabaseContextFactory = provider.GetRequiredService<ISnowflakeDatabaseContextFactory>();
+                IClientWarehouseService clientWarehouseService = provider.GetRequiredService<IClientWarehouseService>();
+                return snowflakeDatabaseContextFactory.Create(provider.GetRequiredService<IClaimsPrincipalAccessor>().GetCurrentClaimsPrincipal()?.GetDatabaseGuid().ToString("N"));
+            });
+        }
+
+        private static void AddDapperServices(this IServiceCollection services, IConfiguration configuration)
+        {
+            SqlMapper.AddTypeHandler(new DateOnlyTypeHandler());
+        }
+
+        private static bool IsDatabaseGuidKnown(IServiceProvider provider)
+        {
+            try
+            {
+                return provider.GetRequiredService<IClaimsPrincipalAccessor>().GetCurrentClaimsPrincipal()?.GetDatabaseGuid() != null;
+            }
+            catch (ClaimNotFoundException)
+            {
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Configurations/Hangfire/CaptureJobParameterAttribute.cs b/src/Strata.ContinuousImprovement.Biz/Configurations/Hangfire/CaptureJobParameterAttribute.cs
new file mode 100644
index 0000000..66a5367
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Configurations/Hangfire/CaptureJobParameterAttribute.cs
@@ -0,0 +1,60 @@
+using Hangfire.Common;
+using Hangfire.Server;
+using Strata.CoreLib.Claims;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+
+namespace Strata.ContinuousImprovement.Biz.Configurations.Hangfire
+{
+    /// <summary>
+    /// Captures Job parameters as Claims on the ThreadPrincipal running the job
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Method)]
+    public class CaptureJobParameterAttribute : JobFilterAttribute, IServerFilter
+    {
+        public int DatabaseGuidArgumentPosition { get; set; } = -1;
+        public int StrataIdArgumentPosition { get; set; } = -1;
+
+        // server filters
+        public void OnPerforming(PerformingContext filterContext)
+        {
+            var claims = new List<Claim>();
+            var args = filterContext.BackgroundJob.Job.Args.ToArray();
+
+            if (StrataIdArgumentPosition >= 0)
+            {
+                var strataIdValue = string.Format(CultureInfo.CurrentCulture, $"{{{StrataIdArgumentPosition}}}", args);
+                if (int.TryParse(strataIdValue, out var strataId))
+                {
+                    claims.Add(new Claim(StrataClaims.StrataId, strataId.ToString()));
+                }
+            }
+
+            if (DatabaseGuidArgumentPosition >= 0)
+            {
+                var databaseGuidValue = string.Format(CultureInfo.CurrentCulture, $"{{{DatabaseGuidArgumentPosition}}}", args);
+                if (Guid.TryParse(databaseGuidValue, out var databaseGuid))
+                {
+                    claims.Add(new Claim(StrataClaims.DatabaseGuid, databaseGuid.ToString()));
+                }
+            }
+
+            if (claims.Count == 0)
+            {
+                return;
+            }
+
+            var principal = new ClaimsPrincipal(new ClaimsIdentity(claims, "hangfire_impersonation"));
+            Thread.CurrentPrincipal = principal;
+        }
+
+        public void OnPerformed(PerformedContext filterContext)
+        {
+            Thread.CurrentPrincipal = null;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Configurations/Hangfire/DeleteOnSuccessAttribute.cs b/src/Strata.ContinuousImprovement.Biz/Configurations/Hangfire/DeleteOnSuccessAttribute.cs
new file mode 100644
index 0000000..c121241
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Configurations/Hangfire/DeleteOnSuccessAttribute.cs
@@ -0,0 +1,16 @@
+using Hangfire.Common;
+using Hangfire.States;
+
+namespace Strata.ContinuousImprovement.Biz.Configurations.Hangfire
+{
+    public class DeleteOnSuccessAttribute : JobFilterAttribute, IElectStateFilter
+    {
+        public void OnStateElection(ElectStateContext context)
+        {
+            if (context.CandidateState.Name == SucceededState.StateName)
+            {
+                context.CandidateState = new DeletedState { Reason = "This job is deleted on success." };
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Configurations/Hangfire/HangfireEndpointRouteBuilderExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Configurations/Hangfire/HangfireEndpointRouteBuilderExtensions.cs
new file mode 100644
index 0000000..d993304
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Configurations/Hangfire/HangfireEndpointRouteBuilderExtensions.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Routing;
+using Strata.ContinuousImprovement.Biz.Hubs;
+
+namespace Strata.ContinuousImprovement.Biz.Configurations.Hangfire
+{
+    public static class HangfireEndpointRouteBuilderExtensions
+    {
+        public static HubEndpointConventionBuilder MapHangfireHub(this IEndpointRouteBuilder endpoints)
+        {
+            return endpoints.MapHub<HangfireHub>(HangfireHub.HubURL, configureOptions: null)
+                .RequireAuthorization();
+        }
+    }
+}
+
diff --git a/src/Strata.ContinuousImprovement.Biz/Configurations/HubEndpointRouteBuilderExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Configurations/HubEndpointRouteBuilderExtensions.cs
new file mode 100644
index 0000000..1ea86fe
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Configurations/HubEndpointRouteBuilderExtensions.cs
@@ -0,0 +1,15 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Routing;
+using Strata.ContinuousImprovement.Biz.Notification;
+
+namespace Strata.ContinuousImprovement.Biz.Configurations
+{
+    public static class HubEndpointRouteBuilderExtensions
+    {
+        public static HubEndpointConventionBuilder MapNotificationHub(this IEndpointRouteBuilder endpoints)
+        {
+            return endpoints.MapHub<NotificationHub>("/api/NotificationHub", configureOptions: null)
+                .RequireAuthorization();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Configurations/QueryRecursionSection.cs b/src/Strata.ContinuousImprovement.Biz/Configurations/QueryRecursionSection.cs
new file mode 100644
index 0000000..07ca815
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Configurations/QueryRecursionSection.cs
@@ -0,0 +1,14 @@
+namespace Strata.ContinuousImprovement.Biz.Configurations
+{
+    public class QueryRecursionSection
+    {
+        public RecursionInfo CCOpportunityDetailQuery { get; set; }
+    }
+
+    public class RecursionInfo
+    {
+        public int Start { get; set; }
+        public int End { get; set; }
+        public int Increment { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ContinuousImprovementBootstrapperService.cs b/src/Strata.ContinuousImprovement.Biz/ContinuousImprovementBootstrapperService.cs
new file mode 100644
index 0000000..3c32416
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ContinuousImprovementBootstrapperService.cs
@@ -0,0 +1,182 @@
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Jobs;
+using Strata.ContinuousImprovement.Biz.Encounter;
+using Strata.ContinuousImprovement.Biz.GMDN.Jobs;
+using Strata.ContinuousImprovement.Biz.Hangfire;
+using Strata.ContinuousImprovement.Biz.Population;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Jobs;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz
+{
+    public class ContinuousImprovementBootstrapperService : BackgroundService
+    {
+        private readonly ILogger<ContinuousImprovementBootstrapperService> _logger;
+        private readonly IHostEnvironment _environment;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+        private readonly IRecurringJobManager _recurringJobManager;
+        public IThrottlingManager _throttlingManager { get; }
+
+        public ContinuousImprovementBootstrapperService(ILogger<ContinuousImprovementBootstrapperService> logger,
+            IHostEnvironment environment,
+            IRecurringJobManager recurringJobManager,
+            IBackgroundJobClient backgroundJobClient,
+            IThrottlingManager throttlingManager)
+        {
+            _logger = logger;
+            _environment = environment;
+            _recurringJobManager = recurringJobManager;
+            _backgroundJobClient = backgroundJobClient;
+            _throttlingManager = throttlingManager;
+        }
+
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            var jobOptions = new RecurringJobOptions() { TimeZone = TimeZoneInfo.FindSystemTimeZoneById("Central Standard Time") };
+
+            var cronOnDemand = Cron.Never; // Never run job, 31st of Feb
+
+            // the schedule is set for every day at 9:05pm
+            var cronExpr = Cron.Daily(21, 5);
+
+            // the schedule is set for 1st of every Month at 12:00am
+            var cronMonthlyExpr = Cron.Monthly(1);
+
+            // the schedule is set for 3rd of every Month at 12:00am
+            var cronThirdDayOfMonthExpr = Cron.Monthly(3);
+
+            _throttlingManager.AddOrUpdateSemaphore(nameof(CCOpportunityDetailJob.PopulateOpportunityBaselineDetailsAsync), new SemaphoreOptions(maxCount: 10));
+            _throttlingManager.AddOrUpdateSemaphore(nameof(CCOpportunityDetailJob.PopulateOpportunityTrackingDetailsAsync), new SemaphoreOptions(maxCount: 10));
+            _throttlingManager.AddOrUpdateSemaphore(nameof(CCOpportunityDetailJob), new SemaphoreOptions(maxCount: 10));
+            _throttlingManager.AddOrUpdateSemaphore(nameof(QviOpportunityMetricsJob.PopulateQviMetricsAsync), new SemaphoreOptions(maxCount: 10));
+            _throttlingManager.AddOrUpdateSemaphore(nameof(ENOpportunityDetailJob.PopulateOpportunityDetailsAsync), new SemaphoreOptions(maxCount: 10));
+
+            _throttlingManager.AddOrUpdateSemaphore(nameof(SeedGUDIDIdentifierDataJob.MergeGUDIDIdentifierData), new SemaphoreOptions(maxCount: 1));
+
+            _throttlingManager.AddOrUpdateSemaphore(nameof(GUDIDDeviceDailyUpdateJob.GUDIDDeviceDailyUpdate), new SemaphoreOptions(maxCount: 1));
+            _throttlingManager.AddOrUpdateSemaphore(nameof(GUDIDDeviceDailyUpdateJob.GUDIDDeviceDailyPageUpdate), new SemaphoreOptions(maxCount: 10));
+            _throttlingManager.AddOrUpdateSemaphore(nameof(GMDNMonthlyUpdateJob.RefreshGMDNData), new SemaphoreOptions(maxCount: 1));
+            _throttlingManager.AddOrUpdateSemaphore(nameof(PrimaryMeasureMonitoringJob.RunNotifyPrimaryMeasureMonitoring), new SemaphoreOptions(maxCount: 10));
+            _throttlingManager.AddOrUpdateSemaphore(nameof(SeedDeviceIdentifierDimensionJob.SeedDeviceIdentifierDimension), new SemaphoreOptions(maxCount: 1));
+            _throttlingManager.AddOrUpdateSemaphore(nameof(SeedDeviceIdentifierDimensionJob.SeedDeviceIdentifierDimensionBatch), new SemaphoreOptions(maxCount: 3));
+            _throttlingManager.AddOrUpdateSemaphore(nameof(DeviceIdentifierClientMappingJob.MapClientDimDeviceIdentifier), new SemaphoreOptions(maxCount: 10));
+            _throttlingManager.AddOrUpdateSemaphore(nameof(DeviceIdentifierClientClearingJob.ClearClientDimDeviceIdentifier), new SemaphoreOptions(maxCount: 10));
+            _throttlingManager.AddOrUpdateSemaphore(nameof(ExplorationPopulationReplicationJob.ReplicateAllClientExplorationPopulations), new SemaphoreOptions(maxCount: 1));
+
+#if DEBUG
+            //disable our scheduled tasks if we're debugging
+            cronExpr = Cron.Never();
+            cronMonthlyExpr = Cron.Never();
+#endif
+
+            try
+            {
+                // Daily Jobs
+                _recurringJobManager.AddOrUpdate<GUDIDDeviceDailyUpdateJob>(nameof(GUDIDDeviceDailyUpdateJob),
+                    job => job.GUDIDDeviceDailyUpdate(CancellationToken.None), cronExpr, jobOptions);
+
+                _recurringJobManager.AddOrUpdate<DeviceIdentifierMappingJob>(nameof(DeviceIdentifierMappingJob),
+                    job => job.MapDimDeviceIdentifierToJazz(CancellationToken.None), cronExpr, jobOptions);
+
+                _recurringJobManager.AddOrUpdate<ExplorationPopulationReplicationJob>(nameof(ExplorationPopulationReplicationJob),
+                    job => job.ReplicateAllClientExplorationPopulations(CancellationToken.None), cronExpr, jobOptions);
+
+                // Monthly Jobs
+                _recurringJobManager.AddOrUpdate<GMDNMonthlyUpdateJob>(nameof(GMDNMonthlyUpdateJob),
+                    job => job.RefreshGMDNData(CancellationToken.None), cronMonthlyExpr, jobOptions);
+
+                _recurringJobManager.AddOrUpdate<PrimaryMeasureMonitoringJob>(nameof(PrimaryMeasureMonitoringJob),
+                    job => job.RunNotifyPrimaryMeasureMonitoring(CancellationToken.None), cronThirdDayOfMonthExpr, jobOptions);
+
+                // On Demand Jobs
+                _recurringJobManager.AddOrUpdate<SeedDeviceIdentifierDimensionJob>(nameof(SeedDeviceIdentifierDimensionJob),
+                    job => job.SeedDeviceIdentifierDimension(CancellationToken.None), cronOnDemand, jobOptions);
+
+                _recurringJobManager.AddOrUpdate<DeviceIdentifierClearingJob>(nameof(DeviceIdentifierClearingJob),
+                    job => job.ClearDimDeviceIdentifierFromJazz(CancellationToken.None), cronOnDemand, jobOptions);
+
+                // Removing outdated jobs explicitly -- this can be removed once code is deployed and job is removed from recurring job manager 
+                _recurringJobManager.RemoveIfExists("GMDNMappingJob");
+                _recurringJobManager.RemoveIfExists("PrimaryDIMappingJob");
+                _recurringJobManager.RemoveIfExists("SeedDimPrimaryDIJob");
+                _recurringJobManager.RemoveIfExists("SeedGMDNTermDataJob");
+                _recurringJobManager.RemoveIfExists("SeedDimDeviceIdentifierJob");
+                _recurringJobManager.RemoveIfExists("UpdateFactOpportunitySavingsJob");
+                _recurringJobManager.RemoveIfExists("CCOpportunityJob");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+            }
+
+            if (!_environment.IsDevelopment())
+            {
+                _recurringJobManager.RemoveIfExists(nameof(SprintRefresh.SprintRefreshJob));
+                _recurringJobManager.RemoveIfExists(nameof(SprintRefresh.CommentsRefreshJob));
+                _recurringJobManager.RemoveIfExists(nameof(SprintRefresh.OpportunityWorkbooksRefreshJob));
+                _recurringJobManager.RemoveIfExists(nameof(SprintRefresh.NetworkOpportunityRefreshJob));
+                _recurringJobManager.RemoveIfExists(nameof(SprintRefresh.RunUpdateFactOpportunitySavingsTaskJob) + "DevMaster");
+                _recurringJobManager.RemoveIfExists(nameof(SprintRefresh.RunUpdateFactOpportunitySavingsTaskJob) + "QAMaster");
+            }
+            else
+            {
+                try
+                {
+                    _recurringJobManager.RemoveIfExists(nameof(SprintRefresh.RunUpdateFactOpportunitySavingsTaskJob));
+
+                    _throttlingManager.AddOrUpdateSemaphore(nameof(SprintRefresh.SprintRefreshJob), new SemaphoreOptions(maxCount: 1));
+                    _throttlingManager.AddOrUpdateSemaphore(nameof(SprintRefresh.CommentsRefreshJob), new SemaphoreOptions(maxCount: 1));
+                    _throttlingManager.AddOrUpdateSemaphore(nameof(SprintRefresh.OpportunityWorkbooksRefreshJob), new SemaphoreOptions(maxCount: 1));
+                    _throttlingManager.AddOrUpdateSemaphore(nameof(SprintRefresh.NetworkOpportunityRefreshJob), new SemaphoreOptions(maxCount: 1));
+                    _throttlingManager.AddOrUpdateSemaphore(nameof(SprintRefresh.RunUpdateFactOpportunitySavingsTaskJob), new SemaphoreOptions(maxCount: 10));
+                    _throttlingManager.AddOrUpdateSemaphore(nameof(SprintRefresh.RunUpdateFactOpportunitySavingsTaskJob) + "DevMaster", new SemaphoreOptions(maxCount: 1));
+                    _throttlingManager.AddOrUpdateSemaphore(nameof(SprintRefresh.RunUpdateFactOpportunitySavingsTaskJob) + "QAMaster", new SemaphoreOptions(maxCount: 1));
+                    _throttlingManager.AddOrUpdateSemaphore(nameof(HangfireUtility.RunJazzHangfireTaskJob), new SemaphoreOptions(maxCount: 10));
+
+                    var sprintRefresh = nameof(SprintRefresh.SprintRefreshJob);
+                    _recurringJobManager.AddOrUpdate<SprintRefresh>(sprintRefresh,
+                        job => job.SprintRefreshJob(CancellationToken.None),
+                        cronOnDemand, new RecurringJobOptions { TimeZone = TimeZoneInfo.Local });
+
+                    var commentsRefresh = nameof(SprintRefresh.CommentsRefreshJob);
+                    _recurringJobManager.AddOrUpdate<SprintRefresh>(commentsRefresh,
+                        job => job.CommentsRefreshJob(CancellationToken.None),
+                        cronOnDemand, new RecurringJobOptions { TimeZone = TimeZoneInfo.Local });
+
+                    var opportunityWorkbookRefresh = nameof(SprintRefresh.OpportunityWorkbooksRefreshJob);
+                    _recurringJobManager.AddOrUpdate<SprintRefresh>(opportunityWorkbookRefresh,
+                        job => job.OpportunityWorkbooksRefreshJob(CancellationToken.None),
+                        cronOnDemand, new RecurringJobOptions { TimeZone = TimeZoneInfo.Local });
+
+                    var networkOpportunityRefresh = nameof(SprintRefresh.NetworkOpportunityRefreshJob);
+                    _recurringJobManager.AddOrUpdate<SprintRefresh>(networkOpportunityRefresh,
+                        job => job.NetworkOpportunityRefreshJob(CancellationToken.None),
+                        cronOnDemand, new RecurringJobOptions { TimeZone = TimeZoneInfo.Local });
+
+                    var runUpdateFactOpportunitySavingsRefreshDevMaster = nameof(SprintRefresh.RunUpdateFactOpportunitySavingsTaskJob) + "DevMaster";
+                    _recurringJobManager.AddOrUpdate<SprintRefresh>(runUpdateFactOpportunitySavingsRefreshDevMaster,
+                        job => job.RunUpdateFactOpportunitySavingsTaskJob("Dev Master", CancellationToken.None),
+                        cronOnDemand, new RecurringJobOptions { TimeZone = TimeZoneInfo.Local });
+
+                    var runUpdateFactOpportunitySavingsRefreshQaMaster = nameof(SprintRefresh.RunUpdateFactOpportunitySavingsTaskJob) + "QAMaster";
+                    _recurringJobManager.AddOrUpdate<SprintRefresh>(runUpdateFactOpportunitySavingsRefreshQaMaster,
+                        job => job.RunUpdateFactOpportunitySavingsTaskJob("QA Master", CancellationToken.None),
+                        cronOnDemand, new RecurringJobOptions { TimeZone = TimeZoneInfo.Local });
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogServiceError(ex);
+                }
+            }
+            await Task.CompletedTask;
+        }
+    }
+}
+
diff --git a/src/Strata.ContinuousImprovement.Biz/Cube/CubeService.cs b/src/Strata.ContinuousImprovement.Biz/Cube/CubeService.cs
new file mode 100644
index 0000000..7085163
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Cube/CubeService.cs
@@ -0,0 +1,43 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Cube
+{
+    public class CubeService : ICubeService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly ILogger<CubeService> _logger;
+        private const string CostingProcessCubeLockGroup = "CostingProcessCubeTask";
+
+        public CubeService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory, ILogger<CubeService> logger)
+        {
+            _dbContextFactory = dbContextFactory;
+            _logger = logger;
+        }
+
+        private async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<bool> IsCubeRunningAsync(CancellationToken cancellationToken)
+        {
+            try
+            {
+                await using var dbContext = GetDbContext(cancellationToken).Result;
+                if (dbContext == null) return false;
+                return await dbContext.Locks.AnyAsync(l => l.LockGroup == CostingProcessCubeLockGroup, cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error checking cube processing status");
+                throw;
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Cube/ICubeService.cs b/src/Strata.ContinuousImprovement.Biz/Cube/ICubeService.cs
new file mode 100644
index 0000000..6a29fb6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Cube/ICubeService.cs
@@ -0,0 +1,10 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Cube
+{
+    public interface ICubeService
+    {
+        Task<bool> IsCubeRunningAsync(CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Cube/Lock.cs b/src/Strata.ContinuousImprovement.Biz/Cube/Lock.cs
new file mode 100644
index 0000000..6e3c497
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Cube/Lock.cs
@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Cube
+{
+    [Table("Lock", Schema = "dbo")]
+    public class Lock
+    {
+        public Guid LockGUID { get; set; }
+        public Guid ItemGUID { get; set; }
+        public Guid UserGUID { get; set; }
+        public DateTime DateLocked { get; set; }
+        public string LockGroup { get; set; }
+        public DateTime DateLastActive { get; set; }
+        public string UserName { get; set; }
+        public DateTime DateLockedUtc { get; set; }
+        public DateTime DateLastActiveUtc { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Databases/Database.cs b/src/Strata.ContinuousImprovement.Biz/Databases/Database.cs
new file mode 100644
index 0000000..378e986
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Databases/Database.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Databases
+{
+    public class Database
+    {
+        public string DatabaseName { get; set; }
+        public Guid DatabaseGuid { get; set; }
+        public string OrgPin { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Databases/DatabaseService.cs b/src/Strata.ContinuousImprovement.Biz/Databases/DatabaseService.cs
new file mode 100644
index 0000000..a157a38
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Databases/DatabaseService.cs
@@ -0,0 +1,55 @@
+using Strata.ContinuousImprovement.Biz.Databases;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.Id.Client;
+using Strata.Replication.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Replication
+{
+    public class DatabaseService : IDatabaseService
+    {
+        private readonly IReplicationServiceClient _replicationService;
+        private readonly IClaimsPrincipalAccessor _claimsPrincipalAccessor;
+        private readonly IIdServiceClient _idServiceClient;
+
+        public DatabaseService(IReplicationServiceClient replicationServiceClient
+            , IClaimsPrincipalAccessor claimsPrincipalAccessor
+            , IIdServiceClient idServiceClient
+            )
+        {
+            _replicationService = replicationServiceClient;
+            _claimsPrincipalAccessor = claimsPrincipalAccessor;
+            _idServiceClient = idServiceClient;
+        }
+
+        public async Task<bool> IsClientOnboardedAsync(CancellationToken cancellationToken)
+        {
+            var user = _claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+            var dbGuid = user?.GetDatabaseGuid() ?? Guid.Empty;
+            if (dbGuid == Guid.Empty) { return false; }
+
+            var strataId = await _idServiceClient.GetStrataId(dbGuid);
+            return await _replicationService.IsOnboarded(strataId, cancellationToken);
+        }
+
+        public async Task<List<Database>> GetDatabasesAsync(CancellationToken cancellationToken)
+        {
+            var clients = await _idServiceClient.GetStrataIds(cancellationToken);
+            var databases = clients.Select(d => new Database
+            {
+                DatabaseGuid = d.DatabaseGUID,
+                DatabaseName = d.DatabaseName,
+                OrgPin = d.OrgPin
+            }).OrderBy(db => db.OrgPin);
+
+            return databases.ToList();
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Databases/IDatabaseService.cs b/src/Strata.ContinuousImprovement.Biz/Databases/IDatabaseService.cs
new file mode 100644
index 0000000..c4f1ade
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Databases/IDatabaseService.cs
@@ -0,0 +1,13 @@
+using Strata.ContinuousImprovement.Biz.Databases;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Replication
+{
+    public interface IDatabaseService
+    {
+        Task<List<Database>> GetDatabasesAsync(CancellationToken cancellationToken);
+        Task<bool> IsClientOnboardedAsync(CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/CentralDbContext.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/CentralDbContext.cs
new file mode 100644
index 0000000..532bca4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/CentralDbContext.cs
@@ -0,0 +1,189 @@
+using Dapper;
+using Microsoft.EntityFrameworkCore;
+using Npgsql;
+using Strata.Analytics.Models.Workbooks;
+using Strata.ContinuousImprovement.Biz.ClientWarehouses;
+using Strata.ContinuousImprovement.Biz.GMDN;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Biz.Population;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts;
+
+public class CentralDbContext : DbContext, ICentralDbContext
+{
+    public static string MigrationsAssembly = typeof(CentralDbContext).Assembly.GetName().Name;
+
+    // Application Entities
+    public virtual DbSet<NetworkOpportunity> NetworkOpportunities { get; set; }
+    public virtual DbSet<ClientNetworkOpportunity> ClientNetworkOpportunities { get; set; }
+    public virtual DbSet<ClientNetworkOpportunityLink> ClientNetworkOpportunityLinks { get; set; }
+    public virtual DbSet<Comment> Comments { get; set; }
+    public virtual DbSet<OpportunityWorkbook> OpportunityWorkbooks { get; set; }
+    public virtual DbSet<OpportunityTypeWorkbook> OpportunityTypeWorkbooks { get; set; }
+    public virtual DbSet<OpportunityRoleAssignment.OpportunityRoleAssignment> OpportunityRoleAssignments { get; set; }
+    public virtual DbSet<ClientWarehouse> ClientWarehouses { get; set; }
+    public virtual DbSet<ExplorationPopulation> ExplorationPopulations { get; set; }
+    public virtual DbSet<ExplorationInclusionExclusion> ExplorationInclusionExclusions { get; set; }
+    public virtual DbSet<ExplorationPopulationEncounter> ExplorationPopulationEncounters { get; set; }
+    public virtual DbSet<StrategicOpportunity> StrategicOpportunities { get; set; }
+    public virtual DbSet<StrategicOpportunityChargeCode> StrategicOpportunityChargeCodes { get; set; }
+    public virtual DbSet<StrategicOpportunityGL> StrategicOpportunityGLs { get; set; }
+    public virtual DbSet<StrategicOpportunityMeasure> StrategicOpportunityMeasures { get; set; }
+    public virtual DbSet<StrategicOpportunityRampUp> StrategicOpportunityRampUps { get; set; }
+    public virtual DbSet<StrategicOpportunityWorkbook> StrategicOpportunityWorkbooks { get; set; }
+    public virtual DbSet<StrategicStakeholdersLink> StakeholdersLinks { get; set; }
+
+    // GMDN
+    public virtual DbSet<GMDNTerm> GMDNTerms { get; set; }
+    public virtual DbSet<GMDNCategory> GMDNCategories { get; set; }
+    public virtual DbSet<GMDNTermCategory> GMDNTermCategories { get; set; }
+
+    // GUDID
+    public virtual DbSet<GUDIDTerm> GUDIDTerms { get; set; }
+    public virtual DbSet<GUDIDDevice> GUDIDDevices { get; set; }
+    public virtual DbSet<GUDIDIdentifier> GUDIDIdentifiers { get; set; }
+    public virtual DbSet<TmpGUDIDIdentifier> TmpGUDIDIdentifiers { get; set; }
+
+    // GMDN + GUDID Dimension
+    public virtual DbSet<DeviceIdentifierDimension> DeviceIdentifierDimension { get; set; }
+    public virtual DbSet<DeviceIdentifierTerm> DeviceIdentifierTerms { get; set; } // view that supports seeding dimension
+
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder.Entity<ClientNetworkOpportunity>().HasKey(o => new { o.StrataId, o.NetworkOpportunityId });
+        modelBuilder.Entity<GMDNTermCategory>().HasKey(x => new { x.TermCode, x.CategoryCode });
+        modelBuilder.Entity<DeviceIdentifierTerm>()
+           .ToView("device_identifier_terms")
+            .HasKey(di => new { di.DeviceId, di.PrimaryDI, di.DeviceIdType });
+        modelBuilder.Entity<DeviceIdentifierDimension>()
+            .HasKey(di => new { di.DeviceIdentifier });
+        modelBuilder.Entity<OpportunityWorkbook>().HasKey(ow => new { ow.StrataId, ow.OpportunityGuid, ow.WorkbookId });
+        modelBuilder.Entity<OpportunityRoleAssignment.OpportunityRoleAssignment>().HasKey(c => new { c.OpportunityId, c.IdentityGuid });
+        modelBuilder.Entity<OpportunityTypeWorkbook>().HasKey(ow => new { ow.StrataId, ow.OpportunityType, ow.WorkbookId });
+        modelBuilder.Entity<GUDIDDevice>()
+            .HasIndex(p => p.PublicVersionDate);
+        modelBuilder.Entity<ClientWarehouse>()
+            .HasIndex(e => e.DatabaseGuid)
+            .IsUnique();
+        modelBuilder.Entity<ExplorationPopulation>()
+            .HasKey(e => e.ExplorationPopulationId);
+        modelBuilder.Entity<ExplorationPopulationEncounter>()
+            .HasKey(e => new { e.ExplorationPopulationId, e.EncounterId });
+        modelBuilder.Entity<ExplorationInclusionExclusion>()
+            .HasKey(e => new { e.ExplorationPopulationId, e.EncounterId });
+        modelBuilder.Entity<ExplorationPopulation>()
+            .HasMany(g => g.ExplorationPopulationEncounters)
+            .WithOne(m => m.ExplorationPopulation)
+            .HasForeignKey(m => m.ExplorationPopulationId)
+            .HasPrincipalKey(g => g.ExplorationPopulationId);
+        modelBuilder.Entity<ExplorationPopulation>()
+            .HasMany(g => g.ExplorationInclusionExclusions)
+            .WithOne(m => m.ExplorationPopulation)
+            .HasForeignKey(m => m.ExplorationPopulationId)
+            .HasPrincipalKey(g => g.ExplorationPopulationId);
+        modelBuilder.Entity<StrategicOpportunity>().UseTptMappingStrategy();
+        modelBuilder.Entity<StrategicOpportunity>()
+            .HasMany(e => e.Measures)
+            .WithOne(e => e.Opportunity)
+            .HasForeignKey(e => e.OpportunityId)
+            .HasPrincipalKey(e => e.OpportunityId);
+        modelBuilder.Entity<StrategicOpportunity>()
+            .HasMany(e => e.Workbooks)
+            .WithOne(e => e.Opportunity)
+            .HasForeignKey(e => e.OpportunityId)
+            .HasPrincipalKey(e => e.OpportunityId);
+        modelBuilder.Entity<StrategicOpportunity>()
+            .HasMany(e => e.RampUps)
+            .WithOne(e => e.Opportunity)
+            .HasForeignKey(e => e.OpportunityId)
+            .HasPrincipalKey(e => e.OpportunityId);
+        modelBuilder.Entity<StrategicOpportunityWorkbook>()
+            .HasKey(e => new
+            {
+                e.OpportunityId,
+                e.WorkbookId
+            });
+        modelBuilder.Entity<StrategicOpportunityRampUp>()
+            .HasKey(e => new
+            {
+                e.OpportunityId,
+                e.MonthNumber
+            });
+        modelBuilder.Entity<StrategicStakeholdersLink>()
+            .HasKey(e => new
+            {
+                e.StrategicOpportunityId,
+                e.UserGuid
+            });
+        modelBuilder.Entity<StrategicOpportunity>()
+            .HasMany(e => e.Stakeholders)
+            .WithOne(e => e.Opportunity)
+            .HasForeignKey(e => e.StrategicOpportunityId)
+            .HasPrincipalKey(e => e.OpportunityId);
+    }
+
+    public CentralDbContext(DbContextOptions<CentralDbContext> options) : base(options)
+    {
+    }
+
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        // Intenionally left empty
+    }
+
+
+    /// <summary>
+    /// Uses postgresql COPY command to bulk insert data from STDIN. More efficient than EF Core SaveChanges.
+    /// https://www.postgresql.org/docs/current/sql-copy.html
+    /// https://www.npgsql.org/doc/copy.html#text-copy
+    /// </summary>
+    public async Task<TextWriter> BeginTextImportAsync<TEntity>(char delimiter = '|', CancellationToken cancellationToken = default)
+    {
+        var connection = Database.GetDbConnection();
+        if (connection is not NpgsqlConnection npgsqlConnection)
+        {
+            throw new NotSupportedException("BeginTextImportAsync is only supported for NpgsqlConnections");
+        }
+
+        if (npgsqlConnection.State != System.Data.ConnectionState.Open)
+        {
+            await npgsqlConnection.OpenAsync(cancellationToken);
+        }
+
+        // use the EF Core IModel to get the actual table name and schema in the database
+        var tableMapping = Model.FindEntityType(typeof(TEntity));
+        if (tableMapping is null)
+        {
+            throw new NotSupportedException($"Entity type {typeof(TEntity).Name} is not mapped to a table");
+        }
+
+        var tableName = tableMapping.GetTableName();
+        var schemaName = tableMapping.GetSchema() ?? Model.GetDefaultSchema() ?? "public";
+
+        // selects all the columns in the table that are not auto generated identity columns
+        const string sql = @"
+select c.column_name
+from information_schema.columns c
+where c.table_schema = @schema_name and c.table_name = @table_name and c.is_identity = 'NO'
+order by c.ordinal_position;";
+
+        var columns = await connection.QueryAsync<string>(sql, new { schema_name = schemaName, table_name = tableName });
+
+        var columnsList = string.Join(", ", columns.Select(c => $"\"{c}\""));
+
+        // build the COPY command from the columns and table name
+        var beginTextImportQuery = $"COPY \"{schemaName}\".\"{tableName}\" ({columnsList}) FROM STDIN WITH (DELIMITER '{delimiter}') ";
+
+        return await npgsqlConnection.BeginTextImportAsync(beginTextImportQuery, cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Dapper/TypeHandlers.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Dapper/TypeHandlers.cs
new file mode 100644
index 0000000..1576213
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Dapper/TypeHandlers.cs
@@ -0,0 +1,24 @@
+using Dapper;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Dapper
+{
+    public class DateOnlyTypeHandler : SqlMapper.TypeHandler<DateOnly>
+    {
+        public override void SetValue(IDbDataParameter parameter, DateOnly date)
+        {
+            parameter.Value = date.ToDateTime(new TimeOnly(0, 0));
+            parameter.DbType = DbType.Date;
+        }
+
+        public override DateOnly Parse(object value)
+        {
+            return DateOnly.FromDateTime((DateTime)value);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/DataTableMapper.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/DataTableMapper.cs
new file mode 100644
index 0000000..dc85f8b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/DataTableMapper.cs
@@ -0,0 +1,14 @@
+using Riok.Mapperly.Abstractions;
+using Strata.DataSchema.Models.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class DataTableMapper
+    {
+        [MapperIgnoreSource(nameof(DataTable.StrataId))]
+        [MapperIgnoreSource(nameof(DataColumn.StrataId))]
+        [MapperIgnoreTarget(nameof(DataTableSaveInfo.UpdateRolePlayingDimTableIds))]
+        public static partial DataTableSaveInfo MapToSaveInfo(this DataTable src);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Encounter/ENOpportunityDetailQuery.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Encounter/ENOpportunityDetailQuery.cs
new file mode 100644
index 0000000..df20207
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Encounter/ENOpportunityDetailQuery.cs
@@ -0,0 +1,359 @@
+using Microsoft.Data.SqlClient;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Strata.ContinuousImprovement.Biz.Encounter;
+using Strata.ContinuousImprovement.Biz.Encounter.Initiatives;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Schema.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts
+{
+    public partial class JazzDbContext
+    {
+        // this code was copied from Jazz
+        public async Task<List<OpportunityMetricCohortData>> GetENOpportunityDetailQuery(ENOpportunityDataModel opportunity,
+            Configuration.Configuration configuration, ISchemaServiceClient schemaServiceClient, ILogger<ENOpportunityDetailJob> _logger, Guid dbGuid)
+        {
+            var opportunityFilters = JsonConvert.DeserializeObject<ENOpportunityBaseFilters>(opportunity.EncounterOpportunityJSON,
+                new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace });
+            var exists = string.Empty;
+            var possibleCTCategories = new List<int>() { 0, 1, 3 };
+            if (opportunityFilters.EncounterGroup == 1 || opportunityFilters.PatientPopulations.Select(pp => Int32.Parse(pp.Id)).Where(pp => pp != 0).Any())
+            {
+                var dimension = await schemaServiceClient.GetDimensionByGlobalIdAsync("Clinical Indicator");
+                var hierarchyPaths = opportunityFilters.PatientPopulations.Select(ct => ct.Id);
+                var patientPopulations = (await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid, hierarchyPaths)).Select(mem => Int32.Parse(mem.Id)).ToList();
+                exists = $@"AND EXISTS(SELECT 1 FROM dss.FactPatientEncounterClinicalIndicator ci 
+WHERE ci.EncounterID = fpes.EncounterID AND ci.ClinicalIndicatorID in ({patientPopulations.ToCSVList()}) and ci.IsDeleted = 0)";
+            }
+            else
+            {
+                var nonPatientPopDimension = Guid.Parse("7799FFBA-B233-4E72-A629-D0BBA4082F34");
+                var hierarchyPaths = opportunityFilters.CaseTypes.Select(ct => ct.Id);
+                var caseTypeIds = (await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(nonPatientPopDimension, hierarchyPaths)).Select(mem => Int32.Parse(mem.Id)).ToList();
+                var cts = (await DimCaseTypes.Where(ct => caseTypeIds.Contains(ct.CaseTypeId) && possibleCTCategories.Contains(ct.CaseTypeCategory)).ToListAsync())
+                    .Select(ct => new { ct.CaseTypeCategory, ct.CaseTypeId }).ToList()
+                    .GroupBy(ct => ct.CaseTypeCategory,
+                        (g, d) => new
+                        {
+                            CaseTypeCategory = g,
+                            CaseTypeIds = d.Select(x => x.CaseTypeId).ToList()
+                        }).ToList()
+                    .ConvertAll(ct => string.Format(CaseTypeFamilyIdExists.Exists[ct.CaseTypeCategory], ct.CaseTypeIds.ToCSVList()))
+                    .Aggregate("", (x, y) => $"{x}\r\nOR\r\n{y}");
+                exists = string.IsNullOrEmpty(cts) || cts.Length <= 6
+                    ? cts
+                    : $"AND ({cts.Substring(6)}\r\n)";
+            }
+
+            var startDate = opportunityFilters.IsBaseline
+                ? configuration.GetBaselineStartDate(OpportunityTypes.Encounter)
+                : configuration.GetTrackingStartDate(OpportunityTypes.Encounter);
+            var endDate = opportunityFilters.IsBaseline
+                ? configuration.GetBaselineEndDate(OpportunityTypes.Encounter).AddDays(1).Date
+                : configuration.GetTrackingEndDate().AddDays(1).Date;
+            var sqlTemplate = await GetSqlTemplate(opportunityFilters, configuration, schemaServiceClient, dbGuid, startDate, endDate, exists);
+            return await OpportunityMetricCohortData.FromSqlRaw(sqlTemplate, new SqlParameter("@IsBaseline", System.Data.SqlDbType.Bit) { Value = true }).ToListAsync();
+        }
+
+        private async Task<string> GetSqlTemplate(ENOpportunityBaseFilters opportunityLevel, Configuration.Configuration configuration, ISchemaServiceClient schemaServiceClient, Guid dbGuid,
+            DateTime startDate, DateTime endDate, string exists)
+        {
+            var queryDetails = new OpportunityQueryDetails() { Exists = exists };
+            queryDetails.RevenueColumn = await RevenueColumn();
+            queryDetails.CostColumn = await CostColumn(configuration);
+            queryDetails.BillingJoin = await GetBillingJoin();
+            switch (opportunityLevel.EncounterOpportunityLevel)
+            {
+                case OpportunityLevel.Organization:
+                    return GetOrganizationSqlTemplate(queryDetails, startDate, endDate);
+                case OpportunityLevel.Entity:
+                    var entityDimension = await schemaServiceClient.GetDimensionByGlobalIdAsync(configuration.IsUsingCustomEntityDimension ? configuration.DepartmentRollupGlobalId : "Entity");
+                    var entities = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(entityDimension.DimensionGuid,
+                        opportunityLevel.Entities.Select(sl => sl.Id));
+                    return GetSystemSqlTemplate(queryDetails, entities.Select(el => Int32.Parse(el.Id)), configuration, startDate, endDate);
+                case OpportunityLevel.Specialty:
+                    var specialtyDimension = await schemaServiceClient.GetDimensionByGlobalIdAsync("DSS Physician Specialty");
+                    var specialties = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(specialtyDimension.DimensionGuid,
+                        opportunityLevel.Specialties.Select(sl => sl.Id));
+                    return GetSpecialtySqlTemplate(queryDetails, specialties.Select(el => Int32.Parse(el.Id)), startDate, endDate);
+                case OpportunityLevel.ServiceLine:
+                    var serviceLineDimension = await schemaServiceClient.GetClientDimensionAsync(dbGuid, configuration.ServiceLineDimensionGuid);
+                    var serviceLine = serviceLineDimension.Attributes.Find(attr => attr.AttributeGuid == serviceLineDimension.DefaultKeyGuid)?.SqlColumnName;
+                    serviceLine = string.IsNullOrEmpty(serviceLine) ? "ServiceLineID" : serviceLine;
+
+                    if (configuration.ServiceLineDimensionGuid != Guid.Empty &&
+                        serviceLineDimension.FriendlyName == "Sg2 Service Line Crosswalk")
+                    {
+                        var hierarchyElements = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(configuration.ServiceLineDimensionGuid,
+                            opportunityLevel.ServiceLines.Select(sl => sl.Id));
+                        return GetSg2ServiceLineSqlTemplate(queryDetails, hierarchyElements.Select(el => Int32.Parse(el.Id)), serviceLine, startDate, endDate);
+                    }
+                    else
+                    {
+                        if (configuration.ServiceLineDimensionGuid != Guid.Empty)
+                        {
+                            var hierarchyElements = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(configuration.ServiceLineDimensionGuid,
+                                opportunityLevel.ServiceLines.Select(sl => sl.Id));
+                            return GetServiceLineSqlTemplate(queryDetails, hierarchyElements.Select(el => Int32.Parse(el.Id)), serviceLine, startDate, endDate);
+                        }
+                        else
+                        {
+                            var dimension = await schemaServiceClient.GetDimensionByGlobalIdAsync("Service Line");
+                            var hierarchyElements = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid,
+                                opportunityLevel.ServiceLines.Select(sl => sl.Id));
+                            return GetServiceLineSqlTemplate(queryDetails, hierarchyElements.Select(el => Int32.Parse(el.Id)), serviceLine, startDate, endDate);
+                        }
+                    }
+                case OpportunityLevel.Provider:
+                    var providerDimension = await schemaServiceClient.GetDimensionByGlobalIdAsync("Physician Primary");
+                    var providers = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(providerDimension.DimensionGuid,
+                        opportunityLevel.Providers.Select(sl => sl.Id));
+                    return GetProviderSqlTemplate(queryDetails, providers.Select(el => Int32.Parse(el.Id)), startDate, endDate);
+                default:
+                    return default;
+            }
+        }
+
+        private static string GetOrganizationSqlTemplate(OpportunityQueryDetails queryDetails, DateTime startDate, DateTime endDate)
+        {
+            return $@"
+;WITH RevenueTotals AS (
+SELECT  0 LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], CAST(SUM({queryDetails.RevenueColumn}) AS DECIMAL) Revenue
+FROM clientdss.FactPatientEncounterSummary fpes 
+WHERE fpes.DischargeDateTime >= '{startDate:d}' AND fpes.DischargeDateTime < '{endDate:d}'
+{queryDetails.Exists}
+GROUP BY DATEPART(MONTH, fpes.DischargeDateTime) 
+)
+
+SELECT rt.Revenue, q.* FROM (
+SELECT 0 LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], COUNT(DISTINCT(fpes.EncounterID)) Volume, 
+CAST(SUM({queryDetails.CostColumn}) AS DECIMAL) Cost, @IsBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+{queryDetails.BillingJoin}
+WHERE fpes.DischargeDateTime >= '{startDate:d}' AND fpes.DischargeDateTime < '{endDate:d}'
+{queryDetails.Exists}
+GROUP BY DATEPART(MONTH, fpes.DischargeDateTime)) q
+INNER JOIN RevenueTotals rt ON rt.LevelID = q.LevelID AND rt.Month = q.Month";
+        }
+
+        private static string GetSystemSqlTemplate(OpportunityQueryDetails queryDetails, IEnumerable<int> levelIds, Configuration.Configuration configuration
+            , DateTime startDate, DateTime endDate)
+        {
+            string rollupJoin, rollupColumn;
+            if (configuration.IsUsingCustomEntityDimension)
+            {
+                rollupJoin = configuration.DepartmentRollupGlobalId == "Location"
+                    ? string.Empty
+                    : "INNER JOIN [fw].[DimDepartment] de ON de.DepartmentID = fpes.HighestVariableCostDepartmentID";
+                rollupColumn = configuration.DepartmentRollupGlobalId == "Location"
+                    ? "fpes.LocationID"
+                    : $"de.{configuration.DepartmentRollupGlobalId.Replace(" ", string.Empty)}ID";
+            }
+            else
+            {
+                rollupJoin = "INNER JOIN clientdss.DimEntity de ON de.EntityID = fpes.EntityID";
+                rollupColumn = "de.FwEntityID";
+            }
+            return $@"
+;WITH RevenueTotals AS (
+SELECT  CAST({rollupColumn} AS INT) LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], CAST(SUM({queryDetails.RevenueColumn}) AS DECIMAL) Revenue
+FROM clientdss.FactPatientEncounterSummary fpes 
+{rollupJoin}
+WHERE fpes.DischargeDateTime >= '{startDate:d}' AND fpes.DischargeDateTime < '{endDate:d}'
+{queryDetails.Exists}
+AND {rollupColumn} IN ({levelIds.ToCSVList()})
+GROUP BY {rollupColumn}, DATEPART(MONTH, fpes.DischargeDateTime) 
+)
+
+SELECT rt.Revenue, q.* FROM (
+SELECT CAST({rollupColumn} AS INT) LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], COUNT(DISTINCT(fpes.EncounterID)) Volume, 
+CAST(SUM({queryDetails.CostColumn}) AS DECIMAL) Cost, @IsBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+{queryDetails.BillingJoin}
+{rollupJoin}
+WHERE fpes.DischargeDateTime >= '{startDate:d}' AND fpes.DischargeDateTime < '{endDate:d}'
+{queryDetails.Exists}
+  AND {rollupColumn} IN ({levelIds.ToCSVList()})
+GROUP BY {rollupColumn}, DATEPART(MONTH, fpes.DischargeDateTime)) q
+INNER JOIN RevenueTotals rt ON rt.LevelID = q.LevelID AND rt.Month = q.Month";
+        }
+
+        private static string GetSpecialtySqlTemplate(OpportunityQueryDetails queryDetails, IEnumerable<int> levelIds, DateTime startDate, DateTime endDate)
+        {
+            return $@"
+;WITH RevenueTotals AS (
+SELECT  ps.PhysicianSpecialtyID LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], CAST(SUM({queryDetails.RevenueColumn}) AS DECIMAL) Revenue
+FROM clientdss.FactPatientEncounterSummary fpes
+INNER JOIN dss.viewDimPrimaryPhysician pp ON pp.PrimaryPhysicianID = fpes.PrimaryPhysicianID
+INNER JOIN dss.DimPhysicianSpecialty ps ON ps.PhysicianSpecialtyID = pp.PhysicianSpecialtyID
+WHERE fpes.DischargeDateTime >= '{startDate:d}' AND fpes.DischargeDateTime < '{endDate:d}'
+{queryDetails.Exists}
+AND ps.PhysicianSpecialtyID IN ({levelIds.ToCSVList()})
+GROUP BY ps.PhysicianSpecialtyID, DATEPART(MONTH, fpes.DischargeDateTime) 
+)
+
+SELECT rt.Revenue,  q.* FROM (
+SELECT ps.PhysicianSpecialtyID LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], COUNT(DISTINCT(fpes.EncounterID)) Volume, 
+CAST(SUM({queryDetails.CostColumn}) AS DECIMAL) Cost, @IsBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+{queryDetails.BillingJoin}
+INNER JOIN dss.viewDimPrimaryPhysician pp ON pp.PrimaryPhysicianID = fpes.PrimaryPhysicianID
+INNER JOIN dss.DimPhysicianSpecialty ps ON ps.PhysicianSpecialtyID = pp.PhysicianSpecialtyID
+WHERE fpes.DischargeDateTime >= '{startDate:d}' AND fpes.DischargeDateTime < '{endDate:d}'
+{queryDetails.Exists}
+  AND ps.PhysicianSpecialtyID IN ({levelIds.ToCSVList()})
+GROUP BY ps.PhysicianSpecialtyID, DATEPART(MONTH, fpes.DischargeDateTime)) q
+INNER JOIN RevenueTotals rt ON rt.LevelID = q.LevelID AND rt.Month = q.Month";
+        }
+
+        private static string GetSg2ServiceLineSqlTemplate(OpportunityQueryDetails queryDetails, IEnumerable<int> levelIds, string serviceLine, DateTime startDate, DateTime endDate)
+        {
+            return $@"
+;WITH RevenueTotals AS (
+SELECT  sl.{serviceLine} LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], CAST(SUM({queryDetails.RevenueColumn}) AS DECIMAL) Revenue
+FROM clientdss.FactPatientEncounterSummary fpes 
+INNER JOIN dss.DimSg2CareFamily cf ON cf.Sg2CAREFamilyID = fpes.Sg2CAREFamilyID
+INNER JOIN dss.DimSg2ServiceLineCrosswalk sl ON sl.Sg2ServiceLine = cf.ServiceLine
+WHERE fpes.DischargeDateTime >= '{startDate:d}' AND fpes.DischargeDateTime < '{endDate:d}'
+{queryDetails.Exists}
+AND sl.{serviceLine} IN ({levelIds.ToCSVList()})
+GROUP BY sl.{serviceLine}, DATEPART(MONTH, fpes.DischargeDateTime) 
+)
+
+SELECT rt.Revenue, q.* FROM (
+SELECT sl.{serviceLine} LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], COUNT(DISTINCT(fpes.EncounterID)) Volume, 
+CAST(SUM({queryDetails.CostColumn}) AS DECIMAL) Cost, @IsBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+{queryDetails.BillingJoin}
+INNER JOIN dss.DimSg2CareFamily cf ON cf.Sg2CAREFamilyID = fpes.Sg2CAREFamilyID
+INNER JOIN dss.DimSg2ServiceLineCrosswalk sl ON sl.Sg2ServiceLine = cf.ServiceLine
+WHERE fpes.DischargeDateTime >= '{startDate:d}' AND fpes.DischargeDateTime < '{endDate:d}'
+{queryDetails.Exists}
+  AND sl.{serviceLine} IN ({levelIds.ToCSVList()})
+GROUP BY sl.{serviceLine}, DATEPART(MONTH, fpes.DischargeDateTime)) q
+INNER JOIN RevenueTotals rt ON rt.LevelID = q.LevelID AND rt.Month = q.Month";
+        }
+
+        private static string GetServiceLineSqlTemplate(OpportunityQueryDetails queryDetails, IEnumerable<int> levelIds, string serviceLine, DateTime startDate, DateTime endDate)
+        {
+            return $@"
+;WITH RevenueTotals AS (
+SELECT  fpes.{serviceLine} LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], CAST(SUM({queryDetails.RevenueColumn}) AS DECIMAL) Revenue
+FROM clientdss.FactPatientEncounterSummary fpes 
+WHERE fpes.DischargeDateTime >= '{startDate:d}' AND fpes.DischargeDateTime < '{endDate:d}'
+{queryDetails.Exists}
+AND fpes.{serviceLine} IN ({levelIds.ToCSVList()})
+GROUP BY fpes.{serviceLine}, DATEPART(MONTH, fpes.DischargeDateTime) 
+)
+
+SELECT rt.Revenue, q.* FROM (
+SELECT fpes.{serviceLine} LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], 
+COUNT(DISTINCT(fpes.EncounterID)) Volume, 
+CAST(SUM({queryDetails.CostColumn}) AS DECIMAL) Cost, 
+@IsBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+{queryDetails.BillingJoin}
+WHERE fpes.DischargeDateTime >= '{startDate:d}' AND fpes.DischargeDateTime < '{endDate:d}'
+{queryDetails.Exists}
+  AND fpes.{serviceLine} IN ({levelIds.ToCSVList()})
+GROUP BY fpes.{serviceLine}, DATEPART(MONTH, fpes.DischargeDateTime)) q
+INNER JOIN RevenueTotals rt ON rt.LevelID = q.LevelID AND rt.Month = q.Month";
+        }
+
+        private static string GetProviderSqlTemplate(OpportunityQueryDetails queryDetails, IEnumerable<int> levelIds, DateTime startDate, DateTime endDate)
+        {
+            return $@"
+;WITH RevenueTotals AS (
+SELECT  dp.PhysicianID LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], CAST(SUM({queryDetails.RevenueColumn}) AS DECIMAL) Revenue
+FROM clientdss.FactPatientEncounterSummary fpes 
+INNER JOIN dss.DimPhysician dp on dp.PhysicianID = fpes.PrimaryPhysicianID
+WHERE fpes.DischargeDateTime >= '{startDate:d}' AND fpes.DischargeDateTime < '{endDate:d}'
+{queryDetails.Exists}
+AND dp.PhysicianID IN ({levelIds.ToCSVList()})
+GROUP BY dp.PhysicianID, DATEPART(MONTH, fpes.DischargeDateTime) 
+)
+
+SELECT rt.Revenue, q.* FROM (
+SELECT dp.PhysicianID LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], COUNT(DISTINCT(fpes.EncounterID)) Volume, 
+CAST(SUM({queryDetails.CostColumn}) AS DECIMAL) Cost, @IsBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+{queryDetails.BillingJoin}
+INNER JOIN dss.DimPhysician dp on dp.PhysicianID = fpes.PrimaryPhysicianID
+WHERE fpes.DischargeDateTime >= '{startDate:d}' AND fpes.DischargeDateTime < '{endDate:d}'
+{queryDetails.Exists}
+  AND dp.PhysicianID IN ({levelIds.ToCSVList()})
+GROUP BY dp.PhysicianID, DATEPART(MONTH, fpes.DischargeDateTime)) q
+INNER JOIN RevenueTotals rt ON rt.LevelID = q.LevelID AND rt.Month = q.Month";
+        }
+
+        private async Task<string> RevenueColumn()
+        {
+            var settingValue = Convert.ToBoolean(Convert.ToInt32((await SystemSettings.SingleOrDefaultAsync(ss => ss.Name == "Encounter Initiatives Revenue CSF")).Value));
+            return settingValue ? "fpes.CustomEncounterInitiativesRevenue" : "fpes.NetRevenue";
+        }
+
+        private async Task<string> CostColumn(Configuration.Configuration config)
+        {
+            var settingValue = Convert.ToInt32((await SystemSettings.SingleOrDefaultAsync(ss => ss.Name == "Encounter Initiatives Cost Type")).Value);
+            switch ((EncounterInitiativeCostType)settingValue)
+            {
+                case EncounterInitiativeCostType.EncounterSummary:
+                    return config.IsUsingIndirectCost ? "fpes.VariableIndirectCost + fpes.VariableDirectCost" : "fpes.VariableDirectCost";
+                case EncounterInitiativeCostType.CSF:
+                    return "fpes.CustomEncounterInitiativesCost";
+                case EncounterInitiativeCostType.DetailBilling:
+                    return config.IsUsingIndirectCost ? "billing.VariableIndirectCost + billing.VariableDirectCost" : "billing.VariableDirectCost";
+            }
+
+            return "";
+        }
+
+        private async Task<string> GetBillingJoin()
+        {
+            var settingValue = Convert.ToInt32((await SystemSettings.SingleOrDefaultAsync(ss => ss.Name == "Encounter Initiatives Cost Type")).Value);
+            if ((EncounterInitiativeCostType)settingValue is EncounterInitiativeCostType.DetailBilling)
+            {
+                return "INNER JOIN dss.viewFactPatientBillingLineItemDetailWithCosts billing ON billing.EncounterId = fpes.EncounterId ";
+            }
+            return "";
+        }
+    }
+
+    internal class OpportunityQueryDetails
+    {
+        public string Exists { get; set; }
+        public string RevenueColumn { get; set; }
+        public string CostColumn { get; set; }
+        public string BillingJoin { get; set; }
+    }
+
+    internal static class CaseTypeFamilyIdExists
+    {
+        public static string[] Exists => new[]
+        {
+            @"    EXISTS(SELECT 1 FROM dss.CaseTypeFamilyMappingICD10 msdrg
+    INNER JOIN dss.DimCaseType dct ON dct.CaseTypeFamilyID = msdrg.CaseTypeFamilyID AND dct.CaseTypeId in ({0}) AND dct.CaseTypeCategory = 0
+    WHERE msdrg.CaseTypeFamilyID = fpes.MSDRGCaseTypeFamilyID)",
+            @"    EXISTS(SELECT 1 FROM dss.CaseTypeFamilyMappingAPRDRG aprdrg
+    INNER JOIN dss.DimCaseType dct ON dct.CaseTypeFamilyID = aprdrg.CaseTypeFamilyID AND dct.CaseTypeId in ({0}) AND dct.CaseTypeCategory = 1
+    WHERE aprdrg.CaseTypeFamilyID = fpes.APRDRGCaseTypeFamilyID)",
+            @"AND EXISTS(SELECT 1 FROM dss.FactPatientEncounterClinicalIndicator ci 
+WHERE ci.EncounterID = fpes.EncounterID AND ci.ClinicalIndicatorID in ({0}) and ci.IsDeleted = 0)",
+            @"    EXISTS(SELECT 1 FROM dss.CaseTypeFamilyMappingCPT cpt
+    INNER JOIN dss.DimCaseType dct ON dct.CaseTypeFamilyID = cpt.CaseTypeFamilyID AND dct.CaseTypeId in ({0}) AND dct.CaseTypeCategory = 3
+    WHERE cpt.CaseTypeFamilyID = fpes.CPTCodeCaseTypeFamilyID)"
+        };
+
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/ICentralDbContext.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/ICentralDbContext.cs
new file mode 100644
index 0000000..a116c5d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/ICentralDbContext.cs
@@ -0,0 +1,33 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.GMDN;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts
+{
+    public interface ICentralDbContext
+    {
+        DbSet<ClientNetworkOpportunity> ClientNetworkOpportunities { get; set; }
+        DbSet<ClientNetworkOpportunityLink> ClientNetworkOpportunityLinks { get; set; }
+        DbSet<Comment> Comments { get; set; }
+        DbSet<DeviceIdentifierDimension> DeviceIdentifierDimension { get; set; }
+        DbSet<DeviceIdentifierTerm> DeviceIdentifierTerms { get; set; }
+        DbSet<GMDNCategory> GMDNCategories { get; set; }
+        DbSet<GMDNTermCategory> GMDNTermCategories { get; set; }
+        DbSet<GMDNTerm> GMDNTerms { get; set; }
+        DbSet<GUDIDDevice> GUDIDDevices { get; set; }
+        DbSet<GUDIDIdentifier> GUDIDIdentifiers { get; set; }
+        DbSet<GUDIDTerm> GUDIDTerms { get; set; }
+        DbSet<NetworkOpportunity> NetworkOpportunities { get; set; }
+        DbSet<OpportunityTypeWorkbook> OpportunityTypeWorkbooks { get; set; }
+        DbSet<OpportunityRoleAssignment.OpportunityRoleAssignment> OpportunityRoleAssignments { get; set; }
+        DbSet<OpportunityWorkbook> OpportunityWorkbooks { get; set; }
+        DbSet<TmpGUDIDIdentifier> TmpGUDIDIdentifiers { get; set; }
+        DbSet<StrategicOpportunity> StrategicOpportunities { get; set; }
+        DbSet<StrategicOpportunityChargeCode> StrategicOpportunityChargeCodes { get; set; }
+        DbSet<StrategicOpportunityGL> StrategicOpportunityGLs { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/IJazzDbContext.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/IJazzDbContext.cs
new file mode 100644
index 0000000..c0df46e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/IJazzDbContext.cs
@@ -0,0 +1,53 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Encounter;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using Strata.ContinuousImprovement.Biz.Security;
+using Strata.ContinuousImprovement.Biz.UserProfiles;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation;
+using Strata.Schema.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts
+{
+    public interface IJazzDbContext
+    {
+        DbSet<Configuration.Configuration> Configurations { get; set; }
+        DbSet<All.Opportunities.AllOpportunity> AllOpportunities { get; set; }
+        DbSet<CCOpportunityDataModel> ChargeCodeOpportunities { get; set; }
+        DbSet<Encounter.Opportunities.ENOpportunity> EncounterOpportunities { get; set; }
+        DbSet<FreeForm.Opportunities.FFOpportunity> FFOpportunities { get; set; }
+        DbSet<GeneralLedger.Opportunities.GLOpportunity> GeneralLedgerOpportunities { get; set; }
+        DbSet<Payroll.Opportunities.PROpportunity> PayrollOpportunities { get; set; }
+        DbSet<UtilizationVariation.Opportunities.UVOpportunity> VariationOpportunities { get; set; }
+        DbSet<UtilizationVariation.VariationCaseTypes.UVCaseType> VariationCaseTypes { get; set; }
+        DbSet<DimCaseType> DimCaseTypes { get; set; }
+        DbSet<DimEntity> DimEntities { get; set; }
+        DbSet<QualityVariation.Opportunities.QVIOpportunity> QualityVariationItemOpportunities { get; set; }
+        DbSet<QualityVariation.Events.QVIEvent> QualityVariationItemEvents { get; set; }
+        DbSet<QualityVariation.Metrics.QviMetrics> QviMetrics { get; set; }
+        DbSet<QualityVariation.Breakdowns.QVIBreakdown> QualityVariationItemBreakdowns { get; set; }
+        DbSet<CciUserSetting> UserSettings { get; set; }
+        DbSet<GeneralLedger.Details.FactGLSampled> FactGLSampledData { get; set; }
+        DbSet<GeneralLedger.Details.FactGL> FactGLData { get; set; }
+        DbSet<GeneralLedger.Details.FactStatisticSampledMonthly> FactStatisticSampledMonthlyData { get; set; }
+        DbSet<GeneralLedger.Details.FactStatistic> FactStatisticData { get; set; }
+        DbSet<UserProfile> UserProfiles { get; set; }
+        DbSet<DboUserSetting> DboUserSettings { get; set; }
+        public DbSet<SimplePermission> SimplePermissions { get; set; }
+        public DbSet<S3SimplePermission> S3SimplePermissions { get; set; }
+        DbSet<InitiativeRollupColumn> InitiativeRollupColumns { get; set; }
+        DbSet<InitiativeRollupValue> InitiativeRollupValues { get; set; }
+
+        IQueryable<T> AddUserFilter<T>(IQueryable<T> query, ClaimsPrincipal user);
+        Task<List<OpportunityMetricCohortData>> GetENOpportunityDetailQuery(ENOpportunityDataModel opportunity,
+            Configuration.Configuration configuration, ISchemaServiceClient schemaServiceClient, ILogger<ENOpportunityDetailJob> _logger, Guid dbGuid);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/InitiativeWorkstreamsByConfigurationQuery.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/InitiativeWorkstreamsByConfigurationQuery.cs
new file mode 100644
index 0000000..a1bd75e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/InitiativeWorkstreamsByConfigurationQuery.cs
@@ -0,0 +1,19 @@
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts
+{
+    public partial class JazzDbContext
+    {
+        public IQueryable<WorkstreamDto> InitiativeWorkstreamsByConfigurationQuery(Guid configurationGuid)
+        {
+            var result = Initiatives
+                .Where(i => i.ConfigurationGUID == configurationGuid)
+                .Select(i => new WorkstreamDto { Workstream = i.Workstream }).Distinct().OrderBy(i => i.Workstream);
+            return result;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/InitiativeWorkstreamsQuery.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/InitiativeWorkstreamsQuery.cs
new file mode 100644
index 0000000..3a50158
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/InitiativeWorkstreamsQuery.cs
@@ -0,0 +1,16 @@
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts
+{
+    public partial class JazzDbContext
+    {
+        public IQueryable<WorkstreamDto> InitiativeWorkstreamsQuery()
+        {
+            var result = Initiatives.Select(i => new WorkstreamDto { Workstream = i.Workstream }).Distinct().OrderBy(i => i.Workstream);
+            return result;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimAprdrg.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimAprdrg.cs
new file mode 100644
index 0000000..c12b2d2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimAprdrg.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Jazz.Dimensions
+{
+    [Table("DimAprdrg", Schema = "dss")]
+    public class DimAprdrg
+    {
+        [Key]
+        public int AprDrgId { get; set; }
+        public string AprDrgCode { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimCpt.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimCpt.cs
new file mode 100644
index 0000000..1bfdf3b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimCpt.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Jazz.Dimensions
+{
+    [Table("DimCpt", Schema = "dss")]
+    public class DimCpt
+    {
+        [Key]
+        public int CptId { get; set; }
+        public string CptCode { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimIcd10Dx.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimIcd10Dx.cs
new file mode 100644
index 0000000..1ebb6c2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimIcd10Dx.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Jazz.Dimensions
+{
+    [Table("DimICD10DX", Schema = "dss")]
+    public class DimIcd10Dx
+    {
+        [Key]
+        public int Icd10DxId { get; set; }
+        public string Icd10DxCode { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimIcd10Px.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimIcd10Px.cs
new file mode 100644
index 0000000..367e6ce
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimIcd10Px.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Jazz.Dimensions
+{
+    [Table("DimICD10Px", Schema = "dss")]
+    public class DimIcd10Px
+    {
+        [Key]
+        public int Icd10PxId { get; set; }
+        public string Icd10PxCode { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimMsdrg.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimMsdrg.cs
new file mode 100644
index 0000000..75fae4c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimMsdrg.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Jazz.Dimensions
+{
+    [Table("DimMsdrg", Schema = "dss")]
+    public class DimMsdrg
+    {
+        [Key]
+        public int MsdrgId { get; set; }
+        public string MsdrgCode { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimMsdrgRollup.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimMsdrgRollup.cs
new file mode 100644
index 0000000..7198497
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Jazz/Dimensions/DimMsdrgRollup.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Jazz.Dimensions
+{
+    [Table("DimMsdrgRollup", Schema = "dss")]
+    public class DimMsdrgRollup
+    {
+        [Key]
+        public int MsdrgRollupId { get; set; }
+        public string MsdrgRollupCode { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/JazzDbContext.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/JazzDbContext.cs
new file mode 100644
index 0000000..36ca597
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/JazzDbContext.cs
@@ -0,0 +1,304 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Cube;
+using Strata.ContinuousImprovement.Biz.DbContexts.Jazz.Dimensions;
+using Strata.ContinuousImprovement.Biz.DbContexts.Reports;
+using Strata.ContinuousImprovement.Biz.DbContexts.Security;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Exploration.Opportunities;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.FreeForm.Initiatives;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Details;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.GMDN;
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities;
+using Strata.ContinuousImprovement.Biz.PeerGroups;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns;
+using Strata.ContinuousImprovement.Biz.Score;
+using Strata.ContinuousImprovement.Biz.Security;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.UserProfiles;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.Stratasphere.Biz.DbContexts;
+using System;
+using System.Linq;
+using System.Security.Claims;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts
+{
+
+    public partial class JazzDbContext : DbContext, IJazzDbContext
+    {
+        public DbSet<Configuration.Configuration> Configurations { get; set; }
+        public DbSet<SystemSetting> SystemSettings { get; set; }
+        public DbSet<ScoreDimension> ScoreDimensions { get; set; }
+        public DbSet<ViewScoreAttribute> ViewScoreAttributes { get; set; }
+        public DbSet<ScoreAttribute> ScoreAttributes { get; set; }
+        public DbSet<AllOpportunity> AllOpportunities { get; set; }
+        public DbSet<EXOpportunity> ExplorationOpportunities { get; set; }
+        public DbSet<ENOpportunity> EncounterOpportunities { get; set; }
+        public DbSet<ENOpportunityMetricData> EncounterOpportunityMetricData { get; set; }
+        public DbSet<OpportunityMetricCohortData> OpportunityMetricCohortData { get; set; }
+        public DbSet<ENOpportunityDataModel> ENOpportunities { get; set; }
+        public DbSet<Population.ExplorationVariationOpportunityDataModel> ExplorationVariationOpportunitiesData { get; set; }
+        public DbSet<ChargeCode.ChargeCode> ChargeCodes { get; set; }
+        public DbSet<CCOpportunity> ChargeCodeOpps { get; set; }
+        public DbSet<CCOpportunityDataModel> ChargeCodeOpportunities { get; set; }
+        public DbSet<ChargeCodeOpportunityDetail> ChargeCodeDetails { get; set; }
+        public DbSet<ChargeCodeOpportunityLevelCase> ChargeCodeOpportunityLevelCases { get; set; }
+        public DbSet<CCOpportunityDetailQueryResult> ChargeCodeDetailsQueryResults { get; set; }
+        public DbSet<CCOpportunityLevelCaseQueryResult> ChargeCodeOpportunityLevelCaseQueryResults { get; set; }
+        public DbSet<FFOpportunity> FFOpportunities { get; set; }
+        public DbSet<FFOpportunityDataModel> FreeFormOpportunities { get; set; }
+        public DbSet<FFInitiativeTrackingData> FreeFormInitiativeTrackingData { get; set; }
+        public DbSet<FFFInitiativeTrackingData> FinancialFreeFormInitiativeTrackingData { get; set; }
+        public DbSet<GLOpportunity> GeneralLedgerOpportunities { get; set; }
+        public DbSet<GLOpportunityDataModel> GeneralLedgerOpportunitiesDataModel { get; set; }
+        public DbSet<PROpportunity> PayrollOpportunities { get; set; }
+        public DbSet<PROpportunityDataModel> PayrollOpportunitiesDataModel { get; set; }
+        public DbSet<UVOpportunity> VariationOpportunities { get; set; }
+        public DbSet<VariationOpportunityDataModel> UtilizationVariationOpportunitiesData { get; set; }
+        public DbSet<NetworkOpportunityLink> NetworkOpportunityLinks { get; set; }
+        public DbSet<UVCaseType> VariationCaseTypes { get; set; }
+        public DbSet<DimCaseType> DimCaseTypes { get; set; }
+        public DbSet<DimEntity> DimEntities { get; set; }
+        public DbSet<QualityVariation.Opportunities.QVIOpportunity> QualityVariationItemOpportunities { get; set; }
+        public DbSet<QVIBreakdown> QualityVariationItemBreakdowns { get; set; }
+        public DbSet<QualityVariation.Events.QVIEvent> QualityVariationItemEvents { get; set; }
+        public DbSet<QualityVariation.Metrics.QviMetrics> QviMetrics { get; set; }
+        public DbSet<CciUserSetting> UserSettings { get; set; }
+        public DbSet<FactGLSampled> FactGLSampledData { get; set; }
+        public DbSet<FactGL> FactGLData { get; set; }
+        public DbSet<FactStatisticSampledMonthly> FactStatisticSampledMonthlyData { get; set; }
+        public DbSet<FactStatistic> FactStatisticData { get; set; }
+        public DbSet<Initiative> Initiatives { get; set; }
+        public DbSet<InitiativeComment> InitiativeComments { get; set; }
+        public DbSet<InitiativeCriteria> InitiativeCriteria { get; set; }
+        public DbSet<InitiativeScore> InitiativeScore { get; set; }
+        public DbSet<InitiativeCriteriaQueryResult> InitiativeCriteriaQueryResults { get; set; }
+        public DbSet<DimSupply> DimSupply { get; set; }
+        public DbSet<DimDeviceIdentifier> DimDeviceIdentifiers { get; set; }
+
+        public DbSet<OpportunityReport> OpportunityReports { get; set; }
+        public DbSet<SourceOfSavingsReport> SourceOfSavingsReports { get; set; }
+        public DbSet<REReport> REReports { get; set; }
+        public DbSet<Folder> Folders { get; set; }
+        public DbSet<S3ACLSimple> S3ACLSimples { get; set; }
+        public DbSet<SimplePermission> SimplePermissions { get; set; }
+        public DbSet<S3SimplePermission> S3SimplePermissions { get; set; }
+        public DbSet<S3SimplePermissionDefault> S3SimplePermissionDefaults { get; set; }
+        public DbSet<Identity> Identities { get; set; }
+        public DbSet<UserGroup> UserGroups { get; set; }
+        public DbSet<UserProfile> UserProfiles { get; set; }
+        public DbSet<DboUserSetting> DboUserSettings { get; set; }
+        public DbSet<InitiativeRollupColumn> InitiativeRollupColumns { get; set; }
+        public DbSet<PeerGroup> PeerGroups { get; set; }
+        public DbSet<PeerGroupCriteriaMapping> PeerGroupCriteriaMappings { get; set; }
+        public DbSet<InitiativeRollupValue> InitiativeRollupValues { get; set; }

+        public DbSet<DimCostComponent> DimCostComponents { get; set; }
+        public DbSet<CostComponentRollup> CostComponentRollups { get; set; }
+        public DbSet<CaseTypeFamily> CaseTypeFamilies { get; set; }
+        public DbSet<Lock> Locks { get; set; }
+
+        public DbSet<DimAprdrg> DimAprDrgs { get; set; }
+        public DbSet<DimMsdrg> DimMsdrgs { get; set; }
+        public DbSet<DimMsdrgRollup> DimMsdrgRollups { get; set; }
+        public DbSet<DimIcd10Dx> DimIcd10Dxs { get; set; }
+        public DbSet<DimIcd10Px> DimIcd10Pxs { get; set; }
+        public DbSet<DimCpt> DimCpts { get; set; }
+
+#pragma warning disable S100 // Methods and properties should be named in PascalCase
+        public DbSet<RESQLReportRegisteredAttribute> RESQLReportRegisteredAttributes { get; set; }
+#pragma warning restore S100 // Methods and properties should be named in PascalCase
+

+        private ILogger<JazzDbContext> _logger { get; set; }
+
+        public IDatabaseFunctionService DatabaseFunctionService { get; set; }
+
+        public JazzDbContext(DbContextOptions<JazzDbContext> options) : base(options)
+        {
+            var loggerFactory = (ILoggerFactory)new LoggerFactory();
+            _logger = loggerFactory.CreateLogger<JazzDbContext>();
+            DatabaseFunctionService = new DatabaseFunctionService();
+        }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            modelBuilder.Entity<CCOpportunityDataModel>()
+                .Property(p => p.OpportunityId)
+                .Metadata.SetAfterSaveBehavior(Microsoft.EntityFrameworkCore.Metadata.PropertySaveBehavior.Ignore);
+
+            modelBuilder.Entity<EXOpportunity>()
+                .Property(p => p.OpportunityId)
+                .Metadata.SetAfterSaveBehavior(Microsoft.EntityFrameworkCore.Metadata.PropertySaveBehavior.Ignore);
+
+            modelBuilder.Entity<ChargeCode.ChargeCode>()
+                .HasKey(cc => new
+                {
+                    cc.ChargeCodeId
+                });
+
+            modelBuilder.Entity<Initiative>()
+                .ToTable(tb => tb.UseSqlOutputClause(false))
+                .HasAlternateKey(i => new
+                {
+                    i.ConfigurationGUID,
+                    i.InitiativeGUID
+                });
+            modelBuilder.Entity<UVCaseType>()
+                .HasKey(vct => new
+                {
+                    vct.ConfigurationGuid,
+                    vct.CaseTypeId,
+                    vct.ServiceLineId
+                });
+            modelBuilder.Entity<QualityVariation.Events.QVIEvent>()
+                .HasKey(vct => new
+                {
+                    vct.ConfigurationGuid,
+                    vct.QualityVariationEventId
+                });
+            modelBuilder.Entity<QVIBreakdown>()
+                .HasKey(b => new
+                {
+                    b.ConfigurationGuid,
+                    b.BreakdownId
+                });
+            modelBuilder.Entity<FactGLSampled>()
+                .HasKey(gl => new
+                {
+                    gl.DepartmentID,
+                    gl.AccountID,
+                    gl.FiscalYearID,
+                    gl.FiscalMonthID
+                });
+            modelBuilder.Entity<FactGL>()
+                .HasKey(gl => new
+                {
+                    gl.DepartmentID,
+                    gl.AccountID,
+                    gl.FiscalYearID,
+                    gl.FiscalMonthID
+                });
+            modelBuilder.Entity<FactStatisticSampledMonthly>()
+                .HasKey(gl => new
+                {
+                    gl.DepartmentID,
+                    gl.AccountID,
+                    gl.FiscalYearID,
+                    gl.FiscalMonthID
+                });
+            modelBuilder.Entity<FactStatistic>()
+                .HasKey(gl => new
+                {
+                    gl.DepartmentID,
+                    gl.AccountID,
+                    gl.FiscalYearID,
+                    gl.FiscalMonthID
+                });
+
+            modelBuilder.Entity<CCOpportunityDetailQueryResult>()
+                .HasNoKey();
+            modelBuilder.Entity<CCOpportunityLevelCaseQueryResult>()
+                .HasNoKey();
+
+            modelBuilder.Entity<ChargeCodeOpportunityLevelCase>()
+                .HasKey(lc => new
+                {
+                    lc.OpportunityGuid,
+                    lc.Month,
+                    lc.OpportunityLevelId,
+                    lc.IsBaseline
+                });
+
+            modelBuilder.Entity<ViewScoreAttribute>()
+                .HasNoKey();
+            modelBuilder.Entity<ScoreAttribute>()
+                .ToTable(tb => tb.UseSqlOutputClause(false));
+            modelBuilder.Entity<DimCaseType>()
+                .ToTable(tb => tb.UseSqlOutputClause(false));

+            modelBuilder.Entity<DimEntity>()

+                .ToTable(tb => tb.UseSqlOutputClause(false));
+            modelBuilder.Entity<OpportunityReport>().HasKey(or => new { or.OpportunityGUID, or.ReportGUID });
+            modelBuilder.Entity<SourceOfSavingsReport>().HasKey(sr => new { sr.SourceOfSavings, sr.ReportGUID });
+            modelBuilder.Entity<S3ACLSimple>().HasKey(s => new { s.UserGuid, s.LootId });
+            modelBuilder.Entity<S3SimplePermissionDefault>().HasKey(pd => new { pd.EntityType, pd.IdentityGuid });
+            modelBuilder.Entity<InitiativeCriteriaQueryResult>().HasNoKey();
+            modelBuilder.Entity<DimDeviceIdentifier>().HasKey(di => new { di.DeviceIdentifier });
+            modelBuilder.Entity<InitiativeRollupColumn>()
+                        .HasMany(e => e.InitiativeRollupValues)
+                        .WithOne(e => e.InitiativeRollupColumn)
+                        .HasPrincipalKey(e => e.InitiativeRollupColumnId);

+            modelBuilder.Entity<CostComponentRollup>()

+                        .HasMany(e => e.CostComponents)

+                        .WithOne(e => e.CostComponentRollup)

+                        .HasPrincipalKey(e => e.CostComponentRollupGUID);
+            modelBuilder.Entity<DimDeviceIdentifier>()
+                        .ToTable(tb => tb.UseSqlOutputClause(false));
+            modelBuilder.Entity<NetworkOpportunityLink>()
+                .HasAlternateKey(nol => new
+                {
+                    nol.OpportunityId
+                });
+            modelBuilder.Entity<Lock>()
+                .HasNoKey();
+            modelBuilder.HasDbFunction(() => SqlFunctions.Split(default, default));
+
+            modelBuilder.Entity<PeerGroup>()
+                .HasMany(g => g.Mappings)
+                .WithOne(m => m.PeerGroup)
+                .HasForeignKey(m => m.PeerGroupId)
+                .HasPrincipalKey(g => g.PeerGroupId);
+
+            modelBuilder.Entity<ScoreDimension>()
+                .HasKey(e => e.DimensionGuid);
+        }
+
+        public IQueryable<T> AddUserFilter<T>(IQueryable<T> query, ClaimsPrincipal user)
+        {
+            if (user == null || user.IsSdtEmployee()) return query;
+            var userGuid = user.GetUserGuid();
+            var obj = Activator.CreateInstance<T>();
+            if (obj is IOpportunity)
+            {
+                return query
+                    .Where(o => (from s3 in S3SimplePermissions
+                                 where s3.IdentityGUID == userGuid && s3.LootID == ((IOpportunity)o).OpportunityGuid && s3.ReadValue
+                                 select ((IOpportunity)o).OpportunityGuid).Contains(((IOpportunity)o).OpportunityGuid)
+                            || ((from s3 in S3ACLSimples
+                                 where s3.UserGuid == userGuid && s3.LootId == ((IOpportunity)o).OpportunityGuid && s3.IsReadable
+                                 select ((IOpportunity)o).OpportunityGuid).Contains(((IOpportunity)o).OpportunityGuid)
+                                 && !(from s3 in S3SimplePermissions
+                                      where s3.IdentityGUID == userGuid && s3.LootID == ((IOpportunity)o).OpportunityGuid && !s3.ReadValue
+                                      select ((IOpportunity)o).OpportunityGuid).Contains(((IOpportunity)o).OpportunityGuid)));
+            }
+            else if (obj is IInitiative)
+            {
+                return query.Where(i =>
+                        (from s3 in S3SimplePermissions
+                         where s3.IdentityGUID == userGuid && s3.LootID == ((IInitiative)i).InitiativeGUID && s3.ReadValue
+                         select ((IInitiative)i).InitiativeGUID).Contains(((IInitiative)i).InitiativeGUID)
+                            || ((from s3 in S3ACLSimples
+                                 where s3.UserGuid == userGuid && s3.LootId == ((IInitiative)i).InitiativeGUID && s3.IsReadable
+                                 select ((IInitiative)i).InitiativeGUID).Contains(((IInitiative)i).InitiativeGUID)
+                         && !(from s3 in S3SimplePermissions
+                              where s3.IdentityGUID == userGuid && s3.LootID == ((IInitiative)i).InitiativeGUID && !s3.ReadValue
+                              select ((IInitiative)i).InitiativeGUID).Contains(((IInitiative)i).InitiativeGUID)));
+            }
+            return query;
+        }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/RESQLReportRegisteredAttribute.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/RESQLReportRegisteredAttribute.cs
new file mode 100644
index 0000000..1974a33
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/RESQLReportRegisteredAttribute.cs
@@ -0,0 +1,18 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts
+{
+    [Table("RESQLReportRegisteredAttribute", Schema = "dbo")]
+#pragma warning disable S100 // Methods and properties should be named in PascalCase
+    public class RESQLReportRegisteredAttribute
+#pragma warning restore S100 // Methods and properties should be named in PascalCase
+    {
+        [Key]
+        public Guid RegisteredAttributeGUID { get; set; }
+        public Guid RegisteredDimensionGUID { get; set; }
+        public Guid AttributeGUID { get; set; }
+        public string ColumnAlias { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/Folder.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/Folder.cs
new file mode 100644
index 0000000..3b9dd9d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/Folder.cs
@@ -0,0 +1,24 @@
+using Strata.Stratasphere.Biz.DbContexts;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Reports
+{
+    [Table("Folder", Schema = "dbo")]
+    public class Folder
+    {
+        [Key]
+        public Guid FolderGuid { get; set; }
+        public Guid ParentFolderGuid { get; set; }
+        public string Name { get; set; }
+        //public int DisplayOrder { get; set; }
+        //public int OutlineLevel { get; set; }
+
+        [NotMapped]
+        public List<Folder> Folders { get; set; }
+        [NotMapped]
+        public List<REReport> Reports { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/FolderTree.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/FolderTree.cs
new file mode 100644
index 0000000..3e246ae
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/FolderTree.cs
@@ -0,0 +1,30 @@
+using Strata.Stratasphere.Biz.DbContexts;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Reports
+{
+    public class FolderTree
+    {
+        public string Key { get; set; }
+        public string Title { get; set; }
+        public List<FolderTree> Children { get; set; }
+
+        public FolderTree() { }
+
+        public FolderTree(Folder folder)
+        {
+            Key = folder.FolderGuid.ToString();
+            Title = folder.Name;
+            if (!folder.Folders.Any() && !folder.Reports.Any()) { return; }
+            Children = folder.Folders.Select(x => new FolderTree(x))
+                .Union(folder.Reports.Select(x => new FolderTree(x))).ToList();
+        }
+
+        public FolderTree(REReport report)
+        {
+            Key = report.ReportGUID.ToString();
+            Title = report.Name;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/OpportunityReport.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/OpportunityReport.cs
new file mode 100644
index 0000000..becbe4d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/OpportunityReport.cs
@@ -0,0 +1,12 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.Stratasphere.Biz.DbContexts
+{
+    [Table("OpportunityReports", Schema = "cci")]
+    public class OpportunityReport
+    {
+        public Guid OpportunityGUID { get; set; }
+        public Guid ReportGUID { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/REReport.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/REReport.cs
new file mode 100644
index 0000000..b1c461b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/REReport.cs
@@ -0,0 +1,18 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.Stratasphere.Biz.DbContexts
+{
+    [Table("REReport", Schema = "dbo")]
+    public class REReport
+    {
+        [Key]
+        public Guid ReportGUID { get; set; }
+        public string Name { get; set; }
+        public Guid FolderGuid { get; set; }
+
+        [NotMapped]
+        public bool IsOpportunityReport { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/SourceOfSavingsReport.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/SourceOfSavingsReport.cs
new file mode 100644
index 0000000..de12891
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Reports/SourceOfSavingsReport.cs
@@ -0,0 +1,12 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.Stratasphere.Biz.DbContexts
+{
+    [Table("SourceOfSavingsReports", Schema = "cci")]
+    public class SourceOfSavingsReport
+    {
+        public int SourceOfSavings { get; set; }
+        public Guid ReportGUID { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Security/S3ACLSimple.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Security/S3ACLSimple.cs
new file mode 100644
index 0000000..b306cdf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Security/S3ACLSimple.cs
@@ -0,0 +1,15 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Security
+{
+    [Table("viewS3ACLSimple", Schema = "dbo")]
+    public class S3ACLSimple
+    {
+        public Guid UserGuid { get; set; }
+        public Guid LootId { get; set; }
+        public bool IsReadable { get; set; }
+        public bool IsWritable { get; set; }
+        public bool IsSecurable { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/ISnowflakeDatabaseContext.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/ISnowflakeDatabaseContext.cs
new file mode 100644
index 0000000..1ad34a5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/ISnowflakeDatabaseContext.cs
@@ -0,0 +1,28 @@
+using Dapper;
+using Strata.SnowflakeLib;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Snowflake
+{
+    public interface ISnowflakeDatabaseContext
+    {
+        Task<SnowflakeConnectionStringBuilder> GetSnowflakeConnectionStringBuilderAsync();
+
+        Task<IEnumerable<T>> QueryAsync<T>(string query, string requestType, object parameters = null, TimeSpan timeSpan = default);
+
+        Task<ISqlGridReaderWrapper> QueryMultipleAsync(string query, string requestType, object parameters = null, TimeSpan timeSpan = default);
+
+        Task<IEnumerable<T>> QueryMultipleReturnLastAsync<T>(string query, string requestType, byte queryCount, object parameters = null, TimeSpan timeSpan = default);
+
+        Task<T> QueryFirstOrDefault<T>(string query, object parameters = null);
+
+        Task<T> ExecuteScalarAsync<T>(string query, object parameters = null);
+        Task<int> ExecuteCommandAsync(string queryString, object parameters = null, TimeSpan timeSpan = default);
+        Task ExecuteCommand(string queryString, object parameters = null, TimeSpan timeSpan = default);
+        Task BulkInsert<T>(string stageName, string tableName, IEnumerable<T> entities, string sqlClearData, IEnumerable<string> columnsToIgnore);
+
+        Task BulkUpdate<T>(string stageName, string tableName, IEnumerable<T> entities, string tempTableName, string tempTableFields, IEnumerable<string> keyColumns, IEnumerable<string> valueColumns);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/ISnowflakeDatabaseContextFactory.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/ISnowflakeDatabaseContextFactory.cs
new file mode 100644
index 0000000..d505516
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/ISnowflakeDatabaseContextFactory.cs
@@ -0,0 +1,7 @@
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Snowflake
+{
+    public interface ISnowflakeDatabaseContextFactory
+    {
+        public SnowflakeDatabaseContext Create(string databaseGuid);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/ISqlGridReaderWrapper.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/ISqlGridReaderWrapper.cs
new file mode 100644
index 0000000..a43dcd7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/ISqlGridReaderWrapper.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Snowflake
+{
+    public interface ISqlGridReaderWrapper : IDisposable
+    {
+        IEnumerable<dynamic> Read(bool buffered = true);
+        IEnumerable<T> Read<T>(bool buffered = true);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/SnowflakeDatabaseContext.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/SnowflakeDatabaseContext.cs
new file mode 100644
index 0000000..42a019d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/SnowflakeDatabaseContext.cs
@@ -0,0 +1,286 @@
+using CsvHelper.Configuration;
+using CsvHelper;
+using Dapper;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Snowflake.Data.Client;
+using Strata.ContinuousImprovement.Biz.ClientWarehouses;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.SnowflakeLib;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Data;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Snowflake
+{
+    public class SnowflakeDatabaseContext : DbContext, ISnowflakeDatabaseContext
+    {
+        public const string DEFAULT_CI_WAREHOUSE = "APP_CI_EXPLORATION_XS_WH";
+        private string _databaseGuid { get; }
+
+        private readonly SnowflakeClientDbConnectionStringBuilderFactory _snowflakeClientDbConnectionStringBuilderFactory;
+        private readonly IClientWarehouseService _clientWarehouseService;
+
+        public SnowflakeDatabaseContext(string databaseGuid,
+            SnowflakeClientDbConnectionStringBuilderFactory snowflakeClientDbConnectionStringBuilderFactory,
+            IClientWarehouseService clientWarehouseService)
+        {
+            _databaseGuid = databaseGuid;
+            _snowflakeClientDbConnectionStringBuilderFactory = snowflakeClientDbConnectionStringBuilderFactory;
+            _clientWarehouseService = clientWarehouseService;
+        }
+
+        public async Task<SnowflakeConnectionStringBuilder> GetSnowflakeConnectionStringBuilderAsync()
+        {
+            var connection = await _snowflakeClientDbConnectionStringBuilderFactory.CreateAsync(_databaseGuid);
+
+            if (Guid.TryParse(_databaseGuid, out Guid databaseGuid))
+            {
+                var clientWarehouse = await _clientWarehouseService.GetByDatabaseGuid(databaseGuid, CancellationToken.None);
+                connection.Warehouse = clientWarehouse == null ?
+                DEFAULT_CI_WAREHOUSE : $"APP_CI_EXPLORATION_{clientWarehouse.WarehouseSize}_WH";
+            }
+            return connection;
+        }
+
+        public async Task<IEnumerable<T>> QueryAsync<T>(string query, string requestType, object parameters = null, TimeSpan timeSpan = default)
+        {
+            SnowflakeConnectionStringBuilder connectionBuilder = await GetSnowflakeConnectionStringBuilderAsync();
+            if (!timeSpan.Equals(default(TimeSpan))) connectionBuilder.Timeout = (int)timeSpan.TotalSeconds;
+
+            await using (StrataSnowflakeConnection connection = connectionBuilder.CreateConnection())
+            {
+                connection.AddCustomQueryTags(new Dictionary<string, string>(new[] { GetRequestTypeQueryTag(requestType) }));
+                return await connection.QueryAsync<T>(query, parameters);
+            }
+        }
+
+        public async Task<ISqlGridReaderWrapper> QueryMultipleAsync(string query, string requestType, object parameters = null, TimeSpan timeSpan = default)
+        {
+            SnowflakeConnectionStringBuilder connectionBuilder = await GetSnowflakeConnectionStringBuilderAsync();
+            if (!timeSpan.Equals(default(TimeSpan))) connectionBuilder.Timeout = (int)timeSpan.TotalSeconds;
+
+            StrataSnowflakeConnection connection = connectionBuilder.CreateConnection();
+            connection.AddCustomQueryTags(new Dictionary<string, string>(new[] { GetRequestTypeQueryTag(requestType) }));
+            var sqlReader = await connection.QueryMultipleAsync(query, parameters);
+            return new SqlGridReaderWrapper(sqlReader);
+        }
+
+        public async Task<IEnumerable<T>> QueryMultipleReturnLastAsync<T>(string query, string requestType, byte queryCount, object parameters = null, TimeSpan timeSpan = default)
+        {
+            var result = await QueryMultipleAsync(query, requestType, parameters, timeSpan);
+            using (result)
+            {
+                for (int i = 0; i < queryCount - 1; i++)
+                {
+                    result.Read();
+                }
+                var finalResult = result.Read<T>().ToList();
+                return finalResult;
+            }
+        }
+
+        public async Task<T> QueryFirstOrDefault<T>(string query, object parameters = null)
+        {
+            SnowflakeConnectionStringBuilder connectionBuilder = await GetSnowflakeConnectionStringBuilderAsync();
+
+            await using (StrataSnowflakeConnection connection = connectionBuilder.CreateConnection())
+            {
+                return await connection.QueryFirstOrDefaultAsync<T>(query, parameters);
+            }
+
+        }
+
+        public async Task<T> ExecuteScalarAsync<T>(string query, object parameters = null)
+        {
+            SnowflakeConnectionStringBuilder connectionBuilder = await GetSnowflakeConnectionStringBuilderAsync();
+
+            await using (StrataSnowflakeConnection connection = connectionBuilder.CreateConnection())
+            {
+                return await connection.ExecuteScalarAsync<T>(query, parameters);
+            }
+
+        }
+
+        public async Task<int> ExecuteCommandAsync(string queryString, object parameters = null, TimeSpan timeSpan = default)
+        {
+            var connectionBuilder = await GetSnowflakeConnectionStringBuilderAsync();
+            if (!timeSpan.Equals(default(TimeSpan))) connectionBuilder.Timeout = (int)timeSpan.TotalSeconds;
+
+            await using (SnowflakeDbConnection connection = connectionBuilder.CreateConnection())
+            {
+                return await connection.ExecuteAsync(queryString, parameters);
+            }
+        }
+
+        // use this method to avoid "Get and Put are not supported in async calls. Use Execute() instead of ExecuteAsync()." error
+        public async Task ExecuteCommand(string queryString, object parameters = null, TimeSpan timeSpan = default)
+        {
+            var connectionBuilder = await GetSnowflakeConnectionStringBuilderAsync();
+            if (!timeSpan.Equals(default(TimeSpan))) connectionBuilder.Timeout = (int)timeSpan.TotalSeconds;
+
+            await using (SnowflakeDbConnection connection = connectionBuilder.CreateConnection())
+            {
+                connection.Execute(queryString, parameters);
+            }
+        }
+
+        public async Task BulkInsert<T>(string stageName, string tableName, IEnumerable<T> entities, string sqlClearData, IEnumerable<string> columnsToIgnore)
+        {
+            var fileName = $"{Guid.NewGuid()}.csv";
+            var tempFilePath = Path.Combine(Path.GetTempPath(), fileName);
+
+            try
+            {
+                string[] headers;
+                await using (var writer = new StreamWriter(tempFilePath))
+                await using (var csv = new CsvWriter(writer, new CsvConfiguration(CultureInfo.InvariantCulture)))
+                {
+                    csv.Context.RegisterClassMap(new CsvUtils.DynamicMap<T>(columnsToIgnore));
+                    await csv.WriteRecordsAsync(entities);
+                    headers = csv.HeaderRecord;
+                }
+
+                SnowflakeConnectionStringBuilder connectionBuilder = await GetSnowflakeConnectionStringBuilderAsync();
+
+                await using (StrataSnowflakeConnection connection = connectionBuilder.CreateConnection())
+                {
+                    var stageFileName = $"{stageName}/{fileName}";
+                    using (IDbTransaction transaction = connection.BeginTransaction())
+                    {
+                        try
+                        {
+                            connection.Execute($"PUT file://{tempFilePath} @{stageFileName} AUTO_COMPRESS=TRUE", transaction: transaction);
+                            if (!string.IsNullOrEmpty(sqlClearData))
+                            {
+                                await connection.ExecuteAsync($"{sqlClearData}", transaction: transaction);
+                            }
+                            await connection.ExecuteAsync($@"
+                                COPY INTO {tableName} ({string.Join(",", headers)})
+                                FROM @{stageFileName}
+                                FILE_FORMAT = (TYPE = CSV, SKIP_HEADER = 1);
+                            ", transaction: transaction);
+
+                            transaction.Commit();
+                        }
+                        catch
+                        {
+                            transaction.Rollback();
+                            throw;
+                        }
+                        finally
+                        {
+                            try
+                            {
+                                await this.ExecuteCommandAsync($"REMOVE @{stageFileName};");
+                            }
+                            catch (Exception ex)
+                            {
+                                _logger.LogError(ex, "Failed to remove staged file {StageFileName} from Snowflake. Manual cleanup may be required.", stageFileName);
+                            }
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                File.Delete(tempFilePath);
+            }
+        }
+
+        public async Task BulkUpdate<T>(string stageName, string tableName, IEnumerable<T> entities, string tempTableName, string tempTableFields, IEnumerable<string> keyColumns, IEnumerable<string> valueColumns)
+        {
+            var fileName = $"{Guid.NewGuid()}.csv";
+            var tempFilePath = Path.Combine(Path.GetTempPath(), fileName);
+
+            try
+            {
+                await using (var writer = new StreamWriter(tempFilePath))
+                await using (var csv = new CsvWriter(writer, new CsvConfiguration(CultureInfo.InvariantCulture)))
+                {
+                    await csv.WriteRecordsAsync(entities);
+                }
+
+                SnowflakeConnectionStringBuilder connectionBuilder = await GetSnowflakeConnectionStringBuilderAsync();
+
+                await using (StrataSnowflakeConnection connection = connectionBuilder.CreateConnection())
+                {
+                    var stageFileName = $"{stageName}/{fileName}";
+                    using (IDbTransaction transaction = connection.BeginTransaction())
+                    {
+                        try
+                        {
+                            connection.Execute($"PUT file://{tempFilePath} @{stageFileName} AUTO_COMPRESS=TRUE", transaction: transaction);
+                            await connection.ExecuteAsync($@"
+                                CREATE TEMPORARY TABLE {tempTableName} (
+                                    {tempTableFields}
+                                );
+                            ", transaction: transaction);
+
+                            var sqlCopy = $@"
+                                COPY INTO {tempTableName}
+                                FROM @{stageFileName}
+                                FILE_FORMAT = (TYPE = CSV, PARSE_HEADER = TRUE) 
+                                MATCH_BY_COLUMN_NAME = CASE_INSENSITIVE;
+                            ";
+                            await connection.ExecuteAsync(sqlCopy, transaction: transaction);
+
+                            var sqlMerge = $@"
+                                MERGE INTO {tableName} AS T
+                                USING {tempTableName} AS S
+                                ON {string.Join(" AND ", keyColumns.Select(x => $"T.{x} = S.{x}"))}
+                                WHEN MATCHED THEN
+                                    UPDATE SET 
+                                        {string.Join(", ", valueColumns.Select(x => $"T.{x} = S.{x}"))};
+                            ";
+                            await connection.ExecuteAsync(sqlMerge, transaction: transaction);
+
+                            transaction.Commit();
+                        }
+                        catch
+                        {
+                            transaction.Rollback();
+                            throw;
+                        }
+                        finally
+                        {
+                            try
+                            {
+                                await this.ExecuteCommandAsync($"REMOVE @{stageFileName};");
+                            }
+                            catch (Exception ex)
+                            {
+                                _logger.LogError(ex, "Failed to remove staged file {StageFileName} from Snowflake. Manual cleanup may be required.", stageFileName);
+                            }
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                if (File.Exists(tempFilePath))
+                {
+                    File.Delete(tempFilePath);
+                }
+            }
+        }
+
+        private KeyValuePair<string, string> GetRequestTypeQueryTag(string requestType) => new("Request_Type", requestType);
+
+        private ILogger<SnowflakeDatabaseContext> _logger { get; set; }
+
+        public SnowflakeDatabaseContext(DbContextOptions<SnowflakeDatabaseContext> options)
+            : base(options)
+        {
+            var loggerFactory = (ILoggerFactory)new LoggerFactory();
+            _logger = loggerFactory.CreateLogger<SnowflakeDatabaseContext>();
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/SnowflakeDatabaseContextFactory.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/SnowflakeDatabaseContextFactory.cs
new file mode 100644
index 0000000..13a13cc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/SnowflakeDatabaseContextFactory.cs
@@ -0,0 +1,22 @@
+using Strata.ContinuousImprovement.Biz.ClientWarehouses;
+using Strata.SnowflakeLib;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Snowflake
+{
+    public class SnowflakeDatabaseContextFactory : ISnowflakeDatabaseContextFactory
+    {
+        private readonly SnowflakeClientDbConnectionStringBuilderFactory _snowflakeClientDbConnectionStringBuilderFactory;
+        private readonly IClientWarehouseService _clientWarehouseService;
+
+        public SnowflakeDatabaseContextFactory(SnowflakeClientDbConnectionStringBuilderFactory snowflakeClientDbConnectionStringBuilderFactory, IClientWarehouseService clientWarehouseService)
+        {
+            _snowflakeClientDbConnectionStringBuilderFactory = snowflakeClientDbConnectionStringBuilderFactory;
+            _clientWarehouseService = clientWarehouseService;
+        }
+
+        public SnowflakeDatabaseContext Create(string databaseGuid)
+        {
+            return new SnowflakeDatabaseContext(databaseGuid, _snowflakeClientDbConnectionStringBuilderFactory, _clientWarehouseService);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/SnowflakeExtensions.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/SnowflakeExtensions.cs
new file mode 100644
index 0000000..8e7c17c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/SnowflakeExtensions.cs
@@ -0,0 +1,12 @@
+using System.Text.RegularExpressions;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Snowflake
+{
+    public static class SnowflakeExtensions
+    {
+        public static string ConvertSqlToSnowflakeParameterSyntax(this string sql)
+            => Regex.Replace(sql.Replace("@", ":").Replace("--", ""),
+                @"IN \(\s*(:[^)]*)\s*\)", "IN $1",
+                RegexOptions.IgnoreCase | RegexOptions.Multiline);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/SqlGridReaderWrapper.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/SqlGridReaderWrapper.cs
new file mode 100644
index 0000000..2c98470
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/Snowflake/SqlGridReaderWrapper.cs
@@ -0,0 +1,31 @@
+using Dapper;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts.Snowflake
+{
+    public class SqlGridReaderWrapper : ISqlGridReaderWrapper
+    {
+        private readonly SqlMapper.GridReader _sqlReader;
+        
+        public SqlGridReaderWrapper(SqlMapper.GridReader sqlReader)
+        {
+            _sqlReader = sqlReader;
+        }
+        
+        public IEnumerable<dynamic> Read(bool buffered = true)
+        {
+            return _sqlReader.Read(buffered);
+        }
+        
+        public IEnumerable<T> Read<T>(bool buffered = true)
+        {
+            return _sqlReader.Read<T>(buffered);
+        }
+        
+        public void Dispose()
+        {
+            _sqlReader?.Dispose();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/DbContexts/SqlFunctions.cs b/src/Strata.ContinuousImprovement.Biz/DbContexts/SqlFunctions.cs
new file mode 100644
index 0000000..2c54ca4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/DbContexts/SqlFunctions.cs
@@ -0,0 +1,21 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.DbContexts
+{
+    public static class SqlFunctions
+    {
+        [DbFunction(Name = "STRING_SPLIT", IsBuiltIn = true)]
+        public static IQueryable<StringValue> Split(string source, string separator)
+            => throw new NotSupportedException("Only works in database queries.");
+    }
+
+    [Keyless]
+    public class StringValue
+    {
+        [Column("value")]
+        public string Value { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Dtos/CCOpportunityDto.cs b/src/Strata.ContinuousImprovement.Biz/Dtos/CCOpportunityDto.cs
new file mode 100644
index 0000000..b63f793
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Dtos/CCOpportunityDto.cs
@@ -0,0 +1,78 @@
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Dtos
+{
+    [ExcludeFromCodeCoverage]
+    public class CCOpportunityDto
+    {
+        // Save properties
+        [Required]
+        public Guid ConfigurationGuid { get; set; }
+        [Required]
+        [StringLength(200)]
+        public string Name { get; set; }
+        [Required]
+        public int EncounterGroup { get; set; }
+        public List<string> EncounterGroups { get; set; }
+        public List<string> ChargeCodes { get; set; }
+        public bool IsSeasonal { get; set; }
+
+        [Required]
+        public int OpportunityLevel { get; set; }
+        public List<string> OpportunityLevels { get; set; }
+        public DateTime BaselineStartDate { get; set; }
+        public DateTime BaselineEndDate { get; set; }
+        public DateTime TrackingStartDate { get; set; }
+        public DateTime TrackingEndDate { get; set; }
+        public bool IsHidden { get; set; }
+        public string Note { get; set; } = String.Empty;
+
+        // Display properties
+        public int TotalCases { get; set; }
+        public double TotalCost => Details?.Sum(Details => Details.TotalCost) ?? 0;
+        public double GoalTotalCost => GetGoalTotalCost();
+        public double ImprovementTotalCost => TotalCost - GoalTotalCost;
+        public double CostPerCase => TotalCost.DivideBy(TotalCases);
+        public double GoalCostPerCase => GoalTotalCost.DivideBy(TotalCases);
+        public double ImprovementCostPerCase => CostPerCase - GoalCostPerCase;
+        public string OpportunityKey { get; set; }
+        public long OpportunityId { get; set; }
+        public string SourceOpportunity { get; set; }
+        public int SourceOpportunityId { get; set; }
+        public IEnumerable<ChargeCodeOpportunityDetail> Details { get; set; }
+        public IEnumerable<ChargeCodeOpportunityLevelCase> LevelCases { get; set; }
+        public IEnumerable<CCOpportunityDetailTreeGridModel> TreeGridData => Details?.GroupBy(detail => detail.OpportunityLevelId.ToString())
+                .Select(opportunityLevelGrouping => new CCOpportunityDetailTreeGridModel(opportunityLevelGrouping, string.Empty,
+                    opportunityLevelGrouping => opportunityLevelGrouping.FirstOrDefault()?.OpportunityLevelName ?? "System",
+                    LevelCases,
+                    TypeOfChildren.Rollup))
+            ?? new List<CCOpportunityDetailTreeGridModel>();
+
+        private double GetGoalTotalCost()
+        {
+            if (Details == null) return 0;
+            double goalTotalCost = 0;
+
+            var detailsGroup = Details.GroupBy(d => new { d.OpportunityLevelId, d.ChargeCodeId });
+            foreach (var groupedOpportunityDetails in detailsGroup)
+            {
+                var totalCost = groupedOpportunityDetails.Sum(data => data.TotalCost);
+                var totalUnitsOfService = groupedOpportunityDetails.Sum(data => data.TotalUnitsOfService);
+                var goalTotalUnitsOfService = groupedOpportunityDetails.Sum(data => data.GoalTotalUnitsOfService);
+                var goalCostPerUnit = groupedOpportunityDetails.First().GoalCostPerUnit;
+                var goalCost = goalCostPerUnit * goalTotalUnitsOfService;
+
+                goalTotalCost += goalCost;
+            }
+
+            return goalTotalCost;
+        }
+    }
+}
+
diff --git a/src/Strata.ContinuousImprovement.Biz/Dtos/ClientNetworkOpportunityDto.cs b/src/Strata.ContinuousImprovement.Biz/Dtos/ClientNetworkOpportunityDto.cs
new file mode 100644
index 0000000..010b3f2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Dtos/ClientNetworkOpportunityDto.cs
@@ -0,0 +1,67 @@
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Dtos
+{
+    public class ClientNetworkOpportunityDto
+    {
+        public int StrataId { get; set; }
+        public int NetworkOpportunityId { get; set; }
+        public int IdentifiedSavings { get; set; }
+        public string IdentifiedSavingsDescription { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public bool IsPublished { get; set; }
+        public int AnalyticsWorkbookId { get; set; }
+        public int WorkbookTemplateId { get; set; }
+        public InitiativeStatuses InitiativeStatus { get; set; }
+
+        public IEnumerable<ClientOpportunity> Opportunities { get; set; }
+
+        public ClientNetworkOpportunityDto()
+        {
+            Opportunities = new List<ClientOpportunity>();
+        }
+
+        public ClientNetworkOpportunityDto(ClientNetworkOpportunity clientNetworkOpportunity)
+        {
+            StrataId = clientNetworkOpportunity.StrataId;
+            IdentifiedSavings = clientNetworkOpportunity.IdentifiedSavings;
+            IdentifiedSavingsDescription = clientNetworkOpportunity.IdentifiedSavingsDescription;
+            NetworkOpportunityId = clientNetworkOpportunity.NetworkOpportunityId;
+            Name = clientNetworkOpportunity.NetworkOpportunity.Name;
+            Description = clientNetworkOpportunity.NetworkOpportunity.Description;
+            IsPublished = clientNetworkOpportunity.IsPublished;
+            AnalyticsWorkbookId = clientNetworkOpportunity.AnalyticsWorkbookId;
+            WorkbookTemplateId = clientNetworkOpportunity.NetworkOpportunity.WorkbookTemplateId;
+            InitiativeStatus = clientNetworkOpportunity.InitiativeStatus;
+            Opportunities = clientNetworkOpportunity.Opportunities?.Select(opp => new ClientOpportunity(opp))
+                ?? new List<ClientOpportunity>();
+        }
+    }
+
+    public class ClientOpportunity
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public string Opportunity { get; set; }
+        public string CostDriver { get; set; }
+        public string Initiative { get; set; }
+
+        public ClientOpportunity() { }
+
+        public ClientOpportunity(ClientNetworkOpportunityLink opportunityLink)
+        {
+            ConfigurationGuid = opportunityLink.ConfigurationGuid;
+            OpportunityGuid = opportunityLink.OpportunityGuid;
+            InitiativeGuid = opportunityLink.InitiativeGuid;
+            Opportunity = opportunityLink.Opportunity;
+            CostDriver = opportunityLink.CostDriver;
+            Initiative = opportunityLink.Initiative;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Dtos/ENOpportunityDto.cs b/src/Strata.ContinuousImprovement.Biz/Dtos/ENOpportunityDto.cs
new file mode 100644
index 0000000..acfebd3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Dtos/ENOpportunityDto.cs
@@ -0,0 +1,64 @@
+using Strata.ContinuousImprovement.Biz.Encounter;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Dtos
+{
+    [ExcludeFromCodeCoverage]
+    public class ENOpportunityDto
+    {
+        [Required]
+        public Guid ConfigurationGuid { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        [Required]
+        [StringLength(200)]
+        public string Name { get; set; }
+        [Required]
+        public int EncounterGroup { get; set; }
+        [Required]
+        public int OpportunityLevel { get; set; }
+        public string OpportunityKey { get; set; }
+        public long OpportunityId { get; set; }
+        public bool IsHidden { get; set; }
+        public string OpportunityLevelLabel { get; set; }
+        public List<string> EncounterGroups { get; set; }
+        public List<string> OpportunityLevels { get; set; }
+        public List<string> EncounterGroupIds { get; set; }
+        public List<string> OpportunityLevelIds { get; set; }
+        public double RevenueGoal { get; set; }
+        public double RevenueImprovement { get; set; }
+        public double CostGoal { get; set; }
+        public double CostImprovement { get; set; }
+        public double MarginGoal { get; set; }
+        public double MarginImprovement { get; set; }
+        public DateTime BaselineStartDate { get; set; }
+        public DateTime BaselineEndDate { get; set; }
+        public DateTime TrackingStartDate { get; set; }
+        public DateTime TrackingEndDate { get; set; }
+        public Dictionary<string, List<ENOpportunityRowData>> GridData { get; set; }
+        public string EncounterOpportunityJSON { get; set; }
+
+        public bool IsSeasonal { get; set; }
+
+        public bool IsBaseline { get; set; } = true;
+        public decimal BaselineValue;
+        public decimal GoalValue;
+
+        public string OpportunityLevelName()
+        {
+            return OpportunityLevel switch
+            {
+                1 => "Entity",
+                2 => "ServiceLine",
+                3 => "Specialty",
+                4 => "Provider",
+                _ => "System"
+            };
+        }
+
+    }
+}
+
diff --git a/src/Strata.ContinuousImprovement.Biz/Dtos/ExplorationPopulationDataDto.cs b/src/Strata.ContinuousImprovement.Biz/Dtos/ExplorationPopulationDataDto.cs
new file mode 100644
index 0000000..7bffa7e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Dtos/ExplorationPopulationDataDto.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Dtos
+{
+    public class ExplorationPopulationDataDto
+    {
+        public long ExplorationPopulationId { get; set; }
+        public string Name { get; set; }
+        public int TotalEncounters { get; set; }
+        public decimal TotalVariation { get; set; }
+        public DateTime StartDischargeDate { get; set; }
+        public DateTime EndDischargeDate { get; set; }
+        public int AssociatedOpportunitiesCount { get; set; }
+        public int AssociatedInitiativesCount { get; set; }
+        public IEnumerable<ExplorationPopulationOpportunityDto> Opportunities { get; set; }
+    }
+
+    public class ExplorationPopulationOpportunityDto
+    {
+        public long OpportunityId { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public string CostDriver { get; set; }
+        public long ExplorationPopulationId { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public DateTime? BaselineStartDate { get; set; }
+        public DateTime? BaselineEndDate { get; set; }
+        public DateTime? TrackingStartDate { get; set; }
+        public DateTime? TrackingEndDate { get; set; }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Dtos/ExplorationPopulationDetailsDto.cs b/src/Strata.ContinuousImprovement.Biz/Dtos/ExplorationPopulationDetailsDto.cs
new file mode 100644
index 0000000..c8b93f5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Dtos/ExplorationPopulationDetailsDto.cs
@@ -0,0 +1,23 @@
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Dtos
+{
+    public class ExplorationPopulationDetailsDto
+    {
+        public long ExplorationPopulationId { get; set; }
+        public string Name { get; set; }
+        public string CostDriver { get; set; }
+        public ExclusionCriteria ExclusionCriteria { get; set; }
+        public List<FilterChipItem> Filters { get; set; }
+        public bool HasManuallyChangeEncounters { get; set; }
+        public List<ExplorationPopulationStrategicOpportunityDto> AssociatedOpportunities { get; set; }
+        public List<ExplorationPopulationStrategicOpportunityDto> AssociatedInitiatives { get; set; }
+    }
+
+    public class ExplorationPopulationStrategicOpportunityDto(long opportunityId, string name)
+    {
+        public long OpportunityId { get; set; } = opportunityId;
+        public string Name { get; set; } = name;
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Dtos/ExplorationPopulationDto.cs b/src/Strata.ContinuousImprovement.Biz/Dtos/ExplorationPopulationDto.cs
new file mode 100644
index 0000000..887c6ce
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Dtos/ExplorationPopulationDto.cs
@@ -0,0 +1,15 @@
+using Strata.ContinuousImprovement.Biz.Population;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Dtos
+{
+    public class ExplorationPopulationDto : ExplorationPopulation
+    {
+        public List<long> ManuallyExcludedEncounterIds { get; set; }
+        public List<long> ManuallyIncludedEncounterIds { get; set; }
+        public List<long> MappingEncounterIds { get; set; }
+        public int OpportunitiesCount { get; set; }
+        public int? AssociatedOpportunitiesCount { get; set; }
+        public int? AssociatedInitiativesCount { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Dtos/FFOpportunityDto.cs b/src/Strata.ContinuousImprovement.Biz/Dtos/FFOpportunityDto.cs
new file mode 100644
index 0000000..438bd8e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Dtos/FFOpportunityDto.cs
@@ -0,0 +1,25 @@
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Dtos
+{
+    [ExcludeFromCodeCoverage]
+    public class FFOpportunityDto
+    {
+        [Required]
+        public FinancialImprovementType ImprovementType { get; set; }
+        [Required]
+        public MetricType MetricType { get; set; }
+        [Required]
+        [StringLength(200)]
+        public string Name { get; set; }
+        [Required]
+        public int EntityId { get; set; }
+        public string MetricNumerator { get; set; }
+        public string MetricDenominator { get; set; }
+        [Required]
+        public Guid ConfigurationGuid { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Dtos/KeyValueDto.cs b/src/Strata.ContinuousImprovement.Biz/Dtos/KeyValueDto.cs
new file mode 100644
index 0000000..8073582
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Dtos/KeyValueDto.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Dtos
+{
+    public class KeyValueDto<TKey, TValue>
+    {
+        public TKey Key { get; set;  }
+        public TValue Value { get; set;  }
+
+        public KeyValueDto() { }
+        public KeyValueDto(TKey key, TValue value)
+        {
+            Key = key;
+            Value = value;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Dtos/OpportunityJobResult.cs b/src/Strata.ContinuousImprovement.Biz/Dtos/OpportunityJobResult.cs
new file mode 100644
index 0000000..21e31bb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Dtos/OpportunityJobResult.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Dtos
+
+{
+    public class OpportunityJobResultDto
+    {
+        public Guid JobId { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        public string Message { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Dtos/OpportunityJobResultsDto.cs b/src/Strata.ContinuousImprovement.Biz/Dtos/OpportunityJobResultsDto.cs
new file mode 100644
index 0000000..da4c520
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Dtos/OpportunityJobResultsDto.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Dtos
+{
+    public class OpportunityJobResultsDto
+    {
+        public Guid JobId { get; set; }
+        public Guid OpportunityGuid { get; set; }
+
+        public OpportunityJobResultsDto(Guid jobId, Guid opportunityGuid)
+        {
+            JobId = jobId;
+            OpportunityGuid = opportunityGuid;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Dtos/PROpportunityDto.cs b/src/Strata.ContinuousImprovement.Biz/Dtos/PROpportunityDto.cs
new file mode 100644
index 0000000..5a97b32
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Dtos/PROpportunityDto.cs
@@ -0,0 +1,40 @@
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Dtos
+{
+    [ExcludeFromCodeCoverage]
+    public class PROpportunityDto
+    {
+        [Required]
+        public Guid ConfigurationGuid { get; set; }
+        [Required]
+        public Guid OpportunityGuid { get; set; }
+        [Required]
+        public Guid InitiativeGuid { get; set; }
+        [Required]
+        [StringLength(200)]
+        public string Name { get; set; }
+        [Required]
+        public Guid OwnerGuid { get; set; }
+        public string OwnerName { get; set; }
+        public string Note { get; set; }
+        public string SourceOpportunity { get; set; }
+        public string OpportunityKey { get; set; }
+        public int SourceOpportunityId { get; set; }
+        public bool IsHidden { get; set; }
+        public bool HasInitiative { get; set; }
+        public long OpportunityId { get; set; }
+        [Required]
+        public PayrollGoalType PayrollGoal { get; set; }
+        public bool HasAllDepartments { get; set; }
+        public bool HasAllJobCodes { get; set; }
+        public bool HasAllPayCodes { get; set; }
+        public List<string> Departments { get; set; }
+        public List<string> JobCodes { get; set; }
+        public List<string> PayCodes { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Email/EmailBuilder.cs b/src/Strata.ContinuousImprovement.Biz/Email/EmailBuilder.cs
new file mode 100644
index 0000000..0c8dd98
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Email/EmailBuilder.cs
@@ -0,0 +1,101 @@
+using Microsoft.Extensions.Options;
+using System;
+using System.Collections.Generic;
+using System.Net.Http.Headers;
+using System.Net.Http;
+using System.Net.Mail;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Email
+{
+    public class EmailBuilder : IFluentEmailBuilder, IEmailBuilder, IDisposable
+    {
+        private readonly IHttpClientFactory _httpClientFactory;
+
+        private readonly IOptions<MailGunOption> _option;
+
+        private MultipartFormDataContent _emailContent;
+
+        private bool _isDisposed;
+
+        public EmailBuilder(IHttpClientFactory httpClientFactory, IOptions<MailGunOption> option)
+        {
+            _httpClientFactory = httpClientFactory;
+            _option = option;
+            _emailContent = new MultipartFormDataContent();
+        }
+
+        public IFluentEmailBuilder NewEmail()
+        {
+            if (_emailContent != null)
+            {
+                _emailContent.Dispose();
+            }
+
+            _emailContent = new MultipartFormDataContent();
+            _isDisposed = false;
+            return this;
+        }
+
+        public IFluentEmailBuilder From()
+        {
+            var fromAddress = new MailAddress(_option.Value.FromEmailAddress).ToString();
+
+            _emailContent.Add(new StringContent(fromAddress), "from");
+
+            return this;
+        }
+
+        public IFluentEmailBuilder To(IList<string> toAddresses)
+        {
+            foreach (var toAddress in toAddresses)
+            {
+                _emailContent.Add(new StringContent(toAddress), "to");
+            }
+
+            return this;
+        }
+
+        public IFluentEmailBuilder WithSubject(string subject)
+        {
+            _emailContent.Add(new StringContent(subject), "subject");
+
+            return this;
+        }
+
+        public IFluentEmailBuilder WithHtmlBody(string htmlBody)
+        {
+            _emailContent.Add(new StringContent(htmlBody), "html");
+
+            return this;
+        }
+
+        public async Task<HttpResponseMessage> SendAsync()
+        {
+            var httpClient = _httpClientFactory.CreateClient();
+
+            Uri baseUrl = new(_option.Value.BaseUrl);
+
+            Uri baseAddress = new Uri(baseUrl, $"{_option.Value.Domain}/messages");
+
+            string encodedApiKey = Convert.ToBase64String(Encoding.ASCII.GetBytes($"api:{_option.Value.ApiKey}"));
+
+            httpClient.DefaultRequestHeaders.Authorization =
+                new AuthenticationHeaderValue("Basic", encodedApiKey);
+
+            var result = await httpClient.PostAsync(baseAddress, _emailContent);
+
+            return result;
+        }
+
+        public void Dispose()
+        {
+            if (!_isDisposed)
+            {
+                _emailContent.Dispose();
+                _isDisposed = true;
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Email/EmailInfo.cs b/src/Strata.ContinuousImprovement.Biz/Email/EmailInfo.cs
new file mode 100644
index 0000000..e743041
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Email/EmailInfo.cs
@@ -0,0 +1,8 @@
+namespace Strata.ContinuousImprovement.Biz.Email
+{
+    public class EmailInfo
+    {
+        public string Subject { get; set; } = string.Empty;
+        public string Body { get; set; } = string.Empty;
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Email/EmailNotificationService.cs b/src/Strata.ContinuousImprovement.Biz/Email/EmailNotificationService.cs
new file mode 100644
index 0000000..3ebb81e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Email/EmailNotificationService.cs
@@ -0,0 +1,70 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Microsoft.IdentityModel.Tokens;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Email
+{
+    public class EmailNotificationService(
+         ILogger<EmailNotificationService> logger,
+         IConfiguration config,
+         IEmailBuilder emailBuilder) : IEmailNotificationService
+    {
+        private readonly IEmailBuilder _emailBuilder = emailBuilder;
+
+        private readonly ILogger<EmailNotificationService> _logger = logger;
+
+        public async Task<bool> SendEmailAsync(string recipientEmail, EmailInfo emailInfo)
+        {
+            try
+            {
+                if (recipientEmail.IsNullOrEmpty())
+                {
+                    _logger.LogError("No recipient found for email notification.");
+                    return false;
+                }
+
+                using var email = _emailBuilder.NewEmail()
+                             .From()
+                             .To(new List<string>() { recipientEmail })
+                             .WithSubject(emailInfo.Subject)
+                             .WithHtmlBody(emailInfo.Body);
+
+                var result = await email.SendAsync();
+
+                if (!result.IsSuccessStatusCode)
+                {
+                    _logger.LogError($"Error sending email");
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, "Error sending email notification");
+                return false;
+            }
+        }
+
+        public string BuildEmailBody(string htmlPath, string appVersion)
+        {
+            var templateFilePath = StandardHtmlEmailGenerator.GetPathFromOutputDir(htmlPath);
+            var body = StandardHtmlEmailGenerator.GetEmailContentTemplate(templateFilePath);
+
+            var endpoint = config.GetValue<string>("endPoints:strataJazz");
+            var loginUrl = $"{endpoint}{appVersion}/login.aspx";
+            var logoImage = $"{endpoint}{appVersion}/Res/Images/Email/strata-logo-color.png";
+
+            body = body.Replace("[STRATA_LOGIN_URL]", loginUrl); 
+            body = body.Replace("[STRATA_LOGO_IMAGE]", logoImage);
+            body = body.Replace("[STRATA_COPYRIGHT_YEAR]", (DateTime.Now.Year).ToString());
+
+            return body;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Email/IEmailBuilder.cs b/src/Strata.ContinuousImprovement.Biz/Email/IEmailBuilder.cs
new file mode 100644
index 0000000..59be182
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Email/IEmailBuilder.cs
@@ -0,0 +1,7 @@
+namespace Strata.ContinuousImprovement.Biz.Email
+{
+    public interface IEmailBuilder
+    {
+        IFluentEmailBuilder NewEmail();
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Email/IEmailNotificationService.cs b/src/Strata.ContinuousImprovement.Biz/Email/IEmailNotificationService.cs
new file mode 100644
index 0000000..87c797d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Email/IEmailNotificationService.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Email
+{
+    public interface IEmailNotificationService
+    {
+        Task<bool> SendEmailAsync(string recipientEmail, EmailInfo emailInfo);
+        string BuildEmailBody(string htmlPath, string appVersion);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Email/IFluentEmailBuilder.cs b/src/Strata.ContinuousImprovement.Biz/Email/IFluentEmailBuilder.cs
new file mode 100644
index 0000000..2fcb2e2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Email/IFluentEmailBuilder.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Email
+{
+    public interface IFluentEmailBuilder : IDisposable
+    {
+        IFluentEmailBuilder From();
+
+        IFluentEmailBuilder To(IList<string> toAddresses);
+
+        IFluentEmailBuilder WithSubject(string subject);
+
+        IFluentEmailBuilder WithHtmlBody(string htmlBody);
+
+        Task<HttpResponseMessage> SendAsync();
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Email/MailGunOption.cs b/src/Strata.ContinuousImprovement.Biz/Email/MailGunOption.cs
new file mode 100644
index 0000000..6069c45
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Email/MailGunOption.cs
@@ -0,0 +1,11 @@
+namespace Strata.ContinuousImprovement.Biz.Email
+{
+    public class MailGunOption
+    {
+        public const string MailGun = "MailGun";
+        public string ApiKey { get; set; }
+        public string BaseUrl { get; set; }
+        public string Domain { get; set; }
+        public string FromEmailAddress { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Email/StandardHTMLEmailGenerator.cs b/src/Strata.ContinuousImprovement.Biz/Email/StandardHTMLEmailGenerator.cs
new file mode 100644
index 0000000..63a0a51
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Email/StandardHTMLEmailGenerator.cs
@@ -0,0 +1,27 @@
+using System;
+using System.IO;
+
+namespace Strata.ContinuousImprovement.Biz.Email
+{
+    public class StandardHtmlEmailGenerator
+    {
+        public static string GetEmailContentTemplate(string filePath)
+        {
+            var htmlContent = string.Empty;
+            using (var sourceReader = File.OpenText(filePath))
+            {
+                htmlContent += sourceReader.ReadToEnd();
+            }
+
+            return htmlContent;
+        }
+
+        public static string GetPathFromOutputDir(string relativePath)
+        {
+            var baseDirectory = AppContext.BaseDirectory?.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar) ?? string.Empty;
+            var sanitizedRelativePath = (relativePath ?? string.Empty).TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+            return Path.Combine(baseDirectory, sanitizedRelativePath);
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/ENOpportunityDetailJob.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/ENOpportunityDetailJob.cs
new file mode 100644
index 0000000..91edd34
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/ENOpportunityDetailJob.cs
@@ -0,0 +1,209 @@
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Newtonsoft.Json;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Hangfire.Filters;
+using Strata.Id.Client;
+using Strata.Schema.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter
+{
+    public class ENOpportunityDetailJob
+    {
+        protected readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly IFiscalMonthResolver _fiscalMonthResolver;
+        private readonly IHubContext<NotificationHub, INotificationHub> _notificationHubContext;
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly ILogger<ENOpportunityDetailJob> _logger;
+        private readonly ISchemaServiceClient _schemaServiceClient;
+
+        public ENOpportunityDetailJob(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            IFiscalMonthResolver fiscalMonthResolver,
+            IHubContext<NotificationHub, INotificationHub> notificationHubContext,
+            IIdServiceClient idServiceClient,
+            ILogger<ENOpportunityDetailJob> logger,
+            ISchemaServiceClient schemaServiceClient)
+        {
+            _dbContextFactory = dbContextFactory;
+            _fiscalMonthResolver = fiscalMonthResolver;
+            _notificationHubContext = notificationHubContext;
+            _idServiceClient = idServiceClient;
+            _logger = logger;
+            _schemaServiceClient = schemaServiceClient;
+        }
+
+        public async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Populate Encounter details for {1} on ({0})")]
+        [CaptureClaimsPrincipal]
+        [Semaphore(nameof(PopulateOpportunityDetailsAsync))]
+        public async Task PopulateOpportunityDetailsAsync(int strataId, string name, Guid opportunityGuid, Guid dbGuid, bool isUpdate, bool isTempoPage, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await GetDbContext(cancellationToken);
+            dbContext.Database.SetCommandTimeout(TimeSpan.FromMinutes(30));
+
+            try
+            {
+                var hub = _notificationHubContext.Clients.Group(name);
+                if (isUpdate)
+                {
+                    await hub.SendOpportunityUpdateDetails(name, 0);
+                }
+                else
+                {
+                    await hub.SendOpportunityCreateDetails(name, 0);
+                }
+
+                var opportunity = await dbContext.ENOpportunities.SingleOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid);
+                if (opportunity == null)
+                {
+                    throw new ArgumentException($"Opportunity Not Found for opportunty guid {opportunityGuid}", nameof(opportunityGuid));
+                }
+                var configuration = await dbContext.Configurations.SingleOrDefaultAsync(c => c.ConfigurationGuid == opportunity.ConfigurationGuid, cancellationToken);
+
+                configuration.FiscalMonthResolver = _fiscalMonthResolver;
+                var opportunityFilters = JsonConvert.DeserializeObject<ENOpportunityBaseFilters>(opportunity.EncounterOpportunityJSON,
+                    new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace });
+                var opportunityLevel = opportunityFilters.EncounterOpportunityLevel;
+
+                if (isUpdate)
+                {
+                    var existingMetricData = await dbContext.EncounterOpportunityMetricData.Where(data => data.OpportunityGUID == opportunityGuid).ToListAsync();
+                    dbContext.EncounterOpportunityMetricData.RemoveRange(existingMetricData);
+                }
+
+                var oppMetrics = (await MetricData(opportunity, configuration)).ToList();
+                var months = Enumerable.Range(1, 12).ToList();
+                var monthlyMetrics = oppMetrics.SelectMany(metric => months.ConvertAll(month => new ENOpportunityMetricData(metric, month, true))).ToList();
+
+                var monthlyResults = await dbContext.GetENOpportunityDetailQuery(opportunity, configuration, _schemaServiceClient, _logger, dbGuid);
+                monthlyResults.ForEach(result => result.IsBaseline = true);
+
+                monthlyMetrics.ForEach(metric =>
+                    metric.UpdateDataWithGoals(monthlyResults.Find(result => result.IsEquivalent(metric))));
+
+                monthlyResults.RemoveAll(result => monthlyMetrics.Exists(metric => result.IsEquivalent(metric)));
+
+                var defaultNames = oppMetrics.GroupBy(r => r.LevelID)
+                    .ToDictionary(g => g.Key, g => g.FirstOrDefault(o => o.LevelID == g.Key && !string.IsNullOrEmpty(o.Name))?.Name ?? string.Empty);
+                monthlyMetrics.AddRange(monthlyResults.ConvertAll(r =>
+                    r.EncounterMetricData(true, opportunityGuid, opportunityFilters.OpportunityLevel, defaultNames)));
+
+                dbContext.EncounterOpportunityMetricData.AddRange(monthlyMetrics);
+
+                await dbContext.SaveChangesAsync();
+
+                await hub.SendOpportunityCreateUpdateSuccess(opportunity.OpportunityGuid, isTempoPage, opportunity.Name, isUpdate, OpportunityTypes.Encounter);
+            }
+            catch (Exception ex)
+            {
+                var db = (await _idServiceClient.GetStrataIds()).SingleOrDefault(i => i.StrataId == strataId);
+                if (db == null)
+                {
+                    _logger.LogContextError(ex, dbContext, nameof(PopulateOpportunityDetailsAsync),
+                        new Dictionary<string, object>
+                        {
+                            { nameof(strataId), strataId  },
+                            { nameof(name), name },
+                            { nameof(opportunityGuid), opportunityGuid },
+                            { nameof(dbGuid), dbGuid },
+                            { nameof(isUpdate), isUpdate }
+                        });
+                }
+                else
+                {
+                    _logger.LogContextError(ex, db, nameof(PopulateOpportunityDetailsAsync),
+                        new Dictionary<string, object>
+                        {
+                            { nameof(strataId), strataId  },
+                            { nameof(name), name },
+                            { nameof(opportunityGuid), opportunityGuid },
+                            { nameof(dbGuid), dbGuid },
+                            { nameof(isUpdate), isUpdate }
+                        });
+                }
+                await _notificationHubContext.Clients.Group(name).SendOpportunityCreateError(name);
+            }
+        }
+
+        internal class EncounterOpportunityMetricCohort
+        {
+            public int CohortID { get; set; }
+            public string CohortName { get; set; }
+            public EncounterOpportunityMetricCohort(int id, string name)
+            {
+                CohortID = id;
+                CohortName = name;
+            }
+        }
+
+        private async Task<IEnumerable<ENOpportunityMetricData>> MetricData(ENOpportunityDataModel opportunity, Configuration.Configuration config)
+        {
+            var cohorts = new List<EncounterOpportunityMetricCohort>();
+            var opportunityFilters = JsonConvert.DeserializeObject<ENOpportunityBaseFilters>(opportunity.EncounterOpportunityJSON,
+                new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace });
+            switch (opportunityFilters.OpportunityLevel)
+            {
+                case "Entity":
+                    var entityDimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync(config.IsUsingCustomEntityDimension ? config.DepartmentRollupGlobalId : "Entity");
+                    var entities = await _schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(entityDimension.DimensionGuid,
+                        opportunityFilters.Entities.Select(sl => sl.Id));
+                    cohorts = entities.Select(e => new EncounterOpportunityMetricCohort(Int32.Parse(e.Id), e.Name)).ToList();
+                    break;
+                case "ServiceLine":
+                    if (config.ServiceLineDimensionGuid != Guid.Empty)
+                    {
+                        var hierarchyElements = await _schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(config.ServiceLineDimensionGuid,
+                            opportunityFilters.ServiceLines.Select(sl => sl.Id));
+                        cohorts = hierarchyElements.Select(e => new EncounterOpportunityMetricCohort(Int32.Parse(e.Id), e.Name)).ToList();
+                    }
+                    else
+                    {
+                        var dimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync("Service Line");
+                        var hierarchyElements = await _schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid,
+                            opportunityFilters.ServiceLines.Select(sl => sl.Id));
+                        cohorts = hierarchyElements.Select(e => new EncounterOpportunityMetricCohort(Int32.Parse(e.Id), e.Name)).ToList();
+                    }
+                    break;
+                case "Specialty":
+                    var specialtyDimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync("DSS Physician Specialty");
+                    var specialties = await _schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(specialtyDimension.DimensionGuid,
+                        opportunityFilters.Specialties.Select(sl => sl.Id));
+                    cohorts = specialties.Select(e => new EncounterOpportunityMetricCohort(Int32.Parse(e.Id), e.Name)).ToList();
+                    break;
+                case "Provider":
+                    var providerDimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync("Physician Primary");
+                    var providers = await _schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(providerDimension.DimensionGuid,
+                        opportunityFilters.Providers.Select(sl => sl.Id));
+                    cohorts = providers.Select(e => new EncounterOpportunityMetricCohort(Int32.Parse(e.Id), e.Name)).ToList();
+                    break;
+                default:
+                    cohorts = new List<EncounterOpportunityMetricCohort> { new EncounterOpportunityMetricCohort(0, string.Empty) };
+                    break;
+            }
+            return cohorts?.Select(c => new ENOpportunityMetricData(c.CohortID, opportunityFilters.OpportunityLevel, c.CohortName, opportunity.OpportunityGuid) { IsBaseline = true }).ToList();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/EncounterOpportunityMetric.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/EncounterOpportunityMetric.cs
new file mode 100644
index 0000000..49fb327
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/EncounterOpportunityMetric.cs
@@ -0,0 +1,54 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter
+{
+    public class EncounterOpportunityMetric
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public string Name { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        public Guid AuthorGuid { get; set; }
+        public string AuthorName { get; set; }
+        public decimal BaselineValue;
+        public decimal GoalValue;
+        public int EncounterGroup { get; set; }
+        public bool IsSeasonal { get; set; }
+        public List<FilterHelper> CaseTypes { get; set; }
+        public List<FilterHelper> PatientPopulations { get; set; }
+        public string OpportunityLevel { get; set; }
+
+        public OpportunityLevel EncounterOpportunityLevel =>
+            Enum.TryParse(OpportunityLevel, true, out OpportunityLevel level)
+                ? level
+                : Shared.OpportunityLevel.Organization;
+
+        public List<FilterHelper> Entities { get; set; }
+        public List<FilterHelper> ServiceLines { get; set; }
+        public List<FilterHelper> Specialties { get; set; }
+        public List<FilterHelper> Providers { get; set; }
+
+        public bool IsBaseline { get; set; } = true;
+
+        public EncounterOpportunityMetric()
+        {
+            Name = string.Empty;
+            OpportunityGuid = Guid.Empty;
+            EncounterGroup = 0;
+            OpportunityLevel = string.Empty;
+            CaseTypes = new List<FilterHelper>();
+            PatientPopulations = new List<FilterHelper>();
+            Entities = new List<FilterHelper>();
+            ServiceLines = new List<FilterHelper>();
+            Specialties = new List<FilterHelper>();
+            Providers = new List<FilterHelper>();
+        }
+    }
+
+    public class FilterHelper
+    {
+        public string Text { get; set; }
+        public string Id { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Initiatives/ENInitiativeService.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Initiatives/ENInitiativeService.cs
new file mode 100644
index 0000000..17e87f5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Initiatives/ENInitiativeService.cs
@@ -0,0 +1,62 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Initiatives
+{
+    public class ENInitiativeService : InitiativeCreateService, IENInitiativeService
+    {
+        public ENInitiativeService(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            IInitiativeSavingsService initiativeSavingsService,
+            IAuthorizationServiceClient authorizationServiceClient,
+            IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            ILogger<ENInitiativeService> logger)
+            : base(dbContextFactory, initiativeSavingsService, authorizationServiceClient, updateFactOpportunitySavingsService, logger)
+        {
+        }
+
+        public override async Task<IOpportunity> GetOpportunity(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            return dbContext.EncounterOpportunities.SingleOrDefault(opp => opp.OpportunityGuid == opportunityGuid) as IOpportunity;
+        }
+
+        public override async Task SaveOpportunity(Guid opportunityGuid, Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var opportunity = dbContext.EncounterOpportunities.SingleOrDefault(opp => opp.OpportunityGuid == opportunityGuid);
+            if (opportunity == null) { return; }
+
+            opportunity.InitiativeGuid = initiativeGuid;
+            await dbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task<bool> UpdateSavings(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await GetDbContext(cancellationToken);
+            var opportunity = await dbContext.Set<ENOpportunityDataModel>().SingleOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+            if (opportunity == null) { return false; }
+            if (opportunity.InitiativeGuid == Guid.Empty) { return true; }   // no initiative to update
+
+            var initiative = await dbContext.Initiatives.SingleOrDefaultAsync(init => init.InitiativeGUID == opportunity.InitiativeGuid, cancellationToken);
+            if (initiative == null) { return false; }
+
+            var baselineMetrics = await dbContext.Set<ENOpportunityMetricData>()
+                .Where(data => data.OpportunityGUID == opportunityGuid && data.IsBaseline).ToListAsync(cancellationToken);
+            opportunity.Savings = Math.Round(baselineMetrics.Sum(x => x.MarginImprovement), 2);
+
+            await dbContext.SaveChangesAsync(cancellationToken);
+            return true;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Initiatives/EncounterInitiativeCostType.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Initiatives/EncounterInitiativeCostType.cs
new file mode 100644
index 0000000..8260510
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Initiatives/EncounterInitiativeCostType.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.Encounter.Initiatives
+{
+    public enum EncounterInitiativeCostType
+    {
+        EncounterSummary = 0,
+        CSF = 1,
+        DetailBilling = 2
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Initiatives/EncounterInitiativeDto.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Initiatives/EncounterInitiativeDto.cs
new file mode 100644
index 0000000..45f5b47
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Initiatives/EncounterInitiativeDto.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Initiatives
+{
+    public class EncounterInitiativeDto : InitiativeDto
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public int EncounterGroup { get; set; }
+        public int OpportunityLevel { get; set; }
+        public List<string> EncounterGroups { get; set; }
+        public List<string> OpportunityLevels { get; set; }
+        public bool IsSeasonal { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Initiatives/IENInitiativeService.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Initiatives/IENInitiativeService.cs
new file mode 100644
index 0000000..9623fc5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Initiatives/IENInitiativeService.cs
@@ -0,0 +1,13 @@
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Initiatives
+{
+    public interface IENInitiativeService : IInitiativeCreateService
+    {
+        Task<bool> UpdateSavings(Guid opportunityGuid, CancellationToken cancellationToken);
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunity.cs
new file mode 100644
index 0000000..d846956
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunity.cs
@@ -0,0 +1,20 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities
+{
+    [Table("viewEncounterOpportunity", Schema = "cci")]
+    public class ENOpportunity : Opportunity
+    {
+        public string Name { get; set; }
+        public double Cases { get; set; }
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public EncounterGroup EncounterGroup { get; set; }
+        public string EncounterGroupValue { get; set; }
+        public string OpportunityLevel { get; set; }
+        public bool IsSeasonal { get; set; }
+        public long OpportunityId { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityDataModel.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityDataModel.cs
new file mode 100644
index 0000000..a140f2f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityDataModel.cs
@@ -0,0 +1,60 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities
+{
+    [Table("EncounterOpportunity", Schema = "cci")]
+    public class ENOpportunityDataModel : IOpportunity, IWithAuthor
+    {
+        [Key]
+        public Guid OpportunityGuid { get; set; }
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long OpportunityId { get; set; }
+        public string EncounterOpportunityJSON { get; set; }
+        public string Name { get; set; }
+        public DateTime DateCreated { get; set; }
+        public DateTime EndDate { get; set; }
+        public byte OpportunityType { get; set; }
+        public Guid OwnerGuid { get; set; }
+        public string OwnerName { get; set; } = string.Empty;
+        public Guid AuthorGuid { get; set; }
+        public string AuthorName { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public double Savings { get; set; }
+        [NotMapped]
+        public double IdentifiedSavings { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public bool HasInitiative => InitiativeGuid != Guid.Empty;
+        [NotMapped]
+        public string Initiative { get; set; }
+        public bool IsHidden { get; set; }
+        public string Note { get; set; } = String.Empty;
+
+        [NotMapped]
+        public string SourceOpportunity { get; set; } = "";
+        [NotMapped]
+        public long SourceOpportunityId { get; set; } = -1;
+
+        public virtual void Update(IOpportunity updates)
+        {
+            IdentifiedSavings = updates.IdentifiedSavings;
+            InitiativeGuid = updates.InitiativeGuid;
+            IsHidden = updates.IsHidden;
+            Note = updates.Note;
+        }
+
+        // IOpportunity properties needed to implement interface
+        [NotMapped]
+        public string OpportunityKey
+        {
+            get
+            {
+                return $"EN - {OpportunityId}";
+            }
+            set { }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityDataModelMapper.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityDataModelMapper.cs
new file mode 100644
index 0000000..d90b65e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityDataModelMapper.cs
@@ -0,0 +1,164 @@
+using Newtonsoft.Json;
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Encounter.Initiatives;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class ENOpportunityDataModelMapper
+    {
+        public static ENOpportunityDataModelWithFilters MapToDataModel(this EncounterInitiativeDto src, ClaimsPrincipal user, bool isCreated = true)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) return default;
+            if (!isCreated) mapped.OpportunityGuid = src.OpportunityGuid;
+            mapped.MapAuthor(user);
+            mapped.OpportunityLevel = Enum.GetName(typeof(OpportunityLevel), src.OpportunityLevel);
+            if (src.EncounterGroup == (int)EncounterGroup.CaseType)
+            {
+                mapped.CaseTypes = src.EncounterGroups.MapToFilterHelpers();
+            }
+            else
+            {
+                mapped.PatientPopulations = src.EncounterGroups.MapToFilterHelpers();
+            }
+            switch (src.OpportunityLevel)
+            {
+                case (int)OpportunityLevel.Entity:
+                    mapped.Entities = src.OpportunityLevels.MapToFilterHelpers();
+                    break;
+                case (int)OpportunityLevel.ServiceLine:
+                    mapped.ServiceLines = src.OpportunityLevels.MapToFilterHelpers();
+                    break;
+                case (int)OpportunityLevel.Specialty:
+                    mapped.Specialties = src.OpportunityLevels.MapToFilterHelpers();
+                    break;
+                case (int)OpportunityLevel.Provider:
+                    mapped.Providers = src.OpportunityLevels.MapToFilterHelpers();
+                    break;
+            }
+            return mapped;
+        }
+
+        public static ENOpportunityDataModelWithFilters MapToDataModel(this ENOpportunityDto src, ClaimsPrincipal user, bool isCreated = true)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) return default;
+            if (!isCreated) mapped.OpportunityGuid = src.OpportunityGuid;
+            mapped.MapAuthor(user);
+            mapped.OpportunityLevel = Enum.GetName(typeof(OpportunityLevel), src.OpportunityLevel);
+            if (src.EncounterGroup == (int)EncounterGroup.CaseType)
+            {
+                mapped.CaseTypes = isCreated ? src.EncounterGroups.MapToFilterHelpers() : src.EncounterGroupIds.MapToFilterHelpers();
+            }
+            else
+            {
+                mapped.PatientPopulations = isCreated ? src.EncounterGroups.MapToFilterHelpers() : src.EncounterGroupIds.MapToFilterHelpers();
+            }
+            switch (src.OpportunityLevel)
+            {
+                case (int)OpportunityLevel.Entity:
+                    mapped.Entities = isCreated ? src.OpportunityLevels.MapToFilterHelpers() : src.OpportunityLevelIds.MapToFilterHelpers();
+                    break;
+                case (int)OpportunityLevel.ServiceLine:
+                    mapped.ServiceLines = isCreated ? src.OpportunityLevels.MapToFilterHelpers() : src.OpportunityLevelIds.MapToFilterHelpers();
+                    break;
+                case (int)OpportunityLevel.Specialty:
+                    mapped.Specialties = isCreated ? src.OpportunityLevels.MapToFilterHelpers() : src.OpportunityLevelIds.MapToFilterHelpers();
+                    break;
+                case (int)OpportunityLevel.Provider:
+                    mapped.Providers = isCreated ? src.OpportunityLevels.MapToFilterHelpers() : src.OpportunityLevelIds.MapToFilterHelpers();
+                    break;
+            }
+            return mapped;
+        }
+
+        public static ENOpportunityDataModel MapToDataModel(this ENOpportunityDataModelWithFilters src, ClaimsPrincipal user)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) return default;
+            mapped.MapAuthor(user);
+            mapped.EncounterOpportunityJSON = System.Text.Json.JsonSerializer.Serialize((ENOpportunityBaseFilters)src);
+            return mapped;
+        }
+
+        public static ENOpportunityDto MapToDto(this ENOpportunityDataModel src)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) { return default; }
+            if (!string.IsNullOrEmpty(src.EncounterOpportunityJSON))
+            {
+                var opportunityInfo = JsonConvert.DeserializeObject<ENOpportunityBaseFilters>(src.EncounterOpportunityJSON, new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace });
+                mapped.EncounterGroup = opportunityInfo.EncounterGroup;
+                mapped.EncounterGroups = opportunityInfo.EncounterGroup == (int)EncounterGroup.CaseType
+                    ? opportunityInfo.CaseTypes.Select(ct => ct.Text).ToList() : opportunityInfo.PatientPopulations.Select(ct => ct.Text).ToList();
+                mapped.EncounterGroupIds = opportunityInfo.EncounterGroup == (int)EncounterGroup.CaseType
+                    ? opportunityInfo.CaseTypes.Select(ct => ct.Id).ToList() : opportunityInfo.PatientPopulations.Select(ct => ct.Id).ToList();
+                mapped.OpportunityLevelIds = GetOpportunityLevels(opportunityInfo);
+                mapped.IsSeasonal = opportunityInfo.IsSeasonal;
+                mapped.OpportunityLevel = (int)opportunityInfo.EncounterOpportunityLevel;
+            }
+            return mapped;
+        }
+
+        public static ENOpportunitySaveModel MapToSaveModel(this ENOpportunityDto src)
+        {
+            var mapped = MapDtoToSaveModel(src);
+            if (mapped == null) { return default; }
+            var opportunityInfo = JsonConvert.DeserializeObject<ENOpportunityBaseFilters>(src.EncounterOpportunityJSON, new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace });
+
+            mapped.EncounterGroup = opportunityInfo.EncounterGroup;
+            mapped.IsSeasonal = opportunityInfo.IsSeasonal;
+            mapped.OpportunityLevel = (int)Enum.Parse<OpportunityLevel>(opportunityInfo.OpportunityLevel, true);
+            mapped.EncounterGroups = opportunityInfo.EncounterGroup == (int)EncounterGroup.CaseType
+                ? opportunityInfo.CaseTypes.Select(ct => ct.Id).ToList()
+                : opportunityInfo.PatientPopulations.Select(ct => ct.Id).ToList();
+            mapped.OpportunityLevels = mapped.OpportunityLevel == (int)OpportunityLevel.Organization
+                ? new List<string> { "System" }
+                : opportunityInfo.Entities.Select(ct => ct.Id).ToList();
+            mapped.OpportunityLevelLabel = opportunityInfo.OpportunityLevel;
+            mapped.OpportunityLevels = GetOpportunityLevels(opportunityInfo);
+
+            return mapped;
+        }
+
+        public static partial EncounterOpportunityMetric MapFromDataModel(this ENOpportunityDataModelWithFilters src);
+        private static partial ENOpportunityDataModel Mapped(this ENOpportunityDataModelWithFilters src);
+        private static partial ENOpportunityDto Mapped(this ENOpportunityDataModel src);
+        private static partial ENOpportunitySaveModel MapDtoToSaveModel(this ENOpportunityDto src);
+
+        [MapperIgnoreTarget(nameof(ENOpportunityDataModelWithFilters.OpportunityGuid))]
+        [MapperIgnoreTarget(nameof(ENOpportunityDataModelWithFilters.OpportunityLevel))]
+        [MapProperty(nameof(EncounterInitiativeDto.OpportunityLevel), nameof(ENOpportunityDataModelWithFilters.EncounterOpportunityLevel))]
+        private static partial ENOpportunityDataModelWithFilters Mapped(EncounterInitiativeDto src);
+
+        [MapperIgnoreTarget(nameof(ENOpportunityDataModelWithFilters.OpportunityGuid))]
+        [MapProperty(nameof(ENOpportunityDto.OpportunityLevel), nameof(ENOpportunityDataModelWithFilters.EncounterOpportunityLevel))]
+        private static partial ENOpportunityDataModelWithFilters Mapped(ENOpportunityDto src);
+
+        private static List<string> GetOpportunityLevels(ENOpportunityBaseFilters opportunityInfo)
+        {
+            switch (opportunityInfo.EncounterOpportunityLevel)
+            {
+                case OpportunityLevel.Entity:
+                    return opportunityInfo.Entities.Select(ct => ct.Id).ToList();
+                case OpportunityLevel.ServiceLine:
+                    return opportunityInfo.ServiceLines.Select(ct => ct.Id).ToList();
+                case OpportunityLevel.Specialty:
+                    return opportunityInfo.Specialties.Select(ct => ct.Id).ToList();
+                case OpportunityLevel.Provider:
+                    return opportunityInfo.Providers.Select(ct => ct.Id).ToList();
+                default:
+                    return default;
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityDataModelWithFilters.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityDataModelWithFilters.cs
new file mode 100644
index 0000000..7d6722f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityDataModelWithFilters.cs
@@ -0,0 +1,29 @@
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities
+{
+    public class ENOpportunityDataModelWithFilters : ENOpportunityBaseFilters,  IWithAuthor
+    {
+        public Guid OpportunityGuid { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public string Name { get; set; }
+        public DateTime DateCreated { get; set; }
+        public Guid AuthorGuid { get; set; }
+        public string AuthorName { get; set; }
+
+        public ENOpportunityDataModelWithFilters()
+        {
+            OpportunityGuid = Guid.NewGuid();
+            CaseTypes = new List<FilterHelper>();
+            PatientPopulations = new List<FilterHelper>();
+            Entities = new List<FilterHelper>();
+            ServiceLines = new List<FilterHelper>();
+            Specialties = new List<FilterHelper>();
+            Providers = new List<FilterHelper>();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityMetricData.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityMetricData.cs
new file mode 100644
index 0000000..af64fb3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityMetricData.cs
@@ -0,0 +1,88 @@
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities
+{
+    [Table("EncounterOpportunityMetricData", Schema = "cci")]
+    public class ENOpportunityMetricData
+    {
+        [Key]
+        public Guid EncounterOpportunityMetricDataGUID { get; set; }
+        public Guid OpportunityGUID { get; set; }
+        public int LevelID { get; set; }
+        public int Month { get; set; }
+        public string Level { get; set; }
+        public string Name { get; set; }
+        public double Volume { get; set; }
+        public bool IsBaseline { get; set; }
+        public double Revenue { get; set; }
+        public double Cost { get; set; }
+        public double Margin { get; set; }
+        public double GoalVolume { get; set; }
+        public double GoalRevenuePerCase { get; set; }
+        public double GoalCostPerCase { get; set; }
+        public double GoalRevenue => GoalRevenuePerCase * GoalVolume;
+        public double RevenueImprovement => GoalRevenue - Revenue;
+        public double GoalCost => GoalCostPerCase * GoalVolume;
+        public double CostImprovement => Cost - GoalCost;
+        public double GoalMargin => GoalRevenue - GoalCost;
+        public double MarginImprovement => GoalMargin - Margin;
+        public double GoalMarginPerCase => GoalVolume == 0
+            ? GoalRevenuePerCase - GoalCostPerCase
+            : GoalMargin.DivideBy(GoalVolume);
+
+
+        [NotMapped]
+        public double RevenuePerCase => Revenue.DivideBy(Volume);
+
+        [NotMapped]
+        public double CostPerCase => Cost.DivideBy(Volume);
+
+        [NotMapped]
+        public double MarginPerCase => Margin.DivideBy(Volume);
+
+        public ENOpportunityMetricData(int id, string level, string name, Guid oppGuid)
+        {
+            OpportunityGUID = oppGuid;
+            LevelID = id;
+            Level = level;
+            Name = name;
+            Volume = 0;
+            GoalVolume = 0;
+            Revenue = 0;
+            GoalRevenuePerCase = 0;
+            Cost = 0;
+            GoalCostPerCase = 0;
+            Margin = 0;
+            IsBaseline = false;
+        }
+
+        public ENOpportunityMetricData() { }
+        public ENOpportunityMetricData(ENOpportunityMetricData metric, int month, bool isBaseline) 
+        {
+            Month = month;
+            IsBaseline = true;
+            Name = metric.Name;
+            Level = metric.Level;
+            LevelID = metric.LevelID;
+            OpportunityGUID = metric.OpportunityGUID;
+        }
+
+        public void UpdateDataWithGoals(OpportunityMetricCohortData result, bool isBaseline = true)
+        {
+            if (result == null) return;
+            Volume = result.Volume;
+            Revenue = (double)result.Revenue;
+            Cost = (double)result.Cost;
+            Margin = (double)result.Margin;
+            GoalVolume = result.Volume;
+            GoalRevenuePerCase = (double)result.RevenuePerCase;
+            GoalCostPerCase = (double)result.CostPerCase;
+            IsBaseline = isBaseline;
+            Month = result.Month;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityRowData.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityRowData.cs
new file mode 100644
index 0000000..3f3d099
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityRowData.cs
@@ -0,0 +1,78 @@
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities
+{
+    public class ENOpportunityRowData
+    {
+        public string Text { get; set; }
+        public int LevelId { get; set; }
+        public double Volume { get; set; }
+        public double RevenuePerCase { get; set; }
+        public double RevenueTotal { get; set; }
+        public double CostPerCase { get; set; }
+        public double CostTotal { get; set; }
+        public double MarginPerCase { get; set; }
+        public double MarginTotal { get; set; }
+
+        public ENOpportunityRowData() { }
+
+        public static KeyValuePair<string, List<ENOpportunityRowData>> KeyValuePair(IGrouping<int, ENOpportunityMetricData> metricGroup)
+            => new KeyValuePair<string, List<ENOpportunityRowData>>(
+                string.IsNullOrEmpty(metricGroup.First().Name) ? "System" : metricGroup.First().Name,
+                GridData(metricGroup)
+            );
+
+        public static List<ENOpportunityRowData> GridData(IGrouping<int, ENOpportunityMetricData> metricGroup)
+            => new List<ENOpportunityRowData>
+            {
+                BaselineData(metricGroup),
+                GoalData(metricGroup)
+            };
+
+        public static ENOpportunityRowData BaselineData(IGrouping<int, ENOpportunityMetricData> metricGroup)
+        {
+            return new ENOpportunityRowData
+            {
+                Text = "Baseline",
+                LevelId = metricGroup.Key,
+                Volume = metricGroup.Sum(m => m.Volume),
+                RevenuePerCase = metricGroup.WeightedAverage(m => m.RevenuePerCase, m => m.Volume),
+                RevenueTotal = metricGroup.Sum(m => m.Revenue),
+                CostPerCase = metricGroup.WeightedAverage(m => m.CostPerCase, m => m.Volume),
+                CostTotal = metricGroup.Sum(m => m.Cost),
+                MarginPerCase = metricGroup.WeightedAverage(m => m.MarginPerCase, m => m.Volume),
+                MarginTotal = metricGroup.Sum(m => m.Margin)
+            };
+        }
+
+        public static ENOpportunityRowData GoalData(IGrouping<int, ENOpportunityMetricData> metricGroup)
+        {
+            var baselineData = new ENOpportunityRowData
+            {
+                Text = "Goal",
+                LevelId = metricGroup.Key,
+                Volume = metricGroup.Sum(m => m.GoalVolume),
+                RevenuePerCase = metricGroup.WeightedAverage(m => m.GoalRevenuePerCase, m => m.Volume),
+                RevenueTotal = metricGroup.Sum(m => m.GoalRevenue),
+                CostPerCase = metricGroup.WeightedAverage(m => m.GoalCostPerCase, m => m.Volume),
+                CostTotal = metricGroup.Sum(m => m.GoalCost),
+                MarginPerCase = metricGroup.WeightedAverage(m => m.GoalMarginPerCase, m => m.Volume),
+                MarginTotal = metricGroup.Sum(m => m.GoalMargin)
+            };
+
+            if ((baselineData.RevenueTotal != 0 || metricGroup.Sum(m => m.GoalRevenuePerCase) != 0) && baselineData.RevenuePerCase == 0)
+                baselineData.RevenuePerCase = metricGroup.First(m => m.GoalRevenuePerCase != 0).GoalRevenuePerCase;
+            if ((baselineData.CostTotal != 0 || metricGroup.Sum(m => m.GoalCostPerCase) != 0) && baselineData.CostPerCase == 0)
+                baselineData.CostPerCase = metricGroup.First(m => m.GoalCostPerCase != 0).GoalCostPerCase;
+            if ((baselineData.MarginTotal != 0 || metricGroup.Sum(m => m.GoalMarginPerCase) != 0) && baselineData.MarginPerCase == 0)
+            {
+                baselineData.MarginPerCase = baselineData.Volume == 0
+                    ? baselineData.RevenuePerCase - baselineData.CostPerCase
+                    : metricGroup.First(m => m.GoalMarginPerCase != 0).GoalMarginPerCase;
+            }
+            return baselineData;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityRowDataChanges.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityRowDataChanges.cs
new file mode 100644
index 0000000..4d87de9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityRowDataChanges.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities
+{
+    public class ENOpportunityRowDataChanges
+    {
+        public int LevelId { get; set; }
+        public double Volume { get; set; }
+        public double RevenuePerCase { get; set; }
+        public double CostPerCase { get; set; }        
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunitySaveModel.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunitySaveModel.cs
new file mode 100644
index 0000000..97b0909
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunitySaveModel.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities
+{
+    public class ENOpportunitySaveModel
+    {
+        public Guid OpportunityGuid { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public string Name { get; set; }
+        public bool IsSeasonal { get; set; }
+        public string EncounterOpportunityJSON { get; set; }
+        public int OpportunityLevel { get; set; }
+        public string OpportunityLevelLabel { get; set; }
+        public string OpportunityLevelJson { get; set; }
+
+        [Required]
+        public int EncounterGroup { get; set; }
+
+        [NotMapped]
+        public bool IsFromWizard { get; set; }
+        [NotMapped]
+        public IEnumerable<string> EncounterGroups { get; set; }
+        [NotMapped]
+        public IEnumerable<string> OpportunityLevels { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityService.cs
new file mode 100644
index 0000000..92a8e21
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/ENOpportunityService.cs
@@ -0,0 +1,451 @@
+using ClosedXML.Excel;
+using Hangfire;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using MoreLinq;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Export;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Id.Client;
+using Strata.Schema.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities
+{
+    public class ENOpportunityService : OpportunityService<ENOpportunity>, IENOpportunityService
+    {
+        private readonly IJazzHangfireServiceClient _hangfireServiceClient;
+        private readonly ISchemaServiceClient _schemaServiceClient;
+        private readonly IConfigurationService _configurationService;
+        private readonly IFiscalMonthResolver _fiscalMonthResolver;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+        private readonly IAuthorizationServiceClient _authorizationServiceClient;
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly IHubContext<NotificationHub, INotificationHub> _notificationHubContext;
+
+        internal ENOpportunityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IInitiativeService initiativeService, IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor, initiativeService, updateFactOpportunitySavingsService)
+        {
+        }
+
+        public ENOpportunityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            ISchemaServiceClient schemaServiceClient,
+            IJazzHangfireServiceClient hangfireServiceClient,
+            IConfigurationService configurationService,
+            IFiscalMonthResolver fiscalMonthResolver,
+            IInitiativeService initiativeService,
+            IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            IBackgroundJobClient backgroundJobClient,
+            IIdServiceClient idServiceClient,
+            IHubContext<NotificationHub, INotificationHub> notificationHubContext,
+            IAuthorizationServiceClient authorizationServiceClient)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor, initiativeService, updateFactOpportunitySavingsService)
+        {
+            _hangfireServiceClient = hangfireServiceClient;
+            _schemaServiceClient = schemaServiceClient;
+            _configurationService = configurationService;
+            _fiscalMonthResolver = fiscalMonthResolver;
+            _backgroundJobClient = backgroundJobClient;
+            _idServiceClient = idServiceClient;
+            _notificationHubContext = notificationHubContext;
+            _authorizationServiceClient = authorizationServiceClient;
+        }
+
+        public async Task<ENFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return null;
+
+            var opportunityContext = dbContext.Set<ENOpportunity>();
+            var configuredOpportunities = opportunityContext.Where(en => en.ConfigurationGuid == configurationGuid);
+
+            var opportunityLevels = configuredOpportunities
+#pragma warning disable S2971 // "IEnumerable" LINQs should be simplified
+                .Select(en => en.OpportunityLevel).Distinct().ToList()
+#pragma warning restore S2971 // "IEnumerable" LINQs should be simplified
+                .Select(ol => new FilterMember { Id = ol, Text = (ol == "ServiceLine" ? "Service Line" : ol) })
+                .OrderBy(ol => ol.Text);
+
+            return new ENFilterOptions
+            {
+                OpportunityLevels = opportunityLevels
+            };
+        }
+
+        public async Task<Guid> CreateAsync(ENOpportunityDataModel opportunity, Guid databaseGuid, bool isTempoPage, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(opportunity.Name);
+            try
+            {
+                await using var dbContext = await GetDbContext(cancellationToken);
+                opportunity.DateCreated = DateTime.Now;
+                var config = dbContext.Configurations.SingleOrDefault(c => c.ConfigurationGuid == opportunity.ConfigurationGuid);
+
+                if (config == null) return default;
+                opportunity.EndDate = config.GetBaselineEndDate(OpportunityTypes.Encounter);
+                opportunity.OpportunityType = Convert.ToByte(OpportunityTypes.Encounter);
+
+                dbContext.ENOpportunities.Add(opportunity);
+
+                await dbContext.SaveChangesAsync(cancellationToken);
+                await _authorizationServiceClient.AddPermissionsFromDefaultsAsync(opportunity.OpportunityGuid, SecurableEntityType.Opportunity, cancellationToken);
+                var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+
+                var jobId = _backgroundJobClient.Enqueue<ENOpportunityDetailJob>(job
+                    => job.PopulateOpportunityDetailsAsync(strataId, opportunity.Name, opportunity.OpportunityGuid, databaseGuid, false, isTempoPage, cancellationToken));
+                return Guid.Parse(jobId);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogOpportunityError(ex, opportunity.Name, opportunity.OpportunityGuid);
+                await hub.SendOpportunityCreateError(opportunity.Name, ex.Message);
+                return default;
+            }
+        }
+
+        internal async Task<List<FilterHelper>> GetEntityNodes(Configuration.Configuration configuration, CancellationToken cancellationToken)
+        {
+            var globalId = configuration.IsUsingCustomEntityDimension ? configuration.DepartmentRollupGlobalId : "Entity";
+            var dimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync(globalId);
+            return await GetNodesByHierarchyGuid(dimension.DefaultHierarchyGuid, cancellationToken);
+        }
+
+        public async Task<ENOpportunityDto> GetENOpportunityById(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var opportunity = await dbContext.AddUserFilter(dbContext.Set<ENOpportunityDataModel>().AsQueryable(), _user)
+                    .FirstOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+            if (opportunity == null) { return null; }
+            var config = dbContext.Configurations.SingleOrDefault(c => c.ConfigurationGuid == opportunity.ConfigurationGuid);
+
+            if (config == null) { return new ENOpportunityDto(); }
+            config.FiscalMonthResolver = _fiscalMonthResolver;
+
+            if (opportunity is IWithSourceOpportunity && _centralDbContext != null)
+            {
+                try
+                {
+                    var clientNetworkOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                        .Include(cno => cno.Opportunities)
+                        .Include(cno => cno.NetworkOpportunity)
+                        .SingleOrDefaultAsync(cno => cno.Opportunities.Any(link => link.OpportunityGuid == opportunity.OpportunityGuid));
+                    ((IWithSourceOpportunity)opportunity).SetSourceOpportunity(clientNetworkOpportunity);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogServiceError(ex, $"Failed to get source opportunity for {opportunityGuid}");
+                    throw;
+                }
+            }
+
+            var metricData = dbContext.Set<ENOpportunityMetricData>().AsQueryable().Where(data => data.OpportunityGUID == opportunity.OpportunityGuid && data.IsBaseline).ToList();
+            var oppotunityDto = opportunity.MapToDto();
+            oppotunityDto.RevenueGoal = metricData.Sum(x => x.GoalRevenue);
+            oppotunityDto.RevenueImprovement = metricData.Sum(x => x.RevenueImprovement);
+            oppotunityDto.CostGoal = metricData.Sum(x => x.GoalCost);
+            oppotunityDto.CostImprovement = metricData.Sum(x => x.CostImprovement);
+            oppotunityDto.MarginGoal = metricData.Sum(x => x.GoalMargin);
+            oppotunityDto.MarginImprovement = metricData.Sum(x => x.MarginImprovement);
+            oppotunityDto.GridData = GetOpportnuityGridData(metricData);
+            oppotunityDto.BaselineStartDate = config.GetBaselineStartDate(OpportunityTypes.Encounter);
+            oppotunityDto.BaselineEndDate = config.GetBaselineEndDate(OpportunityTypes.Encounter);
+            oppotunityDto.TrackingStartDate = config.GetTrackingStartDate(OpportunityTypes.Encounter);
+            oppotunityDto.TrackingEndDate = config.GetTrackingEndDate();
+            return oppotunityDto;
+        }
+
+        public async Task<InitiativeInfo> GetInitiativeInfoAsync(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) { return default; }
+            var opportunityItem = await dbContext.AddUserFilter(dbContext.Set<ENOpportunity>().AsQueryable(), _user)
+                .SingleOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+            if (opportunityItem == null) { return default; }
+            var configuration = await _configurationService.GetConfigurationAsync(opportunityItem.ConfigurationGuid, cancellationToken);
+
+            if (opportunityItem.InitiativeGuid != Guid.Empty)
+            {
+                var initiative = dbContext?.Initiatives.SingleOrDefault(i => i.InitiativeGUID == opportunityItem.InitiativeGuid);
+                var fiscalMonths = configuration.GetTrackingFiscalMonths(OpportunityTypes.OrgDefined, initiative.EffectiveDate);
+                return initiative?.InitiativeInfo(opportunityItem.OpportunityGuid, fiscalMonths, configuration.OrgDefinedTrackingStartDate, configuration.OrgDefinedTrackingEndDate);
+            }
+            var info = new InitiativeInfo
+            {
+                OpportunityGuid = opportunityGuid,
+                Name = opportunityItem.Name,
+                CostDriver = "Encounter",
+                StartMonth = configuration.OrgDefinedTrackingStartDate.ToString("yyyy-MM-dd"),
+                EndMonth = configuration.OrgDefinedTrackingEndDate.ToString("yyyy-MM-dd")
+            };
+            return info;
+        }
+
+        public async Task<string> UpdateAsync(Guid databaseGuid, ENOpportunityDataModelWithFilters opportunityWithFilters, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(opportunityWithFilters.Name);
+            try
+            {
+                await using var dbContext = await GetDbContext(cancellationToken);
+
+                // do not use NotFoundException from Strata.CoreLib.Excpetions as it leads to the error
+                var originalOpportunity = dbContext.ENOpportunities
+                    .FirstOrDefault(opp => opp.OpportunityGuid.Equals(opportunityWithFilters.OpportunityGuid))
+                    ?? throw new Exception($"Encounter Opportunity with guid {opportunityWithFilters.OpportunityGuid} is not found");
+
+                await SetOpportunityFilters(opportunityWithFilters, cancellationToken);
+                originalOpportunity.Name = opportunityWithFilters.Name;
+                var previousOpportunityJSON = originalOpportunity.EncounterOpportunityJSON;
+                originalOpportunity.EncounterOpportunityJSON = System.Text.Json.JsonSerializer.Serialize((ENOpportunityBaseFilters)opportunityWithFilters);
+
+                await dbContext.SaveChangesAsync(cancellationToken);
+
+                if (previousOpportunityJSON != originalOpportunity.EncounterOpportunityJSON)
+                {
+                    var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+
+                    originalOpportunity.IdentifiedSavings = 0;
+                    originalOpportunity.Savings = 0;
+                    await dbContext.SaveChangesAsync(cancellationToken);
+
+                    var jobId = _backgroundJobClient.Enqueue<ENOpportunityDetailJob>(job
+                        => job.PopulateOpportunityDetailsAsync(strataId, originalOpportunity.Name, originalOpportunity.OpportunityGuid, databaseGuid, true, true, cancellationToken));
+                    return jobId;
+                }
+
+                await hub.SendOpportunityCreateUpdateSuccess(originalOpportunity.OpportunityGuid, true, originalOpportunity.Name, true, OpportunityTypes.Encounter);
+                return Guid.Empty.ToString();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogOpportunityError(ex, opportunityWithFilters.Name, opportunityWithFilters.OpportunityGuid);
+                await hub.SendOpportunityUpdateError(opportunityWithFilters.Name);
+                return null;
+            }
+        }
+
+        public async Task SetOpportunityFilters(ENOpportunityDataModelWithFilters filters, CancellationToken cancellationToken)
+        {
+            var configuration = await _configurationService.GetConfigurationAsync(filters.ConfigurationGuid, cancellationToken);
+            filters.IsBaseline = true;
+            List<FilterHelper> filterHelpers;
+            IEnumerable<string> ids;
+            if (filters.EncounterGroup == 0)
+            {
+                var nonPatientPopDimension = Guid.Parse("7799FFBA-B233-4E72-A629-D0BBA4082F34");
+                var hierarchyPaths = filters.CaseTypes.Select(ct => ct.Id);
+                filterHelpers = await GetNodesByHierarchyPath(nonPatientPopDimension, hierarchyPaths, cancellationToken);
+                ids = filters.CaseTypes.Select(x => x.Id);
+                filters.CaseTypes = filterHelpers.Where(ct => ids.Contains(ct.Id)).ToList();
+            }
+            else
+            {
+                filterHelpers = await GetNodesByGlobalId("Clinical Indicator", cancellationToken);
+                ids = filters.PatientPopulations.Select(x => x.Id);
+                filters.PatientPopulations =
+                    filterHelpers.Where(pp => ids.Contains(pp.Id)).ToList();
+            }
+
+            switch (filters.EncounterOpportunityLevel)
+            {
+                case OpportunityLevel.Entity:
+                    filterHelpers = await GetEntityNodes(configuration, cancellationToken);
+                    ids = filters.Entities.Select(x => x.Id);
+                    filters.Entities = filterHelpers.Where(e => ids.Contains(e.Id)).ToList();
+                    break;
+                case OpportunityLevel.ServiceLine:
+                    filterHelpers = await GetServiceLineNodes(configuration, filters.ServiceLines.Select(x => x.Id), cancellationToken);
+                    ids = filters.ServiceLines.Select(x => x.Id);
+                    filters.ServiceLines = filterHelpers.Where(e => ids.Contains(e.Id)).ToList();
+                    break;
+                case OpportunityLevel.Specialty:
+                    filterHelpers = await GetNodesByGlobalId("DSS Physician Specialty", cancellationToken);
+                    ids = filters.Specialties.Select(x => x.Id);
+                    filters.Specialties = filterHelpers.Where(e => ids.Contains(e.Id)).ToList();
+                    break;
+                case OpportunityLevel.Provider:
+                    filterHelpers = await GetNodesByHierarchyPath(new Guid("8944429C-0164-4107-870E-EDE98A059324"), filters.Providers.Select(ct => ct.Id), cancellationToken);
+                    ids = filters.Providers.Select(x => x.Id);
+                    filters.Providers = filterHelpers.Where(e => ids.Contains(e.Id)).ToList();
+                    break;
+            }
+        }
+
+        public async Task<bool> UpdateGoalsAsync(Guid opportunityGuid, IEnumerable<ENOpportunityRowDataChanges> changes, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return false;
+
+            var changedMetrics = new List<ENOpportunityMetricData>();
+
+            foreach (var change in changes)
+            {
+                var metrics = UpdateGoal(dbContext, opportunityGuid, change, cancellationToken);
+                changedMetrics.AddRange(metrics);
+            }
+
+            dbContext.EncounterOpportunityMetricData.UpdateRange(changedMetrics);
+            var changesNumber = await dbContext.SaveChangesAsync(cancellationToken);
+            return changesNumber > 0;
+        }
+
+        public async Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, ENFilters filters, CancellationToken cancellationToken)
+        {
+            var exportOptions = this.GetExportOptions();
+
+            // get data
+            var opportunities = await this.GetAllAsync(sortOptions, filters, cancellationToken);
+            var data = opportunities.Select(opp => new
+            {
+                Opportunity = opp.OpportunityKey,
+                opp.Name,
+                opp.IdentifiedSavings,
+                opp.Cases,
+                EncounterGroup = opp.EncounterGroupValue,
+                Level = opp.OpportunityLevel,
+                Seasonality = opp.IsSeasonal ? "With" : "Without",
+                opp.Initiative,
+                IsHidden = opp.IsHidden ? 1 : 0,
+                opp.Note
+            });
+
+            // configure column formats
+            exportOptions.AddColumnOptions("Identified Savings", "Currency2Dec");
+            exportOptions.AddColumnOptions("Cases", "Accounting");
+            exportOptions.AddColumnOptions("Is Hidden", "\"Yes\";-;\"No\"");
+
+            return ExportUtils.CreateExcelWorkbook(data, exportOptions);
+        }
+
+        internal async Task<List<FilterHelper>> GetServiceLineNodes(Configuration.Configuration configuration, IEnumerable<string> hierarchyPaths, CancellationToken cancellationToken)
+        {
+            var dimensionGuid = configuration.ServiceLineDimensionGuid;
+            var dimension = await _schemaServiceClient.GetDimensionByIdAsync(dimensionGuid)
+                            ?? await _schemaServiceClient.GetDimensionByGlobalIdAsync("Service Line");
+            return await GetNodesByHierarchyPath(dimension.DimensionGuid, hierarchyPaths, cancellationToken);
+        }
+
+        internal async Task<List<FilterHelper>> GetNodesByGlobalId(string globalId, CancellationToken cancellationToken)
+        {
+            var dimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync(globalId);
+            return await GetNodesByHierarchyGuid(dimension.DefaultHierarchyGuid, cancellationToken);
+        }
+
+        internal async Task<List<FilterHelper>> GetNodesByHierarchyGuid(Guid hierarchyGuid, CancellationToken cancellationToken)
+        {
+            return (await _schemaServiceClient.GetHierarchyNodesByHierarchyGuidAsync(hierarchyGuid, default, default, cancellationToken)).MapToFilterHelpers();
+        }
+
+        private async Task<List<FilterHelper>> GetNodesByHierarchyPath(Guid dimensionGuid, IEnumerable<string> hierarchyPaths, CancellationToken cancellationToken)
+        {
+            var nodes = await _schemaServiceClient.GetHierarchyNodesFromHierarchyPathsAsync(dimensionGuid, hierarchyPaths, cancellationToken);
+            var filters = nodes.MapToFilterHelpers();
+            return filters;
+        }
+
+        // Info: Code of this method was copied from Jazz
+        private List<ENOpportunityMetricData> UpdateGoal(JazzDbContext dbContext, Guid opportunityGuid, ENOpportunityRowDataChanges row, CancellationToken cancellationToken)
+        {
+            var levelID = row.LevelId;
+            var goalVolume = row.Volume;
+            var goalRevenuePerCase = row.RevenuePerCase;
+            var goalCostPerCase = row.CostPerCase;
+
+            var baselineMetrics = dbContext.EncounterOpportunityMetricData.AsQueryable()
+                .Where(data => data.OpportunityGUID == opportunityGuid && data.LevelID == levelID && data.IsBaseline)
+                .ToList();
+
+            var baselineSum = (from metric in baselineMetrics
+                               group metric by 1 into g
+                               select new
+                               {
+                                   Volume = g.Sum(x => x.Volume),
+                                   Cost = g.Sum(x => x.Cost),
+                                   Revenue = g.Sum(x => x.Revenue)
+                               }).First();
+
+            if (baselineSum.Cost == 0 && baselineSum.Revenue == 0 && baselineSum.Volume == 0)
+            {
+                var weight = baselineMetrics.Count();
+                baselineMetrics.ForEach(metric =>
+                {
+                    metric.GoalVolume = goalVolume.DivideBy(weight);
+                    if (goalRevenuePerCase == 0 && metric.GoalRevenue != 0)
+                    {
+                        goalRevenuePerCase = (metric.GoalRevenue * weight).DivideBy(goalVolume);
+                    }
+                    if (goalCostPerCase == 0 && metric.GoalCost != 0)
+                    {
+                        goalCostPerCase = (metric.GoalCost * weight).DivideBy(goalVolume);
+                    }
+                    metric.GoalRevenuePerCase = goalRevenuePerCase;
+                    metric.GoalCostPerCase = goalCostPerCase;
+                    metric.IsBaseline = true;
+                });
+            }
+            else
+            {
+                if (baselineMetrics.Any())
+                {
+                    baselineMetrics.ForEach(metric =>
+                    {
+                        var monthlyWeightedVolume = (double)goalVolume * (metric.Volume.DivideBy(baselineSum.Volume));
+                        metric.GoalVolume = monthlyWeightedVolume;
+                        metric.IsBaseline = true;
+                    });
+
+                    if (baselineMetrics.First().GoalRevenuePerCase != goalRevenuePerCase)
+                    {
+                        baselineMetrics.ForEach(metric =>
+                        {
+                            metric.GoalRevenuePerCase = goalRevenuePerCase;
+                            metric.IsBaseline = true;
+                        });
+                    }
+
+                    if (baselineMetrics.First().GoalCostPerCase != goalCostPerCase)
+                    {
+                        baselineMetrics.ForEach(metric =>
+                        {
+                            metric.GoalCostPerCase = goalCostPerCase;
+                            metric.IsBaseline = true;
+                        });
+                    }
+                }
+            }
+
+            return baselineMetrics;
+        }
+
+        private Dictionary<string, List<ENOpportunityRowData>> GetOpportnuityGridData(List<ENOpportunityMetricData> metricData)
+        {
+            return metricData.GroupBy(m => m.LevelID)
+                .OrderBy(m => m.FirstOrDefault()?.Name ?? "System")
+                .Select(metricGroup => ENOpportunityRowData.KeyValuePair(metricGroup))
+                .ToDictionary(key => key.Key, value => value.Value);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/Filters/ENFilterOptions.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/Filters/ENFilterOptions.cs
new file mode 100644
index 0000000..3732da4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/Filters/ENFilterOptions.cs
@@ -0,0 +1,10 @@
+using Strata.ContinuousImprovement.Biz.Filter;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters
+{
+    public class ENFilterOptions
+    {
+        public IEnumerable<FilterMember> OpportunityLevels { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/Filters/ENFilters.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/Filters/ENFilters.cs
new file mode 100644
index 0000000..44023f3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/Filters/ENFilters.cs
@@ -0,0 +1,57 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters
+{
+    public partial class ENFilters : FiltersOpportunity<ENOpportunity>
+    {
+        public int Cases { get; set; }
+        public IEnumerable<string> OpportunityLevels { get; set; }
+        public EncounterGroup EncounterGroups { get; set; }
+        public SeasonalityType Seasonality { get; set; }
+
+        public ENFilters() : base()
+        {
+            Cases = 0;
+            OpportunityLevels = new List<string>();
+            EncounterGroups = EncounterGroup.Both;
+            Seasonality = SeasonalityType.WithAndWithout;
+        }
+
+        public override IEnumerable<Expression<Func<ENOpportunity, bool>>> GetFilters(JazzDbContext context)
+        {
+            var filters = base.GetFilters(context).ToList();
+
+            if (Cases > 0)
+                filters.Add(m => m.Cases >= Cases);
+
+            if (OpportunityLevels.Any())
+                filters.Add(m => OpportunityLevels.Contains(m.OpportunityLevel));
+
+            if (EncounterGroups != EncounterGroup.Both)
+                filters.Add(m => (int)EncounterGroups == (int)m.EncounterGroup);
+
+            if (Seasonality != SeasonalityType.WithAndWithout)
+                filters.Add(m => (int)Seasonality == Convert.ToInt32(m.IsSeasonal));
+
+            if (!string.IsNullOrEmpty(OpportunitySearch))
+            {
+                var testSeasonality = Enum.TryParse<SeasonalityType>(OpportunitySearch, true, out var seasonalityType)
+                    && seasonalityType != SeasonalityType.WithAndWithout;
+                filters.Add(m => m.OpportunityKey.Contains(OpportunitySearch)
+                    || m.Name.Contains(OpportunitySearch)
+                    || m.EncounterGroupValue.Contains(OpportunitySearch)
+                    || m.OpportunityLevel.Contains(OpportunitySearch)
+                    || (testSeasonality && m.IsSeasonal == (seasonalityType == SeasonalityType.With)));
+            }
+
+            return filters;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/Filters/ENOpportunityBaseFilters.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/Filters/ENOpportunityBaseFilters.cs
new file mode 100644
index 0000000..6b0911e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/Filters/ENOpportunityBaseFilters.cs
@@ -0,0 +1,27 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters
+{
+    public class ENOpportunityBaseFilters
+    {
+        public int EncounterGroup { get; set; }
+        public bool IsSeasonal { get; set; }
+        public List<FilterHelper> CaseTypes { get; set; }
+        public List<FilterHelper> PatientPopulations { get; set; }
+        public string OpportunityLevel { get; set; }
+
+        public OpportunityLevel EncounterOpportunityLevel { get; set; }
+
+        public List<FilterHelper> Entities { get; set; }
+        public List<FilterHelper> ServiceLines { get; set; }
+        public List<FilterHelper> Specialties { get; set; }
+        public List<FilterHelper> Providers { get; set; }
+
+        public bool IsBaseline { get; set; } = true;
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/IENOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/IENOpportunityService.cs
new file mode 100644
index 0000000..d1e2de8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/IENOpportunityService.cs
@@ -0,0 +1,28 @@
+using ClosedXML.Excel;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public interface IENOpportunityService : IOpportunityService<ENOpportunity>
+    {
+        Task<ENFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken);
+
+        Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, ENFilters filters, CancellationToken cancellationToken);
+
+        Task<string> UpdateAsync(Guid databaseGuid, ENOpportunityDataModelWithFilters opportunity, CancellationToken cancellationToken);
+        Task<Guid> CreateAsync(ENOpportunityDataModel opportunity, Guid databaseGuid, bool isTempoPage, CancellationToken cancellationToken);
+        Task<ENOpportunityDto> GetENOpportunityById(Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<InitiativeInfo> GetInitiativeInfoAsync(Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<bool> UpdateGoalsAsync(Guid opportunityGuid, IEnumerable<ENOpportunityRowDataChanges> changes, CancellationToken cancellationToken);
+        Task SetOpportunityFilters(ENOpportunityDataModelWithFilters filters, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/OpportunityMetricCohortData.cs b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/OpportunityMetricCohortData.cs
new file mode 100644
index 0000000..2d53f9a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Encounter/Opportunities/OpportunityMetricCohortData.cs
@@ -0,0 +1,54 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities
+{
+    [Keyless]
+    public class OpportunityMetricCohortData
+    {
+        public int LevelID { get; set; }
+        [NotMapped]
+        public string Name { get; set; }
+        public int Month { get; set; }
+        public int Volume { get; set; }
+        // TODO Revenue and Cost are defined in the database as float, consider changing to double?
+        public decimal Revenue { get; set; }
+        public decimal Cost { get; set; }
+        public decimal Margin => Revenue - Cost;
+        public decimal RevenuePerCase => Revenue.DivideBy(Volume);
+        public decimal CostPerCase => Cost.DivideBy(Volume);
+        public bool IsBaseline { get; set; }
+
+        internal OpportunityMetricCohortData()
+        {
+
+        }
+        internal ENOpportunityMetricData EncounterMetricData(bool isBaseline, Guid oppGuid, string opportunityLevel,
+            Dictionary<int, string> defaultNames)
+        {
+            var name = !string.IsNullOrEmpty(Name) ? Name
+                : defaultNames.TryGetValue(LevelID, out var result) ? result : string.Empty;
+            var data = new ENOpportunityMetricData
+            {
+                EncounterOpportunityMetricDataGUID = Guid.NewGuid(),
+                OpportunityGUID = oppGuid,
+                Level = opportunityLevel,
+                LevelID = LevelID,
+                Name = name,
+                Month = Month,
+                Volume = Volume,
+                GoalVolume = Volume,
+                Revenue = (double)Revenue,
+                GoalRevenuePerCase = (double)RevenuePerCase,
+                Cost = (double)Cost,
+                GoalCostPerCase = (double)CostPerCase,
+                Margin = (double)Margin,
+                IsBaseline = isBaseline
+            };
+            return data;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/Benchmark/BenchmarkingInsightsGranularity.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/Benchmark/BenchmarkingInsightsGranularity.cs
new file mode 100644
index 0000000..e4c7f24
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/Benchmark/BenchmarkingInsightsGranularity.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.Exploration.Benchmark
+{
+    public enum BenchmarkingInsightsGranularity
+    {
+        CaseTypeFamily = 0,
+        DrgCode = 1,
+        PrimaryCpt = 2
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/Benchmark/HeatMapData.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/Benchmark/HeatMapData.cs
new file mode 100644
index 0000000..2c5bc1d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/Benchmark/HeatMapData.cs
@@ -0,0 +1,52 @@
+namespace Strata.ContinuousImprovement.Biz.Exploration.Benchmark
+{
+    /// <summary>
+    /// Simplified DTO for heatmap visualization containing only the essential 
+    /// benchmarking metrics needed for the UI. Supports both case type family 
+    /// and code-level (MS-DRG/APR-DRG/CPT) granularity.
+    /// </summary>
+    public class HeatMapData
+    {
+        /// <summary>
+        /// The display name for the row. Contains either the case type family name
+        /// or the code value (MS-DRG/APR-DRG/CPT) depending on the granularity level.
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// The cost driver name (e.g., "Pharmacy", "Laboratory").
+        /// </summary>
+        public string CostDriver { get; set; }
+
+        /// <summary>
+        /// Customer's 50th percentile variable direct cost.
+        /// </summary>
+        public decimal? CustomerMedianCost { get; set; }
+
+        /// <summary>
+        /// Benchmark cohort's 50th percentile variable direct cost.
+        /// </summary>
+        public decimal? BenchmarkMedianCost { get; set; }
+
+        /// <summary>
+        /// Pre-calculated O/E ratio (CustomerMedianCost / BenchmarkMedianCost).
+        /// Null if benchmark is null or zero.
+        /// </summary>
+        public decimal? CostOeRatio { get; set; }
+
+        /// <summary>
+        /// Customer's 50th percentile average length of stay.
+        /// </summary>
+        public decimal? CustomerMedianAlos { get; set; }
+
+        /// <summary>
+        /// Benchmark cohort's 50th percentile average length of stay.
+        /// </summary>
+        public decimal? BenchmarkMedianAlos { get; set; }
+
+        /// <summary>
+        /// Pre-calculated O/E ratio (CustomerMedianAlos / BenchmarkMedianAlos).
+        /// Null if benchmark is null or zero.
+        /// </summary>
+        public decimal? AlosOeRatio { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/Benchmark/HeatMapDataMapper.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/Benchmark/HeatMapDataMapper.cs
new file mode 100644
index 0000000..45a003f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/Benchmark/HeatMapDataMapper.cs
@@ -0,0 +1,160 @@
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.StrataSphereCompare.Client.Models;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.Benchmark
+{
+    /// <summary>
+    /// Maps CostDetailsDto to simplified HeatMapData for frontend visualization.
+    /// </summary>
+    public static class HeatMapDataMapper
+    {
+        /// <summary>
+        /// Converts a collection of CostDetailsDto to HeatMapData at the case type family level.
+        /// </summary>
+        /// <param name="costDetails">The raw cost detail records from the benchmarking service.</param>
+        /// <param name="isUsingAprdrg">True if using APR-DRG; false for MS-DRG classification.</param>
+        /// <returns>Simplified heatmap data with pre-calculated O/E ratios.</returns>
+        public static IEnumerable<HeatMapData> ToHeatMapData(
+            IEnumerable<CostDetailsDto> costDetails,
+            bool isUsingAprdrg)
+        {
+            if (costDetails == null || !costDetails.Any())
+                return Enumerable.Empty<HeatMapData>();
+
+            return costDetails
+                .Select(dto => MapToCaseTypeFamilyLevel(dto, isUsingAprdrg))
+                .Where(data => data != null);
+        }
+
+        /// <summary>
+        /// Converts a collection of CostDetailsDto to HeatMapData at the code level (MS-DRG/APR-DRG/CPT).
+        /// </summary>
+        /// <param name="costDetails">The raw cost detail records from the benchmarking service.</param>
+        /// <param name="isUsingAprdrg">True if using APR-DRG; false for MS-DRG classification.</param>
+        /// <returns>Simplified heatmap data with pre-calculated O/E ratios at code granularity.</returns>
+        public static IEnumerable<HeatMapData> ToHeatMapDataCodeLevel(
+            IEnumerable<CostDetailsDto> costDetails,
+            bool isUsingAprdrg)
+        {
+            if (costDetails == null || !costDetails.Any())
+                return Enumerable.Empty<HeatMapData>();
+
+            return costDetails
+                .Select(dto => MapToCodeLevel(dto, isUsingAprdrg))
+                .Where(data => data != null);
+        }
+
+        private static HeatMapData MapToCaseTypeFamilyLevel(CostDetailsDto dto, bool isUsingAprdrg)
+        {
+            var name = GetCaseTypeFamilyName(dto, isUsingAprdrg);
+
+            if (string.IsNullOrEmpty(name) || name.Equals("Not Specified"))
+                return null;
+
+            return new HeatMapData
+            {
+                Name = name,
+                CostDriver = dto.SphChargeCodeCostDriver,
+                CustomerMedianCost = dto.CustomerP50th_VariableDirectCost,
+                BenchmarkMedianCost = dto.P50th_VariableDirectCost,
+                CostOeRatio = MathExtensions.CalculateOeRatio(dto.CustomerP50th_VariableDirectCost, dto.P50th_VariableDirectCost),
+                CustomerMedianAlos = dto.CustomerP50th_Alos,
+                BenchmarkMedianAlos = dto.P50th_Alos,
+                AlosOeRatio = MathExtensions.CalculateOeRatio(dto.CustomerP50th_Alos, dto.P50th_Alos)
+            };
+        }
+
+        /// <summary>
+        /// Converts a collection of CostDetailsDto to HeatMapData at the primary CPT code level.
+        /// </summary>
+        /// <param name="costDetails">The raw cost detail records from the benchmarking service.</param>
+        /// <returns>Simplified heatmap data with pre-calculated O/E ratios at primary CPT code granularity.</returns>
+        public static IEnumerable<HeatMapData> ToHeatMapDataPrimaryCptLevel(IEnumerable<CostDetailsDto> costDetails)
+        {
+            if (costDetails == null || !costDetails.Any())
+                return Enumerable.Empty<HeatMapData>();
+
+            return costDetails
+                .Select(dto => MapToPrimaryCptLevel(dto))
+                .Where(data => data != null);
+        }
+
+        private static HeatMapData MapToPrimaryCptLevel(CostDetailsDto dto)
+        {
+            var code = dto.SphPrimaryCptCode;
+
+            if (string.IsNullOrEmpty(code))
+                return null;
+
+            return new HeatMapData
+            {
+                Name = code,
+                CostDriver = dto.SphChargeCodeCostDriver,
+                CustomerMedianCost = dto.CustomerP50th_VariableDirectCost,
+                BenchmarkMedianCost = dto.P50th_VariableDirectCost,
+                CostOeRatio = MathExtensions.CalculateOeRatio(dto.CustomerP50th_VariableDirectCost, dto.P50th_VariableDirectCost),
+                CustomerMedianAlos = dto.CustomerP50th_Alos,
+                BenchmarkMedianAlos = dto.P50th_Alos,
+                AlosOeRatio = MathExtensions.CalculateOeRatio(dto.CustomerP50th_Alos, dto.P50th_Alos)
+            };
+        }
+
+        private static HeatMapData MapToCodeLevel(CostDetailsDto dto, bool isUsingAprdrg)
+        {
+            var code = GetCode(dto, isUsingAprdrg);
+
+            if (string.IsNullOrEmpty(code))
+                return null;
+
+            return new HeatMapData
+            {
+                Name = code,
+                CostDriver = dto.SphChargeCodeCostDriver,
+                CustomerMedianCost = dto.CustomerP50th_VariableDirectCost,
+                BenchmarkMedianCost = dto.P50th_VariableDirectCost,
+                CostOeRatio = MathExtensions.CalculateOeRatio(dto.CustomerP50th_VariableDirectCost, dto.P50th_VariableDirectCost),
+                CustomerMedianAlos = dto.CustomerP50th_Alos,
+                BenchmarkMedianAlos = dto.P50th_Alos,
+                AlosOeRatio = MathExtensions.CalculateOeRatio(dto.CustomerP50th_Alos, dto.P50th_Alos)
+            };
+        }
+
+        /// <summary>
+        /// Gets the appropriate case type family name based on the DRG type configuration.
+        /// Priority: DRG-specific (APRDRG or MSDRG) > CPT
+        /// </summary>
+        private static string GetCaseTypeFamilyName(CostDetailsDto dto, bool isUsingAprdrg)
+        {
+            // First try DRG-specific name
+            var drgName = isUsingAprdrg
+                ? dto.AprDrgCaseTypeFamilyName
+                : dto.MsDrgCaseTypeFamilyName;
+
+            if (!string.IsNullOrEmpty(drgName))
+                return drgName;
+
+            // Fall back to CPT if DRG name is not available
+            return dto.SphCptCodeCaseTypeFamilyName;
+        }
+
+        /// <summary>
+        /// Gets the appropriate code value based on the DRG type configuration.
+        /// Priority: DRG-specific (APRDRG or MSDRG) > CPT
+        /// </summary>
+        private static string GetCode(CostDetailsDto dto, bool isUsingAprdrg)
+        {
+            // First try DRG-specific code
+            var drgCode = isUsingAprdrg
+                ? dto.SphAprDrgCode
+                : dto.SphMsDrgCode;
+
+            if (!string.IsNullOrEmpty(drgCode))
+                return drgCode;
+
+            // Fall back to CPT if DRG code is not available
+            return dto.SphPrimaryCptCode;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CTFEncounterDetail.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CTFEncounterDetail.cs
new file mode 100644
index 0000000..79f860e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CTFEncounterDetail.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public class CTFEncounterDetail : ICTFEncounterDetail
+    {
+        public int EncounterId { get; set; }
+        public string EncounterRecordNumber { get; set; }
+
+        public int CTFType { get; set; }
+
+        public int EntityId { get; set; }
+        public string Code { get; set; }
+        public int PhysicianId { get; set; }
+
+        public float LengthOfStay { get; set; }
+        public double VariableDirectCost { get; set; }
+        public double IdentifiedVariation { get; set; }
+        public double Charges { get; set; }
+
+        public short IsExpired { get; set; }
+        public bool IsExcluded { get; set; }
+
+        public string DischargeStatusCode { get; set; }
+        public string DischargeStatusDescription { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CTFGroupCalcs.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CTFGroupCalcs.cs
new file mode 100644
index 0000000..0ae185d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CTFGroupCalcs.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public class CTFGroupCalcs
+    {
+        public int CTFId { get; set; }
+        public string CTFName { get; set; }
+        public double MedianVDC { get; set; }
+
+    }
+
+    public class EntityGroupCalcs : ICTFGroupCalcs
+    {
+        public int EntityId { get; set; }
+        public string EntityName { get; set; }
+        public double MedianVDC { get; set; }
+        public double MedianLOS { get; set; }
+        public double AverageLOS { get; set; }
+        public double MedianCharges { get; set; }
+        public string Id { get { return this.EntityId.ToString(); } }
+        public string Name { get { return this.EntityName; } }
+    }
+
+    public class EntityCodeGroupCalcs : ICTFGroupCalcs
+    {
+        public int EntityId { get; set; }
+        public string Code { get; set; }
+        public string CodeName { get; set; }
+        public double MedianVDC { get; set; }
+        public double MedianLOS { get; set; }
+        public double AverageLOS { get; set; }
+        public double MedianCharges { get; set; }
+        public string Id { get { return this.Code; } }
+        public string Name { get { return this.CodeName; } }
+    }
+
+    public class EntityCodePhysicianGroupCalcs : ICTFGroupCalcs
+    {
+        public int EntityId { get; set; }
+        public string Code { get; set; }
+        public int PhysicianId { get; set; }
+        public string PhysicianName { get; set; }
+        public double MedianVDC { get; set; }
+        public double MedianLOS { get; set; }
+        public double AverageLOS { get; set; }
+        public double MedianCharges { get; set; }
+        public string Id { get { return this.PhysicianId.ToString(); } }
+        public string Name { get { return this.PhysicianName; } }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeDetailRowData.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeDetailRowData.cs
new file mode 100644
index 0000000..43500b1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeDetailRowData.cs
@@ -0,0 +1,111 @@
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public class CaseTypeDetailRowData
+    {
+
+        internal CaseTypeDetailRowData(IEnumerable<ICTFEncounterDetail> group, ICTFGroupCalcs groupCalcs)
+        {
+            Id = groupCalcs.Id;
+            Name = groupCalcs.Name;
+
+            TotalEncounters = group.Count();
+            TotalVariationEncounters = group.Count(x => x.IdentifiedVariation > 0);
+            IdentifiedVariation = group.Where(x => x.IdentifiedVariation > 0).Sum(e => e.IdentifiedVariation);
+            IncludedEncounterCount = group.Count(x => !x.IsExcluded);
+            MortalityRate = group.Count(x => !x.IsExcluded && x.IsExpired == 1).DivideBy(group.Count());
+            IncludedEncountersBelowMedian = group.Count(x => !x.IsExcluded && x.IdentifiedVariation <= 0);
+            IncludedEncountersAboveMedian = group.Count(x => !x.IsExcluded && x.IdentifiedVariation > 0);
+            IncludedVariation = group.Where(x => !x.IsExcluded && x.IdentifiedVariation > 0).Sum(x => x.IdentifiedVariation);
+            ExcludedEncountersAboveMedian = group.Count(x => x.IsExcluded && x.IdentifiedVariation > 0);
+            ExcludedVariation = group.Where(x => x.IsExcluded && x.IdentifiedVariation > 0).Select(x => x.IdentifiedVariation).DefaultIfEmpty().Sum();
+
+            MedianLos = groupCalcs.MedianLOS;
+            AverageLos = groupCalcs.AverageLOS;
+            MedianGrossCharges = groupCalcs.MedianCharges;
+            MedianCost = groupCalcs.MedianVDC;
+        }
+
+        internal CaseTypeDetailRowData(ICTFEncounterDetail encounter)
+        {
+            Id = encounter.EncounterId.ToString();
+            Name = encounter.EncounterRecordNumber;
+            TotalEncounters = 1;
+            IsExcluded = encounter.IsExcluded;
+
+            if (encounter.IdentifiedVariation > 0)
+            {
+                TotalVariationEncounters = 1;
+                IdentifiedVariation = encounter.IdentifiedVariation;
+                if (IsExcluded)
+                {
+                    ExcludedEncountersAboveMedian = 1;
+                    ExcludedVariation = encounter.IdentifiedVariation;
+                }
+                else
+                {
+                    IncludedEncounterCount = 1;
+                    IncludedEncountersAboveMedian = 1;
+                    IncludedVariation = encounter.IdentifiedVariation;
+                }
+            }
+            else // encounter.IdentifiedVariation <= 0
+            {
+                if (!IsExcluded)
+                {
+                    IncludedEncounterCount = 1;
+                    IncludedEncountersBelowMedian = 1;
+                }
+            }
+
+            MortalityRate = encounter.IsExpired;
+            DischargeStatusCode = encounter.DischargeStatusCode;
+            DischargeStatusDescription = encounter.DischargeStatusDescription;
+            MedianLos = encounter.LengthOfStay;
+            AverageLos = encounter.LengthOfStay; // For single encounter, average = actual value
+            MedianCost = encounter.VariableDirectCost;
+            MedianGrossCharges = encounter.Charges;
+        }
+
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public int TotalEncounters { get; set; }
+        public int TotalVariationEncounters { get; set; }
+        public double IdentifiedVariation { get; set; }
+        public int IncludedEncounterCount { get; set; }
+        public double MortalityRate { get; set; }
+        public double MedianLos { get; set; }
+        public double AverageLos { get; set; }
+        public double MedianCost { get; set; }
+        public int IncludedEncountersBelowMedian { get; set; }
+        public int IncludedEncountersAboveMedian { get; set; }
+        public double IncludedVariation { get; set; }
+        public int ExcludedEncountersAboveMedian { get; set; }
+        public double ExcludedVariation { get; set; }
+        public double MedianGrossCharges { get; set; }
+        public bool IsExcluded { get; set; }
+        public string DischargeStatusCode { get; set; }
+        public string DischargeStatusDescription { get; set; }
+        public double PeerMedianALos { get; set; }
+        public double PeerMedianCost { get; set; }
+
+        /// <summary>
+        /// Median adjusted length of stay based on the customer-defined benchmark cohort,
+        /// as opposed to <see cref="PeerMedianALos"/>, which is calculated from the external peer group.
+        /// </summary>
+        public double CustomerBenchmarkMedianALos { get; set; }
+        /// <summary>
+        /// Median cost based on the customer-defined benchmark cohort,
+        /// as opposed to <see cref="PeerMedianCost"/>, which is calculated from the external peer group.
+        /// </summary>
+        public double CustomerBenchmarkMedianCost { get; set; }
+
+        public double? CostOeRatio => MathExtensions.CalculateOeRatio(CustomerBenchmarkMedianCost, PeerMedianCost);
+        public double? AlosOeRatio => MathExtensions.CalculateOeRatio(CustomerBenchmarkMedianALos, PeerMedianALos);
+
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamily.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamily.cs
new file mode 100644
index 0000000..c672ba7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamily.cs
@@ -0,0 +1,25 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    [Table("CaseTypeFamily", Schema = "dss")]
+    public class CaseTypeFamily
+    {
+        public int CaseTypeFamilyId { get; set; }
+        public string Name { get; set; }
+        public string CaseTypeFamilyGlobalId { get; set; }
+
+        public static string CaseTypeFamilyTypeDefault = "CPT";
+        [NotMapped]
+        public string CaseTypeFamilyType =>
+            string.IsNullOrEmpty(CaseTypeFamilyGlobalId)
+            ? CaseTypeFamilyTypeDefault
+            : CaseTypeFamilyGlobalId.Substring(0, 1) switch
+            {
+                "A" => "APRDRG",
+                "M" => "MSDRG",
+                "O" => "CPT",
+                _ => CaseTypeFamilyTypeDefault
+            };
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyDetailBase.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyDetailBase.cs
new file mode 100644
index 0000000..1e62db0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyDetailBase.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public class CaseTypeFamilyDetailBase : ICaseTypeFamilyDetailBase
+    {
+        public int EncounterId { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+        public string EncounterRecordNumber { get; set; }
+        public int EntityId { get; set; }
+        public double IdentifiedVariation { get; set; }
+        public short IsExpired { get; set; }
+        public float LengthOfStay { get; set; }
+        public float MedianLengthOfStay { get; set; }
+        public float AverageLengthOfStay { get; set; }
+        public double MedianVariableDirectCost { get; set; }
+        public double MedianGrossCharges { get; set; }
+        public double VariableDirectCost { get; set; }
+        public double Charges { get; set; }
+        public bool IsExcluded { get; set; }
+        public float IqrLos { get; set; }
+        public float IqrVdc { get; set; }
+        public float MadLos { get; set; }
+        public float MadVdc { get; set; }
+        public string DischargeStatusCode { get; set; }
+        public string DischargeStatusDescription { get; set; }
+        public double MortalityRate { get; set; }
+        public string ROM { get; set; }
+        public string SOI { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyDetailData.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyDetailData.cs
new file mode 100644
index 0000000..aa38b7e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyDetailData.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public class CaseTypeFamilyDetailData
+    {
+        public string Key { get; set; }
+        public CaseTypeDetailRowData Data { get; set; }
+        public IEnumerable<CaseTypeFamilyDetailData> Children { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyDetailInfo.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyDetailInfo.cs
new file mode 100644
index 0000000..cfbdea7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyDetailInfo.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public class CaseTypeFamilyDetailInfo
+    {
+        public string CaseTypeFamilyType { get; set; } = CaseTypeFamily.CaseTypeFamilyTypeDefault;
+        public string CaseTypeFamilyName { get; set; }
+        public CaseTypeFamilyMetric Metrics { get; set; }
+        public IEnumerable<CaseTypeFamilyDetailData> CaseTypeFamilyDetails { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyEncounterInfo.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyEncounterInfo.cs
new file mode 100644
index 0000000..04ce9e7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyEncounterInfo.cs
@@ -0,0 +1,15 @@
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    //This class represents the return type of our snowflake query
+    //It contains encounter level information as well as some grouped info such as medians and identified variation
+    public class CaseTypeFamilyEncounterInfo : CaseTypeFamilyDetailBase
+    {
+        public int CaseTypeFamilyId { get; set; }
+        public string CaseTypeFamilyName { get; set; }
+        public double Vdc { get; set; }
+        public double MedianVdc { get; set; }
+        public double SeventyFivePercentileVdc { get; set; }
+        public double SeventyFivePercentileLos { get; set; }
+        public string CostDriver { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyGroupCalcs.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyGroupCalcs.cs
new file mode 100644
index 0000000..fe8fcb4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyGroupCalcs.cs
@@ -0,0 +1,36 @@
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public class CaseTypeFamilyGroupCalcs
+    {
+        public CTFGroupCalcs CtfGroupCalcs { get; set; }
+        public IEnumerable<EntityGroupCalcs> EntityGroupCalcs { get; set; }
+        public IEnumerable<EntityCodeGroupCalcs> EntityCodeGroupCalcs { get; set; }
+        public IEnumerable<EntityCodePhysicianGroupCalcs> EntityCodePhysicianGroupCalcs { get; set; }
+        public IEnumerable<CTFEncounterDetail> CtfEncounterDetails { get; set; }
+
+        public CaseTypeFamilyGroupCalcs()
+        {
+            CtfGroupCalcs = new CTFGroupCalcs();
+            EntityGroupCalcs = Enumerable.Empty<EntityGroupCalcs>();
+            EntityCodeGroupCalcs = Enumerable.Empty<EntityCodeGroupCalcs>();
+            EntityCodePhysicianGroupCalcs = Enumerable.Empty<EntityCodePhysicianGroupCalcs>();
+            CtfEncounterDetails = Enumerable.Empty<CTFEncounterDetail>();
+        }
+
+        public CaseTypeFamilyGroupCalcs(ISqlGridReaderWrapper results)
+            : this()
+        {
+            CtfGroupCalcs = results.Read<CTFGroupCalcs>().FirstOrDefault() ?? new CTFGroupCalcs();
+            EntityGroupCalcs = [.. results.Read<EntityGroupCalcs>()];
+            EntityCodeGroupCalcs = [.. results.Read<EntityCodeGroupCalcs>()];
+            EntityCodePhysicianGroupCalcs = [.. results.Read<EntityCodePhysicianGroupCalcs>()];
+            CtfEncounterDetails = results.Read<CTFEncounterDetail>();
+            CtfEncounterDetails.ForEach(x => { x.IdentifiedVariation = x.VariableDirectCost - CtfGroupCalcs.MedianVDC; });
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyMetric.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyMetric.cs
new file mode 100644
index 0000000..319102c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyMetric.cs
@@ -0,0 +1,12 @@
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public class CaseTypeFamilyMetric
+    {
+        public int TotalEncounters { get; set; }
+        public double IdentifiedVariation { get; set; }
+        public int EncountersIncluded { get; set; }
+        public double VariationIncluded { get; set; }
+        public int EncountersExcluded { get; set; }
+        public double VariationExcluded { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilySummaryData.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilySummaryData.cs
new file mode 100644
index 0000000..3534c61
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilySummaryData.cs
@@ -0,0 +1,62 @@
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public class CaseTypeFamilySummaryData
+    {
+        public string Key { get; set; }
+        public string Name { get; set; }
+        public bool Leaf { get; set; }
+        public EncounterGroupSummary Data { get; set; }
+        public IEnumerable<CaseTypeFamilySummaryData> Children { get; set; }
+
+        public CaseTypeFamilySummaryData() { }
+
+        //CTF summary
+        public CaseTypeFamilySummaryData(CaseTypeFamilySummaryInfo ctf)
+        {
+            Key = $"1-{ctf.CaseTypeFamilyId}";
+            Name = ctf.CaseTypeFamilyName;
+            Data = new EncounterGroupSummary(ctf);
+            Data.Key = Key;
+        }
+
+        //Children - CTF x Cost driver
+        public CaseTypeFamilySummaryData(string key, IEnumerable<CaseTypeFamilyEncounterInfo> group, ExclusionCriteria exclusionCriteria,
+            int level = 1, bool withChildren = false)
+        {
+            Key = $"{level}-{key}";
+            var item = group.FirstOrDefault();
+            if (item == null) { Name = "".IsNotSpecified(); }
+            else
+            {
+                Name = level == 1
+                    ? item.CaseTypeFamilyName.IsNotSpecified()
+                    : item.CostDriver.IsNotSpecified();
+            }
+            Leaf = level != 1;
+            Data = new EncounterGroupSummary(group, exclusionCriteria, Name, level > 1);
+            Data.Key = Key;
+            if (level > 1) { return; }
+            var children = new List<CaseTypeFamilySummaryData>();
+            if (level == 1 && !withChildren)
+            {
+                children.Add(new CaseTypeFamilySummaryData("", [], exclusionCriteria, 2));
+                Children = children;
+            }
+            if (level > 1 || !withChildren) { return; }
+            var batches = group.GroupBy(x => x.CostDriver, (CostDriver, Items) => new { CostDriver, Items }).Batch(10);
+            foreach (var batch in batches)
+            {
+                batch.ForEach(costDriverGroup =>
+                    children.Add(new CaseTypeFamilySummaryData(costDriverGroup.CostDriver, costDriverGroup.Items, exclusionCriteria, 2)));
+
+            }
+            Children = children.OrderBy(caseTypeFamilySummary => caseTypeFamilySummary.Name);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyTrimInfo.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyTrimInfo.cs
new file mode 100644
index 0000000..de55e0b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeFamilyTrimInfo.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public class CaseTypeFamilyTrimInfo
+    {
+        public int CaseTypeFamilyId { get; set; }
+        public float MadVdc { get; set; }
+        public float MadLos { get; set; }
+        public double MedianVdc { get; set; }
+        public float MedianLos { get; set; }
+        public double SeventyFivePercentileVdc { get; set; }
+        public double SeventyFivePercentileLos { get; set; }
+        public float IqrVdc { get; set; }
+        public float IqrLos { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeSummaryInfo.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeSummaryInfo.cs
new file mode 100644
index 0000000..020dc1a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/CaseTypeSummaryInfo.cs
@@ -0,0 +1,24 @@
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    //This class represents the return type of our snowflake query
+    public class CaseTypeFamilySummaryInfo
+    {
+        public int CaseTypeFamilyId { get; set; }
+        public string CaseTypeFamilyName { get; set; }
+        public double Vdc { get; set; }
+        public double MedianVdc { get; set; }
+        public int TotalEncounters { get; set; }
+        public int TotalVariationEncounters { get; set; }
+        public double IdentifiedVariation { get; set; }
+        public int IncludedEncounterCount { get; set; }
+        public double MortalityRate { get; set; }
+        public double MedianLos { get; set; }
+        public double AverageLengthOfStay { get; set; }
+        public double MedianCost { get; set; }
+        public int IncludedEncountersBelowMedian { get; set; }
+        public int IncludedEncountersAboveMedian { get; set; }
+        public double IncludedVariation { get; set; }
+        public int ExcludedEncountersAboveMedian { get; set; }
+        public double ExcludedVariation { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/ICTFEncounterDetail.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/ICTFEncounterDetail.cs
new file mode 100644
index 0000000..8754823
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/ICTFEncounterDetail.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public interface ICTFEncounterDetail
+    {
+        int EncounterId { get; set; }
+        string EncounterRecordNumber { get; set; }
+
+        int CTFType { get; set; }
+
+        int EntityId { get; set; }
+        string Code { get; set; }
+        int PhysicianId { get; set; }
+
+        float LengthOfStay { get; set; }
+        double VariableDirectCost { get; set; }
+        double IdentifiedVariation { get; set; }
+        double Charges { get; set; }
+
+        short IsExpired { get; set; }
+        bool IsExcluded { get; set; }
+
+        string DischargeStatusCode { get; set; }
+        string DischargeStatusDescription { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/ICTFGroupCalcs.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/ICTFGroupCalcs.cs
new file mode 100644
index 0000000..8ce8b17
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/ICTFGroupCalcs.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public interface ICTFGroupCalcs
+    {
+        string Id { get; }
+        string Name { get; }
+        double MedianVDC { get; set; }
+        double MedianLOS { get; set; }
+        double AverageLOS { get; set; }
+        double MedianCharges { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/ICaseTypeFamilyDetailBase.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/ICaseTypeFamilyDetailBase.cs
new file mode 100644
index 0000000..38d1614
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/CaseTypeFamilies/ICaseTypeFamilyDetailBase.cs
@@ -0,0 +1,27 @@
+namespace Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies
+{
+    public interface ICaseTypeFamilyDetailBase
+    {
+        int EncounterId { get; set; }
+        string EncounterRecordNumber { get; set; }
+        int EntityId { get; set; }
+        double IdentifiedVariation { get; set; }
+        double Charges { get; set; }
+        float IqrLos { get; set; }
+        float IqrVdc { get; set; }
+        bool IsExcluded { get; set; }
+        short IsExpired { get; set; }
+        float LengthOfStay { get; set; }
+        float MadLos { get; set; }
+        float MadVdc { get; set; }
+        float MedianLengthOfStay { get; set; }
+        double MedianVariableDirectCost { get; set; }
+        double MedianGrossCharges { get; set; }
+        double VariableDirectCost { get; set; }
+        string DischargeStatusCode { get; set; }
+        string DischargeStatusDescription { get; set; }
+        double MortalityRate { get; set; }
+        string ROM { get; set; }
+        string SOI { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/EncounterGroupSummary.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/EncounterGroupSummary.cs
new file mode 100644
index 0000000..27d026d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/EncounterGroupSummary.cs
@@ -0,0 +1,128 @@
+using Microsoft.IdentityModel.Tokens;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration
+{
+    public class EncounterGroupSummary
+    {
+        public string Key { get; set; }
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public int TotalEncounters { get; set; }
+        public int TotalVariationEncounters { get; set; }
+        public double IdentifiedVariation { get; set; }
+        public int IncludedEncounterCount { get; set; }
+        public double MortalityRate { get; set; }
+        public double MedianLos { get; set; }
+        public double AverageLengthOfStay { get; set; }
+        public double MedianCost { get; set; }
+        public int IncludedEncountersBelowMedian { get; set; }
+        public int IncludedEncountersAboveMedian { get; set; }
+        public double IncludedVariation { get; set; }
+        public int ExcludedEncountersAboveMedian { get; set; }
+        public double ExcludedVariation { get; set; }
+        public double MadLos { get; set; }
+        public double MadCost { get; set; }
+        public double IqrLos { get; set; }
+        public double IqrCost { get; set; }
+        public double PeerMedianALos { get; set; }
+        public double PeerMedianCost { get; set; }
+        public double CustomerBenchmarkMedianCost { get; set; }
+        public double CustomerBenchmarkALos { get; set; }
+        public double? CostOeRatio => MathExtensions.CalculateOeRatio(CustomerBenchmarkMedianCost, PeerMedianCost); 
+        public double? AlosOeRatio => MathExtensions.CalculateOeRatio(CustomerBenchmarkALos, PeerMedianALos);
+
+
+        public EncounterGroupSummary()
+        {
+
+        }
+
+        public EncounterGroupSummary(CaseTypeFamilySummaryInfo caseTypeSummary)
+        {
+            Id = caseTypeSummary.CaseTypeFamilyId;
+            Name = caseTypeSummary.CaseTypeFamilyName;
+            TotalEncounters = caseTypeSummary.TotalEncounters;
+            TotalVariationEncounters = caseTypeSummary.TotalVariationEncounters;
+            IdentifiedVariation = caseTypeSummary.IdentifiedVariation;
+
+            IncludedEncounterCount = caseTypeSummary.IncludedEncounterCount;
+            MortalityRate = caseTypeSummary.MortalityRate;
+            MedianLos = caseTypeSummary.MedianLos;
+            AverageLengthOfStay = caseTypeSummary.AverageLengthOfStay;
+            MedianCost = caseTypeSummary.MedianCost;
+
+            IncludedEncountersBelowMedian = caseTypeSummary.IncludedEncountersBelowMedian;
+            IncludedEncountersAboveMedian = caseTypeSummary.IncludedEncountersAboveMedian;
+            IncludedVariation = caseTypeSummary.IncludedVariation;
+
+            ExcludedEncountersAboveMedian = caseTypeSummary.ExcludedEncountersAboveMedian;
+            ExcludedVariation = caseTypeSummary.ExcludedVariation;
+        }
+
+        public EncounterGroupSummary(IEnumerable<CaseTypeFamilyEncounterInfo> encounterGroupInfos, ExclusionCriteria exclusionCriteria, string groupName, bool isDetailRow = false)
+        {
+            if (encounterGroupInfos.IsNullOrEmpty()) { return; }
+            var includedEncounterInfos = exclusionCriteria.LosExclusionType switch
+            {
+                ExclusionCriteriaType.Mad => encounterGroupInfos
+                    .Where(encounterInfo => encounterInfo.LengthOfStay <= (encounterInfo.MadLos * exclusionCriteria.LosExclusionValue) + encounterInfo.MedianLengthOfStay),
+                ExclusionCriteriaType.Iqr => encounterGroupInfos
+                    .Where(encounterInfo => encounterInfo.LengthOfStay <= (encounterInfo.IqrLos * exclusionCriteria.LosExclusionValue) + encounterInfo.SeventyFivePercentileLos),
+                _ => encounterGroupInfos
+            };
+
+            includedEncounterInfos = exclusionCriteria.CostExclusionType switch
+            {
+                ExclusionCriteriaType.Mad => includedEncounterInfos
+                    .Where(encounterInfo => encounterInfo.Vdc <= (encounterInfo.MadVdc * exclusionCriteria.CostExclusionValue) + encounterInfo.MedianVdc),
+                ExclusionCriteriaType.Iqr => includedEncounterInfos
+                    .Where(encounterInfo => encounterInfo.Vdc <= (encounterInfo.IqrVdc * exclusionCriteria.CostExclusionValue) + encounterInfo.SeventyFivePercentileVdc),
+                _ => includedEncounterInfos
+            };
+
+            var excludedEncounterInfos = encounterGroupInfos.Except(includedEncounterInfos);
+
+            Id = encounterGroupInfos.First().CaseTypeFamilyId;
+            Name = groupName;
+
+            var encounterInfosAbove = encounterGroupInfos.Where(i => i.IdentifiedVariation > 0);
+
+            TotalEncounters = encounterGroupInfos.DistinctBy(x => x.EncounterId).Count();
+            TotalVariationEncounters = encounterInfosAbove.DistinctBy(x => x.EncounterId).Count();
+            IdentifiedVariation = encounterInfosAbove.Sum(e => e.IdentifiedVariation);
+
+            var distinctIncludedEncounters = includedEncounterInfos.DistinctBy(x => x.EncounterId);
+            IncludedEncounterCount = distinctIncludedEncounters.Count();
+            MortalityRate = distinctIncludedEncounters.Any() ? distinctIncludedEncounters.Average(i => i.IsExpired) : 0;
+            MedianLos = distinctIncludedEncounters.Median(i => i.LengthOfStay);
+            AverageLengthOfStay = distinctIncludedEncounters.Any() ? distinctIncludedEncounters.Average(i => i.LengthOfStay) : 0;
+            MedianCost = CalculateMedianCost(isDetailRow, includedEncounterInfos);
+
+            var includedInfosAbove = includedEncounterInfos.Where(i => i.IdentifiedVariation > 0);
+            IncludedEncountersAboveMedian = includedInfosAbove.DistinctBy(x => x.EncounterId).Count();
+            IncludedEncountersBelowMedian = IncludedEncounterCount - IncludedEncountersAboveMedian;
+            IncludedVariation = includedEncounterInfos.Any() ? includedInfosAbove.Sum(e => e.IdentifiedVariation) : 0;
+
+            var excludedInfosAbove = excludedEncounterInfos.Where(i => i.IdentifiedVariation > 0);
+            ExcludedEncountersAboveMedian = excludedEncounterInfos.DistinctBy(x => x.EncounterId).Count();
+            ExcludedVariation = excludedEncounterInfos.Any() ? excludedInfosAbove.Sum(e => e.IdentifiedVariation) : 0;
+        }
+
+        private static double CalculateMedianCost(bool isDetailRow, IEnumerable<CaseTypeFamilyEncounterInfo> includedEncounterInfos)
+        {
+            if (isDetailRow)
+            {
+                return includedEncounterInfos.Select(i => i.MedianVariableDirectCost).FirstOrDefault();
+            }
+
+            // CTF Level - Total VDC Median for encounters within CTF
+            var costDriverEncounters = includedEncounterInfos.GroupBy(x => x.EncounterId).Select(group => new { TotalVDC = group.Sum(encounters => encounters.VariableDirectCost) });
+            return costDriverEncounters.Select(x => x.TotalVDC).Median();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/EncounterPhysicianInfo.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/EncounterPhysicianInfo.cs
new file mode 100644
index 0000000..84bcf4f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/EncounterPhysicianInfo.cs
@@ -0,0 +1,96 @@
+using DocumentFormat.OpenXml.Wordprocessing;
+using Microsoft.EntityFrameworkCore.Migrations.Operations;
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static Pipelines.Sockets.Unofficial.SocketConnection;
+using Jazz = Strata.DecisionSupport.Models.Jazz;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration
+{
+    public class PhysicianInfo
+    {
+        public int PhysicianID { get; set; }
+        public string PhysicianName { get; set; }        
+        public Guid PhysicianGUID { get; set; }
+        public string StrPhysicianGUID
+        {
+            set
+            {
+                this.PhysicianGUID = Guid.TryParse(value, out var valueGuid) ? valueGuid : Guid.Empty;
+            }
+        }
+        public int PhysicianGroupAffiliationID { get; set; }
+        public string PhysicianGroupAffiliation { get; set; }        
+        public Guid PhysicianGroupAffiliationGUID { get; set; }
+        public string StrPhysicianGroupAffiliationGUID
+        {
+            set
+            {
+                this.PhysicianGroupAffiliationGUID = Guid.TryParse(value, out var valueGuid) ? valueGuid : Guid.Empty;
+            }
+        }
+        public int PhysicianSpecialtyID { get; set; }
+        public string PhysicianSpecialty { get; set; }        
+        public Guid PhysicianSpecialtyGUID { get; set; }
+        public string StrPhysicianSpecialtyGUID
+        {
+            set
+            {
+                this.PhysicianSpecialtyGUID = Guid.TryParse(value, out var valueGuid) ? valueGuid : Guid.Empty;
+            }
+        }
+    }
+
+    public class EncounterInfoBase
+    {
+        public long EncounterId { get; set; }
+        public string EncounterRecordNumber { get; set; }
+        public int PhysicianID { get; set; }
+        public int AgeCohortID { get; set; }
+        public int EntityID { get; set; }        
+        public int ServiceLineID { get; set; }
+        public double LengthOfStay { get; set; }
+        public bool IsQVIEncounter { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+        public bool IsExcluded { get; set; }
+    }
+
+    public class EncounterPhysicianInfo : EncounterInfoBase
+    {
+        public string PhysicianName { get; set; }
+        public Guid PhysicianGUID { get; set; }
+        public int PhysicianGroupAffiliationID { get; set; }
+        public string PhysicianGroupAffiliation { get; set; }
+        public Guid PhysicianGroupAffiliationGUID { get; set; }
+        public int PhysicianSpecialtyID { get; set; }
+        public string PhysicianSpecialty { get; set; }
+        public Guid PhysicianSpecialtyGUID { get; set; }
+
+        public void AddPhysicianData(PhysicianInfo physician)
+        {
+            PhysicianName = physician.PhysicianName;
+            PhysicianGUID = physician.PhysicianGUID;
+            PhysicianGroupAffiliationID = physician.PhysicianGroupAffiliationID;
+            PhysicianGroupAffiliation = physician.PhysicianGroupAffiliation;
+            PhysicianGroupAffiliation = physician.PhysicianGroupAffiliation;
+            PhysicianGroupAffiliationGUID = physician.PhysicianGroupAffiliationGUID;
+            PhysicianSpecialtyID = physician.PhysicianSpecialtyID;
+            PhysicianSpecialty = physician.PhysicianSpecialty;
+            PhysicianSpecialtyGUID = physician.PhysicianSpecialtyGUID;
+        }
+    }
+
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true,
+        PropertyNameMappingStrategy = PropertyNameMappingStrategy.CaseInsensitive)]
+    public static partial class EncounterInfoMapper
+    {
+        public static partial EncounterPhysicianInfo MapToEncounterPhysicianInfo(this EncounterInfoBase src);
+        public static partial Jazz.ExplorationEncounterInfo MapToExplorationEncounterInfo(this EncounterPhysicianInfo src);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationFilterService.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationFilterService.cs
new file mode 100644
index 0000000..2b3a3d3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationFilterService.cs
@@ -0,0 +1,459 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.PatientType;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Schema.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using Strata.StrataSphereCompare.Client.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using static Strata.ContinuousImprovement.Biz.Exploration.ExplorationService;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration
+{
+    public class ExplorationFilterService : IExplorationFilterService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly ISchemaServiceClient _schemaServiceClient;
+        private readonly ILogger<ExplorationFilterService> _logger;
+
+        /// <summary>
+        /// Valid SPH cost drivers to avoid looking at any custom/variation across customer base
+        /// </summary>
+        private static class SphCostDrivers
+        {
+            public const string AnesthesiaAndRecovery = "Anesthesia and Recovery";
+            public const string Imaging = "Imaging";
+            public const string Laboratory = "Laboratory";
+            public const string LengthOfStay = "LOS";
+            public const string OrTime = "OR Time";
+            public const string Pharmacy = "Pharmacy";
+            public const string Supplies = "Supplies";
+        }
+
+        private static readonly string[] ValidSphCostDrivers =
+        {
+            SphCostDrivers.AnesthesiaAndRecovery,
+            SphCostDrivers.Imaging,
+            SphCostDrivers.Laboratory,
+            SphCostDrivers.LengthOfStay,
+            SphCostDrivers.OrTime,
+            SphCostDrivers.Pharmacy,
+            SphCostDrivers.Supplies
+        };
+
+        public ExplorationFilterService(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            ISchemaServiceClient schemaServiceClient,
+            ILogger<ExplorationFilterService> logger)
+        {
+            _dbContextFactory = dbContextFactory;
+            _schemaServiceClient = schemaServiceClient;
+            _logger = logger;
+        }
+
+        public async Task<(string QueryFilters, string EncounterSummaryFilters)> GetFilterStringsAsync(IEnumerable<FilterChipItem> filterChipItems, IQueryParamBase queryParams, CancellationToken cancellationToken)
+        {
+            var filterCollection = await GetFiltersAsync(filterChipItems, queryParams, cancellationToken);
+            var queryFilters = filterCollection.QueryFilters.Any() ? "WHERE " + string.Join("\r\n        AND ", filterCollection.QueryFilters) + "\r\n" : "\r\n";
+            var encounterSummaryFilters = filterCollection.EncounterSummaryFilters.Any() ? "AND " + string.Join("\r\n        AND ", filterCollection.EncounterSummaryFilters) + "\r\n" : "\r\n";
+            return (queryFilters, encounterSummaryFilters);
+        }
+
+        public async Task<FilterCollection> GetFiltersAsync(IEnumerable<FilterChipItem> filterChipItems, IQueryParamBase queryParams, CancellationToken cancellationToken)
+        {
+            if (filterChipItems.IsEmpty()) { return new FilterCollection(); }
+            var ids = new List<string>();
+            var queryFilters = new List<string>();
+            var encounterSummaryFilters = new List<string>();
+            var filterCollection = new FilterCollection();
+            var filterChipGroups = filterChipItems
+                    .OrderBy(fci => fci.ChipType).ThenBy(fci => fci.Key);
+
+            foreach (var filterChipItem in filterChipGroups)
+            {
+                // UI Filter chip only, doesn't produce any expected microservice query constructs
+                if (new[] { ChipKey.LengthOfStay, ChipKey.VariableDirectCost }.Contains(filterChipItem.Key))
+                    continue;
+
+                var isIn = filterChipItem.Operator == OperatorType.In ? "In" : "Not In";
+                try
+                {
+                    switch (filterChipItem.ChipType)
+                    {
+                        case ChipType.ScoreMember when filterChipItem.Filters.Count > 0:
+                            await ProcessScoreMemberFilter(filterChipItem, isIn, queryFilters, encounterSummaryFilters, cancellationToken);
+                            break;
+                        case ChipType.Boolean when filterChipItem.IsSelected.HasValue:
+                            ProcessBooleanFilter(filterChipItem, isIn, queryFilters);
+                            break;
+                        case ChipType.Special when filterChipItem.Filters.Count > 0:
+                            ProcessSpecialFilter(filterChipItem, isIn, queryFilters);
+                            break;
+                        case ChipType.CostDriver when filterChipItem.Filters.Count > 0:
+                            ProcessCostDriverFilter(filterChipItem, queryFilters);
+                            break;
+                        case ChipType.DateRange when filterChipItem.DateRange.Count() == 2:
+                            ProcessDateRangeFilter(filterChipItem, queryParams);
+                            break;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogServiceError(ex, info: new Dictionary<string, object> { { "FilterBars", filterChipItem } });
+                    throw;
+                }
+            }
+
+            filterCollection.QueryFilters = queryFilters.Where(qf => !string.IsNullOrEmpty(qf));
+            filterCollection.EncounterSummaryFilters = encounterSummaryFilters.Where(esf => !string.IsNullOrEmpty(esf));
+            return filterCollection;
+        }
+
+        /// <summary>
+        /// Builds a <see cref="CostDetailsFilterDto"/> instance based on the supplied filter chips
+        /// and drill-down context for the selected case type family and cost driver.
+        /// </summary>
+        /// <param name="drillDownCaseTypeFamily">The case type family being drilled into for cost details.</param>
+        /// <param name="drillDownCostDriver">The identifier of the cost driver for which drill-down filters are being built.</param>
+        /// <param name="filters">The collection of filter chip items used to construct population and benchmarking filters.</param>
+        /// <param name="isUsingAprdrg">Indicates whether APR-DRG logic should be applied when building population criteria filters.</param>
+        /// <param name="forceIncludeOfCostDriverColumn">If true, forces inclusion of the cost driver column in the resulting filters.</param>
+        /// <param name="includeCodeColumn">If true, includes the code column in the resulting filters for the drill-down.</param>
+        /// <param name="cancellationToken">Token used to observe cancellation requests for the asynchronous operation.</param>
+        /// <returns>A populated <see cref="CostDetailsFilterDto"/> representing the filters to apply to the cost details query.</returns>
+        public async Task<CostDetailsFilterDto> BuildDataFiltersAsync(CaseTypeFamily drillDownCaseTypeFamily, string drillDownCostDriver, Filters.Filter filters, bool isUsingAprdrg, bool forceIncludeOfCostDriverColumn, bool includeCodeColumn, CancellationToken cancellationToken)
+        {
+            var dataFilters = new CostDetailsFilterDto();
+            var filterChipItems = filters.FilterChipItems;
+
+            if (filterChipItems == null || filterChipItems.Count == 0)
+                return dataFilters;
+
+            // Apply filter for supported "in" type only, OperatorType.In 
+            filterChipItems = filterChipItems.Where(x => x.Operator == OperatorType.In).ToList();
+
+            await ApplyPopulationCriteriaFiltersAsync(isUsingAprdrg, dataFilters, filterChipItems, cancellationToken);
+            ApplyBenchmarkingCriteriaFilters(filterChipItems, dataFilters);
+
+            // CTF -> Cost Driver DrillDowns
+            ApplyDrillDownFilters(dataFilters, isUsingAprdrg, drillDownCaseTypeFamily, drillDownCostDriver, forceIncludeOfCostDriverColumn, includeCodeColumn);
+
+            dataFilters.AvailableDrgType = isUsingAprdrg ? StrataSphereCompare.Client.Models.Enums.DrgType.AprDrg : StrataSphereCompare.Client.Models.Enums.DrgType.MsDrg;
+
+            return dataFilters;
+        }
+
+        public FilterChipItem CreateCostDriverFilter()
+        {
+            return new FilterChipItem
+            {
+                ChipType = ChipType.CostDriver,
+                IsSelected = true,
+                Key = ChipKey.CostDriver,
+                Operator = OperatorType.In,
+                Filters = [.. ValidSphCostDrivers.Select(costDriver => new TreeNode
+                {
+                    DisplayText = costDriver,
+                    Id = costDriver
+                })]
+            };
+        }
+
+        #region Private Methods
+
+        private async Task ProcessScoreMemberFilter(FilterChipItem filterChipItem, string isIn, List<string> queryFilters, List<string> encounterSummaryFilters, CancellationToken cancellationToken)
+        {
+            var dimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync(filterChipItem.GlobalId, cancellationToken);
+            if (dimension != null)
+            {
+                var members = await _schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid, filterChipItem.Filters.Select(f => f.Id), cancellationToken);
+
+                var ids = members.Select(m => m.Id).ToList();
+
+                if (filterChipItem.GlobalId.Equals("Patient Type Rollup", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    var patientTypeDimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync("Patient Type", cancellationToken);
+                    var patientTypeMembers = await _schemaServiceClient.GetDimensionMembersByDimensionGuidAsync<PatientTypeMember>(patientTypeDimension.DimensionGuid, cancellationToken);
+                    var patientTypeIds = patientTypeMembers.Where(n => ids.Contains(n.PatientTypeRollupID.ToString())).Select(m => m.PatientTypeID).ToList();
+                    ids = patientTypeIds.ConvertAll(x => x.ToString());
+                }
+
+                if (ids.Count == 0) { return; }
+
+                var columnName = filterChipItem.Key.ToString();
+                if (columnName.Equals("CaseTypeFamilyID", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    queryFilters.Add($"el.CaseTypeFamilyID {isIn} ({string.Join(", ", ids)})");
+                }
+                else if (columnName.Equals("MSDRGRollupID", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    queryFilters.Add($"dmsdroll.MSDRGRollupID {isIn} ({string.Join(", ", ids)})");
+                }
+                else
+                {
+                    if (filterChipItem.Key.IsEncounterSummaryFilter())
+                    {
+                        encounterSummaryFilters.Add($"fpes.{columnName} {isIn} ({string.Join(", ", ids)})");
+                    }
+                    else
+                    {
+                        queryFilters.Add($"el.{columnName} {isIn} ({string.Join(", ", ids)})");
+                    }
+                }
+            }
+        }
+
+        private static void ProcessBooleanFilter(FilterChipItem filterChipItem, string isIn, List<string> queryFilters)
+        {
+            queryFilters.Add(filterChipItem.Key switch
+            {
+                ChipKey.IsGreaterThanZeroCharges => $"el.Charges {(filterChipItem.IsSelected.Value ? ">" : " <= ")} 0",
+                ChipKey.Mortality => $"el.isExpired {isIn} (" + (filterChipItem.IsSelected.Value ? "1" : "0") + ")",
+                _ => null
+            });
+        }
+
+        private static void ProcessSpecialFilter(FilterChipItem filterChipItem, string isIn, List<string> queryFilters)
+        {
+            var filterIds = string.Join(", ", filterChipItem.Filters.Select(f => f.Id));
+            queryFilters.Add(filterChipItem.Key switch
+            {
+                ChipKey.RiskOfMortality => $"el.ROM {isIn} ({filterIds})",
+                ChipKey.SeverityOfIllness => $"el.SOI {isIn} ({filterIds})",
+                _ => null
+            });
+        }
+
+        private static void ProcessCostDriverFilter(FilterChipItem filterChipItem, List<string> queryFilters)
+        {
+            var costDrivers = string.Join(", ", filterChipItem.Filters.Select(f => $"'{(f.Id == Constants.NOT_SPECIFIED ? "" : f.Id)}'"));
+            queryFilters.Add(filterChipItem.Key switch
+            {
+                // Cost driver only supports IN for now
+                ChipKey.CostDriver => $"el.CostDriver IN ({costDrivers})",
+                _ => null
+            });
+        }
+
+        private static void ProcessDateRangeFilter(FilterChipItem filterChipItem, IQueryParamBase queryParams)
+        {
+            var dateRange = filterChipItem.DateRange.Select(dr => dr.Date).ToArray();
+            queryParams.DischargeDateStart = $"{dateRange[0]:yyyy-MM-dd}";
+            queryParams.DischargeDateEnd = $"{dateRange[1].AddDays(1):yyyy-MM-dd}";
+        }
+
+        private async Task ApplyPopulationCriteriaFiltersAsync(bool isUsingAprdrg, CostDetailsFilterDto dataFilters, List<FilterChipItem> filterChipItems, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+
+            await ApplyScoreMemberFiltersAsync(filterChipItems, isUsingAprdrg, dbContext, dataFilters, cancellationToken);
+            ApplyCostDriverFilters(filterChipItems, dataFilters);
+        }
+
+        private void ApplyBenchmarkingCriteriaFilters(IEnumerable<FilterChipItem> filterChipItems, CostDetailsFilterDto dataFilters)
+        {
+            if (!filterChipItems.Any()) { return; }
+
+            // New Born Flag (boolean type)
+            var isNewBornFilterItem = filterChipItems.FirstOrDefault(f => f.Key == ChipKey.SPHIsNewBorn);
+            if (isNewBornFilterItem != null)
+            {
+                dataFilters.SphIsNewborn = isNewBornFilterItem.Filters.Any(x => x.Id.Equals("true", StringComparison.OrdinalIgnoreCase));
+            }
+
+            // Apply filters for multiple selection types
+            var filterMappings = new Dictionary<ChipKey, Action<List<string>>>
+            {
+                { ChipKey.SPHAgeRollup, ids => dataFilters.SphAgeRollup = ids },
+                { ChipKey.SPHDischargeStatus, ids => dataFilters.SphDischargeStatus = ids },
+                { ChipKey.SPHAdmitType, ids => dataFilters.SphAdmitType = ids },
+                { ChipKey.SPHGender, ids => dataFilters.SphGender = ids },
+                { ChipKey.SPHPatientType, ids => dataFilters.SphPatientType = ids }
+            };
+
+            ApplyMultiSelectFilters(filterChipItems, filterMappings);
+        }
+
+        private static void ApplyMultiSelectFilters(IEnumerable<FilterChipItem> filterChipItems, Dictionary<ChipKey, Action<List<string>>> filterMappings)
+        {
+            foreach (var mapping in filterMappings)
+            {
+                var filterItems = filterChipItems.Where(f => f.Key == mapping.Key);
+                if (filterItems.Any())
+                {
+                    var ids = filterItems.SelectMany(x => x.Filters.Select(filter => filter.Id)).ToList();
+                    mapping.Value(ids);
+                }
+            }
+        }
+
+        private static void ApplyCostDriverFilters(IEnumerable<FilterChipItem> filterChipItems, CostDetailsFilterDto dataFilters)
+        {
+            // ChipType.CostDriver
+            var costDriverFilterItems = filterChipItems.Where(f => f.Key == ChipKey.CostDriver);
+            if (costDriverFilterItems.Any())
+            {
+                dataFilters.SphChargeCodeCostDriver = costDriverFilterItems
+                    .SelectMany(i => i.Filters.Select(x => x.Id)) // id = displaytext for this type
+                    .ToList();
+            }
+        }
+
+        /// <summary>
+        /// Configures the filters for drilling down
+        /// </summary>
+        /// <param name="dataFilters">the object to modify to apply the drill down</param>
+        /// <param name="drillDownCaseTypeFamily">if set, will filter the returned data down to specific CTF</param>
+        /// <param name="drillDownCostDriver">For page 2, set and will filter specifically down to a costdriver</param>
+        /// <param name="forceIncludeOfCostDriverColumn">Only used when set to true if <paramref name="drillDownCaseTypeFamily"/> is null and <paramref name="drillDownCostDriver"/> is an empty string, includes all other and total columns to cost driver if true and costdriver filters are set</param>
+        /// <param name="includeCodeColumn">forces the load of the lowest level detail for the cpt, drg columns</param>
+        private static void ApplyDrillDownFilters(CostDetailsFilterDto dataFilters, bool isUsingAprDrg, CaseTypeFamily drillDownCaseTypeFamily, string drillDownCostDriver, bool forceIncludeOfCostDriverColumn, bool includeCodeColumn)
+        {
+            if (drillDownCaseTypeFamily != null)
+            {
+                // Apply CTF drill down filter if the CTF is one of the allowed types.
+                var allowedDetailTypes = new string[] { "msdrg", "aprdrg", "cpt" };
+                var detailType = drillDownCaseTypeFamily.CaseTypeFamilyType.ToLower();
+                if (allowedDetailTypes.Contains(detailType))
+                {
+                    dataFilters.CostDetailsFilterDrillDown = new CostDetailsFilterDrillDownDto
+                    {
+                        DetailType = detailType == "cpt" ? "cpt" : isUsingAprDrg ? "aprdrg" : "msdrg", // case sensitive (must be lowercase)
+                        DetailFilterValue = drillDownCaseTypeFamily.Name
+                    };
+
+                    // Attempt to apply Cost Driver filter if CTF filter is applied.
+                    if (!string.IsNullOrEmpty(drillDownCostDriver))
+                    {
+                        dataFilters.CostDetailsFilterDrillDown.CostDriverFilterValue = drillDownCostDriver;
+                    }
+                }
+            }
+            else if (forceIncludeOfCostDriverColumn)
+            {
+                dataFilters.CostDetailsFilterDrillDown = new CostDetailsFilterDrillDownDto(); //this forces the costdriver column to be included - we should look at a more explicit way to do this in the cost detail api
+                if (dataFilters.SphChargeCodeCostDriver.Count > 0)
+                {
+                    dataFilters.IncludeCostDriverAggregations = true;
+                }
+            }
+
+            dataFilters.IncludeCodeColumn = includeCodeColumn;
+        }
+
+        private async Task ApplyScoreMemberFiltersAsync(IEnumerable<FilterChipItem> filterChipItems, bool isUsingAprdrg, JazzDbContext dbContext, CostDetailsFilterDto dataFilters, CancellationToken cancellationToken)
+        {
+            var filterMappings = new List<ScoreMemberFilterMapping>
+            {
+                new(ChipKey.AprDrgID, async memberIds =>
+                    dataFilters.SphAprDrgCode = await dbContext.DimAprDrgs
+                        .Where(x => memberIds.Contains(x.AprDrgId))
+                        .Select(x => x.AprDrgCode)
+                        .ToListAsync(cancellationToken)),
+
+                new(ChipKey.MSDRGRollupID, async memberIds =>
+                    dataFilters.SphMsDrgCode = await dbContext.DimMsdrgRollups
+                        .Where(x => memberIds.Contains(x.MsdrgRollupId))
+                        .Select(x => x.MsdrgRollupCode)
+                        .ToListAsync(cancellationToken)),
+
+                new(ChipKey.ICD10DXPrimaryDiagID, async memberIds =>
+                    dataFilters.SphPrimaryIcd10DxCode = await dbContext.DimIcd10Dxs
+                        .Where(x => memberIds.Contains(x.Icd10DxId))
+                        .Select(x => x.Icd10DxCode)
+                        .ToListAsync(cancellationToken)),
+
+                new(ChipKey.ICD10PXPrimaryID, async memberIds =>
+                    dataFilters.SphPrimaryIcd10PxCode = await dbContext.DimIcd10Pxs
+                        .Where(x => memberIds.Contains(x.Icd10PxId))
+                        .Select(x => x.Icd10PxCode)
+                        .ToListAsync(cancellationToken)),
+
+                new(ChipKey.PrimaryCPTID, async memberIds =>
+                    dataFilters.SphPrimaryCptCode = await dbContext.DimCpts
+                        .Where(x => memberIds.Contains(x.CptId))
+                        .Select(x => x.CptCode)
+                        .ToListAsync(cancellationToken))
+            };
+
+            // Apply standard score member filters
+            await ApplyStandardScoreMemberFiltersAsync(filterChipItems, filterMappings, cancellationToken);
+
+            // Handle special case for Case Type Family Names
+            await ApplyCaseTypeFamilyFilterAsync(filterChipItems, isUsingAprdrg, dbContext, dataFilters, cancellationToken);
+        }
+
+        private async Task ApplyStandardScoreMemberFiltersAsync(IEnumerable<FilterChipItem> filterChipItems, List<ScoreMemberFilterMapping> filterMappings, CancellationToken cancellationToken)
+        {
+            var tasks = filterMappings
+                .Select(async mapping =>
+                {
+                    var filterItems = filterChipItems.Where(f => f.Key == mapping.ChipKey);
+                    if (filterItems.Any())
+                    {
+                        var memberIds = await GetFilterChipMemberIdsAsync(filterItems, cancellationToken);
+                        await mapping.ApplyFilter(memberIds);
+                    }
+                });
+
+            await Task.WhenAll(tasks);
+        }
+
+        private async Task ApplyCaseTypeFamilyFilterAsync(IEnumerable<FilterChipItem> filterChipItems, bool isUsingAprdrg, JazzDbContext dbContext, CostDetailsFilterDto dataFilters, CancellationToken cancellationToken)
+        {
+            var caseTypeFamilyFilterItems = filterChipItems.Where(f => f.Key == ChipKey.CaseTypeFamilyID);
+            if (!caseTypeFamilyFilterItems.Any()) return;
+
+            var memberIds = await GetFilterChipMemberIdsAsync(caseTypeFamilyFilterItems, cancellationToken);
+            var caseTypeFamilies = await dbContext.CaseTypeFamilies
+                .Where(ctf => memberIds.Contains(ctf.CaseTypeFamilyId))
+                .ToListAsync(cancellationToken);
+
+
+            if (isUsingAprdrg)
+            {
+                dataFilters.AprDrgCaseTypeFamilyName = caseTypeFamilies
+                    .Select(x => x.Name)
+                    .ToList();
+            }
+            else
+            {
+                dataFilters.MsDrgCaseTypeFamilyName = caseTypeFamilies
+                    .Select(x => x.Name)
+                    .ToList();
+            }
+
+            dataFilters.SphCptCodeCaseTypeFamilyName = caseTypeFamilies
+                .Where(x => x.CaseTypeFamilyType.Equals("cpt", StringComparison.OrdinalIgnoreCase))
+                .Select(x => x.Name)
+                .ToList();
+        }
+
+        private async Task<List<int>> GetFilterChipMemberIdsAsync(IEnumerable<FilterChipItem> filterItems, CancellationToken cancellationToken)
+        {
+            if (filterItems == null || !filterItems.Any())
+            {
+                return new List<int>();
+            }
+
+            var hPaths = filterItems.SelectMany(items => items.Filters.Select(filter => filter.Id));
+            var globalId = filterItems.FirstOrDefault().GlobalId;
+
+            var dimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync(globalId);
+            var members = await _schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid, hPaths, cancellationToken);
+            var memberIds = members.Select(m => int.Parse(m.Id)).Distinct().ToList();
+            return memberIds;
+        }
+
+        private record ScoreMemberFilterMapping(ChipKey ChipKey, Func<List<int>, Task> ApplyFilter);
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationInfo.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationInfo.cs
new file mode 100644
index 0000000..22617dc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationInfo.cs
@@ -0,0 +1,31 @@
+using Strata.ContinuousImprovement.Biz.Exploration.Benchmark;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration
+{
+    public class ExplorationInfo : IExplorationInfo
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public ExclusionCriteria ExclusionCriteria { get; set; }
+        public Filters.Filter Filters { get; set; }
+        public int PeerGroupId { get; set; }
+        public BenchmarkingInsightsGranularity Granularity { get; set; }
+    }
+
+    public class ExplorationCostDriverInfo : ExplorationInfo
+    {
+        public int CaseTypeFamilyId { get; set; }
+    }
+
+    public class ExplorationDetailInfo : ExplorationInfo
+    {
+        public int CaseTypeFamilyId { get; set; }
+        public string CostDriver { get; set; }
+        public CaseTypeCategories? CodeType { get; set; }
+        public List<long> ExcludedEncounters { get; set; }
+        public List<long> IncludedEncounters { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationService.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationService.cs
new file mode 100644
index 0000000..37f6706
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationService.cs
@@ -0,0 +1,793 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Exploration.Benchmark;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.PeerGroups;
+using Strata.ContinuousImprovement.Biz.PeerGroups.Enums;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using Strata.StrataSphereCompare.Client;
+using Strata.StrataSphereCompare.Client.Models;
+using Strata.StrataSphereCompare.Client.Models.Enums;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration
+{
+    public class ExplorationService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            ISnowflakeDatabaseContext snowflakeDatabaseContext,
+            IFiscalMonthResolver fiscalMonthResolver,
+            IFeatureFlagWrapper featureFlagWrapper,
+            IStrataSphereCompareService strataSphereCompareService,
+            IExplorationFilterService explorationFilterService,
+            ILogger<ExplorationService> logger) : IExplorationService
+    {
+        public async Task<IEnumerable<CaseTypeFamilySummaryData>> GetCaseTypeFamilySummariesAsync(IExplorationInfo exploration, CancellationToken cancellationToken)
+        {
+            Stopwatch performanceTimer = null;
+            var isFlexExPerfLoggingEnabled = await IsFlexExPerfLogging(cancellationToken);
+
+            var isUsingAprdrg = await IsUsingAprdrgAsync(cancellationToken);
+
+            var queryParams = new QueryParams
+            {
+                CodeType = isUsingAprdrg ? CaseTypeCategories.APRDRG : CaseTypeCategories.MSDRG,
+                LosExclusionType = exploration.ExclusionCriteria.LosExclusionType.ToString(),
+                LosExclusionValue = exploration.ExclusionCriteria.LosExclusionValue.ToString(),
+                CostExclusionType = exploration.ExclusionCriteria.CostExclusionType.ToString(),
+                CostExclusionValue = exploration.ExclusionCriteria.CostExclusionValue.ToString(),
+            };
+
+            var filters = await explorationFilterService.GetFilterStringsAsync(exploration.Filters.FilterChipItems, queryParams, cancellationToken);
+            var ctfSummaryQuery = ExplorationServiceQuery.BuildCaseTypeFamilySummaryQuery(filters.QueryFilters, filters.EncounterSummaryFilters);
+
+            try
+            {
+                var start = DateTime.Now;
+
+                // Fire both async operations concurrently
+
+                var ctfSummaryTask = snowflakeDatabaseContext
+                    .QueryAsync<CaseTypeFamilySummaryInfo>(ctfSummaryQuery, "CaseTypeFamily Summary", queryParams);
+                var benchmarkingTask = GetBenchmarkingDataForSummaries(exploration.PeerGroupId, exploration.Filters, isUsingAprdrg, cancellationToken);
+
+                if (isFlexExPerfLoggingEnabled) performanceTimer = Stopwatch.StartNew();
+                await Task.WhenAll(ctfSummaryTask, benchmarkingTask);
+                if (isFlexExPerfLoggingEnabled) logger.LogPerformanceInformation($"CI FlexEx Perf * Call: Task.WhenAll * Elapsed time: {performanceTimer.Elapsed}");
+
+                var ctfSummaryInfo = ctfSummaryTask.Result;
+                var benchmarkingData = benchmarkingTask.Result;
+
+                // CTF Summaries
+                var caseTypeFamilySummaries = ctfSummaryInfo.Select(caseTypeGroup => new CaseTypeFamilySummaryData(caseTypeGroup)).ToList();
+
+                var endOfQuery = DateTime.Now.Subtract(start).TotalMilliseconds;
+                logger.LogServiceInformation("GetCaseTypeFamilySummariesAsyncLogging", new Dictionary<string, object> {
+                        { "query", ctfSummaryQuery },
+                        { "queryParams", queryParams.AsDictionary },
+                        { "time", endOfQuery },
+                        { "rows", ctfSummaryInfo.Count() }
+                    });
+
+                PopulateBenchmarkingSummaryData(caseTypeFamilySummaries, benchmarkingData, isUsingAprdrg);
+
+                return caseTypeFamilySummaries.OrderBy(caseTypeFamilySummary => caseTypeFamilySummary.Name);
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, info: new Dictionary<string, object> { { "query", ctfSummaryQuery }, { "queryParams", queryParams } });
+                throw;
+            }
+        }
+
+        public async Task<IEnumerable<CaseTypeFamilySummaryData>> GetCaseTypeFamilySummaryDetailsAsync(IExplorationInfo exploration, CancellationToken cancellationToken)
+        {
+            Stopwatch performanceTimer = Stopwatch.StartNew();
+            var isFlexExPerfLoggingEnabled = await IsFlexExPerfLogging(cancellationToken);
+
+            var isUsingAprdrg = await IsUsingAprdrgAsync(cancellationToken);
+
+            var withChildren = true;
+            var detail = exploration as ExplorationCostDriverInfo;
+
+            var queryParams = new QueryParams
+            {
+                CodeType = isUsingAprdrg ? CaseTypeCategories.APRDRG : CaseTypeCategories.MSDRG,
+                CaseTypeFamilyId = detail.CaseTypeFamilyId
+            };
+
+            var filters = await explorationFilterService.GetFilterStringsAsync(exploration.Filters.FilterChipItems, queryParams, cancellationToken);
+
+            var ctfSummaryQuery = ExplorationServiceQuery.BuildCaseTypeFamilySummaryDetailQuery(filters.QueryFilters, filters.EncounterSummaryFilters);
+
+            try
+            {
+                await using var dbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
+
+                var caseTypeFamily = await dbContext.CaseTypeFamilies.FirstOrDefaultAsync(x => x.CaseTypeFamilyId == detail.CaseTypeFamilyId, cancellationToken: cancellationToken);
+
+                // Fire both async operations concurrently
+                var ctfCostDriverTask = snowflakeDatabaseContext
+                    .QueryAsync<CaseTypeFamilyEncounterInfo>(ctfSummaryQuery, "CaseTypeFamily CostDriver Summary", queryParams);
+                var benchmarkingTask = GetBenchmarkingDataForCaseTypeFamily(exploration.PeerGroupId, exploration.Filters, caseTypeFamily, isUsingAprdrg, cancellationToken);
+
+                if (isFlexExPerfLoggingEnabled) performanceTimer = Stopwatch.StartNew();
+                await Task.WhenAll(ctfCostDriverTask, benchmarkingTask);
+                if (isFlexExPerfLoggingEnabled) { logger.LogPerformanceInformation($"CI FlexEx Perf * Call: Task.WhenAll * Elapsed time: {performanceTimer.Elapsed}"); }
+
+                var ctfCostDriverInfo = ctfCostDriverTask.Result;
+                var benchmarkingData = benchmarkingTask.Result;
+
+                // Tree Grid Details
+                var caseTypeGroups = ctfCostDriverInfo.GroupBy(x => x.CaseTypeFamilyId.ToString(), (CaseTypeFamilyId, Items) => new { CaseTypeFamilyId, Items });
+                var caseTypeGroup = caseTypeGroups.FirstOrDefault();
+                if (caseTypeGroup == null) { return Enumerable.Empty<CaseTypeFamilySummaryData>(); }
+
+                var ctfSummaryDetail = new CaseTypeFamilySummaryData(caseTypeGroup.CaseTypeFamilyId, caseTypeGroup.Items, exploration.ExclusionCriteria, withChildren: withChildren);
+
+                PopulateBenchmarkingCostDriverData(ctfSummaryDetail, benchmarkingData);
+
+                logger.LogServiceInformation("GetCaseTypeFamilySummaryDetailsAsyncLogging", new Dictionary<string, object> {
+                        { "query", ctfSummaryQuery },
+                        { "queryParams", queryParams.AsDictionary }
+                    });
+
+                return new List<CaseTypeFamilySummaryData>
+                {
+                    ctfSummaryDetail
+                };
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, info: new Dictionary<string, object> { { "query", ctfSummaryQuery }, { "queryParams", queryParams } });
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Gets heatmap data for summary page based on the current filters
+        /// </summary>
+        /// <param name="exploration">filters from the UI</param>
+        /// <param name="granularity">Row granularity: CaseTypeFamily, DrgCode, or PrimaryCpt</param>
+        /// <param name="cancellationToken">Token to cancel the asynchronous operation.</param>
+        /// <returns></returns>
+        public async Task<List<HeatMapData>> GetBenchmarkingDataForHeatMapAsync(IExplorationInfo exploration, BenchmarkingInsightsGranularity granularity, CancellationToken cancellationToken)
+        {
+            var isUsingAprdrg = await IsUsingAprdrgAsync(cancellationToken);
+            // Only apply filter if we don't filter by cost driver
+            if (!exploration.Filters.FilterChipItems.Any(fc => fc.Key == ChipKey.CostDriver))
+            {
+                exploration.Filters.FilterChipItems.Add(explorationFilterService.CreateCostDriverFilter());
+            }
+
+            // Guard: if the code level enhancement flag is off, fall back to CaseTypeFamily
+            if (granularity != BenchmarkingInsightsGranularity.CaseTypeFamily)
+            {
+                granularity = BenchmarkingInsightsGranularity.CaseTypeFamily;
+            }
+
+            var isCodeLevel = granularity != BenchmarkingInsightsGranularity.CaseTypeFamily;
+            var benchmarkingData = await GetBenchmarkingData(exploration.PeerGroupId, exploration.Filters, caseTypeFamily: null, "", isUsingAprdrg, true, isCodeLevel, cancellationToken);
+
+            // Map to simplified HeatMapData using the appropriate mapper based on granularity level
+            var heatMapData = granularity switch
+            {
+                BenchmarkingInsightsGranularity.DrgCode => HeatMapDataMapper.ToHeatMapDataCodeLevel(benchmarkingData, isUsingAprdrg),
+                BenchmarkingInsightsGranularity.PrimaryCpt => HeatMapDataMapper.ToHeatMapDataPrimaryCptLevel(benchmarkingData),
+                _ => HeatMapDataMapper.ToHeatMapData(benchmarkingData, isUsingAprdrg)
+            };
+
+            return heatMapData.OrderBy(h => h.Name).ToList();
+        }
+
+        /// <summary>
+        /// Gets benchmarking data for all case type families (summary view)
+        /// Page 1
+        /// </summary>
+        private Task<List<CostDetailsDto>> GetBenchmarkingDataForSummaries(int peerGroupId, Filters.Filter filters, bool isUsingAprdrg, CancellationToken cancellationToken)
+        {
+            return GetBenchmarkingData(peerGroupId, filters, caseTypeFamily: null, costDriver: null, isUsingAprdrg, false, false, cancellationToken);
+        }
+
+        /// <summary>
+        /// Gets benchmarking data for a specific case type family (includes cost driver breakdown)
+        /// Page 1
+        /// </summary>
+        private Task<List<CostDetailsDto>> GetBenchmarkingDataForCaseTypeFamily(int peerGroupId, Filters.Filter filters, CaseTypeFamily caseTypeFamily, bool isUsingAprdrg, CancellationToken cancellationToken)
+        {
+            return GetBenchmarkingData(peerGroupId, filters, caseTypeFamily, costDriver: null, isUsingAprdrg, false, false, cancellationToken);
+        }
+
+        /// <summary>
+        /// Gets benchmarking data for a specific case type family and cost driver combination (detail view)
+        /// This is for page 2
+        /// </summary>
+        private Task<List<CostDetailsDto>> GetBenchmarkingDataForCostDriver(int peerGroupId, Filters.Filter filters, CaseTypeFamily caseTypeFamily, string costDriver, bool isUsingAprdrg, bool includeCodeColumn, CancellationToken cancellationToken)
+        {
+            return GetBenchmarkingData(peerGroupId, filters, caseTypeFamily, costDriver, isUsingAprdrg, false, includeCodeColumn, cancellationToken);
+        }
+
+        /// <summary>
+        /// Retrieves benchmarking cost data based on peer group criteria and optional filters.
+        /// </summary>
+        /// <param name="peerGroupId">The identifier of the peer group to use for benchmarking comparison.</param>
+        /// <param name="filters">The filter criteria to apply to the benchmarking data query.</param>
+        /// <param name="caseTypeFamily">Optional case type family to filter results. Pass null for summary-level data.</param>
+        /// <param name="costDriver">Optional cost driver to filter results. Pass null unless drilling down to cost driver level.</param>
+        /// <param name="isUsingAprdrg">True if using APR-DRG classification; false for MS-DRG classification.</param>
+        /// <param name="forceIncludeOfCostDriverColumn">Only used when set to true if <paramref name="caseTypeFamily"/> is null and <paramref name="costDriver"/> is an empty string</param>
+        /// <param name="includeCodeColumn">forces the override of including the code column (msdrg, aprdrg, cpt)</param>
+        /// <param name="cancellationToken">Token to cancel the asynchronous operation.</param>
+        /// <returns>A list of cost detail records from the benchmarking service, or an empty list if benchmarking is disabled or no peer group mappings exist.</returns>
+        private async Task<List<CostDetailsDto>> GetBenchmarkingData(int peerGroupId, Filters.Filter filters, CaseTypeFamily caseTypeFamily, string costDriver, bool isUsingAprdrg, bool forceIncludeOfCostDriverColumn, bool includeCodeColumn, CancellationToken cancellationToken)
+        {
+            var isBenchmarkingEnabled = await featureFlagWrapper.IsCiBenchmarkingEnabled();
+            if (!isBenchmarkingEnabled) return new List<CostDetailsDto>();
+
+            await using var dbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
+
+            var peerGroupMappings = await dbContext.PeerGroupCriteriaMappings.Where(x => x.PeerGroupId == peerGroupId).ToListAsync(cancellationToken);
+            if (peerGroupMappings == null || peerGroupMappings.Count == 0) return new List<CostDetailsDto>();
+            var cohortParams = BuildCohortParams(peerGroupMappings, filters);
+
+            var dataFilters = await explorationFilterService.BuildDataFiltersAsync(caseTypeFamily, costDriver, filters, isUsingAprdrg, forceIncludeOfCostDriverColumn, includeCodeColumn, cancellationToken);
+            var benchmarkingData = await strataSphereCompareService.GetCostDetailsAsync(cohortParams, dataFilters, cancellationToken);
+
+            return benchmarkingData?.ToList() ?? new List<CostDetailsDto>();
+        }
+
+        private static BaseComparisonParams BuildCohortParams(IEnumerable<PeerGroupCriteriaMapping> mappings, Filters.Filter filters)
+        {
+            var comparisonParams = new BaseComparisonParams();
+            PopulatePeerGroupCriteria(comparisonParams, mappings);
+            PopulateDateRange(comparisonParams, filters);
+            return comparisonParams;
+        }
+
+        private static void PopulatePeerGroupCriteria(BaseComparisonParams comparisonParameters, IEnumerable<PeerGroupCriteriaMapping> mappings)
+        {
+            if (mappings == null) return;
+
+            var hospitalTypes = new HashSet<HospitalType>();
+            var censusRegions = new HashSet<CensusRegion>();
+            var operatingExpenses = new HashSet<OperatingExpense>();
+            var isAmcValues = new HashSet<IsAmc>();
+            var bedSizes = new HashSet<BedSize>();
+            var urbanRuralValues = new HashSet<UrbanRural>();
+
+            foreach (var mapping in mappings)
+            {
+                var criteriaType = (PeerGroupCritetiaType)mapping.MappingType;
+                switch (criteriaType)
+                {
+                    case PeerGroupCritetiaType.EntityTypes:
+                        hospitalTypes.Add((HospitalType)mapping.MappingValue);
+                        break;
+                    case PeerGroupCritetiaType.CensusRegions:
+                        censusRegions.Add((CensusRegion)mapping.MappingValue);
+                        break;
+                    case PeerGroupCritetiaType.OperatingExpenses:
+                        operatingExpenses.Add((OperatingExpense)mapping.MappingValue);
+                        break;
+                    case PeerGroupCritetiaType.AMCTypes:
+                        isAmcValues.Add((IsAmc)mapping.MappingValue);
+                        break;
+                    case PeerGroupCritetiaType.BedSize:
+                        bedSizes.Add((BedSize)mapping.MappingValue);
+                        break;
+                    case PeerGroupCritetiaType.UrbanRural:
+                        urbanRuralValues.Add((UrbanRural)mapping.MappingValue);
+                        break;
+                }
+            }
+
+            if (hospitalTypes.Count > 0) comparisonParameters.HospitalType = hospitalTypes.ToArray();
+            if (censusRegions.Count > 0) comparisonParameters.CensusRegion = censusRegions.ToArray();
+            if (operatingExpenses.Count > 0) comparisonParameters.OperatingExpense = operatingExpenses.ToArray();
+            if (isAmcValues.Count > 0) comparisonParameters.IsAmc = isAmcValues.ToArray();
+            if (bedSizes.Count > 0) comparisonParameters.BedSize = bedSizes.ToArray();
+            if (urbanRuralValues.Count > 0) comparisonParameters.UrbanRural = urbanRuralValues.ToArray();
+        }
+
+        private static void PopulateDateRange(BaseComparisonParams comparisonParameters, Filters.Filter filters)
+        {
+            if (filters?.FilterChipItems == null) return;
+
+            var dateFilter = filters.FilterChipItems.FirstOrDefault(f => f.ChipType == ChipType.DateRange);
+
+            if (dateFilter?.DateRange == null || dateFilter.DateRange.Count() != 2) return;
+
+            var start = dateFilter.DateRange.First();
+            var end = dateFilter.DateRange.Last();
+
+            // benchmarking expects this format
+            comparisonParameters.StartDate = start.ToString("yyyyMM");
+            comparisonParameters.EndDate = end.ToString("yyyyMM");
+        }
+
+        private static void PopulateBenchmarkingSummaryData(List<CaseTypeFamilySummaryData> summaries, List<CostDetailsDto> benchmarkingData, bool isUsingAprdrg)
+        {
+            if (benchmarkingData != null && benchmarkingData.Count > 0)
+            {
+                var benchmarkingLookup = benchmarkingData
+                    .SelectMany(data => new[]
+                    {
+                        (Name: data.SphCptCodeCaseTypeFamilyName, Item: data),
+                        isUsingAprdrg ? (Name: data.AprDrgCaseTypeFamilyName, Item: data) : (Name: data.MsDrgCaseTypeFamilyName, Item: data)
+                    })
+                    .Where(x => x.Item != null
+                        && !string.IsNullOrEmpty(x.Name)
+                        && !x.Name.Equals("Not Specified"))   // note: excluding "Not Specified" because we don't show it in the CTF summaries
+                    .GroupBy(x => x.Name)
+                    .ToDictionary(g => g.Key, g => g.Select(x => x.Item).FirstOrDefault());
+
+                summaries.ForEach(ctf =>
+                {
+                    if (benchmarkingLookup.TryGetValue(ctf.Name, out var benchmark))
+                    {
+                        ctf.Data.PeerMedianCost = (double)benchmark.P50th_VariableDirectCost;
+                        ctf.Data.PeerMedianALos = (double)benchmark.P50th_Alos;
+                        ctf.Data.CustomerBenchmarkMedianCost = (double)(benchmark.CustomerP50th_VariableDirectCost ?? 0);
+                        ctf.Data.CustomerBenchmarkALos = (double)(benchmark.CustomerP50th_Alos ?? 0);
+                    }
+                });
+            }
+        }
+
+        private static void PopulateBenchmarkingCostDriverData(CaseTypeFamilySummaryData summary, List<CostDetailsDto> benchmarkingData)
+        {
+            if (benchmarkingData != null && benchmarkingData.Count > 0)
+            {
+                var costDriverLookup = benchmarkingData
+                    .GroupBy(d => (d.SphChargeCodeCostDriver ?? string.Empty).Trim())   // intentionally includes "" costdriver grouping for not specified cost drivers
+                    .Where(g => !string.IsNullOrEmpty(g.Key) || g.Any(x => string.IsNullOrEmpty(x.SphChargeCodeCostDriver)))
+                    .ToDictionary(g => g.Key, g => g.First());
+
+                if (summary.Children != null && summary.Children.Any())
+                {
+                    foreach (var costDriverSummary in summary.Children)
+                    {
+                        if (costDriverLookup.TryGetValue(costDriverSummary.Name, out var benchmark))
+                        {
+                            costDriverSummary.Data.PeerMedianCost = (double)benchmark.P50th_VariableDirectCost;
+                            costDriverSummary.Data.PeerMedianALos = (double)benchmark.P50th_Alos;
+                            costDriverSummary.Data.CustomerBenchmarkMedianCost = (double)(benchmark.CustomerP50th_VariableDirectCost ?? 0);
+                            costDriverSummary.Data.CustomerBenchmarkALos = (double)(benchmark.CustomerP50th_Alos ?? 0);
+                        }
+                    }
+                }
+            }
+        }
+
+        private static void PopulateBenchmarkingCostDriverDetailData(List<CaseTypeFamilyDetailData> details, bool isUsingAprdrg, List<CostDetailsDto> benchmarks, List<CostDetailsDto> benchmarkCodes)
+        {
+            if (details == null || !details.Any()) return;
+            if ((benchmarks == null || benchmarks.Count == 0) && (benchmarkCodes == null || benchmarkCodes.Count == 0))
+            {
+                return;
+            }
+
+            var benchmarkCodesLookup = benchmarkCodes.SelectMany(data => new[]
+                    {
+                        (Name: data.SphPrimaryCptCode, Item: data),
+                        isUsingAprdrg ? (Name: data.SphAprDrgCode, Item: data) : (Name: data.SphMsDrgCode, Item: data)
+                    }).Where(x => x.Item != null
+                        && !string.IsNullOrEmpty(x.Name)
+                        && !x.Name.Equals("Not Specified"))   // note: excluding "Not Specified" because we don't show it in the CTF summaries
+                    .GroupBy(x => x.Name)
+                    .ToDictionary(g => g.Key, g => g.Select(x => x.Item).FirstOrDefault());
+
+            // map cost driver benchmarking data to first two levels 
+            foreach (var detail in details)
+            {
+                if (detail.Data != null && detail.Children.Any())
+                {
+                    var benchmark = benchmarks.FirstOrDefault();
+                    if (benchmark != null)
+                    {
+                        detail.Data.PeerMedianCost = (double)benchmark.P50th_VariableDirectCost;
+                        detail.Data.PeerMedianALos = (double)benchmark.P50th_Alos;
+                        detail.Data.CustomerBenchmarkMedianCost = (double)(benchmark.CustomerP50th_VariableDirectCost ?? 0);
+                        detail.Data.CustomerBenchmarkMedianALos = (double)(benchmark.CustomerP50th_Alos ?? 0);
+                    }
+
+                    foreach (var child in detail.Children)
+                    {
+                        if (benchmarkCodesLookup.TryGetValue(child.Data.Id, out var benchmarkCode))
+                        {
+                            child.Data.PeerMedianCost = (double)benchmarkCode.P50th_VariableDirectCost;
+                            child.Data.PeerMedianALos = (double)benchmarkCode.P50th_Alos;
+                            child.Data.CustomerBenchmarkMedianCost = (double)(benchmarkCode.CustomerP50th_VariableDirectCost ?? 0);
+                            child.Data.CustomerBenchmarkMedianALos = (double)(benchmarkCode.CustomerP50th_Alos ?? 0);
+                        }
+                    }
+                }
+            }
+        }
+
+        public async Task<CaseTypeFamilyDetailInfo> GetCaseTypeFamilyDetailsAsync(ExplorationDetailInfo exploration, CancellationToken cancellationToken)
+        {
+            var isUsingAprdrg = exploration.CodeType.HasValue
+                ? exploration.CodeType.Value == CaseTypeCategories.APRDRG
+                : await IsUsingAprdrgAsync(cancellationToken);

            Stopwatch performanceTimer = Stopwatch.StartNew();
+            var isFlexExPerfLoggingEnabled = await IsFlexExPerfLogging(cancellationToken);
+
+            var queryData = await EncountersQueryBuilder(exploration, isUsingAprdrg, ExplorationServiceQuery.CTFEntityCodePhysicianQuery, null, cancellationToken);

+            var queryOneParams = new Dictionary<string, object>
+         {
+             { "MULTI_STATEMENT_COUNT", queryData.Item2 }
+         };
+
+            var ctfGroupCalcs = new CTFGroupCalcs();
+            var entityGroupCalcs = Enumerable.Empty<EntityGroupCalcs>();
+            var entityCodeGroupCalcs = Enumerable.Empty<EntityCodeGroupCalcs>();
+            var entityCodePhysicianGroupCalcs = Enumerable.Empty<EntityCodePhysicianGroupCalcs>();
+            var ctfEncounterDetails = Enumerable.Empty<CTFEncounterDetail>();
+
+            if (isFlexExPerfLoggingEnabled) performanceTimer = Stopwatch.StartNew();
+            await using var dbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
+            var caseTypeFamily = await dbContext.CaseTypeFamilies.FirstOrDefaultAsync(x => x.CaseTypeFamilyId == exploration.CaseTypeFamilyId, cancellationToken);
+            if (isFlexExPerfLoggingEnabled) logger.LogPerformanceInformation($"CI FlexEx Perf * Call: dbContext.CaseTypeFamilies.FirstOrDefaultAsync * Elapsed time: {performanceTimer.Elapsed}");
+            var benchmarkingData = new List<CostDetailsDto>();
+            var benchmarkingDataCodes = new List<CostDetailsDto>();
+
+            try
+            {
+                // Fire both async operations concurrently
+                var detailQueryTask = snowflakeDatabaseContext.QueryMultipleAsync(queryData.Item1, "Entity Detail", queryOneParams);
+                var benchmarkingTask = GetBenchmarkingDataForCostDriver(exploration.PeerGroupId, exploration.Filters, caseTypeFamily, exploration.CostDriver, isUsingAprdrg, false, cancellationToken);
+                var benchmarkingCodesTask = GetBenchmarkingDataForCostDriver(exploration.PeerGroupId, exploration.Filters, caseTypeFamily, exploration.CostDriver, isUsingAprdrg, true, cancellationToken); //to get the drill down data
+
+                if (isFlexExPerfLoggingEnabled) performanceTimer = Stopwatch.StartNew();
+                await Task.WhenAll(detailQueryTask, benchmarkingTask, benchmarkingCodesTask);
+                if (isFlexExPerfLoggingEnabled)
+                {
+                    logger.LogPerformanceInformation($"CI FlexEx Perf * Call: Task.WhenAll * Elapsed time: {performanceTimer.Elapsed}");
+                    performanceTimer = Stopwatch.StartNew();
+                }
+
+
+                var detailQuery = detailQueryTask.Result;
+                benchmarkingData = benchmarkingTask.Result;
+                benchmarkingDataCodes = benchmarkingCodesTask.Result;
+                ctfGroupCalcs = detailQuery.Read<CTFGroupCalcs>().FirstOrDefault() ?? ctfGroupCalcs;
+                entityGroupCalcs = detailQuery.Read<EntityGroupCalcs>().ToList();
+                entityCodeGroupCalcs = detailQuery.Read<EntityCodeGroupCalcs>().ToList();
+                entityCodePhysicianGroupCalcs = detailQuery.Read<EntityCodePhysicianGroupCalcs>().ToList();
+                ctfEncounterDetails = detailQuery.Read<CTFEncounterDetail>();
+                ctfEncounterDetails.ForEach(x => { x.IdentifiedVariation = x.VariableDirectCost - ctfGroupCalcs.MedianVDC; });
+
+                if (isFlexExPerfLoggingEnabled) logger.LogPerformanceInformation($"CI FlexEx Perf * Getting all the detailQueries * Elapsed time: {performanceTimer.Elapsed}");
+
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, info: new Dictionary<string, object> { { "query", queryData.Item1 }, { "queryParams", queryOneParams } });
+                throw;
+            }
+
+            if (isFlexExPerfLoggingEnabled) performanceTimer = Stopwatch.StartNew();
+
+            var details = ctfEncounterDetails
+                .GroupBy(x => x.EntityId)
+                .Join(entityGroupCalcs, x => x.Key, y => y.EntityId, (x, y) => new { Group = x, GroupCalcs = y })
+                .Select(entityGroup => new CaseTypeFamilyDetailData
+                {
+                    Key = string.Join("-", "1", entityGroup.GroupCalcs.Id),
+                    Data = new CaseTypeDetailRowData((IEnumerable<ICTFEncounterDetail>)entityGroup.Group, entityGroup.GroupCalcs),
+                    Children = entityGroup.Group
+                    .GroupBy(x => x.Code)
+                    .Join(entityCodeGroupCalcs, x => new { x1 = entityGroup.GroupCalcs.EntityId, x2 = x.Key }, y => new { x1 = y.EntityId, x2 = y.Code }, (x, y) => new { Group = x, GroupCalcs = y })
+                    .Select(entityCodeGroup => new CaseTypeFamilyDetailData
+                    {
+                        Key = string.Join("-", "2", entityGroup.GroupCalcs.Id, entityCodeGroup.GroupCalcs.Id),
+                        Data = new CaseTypeDetailRowData((IEnumerable<ICTFEncounterDetail>)entityCodeGroup.Group, entityCodeGroup.GroupCalcs),
+                        Children = entityCodeGroup.Group
+                        .GroupBy(x => x.PhysicianId)
+                        .Join(entityCodePhysicianGroupCalcs, x => new { x1 = entityGroup.GroupCalcs.EntityId, x2 = entityCodeGroup.GroupCalcs.Code, x3 = x.Key }, y => new { x1 = y.EntityId, x2 = y.Code, x3 = y.PhysicianId }, (x, y) => new { Group = x, GroupCalcs = y })
+                        .Select(entityCodePhysicianGroup => new CaseTypeFamilyDetailData
+                        {
+                            Key = string.Join("-", "3", entityGroup.GroupCalcs.Id, entityCodeGroup.GroupCalcs.Id, entityCodePhysicianGroup.GroupCalcs.Id),
+                            Data = new CaseTypeDetailRowData((IEnumerable<ICTFEncounterDetail>)entityCodePhysicianGroup.Group, entityCodePhysicianGroup.GroupCalcs),
+                            Children = entityCodePhysicianGroup.Group.Select(encounter => new CaseTypeFamilyDetailData
+                            {
+                                Key = string.Join("-", "4", entityGroup.GroupCalcs.Id, entityCodeGroup.GroupCalcs.Id, entityCodePhysicianGroup.GroupCalcs.Id, encounter.EncounterId),
+                                Data = new CaseTypeDetailRowData(encounter)
+                            })
+                        })
+                    }).ToList()
+                }).ToList();
+
+            if (isFlexExPerfLoggingEnabled)
+            {
+                logger.LogPerformanceInformation($"CI FlexEx Perf * SQL to get details * Elapsed time: {performanceTimer.Elapsed}");
+                performanceTimer = Stopwatch.StartNew();
+            }
+
+            PopulateBenchmarkingCostDriverDetailData(details, isUsingAprdrg, benchmarkingData, benchmarkingDataCodes);
+            if (isFlexExPerfLoggingEnabled)
+            {
+                logger.LogPerformanceInformation($"CI FlexEx Perf * Call: PopulateBenchmarkingCostDriverDetailData * Elapsed time: {performanceTimer.Elapsed}");
+                performanceTimer = Stopwatch.StartNew();
+            }
+
+
+            var metrics = new CaseTypeFamilyMetric
+            {
+                TotalEncounters = ctfEncounterDetails.Count(),
+                IdentifiedVariation = ctfEncounterDetails.Where(ed => ed.IdentifiedVariation > 0).Sum(e => e.IdentifiedVariation),
+                EncountersIncluded = ctfEncounterDetails.Count(ed => !ed.IsExcluded),
+                VariationIncluded = ctfEncounterDetails.Where(ed => !ed.IsExcluded && ed.IdentifiedVariation > 0).Sum(e => e.IdentifiedVariation),
+                EncountersExcluded = ctfEncounterDetails.Count(ed => ed.IsExcluded),
+                VariationExcluded = ctfEncounterDetails.Where(ed => ed.IsExcluded && ed.IdentifiedVariation > 0).Sum(e => e.IdentifiedVariation)
+            };
+            if (isFlexExPerfLoggingEnabled)
+            {
+                logger.LogPerformanceInformation($"CI FlexEx Perf * Getting metrics * Elapsed time: {performanceTimer.Elapsed}");
+                performanceTimer = Stopwatch.StartNew();
+            }
+
+            var ctf = await dbContext.CaseTypeFamilies
+                .Where(ctf => ctf.CaseTypeFamilyId == exploration.CaseTypeFamilyId)
+                .SingleOrDefaultAsync(cancellationToken);
+            var ctfType = ctf?.CaseTypeFamilyType ?? CaseTypeFamily.CaseTypeFamilyTypeDefault;
+            if (isFlexExPerfLoggingEnabled) logger.LogPerformanceInformation($"CI FlexEx Perf * Getting ctf * Elapsed time: {performanceTimer.Elapsed}");
+
+
+            return new CaseTypeFamilyDetailInfo
+            {
+                CaseTypeFamilyType = ctfType,
+                CaseTypeFamilyName = ctfGroupCalcs.CTFName,
+                Metrics = metrics,
+                CaseTypeFamilyDetails = details
+            };
+        }
+
+        public async Task<IEnumerable<EncounterPhysicianInfo>> GetEncountersAsync(ExplorationDetailInfo exploration, Guid configurationGuid, CancellationToken cancellationToken)
+        {
+
+            await using var dbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
+            var config = configurationGuid != Guid.Empty ?
+
+            await dbContext.Configurations.SingleOrDefaultAsync(c => c.ConfigurationGuid == configurationGuid, cancellationToken) : null;
+
+            if (config != null)
+            {
+                logger.LogServiceInformation($"{nameof(GetEncountersAsync)} - config is not null");
+                config.FiscalMonthResolver = fiscalMonthResolver;
+            }
+            else
+            {
+                logger.LogServiceInformation($"{nameof(GetEncountersAsync)} - config is null");
+            }
+
+            var isUsingAprdrg = exploration.CodeType.HasValue && exploration.CodeType.Value == CaseTypeCategories.APRDRG;
+
+            var queryData = await EncountersQueryBuilder(exploration, isUsingAprdrg, ExplorationServiceQuery.EncountersIsIncludedQuery, config, cancellationToken);
+
+            logger.LogServiceInformation($"{nameof(GetEncountersAsync)}", new Dictionary<string, object> { { "query", queryData.Item1 } });
+
+            var queryOneParams = new Dictionary<string, object>
+            {
+                { "MULTI_STATEMENT_COUNT", queryData.Item2 }
+            };
+
+            var ctfGroupCalcs = new CTFGroupCalcs();
+            var physicians = new Dictionary<int, PhysicianInfo>();
+            var encounters = Enumerable.Empty<EncounterInfoBase>();
+
+            try
+            {
+                var results = await snowflakeDatabaseContext.QueryMultipleAsync(queryData.Item1, "Entity Detail", queryOneParams);
+                physicians = results.Read<PhysicianInfo>().ToDictionary(x => x.PhysicianID, x => x);
+                encounters = results.Read<EncounterInfoBase>().ToList();
+
+                logger.LogServiceInformation($"{nameof(GetEncountersAsync)} - physician count: {physicians.Count}, encounter count: {encounters.Count()}");
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, info: new Dictionary<string, object> { { "query", queryData.Item1 }, { "queryParams", queryOneParams } });
+                throw;
+            }
+
+            var encounterPhysicians = new List<EncounterPhysicianInfo>();
+
+            foreach (var enc in encounters)
+            {
+                var encPhys = enc.MapToEncounterPhysicianInfo();
+                if (physicians.TryGetValue(enc.PhysicianID, out var phys)) encPhys.AddPhysicianData(phys);
+                encounterPhysicians.Add(encPhys);
+            }
+
+            logger.LogServiceInformation($"{nameof(GetEncountersAsync)} - encounterPhysicians count: {encounterPhysicians.Count}");
+
+            return encounterPhysicians;
+        }
+
+        public async Task<bool> IsFlexExPerfLogging(CancellationToken cancellationToken)
+        {
+            return await featureFlagWrapper.IsCiFlexExPerformanceLoggingEnabled();
+        }
+
+        #region Internal Helpers
+
+        // REMOVE these delegate methods - they are no longer needed:
+        // - GetFilters method
+        // - GetFilterStrings method
+
+        private async Task<(string, byte)> EncountersQueryBuilder(ExplorationDetailInfo exploration, bool isUsingAprdrg, Func<string, string, string, string, (string, byte)> getQuery,
+            Configuration.Configuration configuration, CancellationToken cancellationToken)
+        {
+
+            var trimQueryParams = new TrimQueryParams
+            {
+                CaseTypeFamilyId = exploration.CaseTypeFamilyId,
+                CostDriver = exploration.CostDriver
+            };
+
+            var dateStart = GetQueryStartDate(exploration, configuration);
+
+            var dateEnd = GetQueryEndDate(exploration, configuration);
+
+            trimQueryParams.DischargeDateStart = dateStart;
+            trimQueryParams.DischargeDateEnd = dateEnd;
+
+            var trimQuery = ExplorationServiceQuery.CaseTypeFamilyTrimQuery();
+
+
+
+            CaseTypeFamilyTrimInfo trimInfo = new CaseTypeFamilyTrimInfo();
+            try
+            {
+                var queryResult = await snowflakeDatabaseContext.QueryAsync<CaseTypeFamilyTrimInfo>(trimQuery, "CTF Trim Info", trimQueryParams);
+                if (queryResult.Any()) trimInfo = queryResult.First();
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, info: new Dictionary<string, object> { { "query", trimQuery }, { "queryParams", trimQueryParams } });
+                throw;
+            }
+
+            var queryTrim = exploration.ExclusionCriteria.GetTrimQueryString(trimInfo);
+            var filterStrings =
+                await explorationFilterService.GetFilterStringsAsync(exploration.Filters.FilterChipItems
+                .Where(x => x.ChipType != ChipType.CostDriver), trimQueryParams, cancellationToken);
+
+            var queryData = getQuery(filterStrings.QueryFilters, filterStrings.EncounterSummaryFilters, "", queryTrim);
+            var actualCodeTypes = new int[] { isUsingAprdrg ? (int)CaseTypeCategories.APRDRG : (int)CaseTypeCategories.MSDRG, (int)CaseTypeCategories.CPTCode };
+            // Info: have problem with passing parameters to QueryMultipleAsync - it doesn't work. So as temporary solution it is prepared query without parameters
+            var parametersReplace = new Dictionary<string, string>
+                {
+                    { "@CaseTypeFamilyId", exploration.CaseTypeFamilyId.ToString() },
+                    { "@CostDriver", exploration.CostDriver == Constants.NOT_SPECIFIED ? "''" : $"'{exploration.CostDriver}'" },
+                    { "@DischargeDateStart", $"'{dateStart}'"},
+                    { "@DischargeDateEnd", $"'{dateEnd}'" },
+                    { "@EncounterExclusions", exploration.ExcludedEncounters.Count > 0 && configuration == null ? string.Join(", ", exploration.ExcludedEncounters)  : "0" },
+                    { "@EncounterInclusions", exploration.IncludedEncounters.Count > 0 && configuration == null ? string.Join(", ", exploration.IncludedEncounters)  : "0" },
+                    { "@CodeTypes", string.Join(", ", actualCodeTypes) }
+                };
+            foreach (var x in parametersReplace)
+            {
+                queryData.Item1 = queryData.Item1.Replace(x.Key, x.Value);
+            }
+
+            return queryData;
+        }
+
+        private DateTime GetDischargeDateEnd(ExplorationDetailInfo exploration)
+
+        {
+            var dischargeDateFilter = exploration.Filters.FilterChipItems
+                .SingleOrDefault((fci) => fci.Key == ChipKey.DischargeDateID);
+            return dischargeDateFilter?.DateRange.LastOrDefault() ?? DateTime.MaxValue;
+        }
+
+        private string GetQueryEndDate(ExplorationDetailInfo exploration, Configuration.Configuration configuration)
+        {
+            var endDate = configuration != null ? configuration.GetTrackingEndDate() : GetDischargeDateEnd(exploration);
+            return endDate.AddDays(1).ToString("yyyy-MM-dd");
+        }
+
+        private string GetQueryStartDate(ExplorationDetailInfo exploration, Configuration.Configuration configuration)
+
+        {
+            var dischargeDateFilter = exploration.Filters.FilterChipItems
+                .SingleOrDefault((fci) => fci.Key == ChipKey.DischargeDateID);
+            var dischargeDateStart = dischargeDateFilter?.DateRange.FirstOrDefault() ?? DateTime.MinValue;
+            var dischargeDateEnd = dischargeDateFilter?.DateRange.LastOrDefault() ?? DateTime.MaxValue;
+            if (configuration == null)
+            {
+                return $"{dischargeDateStart:yyyy-MM-dd}";
+            }
+            // if discharge end date is less then tracking start date - we should take tracking start date
+            // otherwise we should take discharge end date so that baseline and tracking dates don't crossover
+            var trackingStartDate = dischargeDateEnd.AddDays(1) < configuration.GetTrackingStartDate(Generics.OpportunityTypes.Variation)
+                ? configuration.GetTrackingStartDate(Generics.OpportunityTypes.Variation)
+                : dischargeDateEnd.AddDays(1);
+            return $"{trackingStartDate:yyyy-MM-dd}";
+        }
+
+        internal async Task<bool> IsUsingAprdrgAsync(CancellationToken cancellationToken)
+        {
+            await using var dbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
+            var ctfValueSetting = (await dbContext.SystemSettings.SingleOrDefaultAsync(item => item.Name == "Flexible Exploration Inpatient Case Type Family", cancellationToken)).Value;
+            return ctfValueSetting == "1";
+        }
+
+        #endregion
+
+
+        #region Internal Classes
+
+        public interface IQueryParamBase
+        {
+            string DischargeDateEnd { get; set; }
+            string DischargeDateStart { get; set; }
+        }
+
+        internal class QueryParamBase : IQueryParamBase
+        {
+            public string DischargeDateStart { get; set; }
+            public string DischargeDateEnd { get; set; }
+            public string LosExclusionType { get; set; }
+            public string LosExclusionValue { get; set; }
+            public string CostExclusionType { get; set; }
+            public string CostExclusionValue { get; set; }
+        }
+
+        internal class QueryParams : QueryParamBase
+        {
+            public CaseTypeCategories CodeType { get; set; }
+            public int CaseTypeFamilyId { get; set; }
+            public Dictionary<string, object> AsDictionary
+                => new Dictionary<string, object>
+                {
+                    { "CodeType", (byte)CodeType },
+                    { "DischargeDateStart", DischargeDateStart},
+                    { "DischargeDateEnd", DischargeDateEnd},
+                    { "LosExclusionType", LosExclusionType},
+                    { "LosExclusionValue", LosExclusionValue},
+                    { "CostExclusionType", CostExclusionType},
+                    { "CostExclusionValue", CostExclusionValue}
+                };
+        }
+
+        internal class TrimQueryParams : QueryParamBase
+        {
+            public int CaseTypeFamilyId { get; set; }
+            public string CostDriver { get; set; }
+        }
+
+        public class FiltersDataListQuery
+        {
+            public IEnumerable<string> Filters { get; set; }
+            public IEnumerable<string> Joins { get; set; }
+        }
+
+        public class FiltersDataQuery
+        {
+            public string Filter { get; set; }
+            public string Join { get; set; }
+
+            public FiltersDataQuery() { }
+            public FiltersDataQuery(IEnumerable<string> filters, IEnumerable<string> joins)
+            {
+                Filter = filters.Any() ? "\r\n        WHERE " + string.Join("\r\n        AND ", filters) + "\r\n" : string.Empty;
+                Join = joins.Any() ? "\r\n" + string.Join("\r\n", joins) + "\r\n" : string.Empty;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryBase.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryBase.sql
new file mode 100644
index 0000000..9e47dad
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryBase.sql
@@ -0,0 +1,61 @@
+
+WITH EncounterList (EncounterID, CaseTypeFamilyId, ctftype, codeid, Charges, VariableDirectCost, IsExpired, ROM, SOI) AS (
+    SELECT
+        fpes.EncounterID,
+        -- This should be optimized in next story
+        (CASE
+            WHEN dptr.Type = 'Outpatient' THEN fpes.CPTCodeCaseTypeFamilyID
+            WHEN 1 IN (@CodeTypes) THEN fpes.aprdrgcasetypefamilyid
+            ELSE fpes.msdrgcasetypefamilyid
+        END) AS CaseTypeFamilyId,
+        (CASE
+            WHEN dptr.Type = 'Outpatient' THEN 3
+            WHEN 1 IN (@CodeTypes) THEN 1
+            ELSE 0
+        END) AS ctftype,
+        (CASE
+            WHEN dptr.Type = 'Outpatient' THEN fpes.primarycptid
+            WHEN 1 IN (@CodeTypes) THEN fpes.reportingaprdrgid
+            ELSE fpes.reportingdrgid
+        END) AS codeid,
+        SUM(c.charge) AS Charges,
+        SUM(c.variabledirectcost) AS VariableDirectCost,
+        CASE WHEN ds.DischargeStatusCode IN ('20', '40', '41', '42') THEN 1 ELSE 0 END AS IsExpired,
+        COALESCE(apr.aprrom, '0') AS ROM, 
+        COALESCE(apr.aprsoi, '0') AS SOI
+    FROM clientDSS.FactPatientEncounterSummary fpes
+    LEFT JOIN cci.encounterchargecodecosts c on fpes.encounterid = c.encounterid
+    LEFT JOIN fw.DimChargeCode cc ON cc.chargecodeid = c.chargecodeid
+    JOIN fw.DimPatientType dpt ON dpt.PatientTypeID = fpes.PatientTypeID
+    JOIN fw.DimPatientTypeRollup dptr ON dptr.PatientTypeRollupID = dpt.PatientTypeRollupId
+    JOIN clientdss.DimDischargeStatus ds ON fpes.DischargeStatusID = ds.DischargeStatusId
+    LEFT JOIN dss.dimaprdrg apr ON fpes.apdrgid = apr.aprdrgid
+    WHERE fpes.dischargedatetime >= @DischargeDateStart AND fpes.dischargedatetime < @DischargeDateEnd
+      AND CaseTypeFamilyId = @CaseTypeFamilyId 
+      AND cc.costdriver = @CostDriver
+      AND ctftype IN (@CodeTypes)
+      -- {encounterSummaryFilter}
+    GROUP BY fpes.EncounterId, CaseTypeFamilyId, ctftype, codeid, isExpired, rom, soi
+),
+
+ListOfEncounters AS (
+    SELECT
+        el.EncounterID,
+        el.CaseTypeFamilyId, 
+        el.ctftype,
+        el.Charges,
+        el.VariableDirectCost,
+        el.IsExpired,
+        CASE WHEN (fpes.encounterid IN (@EncounterExclusions)
+        -- {queryTrim}
+        ) AND fpes.encounterid NOT IN (@EncounterInclusions) THEN 1 ELSE 0 END AS IsExcluded,
+        el.ROM,
+        el.SOI
+        -- {queryAdditionalColumns}
+    FROM clientDSS.FactPatientEncounterSummary fpes
+    JOIN EncounterList el ON fpes.encounterId = el.encounterid
+    LEFT JOIN dss.dimmsdrg dmsd ON dmsd.msdrgid = el.codeid and el.ctftype = 0
+    LEFT JOIN dss.dimmsdrgrollup dmsdroll ON dmsdroll.msdrgrollupcode = dmsd.msdrgcode 
+    -- {queryAdditionalJoins}
+-- {queryFilter}
+)
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryCodes.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryCodes.sql
new file mode 100644
index 0000000..4fbcc17
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryCodes.sql
@@ -0,0 +1,40 @@
+
+SELECT
+    1 as ctftype,
+    aprdrg.aprdrgid as codeid,
+    aprdrg.aprdrgcode as code,
+    t.codename as codename
+FROM dss.DimAPRDRG aprdrg    
+INNER JOIN (
+    SELECT            
+        aprdrgcode as code,
+        reportingname as codename,
+        ROW_NUMBER()  
+            OVER (PARTITION BY CODE ORDER BY drgschema DESC, aprdrgid DESC) AS rownumber
+    FROM dss.DimAPRDRG
+) t on t.rownumber = 1 AND t.code = aprdrg.aprdrgcode
+WHERE ctftype in (@CodeTypes)
+UNION
+    SELECT
+    0 as ctftype,
+    msdrg.msdrgid as codeid,
+    msdrg.msdrgcode as code,
+    t.codename as codename
+FROM dss.DimMSDRG msdrg
+INNER JOIN (
+    SELECT            
+        msdrgcode as code,
+        reportingname as codename,
+        ROW_NUMBER()  
+            OVER (PARTITION BY CODE ORDER BY drgschema DESC, msdrgid DESC) AS rownumber
+    FROM dss.DimMSDRG
+) t on t.rownumber = 1 AND t.code = msdrg.msdrgcode
+WHERE ctftype in (@CodeTypes)
+UNION
+SELECT
+    3 as ctftype,
+    cpt.cptid as codeid,
+    cpt.cptcode as code,
+    cpt.cptname as codename
+FROM dss.DimCPT cpt
+WHERE ctftype in (@CodeTypes)
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryEncountersData.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryEncountersData.sql
new file mode 100644
index 0000000..63393f2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryEncountersData.sql
@@ -0,0 +1,26 @@
+-- {queryListOfEncounters}
+
+SELECT    
+    f.encounterid,
+    f.encounterrecordnumber,
+    
+    loe.ctftype,
+    
+    f.entityid,
+    loe.code,
+    f.primaryphysicianid as physicianid,
+    
+    f.lengthofstay,
+    loe.variabledirectcost,
+    loe.charges,
+
+    loe.IsExpired,
+    loe.IsExcluded,
+    
+    ds.dischargeStatusCode,
+    ds.description AS dischargeStatusDescription
+    
+FROM clientdss.factpatientencountersummary f
+    JOIN ListOfEncounters loe ON f.EncounterId = loe.EncounterId
+    JOIN clientdss.dimDischargeStatus ds ON ds.dischargeStatusId = f.dischargeStatusId
+ORDER BY f.encounterid;
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryEncountersIdIncluded.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryEncountersIdIncluded.sql
new file mode 100644
index 0000000..1dfc756
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryEncountersIdIncluded.sql
@@ -0,0 +1,16 @@
+-- {queryListOfEncounters}
+
+SELECT    
+    f.agecohortid,
+    f.dischargedatetime,
+    f.encounterid,
+    f.encounterrecordnumber,
+    de.fwentityid as entityid,
+    f.lengthofstay,
+    f.primaryphysicianid as physicianid,
+    f.servicelineid,
+    loe.IsExcluded
+FROM clientdss.factpatientencountersummary f
+JOIN ListOfEncounters loe ON f.EncounterId = loe.EncounterId
+JOIN clientdss.dimEntity de ON de.entityid = f.entityid
+ORDER BY f.encounterid;
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryGroupByCtf.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryGroupByCtf.sql
new file mode 100644
index 0000000..ca8dde3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryGroupByCtf.sql
@@ -0,0 +1,12 @@
+-- {queryListOfEncounters}
+
+SELECT ctf.CaseTypeFamilyID as ctfid, ctf.NAME as ctfname, IFNULL(t.medianvdc, 0) as medianvdc FROM(
+    SELECT
+        loe.CaseTypeFamilyId,
+        MEDIAN(loe.variabledirectcost) AS medianvdc
+    FROM clientdss.factpatientencountersummary f
+    JOIN ListOfEncounters loe ON f.encounterid = loe.encounterid
+    GROUP BY loe.CaseTypeFamilyId
+) t
+RIGHT JOIN dss.casetypefamily ctf ON ctf.CaseTypeFamilyID = t.CaseTypeFamilyId
+WHERE ctf.CaseTypeFamilyID = @CaseTypeFamilyId;
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryGroupByEntity.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryGroupByEntity.sql
new file mode 100644
index 0000000..43b1e18
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryGroupByEntity.sql
@@ -0,0 +1,25 @@
+-- {queryListOfEncounters}
+
+SELECT 
+    f.entityId,
+    e.name as entityname,
+    MAX(IFNULL(t.medianvdc, 0)) as medianvdc,
+    MAX(IFNULL(t.medianlos, 0)) medianlos,
+    MAX(IFNULL(t.averagelos, 0)) averagelos,
+    MAX(IFNULL(t.mediancharges, 0)) as mediancharges
+FROM clientdss.factpatientencountersummary f
+JOIN ListOfEncounters loe ON f.encounterid = loe.encounterid
+JOIN clientdss.dimEntity e ON e.entityid = f.entityid
+LEFT JOIN (
+    SELECT 
+        f.entityId,
+        MEDIAN(loe.variabledirectcost) AS medianvdc,
+        MEDIAN(f.lengthofstay) AS medianlos,
+        AVG(f.lengthofstay) AS averagelos,
+        MEDIAN(loe.charges) AS mediancharges
+    FROM clientdss.factpatientencountersummary f
+    JOIN ListOfEncounters loe ON f.encounterid = loe.encounterid
+    WHERE loe.IsExcluded = 0
+    GROUP BY f.entityid
+) t ON t.entityId = f.entityId
+GROUP BY f.entityid, e.name;
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryGroupByEntityCode.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryGroupByEntityCode.sql
new file mode 100644
index 0000000..aaaf18d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryGroupByEntityCode.sql
@@ -0,0 +1,26 @@
+-- {queryListOfEncounters}
+
+SELECT 
+    f.entityid,
+    loe.code,
+    loe.codename,
+    MAX(IFNULL(t.medianvdc, 0)) as medianvdc,
+    MAX(IFNULL(t.medianlos, 0)) medianlos,
+    MAX(IFNULL(t.averagelos, 0)) averagelos,
+    MAX(IFNULL(t.mediancharges, 0)) as mediancharges
+FROM clientdss.factpatientencountersummary f
+JOIN ListOfEncounters loe ON f.EncounterId = loe.EncounterId    
+LEFT JOIN (
+    SELECT 
+        f.entityid,
+        loe.code,
+        MEDIAN(loe.variabledirectcost) AS medianvdc,
+        MEDIAN(f.lengthofstay) AS medianlos,
+        AVG(f.lengthofstay) AS averagelos,
+        MEDIAN(loe.charges) AS mediancharges
+    FROM clientdss.factpatientencountersummary f
+    JOIN ListOfEncounters loe ON f.EncounterId = loe.EncounterId    
+    WHERE loe.IsExcluded = 0
+    GROUP BY f.entityid, loe.code
+) t ON t.entityId = f.entityId AND t.code = loe.code
+GROUP BY f.entityid, loe.code, loe.codename;
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryGroupByEntityCodePhysician.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryGroupByEntityCodePhysician.sql
new file mode 100644
index 0000000..c4aa1d3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryGroupByEntityCodePhysician.sql
@@ -0,0 +1,29 @@
+-- {queryListOfEncounters}
+
+SELECT 
+    f.entityid,
+    loe.code,
+    f.primaryphysicianid as physicianid,
+    dph.fullname as physicianname,
+    MAX(IFNULL(t.medianvdc, 0)) as medianvdc,
+    MAX(IFNULL(t.medianlos, 0)) medianlos,
+    MAX(IFNULL(t.averagelos, 0)) averagelos,
+    MAX(IFNULL(t.mediancharges, 0)) as mediancharges
+FROM clientdss.factpatientencountersummary f
+JOIN ListOfEncounters loe ON f.EncounterId = loe.EncounterId
+JOIN dss.dimphysician dph ON dph.physicianid = f.primaryphysicianid
+LEFT JOIN (
+    SELECT 
+        f.entityid,
+        loe.code,
+        f.primaryphysicianid,
+        MEDIAN(loe.variabledirectcost) AS medianvdc,
+        MEDIAN(f.lengthofstay) AS medianlos,
+        AVG(f.lengthofstay) AS averagelos,
+        MEDIAN(loe.charges) AS mediancharges
+    FROM clientdss.factpatientencountersummary f
+    JOIN ListOfEncounters loe ON f.EncounterId = loe.EncounterId
+    WHERE loe.IsExcluded = 0
+    GROUP BY f.entityid, loe.code, f.primaryphysicianid
+) t ON t.entityId = f.entityId AND t.code = loe.code AND t.primaryphysicianid = f.primaryphysicianid
+GROUP BY f.entityid, loe.code, f.primaryphysicianid, dph.fullname;
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryPhysicianData.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryPhysicianData.sql
new file mode 100644
index 0000000..1f4dbbe
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/Builder/ExplorationQueryPhysicianData.sql
@@ -0,0 +1,20 @@
+-- {queryListOfEncounters}
+
+SELECT DISTINCT
+    dph.PhysicianID,
+    dph.FullName AS PhysicianName,
+    dph.MemberGUID AS StrPhysicianGUID,
+
+    dphs.PhysicianSpecialtyID,
+    dphs.Name AS PhysicianSpecialty,
+    dphs.MemberGUID AS StrPhysicianSpecialtyGUID,
+    
+    dphga.PhysicianGroupAffiliationID,
+    dphga.Name AS PhysicianGroupAffiliation,
+    dphga.MemberGuid AS StrPhysicianGroupAffiliationGuid
+    
+FROM clientdss.factpatientencountersummary f
+JOIN ListOfEncounters loe ON f.EncounterId = loe.EncounterId
+JOIN dss.dimphysician dph ON dph.physicianid = f.primaryphysicianid
+JOIN dss.DimPhysicianSpecialty dphs ON dphs.PhysicianSpecialtyID = dph.PhysicianSpecialtyID
+JOIN dss.DimPhysicianGroupAffiliation dphga on dphga.PhysicianGroupAffiliationID = dph.PhysicianGroupAffiliationID;
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/CaseTypeFamilySummaryDetailQuery.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/CaseTypeFamilySummaryDetailQuery.sql
new file mode 100644
index 0000000..9cb41b9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/CaseTypeFamilySummaryDetailQuery.sql
@@ -0,0 +1,222 @@
+WITH PatientEncounterSummary (encounterid, patienttypeid, dischargestatusid, aprdrgid, lengthofstay, variabledirectcost, dischargedatetime, msdrgcasetypefamilyid, aprdrgcasetypefamilyid, cptcodecasetypefamilyid, primarycptid, reportingaprdrgid, reportingdrgid,  admitsourceid, admittypeid, agecohortid, entityid, genderid, icd10dxprimarydiagid, icd10pxprimaryid, insuranceplan1id, locationid, msdrgid, newbornflagid, primaryphysicianid, sourcesystemid, dischargedateid, primaryqviid) AS (
+    SELECT
+    fpes.encounterid,
+    fpes.patienttypeid,
+    fpes.dischargestatusid,
+    fpes.aprdrgid,
+    fpes.lengthofstay,
+    fpes.variabledirectcost,
+    fpes.dischargedatetime,
+    fpes.msdrgcasetypefamilyid,
+    fpes.aprdrgcasetypefamilyid,
+    fpes.cptcodecasetypefamilyid,
+    fpes.primarycptid,
+    fpes.reportingaprdrgid,
+    fpes.reportingdrgid,
+    fpes.admitsourceid,
+    fpes.admittypeid,
+    fpes.agecohortid,
+    fpes.entityid,
+    fpes.genderid,
+    fpes.icd10dxprimarydiagid,
+    fpes.icd10pxprimaryid,
+    fpes.insuranceplan1id,
+    fpes.locationid,
+    fpes.msdrgid,
+    fpes.newbornflagid,
+    fpes.primaryphysicianid,
+    fpes.sourcesystemid,
+    fpes.dischargedateid,
+    fpes.primaryqviid
+    FROM clientDSS.FactPatientEncounterSummary fpes
+    WHERE fpes.dischargedatetime >= @DischargeDateStart AND fpes.dischargedatetime < @DischargeDateEnd
+),
+
+EncounterList (encounterid, patienttypeid, dischargestatusid, aprdrgid, lengthofstay, variabledirectcost, dischargedatetime, msdrgcasetypefamilyid, aprdrgcasetypefamilyid, cptcodecasetypefamilyid, primarycptid, reportingaprdrgid, reportingdrgid) AS (
+    SELECT
+    fpes.encounterid,
+    fpes.patienttypeid,
+    fpes.dischargestatusid,
+    fpes.aprdrgid,
+    fpes.lengthofstay,
+    fpes.variabledirectcost,
+    fpes.dischargedatetime,
+    fpes.msdrgcasetypefamilyid,
+    fpes.aprdrgcasetypefamilyid,
+    fpes.cptcodecasetypefamilyid,
+    fpes.primarycptid,
+    fpes.reportingaprdrgid,
+    fpes.reportingdrgid
+    FROM PatientEncounterSummary fpes
+    WHERE 1=1
+        -- {encounterSummaryFilter}
+),
+
+EncounterListWithCtf (encounterid, patienttypeid, dischargestatusid, aprdrgid, lengthofstay, variabledirectcost, dischargedatetime, casetypefamilyid, codeid, codeType) AS (
+    SELECT 
+        el.encounterid,
+        el.patienttypeid,
+        el.dischargestatusid,
+        el.aprdrgid,
+        el.lengthofstay,
+        el.variabledirectcost,
+        el.dischargedatetime,
+        (CASE
+            WHEN dptr.Type = 'Outpatient' THEN el.CPTCodeCaseTypeFamilyID
+            WHEN @CodeType = 0  THEN el.msdrgcasetypefamilyid
+            ELSE el.aprdrgcasetypefamilyid
+            END) AS casetypefamilyid,
+        (CASE
+            WHEN dptr.Type = 'Outpatient' THEN el.primarycptid
+            WHEN @CodeType = 1 THEN el.reportingaprdrgid
+            ELSE el.reportingdrgid
+        END) AS codeid,
+        (CASE
+            WHEN dptr.Type = 'Outpatient' THEN 3
+            ELSE @CodeType
+        END) AS codeType
+    FROM EncounterList el
+    JOIN fw.DimPatientType dpt ON dpt.PatientTypeID = el.PatientTypeID
+    JOIN fw.DimPatientTypeRollup dptr ON dptr.PatientTypeRollupID = dpt.PatientTypeRollupID
+    WHERE casetypefamilyid = @CaseTypeFamilyId
+),
+
+EncounterCosts (encounterid, charges, variabledirectcost, costdriver) AS (
+    SELECT
+        el.encounterid,
+        SUM(c.charge) charges,
+        SUM(c.variabledirectcost) AS variabledirectcost,
+        cc.costdriver
+    FROM EncounterListWithCtf el
+    JOIN cci.encounterchargecodecosts c on el.encounterid = c.encounterid
+    JOIN fw.dimchargecode cc on cc.chargecodeid = c.chargecodeid
+    GROUP BY el.encounterid, cc.costdriver
+),
+
+EncounterListWithCharges (encounterid, charges, variabledirectcost, isexpired, rom, soi, costdriver, casetypefamilyid, codeid, lengthofstay, dischargedatetime, codeType) AS (
+    SELECT
+        el.encounterid,
+        ec.charges,
+        ec.variabledirectcost,
+        CASE WHEN ds.dischargestatuscode IN ('20', '40', '41', '42') THEN 1 ELSE 0 END AS isexpired,
+        COALESCE(apr.aprrom, '0') AS rom,
+        COALESCE(apr.aprsoi, '0') AS soi,
+        ec.costdriver,
+        el.casetypefamilyid,
+        el.codeid,
+        el.lengthofstay,
+        el.dischargedatetime,
+        el.codeType
+    FROM EncounterListWithCtf el
+    JOIN EncounterCosts ec on el.encounterid = ec.encounterid
+    JOIN clientdss.dimdischargestatus ds ON el.dischargestatusid = ds.dischargestatusid
+    LEFT JOIN dss.dimaprdrg apr ON el.aprdrgid = apr.aprdrgid
+),
+
+EncounterUniqueList (EncounterID, CaseTypeFamilyID) AS (
+    SELECT 
+    EncounterId,
+    (CASE
+            WHEN dptr.Type = 'Outpatient' THEN pes.CPTCodeCaseTypeFamilyID
+            WHEN @CodeType = 0  THEN pes.msdrgcasetypefamilyid
+            ELSE pes.aprdrgcasetypefamilyid
+            END) AS casetypefamilyid
+    FROM PatientEncounterSummary pes
+    JOIN fw.DimPatientType dpt ON dpt.PatientTypeID = pes.PatientTypeID
+    JOIN fw.DimPatientTypeRollup dptr ON dptr.PatientTypeRollupID = dpt.PatientTypeRollupID
+),
+
+ListOfEncounters (EncounterID, Charges, VariableDirectCost, IsExpired, ROM, SOI, CostDriver, CaseTypeFamilyID, LengthOfStay, DischargeDateTime) AS (
+    SELECT
+        el.EncounterID,
+        el.Charges,
+        el.VariableDirectCost,
+        el.IsExpired,
+        el.ROM,
+        el.SOI,
+        el.CostDriver,
+        el.CaseTypeFamilyID,
+        el.lengthofstay,
+        el.dischargedatetime
+    FROM EncounterListWithCharges el
+         LEFT JOIN dss.dimmsdrg dmsd ON dmsd.msdrgid = el.codeid AND el.codeType = 0
+         LEFT JOIN dss.dimmsdrgrollup dmsdroll ON dmsdroll.msdrgrollupid = dmsd.msdrgrollupid
+      -- {queryFilter}
+),
+
+ctfGroupCalcs (casetypefamilyid, medianvdc, medianlos, averagelos, twentyfivepercentilevdc, seventyfivepercentilevdc, twentyfivepercentilelos, seventyfivepercentilelos) AS (
+    SELECT
+        eul.CaseTypeFamilyID,
+        MEDIAN(el.variabledirectcost) AS medianvdc,
+        MEDIAN(el.lengthofstay) AS medianlos,
+        AVG(el.lengthofstay) AS averagelos,
+        PERCENTILE_CONT(0.25) WITHIN GROUP (ORDER BY el.variabledirectcost) AS twentyfivepercentilevdc,
+        PERCENTILE_CONT(0.75) WITHIN GROUP (ORDER BY el.variabledirectcost) AS seventyfivepercentilevdc,
+        PERCENTILE_CONT(0.25) WITHIN GROUP (ORDER BY el.lengthofstay) AS twentyfivepercentilelos,
+        PERCENTILE_CONT(0.75) WITHIN GROUP (ORDER BY el.lengthofstay) AS seventyfivepercentilelos
+    FROM EncounterList el
+    JOIN EncounterUniqueList eul ON el.EncounterID = eul.EncounterID
+    GROUP BY eul.casetypefamilyid
+),
+
+ctfCostDriverGroupCalcs (casetypefamilyid, costdriver, medianvdc) AS (
+  SELECT
+        loe.casetypefamilyid,
+        loe.costdriver,
+        MEDIAN(loe.variabledirectcost) AS medianvdc
+    FROM ListOfEncounters loe
+    GROUP BY casetypefamilyid, costdriver
+),
+
+madsubcalc (encounterid, casetypefamilyid, vdcdifference, losdifference) AS (
+    SELECT
+        el.encounterid,
+        g.casetypefamilyid,
+        ABS(el.variabledirectcost - g.medianvdc) AS vdcdifference,
+        ABS(el.lengthofstay - g.medianlos) AS losdifference
+    FROM EncounterList el
+    JOIN EncounterUniqueList eul ON eul.EncounterID = el.EncounterID
+    JOIN ctfGroupCalcs g ON g.casetypefamilyid = eul.casetypefamilyid
+),
+
+mads (casetypefamilyid, madvdc, madlos) AS (
+    SELECT
+        casetypefamilyid,
+        MEDIAN(vdcdifference) as madvdc,
+        MEDIAN(losdifference) as madlos
+    FROM madsubcalc
+    GROUP BY casetypefamilyid
+)
+
+SELECT
+    el.encounterid,
+    el.dischargedatetime,
+    loe.casetypefamilyid,
+    ctf.name AS casetypefamilyname,
+    loe.isexpired,
+    loe.variabledirectcost,
+    el.variabledirectcost vdc,
+    el.lengthofstay,
+    cg.medianvdc as medianvariabledirectcost,
+    loe.variabledirectcost - cg.medianvdc AS identifiedvariation,
+    g.medianvdc,
+    g.medianlos as medianlengthofstay,
+    g.averagelos as averagelengthofstay,
+    g.twentyfivepercentilevdc,
+    g.seventyfivepercentilevdc,
+    g.seventyfivepercentilevdc - g.twentyfivepercentilevdc as iqrvdc,
+    g.twentyfivepercentilelos,
+    g.seventyfivepercentilelos,
+    g.seventyfivepercentilelos - g.twentyfivepercentilelos as iqrlos,
+    m.madvdc * 1.4826 as madvdc,
+    m.madlos * 1.4826 as madlos,
+    loe.rom,
+    loe.soi,
+    loe.charges,
+    loe.costdriver
+FROM EncounterList el
+    JOIN ListOfEncounters loe ON el.EncounterId = loe.EncounterId
+    JOIN dss.casetypefamily ctf ON ctf.casetypefamilyid = loe.casetypefamilyid
+    JOIN ctfGroupCalcs g ON g.casetypefamilyid = loe.casetypefamilyid
+    JOIN ctfCostDriverGroupCalcs cg ON cg.casetypefamilyid = loe.casetypefamilyid AND cg.costdriver = loe.costdriver
+    JOIN mads m on m.casetypefamilyid = loe.casetypefamilyid
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/CaseTypeFamilySummaryEncounterQuery.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/CaseTypeFamilySummaryEncounterQuery.sql
new file mode 100644
index 0000000..40ca942
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/CaseTypeFamilySummaryEncounterQuery.sql
@@ -0,0 +1,150 @@
+WITH PatientEncounterSummary (encounterid, patienttypeid, dischargestatusid, aprdrgid, lengthofstay, variabledirectcost, dischargedatetime, msdrgcasetypefamilyid, aprdrgcasetypefamilyid, cptcodecasetypefamilyid, primarycptid, reportingaprdrgid, reportingdrgid,  admitsourceid, admittypeid, agecohortid, entityid, genderid, icd10dxprimarydiagid, icd10pxprimaryid, insuranceplan1id, locationid, msdrgid, newbornflagid, primaryphysicianid, sourcesystemid, dischargedateid, primaryqviid) AS (
+    SELECT
+    fpes.encounterid,
+    fpes.patienttypeid,
+    fpes.dischargestatusid,
+    fpes.aprdrgid,
+    fpes.lengthofstay,
+    fpes.variabledirectcost,
+    fpes.dischargedatetime,
+    fpes.msdrgcasetypefamilyid,
+    fpes.aprdrgcasetypefamilyid,
+    fpes.cptcodecasetypefamilyid,
+    fpes.primarycptid,
+    fpes.reportingaprdrgid,
+    fpes.reportingdrgid,
+    fpes.admitsourceid,
+    fpes.admittypeid,
+    fpes.agecohortid,
+    fpes.entityid,
+    fpes.genderid,
+    fpes.icd10dxprimarydiagid,
+    fpes.icd10pxprimaryid,
+    fpes.insuranceplan1id,
+    fpes.locationid,
+    fpes.msdrgid,
+    fpes.newbornflagid,
+    fpes.primaryphysicianid,
+    fpes.sourcesystemid,
+    fpes.dischargedateid,
+    fpes.primaryqviid
+    FROM clientDSS.FactPatientEncounterSummary fpes
+    WHERE fpes.dischargedatetime >= @DischargeDateStart AND fpes.dischargedatetime < @DischargeDateEnd
+),
+
+EncounterList (encounterid, patienttypeid, dischargestatusid, aprdrgid, lengthofstay, variabledirectcost, dischargedatetime, msdrgcasetypefamilyid, aprdrgcasetypefamilyid, cptcodecasetypefamilyid, primarycptid, reportingaprdrgid, reportingdrgid) AS (
+    SELECT
+    fpes.encounterid,
+    fpes.patienttypeid,
+    fpes.dischargestatusid,
+    fpes.aprdrgid,
+    fpes.lengthofstay,
+    fpes.variabledirectcost,
+    fpes.dischargedatetime,
+    fpes.msdrgcasetypefamilyid,
+    fpes.aprdrgcasetypefamilyid,
+    fpes.cptcodecasetypefamilyid,
+    fpes.primarycptid,
+    fpes.reportingaprdrgid,
+    fpes.reportingdrgid
+    FROM PatientEncounterSummary fpes
+    WHERE 1=1
+    -- {encounterSummaryFilter}
+),
+
+EncounterListWithCtf (encounterid, patienttypeid, dischargestatusid, aprdrgid, lengthofstay, variabledirectcost, dischargedatetime, casetypefamilyid, codeid, codeType) AS (
+    SELECT 
+        el.encounterid,
+        el.patienttypeid,
+        el.dischargestatusid,
+        el.aprdrgid,
+        el.lengthofstay,
+        el.variabledirectcost,
+        el.dischargedatetime,
+        (CASE
+            WHEN dptr.Type = 'Outpatient' THEN el.CPTCodeCaseTypeFamilyID
+            WHEN @CodeType = 0  THEN el.msdrgcasetypefamilyid
+            ELSE el.aprdrgcasetypefamilyid
+            END) AS casetypefamilyid,
+        (CASE
+            WHEN dptr.Type = 'Outpatient' THEN el.primarycptid
+            WHEN @CodeType = 1 THEN el.reportingaprdrgid
+            ELSE el.reportingdrgid
+        END) AS codeid,
+        (CASE
+            WHEN dptr.Type = 'Outpatient' THEN 3
+            ELSE @CodeType
+        END) AS codeType
+    FROM EncounterList el
+    JOIN fw.DimPatientType dpt ON dpt.PatientTypeID = el.PatientTypeID
+    JOIN fw.DimPatientTypeRollup dptr ON dptr.PatientTypeRollupID = dpt.PatientTypeRollupID
+    WHERE casetypefamilyid = @CaseTypeFamilyId
+),
+
+EncounterCosts (encounterid, charges, variabledirectcost, costdriver) AS (
+    SELECT
+        el.encounterid,
+        SUM(c.charge) charges,
+        SUM(c.variabledirectcost) AS variabledirectcost,
+        cc.costdriver
+    FROM EncounterListWithCtf el
+    JOIN cci.encounterchargecodecosts c on el.encounterid = c.encounterid
+    JOIN fw.dimchargecode cc on cc.chargecodeid = c.chargecodeid
+    GROUP BY el.encounterid, cc.costdriver
+),
+
+EncounterListWithCharges (encounterid, charges, variabledirectcost, isexpired, rom, soi, costdriver, casetypefamilyid, codeid, lengthofstay, dischargedatetime, codeType) AS (
+    SELECT
+        el.encounterid,
+        ec.charges,
+        ec.variabledirectcost,
+        CASE WHEN ds.dischargestatuscode IN ('20', '40', '41', '42') THEN 1 ELSE 0 END AS isexpired,
+        COALESCE(apr.aprrom, '0') AS rom,
+        COALESCE(apr.aprsoi, '0') AS soi,
+        ec.costdriver,
+        el.casetypefamilyid,
+        el.codeid,
+        el.lengthofstay,
+        el.dischargedatetime,
+        el.codeType
+    FROM EncounterListWithCtf el
+    JOIN EncounterCosts ec on el.encounterid = ec.encounterid
+    JOIN clientdss.dimdischargestatus ds ON el.dischargestatusid = ds.dischargestatusid
+    LEFT JOIN dss.dimaprdrg apr ON el.aprdrgid = apr.aprdrgid
+),
+
+EncounterUniqueList (EncounterID, CaseTypeFamilyID) AS (
+    SELECT 
+    EncounterId,
+    (CASE
+            WHEN dptr.Type = 'Outpatient' THEN pes.CPTCodeCaseTypeFamilyID
+            WHEN @CodeType = 0  THEN pes.msdrgcasetypefamilyid
+            ELSE pes.aprdrgcasetypefamilyid
+            END) AS casetypefamilyid
+    FROM PatientEncounterSummary pes
+    JOIN fw.DimPatientType dpt ON dpt.PatientTypeID = pes.PatientTypeID
+    JOIN fw.DimPatientTypeRollup dptr ON dptr.PatientTypeRollupID = dpt.PatientTypeRollupID
+),
+
+ListOfEncounters (EncounterID, Charges, VariableDirectCost, IsExpired, ROM, SOI, CostDriver, CaseTypeFamilyID, LengthOfStay, DischargeDateTime) AS (
+    SELECT
+        el.EncounterID,
+        el.Charges,
+        el.VariableDirectCost,
+        el.IsExpired,
+        el.ROM,
+        el.SOI,
+        el.CostDriver,
+        el.CaseTypeFamilyID,
+        el.lengthofstay,
+        el.dischargedatetime
+    FROM EncounterListWithCharges el
+         LEFT JOIN dss.dimmsdrg dmsd ON dmsd.msdrgid = el.codeid AND el.codeType = 0
+         LEFT JOIN dss.dimmsdrgrollup dmsdroll ON dmsdroll.msdrgrollupid = dmsd.msdrgrollupid
+      -- {queryFilter}
+)
+
+SELECT
+   DISTINCT el.encounterid AS "FilterEncounterId"
+FROM EncounterList el
+    JOIN ListOfEncounters loe ON el.EncounterId = loe.EncounterId
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/CaseTypeFamilySummaryQuery.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/CaseTypeFamilySummaryQuery.sql
new file mode 100644
index 0000000..5378027
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/CaseTypeFamilySummaryQuery.sql
@@ -0,0 +1,346 @@
+WITH PatientEncounterSummary (encounterid, patienttypeid, dischargestatusid, aprdrgid, lengthofstay, variabledirectcost, dischargedatetime, msdrgcasetypefamilyid, aprdrgcasetypefamilyid, cptcodecasetypefamilyid, primarycptid, reportingaprdrgid, reportingdrgid,  admitsourceid, admittypeid, agecohortid, entityid, genderid, icd10dxprimarydiagid, icd10pxprimaryid, insuranceplan1id, locationid, msdrgid, newbornflagid, primaryphysicianid, sourcesystemid, dischargedateid, primaryqviid) AS (
+    SELECT
+    fpes.encounterid,
+    fpes.patienttypeid,
+    fpes.dischargestatusid,
+    fpes.aprdrgid,
+    fpes.lengthofstay,
+    fpes.variabledirectcost,
+    fpes.dischargedatetime,
+    fpes.msdrgcasetypefamilyid,
+    fpes.aprdrgcasetypefamilyid,
+    fpes.cptcodecasetypefamilyid,
+    fpes.primarycptid,
+    fpes.reportingaprdrgid,
+    fpes.reportingdrgid,
+    fpes.admitsourceid,
+    fpes.admittypeid,
+    fpes.agecohortid,
+    fpes.entityid,
+    fpes.genderid,
+    fpes.icd10dxprimarydiagid,
+    fpes.icd10pxprimaryid,
+    fpes.insuranceplan1id,
+    fpes.locationid,
+    fpes.msdrgid,
+    fpes.newbornflagid,
+    fpes.primaryphysicianid,
+    fpes.sourcesystemid,
+    fpes.dischargedateid,
+    fpes.primaryqviid
+    FROM clientDSS.FactPatientEncounterSummary fpes
+    WHERE fpes.dischargedatetime >= @DischargeDateStart AND fpes.dischargedatetime < @DischargeDateEnd
+),
+
+EncounterList (encounterid, patienttypeid, dischargestatusid, aprdrgid, lengthofstay, variabledirectcost, dischargedatetime, msdrgcasetypefamilyid, aprdrgcasetypefamilyid, cptcodecasetypefamilyid, primarycptid, reportingaprdrgid, reportingdrgid) AS (
+    SELECT
+    fpes.encounterid,
+    fpes.patienttypeid,
+    fpes.dischargestatusid,
+    fpes.aprdrgid,
+    fpes.lengthofstay,
+    fpes.variabledirectcost,
+    fpes.dischargedatetime,
+    fpes.msdrgcasetypefamilyid,
+    fpes.aprdrgcasetypefamilyid,
+    fpes.cptcodecasetypefamilyid,
+    fpes.primarycptid,
+    fpes.reportingaprdrgid,
+    fpes.reportingdrgid
+    FROM PatientEncounterSummary fpes
+    WHERE 1=1
+    -- {encounterSummaryFilter}
+),
+
+EncounterListWithCtf (encounterid, patienttypeid, dischargestatusid, aprdrgid, lengthofstay, variabledirectcost, dischargedatetime, casetypefamilyid, codeid, codeType) AS (
+    SELECT 
+        el.encounterid,
+        el.patienttypeid,
+        el.dischargestatusid,
+        el.aprdrgid,
+        el.lengthofstay,
+        el.variabledirectcost,
+        el.dischargedatetime,
+        (CASE
+            WHEN dptr.Type = 'Outpatient' THEN el.CPTCodeCaseTypeFamilyID
+            WHEN @CodeType = 0  THEN el.msdrgcasetypefamilyid
+            ELSE el.aprdrgcasetypefamilyid
+            END) AS casetypefamilyid,
+        (CASE
+            WHEN dptr.Type = 'Outpatient' THEN el.primarycptid
+            WHEN @CodeType = 1 THEN el.reportingaprdrgid
+            ELSE el.reportingdrgid
+        END) AS codeid,
+        (CASE
+            WHEN dptr.Type = 'Outpatient' THEN 3 -- codeType 3 = outpatient (CPT-based) classification
+            ELSE @CodeType
+        END) AS codeType
+    FROM EncounterList el
+    JOIN fw.DimPatientType dpt ON dpt.PatientTypeID = el.PatientTypeID
+    JOIN fw.DimPatientTypeRollup dptr ON dptr.PatientTypeRollupID = dpt.PatientTypeRollupID
+    WHERE casetypefamilyid <> 0
+),
+
+EncounterCosts (encounterid, charges, variabledirectcost, costdriver) AS (
+    SELECT
+        el.encounterid,
+        SUM(c.charge) charges,
+        SUM(c.variabledirectcost) AS variabledirectcost,
+        cc.costdriver
+    FROM EncounterListWithCtf el
+    JOIN cci.encounterchargecodecosts c on el.encounterid = c.encounterid
+    JOIN fw.dimchargecode cc on cc.chargecodeid = c.chargecodeid
+    GROUP BY el.encounterid, cc.costdriver
+),
+
+EncounterListWithCharges (encounterid, charges, variabledirectcost, isexpired, rom, soi, costdriver, casetypefamilyid, codeid, lengthofstay, dischargedatetime, codeType) AS (
+    SELECT
+        el.encounterid,
+        ec.charges,
+        ec.variabledirectcost,
+        CASE WHEN ds.dischargestatuscode IN ('20', '40', '41', '42') THEN 1 ELSE 0 END AS isexpired,
+        COALESCE(apr.aprrom, '0') AS rom,
+        COALESCE(apr.aprsoi, '0') AS soi,
+        ec.costdriver,
+        el.casetypefamilyid,
+        el.codeid,
+        el.lengthofstay,
+        el.dischargedatetime,
+        el.codeType
+    FROM EncounterListWithCtf el
+    JOIN EncounterCosts ec on el.encounterid = ec.encounterid
+    JOIN clientdss.dimdischargestatus ds ON el.dischargestatusid = ds.dischargestatusid
+    LEFT JOIN dss.dimaprdrg apr ON el.aprdrgid = apr.aprdrgid
+),
+
+EncounterUniqueList (EncounterID, CaseTypeFamilyID) AS (
+    SELECT 
+    EncounterId,
+    (CASE
+            WHEN dptr.Type = 'Outpatient' THEN pes.CPTCodeCaseTypeFamilyID
+            WHEN @CodeType = 0  THEN pes.msdrgcasetypefamilyid
+            ELSE pes.aprdrgcasetypefamilyid
+            END) AS casetypefamilyid
+    FROM PatientEncounterSummary pes
+    JOIN fw.DimPatientType dpt ON dpt.PatientTypeID = pes.PatientTypeID
+    JOIN fw.DimPatientTypeRollup dptr ON dptr.PatientTypeRollupID = dpt.PatientTypeRollupID
+),
+
+ListOfEncounters (EncounterID, Charges, VariableDirectCost, IsExpired, ROM, SOI, CostDriver, CaseTypeFamilyID, lengthofstay, dischargedatetime) AS (
+    SELECT
+        el.EncounterID,
+        el.Charges,
+        el.VariableDirectCost,
+        el.IsExpired,
+        el.ROM,
+        el.SOI,
+        el.CostDriver,
+        el.CaseTypeFamilyID,
+        el.lengthofstay,
+        el.dischargedatetime
+    FROM EncounterListWithCharges el
+         LEFT JOIN dss.dimmsdrg dmsd ON dmsd.msdrgid = el.codeid and el.codeType = 0
+         LEFT JOIN dss.dimmsdrgrollup dmsdroll ON dmsdroll.msdrgrollupid = dmsd.msdrgrollupid
+      -- {queryFilter}
+),
+
+ctfGroupCalcs (casetypefamilyid, medianvdc, medianlos, averageLos, twentyfivepercentilevdc, seventyfivepercentilevdc, twentyfivepercentilelos, seventyfivepercentilelos) AS (
+    SELECT
+        eul.CaseTypeFamilyID,
+        MEDIAN(el.variabledirectcost) AS medianvdc,
+        MEDIAN(el.lengthofstay) AS medianlos,
+        AVG(el.lengthofstay) as averageLos,
+        PERCENTILE_CONT(0.25) WITHIN GROUP (ORDER BY el.variabledirectcost) AS twentyfivepercentilevdc,
+        PERCENTILE_CONT(0.75) WITHIN GROUP (ORDER BY el.variabledirectcost) AS seventyfivepercentilevdc,
+        PERCENTILE_CONT(0.25) WITHIN GROUP (ORDER BY el.lengthofstay) AS twentyfivepercentilelos,
+        PERCENTILE_CONT(0.75) WITHIN GROUP (ORDER BY el.lengthofstay) AS seventyfivepercentilelos
+    FROM EncounterList el
+    JOIN EncounterUniqueList eul ON el.EncounterID = eul.EncounterID
+    GROUP BY eul.casetypefamilyid
+),
+
+ctfCostDriverGroupCalcs (casetypefamilyid, costdriver, medianvdc) AS (
+  SELECT
+        loe.casetypefamilyid,
+        loe.costdriver,
+        MEDIAN(loe.variabledirectcost) AS medianvdc
+    FROM ListOfEncounters loe
+    GROUP BY casetypefamilyid, costdriver
+),
+
+madsubcalc (encounterid, casetypefamilyid, vdcdifference, losdifference) AS (
+    SELECT
+        el.encounterid,
+        g.casetypefamilyid,
+        ABS(el.variabledirectcost - g.medianvdc) AS vdcdifference,
+        ABS(el.lengthofstay - g.medianlos) AS losdifference
+    FROM EncounterList el
+    JOIN EncounterUniqueList eul ON eul.EncounterID = el.EncounterID
+    JOIN ctfGroupCalcs g ON g.casetypefamilyid = eul.casetypefamilyid
+),
+
+mads (casetypefamilyid, madvdc, madlos) AS (
+    SELECT
+        casetypefamilyid,
+        MEDIAN(vdcdifference) as madvdc,
+        MEDIAN(losdifference) as madlos
+    FROM madsubcalc
+    GROUP BY casetypefamilyid
+),
+
+ctfSummaryDetailData (encounterid, dischargedatetime, casetypefamilyid, casetypefamilyname, isexpired, variabledirectcost, vdc, lengthofstay, identifiedvariation, medianvdc, medianlengthofstay, averagelengthofstay, twentyfivepercentilevdc, seventyfivepercentilevdc, iqrvdc, twentyfivepercentilelos, seventyfivepercentilelos, iqrlos, madvdc, madlos, rom, soi, charges, costdriver) AS (
+    SELECT
+        el.encounterid,
+        el.dischargedatetime,
+        loe.casetypefamilyid,
+        ctf.name AS casetypefamilyname,
+        loe.isexpired,
+        loe.variabledirectcost,
+        el.variabledirectcost vdc,
+        el.lengthofstay,
+        --rounding to block extremely small values from being marked as identified variation later on
+        ROUND(loe.variabledirectcost - cg.medianvdc, 5) AS identifiedvariation,
+        g.medianvdc,
+        g.medianlos as medianlengthofstay,
+        g.averageLos as averagelengthofstay,
+        g.twentyfivepercentilevdc,
+        g.seventyfivepercentilevdc,
+        g.seventyfivepercentilevdc - g.twentyfivepercentilevdc as iqrvdc,
+        g.twentyfivepercentilelos,
+        g.seventyfivepercentilelos,
+        g.seventyfivepercentilelos - g.twentyfivepercentilelos as iqrlos,
+        m.madvdc * 1.4826 as madvdc,
+        m.madlos * 1.4826 as madlos,
+        loe.rom,
+        loe.soi,
+        loe.charges,
+        loe.costdriver
+    FROM EncounterList el
+        JOIN ListOfEncounters loe on loe.encounterid = el.encounterid
+        JOIN dss.casetypefamily ctf ON ctf.casetypefamilyid = loe.casetypefamilyid
+        JOIN ctfGroupCalcs g ON g.casetypefamilyid = loe.casetypefamilyid
+        JOIN ctfCostDriverGroupCalcs cg ON cg.casetypefamilyid = loe.casetypefamilyid AND cg.costdriver = loe.costdriver
+        JOIN mads m on m.casetypefamilyid = loe.casetypefamilyid
+),
+includedEncounterInfos (encounterid, casetypefamilyid, costdriver, identifiedvariation, lengthofstay, variableDirectCost, isExpired ) AS (
+    SELECT 
+       encounterid, 
+       casetypefamilyid, 
+       costdriver, 
+       identifiedvariation,
+       lengthofstay, 
+       variableDirectCost,
+       isExpired
+    FROM ctfSummaryDetailData
+    WHERE
+    (
+        -- LOS exclusion
+        @LosExclusionType = 'None'
+        OR (
+            lengthofstay
+            <=
+            CASE 
+                WHEN @LosExclusionType = 'Mad' THEN (madlos * @LosExclusionValue) + medianlengthofstay
+                WHEN @LosExclusionType = 'Iqr' THEN (iqrlos *  @LosExclusionValue) + seventyfivepercentilelos
+                ELSE NULL
+            END
+        )
+    )
+    AND
+    (
+        -- VDC exclusion
+        @CostExclusionType = 'None'
+        OR (
+            vdc
+            <=
+            CASE 
+                WHEN @CostExclusionType = 'Mad' THEN (madvdc * @CostExclusionValue) + medianvdc
+                WHEN @CostExclusionType = 'Iqr' THEN (iqrvdc * @CostExclusionValue) + seventyfivepercentilevdc
+                ELSE NULL
+            END
+        )
+    )
+),
+includedEncounterCostAgg AS (
+  SELECT 
+    encounterid,
+    casetypefamilyid,
+    SUM(variabledirectcost) as totalVdc
+  FROM includedEncounterInfos
+  GROUP BY encounterid, casetypefamilyid
+), 
+includedMedianCost AS (
+  SELECT
+    casetypefamilyid,
+    MEDIAN(totalVdc) AS includedMedianCost
+  FROM includedEncounterCostAgg
+  GROUP BY casetypefamilyid
+),
+includedEncounterValues AS (
+    SELECT
+    DISTINCT(encounterid),
+    casetypefamilyid,
+    isexpired,
+    lengthofstay
+    FROM includedEncounterInfos
+),
+includedCalcs AS (
+    SELECT
+    casetypefamilyid,
+    AVG(isexpired) AS mortalityrate,
+    MEDIAN(lengthofstay) AS lengthofstay, 
+    AVG(lengthofstay) as averagelengthofstay
+    FROM includedEncounterValues
+    GROUP BY casetypefamilyid
+),
+distinctIncludedVariationEncounters AS (
+    SELECT
+    COUNT(DISTINCT detail.encounterid) AS includedVariationEncounters,
+    detail.casetypefamilyid
+    FROM includedEncounterInfos detail 
+    WHERE detail.identifiedVariation > 0
+    GROUP BY detail.casetypefamilyid
+),
+ctfSummary (casetypefamilyid, casetypefamilyname,
+totalEncounters, totalVariationEncounters, identifiedvariation, 
+includedEncounterCount, mortalityRate, medianLos, averagelengthofstay, medianCost, includedEncountersBelowMedian, includedEncountersAboveMedian, includedVariation,
+excludedEncountersAboveMedian, excludedVariation
+) AS (
+    SELECT 
+        detail.casetypefamilyid,
+        detail.casetypefamilyname,        
+        -- entire population
+        COUNT(DISTINCT detail.encounterid) totalEncounters,
+        COUNT(DISTINCT CASE WHEN detail.identifiedVariation > 0 THEN detail.encounterid ELSE NULL END) AS totalVariationEncounters,
+        SUM(CASE WHEN detail.identifiedvariation > 0 THEN detail.identifiedvariation  ELSE 0 END) AS identifiedvariation,
+        
+        -- -- refined population
+        COUNT(DISTINCT included.encounterid) AS includedEncounterCount,
+        ic.mortalityrate AS mortalityrate,
+        ic.lengthofstay AS medianLos, 
+        ic.averagelengthofstay as averagelengthofstay,
+        ANY_VALUE(mc.includedMedianCost) AS medianCost,
+        COUNT(DISTINCT included.encounterid) - ZEROIFNULL(divc.includedVariationEncounters) AS includedEncountersBelowMedian,
+        ZEROIFNULL(divc.includedVariationEncounters) AS includedEncountersAboveMedian,
+        SUM(CASE WHEN included.identifiedvariation > 0 THEN included.identifiedvariation  ELSE 0 END) AS includedVariation, 
+        
+        -- excluded population
+        COUNT(DISTINCT CASE WHEN included.encounterid IS NULL THEN detail.encounterid ELSE NULL END) AS  excludedEncountersAboveMedian,
+        SUM(CASE WHEN included.encounterid IS NULL AND detail.identifiedvariation > 0 THEN detail.identifiedvariation ELSE 0 END) AS excludedVariation
+    FROM ctfSummaryDetailData detail 
+    LEFT JOIN includedEncounterInfos included ON included.encounterid = detail.encounterid 
+        AND included.caseTypeFamilyId = detail.caseTypeFamilyId
+        AND included.costdriver = detail.costdriver
+    LEFT JOIN includedMedianCost mc ON mc.casetypefamilyid = detail.casetypefamilyid
+    LEFT JOIN includedCalcs ic ON ic.casetypefamilyid = detail.casetypefamilyid
+    LEFT JOIN distinctIncludedVariationEncounters divc ON divc.casetypefamilyid = detail.casetypefamilyid
+    GROUP BY detail.casetypefamilyid, detail.casetypefamilyname, divc.includedVariationEncounters, ic.mortalityrate, ic.lengthofstay, ic.averagelengthofstay
+)
+SELECT
+casetypefamilyid, 
+casetypefamilyname, 
+totalEncounters, totalVariationEncounters, identifiedvariation, 
+includedEncounterCount, mortalityRate, medianLos, averagelengthofstay, medianCost, includedEncountersBelowMedian, includedEncountersAboveMedian, includedVariation,
+excludedEncountersAboveMedian, excludedVariation
+FROM ctfsummary
+ORDER BY casetypefamilyname;
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/CaseTypeFamilyTrimQuery.sql b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/CaseTypeFamilyTrimQuery.sql
new file mode 100644
index 0000000..c1aa5b9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQueries/CaseTypeFamilyTrimQuery.sql
@@ -0,0 +1,66 @@
+WITH EncounterList (EncounterID, Charges, IsExpired, ROM, SOI) AS (
+    SELECT
+	    fpes.EncounterID,
+		SUM(c.charge) Charges,
+		CASE WHEN ds.dischargestatuscode in ('20', '40', '41', '42') THEN 1 ELSE 0 END AS isexpired,
+        COALESCE(apr.aprrom, '0') AS rom, 
+        COALESCE(apr.aprsoi, '0') AS soi
+	FROM clientDSS.FactPatientEncounterSummary fpes
+    JOIN cci.encounterchargecodecosts c on fpes.encounterid = c.encounterid
+    JOIN clientdss.dimdischargestatus ds on fpes.dischargestatusid = ds.dischargestatusid
+    LEFT JOIN dss.dimaprdrg apr ON fpes.apdrgid = apr.aprdrgid
+    WHERE fpes.dischargedatetime >= @DischargeDateStart AND fpes.dischargedatetime < @DischargeDateEnd
+      AND COALESCE(NULLIF(fpes.msdrgcasetypefamilyid, 0), NULLIF(fpes.aprdrgcasetypefamilyid, 0), NULLIF(fpes.cptcodecasetypefamilyid, 0)) = @CaseTypeFamilyId
+    GROUP BY fpes.EncounterId, isExpired, rom, soi
+),
+
+EncounterUniqueList (EncounterID) AS (
+    SELECT DISTINCT EncounterID
+    FROM EncounterList
+),
+
+groupcalcs (casetypefamilyid, medianvdc, medianlos, twentyfivepercentilevdc, twentyfivepercentilelos, seventyfivepercentilevdc, seventyfivepercentilelos) AS (
+    SELECT
+        COALESCE(NULLIF(f.msdrgcasetypefamilyid, 0), NULLIF(f.aprdrgcasetypefamilyid, 0), NULLIF(f.cptcodecasetypefamilyid, 0)) AS casetypefamilyid,
+        MEDIAN(f.variabledirectcost) AS medianvdc,
+        MEDIAN(f.lengthofstay) AS medianlos,
+        percentile_cont(0.25) within group (order by f.variabledirectcost) as twentyfivepercentilevdc,
+        percentile_cont(0.25) within group (order by f.lengthofstay) as twentyfivepercentilelos,
+        percentile_cont(0.75) within group (order by f.variabledirectcost) as seventyfivepercentilevdc,
+        percentile_cont(0.75) within group (order by f.lengthofstay) as seventyfivepercentilelos
+    FROM clientdss.factpatientencountersummary f
+    JOIN EncounterUniqueList el ON f.encounterId = el.encounterId
+    GROUP BY casetypefamilyid
+    ),
+
+madsubcalc (casetypefamilyid, vdcdifference, losdifference) as (
+    SELECT
+        COALESCE(NULLIF(f.msdrgcasetypefamilyid, 0), NULLIF(f.aprdrgcasetypefamilyid, 0), NULLIF(f.cptcodecasetypefamilyid, 0)) AS casetypefamilyid,
+        ABS(f.variabledirectcost - g.medianvdc) as vdcdifference,
+        ABS(f.lengthofstay - g.medianlos) as losdifference
+    FROM clientdss.factpatientencountersummary f
+    JOIN EncounterUniqueList el ON f.encounterId = el.encounterId
+    JOIN groupcalcs as g on g.casetypefamilyid = casetypefamilyid
+),
+
+mads (casetypefamilyid, madvdc, madlos) as (
+    SELECT
+        casetypefamilyid,
+        MEDIAN(vdcdifference) as madvdc,
+        MEDIAN(losdifference) as madlos
+    FROM madsubcalc m
+    GROUP BY m.casetypefamilyid
+)
+
+SELECT
+    m.casetypefamilyid,
+    m.madvdc * 1.4826 as madvdc,
+    m.madlos * 1.4826 as madlos,
+    g.medianvdc,
+    g.medianlos,
+    g.seventyfivepercentilevdc,
+    g.seventyfivepercentilevdc - g.twentyfivepercentilevdc as iqrvdc,
+    g.seventyfivepercentilelos,
+    g.seventyfivepercentilelos - g.twentyfivepercentilelos as iqrlos
+FROM mads m
+JOIN groupcalcs g on g.casetypefamilyid = m.casetypefamilyid
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQuery.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQuery.cs
new file mode 100644
index 0000000..bd72c7b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/ExplorationServiceQuery.cs
@@ -0,0 +1,102 @@
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration
+{
+    public static class ExplorationServiceQuery
+    {
+        private static readonly Func<string, string> SnowflakeSyntax = (sql)
+            => Regex.Replace(sql.Replace("@", ":"), @"IN \((:[^)]*)\)", "IN $1", RegexOptions.IgnoreCase | RegexOptions.Multiline);
+
+        private static readonly Func<string, string, string> ApplyQueryFilters = (queryFilters, sql)
+            => sql.Replace("-- {queryFilter}", queryFilters);
+
+        private static readonly Func<string, string, string> ApplyEncounterSummaryFilters = (encounterSummaryFilters, sql)
+            => sql.Replace("-- {encounterSummaryFilter}", encounterSummaryFilters);
+
+        private static readonly Func<string, string, string> ApplyQueryTrim = (queryTrim, sql)
+            => sql.Replace("-- {queryTrim}", queryTrim);
+
+        private static readonly Func<string, string, string> ApplyQueryListOfEncounters = (queryListOfEncounters, sql)
+             => sql.Replace("-- {queryListOfEncounters}", queryListOfEncounters);
+
+        private static readonly Func<string, string, string> ApplyQuerySelect = (querySelect, sql)
+            => sql.Replace("-- {querySelect}", querySelect);
+
+        private static readonly Func<string, string, string, string> ApplyQueryAdditional = (queryAdditionalColumns, queryAdditionalJoins, sql)
+            => sql.Replace("-- {queryAdditionalColumns}", queryAdditionalColumns).Replace("-- {queryAdditionalJoins}", queryAdditionalJoins);
+
+        /// <summary>
+        /// Returns the CaseTypeFamily Summary Query string
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// Likely not enough logic to constitute its own function, but I imagine as we build this out
+        /// there will be more parameters to pass into here, or maybe a place where we would want to reuse this logic
+        /// </remarks>
+        public static string BuildCaseTypeFamilySummaryQuery(string queryFilters, string encounterSummaryFilters)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            return SnowflakeSyntax(ApplyQueryFilters(queryFilters, ApplyEncounterSummaryFilters(encounterSummaryFilters, assembly.ReadResource("CaseTypeFamilySummaryQuery.sql"))));
+        }
+
+        public static string BuildCaseTypeFamilySummaryDetailQuery(string queryFilters, string encounterSummaryFilters)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            return SnowflakeSyntax(ApplyQueryFilters(queryFilters, ApplyEncounterSummaryFilters(encounterSummaryFilters, assembly.ReadResource("CaseTypeFamilySummaryDetailQuery.sql"))));
+        }
+
+        public static string BuildCaseTypeFamilySummaryEncounterQuery(string queryFilters, string encounterSummaryFilters)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            return SnowflakeSyntax(ApplyQueryFilters(queryFilters, ApplyEncounterSummaryFilters(encounterSummaryFilters, assembly.ReadResource("CaseTypeFamilySummaryEncounterQuery.sql"))));
+        }
+
+        public static string CaseTypeFamilyTrimQuery()
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            return SnowflakeSyntax(assembly.ReadResource("CaseTypeFamilyTrimQuery.sql"));
+        }
+
+        public static (string, byte) CTFEntityCodePhysicianQuery(string queryFilter, string encounterSummaryFilters, string queryJoin, string queryTrim)
+        {
+            var sbQuerySelect = new StringBuilder();
+            var assembly = Assembly.GetExecutingAssembly();            
+            sbQuerySelect.Append(assembly.ReadResource("ExplorationQueryGroupByCtf.sql"));
+            sbQuerySelect.Append(assembly.ReadResource("ExplorationQueryGroupByEntity.sql"));
+            sbQuerySelect.Append(assembly.ReadResource("ExplorationQueryGroupByEntityCode.sql"));
+            sbQuerySelect.Append(assembly.ReadResource("ExplorationQueryGroupByEntityCodePhysician.sql"));
+            sbQuerySelect.Append(assembly.ReadResource("ExplorationQueryEncountersData.sql"));
+
+            var query =
+                ApplyQueryTrim(queryTrim,
+                    ApplyQueryFilters(queryFilter, 
+                        ApplyEncounterSummaryFilters(encounterSummaryFilters,
+                            ApplyQueryAdditional(", loc.code, loc.codename", queryJoin + $"JOIN ({assembly.ReadResource("ExplorationQueryCodes.sql")}) loc ON loc.ctftype = el.ctftype AND loc.codeid = el.codeid",
+                                ApplyQueryListOfEncounters(assembly.ReadResource("ExplorationQueryBase.sql"),
+                                    ApplyQuerySelect(sbQuerySelect.ToString(), "-- {querySelect}"))))));
+
+            return (query, 5);
+        }
+
+        public static (string, byte) EncountersIsIncludedQuery(string queryFilter, string encounterSummaryFilters, string queryTrim, string queryJoin = "")
+        {
+            var sbQuerySelect = new StringBuilder();
+            var assembly = Assembly.GetExecutingAssembly();
+            sbQuerySelect.Append(assembly.ReadResource("ExplorationQueryPhysicianData.sql"));
+            sbQuerySelect.Append(assembly.ReadResource("ExplorationQueryEncountersIdIncluded.sql"));
+
+            var query =
+                ApplyQueryTrim(queryTrim,
+                    ApplyQueryFilters(queryFilter, 
+                        ApplyEncounterSummaryFilters(encounterSummaryFilters,
+                            ApplyQueryListOfEncounters(assembly.ReadResource("ExplorationQueryBase.sql"),
+                                ApplyQuerySelect(sbQuerySelect.ToString(), "-- {querySelect}")))));
+
+            return (query, 2);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/Filters/EXFilterOptions.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/Filters/EXFilterOptions.cs
new file mode 100644
index 0000000..fb70a3a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/Filters/EXFilterOptions.cs
@@ -0,0 +1,6 @@
+namespace Strata.ContinuousImprovement.Biz.Exploration.Filters
+{
+    public class EXFilterOptions
+    {
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/Filters/EXFilters.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/Filters/EXFilters.cs
new file mode 100644
index 0000000..7ccd9f6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/Filters/EXFilters.cs
@@ -0,0 +1,30 @@
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Exploration.Opportunities;
+using Strata.ContinuousImprovement.Biz.Filter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.Filters
+{
+    public class EXFilters : FiltersOpportunity<EXOpportunity>
+    {
+        public EXFilters() : base()
+        {
+        }
+
+        public override IEnumerable<Expression<Func<EXOpportunity, bool>>> GetFilters(JazzDbContext context)
+        {
+            var filters = base.GetFilters(context).ToList();
+
+            if (!string.IsNullOrEmpty(OpportunitySearch))
+            {
+                filters.Add(m => ("EX - " + m.OpportunityId.ToString()).Contains(OpportunitySearch)
+                    || m.Name.Contains(OpportunitySearch));
+            }
+
+            return filters;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/Filters/ExclusionCriteria.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/Filters/ExclusionCriteria.cs
new file mode 100644
index 0000000..dffa63e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/Filters/ExclusionCriteria.cs
@@ -0,0 +1,50 @@
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.Filters
+{
+    public class ExclusionCriteria
+    {
+
+        public ExclusionCriteriaType LosExclusionType { get; set; }
+        public double LosExclusionValue { get; set; }
+        public ExclusionCriteriaType CostExclusionType { get; set; }
+        public double CostExclusionValue { get; set; }
+
+        public string GetTrimQueryString(CaseTypeFamilyTrimInfo trimInfo)
+        {
+            var queryString = "";
+            if (LosExclusionType != ExclusionCriteriaType.None) queryString += $"OR (fpes.lengthofstay > {GetLosTrim(trimInfo)}) ";
+            if (CostExclusionType != ExclusionCriteriaType.None) queryString += $"OR (fpes.variabledirectcost > {GetCostTrim(trimInfo)}) ";
+            return queryString;
+        }
+
+        private double GetLosTrim(CaseTypeFamilyTrimInfo trimInfo)
+        {
+            return LosExclusionType switch
+            {
+                ExclusionCriteriaType.Mad => (trimInfo.MadLos * LosExclusionValue) + trimInfo.MedianLos,
+                ExclusionCriteriaType.Iqr => (trimInfo.IqrLos * LosExclusionValue) + trimInfo.SeventyFivePercentileLos,
+                ExclusionCriteriaType.None => double.MaxValue,
+                _ => double.MaxValue
+            };
+        }
+
+        private double GetCostTrim(CaseTypeFamilyTrimInfo trimInfo)
+        {
+            return CostExclusionType switch
+            {
+                ExclusionCriteriaType.Mad => (trimInfo.MadVdc * CostExclusionValue) + trimInfo.MedianVdc,
+                ExclusionCriteriaType.Iqr => (trimInfo.IqrVdc * CostExclusionValue) + trimInfo.SeventyFivePercentileVdc,
+                ExclusionCriteriaType.None => double.MaxValue,
+                _ => double.MaxValue
+            };
+        }
+    }
+
+    public enum ExclusionCriteriaType
+    {
+        None,
+        Mad,
+        Iqr
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/Filters/Filter.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/Filters/Filter.cs
new file mode 100644
index 0000000..a560733
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/Filters/Filter.cs
@@ -0,0 +1,153 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.Filters
+{
+    public class Filter
+    {
+        public DateTime DischargeDateStart { get; set; }
+        public DateTime DischargeDateEnd { get; set; }
+        public List<FilterChipItem> FilterChipItems { get; set; }
+    }
+
+    public class FilterChipItem
+    {
+        public ChipKey Key { get; set; }
+        public string Label { get; set; }
+        public string GlobalId { get; set; }
+        public OperatorType Operator { get; set; }
+        public ChipType ChipType { get; set; }
+        public List<TreeNode> Filters { get; set; }
+        public bool? IsSelected { get; set; }
+        public IEnumerable<DateTime> DateRange { get; set; }
+    }
+
+    public class FilterCollection
+    {
+        public IEnumerable<string> QueryFilters { get; set; }
+        public IEnumerable<string> EncounterSummaryFilters { get; set; }
+    }
+
+    public class TreeNode
+    {
+        public string Id { get; set; }
+        public string DisplayText { get; set; }
+    }
+
+    public enum ChipType
+    {
+        ScoreMember,
+        Boolean,
+        Special,
+        CostDriver,
+        DateRange,
+        Supply,
+        CostComponent,
+        SphCriteria
+    }
+
+    public enum ChipKey
+    {
+        AdmitSourceID,
+        AdmitTypeID,
+        AgeCohortID,
+        AprDrgID,
+        CaseTypeFamilyID,
+        CostDriver,
+        DischargeStatusId,
+        EntityID,
+        EncounterID,
+        GenderID,
+        ICD10DXPrimaryDiagID,
+        ICD10PXPrimaryID,
+        InsurancePlan1ID,
+        IsGreaterThanZeroCharges,
+        LocationID,
+        Mortality,
+        MSDRGID,
+        NewBornFlagID,
+        PatientTypeID,
+        PrimaryCPTID,
+        PrimaryPhysicianID,
+        PrimaryQVIID,
+        RiskOfMortality,
+        SeverityOfIllness,
+        SourceSystemID,
+        DischargeDateID,
+        BilledCPT,
+        ChargeCode,
+        CostComponent,
+        Supply,
+        UBRevenueCode,
+        Department,
+        VariableDirectCost = 32,
+        LengthOfStay = 33,
+        MSDRGRollupID = 34,
+        SPHAdmitType,
+        SPHDischargeStatus,
+        SPHPatientType,
+        SPHGender,
+        SPHIsNewBorn,
+        SPHAgeRollup
+    }
+
+    public enum OperatorType
+    {
+        In,
+        NotIn
+    }
+
+    public static class ChipTypeExtensions
+    {
+        public static bool IsEncounterSummaryFilter(this ChipKey chipKey)
+        {
+            switch (chipKey)
+            {
+                case ChipKey.AdmitSourceID:
+                case ChipKey.AdmitTypeID:
+                case ChipKey.AgeCohortID:
+                case ChipKey.AprDrgID:
+                case ChipKey.DischargeStatusId:
+                case ChipKey.EntityID:
+                case ChipKey.EncounterID:
+                case ChipKey.GenderID:
+                case ChipKey.ICD10DXPrimaryDiagID:
+                case ChipKey.ICD10PXPrimaryID:
+                case ChipKey.InsurancePlan1ID:
+                case ChipKey.LocationID:
+                case ChipKey.MSDRGID:
+                case ChipKey.NewBornFlagID:
+                case ChipKey.PatientTypeID:
+                case ChipKey.PrimaryCPTID:
+                case ChipKey.PrimaryPhysicianID:
+                case ChipKey.SourceSystemID:
+                case ChipKey.DischargeDateID:
+                case ChipKey.PrimaryQVIID:
+                case ChipKey.VariableDirectCost: // Should we refactor so that this filters on our costing costs instead of FPES?
+                case ChipKey.LengthOfStay:
+                    return true;
+                case ChipKey.CostDriver:
+                case ChipKey.RiskOfMortality:
+                case ChipKey.SeverityOfIllness:
+                case ChipKey.IsGreaterThanZeroCharges:
+                case ChipKey.Mortality:
+                case ChipKey.MSDRGRollupID:
+                case ChipKey.CaseTypeFamilyID:
+                    return false;
+            }
+            return false;
+        }
+
+        public static bool ContainsChips(string filtersJson, IEnumerable<ChipKey> chips)
+        {
+            if (!string.IsNullOrEmpty(filtersJson) && filtersJson != "[]")
+            {
+                var additionalFilters = JsonConvert.DeserializeObject<List<FilterChipItem>>(filtersJson);
+                return additionalFilters.Any(f => chips.Contains(f.Key));
+            }
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/IExplorationFilterService.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/IExplorationFilterService.cs
new file mode 100644
index 0000000..d494895
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/IExplorationFilterService.cs
@@ -0,0 +1,18 @@
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.StrataSphereCompare.Client.Models;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using static Strata.ContinuousImprovement.Biz.Exploration.ExplorationService;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration
+{
+    public interface IExplorationFilterService
+    {
+        Task<(string QueryFilters, string EncounterSummaryFilters)> GetFilterStringsAsync(IEnumerable<FilterChipItem> filterChipItems, IQueryParamBase queryParams, CancellationToken cancellationToken);
+        Task<FilterCollection> GetFiltersAsync(IEnumerable<FilterChipItem> filterChipItems, IQueryParamBase queryParams, CancellationToken cancellationToken);
+        Task<CostDetailsFilterDto> BuildDataFiltersAsync(CaseTypeFamily drillDownCaseTypeFamily, string drillDownCostDriver, Filters.Filter filters, bool isUsingAprdrg, bool forceIncludeOfCostDriverColumn, bool includeCodeColumn, CancellationToken cancellationToken);
+        FilterChipItem CreateCostDriverFilter();
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/IExplorationInfo.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/IExplorationInfo.cs
new file mode 100644
index 0000000..69c536a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/IExplorationInfo.cs
@@ -0,0 +1,15 @@
+using Strata.ContinuousImprovement.Biz.Exploration.Benchmark;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration
+{
+    public interface IExplorationInfo
+    {
+        Guid ConfigurationGuid { get; set; }
+        ExclusionCriteria ExclusionCriteria { get; set; }
+        Filters.Filter Filters { get; set; }
+        int PeerGroupId { get; set; }
+        BenchmarkingInsightsGranularity Granularity { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/IExplorationService.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/IExplorationService.cs
new file mode 100644
index 0000000..9b9b8e8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/IExplorationService.cs
@@ -0,0 +1,19 @@
+using Strata.ContinuousImprovement.Biz.Exploration.Benchmark;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration
+{
+    public interface IExplorationService
+    {
+        Task<IEnumerable<CaseTypeFamilySummaryData>> GetCaseTypeFamilySummariesAsync(IExplorationInfo exploration, CancellationToken cancellationToken);
+        Task<IEnumerable<CaseTypeFamilySummaryData>> GetCaseTypeFamilySummaryDetailsAsync(IExplorationInfo exploration, CancellationToken cancellationToken);
+        Task<CaseTypeFamilyDetailInfo> GetCaseTypeFamilyDetailsAsync(ExplorationDetailInfo exploration, CancellationToken cancellationToken);
+        Task<IEnumerable<EncounterPhysicianInfo>> GetEncountersAsync(ExplorationDetailInfo exploration, Guid configurationGuid, CancellationToken cancellationToken);
+        Task<List<HeatMapData>> GetBenchmarkingDataForHeatMapAsync(IExplorationInfo exploration, BenchmarkingInsightsGranularity granularity, CancellationToken cancellationToken);
+        Task<bool> IsFlexExPerfLogging(CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/IWorkbookService.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/IWorkbookService.cs
new file mode 100644
index 0000000..616ccb5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/IWorkbookService.cs
@@ -0,0 +1,16 @@
+using Strata.Analytics.Models.Utils;
+using Strata.Analytics.Models.Workbooks;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration
+{
+    public interface IWorkbookService
+    {
+        Task<bool> CheckHasValidWorkbookAsync(int workbookId, CancellationToken cancellationToken);
+        Task<int> CreateDefaultWorkbook(string workbookName, CancellationToken cancellationToken);
+        Task<Batch<WorkbookRoleAssignmentSaveInfo, Guid>> GetDefaultCIUserRoleAssignmentsAsync(JazzDbContext dbContext, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/Opportunities/EXOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/Opportunities/EXOpportunity.cs
new file mode 100644
index 0000000..ad1ced7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/Opportunities/EXOpportunity.cs
@@ -0,0 +1,52 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.Opportunities
+{
+    [Table("ExplorationOpportunity", Schema = "cci")]
+    public class EXOpportunity : Opportunity, IOpportunity
+    {
+        public EXOpportunity()
+        {
+            OpportunityGuid = Guid.NewGuid();
+            DateCreated = DateTime.Now;
+        }
+
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public DateTime DateCreated { get; set; }
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long OpportunityId { get; set; }
+        public InitiativeStatuses InitiativeStatus { get; set; } = InitiativeStatuses.OnHold;
+        public int AnalyticsWorkbookId { get; set; }
+
+        // IOpportunity properties needed to implement interface (these are typically properties from a view)
+        [NotMapped]
+        public new string OpportunityKey
+        {
+            get
+            {
+                return $"EX - {OpportunityId}";
+            }
+            set { }
+        }
+
+        [NotMapped]
+        public new bool HasInitiative { get; set; }
+        [NotMapped]
+        public new string Initiative { get; set; }
+
+        public override void Update(IOpportunity updates)
+        {
+            base.Update(updates);
+            var exUpdates = updates as EXOpportunity;
+            if (exUpdates == null) return;
+            Name = exUpdates.Name;
+            Description = exUpdates.Description;
+            InitiativeStatus = exUpdates.InitiativeStatus;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/Opportunities/EXOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/Opportunities/EXOpportunityService.cs
new file mode 100644
index 0000000..d823b43
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/Opportunities/EXOpportunityService.cs
@@ -0,0 +1,140 @@
+using ClosedXML.Excel;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Export;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.Opportunities
+{
+    public class EXOpportunityService : OpportunityService<EXOpportunity>, IEXOpportunityService
+    {
+        private readonly IHubContext<NotificationHub, INotificationHub> _notificationHubContext;
+        private readonly IWorkbookService _workbookService;
+        private readonly ILogger<EXOpportunityService> _logger;
+
+        public EXOpportunityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IInitiativeService initiativeService, IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            IHubContext<NotificationHub, INotificationHub> notificationHubContext,
+            IWorkbookService workbookService,
+            ILogger<EXOpportunityService> logger)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor, initiativeService, updateFactOpportunitySavingsService)
+        {
+            _notificationHubContext = notificationHubContext;
+            _workbookService = workbookService;
+            _logger = logger;
+        }
+
+        public override async Task<EXOpportunity> GetById(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            return dbContext.ExplorationOpportunities.FirstOrDefault(opp => opp.OpportunityGuid == opportunityGuid);
+        }
+
+        public async Task<EXFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return null;
+
+            var opportunityContext = dbContext.Set<EXOpportunity>();
+
+            return new EXFilterOptions
+            {
+            };
+        }
+
+        public async Task<EXOpportunity> CreateAsync(EXOpportunity opportunity, string userName, CancellationToken cancellationToken)
+        {
+            var hubKey = userName + opportunity.Name;
+            var hub = _notificationHubContext.Clients.Group(hubKey);
+
+            try
+            {
+                await using var dbContext = GetDbContext(cancellationToken).Result;
+                await dbContext.AddAsync(opportunity, cancellationToken);
+                await dbContext.SaveChangesAsync();
+                await hub.SendExplorationOpportunityCreateSuccess(hubKey, opportunity.Name, opportunity.OpportunityGuid.ToString());
+                return opportunity;
+            }
+            catch (Exception ex)
+            {
+                await hub.SendExplorationOpportunityCreateError(hubKey, opportunity.Name);
+                _logger.LogOpportunityError(ex, opportunity.Name, Guid.Empty);
+                return null;
+            }
+        }
+
+        public async Task<EXOpportunity> UpdateAsync(EXOpportunity opportunity, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var opp = dbContext.ExplorationOpportunities.FirstOrDefault(opp => opp.OpportunityGuid == opportunity.OpportunityGuid);
+            if (opp == null) { return null; }
+            opp.Name = opportunity.Name;
+            opp.Description = opportunity.Description;
+            opp.IdentifiedSavings = opportunity.IdentifiedSavings;
+            opp.InitiativeStatus = opportunity.InitiativeStatus;
+            opp.Note = opportunity.Note;
+            opp.AnalyticsWorkbookId = opportunity.AnalyticsWorkbookId;
+            dbContext.Update(opp).Property(p => p.OpportunityId).IsModified = false;
+            await dbContext.SaveChangesAsync();
+            return opp;
+        }
+
+        public async Task<bool> DeleteAsync(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var opp = dbContext.ExplorationOpportunities.FirstOrDefault(opp => opp.OpportunityGuid == opportunityGuid);
+            dbContext.Remove(opp);
+            var result = await dbContext.SaveChangesAsync();
+            return result > 0;
+        }
+
+        public async Task CheckWorkbook(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var opportunity = await GetById(opportunityGuid, cancellationToken);
+            if (opportunity == null) { return; }
+            var hasValidWorkbook = await _workbookService.CheckHasValidWorkbookAsync(opportunity.AnalyticsWorkbookId, cancellationToken);
+            if (hasValidWorkbook) { return; }
+            opportunity.AnalyticsWorkbookId = await _workbookService.CreateDefaultWorkbook(opportunity.Name, cancellationToken);
+            var dbContext = await GetDbContext(cancellationToken);
+            dbContext.Update(opportunity);
+            await dbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, EXFilters filters, CancellationToken cancellationToken)
+        {
+            var exportOptions = this.GetExportOptions();
+
+            // get data
+            var opportunities = await this.GetAllAsync(sortOptions, filters, cancellationToken);
+            var data = opportunities.Select(opp => new
+            {
+                Opportunity = opp.OpportunityKey,
+                opp.Name,
+                opp.IdentifiedSavings,
+                opp.Initiative,
+                IsHidden = opp.IsHidden ? 1 : 0,
+                opp.Note
+            });
+
+            // configure column formats
+            exportOptions.AddColumnOptions("Identified Savings", "Currency2Dec");
+            exportOptions.AddColumnOptions("Is Hidden", "\"Yes\";-;\"No\"");
+
+            return ExportUtils.CreateExcelWorkbook(data, exportOptions);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/Opportunities/IEXOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/Opportunities/IEXOpportunityService.cs
new file mode 100644
index 0000000..eb9f7b7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/Opportunities/IEXOpportunityService.cs
@@ -0,0 +1,21 @@
+using ClosedXML.Excel;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration.Opportunities
+{
+    public interface IEXOpportunityService : IOpportunityService<EXOpportunity>
+    {
+        Task<EXOpportunity> GetById(Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<EXFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken);
+        Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, EXFilters filters, CancellationToken cancellationToken);
+        Task<EXOpportunity> CreateAsync(EXOpportunity opportunity, string userName, CancellationToken cancellationToken);
+        Task<EXOpportunity> UpdateAsync(EXOpportunity opportunity, CancellationToken cancellationToken);
+        Task<bool> DeleteAsync(Guid opportunityGuid, CancellationToken cancellationToken);
+        Task CheckWorkbook(Guid opportunityGuid, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Exploration/WorkbookService.cs b/src/Strata.ContinuousImprovement.Biz/Exploration/WorkbookService.cs
new file mode 100644
index 0000000..41a904c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Exploration/WorkbookService.cs
@@ -0,0 +1,83 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.Analytics.Client;
+using Strata.Analytics.Models.Utils;
+using Strata.Analytics.Models.Workbooks;
+using Strata.ApiCommunication.Http.Exceptions;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Security;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Exploration
+{
+    public class WorkbookService : IWorkbookService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly IAnalyticsService _analyticsService;
+        private readonly ISimpleSecurityService _simpleSecurityService;
+        private readonly ILogger<WorkbookService> _logger;
+
+        public WorkbookService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            IAnalyticsService analyticsService,
+            ISimpleSecurityService simpleSecurityService,
+            ILogger<WorkbookService> logger)
+        {
+            _dbContextFactory = dbContextFactory;
+            _analyticsService = analyticsService;
+            _simpleSecurityService = simpleSecurityService;
+            _logger = logger;
+        }
+
+        public async Task<bool> CheckHasValidWorkbookAsync(int workbookId, CancellationToken cancellationToken)
+        {
+            if (workbookId == 0) return false;
+            try
+            {
+                var workbook = await _analyticsService.GetWorkbookAsync(workbookId, cancellationToken);
+                return true;
+            }
+            catch (StrataHttpException ex) //GetWorkbookAsync throws a NotFound if the workbook doesn't exist
+            {
+                if (ex.StatusCode == System.Net.HttpStatusCode.NotFound) return false;
+                return true;
+            }
+            catch
+            {
+                //We don't want to create another workbook if we catch any other type of exception
+                return true;
+            }
+        }
+
+        public async Task<int> CreateDefaultWorkbook(string workbookName, CancellationToken cancellationToken)
+        {
+            var workbookCreateInfo = new WorkbookCreateInfo() { Name = workbookName };
+            var workbook = await _analyticsService.CreateWorkbookAsync(workbookCreateInfo, cancellationToken);
+            var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            var roleAssignment = await GetDefaultCIUserRoleAssignmentsAsync(dbContext, cancellationToken);
+            await _analyticsService.SaveRoleAssignmentsAsync(workbook.WorkbookId, roleAssignment, cancellationToken);
+            return workbook.WorkbookId;
+        }
+
+        public async Task<Batch<WorkbookRoleAssignmentSaveInfo, Guid>> GetDefaultCIUserRoleAssignmentsAsync(JazzDbContext dbContext, CancellationToken cancellationToken)
+        {
+            var defaults = await _simpleSecurityService.GetSimplePermissionDefaults(SecurableEntityType.Opportunity, cancellationToken);
+            var roleAssignment = new Batch<WorkbookRoleAssignmentSaveInfo, Guid>
+            {
+                Updates = defaults.Select(dflt =>
+                    new WorkbookRoleAssignmentSaveInfo
+                    {
+                        IdentityGuid = dflt.IdentityGUID,
+                        IdentityName = dflt.IdentityName,
+                        IdentityType = Analytics.Models.Security.IdentityType.UserGroup,
+                        Role = dflt.WriteValue ? WorkbookRole.Editor : WorkbookRole.Viewer
+                    })
+            };
+            return roleAssignment;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Export/ColumnOptions.cs b/src/Strata.ContinuousImprovement.Biz/Export/ColumnOptions.cs
new file mode 100644
index 0000000..c087f2a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Export/ColumnOptions.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Export
+{
+    public class ColumnOptions
+    {
+        public string Column { get; set; }
+        public string Format { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Export/ExportOptions.cs b/src/Strata.ContinuousImprovement.Biz/Export/ExportOptions.cs
new file mode 100644
index 0000000..da26052
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Export/ExportOptions.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Export
+{
+    public class ExportOptions
+    {
+        public string DefaultWorksheetName { get; set; }
+        public string EmptyMessage { get; set; }
+
+        public IList<ColumnOptions> ColumnOptions { get; set; }
+
+        public ExportOptions()
+        {
+            DefaultWorksheetName = "Sheet1";
+            EmptyMessage = "No Data Available";
+            ColumnOptions = new List<ColumnOptions>();
+        }
+
+        public void AddColumnOptions(string column, string format)
+        {
+            this.ColumnOptions.Add(new ColumnOptions() { Column = column, Format = format });
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Export/ExportUtils.cs b/src/Strata.ContinuousImprovement.Biz/Export/ExportUtils.cs
new file mode 100644
index 0000000..d4f16b2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Export/ExportUtils.cs
@@ -0,0 +1,327 @@
+using ClosedXML.Excel;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Export
+{
+    [ExcludeFromCodeCoverage]
+    public static class ExportUtils
+    {
+        /// <summary>
+        /// 0   General
+        ///1   0
+        ///2   0.00
+        ///3   #,##0
+        ///4   #,##0.00
+        ///9   0%
+        ///10  0.00%
+        ///11  0.00E+00
+        ///12  # ?/?
+        ///13  # ??/??
+        ///14  d/m/yyyy
+        ///15  d-mmm-yy
+        ///16  d-mmm
+        ///17  mmm-yy
+        ///18  h:mm tt
+        ///19  h:mm:ss tt
+        ///20  H:mm
+        ///21  H:mm:ss
+        ///22  m/d/yyyy H:mm
+        ///37  #,##0 ;(#,##0)
+        ///38  #,##0 ;[Red](#,##0)
+        ///39  #,##0.00;(#,##0.00)
+        ///40  #,##0.00;[Red](#,##0.00)
+        ///45  mm:ss
+        ///46  [h]:mm:ss
+        ///47  mmss.0
+        ///48  ##0.0E+0
+        ///49  @
+        /// </summary>
+        internal enum NumberFormatId
+        {
+            General,
+            Zero,
+            ZeroDotZeroZero,
+            PoundCommaPoundPoundZero,
+            PoundCommaPoundPoundZeroDotZeroZero,
+            ZeroPercent = 9,
+            ZeroDotZeroZeroPercent = 10,
+            ScientificNotation = 11,
+            PoundSpaceQuestionSlashQuestion = 12,
+            PoundSpaceQuestionQuestionSlashQuestionQuestion = 13,
+            ShortDateSlash = 14,
+            ShortDateDash = 15,
+            DDashMMM = 16,
+            MMMDashYY = 17,
+            ShortTime = 18,
+            ShortTimeSeconds = 19,
+            ShortTime24 = 20,
+            ShortTimeSeconds24 = 21,
+            ShortDateTime = 22,
+            PoundCommaPoundPoundZeroNegative = 37,
+            PoundCommaPoundPoundZeroRedNegative = 38,
+            PoundCommaPoundPoundZeroDotZeroZeroNegative = 39,
+            PoundCommaPoundPoundZeroDotZeroZeroRedNegative = 40,
+            MinutesSeconds = 45,
+            HoursOptionalMinutesSeconds = 46,
+            MinutesSecondsMilliseconds = 47,
+            PoundPoundScientificNotation = 48,
+            HideZeroValues = 49
+        }
+
+        internal static Dictionary<string, int> NumberFormatDictionary => new Dictionary<string, int>()
+        {
+            {"General", 0},
+            {"0", 1},
+            {"Accounting",1},
+            {"0.00", 2},
+            {"Accounting2Dec", 2},
+            {"#,##0", 3},
+            {"Currency",3},
+            {"#,##0.00", 4},
+            {"Currency2Dec", 4},
+            {"0%", 9},
+            {"ZeroPercent", 9},
+            {"0.00%", 10},
+            {"ZeroPerentWithDecimals", 10},
+            {"0.00E+00", 11},
+            {"Scientific", 11},
+            {"# ?/?", 12},
+            {"Fractions", 12},
+            {"# ??/??", 13},
+            {"mm-dd-yy", 14},
+            {"ShortDateSlash", 14},
+            {"d-mmm-yy", 15},
+            {"ShortDateDash", 15},
+            {"d-mmm", 16},
+            {"DDashMMM", 16},
+            {"mmm-yy", 17},
+            {"MMMDashYY", 17},
+            {"h:mm AM/PM", 18},
+            {"ShortTime", 18},
+            {"h:mm:ss AM/PM", 19},
+            {"ShortTimeSeconds",19},
+            {"h:mm", 20},
+            {"ShortTime24", 20},
+            {"h:mm:ss", 21},
+            {"ShortTimeSeconds24",21},
+            {"m/d/yy h:mm", 22},
+            {"ShortDateTime",22},
+            {"#,##0 ;(#,##0)", 37},
+            {"NoLeadingZeroNegative",37},
+            {"#,##0 ;[Red](#,##0)", 38},
+            {"NoLeadingZeroRedNegative",38},
+            {"#,##0.00;(#,##0.00)", 39},
+            {"NoLeadingZeroDecimalsNegative",39},
+            {"#,##0.00;[Red](#,##0.00)", 40},
+            {"NoLeadingZeroDecimalsRedNegative",40},
+            {"mm:ss", 45},
+            {"MinutesSeconds", 45},
+            {"[h]:mm:ss", 46},
+            {"HoursOptionalMinutesSeconds",46},
+            {"mmss.0", 47},
+            {"MinutesSecondsMilliseconds", 47},
+            {"##0.0E+0", 48},
+            {"ScientificNotation",48},
+            {"@", 49},
+            {"HideZeroValues", 49}
+        };
+
+        public static string ExcelCurrencyFormatWithDecimals
+        {
+            get
+            {
+                var currencySymbol = CultureInfo.CurrentCulture.NumberFormat.CurrencySymbol;
+                return $@"{currencySymbol}#,##0.00_);({currencySymbol}#,##0.00)";
+            }
+        }
+
+        public static string ExcelCurrencyFormatWithoutDecimals
+        {
+            get
+            {
+                var currencySymbol = CultureInfo.CurrentCulture.NumberFormat.CurrencySymbol;
+                return $@"{currencySymbol}#,##0;({currencySymbol}#,##0)";
+            }
+        }
+
+        public static string CellName(this IXLWorksheet ws, int row, int col) => ws.Cell(row, col).Address.ToString();
+
+        public static IXLWorksheet WriteFormField(this IXLWorksheet ws, int row, int col, string label, string value)
+        {
+            ws.Cell(row, col).Value = $"{label}:";
+            ws.Cell(row, col + 1).Value = value;
+            return ws;
+        }
+
+        public static IXLWorksheet WriteSheetTitle(this IXLWorksheet ws, int row, int col, int offset, string title)
+        {
+            var cellRow = ws.Row(row);
+            cellRow.Height = 30;
+            var cells = ws.Range(row, col, row, offset);
+            cells.Merge();
+            cells.Style.Font.Bold = true;
+            cells.Style.Font.FontColor = XLColor.FromArgb(31, 73, 125);
+            cells.Style.Font.FontSize = 18;
+            cells.Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
+            cells.Value = title;
+            return ws;
+        }
+
+        public static IXLWorksheet WriteSheetSubTitle(this IXLWorksheet ws, int row, int col, int offset, string subtitle)
+        {
+            var cells = ws.Range(row, col, row, offset);
+            cells.Merge();
+            cells.Style.Font.Italic = true;
+            cells.Style.Font.FontColor = XLColor.FromArgb(237, 125, 49);
+            cells.Value = subtitle;
+            return ws;
+        }
+
+        public static IXLWorksheet WriteHeader(this IXLWorksheet ws, int row, int col, int offset, string label)
+        {
+            var cells = ws.Range(row, col, row, offset);
+            cells.Merge();
+            cells.Style.Font.Bold = true;
+            cells.Style.Font.FontColor = XLColor.FromArgb(31, 73, 125);
+            cells.Style.Font.FontSize = 16;
+            cells.Style.Border.BottomBorder = XLBorderStyleValues.Medium;
+            cells.Style.Border.BottomBorderColor = XLColor.FromArgb(148, 179, 215);
+            cells.Value = label;
+            return ws;
+        }
+
+        public static IXLWorksheet WriteCellValue(this IXLWorksheet ws, int row, int col, object value)
+        {
+            var cell = ws.Cell(row, col);
+            cell.Value = value;
+            return ws;
+        }
+
+        internal static IXLWorksheet WriteHeading(this IXLWorksheet ws, int row, int col, string value)
+        {
+            var cell = ws.Cell(row, col);
+            cell.Style.Font.Bold = true;
+            cell.Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
+            cell.Value = value;
+            return ws;
+        }
+
+        public static IXLWorksheet CreateTitlePage(this XLWorkbook wb, string title, string subTitle)
+        {
+            var ws = wb.AddWorksheet(title);
+            ws.WriteSheetTitle(1, 1, 8, title)
+                .WriteHeader(3, 1, 8, subTitle)
+                .WriteFormField(5, 1, "Report Date", DateTime.Today.ToString("g"));
+            ws.Columns().AdjustToContents();
+            return ws;
+        }
+
+        public static IXLWorksheet CreateWorksheet(this XLWorkbook wb, DataTable items, string worksheetName, int headerRow = 1)
+        {
+            wb.AddWorksheet(worksheetName);
+            var ws = wb.Worksheet(worksheetName);
+            var table = ws.Cell(headerRow, 1).InsertTable(items);
+            var columns = table.ColumnsUsed().Select(t => t.ColumnNumber());
+            foreach (var colNo in columns)
+            {
+                var heading = (string)ws.Cell(headerRow, colNo).Value;
+                ws.Cell(headerRow, colNo).Value = heading.SplitCamelCase();
+            }
+            ws.Columns().AdjustToContents();
+            return ws;
+        }
+
+        public static IXLWorksheet CreateWorksheet<T>(this XLWorkbook wb, IEnumerable<T> items, string worksheetName)
+        {
+            wb.AddWorksheet(worksheetName);
+            var ws = wb.Worksheet(worksheetName);
+            var table = ws.Cell(1, 1).InsertTable(items);
+            var columns = table.ColumnsUsed().Select(t => t.ColumnNumber());
+            foreach (var colNo in columns)
+            {
+                var heading = (string)ws.Cell(1, colNo).Value;
+                ws.Cell(1, colNo).Value = heading.SplitCamelCase();
+            }
+            ws.Columns().AdjustToContents();
+            return ws;
+        }
+
+        public static XLWorkbook CreateExcelWorkbook(DataTable data, ExportOptions options, int headerRow = 1)
+        {
+            if (data.Rows.Count == 0)
+            {
+                return GetEmptyWorkbook(options);
+            }
+
+            // load data into worksheet
+            var workbook = new XLWorkbook();
+            var ws = workbook.CreateWorksheet(data, options.DefaultWorksheetName, headerRow);
+
+            // format columns
+            foreach (var columnOption in options.ColumnOptions)
+            {
+                ws.SetColumnFormatByHeader(columnOption.Column, columnOption.Format);
+            }
+
+            return workbook;
+        }
+
+        public static XLWorkbook CreateExcelWorkbook(IEnumerable<object> data, ExportOptions options)
+        {
+            if (data is null || !data.Any())
+            {
+                return GetEmptyWorkbook(options);
+            }
+
+            // load data into worksheet
+            var workbook = new XLWorkbook();
+            var ws = workbook.CreateWorksheet(data, options.DefaultWorksheetName);
+
+            // format columns
+            foreach (var columnOption in options.ColumnOptions)
+            {
+                ws.SetColumnFormatByHeader(columnOption.Column, columnOption.Format);
+            }
+
+            return workbook;
+        }
+        private static XLWorkbook GetEmptyWorkbook(ExportOptions options)
+        {
+            var workbook = new XLWorkbook();
+            var ws = workbook.AddWorksheet(options.DefaultWorksheetName);
+            ws.Cell(1, 1).Value = options.EmptyMessage;
+            return workbook;
+        }
+
+        internal static IXLCell CellByHeader(this IXLWorksheet ws, string columnHeader)
+        {
+            return ws.Tables.First().HeadersRow().CellsUsed(c => c.Value.ToString() == columnHeader).FirstOrDefault();
+        }
+
+        internal static IXLColumn ColumnByHeader(this IXLWorksheet ws, string columnHeader)
+        {
+            return ws.Tables.FirstOrDefault()?.HeadersRow()
+                .CellsUsed(c => c.Value.ToString() == columnHeader).FirstOrDefault()?.WorksheetColumn();
+        }
+
+        internal static void SetColumnFormatByHeader(this IXLWorksheet ws, string columnHeader, string formatName)
+        {
+            var column = ws.ColumnByHeader(columnHeader);
+            if (column == null) throw new ArgumentOutOfRangeException(nameof(columnHeader));
+            if (NumberFormatDictionary.TryGetValue(formatName, out var formatId))
+            {
+                column.Style.NumberFormat.NumberFormatId = formatId;
+            }
+            else
+            {
+                column.Style.NumberFormat.Format = formatName;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/CostComponentRollup.cs b/src/Strata.ContinuousImprovement.Biz/Filter/CostComponentRollup.cs
new file mode 100644
index 0000000..329a986
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/CostComponentRollup.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Filter
+{
+    [Table("CostComponentRollup", Schema = "dss")]
+    public class CostComponentRollup
+    {
+        [Key]
+        public Guid CostComponentRollupGUID { get; set; }
+        public string Name { get; set; }
+        public ICollection<DimCostComponent> CostComponents { get; set; } = new List<DimCostComponent>();
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/DimCostComponent.cs b/src/Strata.ContinuousImprovement.Biz/Filter/DimCostComponent.cs
new file mode 100644
index 0000000..2b119a6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/DimCostComponent.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Filter
+{
+    [Table("DimCostComponent", Schema = "dss")]
+    public class DimCostComponent
+    {
+        [Key]
+        public int CostComponentID { get; set; }
+        public string Name { get; set; }
+        public CostComponentRollup CostComponentRollup { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/Expressions/ConfigurationGuidFilter.cs b/src/Strata.ContinuousImprovement.Biz/Filter/Expressions/ConfigurationGuidFilter.cs
new file mode 100644
index 0000000..21a0077
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/Expressions/ConfigurationGuidFilter.cs
@@ -0,0 +1,15 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.Filter.Expressions
+{
+    internal static class ConfigurationGuidFilter
+    {
+        public static void AddConfigurationGuidFilter<T>(this IList<Expression<Func<T, bool>>> filters, Guid ConfigurationGuid) where T:IWithConfigurationGuid
+        {
+            filters.Add(m => m.ConfigurationGuid.Equals(ConfigurationGuid));
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/Expressions/IdentifiedSavingsTotalFilter.cs b/src/Strata.ContinuousImprovement.Biz/Filter/Expressions/IdentifiedSavingsTotalFilter.cs
new file mode 100644
index 0000000..66c94d5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/Expressions/IdentifiedSavingsTotalFilter.cs
@@ -0,0 +1,16 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.Filter.Expressions
+{
+    internal static class IdentifiedSavingsTotalFilter
+    {
+        public static void AddIdentifiedSavingsTotalFilter<T>(this IList<Expression<Func<T, bool>>> filters, double? identifiedSavingsTotal) where T : IWithIdentifiedSavingsTotal
+        {
+            if (identifiedSavingsTotal is not null)
+                filters.Add(m => m.IdentifiedSavingsTotal >= identifiedSavingsTotal);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/FilterListItem.cs b/src/Strata.ContinuousImprovement.Biz/Filter/FilterListItem.cs
new file mode 100644
index 0000000..c8c90dd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/FilterListItem.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Filter
+{
+    public class FilterListItem
+    {
+        public string Key { get; set; }
+        public string Title { get; set; }
+        public IEnumerable<FilterListItem> Children { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/FilterMember.cs b/src/Strata.ContinuousImprovement.Biz/Filter/FilterMember.cs
new file mode 100644
index 0000000..94f80f8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/FilterMember.cs
@@ -0,0 +1,8 @@
+namespace Strata.ContinuousImprovement.Biz.Filter
+{
+    public class FilterMember
+    {
+        public string Id { get; set; }
+        public string Text { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/FilterService.cs b/src/Strata.ContinuousImprovement.Biz/Filter/FilterService.cs
new file mode 100644
index 0000000..c1ebdde
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/FilterService.cs
@@ -0,0 +1,112 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.ChargeCode;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using Strata.StrataSphereCompare.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Filter
+{
+    public class FilterService : IFilterService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly ILogger<ChargeCodeService> _logger;
+        private readonly IStrataSphereCompareService _strataSphereCompareService;
+
+        /// <summary>
+        /// SPH Column Keys we can fetch from API to get filter values
+        /// </summary>
+        private static readonly HashSet<ChipKey> SupportedSphChipKeys = new()
+        {
+            ChipKey.SPHAdmitType,
+            ChipKey.SPHDischargeStatus,
+            ChipKey.SPHPatientType,
+            ChipKey.SPHGender,
+            ChipKey.SPHAgeRollup
+        };
+
+        public FilterService(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            ILogger<ChargeCodeService> logger,
+            IStrataSphereCompareService strataSphereCompareService)
+        {
+            _dbContextFactory = dbContextFactory;
+            _logger = logger;
+            _strataSphereCompareService = strataSphereCompareService;
+        }
+
+        private async Task<JazzDbContext> GetDbContextAsync(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<List<FilterListItem>> GetSupplyList(CancellationToken cancellationToken)
+        {
+            try
+            {
+                var dbContext = await GetDbContextAsync(cancellationToken);
+                return await dbContext.DimSupply.Select(supply => new FilterListItem { Key = supply.SupplyID.ToString(), Title = supply.Name }).ToListAsync(cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+            }
+
+            return new List<FilterListItem>();
+        }
+
+        public async Task<List<FilterListItem>> GetCostComponentList(CancellationToken cancellationToken)
+        {
+            try
+            {
+                var dbContext = await GetDbContextAsync(cancellationToken);
+
+
+                var result = await dbContext.CostComponentRollups.GroupBy(a => a.Name).Select(group => new FilterListItem()
+                {
+                    Key = group.Key,
+                    Children = group.SelectMany(a => a.CostComponents).Select(c => new FilterListItem() { Key = @$"{group.Key}|{c.Name}", Title = c.Name }).ToList()
+                }).ToListAsync(cancellationToken);
+
+
+                result.ForEach(item =>
+                {
+                    item.Title = $"{item.Key} ({item.Children.DistinctBy(x => x.Title).Count()})";
+                    item.Children = item.Children.DistinctBy(x => x.Title);
+                });
+
+                return result.Where(x => x.Children.Any()).ToList();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+            }
+
+            return new List<FilterListItem>();
+        }
+
+        public async Task<List<FilterListItem>> GetSphCriteriaList(ChipKey chipKey, CancellationToken cancellationToken)
+        {
+            ValidateIsSupportedSphKey(chipKey);
+            var sphColumnName = chipKey.ToString();
+            var values = await _strataSphereCompareService.GetDistinctFilterValuesAsync(sphColumnName, cancellationToken);
+            return values.Where(x => !string.IsNullOrEmpty(x))
+                .Select(type => new FilterListItem { Key = type, Title = type }).OrderBy(x => x.Key).ToList();
+        }
+
+        private static void ValidateIsSupportedSphKey(ChipKey chipKey)
+        {
+            if (!SupportedSphChipKeys.Contains(chipKey))
+            {
+                throw new ArgumentException($"Unsupported SPH chip key '{chipKey}'.", nameof(chipKey));
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/FiltersOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Filter/FiltersOpportunity.cs
new file mode 100644
index 0000000..0891bb8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/FiltersOpportunity.cs
@@ -0,0 +1,44 @@
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter.Expressions;
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.Filter
+{
+    public class FiltersOpportunity<T> : IFiltersOpportunity<T> where T : IOpportunity
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public int? IdentifiedSavings { get; set; }
+        public bool? ViewVisible { get; set; }
+        public bool ExcludeInitiatives { get; set; }
+        public string OpportunitySearch { get; set; }
+
+        public FiltersOpportunity()
+        {
+            ConfigurationGuid = Guid.Empty;
+            IdentifiedSavings = null;
+            ViewVisible = null;
+            ExcludeInitiatives = false;
+            OpportunitySearch = "";
+        }
+
+        public virtual IEnumerable<Expression<Func<T, bool>>> GetFilters(JazzDbContext context)
+        {
+            var filters = new List<Expression<Func<T, bool>>>();
+
+            filters.AddConfigurationGuidFilter(ConfigurationGuid);
+
+            if (ViewVisible.HasValue)
+                filters.Add(m => ViewVisible.Value.Equals(!(m).IsHidden));
+
+            if (IdentifiedSavings is not null)
+                filters.Add(m => Math.Round(m.IdentifiedSavings) >= IdentifiedSavings);
+            if (ExcludeInitiatives)
+                filters.Add(m => (m).InitiativeGuid.Equals(Guid.Empty));
+
+            return filters;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/IFilterService.cs b/src/Strata.ContinuousImprovement.Biz/Filter/IFilterService.cs
new file mode 100644
index 0000000..8e07d07
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/IFilterService.cs
@@ -0,0 +1,14 @@
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Filter
+{
+    public interface IFilterService
+    {
+        Task<List<FilterListItem>> GetSupplyList(CancellationToken cancellationToken);
+        Task<List<FilterListItem>> GetCostComponentList(CancellationToken cancellationToken);
+        Task<List<FilterListItem>> GetSphCriteriaList(ChipKey chipKey, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/IFilters.cs b/src/Strata.ContinuousImprovement.Biz/Filter/IFilters.cs
new file mode 100644
index 0000000..81425a3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/IFilters.cs
@@ -0,0 +1,15 @@
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Filter
+{
+    public interface IFilters<T>
+    {
+        IEnumerable<Expression<Func<T, bool>>> GetFilters(JazzDbContext context);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/IFiltersOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Filter/IFiltersOpportunity.cs
new file mode 100644
index 0000000..6cb7334
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/IFiltersOpportunity.cs
@@ -0,0 +1,14 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Filter
+{
+    public interface IFiltersOpportunity<T> : IFilters<T> where T : IOpportunity
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public int? IdentifiedSavings { get; set; }
+        bool? ViewVisible { get; set; }
+        bool ExcludeInitiatives { get; set; }
+        string OpportunitySearch { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/IFiltersSummary.cs b/src/Strata.ContinuousImprovement.Biz/Filter/IFiltersSummary.cs
new file mode 100644
index 0000000..1f28134
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/IFiltersSummary.cs
@@ -0,0 +1,16 @@
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.Filter
+{
+    public interface IFiltersSummary
+    {
+        public bool ExportFiltered { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public int? IdentifiedSavings { get; set; }
+
+        IEnumerable<Expression<Func<TClass, bool>>> GetOpportunitiesWithCustomExpressions<TClass>(JazzDbContext context) where TClass : class;
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Filter/SeasonalityType.cs b/src/Strata.ContinuousImprovement.Biz/Filter/SeasonalityType.cs
new file mode 100644
index 0000000..3d65417
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Filter/SeasonalityType.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.Filter
+{
+    public enum SeasonalityType
+    {
+        WithAndWithout = -1,
+        Without = 0,
+        With = 1
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FiscalMonths/FiscalMonth.cs b/src/Strata.ContinuousImprovement.Biz/FiscalMonths/FiscalMonth.cs
new file mode 100644
index 0000000..1021c6a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FiscalMonths/FiscalMonth.cs
@@ -0,0 +1,44 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.FiscalMonths
+{
+    [Table("DimFiscalMonth", Schema = "fw")]
+    public class FiscalMonth
+    {
+        [Key]
+        public Guid MemberGuid { get; set; }
+        public string Name { get; set; }
+        public byte FiscalMonthId { get; set; }
+        public string FiscalMonthCode { get; set; }
+        public byte SortOrder { get; set; }
+        public int DaysInMonth { get; set; }
+        public int YtdDaysInMonth { get; set; }
+        public int DaysInLeapYearMonth { get; set; }
+        public int YtdDaysInLeapYearMonth { get; set; }
+        public string MonthColumnName { get; set; }
+        public string Abbreviation { get; set; }
+        public bool IsReal { get; set; }
+
+        public FiscalMonth(Guid memberGUID, byte fiscalMonthID, byte sortOrder, string fiscalMonthCode, string name, string abbreviation, int daysInMonth, int yTDDaysInMonth, string monthColumnName, int daysInLeapYearMonth, int yTDDaysInLeapYearMonth)
+        {
+
+            MemberGuid = memberGUID;
+            FiscalMonthId = fiscalMonthID;
+            SortOrder = sortOrder;
+            FiscalMonthCode = fiscalMonthCode;
+            Name = name;
+            Abbreviation = abbreviation;
+            DaysInMonth = daysInMonth;
+            YtdDaysInMonth = yTDDaysInMonth;
+            MonthColumnName = monthColumnName;
+            DaysInLeapYearMonth = daysInLeapYearMonth;
+            YtdDaysInLeapYearMonth = yTDDaysInLeapYearMonth;
+        }
+
+        public FiscalMonth()
+        {
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FiscalMonths/FiscalMonthExtensions.cs b/src/Strata.ContinuousImprovement.Biz/FiscalMonths/FiscalMonthExtensions.cs
new file mode 100644
index 0000000..744ab7c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FiscalMonths/FiscalMonthExtensions.cs
@@ -0,0 +1,30 @@
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.FiscalMonths
+{
+    internal static class FiscalMonthExtensions
+    {
+        internal static Dictionary<byte, short> GetFiscalMonthDictionary(this IEnumerable<FiscalMonth> fiscalMonths, DateTime orgDefinedEndDate)
+        {
+            var lastFiscalMonth = fiscalMonths.First(fm => fm.SortOrder == 12);
+            var endDate = orgDefinedEndDate;
+            var startDate = endDate.GetStartOrEndDateOfYearPeriod(-1);
+            var yearMonthDictionary = new Dictionary<byte, short>();
+
+            while (startDate <= endDate)
+            {
+                var fiscalYearID = startDate.Month <= lastFiscalMonth.FiscalMonthId
+                ? startDate.Year
+                : startDate.Year + 1;
+
+                yearMonthDictionary.Add(fiscalMonths.First(fm => fm.FiscalMonthId == (byte)startDate.Month).FiscalMonthId, (short)fiscalYearID);
+                startDate = startDate.AddMonths(1);
+            }
+
+            return yearMonthDictionary;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FiscalMonths/FiscalMonthResolver.cs b/src/Strata.ContinuousImprovement.Biz/FiscalMonths/FiscalMonthResolver.cs
new file mode 100644
index 0000000..56e61e8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FiscalMonths/FiscalMonthResolver.cs
@@ -0,0 +1,152 @@
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Schema.Client;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.FiscalMonths
+{
+    /// <summary>
+    /// This is just a starting point for this
+    /// </summary>
+    public class FiscalMonthResolver : IFiscalMonthResolver
+    {
+        private readonly ISchemaServiceClient _schemaServiceClient;
+        private readonly ReadOnlyCollection<FiscalMonth> _fiscalMonthsBySortOrder;
+        private readonly ReadOnlyCollection<FiscalMonth> _fiscalMonthsByMonthId;
+        private readonly ILogger<FiscalMonthResolver> _logger;
+
+        public FiscalMonthResolver(ISchemaServiceClient schemaServiceClient, ILogger<FiscalMonthResolver> logger)
+        {
+            _logger = logger;
+            _schemaServiceClient = schemaServiceClient;
+
+            var task = Task.Run(async () => await GetFiscalMonthsAsync().ConfigureAwait(false));
+            try
+            {
+                var result = task.Result;
+                if (result == null || !result.Any()) return;
+                var fiscalMonths = result.Where(fm => fm.IsReal).ToList();
+                _fiscalMonthsBySortOrder = new ReadOnlyCollection<FiscalMonth>(fiscalMonths);
+                _fiscalMonthsByMonthId = new ReadOnlyCollection<FiscalMonth>(_fiscalMonthsBySortOrder.OrderBy(p => p.FiscalMonthId).ToList());
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+            }
+        }
+
+        public async Task<Dictionary<byte, short>> FiscalMonthDictionary(DateTime date)
+        {
+            var fiscalMonths = await GetFiscalMonthsAsync();
+            return fiscalMonths.GetFiscalMonthDictionary(date);
+        }
+
+        public FiscalMonth FirstFiscalMonth()
+            => GetByFiscalMonthSortOrder(1);
+
+        public FiscalMonth LastFiscalMonth()
+                => GetByFiscalMonthSortOrder(12);
+
+        public FiscalMonth GetByFiscalMonthId(int fiscalMonthId)
+        {
+            if (fiscalMonthId < 1 || fiscalMonthId > 12)
+            {
+                throw new ArgumentOutOfRangeException("fiscalMonthId");
+            }
+
+            return _fiscalMonthsByMonthId[fiscalMonthId - 1];
+        }
+
+        public FiscalMonth GetNextFiscalMonth(int currFiscalMonthId)
+        {
+            if (currFiscalMonthId < 1 || currFiscalMonthId > 12)
+            {
+                throw new ArgumentOutOfRangeException("currFiscalMonthId");
+            }
+
+            return GetFiscalMonthByDifference(currFiscalMonthId, 1);
+        }
+
+        public FiscalMonth GetPriorFiscalMonth(int currFiscalMonthId)
+        {
+            if (currFiscalMonthId < 1 || currFiscalMonthId > 12)
+            {
+                throw new ArgumentOutOfRangeException("currFiscalMonthId");
+            }
+
+            return GetFiscalMonthByDifference(currFiscalMonthId, -1);
+        }
+
+        public int GetDifferenceBetweenFiscalMonths(int origMonthID, int newMonthID)
+        {
+            if (origMonthID == newMonthID)
+            {
+                return 0;
+            }
+            else if (origMonthID < newMonthID)
+            {
+                return newMonthID - origMonthID;
+            }
+            else
+            {
+                return -1 * (origMonthID - newMonthID);
+            }
+        }
+
+        public FiscalMonth GetFiscalMonthByDifference(int currFiscalMonthId, int monthDifference)
+        {
+            if (currFiscalMonthId < 1 || currFiscalMonthId > 12)
+            {
+                throw new ArgumentOutOfRangeException("currFiscalMonthId");
+            }
+            var nextFiscalMonthId = currFiscalMonthId + monthDifference;
+            if (nextFiscalMonthId < 1)
+            {
+                nextFiscalMonthId = 12 + nextFiscalMonthId;
+            }
+            else if (nextFiscalMonthId > 12)
+            {
+                nextFiscalMonthId = nextFiscalMonthId - 12;
+            }
+
+            return _fiscalMonthsByMonthId[nextFiscalMonthId - 1];
+        }
+
+        public FiscalMonth GetByFiscalMonthSortOrder(int sortOrder)
+        {
+            if (sortOrder < 1 || sortOrder > 12)
+            {
+                throw new ArgumentOutOfRangeException("sortOrder");
+            }
+
+            return _fiscalMonthsBySortOrder?[sortOrder - 1] ?? default(FiscalMonth);
+        }
+
+        public ReadOnlyCollection<FiscalMonth> AllFiscalMonths
+        {
+            get { return _fiscalMonthsBySortOrder; }
+        }
+
+        private async Task<IEnumerable<FiscalMonth>> GetFiscalMonthsAsync()
+        {
+            var fiscalMonths = Enumerable.Empty<FiscalMonth>();
+            try
+            {
+                var fiscalMonthDimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync("Fiscal Month")
+                    ?? throw new ArgumentException("Fiscal Month dimension not found on client.");
+                fiscalMonths = await _schemaServiceClient.GetDimensionMembersByDimensionGuidAsync<FiscalMonth>(fiscalMonthDimension.DimensionGuid);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+            }
+            return fiscalMonths.OrderBy(fm => fm.SortOrder).ToList();
+        }
+
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FiscalMonths/IFiscalMonthResolver.cs b/src/Strata.ContinuousImprovement.Biz/FiscalMonths/IFiscalMonthResolver.cs
new file mode 100644
index 0000000..4c6ba53
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FiscalMonths/IFiscalMonthResolver.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.FiscalMonths
+{
+    public interface IFiscalMonthResolver
+    {
+        Task<Dictionary<byte, short>> FiscalMonthDictionary(DateTime date);
+        FiscalMonth FirstFiscalMonth();
+        FiscalMonth LastFiscalMonth();
+        FiscalMonth GetByFiscalMonthId(int fiscalMonthId);
+        ReadOnlyCollection<FiscalMonth> AllFiscalMonths { get; }
+
+        FiscalMonth GetByFiscalMonthSortOrder(int sortOrder);
+        int GetDifferenceBetweenFiscalMonths(int origMonthID, int newMonthID);
+        FiscalMonth GetFiscalMonthByDifference(int currFiscalMonthId, int monthDifference);
+        FiscalMonth GetNextFiscalMonth(int currFiscalMonthId);
+        FiscalMonth GetPriorFiscalMonth(int currFiscalMonthId);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/FiscalMonths/TrackingMonth.cs b/src/Strata.ContinuousImprovement.Biz/FiscalMonths/TrackingMonth.cs
new file mode 100644
index 0000000..1be1a2c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FiscalMonths/TrackingMonth.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.FiscalMonths
+{
+    public class TrackingMonth
+    {
+        public string Abbreviation { get; set; }
+        public bool IsAfterEffectiveDate { get; set; }
+        public readonly bool IsBeforeTrackingDate;
+        public readonly bool IsCurrentMonth;
+
+        public TrackingMonth(string abbreviation, bool isAfterEffectiveDate, bool isBeforeTrackingDate, bool isCurrentMonth)
+        {
+            Abbreviation = abbreviation;
+            IsAfterEffectiveDate = isAfterEffectiveDate;
+            IsBeforeTrackingDate = isBeforeTrackingDate;
+            IsCurrentMonth = isCurrentMonth;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FFFInitiativeTrackingData.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FFFInitiativeTrackingData.cs
new file mode 100644
index 0000000..185360e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FFFInitiativeTrackingData.cs
@@ -0,0 +1,60 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Initiatives
+{
+    [Table("FinancialFreeFormInitiativeTrackingData", Schema = "cci")]
+    public class FFFInitiativeTrackingData
+    {
+        [Key]
+        public Guid InitiativeGUID { get; set; }
+        [Precision(15, 4)]
+        public decimal Month01Actual { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month02Actual { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month03Actual { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month04Actual { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month05Actual { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month06Actual { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month07Actual { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month08Actual { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month09Actual { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month10Actual { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month11Actual { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month12Actual { get; set; } = 0;
+
+        public FFFInitiativeTrackingData(Guid initiativeGUID, decimal month01Actual, decimal month02Actual, decimal month03Actual, decimal month04Actual, decimal month05Actual, decimal month06Actual, decimal month07Actual, decimal month08Actual, decimal month09Actual, decimal month10Actual, decimal month11Actual, decimal month12Actual)
+        {
+            this.InitiativeGUID = initiativeGUID;
+            this.Month01Actual = month01Actual;
+            this.Month02Actual = month02Actual;
+            this.Month03Actual = month03Actual;
+            this.Month04Actual = month04Actual;
+            this.Month05Actual = month05Actual;
+            this.Month06Actual = month06Actual;
+            this.Month07Actual = month07Actual;
+            this.Month08Actual = month08Actual;
+            this.Month09Actual = month09Actual;
+            this.Month10Actual = month10Actual;
+            this.Month11Actual = month11Actual;
+            this.Month12Actual = month12Actual;
+        }
+
+        public FFFInitiativeTrackingData(Guid initiativeGUID)
+        {
+            InitiativeGUID = initiativeGUID;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FFInitiativeService.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FFInitiativeService.cs
new file mode 100644
index 0000000..d38b06e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FFInitiativeService.cs
@@ -0,0 +1,121 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Encounter.Initiatives;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Initiatives
+{
+    public class FFInitiativeService : IFFInitiativeService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly IInitiativeSavingsService _initiativeSavingsService;
+        private readonly IAuthorizationServiceClient _authorizationServiceClient;
+        private readonly IUpdateFactOpportunitySavingsService _updateFactOpportunitySavingsService;
+        private readonly ILogger<ENInitiativeService> _logger;
+
+        public FFInitiativeService(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            IInitiativeSavingsService initiativeSavingsService,
+            IAuthorizationServiceClient authorizationServiceClient,
+            IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            ILogger<ENInitiativeService> logger)
+        {
+            _dbContextFactory = dbContextFactory;
+            _initiativeSavingsService = initiativeSavingsService;
+            _authorizationServiceClient = authorizationServiceClient;
+            _updateFactOpportunitySavingsService = updateFactOpportunitySavingsService;
+            _logger = logger;
+        }
+
+        private async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<Guid> CreateInitiative(Guid dbGuid, Initiative initiative, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var opportunity = await dbContext.FFOpportunities.SingleOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+
+            if (opportunity == null) { return Guid.Empty; }
+            try
+            {
+                _initiativeSavingsService.ConfigureRampUps(dbContext, initiative, opportunity.ConfigurationGuid);
+
+                initiative.ConfigurationGUID = opportunity.ConfigurationGuid;
+                await dbContext.Initiatives.AddAsync(initiative, cancellationToken);
+                await dbContext.SaveChangesAsync(cancellationToken);
+
+                if (opportunity.MetricType == Opportunities.MetricType.Financial)
+                {
+                    await dbContext.FinancialFreeFormInitiativeTrackingData.AddAsync(new FFFInitiativeTrackingData(initiative.InitiativeGUID), cancellationToken);
+                }
+                else
+                {
+                    await dbContext.FreeFormInitiativeTrackingData.AddAsync(new FFInitiativeTrackingData(initiative.InitiativeGUID), cancellationToken);
+                }
+                await dbContext.SaveChangesAsync(cancellationToken);
+
+                await _authorizationServiceClient.AddPermissionsFromDefaultsAsync(initiative.InitiativeGUID, SecurableEntityType.Initiative, cancellationToken);
+                await _authorizationServiceClient.AddPermissionAsync(initiative.InitiativeGUID, initiative.OwnerGUID, true, false, false, cancellationToken);
+
+                opportunity.InitiativeGuid = initiative.InitiativeGUID;
+                await dbContext.SaveChangesAsync(cancellationToken);
+                await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+                return opportunity.InitiativeGuid;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInitiativeError(ex, dbContext, initiative.Name, opportunityGuid, initiative.InitiativeGUID);
+                return Guid.Empty;
+            }
+        }
+
+        public async Task<Initiative> UpdateAsync(Initiative updatedInitiative, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var opportunity = await dbContext.FFOpportunities
+                .SingleOrDefaultAsync(opp => opp.InitiativeGuid == updatedInitiative.InitiativeGUID);
+            var initiative = await dbContext.Initiatives
+                .SingleOrDefaultAsync(init => init.InitiativeGUID == updatedInitiative.InitiativeGUID, cancellationToken);
+            if (opportunity.MetricType == Opportunities.MetricType.Financial)
+            {
+                var finTrackingData = await dbContext.FinancialFreeFormInitiativeTrackingData
+                    .SingleOrDefaultAsync(opp => opp.InitiativeGUID == updatedInitiative.InitiativeGUID);
+                if (finTrackingData == null)
+                {
+                    await dbContext.FinancialFreeFormInitiativeTrackingData.AddAsync(new FFFInitiativeTrackingData(initiative.InitiativeGUID), cancellationToken);
+                }
+            }
+            else
+            {
+                var trackingData = await dbContext.FreeFormInitiativeTrackingData
+                    .SingleOrDefaultAsync(opp => opp.InitiativeGUID == updatedInitiative.InitiativeGUID);
+                if (trackingData == null)
+                {
+                    await dbContext.FreeFormInitiativeTrackingData.AddAsync(new FFInitiativeTrackingData(initiative.InitiativeGUID), cancellationToken);
+                }
+            }
+            initiative.Update(updatedInitiative);
+            try
+            {
+                await dbContext.SaveChangesAsync(cancellationToken);
+                await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                throw;
+            }
+            return initiative;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FFInitiativeTrackingData.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FFInitiativeTrackingData.cs
new file mode 100644
index 0000000..3ce3b96
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FFInitiativeTrackingData.cs
@@ -0,0 +1,101 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Initiatives
+{
+    [Table("FreeFormInitiativeTrackingData", Schema = "cci")]
+    public class FFInitiativeTrackingData
+    {
+        [Key]
+        public Guid InitiativeGUID { get; set; }
+        [Precision(15, 4)]
+        public decimal Month01Numerator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month02Numerator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month03Numerator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month04Numerator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month05Numerator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month06Numerator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month07Numerator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month08Numerator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month09Numerator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month10Numerator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month11Numerator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month12Numerator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month01Denominator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month02Denominator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month03Denominator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month04Denominator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month05Denominator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month06Denominator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month07Denominator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month08Denominator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month09Denominator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month10Denominator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month11Denominator { get; set; } = 0;
+        [Precision(15, 4)]
+        public decimal Month12Denominator { get; set; } = 0;
+
+        public FFInitiativeTrackingData(Guid initiativeGUID, decimal month01Numerator, decimal month02Numerator, decimal month03Numerator,
+            decimal month04Numerator, decimal month05Numerator, decimal month06Numerator, decimal month07Numerator, decimal month08Numerator,
+            decimal month09Numerator, decimal month10Numerator, decimal month11Numerator, decimal month12Numerator, decimal month01Denominator,
+            decimal month02Denominator, decimal month03Denominator, decimal month04Denominator, decimal month05Denominator,
+            decimal month06Denominator, decimal month07Denominator, decimal month08Denominator, decimal month09Denominator,
+            decimal month10Denominator, decimal month11Denominator, decimal month12Denominator)
+        {
+            this.InitiativeGUID = initiativeGUID;
+            this.Month01Numerator = month01Numerator;
+            this.Month02Numerator = month02Numerator;
+            this.Month03Numerator = month03Numerator;
+            this.Month04Numerator = month04Numerator;
+            this.Month05Numerator = month05Numerator;
+            this.Month06Numerator = month06Numerator;
+            this.Month07Numerator = month07Numerator;
+            this.Month08Numerator = month08Numerator;
+            this.Month09Numerator = month09Numerator;
+            this.Month10Numerator = month10Numerator;
+            this.Month11Numerator = month11Numerator;
+            this.Month12Numerator = month12Numerator;
+            this.Month01Denominator = month01Denominator;
+            this.Month02Denominator = month02Denominator;
+            this.Month03Denominator = month03Denominator;
+            this.Month04Denominator = month04Denominator;
+            this.Month05Denominator = month05Denominator;
+            this.Month06Denominator = month06Denominator;
+            this.Month07Denominator = month07Denominator;
+            this.Month08Denominator = month08Denominator;
+            this.Month09Denominator = month09Denominator;
+            this.Month10Denominator = month10Denominator;
+            this.Month11Denominator = month11Denominator;
+            this.Month12Denominator = month12Denominator;
+        }
+
+        public FFInitiativeTrackingData(Guid initiativeGUID)
+        {
+            InitiativeGUID = initiativeGUID;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FreeFormInitiativeDto.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FreeFormInitiativeDto.cs
new file mode 100644
index 0000000..57afb4f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FreeFormInitiativeDto.cs
@@ -0,0 +1,14 @@
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Initiatives
+{
+    public class FreeFormInitiativeDto : InitiativeDto
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public int ImprovementType { get; set; }
+        public int MetricType { get; set; }
+        public string MetricNumerator { get; set; }
+        public string MetricDenominator { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FreeFormInitiativeMapper.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FreeFormInitiativeMapper.cs
new file mode 100644
index 0000000..a94d132
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/FreeFormInitiativeMapper.cs
@@ -0,0 +1,94 @@
+using Newtonsoft.Json;
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Initiatives
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class FreeFormInitiativeMapper
+    {
+        public static FreeFormInitiativeDto MapToFreeFormInitiative(this Initiative src, FFOpportunityDataModel opportunity)
+        {
+            var mapped = src.Map();
+            if (mapped == null) return mapped;
+            var milestones = JsonConvert.DeserializeObject<MilestonesDto>(src.MilestonesConfigJSON);
+            var idx = 1;
+            foreach (var milestone in milestones.Milestones)
+            {
+                if (DateTime.TryParse(milestone.DueDate, out var dueDate))
+                {
+                    mapped.TrySetPropertyValue($"DueDate{idx}", dueDate.ToString("yyyy-MM-dd"), true);
+                }
+                mapped.TrySetPropertyValue($"Milestone{idx}", milestone.Name, true);
+                idx += 1;
+            }
+            mapped.IsFinalized = src.CurrentStepEnum == InitiativeSteps.Tracking;
+            var stakeholders = JsonConvert.DeserializeObject<IEnumerable<Stakeholder>>(src.StakeholdersJSON);
+            mapped.Stakeholders = stakeholders.Select(sh => sh.UserGUID.ToString()).ToArray();
+            mapped.TrackingStart = src.EffectiveDate.ToString("yyyy-MM-dd");
+            mapped.OpportunityGuid = opportunity.OpportunityGuid;
+            mapped.Name = opportunity.Name;
+            mapped.ImprovementType = (int)opportunity.FinancialImprovementType;
+            mapped.MetricType = (int)opportunity.MetricType;
+            mapped.MetricNumerator = opportunity.Numerator;
+            mapped.MetricDenominator = opportunity.Denominator;
+            return mapped;
+        }
+
+        [MapProperty(nameof(FreeFormInitiativeDto.MetricNumerator), nameof(FFOpportunityDataModel.Numerator))]
+        [MapProperty(nameof(FreeFormInitiativeDto.MetricDenominator), nameof(FFOpportunityDataModel.Denominator))]
+        [MapProperty(nameof(FreeFormInitiativeDto.ImprovementType), nameof(FFOpportunityDataModel.FinancialImprovementType))]
+        public static partial FFOpportunityDataModel MapToOpportunity(this FreeFormInitiativeDto src);
+
+        [MapProperty(nameof(Initiative.InitiativeGUID), nameof(FreeFormInitiativeDto.InitiativeGuid))]
+        [MapProperty(nameof(Initiative.ConfigurationGUID), nameof(FreeFormInitiativeDto.ConfigurationGuid))]
+        [MapProperty(nameof(Initiative.CostLeaderGUID), nameof(FreeFormInitiativeDto.CostLeader))]
+        [MapProperty(nameof(Initiative.ExecutiveSponsorGUID), nameof(FreeFormInitiativeDto.ExecutiveSponsor))]
+        [MapProperty(nameof(Initiative.OwnerGUID), nameof(FreeFormInitiativeDto.Owner))]
+        [MapProperty(nameof(Initiative.Description), nameof(FreeFormInitiativeDto.PlannedImprovements))]
+        [MapperIgnoreSource(nameof(Initiative.EffectiveDate))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.IsFinalized))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.ImprovementType))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.MetricType))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.MetricNumerator))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.Stakeholders))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.TrackingStart))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.Milestone1))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.Milestone2))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.Milestone3))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.Milestone4))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.Milestone5))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.Milestone6))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.Milestone7))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.Milestone8))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.Milestone9))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.Milestone10))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.DueDate1))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.DueDate2))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.DueDate3))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.DueDate4))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.DueDate5))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.DueDate6))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.DueDate7))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.DueDate8))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.DueDate9))]
+        [MapperIgnoreTarget(nameof(FreeFormInitiativeDto.DueDate10))]
+        private static partial FreeFormInitiativeDto Map(this Initiative src);
+    }
+
+    public class MilestonesDto
+    {
+        public List<MileStone> Milestones { get; set; }
+
+        public MilestonesDto()
+        {
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/IFFInitiativeService.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/IFFInitiativeService.cs
new file mode 100644
index 0000000..327b124
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Initiatives/IFFInitiativeService.cs
@@ -0,0 +1,13 @@
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Initiatives
+{
+    public interface IFFInitiativeService
+    {
+        Task<Guid> CreateInitiative(Guid dbGuid, Initiative initiative, Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<Initiative> UpdateAsync(Initiative updatedInitiative, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunity.cs
new file mode 100644
index 0000000..1809a19
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunity.cs
@@ -0,0 +1,39 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Opportunities
+{
+    [Table("viewFreeFormOpportunity", Schema = "cci")]
+    public class FFOpportunity : Opportunity
+    {
+        public FinancialImprovementType ImprovementType { get; set; }
+        public MetricType MetricType { get; set; }
+        public string MetricTypeValue { get; set; }
+        public long OpportunityId { get; set; }
+        public string Name { get; set; }
+
+        public override void Update(IOpportunity updates)
+        {
+            base.Update(updates);
+            var ffUpdates = updates as FFOpportunity;
+            if (ffUpdates == null) return;
+            ImprovementType = ffUpdates.ImprovementType;
+            MetricType = ffUpdates.MetricType;
+            MetricTypeValue = ffUpdates.MetricTypeValue;
+            Name = ffUpdates.Name;
+        }
+    }
+
+    public enum MetricType : byte
+    {
+        Operational = 0,
+        FinancialPerUnit = 1,
+        Financial = 2
+    }
+
+    public enum FinancialImprovementType : byte
+    {
+        Cost = 0,
+        Revenue = 1
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunityDataModel.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunityDataModel.cs
new file mode 100644
index 0000000..1fcaeab
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunityDataModel.cs
@@ -0,0 +1,144 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Network;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Opportunities
+{
+    [Table("FreeFormOpportunity", Schema = "cci")]
+    public class FFOpportunityDataModel : IOpportunity, IWithAuthor
+    {
+        public FFOpportunityDataModel()
+        {
+            OpportunityGuid = Guid.NewGuid();
+            OpportunityType = (byte)OpportunityTypes.FreeForm;
+            OpportunityKey = $"FF - {OpportunityId}";
+            Initiative = InitiativeObj?.Name ?? "";
+            DateCreated = DateTime.Now;
+            Note = string.Empty;
+        }
+
+        [Key]
+        public Guid OpportunityGuid { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public string Name { get; set; }
+        public string Numerator { get; set; }
+        public string Denominator { get; set; }
+        public FinancialImprovementType FinancialImprovementType { get; set; }
+        public DateTime DateCreated { get; set; }
+        public Guid AuthorGuid { get; set; }
+        public string AuthorName { get; set; }
+        public byte OpportunityType { get; set; }
+        public MetricType MetricType { get; set; }
+        [Precision(15, 4)]
+        public decimal SavingsPerUnit { get; set; }
+        public bool IsHidden { get; set; }
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long OpportunityId { get; set; }
+        [Precision(15, 4)]
+        public decimal GoalRate { get; set; }
+        [Precision(15, 4)]
+        public decimal ChangeRate { get; set; }
+        public double Savings { get; set; }
+        [Precision(15, 4)]
+        public decimal Month01Upper { get; set; }
+        [Precision(15, 4)]
+        public decimal Month02Upper { get; set; }
+        [Precision(15, 4)]
+        public decimal Month03Upper { get; set; }
+        [Precision(15, 4)]
+        public decimal Month04Upper { get; set; }
+        [Precision(15, 4)]
+        public decimal Month05Upper { get; set; }
+        [Precision(15, 4)]
+        public decimal Month06Upper { get; set; }
+        [Precision(15, 4)]
+        public decimal Month07Upper { get; set; }
+        [Precision(15, 4)]
+        public decimal Month08Upper { get; set; }
+        [Precision(15, 4)]
+        public decimal Month09Upper { get; set; }
+        [Precision(15, 4)]
+        public decimal Month10Upper { get; set; }
+        [Precision(15, 4)]
+        public decimal Month11Upper { get; set; }
+        [Precision(15, 4)]
+        public decimal Month12Upper { get; set; }
+        [Precision(15, 4)]
+        public decimal Month01Lower { get; set; }
+        [Precision(15, 4)]
+        public decimal Month02Lower { get; set; }
+        [Precision(15, 4)]
+        public decimal Month03Lower { get; set; }
+        [Precision(15, 4)]
+        public decimal Month04Lower { get; set; }
+        [Precision(15, 4)]
+        public decimal Month05Lower { get; set; }
+        [Precision(15, 4)]
+        public decimal Month06Lower { get; set; }
+        [Precision(15, 4)]
+        public decimal Month07Lower { get; set; }
+        [Precision(15, 4)]
+        public decimal Month08Lower { get; set; }
+        [Precision(15, 4)]
+        public decimal Month09Lower { get; set; }
+        [Precision(15, 4)]
+        public decimal Month10Lower { get; set; }
+        [Precision(15, 4)]
+        public decimal Month11Lower { get; set; }
+        [Precision(15, 4)]
+        public decimal Month12Lower { get; set; }
+        [NotMapped]
+        public virtual Configuration.Configuration Configuration { get; set; }
+
+        #region IWithSourceOpportunity
+        [NotMapped]
+        public string SourceOpportunity { get; set; }
+        [NotMapped]
+        public long SourceOpportunityId { get; set; }
+        public void SetSourceOpportunity(ClientNetworkOpportunity sourceOpportunity)
+        {
+            if (sourceOpportunity == null) { return; }
+            SourceOpportunity = sourceOpportunity.NetworkOpportunity.Name;
+            SourceOpportunityId = sourceOpportunity.NetworkOpportunityId;
+        }
+        #endregion
+
+        #region IOpportunity items
+        [NotMapped]
+        public string OpportunityKey { get; set; }
+        [NotMapped]
+        public double IdentifiedSavings { get; set; }
+        [NotMapped]
+        public bool HasInitiative => InitiativeGuid != Guid.Empty;
+        [NotMapped]
+        public string Initiative { get; set; }
+        [NotMapped]
+        public string Note { get; set; }
+        #endregion
+
+        [NotMapped]
+        public virtual Initiative InitiativeObj { get; set; }
+
+        public void Update(IOpportunity updates)
+        {
+            IdentifiedSavings = updates.IdentifiedSavings;
+            InitiativeGuid = updates.InitiativeGuid;
+            IsHidden = updates.IsHidden;
+            Note = updates.Note;
+            var ffUpdates = updates as FFOpportunityDataModel;
+            if (ffUpdates == null) return;
+            Name = ffUpdates.Name;
+            FinancialImprovementType = ffUpdates.FinancialImprovementType;
+            MetricType = ffUpdates.MetricType;
+            Numerator = ffUpdates.Numerator;
+            Denominator = ffUpdates.Denominator;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunityDataModelMapper.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunityDataModelMapper.cs
new file mode 100644
index 0000000..00aa86c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunityDataModelMapper.cs
@@ -0,0 +1,83 @@
+using MoreLinq;
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.FreeForm.Initiatives;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System.Linq;
+using System.Security.Claims;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Opportunities
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class FFOpportunityDataModelMapper
+    {
+        public static FFOpportunityDataModel MapToDataModel(this FreeFormInitiativeDto src, ClaimsPrincipal user)
+        {
+            var mapped = src.Mapped();
+            if (mapped == null) return default;
+
+            mapped.MapAuthor(user);
+            mapped.Numerator ??= "Baseline";
+            mapped.Denominator ??= "Target";
+            return mapped;
+        }
+
+        public static FFOpportunityDetailModel MapToDetailModel(this FFOpportunityDataModel src, IFiscalMonthResolver fiscalMonthResolver)
+        {
+            var mapped = MappedToDetailModel(src);
+            if (mapped == null) return default;
+
+            mapped.OpportunityKey = "FF - " + src.OpportunityId;
+            mapped.BaselineStartDate = src.Configuration.GetBaselineStartDate(OpportunityTypes.OrgDefined);
+            mapped.BaselineEndDate = src.Configuration.GetBaselineEndDate(OpportunityTypes.OrgDefined);
+            mapped.TrackingStartDate = src.Configuration.GetTrackingStartDate(OpportunityTypes.OrgDefined);
+            mapped.TrackingEndDate = src.Configuration.GetTrackingEndDate();
+            mapped.Numerator = string.IsNullOrEmpty(mapped.Numerator) ? "Baseline" : mapped.Numerator;
+            mapped.Denominator = string.IsNullOrEmpty(mapped.Denominator) ? "Target" : mapped.Denominator;
+            // Get the real Fiscal Months in order and double them in case we need to use the next year.
+            var realFiscalMonths = fiscalMonthResolver.AllFiscalMonths.Where(x => x.IsReal).OrderBy(x => x.SortOrder).ToList();
+            realFiscalMonths.AddRange(fiscalMonthResolver.AllFiscalMonths.Where(x => x.IsReal).OrderBy(x => x.SortOrder));
+            var start = realFiscalMonths.Find(fm => fm.FiscalMonthId == mapped.BaselineStartDate.Month);
+            var fmIndex = realFiscalMonths.IndexOf(start);
+
+            var baselineStart = mapped.BaselineStartDate;
+            mapped.RowData = realFiscalMonths.Skip(fmIndex).Take(12)
+                .Select((fm, idx) => new FFOpportunityDetailRowData(
+                    fm.MonthColumnName.ToLower(),
+                    baselineStart.AddMonths(idx),
+                    src.TryGetPropertyValue($"{fm.MonthColumnName}Upper", out decimal upper) ? upper : 0m,
+                    src.TryGetPropertyValue($"{fm.MonthColumnName}Lower", out decimal lower) ? lower : 0m)
+                ).ToList();
+            return mapped;
+        }
+
+        [MapperIgnoreTarget(nameof(FFOpportunityDataModel.OpportunityGuid))]
+        [MapProperty(nameof(FFOpportunityDto.ImprovementType), nameof(FFOpportunityDataModel.FinancialImprovementType))]
+        [MapProperty(nameof(FFOpportunityDto.MetricDenominator), nameof(FFOpportunityDataModel.Denominator))]
+        [MapProperty(nameof(FFOpportunityDto.MetricNumerator), nameof(FFOpportunityDataModel.Numerator))]
+        public static FFOpportunityDataModel MapToDataModel(this FFOpportunityDto src)
+        {
+            var mapped = OpportunityToDataModel(src);
+            if (mapped == null) return null;
+
+            return mapped;
+        }
+
+        [MapperIgnoreTarget(nameof(FFOpportunityDataModel.OpportunityGuid))]
+        [MapProperty(nameof(FFOpportunityDto.ImprovementType), nameof(FFOpportunityDataModel.FinancialImprovementType))]
+        [MapProperty(nameof(FFOpportunityDto.MetricDenominator), nameof(FFOpportunityDataModel.Denominator))]
+        [MapProperty(nameof(FFOpportunityDto.MetricNumerator), nameof(FFOpportunityDataModel.Numerator))]
+        private static partial FFOpportunityDataModel OpportunityToDataModel(this FFOpportunityDto src);
+
+        [MapperIgnoreTarget(nameof(FFOpportunityDataModel.OpportunityGuid))]
+        [MapProperty(nameof(FreeFormInitiativeDto.ImprovementType), nameof(FFOpportunityDataModel.FinancialImprovementType))]
+        [MapProperty(nameof(FreeFormInitiativeDto.MetricDenominator), nameof(FFOpportunityDataModel.Denominator))]
+        [MapProperty(nameof(FreeFormInitiativeDto.MetricNumerator), nameof(FFOpportunityDataModel.Numerator))]
+        private static partial FFOpportunityDataModel Mapped(this FreeFormInitiativeDto src);
+
+        private static partial FFOpportunityDetailModel MappedToDetailModel(this FFOpportunityDataModel src);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunityDetailModel.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunityDetailModel.cs
new file mode 100644
index 0000000..89dcfd2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunityDetailModel.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Opportunities
+{
+    public class FFOpportunityDetailModel
+    {
+        public Guid OpportunityGuid { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public long OpportunityId { get; set; }
+        public string OpportunityKey { get; set; }
+        public string Name { get; set; }
+        public string Numerator { get; set; }
+        public string Denominator { get; set; }
+        public float Savings { get; set; }
+        public float SavingsPerUnit { get; set; }
+        public float GoalRate { get; set; }
+        public float ChangeRate { get; set; }
+        public DateTime BaselineStartDate { get; set; }
+        public DateTime BaselineEndDate { get; set; }
+        public DateTime TrackingStartDate { get; set; }
+        public DateTime TrackingEndDate { get; set; }
+        public FinancialImprovementType FinancialImprovementType { get; set; }
+        public MetricType MetricType { get; set; }
+        public bool IsHidden { get; set; }
+        public string SourceOpportunity { get; set; }
+        public long SourceOpportunityId { get; set; }
+        public List<FFOpportunityDetailRowData> RowData { get; set; }
+    }
+
+    public class FFOpportunityDetailRowData
+    {
+        public string Key { get; set; }
+        public string Month { get; set; }
+        public decimal Upper { get; set; }
+        public decimal Lower { get; set; }
+
+        public FFOpportunityDetailRowData()
+        {
+
+        }
+
+        public FFOpportunityDetailRowData(string key, DateTime date, decimal upper, decimal lower)
+        {
+            Key = key;
+            Month = $"{date:MMM-yy}";
+            Upper = upper;
+            Lower = lower;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunityService.cs
new file mode 100644
index 0000000..4fbfe77
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/FFOpportunityService.cs
@@ -0,0 +1,228 @@
+using ClosedXML.Excel;
+using Microsoft.EntityFrameworkCore;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Export;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.Hangfire.Jazz.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Opportunities
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class FFOpportunityService : OpportunityService<FFOpportunity>, IFFOpportunityService
+    {
+        private readonly IJazzHangfireServiceClient _hangfireServiceClient;
+        private readonly IAuthorizationServiceClient _authorizationServiceClient;
+        private readonly IFiscalMonthResolver _fiscalMonthResolver;
+
+        public FFOpportunityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IJazzHangfireServiceClient hangfireServiceClient,
+            IFiscalMonthResolver fiscalMonthResolver,
+            IInitiativeService initiativeService,
+            IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            IAuthorizationServiceClient authorizationServiceClient)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor, initiativeService, updateFactOpportunitySavingsService)
+        {
+            _hangfireServiceClient = hangfireServiceClient;
+            _authorizationServiceClient = authorizationServiceClient;
+            _fiscalMonthResolver = fiscalMonthResolver;
+        }
+
+        public async Task<FFFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return null;
+
+            var opportunityContext = dbContext.Set<FFOpportunity>();
+            var configuredOpportunities = opportunityContext.Where(ff => ff.ConfigurationGuid == configurationGuid);
+
+            var metricTypes = (await configuredOpportunities.Select(mt => new { mt.MetricType }).Distinct().ToListAsync(cancellationToken))
+                .Select(mt => new FilterMember
+                {
+                    Id = ((int)mt.MetricType).ToString(),
+                    Text = Enum.GetName<MetricType>(mt.MetricType).SplitCamelCase()
+                }).Distinct().OrderBy(t => t.Text).ToList();
+
+            var financialImprovementTypes = (await configuredOpportunities.Select(it => new { it.ImprovementType }).Distinct().ToListAsync(cancellationToken))
+                .Select(ff => new FilterMember
+                {
+                    Id = ((int)ff.ImprovementType).ToString(),
+                    Text = Enum.GetName<FinancialImprovementType>(ff.ImprovementType).SplitCamelCase()
+                }).Distinct().OrderBy(oa => oa.Text).ToList();
+
+            return new FFFilterOptions
+            {
+                MetricTypes = metricTypes,
+                FinancialImprovementTypes = financialImprovementTypes
+            };
+
+        }
+
+        public async Task<Guid> CreateAsync(FFOpportunityDataModel opportunity, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+
+            var configuration = await dbContext.Configurations
+                .FirstOrDefaultAsync(x => x.ConfigurationGuid == opportunity.ConfigurationGuid, cancellationToken);
+            if (opportunity.MetricType == MetricType.FinancialPerUnit) opportunity.SavingsPerUnit = 1;
+
+            await dbContext.FreeFormOpportunities.AddAsync(opportunity, cancellationToken);
+            await dbContext.SaveChangesAsync(cancellationToken);
+
+            await _authorizationServiceClient.AddPermissionsFromDefaultsAsync(opportunity.OpportunityGuid, SecurableEntityType.Opportunity, cancellationToken);
+
+            return opportunity.OpportunityGuid;
+        }
+
+        public async Task<FFOpportunity> UpdateAsync(FFOpportunityDataModel opportunity, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+            var ffOpportunity = await dbContext.FreeFormOpportunities
+                .SingleOrDefaultAsync(ff => ff.OpportunityGuid == opportunity.OpportunityGuid, cancellationToken);
+            ffOpportunity.Update(opportunity);
+            await dbContext.SaveChangesAsync(cancellationToken);
+            return await dbContext.FFOpportunities
+                .SingleOrDefaultAsync(ff => ff.OpportunityGuid == opportunity.OpportunityGuid, cancellationToken);
+        }
+
+        public async Task<FFOpportunityDataModel> GetDataModelById(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+            var opportunity = await dbContext.FreeFormOpportunities.FirstOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+            opportunity.OpportunityKey = $"FF - {opportunity.OpportunityId}";
+            opportunity.Configuration = await dbContext.Configurations.SingleOrDefaultAsync(c => c.ConfigurationGuid == opportunity.ConfigurationGuid, cancellationToken);
+            if (opportunity.InitiativeGuid != Guid.Empty)
+            {
+                opportunity.InitiativeObj = await dbContext.Initiatives.SingleOrDefaultAsync(i => i.InitiativeGUID == opportunity.InitiativeGuid, cancellationToken);
+                opportunity.Initiative = opportunity.InitiativeObj?.Name ?? "";
+            }
+            var link = await _centralDbContext.ClientNetworkOpportunityLinks
+                .Include(cno => cno.ClientNetworkOpportunity)
+                .ThenInclude(no => no.NetworkOpportunity)
+                .SingleOrDefaultAsync(link => link.OpportunityGuid == opportunityGuid, cancellationToken);
+            if (link != null)
+            {
+                opportunity.SourceOpportunity = link.ClientNetworkOpportunity.NetworkOpportunity.Name;
+                opportunity.SourceOpportunityId = link.ClientNetworkOpportunity.NetworkOpportunityId;
+            }
+            opportunity.Configuration.FiscalMonthResolver = _fiscalMonthResolver;
+            opportunity = (FFOpportunityDataModel)await SetSourceOpportunity(opportunity, cancellationToken);
+            return opportunity;
+        }
+
+        public async Task<bool> SetGoalsAsync(Guid opportunityGuid, FFOpportunityDetailModel opportunityDetail, IList<FFOpportunityDetailRowData> monthValues, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+
+            try
+            {
+                //get opportunity
+                var opportunity = await dbContext.FreeFormOpportunities
+                    .FirstOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+                if (opportunity == null) { return false; }
+
+                //update opportunity fields
+                opportunity.ChangeRate = (decimal)opportunityDetail.ChangeRate;
+                opportunity.GoalRate = (decimal)opportunityDetail.GoalRate;
+                opportunity.SavingsPerUnit = (decimal)opportunityDetail.SavingsPerUnit;
+                opportunity.Savings = opportunityDetail.Savings;
+                opportunity.IdentifiedSavings = opportunityDetail.Savings;
+
+                //update monthly values
+                foreach (var row in monthValues)
+                {
+                    opportunity.TrySetPropertyValue($"{row.Key}Upper", row.Upper, true);
+                    opportunity.TrySetPropertyValue($"{row.Key}Lower", row.Lower, true);
+                }
+
+                await dbContext.SaveChangesAsync();
+
+                var initiative = await dbContext.Initiatives.SingleOrDefaultAsync(init => init.InitiativeGUID == opportunity.InitiativeGuid, cancellationToken);
+                if (initiative == null) { return false; }
+
+                initiative.SavingsCommitted = opportunityDetail.Savings;
+                await dbContext.SaveChangesAsync();
+
+                if (!(await RunTracking(opportunity.InitiativeGuid, cancellationToken)))
+                {
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                return false;
+            }
+        }
+
+        private async Task<bool> RunTracking(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var dbContext = await GetDbContext(cancellationToken);
+                var initiative = await dbContext.Initiatives.SingleOrDefaultAsync(i => i.InitiativeGUID.Equals(initiativeGuid), cancellationToken);
+
+                var jobId = await _initiativeService.RunTracking(initiativeGuid, cancellationToken);
+
+                // Wait for the job to finish
+                var result = await _hangfireServiceClient.GetJobInfoAsync(jobId, cancellationToken);
+                while (result.State.Name == "Processing")
+                {
+                    await Task.Delay(500);
+                    result = await _hangfireServiceClient.GetJobInfoAsync(jobId, cancellationToken);
+                }
+
+                if (result.State.Name != "Succeeded") { return false; }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+                return false;
+            }
+        }
+
+        public async Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, FFFilters filters, CancellationToken cancellationToken)
+        {
+            var exportOptions = this.GetExportOptions();
+
+            // get data
+            var data = (await this.GetAllAsync(sortOptions, filters, cancellationToken)).Select(opp => new
+            {
+                Opportunity = opp.OpportunityKey,
+                opp.Name,
+                ImprovementType = $"{opp.ImprovementType}".SplitCamelCase(),
+                MetricType = $"{opp.MetricType}".SplitCamelCase(),
+                GoalSavings = opp.IdentifiedSavings,
+                opp.Initiative,
+                IsHidden = opp.IsHidden ? 1 : 0,
+                opp.Note
+            });
+
+            // configure column formats
+            exportOptions.AddColumnOptions("Goal Savings", "Currency2Dec");
+            exportOptions.AddColumnOptions("Is Hidden", "\"Yes\";-;\"No\"");
+
+            return ExportUtils.CreateExcelWorkbook(data, exportOptions);
+        }
+
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/Filters/FFFilterOptions.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/Filters/FFFilterOptions.cs
new file mode 100644
index 0000000..6aaad9e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/Filters/FFFilterOptions.cs
@@ -0,0 +1,11 @@
+using Strata.ContinuousImprovement.Biz.Filter;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Opportunities.Filters
+{
+    public class FFFilterOptions
+    {
+        public IEnumerable<FilterMember> FinancialImprovementTypes { get; set; }
+        public IEnumerable<FilterMember> MetricTypes { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/Filters/FFFilters.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/Filters/FFFilters.cs
new file mode 100644
index 0000000..ca35e29
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/Filters/FFFilters.cs
@@ -0,0 +1,45 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Opportunities.Filters
+{
+    public class FFFilters : FiltersOpportunity<FFOpportunity>
+    {
+        public IEnumerable<string> FinancialImprovementTypes { get; set; }
+        public IEnumerable<string> MetricTypes { get; set; }
+
+        public FFFilters() : base()
+        {
+            FinancialImprovementTypes = new List<string>();
+            MetricTypes = new List<string>();
+        }
+
+        public override IEnumerable<Expression<Func<FFOpportunity, bool>>> GetFilters(JazzDbContext context)
+        {
+            var filters = base.GetFilters(context).ToList();
+
+            if (FinancialImprovementTypes.Any())
+                filters.Add(m => FinancialImprovementTypes.Contains(((int)m.ImprovementType).ToString()));
+
+            if (MetricTypes.Any())
+                filters.Add(m => MetricTypes.Contains(((int)m.MetricType).ToString()));
+
+            if (!string.IsNullOrEmpty(OpportunitySearch))
+            {
+                var matchedImprovementTypeName = Enum.GetNames(typeof(FinancialImprovementType)).FirstOrDefault(fit => fit.ToLower().Contains(OpportunitySearch.ToLower()));
+                var testImprovementType = Enum.TryParse<FinancialImprovementType>(matchedImprovementTypeName, true, out var financialImprovementType);
+                filters.Add(m => m.OpportunityKey.Contains(OpportunitySearch)
+                    || m.Name.Contains(OpportunitySearch)
+                    || (testImprovementType && m.ImprovementType == financialImprovementType)
+                    || m.MetricTypeValue.Contains(OpportunitySearch));
+            }
+
+            return filters;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/IFFOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/IFFOpportunityService.cs
new file mode 100644
index 0000000..efa9981
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/FreeForm/Opportunities/IFFOpportunityService.cs
@@ -0,0 +1,28 @@
+using ClosedXML.Excel;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.FreeForm.Opportunities
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public interface IFFOpportunityService : IOpportunityService<FFOpportunity>
+    {
+        Task<FFFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken);
+
+        Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, FFFilters filters, CancellationToken cancellationToken);
+
+        Task<Guid> CreateAsync(FFOpportunityDataModel opportunity, CancellationToken cancellationToken);
+
+        Task<FFOpportunity> UpdateAsync(FFOpportunityDataModel opportunity, CancellationToken cancellationToken);
+
+        Task<bool> SetGoalsAsync(Guid opportunityGuid, FFOpportunityDetailModel opportunityDetail, IList<FFOpportunityDetailRowData> monthValues, CancellationToken cancellationToken);
+
+        Task<FFOpportunityDataModel> GetDataModelById(Guid opportunityGuid, CancellationToken cancellationToken);
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/DatadogSection.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/DatadogSection.cs
new file mode 100644
index 0000000..642c61e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/DatadogSection.cs
@@ -0,0 +1,7 @@
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    public class DatadogSection
+    {
+        public string SeedGMDNJob { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/DeviceIdentifierDimension.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/DeviceIdentifierDimension.cs
new file mode 100644
index 0000000..2efb247
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/DeviceIdentifierDimension.cs
@@ -0,0 +1,144 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    /// <summary>
+    /// Dimension consists of aggregated data from GMDN & GUDID data sources
+    /// </summary>
+    public class DeviceIdentifierDimension
+    {
+        public string DeviceIdentifier { get; set; }
+        public string PrimaryDI { get; set; }
+        public string DeviceIdType { get; set; }
+        public string GMDNTermCode { get; set; }
+        public string GMDNTermName { get; set; }
+        public string GMDNTermDefinition { get; set; }
+        public string GMDNDeviceFunction1 { get; set; } = "";
+        public string GMDNDeviceFunction2 { get; set; } = "";
+        public string GMDNDeviceFunction3 { get; set; } = "";
+        public string GMDNDeviceFunction4 { get; set; } = "";
+        public string GMDNDeviceFunction5 { get; set; } = "";
+        public string GMDNDeviceFunction6 { get; set; } = "";
+        public string GMDNDeviceFunction7 { get; set; } = "";
+        public string GMDNInvasiveness1 { get; set; } = "";
+        public string GMDNInvasiveness2 { get; set; } = "";
+        public string GMDNUseFrequency1 { get; set; } = "";
+        public string GMDNUseFrequency2 { get; set; } = "";
+        public string GMDNPower1 { get; set; } = "";
+        public string GMDNPower2 { get; set; } = "";
+        public string GMDNMaterials1 { get; set; } = "";
+        public string GMDNMaterials2 { get; set; } = "";
+        public string GMDNFeaturedAttributes1 { get; set; } = "";
+        public string GMDNFeaturedAttributes2 { get; set; } = "";
+        public string GMDNAnatomicalSpecialty1 { get; set; } = "";
+        public string GMDNAnatomicalSpecialty2 { get; set; } = "";
+        public string GMDNAnatomicalSpecialty3 { get; set; } = "";
+        public string GMDNAnatomicalSpecialty4 { get; set; } = "";
+        public string GMDNAnatomicalSpecialty5 { get; set; } = "";
+        public string GMDNAnatomicalSpecialty6 { get; set; } = "";
+        public string GMDNNamesIndex1 { get; set; } = "";
+        public string GMDNNamesIndex2 { get; set; } = "";
+        public string GMDNNamesIndex3 { get; set; } = "";
+        public string GMDNNamesIndex4 { get; set; } = "";
+        public string GMDNNamesIndex5 { get; set; } = "";
+        public string GMDNNamesIndex6 { get; set; } = "";
+        public string GMDNNamesIndex7 { get; set; } = "";
+        public string GUDIDCompanyName { get; set; } = "";
+
+        public bool HasChanges(DeviceIdentifierDimension dim)
+        {
+            if (PrimaryDI != dim.PrimaryDI
+               || DeviceIdType != dim.DeviceIdType
+               || GMDNTermCode != dim.GMDNTermCode
+               || GMDNTermName != dim.GMDNTermName
+               || GMDNTermDefinition != dim.GMDNTermDefinition
+               || GMDNDeviceFunction1 != dim.GMDNDeviceFunction1
+               || GMDNDeviceFunction2 != dim.GMDNDeviceFunction2
+               || GMDNDeviceFunction3 != dim.GMDNDeviceFunction3
+               || GMDNDeviceFunction4 != dim.GMDNDeviceFunction4
+               || GMDNDeviceFunction5 != dim.GMDNDeviceFunction5
+               || GMDNDeviceFunction6 != dim.GMDNDeviceFunction6
+               || GMDNDeviceFunction7 != dim.GMDNDeviceFunction7
+               || GMDNInvasiveness1 != dim.GMDNInvasiveness1
+               || GMDNInvasiveness2 != dim.GMDNInvasiveness2
+               || GMDNUseFrequency1 != dim.GMDNUseFrequency1
+               || GMDNUseFrequency2 != dim.GMDNUseFrequency2
+               || GMDNPower1 != dim.GMDNPower1
+               || GMDNPower2 != dim.GMDNPower2
+               || GMDNMaterials1 != dim.GMDNMaterials1
+               || GMDNMaterials2 != dim.GMDNMaterials2
+               || GMDNFeaturedAttributes1 != dim.GMDNFeaturedAttributes1
+               || GMDNFeaturedAttributes2 != dim.GMDNFeaturedAttributes2
+               || GMDNAnatomicalSpecialty1 != dim.GMDNAnatomicalSpecialty1
+               || GMDNAnatomicalSpecialty2 != dim.GMDNAnatomicalSpecialty2
+               || GMDNAnatomicalSpecialty3 != dim.GMDNAnatomicalSpecialty3
+               || GMDNAnatomicalSpecialty4 != dim.GMDNAnatomicalSpecialty4
+               || GMDNAnatomicalSpecialty5 != dim.GMDNAnatomicalSpecialty5
+               || GMDNAnatomicalSpecialty6 != dim.GMDNAnatomicalSpecialty6
+               || GMDNNamesIndex1 != dim.GMDNNamesIndex1
+               || GMDNNamesIndex2 != dim.GMDNNamesIndex2
+               || GMDNNamesIndex3 != dim.GMDNNamesIndex3
+               || GMDNNamesIndex4 != dim.GMDNNamesIndex4
+               || GMDNNamesIndex5 != dim.GMDNNamesIndex5
+               || GMDNNamesIndex6 != dim.GMDNNamesIndex6
+               || GMDNNamesIndex7 != dim.GMDNNamesIndex7
+               || GUDIDCompanyName != dim.GUDIDCompanyName)
+            {
+                return true;
+            }
+            return false;
+        }
+    }
+
+    [Table("DimDeviceIdentifier", Schema = "dss")]
+    public class DimDeviceIdentifier : DeviceIdentifierDimension
+    {
+        [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public Guid MemberGUID { get; set; }
+        public Guid HistoryItemGUID { get; set; }
+        public int TransactionID { get; set; }
+
+        public DimDeviceIdentifier Update(DeviceIdentifierDimension dim)
+        {
+            PrimaryDI = dim.PrimaryDI;
+            DeviceIdType = dim.DeviceIdType;
+            GMDNTermCode = dim.GMDNTermCode;
+            GMDNTermName = dim.GMDNTermName;
+            GMDNTermDefinition = dim.GMDNTermDefinition;
+            GMDNDeviceFunction1 = dim.GMDNDeviceFunction1;
+            GMDNDeviceFunction2 = dim.GMDNDeviceFunction2;
+            GMDNDeviceFunction3 = dim.GMDNDeviceFunction3;
+            GMDNDeviceFunction4 = dim.GMDNDeviceFunction4;
+            GMDNDeviceFunction5 = dim.GMDNDeviceFunction5;
+            GMDNDeviceFunction6 = dim.GMDNDeviceFunction6;
+            GMDNDeviceFunction7 = dim.GMDNDeviceFunction7;
+            GMDNInvasiveness1 = dim.GMDNInvasiveness1;
+            GMDNInvasiveness2 = dim.GMDNInvasiveness2;
+            GMDNUseFrequency1 = dim.GMDNUseFrequency1;
+            GMDNUseFrequency2 = dim.GMDNUseFrequency2;
+            GMDNPower1 = dim.GMDNPower1;
+            GMDNPower2 = dim.GMDNPower2;
+            GMDNMaterials1 = dim.GMDNMaterials1;
+            GMDNMaterials2 = dim.GMDNMaterials2;
+            GMDNFeaturedAttributes1 = dim.GMDNFeaturedAttributes1;
+            GMDNFeaturedAttributes2 = dim.GMDNFeaturedAttributes2;
+            GMDNAnatomicalSpecialty1 = dim.GMDNAnatomicalSpecialty1;
+            GMDNAnatomicalSpecialty2 = dim.GMDNAnatomicalSpecialty2;
+            GMDNAnatomicalSpecialty3 = dim.GMDNAnatomicalSpecialty3;
+            GMDNAnatomicalSpecialty4 = dim.GMDNAnatomicalSpecialty4;
+            GMDNAnatomicalSpecialty5 = dim.GMDNAnatomicalSpecialty5;
+            GMDNAnatomicalSpecialty6 = dim.GMDNAnatomicalSpecialty6;
+            GMDNNamesIndex1 = dim.GMDNNamesIndex1;
+            GMDNNamesIndex2 = dim.GMDNNamesIndex2;
+            GMDNNamesIndex3 = dim.GMDNNamesIndex3;
+            GMDNNamesIndex4 = dim.GMDNNamesIndex4;
+            GMDNNamesIndex5 = dim.GMDNNamesIndex5;
+            GMDNNamesIndex6 = dim.GMDNNamesIndex6;
+            GMDNNamesIndex7 = dim.GMDNNamesIndex7;
+            GUDIDCompanyName = dim.GUDIDCompanyName;
+            return this;
+        }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/DeviceIdentifierTerm.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/DeviceIdentifierTerm.cs
new file mode 100644
index 0000000..8925841
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/DeviceIdentifierTerm.cs
@@ -0,0 +1,12 @@
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    public class DeviceIdentifierTerm
+    {
+        public string DeviceId { get; set; }
+        public string DeviceIdType { get; set; }
+        public string PrimaryDI { get; set; }
+        public string CompanyName { get; set; }
+        public string GMDNCode { get; set; }
+        public int RowNumber { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/DimDeviceIdentifierMapper.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/DimDeviceIdentifierMapper.cs
new file mode 100644
index 0000000..e88291b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/DimDeviceIdentifierMapper.cs
@@ -0,0 +1,19 @@
+using Riok.Mapperly.Abstractions;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class DimDeviceIdentifierMapper
+    {
+        public static DimDeviceIdentifier MapToJazzModel(this DeviceIdentifierDimension src)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) { return default; }
+            return mapped;
+        }
+
+        private static partial DimDeviceIdentifier Mapped(DeviceIdentifierDimension src);
+
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/DimSupply.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/DimSupply.cs
new file mode 100644
index 0000000..251d317
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/DimSupply.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    [Table("DimSupply", Schema = "dss")]
+    public class DimSupply
+    {
+        [Key]
+        public int SupplyID { get; set; }
+        public string DeviceIdentifier { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNCategory.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNCategory.cs
new file mode 100644
index 0000000..d438fb4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNCategory.cs
@@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations;
+using System.Xml.Serialization;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    public class GMDNCategory
+    {
+        [Key]
+        [XmlElement("nodeID")]
+        public int NodeId { get; set; }
+        [XmlElement("path")]
+        public string Path { get; set; }
+        [XmlElement("categoryCode")]
+        public string CategoryCode { get; set; }
+        [XmlElement("name")]
+        public string Name { get; set; }
+        [XmlElement("definition")]
+        public string Definition { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNService.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNService.cs
new file mode 100644
index 0000000..2583ff9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNService.cs
@@ -0,0 +1,119 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Notification;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    public class GMDNService : IGMDNService
+    {
+        private readonly CentralDbContext _centralDbContext;
+        private readonly IHubContext<NotificationHub, INotificationHub> _notificationHubContext;
+
+        public GMDNService(CentralDbContext centralDbContext, IHubContext<NotificationHub, INotificationHub> notificationHubContext)
+        {
+            _centralDbContext = centralDbContext;
+            _notificationHubContext = notificationHubContext;
+        }
+
+        public class GMDNTermsFile
+        {
+            [XmlElement("term")]
+            public List<GMDNTerm> terms { get; set; }
+        }
+        public class GMDNTermCategoriesFile
+        {
+            [XmlElement("categoryTermLink")]
+            public List<GMDNTermCategory> termCategories { get; set; }
+        }
+        public class GMDNCategoriesFile
+        {
+            [XmlElement("category")]
+            public List<GMDNCategory> categories { get; set; }
+
+        }
+
+        public async Task SeedGMDNTerms(IFormFile gmdnTermFile, string userName, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(userName + gmdnTermFile.FileName);
+
+            var serializer = new XmlSerializer(typeof(GMDNTermsFile), new XmlRootAttribute("gmdn"));
+            var terms = new GMDNTermsFile();
+
+            using (var reader = gmdnTermFile.OpenReadStream())
+            {
+                terms = (GMDNTermsFile)serializer.Deserialize(reader);
+            }
+
+            _centralDbContext.Database.ExecuteSqlRaw("TRUNCATE TABLE public.gmdn_terms RESTART IDENTITY;");
+            await _centralDbContext.GMDNTerms.AddRangeAsync(terms.terms);
+            var result = _centralDbContext.SaveChanges();
+
+            if (result > 0)
+            {
+                await hub.SendUploadFileFinish(userName, gmdnTermFile.FileName);
+            }
+            else
+            {
+                await hub.SendUploadFileError(userName, gmdnTermFile.FileName);
+            }
+        }
+
+        public async Task SeedGMDNTermCategories(IFormFile gmdnTermCategoryFile, string userName, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(userName + gmdnTermCategoryFile.FileName);
+
+            var serializer = new XmlSerializer(typeof(GMDNTermCategoriesFile), new XmlRootAttribute("gmdn"));
+            var termCategoryFile = new GMDNTermCategoriesFile();
+
+            using (var reader = gmdnTermCategoryFile.OpenReadStream())
+            {
+                termCategoryFile = (GMDNTermCategoriesFile)serializer.Deserialize(reader);
+            }
+
+            _centralDbContext.Database.ExecuteSqlRaw("TRUNCATE TABLE public.gmdn_term_categories RESTART IDENTITY;");
+            await _centralDbContext.GMDNTermCategories.AddRangeAsync(termCategoryFile.termCategories);
+            var result = _centralDbContext.SaveChanges();
+
+            if (result > 0)
+            {
+                await hub.SendUploadFileFinish(userName, gmdnTermCategoryFile.FileName);
+            }
+            else
+            {
+                await hub.SendUploadFileError(userName, gmdnTermCategoryFile.FileName);
+            };
+        }
+
+        public async Task SeedGMDNCategories(IFormFile gmdnTermCategoryFile, string userName, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(userName + gmdnTermCategoryFile.FileName);
+
+            var serializer = new XmlSerializer(typeof(GMDNCategoriesFile), new XmlRootAttribute("gmdn"));
+            var categoryFile = new GMDNCategoriesFile();
+
+            using (var reader = gmdnTermCategoryFile.OpenReadStream())
+            {
+                categoryFile = (GMDNCategoriesFile)serializer.Deserialize(reader);
+            }
+
+            _centralDbContext.Database.ExecuteSqlRaw("TRUNCATE TABLE public.gmdn_categories RESTART IDENTITY;");
+            await _centralDbContext.GMDNCategories.AddRangeAsync(categoryFile.categories);
+            var result = _centralDbContext.SaveChanges();
+
+            if (result > 0)
+            {
+                await hub.SendUploadFileFinish(userName, gmdnTermCategoryFile.FileName);
+            }
+            else
+            {
+                await hub.SendUploadFileError(userName, gmdnTermCategoryFile.FileName);
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNTerm.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNTerm.cs
new file mode 100644
index 0000000..5995d9b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNTerm.cs
@@ -0,0 +1,24 @@
+using System.ComponentModel.DataAnnotations;
+using System.Xml.Serialization;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+
+    public class GMDNTerm
+    {
+        [Key]
+        public int TermId { get; set; }
+        [XmlElement("termCode")]
+        public string TermCode { get; set; }
+        [XmlElement("termName")]
+        public string TermName { get; set; }
+        [XmlElement("termDefinition")]
+        public string TermDefinition { get; set; }
+        [XmlElement("termStatus")]
+        public string TermStatus { get; set; }
+        [XmlElement("termIsIVD")]
+        public string TermIsIVD { get; set; }
+        [XmlElement("createdDate")]
+        public string CreatedDate { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNTermCategory.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNTermCategory.cs
new file mode 100644
index 0000000..c9634b8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNTermCategory.cs
@@ -0,0 +1,12 @@
+using System.Xml.Serialization;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    public class GMDNTermCategory
+    {
+        [XmlElement("termCode")]
+        public string TermCode { get; set; }
+        [XmlElement("categoryCode")]
+        public string CategoryCode { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNTermExtensions.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNTermExtensions.cs
new file mode 100644
index 0000000..5584083
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/GMDNTermExtensions.cs
@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    public static class GMDNTermExtensions
+    {
+        public static GUDIDTerm GMDNTerm(this string line)
+        {
+            var items = line.Split('|');
+            if (items.Length == 6)
+                return new GUDIDTerm()
+                {
+                    PrimaryDI = items[0],
+                    GMDNPTName = items[1].ReplaceSpecialCharacters(),
+                    GMDNPTDefinition = items[2],
+                    GMDNCode = items[3],
+                    GMDNCodeStatus = items[4] == "Active" ? GMDNCodeStatus.Active : GMDNCodeStatus.Obsolete,
+                    Implantable = items[5].ToLower() == "true"
+                };
+
+            return null;
+        }
+
+        public static Dictionary<string, object> KeyValuePairs(this GUDIDTerm term)
+            => new()
+            {
+                {"primaryDI", term.PrimaryDI },
+                {"gmdnPTName", term.GMDNPTName},
+                {"gmdnPTDefinition", term.GMDNPTDefinition }
+            };
+
+        internal static string ReplaceSpecialCharacters(this string value)
+        {
+            return value.ReplaceCharacters("[,'`\\\\*?$!={}<>()\\[\\]\"]+", string.Empty)
+                        .ReplaceCharacters("[:/]+", "-")
+                        .ReplaceCharacters("[&]+", "and");
+        }
+
+        internal static string ReplaceCharacters(this string value, string pattern, string replacement)
+            => Regex.Replace(value, pattern, replacement);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDDevice.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDDevice.cs
new file mode 100644
index 0000000..ba32589
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDDevice.cs
@@ -0,0 +1,59 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    [Index(nameof(PrimaryDi))]
+    public class GUDIDDevice
+    {
+        [Key, MaxLength(24), NotNull]
+        public string PrimaryDi { get; set; }
+        [MaxLength(50), NotNull]
+        public string PublicDeviceRecordKey { get; set; }
+        [MaxLength(12)]
+        public string PublicVersionStatus { get; set; }
+        [MaxLength(12)]
+        public string DeviceRecordStatus { get; set; }
+        public int? PublicVersionNumber { get; set; }
+        public DateTime? PublicVersionDate { get; set; }
+        public DateTime? DevicePublishDate { get; set; }
+        public DateTime? DeviceCommDistributionEndDate { get; set; }
+        [MaxLength(200)]
+        public string DeviceCommDistributionStatus { get; set; }
+        [MaxLength(80)]
+        public string BrandName { get; set; }
+        [MaxLength(80)]
+        public string VersionModelNumber { get; set; }
+        [MaxLength(80)]
+        public string CatalogNumber { get; set; }
+        [MaxLength(16)]
+        public string DunsNumber { get; set; }
+        [MaxLength(120)]
+        public string CompanyName { get; set; }
+        public int? DeviceCount { get; set; }
+        [MaxLength(2000)]
+        public string DeviceDescription { get; set; }
+        public bool DmExempt { get; set; }
+        public bool PremarketExempt { get; set; }
+        public bool DeviceHctp { get; set; }
+        public bool DeviceKit { get; set; }
+        public bool DeviceCombinationProduct { get; set; }
+        public bool SingleUse { get; set; }
+        public bool LotBatch { get; set; }
+        public bool SerialNumber { get; set; }
+        public bool ManufacturingDate { get; set; }
+        public bool ExpirationDate { get; set; }
+        public bool DonationIdNumber { get; set; }
+        public bool LabeledContainsNrl { get; set; }
+        public bool LabeledNoNrl { get; set; }
+        [MaxLength(50)]
+        public string MriSafetyStatus { get; set; }
+        public bool Rx { get; set; }
+        public bool Otc { get; set; }
+        public bool DeviceSterile { get; set; }
+        public bool SterilizationPriorToUse { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDDeviceExtensions.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDDeviceExtensions.cs
new file mode 100644
index 0000000..3256bbb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDDeviceExtensions.cs
@@ -0,0 +1,60 @@
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    public static class GUDIDDeviceExtensions
+    {
+        public static string TrueFalse(this string aString) => aString.ToLower() == "true" ? "true" : "false";
+
+        public static GUDIDDevice GUDIDDevice(this string line)
+        {
+            var items = line.Split('|');
+            if (items.Length != 34) { return null; }
+            try
+            {
+                return new GUDIDDevice()
+                {
+                    PrimaryDi = items[0],
+                    PublicDeviceRecordKey = items[1],
+                    PublicVersionStatus = items[2],
+                    DeviceRecordStatus = items[3],
+                    PublicVersionNumber = int.TryParse(items[4], out var result4) ? result4 : null,
+                    PublicVersionDate = DateTime.TryParse(items[5], out var result) ? result.ToUniversalTime() : null,
+                    DevicePublishDate = DateTime.TryParse(items[6], out var result1) ? result.ToUniversalTime() : null,
+                    DeviceCommDistributionEndDate = DateTime.TryParse(items[7], out var result2) ? result2.ToUniversalTime() : null,
+                    DeviceCommDistributionStatus = items[8].Maxlength(200),
+                    BrandName = items[9].Maxlength(80),
+                    VersionModelNumber = items[10].Maxlength(80),
+                    CatalogNumber = items[11].Maxlength(80),
+                    DunsNumber = items[12].Maxlength(16),
+                    CompanyName = items[13].Maxlength(120).ReplaceSpecialCharacters(),
+                    DeviceCount = int.TryParse(items[14], out var result3) ? result3 : null,
+                    DeviceDescription = items[15].Maxlength(2000).ReplaceSpecialCharacters(),
+                    DmExempt = items[16].AsBoolean(),
+                    PremarketExempt = items[17].AsBoolean(),
+                    DeviceHctp = items[18].AsBoolean(),
+                    DeviceKit = items[19].AsBoolean(),
+                    DeviceCombinationProduct = items[20].AsBoolean(),
+                    SingleUse = items[21].AsBoolean(),
+                    LotBatch = items[22].AsBoolean(),
+                    SerialNumber = items[23].AsBoolean(),
+                    ManufacturingDate = items[24].AsBoolean(),
+                    ExpirationDate = items[25].AsBoolean(),
+                    DonationIdNumber = items[26].AsBoolean(),
+                    LabeledContainsNrl = items[27].AsBoolean(),
+                    LabeledNoNrl = items[28].AsBoolean(),
+                    MriSafetyStatus = items[29].Maxlength(50),
+                    Rx = items[30].AsBoolean(),
+                    Otc = items[31].AsBoolean(),
+                    DeviceSterile = items[32].AsBoolean(),
+                    SterilizationPriorToUse = items[33].AsBoolean()
+                };
+            }
+            catch (Exception ex)
+            {
+                return null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDIdentifier.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDIdentifier.cs
new file mode 100644
index 0000000..0c9d57c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDIdentifier.cs
@@ -0,0 +1,47 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    [Index(nameof(DeviceId), nameof(PrimaryDI), nameof(DeviceIdType), IsUnique = true)]
+    [Index(nameof(DeviceId), nameof(PrimaryDI))]
+    [Index(nameof(DeviceId))]
+    [Index(nameof(PrimaryDI))]
+    public class GUDIDIdentifier
+    {
+        [Key]
+        public int GudidIdentifierId { get; set; }
+        public string PrimaryDI { get; set; }
+        public string DeviceId { get; set; }
+        public string DeviceIdType { get; set; }
+        public string DeviceIdIssuingAgency { get; set; }
+        public string ContainsDINumber { get; set; }
+        public int PkgQuantity { get; set; }
+        public DateTime? PkgDiscontinueDate { get; set; }
+        public string PkgStatus { get; set; }
+        public string PkgType { get; set; }
+        [DefaultValue(false)]
+        public bool IsDeleted { get; set; } = false;
+    }
+
+    [Index(nameof(DeviceId), nameof(PrimaryDI), nameof(DeviceIdType), IsUnique = true)]
+    [Table("gudid_identifiers", Schema = "tmp")]
+    public class TmpGUDIDIdentifier
+    {
+        [Key]
+        public int TmpGudidIdentifierId { get; set; }
+        public string PrimaryDI { get; set; }
+        public string DeviceId { get; set; }
+        public string DeviceIdType { get; set; }
+        public string DeviceIdIssuingAgency { get; set; }
+        public string ContainsDINumber { get; set; }
+        public int PkgQuantity { get; set; }
+        public DateTime? PkgDiscontinueDate { get; set; }
+        public string PkgStatus { get; set; }
+        public string PkgType { get; set; }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDIdentifierExtensions.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDIdentifierExtensions.cs
new file mode 100644
index 0000000..08c1833
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDIdentifierExtensions.cs
@@ -0,0 +1,48 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    public static class GUDIDIdentifierExtensions
+    {
+        public static GUDIDIdentifier GUDIDIdentifier(this string line)
+        {
+            var items = line.Split('|');
+            if (items.Length == 9)
+            {
+                return new GUDIDIdentifier()
+                {
+                    PrimaryDI = items[0],
+                    DeviceId = items[1],
+                    DeviceIdType = items[2],
+                    DeviceIdIssuingAgency = items[3],
+                    ContainsDINumber = items[4],
+                    PkgQuantity = int.TryParse(items[5], out int result) ? result : 0,
+                    PkgDiscontinueDate = DateTime.TryParse(items[6], out var date) ? date.ToUniversalTime() : null,
+                    PkgStatus = items[7],
+                    PkgType = items[8]
+                };
+            }
+            return null;
+        }
+        public static TmpGUDIDIdentifier TmpGUDIDIdentifier(this string line)
+        {
+            var items = line.Split('|');
+            if (items.Length == 9)
+            {
+                return new TmpGUDIDIdentifier()
+                {
+                    PrimaryDI = items[0],
+                    DeviceId = items[1],
+                    DeviceIdType = items[2],
+                    DeviceIdIssuingAgency = items[3],
+                    ContainsDINumber = items[4],
+                    PkgQuantity = int.TryParse(items[5], out int result) ? result : 0,
+                    PkgDiscontinueDate = DateTime.TryParse(items[6], out var date) ? date.ToUniversalTime() : null,
+                    PkgStatus = items[7],
+                    PkgType = items[8]
+                };
+            }
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDService.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDService.cs
new file mode 100644
index 0000000..f104e37
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDService.cs
@@ -0,0 +1,157 @@
+using EFCore.BulkExtensions;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    public class GUDIDService : IGUDIDService
+    {
+        private readonly CentralDbContext _centralDbContext;
+        private readonly ILogger<GUDIDService> _logger;
+        private readonly IHubContext<NotificationHub, INotificationHub> _notificationHubContext;
+
+        public GUDIDService(CentralDbContext centralDbContext,
+            IHubContext<NotificationHub, INotificationHub> notificationHubContext,
+            ILogger<GUDIDService> logger)
+        {
+            _centralDbContext = centralDbContext;
+            _notificationHubContext = notificationHubContext;
+            _logger = logger;
+        }
+
+        public async Task SeedGUDID(string schemaName, string tableName, Stream stream, string fileName, string userName, CancellationToken cancellationToken)
+        {
+            var toastKey = userName + fileName;
+            var hub = _notificationHubContext.Clients.Group(toastKey);
+
+            await hub.SendUploadFileStart(toastKey, fileName);
+
+            try
+            {
+                switch (tableName)
+                {
+                    case "gudid_identifiers":
+                        await SeedTable<TmpGUDIDIdentifier>(schemaName, tableName, stream, TmpGudidIdentifierFunc, cancellationToken);
+                        break;
+                    case "gudid_terms":
+                        await SeedTable<GUDIDTerm>(schemaName, tableName, stream, TmpGudidTermFunc, cancellationToken);
+                        break;
+                    case "gudid_devices":
+                        await SeedTable<GUDIDDevice>(schemaName, tableName, stream, TmpGudidDevicesFunc, cancellationToken);
+                        break;
+                }
+
+                await hub.SendUploadFileFinish(toastKey, fileName);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, ex.Message, ex.StackTrace, nameof(SeedGUDID));
+                await hub.SendUploadFileError(toastKey, fileName);
+            }
+        }
+
+        public async Task SeedTable<TEntity>(string schemaName, string tableName, Stream stream,
+            Func<string[], HashSet<(string, string, string)>, bool> function, CancellationToken cancellationToken) where TEntity : class
+        {
+            string line;
+            var identifiersLookup = new HashSet<(string, string, string)>();
+            // Truncate existing data
+            _centralDbContext.Database.SetCommandTimeout(TimeSpan.FromMinutes(10));
+            _logger.LogServiceInformation("Begin table truncate");
+            await _centralDbContext.TruncateAsync<TEntity>(cancellationToken: cancellationToken);
+            _logger.LogServiceInformation("End table truncate");
+            await using var importer = await _centralDbContext.BeginTextImportAsync<TEntity>(cancellationToken: cancellationToken);
+            using var reader = new StreamReader(stream, bufferSize: 1024 * 64);
+            _logger.LogServiceInformation("Begin streaming file");
+            await reader.ReadLineAsync(cancellationToken); // Skip header line
+            do
+            {
+                line = await reader.ReadLineAsync(cancellationToken);
+                if (string.IsNullOrEmpty(line) || line.Length == 0) { continue; }
+                var items = line.Split('|');
+                if (!(function?.Invoke(items, identifiersLookup) ?? true)) { continue; }
+                line = string.Join("|", items);
+                importer.WriteLine(line);
+            } while (line != null);
+            _logger.LogServiceInformation("End streaming file");
+            
+        }
+
+        public static bool TmpGudidDevicesFunc(string[] items, HashSet<(string, string, string)> identifiersLookup) 
+        {
+            if (items.Length != 34) { return false; }
+
+            try
+            {
+                int? tmp = int.TryParse(items[4], out var result4) ? result4 : null;
+                items[4] = tmp?.ToString();
+                DateTime? PublicVersionDate = DateTime.TryParse(items[5], out var date) ? date.ToUniversalTime() : null;
+                items[5] = PublicVersionDate?.ToString("o") ?? "\\N"; // format this date, use the postgres nullable placeholder
+                DateTime? DevicePublishDate = DateTime.TryParse(items[6], out var date2) ? date2.ToUniversalTime() : null;
+                items[6] = DevicePublishDate?.ToString("o") ?? "\\N"; // format this date, use the postgres nullable placeholder
+                DateTime? DeviceCommDistributionEndDate = DateTime.TryParse(items[7], out var date3) ? date3.ToUniversalTime() : null;
+                items[7] = DeviceCommDistributionEndDate?.ToString("o") ?? "\\N"; // format this date, use the postgres nullable placeholder
+                items[8] = items[8].Maxlength(200);
+                items[9] = items[9].ReplaceSpecialCharacters().Maxlength(80);
+                items[10] = items[10].Maxlength(80);
+                items[11] = items[11].Maxlength(80);
+                items[12] = items[12].Maxlength(16);
+                items[13] = items[13].ReplaceSpecialCharacters().Maxlength(120);
+                int? tmp2 = int.TryParse(items[14], out var result3) ? result3 : null;
+                items[14] = tmp2?.ToString();
+                items[15] = items[15].ReplaceSpecialCharacters().Maxlength(2000);
+                items[29] = items[29].Maxlength(50);
+
+                for (var i = 16; i < 34; i++)
+                {
+                    if (i == 29) continue;
+                    items[i] = items[i].TrueFalse();
+                }
+            }
+            catch (Exception ex)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public static bool TmpGudidTermFunc(string[] items, HashSet<(string, string, string)> identifiersLookup)
+        {
+            if (items.Length != 6) { return false; }
+            items[1].ReplaceSpecialCharacters();
+            items[4] = items[4] == "Active" ? "0" : "1";
+            items[5] = items[5].ToLower() == "true" ? "true" : "false";
+
+            return true; 
+        }
+
+        public static bool TmpGudidIdentifierFunc(string[] items, HashSet<(string, string, string)> identifiersLookup)
+        {
+            if (items.Length != 9) { return false; } // 9 items
+            if (identifiersLookup.Contains((items[0], items[1], items[2]))) { return false; } // check for duplicates
+            identifiersLookup.Add((items[0], items[1], items[2]));
+            if (string.IsNullOrEmpty(items[5])) items[5] = "0"; // the default for this columns is 0
+            if (items[6].Length > 0)
+            {
+                DateTime? PkgDiscontinueDate = DateTime.TryParse(items[6], out var date) ? date.ToUniversalTime() : null;
+                items[6] = PkgDiscontinueDate?.ToString("o") ?? "\\N"; // format this date, use the postgres nullable placeholder
+            }
+            items.ForEach((item, idx) =>
+            {
+                if (string.IsNullOrEmpty(item)) { items[idx] = "\\N"; } // use the postgres nullable placeholder
+            });
+            return true;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDTerm.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDTerm.cs
new file mode 100644
index 0000000..3564fc4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/GUDIDTerm.cs
@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    [Index(nameof(PrimaryDI))]
+    public class GUDIDTerm
+    {
+        [Key]
+        public int GUDIDTermId { get; set; }
+        public string PrimaryDI { get; set; }
+        [MaxLength(150)]
+        public string GMDNPTName { get; set; }
+        [MaxLength(2000)]
+        public string GMDNPTDefinition { get; set; }
+        public string GMDNCode { get; set; }
+        public GMDNCodeStatus GMDNCodeStatus { get; set; }
+        public bool Implantable { get; set; }
+    }
+
+    public enum GMDNCodeStatus
+    {
+        Active,
+        Obsolete
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/IGMDNService.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/IGMDNService.cs
new file mode 100644
index 0000000..0170822
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/IGMDNService.cs
@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    public interface IGMDNService
+    {
+        Task SeedGMDNCategories(IFormFile gmdnTermCategoryFile, string userName, CancellationToken cancellationToken);
+        Task SeedGMDNTermCategories(IFormFile gmdnTermCategoryFile, string userName, CancellationToken cancellationToken);
+        Task SeedGMDNTerms(IFormFile gmdnTermFile, string userName, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/IGUDIDService.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/IGUDIDService.cs
new file mode 100644
index 0000000..35fff42
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/IGUDIDService.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN
+{
+    public interface IGUDIDService
+    {
+        Task SeedGUDID(string schemaName, string tableName, Stream stream, string fileName, string userName, CancellationToken cancellationToken);
+
+        Task SeedTable<TEntity>(string schemaName, string tableName, Stream stream, Func<string[], HashSet<(string, string, string)>, bool> function, CancellationToken cancellationToken) where TEntity : class;
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceIdentifierClearingJob.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceIdentifierClearingJob.cs
new file mode 100644
index 0000000..2db72a1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceIdentifierClearingJob.cs
@@ -0,0 +1,36 @@
+using Hangfire;
+using Strata.ContinuousImprovement.Biz.ClientLicense;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN.Jobs
+{
+    public class DeviceIdentifierClearingJob
+    {
+        private readonly IClientLicenseService _clientFilterService;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+
+        public DeviceIdentifierClearingJob(
+            IClientLicenseService clientFilterService,
+            IBackgroundJobClient backgroundJobClient)
+        {
+            _clientFilterService = clientFilterService;
+            _backgroundJobClient = backgroundJobClient;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Clear Device Identifier Dimension in JAZZ for all non-licensed CI clients")]
+        public async Task ClearDimDeviceIdentifierFromJazz(CancellationToken cancellationToken)
+        {
+            // Get non-licensed clients (isLicensed: false)
+            var clearClients = await _clientFilterService.GetEligibleCIClientsAsync(isLicensed: false, cancellationToken);
+
+            foreach (var client in clearClients)
+            {
+                _backgroundJobClient.Enqueue<DeviceIdentifierClientClearingJob>(job
+                    => job.ClearClientDimDeviceIdentifier(client.DatabaseGUID, client.StrataId, cancellationToken));
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceIdentifierClientClearingJob.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceIdentifierClientClearingJob.cs
new file mode 100644
index 0000000..c68a83b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceIdentifierClientClearingJob.cs
@@ -0,0 +1,79 @@
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN.Jobs
+{
+    class DeviceIdentifierClientClearingJob
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly ILogger<DeviceIdentifierClientClearingJob> _logger;
+
+        public DeviceIdentifierClientClearingJob(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            ILogger<DeviceIdentifierClientClearingJob> logger)
+        {
+            _dbContextFactory = dbContextFactory;
+            _logger = logger;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Clear Device Identifier Dimension in Jazz for client ({1})")]
+        [Semaphore(nameof(ClearClientDimDeviceIdentifier))]
+        [CaptureJobParameter(DatabaseGuidArgumentPosition = 0, StrataIdArgumentPosition = 1)]
+        public async Task ClearClientDimDeviceIdentifier(Guid databaseGuid, int strataId, CancellationToken cancellationToken)
+        {
+            await using var jazzDbContext = GetDbContext(cancellationToken).Result;
+
+            try
+            {
+                // Get all device identifiers (exclude not-specified record)
+                var deviceIdentifiers = await jazzDbContext.DimDeviceIdentifiers
+                    .Where(s => !string.IsNullOrEmpty(s.DeviceIdentifier)) // "" = Not Specified
+                    .Select(s => s.DeviceIdentifier)
+                    .ToListAsync(cancellationToken);
+
+                var totalRowsAffected = 0;
+
+                foreach (var batch in deviceIdentifiers.Batch(500))
+                {
+                    var identifiersToRemove = await jazzDbContext.DimDeviceIdentifiers
+                        .Where(s => batch.Contains(s.DeviceIdentifier))
+                        .ToListAsync(cancellationToken);
+
+                    jazzDbContext.DimDeviceIdentifiers.RemoveRange(identifiersToRemove);
+                    var rowsAffected = await jazzDbContext.SaveChangesAsync(cancellationToken);
+                    totalRowsAffected += rowsAffected;
+                }
+
+                if (totalRowsAffected > 0)
+                {
+                    _logger.LogInformation("Cleared {TotalCount} device identifier records for client {StrataId}", totalRowsAffected, strataId);
+                }
+                else
+                {
+                    _logger.LogInformation("No device identifier records to clear for client {StrataId}", strataId);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogMappingJobError(ex, jazzDbContext, "Error clearing device identifier dimension");
+                throw;
+            }
+        }
+
+        private async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceIdentifierClientMappingJob.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceIdentifierClientMappingJob.cs
new file mode 100644
index 0000000..26e2b5a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceIdentifierClientMappingJob.cs
@@ -0,0 +1,151 @@
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.Cube;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN.Jobs
+{
+    public class DeviceIdentifierClientMappingJob
+    {
+        private readonly CentralDbContext _centralDbContext;
+        protected readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+        private readonly ILogger<DeviceIdentifierClientMappingJob> _logger;
+        private readonly ICubeService _cubeService;
+
+
+        public DeviceIdentifierClientMappingJob(
+             CentralDbContext centralDbContext,
+             IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+             IBackgroundJobClient backgroundJobClient,
+             ILogger<DeviceIdentifierClientMappingJob> logger,
+             ICubeService cubeService)
+        {
+            _centralDbContext = centralDbContext;
+            _dbContextFactory = dbContextFactory;
+            _backgroundJobClient = backgroundJobClient;
+            _logger = logger;
+            _cubeService = cubeService;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Map DimDeviceIdentifier to Client Jazz DB ({1})")]
+        [Semaphore(nameof(MapClientDimDeviceIdentifier))]
+        [CaptureJobParameter(DatabaseGuidArgumentPosition = 0, StrataIdArgumentPosition = 1)]
+        public async Task MapClientDimDeviceIdentifier(Guid databaseGuid, int strataId, CancellationToken cancellationToken)
+        {
+            try
+            {
+                if (await _cubeService.IsCubeRunningAsync(cancellationToken))
+                {
+                    await RetryMapClientDimDeviceIdentifierAsync(databaseGuid, strataId, 1, cancellationToken);
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, "CubeService Error mapping DimDeviceIdentifier to Jazz",
+                    new Dictionary<string, object> {
+                        { "db", new Dictionary<string, object>
+                            {
+                                { "databaseGuid", databaseGuid},
+                                { "strataId", strataId }
+                            }
+                        }
+                    });
+            }
+
+            await using var jazzDbContext = GetDbContext(cancellationToken).Result;
+            try
+            {
+
+                var supplies = await jazzDbContext.DimSupply
+                    .Where(s => !string.IsNullOrEmpty(s.DeviceIdentifier))
+                    .Select(s => s.DeviceIdentifier).ToListAsync(cancellationToken);
+
+                foreach (var batch in supplies.Batch(500))
+                {
+                    var centralRecords = await _centralDbContext.DeviceIdentifierDimension
+                        .Where(x => batch.Contains(x.DeviceIdentifier))
+                        .ToListAsync(cancellationToken);
+                    var jazzRecords = await jazzDbContext.DimDeviceIdentifiers
+                        .Where(x => batch.Contains(x.DeviceIdentifier))
+                        .ToListAsync(cancellationToken);
+                    var updates = centralRecords
+                        .GroupJoin(jazzRecords, cr => cr.DeviceIdentifier, jr => jr.DeviceIdentifier,
+                            (centralRecord, jazzRecord) => new
+                            {
+                                centralRecord,
+                                jazzRecord = jazzRecord.DefaultIfEmpty().FirstOrDefault()
+                            })
+                        .ToList();
+                    await jazzDbContext.DimDeviceIdentifiers.AddRangeAsync(updates.Where(update => update.jazzRecord == null)
+                        .Select(update => update.centralRecord.MapToJazzModel()), cancellationToken);
+                    foreach (var update in updates.Where(update => update.jazzRecord != null && update.jazzRecord.HasChanges(update.centralRecord)))
+                    {
+                        update.jazzRecord.Update(update.centralRecord);
+                        jazzDbContext.DimDeviceIdentifiers.Update(update.jazzRecord);
+                    }
+
+                    // save batch
+                    await jazzDbContext.SaveChangesAsync(cancellationToken);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex.Message.Contains("Invalid column name 'DeviceIdentifier'."))
+                {
+                    _logger.LogMappingJobInformation(ex, jazzDbContext, "Error mapping DimDeviceIdentifier to Jazz");
+                }
+                else
+                {
+                    _logger.LogMappingJobError(ex, jazzDbContext, "Error mapping DimDeviceIdentifier to Jazz");
+                }
+            }
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Map DimDeviceIdentifier to Client Jazz DB ({1})")]
+        [CaptureJobParameter(DatabaseGuidArgumentPosition = 0, StrataIdArgumentPosition = 1)]
+        public async Task RetryMapClientDimDeviceIdentifierAsync(Guid databaseGuid, int strataId, int tries, CancellationToken cancellationToken)
+        {
+            if (tries > 5) { return; }
+            if (await _cubeService.IsCubeRunningAsync(cancellationToken))
+            {
+                _logger.LogServiceInformation("Cannot map device identifier dimension to client db while cube is processing",
+                    new Dictionary<string, object> {
+                        { "db", new Dictionary<string, object>
+                            {
+                                { "databaseGuid", databaseGuid},
+                                { "strataId", strataId }
+                            }
+                        }
+                    });
+
+                _backgroundJobClient.Schedule<DeviceIdentifierClientMappingJob>(job
+                    => job.RetryMapClientDimDeviceIdentifierAsync(databaseGuid, strataId, tries + 1, cancellationToken), TimeSpan.FromMinutes(30));
+            }
+            else
+            {
+                _backgroundJobClient.Enqueue<DeviceIdentifierClientMappingJob>(job
+                => job.MapClientDimDeviceIdentifier(databaseGuid, strataId, cancellationToken));
+            }
+        }
+
+        public async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceIdentifierMappingJob.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceIdentifierMappingJob.cs
new file mode 100644
index 0000000..3e29f2f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceIdentifierMappingJob.cs
@@ -0,0 +1,70 @@
+using Hangfire;
+using Strata.ContinuousImprovement.Biz.ClientLicense;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.Id.Client;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN.Jobs
+{
+    class DeviceIdentifierMappingJob
+    {
+        private readonly IClientLicenseService _clientLicenseService;
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+
+        public DeviceIdentifierMappingJob(
+            IClientLicenseService clientLicenseService,
+            IIdServiceClient idServiceClient,
+            IBackgroundJobClient backgroundJobClient)
+        {
+            _clientLicenseService = clientLicenseService;
+            _idServiceClient = idServiceClient;
+            _backgroundJobClient = backgroundJobClient;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Update Device Identifier Dimension in JAZZ for all clients")]
+        public async Task MapDimDeviceIdentifierToJazz(CancellationToken cancellationToken)
+        {
+            // Get licensed clients (isLicensed: true)
+            var refreshClients = await _clientLicenseService.GetEligibleCIClientsAsync(isLicensed: true, cancellationToken);
+
+            foreach (var client in refreshClients)
+            {
+                if (client.IsInMaintenanceMode)
+                {
+                    _backgroundJobClient.Schedule<DeviceIdentifierMappingJob>(job
+                        => job.MapDimDeviceIdentifierToJazzInMaintenanceMode(client.StrataId, 1, cancellationToken),
+                        TimeSpan.FromMinutes(30));
+                }
+                else
+                {
+                    _backgroundJobClient.Enqueue<DeviceIdentifierClientMappingJob>(job
+                    => job.MapClientDimDeviceIdentifier(client.DatabaseGUID, client.StrataId, cancellationToken));
+                }
+            }
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Update Device Identifier Dimension in JAZZ for client in maintenance mode ({0})")]
+        public async Task MapDimDeviceIdentifierToJazzInMaintenanceMode(int strataId, int tries, CancellationToken cancellationToken)
+        {
+            if (tries > 5) { return; }
+            var client = await _idServiceClient.GetStrataId(strataId, cancellationToken);
+            if (client == null) { return; }
+            if (client.IsInMaintenanceMode)
+            {
+                _backgroundJobClient.Schedule<DeviceIdentifierMappingJob>(job
+                    => job.MapDimDeviceIdentifierToJazzInMaintenanceMode(client.StrataId, tries + 1, cancellationToken), TimeSpan.FromMinutes(30));
+            }
+            else
+            {
+                if (client == null) { return; }
+                _backgroundJobClient.Enqueue<DeviceIdentifierClientMappingJob>(job
+                => job.MapClientDimDeviceIdentifier(client.DatabaseGUID, client.StrataId, cancellationToken));
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceTermCategory.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceTermCategory.cs
new file mode 100644
index 0000000..ec2494e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/DeviceTermCategory.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN.Jobs
+{
+    public class DeviceTermCategory
+    {
+        public string CategoryName { get; set; }
+        public string TermCode { get; set; }
+        public string TermName { get; set; }
+        public string TermDefinition { get; set; }
+        public string Path { get; set; }
+        public int NodeId { get; set; }
+    }
+
+    public static class DeviceTermCategoryExtensions
+    {
+        public static string GetHierarchyNameAtIndex(this List<DeviceTermCategory> deviceTermCategories, string[] hierarchies, int index)
+        {
+            return deviceTermCategories.Where(x => x.NodeId.ToString() == hierarchies.ElementAtOrDefault(index))
+                                       .Select(x => x.CategoryName).FirstOrDefault() ?? "";
+        }
+
+        public static string[] GetHierarchiesFromPath(this List<DeviceTermCategory> deviceTermCategories, string hierarchyPath)
+        {
+            // Get the longest path for this hierarchy with the greatest node value
+            var fullPath = deviceTermCategories.Where(x => x.Path.StartsWith(hierarchyPath))
+                                               .OrderByDescending(x => x.Path.Length).ThenByDescending(x => x.NodeId)
+                                               .Select(x => x.Path).FirstOrDefault();
+
+            // skip first and last elements (path is wrapped in "/" causing empty elements during split)
+            return fullPath?[1..^1].Split("/");
+        }
+    }
+}
+
+
+
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/GMDNFTPSection.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/GMDNFTPSection.cs
new file mode 100644
index 0000000..7113dcc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/GMDNFTPSection.cs
@@ -0,0 +1,15 @@
+namespace Strata.ContinuousImprovement.Biz.GMDN.Jobs
+{
+    public class GMDNFTPSection
+    {
+        public string FTPHostUrl { get; set; }
+        public UserInfo TermUser { get; set; }
+        public UserInfo CategoryUser { get; set; }
+    }
+
+    public class UserInfo
+    {
+        public string UserName { get; set; }
+        public string Password { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/GMDNMonthlyUpdateJob.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/GMDNMonthlyUpdateJob.cs
new file mode 100644
index 0000000..e8dbb00
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/GMDNMonthlyUpdateJob.cs
@@ -0,0 +1,92 @@
+using FluentFTP;
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using static Strata.ContinuousImprovement.Biz.GMDN.GMDNService;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN.Jobs
+{
+    public class GMDNMonthlyUpdateJob
+    {
+        private readonly CentralDbContext _centralDbContext;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+        private readonly ILogger<GMDNMonthlyUpdateJob> _logger;
+        private readonly GMDNFTPSection _gmdnFTPInfo;
+
+        public GMDNMonthlyUpdateJob(
+           CentralDbContext centralDbContext,
+           IBackgroundJobClient backgroundJobClient,
+           IOptions<GMDNFTPSection> sectionAccessor,
+           ILogger<GMDNMonthlyUpdateJob> logger)
+        {
+            _centralDbContext = centralDbContext;
+            _backgroundJobClient = backgroundJobClient;
+            _gmdnFTPInfo = sectionAccessor.Value ?? throw new ArgumentNullException(nameof(sectionAccessor));
+            _logger = logger;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Refresh GMDN Data and Reseed Device Identifier Dimension")]
+        [Semaphore(nameof(GMDNMonthlyUpdateJob.RefreshGMDNData))]        
+        public async Task RefreshGMDNData(CancellationToken cancellationToken)
+        {
+            try
+            {
+                // Read GMDN files from FTP and re-populate tables
+                await RefreshGMDNTerms();
+                await RefreshGMDNCategories();
+          
+                // Reseed PrimaryDI Dimension w/ updated data
+                _backgroundJobClient.Enqueue<SeedDeviceIdentifierDimensionJob>(job
+                    => job.SeedDeviceIdentifierDimension(cancellationToken));                
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+            }
+        }
+
+        private async Task RefreshGMDNTerms()
+        {
+            var termsClient = new FtpClient(_gmdnFTPInfo.FTPHostUrl, _gmdnFTPInfo.TermUser.UserName, _gmdnFTPInfo.TermUser.Password, 21, new FtpConfig() { EncryptionMode = FtpEncryptionMode.Explicit});
+            var termFile = FTPClientExtensions.DeserializeZippedXMLFromFTP<GMDNTermsFile>(termsClient, "gmdnData", "gmdn");
+
+            if (termFile.terms.Any())
+            {
+                await _centralDbContext.Database.ExecuteSqlRawAsync("TRUNCATE TABLE public.gmdn_terms RESTART IDENTITY;");
+                await _centralDbContext.GMDNTerms.AddRangeAsync(termFile.terms);
+                await _centralDbContext.SaveChangesAsync();
+            }
+        }
+
+        private async Task RefreshGMDNCategories()
+        {
+            var categoryClient = new FtpClient(_gmdnFTPInfo.FTPHostUrl, _gmdnFTPInfo.CategoryUser.UserName, _gmdnFTPInfo.CategoryUser.Password, 21, new FtpConfig() { EncryptionMode = FtpEncryptionMode.Explicit });
+            var categoryFile = FTPClientExtensions.DeserializeZippedXMLFromFTP<GMDNCategoriesFile>(categoryClient, "gmdn_category_en_", "gmdn");
+
+            if (categoryFile.categories.Any())
+            {
+                await _centralDbContext.Database.ExecuteSqlRawAsync("TRUNCATE TABLE public.gmdn_categories RESTART IDENTITY;");
+                await _centralDbContext.GMDNCategories.AddRangeAsync(categoryFile.categories);
+                await _centralDbContext.SaveChangesAsync();
+            }
+
+            var termCategoryFile = FTPClientExtensions.DeserializeZippedXMLFromFTP<GMDNTermCategoriesFile>(categoryClient, "gmdn_categoryTermLink_en_", "gmdn");
+            if (termCategoryFile.termCategories.Any())
+            {
+                await _centralDbContext.Database.ExecuteSqlRawAsync("TRUNCATE TABLE public.gmdn_term_categories RESTART IDENTITY;");
+                await _centralDbContext.GMDNTermCategories.AddRangeAsync(termCategoryFile.termCategories);
+                await _centralDbContext.SaveChangesAsync();
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/GUDIDDeviceDailyUpdateJob.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/GUDIDDeviceDailyUpdateJob.cs
new file mode 100644
index 0000000..4afb082
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/GUDIDDeviceDailyUpdateJob.cs
@@ -0,0 +1,164 @@
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using RestSharp;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN.Jobs
+{
+    public class GUDIDDeviceDailyUpdateJob : IGUDIDDeviceDailyUpdateJob
+    {
+        private readonly CentralDbContext _centralDbContext;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+        private readonly ILogger<GUDIDDeviceDailyUpdateJob> _logger;
+        private readonly RestClient _restClient = new RestClient(new RestClientOptions(@"https://accessgudid.nlm.nih.gov/api/v2"));
+
+        public GUDIDDeviceDailyUpdateJob(
+            CentralDbContext centralDbContext,
+            IBackgroundJobClient backgroundJobClient,
+            ILogger<GUDIDDeviceDailyUpdateJob> logger)
+        {
+            _centralDbContext = centralDbContext;
+            _backgroundJobClient = backgroundJobClient;
+            _logger = logger;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Refresh GUDID Devices")]
+        [Semaphore(nameof(GUDIDDeviceDailyUpdateJob.GUDIDDeviceDailyUpdate))]
+        public async Task GUDIDDeviceDailyUpdate(CancellationToken cancellationToken)
+        {
+            var maxPublicVersionDate = (await _centralDbContext.GUDIDDevices.MaxAsync(d => d.PublicVersionDate)) ?? DateTime.MinValue;
+            var fromDate = maxPublicVersionDate.ToString("yyyyMMdd");
+            var request = new RestRequest("devices/implantable/list.json");
+            request.AddOrUpdateParameter("from_date", fromDate);
+            request.AddOrUpdateParameter("per_page", "100");
+            request.AddOrUpdateParameter("page", "1");
+            var response = await _restClient.GetAsync<GUDID>(request);
+            for (var pageNo = 1; pageNo < response.Metadata.TotalPages; pageNo++)
+            {
+                _backgroundJobClient.Enqueue<GUDIDDeviceDailyUpdateJob>((job) =>
+                    job.GUDIDDeviceDailyPageUpdate(fromDate, pageNo, cancellationToken));
+            }
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Refresh GUDID Devices for page {1}")]
+        [Semaphore(nameof(GUDIDDeviceDailyUpdateJob.GUDIDDeviceDailyPageUpdate))]
+        public async Task GUDIDDeviceDailyPageUpdate(string fromDate, int pageNo, CancellationToken cancellationToken)
+        {
+            var request = new RestRequest("devices/implantable/list.json");
+            request.AddOrUpdateParameter("from_date", fromDate);
+            request.AddOrUpdateParameter("per_page", "100");
+            request.AddOrUpdateParameter("page", $"{pageNo}");
+            var response = await _restClient.GetAsync<GUDID>(request);
+            var newDevices = response.Devices
+                .Where(d => !_centralDbContext.GUDIDDevices.Any(g => g.PrimaryDi == d.DeviceId))
+                .Select(d => GUDIDDevice(d));
+            var updatedDevices = response.Devices
+                .Where(d => _centralDbContext.GUDIDDevices.Any(g => g.PrimaryDi == d.DeviceId))
+                .Select(d => GUDIDDevice(d));
+            try
+            {
+                if (newDevices.Any())
+                {
+                    await _centralDbContext.GUDIDDevices.AddRangeAsync(newDevices);
+                }
+                if (updatedDevices.Any())
+                {
+                    _centralDbContext.GUDIDDevices.UpdateRange(updatedDevices);
+                }
+                var dict = new Dictionary<string, object>
+                    {
+                        {"Page", pageNo },
+                        {"Total Pages", response.Metadata.TotalPages },
+                        {"New Devices", newDevices.Count() },
+                        {"Updated Devices", updatedDevices.Count() }
+                    };
+                _logger.LogServiceInformation(nameof(GUDIDDeviceDailyUpdate).SplitCamelCase(), dict);
+                await _centralDbContext.SaveChangesAsync(cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+                throw;
+            }
+        }
+
+        private DateTime MaxDateTime(DateTime date1, DateTime date2)
+            => new DateTime(Math.Max(date1.Ticks, date2.Ticks));
+
+        public GUDIDDevice GUDIDDevice(Device device)
+        {
+            var guididDevice = _centralDbContext.GUDIDDevices.FirstOrDefault(d => d.PrimaryDi == device.DeviceId);
+            return guididDevice == null ? new GUDIDDevice
+            {
+                PrimaryDi = device.DeviceId,
+                PublicDeviceRecordKey = device.PublicDeviceRecordKey,
+                PublicVersionNumber = device.PublicVersionNumber,
+                PublicVersionDate = device.PublicVersionDate,
+                BrandName = device.BrandName,
+                CompanyName = device.CompanyName,
+                VersionModelNumber = device.VersionModelNumber,
+                DunsNumber = device.DunsNumber,
+                MriSafetyStatus = device.MriSafetyStatus,
+                LabeledContainsNrl = device.LabeledContainsNRL,
+                DeviceRecordStatus = device.DeviceRecordStatus
+            } : GUDIDDevice(device, guididDevice);
+        }
+
+        public GUDIDDevice GUDIDDevice(Device device, GUDIDDevice gudidDevice)
+        {
+            gudidDevice.PublicDeviceRecordKey = device.PublicDeviceRecordKey;
+            gudidDevice.PublicVersionNumber = device.PublicVersionNumber;
+            gudidDevice.PublicVersionDate = device.PublicVersionDate;
+            gudidDevice.BrandName = device.BrandName;
+            gudidDevice.CompanyName = device.CompanyName;
+            gudidDevice.VersionModelNumber = device.VersionModelNumber;
+            gudidDevice.DunsNumber = device.DunsNumber;
+            gudidDevice.MriSafetyStatus = device.MriSafetyStatus;
+            gudidDevice.LabeledContainsNrl = device.LabeledContainsNRL;
+            gudidDevice.DeviceRecordStatus = device.DeviceRecordStatus;
+            return gudidDevice;
+        }
+
+        public class Device
+        {
+            public string DeviceId { get; set; }
+            public string DeviceIdIssuingAgency { get; set; }
+            public string PublicDeviceRecordKey { get; set; }
+            public int PublicVersionNumber { get; set; }
+            public DateTime PublicVersionDate { get; set; }
+            public string BrandName { get; set; }
+            public string CompanyName { get; set; }
+            public string VersionModelNumber { get; set; }
+            public string DunsNumber { get; set; }
+            public string MriSafetyStatus { get; set; }
+            public bool LabeledContainsNRL { get; set; }
+            public List<string> GmdnPTName { get; set; }
+            public string DeviceRecordStatus { get; set; }
+            public DateTime CreationDate { get; set; }
+        }
+
+        public class Metadata
+        {
+            public int Page { get; set; }
+            public int TotalPages { get; set; }
+            public int TotalResults { get; set; }
+        }
+
+        public class GUDID
+        {
+            public Metadata Metadata { get; set; }
+            public List<Device> Devices { get; set; }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/IGUDIDDeviceDailyUpdateJob.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/IGUDIDDeviceDailyUpdateJob.cs
new file mode 100644
index 0000000..d054b63
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/IGUDIDDeviceDailyUpdateJob.cs
@@ -0,0 +1,11 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN.Jobs
+{
+    public interface IGUDIDDeviceDailyUpdateJob
+    {
+        Task GUDIDDeviceDailyUpdate(CancellationToken cancellationToken);
+        Task GUDIDDeviceDailyPageUpdate(string fromDate, int pageNo, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/SeedDeviceIdentifierDimensionJob.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/SeedDeviceIdentifierDimensionJob.cs
new file mode 100644
index 0000000..9248cf6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/SeedDeviceIdentifierDimensionJob.cs
@@ -0,0 +1,205 @@
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN.Jobs
+{
+    public partial class SeedDeviceIdentifierDimensionJob
+    {
+        private readonly CentralDbContext _centralDbContext;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+        private readonly ILogger<SeedDeviceIdentifierDimensionJob> _logger;
+        private const string FeaturedAttributePath = "/1/";
+        private const string NamesPath = "/3/";
+        private const string AnatomicalSpecialtyPath = "/4/";
+        private const string MaterialsPath = "/887/";
+        private const string PowerPath = "/888/";
+        private const string UserFrequencyPath = "/890/";
+        private const string InvasivenessPath = "/898/";
+        private const string DeviceFunctionPath = "/4941/";
+
+        public SeedDeviceIdentifierDimensionJob(CentralDbContext centralDbContext,
+            IBackgroundJobClient backgroundJobClient,
+            ILogger<SeedDeviceIdentifierDimensionJob> logger)
+        {
+            _centralDbContext = centralDbContext;
+            _backgroundJobClient = backgroundJobClient;
+            _logger = logger;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Seed DeviceIdentifierDimension")]
+        [Semaphore(nameof(SeedDeviceIdentifierDimension))]
+        public async Task SeedDeviceIdentifierDimension(CancellationToken cancellationToken)
+        {
+            _logger.LogServiceInformation($"{nameof(SeedDeviceIdentifierDimension)} Job Started.");
+            var startTime = DateTime.Now;
+            _centralDbContext.Database.SetCommandTimeout(TimeSpan.FromMinutes(10));
+            _centralDbContext.Database.ExecuteSqlRaw("TRUNCATE TABLE public.device_identifier_dimension;");
+
+            var totalBatches = 10;
+            var batchSize = (int)Math.Ceiling(_centralDbContext.DeviceIdentifierTerms.Count().DivideBy(totalBatches));
+            var currentBatch = 1;
+
+            while (currentBatch <= totalBatches)
+            {
+                _backgroundJobClient.Enqueue<SeedDeviceIdentifierDimensionJob>(job =>
+                    job.SeedDeviceIdentifierDimensionBatch(totalBatches, currentBatch, batchSize));
+                currentBatch++;
+            }
+
+            _logger.LogServiceInformation($"{nameof(SeedDeviceIdentifierDimension)} Job Finished, elapsed time: {TimeSpan.FromSeconds(DateTime.Now.Subtract(startTime).Minutes)}");
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Seed DeviceIdentifierDimension Batch ({1} of {0})")]
+        [Semaphore(nameof(SeedDeviceIdentifierDimensionBatch))]
+        public async Task SeedDeviceIdentifierDimensionBatch(int totalBatches, int batch, int batchSize)
+        {
+            try
+            {
+                _logger.LogServiceInformation($"{nameof(SeedDeviceIdentifierDimensionBatch)} Batch {batch} of {totalBatches} Job Started.");
+                var startTime = DateTime.Now;
+                _centralDbContext.Database.SetCommandTimeout(TimeSpan.FromMinutes(10));
+
+                var deviceTerms = (from gudidDeviceTerms in _centralDbContext.DeviceIdentifierTerms.AsNoTracking()
+                                   .Where(device => device.RowNumber == 1)
+                                   .OrderBy(x => x.DeviceId).Skip((batch - 1) * batchSize).Take(batchSize)
+                                   select new { gudidDeviceTerms.DeviceId, gudidDeviceTerms.DeviceIdType, gudidDeviceTerms.PrimaryDI, gudidDeviceTerms.CompanyName, gudidDeviceTerms.GMDNCode }).ToList();
+
+                var termCategories = (from gmdnTerms in _centralDbContext.GMDNTerms.AsNoTracking()
+                                      join gmdnTermCategories in _centralDbContext.GMDNTermCategories.AsNoTracking() on gmdnTerms.TermCode equals gmdnTermCategories.TermCode
+                                      join gmdnCategories in _centralDbContext.GMDNCategories.AsNoTracking() on gmdnTermCategories.CategoryCode equals gmdnCategories.CategoryCode
+                                      select new { gmdnTerms.TermCode, gmdnTerms.TermName, gmdnTerms.TermDefinition, gmdnCategories.Name, gmdnCategories.Path, gmdnCategories.NodeId }).ToList();
+
+                var totalUpdates = 0;
+                foreach (var deviceBatch in deviceTerms.Batch(500))
+                {
+                    var deviceIdentifierBatch = new List<DeviceIdentifierDimension>();
+                    foreach (var deviceTerm in deviceBatch)
+                    {
+                        var deviceTermCategories = termCategories.Where(termCategory => termCategory.TermCode == deviceTerm.GMDNCode).Select(dtc => new DeviceTermCategory
+                        {
+                            TermCode = dtc.TermCode,
+                            TermName = dtc.TermName.ReplaceSpecialCharacters(),
+                            TermDefinition = dtc.TermDefinition.ReplaceSpecialCharacters(),
+                            Path = dtc.Path,
+                            CategoryName = dtc.Name,
+                            NodeId = dtc.NodeId
+                        }).ToList();
+
+                        if (deviceTermCategories.Any())
+                        {
+                            var deviceIdentifier = new DeviceIdentifierDimension()
+                            {
+                                DeviceIdentifier = deviceTerm.DeviceId,
+                                DeviceIdType = deviceTerm.DeviceIdType,
+                                PrimaryDI = deviceTerm.PrimaryDI,
+                                GMDNTermCode = deviceTerm.GMDNCode,
+                                GUDIDCompanyName = deviceTerm.CompanyName,
+                                GMDNTermName = deviceTermCategories?.FirstOrDefault().TermName,
+                                GMDNTermDefinition = deviceTermCategories?.FirstOrDefault().TermDefinition
+                            };
+                            var deviceHierarchies = deviceTermCategories.GetHierarchiesFromPath(DeviceFunctionPath);
+                            if (deviceHierarchies?.Length > 0)
+                            {
+                                // Hierarchy Index starts at 1 in order to skip 0th element which is the parent category
+                                // i.e. /4941/9057/10774/, here 4941 is device function parent category we just want it's sub categories
+                                deviceIdentifier.GMDNDeviceFunction1 = deviceTermCategories.GetHierarchyNameAtIndex(deviceHierarchies, 1);
+                                deviceIdentifier.GMDNDeviceFunction2 = deviceTermCategories.GetHierarchyNameAtIndex(deviceHierarchies, 2);
+                                deviceIdentifier.GMDNDeviceFunction3 = deviceTermCategories.GetHierarchyNameAtIndex(deviceHierarchies, 3);
+                                deviceIdentifier.GMDNDeviceFunction4 = deviceTermCategories.GetHierarchyNameAtIndex(deviceHierarchies, 4);
+                                deviceIdentifier.GMDNDeviceFunction5 = deviceTermCategories.GetHierarchyNameAtIndex(deviceHierarchies, 5);
+                                deviceIdentifier.GMDNDeviceFunction6 = deviceTermCategories.GetHierarchyNameAtIndex(deviceHierarchies, 6);
+                                deviceIdentifier.GMDNDeviceFunction7 = deviceTermCategories.GetHierarchyNameAtIndex(deviceHierarchies, 7);
+                            }
+
+                            var invasivenessHierarchies = deviceTermCategories.GetHierarchiesFromPath(InvasivenessPath);
+                            if (invasivenessHierarchies?.Length > 0)
+                            {
+                                deviceIdentifier.GMDNInvasiveness1 = deviceTermCategories.GetHierarchyNameAtIndex(invasivenessHierarchies, 1);
+                                deviceIdentifier.GMDNInvasiveness2 = deviceTermCategories.GetHierarchyNameAtIndex(invasivenessHierarchies, 2);
+                            }
+
+                            var userFrequencyHierarchies = deviceTermCategories.GetHierarchiesFromPath(UserFrequencyPath);
+                            if (userFrequencyHierarchies?.Length > 0)
+                            {
+                                deviceIdentifier.GMDNUseFrequency1 = deviceTermCategories.GetHierarchyNameAtIndex(userFrequencyHierarchies, 1);
+                                deviceIdentifier.GMDNUseFrequency2 = deviceTermCategories.GetHierarchyNameAtIndex(userFrequencyHierarchies, 2);
+                            }
+
+                            var powerPathHierarchies = deviceTermCategories.GetHierarchiesFromPath(PowerPath);
+                            if (powerPathHierarchies?.Length > 0)
+                            {
+                                deviceIdentifier.GMDNPower1 = deviceTermCategories.GetHierarchyNameAtIndex(powerPathHierarchies, 1);
+                                deviceIdentifier.GMDNPower2 = deviceTermCategories.GetHierarchyNameAtIndex(powerPathHierarchies, 2);
+                            }
+
+                            var materialsPathHierarchies = deviceTermCategories.GetHierarchiesFromPath(MaterialsPath);
+                            if (materialsPathHierarchies?.Length > 0)
+                            {
+                                deviceIdentifier.GMDNMaterials1 = deviceTermCategories.GetHierarchyNameAtIndex(materialsPathHierarchies, 1);
+                                deviceIdentifier.GMDNMaterials2 = deviceTermCategories.GetHierarchyNameAtIndex(materialsPathHierarchies, 2);
+                            }
+
+                            var featuredAttributesPathHierarchies = deviceTermCategories.GetHierarchiesFromPath(FeaturedAttributePath);
+                            if (featuredAttributesPathHierarchies?.Length > 0)
+                            {
+                                deviceIdentifier.GMDNFeaturedAttributes1 = deviceTermCategories.GetHierarchyNameAtIndex(featuredAttributesPathHierarchies, 1);
+                                deviceIdentifier.GMDNFeaturedAttributes2 = deviceTermCategories.GetHierarchyNameAtIndex(featuredAttributesPathHierarchies, 2);
+                            }
+
+                            var anatomicalSpecialtyPathHierarchies = deviceTermCategories.GetHierarchiesFromPath(AnatomicalSpecialtyPath);
+                            if (anatomicalSpecialtyPathHierarchies?.Length > 0)
+                            {
+                                deviceIdentifier.GMDNAnatomicalSpecialty1 = deviceTermCategories.GetHierarchyNameAtIndex(anatomicalSpecialtyPathHierarchies, 1);
+                                deviceIdentifier.GMDNAnatomicalSpecialty2 = deviceTermCategories.GetHierarchyNameAtIndex(anatomicalSpecialtyPathHierarchies, 2);
+                                deviceIdentifier.GMDNAnatomicalSpecialty3 = deviceTermCategories.GetHierarchyNameAtIndex(anatomicalSpecialtyPathHierarchies, 3);
+                                deviceIdentifier.GMDNAnatomicalSpecialty4 = deviceTermCategories.GetHierarchyNameAtIndex(anatomicalSpecialtyPathHierarchies, 4);
+                                deviceIdentifier.GMDNAnatomicalSpecialty5 = deviceTermCategories.GetHierarchyNameAtIndex(anatomicalSpecialtyPathHierarchies, 5);
+                                deviceIdentifier.GMDNAnatomicalSpecialty6 = deviceTermCategories.GetHierarchyNameAtIndex(anatomicalSpecialtyPathHierarchies, 6);
+                            }
+
+                            var namesIndexPathHierarchies = deviceTermCategories.GetHierarchiesFromPath(NamesPath);
+                            if (namesIndexPathHierarchies?.Length > 0)
+                            {
+                                deviceIdentifier.GMDNNamesIndex1 = deviceTermCategories.GetHierarchyNameAtIndex(namesIndexPathHierarchies, 1);
+                                deviceIdentifier.GMDNNamesIndex2 = deviceTermCategories.GetHierarchyNameAtIndex(namesIndexPathHierarchies, 2);
+                                deviceIdentifier.GMDNNamesIndex3 = deviceTermCategories.GetHierarchyNameAtIndex(namesIndexPathHierarchies, 3);
+                                deviceIdentifier.GMDNNamesIndex4 = deviceTermCategories.GetHierarchyNameAtIndex(namesIndexPathHierarchies, 4);
+                                deviceIdentifier.GMDNNamesIndex5 = deviceTermCategories.GetHierarchyNameAtIndex(namesIndexPathHierarchies, 5);
+                                deviceIdentifier.GMDNNamesIndex6 = deviceTermCategories.GetHierarchyNameAtIndex(namesIndexPathHierarchies, 6);
+                                deviceIdentifier.GMDNNamesIndex7 = deviceTermCategories.GetHierarchyNameAtIndex(namesIndexPathHierarchies, 7);
+                            }
+
+                            deviceIdentifierBatch.Add(deviceIdentifier);
+                        }
+                    }
+
+                    _centralDbContext.DeviceIdentifierDimension.AddRange(deviceIdentifierBatch);
+                    totalUpdates += await _centralDbContext.SaveChangesAsync();
+                }
+
+                var jobTime = (DateTime.Now - startTime).TotalSeconds;
+                _logger.LogServiceInformation($"{nameof(SeedDeviceIdentifierDimensionBatch)} Batch {batch} of {totalBatches} Job Added {totalUpdates} in {jobTime} seconds.");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+            }
+        }
+    }
+}
+
+
+
diff --git a/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/SeedGUDIDIdentifiersDataJob.cs b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/SeedGUDIDIdentifiersDataJob.cs
new file mode 100644
index 0000000..c21c93c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GMDN/Jobs/SeedGUDIDIdentifiersDataJob.cs
@@ -0,0 +1,31 @@
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GMDN.Jobs
+{
+    public class SeedGUDIDIdentifierDataJob
+    {
+        private readonly CentralDbContext _centralDbContext;
+
+        public SeedGUDIDIdentifierDataJob(
+            CentralDbContext centralDbContext)
+        {
+            _centralDbContext = centralDbContext;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Merge GUDIDIdentifierData in CentralDBContext")]
+        [Semaphore(nameof(MergeGUDIDIdentifierData))]
+        public async Task MergeGUDIDIdentifierData(CancellationToken cancellationToken)
+        {
+            _centralDbContext.Database.SetCommandTimeout(TimeSpan.FromMinutes(30));
+            await _centralDbContext.Database.ExecuteSqlRawAsync("call public.update_gudid_identifiers();", cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/AccountDetail.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/AccountDetail.cs
new file mode 100644
index 0000000..885b766
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/AccountDetail.cs
@@ -0,0 +1,20 @@
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Details
+{
+    public class AccountDetail
+    {
+        public int AccountId { get; set; }
+        public string Name { get; set; }
+        public decimal Amount { get; set; }
+
+        public AccountDetail()
+        {
+        }
+
+        public AccountDetail(int accountId, string name, decimal amount)
+        {
+            AccountId = accountId;
+            Name = name;
+            Amount = amount;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/DepartmentDetail.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/DepartmentDetail.cs
new file mode 100644
index 0000000..30f09e1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/DepartmentDetail.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Details
+{
+    public class DepartmentDetail
+    {
+        public int DepartmentId { get; set; }
+        public string Name { get; set; }
+        public decimal Amount { get; set; }
+        public IEnumerable<AccountDetail> AccountDetails { get; set; }
+
+        public DepartmentDetail()
+        {
+        }
+
+        public DepartmentDetail(int departmentId, string name, decimal amount, IEnumerable<AccountDetail> accountDetails)
+        {
+            DepartmentId = departmentId;
+            Name = name;
+            Amount = amount;
+            AccountDetails = accountDetails;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/FactGL.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/FactGL.cs
new file mode 100644
index 0000000..ba8031f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/FactGL.cs
@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Details
+{
+    [Table("viewFactGL", Schema = "cci")]
+    public class FactGL : IGLData
+    {
+        public int DepartmentID { get; set; }
+        public int AccountID { get; set; }
+        public short FiscalYearID { get; set; }
+        public byte FiscalMonthID { get; set; }
+        [Precision(38, 4)]
+        public decimal Value { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/FactGLSampled.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/FactGLSampled.cs
new file mode 100644
index 0000000..59fcce6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/FactGLSampled.cs
@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Details
+{
+    [Table("viewFactGLSampled", Schema = "cci")]
+    public class FactGLSampled : IGLData
+    {
+        public int DepartmentID { get; set; }
+        public int AccountID { get; set; }
+        public short FiscalYearID { get; set; }
+        public byte FiscalMonthID { get; set; }
+        [Precision(38, 6)]
+        public decimal Value { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/FactStatistic.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/FactStatistic.cs
new file mode 100644
index 0000000..153d669
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/FactStatistic.cs
@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Details
+{
+    [Table("viewFactStatistic", Schema = "cci")]
+    public class FactStatistic : IGLData
+    {
+        public int DepartmentID { get; set; }
+        public int AccountID { get; set; }
+        public short FiscalYearID { get; set; }
+        public byte FiscalMonthID { get; set; }
+        [Precision(38, 4)]
+        public decimal Value { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/FactStatisticSampledMonthly.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/FactStatisticSampledMonthly.cs
new file mode 100644
index 0000000..165ab91
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/FactStatisticSampledMonthly.cs
@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Details
+{
+    [Table("viewFactStatisticSampledMonthly", Schema = "cci")]
+    public class FactStatisticSampledMonthly : IGLData
+    {
+        public int DepartmentID { get; set; }
+        public int AccountID { get; set; }
+        public short FiscalYearID { get; set; }
+        public byte FiscalMonthID { get; set; }
+        [Precision(38, 6)]
+        public decimal Value { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/GLDepartmentAccountData.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/GLDepartmentAccountData.cs
new file mode 100644
index 0000000..a8b6e61
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/GLDepartmentAccountData.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Details
+{
+    public class GLDepartmentAccountData
+    {
+        public IEnumerable<string> Departments { get; set; }
+        public IEnumerable<string> Accounts { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/GLDetail.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/GLDetail.cs
new file mode 100644
index 0000000..9482bc3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/GLDetail.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Details
+{
+    public class GLDetail
+    {
+        public decimal Total { get; set; }
+        public IEnumerable<DepartmentDetail> DepartmentDetails { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/GLDetailService.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/GLDetailService.cs
new file mode 100644
index 0000000..8951641
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/GLDetailService.cs
@@ -0,0 +1,132 @@
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.CoreLib.Claims;
+using Strata.Schema.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Details
+{
+    public class GLDetailService : JazzDbService<GLDetail, int>, IGLDetailService
+    {
+        private readonly ISchemaServiceClient _schemaServiceClient;
+
+        public GLDetailService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext, IClaimsPrincipalAccessor claimsPrincipalAccessor, ISchemaServiceClient schemaServiceClient)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor)
+        {
+            _schemaServiceClient = schemaServiceClient;
+        }
+
+        public async Task<GLDetail> GetOverallDetailAsync(Guid configurationGuid, GLDepartmentAccountData departmentAccountData, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return null;
+
+            var configuration = dbContext.Set<Configuration.Configuration>().FirstOrDefault(c => c.ConfigurationGuid == configurationGuid);
+            if (configuration == null) return null;
+
+            if (!departmentAccountData.Departments.Any() || !departmentAccountData.Accounts.Any()) return new GLDetail();
+            var departments = await GetDimensionMemberDictionary("Department", departmentAccountData.Departments, cancellationToken);
+            var accounts = await GetDimensionMemberDictionary("Account", departmentAccountData.Accounts, cancellationToken);
+
+            var fiscalMonthDimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync("Fiscal Month");
+            var fiscalMonths = await _schemaServiceClient.GetDimensionMembersByDimensionGuidAsync<FiscalMonth>(fiscalMonthDimension.DimensionGuid);
+            var yearMonthDictionary = fiscalMonths.GetFiscalMonthDictionary(configuration.OrgDefinedEndDate);
+
+            var factGLSampledData = dbContext.Set<FactGLSampled>();
+            var factGLData = dbContext.Set<FactGL>();
+            IQueryable<IGLData> glData = factGLSampledData.Any() ? factGLSampledData : factGLData;
+
+            var batchedDepartments = departments.Batch(1000);
+            var groupedGlData = new List<IGrouping<int, IGLData>>();
+            foreach (var depts in batchedDepartments)
+            {
+                var deptsDictionary = depts.ToDictionary();
+                var glGrouping = glData
+                    .Where(gl => deptsDictionary.Keys.Contains(gl.DepartmentID))
+                    .Where(gl => accounts.Keys.Contains(gl.AccountID))
+                    .AsEnumerable()
+                    .Where(gl => yearMonthDictionary[gl.FiscalMonthID] == gl.FiscalYearID)
+                    .GroupBy(gl => gl.DepartmentID)
+                    .ToList();
+                groupedGlData.AddRange(glGrouping);
+            }
+
+            var departmentDetails = new List<DepartmentDetail>();
+
+            groupedGlData.ForEach(data =>
+            {
+                var accountDetails = data.Where(d => d.Value != 0).GroupBy(gl => gl.AccountID).Select(d => new AccountDetail(d.Key, accounts[d.Key], d.Sum(a => a.Value)));
+                var departmentDetail = new DepartmentDetail(data.Key, departments[data.Key], accountDetails.Sum(d => d.Amount), accountDetails);
+                departmentDetails.Add(departmentDetail);
+            });
+
+            return new GLDetail() { Total = departmentDetails.Sum(d => d.Amount), DepartmentDetails = departmentDetails };
+        }
+
+        public async Task<GLDetail> GetStatisticDetailAsync(Guid configurationGuid, GLDepartmentAccountData departmentAccountData, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return null;
+
+            var configuration = dbContext.Set<Configuration.Configuration>().FirstOrDefault(c => c.ConfigurationGuid == configurationGuid);
+            if (configuration == null) return null;
+
+            if (!departmentAccountData.Departments.Any() || !departmentAccountData.Accounts.Any()) return new GLDetail();
+            var departments = await GetDimensionMemberDictionary("Department", departmentAccountData.Departments, cancellationToken);
+            var accounts = await GetDimensionMemberDictionary("Account", departmentAccountData.Accounts, cancellationToken);
+
+            var fiscalMonthDimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync("Fiscal Month");
+            var fiscalMonths = await _schemaServiceClient.GetDimensionMembersByDimensionGuidAsync<FiscalMonth>(fiscalMonthDimension.DimensionGuid);
+            var yearMonthDictionary = fiscalMonths.GetFiscalMonthDictionary(configuration.OrgDefinedEndDate);
+
+            var factStatisticSampledMonthlyData = dbContext.Set<FactStatisticSampledMonthly>();
+            var factStatisticData = dbContext.Set<FactStatistic>();
+            IQueryable<IGLData> glData = factStatisticSampledMonthlyData.Any() ? factStatisticSampledMonthlyData : factStatisticData;
+
+            var batchedDepartments = departments.Batch(1000);
+            var groupedGlData = new List<IGrouping<int, IGLData>>();
+            foreach (var depts in batchedDepartments)
+            {
+                var deptsDictionary = depts.ToDictionary();
+                var glGrouping = glData
+                    .Where(gl => deptsDictionary.Keys.Contains(gl.DepartmentID))
+                    .Where(gl => accounts.Keys.Contains(gl.AccountID))
+                    .AsEnumerable()
+                    .Where(gl => yearMonthDictionary[gl.FiscalMonthID] == gl.FiscalYearID)
+                    .GroupBy(gl => gl.DepartmentID)
+                    .ToList();
+                groupedGlData.AddRange(glGrouping);
+            }
+
+            var departmentDetails = new List<DepartmentDetail>();
+
+            groupedGlData.ForEach(data =>
+            {
+                var accountDetails = data.Where(d => d.Value != 0).GroupBy(gl => gl.AccountID).Select(d => new AccountDetail(d.Key, accounts[d.Key], d.Sum(a => a.Value)));
+                var departmentDetail = new DepartmentDetail(data.Key, departments[data.Key], accountDetails.Sum(d => d.Amount), accountDetails);
+                departmentDetails.Add(departmentDetail);
+            });
+
+            return new GLDetail() { Total = departmentDetails.Sum(d => d.Amount), DepartmentDetails = departmentDetails };
+        }
+
+        private async Task<Dictionary<int, string>> GetDimensionMemberDictionary(string globalId, IEnumerable<string> hierarchyPaths, CancellationToken cancellationToken)
+        {
+            var dimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync(globalId);
+            var result = await _schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid, hierarchyPaths, cancellationToken);
+            var memberDictionary = result.ToDictionary(member => Convert.ToInt32(member.Id), member => member.Name);
+
+            return memberDictionary;
+        }
+
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/IGLData.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/IGLData.cs
new file mode 100644
index 0000000..1036605
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/IGLData.cs
@@ -0,0 +1,11 @@
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Details
+{
+    public interface IGLData
+    {
+        public int DepartmentID { get; set; }
+        public int AccountID { get; set; }
+        public short FiscalYearID { get; set; }
+        public byte FiscalMonthID { get; set; }
+        public decimal Value { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/IGLDetailService.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/IGLDetailService.cs
new file mode 100644
index 0000000..55c1aa2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Details/IGLDetailService.cs
@@ -0,0 +1,13 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Details
+{
+    public interface IGLDetailService : IJazzDbService<GLDetail, int>
+    {
+        Task<GLDetail> GetOverallDetailAsync(Guid configurationGuid, GLDepartmentAccountData departmentAccountData, CancellationToken cancellationToken);
+        Task<GLDetail> GetStatisticDetailAsync(Guid configurationGuid, GLDepartmentAccountData departmentAccountData, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Initiatives/GLInitiativeService.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Initiatives/GLInitiativeService.cs
new file mode 100644
index 0000000..a6531a2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Initiatives/GLInitiativeService.cs
@@ -0,0 +1,43 @@
+using Microsoft.Extensions.Logging;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Initiatives
+{
+    public class GLInitiativeService : InitiativeCreateService, IGLInitiativeService
+    {
+        public GLInitiativeService(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            IInitiativeSavingsService initiativeSavingsService,
+            IAuthorizationServiceClient authorizationServiceClient,
+            IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            ILogger<GLInitiativeService> logger)
+            : base(dbContextFactory, initiativeSavingsService, authorizationServiceClient, updateFactOpportunitySavingsService, logger)
+        {
+        }
+
+        public override async Task<IOpportunity> GetOpportunity(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            return dbContext.GeneralLedgerOpportunities.SingleOrDefault(opp => opp.OpportunityGuid == opportunityGuid) as IOpportunity;
+        }
+
+        public override async Task SaveOpportunity(Guid opportunityGuid, Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var opportunity = dbContext.GeneralLedgerOpportunities.SingleOrDefault(opp => opp.OpportunityGuid == opportunityGuid);
+            if (opportunity == null) { return; }
+
+            opportunity.InitiativeGuid = initiativeGuid;
+            await dbContext.SaveChangesAsync(cancellationToken);
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Initiatives/GeneralLedgerInitiativeDto.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Initiatives/GeneralLedgerInitiativeDto.cs
new file mode 100644
index 0000000..be2d67f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Initiatives/GeneralLedgerInitiativeDto.cs
@@ -0,0 +1,21 @@
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Initiatives
+{
+    public class GeneralLedgerInitiativeDto : InitiativeDto
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public AccountType GLOpportunityType { get; set; }
+        public GLOpportunityLevel GoalLevel { get; set; }
+        public List<string> Departments { get; set; }
+        public List<string> RevenueAccounts { get; set; }
+        public List<string> ExpenseAccounts { get; set; }
+        public List<string> StatisticAccounts { get; set; }
+        public List<string> StatisticDepartments { get; set; }
+        public bool HasStatistic { get; set; }
+        public bool IsSeasonal { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Initiatives/IGLInitiativeService.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Initiatives/IGLInitiativeService.cs
new file mode 100644
index 0000000..08dd843
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Initiatives/IGLInitiativeService.cs
@@ -0,0 +1,9 @@
+using Strata.ContinuousImprovement.Biz.Initiatives;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Initiatives
+{
+    public interface IGLInitiativeService : IInitiativeCreateService
+    {
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/Filters/GLFilterOptions.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/Filters/GLFilterOptions.cs
new file mode 100644
index 0000000..953a0c8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/Filters/GLFilterOptions.cs
@@ -0,0 +1,11 @@
+using Strata.ContinuousImprovement.Biz.Filter;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities.Filters
+{
+    public class GLFilterOptions
+    {
+        public IEnumerable<FilterMember> Types { get; set; }
+        public IEnumerable<FilterMember> Levels { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/Filters/GLFilters.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/Filters/GLFilters.cs
new file mode 100644
index 0000000..96b3316
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/Filters/GLFilters.cs
@@ -0,0 +1,51 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities.Filters
+{
+    public class GLFilters : FiltersOpportunity<GLOpportunity>
+    {
+        public IEnumerable<string> Types { get; set; }
+        public IEnumerable<string> Levels { get; set; }
+        public SeasonalityType Seasonality { get; set; }
+
+        public GLFilters() : base()
+        {
+            Types = new List<string>();
+            Levels = new List<string>();
+            Seasonality = SeasonalityType.WithAndWithout;
+        }
+
+        public override IEnumerable<Expression<Func<GLOpportunity, bool>>> GetFilters(JazzDbContext context)
+        {
+            var filters = base.GetFilters(context).ToList();
+
+            if (Types.Any())
+                filters.Add(m => Types.Contains(m.Type));
+
+            if (Levels.Any())
+                filters.Add(m => Levels.Contains(m.Level));
+
+            if (Seasonality != SeasonalityType.WithAndWithout)
+                filters.Add(m => (int)Seasonality == Convert.ToInt32(m.IsSeasonal));
+
+            if (!string.IsNullOrEmpty(OpportunitySearch))
+            {
+                var testSeasonality = Enum.TryParse<SeasonalityType>(OpportunitySearch, true, out var seasonalityType)
+                    && seasonalityType != SeasonalityType.WithAndWithout;
+                filters.Add(m => m.OpportunityKey.Contains(OpportunitySearch)
+                    || m.Name.Contains(OpportunitySearch)
+                    || m.Type.Contains(OpportunitySearch)
+                    || m.Level.Contains(OpportunitySearch)
+                    || (testSeasonality && m.IsSeasonal == (seasonalityType == SeasonalityType.With)));
+            }
+
+            return filters;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunity.cs
new file mode 100644
index 0000000..3db4a1f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunity.cs
@@ -0,0 +1,15 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities
+{
+    [Table("viewGLOpportunity", Schema = "cci")]
+    public class GLOpportunity : Opportunity
+    {
+        public string Name { get; set; }
+        public long OpportunityId { get; set; }
+        public string Type { get; set; }
+        public string Level { get; set; }
+        public bool IsSeasonal { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunityDataModel.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunityDataModel.cs
new file mode 100644
index 0000000..947eaed
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunityDataModel.cs
@@ -0,0 +1,82 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities
+{
+
+    [Table("GLOpportunity", Schema = "cci")]
+    public class GLOpportunityDataModel : IOpportunity, IWithAuthor, IWithOwner
+    {
+        public GLOpportunityDataModel()
+        {
+            OpportunityGuid = Guid.NewGuid();
+            DateCreated = DateTime.Now;
+            DateModified = DateTime.Now;
+        }
+
+        [Key]
+        public Guid OpportunityGuid { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public string Name { get; set; }
+        public string Note { get; set; }
+        public DateTime DateCreated { get; set; }
+        public DateTime DateModified { get; set; }
+        public Guid OwnerGuid { get; set; }
+        public string OwnerName { get; set; }
+        public Guid AuthorGuid { get; set; }
+        public string AuthorName { get; set; }
+        public string RevenueDepartmentFilterJSON { get; set; } = "[]";
+        public string RevenueAccountFilterJSON { get; set; } = "[]";
+        public string ExpenseDepartmentFilterJSON { get; set; } = "[]";
+        public string ExpenseAccountFilterJSON { get; set; } = "[]";
+        public string StatisticDepartmentFilterJSON { get; set; } = "[]";
+        public string StatisticAccountFilterJSON { get; set; } = "[]";
+        public AccountType GLOpportunityType { get; set; }
+        public GLOpportunityLevel GoalLevel { get; set; }
+        public bool HasStatistic { get; set; }
+        public bool IsSeasonal { get; set; }
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long OpportunityId { get; set; }
+
+        [NotMapped]
+        public string OpportunityKey
+        {
+            get => $"PR - {OpportunityId}"; set
+            { // ILB
+            }
+        }
+        [NotMapped]
+        public double IdentifiedSavings { get; set; }
+        [NotMapped]
+        public bool HasInitiative => !InitiativeGuid.Equals(Guid.Empty);
+        [NotMapped]
+        public string Initiative { get; set; }
+        [NotMapped]
+        public bool IsHidden { get; set; }
+        [NotMapped]
+        public string SourceOpportunity { get; set; }
+        [NotMapped]
+        public long SourceOpportunityId { get; set; }
+
+        public void Update(IOpportunity updates)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public enum GLOpportunityLevel
+    {
+        Overall = 0,
+        Individual = 1
+    }
+    public enum AccountType
+    {
+        Revenue = 0,
+        Expense = 1,
+        Margin = 2
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunityDataModelMapper.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunityDataModelMapper.cs
new file mode 100644
index 0000000..41fb43c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunityDataModelMapper.cs
@@ -0,0 +1,60 @@
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Initiatives;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using System;
+using System.Security.Claims;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class GLOpportunityDataModelMapper
+    {
+        public static GLOpportunityDataModel MapToDataModel(this GLOpportunitySaveModel src)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) return default;
+            mapped.StatisticDepartmentFilterJSON = src.StatisticDepartments.MapToHierarchyPaths();
+            mapped.StatisticAccountFilterJSON = src.StatisticAccounts.MapToHierarchyPaths();
+            if (src.GLOpportunityType == AccountType.Revenue || src.GLOpportunityType == AccountType.Margin)
+            {
+                mapped.RevenueDepartmentFilterJSON = src.Departments.MapToHierarchyPaths();
+                mapped.RevenueAccountFilterJSON = src.RevenueAccounts.MapToHierarchyPaths();
+            }
+            if (src.GLOpportunityType == AccountType.Expense || src.GLOpportunityType == AccountType.Margin)
+            {
+                mapped.ExpenseDepartmentFilterJSON = src.Departments.MapToHierarchyPaths();
+                mapped.ExpenseAccountFilterJSON = src.ExpenseAccounts.MapToHierarchyPaths();
+            }
+            return mapped;
+        }
+
+        public static GLOpportunityDataModel MapToDataModel(this GeneralLedgerInitiativeDto src, ClaimsPrincipal user)
+        {
+            if (src == null) return default;
+            var mapped = Mapped(src);
+            if (mapped == null) return default;
+            mapped.Note = "";
+            mapped.MapAuthor(user);
+            mapped.MapOwner(user);
+            mapped.StatisticDepartmentFilterJSON = src.StatisticDepartments.MapToHierarchyPaths();
+            mapped.StatisticAccountFilterJSON = src.StatisticAccounts.MapToHierarchyPaths();
+            if (src.GLOpportunityType == AccountType.Revenue || src.GLOpportunityType == AccountType.Margin)
+            {
+                mapped.RevenueDepartmentFilterJSON = src.Departments.MapToHierarchyPaths();
+                mapped.RevenueAccountFilterJSON = src.RevenueAccounts.MapToHierarchyPaths();
+            }
+            if (src.GLOpportunityType == AccountType.Expense || src.GLOpportunityType == AccountType.Margin)
+            {
+                mapped.ExpenseDepartmentFilterJSON = src.Departments.MapToHierarchyPaths();
+                mapped.ExpenseAccountFilterJSON = src.ExpenseAccounts.MapToHierarchyPaths();
+            }
+            return mapped;
+        }
+
+        [MapperIgnoreTarget(nameof(GLOpportunityDataModel.OpportunityGuid))]
+        private static partial GLOpportunityDataModel Mapped(GLOpportunitySaveModel src);
+
+        [MapperIgnoreTarget(nameof(GLOpportunityDataModel.OpportunityGuid))]
+        private static partial GLOpportunityDataModel Mapped(GeneralLedgerInitiativeDto src);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunitySaveModel.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunitySaveModel.cs
new file mode 100644
index 0000000..9cbad92
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunitySaveModel.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities
+{
+    [ExcludeFromCodeCoverage]
+    public class GLOpportunitySaveModel
+    {
+        [Required]
+        public Guid ConfigurationGuid { get; set; }
+        [Required]
+        [StringLength(200)]
+        public string Name { get; set; }
+        public string Note { get; set; }
+        [Required]
+        public AccountType GLOpportunityType { get; set; }
+        [Required]
+        public GLOpportunityLevel GoalLevel { get; set; }
+        [Required]
+        public Guid OwnerGuid { get; set; }
+        [Required]
+        public string OwnerName { get; set; }
+        public Guid AuthorGuid { get; set; }
+        public string AuthorName { get; set; }
+        public List<string> Departments { get; set; }
+        public List<string> RevenueAccounts { get; set; }
+        public List<string> ExpenseAccounts { get; set; }
+        public List<string> StatisticAccounts { get; set; }
+        public List<string> StatisticDepartments { get; set; }
+        public bool HasStatistic { get; set; }
+        public bool IsSeasonal { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunityService.cs
new file mode 100644
index 0000000..708ac9a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/GLOpportunityService.cs
@@ -0,0 +1,144 @@
+using ClosedXML.Excel;
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Export;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.CoreLib.Claims;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Hangfire.Jazz.Client.Models;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities
+{
+    public class GLOpportunityService : OpportunityService<GLOpportunity>, IGLOpportunityService
+    {
+        private readonly IJazzHangfireServiceClient _hangfireServiceClient;
+        private readonly IAuthorizationServiceClient _authorizationServiceClient;
+
+        public GLOpportunityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IJazzHangfireServiceClient hangfireServiceClient,
+            IAuthorizationServiceClient authorizationServiceClient,
+            IInitiativeService initiativeService,
+            IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor, initiativeService, updateFactOpportunitySavingsService)
+        {
+            _hangfireServiceClient = hangfireServiceClient;
+            _authorizationServiceClient = authorizationServiceClient;
+        }
+
+        public async Task<GLFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return null;
+
+            var opportunityContext = dbContext.Set<GLOpportunity>();
+            var configuredOpportunities = opportunityContext.Where(en => en.ConfigurationGuid == configurationGuid);
+
+            var glTypes = await configuredOpportunities
+                .Select(opp => new FilterMember { Id = opp.Type, Text = opp.Type }).Distinct()
+                .OrderBy(t => t.Text).ToListAsync(cancellationToken);
+
+            var glLevels = await configuredOpportunities
+                .Select(opp => new FilterMember { Id = opp.Level, Text = opp.Level }).Distinct()
+                .OrderBy(t => t.Text).ToListAsync(cancellationToken);
+
+            return new GLFilterOptions
+            {
+                Types = glTypes,
+                Levels = glLevels
+            };
+        }
+
+        public async Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, GLFilters filters, CancellationToken cancellationToken)
+        {
+            var exportOptions = this.GetExportOptions();
+
+            // get data
+            var opportunities = await this.GetAllAsync(sortOptions, filters, cancellationToken);
+            var data = opportunities.Select(opp => new
+            {
+                Opportunity = opp.OpportunityKey,
+                opp.Name,
+                opp.IdentifiedSavings,
+                opp.Type,
+                opp.Level,
+                IsSeasonal = opp.IsSeasonal ? 1 : 0,
+                opp.Initiative,
+                IsHidden = opp.IsHidden ? 1 : 0,
+                opp.Note
+            });
+
+            // configure column formats
+            exportOptions.AddColumnOptions("Identified Savings", "Currency2Dec");
+            exportOptions.AddColumnOptions("Is Seasonal", "\"Yes\";-;\"No\"");
+            exportOptions.AddColumnOptions("Is Hidden", "\"Yes\";-;\"No\"");
+
+            return ExportUtils.CreateExcelWorkbook(data, exportOptions);
+        }
+
+        public async Task<Guid> CreateAsync(GLOpportunitySaveModel saveModel, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+
+            var opportunity = saveModel.MapToDataModel();
+
+            await dbContext.GeneralLedgerOpportunitiesDataModel.AddAsync(opportunity, cancellationToken);
+            var result = await dbContext.SaveChangesAsync(cancellationToken);
+
+            await _authorizationServiceClient.AddPermissionsFromDefaultsAsync(opportunity.OpportunityGuid, SecurableEntityType.Opportunity, cancellationToken);
+
+            if (result > 0)
+            {
+                await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+                var job = new EnqueueJobDto
+                {
+                    TaskName = "Strata.CS.Jazz.Biz.CCI.Tasks.Custom.GeneralLedger.RunGeneralLedgerSavingsTask, Strata.CS.Jazz.Biz.CCI",
+                    ContextData = JsonConvert.SerializeObject(new { opportunityGuid = opportunity.OpportunityGuid })
+                };
+
+                await _hangfireServiceClient.EnqueueJobAsync(job, cancellationToken);
+            }
+
+            return opportunity.OpportunityGuid;
+        }
+
+        public async Task<Guid> CreateAsync(GLOpportunityDataModel opportunity, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+
+            await dbContext.GeneralLedgerOpportunitiesDataModel.AddAsync(opportunity, cancellationToken);
+            var result = await dbContext.SaveChangesAsync(cancellationToken);
+
+            await _authorizationServiceClient.AddPermissionsFromDefaultsAsync(opportunity.OpportunityGuid, SecurableEntityType.Opportunity, cancellationToken);
+
+            if (result > 0)
+            {
+                await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+                var job = new EnqueueJobDto
+                {
+                    TaskName = "Strata.CS.Jazz.Biz.CCI.Tasks.Custom.GeneralLedger.RunGeneralLedgerSavingsTask, Strata.CS.Jazz.Biz.CCI",
+                    ContextData = JsonConvert.SerializeObject(new { opportunityGuid = opportunity.OpportunityGuid })
+                };
+
+                var response = await _hangfireServiceClient.EnqueueJobAsync(job, cancellationToken);
+                return response.JobId;
+            }
+            return Guid.Empty;
+
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/IGLOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/IGLOpportunityService.cs
new file mode 100644
index 0000000..7cea7d6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/GeneralLedger/Opportunities/IGLOpportunityService.cs
@@ -0,0 +1,18 @@
+using ClosedXML.Excel;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities
+{
+    public interface IGLOpportunityService : IOpportunityService<GLOpportunity>
+    {
+        Task<GLFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken);
+        Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, GLFilters filters, CancellationToken cancellationToken);
+        Task<Guid> CreateAsync(GLOpportunitySaveModel saveModel, CancellationToken cancellationToken);
+        Task<Guid> CreateAsync(GLOpportunityDataModel opportunity, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/IJazzDbService.cs b/src/Strata.ContinuousImprovement.Biz/Generics/IJazzDbService.cs
new file mode 100644
index 0000000..3383f9c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/IJazzDbService.cs
@@ -0,0 +1,33 @@
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public interface IJazzDbService<T, TKey> where T : class
+    {
+        Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken);
+
+        Task<IEnumerable<T>> GetAllAsync(CancellationToken cancellationToken);
+
+        Task<IEnumerable<T>> GetAllAsync(SortOptions sortOptions, IFilters<T> filters, CancellationToken cancellationToken);
+
+        Task<PagedApiResponse<T>> GetPagedAsync(PagingOptions pagingOptions, IFilters<T> filters, CancellationToken cancellationToken);
+
+        Task<T> GetById(TKey id, CancellationToken cancellationToken);
+
+        Task<T> GetByInitiativeId(TKey id, Guid configurationGuid, OpportunityTypes opportunityType, CancellationToken cancellationToken);
+        Task<T> GetOpportunityByNamePrefix(Guid configurationGuid, OpportunityTypes opportunityType, string name, CancellationToken cancellationToken);
+
+        Task<bool> Contains(T entity, CancellationToken cancellationToken);
+        Task<bool> Contains(TKey id, CancellationToken cancellationToken);
+
+        Task<IEnumerable<T>> GetByIds(IEnumerable<TKey> ids, CancellationToken cancellationToken);
+
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/IOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Generics/IOpportunity.cs
new file mode 100644
index 0000000..52281b6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/IOpportunity.cs
@@ -0,0 +1,18 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public interface IOpportunity : IWithConfigurationGuid, IWithSourceOpportunity
+    {
+        Guid OpportunityGuid { get; set; }
+        string OpportunityKey { get; set; }
+        double IdentifiedSavings { get; set; }
+        Guid InitiativeGuid { get; set; }
+        bool HasInitiative { get; }
+        string Initiative { get; set; }
+        bool IsHidden { get; set; }
+        string Note { get; set; }
+
+        abstract void Update(IOpportunity updates);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/IOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/Generics/IOpportunityService.cs
new file mode 100644
index 0000000..0c3c9eb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/IOpportunityService.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public interface IOpportunityService<T> : IJazzDbService<T, Guid>
+        where T : class, IOpportunity
+    {
+        Task SetHiddenAsync(Guid opportunityGuid, bool isHidden, CancellationToken cancellationToken);
+
+        Task SetNoteAsync(Guid opportunityGuid, string note, CancellationToken cancellationToken);
+
+        Task<bool> DeleteAsync<Entity>(Guid opportunityGuid, CancellationToken cancellationToken)
+            where Entity : class, IOpportunity;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/IUpdateFactOpportunitySavingsService.cs b/src/Strata.ContinuousImprovement.Biz/Generics/IUpdateFactOpportunitySavingsService.cs
new file mode 100644
index 0000000..7695d00
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/IUpdateFactOpportunitySavingsService.cs
@@ -0,0 +1,10 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public interface IUpdateFactOpportunitySavingsService
+    {
+        Task UpdateFactOpportunitySavings(CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/IWithConfigurationGuid.cs b/src/Strata.ContinuousImprovement.Biz/Generics/IWithConfigurationGuid.cs
new file mode 100644
index 0000000..daa0e6b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/IWithConfigurationGuid.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public interface IWithConfigurationGuid
+    {
+        Guid ConfigurationGuid { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/IWithIdentifiedSavingsTotal.cs b/src/Strata.ContinuousImprovement.Biz/Generics/IWithIdentifiedSavingsTotal.cs
new file mode 100644
index 0000000..44fa3f7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/IWithIdentifiedSavingsTotal.cs
@@ -0,0 +1,7 @@
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public interface IWithIdentifiedSavingsTotal
+    {
+        public double IdentifiedSavingsTotal { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/IWithSourceOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Generics/IWithSourceOpportunity.cs
new file mode 100644
index 0000000..b6f59d5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/IWithSourceOpportunity.cs
@@ -0,0 +1,17 @@
+using Strata.ContinuousImprovement.Biz.Network;
+
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public interface IWithSourceOpportunity
+    {
+        string SourceOpportunity { get; set; }
+        long SourceOpportunityId { get; set; }
+
+        public virtual void SetSourceOpportunity(ClientNetworkOpportunity sourceOpportunity)
+        {
+            if (sourceOpportunity == null) { return; }
+            SourceOpportunity = sourceOpportunity.NetworkOpportunity.Name;
+            SourceOpportunityId = sourceOpportunity.NetworkOpportunityId;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/IWithStrataId.cs b/src/Strata.ContinuousImprovement.Biz/Generics/IWithStrataId.cs
new file mode 100644
index 0000000..737667e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/IWithStrataId.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public interface IWithStrataId
+    {
+        public int StrataId { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/JazzDbService.cs b/src/Strata.ContinuousImprovement.Biz/Generics/JazzDbService.cs
new file mode 100644
index 0000000..eb81997
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/JazzDbService.cs
@@ -0,0 +1,276 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.CoreLib.Claims;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public abstract class JazzDbService<T, TKey> : IJazzDbService<T, TKey> where T : class
+    {
+        protected readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        protected readonly CentralDbContext _centralDbContext;
+        protected readonly ClaimsPrincipal _user;
+
+        protected JazzDbService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory, CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor)
+        {
+            _dbContextFactory = dbContextFactory;
+            _centralDbContext = centralDbContext;
+            _user = claimsPrincipalAccessor?.GetCurrentClaimsPrincipal();
+        }
+
+        public async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        /// <summary>
+        /// Get all entities in table
+        /// </summary>
+        public virtual async Task<IEnumerable<T>> GetAllAsync(CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return new List<T>();
+            var query = dbContext.AddUserFilter(dbContext.Set<T>().AsQueryable(), _user);
+
+            var results = await query.ToListAsync(cancellationToken);
+            if (_centralDbContext != null)
+            {
+                foreach (var opportunity in results.Where(opp => opp is IWithSourceOpportunity && opp is IOpportunity))
+                {
+                    var clientNetworkOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                        .Include(cno => cno.Opportunities.Where(link => link.OpportunityGuid == ((IOpportunity)opportunity).OpportunityGuid))
+                        .SingleOrDefaultAsync(cancellationToken);
+                    if (clientNetworkOpportunity != null)
+                    {
+                        ((IWithSourceOpportunity)opportunity).SetSourceOpportunity(clientNetworkOpportunity);
+                    }
+                }
+            }
+            return results;
+        }
+
+        /// <summary>
+        /// Get all entities in table with filters
+        /// </summary>
+        public virtual async Task<IEnumerable<T>> GetAllAsync(SortOptions sortOptions, IFilters<T> filters, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null || filters == null) return new List<T>();
+
+            var query = dbContext.AddUserFilter(dbContext.Set<T>().AsQueryable(), _user).OrderBy(sortOptions);
+            var results = await query.Where(filters.GetFilters(dbContext)).ToListAsync(cancellationToken);
+            var opportunities = results.Where(data => data is IWithSourceOpportunity && data is IOpportunity).ToList();
+            if (opportunities.Any() && _centralDbContext != null)
+            {
+                foreach (var opportunity in results.Where(opp => opp is IWithSourceOpportunity && opp is IOpportunity))
+                {
+                    var clientNetworkOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                        .Include(cno => cno.Opportunities)
+                        .Include(cno => cno.NetworkOpportunity)
+                        .SingleOrDefaultAsync(cno => cno.Opportunities.Any(link => link.OpportunityGuid == ((IOpportunity)opportunity).OpportunityGuid));
+                    if (clientNetworkOpportunity != null)
+                    {
+                        ((IWithSourceOpportunity)opportunity).SetSourceOpportunity(clientNetworkOpportunity);
+                    }
+                }
+            }
+            return results;
+        }
+
+        /// <summary>
+        /// Get entities in table with filters and paging
+        /// </summary>
+        public virtual async Task<PagedApiResponse<T>> GetPagedAsync(PagingOptions pagingOptions, IFilters<T> filters, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return new PagedApiResponse<T>() { Data = new List<T>(), PagingInfo = new PagingInfo() };
+
+            var query = dbContext.AddUserFilter(dbContext.Set<T>().AsQueryable(), _user);
+
+            var results = await query.Where(filters.GetFilters(dbContext)).ToPagedAsync(pagingOptions, cancellationToken);
+            var opportunities = results.Data.Where(data => data is IWithSourceOpportunity && data is IOpportunity).ToList();
+            if (opportunities.Any() && _centralDbContext != null)
+            {
+                foreach (var opportunity in results.Data.Where(opp => opp is IWithSourceOpportunity && opp is IOpportunity))
+                {
+                    var clientNetworkOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                        .Include(cno => cno.Opportunities)
+                        .Include(cno => cno.NetworkOpportunity)
+                        .SingleOrDefaultAsync(cno => cno.Opportunities.Any(link => link.OpportunityGuid == ((IOpportunity)opportunity).OpportunityGuid));
+                    if (clientNetworkOpportunity != null)
+                    {
+                        ((IWithSourceOpportunity)opportunity).SetSourceOpportunity(clientNetworkOpportunity);
+                    }
+                }
+            }
+            return results;
+        }
+
+        /// <summary>
+        /// Get entity by primary key value
+        /// </summary>
+        public virtual async Task<T> GetById(TKey id, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return default;
+            var keyProperty = dbContext.Model.FindEntityType(typeof(T))
+                .FindPrimaryKey().Properties.Single().Name;
+            var result = await dbContext.AddUserFilter(dbContext.Set<T>().AsQueryable(), _user)
+                .FirstOrDefaultAsync(x => id.Equals(EF.Property<TKey>(x, keyProperty)), cancellationToken);
+            var opportunity = result as IOpportunity;
+            if (opportunity != null && opportunity is IWithSourceOpportunity && _centralDbContext != null)
+            {
+                var clientNetworkOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                    .Include(cno => cno.Opportunities)
+                    .Include(cno => cno.NetworkOpportunity)
+                    .SingleOrDefaultAsync(cno => cno.Opportunities.Any(link => link.OpportunityGuid == opportunity.OpportunityGuid));
+                if (clientNetworkOpportunity != null)
+                {
+                    opportunity.SetSourceOpportunity(clientNetworkOpportunity);
+                }
+            }
+            return result;
+        }
+
+        public virtual async Task<T> GetByInitiativeId(TKey id, Guid configurationGuid, OpportunityTypes opportunityType, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return default;
+            var entity = dbContext.Model.FindEntityType(typeof(T));
+            var initiativeGuid = entity.GetProperties()
+                .SingleOrDefault(p => p.Name.Equals(nameof(Initiatives.Initiative.InitiativeGUID), StringComparison.CurrentCultureIgnoreCase))?.Name;
+            if (initiativeGuid == null) return default;
+            var configurationGuidName = entity.GetProperties()
+                .SingleOrDefault(p => p.Name.Equals(nameof(AllOpportunity.ConfigurationGuid), StringComparison.CurrentCultureIgnoreCase))?.Name;
+            if (configurationGuidName == null) return default;
+            var opportunityTypeName = entity.GetProperties()
+                .SingleOrDefault(p => p.Name.Equals(nameof(AllOpportunity.OpportunityType), StringComparison.CurrentCultureIgnoreCase))?.Name;
+            if (opportunityTypeName == null) return default;
+            var result = await dbContext.AddUserFilter(dbContext.Set<T>().AsQueryable(), _user)
+                .FirstOrDefaultAsync(x => EF.Property<TKey>(x, initiativeGuid).Equals(id)
+                    && EF.Property<Guid>(x, configurationGuidName).Equals(configurationGuid)
+                    && EF.Property<int>(x, opportunityTypeName).Equals((int)opportunityType), cancellationToken);
+            return result;
+        }
+
+        public virtual async Task<T> GetOpportunityByNamePrefix(Guid configurationGuid, OpportunityTypes opportunityType, string name, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return default;
+            var entity = dbContext.Model.FindEntityType(typeof(T));
+            var initiativeName = entity.GetProperties()
+                .SingleOrDefault(p => p.Name.Equals("Name", StringComparison.CurrentCultureIgnoreCase))?.Name;
+            if (string.IsNullOrEmpty(initiativeName)) return default;
+            var configurationGuidName = entity.GetProperties()
+                .SingleOrDefault(p => p.Name.Equals(nameof(AllOpportunity.ConfigurationGuid), StringComparison.CurrentCultureIgnoreCase))?.Name;
+            if (configurationGuidName == null) return default;
+            var opportunityTypeName = entity.GetProperties()
+                .SingleOrDefault(p => p.Name.Equals(nameof(AllOpportunity.OpportunityType), StringComparison.CurrentCultureIgnoreCase))?.Name;
+            if (opportunityTypeName == null) return default;
+            var result = await dbContext.AddUserFilter(dbContext.Set<T>().AsQueryable(), _user)
+                .FirstOrDefaultAsync(x => EF.Property<string>(x, initiativeName).StartsWith(name)
+                    && EF.Property<Guid>(x, configurationGuidName).Equals(configurationGuid)
+                    && EF.Property<int>(x, opportunityTypeName).Equals((int)opportunityType), cancellationToken);
+            return result;
+        }
+
+        public virtual async Task<bool> Contains(T entity, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return default;
+            var keyProperty = dbContext.Model.FindEntityType(typeof(T))
+                .FindPrimaryKey().Properties.Single().Name;
+            var id = entity.GetType().GetProperty(keyProperty).GetValue(entity, null);
+            var result = await dbContext.AddUserFilter(dbContext.Set<T>().AsQueryable(), _user)
+                .FirstOrDefaultAsync(x => id.Equals(EF.Property<TKey>(x, keyProperty)), cancellationToken);
+            return result != null;
+        }
+
+        public virtual async Task<bool> Contains(TKey id, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return default;
+            var keyProperty = dbContext.Model.FindEntityType(typeof(T))
+                .FindPrimaryKey().Properties.Single().Name;
+            var entity = await dbContext.AddUserFilter(dbContext.Set<T>().AsQueryable(), _user)
+                .FirstOrDefaultAsync(x => id.Equals(EF.Property<TKey>(x, keyProperty)), cancellationToken);
+            return entity != null;
+        }
+
+        protected virtual async Task<IWithSourceOpportunity> SetSourceOpportunity(IWithSourceOpportunity opportunity, CancellationToken cancellationToken)
+        {
+            if (opportunity == null || opportunity is not IOpportunity || opportunity is not IWithSourceOpportunity || _centralDbContext == null)
+                return opportunity;
+            var clientNetworkOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                .Include(cno => cno.Opportunities)
+                .Include(cno => cno.NetworkOpportunity)
+                .SingleOrDefaultAsync(cno => cno.Opportunities.Any(link => link.OpportunityGuid == ((IOpportunity)opportunity).OpportunityGuid));
+            if (clientNetworkOpportunity != null)
+            {
+                opportunity.SetSourceOpportunity(clientNetworkOpportunity);
+            }
+            else
+            {
+                opportunity.SourceOpportunityId = -1;
+            }
+            return opportunity;
+        }
+
+        /// <summary>
+        /// Get entities by primary key values
+        /// </summary>
+        public virtual Task<IEnumerable<T>> GetByIds(IEnumerable<TKey> ids, CancellationToken cancellationToken)
+        {
+            // prevent long IN clauses
+            if (ids.Count() > 2000)
+            {
+                throw new ArgumentException("List of ids cannot exceed 2000 count.");
+            }
+
+            return GetByIdsInternal(ids, cancellationToken);
+        }
+
+        /// <summary>
+        /// Get entities by primary key values
+        /// </summary>
+        private async Task<IEnumerable<T>> GetByIdsInternal(IEnumerable<TKey> ids, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return new List<T>();
+            var keyProperty = dbContext.Model.FindEntityType(typeof(T))
+                .FindPrimaryKey().Properties.Single().Name;
+            var results = await dbContext.Set<T>()
+                .Where(x => ids.Contains(EF.Property<TKey>(x, keyProperty)))
+                .ToListAsync(cancellationToken);
+            var opportunities = results.Where(data => data is IWithSourceOpportunity && data is IOpportunity).ToList();
+            if (opportunities.Any() && _centralDbContext != null)
+            {
+                foreach (var opportunity in results.Where(opp => opp is IWithSourceOpportunity && opp is IOpportunity))
+                {
+                    var clientNetworkOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                        .Include(cno => cno.Opportunities)
+                        .Include(cno => cno.NetworkOpportunity)
+                        .SingleOrDefaultAsync(cno => cno.Opportunities.Any(link => link.OpportunityGuid == ((IOpportunity)opportunity).OpportunityGuid));
+                    if (clientNetworkOpportunity != null)
+                    {
+                        ((IWithSourceOpportunity)opportunity).SetSourceOpportunity(clientNetworkOpportunity);
+                    }
+                }
+            }
+            return results;
+        }
+
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/Opportunity.cs b/src/Strata.ContinuousImprovement.Biz/Generics/Opportunity.cs
new file mode 100644
index 0000000..606cd22
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/Opportunity.cs
@@ -0,0 +1,33 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public class Opportunity : IOpportunity
+    {
+        [Key] public Guid OpportunityGuid { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public string OpportunityKey { get; set; }
+        public double IdentifiedSavings { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public bool HasInitiative => InitiativeGuid != Guid.Empty;
+        public string Initiative { get; set; }
+        public bool IsHidden { get; set; }
+        public string Note { get; set; } = String.Empty;
+
+        [NotMapped]
+        public string SourceOpportunity { get; set; } = "";
+        [NotMapped]
+        public long SourceOpportunityId { get; set; } = -1;
+
+        public virtual void Update(IOpportunity updates)
+        {
+            IdentifiedSavings = updates.IdentifiedSavings;
+            InitiativeGuid = updates.InitiativeGuid;
+            IsHidden = updates.IsHidden;
+            Note = updates.Note;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/OpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/Generics/OpportunityService.cs
new file mode 100644
index 0000000..f83a8a2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/OpportunityService.cs
@@ -0,0 +1,140 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Export;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public abstract class OpportunityService<T> : JazzDbService<T, Guid>, IOpportunityService<T>
+        where T : class, IOpportunity
+    {
+        protected readonly IInitiativeService _initiativeService;
+        protected readonly IUpdateFactOpportunitySavingsService _updateFactOpportunitySavingsService;
+        protected readonly ILogger<OpportunityService<T>> _logger;
+
+        protected OpportunityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory, CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IInitiativeService initiativeService, IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            ILogger<OpportunityService<T>> logger = default)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor)
+        {
+            _initiativeService = initiativeService;
+            _updateFactOpportunitySavingsService = updateFactOpportunitySavingsService;
+            _logger = logger;
+        }
+
+        protected ExportOptions GetExportOptions()
+        {
+            return new ExportOptions() { EmptyMessage = "No Opportunities" };
+        }
+
+        public virtual async Task SetHiddenAsync(Guid opportunityGuid, bool isHidden, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return;
+            var opportunityItem = await dbContext.Set<T>()
+                .SingleOrDefaultAsync(vo => vo.OpportunityGuid.Equals(opportunityGuid), cancellationToken);
+            if (opportunityItem == null) return;
+
+            if (typeof(T).Name == "UVOpportunity")
+            {
+                if (opportunityItem.OpportunityKey.StartsWith("FE"))
+                {
+                    var explorationOpportunity = await dbContext.ExplorationVariationOpportunitiesData
+                        .SingleOrDefaultAsync(vo => vo.OpportunityGuid.Equals(opportunityGuid), cancellationToken);
+                    if (explorationOpportunity == null) return;
+                    explorationOpportunity.IsHidden = isHidden;
+                    await dbContext.SaveChangesAsync(cancellationToken);
+                }
+                else if (opportunityItem.OpportunityKey.StartsWith("UV"))
+                {
+                    var variationOpportunity = await dbContext.UtilizationVariationOpportunitiesData
+                        .SingleOrDefaultAsync(vo => vo.OpportunityGuid.Equals(opportunityGuid), cancellationToken);
+                    if (variationOpportunity == null) return;
+                    variationOpportunity.IsHidden = isHidden;
+                    await dbContext.SaveChangesAsync(cancellationToken);
+                }
+            }
+            else
+            {
+                ((IOpportunity)opportunityItem).IsHidden = isHidden;
+                await dbContext.SaveChangesAsync(cancellationToken);
+            }
+        }
+
+        public virtual async Task SetNoteAsync(Guid opportunityGuid, string note, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return;
+            var opportunityItem = await dbContext.Set<T>()
+                .SingleOrDefaultAsync(vo => vo.OpportunityGuid.Equals(opportunityGuid), cancellationToken);
+            if (opportunityItem == null) return;
+
+            if (typeof(T).Name == "UVOpportunity")
+            {
+                if (opportunityItem.OpportunityKey.StartsWith("FE"))
+                {
+                    var explorationOpportunity = await dbContext.ExplorationVariationOpportunitiesData
+                        .SingleOrDefaultAsync(vo => vo.OpportunityGuid.Equals(opportunityGuid), cancellationToken);
+                    if (explorationOpportunity == null) return;
+                    explorationOpportunity.Note = note;
+                    await dbContext.SaveChangesAsync(cancellationToken);
+                }
+                else if (opportunityItem.OpportunityKey.StartsWith("UV"))
+                {
+                    var variationOpportunity = await dbContext.UtilizationVariationOpportunitiesData
+                        .SingleOrDefaultAsync(vo => vo.OpportunityGuid.Equals(opportunityGuid), cancellationToken);
+                    if (variationOpportunity == null) return;
+                    variationOpportunity.Note = note;
+                    await dbContext.SaveChangesAsync(cancellationToken);
+                }
+            }
+            else
+            {
+                ((IOpportunity)opportunityItem).Note = note;
+                await dbContext.SaveChangesAsync(cancellationToken);
+            }
+        }
+
+        public virtual async Task<bool> DeleteAsync<Entity>(Guid opportunityGuid, CancellationToken cancellationToken)
+            where Entity : class, IOpportunity
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return false;
+
+            var result = 0;
+            try
+            {
+                var opportunity = await dbContext.Set<Entity>().SingleOrDefaultAsync(opp => opp.OpportunityGuid.Equals(opportunityGuid), cancellationToken);
+                if (opportunity == null) return false;
+
+                if (opportunity.InitiativeGuid != Guid.Empty)
+                {
+                    await _initiativeService.DeleteAsync(opportunity.InitiativeGuid, cancellationToken);
+                }
+
+                dbContext.Set<Entity>().Remove(opportunity);
+                result = await dbContext.SaveChangesAsync(cancellationToken);
+                await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                if (_logger == default) return false;
+                _logger.LogServiceError(ex, ex.Message, new Dictionary<string, object>
+                {
+                    { nameof(opportunityGuid), opportunityGuid }
+                });
+            }
+            return result > 0;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/OpportunityTypes.cs b/src/Strata.ContinuousImprovement.Biz/Generics/OpportunityTypes.cs
new file mode 100644
index 0000000..14ccaad
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/OpportunityTypes.cs
@@ -0,0 +1,17 @@
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public enum OpportunityTypes : byte
+    {
+        Variation,
+        QualityVariation = 2,
+        OrgDefined = 4,
+        FreeForm,
+        GeneralLedger,
+        Payroll,
+        Encounter,
+        ChargeCode,
+        Network,
+        Exploration,
+        Blank
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/StrategicOpportunityTypes.cs b/src/Strata.ContinuousImprovement.Biz/Generics/StrategicOpportunityTypes.cs
new file mode 100644
index 0000000..ada5ce6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/StrategicOpportunityTypes.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public enum StrategicOpportunityTypes : byte
+    {
+        ChargeCode,
+        GeneralLedger,
+        Encounter
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Generics/UpdateFactOpportunitySavingsService.cs b/src/Strata.ContinuousImprovement.Biz/Generics/UpdateFactOpportunitySavingsService.cs
new file mode 100644
index 0000000..fd9efc9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Generics/UpdateFactOpportunitySavingsService.cs
@@ -0,0 +1,45 @@
+using DocumentFormat.OpenXml.Wordprocessing;
+using Hangfire;
+using Hangfire.Common;
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Hangfire;
+using Strata.ContinuousImprovement.Biz.Replication;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Hangfire.Jazz.Client.Models;
+using Strata.Id.Client;
+using Strata.Replication.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+
+namespace Strata.ContinuousImprovement.Biz.Generics
+{
+    public class UpdateFactOpportunitySavingsService : IUpdateFactOpportunitySavingsService
+    {
+        private readonly IJazzHangfireServiceClient _hangfireServiceClient;
+
+        public UpdateFactOpportunitySavingsService(
+            IJazzHangfireServiceClient jazzHangfireServiceClient)
+        {
+            _hangfireServiceClient = jazzHangfireServiceClient;
+        }
+
+        public async Task UpdateFactOpportunitySavings(CancellationToken cancellationToken)
+        {
+            var job = new EnqueueJobDto
+            {
+                TaskName = "Strata.CS.Jazz.Biz.CCI.Tasks.RunUpdateFactOpportunitySavingsTask, Strata.CS.Jazz.Biz.CCI"
+            };
+            await _hangfireServiceClient.EnqueueJobAsync(job, cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Hangfire/AccessGudidSection.cs b/src/Strata.ContinuousImprovement.Biz/Hangfire/AccessGudidSection.cs
new file mode 100644
index 0000000..2ed5043
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Hangfire/AccessGudidSection.cs
@@ -0,0 +1,7 @@
+namespace Strata.ContinuousImprovement.Biz.Hangfire
+{
+    public class AccessGudidSection
+    {
+        public string Url { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Hangfire/HangfireSection.cs b/src/Strata.ContinuousImprovement.Biz/Hangfire/HangfireSection.cs
new file mode 100644
index 0000000..b7bcb9e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Hangfire/HangfireSection.cs
@@ -0,0 +1,7 @@
+namespace Strata.ContinuousImprovement.Biz.Hangfire
+{
+    public class HangfireSection
+    {
+        public string Url { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Hangfire/HangfireUtility.cs b/src/Strata.ContinuousImprovement.Biz/Hangfire/HangfireUtility.cs
new file mode 100644
index 0000000..0908c79
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Hangfire/HangfireUtility.cs
@@ -0,0 +1,50 @@
+using Hangfire;
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Text;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Hangfire
+{
+    public class HangfireUtility
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+
+        public HangfireUtility(IAsyncDbContextFactory<JazzDbContext> dbContextFactory)
+        {
+            _dbContextFactory = dbContextFactory;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Run Jazz Hangfire Task {2} on ({0})")]
+        [CaptureJobParameter(DatabaseGuidArgumentPosition = 1, StrataIdArgumentPosition = 0)]
+        public async Task<int> RunJazzHangfireTaskJob(int strataId, Guid databaseGuid, string taskName, string qualifiedName, object context, CancellationToken cancellationToken)
+        {
+            using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            var contextJson = JsonSerializer.Serialize(context, new JsonSerializerOptions
+            {
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                WriteIndented = true
+            });
+            var command = new StringBuilder();
+            command.AppendFormat("declare @TaskName varchar(max) = '{0}';\r\n", taskName.SplitCamelCase());
+            command.AppendFormat("declare @AssemblyQualifiedName varchar(max) = 'Strata.CS.Jazz.Biz.CCI.{0}, " +
+                "Strata.CS.Jazz.Biz.CCI, Version=2015.20.0.0, Culture=neutral, PublicKeyToken=null';\r\n", qualifiedName);
+            command.AppendLine("DECLARE @statusCode INT;");
+            command.AppendLine("EXEC dbo.procCreateTask");
+            command.AppendLine("    @taskTypeName = @AssemblyQualifiedName,");
+            command.AppendFormat("    @contextXML = '{0}',\r\n", contextJson == null ? "" : $"{contextJson.Replace("{", "{{").Replace("}", "}}")}");
+            command.AppendLine("    @userName = 'HangfireMigration',                  -- varchar(100)");
+            command.AppendLine("	@taskSource = 'Microservice',");
+            command.AppendLine("    @statusCode = @statusCode OUTPUT -- int");
+            var sql = command.ToString();
+            return await dbContext.Database.ExecuteSqlRawAsync(sql, cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Hangfire/ISprintRefresh.cs b/src/Strata.ContinuousImprovement.Biz/Hangfire/ISprintRefresh.cs
new file mode 100644
index 0000000..040a45c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Hangfire/ISprintRefresh.cs
@@ -0,0 +1,10 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Hangfire
+{
+    public interface ISprintRefresh
+    {
+        Task CommentsRefreshJob(CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Hangfire/SprintRefresh.cs b/src/Strata.ContinuousImprovement.Biz/Hangfire/SprintRefresh.cs
new file mode 100644
index 0000000..7dfa7b0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Hangfire/SprintRefresh.cs
@@ -0,0 +1,121 @@
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Id.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Hangfire
+{
+    public class SprintRefresh : ISprintRefresh
+    {
+        private readonly CentralDbContext _centralDbContext;
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly IRecurringJobManager _recurringJobManager;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+        private readonly ILogger<SprintRefresh> _logger;
+
+        public SprintRefresh(CentralDbContext centralDbContext,
+            IIdServiceClient idServiceClient,
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            IRecurringJobManager recurringJobManager,
+            IBackgroundJobClient backgroundJobClient,
+            ILogger<SprintRefresh> logger)
+        {
+            _centralDbContext = centralDbContext;
+            _idServiceClient = idServiceClient;
+            _dbContextFactory = dbContextFactory;
+            _recurringJobManager = recurringJobManager;
+            _backgroundJobClient = backgroundJobClient;
+            _logger = logger;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Sprint Rollover Refresh")]
+        [Semaphore(nameof(SprintRefreshJob))]
+        public async Task SprintRefreshJob(CancellationToken cancellationToken)
+        {
+            _recurringJobManager.Trigger(nameof(SprintRefresh.CommentsRefreshJob));
+            _recurringJobManager.Trigger(nameof(SprintRefresh.OpportunityWorkbooksRefreshJob));
+            _recurringJobManager.Trigger(nameof(SprintRefresh.NetworkOpportunityRefreshJob));
+            _recurringJobManager.Trigger(nameof(SprintRefresh.RunUpdateFactOpportunitySavingsTaskJob) + "DevMaster");
+            _recurringJobManager.Trigger(nameof(SprintRefresh.RunUpdateFactOpportunitySavingsTaskJob) + "QaMaster");
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Sprint Rollover Comments Refresh")]
+        [Semaphore(nameof(CommentsRefreshJob))]
+        public async Task CommentsRefreshJob(CancellationToken cancellationToken)
+        {
+            await RefreshJob<Comment>(cancellationToken);
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Sprint Rollover Opportunity Workbooks Refresh")]
+        [Semaphore(nameof(OpportunityWorkbooksRefreshJob))]
+        public async Task OpportunityWorkbooksRefreshJob(CancellationToken cancellationToken)
+        {
+            await RefreshJob<OpportunityWorkbook>(cancellationToken);
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Sprint Rollover Network Opportunity Refresh")]
+        [Semaphore(nameof(NetworkOpportunityRefreshJob))]
+        public async Task NetworkOpportunityRefreshJob(CancellationToken cancellationToken)
+        {
+            await RefreshJob<NetworkOpportunity>(cancellationToken);
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Sprint Rollover Update Fact Opportunity Savings Refresh on {0}")]
+        [Semaphore(nameof(RunUpdateFactOpportunitySavingsTaskJob))]
+        public async Task RunUpdateFactOpportunitySavingsTaskJob(string databaseName, CancellationToken cancellationToken)
+        {
+            var clients = await _idServiceClient.GetStrataIds(cancellationToken);
+            var db = clients.SingleOrDefault(client => client.DatabaseName.Equals(databaseName, StringComparison.CurrentCultureIgnoreCase));
+            if (db == null) { return; }
+            var hangfireUtility = new HangfireUtility(_dbContextFactory);
+            _backgroundJobClient.Enqueue<HangfireUtility>(job =>
+                hangfireUtility.RunJazzHangfireTaskJob(db.StrataId, db.DatabaseGUID,
+                "RunUpdateFactOpportunitySavingsTask", "Tasks.RunUpdateFactOpportunitySavingsTask",
+                new { RunContext = Guid.NewGuid() }, cancellationToken));
+        }
+
+        private async Task RefreshJob<T>(CancellationToken cancellationToken) where T : class
+        {
+            try
+            {
+                var count = await _centralDbContext.Set<T>().CountAsync(cancellationToken);
+                var tableName = _centralDbContext.SchemaQualifiedTableName<T>();
+                if (count == 0)
+                {
+                    _logger.LogInformation("No {tableName} to be removed", tableName);
+                    return;
+                }
+                var truncateSql = _centralDbContext.TruncateSql<T>();
+                await _centralDbContext.Database.ExecuteSqlRawAsync(truncateSql);
+                var removedCount = await _centralDbContext.Set<T>().CountAsync(cancellationToken);
+                var removed = count - removedCount;
+                _logger.LogInformation("Removing {count} from {tableName}, {removed} removed", tableName, count, removed);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+                throw;
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Hangfire/SprintRefreshExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Hangfire/SprintRefreshExtensions.cs
new file mode 100644
index 0000000..9194863
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Hangfire/SprintRefreshExtensions.cs
@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Utilities;
+
+namespace Strata.ContinuousImprovement.Biz.Hangfire
+{
+    public static class SprintRefreshExtensions
+    {
+        public static string SchemaQualifiedTableName<T>(this DbContext dbContext)
+        {
+            var entityType = dbContext.Model.FindEntityType(typeof(T));
+            var schemaTableName = entityType.GetSchemaQualifiedTableName();
+            return schemaTableName.Replace(".", " ").SplitCamelCase();
+        }
+
+        public static string TruncateSql<T>(this DbContext dbContext)
+        {
+            var entityType = dbContext.Model.FindEntityType(typeof(T));
+            var schemaTableName = entityType.GetSchemaQualifiedTableName();
+            return $"TRUNCATE {schemaTableName} RESTART IDENTITY CASCADE;";
+        }
+
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Hubs/HangfireHub.cs b/src/Strata.ContinuousImprovement.Biz/Hubs/HangfireHub.cs
new file mode 100644
index 0000000..f9eb744
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Hubs/HangfireHub.cs
@@ -0,0 +1,87 @@
+using Microsoft.AspNetCore.SignalR;
+using System;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Hubs
+{
+    public interface IHangfireHub
+    {
+        Task SendNumber(int i);
+        Task SendFailureMessage(Exception e);
+        Task SendSuccessMessage(string taskName);
+        Task SendHangfireStatus(string status, string objectId, string payload);
+    }
+
+    public class HangfireHub : Hub<IHangfireHub>
+    {
+        public const string HubURL = "/api/HangfireHub";
+        public const string ErrorStatus = "error";
+        public const string SuccessStatus = "success";
+        public const string InfoStatus = "info";
+
+        public async Task Register(string topic, CancellationToken cancellationToken)
+        {
+            await Groups.AddToGroupAsync(Context.ConnectionId, topic, cancellationToken);
+        }
+
+        public async Task Remove(string topic, CancellationToken cancellationToken)
+        {
+            await Groups.RemoveFromGroupAsync(Context.ConnectionId, topic, cancellationToken);
+        }
+    }
+
+    public static class HangfireHubContextExtensions
+    {
+        public static Task SendInfo(this IHubContext<HangfireHub, IHangfireHub> context, object objectId, object payload)
+        {
+            return context.SendStatus(HangfireHub.InfoStatus, objectId, payload);
+        }
+
+        public static Task SendSuccess(this IHubContext<HangfireHub, IHangfireHub> context, object objectId, object payload)
+        {
+            return context.SendStatus(HangfireHub.SuccessStatus, objectId, payload);
+        }
+
+        public static Task SendFailure(this IHubContext<HangfireHub, IHangfireHub> context, object objectId, Exception exception)
+        {
+            return context.SendStatus(HangfireHub.ErrorStatus, objectId, exception.Message);
+        }
+
+        public static Task SendFailure(this IHubContext<HangfireHub, IHangfireHub> context, object objectId, object payload)
+        {
+            return context.SendStatus(HangfireHub.ErrorStatus, objectId, payload);
+        }
+
+        public static Task SendStatus(this IHubContext<HangfireHub, IHangfireHub> context, string status, object objectId, object payload)
+        {
+            return context.Clients.All.SendHangfireStatus(status, JsonSerializer.Serialize(objectId), JsonSerializer.Serialize(payload));
+        }
+
+        public static Task SendInfoToGroup(this IHubContext<HangfireHub, IHangfireHub> context, string topic, object objectId, object payload)
+        {
+            return context.SendStatusToGroup(topic, HangfireHub.InfoStatus, objectId, payload);
+        }
+
+        public static Task SendSuccessToGroup(this IHubContext<HangfireHub, IHangfireHub> context, string topic, object objectId, object payload)
+        {
+            return context.SendStatusToGroup(topic, HangfireHub.SuccessStatus, objectId, payload);
+        }
+
+        public static Task SendFailureToGroup(this IHubContext<HangfireHub, IHangfireHub> context, string topic, object objectId, Exception exception)
+        {
+            return context.SendStatusToGroup(topic, HangfireHub.ErrorStatus, objectId, exception.Message);
+        }
+
+        public static Task SendFailureToGroup(this IHubContext<HangfireHub, IHangfireHub> context, string topic, object objectId, object payload)
+        {
+            return context.SendStatusToGroup(topic, HangfireHub.ErrorStatus, objectId, payload);
+        }
+
+        public static Task SendStatusToGroup(this IHubContext<HangfireHub, IHangfireHub> context, string topic, string status, object objectId, object payload)
+        {
+            return context.Clients.Group(topic).SendHangfireStatus(status, JsonSerializer.Serialize(objectId), JsonSerializer.Serialize(payload));
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Hubs/NotifyJobFilter.cs b/src/Strata.ContinuousImprovement.Biz/Hubs/NotifyJobFilter.cs
new file mode 100644
index 0000000..853b367
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Hubs/NotifyJobFilter.cs
@@ -0,0 +1,64 @@
+using Hangfire;
+using Hangfire.Common;
+using Hangfire.States;
+using Hangfire.Storage;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+
+namespace Strata.ContinuousImprovement.Biz.Hubs
+{
+    public class NotifyJobFilter : JobFilterAttribute, IApplyStateFilter
+    {
+        private readonly ILogger<NotifyJobFilter> _logger;
+        private readonly IHubContext<HangfireHub, IHangfireHub> _hangfireHubContext;
+
+        public NotifyJobFilter([NotNull] ILogger<NotifyJobFilter> logger, [NotNull] IHubContext<HangfireHub, IHangfireHub> hangfireHubContext)
+        {
+            _logger = logger;
+            _hangfireHubContext = hangfireHubContext;
+        }
+
+        public void OnStateApplied(ApplyStateContext context, IWriteOnlyTransaction transaction)
+        {
+            if (context.NewState.Name == SucceededState.StateName)
+            {
+                Notify(false, context);
+            }
+
+            if (context.NewState.Name == FailedState.StateName)
+            {
+                Notify(true, context);
+            }
+        }
+
+        private void Notify(bool isError, ApplyStateContext context)
+        {
+            var displayName = context.BackgroundJob.Id;
+
+            var displayNameAttribute = context.BackgroundJob.Job?.Method?.GetCustomAttributes(typeof(JobDisplayNameAttribute), false).FirstOrDefault() as JobDisplayNameAttribute;
+            if (displayNameAttribute != null)
+            {
+                displayName = string.Format(displayNameAttribute.DisplayName, context.BackgroundJob.Job.Args.ToArray());
+            }
+
+            var status = isError ? HangfireHub.ErrorStatus : HangfireHub.SuccessStatus;
+
+            var statusMessage = isError ? "Finished with Errors" : "Finished successfully";
+
+            var message = $"[{displayName}] {statusMessage}";
+
+            _logger.LogInformation(message);
+
+            _hangfireHubContext.SendStatus(status, context.BackgroundJob.Id, message);
+        }
+
+        public void OnStateUnapplied(ApplyStateContext context, IWriteOnlyTransaction transaction)
+        {
+
+        }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeDetailColumns/IInitiativeDetailColumnService.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeDetailColumns/IInitiativeDetailColumnService.cs
new file mode 100644
index 0000000..fd8d34f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeDetailColumns/IInitiativeDetailColumnService.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.InitiativeDetailColumns
+{
+    public interface IInitiativeDetailColumnService
+    {
+        Task<IEnumerable<InitiativeDetailColumn>> GetColumnList(Guid userGuid, CancellationToken cancellationToken);
+        Task<IEnumerable<InitiativeDetailColumn>> GetManagedColumnList(Guid userGuid, CancellationToken cancellationToken);
+        IEnumerable<InitiativeDetailColumn> GetDefaultColumnList();
+        Task SetColumnList(Guid userGuid, IEnumerable<InitiativeDetailColumn> columnList, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeDetailColumns/InitiativeDetailColumn.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeDetailColumns/InitiativeDetailColumn.cs
new file mode 100644
index 0000000..d256c37
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeDetailColumns/InitiativeDetailColumn.cs
@@ -0,0 +1,88 @@
+using Newtonsoft.Json;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+
+namespace Strata.ContinuousImprovement.Biz.InitiativeDetailColumns
+{
+    public class InitiativeDetailColumn
+    {
+        public int Index { get; set; }
+        public string Name { get; set; }
+        public string Heading { get; set; }
+        public bool IsLocked { get; set; }
+        public bool IsHidden { get; set; }
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public int? InitiativeRollupColumnId { get; set; }
+
+        public InitiativeDetailColumn()
+        {
+
+        }
+
+        public InitiativeDetailColumn(PropertyInfo propertyInfo, int index, bool isLocked)
+        {
+            Index = index;
+            Name = propertyInfo.Name;
+            switch (propertyInfo.Name)
+            {
+                case nameof(InitiativeDetail.Name):
+                    Heading = "Initiative"; break;
+                case nameof(Initiative.SavingsCommitted):
+                    Heading = "12-Month Goal Savings"; break;
+                case nameof(Initiative.AnnualGoal):
+                    Heading = "Committed FY Savings"; break;
+                default:
+                    Heading = Name.SplitCamelCase(); break;
+            }
+            IsLocked = isLocked;
+            if (propertyInfo.Name.StartsWith("InitiativeRollup", StringComparison.CurrentCultureIgnoreCase))
+            {
+                InitiativeRollupColumnId = int.TryParse(Regex.Replace(propertyInfo.Name, @"([\d])", "$1"), out var result) ? result : null;
+            }
+        }
+
+        public static IEnumerable<string> ManagedColumnsToIgnore
+            => new[] {
+                nameof(InitiativeDetail.InitiativeRollup1Id),
+                nameof(InitiativeDetail.InitiativeRollup2Id),
+                nameof(InitiativeDetail.InitiativeRollup3Id)
+            };
+
+        public static IEnumerable<string> ColumnsToIgnore
+            => new[] {
+                nameof(InitiativeDetail.InitiativeGuid),
+                nameof(InitiativeDetail.OpportunityType),
+                nameof(InitiativeDetail.InitiativeRollup1),
+                nameof(InitiativeDetail.InitiativeRollup2),
+                nameof(InitiativeDetail.InitiativeRollup3),
+                nameof(InitiativeDetail.GoalStatement),
+                nameof(InitiativeDetail.PlannedImprovements),
+                nameof(InitiativeDetail.CurrentMonth),
+                nameof(InitiativeDetail.Stakeholders),
+                nameof(InitiativeDetail.TeamMembers),
+                nameof(InitiativeDetail.InitiativeStatus),
+                nameof(InitiativeDetail.SourceOpportunityId),
+                nameof(InitiativeDetail.OpportunityKey),
+                nameof(InitiativeDetail.OpportunityId),
+                nameof(InitiativeDetail.Comments),
+                nameof(InitiativeDetail.Milestones),
+                nameof(InitiativeDetail.CurrentStep)
+            };
+
+        public static IEnumerable<InitiativeDetailColumn> GetListOfColumns()
+        {
+            var columnsToIgnore = ColumnsToIgnore;
+            var lockedColumns = new[] { nameof(InitiativeDetail.Name) };
+            var properties = typeof(InitiativeDetail).GetProperties(BindingFlags.Public | BindingFlags.Instance)
+                .Where(p => !columnsToIgnore.Contains(p.Name))
+                .Select((p, i) => new InitiativeDetailColumn(p, i, lockedColumns.Contains(p.Name)));
+            return properties;
+        }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeDetailColumns/InitiativeDetailColumnService.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeDetailColumns/InitiativeDetailColumnService.cs
new file mode 100644
index 0000000..ce51fba
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeDetailColumns/InitiativeDetailColumnService.cs
@@ -0,0 +1,61 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.InitiativeDetailColumns
+{
+    public class InitiativeDetailColumnService : IInitiativeDetailColumnService
+    {
+        private readonly IUserSettingService _userSettingService;
+
+        public InitiativeDetailColumnService(IUserSettingService userSettingService)
+        {
+            _userSettingService = userSettingService;
+        }
+
+        public async Task<IEnumerable<InitiativeDetailColumn>> GetColumnList(Guid userGuid, CancellationToken cancellationToken)
+        {
+            var columns = await GetColumnsAsync(userGuid, cancellationToken);
+            return columns;
+        }
+
+        public async Task<IEnumerable<InitiativeDetailColumn>> GetManagedColumnList(Guid userGuid, CancellationToken cancellationToken)
+        {
+            var columns = await GetColumnsAsync(userGuid, cancellationToken);
+            return columns.Where(cl => !InitiativeDetailColumn.ManagedColumnsToIgnore.Contains(cl.Name, StringComparer.OrdinalIgnoreCase));
+        }
+
+        private async Task<IEnumerable<InitiativeDetailColumn>> GetColumnsAsync(Guid userGuid, CancellationToken cancellationToken)
+        {
+            var columnsToIgnore = InitiativeDetailColumn.ColumnsToIgnore.ToList();
+            var defaultColumnList = GetDefaultColumnList();
+            var columnList = await _userSettingService.GetDboUserSettings<InitiativeDetailColumn>(DboUserSetting.CCI_INITIATIVES_COLUMNS, userGuid, cancellationToken);
+            var result = columnList.Any() ? columnList.Where(col => !columnsToIgnore.Contains(col.Name)).ToList() : defaultColumnList;
+            return result.OrderBy(r => r.Index);
+        }
+
+        public IEnumerable<InitiativeDetailColumn> GetDefaultColumnList()
+        {
+            var defaultColumnList = InitiativeDetailColumn.GetListOfColumns().ToList();
+            return defaultColumnList;
+        }
+
+        public async Task SetColumnList(Guid userGuid, IEnumerable<InitiativeDetailColumn> columnList, CancellationToken cancellationToken)
+        {
+            var reorderedColumns = columnList.Select((column, idx) => new { column, idx }).ToList();
+            reorderedColumns.ForEach(reorderedColumn => reorderedColumn.column.Index = reorderedColumn.idx);
+            columnList = reorderedColumns.Select(reorderedColumn => reorderedColumn.column).ToList();
+            var listOfColumns = columnList.GroupBy(cl => cl.Name, (g, d) => d.OrderBy(c => c.Index).First())
+                .OrderBy(c => c.Index);
+
+            await _userSettingService.SetDboUserSetting(DboUserSetting.CCI_INITIATIVES_COLUMNS, userGuid, listOfColumns, cancellationToken);
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/IInitiativeRollupColumnAliasService.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/IInitiativeRollupColumnAliasService.cs
new file mode 100644
index 0000000..dae22bf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/IInitiativeRollupColumnAliasService.cs
@@ -0,0 +1,10 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.InitiativeRollupColumns
+{
+    public interface IInitiativeRollupColumnAliasService
+    {
+        Task UpdateReportingReferences(int rollupColumnId, string name, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/IInitiativeRollupColumnService.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/IInitiativeRollupColumnService.cs
new file mode 100644
index 0000000..01c2b37
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/IInitiativeRollupColumnService.cs
@@ -0,0 +1,23 @@
+using Strata.ContinuousImprovement.Biz.InitiativeDetailColumns;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.InitiativeRollupColumns
+{
+    public interface IInitiativeRollupColumnService
+    {
+        Task<bool> ContainsAsync(int initiativeRollupColumnId, CancellationToken cancellationToken);
+        Task<bool> ContainsNameAsync(string name, CancellationToken cancellationToken, int initiativeRollupColumnId = 0);
+        Task<bool> IsNameValid(string name, CancellationToken cancellationToken, int initiativeRollupColumnId = 0);
+        Task<InitiativeRollupColumn> CreateAsync(InitiativeRollupColumnCreateInfo createInfo, CancellationToken cancellationToken);
+        Task DeleteAsync(int initiativeRollupColumnId, CancellationToken cancellationToken);
+        Task<IEnumerable<InitiativeRollupColumn>> GetAllAsync(CancellationToken cancellationToken);
+        Task<InitiativeRollupColumn> GetByIdAsync(int initiativeRollupColumnId, CancellationToken cancellationToken);
+        Task<IEnumerable<InitiativeRollupValue>> GetByRollupValuesById(int initiativeRollupColumnId, CancellationToken cancellationToken);
+        Task<InitiativeRollupValue> AddRollupValue(int initiativeRollupColumnId, string value, CancellationToken cancellationToken);
+        Task<InitiativeRollupColumn> UpdateAsync(int initiativeRollupColumnId, InitiativeRollupColumnSaveInfo initiativeRollupColumnSaveInfo, CancellationToken cancellationToken);
+        Task AddRollupToManagedColumns(InitiativeRollupColumn initiativeRollupColumn, CancellationToken cancellationToken);
+        InitiativeDetailColumn ConvertRollupColumnToManagedColumn(InitiativeRollupColumn initiativeRollupColumn, List<InitiativeDetailColumn> managedColumns);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumn.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumn.cs
new file mode 100644
index 0000000..96517a6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumn.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.InitiativeRollupColumns
+{
+    [Table("InitiativeRollupColumn", Schema = "cci")]
+    public class InitiativeRollupColumn
+    {
+        [Key]
+        public int InitiativeRollupColumnId { get; set; }
+        public string Name { get; set; }
+        public ICollection<InitiativeRollupValue> InitiativeRollupValues { get; set; } = new List<InitiativeRollupValue>();
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnAliasService.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnAliasService.cs
new file mode 100644
index 0000000..06b5407
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnAliasService.cs
@@ -0,0 +1,110 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Replication;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.DataSchema.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.InitiativeRollupColumns
+{
+    public class InitiativeRollupColumnAliasService : IInitiativeRollupColumnAliasService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly IDataSchemaService _dataSchemaService;
+        private readonly ILogger<InitiativeRollupColumnAliasService> _logger;
+        private readonly IDatabaseService _databaseService;
+
+        public InitiativeRollupColumnAliasService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory
+            , IDataSchemaService dataSchemaService
+            , ILogger<InitiativeRollupColumnAliasService> logger
+            , IDatabaseService databaseService
+            )
+        {
+            _dbContextFactory = dbContextFactory;
+            _dataSchemaService = dataSchemaService;
+            _logger = logger;
+            _databaseService = databaseService;
+        }
+
+        private async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task UpdateReportingReferences(int rollupColumnId, string name, CancellationToken cancellationToken)
+        {
+            try
+            {
+                await UpdateRESQLReportColumnAlias(rollupColumnId, name, cancellationToken);
+                await UpdateIARDataSchema(rollupColumnId, name, cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+                throw;
+            }
+        }
+
+        private async Task UpdateRESQLReportColumnAlias(int rollupColumnId, string name, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var attributes = await dbContext.ScoreAttributes
+                .Where(a => a.SqlColumnName == $"InitiativeRollup{rollupColumnId}")
+                .ToListAsync(cancellationToken);
+            if (!attributes.Any()) { return; }
+            attributes.ForEach(attribute => attribute.FriendlyName = name);
+            dbContext.ScoreAttributes.UpdateRange(attributes);
+            var registeredAttributes = await dbContext.RESQLReportRegisteredAttributes
+                .Where(a => attributes.Select(attr => attr.AttributeGuid).Contains(a.AttributeGUID))
+                .ToListAsync(cancellationToken);
+            registeredAttributes.ForEach(ra => ra.ColumnAlias = name);
+            dbContext.RESQLReportRegisteredAttributes.UpdateRange(registeredAttributes);
+            await dbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        private async Task UpdateIARDataSchema(int rollupColumnId, string name, CancellationToken cancellationToken)
+        {
+            try
+            {
+                bool isOnboarded = await _databaseService.IsClientOnboardedAsync(cancellationToken);
+
+                if (_dataSchemaService == null || !isOnboarded) return;
+
+                foreach (var tableName in new[] { "dimopportunity", "diminitiative" })
+                {
+                    var iarDimensions = await _dataSchemaService.GetDataTablesBySqlTableNameAsync("fw", tableName, DataSchema.Models.Schema.DataTableType.Dimension, cancellationToken);
+                    var dataTable = iarDimensions.FirstOrDefault();
+
+                    if (dataTable != null)
+                    {
+                        var column = dataTable
+                            .Columns.Find(col => col.SqlObjectName.Equals($"InitiativeRollup{rollupColumnId}", StringComparison.CurrentCultureIgnoreCase));
+                        if (column != null)
+                        {
+                            column.Name = name;
+                            var saveInfo = dataTable.MapToSaveInfo();
+                            try
+                            {
+                                await _dataSchemaService.UpdateDataTableAsync(dataTable.DataTableId, saveInfo, cancellationToken);
+                            }
+                            catch (Exception ex)
+                            {
+                                _logger.LogServiceError(ex, tableName);
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, "UpdateIARDataSchema failed.");
+            }
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnCreateInfo.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnCreateInfo.cs
new file mode 100644
index 0000000..2692617
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnCreateInfo.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.InitiativeRollupColumns
+{
+    public class InitiativeRollupColumnCreateInfo
+    {
+        public string Name { get; set; }
+        public List<string> Values { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnException.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnException.cs
new file mode 100644
index 0000000..b4aa844
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnException.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Strata.ContinuousImprovement.Biz.InitiativeRollupColumns
+{
+    [Serializable]
+    public class InitiativeRollupColumnException : Exception
+    {
+        public InitiativeRollupColumnException()
+        {
+        }
+
+        public InitiativeRollupColumnException(string message) : base(message)
+        {
+        }
+
+        public InitiativeRollupColumnException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        protected InitiativeRollupColumnException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnSaveInfo.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnSaveInfo.cs
new file mode 100644
index 0000000..85e6f9b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnSaveInfo.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.InitiativeRollupColumns
+{
+    public class InitiativeRollupColumnSaveInfo
+    {
+        public string Name { get; set; }
+        public List<InitiativeRollupValueSaveInfo> Updates { get; set; } = new List<InitiativeRollupValueSaveInfo>();
+        public List<InitiativeRollupValueSaveInfo> Deletes { get; set; } = new List<InitiativeRollupValueSaveInfo>();
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnService.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnService.cs
new file mode 100644
index 0000000..4207a14
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupColumnService.cs
@@ -0,0 +1,378 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using MoreLinq.Extensions;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.InitiativeDetailColumns;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.InitiativeRollupColumns
+{
+
+    public class InitiativeRollupColumnService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+        CentralDbContext centralDbContext,
+        IInitiativeDetailColumnService initiativeDetailColumnService,
+        IInitiativeRollupColumnAliasService aliasService,
+        IClaimsPrincipalAccessor claimsPrincipalAccessor,
+        IUserSettingService userSettingService,
+        ILogger<InitiativeRollupColumnService> logger) : IInitiativeRollupColumnService
+    {
+        private readonly ClaimsPrincipal _user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+        private readonly List<int> _allowedRollupColumnIds = new List<int> { 1, 2, 3 };
+
+        private async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<bool> ContainsAsync(int initiativeRollupColumnId, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            return await dbContext.InitiativeRollupColumns
+                .Where(x => _allowedRollupColumnIds.Contains(initiativeRollupColumnId) && x.InitiativeRollupColumnId == initiativeRollupColumnId)
+                .AnyAsync(cancellationToken);
+        }
+
+        public async Task<bool> ContainsNameAsync(string name, CancellationToken cancellationToken, int initiativeRollupColumnId = 0)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            return await dbContext.InitiativeRollupColumns.AnyAsync(x => x.Name.ToLower() == name.ToLower() && x.InitiativeRollupColumnId != initiativeRollupColumnId, cancellationToken);
+        }
+
+        public async Task<IEnumerable<InitiativeRollupColumn>> GetAllAsync(CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var columns = await dbContext.InitiativeRollupColumns
+                .Include(c => c.InitiativeRollupValues)
+                .Where(c => _allowedRollupColumnIds.Contains(c.InitiativeRollupColumnId)).ToListAsync(cancellationToken);
+            // Insert blank (' ') zero values into values for clean UI purposes
+            columns.ForEach(c =>
+            {
+                if (!c.InitiativeRollupValues.Any(v => v.InitiativeRollupValueId == 0))
+                {
+                    c.InitiativeRollupValues.Add(new InitiativeRollupValue
+                    {
+                        InitiativeRollupColumnId = c.InitiativeRollupColumnId,
+                        InitiativeRollupValueId = 0,
+                        Value = " "
+                    });
+                    c.InitiativeRollupValues = c.InitiativeRollupValues.OrderBy(v => v.InitiativeRollupValueId).ToList();
+                }
+            });
+            return columns;
+        }
+
+        public async Task<InitiativeRollupColumn> GetByIdAsync(int initiativeRollupColumnId, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            return await dbContext.InitiativeRollupColumns
+            .Include(irc => irc.InitiativeRollupValues)
+            .AsNoTracking()
+            .SingleOrDefaultAsync(irc => irc.InitiativeRollupColumnId == initiativeRollupColumnId, cancellationToken);
+        }
+
+        public async Task<InitiativeRollupColumn> CreateAsync(InitiativeRollupColumnCreateInfo createInfo, CancellationToken cancellationToken)
+        {
+            try
+            {
+                await using var dbContext = GetDbContext(cancellationToken).Result;
+                if (!await IsNameValid(createInfo.Name, cancellationToken))
+                {
+                    throw new InitiativeRollupColumnException("Rollup column name already exists.");
+                }
+
+                if(createInfo.Name.Length > 100)
+                {
+                    throw new InitiativeRollupColumnException("Rollup column exceeds maximum number of characters");
+                }
+
+                var initiativeRollupColumn = new InitiativeRollupColumn
+                {
+                    Name = createInfo.Name,
+                    InitiativeRollupColumnId = GetNextAvailableRollupColumnId(dbContext),
+                    InitiativeRollupValues = createInfo.Values?.Select(value =>
+                    {
+                        var rollupValue = new InitiativeRollupValue()
+                        {
+                            Value = value
+                        };
+
+                        return rollupValue;
+                    }).ToList()
+                };
+
+                await dbContext.InitiativeRollupColumns.AddAsync(initiativeRollupColumn, cancellationToken);
+                await aliasService.UpdateReportingReferences(initiativeRollupColumn.InitiativeRollupColumnId, initiativeRollupColumn.Name, cancellationToken);
+                await dbContext.SaveChangesAsync(cancellationToken);
+                await AddRollupToManagedColumns(initiativeRollupColumn, cancellationToken);
+                return initiativeRollupColumn;
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Failed creating InitiativeRollupColumn");
+                throw;
+            }
+        }
+
+        public async Task<bool> IsNameValid(string name, CancellationToken cancellationToken, int initiativeRollupColumnId = 0)
+        {
+            return !await ContainsNameAsync(name, cancellationToken, initiativeRollupColumnId);
+        }
+
+        private int GetNextAvailableRollupColumnId(JazzDbContext dbContext)
+        {
+            var currentRollupColumnIds = dbContext.InitiativeRollupColumns.Select(x => x.InitiativeRollupColumnId);
+            if (currentRollupColumnIds.Any())
+            {
+                var nextAvailableRollupColumnId = _allowedRollupColumnIds.Except(currentRollupColumnIds).Take(1);
+                if (!nextAvailableRollupColumnId.Any())
+                {
+                    throw new InitiativeRollupColumnException($"Cannot exceed maximum number of rollup columns {_allowedRollupColumnIds.Count()} allowed.");
+                }
+                return nextAvailableRollupColumnId.FirstOrDefault();
+            }
+
+            return 1;
+        }
+
+        public async Task<InitiativeRollupColumn> UpdateAsync(int initiativeRollupColumnId, InitiativeRollupColumnSaveInfo saveInfo, CancellationToken cancellationToken)
+        {
+            if (!await IsNameValid(saveInfo.Name, cancellationToken, initiativeRollupColumnId))
+            {
+                throw new Exception("Rollup column name already exists.");
+            }
+
+            if (saveInfo.Name.Length > 100)
+            {
+                throw new InitiativeRollupColumnException("Rollup column exceeds maximum number of characters");
+            }
+
+            var initiativeRollupColumn = await GetByIdAsync(initiativeRollupColumnId, cancellationToken);
+            if (initiativeRollupColumn == null) return null;
+
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            initiativeRollupColumn.Name = saveInfo.Name;
+            dbContext.InitiativeRollupColumns.Update(initiativeRollupColumn);
+            await aliasService.UpdateReportingReferences(initiativeRollupColumnId, saveInfo.Name, cancellationToken);
+
+            await UpdateRollupManagedColumn(initiativeRollupColumn, cancellationToken);
+
+            await UpdateInitiativeRollupValuesAsync(dbContext, initiativeRollupColumn, saveInfo, cancellationToken);
+            await dbContext.SaveChangesAsync(cancellationToken);
+
+            return initiativeRollupColumn;
+        }
+
+        private async Task UpdateInitiativeRollupValuesAsync(JazzDbContext dbContext, InitiativeRollupColumn initiativeRollupColumn, InitiativeRollupColumnSaveInfo saveInfo, CancellationToken cancellationToken)
+        {
+            var deletes = initiativeRollupColumn.InitiativeRollupValues
+                .Where(v => _allowedRollupColumnIds.Contains(v.InitiativeRollupColumnId)
+                    && v.InitiativeRollupColumnId == initiativeRollupColumn.InitiativeRollupColumnId
+                    && saveInfo.Deletes.Any(d => d.InitiativeRollupValueId == v.InitiativeRollupValueId));
+            dbContext.InitiativeRollupValues.RemoveRange(deletes);
+            await dbContext.SaveChangesAsync(cancellationToken);
+            foreach (var delete in saveInfo.Deletes)
+            {
+                await ClearInitiativeRollups(dbContext, initiativeRollupColumn.InitiativeRollupColumnId, delete.InitiativeRollupValueId);
+                await ClearStrategicOpportunityRollups(initiativeRollupColumn.InitiativeRollupColumnId, cancellationToken, delete.InitiativeRollupValueId);
+            }
+
+            foreach (var update in saveInfo.Updates)
+            {
+                var existing = initiativeRollupColumn.InitiativeRollupValues.FirstOrDefault(p => p.InitiativeRollupValueId == update.InitiativeRollupValueId);
+                if (existing == null)
+                {
+                    var newRollupValue = new InitiativeRollupValue()
+                    {
+                        InitiativeRollupColumnId = initiativeRollupColumn.InitiativeRollupColumnId,
+                        Value = update.Value
+                    };
+
+                    await dbContext.InitiativeRollupValues.AddAsync(newRollupValue, cancellationToken);
+                    await dbContext.SaveChangesAsync(cancellationToken);
+                }
+                else
+                {
+                    existing.Value = update.Value;
+                    dbContext.InitiativeRollupValues.Update(existing);
+                }
+            }
+        }
+
+        public async Task DeleteAsync(int initiativeRollupColumnId, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            await ClearInitiativeRollups(dbContext, initiativeRollupColumnId);
+            await ClearStrategicOpportunityRollups(initiativeRollupColumnId, cancellationToken);
+            var initiativeRollupColumn = await GetByIdAsync(initiativeRollupColumnId, cancellationToken);
+            await userSettingService.DeleteInitiativeColumnForAllUsers(initiativeRollupColumn.Name, cancellationToken);
+            await userSettingService.UpdateFilterForDeletedGroupCategory($"RollupColumn{initiativeRollupColumnId}", cancellationToken);
+            
+            // Cascading delete will remove InitiativeRollupValues associated with this InitiativeRollupColumn
+            dbContext.InitiativeRollupColumns.Remove(initiativeRollupColumn);
+            await dbContext.SaveChangesAsync(cancellationToken);
+
+            await RemoveRollupManagedColumn(initiativeRollupColumn, cancellationToken);
+        }
+
+        private async Task ClearInitiativeRollups(JazzDbContext dbContext, int initiativeRollupColumnId, int? initiativeRollupValueId = null)
+        {
+            if (!_allowedRollupColumnIds.Contains(initiativeRollupColumnId)) { return; }
+            var initiatives = await dbContext.Initiatives
+                .Where(i => (initiativeRollupColumnId == 1 && initiativeRollupValueId.HasValue ? i.InitiativeRollup1Id == initiativeRollupValueId : i.InitiativeRollup1Id != 0)
+                    || (initiativeRollupColumnId == 2 && initiativeRollupValueId.HasValue ? i.InitiativeRollup2Id == initiativeRollupValueId : i.InitiativeRollup2Id != 0)
+                    || (initiativeRollupColumnId == 3 && initiativeRollupValueId.HasValue ? i.InitiativeRollup3Id == initiativeRollupValueId : i.InitiativeRollup3Id != 0)
+                ).ToListAsync();
+            foreach (var item in initiatives)
+            {
+                switch (initiativeRollupColumnId)
+                {
+                    case 1:
+                        item.InitiativeRollup1Id = 0;
+                        break;
+                    case 2:
+                        item.InitiativeRollup2Id = 0;
+                        break;
+                    case 3:
+                        item.InitiativeRollup3Id = 0;
+                        break;
+                }
+            }
+            dbContext.UpdateRange(initiatives);
+        }
+
+        private async Task ClearStrategicOpportunityRollups(int initiativeRollupColumnId, CancellationToken cancellationToken, int? initiativeRollupValueId = null)
+        {
+            if (!_allowedRollupColumnIds.Contains(initiativeRollupColumnId)) { return; }
+            var strategicOpportunities = await centralDbContext.StrategicOpportunities
+                .Where(i => i.StrataId == _user.GetStrataId() && ((initiativeRollupColumnId == 1 && initiativeRollupValueId.HasValue ? i.Rollup1Id == initiativeRollupValueId : i.Rollup1Id != 0)
+                    || (initiativeRollupColumnId == 2 && initiativeRollupValueId.HasValue ? i.Rollup2Id == initiativeRollupValueId : i.Rollup2Id != 0)
+                    || (initiativeRollupColumnId == 3 && initiativeRollupValueId.HasValue ? i.Rollup3Id == initiativeRollupValueId : i.Rollup3Id != 0))
+                ).ToListAsync(cancellationToken);
+            foreach (var item in strategicOpportunities)
+            {
+                switch (initiativeRollupColumnId)
+                {
+                    case 1:
+                        item.Rollup1Id = 0;
+                        break;
+                    case 2:
+                        item.Rollup2Id = 0;
+                        break;
+                    case 3:
+                        item.Rollup3Id = 0;
+                        break;
+                }
+            }
+            centralDbContext.UpdateRange(strategicOpportunities);
+            await centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task<IEnumerable<InitiativeRollupValue>> GetByRollupValuesById(int initiativeRollupColumnId, CancellationToken cancellationToken)
+        {
+            if (!_allowedRollupColumnIds.Contains(initiativeRollupColumnId))
+            {
+                return null;
+            }
+
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var rollupValues = await dbContext.InitiativeRollupValues
+                    .Where(x => x.InitiativeRollupColumnId == initiativeRollupColumnId)
+                    .ToListAsync(cancellationToken);
+            return rollupValues;
+        }
+
+        public async Task<InitiativeRollupValue> AddRollupValue(int initiativeRollupColumnId, string value, CancellationToken cancellationToken)
+        {
+            if (!_allowedRollupColumnIds.Contains(initiativeRollupColumnId))
+            {
+                return null;
+            }
+
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var rollupValue = (await dbContext.InitiativeRollupValues
+                .AddAsync(new InitiativeRollupValue
+                {
+                    InitiativeRollupColumnId = initiativeRollupColumnId,
+                    Value = value
+                }, cancellationToken)).Entity;
+            await dbContext.SaveChangesAsync(cancellationToken);
+            return rollupValue;
+        }
+
+        public async Task AddRollupToManagedColumns(InitiativeRollupColumn initiativeRollupColumn, CancellationToken cancellationToken)
+        {
+            var userGuid = _user?.GetUserGuid() ?? Guid.Empty;
+            var managedColumns = (await initiativeDetailColumnService.GetColumnList(userGuid, cancellationToken)).ToList();
+            var initiativeDetailColumn = ConvertRollupColumnToManagedColumn(initiativeRollupColumn, managedColumns);
+            var index = managedColumns.FindIndex(col => col.Name == initiativeDetailColumn.Name);
+
+            if (index != -1)
+            {
+                managedColumns[index] = initiativeDetailColumn;
+            }
+            else 
+            { 
+                managedColumns.Add(initiativeDetailColumn); 
+            }
+
+            await initiativeDetailColumnService.SetColumnList(userGuid, managedColumns, cancellationToken);
+            await userSettingService.AddInitiativeColumnForAllUsers(initiativeDetailColumn, cancellationToken);
+        }
+
+        public InitiativeDetailColumn ConvertRollupColumnToManagedColumn(InitiativeRollupColumn initiativeRollupColumn, List<InitiativeDetailColumn> managedColumns)
+        {
+            var initiativeColumName = initiativeRollupColumn.InitiativeRollupColumnId switch
+            {
+                1 => "InitiativeRollup1Id",
+                2 => "InitiativeRollup2Id",
+                3 => "InitiativeRollup3Id",
+                _ => throw new NotImplementedException()
+            };
+
+            var initiativeDetailColumn = new InitiativeDetailColumn()
+            {
+                Name = initiativeColumName,
+                Heading = initiativeRollupColumn.Name,
+                Index = managedColumns.Max(x => x.Index + 1),
+                InitiativeRollupColumnId = initiativeRollupColumn.InitiativeRollupColumnId
+            };
+            return initiativeDetailColumn;
+        }
+
+        public async Task UpdateRollupManagedColumn(InitiativeRollupColumn initiativeRollupColumn, CancellationToken cancellationToken)
+        {
+            var userGuid = _user?.GetUserGuid() ?? Guid.Empty;
+            var managedColumns = await initiativeDetailColumnService.GetColumnList(userGuid, cancellationToken);
+
+            var update = managedColumns.FirstOrDefault(x => x.InitiativeRollupColumnId == initiativeRollupColumn.InitiativeRollupColumnId);
+            if (update != null)
+            {
+                await userSettingService.UpdateInitiativeColumnForAllUsers(update.Heading, initiativeRollupColumn.Name, cancellationToken);
+                await initiativeDetailColumnService.SetColumnList(userGuid, managedColumns, cancellationToken);
+            }
+            else
+            {
+                await AddRollupToManagedColumns(initiativeRollupColumn, cancellationToken);
+            }
+        }
+
+        public async Task RemoveRollupManagedColumn(InitiativeRollupColumn initiativeRollupColumn, CancellationToken cancellationToken)
+        {
+            var userGuid = _user?.GetUserGuid() ?? Guid.Empty;
+            var managedColumns = await initiativeDetailColumnService.GetColumnList(userGuid, cancellationToken);
+
+            managedColumns = managedColumns.Where(x => x.InitiativeRollupColumnId != initiativeRollupColumn.InitiativeRollupColumnId);
+            await initiativeDetailColumnService.SetColumnList(userGuid, managedColumns, cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupValue.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupValue.cs
new file mode 100644
index 0000000..67d0569
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupValue.cs
@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Biz.InitiativeRollupColumns
+{
+    [Table("InitiativeRollupValue", Schema = "cci")]
+    public class InitiativeRollupValue
+    {
+        [Key]
+        public int InitiativeRollupValueId { get; set; }
+        public int InitiativeRollupColumnId { get; set; }
+        [JsonIgnore]
+        public InitiativeRollupColumn InitiativeRollupColumn { get; set; }
+        public string Value { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupValueSaveInfo.cs b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupValueSaveInfo.cs
new file mode 100644
index 0000000..ffa0c68
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/InitiativeRollupColumns/InitiativeRollupValueSaveInfo.cs
@@ -0,0 +1,8 @@
+namespace Strata.ContinuousImprovement.Biz.InitiativeRollupColumns
+{
+    public class InitiativeRollupValueSaveInfo
+    {
+        public int InitiativeRollupValueId { get; set; }
+        public string Value { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/Filters/FilterSettings.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/Filters/FilterSettings.cs
new file mode 100644
index 0000000..03a177c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/Filters/FilterSettings.cs
@@ -0,0 +1,31 @@
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives.Filters
+{
+    public class FilterSettings
+    {
+        public int Status { get; set; }
+        public string Name { get; set; }
+        public Guid[] CostLeaders { get; set; }
+        public Guid[] Owners { get; set; }
+        public Guid[] ExecutiveSponsors { get; set; }
+        public string[] Workstreams { get; set; }
+        public InitiativeRollupValue[] RollupColumn1Values { get; set; }
+        public InitiativeRollupValue[] RollupColumn2Values { get; set; }
+        public InitiativeRollupValue[] RollupColumn3Values { get; set; }
+
+        public FilterSettings()
+        {
+            Status = -1;
+            Name = "";
+            CostLeaders = Array.Empty<Guid>();
+            Owners = Array.Empty<Guid>();
+            ExecutiveSponsors = Array.Empty<Guid>();
+            Workstreams = Array.Empty<string>();
+            RollupColumn1Values = Array.Empty<InitiativeRollupValue>();
+            RollupColumn1Values = Array.Empty<InitiativeRollupValue>();
+            RollupColumn1Values = Array.Empty<InitiativeRollupValue>();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/Filters/InitiativeFilterOptions.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/Filters/InitiativeFilterOptions.cs
new file mode 100644
index 0000000..0690ccc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/Filters/InitiativeFilterOptions.cs
@@ -0,0 +1,20 @@
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.UserProfiles;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives.Filters
+{
+    public class InitiativeFilterOptions
+    {
+        public IEnumerable<INameItem> CostDrivers { get; set; }
+        public IEnumerable<UserProfile> CostLeaders { get; set; }
+        public IEnumerable<UserProfile> Owners { get; set; }
+        public IEnumerable<UserProfile> ExecutiveSponsors { get; set; }
+        public IEnumerable<INameItem> Workstreams { get; set; }
+        public IEnumerable<InitiativeRollupValue> RollupColumn1Values { get; set; }
+        public IEnumerable<InitiativeRollupValue> RollupColumn2Values { get; set; }
+        public IEnumerable<InitiativeRollupValue> RollupColumn3Values { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/Filters/InitiativeFilters.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/Filters/InitiativeFilters.cs
new file mode 100644
index 0000000..3f37fea
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/Filters/InitiativeFilters.cs
@@ -0,0 +1,92 @@
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives.Filters
+{
+    public class InitiativeFilters
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public string Name { get; set; }
+        public int Status { get; set; }
+        public IEnumerable<string> CostDrivers { get; set; }
+        public IEnumerable<Guid> CostLeaders { get; set; }
+        public IEnumerable<Guid> Owners { get; set; }
+        public IEnumerable<Guid> ExecutiveSponsors { get; set; }
+        public IEnumerable<string> Workstreams { get; set; }
+        public IEnumerable<int> RollupColumn1Values { get; set; }
+        public IEnumerable<int> RollupColumn2Values { get; set; }
+        public IEnumerable<int> RollupColumn3Values { get; set; }
+        public InitiativeGroupByCategory GroupByCategory { get; set; }
+
+        public InitiativeFilters()
+        {
+            ConfigurationGuid = Guid.Empty;
+            Status = -1;
+            CostDrivers = new List<string>();
+            CostLeaders = new List<Guid>();
+            Owners = new List<Guid>();
+            ExecutiveSponsors = new List<Guid>();
+            Workstreams = new List<string>();
+        }
+
+        public IEnumerable<Expression<Func<Initiative, bool>>> GetFilters(JazzDbContext context, IEnumerable<string> hiddenColumns)
+        {
+            var filters = new List<Expression<Func<Initiative, bool>>>();
+
+            filters.Add(m => m.ConfigurationGUID.Equals(ConfigurationGuid));
+            if (!string.IsNullOrEmpty(Name))
+            {
+                var lowerName = Name.ToLower();
+                var costDriverIsHidden = hiddenColumns.Contains("CostDriver");
+                var workstreamIsHidden = hiddenColumns.Contains("Workstream");
+                var costLeaderIsHidden = hiddenColumns.Contains("CostLeader");
+                var ownerIsHidden = hiddenColumns.Contains("Owner");
+                var executiveSponsorIsHidden = hiddenColumns.Contains("ExecutiveSponsor");
+                var rollupColumn1IsHidden = hiddenColumns.Contains(nameof(Initiative.InitiativeRollup1Id));
+                var rollupColumn2IsHidden = hiddenColumns.Contains(nameof(Initiative.InitiativeRollup2Id));
+                var rollupColumn3IsHidden = hiddenColumns.Contains(nameof(Initiative.InitiativeRollup3Id));
+                filters.Add(m => m.Name.Contains(lowerName)
+                    || !costDriverIsHidden && m.CostDriver.Contains(lowerName)
+                    || !workstreamIsHidden && m.Workstream.Contains(lowerName)
+                    || m.CostLeaderUser != null && !costLeaderIsHidden && m.CostLeaderUser.NameFull.Contains(lowerName)
+                    || m.OwnerUser != null && !ownerIsHidden && m.OwnerUser.NameFull.Contains(lowerName)
+                    || m.ExecutiveSponsorUser != null && !executiveSponsorIsHidden && m.ExecutiveSponsorUser.NameFull.Contains(lowerName)
+                    || m.RollupColumn1 != null && !rollupColumn1IsHidden && m.RollupColumn1.Value.Contains(lowerName)
+                    || m.RollupColumn2 != null && !rollupColumn2IsHidden && m.RollupColumn2.Value.Contains(lowerName)
+                    || m.RollupColumn3 != null && !rollupColumn3IsHidden && m.RollupColumn3.Value.Contains(lowerName));
+            }
+            if (Status != -1)
+            {
+                if (Status == 0)
+                {
+                    filters.Add(m => m.CurrentStep == (int)InitiativeSteps.Draft);
+                }
+                else
+                {
+                    filters.Add(m => m.CurrentStep == (int)InitiativeSteps.Tracking);
+                }
+            }
+            if (CostDrivers.Any())
+                filters.Add(m => CostDrivers.Contains(m.CostDriver));
+            if (CostLeaders.Any())
+                filters.Add(m => CostLeaders.Contains(m.CostLeaderGUID));
+            if (Owners.Any())
+                filters.Add(m => Owners.Contains(m.OwnerGUID));
+            if (ExecutiveSponsors.Any())
+                filters.Add(m => ExecutiveSponsors.Contains(m.ExecutiveSponsorGUID));
+            if (Workstreams.Any())
+                filters.Add(m => Workstreams.Contains(m.Workstream));
+            if (RollupColumn1Values.Any())
+                filters.Add(m => RollupColumn1Values.Contains(m.InitiativeRollup1Id));
+            if (RollupColumn2Values.Any())
+                filters.Add(m => RollupColumn2Values.Contains(m.InitiativeRollup2Id));
+            if (RollupColumn3Values.Any())
+                filters.Add(m => RollupColumn3Values.Contains(m.InitiativeRollup3Id));
+
+            return filters;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/IInitiativeCreateService.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/IInitiativeCreateService.cs
new file mode 100644
index 0000000..e8c5b0c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/IInitiativeCreateService.cs
@@ -0,0 +1,15 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public interface IInitiativeCreateService
+    {
+        Task<IOpportunity> GetOpportunity(Guid opportunityGuid, CancellationToken cancellationToken);
+        Task SaveOpportunity(Guid opportunityGuid, Guid initiativeGuid, CancellationToken cancellationToken);
+        Task<Guid> CreateInitiative(Guid dbGuid, Initiative initiative, Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<Initiative> UpdateInitiative(Initiative initiative, Guid opportunityGuid, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/IInitiativeSavingsService.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/IInitiativeSavingsService.cs
new file mode 100644
index 0000000..62df5ab
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/IInitiativeSavingsService.cs
@@ -0,0 +1,12 @@
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public interface IInitiativeSavingsService
+    {
+        void ConfigureRampUps(JazzDbContext dbContext, Initiative initiative, Guid configurationGuid);
+        void ApplySavingsToInitiative(CCOpportunityDataModel opportunity, Initiative initiative, double identifiedSavings);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/IInitiativeService.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/IInitiativeService.cs
new file mode 100644
index 0000000..09270b7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/IInitiativeService.cs
@@ -0,0 +1,34 @@
+using ClosedXML.Excel;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.Initiatives.Filters;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public interface IInitiativeService
+    {
+        Task<bool> ContainsAsync(Guid initiativeGuid, CancellationToken cancellationToken);
+        Task<Initiative> GetById(Guid initiativeGuid, CancellationToken cancellationToken);
+        Task<bool> DeleteAsync(Guid initiativeGuid, CancellationToken cancellationToken);
+        Task<InitiativeInfo> GetInitiativeInfoAsync(Guid initiativeGuid, CancellationToken cancellationToken);
+        Task<IEnumerable<InitiativeDetailTreeGridModel>> GetInitiatives(InitiativeFilters filters, CancellationToken cancellationToken);
+        Task<PagedApiResponse<Initiative>> GetPagedAsync(PagingOptions pagingOptions, InitiativeFilters filters, CancellationToken cancellationToken);
+        Task<IXLWorkbook> ExportAsync(bool exportAll, Guid userGuid, SortOptions sortOptions, InitiativeFilters filters, CancellationToken cancellationToken);
+        Task<IEnumerable<WorkstreamDto>> GetWorkstreams(CancellationToken cancellationToken);
+        Task<InitiativeFilters> GetFilterSettings(Guid userGuid, CancellationToken cancellationToken);
+        Task<InitiativeFilters> SetFilterSettings(Guid userGuid, InitiativeFilters filters, CancellationToken cancellationToken);
+        Task<InitiativeFilterOptions> GetFilterOptions(Guid configurationGuid, CancellationToken cancellationToken);
+        Task SetRampupInfo(InitiativeDto initiativeDto, CancellationToken cancellationToken);
+        Task SetRollupValue(Guid initiativeGuid, int rollupId, int rollupValue, CancellationToken cancellationToken);
+        Task<IEnumerable<InitiativeCriteriaDto>> GetCriteria(CancellationToken cancellationToken);
+        Task<InitiativeScoresDto> GetScores(Guid initiativeGuid, CancellationToken cancellationToken);
+        Task<bool> SetScores(InitiativeScoresDto scores, CancellationToken cancellationToken);
+        Task FinalizeInitiative(Guid initiativeGuid, CancellationToken cancellationToken);
+        Task<Guid> RunTracking(Guid initiativeGuid, CancellationToken cancellationToken);
+        Task<Initiative> FindInitiativeByPartialName(Guid configuration, string name, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/Initiative.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/Initiative.cs
new file mode 100644
index 0000000..57260e3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/Initiative.cs
@@ -0,0 +1,211 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using Strata.ContinuousImprovement.Biz.UserProfiles;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+
+    [Table("Initiative", Schema = "cci")]
+    public class Initiative : IWithSourceOpportunity, IInitiative
+    {
+        [Key]
+        public Guid InitiativeGUID { get; set; }
+        public string Name { get; set; }
+        public double SavingsEstimate { get; set; }
+        public double SavingsCommitted { get; set; }
+        public double SavingsRampUp01 { get; set; } = 100d;
+        public double SavingsRampUp02 { get; set; } = 100d;
+        public double SavingsRampUp03 { get; set; } = 100d;
+        public double SavingsRampUp04 { get; set; } = 100d;
+        public double SavingsRampUp05 { get; set; } = 100d;
+        public double SavingsRampUp06 { get; set; } = 100d;
+        public double SavingsRampUp07 { get; set; } = 100d;
+        public double SavingsRampUp08 { get; set; } = 100d;
+        public double SavingsRampUp09 { get; set; } = 100d;
+        public double SavingsRampUp10 { get; set; } = 100d;
+        public double SavingsRampUp11 { get; set; } = 100d;
+        public double SavingsRampUp12 { get; set; } = 100d;
+        public Guid OwnerGUID { get; set; }
+        public Guid ExecutiveSponsorGUID { get; set; }
+        public Guid AuthorGUID { get; set; }
+        public Guid CostLeaderGUID { get; set; }
+        public string CostDriver { get; set; } = "";
+        public int CurrentStep { get; set; } = 0;
+        [NotMapped]
+        public InitiativeSteps CurrentStepEnum
+        {
+            get { return (InitiativeSteps)CurrentStep; }
+            set { CurrentStep = (int)value; }
+        }
+        public string Description { get; set; } = "";
+        public short Score01 { get; set; }
+        public short Score02 { get; set; }
+        public short Score03 { get; set; }
+        public short Score04 { get; set; }
+        public short Score05 { get; set; }
+        public short Score06 { get; set; }
+        public short Score07 { get; set; }
+        public short Score08 { get; set; }
+        public short Score09 { get; set; }
+        public short Score10 { get; set; }
+        public double COI01 { get; set; }
+        public double COI02 { get; set; }
+        public double COI03 { get; set; }
+        public double COI04 { get; set; }
+        public double COI05 { get; set; }
+        public double COI06 { get; set; }
+        public double COI07 { get; set; }
+        public double COI08 { get; set; }
+        public double COI09 { get; set; }
+        public double COI10 { get; set; }
+        public double COI11 { get; set; }
+        public double COI12 { get; set; }
+        public double COICurrentYear { get; set; }
+        public string GoalStatement { get; set; } = "";
+        public string Stakeholders { get; set; } = "";
+        public string MilestonesConfigJSON { get; set; } = "";
+        public DateTime EffectiveDate { get; set; }
+        public Guid LastWorkflowHistoryGUID { get; set; }
+        public double AnnualGoal { get; set; }
+        public double AnnualProjectActual { get; set; }
+        public double YTDGoal { get; set; }
+        public double YTDActual { get; set; }
+        public double CurrentMonthGoal { get; set; }
+        public double CurrentMonthActual { get; set; }
+        public double Month01Goal { get; set; }
+        public double Month01Actual { get; set; }
+        public double Month02Goal { get; set; }
+        public double Month02Actual { get; set; }
+        public double Month03Goal { get; set; }
+        public double Month03Actual { get; set; }
+        public double Month04Goal { get; set; }
+        public double Month04Actual { get; set; }
+        public double Month05Goal { get; set; }
+        public double Month05Actual { get; set; }
+        public double Month06Goal { get; set; }
+        public double Month06Actual { get; set; }
+        public double Month07Goal { get; set; }
+        public double Month07Actual { get; set; }
+        public double Month08Goal { get; set; }
+        public double Month08Actual { get; set; }
+        public double Month09Goal { get; set; }
+        public double Month09Actual { get; set; }
+        public double Month10Goal { get; set; }
+        public double Month10Actual { get; set; }
+        public double Month11Goal { get; set; }
+        public double Month11Actual { get; set; }
+        public double Month12Goal { get; set; }
+        public double Month12Actual { get; set; }
+        public Guid ConfigurationGUID { get; set; }
+        public string StakeholdersJSON { get; set; } = "[]";
+        public string TeamMembers { get; set; } = "";
+        public string Workstream { get; set; } = "";
+
+        [ForeignKey(nameof(ConfigurationGUID))]
+        public Configuration.Configuration Configuration { get; set; }
+
+        [ForeignKey(nameof(OwnerGUID))]
+        public UserProfile OwnerUser { get; set; }
+
+        [ForeignKey(nameof(AuthorGUID))]
+        public UserProfile AuthorUser { get; set; }
+
+        [ForeignKey(nameof(CostLeaderGUID))]
+        public UserProfile CostLeaderUser { get; set; }
+
+        [ForeignKey(nameof(ExecutiveSponsorGUID))]
+        public UserProfile ExecutiveSponsorUser { get; set; }
+
+        public virtual List<InitiativeComment> InitiativeComments { get; set; }
+
+        public string Owner => OwnerUser?.NameFull;
+        public string Author => AuthorUser?.NameFull;
+        public string CostLeader => CostLeaderUser?.NameFull;
+        public string ExecutiveSponsor => ExecutiveSponsorUser?.NameFull;
+
+        public int InitiativeRollup1Id { get; set; }
+        public int InitiativeRollup2Id { get; set; }
+        public int InitiativeRollup3Id { get; set; }
+
+        [ForeignKey(nameof(InitiativeRollup1Id))]
+        public InitiativeRollupValue RollupColumn1 { get; set; }
+
+        [ForeignKey(nameof(InitiativeRollup2Id))]
+        public InitiativeRollupValue RollupColumn2 { get; set; }
+
+        [ForeignKey(nameof(InitiativeRollup3Id))]
+        public InitiativeRollupValue RollupColumn3 { get; set; }
+
+        public string InitiativeRollup1 => RollupColumn1?.Value;
+        public string InitiativeRollup2 => RollupColumn2?.Value;
+        public string InitiativeRollup3 => RollupColumn3?.Value;
+
+        [NotMapped]
+        public int OpportunityType { get; set; }
+        [NotMapped]
+        public long OpportunityId { get; set; }
+        [NotMapped]
+        public string OpportunityKey { get; set; }
+        [NotMapped]
+        public string Comments { get; set; }
+
+        [NotMapped]
+        public string SourceOpportunity { get; set; }
+        [NotMapped]
+        public long SourceOpportunityId { get; set; }
+
+        public Initiative()
+        {
+            InitiativeGUID = Guid.NewGuid();
+            SourceOpportunity = "";
+            SourceOpportunityId = -1;
+        }
+
+        public void SetCostLeader(Guid costLeaderGuid)
+        {
+            CostLeaderGUID = costLeaderGuid;
+        }
+
+        public void SetOwner(Guid ownerGuid)
+        {
+            OwnerGUID = ownerGuid;
+        }
+
+        public void SetExecutiveSponsor(Guid execGuid)
+        {
+            ExecutiveSponsorGUID = execGuid;
+        }
+
+        public void SetOpportunityType(int opportunityType)
+        {
+            OpportunityType = opportunityType;
+        }
+
+        internal void Update(Initiative initiative)
+        {
+            Name = initiative.Name;
+            EffectiveDate = initiative.EffectiveDate;
+            GoalStatement = initiative.GoalStatement;
+            Workstream = initiative.Workstream;
+            Description = initiative.Description;
+            CostLeaderGUID = initiative.CostLeaderGUID;
+            OwnerGUID = initiative.OwnerGUID;
+            ExecutiveSponsorGUID = initiative.ExecutiveSponsorGUID;
+            StakeholdersJSON = initiative.StakeholdersJSON;
+            TeamMembers = initiative.TeamMembers;
+            MilestonesConfigJSON = initiative.MilestonesConfigJSON;
+            InitiativeRollup1Id = initiative.InitiativeRollup1Id;
+            InitiativeRollup2Id = initiative.InitiativeRollup2Id;
+            InitiativeRollup3Id = initiative.InitiativeRollup3Id;
+        }
+    }
+
+    public interface IInitiative
+    {
+        Guid InitiativeGUID { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeComment.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeComment.cs
new file mode 100644
index 0000000..1d182f8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeComment.cs
@@ -0,0 +1,17 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    [Table("InitiativeComment", Schema = "cci")]
+    public class InitiativeComment
+    {
+        [Key]
+        public Guid CommentGuid { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public string UserName { get; set; }
+        public string Comment { get; set; }
+        public DateTime CreatedAtUtc { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeCreateService.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeCreateService.cs
new file mode 100644
index 0000000..fc57879
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeCreateService.cs
@@ -0,0 +1,104 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public class InitiativeCreateService : IInitiativeCreateService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly IInitiativeSavingsService _initiativeSavingsService;
+        private readonly IAuthorizationServiceClient _authorizationServiceClient;
+        private readonly IUpdateFactOpportunitySavingsService _updateFactOpportunitySavingsService;
+        protected readonly ILogger<InitiativeCreateService> _logger;
+
+        public InitiativeCreateService(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            IInitiativeSavingsService initiativeSavingsService,
+            IAuthorizationServiceClient authorizationServiceClient,
+            IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            ILogger<InitiativeCreateService> logger)
+        {
+            _dbContextFactory = dbContextFactory;
+            _initiativeSavingsService = initiativeSavingsService;
+            _authorizationServiceClient = authorizationServiceClient;
+            _updateFactOpportunitySavingsService = updateFactOpportunitySavingsService;
+            _logger = logger;
+        }
+
+        public virtual Task<IOpportunity> GetOpportunity(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual Task SaveOpportunity(Guid opportunityGuid, Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<Guid> CreateInitiative(Guid dbGuid, Initiative initiative, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var opportunity = await GetOpportunity(opportunityGuid, cancellationToken);
+            if (opportunity == null) { return Guid.Empty; }
+
+            try
+            {
+                _initiativeSavingsService.ConfigureRampUps(dbContext, initiative, opportunity.ConfigurationGuid);
+
+                initiative.ConfigurationGUID = opportunity.ConfigurationGuid;
+                await dbContext.Initiatives.AddAsync(initiative, cancellationToken);
+                await dbContext.SaveChangesAsync(cancellationToken);
+
+                await _authorizationServiceClient.AddPermissionsFromDefaultsAsync(initiative.InitiativeGUID, SecurableEntityType.Initiative, cancellationToken);
+                await _authorizationServiceClient.AddPermissionAsync(initiative.InitiativeGUID, initiative.OwnerGUID, true, false, false, cancellationToken);
+
+                await SaveOpportunity(opportunityGuid, initiative.InitiativeGUID, cancellationToken);
+                await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+                return initiative.InitiativeGUID;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInitiativeError(ex, dbContext, initiative.Name, opportunityGuid, initiative.InitiativeGUID);
+                return Guid.Empty;
+            }
+        }
+
+        public async Task<Initiative> UpdateInitiative(Initiative initiative, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            Initiative updatedItem = null;
+            var opportunity = await GetOpportunity(opportunityGuid, cancellationToken);
+            if (opportunity == null) { return null; }
+
+            try
+            {
+                var updateInitiative = await dbContext.Initiatives.SingleOrDefaultAsync(x => x.InitiativeGUID == initiative.InitiativeGUID);
+                if (updateInitiative == null) { return null; }
+                updateInitiative.Update(initiative);
+
+                await dbContext.SaveChangesAsync(cancellationToken);
+
+                await SaveOpportunity(opportunityGuid, initiative.InitiativeGUID, cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInitiativeError(ex, dbContext, initiative.Name, opportunityGuid, initiative.InitiativeGUID);
+            }
+
+            return updatedItem;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeCriteria.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeCriteria.cs
new file mode 100644
index 0000000..1715f8c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeCriteria.cs
@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    [Table("InitiativeCriteria", Schema = "cci")]
+    public class InitiativeCriteria
+    {
+        [Key]
+        public Guid InitiativeCriteriaGUID { get; set; }
+        public string Name { get; set; }
+        public string Type { get; set; }
+        public int ScoringMethod { get; set; }
+        public string InitiativeDataField { get; set; }
+        public string Config { get; set; } // json blob
+        public byte SortOrder { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeCriteriaDto.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeCriteriaDto.cs
new file mode 100644
index 0000000..624cbb6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeCriteriaDto.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public class InitiativeCriteriaDto
+    {
+        public Guid InitiativeCriteriaGUID { get; set; }
+        public string Name { get; set; }
+        public string InitiativeDataField { get; set; }
+        public IList<InitiativeCriteriaOption> Options { get; set; }
+    }
+
+    public class InitiativeCriteriaOption
+    {
+        public int Value { get; set; }
+        public string Text { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeCriteriaQueryResult.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeCriteriaQueryResult.cs
new file mode 100644
index 0000000..a733116
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeCriteriaQueryResult.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public class InitiativeCriteriaQueryResult
+    {
+        public Guid InitiativeCriteriaGUID { get; set; }
+        public string Name { get; set; }
+        public string InitiativeDataField { get; set; }
+        public string DisplayText { get; set; }
+        public int Score { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDataModelMapper.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDataModelMapper.cs
new file mode 100644
index 0000000..0d8bb6c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDataModelMapper.cs
@@ -0,0 +1,10 @@
+using Riok.Mapperly.Abstractions;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class InitiativeDataModelMapper
+    {
+        public static partial InitiativeDto Map(this Initiative src);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDetail.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDetail.cs
new file mode 100644
index 0000000..d14852b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDetail.cs
@@ -0,0 +1,51 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public class InitiativeDetail : InitiativeExport
+    {
+        public Guid InitiativeGuid { get; set; }
+        public int OpportunityType { get; set; }
+    }
+
+    public class InitiativeExport : IWithSourceOpportunity
+    {
+        public string Name { get; set; }
+        public string GoalStatement { get; set; }
+        public string Workstream { get; set; }
+        public string PlannedImprovements { get; set; }
+        public string CostLeader { get; set; }
+        public string Owner { get; set; }
+        public string ExecutiveSponsor { get; set; }
+        public string Stakeholders { get; set; }
+        public string TeamMembers { get; set; }
+        public string Milestones { get; set; }
+        public string CostDriver { get; set; }
+        public InitiativeSteps Status { get; set; }
+        public string InitiativeStatus { get; set; }
+        public string CurrentStep { get; set; }
+        public DateTime TrackingStartMonth { get; set; }
+        public DateTime CurrentMonth { get; set; }
+        public double CurrentMonthGoal { get; set; }
+        public double CurrentMonthActual { get; set; }
+        public double CurrentMonthVariance => CurrentMonthActual - CurrentMonthGoal;
+        public double YTDGoal { get; set; }
+        public double YTDActual { get; set; }
+        public double YTDVariance => YTDActual - YTDGoal;
+        public double SavingsCommitted { get; set; }
+        public double AnnualGoal { get; set; }
+        public string SourceOpportunity { get; set; }
+        public long SourceOpportunityId { get; set; }
+        public string OpportunityKey { get; set; }
+        public long OpportunityId { get; set; }
+        public string Comments { get; set; }
+        public string InitiativeRollup1 { get; set; }
+        public string InitiativeRollup2 { get; set; }
+        public string InitiativeRollup3 { get; set; }
+        public int InitiativeRollup1Id { get; set; }
+        public int InitiativeRollup2Id { get; set; }
+        public int InitiativeRollup3Id { get; set; }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDetailTreeGridModel.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDetailTreeGridModel.cs
new file mode 100644
index 0000000..ebc2fe4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDetailTreeGridModel.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public class InitiativeDetailTreeGridModel
+    {
+        public string Key { get; set; }
+        public InitiativeDetail Data { get; set; }
+        public IEnumerable<InitiativeDetailTreeGridModel> Children { get; set; }
+
+        public InitiativeDetailTreeGridModel(IGrouping<string, InitiativeDetail> initiativeGrouping)
+        {
+            Key = initiativeGrouping.Key;
+            Data = null;
+            Children = initiativeGrouping.Select(i => new InitiativeDetailTreeGridModel(i));
+        }
+
+        public InitiativeDetailTreeGridModel(InitiativeDetail data)
+        {
+            Key = data.InitiativeGuid.ToString();
+            Data = data;
+            Children = null;
+        }
+    }
+
+    public enum InitiativeGroupByCategory
+    {
+        CostDriver,
+        CostLeader,
+        ExecutiveSponsor,
+        Owner,
+        Status,
+        Workstream,
+        RollupColumn1,
+        RollupColumn2,
+        RollupColumn3,
+        None
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDto.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDto.cs
new file mode 100644
index 0000000..7975de4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDto.cs
@@ -0,0 +1,82 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public class InitiativeDto
+    {
+        public string Name { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public string CostDriver { get; set; }
+        public string TrackingStart { get; set; }
+        public string StartMonth { get; set; } = "";
+        public string EndMonth { get; set; } = "";
+        public string GoalStatement { get; set; }
+        public string Workstream { get; set; }
+        public string PlannedImprovements { get; set; } = "";
+        public bool IsFinalized { get; set; } = false;
+        public bool IsLocked { get; set; } = false;
+        public Guid CostLeader { get; set; } = Guid.Empty;
+        public Guid Owner { get; set; } = Guid.Empty;
+        public Guid ExecutiveSponsor { get; set; } = Guid.Empty;
+        public string[] Stakeholders { get; set; }
+        public string TeamMembers { get; set; }
+        public string Milestone1 { get; set; }
+        public string Milestone2 { get; set; }
+        public string Milestone3 { get; set; }
+        public string Milestone4 { get; set; }
+        public string Milestone5 { get; set; }
+        public string Milestone6 { get; set; }
+        public string Milestone7 { get; set; }
+        public string Milestone8 { get; set; }
+        public string Milestone9 { get; set; }
+        public string Milestone10 { get; set; }
+        public string DueDate1 { get; set; } = "";
+        public string DueDate2 { get; set; } = "";
+        public string DueDate3 { get; set; } = "";
+        public string DueDate4 { get; set; } = "";
+        public string DueDate5 { get; set; } = "";
+        public string DueDate6 { get; set; } = "";
+        public string DueDate7 { get; set; } = "";
+        public string DueDate8 { get; set; } = "";
+        public string DueDate9 { get; set; } = "";
+        public string DueDate10 { get; set; } = "";
+        public double SavingsRampUp01 { get; set; } = 100d;
+        public double SavingsRampUp02 { get; set; } = 100d;
+        public double SavingsRampUp03 { get; set; } = 100d;
+        public double SavingsRampUp04 { get; set; } = 100d;
+        public double SavingsRampUp05 { get; set; } = 100d;
+        public double SavingsRampUp06 { get; set; } = 100d;
+        public double SavingsRampUp07 { get; set; } = 100d;
+        public double SavingsRampUp08 { get; set; } = 100d;
+        public double SavingsRampUp09 { get; set; } = 100d;
+        public double SavingsRampUp10 { get; set; } = 100d;
+        public double SavingsRampUp11 { get; set; } = 100d;
+        public double SavingsRampUp12 { get; set; } = 100d;
+        public double COI01 { get; set; } = 0;
+        public double COI02 { get; set; } = 0;
+        public double COI03 { get; set; } = 0;
+        public double COI04 { get; set; } = 0;
+        public double COI05 { get; set; } = 0;
+        public double COI06 { get; set; } = 0;
+        public double COI07 { get; set; } = 0;
+        public double COI08 { get; set; } = 0;
+        public double COI09 { get; set; } = 0;
+        public double COI10 { get; set; } = 0;
+        public double COI11 { get; set; } = 0;
+        public double COI12 { get; set; } = 0;
+        public byte Score01 { get; set; }
+        public byte Score02 { get; set; }
+        public byte Score03 { get; set; }
+        public byte Score04 { get; set; }
+        public byte Score05 { get; set; }
+        public byte Score06 { get; set; }
+        public byte Score07 { get; set; }
+        public byte Score08 { get; set; }
+        public byte Score09 { get; set; }
+        public byte Score10 { get; set; }
+        public int InitiativeRollup1Id { get; set; }
+        public int InitiativeRollup2Id { get; set; }
+        public int InitiativeRollup3Id { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDtoExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDtoExtensions.cs
new file mode 100644
index 0000000..215dbf9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeDtoExtensions.cs
@@ -0,0 +1,44 @@
+using Newtonsoft.Json;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using System;
+using System.Globalization;
+
+namespace Strata.ContinuousImprovement.Api.Controllers
+{
+    public static class InitiativeDtoExtensions
+    {
+        public static string Json(this InitiativeDto source, MilestoneConfiguration milestone)
+        {
+            milestone.Milestones[0].Name = source.Milestone1;
+            milestone.Milestones[0].DueDate = source.DueDate1.JustTheDate();
+            milestone.Milestones[1].Name = source.Milestone2;
+            milestone.Milestones[1].DueDate = source.DueDate2.JustTheDate();
+            milestone.Milestones[2].Name = source.Milestone3;
+            milestone.Milestones[2].DueDate = source.DueDate3.JustTheDate();
+            milestone.Milestones[3].Name = source.Milestone4;
+            milestone.Milestones[3].DueDate = source.DueDate4.JustTheDate();
+            milestone.Milestones[4].Name = source.Milestone5;
+            milestone.Milestones[4].DueDate = source.DueDate5.JustTheDate();
+            milestone.Milestones[5].Name = source.Milestone6;
+            milestone.Milestones[5].DueDate = source.DueDate6.JustTheDate();
+            milestone.Milestones[6].Name = source.Milestone7;
+            milestone.Milestones[6].DueDate = source.DueDate8.JustTheDate();
+            milestone.Milestones[7].Name = source.Milestone8;
+            milestone.Milestones[7].DueDate = source.DueDate8.JustTheDate();
+            milestone.Milestones[8].Name = source.Milestone9;
+            milestone.Milestones[8].DueDate = source.DueDate9.JustTheDate();
+            milestone.Milestones[9].Name = source.Milestone10;
+            milestone.Milestones[9].DueDate = source.DueDate10.JustTheDate();
+            return JsonConvert.SerializeObject(milestone);
+        }
+
+        public static string JustTheDate(this string dateSource)
+        {
+            if (string.IsNullOrEmpty(dateSource)) { return dateSource; }
+            if (dateSource.Equals("Invalid Date", StringComparison.CurrentCultureIgnoreCase)) { return ""; }
+            return DateTime.ParseExact(dateSource, "yyyyMMdd", CultureInfo.InvariantCulture).ToString("MM/dd/yyyy");
+        }
+
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeInfo.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeInfo.cs
new file mode 100644
index 0000000..18b89e7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeInfo.cs
@@ -0,0 +1,110 @@
+using Newtonsoft.Json;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public class InitiativeInfo : InitiativeDto
+    {
+        public IList<TrackingMonth> TrackingMonths { get; set; }
+    }
+
+    public static class InitiativeInfoExtensions
+    {
+        /// <summary>
+        /// Converts Initiative to InitiativeInfo for react UI
+        /// </summary>
+        /// <param name="initiative"></param>
+        /// <param name="opportunityGuid"></param>
+        /// <param name="orgDefinedEndDate"></param>
+        /// <remarks>
+        /// TODO: This should also be checking the user to see if they are part of the Admin group
+        /// Strata.Web.Core.Shared.State.Global.ActiveUserGroupMapping.IsCostLeader() from Jazz
+        /// _userGroupMapping.IsInGroup(Strata.CS.Base.GlobalID.UserGroup.CCICostLeader);
+        /// </remarks>
+        /// <returns></returns>
+        public static InitiativeInfo InitiativeInfo(this Initiative initiative, Guid opportunityGuid, IList<TrackingMonth> trackingMonths, DateTime startDate, DateTime endDate)
+        {
+            var milestones = JsonConvert.DeserializeObject<MilestoneJSON>(initiative.MilestonesConfigJSON);
+            var info = new InitiativeInfo
+            {
+                OpportunityGuid = opportunityGuid,
+                InitiativeGuid = initiative.InitiativeGUID,
+                Name = initiative.Name,
+                PlannedImprovements = initiative.Description,
+                GoalStatement = initiative.GoalStatement,
+                CostDriver = initiative.CostDriver,
+                Owner = initiative.OwnerGUID,
+                CostLeader = initiative.CostLeaderGUID,
+                ExecutiveSponsor = initiative.ExecutiveSponsorGUID,
+                TeamMembers = initiative.TeamMembers,
+                Workstream = initiative.Workstream,
+                TrackingMonths = trackingMonths,
+                TrackingStart = initiative.EffectiveDate.ToString("yyyyMMdd"),
+                IsLocked = initiative.CurrentStepEnum != InitiativeSteps.Draft,
+                StartMonth = startDate.ToString("yyyy-MM-dd"),
+                EndMonth = endDate.ToString("yyyy-MM-dd"),
+                Stakeholders = JsonConvert.DeserializeObject<IEnumerable<User>>(initiative.StakeholdersJSON)
+                    .Select(x => x.UserGUID.ToString()).ToArray(),
+                Milestone1 = milestones.Milestones[0].Name,
+                Milestone2 = milestones.Milestones[1].Name,
+                Milestone3 = milestones.Milestones[2].Name,
+                Milestone4 = milestones.Milestones[3].Name,
+                Milestone5 = milestones.Milestones[4].Name,
+                Milestone6 = milestones.Milestones[5].Name,
+                Milestone7 = milestones.Milestones[6].Name,
+                Milestone8 = milestones.Milestones[7].Name,
+                Milestone9 = milestones.Milestones[8].Name,
+                Milestone10 = milestones.Milestones[9].Name,
+                DueDate1 = milestones.Milestones[0].DueDate.ToMoment(),
+                DueDate2 = milestones.Milestones[1].DueDate.ToMoment(),
+                DueDate3 = milestones.Milestones[2].DueDate.ToMoment(),
+                DueDate4 = milestones.Milestones[3].DueDate.ToMoment(),
+                DueDate5 = milestones.Milestones[4].DueDate.ToMoment(),
+                DueDate6 = milestones.Milestones[5].DueDate.ToMoment(),
+                DueDate7 = milestones.Milestones[6].DueDate.ToMoment(),
+                DueDate8 = milestones.Milestones[7].DueDate.ToMoment(),
+                DueDate9 = milestones.Milestones[8].DueDate.ToMoment(),
+                DueDate10 = milestones.Milestones[9].DueDate.ToMoment(),
+                SavingsRampUp01 = initiative.SavingsRampUp01,
+                SavingsRampUp02 = initiative.SavingsRampUp02,
+                SavingsRampUp03 = initiative.SavingsRampUp03,
+                SavingsRampUp04 = initiative.SavingsRampUp04,
+                SavingsRampUp05 = initiative.SavingsRampUp05,
+                SavingsRampUp06 = initiative.SavingsRampUp06,
+                SavingsRampUp07 = initiative.SavingsRampUp07,
+                SavingsRampUp08 = initiative.SavingsRampUp08,
+                SavingsRampUp09 = initiative.SavingsRampUp09,
+                SavingsRampUp10 = initiative.SavingsRampUp10,
+                SavingsRampUp11 = initiative.SavingsRampUp11,
+                SavingsRampUp12 = initiative.SavingsRampUp12,
+                COI01 = initiative.COI01,
+                COI02 = initiative.COI02,
+                COI03 = initiative.COI03,
+                COI04 = initiative.COI04,
+                COI05 = initiative.COI05,
+                COI06 = initiative.COI06,
+                COI07 = initiative.COI07,
+                COI08 = initiative.COI08,
+                COI09 = initiative.COI09,
+                COI10 = initiative.COI10,
+                COI11 = initiative.COI11,
+                COI12 = initiative.COI12,
+                InitiativeRollup1Id = initiative.InitiativeRollup1Id,
+                InitiativeRollup2Id = initiative.InitiativeRollup2Id,
+                InitiativeRollup3Id = initiative.InitiativeRollup3Id
+            };
+
+            return info;
+        }
+    }
+
+    public class MilestoneJSON
+    {
+        public MileStone[] Milestones { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeInfoMapper.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeInfoMapper.cs
new file mode 100644
index 0000000..4b46068
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeInfoMapper.cs
@@ -0,0 +1,42 @@
+using Newtonsoft.Json;
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.Utilities;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class InitiativeInfoMapper
+    {
+
+        public static InitiativeInfo MapToInfo(this Initiative src)
+        {
+            var milestones = JsonConvert.DeserializeObject<MilestoneJSON>(src.MilestonesConfigJSON);
+            var mapped = src.MapForInfo();
+            mapped.TrackingStart = src.EffectiveDate.ToString("yyyyMMdd");
+            mapped.IsLocked = src.CurrentStepEnum != InitiativeSteps.Draft;
+            mapped.Milestone1 = milestones.Milestones[0].Name;
+            mapped.Milestone2 = milestones.Milestones[1].Name;
+            mapped.Milestone3 = milestones.Milestones[2].Name;
+            mapped.Milestone4 = milestones.Milestones[3].Name;
+            mapped.Milestone5 = milestones.Milestones[4].Name;
+            mapped.Milestone6 = milestones.Milestones[5].Name;
+            mapped.Milestone7 = milestones.Milestones[6].Name;
+            mapped.Milestone8 = milestones.Milestones[7].Name;
+            mapped.Milestone9 = milestones.Milestones[8].Name;
+            mapped.Milestone10 = milestones.Milestones[9].Name;
+            mapped.DueDate1 = milestones.Milestones[0].DueDate.ToMoment();
+            mapped.DueDate2 = milestones.Milestones[1].DueDate.ToMoment();
+            mapped.DueDate3 = milestones.Milestones[2].DueDate.ToMoment();
+            mapped.DueDate4 = milestones.Milestones[3].DueDate.ToMoment();
+            mapped.DueDate5 = milestones.Milestones[4].DueDate.ToMoment();
+            mapped.DueDate6 = milestones.Milestones[5].DueDate.ToMoment();
+            mapped.DueDate7 = milestones.Milestones[6].DueDate.ToMoment();
+            mapped.DueDate8 = milestones.Milestones[7].DueDate.ToMoment();
+            mapped.DueDate9 = milestones.Milestones[8].DueDate.ToMoment();
+            mapped.DueDate10 = milestones.Milestones[9].DueDate.ToMoment();
+            return mapped;
+        }
+
+        private static partial InitiativeInfo MapForInfo(this Initiative src);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeMapper.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeMapper.cs
new file mode 100644
index 0000000..1574969
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeMapper.cs
@@ -0,0 +1,74 @@
+using Newtonsoft.Json;
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.FreeForm.Initiatives;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    [Mapper(UseDeepCloning = true)]
+    public static partial class InitiativeMapper
+    {
+
+        public static Initiative MapToInitiative(this InitiativeDto src, IStakeholderUser stakeholderUser)
+        {
+            var mapped = src.Mapped();
+            if (mapped == null) return default;
+            if (mapped.InitiativeGUID == Guid.Empty)
+            {
+                mapped.InitiativeGUID = Guid.NewGuid();
+            }
+            mapped.EffectiveDate = src.TrackingStart.ToInitiativeEffectiveDate();
+            mapped.MilestonesConfigJSON = src.Json((new MilestoneConfiguration()));
+            mapped.StakeholdersJSON = stakeholderUser.Resolve(src.Stakeholders);
+            return mapped;
+        }
+
+        public static InitiativeExport MapToExport(this Initiative src)
+        {
+            var mapped = src.Mapped();
+            if (mapped == null) return default;
+            var opportunityType = (OpportunityTypes)src.OpportunityType;
+            mapped.CurrentMonth = src.Configuration?.GetTrackingCurrentMonthStartDate(opportunityType) ?? DateTime.MinValue;
+            mapped.InitiativeStatus = src.CurrentStepEnum == InitiativeSteps.Tracking ? "Final" : src.CurrentStepEnum.ToString();
+            mapped.CurrentStep = src.CurrentStepEnum.ToString();
+            mapped.Stakeholders = string.Join("|", JsonConvert.DeserializeObject<IEnumerable<Stakeholder>>(src.StakeholdersJSON)
+                .Select(sh => sh.FullName));
+            mapped.Milestones = string.Join("|", JsonConvert.DeserializeObject<MilestonesDto>(src.MilestonesConfigJSON)
+                .Milestones.Where(m => !string.IsNullOrEmpty(m.Name))
+                .Select(m => $"{m.DueDate:d} {m.Name}"));
+
+            return mapped;
+        }
+
+        [MapProperty(nameof(Initiative.CurrentStepEnum), nameof(InitiativeDetail.Status))]
+        [MapProperty(nameof(Initiative.EffectiveDate), nameof(InitiativeDetail.TrackingStartMonth))]
+        [MapProperty(nameof(Initiative.InitiativeGUID), nameof(InitiativeDetail.InitiativeGuid))]
+        public static partial InitiativeDetail MapToDetail(this Initiative src);
+
+        [MapperIgnoreTarget(nameof(Initiative.Author))]
+        [MapperIgnoreTarget(nameof(Initiative.Owner))]
+        [MapperIgnoreTarget(nameof(Initiative.CostLeader))]
+        [MapperIgnoreTarget(nameof(Initiative.ExecutiveSponsor))]
+        [MapperIgnoreTarget(nameof(Initiative.Stakeholders))]
+        [MapProperty(nameof(InitiativeDto.InitiativeGuid), nameof(Initiative.InitiativeGUID))]
+        [MapProperty(nameof(InitiativeDto.PlannedImprovements), nameof(Initiative.Description))]
+        [MapProperty(nameof(InitiativeDto.Owner), nameof(Initiative.AuthorGUID))]
+        [MapProperty(nameof(InitiativeDto.Owner), nameof(Initiative.OwnerGUID))]
+        [MapProperty(nameof(InitiativeDto.CostLeader), nameof(Initiative.CostLeaderGUID))]
+        [MapProperty(nameof(InitiativeDto.ExecutiveSponsor), nameof(Initiative.ExecutiveSponsorGUID))]
+        private static partial Initiative Mapped(this InitiativeDto src);
+
+        [MapProperty(nameof(Initiative.CurrentStepEnum), nameof(InitiativeExport.Status))]
+        [MapProperty(nameof(Initiative.EffectiveDate), nameof(InitiativeExport.TrackingStartMonth))]
+        [MapProperty(nameof(Initiative.Description), nameof(InitiativeExport.PlannedImprovements))]
+        private static partial InitiativeExport Mapped(this Initiative src);
+
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeSavingsService.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeSavingsService.cs
new file mode 100644
index 0000000..9c9c231
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeSavingsService.cs
@@ -0,0 +1,81 @@
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public class InitiativeSavingsService : IInitiativeSavingsService
+    {
+        private readonly IFiscalMonthResolver _fiscalMonthResolver;
+        private readonly ILogger<InitiativeSavingsService> _logger;
+
+        public InitiativeSavingsService(IFiscalMonthResolver fiscalMonthResolver,
+            ILogger<InitiativeSavingsService> logger)
+        {
+            _fiscalMonthResolver = fiscalMonthResolver;
+            _logger = logger;
+        }
+
+        public void ConfigureRampUps(JazzDbContext dbContext, Initiative initiative, Guid configurationGuid)
+        {
+            var configuration = dbContext.Configurations.SingleOrDefault(c => c.ConfigurationGuid == configurationGuid);
+            if (configuration == null) { return; }
+            for (var i = 1; i <= 12; i++)
+            {
+                var fiscalMonth = _fiscalMonthResolver.GetByFiscalMonthId(i);
+                var trackingMonths = initiative.EffectiveDate.GetMonthsBetweenDates(configuration.OrgDefinedEndDate.AddYears(1));
+                if (!trackingMonths.Contains(fiscalMonth.FiscalMonthId))
+                {
+                    initiative.TrySetPropertyValue($"SavingsRampUp{i:00}", 0.0);
+                }
+            }
+        }
+
+        public void ApplySavingsToInitiative(CCOpportunityDataModel opportunity, Initiative initiative, double identifiedSavings)
+        {
+            if (opportunity.LevelCases == null
+                || !opportunity.LevelCases.Any()
+                || !opportunity.LevelCases.Where(c => c.IsBaseline).Any()) { return; }
+            var annualGoal = 0.0;
+            var baselineLevelCases = opportunity.LevelCases
+                .Where(c => c.IsBaseline)
+                .GroupBy(c => c.Month, (month, data) => new { Month = month, Cases = data.Sum(x => x.Cases) })
+                .ToDictionary(k => k.Month, v => v.Cases);
+            var totalCases = 0d;
+            if (baselineLevelCases != null && baselineLevelCases.Any())
+            {
+                totalCases = baselineLevelCases.Sum(c => c.Value);
+            }
+            var annualGoalSpread = identifiedSavings / 12;
+
+            for (var i = 1; i <= 12; i++)
+            {
+                var fiscalMonth = _fiscalMonthResolver.GetByFiscalMonthId(i);
+                double monthlyRampUp = 0.0;
+                // Spread annual goal evenly across months if not Seasonal
+                double monthlySavings = !opportunity.IsSeasonal ? annualGoalSpread : 0.0;
+
+                if (opportunity.IsSeasonal && baselineLevelCases.ContainsKey(i))
+                {
+                    // Spread annual goal over monthly-weighted case count
+                    var monthlyWeight = baselineLevelCases[i].DivideBy(totalCases);
+                    monthlySavings = identifiedSavings * monthlyWeight;
+                }
+
+                monthlyRampUp = initiative.TryGetPropertyValue($"SavingsRampUp{i:00}", out double rampUp) ? (double)rampUp / 100.0 : 1.0;
+                var monthlyGoal = monthlySavings * monthlyRampUp;
+                initiative.TrySetPropertyValue($"{fiscalMonth.MonthColumnName}Goal", monthlyGoal);
+                annualGoal += monthlyGoal;
+            }
+
+            initiative.AnnualGoal = annualGoal;
+            initiative.SavingsCommitted = identifiedSavings;
+            initiative.SavingsEstimate = identifiedSavings;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeScore.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeScore.cs
new file mode 100644
index 0000000..6965a4c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeScore.cs
@@ -0,0 +1,37 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    [Table("InitiativeScore", Schema = "cci")]
+    public class InitiativeScore
+    {
+        [Key]
+        public Guid InitiativeScoreGUID { get; set; }
+        public Guid InitiativeCriteriaGUID { get; set; }
+        public Guid InitiativeGUID { get; set; }
+        public short Score { get; set; }
+        public Guid UserGUID { get; set; }
+    }
+
+    public class InitiativeScoresDto
+    {
+        public Guid InitiativeGUID { get; set; }
+        public short Score01 { get; set; }
+        public short Score02 { get; set; }
+        public short Score03 { get; set; }
+        public short Score04 { get; set; }
+        public short Score05 { get; set; }
+        public short Score07 { get; set; }
+        public short Score08 { get; set; }
+        public short Score09 { get; set; }
+        public short Score10 { get; set; }
+    }
+
+    public class InitiativeScoreResult
+    {
+        public string DataField { get; set; }
+        public short Score { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeService.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeService.cs
new file mode 100644
index 0000000..4272913
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeService.cs
@@ -0,0 +1,1002 @@
+using ClosedXML.Excel;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Newtonsoft.Json;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Export;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.InitiativeDetailColumns;
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using Strata.ContinuousImprovement.Biz.Initiatives.Filters;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Replication;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Hangfire.Jazz.Client.Models;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Security.Claims;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using static Strata.ContinuousImprovement.Biz.Export.ExportUtils;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+
+    public class InitiativeService : IInitiativeService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly CentralDbContext _centralDbContext;
+        private readonly ClaimsPrincipal _user;
+        private readonly IUserSettingService _userSettingService;
+        private readonly IJazzHangfireServiceClient _hangfireServiceClient;
+        private readonly IConfigurationService _configurationService;
+        private readonly IFiscalMonthResolver _fiscalMonthResolver;
+        private readonly IInitiativeDetailColumnService _initiativeDetailColumnService;
+        private readonly IInitiativeRollupColumnService _initiativeRollupColumnService;
+        private readonly IDatabaseService _databaseService;
+        private readonly IUpdateFactOpportunitySavingsService _updateFactOpportunitySavingsService;
+        private readonly ILogger<InitiativeService> _logger;
+
+#pragma warning disable S107 // Methods should not have too many parameters
+        public InitiativeService(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IUserSettingService userSettingService,
+            IJazzHangfireServiceClient hangfireServiceClient,
+            IConfigurationService configurationService,
+            IFiscalMonthResolver fiscalMonthResolver,
+            IInitiativeDetailColumnService initiativeDetailColumnService,
+            IInitiativeRollupColumnService initiativeRollupColumnService,
+            IDatabaseService databaseService,
+            IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            ILogger<InitiativeService> logger)
+#pragma warning restore S107 // Methods should not have too many parameters
+        {
+            _dbContextFactory = dbContextFactory;
+            _centralDbContext = centralDbContext;
+            _user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+            _userSettingService = userSettingService;
+            _hangfireServiceClient = hangfireServiceClient;
+            _configurationService = configurationService;
+            _fiscalMonthResolver = fiscalMonthResolver;
+            _initiativeDetailColumnService = initiativeDetailColumnService;
+            _initiativeRollupColumnService = initiativeRollupColumnService;
+            _databaseService = databaseService;
+            _updateFactOpportunitySavingsService = updateFactOpportunitySavingsService;
+            _logger = logger;
+        }
+
+        private async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<bool> ContainsAsync(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) return false;
+
+            return await dbContext.Initiatives.ContainsAsync(new Initiative() { InitiativeGUID = initiativeGuid }, cancellationToken);
+        }
+
+        public async Task<Initiative> GetById(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return null;
+
+            var query = dbContext.AddUserFilter(dbContext.Initiatives.AsQueryable(), _user);
+            return await query.FirstOrDefaultAsync(i => i.InitiativeGUID == initiativeGuid);
+        }
+
+        public async Task<bool> DeleteAsync(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) return false;
+
+            var initiative = await dbContext.Initiatives.SingleOrDefaultAsync(i => i.InitiativeGUID.Equals(initiativeGuid), cancellationToken);
+            if (initiative == null) return false;
+
+            dbContext.Initiatives.Remove(initiative);
+
+            var result = await dbContext.SaveChangesAsync(cancellationToken);
+            return result > 0;
+        }
+
+        public async Task<InitiativeInfo> GetInitiativeInfoAsync(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            if (initiativeGuid == Guid.Empty) { return default; }
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var opportunityItem = dbContext?.AllOpportunities
+                .SingleOrDefault(vo => vo.InitiativeGuid.Equals(initiativeGuid));
+            if (opportunityItem == null) { return default; }
+            var configuration = await _configurationService.GetConfigurationAsync(opportunityItem.ConfigurationGuid, cancellationToken);
+            if (configuration != null && configuration.FiscalMonthResolver == null)
+            {
+                configuration.FiscalMonthResolver = _fiscalMonthResolver;
+            }
+
+            if (opportunityItem.InitiativeGuid != Guid.Empty)
+            {
+                var query = dbContext.AddUserFilter(dbContext.Initiatives.AsQueryable(), _user);
+                var initiative = query.SingleOrDefault(i => i.InitiativeGUID == opportunityItem.InitiativeGuid);
+                var fiscalMonths = configuration.GetTrackingFiscalMonths(OpportunityTypes.OrgDefined, initiative.EffectiveDate);
+                return initiative?.InitiativeInfo(opportunityItem.OpportunityGuid, fiscalMonths, configuration.OrgDefinedTrackingStartDate, configuration.OrgDefinedTrackingEndDate);
+            }
+            var info = new InitiativeInfo
+            {
+                OpportunityGuid = opportunityItem.OpportunityGuid,
+                Name = opportunityItem.Name,
+                CostDriver = opportunityItem.CostDriver,
+                StartMonth = configuration.OrgDefinedTrackingStartDate.ToString("yyyy-MM-dd"),
+                EndMonth = configuration.OrgDefinedTrackingEndDate.ToString("yyyy-MM-dd")
+            };
+            return info;
+        }
+
+        /// <summary>
+        /// This is here to insure that these two tables rows aren't accidentally deleted
+        /// These are added to allow for the use of the .Include to resolve the names in the queries
+        /// </summary>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        private async Task VerifyDefaultRollupValue(CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            //Make certain that the 0 Rollup Column is available
+            var defaultRollupColum = await dbContext.InitiativeRollupColumns
+                .SingleOrDefaultAsync(c => c.InitiativeRollupColumnId == 0, cancellationToken);
+            if (defaultRollupColum == null)
+            {
+                await dbContext.InitiativeRollupColumns.AddAsync(new InitiativeRollupColumn
+                {
+                    InitiativeRollupColumnId = 0,
+                    Name = ""
+                }, cancellationToken);
+                await dbContext.SaveChangesAsync(cancellationToken);
+            }
+
+            //Make certain that 0 Rollup Value is availble
+            var defaultRollups = await dbContext.InitiativeRollupValues
+                .SingleOrDefaultAsync(c => c.InitiativeRollupColumnId == 0 && c.InitiativeRollupValueId == 0, cancellationToken);
+            if (defaultRollups == null)
+            {
+                await dbContext.InitiativeRollupValues.AddAsync(new InitiativeRollupValue
+                {
+                    InitiativeRollupValueId = 0,
+                    InitiativeRollupColumnId = 0,
+                    Value = ""
+                }, cancellationToken);
+                await dbContext.SaveChangesAsync(cancellationToken);
+            }
+        }
+
+        public async Task<IEnumerable<InitiativeDetailTreeGridModel>> GetInitiatives(InitiativeFilters filters, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return new List<InitiativeDetailTreeGridModel>();
+            var opportunitiesWithInitiatives = await dbContext.AddUserFilter(dbContext.AllOpportunities
+                    .Where(opp => opp.ConfigurationGuid == filters.ConfigurationGuid
+                        && opp.InitiativeGuid != Guid.Empty), _user)
+                    .ToListAsync(cancellationToken);
+            var query = await GetInitiativeQuery(dbContext, null, filters, cancellationToken);
+            var data = await query.ToListAsync(cancellationToken);
+
+            foreach (var initiative in data)
+            {
+                var opportunity = opportunitiesWithInitiatives.FirstOrDefault(opp => opp.InitiativeGuid == initiative.InitiativeGUID);
+                if (opportunity == null)
+                {
+                    continue;
+                }
+
+                // set opp type from opportunity
+                initiative.OpportunityType = opportunity.OpportunityType;
+
+                var clientNetworkOpportunityLink = await _centralDbContext.ClientNetworkOpportunityLinks
+                    .Include(link => link.ClientNetworkOpportunity)
+                    .ThenInclude(cno => cno.NetworkOpportunity)
+                    .FirstOrDefaultAsync(link => link.OpportunityGuid == opportunity.OpportunityGuid, cancellationToken);
+                if (clientNetworkOpportunityLink == null) continue;
+                ((IWithSourceOpportunity)initiative).SetSourceOpportunity(clientNetworkOpportunityLink.ClientNetworkOpportunity);
+            }
+
+            var detailData = data.Select(i => i.MapToDetail());
+            switch (filters.GroupByCategory)
+            {
+                case InitiativeGroupByCategory.CostDriver:
+                    return detailData.OrderBy(i => i.CostDriver).GroupBy(i => i.CostDriver).Select(group => new InitiativeDetailTreeGridModel(group));
+                case InitiativeGroupByCategory.CostLeader:
+                    return detailData.OrderBy(i => i.CostLeader).GroupBy(i => i.CostLeader).Select(group => new InitiativeDetailTreeGridModel(group));
+                case InitiativeGroupByCategory.ExecutiveSponsor:
+                    return detailData.OrderBy(i => i.ExecutiveSponsor).GroupBy(i => i.ExecutiveSponsor).Select(group => new InitiativeDetailTreeGridModel(group));
+                case InitiativeGroupByCategory.Owner:
+                    return detailData.OrderBy(i => i.Owner).GroupBy(i => i.Owner).Select(group => new InitiativeDetailTreeGridModel(group));
+                case InitiativeGroupByCategory.Status:
+                    return detailData.OrderBy(i => i.Status).GroupBy(i => i.Status.ToString()).Select(group => new InitiativeDetailTreeGridModel(group));
+                case InitiativeGroupByCategory.Workstream:
+                    return detailData.OrderBy(i => i.Workstream).GroupBy(i => i.Workstream).Select(group => new InitiativeDetailTreeGridModel(group));
+                case InitiativeGroupByCategory.RollupColumn1:
+                    return detailData.OrderBy(i => i.InitiativeRollup1).GroupBy(i => i.InitiativeRollup1).Select(group => new InitiativeDetailTreeGridModel(group));
+                case InitiativeGroupByCategory.RollupColumn2:
+                    return detailData.OrderBy(i => i.InitiativeRollup2).GroupBy(i => i.InitiativeRollup2).Select(group => new InitiativeDetailTreeGridModel(group));
+                case InitiativeGroupByCategory.RollupColumn3:
+                    return detailData.OrderBy(i => i.InitiativeRollup3).GroupBy(i => i.InitiativeRollup3).Select(group => new InitiativeDetailTreeGridModel(group));
+                case InitiativeGroupByCategory.None:
+                    return detailData.Select(group => new InitiativeDetailTreeGridModel(group));
+                default:
+                    throw new NotImplementedException();
+            }
+        }
+
+        public async Task<PagedApiResponse<Initiative>> GetPagedAsync(PagingOptions pagingOptions, InitiativeFilters filters, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return new PagedApiResponse<Initiative>() { Data = new List<Initiative>(), PagingInfo = new PagingInfo() };
+            var opportunitiesWithInitiatives = await dbContext.AllOpportunities
+                    .Where(opp => opp.ConfigurationGuid == filters.ConfigurationGuid
+                        && opp.InitiativeGuid != Guid.Empty)
+                    .ToListAsync(cancellationToken);
+
+            PagedApiResponse<Initiative> pageData = default;
+            var query = await GetInitiativeQuery(dbContext, pagingOptions, filters, cancellationToken);
+            pageData = await query.ToPagedAsync(pagingOptions, cancellationToken);
+            foreach (var initiative in pageData.Data)
+            {
+                var opp = opportunitiesWithInitiatives.FirstOrDefault(o => o.InitiativeGuid == initiative.InitiativeGUID);
+                if (opp == null) { continue; }
+                initiative.OpportunityType = opp.OpportunityType;
+                initiative.OpportunityKey = opp.OpportunityKey;
+                initiative.OpportunityId = opp.OpportunityId;
+                initiative.Comments = string.Join("|", initiative.InitiativeComments.OrderBy(c => c.CreatedAtUtc).Select(c => $"{c.UserName} {c.CreatedAtUtc:g} {c.Comment}"));
+            }
+
+            pageData.Data = await UpdateSourceOpportunity(dbContext, filters.ConfigurationGuid, pageData.Data, cancellationToken);
+            return pageData;
+        }
+
+        private async Task<IQueryable<Initiative>> GetInitiativeQuery(JazzDbContext dbContext, PagingOptions pagingOptions, InitiativeFilters filters, CancellationToken cancellationToken)
+        {
+            await VerifyDefaultRollupValue(cancellationToken);
+
+            var userGuid = _user?.GetUserGuid() ?? Guid.Empty;
+            var hiddenColumns = new List<InitiativeDetailColumn>();
+            if (_user != null)
+            {
+                hiddenColumns = (await _initiativeDetailColumnService.GetColumnList(userGuid, cancellationToken)).Where(x => x.IsHidden).ToList();
+            }
+            var query = dbContext.AddUserFilter(dbContext.Initiatives.AsQueryable(), _user)
+                .Include(i => i.OwnerUser)
+                .Include(i => i.ExecutiveSponsorUser)
+                .Include(i => i.CostLeaderUser)
+                .Include(i => i.Configuration)
+                .Include(i => i.InitiativeComments)
+                .Include(i => i.RollupColumn1)
+                .Include(i => i.RollupColumn2)
+                .Include(i => i.RollupColumn3)
+                .AsQueryable();
+
+            if (pagingOptions != null)
+            {
+                switch (pagingOptions.SortField)
+                {
+                    case "initiativerollup1id":
+                        query = pagingOptions.SortOrder == SortOrder.Asc
+                            ? query.OrderBy(i => i.RollupColumn1.Value)
+                            : query.OrderByDescending(i => i.RollupColumn1.Value);
+                        pagingOptions.SortField = "";
+                        break;
+                    case "initiativerollup2id":
+                        query = pagingOptions.SortOrder == SortOrder.Asc
+                            ? query.OrderBy(i => i.RollupColumn2.Value)
+                            : query.OrderByDescending(i => i.RollupColumn2.Value);
+                        pagingOptions.SortField = "";
+                        break;
+                    case "initiativerollup3id":
+                        query = pagingOptions.SortOrder == SortOrder.Asc
+                            ? query.OrderBy(i => i.RollupColumn3.Value)
+                            : query.OrderByDescending(i => i.RollupColumn3.Value);
+                        pagingOptions.SortField = "";
+                        break;
+                    case "owner":
+                        query = pagingOptions.SortOrder == SortOrder.Asc
+                            ? query.OrderBy(i => i.OwnerUser.NameFull)
+                            : query.OrderByDescending(i => i.OwnerUser.NameFull);
+                        pagingOptions.SortField = "";
+                        break;
+                    case "executiveSponsor":
+                        query = pagingOptions.SortOrder == SortOrder.Asc
+                            ? query.OrderBy(i => i.ExecutiveSponsorUser.NameFull)
+                            : query.OrderByDescending(i => i.ExecutiveSponsorUser.NameFull);
+                        pagingOptions.SortField = "";
+                        break;
+                    case "costLeader":
+                        query = pagingOptions.SortOrder == SortOrder.Asc
+                            ? query.OrderBy(i => i.CostLeaderUser.NameFull)
+                            : query.OrderByDescending(i => i.CostLeaderUser.NameFull);
+                        pagingOptions.SortField = "";
+                        break;
+                    case "currentMonthVariance":
+                        query = pagingOptions.SortOrder == SortOrder.Asc
+                            ? query.OrderBy(i => i.CurrentMonthActual - i.CurrentMonthGoal)
+                            : query.OrderByDescending(i => i.CurrentMonthActual - i.CurrentMonthGoal);
+                        pagingOptions.SortField = "";
+                        break;
+                    case "ytdVariance":
+                        query = pagingOptions.SortOrder == SortOrder.Asc
+                            ? query.OrderBy(i => i.YTDActual - i.YTDGoal)
+                            : query.OrderByDescending(i => i.YTDActual - i.YTDGoal);
+                        pagingOptions.SortField = "";
+                        break;
+                    case "status":
+                        pagingOptions.SortField = nameof(Initiative.CurrentStep);
+                        break;
+                    case "trackingStartMonth":
+                        pagingOptions.SortField = nameof(Initiative.EffectiveDate);
+                        break;
+                }
+            }
+
+            var where = filters.GetFilters(dbContext, hiddenColumns.Select(idc => idc.Name));
+            foreach (var e in where)
+            {
+                try
+                {
+                    query = query.Where(e);
+                }
+                catch
+                {
+                    // Intentionally left empty
+                }
+            }
+
+            // this is done to filter out initiatives without opportunities
+            var opportunityTypes = Enum.GetValues<OpportunityTypes>().Select(x => (int)x);
+            query = query.Join(dbContext.AllOpportunities.Where(x => opportunityTypes.Contains(x.OpportunityType)),
+                init => init.InitiativeGUID, opp => opp.InitiativeGuid, (initiatives, opp) => initiatives);
+            return query;
+        }
+
+        private async Task<IEnumerable<Initiative>> UpdateSourceOpportunity(JazzDbContext dbContext, Guid configurationGuid, IEnumerable<Initiative> data, CancellationToken cancellationToken)
+        {
+            var strataId = _user.GetStrataId();
+            var sourceOpportunities = await _centralDbContext.ClientNetworkOpportunities
+                .Where(cno => cno.StrataId == strataId)
+                .Include(cno => cno.NetworkOpportunity)
+                .Include(ol => ol.Opportunities.Where(opp => opp.ConfigurationGuid == configurationGuid))
+                .SelectMany(cno => cno.Opportunities.Select(o => new { o.OpportunityGuid, cno.NetworkOpportunity.Name }))
+                .ToDictionaryAsync(key => key.OpportunityGuid, value => value.Name, cancellationToken);
+            if (!sourceOpportunities.Any()) { return data; }
+
+            foreach (var initiative in data)
+            {
+                var opp = await dbContext.AllOpportunities.SingleOrDefaultAsync(o => o.ConfigurationGuid == configurationGuid
+                    && o.InitiativeGuid == initiative.InitiativeGUID
+                    && sourceOpportunities.Keys.Contains(o.OpportunityGuid), cancellationToken);
+                if (opp == null) continue;
+                initiative.SourceOpportunity = sourceOpportunities.TryGetValue(opp.OpportunityGuid, out var name) ? name : "";
+            }
+            return data;
+        }
+
+#pragma warning disable S3776 // Cognitive Complexity of methods should not be too high
+        public async Task<IXLWorkbook> ExportAsync(bool exportAll, Guid userGuid, SortOptions sortOptions, InitiativeFilters filters, CancellationToken cancellationToken)
+#pragma warning restore S3776 // Cognitive Complexity of methods should not be too high
+        {
+            if (exportAll)
+            {
+                filters = new InitiativeFilters
+                {
+                    ConfigurationGuid = filters.ConfigurationGuid,
+                    RollupColumn1Values = Enumerable.Empty<int>(),
+                    RollupColumn2Values = Enumerable.Empty<int>(),
+                    RollupColumn3Values = Enumerable.Empty<int>()
+                };
+            }
+            var initiatives = await GetPagedAsync(
+                new PagingOptions
+                {
+                    SortField = sortOptions.SortField,
+                    SortOrder = sortOptions.SortOrder,
+                    First = 0,
+                    Rows = int.MaxValue
+                }, filters, cancellationToken);
+            var data = initiatives.Data.Select(i => i.MapToExport());
+
+            switch (filters.GroupByCategory)
+            {
+                case InitiativeGroupByCategory.CostDriver:
+                    data = data.OrderBy(i => i.CostDriver).GroupBy(i => i.CostDriver).SelectMany(group => group);
+                    break;
+                case InitiativeGroupByCategory.CostLeader:
+                    data = data.OrderBy(i => i.CostLeader).GroupBy(i => i.CostLeader).SelectMany(group => group);
+                    break;
+                case InitiativeGroupByCategory.ExecutiveSponsor:
+                    data = data.OrderBy(i => i.ExecutiveSponsor).GroupBy(i => i.ExecutiveSponsor).SelectMany(group => group);
+                    break;
+                case InitiativeGroupByCategory.Owner:
+                    data = data.OrderBy(i => i.Owner).GroupBy(i => i.Owner).SelectMany(group => group);
+                    break;
+                case InitiativeGroupByCategory.Status:
+                    data = data.OrderBy(i => i.Status).GroupBy(i => i.Status).SelectMany(group => group);
+                    break;
+                case InitiativeGroupByCategory.Workstream:
+                    data = data.OrderBy(i => i.Workstream).GroupBy(i => i.Workstream).SelectMany(group => group);
+                    break;
+                case InitiativeGroupByCategory.RollupColumn1:
+                    data = data.OrderBy(i => i.InitiativeRollup1).GroupBy(i => i.InitiativeRollup1).SelectMany(group => group);
+                    break;
+                case InitiativeGroupByCategory.RollupColumn2:
+                    data = data.OrderBy(i => i.InitiativeRollup2).GroupBy(i => i.InitiativeRollup2).SelectMany(group => group);
+                    break;
+                case InitiativeGroupByCategory.RollupColumn3:
+                    data = data.OrderBy(i => i.InitiativeRollup3).GroupBy(i => i.InitiativeRollup3).SelectMany(group => group);
+                    break;
+            }
+
+            var columnOrder = (await _initiativeDetailColumnService.GetColumnList(_user?.GetUserGuid() ?? Guid.Empty, cancellationToken)).ToList();
+            var statusExists = columnOrder.FirstOrDefault(col => col.Name == "Status" && !col.IsHidden);
+            if (statusExists != null)
+            {
+                var idx = columnOrder.IndexOf(statusExists);
+                columnOrder.Insert(idx, new InitiativeDetailColumn
+                {
+                    Name = "InitiativeStatus",
+                    IsHidden = false,
+                    IsLocked = false,
+                    Heading = "InitiativeStatus",
+                    Index = statusExists.Index
+                });
+            }
+            var exportOptions = new ExportOptions { EmptyMessage = "No Initiatives" };
+            var wb = CreateExcelWorkbook(data, exportOptions);
+            if (!data.Any()) { return wb; }
+            var ws = wb.Worksheets.First();
+            var table = ws.Tables.First();
+            var header = table.HeadersRow();
+            var columnDictionary = data.ColumnDictionary();
+            int col = 0;
+            var rollupColumns = (await _initiativeRollupColumnService.GetAllAsync(cancellationToken))
+                .OrderBy(x => x.InitiativeRollupColumnId).ToList();
+
+            List<IXLCell> contents;
+            columnDictionary.ForEach(kvp =>
+            {
+                var wsColumn = columnDictionary.ContainsKey(kvp.Key) ? ws.Column(columnDictionary[kvp.Key]) : default;
+                if (wsColumn == null) return;
+                if (new[] { "CurrentMonthGoal", "CurrentMonthActual", "CurrentMonthVariance",
+                "YTDGoal", "YTDActual", "YTDVariance",
+                "SavingsCommitted", "AnnualGoal" }.Contains(kvp.Key))
+                {
+                    contents = ws.Column(kvp.Value).CellsUsed(XLCellsUsedOptions.Contents).Skip(1).ToList();
+                    contents.ForEach(cell =>
+                        cell.SetDataType(XLDataType.Number).Style.Alignment.SetHorizontal(XLAlignmentHorizontalValues.Right));
+                    wsColumn.Style.NumberFormat.NumberFormatId = (int)NumberFormatId.PoundCommaPoundPoundZeroDotZeroZeroRedNegative;
+                }
+                switch (kvp.Key)
+                {
+                    case "OpportunityId":
+                    case "OpportunityKey":
+                    case "SourceOpportunityId":
+                    case "InitiativeRollup1Id":
+                    case "InitiativeRollup2Id":
+                    case "InitiativeRollup3Id":
+                        wsColumn.Hide();
+                        break;
+                    case "InitiativeRollup1":
+                    case "InitiativeRollup2":
+                    case "InitiativeRollup3":
+                        var id = Regex.Replace(kvp.Key, @"[^\d]*([\d])", "$1");
+                        var rollupColumn = rollupColumns.SingleOrDefault(c => c.InitiativeRollupColumnId == int.Parse(id) && c.Name != "");
+                        if (rollupColumn != null)
+                        {
+                            col = wsColumn.ColumnNumber();
+                            header.Cell(col).Value = rollupColumn.Name;
+                        }
+                        else
+                        {
+                            wsColumn.Hide();
+                        }
+                        break;
+                    case "Status":
+                        wsColumn.Hide();
+                        col = wsColumn.ColumnNumber();
+                        header.Cell(col).Value = "CurrentStep";
+                        if (columnDictionary.ContainsKey("InitiativeStatus"))
+                        {
+                            col = ws.Column(columnDictionary["InitiativeStatus"]).ColumnNumber();
+                            header.Cell(col).Value = "Status";
+                        }
+                        break;
+                    case "TrackingStartMonth":
+                        contents = ws.Column(kvp.Value).CellsUsed(XLCellsUsedOptions.Contents).Skip(1).ToList();
+                        contents.ForEach(cell =>
+                            cell.SetDataType(XLDataType.DateTime).Style.Alignment.SetHorizontal(XLAlignmentHorizontalValues.Left));
+                        wsColumn.Style.DateFormat.SetFormat("MMMM");
+                        break;
+                    case "CurrentMonth":
+                        contents = ws.Column(kvp.Value).CellsUsed(XLCellsUsedOptions.Contents).Skip(1).ToList();
+                        contents.ForEach(cell =>
+                            cell.SetDataType(XLDataType.DateTime).Style.Alignment.SetHorizontal(XLAlignmentHorizontalValues.Left));
+                        wsColumn.Style.DateFormat.SetFormat("MMM-yyyy");
+                        break;
+                    case "CurrentMonthGoal":
+                        col = ws.Column(columnDictionary["CurrentMonthGoal"]).ColumnNumber();
+                        header.Cell(col).Value = "Current Month Committed";
+                        break;
+                    case "YTDGoal":
+                        col = ws.Column(columnDictionary["YTDGoal"]).ColumnNumber();
+                        header.Cell(col).Value = "YTD Committed";
+                        break;
+                    case "SavingsCommitted":
+                        col = ws.Column(columnDictionary["SavingsCommitted"]).ColumnNumber();
+                        header.Cell(col).Value = "12-Month Goal Savings";
+                        break;
+                    case "AnnualGoal":
+                        col = ws.Column(columnDictionary["AnnualGoal"]).ColumnNumber();
+                        header.Cell(col).Value = "Committed FY Savings";
+                        break;
+                }
+            });
+
+            return wb;
+        }
+
+        public async Task<Guid> Create(Initiative initiative, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var opportunity = dbContext.AllOpportunities.SingleOrDefault(opp => opp.OpportunityGuid == opportunityGuid);
+            if (opportunity == null) { return Guid.Empty; }
+            try
+            {
+                initiative.ConfigurationGUID = opportunity.ConfigurationGuid;
+                await dbContext.Initiatives.AddAsync(initiative, cancellationToken);
+                await dbContext.SaveChangesAsync(cancellationToken);
+                opportunity.InitiativeGuid = initiative.InitiativeGUID;
+                await dbContext.SaveChangesAsync(cancellationToken);
+                await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+                return opportunity.InitiativeGuid;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInitiativeError(ex, dbContext, initiative.Name, opportunityGuid, initiative.InitiativeGUID);
+                return Guid.Empty;
+            }
+        }
+
+        public async Task<IEnumerable<WorkstreamDto>> GetWorkstreams(CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            return dbContext.InitiativeWorkstreamsQuery().ToList();
+        }
+
+        public async Task<InitiativeFilters> GetFilterSettings(Guid userGuid, CancellationToken cancellationToken)
+        {
+            var filters = await _userSettingService.GetDboUserSetting<InitiativeFilters>(DboUserSetting.CCI_INITIATIVES_FILTERS, userGuid, cancellationToken);
+            filters.Name = string.Empty;
+            return filters;
+        }
+
+        public async Task<InitiativeFilters> SetFilterSettings(Guid userGuid, InitiativeFilters filters, CancellationToken cancellationToken)
+        {
+            filters.Name = string.Empty;
+            await _userSettingService.SetDboUserSetting(DboUserSetting.CCI_INITIATIVES_FILTERS, userGuid, filters, cancellationToken);
+            return filters;
+        }
+
+        public async Task<InitiativeFilterOptions> GetFilterOptions(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) return null;
+
+            var opportunityTypes = Enum.GetValues<OpportunityTypes>().Cast<byte>();
+            var costDrivers = await dbContext.AllOpportunities
+                .Where(x => opportunityTypes.Contains((byte)x.OpportunityType))
+                .Select(opp => opp.CostDriver).Distinct().ToListAsync(cancellationToken);
+            var initiatives = await dbContext.Initiatives
+                .Include(i => i.CostLeaderUser)
+                .Include(i => i.OwnerUser)
+                .Include(i => i.ExecutiveSponsorUser)
+                .Where(i => i.ConfigurationGUID == configurationGuid)
+                .ToListAsync(cancellationToken);
+
+            var workstreams = await dbContext.Initiatives
+                .Select(i => i.Workstream.Trim()).Distinct()
+                .Select(i => new NameItem(i)).ToListAsync(cancellationToken);
+
+            return new InitiativeFilterOptions
+            {
+                CostDrivers = initiatives.Where(i => costDrivers.Contains(i.CostDriver)).Select(i => i.CostDriver)
+                    .Distinct().OrderBy(x => x).Select(x => new NameItem(x)),
+                CostLeaders = initiatives.Select(i => i.CostLeaderUser).Distinct().OrderBy(x => x.NameFull),
+                Owners = initiatives.Select(i => i.OwnerUser).Distinct().OrderBy(x => x.NameFull),
+                ExecutiveSponsors = initiatives.Select(i => i.ExecutiveSponsorUser).Distinct().OrderBy(x => x.NameFull),
+                Workstreams = workstreams.OrderBy(x => x.Name)
+            };
+        }
+
+        public async Task SetRampupInfo(InitiativeDto initiativeDto, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var initiative = await dbContext.Initiatives.SingleOrDefaultAsync(i => i.InitiativeGUID == initiativeDto.InitiativeGuid, cancellationToken);
+            if (initiative == null) { return; }
+
+            initiative.SavingsRampUp01 = initiativeDto.SavingsRampUp01;
+            initiative.SavingsRampUp02 = initiativeDto.SavingsRampUp02;
+            initiative.SavingsRampUp03 = initiativeDto.SavingsRampUp03;
+            initiative.SavingsRampUp04 = initiativeDto.SavingsRampUp04;
+            initiative.SavingsRampUp05 = initiativeDto.SavingsRampUp05;
+            initiative.SavingsRampUp06 = initiativeDto.SavingsRampUp06;
+            initiative.SavingsRampUp07 = initiativeDto.SavingsRampUp07;
+            initiative.SavingsRampUp08 = initiativeDto.SavingsRampUp08;
+            initiative.SavingsRampUp09 = initiativeDto.SavingsRampUp09;
+            initiative.SavingsRampUp10 = initiativeDto.SavingsRampUp10;
+            initiative.SavingsRampUp11 = initiativeDto.SavingsRampUp11;
+            initiative.SavingsRampUp12 = initiativeDto.SavingsRampUp12;
+
+            initiative.COI01 = initiativeDto.COI01;
+            initiative.COI02 = initiativeDto.COI02;
+            initiative.COI03 = initiativeDto.COI03;
+            initiative.COI04 = initiativeDto.COI04;
+            initiative.COI05 = initiativeDto.COI05;
+            initiative.COI06 = initiativeDto.COI06;
+            initiative.COI07 = initiativeDto.COI07;
+            initiative.COI08 = initiativeDto.COI08;
+            initiative.COI09 = initiativeDto.COI09;
+            initiative.COI10 = initiativeDto.COI10;
+            initiative.COI11 = initiativeDto.COI11;
+            initiative.COI12 = initiativeDto.COI12;
+
+            dbContext.Update(initiative);
+            await dbContext.SaveChangesAsync(cancellationToken);
+            await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+        }
+
+        public async Task SetRollupValue(Guid initiativeGuid, int rollupId, int rollupValue, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await GetDbContext(cancellationToken);
+            var initiative = await dbContext.Initiatives.SingleOrDefaultAsync(i => i.InitiativeGUID == initiativeGuid, cancellationToken);
+            switch (rollupId)
+            {
+                case 1:
+                    initiative.InitiativeRollup1Id = rollupValue;
+                    break;
+                case 2:
+                    initiative.InitiativeRollup2Id = rollupValue;
+                    break;
+                case 3:
+                    initiative.InitiativeRollup3Id = rollupValue;
+                    break;
+            }
+            dbContext.Update<Initiative>(initiative);
+            await dbContext.SaveChangesAsync(cancellationToken);
+            await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+        }
+
+        public async Task<IEnumerable<InitiativeCriteriaDto>> GetCriteria(CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return null;
+
+            var query = $@"
+                SELECT 
+	                InitiativeCriteriaGUID,
+                    Name,
+                    InitiativeDataField,
+	                icco.DisplayText,
+	                icco.Score
+                FROM cci.InitiativeCriteria ic
+                    CROSS APPLY OPENJSON(ic.Config) WITH (
+		                Options NVARCHAR(MAX) '$.Options' AS JSON
+	                ) icc
+	                CROSS APPLY OPENJSON(icc.Options) WITH (
+		                DisplayText NVARCHAR(MAX) '$.DisplayText',
+		                Score int '$.Score',
+		                IconCls NVARCHAR(MAX) '$.IconCls'
+	                ) icco
+                ORDER BY SortOrder, icco.Score
+            ";
+
+            var results = dbContext.InitiativeCriteriaQueryResults.FromSqlRaw(query).ToList();
+            var criteria = results
+                .GroupBy(i => new
+                {
+                    i.InitiativeCriteriaGUID,
+                    i.Name,
+                    i.InitiativeDataField
+                })
+                .Select(group => new InitiativeCriteriaDto
+                {
+                    InitiativeCriteriaGUID = group.Key.InitiativeCriteriaGUID,
+                    Name = group.Key.Name,
+                    InitiativeDataField = group.Key.InitiativeDataField,
+                    Options = group.Select(i => new InitiativeCriteriaOption { Text = i.DisplayText, Value = i.Score }).ToList()
+                });
+
+            return criteria.ToList();
+        }
+
+        public async Task<InitiativeScoresDto> GetScores(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return null;
+
+            var scoreResults = dbContext.InitiativeScore
+                .Where(i => i.InitiativeGUID == initiativeGuid)
+                .Join(dbContext.InitiativeCriteria,
+                    s => s.InitiativeCriteriaGUID,
+                    c => c.InitiativeCriteriaGUID,
+                    (s, c) => new InitiativeScoreResult
+                    {
+                        DataField = c.InitiativeDataField,
+                        Score = s.Score
+                    })
+                .ToList();
+
+            var scores = new InitiativeScoresDto();
+            foreach (var score in scoreResults)
+            {
+                switch (score.DataField)
+                {
+                    case "Score01":
+                        scores.Score01 = score.Score;
+                        break;
+                    case "Score02":
+                        scores.Score02 = score.Score;
+                        break;
+                    case "Score03":
+                        scores.Score03 = score.Score;
+                        break;
+                    case "Score04":
+                        scores.Score04 = score.Score;
+                        break;
+                    case "Score05":
+                        scores.Score05 = score.Score;
+                        break;
+                    case "Score07":
+                        scores.Score07 = score.Score;
+                        break;
+                    case "Score08":
+                        scores.Score08 = score.Score;
+                        break;
+                    case "Score09":
+                        scores.Score09 = score.Score;
+                        break;
+                    case "Score10":
+                        scores.Score10 = score.Score;
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            return scores;
+        }
+
+        public async Task<bool> SetScores(InitiativeScoresDto scores, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) return false;
+
+            try
+            {
+                var dataFieldGuidLookup = await dbContext.InitiativeCriteria
+                    .Select(ic => new { ic.InitiativeDataField, ic.InitiativeCriteriaGUID })
+                    .ToDictionaryAsync(ic => ic.InitiativeDataField, ic => ic.InitiativeCriteriaGUID, cancellationToken);
+
+                var initiative = await dbContext.Initiatives.SingleOrDefaultAsync(i => i.InitiativeGUID == scores.InitiativeGUID, cancellationToken);
+                initiative.Score01 = scores.Score01;
+                initiative.Score02 = scores.Score02;
+                initiative.Score03 = scores.Score03;
+                initiative.Score04 = scores.Score04;
+                initiative.Score05 = scores.Score05;
+                initiative.Score07 = scores.Score07;
+                initiative.Score08 = scores.Score08;
+                initiative.Score09 = scores.Score09;
+                initiative.Score10 = scores.Score10;
+                dbContext.Update(initiative);
+
+                // update cci.InitiativeScores
+                var initiativeScores = await dbContext.InitiativeScore.Where(i => i.InitiativeGUID == scores.InitiativeGUID).ToListAsync(cancellationToken);
+                if (!initiativeScores.Any())
+                {
+                    var newScores = new List<InitiativeScore>
+                    {
+                        new InitiativeScore
+                        {
+                            InitiativeCriteriaGUID = dataFieldGuidLookup["Score01"],
+                            InitiativeGUID = scores.InitiativeGUID,
+                            Score = scores.Score01
+                        },
+                        new InitiativeScore
+                        {
+                            InitiativeCriteriaGUID = dataFieldGuidLookup["Score02"],
+                            InitiativeGUID = scores.InitiativeGUID,
+                            Score = scores.Score02
+                        },
+                        new InitiativeScore
+                        {
+                            InitiativeCriteriaGUID = dataFieldGuidLookup["Score03"],
+                            InitiativeGUID = scores.InitiativeGUID,
+                            Score = scores.Score03
+                        },
+                        new InitiativeScore
+                        {
+                            InitiativeCriteriaGUID = dataFieldGuidLookup["Score04"],
+                            InitiativeGUID = scores.InitiativeGUID,
+                            Score = scores.Score04
+                        },
+                        new InitiativeScore
+                        {
+                            InitiativeCriteriaGUID = dataFieldGuidLookup["Score05"],
+                            InitiativeGUID = scores.InitiativeGUID,
+                            Score = scores.Score05
+                        },
+                        new InitiativeScore
+                        {
+                            InitiativeCriteriaGUID = dataFieldGuidLookup["Score07"],
+                            InitiativeGUID = scores.InitiativeGUID,
+                            Score = scores.Score07
+                        },
+                        new InitiativeScore
+                        {
+                            InitiativeCriteriaGUID = dataFieldGuidLookup["Score08"],
+                            InitiativeGUID = scores.InitiativeGUID,
+                            Score = scores.Score08
+                        },
+                        new InitiativeScore
+                        {
+                            InitiativeCriteriaGUID = dataFieldGuidLookup["Score09"],
+                            InitiativeGUID = scores.InitiativeGUID,
+                            Score = scores.Score09
+                        },
+                        new InitiativeScore
+                        {
+                            InitiativeCriteriaGUID = dataFieldGuidLookup["Score10"],
+                            InitiativeGUID = scores.InitiativeGUID,
+                            Score = scores.Score10
+                        },
+                    };
+                    await dbContext.AddRangeAsync(newScores, cancellationToken);
+                    await dbContext.SaveChangesAsync(cancellationToken);
+                    return true;
+                }
+
+                var iniativeScores = await dbContext.InitiativeScore.Where(i => i.InitiativeGUID == scores.InitiativeGUID).ToListAsync(cancellationToken);
+                foreach (var score in iniativeScores)
+                {
+                    var dataField = dataFieldGuidLookup.FirstOrDefault(x => x.Value == score.InitiativeCriteriaGUID).Key;
+                    switch (dataField)
+                    {
+                        case "Score01":
+                            score.Score = scores.Score01;
+                            break;
+                        case "Score02":
+                            score.Score = scores.Score02;
+                            break;
+                        case "Score03":
+                            score.Score = scores.Score03;
+                            break;
+                        case "Score04":
+                            score.Score = scores.Score04;
+                            break;
+                        case "Score05":
+                            score.Score = scores.Score05;
+                            break;
+                        case "Score07":
+                            score.Score = scores.Score07;
+                            break;
+                        case "Score08":
+                            score.Score = scores.Score08;
+                            break;
+                        case "Score09":
+                            score.Score = scores.Score09;
+                            break;
+                        case "Score10":
+                            score.Score = scores.Score10;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                dbContext.UpdateRange(iniativeScores);
+                await dbContext.SaveChangesAsync(cancellationToken);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInitiativeError(ex, dbContext, "Criteria Scoring", Guid.Empty, scores.InitiativeGUID);
+                return false;
+            }
+        }
+
+        public async Task FinalizeInitiative(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var initiative = await dbContext.Initiatives
+                .SingleOrDefaultAsync(i => i.InitiativeGUID.Equals(initiativeGuid), cancellationToken)
+                ?? throw new Exception($"Initiative with ID {initiativeGuid} not found.");
+
+            try
+            {
+                initiative.CurrentStep = (int)InitiativeSteps.Tracking;
+                await dbContext.SaveChangesAsync(cancellationToken);
+                await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInitiativeError(ex, dbContext, initiative.Name, Guid.Empty, initiativeGuid);
+            }
+        }
+
+        public async Task<Guid> RunTracking(Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var opportunity = await dbContext.AllOpportunities.SingleOrDefaultAsync(opp => opp.InitiativeGuid.Equals(initiativeGuid), cancellationToken);
+            if (!new[] { (int)OpportunityTypes.FreeForm, (int)OpportunityTypes.ChargeCode, (int)OpportunityTypes.Encounter }.Contains(opportunity.OpportunityType))
+            {
+                return Guid.Empty;
+            }
+            var initiative = await dbContext.Initiatives.SingleOrDefaultAsync(i => i.InitiativeGUID.Equals(initiativeGuid), cancellationToken);
+
+            try
+            {
+                EnqueueJobDto enqueueJobDto = new EnqueueJobDto
+                {
+                    TaskName = opportunity.OpportunityType switch
+                    {
+                        (int)OpportunityTypes.ChargeCode => "Strata.CS.Jazz.Biz.CCI.Tasks.Custom.ChargeCode.RunChargeCodeTrackingTask, Strata.CS.Jazz.Biz.CCI",
+                        (int)OpportunityTypes.Encounter => "Strata.CS.Jazz.Biz.CCI.Tasks.Encounter.RunEncounterTrackingTask, Strata.CS.Jazz.Biz.CCI",
+                        (int)OpportunityTypes.FreeForm => "Strata.CS.Jazz.Biz.CCI.Tasks.Custom.FreeForm.RunFreeFormTrackingTask, Strata.CS.Jazz.Biz.CCI",
+                        (int)OpportunityTypes.GeneralLedger => "Strata.CS.Jazz.Biz.CCI.Tasks.Custom.GeneralLedger.RunGeneralLedgerTrackingTask, Strata.CS.Jazz.Biz.CCI",
+                        (int)OpportunityTypes.Payroll => "Strata.CS.Jazz.Biz.CCI.Tasks.Payroll.RunPayrollTrackingTask, Strata.CS.Jazz.Biz.CCI",
+                        _ => throw new ArgumentOutOfRangeException(nameof(opportunity.OpportunityType))
+                    },
+                    ContextData = opportunity.OpportunityType == (int)OpportunityTypes.Encounter ? JsonConvert.SerializeObject(new
+                    {
+                        opportunityGuid = opportunity.OpportunityGuid,
+                        configurationGuid = initiative.ConfigurationGUID
+                    }) : JsonConvert.SerializeObject(new
+                    {
+                        configurationGuid = initiative.ConfigurationGUID,
+                        initiativeGuid
+                    })
+                };
+                var job = enqueueJobDto;
+
+                var response = await _hangfireServiceClient.EnqueueJobAsync(job, cancellationToken);
+                await _hangfireServiceClient.EnqueueJobAfterAsync(new EnqueueJobDto
+                {
+                    TaskName = "Strata.CS.Jazz.Biz.CCI.Tasks.RunUpdateFactOpportunitySavingsTask, Strata.CS.Jazz.Biz.CCI"
+                }, response.JobId, JobContinuationOptions.OnAnyFinishedState, cancellationToken);
+                return response.JobId;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInitiativeError(ex, dbContext, initiative.Name, Guid.Empty, initiativeGuid);
+                throw;
+            }
+        }
+
+        public async Task<Initiative> FindInitiativeByPartialName(Guid configurationGuid, string name, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            return await dbContext.Initiatives
+                .FirstOrDefaultAsync(initiative => initiative.ConfigurationGUID == configurationGuid
+                    && initiative.Name.Contains(name), cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeSteps.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeSteps.cs
new file mode 100644
index 0000000..bc04e8d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/InitiativeSteps.cs
@@ -0,0 +1,13 @@
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public enum InitiativeSteps
+    {
+        Draft,
+        ExecutiveSponsorReview,
+        OwnerReview,
+        CostLeaderReview,
+        ExecutiveSponsorApproval,
+        Tracking
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/MileStone.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/MileStone.cs
new file mode 100644
index 0000000..e8a3602
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/MileStone.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    [Serializable]
+    public class MileStone
+    {
+        public string Name;
+        public string DueDate;
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/MilestoneConfiguration.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/MilestoneConfiguration.cs
new file mode 100644
index 0000000..07fd3a6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/MilestoneConfiguration.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    [Serializable]
+    public class MilestoneConfiguration
+    {
+        public List<MileStone> Milestones { get; set; }
+
+        public MilestoneConfiguration()
+        {
+            Milestones = Enumerable.Range(0, 10).Select(p => new MileStone() { }).ToList();
+        }
+
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/User.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/User.cs
new file mode 100644
index 0000000..97f0ceb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/User.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    [Serializable]
+    public class User
+    {
+        public Guid UserGUID;
+        public string FullName;
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Initiatives/WorkstreamDto.cs b/src/Strata.ContinuousImprovement.Biz/Initiatives/WorkstreamDto.cs
new file mode 100644
index 0000000..9b46a40
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Initiatives/WorkstreamDto.cs
@@ -0,0 +1,7 @@
+namespace Strata.ContinuousImprovement.Biz.Initiatives
+{
+    public class WorkstreamDto
+    {
+        public string Workstream { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/MappedColumns/IMappedColumn.cs b/src/Strata.ContinuousImprovement.Biz/MappedColumns/IMappedColumn.cs
new file mode 100644
index 0000000..1f14a66
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/MappedColumns/IMappedColumn.cs
@@ -0,0 +1,11 @@
+namespace Strata.ContinuousImprovement.Biz.MappedColumns
+{
+    public interface IMappedColumn
+    {
+        string Heading { get; set; }
+        int Index { get; set; }
+        bool IsHidden { get; set; }
+        bool IsLocked { get; set; }
+        string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/MappedColumns/IMappedColumnService.cs b/src/Strata.ContinuousImprovement.Biz/MappedColumns/IMappedColumnService.cs
new file mode 100644
index 0000000..9ebcab0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/MappedColumns/IMappedColumnService.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.MappedColumns
+{
+    public interface IMappedColumnService
+    {
+        Task<IEnumerable<MappedColumn>> GetColumnList<T>(CancellationToken cancellationToken) where T : class;
+        Task<IEnumerable<MappedColumn>> GetColumnList(string name, CancellationToken cancellationToken);
+        IEnumerable<MappedColumn> GetDefaultColumnList<T>(params string[] lockedColumns) where T : class;
+        IEnumerable<MappedColumn> GetDefaultColumnList(string name, params string[] lockedColumns);
+        Task<IEnumerable<MappedColumn>> GetManagedColumnList<T>(params string[] managedColumnsToIgnore) where T : class;
+        Task SetColumnList<T>(IEnumerable<IMappedColumn> columnList, CancellationToken cancellationToken) where T : class;
+        Task SetColumnList(string name, IEnumerable<IMappedColumn> columnList, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/MappedColumns/MappedColumn.cs b/src/Strata.ContinuousImprovement.Biz/MappedColumns/MappedColumn.cs
new file mode 100644
index 0000000..f0865b4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/MappedColumns/MappedColumn.cs
@@ -0,0 +1,38 @@
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace Strata.ContinuousImprovement.Biz.MappedColumns
+{
+    public class MappedColumn : IMappedColumn
+    {
+        public int Index { get; set; }
+        public string Name { get; set; }
+        public string Heading { get; set; }
+        public bool IsLocked { get; set; }
+        public bool IsHidden { get; set; }
+
+        public MappedColumn() { }
+
+        public MappedColumn(PropertyInfo propertyInfo, int index, bool isLocked)
+        {
+            Index = index;
+            Name = propertyInfo.Name;
+            Heading = Name.SplitCamelCase();
+            IsLocked = isLocked;
+        }
+
+        public static IEnumerable<MappedColumn> GetListOfColumns<T>(params string[] lockedColumns) where T : class
+        {
+            if (lockedColumns.Length == 0)
+            {
+                lockedColumns = new[] { "name" };
+            }
+            var properties = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance)
+                .Select((p, i) => new MappedColumn(p, i, lockedColumns.Contains(p.Name, StringComparer.InvariantCultureIgnoreCase)));
+            return properties;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/MappedColumns/MappedColumnService.cs b/src/Strata.ContinuousImprovement.Biz/MappedColumns/MappedColumnService.cs
new file mode 100644
index 0000000..7a37950
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/MappedColumns/MappedColumnService.cs
@@ -0,0 +1,69 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.MappedColumns
+{
+    public class MappedColumnService(
+        IClaimsPrincipalAccessor claimsPrincipalAccessor,
+        IUserSettingService userSettingService
+        ) : IMappedColumnService
+    {
+
+        public async Task<IEnumerable<MappedColumn>> GetColumnList<T>(CancellationToken cancellationToken) where T : class
+            => await GetColumnList(typeof(T).Name, cancellationToken);
+
+        public async Task<IEnumerable<MappedColumn>> GetColumnList(string name, CancellationToken cancellationToken)
+        {
+            var user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+            var userGuid = user?.GetUserGuid() ?? Guid.Empty;
+            var columns = await userSettingService.GetDboUserSettings<MappedColumn>(GetName(name), userGuid, cancellationToken);
+            if (columns == null || !columns.Any())
+            {
+                return GetDefaultColumnList(name);
+            }
+            return columns.OrderBy(c => c.Index);
+        }
+
+        public IEnumerable<MappedColumn> GetDefaultColumnList<T>(params string[] lockedColumns) where T : class
+            => MappedColumn.GetListOfColumns<T>(lockedColumns);
+
+        public virtual IEnumerable<MappedColumn> GetDefaultColumnList(string name, params string[] lockedColumns)
+            => Enumerable.Empty<MappedColumn>();
+
+        public async Task<IEnumerable<MappedColumn>> GetManagedColumnList<T>(params string[] managedColumnsToIgnore) where T : class
+        {
+            var columns = await GetColumnList<T>(CancellationToken.None);
+            return columns.Where(cl => !managedColumnsToIgnore.Contains(cl.Name, StringComparer.OrdinalIgnoreCase));
+        }
+
+        public async Task SetColumnList<T>(IEnumerable<IMappedColumn> columnList, CancellationToken cancellationToken) where T : class
+            => await SetColumnList(typeof(T).Name, columnList, cancellationToken);
+
+        public async Task SetColumnList(string name, IEnumerable<IMappedColumn> columnList, CancellationToken cancellationToken)
+        {
+            var user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+            var userGuid = user?.GetUserGuid() ?? Guid.Empty;
+            var reorderedColumns = columnList.Select((column, idx) => new { column, idx }).ToList();
+            reorderedColumns.ForEach(reorderedColumn => reorderedColumn.column.Index = reorderedColumn.idx);
+            columnList = reorderedColumns.Select(reorderedColumn => reorderedColumn.column).ToList();
+            var listOfColumns = columnList
+                .GroupBy(cl => cl.Name, (g, d) => d.OrderBy(c => c.Index).First())
+                .OrderBy(c => c.Index);
+            await userSettingService.SetDboUserSetting(GetName(name), userGuid, listOfColumns, cancellationToken);
+        }
+
+        private static string GetName(string name) => "CCI_COLUMNS_" + name.ToUpper().SplitCamelCase().Replace(" ", "_");
+
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Mappers/AuthorMapper.cs b/src/Strata.ContinuousImprovement.Biz/Mappers/AuthorMapper.cs
new file mode 100644
index 0000000..96263f1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Mappers/AuthorMapper.cs
@@ -0,0 +1,18 @@
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Security.Claims;
+
+namespace Strata.ContinuousImprovement.Biz.Mappers
+{
+    public static class AuthorMapper
+    {
+
+        public static T MapAuthor<T>(this T src, ClaimsPrincipal user) where T : IWithAuthor
+        {
+            if (src == null) return src;
+            src.AuthorGuid = user?.GetUserGuid() ?? Guid.Empty;
+            src.AuthorName = user?.Identity?.Name ?? string.Empty;
+            return src;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Mappers/ExplorationMapper.cs b/src/Strata.ContinuousImprovement.Biz/Mappers/ExplorationMapper.cs
new file mode 100644
index 0000000..4fe1c7f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Mappers/ExplorationMapper.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DocumentFormat.OpenXml.Spreadsheet;
+using Newtonsoft.Json;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Population;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+
+namespace Strata.ContinuousImprovement.Biz.Mappers
+{
+    public static class ExplorationMapper
+    {
+        public static Exploration.Filters.Filter MapToExplorationFilter(this ExplorationPopulation population)
+        {
+            var dates = population.GetDischargeDates();
+
+            return new Exploration.Filters.Filter()
+            {
+                DischargeDateStart = dates.Item1,
+                DischargeDateEnd = dates.Item2,
+                FilterChipItems = population.FilterChipItems
+            };
+        }
+
+        public static Exploration.Filters.ExclusionCriteria MapToExplorationExclusionCriteria(this ExplorationPopulation population)
+        {
+            return new Exploration.Filters.ExclusionCriteria()
+            {
+                LosExclusionType = (Exploration.Filters.ExclusionCriteriaType)population.LosExclusionType,
+                LosExclusionValue = Decimal.ToDouble(population.LosExclusionValue),
+                CostExclusionType = (Exploration.Filters.ExclusionCriteriaType)population.CostExclusionType,
+                CostExclusionValue = Decimal.ToDouble(population.CostExclusionValue)
+            };
+        }
+
+        public static ExplorationDetailInfo MapToExplorationDetailInfo(this ExplorationPopulationDto population)
+        {
+            return new ExplorationDetailInfo()
+            {
+                ExclusionCriteria = population.MapToExplorationExclusionCriteria(),
+                Filters = population.MapToExplorationFilter(),
+                CaseTypeFamilyId = population.CaseTypeFamilyId,
+                CostDriver = population.CostDriver,
+                CodeType = (CaseTypeCategories)population.CodeType,
+                ExcludedEncounters = population.ManuallyExcludedEncounterIds,
+                IncludedEncounters = population.ManuallyIncludedEncounterIds
+            };
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Mappers/FilterHelperMapper.cs b/src/Strata.ContinuousImprovement.Biz/Mappers/FilterHelperMapper.cs
new file mode 100644
index 0000000..c7da420
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Mappers/FilterHelperMapper.cs
@@ -0,0 +1,24 @@
+using Strata.ContinuousImprovement.Biz.Encounter;
+using Strata.Schema.Client.Dtos;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Mappers
+{
+
+    public static partial class FilterHelperMapper
+    {
+        public static List<FilterHelper> MapToFilterHelpers(this IList<string> src)
+            => src.Select(x => x.MapToFilterHelper()).ToList();
+
+        public static FilterHelper MapToFilterHelper(this string x)
+            => new() { Id = x, Text = x };
+
+        public static List<FilterHelper> MapToFilterHelpers(this IEnumerable<HierarchyNodeDto> src)
+            => src.Select(dto => dto.MapToFilterHelper()).ToList();
+
+        public static FilterHelper MapToFilterHelper(this HierarchyNodeDto src)
+            => new FilterHelper { Text = src.Name, Id = src.Path };
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Mappers/HierarchyPathsMapper.cs b/src/Strata.ContinuousImprovement.Biz/Mappers/HierarchyPathsMapper.cs
new file mode 100644
index 0000000..1a31aaa
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Mappers/HierarchyPathsMapper.cs
@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Mappers
+{
+    public static class HierarchyPathsMapper
+    {
+        public static string MapToHierarchyPaths(this IEnumerable<string> src)
+            => JsonConvert.SerializeObject(src.Select(s => new { HierarchyPath = s }));
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Mappers/IStakeholderUser.cs b/src/Strata.ContinuousImprovement.Biz/Mappers/IStakeholderUser.cs
new file mode 100644
index 0000000..52cf204
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Mappers/IStakeholderUser.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Mappers
+{
+    public interface IStakeholderUser
+    {
+        string Resolve(IEnumerable<string> stakeholders);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Mappers/IWithAuthor.cs b/src/Strata.ContinuousImprovement.Biz/Mappers/IWithAuthor.cs
new file mode 100644
index 0000000..2c0b4d1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Mappers/IWithAuthor.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Mappers
+{
+    public interface IWithAuthor
+    {
+        public Guid AuthorGuid { get; set; }
+        public string AuthorName { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Mappers/IWithOwner.cs b/src/Strata.ContinuousImprovement.Biz/Mappers/IWithOwner.cs
new file mode 100644
index 0000000..b9c0562
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Mappers/IWithOwner.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Mappers
+{
+    public interface IWithOwner
+    {
+        public Guid OwnerGuid { get; set; }
+        public string OwnerName { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Mappers/OwnerMapper.cs b/src/Strata.ContinuousImprovement.Biz/Mappers/OwnerMapper.cs
new file mode 100644
index 0000000..d71ee17
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Mappers/OwnerMapper.cs
@@ -0,0 +1,18 @@
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Security.Claims;
+
+namespace Strata.ContinuousImprovement.Biz.Mappers
+{
+    public static class OwnerMapper
+    {
+
+        public static T MapOwner<T>(this T src, ClaimsPrincipal user) where T : IWithOwner
+        {
+            if (src == null) return src;
+            src.OwnerGuid = user?.GetUserGuid() ?? Guid.Empty;
+            src.OwnerName = user?.Identity?.Name ?? string.Empty;
+            return src;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Mappers/StakeholderUser.cs b/src/Strata.ContinuousImprovement.Biz/Mappers/StakeholderUser.cs
new file mode 100644
index 0000000..595325c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Mappers/StakeholderUser.cs
@@ -0,0 +1,38 @@
+using Newtonsoft.Json;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.UserService;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace Strata.ContinuousImprovement.Biz.Mappers
+{
+    public class StakeholderUser : IStakeholderUser
+    {
+        private readonly IUserService _userService;
+
+        public StakeholderUser(IUserService userService)
+        {
+            _userService = userService;
+        }
+
+        public string Resolve(IEnumerable<string> stakeholders)
+            => JsonConvert.SerializeObject(
+                stakeholders?
+                .Where(u => !string.IsNullOrEmpty(u) && Guid.TryParse(u, out var result))
+                .Select(u => Guid.Parse(u))
+                .Select(u => new User
+                {
+                    UserGUID = u,
+                    FullName = _userService.GetUser(u, CancellationToken.None).Result.FullName
+                }) ?? new List<User>());
+
+    }
+
+    public class Stakeholder
+    {
+        public Guid UserGUID { get; set; }
+        public string FullName { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20230419173719_Initialize-Network-Opps-Tables.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20230419173719_Initialize-Network-Opps-Tables.Designer.cs
new file mode 100644
index 0000000..90e7a09
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20230419173719_Initialize-Network-Opps-Tables.Designer.cs
@@ -0,0 +1,111 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20230419173719_Initialize-Network-Opps-Tables")]
+    partial class InitializeNetworkOppsTables
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20230419173719_Initialize-Network-Opps-Tables.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20230419173719_Initialize-Network-Opps-Tables.cs
new file mode 100644
index 0000000..f743354
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20230419173719_Initialize-Network-Opps-Tables.cs
@@ -0,0 +1,67 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class InitializeNetworkOppsTables : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "network_opportunities",
+                columns: table => new
+                {
+                    network_opportunity_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    name = table.Column<string>(type: "text", nullable: true),
+                    description = table.Column<string>(type: "text", nullable: true),
+                    cost_driver = table.Column<string>(type: "text", nullable: true),
+                    pursued_organizations_count = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_network_opportunities", x => x.network_opportunity_id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "client_network_opportunities",
+                columns: table => new
+                {
+                    strata_id = table.Column<int>(type: "integer", nullable: false),
+                    network_opportunity_id = table.Column<int>(type: "integer", nullable: false),
+                    identified_savings = table.Column<int>(type: "integer", nullable: false),
+                    average_cohort_savings = table.Column<int>(type: "integer", nullable: false),
+                    analytics_workbook_id = table.Column<int>(type: "integer", nullable: false),
+                    is_published = table.Column<bool>(type: "boolean", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_client_network_opportunities", x => new { x.strata_id, x.network_opportunity_id });
+                    table.ForeignKey(
+                        name: "fk_client_network_opportunities_network_opportunities_network_",
+                        column: x => x.network_opportunity_id,
+                        principalTable: "network_opportunities",
+                        principalColumn: "network_opportunity_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_client_network_opportunities_network_opportunity_id",
+                table: "client_network_opportunities",
+                column: "network_opportunity_id");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "client_network_opportunities");
+
+            migrationBuilder.DropTable(
+                name: "network_opportunities");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20230427184132_AddGMDNTermTable.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20230427184132_AddGMDNTermTable.Designer.cs
new file mode 100644
index 0000000..61d3634
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20230427184132_AddGMDNTermTable.Designer.cs
@@ -0,0 +1,143 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20230427184132_AddGMDNTermTable")]
+    partial class AddGMDNTermTable
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("GMDNTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GMDNTermId"));
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GMDNTermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gmdn_terms_primary_di");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20230427184132_AddGMDNTermTable.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20230427184132_AddGMDNTermTable.cs
new file mode 100644
index 0000000..41edd5c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20230427184132_AddGMDNTermTable.cs
@@ -0,0 +1,41 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class AddGMDNTermTable : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "gmdn_terms",
+                columns: table => new
+                {
+                    gmdn_term_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    primary_di = table.Column<string>(type: "text", nullable: true),
+                    gmdnpt_name = table.Column<string>(type: "character varying(150)", maxLength: 150, nullable: true),
+                    gmdnpt_definition = table.Column<string>(type: "character varying(2000)", maxLength: 2000, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_gmdn_terms", x => x.gmdn_term_id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_gmdn_terms_primary_di",
+                table: "gmdn_terms",
+                column: "primary_di");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "gmdn_terms");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20230505152036_AddClientNetworkOppStatus.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20230505152036_AddClientNetworkOppStatus.Designer.cs
new file mode 100644
index 0000000..38cf018
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20230505152036_AddClientNetworkOppStatus.Designer.cs
@@ -0,0 +1,147 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20230505152036_AddClientNetworkOppStatus")]
+    partial class AddClientNetworkOppStatus
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("GMDNTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GMDNTermId"));
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GMDNTermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gmdn_terms_primary_di");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20230505152036_AddClientNetworkOppStatus.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20230505152036_AddClientNetworkOppStatus.cs
new file mode 100644
index 0000000..65c758d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20230505152036_AddClientNetworkOppStatus.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class AddClientNetworkOppStatus : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "initiative_status",
+                table: "client_network_opportunities",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "initiative_status",
+                table: "client_network_opportunities");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20230818191533_new-gmdn-term-columns.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20230818191533_new-gmdn-term-columns.Designer.cs
new file mode 100644
index 0000000..f626b70
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20230818191533_new-gmdn-term-columns.Designer.cs
@@ -0,0 +1,159 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20230818191533_new-gmdn-term-columns")]
+    partial class newgmdntermcolumns
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("GMDNTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GMDNTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GMDNTermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gmdn_terms_primary_di");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20230818191533_new-gmdn-term-columns.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20230818191533_new-gmdn-term-columns.cs
new file mode 100644
index 0000000..b8a415f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20230818191533_new-gmdn-term-columns.cs
@@ -0,0 +1,49 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class newgmdntermcolumns : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "gmdn_code",
+                table: "gmdn_terms",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "gmdn_code_status",
+                table: "gmdn_terms",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "implantable",
+                table: "gmdn_terms",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "gmdn_code",
+                table: "gmdn_terms");
+
+            migrationBuilder.DropColumn(
+                name: "gmdn_code_status",
+                table: "gmdn_terms");
+
+            migrationBuilder.DropColumn(
+                name: "implantable",
+                table: "gmdn_terms");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20230825213849_add-opportunity-comment.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20230825213849_add-opportunity-comment.Designer.cs
new file mode 100644
index 0000000..4bae185
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20230825213849_add-opportunity-comment.Designer.cs
@@ -0,0 +1,199 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20230825213849_add-opportunity-comment")]
+    partial class addopportunitycomment
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("GMDNTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GMDNTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GMDNTermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gmdn_terms_primary_di");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20230825213849_add-opportunity-comment.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20230825213849_add-opportunity-comment.cs
new file mode 100644
index 0000000..5a83888
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20230825213849_add-opportunity-comment.cs
@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class addopportunitycomment : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "comments",
+                columns: table => new
+                {
+                    comment_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    strata_id = table.Column<int>(type: "integer", nullable: false),
+                    source_of_savings_id = table.Column<int>(type: "integer", nullable: false),
+                    opportunity_id = table.Column<int>(type: "integer", nullable: false),
+                    comment_text = table.Column<string>(type: "text", nullable: true),
+                    comment_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
+                    author = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_comments", x => x.comment_id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "comments");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231012184133_AddInitiativeDataToNetworkOpps.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231012184133_AddInitiativeDataToNetworkOpps.Designer.cs
new file mode 100644
index 0000000..8fe721a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231012184133_AddInitiativeDataToNetworkOpps.Designer.cs
@@ -0,0 +1,207 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20231012184133_AddInitiativeDataToNetworkOpps")]
+    partial class AddInitiativeDataToNetworkOpps
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("GMDNTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GMDNTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GMDNTermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gmdn_terms_primary_di");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231012184133_AddInitiativeDataToNetworkOpps.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231012184133_AddInitiativeDataToNetworkOpps.cs
new file mode 100644
index 0000000..546543c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231012184133_AddInitiativeDataToNetworkOpps.cs
@@ -0,0 +1,41 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class AddInitiativeDataToNetworkOpps : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "initiative_guid",
+                table: "client_network_opportunities",
+                type: "uuid",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "opportunity_guid",
+                table: "client_network_opportunities",
+                type: "uuid",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "initiative_guid",
+                table: "client_network_opportunities");
+
+            migrationBuilder.DropColumn(
+                name: "opportunity_guid",
+                table: "client_network_opportunities");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231019204301_jazz-62349-gudid-devices-table.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231019204301_jazz-62349-gudid-devices-table.Designer.cs
new file mode 100644
index 0000000..ca73119
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231019204301_jazz-62349-gudid-devices-table.Designer.cs
@@ -0,0 +1,363 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20231019204301_jazz-62349-gudid-devices-table")]
+    partial class jazz62349gudiddevicestable
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("GMDNTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GMDNTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GMDNTermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gmdn_terms_primary_di");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231019204301_jazz-62349-gudid-devices-table.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231019204301_jazz-62349-gudid-devices-table.cs
new file mode 100644
index 0000000..8d54784
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231019204301_jazz-62349-gudid-devices-table.cs
@@ -0,0 +1,65 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class jazz62349gudiddevicestable : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "gudid_devices",
+                columns: table => new
+                {
+                    primary_di = table.Column<string>(type: "character varying(24)", maxLength: 24, nullable: false),
+                    public_device_record_key = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: true),
+                    public_version_status = table.Column<string>(type: "character varying(12)", maxLength: 12, nullable: true),
+                    device_record_status = table.Column<string>(type: "character varying(12)", maxLength: 12, nullable: true),
+                    public_version_number = table.Column<int>(type: "integer", nullable: true),
+                    public_version_date = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                    device_publish_date = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                    device_comm_distribution_end_date = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                    device_comm_distribution_status = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: true),
+                    brand_name = table.Column<string>(type: "character varying(80)", maxLength: 80, nullable: true),
+                    version_model_number = table.Column<string>(type: "character varying(80)", maxLength: 80, nullable: true),
+                    catalog_number = table.Column<string>(type: "character varying(80)", maxLength: 80, nullable: true),
+                    duns_number = table.Column<string>(type: "character varying(16)", maxLength: 16, nullable: true),
+                    company_name = table.Column<string>(type: "character varying(120)", maxLength: 120, nullable: true),
+                    device_count = table.Column<int>(type: "integer", nullable: true),
+                    device_description = table.Column<string>(type: "character varying(2000)", maxLength: 2000, nullable: true),
+                    dm_exempt = table.Column<bool>(type: "boolean", nullable: false),
+                    premarket_exempt = table.Column<bool>(type: "boolean", nullable: false),
+                    device_hctp = table.Column<bool>(type: "boolean", nullable: false),
+                    device_kit = table.Column<bool>(type: "boolean", nullable: false),
+                    device_combination_product = table.Column<bool>(type: "boolean", nullable: false),
+                    single_use = table.Column<bool>(type: "boolean", nullable: false),
+                    lot_batch = table.Column<bool>(type: "boolean", nullable: false),
+                    serial_number = table.Column<bool>(type: "boolean", nullable: false),
+                    manufacturing_date = table.Column<bool>(type: "boolean", nullable: false),
+                    expiration_date = table.Column<bool>(type: "boolean", nullable: false),
+                    donation_id_number = table.Column<bool>(type: "boolean", nullable: false),
+                    labeled_contains_nrl = table.Column<bool>(type: "boolean", nullable: false),
+                    labeled_no_nrl = table.Column<bool>(type: "boolean", nullable: false),
+                    mri_safety_status = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: true),
+                    rx = table.Column<bool>(type: "boolean", nullable: false),
+                    otc = table.Column<bool>(type: "boolean", nullable: false),
+                    device_sterile = table.Column<bool>(type: "boolean", nullable: false),
+                    sterilization_prior_to_use = table.Column<bool>(type: "boolean", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_gudid_devices", x => x.primary_di);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "gudid_devices");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231020151858_RenameGMDNTermsTableToGUDIDTerms.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231020151858_RenameGMDNTermsTableToGUDIDTerms.Designer.cs
new file mode 100644
index 0000000..e8010fd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231020151858_RenameGMDNTermsTableToGUDIDTerms.Designer.cs
@@ -0,0 +1,207 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20231020151858_RenameGMDNTermsTableToGUDIDTerms")]
+    partial class RenameGMDNTermsTableToGUDIDTerms
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231020151858_RenameGMDNTermsTableToGUDIDTerms.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231020151858_RenameGMDNTermsTableToGUDIDTerms.cs
new file mode 100644
index 0000000..68a29ec
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231020151858_RenameGMDNTermsTableToGUDIDTerms.cs
@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class RenameGMDNTermsTableToGUDIDTerms : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey("pk_gmdn_terms", "gmdn_terms");
+            migrationBuilder.DropIndex("ix_gmdn_terms_primary_di", "gmdn_terms");
+
+            var script = @"ALTER TABLE gmdn_terms RENAME COLUMN gmdn_term_id TO gudid_term_id;
+                           ALTER TABLE gmdn_terms RENAME TO gudid_terms;";
+            migrationBuilder.Sql(script);
+
+            migrationBuilder.AddPrimaryKey("pk_gudid_terms", "gudid_terms", "gudid_term_id");
+            migrationBuilder.CreateIndex(
+                name: "ix_gudid_terms_primary_di",
+                table: "gudid_terms",
+                column: "primary_di");
+
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey("pk_gudid_terms", "gudid_terms");
+            migrationBuilder.DropIndex("ix_gudid_terms_primary_di", "gudid_terms");
+
+            var script = @"ALTER TABLE gudid_terms RENAME COLUMN gudid_term_id TO gmdn_term_id;
+                           ALTER TABLE gudid_terms RENAME TO gmdn_terms;";
+            migrationBuilder.Sql(script);
+
+            migrationBuilder.AddPrimaryKey("pk_gmdn_terms", "gmdn_terms", "gmdn_term_id");
+            migrationBuilder.CreateIndex(
+                name: "ix_gmdn_terms_primary_di",
+                table: "gmdn_terms",
+                column: "primary_di");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231020222753_AddGMDNTables.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231020222753_AddGMDNTables.Designer.cs
new file mode 100644
index 0000000..173f6e6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231020222753_AddGMDNTables.Designer.cs
@@ -0,0 +1,293 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20231020222753_AddGMDNTables")]
+    partial class AddGMDNTables
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231020222753_AddGMDNTables.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231020222753_AddGMDNTables.cs
new file mode 100644
index 0000000..9ab0739
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231020222753_AddGMDNTables.cs
@@ -0,0 +1,73 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class AddGMDNTables : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "gmdn_categories",
+                columns: table => new
+                {
+                    node_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    path = table.Column<string>(type: "text", nullable: true),
+                    category_code = table.Column<string>(type: "text", nullable: true),
+                    name = table.Column<string>(type: "text", nullable: true),
+                    definition = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_gmdn_categories", x => x.node_id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "gmdn_term_categories",
+                columns: table => new
+                {
+                    term_code = table.Column<string>(type: "text", nullable: false),
+                    category_code = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_gmdn_term_categories", x => new { x.term_code, x.category_code });
+                });
+
+            migrationBuilder.CreateTable(
+                name: "gmdn_terms",
+                columns: table => new
+                {
+                    term_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    term_code = table.Column<string>(type: "text", nullable: true),
+                    term_name = table.Column<string>(type: "text", nullable: true),
+                    term_definition = table.Column<string>(type: "text", nullable: true),
+                    term_status = table.Column<string>(type: "text", nullable: true),
+                    term_is_ivd = table.Column<string>(type: "text", nullable: true),
+                    created_date = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_gmdn_terms", x => x.term_id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "gmdn_categories");
+
+            migrationBuilder.DropTable(
+                name: "gmdn_term_categories");
+
+            migrationBuilder.DropTable(
+                name: "gmdn_terms");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231024165350_AddPrimaryDIDimension.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231024165350_AddPrimaryDIDimension.Designer.cs
new file mode 100644
index 0000000..1967c1a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231024165350_AddPrimaryDIDimension.Designer.cs
@@ -0,0 +1,609 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20231024165350_AddPrimaryDIDimension")]
+    partial class AddPrimaryDIDimension
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DimPrimaryDI", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<Guid>("HistoryItemGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("history_item_guid");
+
+                    b.Property<Guid>("MemberGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("member_guid");
+
+                    b.Property<int>("TransactionID")
+                        .HasColumnType("integer")
+                        .HasColumnName("transaction_id");
+
+                    b.HasKey("PrimaryDI")
+                        .HasName("pk_dim_primary_di");
+
+                    b.ToTable("dim_primary_di", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231024165350_AddPrimaryDIDimension.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231024165350_AddPrimaryDIDimension.cs
new file mode 100644
index 0000000..3c8f55a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231024165350_AddPrimaryDIDimension.cs
@@ -0,0 +1,69 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class AddPrimaryDIDimension : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "dim_primary_di",
+                columns: table => new
+                {
+                    primary_di = table.Column<string>(type: "text", nullable: false),
+                    member_guid = table.Column<Guid>(type: "uuid", nullable: false),
+                    history_item_guid = table.Column<Guid>(type: "uuid", nullable: false),
+                    transaction_id = table.Column<int>(type: "integer", nullable: false),
+                    gmdn_term_code = table.Column<string>(type: "text", nullable: true),
+                    gmdn_term_name = table.Column<string>(type: "text", nullable: true),
+                    gmdn_term_definition = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function3 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function4 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function5 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function6 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function7 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_invasiveness1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_invasiveness2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_use_frequency1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_use_frequency2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_power1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_power2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_materials1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_materials2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_featured_attributes1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_featured_attributes2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty3 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty4 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty5 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty6 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index3 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index4 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index5 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index6 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index7 = table.Column<string>(type: "text", nullable: true),
+                    gudid_company_name = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_dim_primary_di", x => x.primary_di);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "dim_primary_di");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231027022530_AddSavingsDescriptionColumn.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231027022530_AddSavingsDescriptionColumn.Designer.cs
new file mode 100644
index 0000000..03e755a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231027022530_AddSavingsDescriptionColumn.Designer.cs
@@ -0,0 +1,367 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20231027022530_AddSavingsDescriptionColumn")]
+    partial class AddSavingsDescriptionColumn
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231027022530_AddSavingsDescriptionColumn.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231027022530_AddSavingsDescriptionColumn.cs
new file mode 100644
index 0000000..3c79d74
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231027022530_AddSavingsDescriptionColumn.cs
@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class AddSavingsDescriptionColumn : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "identified_savings_description",
+                table: "client_network_opportunities",
+                type: "text",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "identified_savings_description",
+                table: "client_network_opportunities");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231106225021_AddGUDIDDeviceTermView.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231106225021_AddGUDIDDeviceTermView.Designer.cs
new file mode 100644
index 0000000..f782e5a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231106225021_AddGUDIDDeviceTermView.Designer.cs
@@ -0,0 +1,638 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20231106225021_AddGUDIDDeviceTermView")]
+    partial class AddGUDIDDeviceTermView
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DimPrimaryDI", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<Guid>("HistoryItemGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("history_item_guid");
+
+                    b.Property<Guid>("MemberGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("member_guid");
+
+                    b.Property<int>("TransactionID")
+                        .HasColumnType("integer")
+                        .HasColumnName("transaction_id");
+
+                    b.HasKey("PrimaryDI")
+                        .HasName("pk_dim_primary_di");
+
+                    b.ToTable("dim_primary_di", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDeviceTerm", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("PrimaryDI");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("gudid_device_terms");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20231106225021_AddGUDIDDeviceTermView.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20231106225021_AddGUDIDDeviceTermView.cs
new file mode 100644
index 0000000..1626939
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20231106225021_AddGUDIDDeviceTermView.cs
@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class AddGUDIDDeviceTermView : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var script = @"CREATE OR REPLACE VIEW public.gudid_device_terms
+AS
+SELECT
+	d.Primary_DI, 
+	d.Company_Name, 
+	t.GMDN_Code,
+	ROW_NUMBER() OVER (PARTITION BY d.Primary_DI, d.Company_Name 
+					   ORDER BY t.GMDN_Code DESC) as Row_Number
+FROM gudid_devices d
+INNER JOIN gudid_terms t on d.Primary_DI = t.Primary_DI;
+
+ALTER TABLE public.gudid_device_terms
+    OWNER TO postgres;";
+            migrationBuilder.Sql(script);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            var script = @"DROP VIEW public.gudid_device_terms;";
+            migrationBuilder.Sql(script);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240109150415_JAZZ-63722-Redo-Opp-Link-Network-Opportunities.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240109150415_JAZZ-63722-Redo-Opp-Link-Network-Opportunities.Designer.cs
new file mode 100644
index 0000000..9be1717
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240109150415_JAZZ-63722-Redo-Opp-Link-Network-Opportunities.Designer.cs
@@ -0,0 +1,683 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20240109150415_JAZZ-63722-Redo-Opp-Link-Network-Opportunities")]
+    partial class JAZZ63722RedoOppLinkNetworkOpportunities
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DimPrimaryDI", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<Guid>("HistoryItemGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("history_item_guid");
+
+                    b.Property<Guid>("MemberGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("member_guid");
+
+                    b.Property<int>("TransactionID")
+                        .HasColumnType("integer")
+                        .HasColumnName("transaction_id");
+
+                    b.HasKey("PrimaryDI")
+                        .HasName("pk_dim_primary_di");
+
+                    b.ToTable("dim_primary_di", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDeviceTerm", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("PrimaryDI");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("gudid_device_terms");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240109150415_JAZZ-63722-Redo-Opp-Link-Network-Opportunities.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240109150415_JAZZ-63722-Redo-Opp-Link-Network-Opportunities.cs
new file mode 100644
index 0000000..0a06abd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240109150415_JAZZ-63722-Redo-Opp-Link-Network-Opportunities.cs
@@ -0,0 +1,71 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class JAZZ63722RedoOppLinkNetworkOpportunities : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "initiative_guid",
+                table: "client_network_opportunities");
+
+            migrationBuilder.DropColumn(
+                name: "opportunity_guid",
+                table: "client_network_opportunities");
+
+            migrationBuilder.CreateTable(
+                name: "client_network_opportunity_links",
+                columns: table => new
+                {
+                    client_network_opportunity_link_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    configuration_guid = table.Column<Guid>(type: "uuid", nullable: false),
+                    opportunity_guid = table.Column<Guid>(type: "uuid", nullable: false),
+                    initiative_guid = table.Column<Guid>(type: "uuid", nullable: false),
+                    client_network_opportunity_strata_id = table.Column<int>(type: "integer", nullable: true),
+                    client_network_opportunity_network_opportunity_id = table.Column<int>(type: "integer", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_client_network_opportunity_links", x => x.client_network_opportunity_link_id);
+                    table.ForeignKey(
+                        name: "fk_client_network_opportunity_links_client_network_opportuniti",
+                        columns: x => new { x.client_network_opportunity_strata_id, x.client_network_opportunity_network_opportunity_id },
+                        principalTable: "client_network_opportunities",
+                        principalColumns: new[] { "strata_id", "network_opportunity_id" });
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_client_network_opportunity_links_client_network_opportunity",
+                table: "client_network_opportunity_links",
+                columns: new[] { "client_network_opportunity_strata_id", "client_network_opportunity_network_opportunity_id" });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "client_network_opportunity_links");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "initiative_guid",
+                table: "client_network_opportunities",
+                type: "uuid",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "opportunity_guid",
+                table: "client_network_opportunities",
+                type: "uuid",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240208212546_JAZZ-66167-FDA-GUDID-Identifiers-table.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240208212546_JAZZ-66167-FDA-GUDID-Identifiers-table.Designer.cs
new file mode 100644
index 0000000..1e7b7bb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240208212546_JAZZ-66167-FDA-GUDID-Identifiers-table.Designer.cs
@@ -0,0 +1,802 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20240208212546_JAZZ-66167-FDA-GUDID-Identifiers-table")]
+    partial class JAZZ66167FDAGUDIDIdentifierstable
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DimPrimaryDI", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<Guid>("HistoryItemGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("history_item_guid");
+
+                    b.Property<Guid>("MemberGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("member_guid");
+
+                    b.Property<int>("TransactionID")
+                        .HasColumnType("integer")
+                        .HasColumnName("transaction_id");
+
+                    b.HasKey("PrimaryDI")
+                        .HasName("pk_dim_primary_di");
+
+                    b.ToTable("dim_primary_di", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDeviceTerm", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("PrimaryDI");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("gudid_device_terms");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240208212546_JAZZ-66167-FDA-GUDID-Identifiers-table.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240208212546_JAZZ-66167-FDA-GUDID-Identifiers-table.cs
new file mode 100644
index 0000000..9c05789
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240208212546_JAZZ-66167-FDA-GUDID-Identifiers-table.cs
@@ -0,0 +1,94 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class JAZZ66167FDAGUDIDIdentifierstable : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.EnsureSchema(
+                name: "tmp");
+
+            migrationBuilder.CreateTable(
+                name: "gudid_identifiers",
+                columns: table => new
+                {
+                    gudid_identifier_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    primary_di = table.Column<string>(type: "text", nullable: true),
+                    device_id = table.Column<string>(type: "text", nullable: true),
+                    device_id_type = table.Column<string>(type: "text", nullable: true),
+                    device_id_issuing_agency = table.Column<string>(type: "text", nullable: true),
+                    contains_di_number = table.Column<string>(type: "text", nullable: true),
+                    pkg_quantity = table.Column<int>(type: "integer", nullable: false),
+                    pkg_discontinue_date = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                    pkg_status = table.Column<string>(type: "text", nullable: true),
+                    pkg_type = table.Column<string>(type: "text", nullable: true),
+                    is_deleted = table.Column<bool>(type: "boolean", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_gudid_identifiers", x => x.gudid_identifier_id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "gudid_identifiers",
+                schema: "tmp",
+                columns: table => new
+                {
+                    tmp_gudid_identifier_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    primary_di = table.Column<string>(type: "text", nullable: true),
+                    device_id = table.Column<string>(type: "text", nullable: true),
+                    device_id_type = table.Column<string>(type: "text", nullable: true),
+                    device_id_issuing_agency = table.Column<string>(type: "text", nullable: true),
+                    contains_di_number = table.Column<string>(type: "text", nullable: true),
+                    pkg_quantity = table.Column<int>(type: "integer", nullable: false),
+                    pkg_discontinue_date = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                    pkg_status = table.Column<string>(type: "text", nullable: true),
+                    pkg_type = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_gudid_identifiers", x => x.tmp_gudid_identifier_id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_gudid_identifiers_device_id",
+                table: "gudid_identifiers",
+                column: "device_id");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_gudid_identifiers_device_id_primary_di",
+                table: "gudid_identifiers",
+                columns: new[] { "device_id", "primary_di" });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_gudid_identifiers_device_id_primary_di_device_id_type",
+                table: "gudid_identifiers",
+                columns: new[] { "device_id", "primary_di", "device_id_type" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "ix_gudid_identifiers_primary_di",
+                table: "gudid_identifiers",
+                column: "primary_di");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "gudid_identifiers");
+
+            migrationBuilder.DropTable(
+                name: "gudid_identifiers",
+                schema: "tmp");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240208212600_JAZZ-66167-FDA-GUDID-Identifiers-merge.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240208212600_JAZZ-66167-FDA-GUDID-Identifiers-merge.Designer.cs
new file mode 100644
index 0000000..e0691f0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240208212600_JAZZ-66167-FDA-GUDID-Identifiers-merge.Designer.cs
@@ -0,0 +1,802 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20240208212600_JAZZ-66167-FDA-GUDID-Identifiers-merge")]
+    partial class JAZZ66167FDAGUDIDIdentifiersmerge
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DimPrimaryDI", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<Guid>("HistoryItemGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("history_item_guid");
+
+                    b.Property<Guid>("MemberGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("member_guid");
+
+                    b.Property<int>("TransactionID")
+                        .HasColumnType("integer")
+                        .HasColumnName("transaction_id");
+
+                    b.HasKey("PrimaryDI")
+                        .HasName("pk_dim_primary_di");
+
+                    b.ToTable("dim_primary_di", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDeviceTerm", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("PrimaryDI");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("gudid_device_terms");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240208212600_JAZZ-66167-FDA-GUDID-Identifiers-merge.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240208212600_JAZZ-66167-FDA-GUDID-Identifiers-merge.cs
new file mode 100644
index 0000000..1b1b708
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240208212600_JAZZ-66167-FDA-GUDID-Identifiers-merge.cs
@@ -0,0 +1,48 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class JAZZ66167FDAGUDIDIdentifiersmerge : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var sqlProc = @"
+CREATE OR REPLACE PROCEDURE public.update_gudid_identifiers()
+LANGUAGE SQL
+AS $$
+INSERT INTO public.gudid_identifiers (primary_di, device_id, device_id_type, device_id_issuing_agency, contains_di_number, pkg_quantity, pkg_discontinue_date, pkg_status, pkg_type, is_deleted)
+SELECT primary_di, device_id, device_id_type, device_id_issuing_agency, contains_di_number, pkg_quantity, pkg_discontinue_date, pkg_status, pkg_type, false
+FROM tmp.gudid_identifiers
+ON CONFLICT (primary_di, device_id, device_id_type) DO
+    UPDATE SET 
+        device_id_issuing_agency = EXCLUDED.device_id_issuing_agency,
+        contains_di_number = EXCLUDED.contains_di_number,
+        pkg_quantity = EXCLUDED.pkg_quantity,
+        pkg_discontinue_date = EXCLUDED.pkg_discontinue_date,
+        pkg_status = EXCLUDED.pkg_status,
+        pkg_type = EXCLUDED.pkg_type,
+        is_deleted = false;
+
+UPDATE public.gudid_identifiers
+   SET is_deleted = true
+ WHERE NOT EXISTS(select 1 
+        from tmp.gudid_identifiers AS gudid 
+        where gudid.primary_di = gudid_identifiers.primary_di
+          and gudid.device_id = gudid_identifiers.device_id
+          and gudid.device_id_type = gudid_identifiers.device_id_type);
+$$;
+";
+            migrationBuilder.Sql(sqlProc);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            var dropProc = @"DROP PROCEDURE IF EXISTS public.update_gudid_identifiers();";
+            migrationBuilder.Sql(dropProc);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240213150644_AddWorkbookTemplateIdToNetworkOpportunity.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240213150644_AddWorkbookTemplateIdToNetworkOpportunity.Designer.cs
new file mode 100644
index 0000000..a9f3b5b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240213150644_AddWorkbookTemplateIdToNetworkOpportunity.Designer.cs
@@ -0,0 +1,687 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20240213150644_AddWorkbookTemplateIdToNetworkOpportunity")]
+    partial class AddWorkbookTemplateIdToNetworkOpportunity
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DimPrimaryDI", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<Guid>("HistoryItemGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("history_item_guid");
+
+                    b.Property<Guid>("MemberGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("member_guid");
+
+                    b.Property<int>("TransactionID")
+                        .HasColumnType("integer")
+                        .HasColumnName("transaction_id");
+
+                    b.HasKey("PrimaryDI")
+                        .HasName("pk_dim_primary_di");
+
+                    b.ToTable("dim_primary_di", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDeviceTerm", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("PrimaryDI");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("gudid_device_terms");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240213150644_AddWorkbookTemplateIdToNetworkOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240213150644_AddWorkbookTemplateIdToNetworkOpportunity.cs
new file mode 100644
index 0000000..cb2cce2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240213150644_AddWorkbookTemplateIdToNetworkOpportunity.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class AddWorkbookTemplateIdToNetworkOpportunity : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "workbook_template_id",
+                table: "network_opportunities",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "workbook_template_id",
+                table: "network_opportunities");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240219150433_AddConstraintToGudidTempTable.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240219150433_AddConstraintToGudidTempTable.Designer.cs
new file mode 100644
index 0000000..345dd71
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240219150433_AddConstraintToGudidTempTable.Designer.cs
@@ -0,0 +1,806 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20240219150433_AddConstraintToGudidTempTable")]
+    partial class AddConstraintToGudidTempTable
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DimPrimaryDI", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<Guid>("HistoryItemGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("history_item_guid");
+
+                    b.Property<Guid>("MemberGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("member_guid");
+
+                    b.Property<int>("TransactionID")
+                        .HasColumnType("integer")
+                        .HasColumnName("transaction_id");
+
+                    b.HasKey("PrimaryDI")
+                        .HasName("pk_dim_primary_di");
+
+                    b.ToTable("dim_primary_di", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDeviceTerm", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("PrimaryDI");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("gudid_device_terms");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240219150433_AddConstraintToGudidTempTable.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240219150433_AddConstraintToGudidTempTable.cs
new file mode 100644
index 0000000..7321a12
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240219150433_AddConstraintToGudidTempTable.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class AddConstraintToGudidTempTable : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "ix_gudid_identifiers_device_id_primary_di_device_id_type1",
+                schema: "tmp",
+                table: "gudid_identifiers",
+                columns: new[] { "device_id", "primary_di", "device_id_type" },
+                unique: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "ix_gudid_identifiers_device_id_primary_di_device_id_type1",
+                schema: "tmp",
+                table: "gudid_identifiers");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240219220906_ClearAllNetworkOpportunityData.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240219220906_ClearAllNetworkOpportunityData.Designer.cs
new file mode 100644
index 0000000..3973911
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240219220906_ClearAllNetworkOpportunityData.Designer.cs
@@ -0,0 +1,687 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20240219220906_ClearAllNetworkOpportunityData")]
+    partial class ClearAllNetworkOpportunityData
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DimPrimaryDI", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<Guid>("HistoryItemGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("history_item_guid");
+
+                    b.Property<Guid>("MemberGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("member_guid");
+
+                    b.Property<int>("TransactionID")
+                        .HasColumnType("integer")
+                        .HasColumnName("transaction_id");
+
+                    b.HasKey("PrimaryDI")
+                        .HasName("pk_dim_primary_di");
+
+                    b.ToTable("dim_primary_di", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDeviceTerm", b =>
+                {
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("PrimaryDI");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("gudid_device_terms");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240219220906_ClearAllNetworkOpportunityData.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240219220906_ClearAllNetworkOpportunityData.cs
new file mode 100644
index 0000000..2c1d1cb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240219220906_ClearAllNetworkOpportunityData.cs
@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class ClearAllNetworkOpportunityData : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var script = @"TRUNCATE TABLE public.network_opportunities RESTART IDENTITY CASCADE;
+TRUNCATE TABLE public.client_network_opportunities RESTART IDENTITY CASCADE;
+TRUNCATE TABLE public.client_network_opportunity_links RESTART IDENTITY;
+";
+
+            migrationBuilder.Sql(script);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240228155601_AddDeviceIdentifierDimension.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240228155601_AddDeviceIdentifierDimension.Designer.cs
new file mode 100644
index 0000000..e1d658e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240228155601_AddDeviceIdentifierDimension.Designer.cs
@@ -0,0 +1,814 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20240228155601_AddDeviceIdentifierDimension")]
+    partial class AddDeviceIdentifierDimension
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240228155601_AddDeviceIdentifierDimension.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240228155601_AddDeviceIdentifierDimension.cs
new file mode 100644
index 0000000..8bf3046
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240228155601_AddDeviceIdentifierDimension.cs
@@ -0,0 +1,119 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class AddDeviceIdentifierDimension : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "dim_primary_di");
+
+            migrationBuilder.CreateTable(
+                name: "device_identifier_dimension",
+                columns: table => new
+                {
+                    device_identifier = table.Column<string>(type: "text", nullable: false),
+                    primary_di = table.Column<string>(type: "text", nullable: true),
+                    device_id_type = table.Column<string>(type: "text", nullable: true),
+                    gmdn_term_code = table.Column<string>(type: "text", nullable: true),
+                    gmdn_term_name = table.Column<string>(type: "text", nullable: true),
+                    gmdn_term_definition = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function3 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function4 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function5 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function6 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function7 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_invasiveness1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_invasiveness2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_use_frequency1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_use_frequency2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_power1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_power2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_materials1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_materials2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_featured_attributes1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_featured_attributes2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty3 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty4 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty5 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty6 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index3 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index4 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index5 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index6 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index7 = table.Column<string>(type: "text", nullable: true),
+                    gudid_company_name = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_device_identifier_dimension", x => x.device_identifier);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "device_identifier_dimension");
+
+            migrationBuilder.CreateTable(
+                name: "dim_primary_di",
+                columns: table => new
+                {
+                    primary_di = table.Column<string>(type: "text", nullable: false),
+                    gmdn_anatomical_specialty1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty3 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty4 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty5 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_anatomical_specialty6 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function3 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function4 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function5 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function6 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_device_function7 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_featured_attributes1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_featured_attributes2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_invasiveness1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_invasiveness2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_materials1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_materials2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index3 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index4 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index5 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index6 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_names_index7 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_power1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_power2 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_term_code = table.Column<string>(type: "text", nullable: true),
+                    gmdn_term_definition = table.Column<string>(type: "text", nullable: true),
+                    gmdn_term_name = table.Column<string>(type: "text", nullable: true),
+                    gmdn_use_frequency1 = table.Column<string>(type: "text", nullable: true),
+                    gmdn_use_frequency2 = table.Column<string>(type: "text", nullable: true),
+                    gudid_company_name = table.Column<string>(type: "text", nullable: true),
+                    history_item_guid = table.Column<Guid>(type: "uuid", nullable: false),
+                    member_guid = table.Column<Guid>(type: "uuid", nullable: false),
+                    transaction_id = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_dim_primary_di", x => x.primary_di);
+                });
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240228155632_AlterGUDIDDeviceTermsView.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240228155632_AlterGUDIDDeviceTermsView.Designer.cs
new file mode 100644
index 0000000..666929d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240228155632_AlterGUDIDDeviceTermsView.Designer.cs
@@ -0,0 +1,814 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20240228155632_AlterGUDIDDeviceTermsView")]
+    partial class AlterGUDIDDeviceTermsView
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240228155632_AlterGUDIDDeviceTermsView.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240228155632_AlterGUDIDDeviceTermsView.cs
new file mode 100644
index 0000000..772ee05
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240228155632_AlterGUDIDDeviceTermsView.cs
@@ -0,0 +1,55 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class AlterGUDIDDeviceTermsView : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var script = @"DROP VIEW public.gudid_device_terms;
+CREATE OR REPLACE VIEW public.device_identifier_terms
+ AS
+ SELECT i.device_id,
+    i.device_id_type,
+    i.primary_di,
+    d.company_name,
+    t.gmdn_code,
+    row_number() OVER (PARTITION BY i.device_id 
+					   ORDER BY case i.device_id_type when 'Primary' then 0 else 1 end, 
+					   i.primary_di DESC, t.gmdn_code DESC) AS row_number
+    FROM gudid_identifiers i
+   	LEFT JOIN gudid_devices d ON i.primary_di = d.primary_di::text
+    LEFT JOIN gudid_terms t ON d.primary_di::text = t.primary_di;
+
+ALTER TABLE public.device_identifier_terms
+    OWNER TO postgres;
+
+";
+
+            migrationBuilder.Sql(script);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            var script = @"DROP VIEW public.device_identifier_terms;
+CREATE OR REPLACE VIEW public.gudid_device_terms
+ AS
+ SELECT d.primary_di,
+    d.company_name,
+    t.gmdn_code,
+    row_number() OVER (PARTITION BY d.primary_di, d.company_name ORDER BY t.gmdn_code DESC) AS row_number
+   FROM gudid_devices d
+     JOIN gudid_terms t ON d.primary_di::text = t.primary_di;
+
+ALTER TABLE public.gudid_device_terms
+    OWNER TO postgres;
+";
+
+            migrationBuilder.Sql(script);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240408151829_AddOpportunityWorkbooks.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240408151829_AddOpportunityWorkbooks.Designer.cs
new file mode 100644
index 0000000..85b1a12
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240408151829_AddOpportunityWorkbooks.Designer.cs
@@ -0,0 +1,854 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20240408151829_AddOpportunityWorkbooks")]
+    partial class AddOpportunityWorkbooks
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240408151829_AddOpportunityWorkbooks.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240408151829_AddOpportunityWorkbooks.cs
new file mode 100644
index 0000000..f2ca86d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240408151829_AddOpportunityWorkbooks.cs
@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [ExcludeFromCodeCoverage]
+    public partial class AddOpportunityWorkbooks : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "opportunity_type_workbooks",
+                columns: table => new
+                {
+                    strata_id = table.Column<int>(type: "integer", nullable: false),
+                    opportunity_type = table.Column<int>(type: "integer", nullable: false),
+                    workbook_id = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_opportunity_type_workbooks", x => new { x.strata_id, x.opportunity_type, x.workbook_id });
+                });
+
+            migrationBuilder.CreateTable(
+                name: "opportunity_workbooks",
+                columns: table => new
+                {
+                    strata_id = table.Column<int>(type: "integer", nullable: false),
+                    opportunity_guid = table.Column<Guid>(type: "uuid", nullable: false),
+                    workbook_id = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_opportunity_workbooks", x => new { x.strata_id, x.opportunity_guid, x.workbook_id });
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "opportunity_type_workbooks");
+
+            migrationBuilder.DropTable(
+                name: "opportunity_workbooks");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240911141842_AddNullForCohortOrgCount.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240911141842_AddNullForCohortOrgCount.Designer.cs
new file mode 100644
index 0000000..b9cf8fe
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240911141842_AddNullForCohortOrgCount.Designer.cs
@@ -0,0 +1,854 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20240911141842_AddNullForCohortOrgCount")]
+    partial class AddNullForCohortOrgCount
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20240911141842_AddNullForCohortOrgCount.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20240911141842_AddNullForCohortOrgCount.cs
new file mode 100644
index 0000000..2e1f90d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20240911141842_AddNullForCohortOrgCount.cs
@@ -0,0 +1,51 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    public partial class AddNullForCohortOrgCount : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "pursued_organizations_count",
+                table: "network_opportunities",
+                type: "integer",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "integer");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "average_cohort_savings",
+                table: "client_network_opportunities",
+                type: "integer",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "integer");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "pursued_organizations_count",
+                table: "network_opportunities",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "integer",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "average_cohort_savings",
+                table: "client_network_opportunities",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "integer",
+                oldNullable: true);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20241112193215_ConvertCommentOpportunityIdToBigInt.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20241112193215_ConvertCommentOpportunityIdToBigInt.Designer.cs
new file mode 100644
index 0000000..a913375
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20241112193215_ConvertCommentOpportunityIdToBigInt.Designer.cs
@@ -0,0 +1,855 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20241112193215_ConvertCommentOpportunityIdToBigInt")]
+    partial class ConvertCommentOpportunityIdToBigInt
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20241112193215_ConvertCommentOpportunityIdToBigInt.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20241112193215_ConvertCommentOpportunityIdToBigInt.cs
new file mode 100644
index 0000000..311201c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20241112193215_ConvertCommentOpportunityIdToBigInt.cs
@@ -0,0 +1,34 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class ConvertCommentOpportunityIdToBigInt : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<long>(
+                name: "opportunity_id",
+                table: "comments",
+                type: "bigint",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "integer");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "opportunity_id",
+                table: "comments",
+                type: "integer",
+                nullable: false,
+                oldClrType: typeof(long),
+                oldType: "bigint");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20241112194359_AddNotNullPublicDeviceRecordKey.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20241112194359_AddNotNullPublicDeviceRecordKey.Designer.cs
new file mode 100644
index 0000000..fc1b369
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20241112194359_AddNotNullPublicDeviceRecordKey.Designer.cs
@@ -0,0 +1,856 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20241112194359_AddNotNullPublicDeviceRecordKey")]
+    partial class AddNotNullPublicDeviceRecordKey
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20241112194359_AddNotNullPublicDeviceRecordKey.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20241112194359_AddNotNullPublicDeviceRecordKey.cs
new file mode 100644
index 0000000..82bb778
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20241112194359_AddNotNullPublicDeviceRecordKey.cs
@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddNotNullPublicDeviceRecordKey : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "public_device_record_key",
+                table: "gudid_devices",
+                type: "character varying(50)",
+                maxLength: 50,
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "character varying(50)",
+                oldMaxLength: 50,
+                oldNullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "public_device_record_key",
+                table: "gudid_devices",
+                type: "character varying(50)",
+                maxLength: 50,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(50)",
+                oldMaxLength: 50);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20241119162858_JAZZ-80222-Gudid-Device-Version-Date-Index.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20241119162858_JAZZ-80222-Gudid-Device-Version-Date-Index.Designer.cs
new file mode 100644
index 0000000..dfe42db
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20241119162858_JAZZ-80222-Gudid-Device-Version-Date-Index.Designer.cs
@@ -0,0 +1,859 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20241119162858_JAZZ-80222-Gudid-Device-Version-Date-Index")]
+    partial class JAZZ80222GudidDeviceVersionDateIndex
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<int>("OpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20241119162858_JAZZ-80222-Gudid-Device-Version-Date-Index.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20241119162858_JAZZ-80222-Gudid-Device-Version-Date-Index.cs
new file mode 100644
index 0000000..4bdf055
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20241119162858_JAZZ-80222-Gudid-Device-Version-Date-Index.cs
@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class JAZZ80222GudidDeviceVersionDateIndex : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "ix_gudid_devices_public_version_date",
+                table: "gudid_devices",
+                column: "public_version_date");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "ix_gudid_devices_public_version_date",
+                table: "gudid_devices");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250411154907_AddClientWarehouse.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250411154907_AddClientWarehouse.Designer.cs
new file mode 100644
index 0000000..9a4bd6e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250411154907_AddClientWarehouse.Designer.cs
@@ -0,0 +1,890 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20250411154907_AddClientWarehouse")]
+    partial class AddClientWarehouse
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250411154907_AddClientWarehouse.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250411154907_AddClientWarehouse.cs
new file mode 100644
index 0000000..6eacaa6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250411154907_AddClientWarehouse.cs
@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using System;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddClientWarehouse : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "client_warehouses",
+                columns: table => new
+                {
+                    client_warehouse_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    database_guid = table.Column<Guid>(type: "uuid", nullable: false),
+                    client_name = table.Column<string>(type: "text", nullable: true),
+                    warehouse_size = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_client_warehouses", x => x.client_warehouse_id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_client_warehouses_database_guid",
+                table: "client_warehouses",
+                column: "database_guid",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "client_warehouses");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250618140334_AddGudidDeviceIndex.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250618140334_AddGudidDeviceIndex.Designer.cs
new file mode 100644
index 0000000..3059c2a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250618140334_AddGudidDeviceIndex.Designer.cs
@@ -0,0 +1,893 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20250618140334_AddGudidDeviceIndex")]
+    partial class AddGudidDeviceIndex
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250618140334_AddGudidDeviceIndex.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250618140334_AddGudidDeviceIndex.cs
new file mode 100644
index 0000000..ac1ae70
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250618140334_AddGudidDeviceIndex.cs
@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddGudidDeviceIndex : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "ix_gudid_devices_primary_di",
+                table: "gudid_devices",
+                column: "primary_di");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "ix_gudid_devices_primary_di",
+                table: "gudid_devices");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250618142121_AddExplorationPopulationTables.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250618142121_AddExplorationPopulationTables.Designer.cs
new file mode 100644
index 0000000..00551fb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250618142121_AddExplorationPopulationTables.Designer.cs
@@ -0,0 +1,1028 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20250618142121_AddExplorationPopulationTables")]
+    partial class AddExplorationPopulationTables
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusions", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounters", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulations", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusions", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulations", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounters", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulations", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulations", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250618142121_AddExplorationPopulationTables.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250618142121_AddExplorationPopulationTables.cs
new file mode 100644
index 0000000..693276d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250618142121_AddExplorationPopulationTables.cs
@@ -0,0 +1,91 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddExplorationPopulationTables : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "exploration_populations",
+                columns: table => new
+                {
+                    exploration_population_id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    name = table.Column<string>(type: "text", nullable: true),
+                    case_type_family_id = table.Column<int>(type: "integer", nullable: false),
+                    cost_driver = table.Column<string>(type: "text", nullable: true),
+                    los_exclusion_type = table.Column<short>(type: "smallint", nullable: false),
+                    los_exclusion_value = table.Column<decimal>(type: "numeric", nullable: false),
+                    cost_exclusion_type = table.Column<short>(type: "smallint", nullable: false),
+                    cost_exclusion_value = table.Column<decimal>(type: "numeric", nullable: false),
+                    filters_json = table.Column<string>(type: "text", nullable: true),
+                    total_encounters = table.Column<int>(type: "integer", nullable: false),
+                    total_variation = table.Column<decimal>(type: "numeric", nullable: false),
+                    code_type = table.Column<short>(type: "smallint", nullable: false),
+                    strata_id = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_exploration_populations", x => x.exploration_population_id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "exploration_inclusion_exclusions",
+                columns: table => new
+                {
+                    exploration_population_id = table.Column<long>(type: "bigint", nullable: false),
+                    encounter_id = table.Column<long>(type: "bigint", nullable: false),
+                    is_excluded = table.Column<bool>(type: "boolean", nullable: false),
+                    strata_id = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_exploration_inclusion_exclusions", x => new { x.exploration_population_id, x.encounter_id });
+                    table.ForeignKey(
+                        name: "fk_exploration_inclusion_exclusions_exploration_populations_ex",
+                        column: x => x.exploration_population_id,
+                        principalTable: "exploration_populations",
+                        principalColumn: "exploration_population_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "exploration_population_encounters",
+                columns: table => new
+                {
+                    exploration_population_id = table.Column<long>(type: "bigint", nullable: false),
+                    encounter_id = table.Column<long>(type: "bigint", nullable: false),
+                    strata_id = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_exploration_population_encounters", x => new { x.exploration_population_id, x.encounter_id });
+                    table.ForeignKey(
+                        name: "fk_exploration_population_encounters_exploration_populations_e",
+                        column: x => x.exploration_population_id,
+                        principalTable: "exploration_populations",
+                        principalColumn: "exploration_population_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "exploration_inclusion_exclusions");
+
+            migrationBuilder.DropTable(
+                name: "exploration_population_encounters");
+
+            migrationBuilder.DropTable(
+                name: "exploration_populations");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250806154249_AddStrategicOpportunityTables.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250806154249_AddStrategicOpportunityTables.Designer.cs
new file mode 100644
index 0000000..84cb97a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250806154249_AddStrategicOpportunityTables.Designer.cs
@@ -0,0 +1,1230 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20250806154249_AddStrategicOpportunityTables")]
+    partial class AddStrategicOpportunityTables
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StandardDataSourceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("standard_data_source_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250806154249_AddStrategicOpportunityTables.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250806154249_AddStrategicOpportunityTables.cs
new file mode 100644
index 0000000..bb8030f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250806154249_AddStrategicOpportunityTables.cs
@@ -0,0 +1,144 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <summary>
+    /// Migration to add Strategic Opportunity tables.
+    /// </summary>
+    public partial class AddStrategicOpportunityTables : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            CreateStrategicOpportunityTable(migrationBuilder);
+            CreateStrategicOpportunityChargeCodeTable(migrationBuilder);
+            CreateStrategicOpportunityMeasureTable(migrationBuilder);
+            CreateStrategicOpportunityWorkbookTable(migrationBuilder);
+        }
+
+        private void CreateStrategicOpportunityTable(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "strategic_opportunity",
+                columns: table => new
+                {
+                    opportunity_id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    name = table.Column<string>(type: "text", nullable: true),
+                    opportunity_type = table.Column<byte>(type: "smallint", nullable: false),
+                    opportunity_filters_json = table.Column<string>(type: "text", nullable: true),
+                    rollup1id = table.Column<int>(type: "integer", nullable: false),
+                    rollup2id = table.Column<int>(type: "integer", nullable: false),
+                    rollup3id = table.Column<int>(type: "integer", nullable: false),
+                    baseline_type = table.Column<byte>(type: "smallint", nullable: false),
+                    baseline_distribution = table.Column<byte>(type: "smallint", nullable: false),
+                    baseline_start_date = table.Column<DateOnly>(type: "date", nullable: false),
+                    baseline_end_date = table.Column<DateOnly>(type: "date", nullable: false),
+                    estimated_tracking_duration = table.Column<byte>(type: "smallint", nullable: false),
+                    strata_id = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_strategic_opportunity", x => x.opportunity_id);
+                });
+        }
+
+        private void CreateStrategicOpportunityChargeCodeTable(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "strategic_opportunity_charge_code",
+                columns: table => new
+                {
+                    opportunity_id = table.Column<long>(type: "bigint", nullable: false),
+                    patient_population_h_path = table.Column<string>(type: "text", nullable: true),
+                    exploration_population_id = table.Column<long>(type: "bigint", nullable: false),
+                    charge_code_h_path = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_strategic_opportunity_charge_code", x => x.opportunity_id);
+                    table.ForeignKey(
+                        name: "fk_strategic_opportunity_charge_code_strategic_opportunity_opp",
+                        column: x => x.opportunity_id,
+                        principalTable: "strategic_opportunity",
+                        principalColumn: "opportunity_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        private void CreateStrategicOpportunityMeasureTable(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "strategic_opportunity_measure",
+                columns: table => new
+                {
+                    measure_id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    opportunity_id = table.Column<long>(type: "bigint", nullable: false),
+                    standard_data_source_id = table.Column<int>(type: "integer", nullable: false),
+                    measure_type = table.Column<byte>(type: "smallint", nullable: false),
+                    measure_name = table.Column<string>(type: "text", nullable: true),
+                    desired_result = table.Column<byte>(type: "smallint", nullable: false),
+                    acceptable_threshold = table.Column<float>(type: "real", nullable: false),
+                    filters_json = table.Column<string>(type: "text", nullable: true),
+                    is_primary_measure = table.Column<bool>(type: "boolean", nullable: false),
+                    strata_id = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_strategic_opportunity_measure", x => x.measure_id);
+                    table.ForeignKey(
+                        name: "fk_strategic_opportunity_measure_strategic_opportunity_opportu",
+                        column: x => x.opportunity_id,
+                        principalTable: "strategic_opportunity",
+                        principalColumn: "opportunity_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        private void CreateStrategicOpportunityWorkbookTable(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "strategic_opportunity_workbook",
+                columns: table => new
+                {
+                    opportunity_id = table.Column<long>(type: "bigint", nullable: false),
+                    workbook_id = table.Column<int>(type: "integer", nullable: false),
+                    strata_id = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_strategic_opportunity_workbook", x => new { x.opportunity_id, x.workbook_id });
+                    table.ForeignKey(
+                        name: "fk_strategic_opportunity_workbook_strategic_opportunity_opport",
+                        column: x => x.opportunity_id,
+                        principalTable: "strategic_opportunity",
+                        principalColumn: "opportunity_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_strategic_opportunity_measure_opportunity_id",
+                table: "strategic_opportunity_measure",
+                column: "opportunity_id");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "strategic_opportunity_charge_code");
+
+            migrationBuilder.DropTable(
+                name: "strategic_opportunity_measure");
+
+            migrationBuilder.DropTable(
+                name: "strategic_opportunity_workbook");
+
+            migrationBuilder.DropTable(
+                name: "strategic_opportunity");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250818091715_AddLayoutJSONColumnToStrategicOpportunityTable.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250818091715_AddLayoutJSONColumnToStrategicOpportunityTable.Designer.cs
new file mode 100644
index 0000000..dbfb817
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250818091715_AddLayoutJSONColumnToStrategicOpportunityTable.Designer.cs
@@ -0,0 +1,1234 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20250818091715_AddLayoutJSONColumnToStrategicOpportunityTable")]
+    partial class AddLayoutJSONColumnToStrategicOpportunityTable
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StandardDataSourceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("standard_data_source_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250818091715_AddLayoutJSONColumnToStrategicOpportunityTable.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250818091715_AddLayoutJSONColumnToStrategicOpportunityTable.cs
new file mode 100644
index 0000000..21d49be
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250818091715_AddLayoutJSONColumnToStrategicOpportunityTable.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddLayoutJSONColumnToStrategicOpportunityTable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "layout_json",
+                table: "strategic_opportunity",
+                type: "text",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "layout_json",
+                table: "strategic_opportunity");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250827094039_Added Strategic Opportunity Ramp Up table.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250827094039_Added Strategic Opportunity Ramp Up table.Designer.cs
new file mode 100644
index 0000000..c14f138
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250827094039_Added Strategic Opportunity Ramp Up table.Designer.cs	
@@ -0,0 +1,1268 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20250827094039_Added Strategic Opportunity Ramp Up table")]
+    partial class AddedStrategicOpportunityRampUptable
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StandardDataSourceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("standard_data_source_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250827094039_Added Strategic Opportunity Ramp Up table.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250827094039_Added Strategic Opportunity Ramp Up table.cs
new file mode 100644
index 0000000..5bb605f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250827094039_Added Strategic Opportunity Ramp Up table.cs	
@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddedStrategicOpportunityRampUptable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "strategic_opportunity_ramp_up",
+                columns: table => new
+                {
+                    opportunity_id = table.Column<long>(type: "bigint", nullable: false),
+                    month_number = table.Column<byte>(type: "smallint", nullable: false),
+                    percentage = table.Column<double>(type: "double precision", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_strategic_opportunity_ramp_up", x => new { x.opportunity_id, x.month_number });
+                    table.ForeignKey(
+                        name: "fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu",
+                        column: x => x.opportunity_id,
+                        principalTable: "strategic_opportunity",
+                        principalColumn: "opportunity_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "strategic_opportunity_ramp_up");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250911101011_AddOpportunityRoleAssignmentTable.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250911101011_AddOpportunityRoleAssignmentTable.Designer.cs
new file mode 100644
index 0000000..063aa47
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250911101011_AddOpportunityRoleAssignmentTable.Designer.cs
@@ -0,0 +1,1304 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20250911101011_AddOpportunityRoleAssignmentTable")]
+    partial class AddOpportunityRoleAssignmentTable
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StandardDataSourceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("standard_data_source_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250911101011_AddOpportunityRoleAssignmentTable.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250911101011_AddOpportunityRoleAssignmentTable.cs
new file mode 100644
index 0000000..2bff044
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250911101011_AddOpportunityRoleAssignmentTable.cs
@@ -0,0 +1,39 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddOpportunityRoleAssignmentTable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "opportunity_role_assignments",
+                columns: table => new
+                {
+                    opportunity_id = table.Column<long>(type: "bigint", nullable: false),
+                    identity_guid = table.Column<Guid>(type: "uuid", nullable: false),
+                    strata_id = table.Column<int>(type: "integer", nullable: false),
+                    identity_name = table.Column<string>(type: "text", nullable: true),
+                    is_read = table.Column<bool>(type: "boolean", nullable: false),
+                    is_write = table.Column<bool>(type: "boolean", nullable: false),
+                    is_secure_write = table.Column<bool>(type: "boolean", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_opportunity_role_assignments", x => new { x.opportunity_id, x.identity_guid });
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "opportunity_role_assignments");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250917110126_Added status column to StrategicOpportunity.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250917110126_Added status column to StrategicOpportunity.Designer.cs
new file mode 100644
index 0000000..b156314
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250917110126_Added status column to StrategicOpportunity.Designer.cs	
@@ -0,0 +1,1308 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20250917110126_Added status column to StrategicOpportunity")]
+    partial class AddedstatuscolumntoStrategicOpportunity
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StandardDataSourceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("standard_data_source_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250917110126_Added status column to StrategicOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250917110126_Added status column to StrategicOpportunity.cs
new file mode 100644
index 0000000..38e71c4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250917110126_Added status column to StrategicOpportunity.cs	
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddedstatuscolumntoStrategicOpportunity : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<byte>(
+                name: "status",
+                table: "strategic_opportunity",
+                type: "smallint",
+                nullable: false,
+                defaultValue: (byte)0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "status",
+                table: "strategic_opportunity");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250917151411_Add tracking dates to StrategicOpportunity.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250917151411_Add tracking dates to StrategicOpportunity.Designer.cs
new file mode 100644
index 0000000..b32c186
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250917151411_Add tracking dates to StrategicOpportunity.Designer.cs	
@@ -0,0 +1,1316 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20250917151411_Add tracking dates to StrategicOpportunity")]
+    partial class AddtrackingdatestoStrategicOpportunity
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StandardDataSourceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("standard_data_source_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20250917151411_Add tracking dates to StrategicOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20250917151411_Add tracking dates to StrategicOpportunity.cs
new file mode 100644
index 0000000..3f330a9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20250917151411_Add tracking dates to StrategicOpportunity.cs	
@@ -0,0 +1,45 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddtrackingdatestoStrategicOpportunity : Migration
+    {
+        private const string TableName = "strategic_opportunity";
+        private static readonly DateOnly DefaultDate = new(1, 1, 1);
+
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            AddDateColumn(migrationBuilder, "tracking_start_date");
+            AddDateColumn(migrationBuilder, "tracking_end_date");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            RemoveColumn(migrationBuilder, "tracking_start_date");
+            RemoveColumn(migrationBuilder, "tracking_end_date");
+        }
+
+        private static void AddDateColumn(MigrationBuilder builder, string columnName)
+        {
+            builder.AddColumn<DateOnly>(
+                name: columnName,
+                table: TableName,
+                type: "date",
+                nullable: false,
+                defaultValue: DefaultDate);
+        }
+
+        private static void RemoveColumn(MigrationBuilder builder, string columnName)
+        {
+            builder.DropColumn(
+                name: columnName,
+                table: TableName);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20251105230652_AddTotalValuesToStrategicOpportunity.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20251105230652_AddTotalValuesToStrategicOpportunity.Designer.cs
new file mode 100644
index 0000000..5c95721
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20251105230652_AddTotalValuesToStrategicOpportunity.Designer.cs
@@ -0,0 +1,1324 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20251105230652_AddTotalValuesToStrategicOpportunity")]
+    partial class AddTotalValuesToStrategicOpportunity
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<double>("TotalGoal")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_goal");
+
+                    b.Property<double>("TotalImprovements")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_improvements");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StandardDataSourceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("standard_data_source_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20251105230652_AddTotalValuesToStrategicOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20251105230652_AddTotalValuesToStrategicOpportunity.cs
new file mode 100644
index 0000000..240b953
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20251105230652_AddTotalValuesToStrategicOpportunity.cs
@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddTotalValuesToStrategicOpportunity : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<double>(
+                name: "estimated_goal",
+                table: "strategic_opportunity",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0);
+
+            migrationBuilder.AddColumn<double>(
+                name: "total_improvement",
+                table: "strategic_opportunity",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "estimated_goal",
+                table: "strategic_opportunity");
+
+            migrationBuilder.DropColumn(
+                name: "total_improvement",
+                table: "strategic_opportunity");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20251117115508_Remove-StandardDataSource-From-StrategicOpportunityMeasure.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20251117115508_Remove-StandardDataSource-From-StrategicOpportunityMeasure.Designer.cs
new file mode 100644
index 0000000..e9a7bed
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20251117115508_Remove-StandardDataSource-From-StrategicOpportunityMeasure.Designer.cs
@@ -0,0 +1,1312 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20251117115508_Remove-StandardDataSource-From-StrategicOpportunityMeasure")]
+    partial class RemoveStandardDataSourceFromStrategicOpportunityMeasure
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20251117115508_Remove-StandardDataSource-From-StrategicOpportunityMeasure.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20251117115508_Remove-StandardDataSource-From-StrategicOpportunityMeasure.cs
new file mode 100644
index 0000000..6e2194a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20251117115508_Remove-StandardDataSource-From-StrategicOpportunityMeasure.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class RemoveStandardDataSourceFromStrategicOpportunityMeasure : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "standard_data_source_id",
+                table: "strategic_opportunity_measure");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "standard_data_source_id",
+                table: "strategic_opportunity_measure",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20251202115024_AddedStrategicStakeholdersLinkTable.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20251202115024_AddedStrategicStakeholdersLinkTable.Designer.cs
new file mode 100644
index 0000000..b0cad79
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20251202115024_AddedStrategicStakeholdersLinkTable.Designer.cs
@@ -0,0 +1,1359 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20251202115024_AddedStrategicStakeholdersLinkTable")]
+    partial class AddedStrategicStakeholdersLinkTable
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<Guid>("CostLeaderGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("cost_leader_guid");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<Guid>("ExecutiveSponsorGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("executive_sponsor_guid");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<Guid>("OwnerGUID")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_guid");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<string>("TeamMembers")
+                        .HasMaxLength(4000)
+                        .HasColumnType("character varying(4000)")
+                        .HasColumnName("team_members");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.Property<long>("StrategicOpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("strategic_opportunity_id");
+
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_guid");
+
+                    b.HasKey("StrategicOpportunityId", "UserGuid")
+                        .HasName("pk_strategic_stakeholders_link");
+
+                    b.ToTable("strategic_stakeholders_link", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Stakeholders")
+                        .HasForeignKey("StrategicOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_stakeholders_link_strategic_opportunity_strategic");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Stakeholders");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20251202115024_AddedStrategicStakeholdersLinkTable.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20251202115024_AddedStrategicStakeholdersLinkTable.cs
new file mode 100644
index 0000000..eb2e29b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20251202115024_AddedStrategicStakeholdersLinkTable.cs
@@ -0,0 +1,84 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddedStrategicStakeholdersLinkTable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "cost_leader_guid",
+                table: "strategic_opportunity",
+                type: "uuid",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "executive_sponsor_guid",
+                table: "strategic_opportunity",
+                type: "uuid",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "owner_guid",
+                table: "strategic_opportunity",
+                type: "uuid",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+
+            migrationBuilder.AddColumn<string>(
+                name: "team_members",
+                table: "strategic_opportunity",
+                type: "character varying(4000)",
+                maxLength: 4000,
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "strategic_stakeholders_link",
+                columns: table => new
+                {
+                    strategic_opportunity_id = table.Column<long>(type: "bigint", nullable: false),
+                    user_guid = table.Column<Guid>(type: "uuid", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_strategic_stakeholders_link", x => new { x.strategic_opportunity_id, x.user_guid });
+                    table.ForeignKey(
+                        name: "fk_strategic_stakeholders_link_strategic_opportunity_strategic",
+                        column: x => x.strategic_opportunity_id,
+                        principalTable: "strategic_opportunity",
+                        principalColumn: "opportunity_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "strategic_stakeholders_link");
+
+            migrationBuilder.DropColumn(
+                name: "cost_leader_guid",
+                table: "strategic_opportunity");
+
+            migrationBuilder.DropColumn(
+                name: "executive_sponsor_guid",
+                table: "strategic_opportunity");
+
+            migrationBuilder.DropColumn(
+                name: "owner_guid",
+                table: "strategic_opportunity");
+
+            migrationBuilder.DropColumn(
+                name: "team_members",
+                table: "strategic_opportunity");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20251212174231_ClientNetworkOpportunity.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20251212174231_ClientNetworkOpportunity.Designer.cs
new file mode 100644
index 0000000..31fdd2c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20251212174231_ClientNetworkOpportunity.Designer.cs
@@ -0,0 +1,1359 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20251212174231_ClientNetworkOpportunity")]
+    partial class ClientNetworkOpportunity
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<Guid>("CostLeaderGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("cost_leader_guid");
+
+                    b.Property<double>("EstimatedGoal")
+                        .HasColumnType("double precision")
+                        .HasColumnName("estimated_goal");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<Guid>("ExecutiveSponsorGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("executive_sponsor_guid");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<Guid>("OwnerGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_guid");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<string>("TeamMembers")
+                        .HasMaxLength(4000)
+                        .HasColumnType("character varying(4000)")
+                        .HasColumnName("team_members");
+
+                    b.Property<double>("TotalImprovement")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_improvement");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.Property<long>("StrategicOpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("strategic_opportunity_id");
+
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_guid");
+
+                    b.HasKey("StrategicOpportunityId", "UserGuid")
+                        .HasName("pk_strategic_stakeholders_link");
+
+                    b.ToTable("strategic_stakeholders_link", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Stakeholders")
+                        .HasForeignKey("StrategicOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_stakeholders_link_strategic_opportunity_strategic");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Stakeholders");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20251212174231_ClientNetworkOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20251212174231_ClientNetworkOpportunity.cs
new file mode 100644
index 0000000..cab1a12
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20251212174231_ClientNetworkOpportunity.cs
@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class ClientNetworkOpportunity : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "pursued_organizations_count",
+                table: "network_opportunities");
+
+            migrationBuilder.DropColumn(
+                name: "average_cohort_savings",
+                table: "client_network_opportunities");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "pursued_organizations_count",
+                table: "network_opportunities",
+                type: "integer",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "average_cohort_savings",
+                table: "client_network_opportunities",
+                type: "integer",
+                nullable: true);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20251218135025_AddRunTrackingAndTotalCommittedCostColumns.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20251218135025_AddRunTrackingAndTotalCommittedCostColumns.Designer.cs
new file mode 100644
index 0000000..09d9a7e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20251218135025_AddRunTrackingAndTotalCommittedCostColumns.Designer.cs
@@ -0,0 +1,1371 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20251218135025_AddRunTrackingAndTotalCommittedCostColumns")]
+    partial class AddRunTrackingAndTotalCommittedCostColumns
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int?>("AverageCohortSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("average_cohort_savings");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int?>("PursuedOrganizationsCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("pursued_organizations_count");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<Guid>("CostLeaderGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("cost_leader_guid");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<Guid>("ExecutiveSponsorGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("executive_sponsor_guid");
+
+                    b.Property<DateTime?>("LastRunTrackingDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_run_tracking_date");
+
+                    b.Property<byte>("LastRunTrackingStatus")
+                        .HasColumnType("smallint")
+                        .HasColumnName("last_run_tracking_status");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<Guid>("OwnerGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_guid");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<string>("TeamMembers")
+                        .HasMaxLength(4000)
+                        .HasColumnType("character varying(4000)")
+                        .HasColumnName("team_members");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.Property<long>("StrategicOpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("strategic_opportunity_id");
+
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_guid");
+
+                    b.HasKey("StrategicOpportunityId", "UserGuid")
+                        .HasName("pk_strategic_stakeholders_link");
+
+                    b.ToTable("strategic_stakeholders_link", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.Property<double>("TotalCommittedCost")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_committed_cost");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Stakeholders")
+                        .HasForeignKey("StrategicOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_stakeholders_link_strategic_opportunity_strategic");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Stakeholders");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20251218135025_AddRunTrackingAndTotalCommittedCostColumns.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20251218135025_AddRunTrackingAndTotalCommittedCostColumns.cs
new file mode 100644
index 0000000..13baaab
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20251218135025_AddRunTrackingAndTotalCommittedCostColumns.cs
@@ -0,0 +1,51 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddRunTrackingAndTotalCommittedCostColumns : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<double>(
+                name: "total_committed_cost",
+                table: "strategic_opportunity_charge_code",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "last_run_tracking_date",
+                table: "strategic_opportunity",
+                type: "timestamp with time zone",
+                nullable: true);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "last_run_tracking_status",
+                table: "strategic_opportunity",
+                type: "smallint",
+                nullable: false,
+                defaultValue: (byte)0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "total_committed_cost",
+                table: "strategic_opportunity_charge_code");
+
+            migrationBuilder.DropColumn(
+                name: "last_run_tracking_date",
+                table: "strategic_opportunity");
+
+            migrationBuilder.DropColumn(
+                name: "last_run_tracking_status",
+                table: "strategic_opportunity");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20251230164627_AddProgressToDateColumnsToStrategicOpportunityChargeCodeTable.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20251230164627_AddProgressToDateColumnsToStrategicOpportunityChargeCodeTable.Designer.cs
new file mode 100644
index 0000000..c48c55f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20251230164627_AddProgressToDateColumnsToStrategicOpportunityChargeCodeTable.Designer.cs
@@ -0,0 +1,1379 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20251230164627_AddProgressToDateColumnsToStrategicOpportunityChargeCodeTable")]
+    partial class AddProgressToDateColumnsToStrategicOpportunityChargeCodeTable
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<Guid>("CostLeaderGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("cost_leader_guid");
+
+                    b.Property<double>("EstimatedGoal")
+                        .HasColumnType("double precision")
+                        .HasColumnName("estimated_goal");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<Guid>("ExecutiveSponsorGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("executive_sponsor_guid");
+
+                    b.Property<DateTime?>("LastRunTrackingDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_run_tracking_date");
+
+                    b.Property<byte>("LastRunTrackingStatus")
+                        .HasColumnType("smallint")
+                        .HasColumnName("last_run_tracking_status");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<Guid>("OwnerGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_guid");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<string>("TeamMembers")
+                        .HasMaxLength(4000)
+                        .HasColumnType("character varying(4000)")
+                        .HasColumnName("team_members");
+
+                    b.Property<double>("TotalImprovement")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_improvement");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.Property<long>("StrategicOpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("strategic_opportunity_id");
+
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_guid");
+
+                    b.HasKey("StrategicOpportunityId", "UserGuid")
+                        .HasName("pk_strategic_stakeholders_link");
+
+                    b.ToTable("strategic_stakeholders_link", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.Property<double>("ProgressToDateActual")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_actual");
+
+                    b.Property<double>("ProgressToDateCommitted")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_committed");
+
+                    b.Property<double>("TotalCommittedCost")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_committed_cost");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Stakeholders")
+                        .HasForeignKey("StrategicOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_stakeholders_link_strategic_opportunity_strategic");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Stakeholders");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20251230164627_AddProgressToDateColumnsToStrategicOpportunityChargeCodeTable.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20251230164627_AddProgressToDateColumnsToStrategicOpportunityChargeCodeTable.cs
new file mode 100644
index 0000000..c6f49d5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20251230164627_AddProgressToDateColumnsToStrategicOpportunityChargeCodeTable.cs
@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddProgressToDateColumnsToStrategicOpportunityChargeCodeTable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<double>(
+                name: "progress_to_date_actual",
+                table: "strategic_opportunity_charge_code",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0);
+
+            migrationBuilder.AddColumn<double>(
+                name: "progress_to_date_committed",
+                table: "strategic_opportunity_charge_code",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "progress_to_date_actual",
+                table: "strategic_opportunity_charge_code");
+
+            migrationBuilder.DropColumn(
+                name: "progress_to_date_committed",
+                table: "strategic_opportunity_charge_code");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20260127142153_AddAverageValueToStrategicOpportunityMeasure.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20260127142153_AddAverageValueToStrategicOpportunityMeasure.Designer.cs
new file mode 100644
index 0000000..7e1c92e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20260127142153_AddAverageValueToStrategicOpportunityMeasure.Designer.cs
@@ -0,0 +1,1383 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20260127142153_AddAverageValueToStrategicOpportunityMeasure")]
+    partial class AddAverageValueToStrategicOpportunityMeasure
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<Guid>("CostLeaderGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("cost_leader_guid");
+
+                    b.Property<double>("EstimatedGoal")
+                        .HasColumnType("double precision")
+                        .HasColumnName("estimated_goal");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<Guid>("ExecutiveSponsorGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("executive_sponsor_guid");
+
+                    b.Property<DateTime?>("LastRunTrackingDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_run_tracking_date");
+
+                    b.Property<byte>("LastRunTrackingStatus")
+                        .HasColumnType("smallint")
+                        .HasColumnName("last_run_tracking_status");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<Guid>("OwnerGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_guid");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<string>("TeamMembers")
+                        .HasMaxLength(4000)
+                        .HasColumnType("character varying(4000)")
+                        .HasColumnName("team_members");
+
+                    b.Property<double>("TotalImprovement")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_improvement");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<double>("AverageValue")
+                        .HasColumnType("double precision")
+                        .HasColumnName("average_value");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<bool>("IsPrimaryMeasure")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_primary_measure");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.Property<long>("StrategicOpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("strategic_opportunity_id");
+
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_guid");
+
+                    b.HasKey("StrategicOpportunityId", "UserGuid")
+                        .HasName("pk_strategic_stakeholders_link");
+
+                    b.ToTable("strategic_stakeholders_link", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.Property<double>("ProgressToDateActual")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_actual");
+
+                    b.Property<double>("ProgressToDateCommitted")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_committed");
+
+                    b.Property<double>("TotalCommittedCost")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_committed_cost");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Stakeholders")
+                        .HasForeignKey("StrategicOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_stakeholders_link_strategic_opportunity_strategic");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Stakeholders");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20260127142153_AddAverageValueToStrategicOpportunityMeasure.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20260127142153_AddAverageValueToStrategicOpportunityMeasure.cs
new file mode 100644
index 0000000..bf7dd06
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20260127142153_AddAverageValueToStrategicOpportunityMeasure.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddAverageValueToStrategicOpportunityMeasure : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<double>(
+                name: "average_value",
+                table: "strategic_opportunity_measure",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "average_value",
+                table: "strategic_opportunity_measure");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20260226123152_AddMeasureGroupAndDeleteIsPrimaryFromStrategicOpportunityMeasure.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20260226123152_AddMeasureGroupAndDeleteIsPrimaryFromStrategicOpportunityMeasure.Designer.cs
new file mode 100644
index 0000000..3237b3f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20260226123152_AddMeasureGroupAndDeleteIsPrimaryFromStrategicOpportunityMeasure.Designer.cs
@@ -0,0 +1,1383 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20260226123152_AddMeasureGroupAndDeleteIsPrimaryFromStrategicOpportunityMeasure")]
+    partial class AddMeasureGroupAndDeleteIsPrimaryFromStrategicOpportunityMeasure
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<Guid>("CostLeaderGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("cost_leader_guid");
+
+                    b.Property<double>("EstimatedGoal")
+                        .HasColumnType("double precision")
+                        .HasColumnName("estimated_goal");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<Guid>("ExecutiveSponsorGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("executive_sponsor_guid");
+
+                    b.Property<DateTime?>("LastRunTrackingDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_run_tracking_date");
+
+                    b.Property<byte>("LastRunTrackingStatus")
+                        .HasColumnType("smallint")
+                        .HasColumnName("last_run_tracking_status");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<Guid>("OwnerGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_guid");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<string>("TeamMembers")
+                        .HasMaxLength(4000)
+                        .HasColumnType("character varying(4000)")
+                        .HasColumnName("team_members");
+
+                    b.Property<double>("TotalImprovement")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_improvement");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<double>("AverageValue")
+                        .HasColumnType("double precision")
+                        .HasColumnName("average_value");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<byte>("MeasureGroup")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_group");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.Property<long>("StrategicOpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("strategic_opportunity_id");
+
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_guid");
+
+                    b.HasKey("StrategicOpportunityId", "UserGuid")
+                        .HasName("pk_strategic_stakeholders_link");
+
+                    b.ToTable("strategic_stakeholders_link", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.Property<double>("ProgressToDateActual")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_actual");
+
+                    b.Property<double>("ProgressToDateCommitted")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_committed");
+
+                    b.Property<double>("TotalCommittedCost")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_committed_cost");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Stakeholders")
+                        .HasForeignKey("StrategicOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_stakeholders_link_strategic_opportunity_strategic");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Stakeholders");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20260226123152_AddMeasureGroupAndDeleteIsPrimaryFromStrategicOpportunityMeasure.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20260226123152_AddMeasureGroupAndDeleteIsPrimaryFromStrategicOpportunityMeasure.cs
new file mode 100644
index 0000000..60c0091
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20260226123152_AddMeasureGroupAndDeleteIsPrimaryFromStrategicOpportunityMeasure.cs
@@ -0,0 +1,47 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddMeasureGroupAndDeleteIsPrimaryFromStrategicOpportunityMeasure : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<byte>(
+                name: "measure_group",
+                table: "strategic_opportunity_measure",
+                type: "smallint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.Sql($"UPDATE strategic_opportunity_measure SET measure_group = {(byte)MeasureGroup.Primary} WHERE is_primary_measure = true");
+            migrationBuilder.Sql($"UPDATE strategic_opportunity_measure SET measure_group = {(byte)MeasureGroup.Secondary} WHERE is_primary_measure = false");
+
+            migrationBuilder.DropColumn(
+                name: "is_primary_measure",
+                table: "strategic_opportunity_measure");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "is_primary_measure",
+                table: "strategic_opportunity_measure",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.Sql($"UPDATE strategic_opportunity_measure SET is_primary_measure = true WHERE measure_group = {(byte)MeasureGroup.Primary}");
+            migrationBuilder.Sql($"UPDATE strategic_opportunity_measure SET is_primary_measure = false WHERE measure_group != {(byte)MeasureGroup.Primary}");
+
+            migrationBuilder.DropColumn(
+                name: "measure_group",
+                table: "strategic_opportunity_measure");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20260307052555_AddStrategicOpportunityGLTable.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20260307052555_AddStrategicOpportunityGLTable.Designer.cs
new file mode 100644
index 0000000..0b41bc3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20260307052555_AddStrategicOpportunityGLTable.Designer.cs
@@ -0,0 +1,1424 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20260307052555_AddStrategicOpportunityGLTable")]
+    partial class AddStrategicOpportunityGLTable
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<Guid>("CostLeaderGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("cost_leader_guid");
+
+                    b.Property<double>("EstimatedGoal")
+                        .HasColumnType("double precision")
+                        .HasColumnName("estimated_goal");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<Guid>("ExecutiveSponsorGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("executive_sponsor_guid");
+
+                    b.Property<DateTime?>("LastRunTrackingDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_run_tracking_date");
+
+                    b.Property<byte>("LastRunTrackingStatus")
+                        .HasColumnType("smallint")
+                        .HasColumnName("last_run_tracking_status");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<Guid>("OwnerGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_guid");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<string>("TeamMembers")
+                        .HasMaxLength(4000)
+                        .HasColumnType("character varying(4000)")
+                        .HasColumnName("team_members");
+
+                    b.Property<double>("TotalImprovement")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_improvement");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<double>("AverageValue")
+                        .HasColumnType("double precision")
+                        .HasColumnName("average_value");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<byte>("MeasureGroup")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_group");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.Property<long>("StrategicOpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("strategic_opportunity_id");
+
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_guid");
+
+                    b.HasKey("StrategicOpportunityId", "UserGuid")
+                        .HasName("pk_strategic_stakeholders_link");
+
+                    b.ToTable("strategic_stakeholders_link", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.Property<double>("ProgressToDateActual")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_actual");
+
+                    b.Property<double>("ProgressToDateCommitted")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_committed");
+
+                    b.Property<double>("TotalCommittedCost")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_committed_cost");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityGL", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<byte>("AccountType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("account_type");
+
+                    b.Property<string>("DepartmentHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("department_h_path");
+
+                    b.Property<string>("ExpenseAccountHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("expense_account_h_path");
+
+                    b.Property<bool>("HasStatistic")
+                        .HasColumnType("boolean")
+                        .HasColumnName("has_statistic");
+
+                    b.Property<string>("RevenueAccountHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("revenue_account_h_path");
+
+                    b.Property<string>("StatisticAccountHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("statistic_account_h_path");
+
+                    b.ToTable("strategic_opportunity_gl");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Stakeholders")
+                        .HasForeignKey("StrategicOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_stakeholders_link_strategic_opportunity_strategic");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityGL", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityGL", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_gl_strategic_opportunity_opportunity_");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Stakeholders");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20260307052555_AddStrategicOpportunityGLTable.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20260307052555_AddStrategicOpportunityGLTable.cs
new file mode 100644
index 0000000..e95b036
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20260307052555_AddStrategicOpportunityGLTable.cs
@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddStrategicOpportunityGLTable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "strategic_opportunity_gl",
+                columns: table => new
+                {
+                    opportunity_id = table.Column<long>(type: "bigint", nullable: false),
+                    account_type = table.Column<byte>(type: "smallint", nullable: false),
+                    department_h_path = table.Column<string>(type: "text", nullable: true),
+                    revenue_account_h_path = table.Column<string>(type: "text", nullable: true),
+                    expense_account_h_path = table.Column<string>(type: "text", nullable: true),
+                    statistic_account_h_path = table.Column<string>(type: "text", nullable: true),
+                    has_statistic = table.Column<bool>(type: "boolean", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_strategic_opportunity_gl", x => x.opportunity_id);
+                    table.ForeignKey(
+                        name: "fk_strategic_opportunity_gl_strategic_opportunity_opportunity_",
+                        column: x => x.opportunity_id,
+                        principalTable: "strategic_opportunity",
+                        principalColumn: "opportunity_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "strategic_opportunity_gl");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20260317201612_SeparateStrategicOpportunityTypes.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20260317201612_SeparateStrategicOpportunityTypes.Designer.cs
new file mode 100644
index 0000000..2b38b62
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20260317201612_SeparateStrategicOpportunityTypes.Designer.cs
@@ -0,0 +1,1424 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20260317201612_SeparateStrategicOpportunityTypes")]
+    partial class SeparateStrategicOpportunityTypes
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<Guid>("CostLeaderGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("cost_leader_guid");
+
+                    b.Property<double>("EstimatedGoal")
+                        .HasColumnType("double precision")
+                        .HasColumnName("estimated_goal");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<Guid>("ExecutiveSponsorGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("executive_sponsor_guid");
+
+                    b.Property<DateTime?>("LastRunTrackingDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_run_tracking_date");
+
+                    b.Property<byte>("LastRunTrackingStatus")
+                        .HasColumnType("smallint")
+                        .HasColumnName("last_run_tracking_status");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<Guid>("OwnerGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_guid");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<string>("TeamMembers")
+                        .HasMaxLength(4000)
+                        .HasColumnType("character varying(4000)")
+                        .HasColumnName("team_members");
+
+                    b.Property<double>("TotalImprovement")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_improvement");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<double>("AverageValue")
+                        .HasColumnType("double precision")
+                        .HasColumnName("average_value");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<byte>("MeasureGroup")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_group");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.Property<long>("StrategicOpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("strategic_opportunity_id");
+
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_guid");
+
+                    b.HasKey("StrategicOpportunityId", "UserGuid")
+                        .HasName("pk_strategic_stakeholders_link");
+
+                    b.ToTable("strategic_stakeholders_link", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.Property<double>("ProgressToDateActual")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_actual");
+
+                    b.Property<double>("ProgressToDateCommitted")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_committed");
+
+                    b.Property<double>("TotalCommittedCost")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_committed_cost");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityGL", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<byte>("AccountType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("account_type");
+
+                    b.Property<string>("DepartmentHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("department_h_path");
+
+                    b.Property<string>("ExpenseAccountHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("expense_account_h_path");
+
+                    b.Property<bool>("HasStatistic")
+                        .HasColumnType("boolean")
+                        .HasColumnName("has_statistic");
+
+                    b.Property<string>("RevenueAccountHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("revenue_account_h_path");
+
+                    b.Property<string>("StatisticAccountHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("statistic_account_h_path");
+
+                    b.ToTable("strategic_opportunity_gl");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Stakeholders")
+                        .HasForeignKey("StrategicOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_stakeholders_link_strategic_opportunity_strategic");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityGL", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityGL", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_gl_strategic_opportunity_opportunity_");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Stakeholders");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20260317201612_SeparateStrategicOpportunityTypes.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20260317201612_SeparateStrategicOpportunityTypes.cs
new file mode 100644
index 0000000..b226278
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20260317201612_SeparateStrategicOpportunityTypes.cs
@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class SeparateStrategicOpportunityTypes : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("UPDATE strategic_opportunity SET opportunity_type = 0 WHERE opportunity_type = 12;");
+            migrationBuilder.Sql("UPDATE strategic_opportunity SET opportunity_type = 1 WHERE opportunity_type = 13;");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("UPDATE strategic_opportunity SET opportunity_type = 12 WHERE opportunity_type = 0;");
+            migrationBuilder.Sql("UPDATE strategic_opportunity SET opportunity_type = 13 WHERE opportunity_type = 1;");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20260326165304_AddProgressColumnsToStrategicOpportunityGLTable.Designer.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20260326165304_AddProgressColumnsToStrategicOpportunityGLTable.Designer.cs
new file mode 100644
index 0000000..b237e43
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20260326165304_AddProgressColumnsToStrategicOpportunityGLTable.Designer.cs
@@ -0,0 +1,1436 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    [Migration("20260326165304_AddProgressColumnsToStrategicOpportunityGLTable")]
+    partial class AddProgressColumnsToStrategicOpportunityGLTable
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<Guid>("CostLeaderGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("cost_leader_guid");
+
+                    b.Property<double>("EstimatedGoal")
+                        .HasColumnType("double precision")
+                        .HasColumnName("estimated_goal");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<Guid>("ExecutiveSponsorGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("executive_sponsor_guid");
+
+                    b.Property<DateTime?>("LastRunTrackingDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_run_tracking_date");
+
+                    b.Property<byte>("LastRunTrackingStatus")
+                        .HasColumnType("smallint")
+                        .HasColumnName("last_run_tracking_status");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<Guid>("OwnerGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_guid");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<string>("TeamMembers")
+                        .HasMaxLength(4000)
+                        .HasColumnType("character varying(4000)")
+                        .HasColumnName("team_members");
+
+                    b.Property<double>("TotalImprovement")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_improvement");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<double>("AverageValue")
+                        .HasColumnType("double precision")
+                        .HasColumnName("average_value");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<byte>("MeasureGroup")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_group");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.Property<long>("StrategicOpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("strategic_opportunity_id");
+
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_guid");
+
+                    b.HasKey("StrategicOpportunityId", "UserGuid")
+                        .HasName("pk_strategic_stakeholders_link");
+
+                    b.ToTable("strategic_stakeholders_link", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.Property<double>("ProgressToDateActual")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_actual");
+
+                    b.Property<double>("ProgressToDateCommitted")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_committed");
+
+                    b.Property<double>("TotalCommittedCost")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_committed_cost");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityGL", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<byte>("AccountType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("account_type");
+
+                    b.Property<string>("DepartmentHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("department_h_path");
+
+                    b.Property<string>("ExpenseAccountHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("expense_account_h_path");
+
+                    b.Property<bool>("HasStatistic")
+                        .HasColumnType("boolean")
+                        .HasColumnName("has_statistic");
+
+                    b.Property<double>("ProgressToDateActual")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_actual");
+
+                    b.Property<double>("ProgressToDateCommitted")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_committed");
+
+                    b.Property<string>("RevenueAccountHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("revenue_account_h_path");
+
+                    b.Property<string>("StatisticAccountHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("statistic_account_h_path");
+
+                    b.Property<double>("TotalCommittedCost")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_committed_cost");
+
+                    b.ToTable("strategic_opportunity_gl");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Stakeholders")
+                        .HasForeignKey("StrategicOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_stakeholders_link_strategic_opportunity_strategic");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityGL", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityGL", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_gl_strategic_opportunity_opportunity_");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Stakeholders");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/20260326165304_AddProgressColumnsToStrategicOpportunityGLTable.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/20260326165304_AddProgressColumnsToStrategicOpportunityGLTable.cs
new file mode 100644
index 0000000..7937cf7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/20260326165304_AddProgressColumnsToStrategicOpportunityGLTable.cs
@@ -0,0 +1,51 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddProgressColumnsToStrategicOpportunityGLTable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<double>(
+                name: "total_committed_cost",
+                table: "strategic_opportunity_gl",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0);
+
+            migrationBuilder.AddColumn<double>(
+                name: "progress_to_date_committed",
+                table: "strategic_opportunity_gl",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0);
+
+            migrationBuilder.AddColumn<double>(
+                name: "progress_to_date_actual",
+                table: "strategic_opportunity_gl",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "total_committed_cost",
+                table: "strategic_opportunity_gl");
+
+            migrationBuilder.DropColumn(
+                name: "progress_to_date_committed",
+                table: "strategic_opportunity_gl");
+
+            migrationBuilder.DropColumn(
+                name: "progress_to_date_actual",
+                table: "strategic_opportunity_gl");
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Migrations/CentralDbContextModelSnapshot.cs b/src/Strata.ContinuousImprovement.Biz/Migrations/CentralDbContextModelSnapshot.cs
new file mode 100644
index 0000000..399c024
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Migrations/CentralDbContextModelSnapshot.cs
@@ -0,0 +1,1433 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+#nullable disable
+
+namespace Strata.ContinuousImprovement.Biz.Migrations
+{
+    [DbContext(typeof(CentralDbContext))]
+    partial class CentralDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.ClientWarehouses.ClientWarehouse", b =>
+                {
+                    b.Property<int>("ClientWarehouseId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_warehouse_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientWarehouseId"));
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("text")
+                        .HasColumnName("client_name");
+
+                    b.Property<Guid>("DatabaseGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("database_guid");
+
+                    b.Property<int>("WarehouseSize")
+                        .HasColumnType("integer")
+                        .HasColumnName("warehouse_size");
+
+                    b.HasKey("ClientWarehouseId")
+                        .HasName("pk_client_warehouses");
+
+                    b.HasIndex("DatabaseGuid")
+                        .IsUnique()
+                        .HasDatabaseName("ix_client_warehouses_database_guid");
+
+                    b.ToTable("client_warehouses", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierDimension", b =>
+                {
+                    b.Property<string>("DeviceIdentifier")
+                        .HasColumnType("text")
+                        .HasColumnName("device_identifier");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty1");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty2");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty3");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty4");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty5");
+
+                    b.Property<string>("GMDNAnatomicalSpecialty6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_anatomical_specialty6");
+
+                    b.Property<string>("GMDNDeviceFunction1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function1");
+
+                    b.Property<string>("GMDNDeviceFunction2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function2");
+
+                    b.Property<string>("GMDNDeviceFunction3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function3");
+
+                    b.Property<string>("GMDNDeviceFunction4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function4");
+
+                    b.Property<string>("GMDNDeviceFunction5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function5");
+
+                    b.Property<string>("GMDNDeviceFunction6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function6");
+
+                    b.Property<string>("GMDNDeviceFunction7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_device_function7");
+
+                    b.Property<string>("GMDNFeaturedAttributes1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes1");
+
+                    b.Property<string>("GMDNFeaturedAttributes2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_featured_attributes2");
+
+                    b.Property<string>("GMDNInvasiveness1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness1");
+
+                    b.Property<string>("GMDNInvasiveness2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_invasiveness2");
+
+                    b.Property<string>("GMDNMaterials1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials1");
+
+                    b.Property<string>("GMDNMaterials2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_materials2");
+
+                    b.Property<string>("GMDNNamesIndex1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index1");
+
+                    b.Property<string>("GMDNNamesIndex2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index2");
+
+                    b.Property<string>("GMDNNamesIndex3")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index3");
+
+                    b.Property<string>("GMDNNamesIndex4")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index4");
+
+                    b.Property<string>("GMDNNamesIndex5")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index5");
+
+                    b.Property<string>("GMDNNamesIndex6")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index6");
+
+                    b.Property<string>("GMDNNamesIndex7")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_names_index7");
+
+                    b.Property<string>("GMDNPower1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power1");
+
+                    b.Property<string>("GMDNPower2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_power2");
+
+                    b.Property<string>("GMDNTermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_code");
+
+                    b.Property<string>("GMDNTermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_definition");
+
+                    b.Property<string>("GMDNTermName")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_term_name");
+
+                    b.Property<string>("GMDNUseFrequency1")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency1");
+
+                    b.Property<string>("GMDNUseFrequency2")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_use_frequency2");
+
+                    b.Property<string>("GUDIDCompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("gudid_company_name");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("DeviceIdentifier")
+                        .HasName("pk_device_identifier_dimension");
+
+                    b.ToTable("device_identifier_dimension", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.DeviceIdentifierTerm", b =>
+                {
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<string>("CompanyName")
+                        .HasColumnType("text")
+                        .HasColumnName("company_name");
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("RowNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_number");
+
+                    b.HasKey("DeviceId", "PrimaryDI", "DeviceIdType");
+
+                    b.ToTable((string)null);
+
+                    b.ToView("device_identifier_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNCategory", b =>
+                {
+                    b.Property<int>("NodeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("node_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NodeId"));
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("text")
+                        .HasColumnName("definition");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.HasKey("NodeId")
+                        .HasName("pk_gmdn_categories");
+
+                    b.ToTable("gmdn_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTerm", b =>
+                {
+                    b.Property<int>("TermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TermId"));
+
+                    b.Property<string>("CreatedDate")
+                        .HasColumnType("text")
+                        .HasColumnName("created_date");
+
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("TermDefinition")
+                        .HasColumnType("text")
+                        .HasColumnName("term_definition");
+
+                    b.Property<string>("TermIsIVD")
+                        .HasColumnType("text")
+                        .HasColumnName("term_is_ivd");
+
+                    b.Property<string>("TermName")
+                        .HasColumnType("text")
+                        .HasColumnName("term_name");
+
+                    b.Property<string>("TermStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("term_status");
+
+                    b.HasKey("TermId")
+                        .HasName("pk_gmdn_terms");
+
+                    b.ToTable("gmdn_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GMDNTermCategory", b =>
+                {
+                    b.Property<string>("TermCode")
+                        .HasColumnType("text")
+                        .HasColumnName("term_code");
+
+                    b.Property<string>("CategoryCode")
+                        .HasColumnType("text")
+                        .HasColumnName("category_code");
+
+                    b.HasKey("TermCode", "CategoryCode")
+                        .HasName("pk_gmdn_term_categories");
+
+                    b.ToTable("gmdn_term_categories", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDDevice", b =>
+                {
+                    b.Property<string>("PrimaryDi")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)")
+                        .HasColumnName("primary_di");
+
+                    b.Property<string>("BrandName")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("brand_name");
+
+                    b.Property<string>("CatalogNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("catalog_number");
+
+                    b.Property<string>("CompanyName")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)")
+                        .HasColumnName("company_name");
+
+                    b.Property<bool>("DeviceCombinationProduct")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_combination_product");
+
+                    b.Property<DateTime?>("DeviceCommDistributionEndDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_comm_distribution_end_date");
+
+                    b.Property<string>("DeviceCommDistributionStatus")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("device_comm_distribution_status");
+
+                    b.Property<int?>("DeviceCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("device_count");
+
+                    b.Property<string>("DeviceDescription")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("device_description");
+
+                    b.Property<bool>("DeviceHctp")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_hctp");
+
+                    b.Property<bool>("DeviceKit")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_kit");
+
+                    b.Property<DateTime?>("DevicePublishDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("device_publish_date");
+
+                    b.Property<string>("DeviceRecordStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("device_record_status");
+
+                    b.Property<bool>("DeviceSterile")
+                        .HasColumnType("boolean")
+                        .HasColumnName("device_sterile");
+
+                    b.Property<bool>("DmExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dm_exempt");
+
+                    b.Property<bool>("DonationIdNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("donation_id_number");
+
+                    b.Property<string>("DunsNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("duns_number");
+
+                    b.Property<bool>("ExpirationDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("expiration_date");
+
+                    b.Property<bool>("LabeledContainsNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_contains_nrl");
+
+                    b.Property<bool>("LabeledNoNrl")
+                        .HasColumnType("boolean")
+                        .HasColumnName("labeled_no_nrl");
+
+                    b.Property<bool>("LotBatch")
+                        .HasColumnType("boolean")
+                        .HasColumnName("lot_batch");
+
+                    b.Property<bool>("ManufacturingDate")
+                        .HasColumnType("boolean")
+                        .HasColumnName("manufacturing_date");
+
+                    b.Property<string>("MriSafetyStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("mri_safety_status");
+
+                    b.Property<bool>("Otc")
+                        .HasColumnType("boolean")
+                        .HasColumnName("otc");
+
+                    b.Property<bool>("PremarketExempt")
+                        .HasColumnType("boolean")
+                        .HasColumnName("premarket_exempt");
+
+                    b.Property<string>("PublicDeviceRecordKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("public_device_record_key");
+
+                    b.Property<DateTime?>("PublicVersionDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("public_version_date");
+
+                    b.Property<int?>("PublicVersionNumber")
+                        .HasColumnType("integer")
+                        .HasColumnName("public_version_number");
+
+                    b.Property<string>("PublicVersionStatus")
+                        .HasMaxLength(12)
+                        .HasColumnType("character varying(12)")
+                        .HasColumnName("public_version_status");
+
+                    b.Property<bool>("Rx")
+                        .HasColumnType("boolean")
+                        .HasColumnName("rx");
+
+                    b.Property<bool>("SerialNumber")
+                        .HasColumnType("boolean")
+                        .HasColumnName("serial_number");
+
+                    b.Property<bool>("SingleUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("single_use");
+
+                    b.Property<bool>("SterilizationPriorToUse")
+                        .HasColumnType("boolean")
+                        .HasColumnName("sterilization_prior_to_use");
+
+                    b.Property<string>("VersionModelNumber")
+                        .HasMaxLength(80)
+                        .HasColumnType("character varying(80)")
+                        .HasColumnName("version_model_number");
+
+                    b.HasKey("PrimaryDi")
+                        .HasName("pk_gudid_devices");
+
+                    b.HasIndex("PrimaryDi")
+                        .HasDatabaseName("ix_gudid_devices_primary_di");
+
+                    b.HasIndex("PublicVersionDate")
+                        .HasDatabaseName("ix_gudid_devices_public_version_date");
+
+                    b.ToTable("gudid_devices", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDIdentifier", b =>
+                {
+                    b.Property<int>("GudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_deleted");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI")
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type");
+
+                    b.ToTable("gudid_identifiers", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.GUDIDTerm", b =>
+                {
+                    b.Property<int>("GUDIDTermId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("gudid_term_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GUDIDTermId"));
+
+                    b.Property<string>("GMDNCode")
+                        .HasColumnType("text")
+                        .HasColumnName("gmdn_code");
+
+                    b.Property<int>("GMDNCodeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("gmdn_code_status");
+
+                    b.Property<string>("GMDNPTDefinition")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("gmdnpt_definition");
+
+                    b.Property<string>("GMDNPTName")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)")
+                        .HasColumnName("gmdnpt_name");
+
+                    b.Property<bool>("Implantable")
+                        .HasColumnType("boolean")
+                        .HasColumnName("implantable");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("GUDIDTermId")
+                        .HasName("pk_gudid_terms");
+
+                    b.HasIndex("PrimaryDI")
+                        .HasDatabaseName("ix_gudid_terms_primary_di");
+
+                    b.ToTable("gudid_terms", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.GMDN.TmpGUDIDIdentifier", b =>
+                {
+                    b.Property<int>("TmpGudidIdentifierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("tmp_gudid_identifier_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TmpGudidIdentifierId"));
+
+                    b.Property<string>("ContainsDINumber")
+                        .HasColumnType("text")
+                        .HasColumnName("contains_di_number");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id");
+
+                    b.Property<string>("DeviceIdIssuingAgency")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_issuing_agency");
+
+                    b.Property<string>("DeviceIdType")
+                        .HasColumnType("text")
+                        .HasColumnName("device_id_type");
+
+                    b.Property<DateTime?>("PkgDiscontinueDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("pkg_discontinue_date");
+
+                    b.Property<int>("PkgQuantity")
+                        .HasColumnType("integer")
+                        .HasColumnName("pkg_quantity");
+
+                    b.Property<string>("PkgStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_status");
+
+                    b.Property<string>("PkgType")
+                        .HasColumnType("text")
+                        .HasColumnName("pkg_type");
+
+                    b.Property<string>("PrimaryDI")
+                        .HasColumnType("text")
+                        .HasColumnName("primary_di");
+
+                    b.HasKey("TmpGudidIdentifierId")
+                        .HasName("pk_gudid_identifiers");
+
+                    b.HasIndex("DeviceId", "PrimaryDI", "DeviceIdType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gudid_identifiers_device_id_primary_di_device_id_type1");
+
+                    b.ToTable("gudid_identifiers", "tmp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("NetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    b.Property<int>("AnalyticsWorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("analytics_workbook_id");
+
+                    b.Property<int>("IdentifiedSavings")
+                        .HasColumnType("integer")
+                        .HasColumnName("identified_savings");
+
+                    b.Property<string>("IdentifiedSavingsDescription")
+                        .HasColumnType("text")
+                        .HasColumnName("identified_savings_description");
+
+                    b.Property<int>("InitiativeStatus")
+                        .HasColumnType("integer")
+                        .HasColumnName("initiative_status");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_published");
+
+                    b.HasKey("StrataId", "NetworkOpportunityId")
+                        .HasName("pk_client_network_opportunities");
+
+                    b.HasIndex("NetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunities_network_opportunity_id");
+
+                    b.ToTable("client_network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.Property<int>("ClientNetworkOpportunityLinkId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_link_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ClientNetworkOpportunityLinkId"));
+
+                    b.Property<int?>("ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_network_opportunity_id");
+
+                    b.Property<int?>("ClientNetworkOpportunityStrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("client_network_opportunity_strata_id");
+
+                    b.Property<Guid>("ConfigurationGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("configuration_guid");
+
+                    b.Property<Guid>("InitiativeGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("initiative_guid");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.HasKey("ClientNetworkOpportunityLinkId")
+                        .HasName("pk_client_network_opportunity_links");
+
+                    b.HasIndex("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasDatabaseName("ix_client_network_opportunity_links_client_network_opportunity");
+
+                    b.ToTable("client_network_opportunity_links", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Property<int>("NetworkOpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("network_opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NetworkOpportunityId"));
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("WorkbookTemplateId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_template_id");
+
+                    b.HasKey("NetworkOpportunityId")
+                        .HasName("pk_network_opportunities");
+
+                    b.ToTable("network_opportunities", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityComments.Comment", b =>
+                {
+                    b.Property<int>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("comment_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CommentId"));
+
+                    b.Property<string>("Author")
+                        .HasColumnType("text")
+                        .HasColumnName("author");
+
+                    b.Property<DateTimeOffset>("CommentDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("comment_date");
+
+                    b.Property<string>("CommentText")
+                        .HasColumnType("text")
+                        .HasColumnName("comment_text");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("SourceOfSavingsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_of_savings_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("CommentId")
+                        .HasName("pk_comments");
+
+                    b.ToTable("comments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment.OpportunityRoleAssignment", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<Guid>("IdentityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("identity_guid");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text")
+                        .HasColumnName("identity_name");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_read");
+
+                    b.Property<bool>("IsSecureWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_secure_write");
+
+                    b.Property<bool>("IsWrite")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_write");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "IdentityGuid")
+                        .HasName("pk_opportunity_role_assignments");
+
+                    b.ToTable("opportunity_role_assignments", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks.OpportunityTypeWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("OpportunityType")
+                        .HasColumnType("integer")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityType", "WorkbookId")
+                        .HasName("pk_opportunity_type_workbooks");
+
+                    b.ToTable("opportunity_type_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.OpportunityWorkbooks.OpportunityWorkbook", b =>
+                {
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<Guid>("OpportunityGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("opportunity_guid");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.HasKey("StrataId", "OpportunityGuid", "WorkbookId")
+                        .HasName("pk_opportunity_workbooks");
+
+                    b.ToTable("opportunity_workbooks", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<bool>("IsExcluded")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_excluded");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_inclusion_exclusions");
+
+                    b.ToTable("exploration_inclusion_exclusions", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("ExplorationPopulationId"));
+
+                    b.Property<int>("CaseTypeFamilyId")
+                        .HasColumnType("integer")
+                        .HasColumnName("case_type_family_id");
+
+                    b.Property<short>("CodeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("code_type");
+
+                    b.Property<string>("CostDriver")
+                        .HasColumnType("text")
+                        .HasColumnName("cost_driver");
+
+                    b.Property<short>("CostExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("cost_exclusion_type");
+
+                    b.Property<decimal>("CostExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("cost_exclusion_value");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<short>("LosExclusionType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("los_exclusion_type");
+
+                    b.Property<decimal>("LosExclusionValue")
+                        .HasColumnType("numeric")
+                        .HasColumnName("los_exclusion_value");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<int>("TotalEncounters")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_encounters");
+
+                    b.Property<decimal>("TotalVariation")
+                        .HasColumnType("numeric")
+                        .HasColumnName("total_variation");
+
+                    b.HasKey("ExplorationPopulationId")
+                        .HasName("pk_exploration_populations");
+
+                    b.ToTable("exploration_populations", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<long>("EncounterId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("encounter_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("ExplorationPopulationId", "EncounterId")
+                        .HasName("pk_exploration_population_encounters");
+
+                    b.ToTable("exploration_population_encounters", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("OpportunityId"));
+
+                    b.Property<byte>("BaselineDistribution")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_distribution");
+
+                    b.Property<DateOnly>("BaselineEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_end_date");
+
+                    b.Property<DateOnly>("BaselineStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("baseline_start_date");
+
+                    b.Property<byte>("BaselineType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("baseline_type");
+
+                    b.Property<Guid>("CostLeaderGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("cost_leader_guid");
+
+                    b.Property<double>("EstimatedGoal")
+                        .HasColumnType("double precision")
+                        .HasColumnName("estimated_goal");
+
+                    b.Property<byte>("EstimatedTrackingDuration")
+                        .HasColumnType("smallint")
+                        .HasColumnName("estimated_tracking_duration");
+
+                    b.Property<Guid>("ExecutiveSponsorGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("executive_sponsor_guid");
+
+                    b.Property<DateTime?>("LastRunTrackingDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_run_tracking_date");
+
+                    b.Property<byte>("LastRunTrackingStatus")
+                        .HasColumnType("smallint")
+                        .HasColumnName("last_run_tracking_status");
+
+                    b.Property<string>("LayoutJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("layout_json");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<string>("OpportunityFiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("opportunity_filters_json");
+
+                    b.Property<byte>("OpportunityType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("opportunity_type");
+
+                    b.Property<Guid>("OwnerGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("owner_guid");
+
+                    b.Property<int>("Rollup1Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup1id");
+
+                    b.Property<int>("Rollup2Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup2id");
+
+                    b.Property<int>("Rollup3Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("rollup3id");
+
+                    b.Property<byte>("Status")
+                        .HasColumnType("smallint")
+                        .HasColumnName("status");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.Property<string>("TeamMembers")
+                        .HasMaxLength(4000)
+                        .HasColumnType("character varying(4000)")
+                        .HasColumnName("team_members");
+
+                    b.Property<double>("TotalImprovement")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_improvement");
+
+                    b.Property<DateOnly>("TrackingEndDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_end_date");
+
+                    b.Property<DateOnly>("TrackingStartDate")
+                        .HasColumnType("date")
+                        .HasColumnName("tracking_start_date");
+
+                    b.HasKey("OpportunityId")
+                        .HasName("pk_strategic_opportunity");
+
+                    b.ToTable("strategic_opportunity");
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.Property<long>("MeasureId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("measure_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("MeasureId"));
+
+                    b.Property<float>("AcceptableThreshold")
+                        .HasColumnType("real")
+                        .HasColumnName("acceptable_threshold");
+
+                    b.Property<double>("AverageValue")
+                        .HasColumnType("double precision")
+                        .HasColumnName("average_value");
+
+                    b.Property<byte>("DesiredResult")
+                        .HasColumnType("smallint")
+                        .HasColumnName("desired_result");
+
+                    b.Property<string>("FiltersJSON")
+                        .HasColumnType("text")
+                        .HasColumnName("filters_json");
+
+                    b.Property<byte>("MeasureGroup")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_group");
+
+                    b.Property<string>("MeasureName")
+                        .HasColumnType("text")
+                        .HasColumnName("measure_name");
+
+                    b.Property<byte>("MeasureType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("measure_type");
+
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("MeasureId")
+                        .HasName("pk_strategic_opportunity_measure");
+
+                    b.HasIndex("OpportunityId")
+                        .HasDatabaseName("ix_strategic_opportunity_measure_opportunity_id");
+
+                    b.ToTable("strategic_opportunity_measure", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<byte>("MonthNumber")
+                        .HasColumnType("smallint")
+                        .HasColumnName("month_number");
+
+                    b.Property<double>("Percentage")
+                        .HasColumnType("double precision")
+                        .HasColumnName("percentage");
+
+                    b.HasKey("OpportunityId", "MonthNumber")
+                        .HasName("pk_strategic_opportunity_ramp_up");
+
+                    b.ToTable("strategic_opportunity_ramp_up", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.Property<long>("OpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("opportunity_id");
+
+                    b.Property<int>("WorkbookId")
+                        .HasColumnType("integer")
+                        .HasColumnName("workbook_id");
+
+                    b.Property<int>("StrataId")
+                        .HasColumnType("integer")
+                        .HasColumnName("strata_id");
+
+                    b.HasKey("OpportunityId", "WorkbookId")
+                        .HasName("pk_strategic_opportunity_workbook");
+
+                    b.ToTable("strategic_opportunity_workbook", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.Property<long>("StrategicOpportunityId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("strategic_opportunity_id");
+
+                    b.Property<Guid>("UserGuid")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_guid");
+
+                    b.HasKey("StrategicOpportunityId", "UserGuid")
+                        .HasName("pk_strategic_stakeholders_link");
+
+                    b.ToTable("strategic_stakeholders_link", (string)null);
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<string>("ChargeCodeHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("charge_code_h_path");
+
+                    b.Property<long>("ExplorationPopulationId")
+                        .HasColumnType("bigint")
+                        .HasColumnName("exploration_population_id");
+
+                    b.Property<string>("PatientPopulationHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("patient_population_h_path");
+
+                    b.Property<double>("ProgressToDateActual")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_actual");
+
+                    b.Property<double>("ProgressToDateCommitted")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_committed");
+
+                    b.Property<double>("TotalCommittedCost")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_committed_cost");
+
+                    b.ToTable("strategic_opportunity_charge_code");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityGL", b =>
+                {
+                    b.HasBaseType("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity");
+
+                    b.Property<byte>("AccountType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("account_type");
+
+                    b.Property<string>("DepartmentHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("department_h_path");
+
+                    b.Property<string>("ExpenseAccountHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("expense_account_h_path");
+
+                    b.Property<bool>("HasStatistic")
+                        .HasColumnType("boolean")
+                        .HasColumnName("has_statistic");
+
+                    b.Property<double>("ProgressToDateActual")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_actual");
+
+                    b.Property<double>("ProgressToDateCommitted")
+                        .HasColumnType("double precision")
+                        .HasColumnName("progress_to_date_committed");
+
+                    b.Property<string>("RevenueAccountHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("revenue_account_h_path");
+
+                    b.Property<string>("StatisticAccountHPath")
+                        .HasColumnType("text")
+                        .HasColumnName("statistic_account_h_path");
+
+                    b.Property<double>("TotalCommittedCost")
+                        .HasColumnType("double precision")
+                        .HasColumnName("total_committed_cost");
+
+                    b.ToTable("strategic_opportunity_gl");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", "NetworkOpportunity")
+                        .WithMany("ClientNetworkOpportunities")
+                        .HasForeignKey("NetworkOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_client_network_opportunities_network_opportunities_network_");
+
+                    b.Navigation("NetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunityLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", "ClientNetworkOpportunity")
+                        .WithMany("Opportunities")
+                        .HasForeignKey("ClientNetworkOpportunityStrataId", "ClientNetworkOpportunityNetworkOpportunityId")
+                        .HasConstraintName("fk_client_network_opportunity_links_client_network_opportuniti");
+
+                    b.Navigation("ClientNetworkOpportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationInclusionExclusion", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationInclusionExclusions")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_inclusion_exclusions_exploration_populations_ex");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulationEncounter", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", "ExplorationPopulation")
+                        .WithMany("ExplorationPopulationEncounters")
+                        .HasForeignKey("ExplorationPopulationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_exploration_population_encounters_exploration_populations_e");
+
+                    b.Navigation("ExplorationPopulation");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityMeasure", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Measures")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_measure_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityRampUp", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("RampUps")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_ramp_up_strategic_opportunity_opportu");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityWorkbook", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Workbooks")
+                        .HasForeignKey("OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_workbook_strategic_opportunity_opport");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicStakeholdersLink", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", "Opportunity")
+                        .WithMany("Stakeholders")
+                        .HasForeignKey("StrategicOpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_stakeholders_link_strategic_opportunity_strategic");
+
+                    b.Navigation("Opportunity");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityChargeCode", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_charge_code_strategic_opportunity_opp");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityGL", b =>
+                {
+                    b.HasOne("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", null)
+                        .WithOne()
+                        .HasForeignKey("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunityGL", "OpportunityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_strategic_opportunity_gl_strategic_opportunity_opportunity_");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.ClientNetworkOpportunity", b =>
+                {
+                    b.Navigation("Opportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Network.NetworkOpportunity", b =>
+                {
+                    b.Navigation("ClientNetworkOpportunities");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.Population.ExplorationPopulation", b =>
+                {
+                    b.Navigation("ExplorationInclusionExclusions");
+
+                    b.Navigation("ExplorationPopulationEncounters");
+                });
+
+            modelBuilder.Entity("Strata.ContinuousImprovement.Biz.StrategicOpportunities.StrategicOpportunity", b =>
+                {
+                    b.Navigation("Measures");
+
+                    b.Navigation("RampUps");
+
+                    b.Navigation("Stakeholders");
+
+                    b.Navigation("Workbooks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunity.cs
new file mode 100644
index 0000000..ca02136
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunity.cs
@@ -0,0 +1,17 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Network;
+
+public class ClientNetworkOpportunity
+{
+    public int StrataId { get; set; }
+    public int IdentifiedSavings { get; set; }
+    public string IdentifiedSavingsDescription { get; set; }
+    public int AnalyticsWorkbookId { get; set; }
+    public int NetworkOpportunityId { get; set; }
+    public bool IsPublished { get; set; }
+    public InitiativeStatuses InitiativeStatus { get; set; } = InitiativeStatuses.OnHold;
+    public virtual NetworkOpportunity NetworkOpportunity { get; set; }
+    public virtual IEnumerable<ClientNetworkOpportunityLink> Opportunities { get; set; }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityLink.cs b/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityLink.cs
new file mode 100644
index 0000000..02dd88a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityLink.cs
@@ -0,0 +1,20 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Network;
+
+public class ClientNetworkOpportunityLink
+{
+    public int ClientNetworkOpportunityLinkId { get; set; }
+    public Guid ConfigurationGuid { get; set; }
+    public Guid OpportunityGuid { get; set; }
+    public Guid InitiativeGuid { get; set; }
+    [NotMapped]
+    public string Opportunity { get; set; }
+    [NotMapped]
+    public string CostDriver { get; set; }
+    [NotMapped]
+    public string Initiative { get; set; }
+
+    public virtual ClientNetworkOpportunity ClientNetworkOpportunity { get; set; }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityLinkExistsException.cs b/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityLinkExistsException.cs
new file mode 100644
index 0000000..f458117
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityLinkExistsException.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Network
+{
+    public class ClientNetworkOpportunityLinkExistsException : Exception
+    {
+        public ClientNetworkOpportunityLink ClientNetworkOpportunityLink;
+
+        public ClientNetworkOpportunityLinkExistsException() : base() { }
+
+        public ClientNetworkOpportunityLinkExistsException(string? message) : base(message) { }
+
+        public ClientNetworkOpportunityLinkExistsException(ClientNetworkOpportunityLink clientNetworkOpportunityLink)
+            : base()
+        {
+            ClientNetworkOpportunityLink = clientNetworkOpportunityLink;
+        }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityLinkNotFoundException.cs b/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityLinkNotFoundException.cs
new file mode 100644
index 0000000..da00850
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityLinkNotFoundException.cs
@@ -0,0 +1,25 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Network
+{
+    public class ClientNetworkOpportunityLinkNotFoundException : Exception
+    {
+
+        public int StrataId { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public Guid OpportunityGuid { get; set; }
+
+        public ClientNetworkOpportunityLinkNotFoundException() : base() { }
+
+        public ClientNetworkOpportunityLinkNotFoundException(string? message) : base(message) { }
+
+        public ClientNetworkOpportunityLinkNotFoundException(int strataId, Guid configurationGuid, Guid opportunityGuid)
+        {
+            StrataId = strataId;
+            ConfigurationGuid = configurationGuid;
+            OpportunityGuid = opportunityGuid;
+        }
+
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityLinkService.cs b/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityLinkService.cs
new file mode 100644
index 0000000..62f62b4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityLinkService.cs
@@ -0,0 +1,214 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Id.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Network
+{
+    public class ClientNetworkOpportunityLinkService : IClientNetworkOpportunityLinkService
+    {
+        private readonly CentralDbContext _centralDbContext;
+        private readonly IAllOpportunityService _allOpportunityService;
+        private readonly IInitiativeService _initiativeService;
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly ILogger<ClientNetworkOpportunityLinkService> _logger;
+
+        public ClientNetworkOpportunityLinkService(CentralDbContext centralDbContext,
+            IAllOpportunityService allOpportunityService,
+            IInitiativeService initiativeService,
+            IIdServiceClient idServiceClient,
+            ILogger<ClientNetworkOpportunityLinkService> logger)
+        {
+            _centralDbContext = centralDbContext;
+            _allOpportunityService = allOpportunityService;
+            _initiativeService = initiativeService;
+            _idServiceClient = idServiceClient;
+            _logger = logger;
+        }
+
+        public async Task<ClientNetworkOpportunityLink> AddOpportunityLinkAsync(Guid databaseGuid, int networkOpportunityId, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+
+            var clientNetworkOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                .Include(cno => cno.Opportunities)
+                .Include(cno => cno.NetworkOpportunity)
+                .SingleOrDefaultAsync(p => p.NetworkOpportunityId == networkOpportunityId && p.StrataId == strataId, cancellationToken);
+
+            var opportunity = await _allOpportunityService.GetById(opportunityGuid, cancellationToken);
+            if (opportunity == null)
+            {
+                throw new KeyNotFoundException("Opportunity not found");
+            }
+            var initiative = await _initiativeService.GetById(opportunity.InitiativeGuid, cancellationToken);
+
+            var clientOpportunityLink = clientNetworkOpportunity.Opportunities?.FirstOrDefault(opp => opp.OpportunityGuid == opportunityGuid);
+            if (clientOpportunityLink != null)
+            {
+                clientOpportunityLink.InitiativeGuid = opportunity.InitiativeGuid;
+                _centralDbContext.Update(clientOpportunityLink);
+            }
+            else
+            {
+                clientOpportunityLink = new ClientNetworkOpportunityLink
+                {
+                    ConfigurationGuid = opportunity.ConfigurationGuid,
+                    OpportunityGuid = opportunityGuid,
+                    InitiativeGuid = opportunity.InitiativeGuid,
+                    ClientNetworkOpportunity = clientNetworkOpportunity
+                };
+                clientOpportunityLink.ClientNetworkOpportunity.NetworkOpportunity = clientNetworkOpportunity.NetworkOpportunity;
+                await _centralDbContext.AddAsync(clientOpportunityLink, cancellationToken);
+            }
+            clientOpportunityLink.Opportunity = opportunity.Name;
+            clientOpportunityLink.CostDriver = opportunity.CostDriver;
+            clientOpportunityLink.Initiative = initiative?.Name ?? "";
+            clientOpportunityLink.OpportunityGuid = opportunityGuid;
+            clientOpportunityLink.InitiativeGuid = initiative?.InitiativeGUID ?? Guid.Empty;
+            await _centralDbContext.SaveChangesAsync();
+            return clientOpportunityLink;
+        }
+
+        public async Task<IEnumerable<ClientNetworkOpportunityLink>> RemoveDeletedOpportunityLinks(List<ClientNetworkOpportunityLink> opportunityLinks, CancellationToken cancellationToken)
+        {
+            if (opportunityLinks.IsEmpty()) { return opportunityLinks; }
+
+            var opportunities = (await _allOpportunityService.GetByIds(opportunityLinks.Select(ol => ol.OpportunityGuid), cancellationToken))
+                .ToDictionary(key => key.OpportunityGuid, value => value.InitiativeGuid);
+            var initiatives = opportunities.Where(o => o.Value != Guid.Empty).Select(o => o.Value);
+            var deletedLinks = opportunityLinks.Where(ol => !opportunities.Keys.Contains(ol.OpportunityGuid)
+            || (ol.InitiativeGuid != Guid.Empty && !initiatives.Contains(ol.InitiativeGuid)));
+            _centralDbContext.ClientNetworkOpportunityLinks.RemoveRange(deletedLinks);
+            await _centralDbContext.SaveChangesAsync();
+
+            opportunityLinks.RemoveAll(ol => !opportunities.Keys.Contains(ol.OpportunityGuid));
+            opportunityLinks.RemoveAll(ol => ol.InitiativeGuid != Guid.Empty && !initiatives.Contains(ol.InitiativeGuid));
+
+            return opportunityLinks;
+        }
+
+        public async Task<bool> ContainsOpportunityLinkAsync(Guid databaseGuid, Guid configurationGuid, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            ClientNetworkOpportunityLink clientNetworkOpportunityLink = await _centralDbContext.ClientNetworkOpportunityLinks
+                    .Include(cno => cno.ClientNetworkOpportunity)
+                    .FirstOrDefaultAsync(cnol => cnol.ClientNetworkOpportunity.StrataId == strataId
+                        && cnol.ConfigurationGuid == configurationGuid
+                        && cnol.OpportunityGuid == opportunityGuid, cancellationToken);
+            return clientNetworkOpportunityLink != null;
+        }
+
+        public async Task<bool> ContainsInitiativeLinkAsync(Guid databaseGuid, Guid configurationGuid, Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            var clientNetworkOpportunityLink = await _centralDbContext.ClientNetworkOpportunityLinks
+                .Include(cno => cno.ClientNetworkOpportunity).Where(cno => cno.ClientNetworkOpportunity.StrataId == strataId)
+                .FirstOrDefaultAsync(cnol => cnol.ConfigurationGuid == configurationGuid && cnol.InitiativeGuid == initiativeGuid, cancellationToken);
+            return clientNetworkOpportunityLink != null;
+        }
+
+        public async Task DeleteOpportunityLinkAsync(Guid databaseGuid, Guid configurationGuid, Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            var clientOpportunityLinks = await _centralDbContext.ClientNetworkOpportunityLinks
+                .Where(opp => opp.ClientNetworkOpportunity.StrataId == strataId
+                    && opp.ConfigurationGuid == configurationGuid
+                    && opp.OpportunityGuid == opportunityGuid)
+                .ToListAsync();
+            if (!clientOpportunityLinks.Any()) { return; }
+            _centralDbContext.RemoveRange(clientOpportunityLinks);
+            await _centralDbContext.SaveChangesAsync();
+        }
+
+        public async Task DeleteInitiativeLinkAsync(Guid databaseGuid, Guid configurationGuid, Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            var clientOpportunityLinks = await _centralDbContext.ClientNetworkOpportunityLinks
+                .Where(opp => opp.ClientNetworkOpportunity.StrataId == strataId
+                    && opp.ConfigurationGuid == configurationGuid
+                    && opp.InitiativeGuid == initiativeGuid)
+                .ToListAsync();
+            if (!clientOpportunityLinks.Any()) { return; }
+            foreach (var link in clientOpportunityLinks)
+            {
+                link.InitiativeGuid = Guid.Empty;
+            }
+            _centralDbContext.ClientNetworkOpportunityLinks.UpdateRange(clientOpportunityLinks);
+            await _centralDbContext.SaveChangesAsync();
+        }
+
+        public async Task<ClientNetworkOpportunityLink> RolloverOpportunityLinkAsync(Guid databaseGuid,
+            Guid sourceConfigurationGuid, Guid sourceOpportunityGuid,
+            Guid rolloverConfigurationGuid, Guid rolloverOpportunityGuid, Guid rolloverInitiativeGuid, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            var logInfo = new Dictionary<string, object>
+            {
+                { "Rollover Opportunity", new Dictionary<string, object>
+                    {
+                        { nameof(strataId), strataId},
+                        { nameof(sourceConfigurationGuid), sourceConfigurationGuid},
+                        { nameof(sourceOpportunityGuid), sourceOpportunityGuid},
+                        { nameof(rolloverConfigurationGuid), rolloverConfigurationGuid},
+                        { nameof(rolloverOpportunityGuid), rolloverOpportunityGuid},
+                        { nameof(rolloverInitiativeGuid), rolloverInitiativeGuid }
+                    }
+                }
+            };
+            _logger.LogServiceInformation(nameof(RolloverOpportunityLinkAsync) + " Started", logInfo);
+
+            var clientOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                .Include(cno => cno.NetworkOpportunity)
+                .Include(cno => cno.Opportunities)
+                .FirstOrDefaultAsync(cno => cno.StrataId == strataId
+                    && cno.Opportunities.Any(opp => opp.ConfigurationGuid == sourceConfigurationGuid && opp.OpportunityGuid == sourceOpportunityGuid));
+            if (!clientOpportunity.Opportunities.Any()) { throw new ClientNetworkOpportunityLinkNotFoundException(strataId, sourceConfigurationGuid, sourceOpportunityGuid); }
+
+            if ((await _allOpportunityService.GetById(sourceOpportunityGuid, cancellationToken)) == null)
+                throw new OpportunityNotFoundException(sourceOpportunityGuid);
+            var rolloverOpportunity = await _allOpportunityService.GetById(rolloverOpportunityGuid, cancellationToken);
+            if (rolloverOpportunity == null)
+                _logger.LogServiceError(new OpportunityNotFoundException(rolloverOpportunityGuid), info: logInfo);
+
+            var rolloverOpportunityLink = await _centralDbContext.ClientNetworkOpportunityLinks
+                .Include(link => link.ClientNetworkOpportunity)
+                .ThenInclude(cno => cno.NetworkOpportunity)
+                .FirstOrDefaultAsync(link =>
+                    link.ClientNetworkOpportunity.StrataId == strataId &&
+                    link.ConfigurationGuid == rolloverConfigurationGuid &&
+                    link.OpportunityGuid == rolloverOpportunityGuid, cancellationToken);
+            if (rolloverOpportunityLink != null) { throw new ClientNetworkOpportunityLinkExistsException(rolloverOpportunityLink); }
+
+            rolloverOpportunityLink = new ClientNetworkOpportunityLink
+            {
+                ConfigurationGuid = rolloverConfigurationGuid,
+                OpportunityGuid = rolloverOpportunityGuid,
+                InitiativeGuid = rolloverInitiativeGuid,
+                ClientNetworkOpportunity = clientOpportunity
+            };
+            rolloverOpportunityLink.ClientNetworkOpportunity.NetworkOpportunity = clientOpportunity.NetworkOpportunity;
+            try
+            {
+                await _centralDbContext.AddAsync(rolloverOpportunityLink, cancellationToken);
+                await _centralDbContext.SaveChangesAsync(cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, ex.Message, logInfo);
+                throw;
+            }
+            _logger.LogServiceInformation(nameof(RolloverOpportunityLinkAsync) + " Finished", logInfo);
+            return rolloverOpportunityLink;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityService.cs
new file mode 100644
index 0000000..41773d2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/ClientNetworkOpportunityService.cs
@@ -0,0 +1,418 @@
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using MoreLinq.Extensions;
+using Strata.Analytics.Client;
+using Strata.Analytics.Models.Templates.Publishing;
+using Strata.Analytics.Models.Utils;
+using Strata.Analytics.Models.Workbooks;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Id.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Network
+{
+    public class ClientNetworkOpportunityService : IClientNetworkOpportunityService
+    {
+        private readonly CentralDbContext _centralDbContext;
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly IAllOpportunityService _allOpportunityService;
+        private readonly IInitiativeService _initiativeService;
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly ICommentService _commentService;
+        private readonly IHubContext<NotificationHub, INotificationHub> _notificationHubContext;
+        private readonly ILogger<ClientNetworkOpportunityService> _logger;
+        private readonly IWorkbookService _workbookService;
+        private readonly IAnalyticsService _analyticsService;
+        private readonly INetworkOpportunityService _networkOpportunityService;
+
+        public ClientNetworkOpportunityService(CentralDbContext centralDbContext,
+                IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            IAllOpportunityService allOpportunityService,
+            IInitiativeService initiativeService,
+            IIdServiceClient idServiceClient, ICommentService commentService,
+            IHubContext<NotificationHub, INotificationHub> notificationHubContext,
+            ILogger<ClientNetworkOpportunityService> logger,
+            IWorkbookService workbookService,
+            IAnalyticsService analyticsService,
+            INetworkOpportunityService networkOpportunityService)
+        {
+            _centralDbContext = centralDbContext;
+            _dbContextFactory = dbContextFactory;
+            _allOpportunityService = allOpportunityService;
+            _initiativeService = initiativeService;
+            _idServiceClient = idServiceClient;
+            _commentService = commentService;
+            _notificationHubContext = notificationHubContext;
+            _logger = logger;
+            _workbookService = workbookService;
+            _analyticsService = analyticsService;
+            _networkOpportunityService = networkOpportunityService;
+        }
+
+        private async Task<JazzDbContext> GetDbContextAsync(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<bool> ContainsAsync(Guid databaseGuid, int networkOpportunityId, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            return await _centralDbContext.ClientNetworkOpportunities
+                .ContainsAsync(new ClientNetworkOpportunity() { StrataId = strataId, NetworkOpportunityId = networkOpportunityId }, cancellationToken);
+        }
+
+        public async Task<ClientNetworkOpportunity> GetByIdAsync(Guid databaseGuid, int networkOpportunityId, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            var networkOpportunity = await _centralDbContext.NetworkOpportunities
+                .Include(p => p.ClientNetworkOpportunities.Where(cno => cno.StrataId == strataId))
+                .ThenInclude(cno => cno.Opportunities)
+                .SingleOrDefaultAsync(opp => opp.NetworkOpportunityId == networkOpportunityId, cancellationToken);
+            var opportunityLinks = networkOpportunity.ClientNetworkOpportunities.SelectMany(cno => cno.Opportunities);
+            foreach (var link in opportunityLinks.Where(l => !l.InitiativeGuid.Equals(Guid.Empty)))
+            {
+                var opportunity = await _allOpportunityService.GetById(link.OpportunityGuid, cancellationToken);
+                if (opportunity != null)
+                {
+                    link.Opportunity = opportunity.Name;
+                    link.CostDriver = opportunity.CostDriver;
+                }
+                var initiative = await _initiativeService.GetById(link.InitiativeGuid, cancellationToken);
+                if (initiative != null)
+                {
+                    link.Initiative = initiative.Name;
+                }
+            }
+
+            // Create client opp if it doesn't exist
+            var clientNetworkOpportunity = networkOpportunity.ClientNetworkOpportunities
+                .SingleOrDefault(opp => opp.StrataId == strataId);
+
+            if (clientNetworkOpportunity == null)
+            {
+                clientNetworkOpportunity = new ClientNetworkOpportunity();
+                clientNetworkOpportunity.NetworkOpportunityId = networkOpportunityId;
+                clientNetworkOpportunity.NetworkOpportunity = networkOpportunity;
+                clientNetworkOpportunity.StrataId = strataId;
+
+                await _centralDbContext.ClientNetworkOpportunities.AddAsync(clientNetworkOpportunity, cancellationToken);
+                await _centralDbContext.SaveChangesAsync(cancellationToken);
+            }
+
+            // Create and link a workbook if not associated with one
+            if (clientNetworkOpportunity.AnalyticsWorkbookId == 0)
+            {
+                await CreateWorkbookFromTemplate(clientNetworkOpportunity, cancellationToken);
+            }
+            return clientNetworkOpportunity;
+        }
+
+        private async Task CreateWorkbookFromTemplate(ClientNetworkOpportunity clientNetworkOpportunity, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var template = await _analyticsService.GetTemplateAsync(clientNetworkOpportunity.NetworkOpportunity.WorkbookTemplateId, cancellationToken);
+                var createInfo = new TemplatePublishLocalInfo()
+                {
+                    Description = template.Description,
+                    Name = template.Name,
+					IsWorkbookHidden = true,
+				};
+                var clientWorkbook = await _analyticsService.PublishTemplateLocalAsync(clientNetworkOpportunity.NetworkOpportunity.WorkbookTemplateId, createInfo, cancellationToken);
+                clientNetworkOpportunity.AnalyticsWorkbookId = clientWorkbook.WorkbookId;
+
+                await _centralDbContext.SaveChangesAsync(cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                throw new CreateWorkbookFromTemplateException(ex.Message);
+            }
+        }
+
+        public async Task<bool> RevertWorkbookToTemplateAsync(Guid databaseGuid, ClientNetworkOpportunity clientNetworkOpportunity, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+                clientNetworkOpportunity.AnalyticsWorkbookId = 0;
+                await CreateWorkbookFromTemplate(clientNetworkOpportunity, cancellationToken);
+                await PublishAsync(databaseGuid, clientNetworkOpportunity, false, cancellationToken);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, "Failed to revert workbook to template");
+                return false;
+            }
+        }
+
+        public async Task<PagedApiResponse<NetworkOpportunitySummary>> GetOpportunitiesAsync(Guid databaseGuid, PagingOptions pagingOptions, NetworkOpportunityFilters filters, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+
+            var networkOpportunities = await _centralDbContext.NetworkOpportunities
+                .Include(o => o.ClientNetworkOpportunities.Where(o => o.StrataId == strataId))
+                .ThenInclude(o => o.Opportunities)
+                .DefaultIfEmpty().ToListAsync(cancellationToken);
+
+            var opportunitySummaries = new List<NetworkOpportunitySummary>();
+
+            networkOpportunities.ForEach(opportunity =>
+            {
+                var clientNetworkOpportunity = opportunity?.ClientNetworkOpportunities.SingleOrDefault();
+
+                if (clientNetworkOpportunity != null && clientNetworkOpportunity.IsPublished)
+                {
+                    var summary = new NetworkOpportunitySummary()
+                    {
+                        NetworkOpportunityId = opportunity.NetworkOpportunityId,
+                        Name = opportunity.Name,
+                        Description = opportunity.Description,
+                        CostDriver = opportunity.CostDriver,
+                        IdentifiedSavings = clientNetworkOpportunity.IdentifiedSavings,
+                        IsPublished = clientNetworkOpportunity.IsPublished,
+                        AnalyticsWorkbookId = clientNetworkOpportunity.AnalyticsWorkbookId,
+                        InitiativeStatus = clientNetworkOpportunity.InitiativeStatus,
+                        HasInitiative = clientNetworkOpportunity?.Opportunities?.Any(o => o.InitiativeGuid != Guid.Empty) ?? false
+                    };
+                    opportunitySummaries.Add(summary);
+                }
+            });
+
+            return opportunitySummaries.ToFilteredPagedList(pagingOptions, filters.GetFilters());
+
+        }
+
+        public async Task ConfigureAsync(Guid databaseGuid, int networkOpportunityId, ClientNetworkOpportunity clientOpportunity, NetworkOpportunitySaveModel networkOpportunity, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+
+            var existingOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                .SingleOrDefaultAsync(p => p.NetworkOpportunityId == networkOpportunityId && p.StrataId == strataId, cancellationToken);
+            try
+            {
+
+                if (existingOpportunity == null)
+                {
+                    await AddAsync(strataId, clientOpportunity, cancellationToken);
+                }
+                else
+                {
+                    await _networkOpportunityService.UpdateAsync(networkOpportunity, cancellationToken);
+                    await UpdateAsync(existingOpportunity, clientOpportunity, cancellationToken);
+                }
+            }
+            catch (Exception ex)
+            {
+
+                throw;
+            }
+        }
+
+        public async Task<ClientNetworkOpportunity> AddAsync(int strataId, ClientNetworkOpportunity opportunity, CancellationToken cancellationToken)
+        {
+            // Can't save without configuring savings
+            if (opportunity.IdentifiedSavings < 1) { return opportunity; }
+
+            var clientNetworkOpportunity = new ClientNetworkOpportunity();
+            clientNetworkOpportunity.NetworkOpportunityId = opportunity.NetworkOpportunityId;
+            clientNetworkOpportunity.IdentifiedSavings = opportunity.IdentifiedSavings;
+            clientNetworkOpportunity.IsPublished = opportunity.IsPublished;
+            clientNetworkOpportunity.AnalyticsWorkbookId = opportunity.AnalyticsWorkbookId;
+            clientNetworkOpportunity.StrataId = strataId;
+
+            await _centralDbContext.AddAsync(clientNetworkOpportunity);
+            await _centralDbContext.SaveChangesAsync(cancellationToken);
+
+            await RefreshNetworkOpportunityLinkAsync(clientNetworkOpportunity, cancellationToken);
+            return clientNetworkOpportunity;
+        }
+
+        public async Task UpdateAsync(ClientNetworkOpportunity targetOpportunity, ClientNetworkOpportunity opportunity, CancellationToken cancellationToken)
+        {
+            targetOpportunity.IdentifiedSavings = opportunity.IdentifiedSavings;
+            targetOpportunity.IdentifiedSavingsDescription = opportunity.IdentifiedSavingsDescription;
+            targetOpportunity.IsPublished = opportunity.IsPublished;
+            targetOpportunity.AnalyticsWorkbookId = opportunity.AnalyticsWorkbookId;
+
+            _centralDbContext.Update(targetOpportunity);
+            await _centralDbContext.SaveChangesAsync(cancellationToken);
+
+            await RefreshNetworkOpportunityLinkAsync(targetOpportunity, cancellationToken);
+        }
+
+        public async Task DeleteAsync(Guid databaseGuid, int networkOpportunityId, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            var networkOpportunity = await _centralDbContext.NetworkOpportunities
+                .Include(p => p.ClientNetworkOpportunities)
+                .SingleOrDefaultAsync(opp => opp.NetworkOpportunityId == networkOpportunityId, cancellationToken);
+
+            var clientNetworkOpportunity = networkOpportunity?.ClientNetworkOpportunities
+                .SingleOrDefault(opp => opp.StrataId == strataId)
+                ?? await _centralDbContext.ClientNetworkOpportunities
+                .SingleOrDefaultAsync(opp => opp.NetworkOpportunityId == networkOpportunityId && opp.StrataId == strataId, cancellationToken);
+
+            if (clientNetworkOpportunity == null) { return; }
+            _centralDbContext.Remove(clientNetworkOpportunity);
+            await _centralDbContext.SaveChangesAsync(cancellationToken);
+
+            var dbContext = await GetDbContextAsync(cancellationToken);
+            var nol = await dbContext.NetworkOpportunityLinks
+                .SingleOrDefaultAsync(nol => nol.OpportunityId == networkOpportunityId, cancellationToken);
+            if (nol != null)
+            {
+                dbContext.NetworkOpportunityLinks.Remove(nol);
+                await dbContext.SaveChangesAsync(cancellationToken);
+            }
+
+            await _commentService.DeleteCommentsAsync(databaseGuid, 10, networkOpportunityId, cancellationToken);
+        }
+
+        public async Task UpdateInitiativeStatusAsync(Guid databaseGuid, int networkOpportunityId, InitiativeStatuses status, CancellationToken cancellationToken)
+        {
+            var hubKey = databaseGuid.ToString() + networkOpportunityId;
+            var hub = _notificationHubContext.Clients.Group(hubKey);
+
+            try
+            {
+                var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+
+                var clientNetworkOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                    .SingleOrDefaultAsync(p => p.NetworkOpportunityId == networkOpportunityId && p.StrataId == strataId, cancellationToken);
+
+                clientNetworkOpportunity.InitiativeStatus = status;
+                var result = _centralDbContext.SaveChanges();
+                if (result > 0)
+                {
+                    await hub.SendInitiativeStatusChangeSuccess(hubKey);
+                }
+                else
+                {
+                    await hub.SendInitiativeStatusChangeError(hubKey);
+                }
+            }
+            catch (Exception ex)
+            {
+                await hub.SendInitiativeStatusChangeError(hubKey);
+            }
+        }
+
+        private async Task RefreshNetworkOpportunityLinkAsync(ClientNetworkOpportunity opportunity, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContextAsync(cancellationToken);
+            var isPublished = opportunity.IsPublished;
+            var nol = await dbContext.NetworkOpportunityLinks
+                .SingleOrDefaultAsync(nol => nol.OpportunityId == opportunity.NetworkOpportunityId, cancellationToken);
+            if (isPublished && nol == null)
+            {
+                await dbContext.NetworkOpportunityLinks.AddAsync(new NetworkOpportunityLink(opportunity), cancellationToken);
+                await dbContext.SaveChangesAsync(cancellationToken);
+            }
+            else if (nol != null)
+            {
+                dbContext.NetworkOpportunityLinks.Remove(nol);
+                await dbContext.SaveChangesAsync(cancellationToken);
+            }
+        }
+
+        public async Task<bool> PublishAsync(Guid databaseGuid, ClientNetworkOpportunity opportunity, bool isPublished, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            opportunity.IsPublished = isPublished;
+
+            var existingOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                .Include(cno => cno.NetworkOpportunity)
+                .SingleOrDefaultAsync(p => p.NetworkOpportunityId == opportunity.NetworkOpportunityId && p.StrataId == strataId, cancellationToken);
+            try
+            {
+                if (existingOpportunity == null)
+                {
+                    existingOpportunity = await AddAsync(strataId, opportunity, cancellationToken);
+                }
+                else
+                {
+                    await UpdateAsync(existingOpportunity, opportunity, cancellationToken);
+                }
+
+                Batch<WorkbookRoleAssignmentSaveInfo, Guid> roleAssignments = default;
+                if (isPublished)
+                {
+                    var dbContext = await GetDbContextAsync(cancellationToken);
+                    // Add CI basic user permissions to Workbook so they may view
+                    roleAssignments = await _workbookService.GetDefaultCIUserRoleAssignmentsAsync(dbContext, cancellationToken);
+                    await _analyticsService.SaveRoleAssignmentsAsync(existingOpportunity.AnalyticsWorkbookId, roleAssignments, cancellationToken);
+                }
+                else
+                {
+                    var workbookRoleAssignments = await _analyticsService.GetRoleAssignmentsAsync(existingOpportunity.AnalyticsWorkbookId, cancellationToken);
+                    roleAssignments = new Batch<WorkbookRoleAssignmentSaveInfo, Guid>
+                    {
+                        Deletes = workbookRoleAssignments.Select(wa => wa.IdentityGuid)
+                    };
+                    await _analyticsService.SaveRoleAssignmentsAsync(existingOpportunity.AnalyticsWorkbookId, roleAssignments, cancellationToken);
+                }
+
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        public async Task<IEnumerable<ClientOpportunityDto>> GetOpportunityNameByOpportunities(Guid databaseGuid, IEnumerable<Guid> opportunityGuids, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            return await _centralDbContext.ClientNetworkOpportunityLinks
+                .Include(opp => opp.ClientNetworkOpportunity)
+                .ThenInclude(cno => cno.NetworkOpportunity)
+                .Where(opp => opp.ClientNetworkOpportunity.StrataId == strataId && opportunityGuids.Contains(opp.OpportunityGuid))
+                .Select(opp => new ClientOpportunityDto
+                {
+                    OpportunityGuid = opp.OpportunityGuid,
+                    InitiativeGuid = opp.InitiativeGuid,
+                    Name = opp.ClientNetworkOpportunity.NetworkOpportunity.Name
+                }).ToListAsync();
+        }
+
+        public async Task<IEnumerable<ClientOpportunityDto>> GetOpportunityNameByInitiatives(Guid databaseGuid, IEnumerable<Guid> initiativeGuids, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            return await _centralDbContext.ClientNetworkOpportunityLinks
+                .Include(opp => opp.ClientNetworkOpportunity)
+                .ThenInclude(cno => cno.NetworkOpportunity)
+                .Where(opp => opp.ClientNetworkOpportunity.StrataId == strataId && initiativeGuids.Contains(opp.InitiativeGuid))
+                .Select(opp => new ClientOpportunityDto
+                {
+                    OpportunityGuid = opp.OpportunityGuid,
+                    InitiativeGuid = opp.InitiativeGuid,
+                    Name = opp.ClientNetworkOpportunity.NetworkOpportunity.Name
+                }).ToListAsync();
+        }
+    }
+
+    public class ClientOpportunityDto
+    {
+        public Guid OpportunityGuid { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/CreateWorkbookFromTemplateException.cs b/src/Strata.ContinuousImprovement.Biz/Network/CreateWorkbookFromTemplateException.cs
new file mode 100644
index 0000000..28883d5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/CreateWorkbookFromTemplateException.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Network
+{
+    public class CreateWorkbookFromTemplateException : Exception
+    {
+        public CreateWorkbookFromTemplateException() : base() { }
+
+        public CreateWorkbookFromTemplateException(string? message) : base(message) { }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/Filters/ClientNetworkOpportunityMapper.cs b/src/Strata.ContinuousImprovement.Biz/Network/Filters/ClientNetworkOpportunityMapper.cs
new file mode 100644
index 0000000..ea11801
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/Filters/ClientNetworkOpportunityMapper.cs
@@ -0,0 +1,18 @@
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Network.Filters
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class ClientNetworkOpportunityMapper
+    {
+        public static partial ClientNetworkOpportunity MappedtoClientOpportunity(this ClientNetworkOpportunityDto src);
+        public static partial NetworkOpportunitySaveModel MappedtoNetworkOpportunitySaveModel(this ClientNetworkOpportunityDto src);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/Filters/NetworkFilters.cs b/src/Strata.ContinuousImprovement.Biz/Network/Filters/NetworkFilters.cs
new file mode 100644
index 0000000..d3e6383
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/Filters/NetworkFilters.cs
@@ -0,0 +1,36 @@
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters
+{
+    public class NetworkOpportunityFilters
+    {
+        public string OpportunitySearch { get; set; }
+        public int? IdentifiedSavings { get; set; }
+        public InitiativeStatuses? InitiativeStatus { get; set; }
+
+
+        public List<Expression<Func<NetworkOpportunitySummary, bool>>> GetFilters()
+        {
+            var filters = new List<Expression<Func<NetworkOpportunitySummary, bool>>>();
+
+            if (!string.IsNullOrEmpty(OpportunitySearch))
+            {
+                var searchToLower = OpportunitySearch.ToLower();
+                filters.Add(m => m.Name.ToLower().Contains(searchToLower)
+                    || (m.Description != null && m.Description.ToLower().Contains(searchToLower)));
+            }
+
+            if (IdentifiedSavings is not null)
+                filters.Add(m => (m).IdentifiedSavings >= IdentifiedSavings);
+
+            if (InitiativeStatus is not null)
+                filters.Add(m => (m).InitiativeStatus.Equals(InitiativeStatus));
+
+            return filters;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/IClientNetworkOpportunityLinkService.cs b/src/Strata.ContinuousImprovement.Biz/Network/IClientNetworkOpportunityLinkService.cs
new file mode 100644
index 0000000..b355a70
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/IClientNetworkOpportunityLinkService.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Network
+{
+    public interface IClientNetworkOpportunityLinkService
+    {
+        Task<ClientNetworkOpportunityLink> AddOpportunityLinkAsync(Guid databaseGuid, int networkOpportunityId, Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<bool> ContainsOpportunityLinkAsync(Guid databaseGuid, Guid configurationGuid, Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<bool> ContainsInitiativeLinkAsync(Guid databaseGuid, Guid configurationGuid, Guid initiativeGuid, CancellationToken cancellationToken);
+        Task DeleteOpportunityLinkAsync(Guid databaseGuid, Guid configurationGuid, Guid opportunityGuid, CancellationToken cancellationToken);
+        Task DeleteInitiativeLinkAsync(Guid databaseGuid, Guid configurationGuid, Guid initiativeGuid, CancellationToken cancellationToken);
+        Task<IEnumerable<ClientNetworkOpportunityLink>> RemoveDeletedOpportunityLinks(List<ClientNetworkOpportunityLink> opportunityLinks, CancellationToken cancellationToken);
+        Task<ClientNetworkOpportunityLink> RolloverOpportunityLinkAsync(Guid databaseGuid,
+            Guid sourceConfigurationGuid, Guid sourceOpportunityGuid,
+            Guid rolloverConfigurationGuid, Guid rolloverOpportunityGuid, Guid rolloverInitiativeGuid, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/IClientNetworkOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/Network/IClientNetworkOpportunityService.cs
new file mode 100644
index 0000000..b8cfb0d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/IClientNetworkOpportunityService.cs
@@ -0,0 +1,27 @@
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Network
+{
+    public interface IClientNetworkOpportunityService
+    {
+        Task<bool> ContainsAsync(Guid databaseGuid, int networkOpportunityId, CancellationToken cancellationToken);
+        Task<PagedApiResponse<NetworkOpportunitySummary>> GetOpportunitiesAsync(Guid databaseGuid, PagingOptions pagingOptions, NetworkOpportunityFilters filters, CancellationToken cancellationToken);
+        Task<ClientNetworkOpportunity> GetByIdAsync(Guid databaseGuid, int networkOpportunityId, CancellationToken cancellationToken);
+        Task<bool> RevertWorkbookToTemplateAsync(Guid databaseGuid, ClientNetworkOpportunity networkOpportunityId, CancellationToken cancellationToken);
+        Task ConfigureAsync(Guid databaseGuid, int networkOpportunityId, ClientNetworkOpportunity clientOpportunity, NetworkOpportunitySaveModel networkOpportunity, CancellationToken cancellationToken);
+        Task UpdateInitiativeStatusAsync(Guid databaseGuid, int networkOpportunityId, InitiativeStatuses status, CancellationToken cancellationToken);
+        Task<ClientNetworkOpportunity> AddAsync(int strataId, ClientNetworkOpportunity opportunity, CancellationToken cancellationToken);
+        Task UpdateAsync(ClientNetworkOpportunity targetOpportunity, ClientNetworkOpportunity opportunity, CancellationToken cancellationToken);
+        Task DeleteAsync(Guid databaseGuid, int networkOpportunityId, CancellationToken cancellationToken);
+        Task<bool> PublishAsync(Guid databaseGuid, ClientNetworkOpportunity opportunity, bool isPublished, CancellationToken cancellationToken);
+        Task<IEnumerable<ClientOpportunityDto>> GetOpportunityNameByOpportunities(Guid databaseGuid, IEnumerable<Guid> opportunityGuids, CancellationToken cancellationToken);
+        Task<IEnumerable<ClientOpportunityDto>> GetOpportunityNameByInitiatives(Guid databaseGuid, IEnumerable<Guid> initiativeGuids, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/INetworkOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/Network/INetworkOpportunityService.cs
new file mode 100644
index 0000000..6273cda
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/INetworkOpportunityService.cs
@@ -0,0 +1,20 @@
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using System;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Network
+{
+    public interface INetworkOpportunityService
+    {
+        Task<bool> GetEnabledAsync(Guid databaseGuid, CancellationToken cancellationToken);
+        Task<PagedApiResponse<NetworkOpportunitySummary>> GetOpportunitiesAsync(ClaimsPrincipal user, PagingOptions pagingOptions, NetworkOpportunityFilters filters, CancellationToken cancellationToken);
+        Task<NetworkOpportunity> CreateAsync(NetworkOpportunitySaveModel opportunity, CancellationToken cancellationToken);
+        Task<NetworkOpportunity> GetbyIdAsync(int networkOpportunityid, CancellationToken cancellationToken);
+        Task UpdateAsync(NetworkOpportunitySaveModel model, CancellationToken cancellationToken);
+        Task<bool> DeleteAsync(int networkOpportunityId, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunity.cs
new file mode 100644
index 0000000..3528e50
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunity.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Strata.ContinuousImprovement.Biz.Network;
+
+public class NetworkOpportunity
+{
+    [Key]
+    [Required]
+    public int NetworkOpportunityId { get; set; }
+    public string Name { get; set; }
+    public string Description { get; set; }
+    public string CostDriver { get; set; }
+    public int WorkbookTemplateId { get; set; }
+
+    public virtual IList<ClientNetworkOpportunity> ClientNetworkOpportunities { get; set; }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunityLink.cs b/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunityLink.cs
new file mode 100644
index 0000000..6788893
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunityLink.cs
@@ -0,0 +1,32 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Network
+{
+    [Table("NetworkOpportunityLink", Schema = "cci")]
+    public class NetworkOpportunityLink
+    {
+        [Key] public Guid OpportunityGuid { get; set; }
+        public string Name { get; set; }
+        public double IdentifiedSavings { get; set; }
+        public bool IsHidden { get; set; }
+        public string Note { get; set; } = String.Empty;
+        public long OpportunityId { get; set; }
+
+        public NetworkOpportunityLink()
+        {
+
+        }
+
+        public NetworkOpportunityLink(ClientNetworkOpportunity clientNetworkOpportunity)
+        {
+            OpportunityGuid = Guid.NewGuid();
+            Name = clientNetworkOpportunity.NetworkOpportunity.Name;
+            OpportunityId = clientNetworkOpportunity.NetworkOpportunityId;
+            IdentifiedSavings = clientNetworkOpportunity.IdentifiedSavings;
+            IsHidden = false;
+            Note = "";
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunitySaveModel.cs b/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunitySaveModel.cs
new file mode 100644
index 0000000..6fa52f3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunitySaveModel.cs
@@ -0,0 +1,10 @@
+namespace Strata.ContinuousImprovement.Biz.Network;
+
+public class NetworkOpportunitySaveModel
+{
+    public int NetworkOpportunityId { get; set; }
+    public string Name { get; set; }
+    public string Description { get; set; }
+    public string CostDriver { get; set; }
+    public int WorkbookTemplateId { get; set; }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunitySection.cs b/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunitySection.cs
new file mode 100644
index 0000000..84107b0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunitySection.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Network
+{
+    public class NetworkOpportunitySection
+    {
+        public IList<string> Creators { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunityService.cs
new file mode 100644
index 0000000..02a02ae
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunityService.cs
@@ -0,0 +1,152 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.Analytics.Client;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.Id.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Network
+{
+    public class NetworkOpportunityService : INetworkOpportunityService
+    {
+        private readonly CentralDbContext _centralDbContext;
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly ICommentService _commentService;
+        private readonly IAnalyticsService _analyticsService;
+
+        public NetworkOpportunityService(CentralDbContext centralDbContext,
+               IIdServiceClient idServiceClient,
+               ICommentService commentService,
+               IAnalyticsService analyticsService)
+        {
+            _centralDbContext = centralDbContext;
+            _idServiceClient = idServiceClient;
+            _commentService = commentService;
+            _analyticsService = analyticsService;
+        }
+
+        public async Task<NetworkOpportunity> CreateAsync(NetworkOpportunitySaveModel opportunity, CancellationToken cancellationToken)
+        {
+            var newNetworkOpportunity = new NetworkOpportunity()
+            {
+                Name = opportunity.Name,
+                Description = opportunity.Description,
+                CostDriver = opportunity.CostDriver,
+                WorkbookTemplateId = opportunity.WorkbookTemplateId
+            };
+
+            await _centralDbContext.NetworkOpportunities.AddAsync(newNetworkOpportunity, cancellationToken);
+
+            await _centralDbContext.SaveChangesAsync(cancellationToken);
+            return newNetworkOpportunity;
+        }
+
+        public async Task<NetworkOpportunity> GetbyIdAsync(int networkOpportunityId, CancellationToken cancellationToken)
+        {
+            return await _centralDbContext.NetworkOpportunities
+                   .SingleOrDefaultAsync(p => p.NetworkOpportunityId == networkOpportunityId, cancellationToken);
+        }
+
+        public async Task<bool> GetEnabledAsync(Guid databaseGuid, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+            return await _centralDbContext.ClientNetworkOpportunities.AnyAsync(no => no.StrataId == strataId && no.IsPublished);
+        }
+
+        public async Task<PagedApiResponse<NetworkOpportunitySummary>> GetOpportunitiesAsync(ClaimsPrincipal user, PagingOptions pagingOptions, NetworkOpportunityFilters filters, CancellationToken cancellationToken)
+        {
+            var databaseGuid = ClaimsPrincipalExtensions.GetDatabaseGuid(user);
+            var strataId = await _idServiceClient.GetStrataId(databaseGuid, cancellationToken);
+
+            var opportunitySummaries = new List<NetworkOpportunitySummary>();
+            if (!_centralDbContext.NetworkOpportunities?.Any() ?? true)
+            {
+                return opportunitySummaries.ToFilteredPagedList(pagingOptions, filters.GetFilters());
+            }
+
+            var networkOpportunities = await _centralDbContext.NetworkOpportunities
+                                    .Include(o => o.ClientNetworkOpportunities)
+                                    .DefaultIfEmpty().ToListAsync(cancellationToken);
+
+            networkOpportunities?.ForEach(opportunity =>
+            {
+                var clientNetworkOpportunity =
+                    opportunity.ClientNetworkOpportunities.AsQueryable()
+                    .SingleOrDefault(opp => opp.StrataId == strataId);
+                var summary = new NetworkOpportunitySummary()
+                {
+                    NetworkOpportunityId = opportunity.NetworkOpportunityId,
+                    Name = opportunity.Name,
+                    Description = opportunity.Description,
+                    IdentifiedSavings = clientNetworkOpportunity?.IdentifiedSavings ?? 0,
+                    AnalyticsWorkbookId = clientNetworkOpportunity?.AnalyticsWorkbookId ?? 0,
+                    CostDriver = opportunity.CostDriver,
+                    IsPublished = clientNetworkOpportunity?.IsPublished ?? false,
+                    InitiativeStatus = clientNetworkOpportunity?.InitiativeStatus ?? InitiativeStatuses.OnHold,
+                    WorkbookTemplateId = opportunity.WorkbookTemplateId
+                };
+                opportunitySummaries.Add(summary);
+            });
+
+            return opportunitySummaries.ToFilteredPagedList(pagingOptions, filters.GetFilters());
+        }
+
+        public async Task UpdateAsync(NetworkOpportunitySaveModel saveModel, CancellationToken cancellationToken)
+        {
+            var networkOpportunity = await GetbyIdAsync(saveModel.NetworkOpportunityId, cancellationToken);
+            if (networkOpportunity != null)
+            {
+                networkOpportunity.Name = saveModel.Name;
+                networkOpportunity.Description = saveModel.Description;
+                networkOpportunity.CostDriver = saveModel.CostDriver;
+                networkOpportunity.WorkbookTemplateId = saveModel.WorkbookTemplateId;
+                await _centralDbContext.SaveChangesAsync(cancellationToken);
+            }
+        }
+
+        public async Task<bool> DeleteAsync(int networkOpportunityId, CancellationToken cancellationToken)
+        {
+            try
+            {
+                // delete network opportunity and all associated client network opps
+                var networkOpportunity = await _centralDbContext.NetworkOpportunities.Include(x => x.ClientNetworkOpportunities)
+                                        .SingleOrDefaultAsync(x => x.NetworkOpportunityId == networkOpportunityId);
+
+                if (networkOpportunity == null) { return false; }
+
+                // delete network and associated client network opps
+                _centralDbContext.Remove(networkOpportunity);
+                await _centralDbContext.SaveChangesAsync(cancellationToken);
+
+                // delete all associated workbooks & comments
+                if (networkOpportunity.ClientNetworkOpportunities != null)
+                {
+                    foreach (var client in networkOpportunity.ClientNetworkOpportunities)
+                    {
+                        await _analyticsService.DeleteWorkbookAsync(client.AnalyticsWorkbookId);
+
+                        var dbGuid = await _idServiceClient.GetDatabaseGUID(client.StrataId, cancellationToken);
+                        await _commentService.DeleteCommentsAsync(dbGuid, (int)OpportunityTypes.Network, networkOpportunityId, cancellationToken);
+                    }
+                }
+
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunitySummary.cs b/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunitySummary.cs
new file mode 100644
index 0000000..e72adf5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/NetworkOpportunitySummary.cs
@@ -0,0 +1,18 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+
+namespace Strata.ContinuousImprovement.Biz.Network;
+
+public class NetworkOpportunitySummary
+{
+    public int NetworkOpportunityId { get; set; }
+    public string OpportunityKey => "NET - " + NetworkOpportunityId;
+    public string Name { get; set; }
+    public string Description { get; set; }
+    public int IdentifiedSavings { get; set; }
+    public bool IsPublished { get; set; }
+    public InitiativeStatuses InitiativeStatus { get; set; }
+    public string CostDriver { get; set; }
+    public int AnalyticsWorkbookId { get; set; }
+    public bool HasInitiative { get; set; }
+    public int WorkbookTemplateId { get; set; }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Network/OpportunityNotFoundException.cs b/src/Strata.ContinuousImprovement.Biz/Network/OpportunityNotFoundException.cs
new file mode 100644
index 0000000..730d2d0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Network/OpportunityNotFoundException.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Network
+{
+    public class OpportunityNotFoundException : Exception
+    {
+        public Guid OpportunityGuid { get; set; }
+        public OpportunityNotFoundException(Guid opportunityGduid) : base()
+        {
+            OpportunityGuid = opportunityGduid;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Notification/INotificationHub.cs b/src/Strata.ContinuousImprovement.Biz/Notification/INotificationHub.cs
new file mode 100644
index 0000000..d086d06
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Notification/INotificationHub.cs
@@ -0,0 +1,38 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Notification
+{
+    /// <summary>
+    /// These are the SignalR notifications sent to the react client
+    /// </summary>
+    public interface INotificationHub
+    {
+        Task SendOpportunityCreate(string opportunityName);
+        Task SendInitiativeCreate(string opportunityName);
+        Task SendOpportunityCreateDetails(string opportunityName, double progress);
+        Task SendOpportunityCreateError(string opportunityName, string optionalMessage = "");
+        Task SendOpportunityUpdate(string opportunityName);
+        Task SendOpportunityUpdateDetails(string opportunityName, double progress);
+        Task SendOpportunityUpdateSuccess(Guid opportunityGuid, string opportunityName);
+        Task SendOpportunityCreateUpdateSuccess(Guid opportunityGuid, bool isTempoPage, string opportunityName, bool isUpdate, OpportunityTypes opportunityType);
+        Task SendInitiativeCreateSuccess(Guid opportunityGuid, string opportunityName);
+        Task SendOpportunityUpdateError(string opportunityName, string optionalMessage = "");
+        Task SendUploadFileStart(string userName, string filename);
+        Task SendUploadFileFinish(string userName, string filename);
+        Task SendUploadFileError(string userName, string filename);
+        Task SendInitiativeStatusChangeSuccess(string key);
+        Task SendInitiativeStatusChangeError(string key);
+        Task SendPatientPopulationCaseTypeCreateSuccess(string key, string count);
+        Task SendPatientPopulationCaseTypeAlreadyExist(string key, string count);
+        Task SendPatientPopulationCaseTypeCreateError(string key);
+        Task SendExplorationOpportunityCreateSuccess(string key, string opportunityName, string opportunityGuid);
+        Task SendExplorationOpportunityCreateError(string key, string opportunityName);
+        Task SendNetworkOpportunityPublish(string opportunityName, bool isPublished);
+        Task SendNetworkOpportunityPublishSuccess(string opportunityName, bool isPublished);
+        Task SendNetworkOpportunityPublishError(string opportunityName, bool isPublished);
+        Task SendStrategicInitiativeTrackerSuccess(string key, byte trackingStatus, DateTime? trackingDate);
+        Task SendStrategicInitiativeTrackerError(string key, byte? trackingStatus, DateTime? trackingDate);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Notification/NotificationHub.cs b/src/Strata.ContinuousImprovement.Biz/Notification/NotificationHub.cs
new file mode 100644
index 0000000..1ab4927
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Notification/NotificationHub.cs
@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.SignalR;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Notification
+{
+    public class NotificationHub : Hub<INotificationHub>
+    {
+        public async Task Register(string topic)
+        {
+            await Groups.AddToGroupAsync(Context.ConnectionId, topic);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityComments/Comment.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityComments/Comment.cs
new file mode 100644
index 0000000..307606a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityComments/Comment.cs
@@ -0,0 +1,17 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityComments
+{
+    public class Comment
+    {
+        [Key]
+        public int CommentId { get; set; }
+        public int StrataId { get; set; }
+        public int SourceOfSavingsId { get; set; }
+        public long OpportunityId { get; set; }
+        public string CommentText { get; set; } = string.Empty;
+        public DateTimeOffset CommentDate { get; set; }
+        public string Author { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityComments/CommentService.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityComments/CommentService.cs
new file mode 100644
index 0000000..5150cc4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityComments/CommentService.cs
@@ -0,0 +1,73 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.Id.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityComments
+{
+    public class CommentService : ICommentService
+    {
+        private readonly CentralDbContext _centralDbContext;
+        private readonly IIdServiceClient _idServiceClient;
+
+        public CommentService(
+            CentralDbContext centralDbContext,
+            IIdServiceClient idServiceClient)
+        {
+            _centralDbContext = centralDbContext;
+            _idServiceClient = idServiceClient;
+        }
+
+        public async Task<IEnumerable<Comment>> GetCommentsAsync(Guid databaseGuid, int opportunityType, long opportunityId, CancellationToken cancellationToken)
+        {
+            var strataId = databaseGuid != Guid.Empty
+                ? await _idServiceClient.GetStrataId(databaseGuid, cancellationToken)
+                : 0;
+            return await _centralDbContext.Comments
+                .Where(x => x.StrataId == strataId && x.SourceOfSavingsId == opportunityType && x.OpportunityId == opportunityId)
+                .OrderByDescending(x => x.CommentDate).ThenBy(x => x.Author).ToListAsync();
+        }
+
+        public async Task<Comment> AddCommentAsync(Guid databaseGuid, int oppportunityType, long opportunityId, string commentText, DateTimeOffset? commentDate, string author, CancellationToken cancellationToken)
+        {
+            var strataId = databaseGuid != Guid.Empty
+                ? await _idServiceClient.GetStrataId(databaseGuid, cancellationToken)
+                : 0;
+            var dateOfComment = commentDate?.UtcDateTime ?? DateTimeOffset.Now.UtcDateTime;
+            var lastComment = await _centralDbContext.Comments
+                .Where(c => c.StrataId == strataId && c.SourceOfSavingsId == oppportunityType && c.OpportunityId == opportunityId && c.Author == author)
+                .OrderByDescending(c => c.CommentDate)
+                .FirstOrDefaultAsync(c => c.CommentText == commentText && c.CommentDate.Date == new DateTimeOffset(dateOfComment.Date).Date);
+            if (lastComment != null) return lastComment;
+            var comment = new Comment
+            {
+                StrataId = strataId,
+                SourceOfSavingsId = oppportunityType,
+                OpportunityId = opportunityId,
+                CommentDate = dateOfComment,
+                CommentText = commentText,
+                Author = author
+            };
+            _centralDbContext.Comments.Add(comment);
+            await _centralDbContext.SaveChangesAsync(cancellationToken);
+            return comment;
+        }
+
+        public async Task DeleteCommentsAsync(Guid databaseGuid, int oppportunityType, long opportunityId, CancellationToken cancellationToken)
+        {
+            var strataId = databaseGuid != Guid.Empty
+                ? await _idServiceClient.GetStrataId(databaseGuid, cancellationToken)
+                : 0;
+            var comments = await _centralDbContext.Comments
+                .Where(x => x.StrataId == strataId && x.SourceOfSavingsId == oppportunityType && x.OpportunityId == opportunityId)
+                .ToListAsync(cancellationToken);
+            if (!comments.Any()) { return; }
+            _centralDbContext.RemoveRange(comments);
+            await _centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityComments/ICommentService.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityComments/ICommentService.cs
new file mode 100644
index 0000000..3607495
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityComments/ICommentService.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityComments
+{
+    public interface ICommentService
+    {
+        Task<IEnumerable<Comment>> GetCommentsAsync(Guid databaseGuid, int opportunityType, long opportunityId, CancellationToken cancellationToken);
+        Task<Comment> AddCommentAsync(Guid databaseGuid, int oppportunityType, long opportunityId, string commentText, DateTimeOffset? commentDate, string author, CancellationToken cancellationToken);
+        Task DeleteCommentsAsync(Guid databaseGuid, int oppportunityType, long opportunityId, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityRoleAssignment/IOpportunityRoleAssignmentService.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityRoleAssignment/IOpportunityRoleAssignmentService.cs
new file mode 100644
index 0000000..264c1f1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityRoleAssignment/IOpportunityRoleAssignmentService.cs
@@ -0,0 +1,16 @@
+using Strata.Authorization;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment
+{
+    public interface IOpportunityRoleAssignmentService
+    {
+        Task AddPermissionsFromDefaultsAsync(long opportunityId, CancellationToken cancellationToken);
+        Task<IEnumerable<OpportunityRoleAssignmentView>> GetRoleAssignmentsAsync(long opportunityId, CancellationToken cancellationToken);
+        Task<RoleAssignmentView> GetUserRoleAssignmentsAsync(long opportunityId, CancellationToken cancellationToken);
+        Task<bool> SaveRoleAssignmentsAsync(long opportunityId, List<OpportunityRoleAssignmentView> permissionSettings, CancellationToken cancellationToken);
+        Task CopyTo(long fromOpportunityId, long toOpportunityId, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityRoleAssignment/OpportunityRoleAssignment.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityRoleAssignment/OpportunityRoleAssignment.cs
new file mode 100644
index 0000000..da68c66
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityRoleAssignment/OpportunityRoleAssignment.cs
@@ -0,0 +1,50 @@
+using Strata.ContinuousImprovement.Biz.Security;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment
+{
+    public class OpportunityRoleAssignment
+    {
+        public int StrataId { get; set; }
+        public long OpportunityId { get; set; }
+        public Guid IdentityGuid { get; set; }
+        public string IdentityName { get; set; } = string.Empty;
+        public bool IsRead { get; set; }
+        public bool IsWrite { get; set; }
+        public bool IsSecureWrite { get; set; }
+
+        public OpportunityRoleAssignment() { }
+        public OpportunityRoleAssignment(OpportunityRoleAssignmentView roleAssignment, int strataId) 
+        { 
+            StrataId = strataId;
+            OpportunityId = roleAssignment.LootId;
+            IdentityGuid = roleAssignment.IdentityGuid;
+            IdentityName = roleAssignment.IdentityName;
+            IsRead = roleAssignment.CanRead;
+            IsWrite = roleAssignment.CanWrite;
+            IsSecureWrite = roleAssignment.CanSecure;
+        }
+
+        public OpportunityRoleAssignment(SimplePermission permission, long opportunityId, int strataId)
+        {
+            StrataId = strataId;
+            OpportunityId = opportunityId;
+            IdentityGuid = permission.IdentityGUID;
+            IdentityName = permission.IdentityName;
+            IsRead = permission.ReadValue;
+            IsWrite = permission.WriteValue;
+            IsSecureWrite = permission.SecureValue;
+        }
+
+        public OpportunityRoleAssignment(OpportunityRoleAssignment role, long opportunityId)
+        {
+            StrataId = role.StrataId;
+            OpportunityId = opportunityId;
+            IdentityGuid = role.IdentityGuid;
+            IdentityName = role.IdentityName;
+            IsRead = role.IsRead;
+            IsWrite = role.IsWrite;
+            IsSecureWrite = role.IsSecureWrite;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityRoleAssignment/OpportunityRoleAssignmentService.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityRoleAssignment/OpportunityRoleAssignmentService.cs
new file mode 100644
index 0000000..658ee4e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityRoleAssignment/OpportunityRoleAssignmentService.cs
@@ -0,0 +1,124 @@
+using IdentityModel;
+using Microsoft.EntityFrameworkCore;
+using MoreLinq;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Security;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.Id.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment
+{
+    public class OpportunityRoleAssignmentService : IOpportunityRoleAssignmentService
+    {
+        private readonly CentralDbContext _dbContext;
+        private readonly ClaimsPrincipal _user;
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly ISimpleSecurityService _simpleSecurityService;
+        private readonly Guid _dbGuid;
+
+        public OpportunityRoleAssignmentService(
+            CentralDbContext dbContext,
+            IIdServiceClient idServiceClient,
+            ISimpleSecurityService simpleSecurityService,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor)
+        {
+            _dbContext = dbContext;
+            _idServiceClient = idServiceClient;
+            _simpleSecurityService = simpleSecurityService;
+            _user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+            _dbGuid = claimsPrincipalAccessor.GetDatabaseGuid();
+
+        }
+        public async Task AddPermissionsFromDefaultsAsync(long opportunityId, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(_dbGuid, cancellationToken);
+
+            var defaultPermissions = await _simpleSecurityService.GetSimplePermissionDefaults(SecurableEntityType.Opportunity, cancellationToken);
+            _dbContext.OpportunityRoleAssignments.AddRange(defaultPermissions.Select(item => new OpportunityRoleAssignment(item, opportunityId, strataId)));
+
+            await _dbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task<IEnumerable<OpportunityRoleAssignmentView>> GetRoleAssignmentsAsync(long opportunityId, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(_dbGuid, cancellationToken);
+            var roleAssignments = await _dbContext.OpportunityRoleAssignments.Where(p => p.OpportunityId == opportunityId && p.StrataId == strataId).OrderBy(item => item.IdentityName).Select(item => new OpportunityRoleAssignmentView(item)).ToListAsync(cancellationToken);
+
+            return roleAssignments;
+        }
+
+        public async Task<RoleAssignmentView> GetUserRoleAssignmentsAsync(long opportunityId, CancellationToken cancellationToken)
+        {
+            if (_user.IsSdtEmployee())
+            {
+                var sdtRole = new RoleAssignmentView();
+                sdtRole.CanRead = true;
+                sdtRole.CanWrite = true;
+                sdtRole.CanSecure = true;
+
+                return sdtRole;
+            }
+
+            var strataId = await _idServiceClient.GetStrataId(_dbGuid, cancellationToken);
+            var userGroups = _user.Claims
+                .Where(c => c.Type == JwtClaimTypes.Role)
+                .Select(c => c.Value);
+            var role = await _dbContext.OpportunityRoleAssignments
+                .Where(r => r.OpportunityId == opportunityId && r.StrataId == strataId && (r.IdentityGuid.Equals(_user.GetUserGuid()) || userGroups.Contains(r.IdentityName)))
+                .GroupBy(r => new { r.OpportunityId })
+                .Select(role => new RoleAssignmentView()
+                {
+                    CanRead = role.Any(r => r.IsRead),
+                    CanWrite = role.Any(r => r.IsWrite),
+                    CanSecure = role.Any(r => r.IsSecureWrite)
+                }).FirstOrDefaultAsync(cancellationToken);
+
+            return role;
+        }
+
+        public async Task<bool> SaveRoleAssignmentsAsync(long opportunityId, List<OpportunityRoleAssignmentView> permissionSettings, CancellationToken cancellationToken)
+        {
+            var strataId = await _idServiceClient.GetStrataId(_dbGuid, cancellationToken);
+            var existingAssignments = await _dbContext.OpportunityRoleAssignments.Where(p => p.OpportunityId == opportunityId && p.StrataId == strataId).ToListAsync(cancellationToken);
+
+            var newRoleAssigments = permissionSettings.Where(item => !existingAssignments.Exists(assignment => assignment.IdentityGuid == item.IdentityGuid)).ToList();
+            var deleteRoleAssigments = existingAssignments.Where(item => !permissionSettings.Exists(assignment => assignment.IdentityGuid == item.IdentityGuid));
+            var updateRoleAssigments = existingAssignments.Where(item => permissionSettings.Exists(assignment => assignment.IdentityGuid == item.IdentityGuid));
+
+            updateRoleAssigments.ForEach(item =>
+            {
+                var updatedItem = permissionSettings.FirstOrDefault(role => role.IdentityGuid == item.IdentityGuid);
+                item.IsRead = updatedItem.CanRead;
+                item.IsWrite = updatedItem.CanWrite;
+                item.IsSecureWrite = updatedItem.CanSecure;
+            });
+
+            _dbContext.OpportunityRoleAssignments.AddRange(newRoleAssigments.Select(item => new OpportunityRoleAssignment(item, strataId)));
+            _dbContext.OpportunityRoleAssignments.RemoveRange(deleteRoleAssigments);
+            _dbContext.OpportunityRoleAssignments.UpdateRange(updateRoleAssigments);
+
+            var result = await _dbContext.SaveChangesAsync(cancellationToken);
+            return result > 0;
+        }
+
+        public async Task CopyTo(long fromOpportunityId, long toOpportunityId, CancellationToken cancellationToken)
+        {
+            var roleAssignments = await _dbContext.OpportunityRoleAssignments.Where(role => role.OpportunityId == fromOpportunityId).ToListAsync(cancellationToken);
+
+            if (roleAssignments.Any())
+            {
+                var newRoleAssignments = roleAssignments.Select(role => new OpportunityRoleAssignment(role, toOpportunityId));
+                _dbContext.OpportunityRoleAssignments.AddRange(newRoleAssignments);
+                await _dbContext.SaveChangesAsync(cancellationToken);
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityRoleAssignment/OpportunityRoleAssignmentView.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityRoleAssignment/OpportunityRoleAssignmentView.cs
new file mode 100644
index 0000000..1a18381
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityRoleAssignment/OpportunityRoleAssignmentView.cs
@@ -0,0 +1,30 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment
+{
+    public class OpportunityRoleAssignmentView : RoleAssignmentView
+    {
+        public long LootId { get; set; }
+        public Guid IdentityGuid { get; set; }
+        public string IdentityName { get; set; }
+
+        public OpportunityRoleAssignmentView() { }
+        public OpportunityRoleAssignmentView(OpportunityRoleAssignment roleAssignment)
+        {
+            LootId = roleAssignment.OpportunityId;
+            IdentityGuid = roleAssignment.IdentityGuid;
+            IdentityName = roleAssignment.IdentityName;
+            CanRead = roleAssignment.IsRead;
+            CanWrite = roleAssignment.IsWrite;
+            CanSecure = roleAssignment.IsSecureWrite;
+        }
+
+    }
+
+    public class RoleAssignmentView
+    {
+        public bool CanRead { get; set; }
+        public bool CanWrite { get; set; }
+        public bool CanSecure { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityTypeWorkbooks/IOpportunityTypeWorkbookService.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityTypeWorkbooks/IOpportunityTypeWorkbookService.cs
new file mode 100644
index 0000000..acd1140
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityTypeWorkbooks/IOpportunityTypeWorkbookService.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks
+{
+    public interface IOpportunityTypeWorkbookService
+    {
+        Task<bool> ContainsAsync(int opportunityType, int workbookId, CancellationToken cancellationToken);
+        Task<IEnumerable<OpportunityTypeWorkbook>> GetOpportunityTypeWorkbooksAsync(int opportunityType, CancellationToken cancellationToken);
+        Task<IEnumerable<OpportunityTypeWorkbook>> CreateOpportunityTypeWorkbooksAsync(IEnumerable<OpportunityTypeWorkbook> opportunityTypeWorkbooks, CancellationToken cancellationToken);
+        Task DeleteAsync(int opportunityType, int workbookId, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityTypeWorkbooks/OpportunityTypeWorkbook.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityTypeWorkbooks/OpportunityTypeWorkbook.cs
new file mode 100644
index 0000000..7dc5c1e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityTypeWorkbooks/OpportunityTypeWorkbook.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks
+{
+    public class OpportunityTypeWorkbook
+    {
+        public int StrataId { get; set; }
+        public int OpportunityType { get; set; }
+        public int WorkbookId { get; set; }
+        [NotMapped]
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityTypeWorkbooks/OpportunityTypeWorkbookService.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityTypeWorkbooks/OpportunityTypeWorkbookService.cs
new file mode 100644
index 0000000..6f4cf2c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityTypeWorkbooks/OpportunityTypeWorkbookService.cs
@@ -0,0 +1,84 @@
+using ClosedXML.Excel;
+using Microsoft.EntityFrameworkCore;
+using MoreLinq;
+using Strata.Analytics.Client;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks
+{
+    public class OpportunityTypeWorkbookService : IOpportunityTypeWorkbookService
+    {
+        private readonly CentralDbContext _centralDbContext;
+        private readonly IAnalyticsService _analyticsService;
+        private readonly ClaimsPrincipal _user;
+
+        public OpportunityTypeWorkbookService(CentralDbContext centralDbContext,
+               IAnalyticsService analyticsService,
+               IClaimsPrincipalAccessor claimsPrincipalAccessor)
+        {
+            _centralDbContext = centralDbContext;
+            _analyticsService = analyticsService;
+            _user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+        }
+
+        public async Task<bool> ContainsAsync(int opportunityType, int workbookId, CancellationToken cancellationToken)
+        {
+            return await _centralDbContext.OpportunityTypeWorkbooks.ContainsAsync(new OpportunityTypeWorkbook()
+            {
+                StrataId = _user.GetStrataId(),
+                OpportunityType = opportunityType,
+                WorkbookId = workbookId
+            }, cancellationToken);
+        }
+
+        public async Task<IEnumerable<OpportunityTypeWorkbook>> GetOpportunityTypeWorkbooksAsync(int opportunityType, CancellationToken cancellationToken)
+        {
+            var strataId = _user.GetStrataId();
+            var opportunityTypeWorkbooks = await _centralDbContext.OpportunityTypeWorkbooks
+                .Where(ow => ow.StrataId == strataId && ow.OpportunityType == opportunityType)
+                .ToListAsync(cancellationToken);
+
+            // get workbook names
+            var workbooks = await _analyticsService.GetWorkbooksAsync(false, cancellationToken);
+            var existingOpportunityTypeWorkbooks = new List<OpportunityTypeWorkbook>();
+            foreach (var opportunityTypeWorkbook in opportunityTypeWorkbooks)
+            {
+                // ignore deleted workbooks for now
+                var workbookName = workbooks.FirstOrDefault(x => x.StrataId == strataId && x.WorkbookId == opportunityTypeWorkbook.WorkbookId)?.Name;
+                if (workbookName != null)
+                {
+                    opportunityTypeWorkbook.Name = workbookName;
+                    existingOpportunityTypeWorkbooks.Add(opportunityTypeWorkbook);
+                }
+            }
+
+            return existingOpportunityTypeWorkbooks;
+        }
+
+        public async Task<IEnumerable<OpportunityTypeWorkbook>> CreateOpportunityTypeWorkbooksAsync(IEnumerable<OpportunityTypeWorkbook> opportunityTypeWorkbooks, CancellationToken cancellationToken)
+        {
+            var strataId = _user.GetStrataId();
+            opportunityTypeWorkbooks.ForEach(x => x.StrataId = strataId);
+            await _centralDbContext.OpportunityTypeWorkbooks.AddRangeAsync(opportunityTypeWorkbooks, cancellationToken);
+            await _centralDbContext.SaveChangesAsync();
+            return opportunityTypeWorkbooks;
+        }
+
+        public async Task DeleteAsync(int opportunityType, int workbookId, CancellationToken cancellationToken)
+        {
+            var opportunityTypeWorkbook = await _centralDbContext.OpportunityTypeWorkbooks
+                        .Where(x => x.StrataId == _user.GetStrataId() &&
+                            x.OpportunityType == opportunityType &&
+                            x.WorkbookId == workbookId).SingleOrDefaultAsync();
+            _centralDbContext.Remove(opportunityTypeWorkbook);
+            await _centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityWorkbooks/IOpportunityWorkbook.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityWorkbooks/IOpportunityWorkbook.cs
new file mode 100644
index 0000000..40248ea
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityWorkbooks/IOpportunityWorkbook.cs
@@ -0,0 +1,8 @@
+namespace Strata.ContinuousImprovement.Biz.OpportunityWorkbooks
+{
+    internal interface IOpportunityWorkbook
+    {
+        public int WorkbookId { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityWorkbooks/IOpportunityWorkbookService.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityWorkbooks/IOpportunityWorkbookService.cs
new file mode 100644
index 0000000..7a2479e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityWorkbooks/IOpportunityWorkbookService.cs
@@ -0,0 +1,23 @@
+using Strata.Analytics.Models.Workbooks;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityWorkbooks
+{
+    public interface IOpportunityWorkbookService
+    {
+        Task<bool> ContainsAsync(Guid opportunityGuid, int workbookId, CancellationToken cancellationToken);
+        Task<IEnumerable<Workbook>> GetAllOpportunityWorkbooksAsync(bool isHidden, CancellationToken cancellationToken);
+        Task<IEnumerable<OpportunityWorkbook>> GetOpportunityWorkbooksAsync(Guid opportunityGuid, CancellationToken cancellationToken);
+        Task<IEnumerable<OpportunityWorkbook>> CreateOpportunityWorkbooksAsync(IEnumerable<OpportunityWorkbook> opportunityWorkbooks, CancellationToken cancellationToken);
+        Task DeleteAsync(Guid opportunityGuid, int workbookId, CancellationToken cancellationToken);
+        Task<bool> ContainsStrategicAsync(long opportunityId, int workbookId, CancellationToken cancellationToken);
+        Task<IEnumerable<StrategicOpportunityWorkbookDto>> GetStrategicOpportunityWorkbooksAsync(long opportunityId, CancellationToken cancellationToken);
+        Task<IEnumerable<StrategicOpportunityWorkbookDto>> CreateStrategicOpportunityWorkbooksAsync(IEnumerable<StrategicOpportunityWorkbook> opportunityWorkbooks, CancellationToken cancellationToken);
+        Task DeleteStrategicOpportunityAsync(long opportunityId, int workbookId, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityWorkbooks/OpportunityWorkbook.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityWorkbooks/OpportunityWorkbook.cs
new file mode 100644
index 0000000..cd08b07
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityWorkbooks/OpportunityWorkbook.cs
@@ -0,0 +1,15 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityWorkbooks
+{
+    public class OpportunityWorkbook : IOpportunityWorkbook, IWithStrataId
+    {
+        public int StrataId { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        public int WorkbookId { get; set; }
+        [NotMapped]
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OpportunityWorkbooks/OpportunityWorkbookService.cs b/src/Strata.ContinuousImprovement.Biz/OpportunityWorkbooks/OpportunityWorkbookService.cs
new file mode 100644
index 0000000..0d54244
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OpportunityWorkbooks/OpportunityWorkbookService.cs
@@ -0,0 +1,148 @@
+using ClosedXML.Excel;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Strata.Analytics.Client;
+using Strata.Analytics.Models.Workbooks;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OpportunityWorkbooks
+{
+    public class OpportunityWorkbookService(
+       CentralDbContext centralDbContext,
+       IAnalyticsService analyticsService,
+       IClaimsPrincipalAccessor claimsPrincipalAccessor,
+       ILogger<OpportunityWorkbookService> logger) : IOpportunityWorkbookService
+    {
+        private readonly ClaimsPrincipal _user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+
+        public async Task<bool> ContainsAsync(Guid opportunityGuid, int workbookId, CancellationToken cancellationToken)
+        {
+            return await centralDbContext.OpportunityWorkbooks
+                                           .ContainsAsync(new OpportunityWorkbook()
+                                           {
+                                               StrataId = _user.GetStrataId(),
+                                               WorkbookId = workbookId,
+                                               OpportunityGuid = opportunityGuid
+                                           }, cancellationToken);
+        }
+
+        public async Task<IEnumerable<Workbook>> GetAllOpportunityWorkbooksAsync(bool isHidden, CancellationToken cancellationToken)
+        {
+            return await analyticsService.GetWorkbooksAsync(isHidden, cancellationToken);
+        }
+
+        public async Task<IEnumerable<OpportunityWorkbook>> GetOpportunityWorkbooksAsync(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var strataId = _user.GetStrataId();
+            var opportunityWorkbooks = await centralDbContext.OpportunityWorkbooks
+                .Where(ow => ow.StrataId == strataId && ow.OpportunityGuid == opportunityGuid)
+                .ToListAsync(cancellationToken);
+            var existingOpportunityWorkbooks = await GetWorkbooksWithName(strataId, opportunityWorkbooks, cancellationToken);
+
+            return existingOpportunityWorkbooks;
+        }
+
+        public async Task<IEnumerable<OpportunityWorkbook>> CreateOpportunityWorkbooksAsync(IEnumerable<OpportunityWorkbook> opportunityWorkbooks, CancellationToken cancellationToken)
+        {
+            return await AddWorkbooks(opportunityWorkbooks, cancellationToken);
+        }
+
+        public async Task DeleteAsync(Guid opportunityGuid, int workbookId, CancellationToken cancellationToken)
+        {
+            var opportunityWorkbook = await centralDbContext.OpportunityWorkbooks
+                        .Where(x => x.StrataId == _user.GetStrataId() &&
+                            x.OpportunityGuid == opportunityGuid &&
+                            x.WorkbookId == workbookId).SingleOrDefaultAsync();
+            await RemoveWorkbook(opportunityWorkbook, cancellationToken);
+        }
+
+        #region Strategic Workbooks
+
+        public async Task<bool> ContainsStrategicAsync(long opportunityId, int workbookId, CancellationToken cancellationToken)
+        {
+            return await centralDbContext.StrategicOpportunityWorkbooks
+                                           .AnyAsync(wb => wb.WorkbookId == workbookId && wb.OpportunityId == opportunityId, cancellationToken);
+        }
+
+        public async Task<IEnumerable<StrategicOpportunityWorkbookDto>> GetStrategicOpportunityWorkbooksAsync(long opportunityId, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var strataId = _user.GetStrataId();
+                var opportunity = centralDbContext.StrategicOpportunities.Include(s => s.Workbooks)
+                    .FirstOrDefault(so => so.StrataId == strataId && so.OpportunityId == opportunityId);
+
+                var existingOpportunityWorkbooks = await GetWorkbooksWithName(strataId, opportunity.Workbooks.ToList(), cancellationToken);
+
+                return existingOpportunityWorkbooks.Select(wb => wb.MapToStrategicOpportunityWorkbookDto());
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex);
+                throw;
+            }
+        }
+
+        public async Task<IEnumerable<StrategicOpportunityWorkbookDto>> CreateStrategicOpportunityWorkbooksAsync(IEnumerable<StrategicOpportunityWorkbook> opportunityWorkbooks, CancellationToken cancellationToken)
+        {
+            return (await AddWorkbooks(opportunityWorkbooks, cancellationToken)).Select(wb => wb.MapToStrategicOpportunityWorkbookDto());
+        }
+
+        public async Task DeleteStrategicOpportunityAsync(long opportunityId, int workbookId, CancellationToken cancellationToken)
+        {
+            var opportunityWorkbook = await centralDbContext.StrategicOpportunityWorkbooks
+                        .Where(x => x.OpportunityId == opportunityId &&
+                            x.WorkbookId == workbookId).SingleOrDefaultAsync();
+            await RemoveWorkbook(opportunityWorkbook, cancellationToken);
+        }
+
+        #endregion
+
+        private async Task<List<T>> GetWorkbooksWithName<T>(int strataId, List<T> opportunityWorkbooks, CancellationToken cancellationToken) where T : IOpportunityWorkbook
+        {
+            // get workbook names
+            var workbooks = await analyticsService.GetWorkbooksAsync(false, cancellationToken);
+            var existingOpportunityWorkbooks = new List<T>();
+            foreach (var opportunityWorkbook in opportunityWorkbooks)
+            {
+                // ignore deleted workbooks for now
+                var workbookName = workbooks.FirstOrDefault(x => x.StrataId == strataId && x.WorkbookId == opportunityWorkbook.WorkbookId)?.Name;
+                if (workbookName != null)
+                {
+                    opportunityWorkbook.Name = workbookName;
+                    existingOpportunityWorkbooks.Add(opportunityWorkbook);
+                }
+            }
+
+            return existingOpportunityWorkbooks;
+        }
+
+        private async Task<IEnumerable<T>> AddWorkbooks<T>(IEnumerable<T> opportunityWorkbooks, CancellationToken cancellationToken) where T : class, IWithStrataId
+        {
+            var strataId = _user.GetStrataId();
+            opportunityWorkbooks.ForEach(x => x.StrataId = strataId);
+            await centralDbContext.Set<T>().AddRangeAsync(opportunityWorkbooks, cancellationToken);
+            await centralDbContext.SaveChangesAsync();
+            return opportunityWorkbooks;
+        }
+
+        private async Task RemoveWorkbook<T>(T opportunityWorkbook, CancellationToken cancellationToken) where T : class
+        {
+            centralDbContext.Set<T>().Remove(opportunityWorkbook);
+            await centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OrgDefined/IOpportunityMetricBase.cs b/src/Strata.ContinuousImprovement.Biz/OrgDefined/IOpportunityMetricBase.cs
new file mode 100644
index 0000000..47cfdc0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OrgDefined/IOpportunityMetricBase.cs
@@ -0,0 +1,19 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.OrgDefined
+{
+    public interface IOpportunityMetricBase
+    {
+        int EncounterGroup { get; }
+        IEnumerable<int> CaseTypeIds { get; }
+        IEnumerable<int> PatientPopulationIds { get; }
+        IEnumerable<int> ChargeCodeIds { get; }
+        string OpportunityLevel { get; set; }
+        bool IsBaseline { get; set; }
+        IEnumerable<int> OpportunityLevelIds { get; }
+        string OpportunityLevelIdAsCSV { get; }
+        OpportunityLevel OpportunityLevelEnum { get; }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OrgDefined/IOpportunityMetricCohortService.cs b/src/Strata.ContinuousImprovement.Biz/OrgDefined/IOpportunityMetricCohortService.cs
new file mode 100644
index 0000000..1bc7af9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OrgDefined/IOpportunityMetricCohortService.cs
@@ -0,0 +1,14 @@
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.OrgDefined.Queries;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OrgDefined
+{
+    public interface IOpportunityMetricCohortService
+    {
+        Task<IEnumerable<OpportunityMetricCohortData>> GetChargeCodeOpportunityMetricCohortData(Configuration.Configuration configuration, IOpportunityMetricBase data, string innerJoin, CancellationToken cancellationToken);
+        Task<IEnumerable<OpportunityMetricCohortData>> GetEncounterOpportunityMetricCohortData(Configuration.Configuration configuration, IOpportunityMetricBase data, string innerJoin, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/OrgDefined/OpportunityMetricCohortService.cs b/src/Strata.ContinuousImprovement.Biz/OrgDefined/OpportunityMetricCohortService.cs
new file mode 100644
index 0000000..97c7049
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OrgDefined/OpportunityMetricCohortService.cs
@@ -0,0 +1,65 @@
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.OrgDefined.Queries;
+using Strata.ContinuousImprovement.Biz.Settings;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OrgDefined
+{
+    public class OpportunityMetricCohortService : IOpportunityMetricCohortService
+    {
+        protected readonly ISettingsService _settingsService;
+        protected readonly IAsyncDbContextFactory<JazzDbContext> _jazzDbContextFactory;
+        protected readonly ISnowflakeDatabaseContext _snowflakeDatabaseContext;
+        protected readonly ILogger<OpportunityMetricCohortService> _logger;
+
+        public OpportunityMetricCohortService(
+            ISettingsService settingsService,
+            IAsyncDbContextFactory<JazzDbContext> jazzDbContextFactory,
+            ISnowflakeDatabaseContext snowflakeDatabaseContext,
+            ILogger<OpportunityMetricCohortService> logger)
+        {
+            _settingsService = settingsService;
+            _jazzDbContextFactory = jazzDbContextFactory;
+            _snowflakeDatabaseContext = snowflakeDatabaseContext;
+            _logger = logger;
+        }
+        public async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _jazzDbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<IEnumerable<OpportunityMetricCohortData>> GetEncounterOpportunityMetricCohortData(Configuration.Configuration configuration, IOpportunityMetricBase data, string innerJoin, CancellationToken cancellationToken)
+            => await GetOpportunityMetricCohortData(configuration, data, innerJoin, Generics.OpportunityTypes.Encounter, cancellationToken);
+
+        public async Task<IEnumerable<OpportunityMetricCohortData>> GetChargeCodeOpportunityMetricCohortData(Configuration.Configuration configuration, IOpportunityMetricBase data, string innerJoin, CancellationToken cancellationToken)
+            => await GetOpportunityMetricCohortData(configuration, data, innerJoin, Generics.OpportunityTypes.ChargeCode, cancellationToken);
+
+        internal async Task<IEnumerable<OpportunityMetricCohortData>> GetOpportunityMetricCohortData(Configuration.Configuration configuration, IOpportunityMetricBase data, string innerJoin, Generics.OpportunityTypes opportunityType, CancellationToken cancellationToken)
+        {
+            await using var jazzDbContext = GetDbContext(cancellationToken).Result;
+            var queryBuilder = OpportunityMetricCohortQueryBase.GetOpportunityMetricQuery(configuration, data, opportunityType, _settingsService, jazzDbContext);
+            var query = await queryBuilder.GetSnowflakeSqlTemplate(innerJoin, cancellationToken);
+            var startDate = data.IsBaseline
+                ? configuration.GetBaselineStartDate(opportunityType)
+                : configuration.GetTrackingStartDate(opportunityType);
+            var endDate = data.IsBaseline
+                ? configuration.GetBaselineEndDate(opportunityType)
+                : configuration.GetTrackingEndDate();
+
+            var queryParams = new
+            {
+                IsBaseline = data.IsBaseline,
+                startDate = $"{startDate:yyyy-MM-dd}",
+                endDate = $"{endDate:yyyy-MM-dd}"
+            };
+            var results = await _snowflakeDatabaseContext.QueryAsync<OpportunityMetricCohortData>(query, "Opportunity-Metric-Cohort", queryParams);
+            return results;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/IOpportunityMetricCohortQueryBase.cs b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/IOpportunityMetricCohortQueryBase.cs
new file mode 100644
index 0000000..124bca8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/IOpportunityMetricCohortQueryBase.cs
@@ -0,0 +1,11 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OrgDefined.Queries
+{
+    public interface IOpportunityMetricCohortQueryBase
+    {
+        Task<string> GetSnowflakeSqlTemplate(string innerJoin, CancellationToken cancellationToken);
+        Task<string> GetSqlTemplate(string innerJoin, CancellationToken cancellationToken = default);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricBase.cs b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricBase.cs
new file mode 100644
index 0000000..5016c1f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricBase.cs
@@ -0,0 +1,33 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Biz.OrgDefined.Queries
+{
+    public class OpportunityMetricBase : IOpportunityMetricBase
+    {
+        public int EncounterGroup { get; set; }
+
+        public IEnumerable<int> CaseTypeIds { get; set; }
+
+        public IEnumerable<int> PatientPopulationIds { get; set; }
+
+        public IEnumerable<int> ChargeCodeIds { get; set; }
+
+        public string OpportunityLevel { get; set; }
+        public bool IsBaseline { get; set; }
+
+        public IEnumerable<int> OpportunityLevelIds { get; set; }
+
+        public string OpportunityLevelIdAsCSV { get; set; }
+
+        [JsonIgnore]
+        [Obsolete("Value is incorrect when coming from Jazz, will be removed in future")]
+        // TODO: remove OpportunityLevelEnum property from this class and regression test
+        public OpportunityLevel OpportunityLevelEnum =>
+            Enum.Parse<OpportunityLevel>(OpportunityLevel, true);
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortEntityQuery.cs b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortEntityQuery.cs
new file mode 100644
index 0000000..e69ca3f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortEntityQuery.cs
@@ -0,0 +1,77 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Settings;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OrgDefined.Queries
+{
+    public class OpportunityMetricCohortEntityQuery : OpportunityMetricCohortQueryBase, IOpportunityMetricCohortQueryBase
+    {
+        private string RollupJoin { get; set; }
+        private string RollupColumn { get; set; }
+        public virtual bool HasRollupId => Config.IsUsingCustomEntityDimension;
+        public virtual string DepartmentRollupGlobalId => Config.DepartmentRollupGlobalId;
+
+
+        public OpportunityMetricCohortEntityQuery(Configuration.Configuration config, IOpportunityMetricBase data, OpportunityTypes opportunityType, ISettingsService settingsService)
+            : base(config, data, opportunityType, settingsService)
+        {
+            RollupJoin = GetRollupJoin();
+            RollupColumn = GetRollupColumn();
+        }
+
+        public override async Task<string> GetSqlTemplate(string innerJoin, CancellationToken cancellationToken = default)
+        {
+            var revenueColumn = await base.RevenueColumn(cancellationToken);
+            var costColumn = await base.CostColumn(cancellationToken);
+            var billingJoin = await base.GetBillingJoin(cancellationToken);
+            var billing = await base.GetSqlTemplate(innerJoin, cancellationToken);
+
+            return $@"{billing}
+RevenueTotals AS (
+SELECT  {RollupColumn} LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], SUM({revenueColumn}) Revenue
+FROM clientdss.FactPatientEncounterSummary fpes 
+{RollupJoin}
+WHERE fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+{innerJoin}
+AND {RollupColumn} IN ({Data.OpportunityLevelIdAsCSV})
+GROUP BY {RollupColumn}, DATEPART(MONTH, fpes.DischargeDateTime) 
+)
+
+SELECT rt.Revenue, q.* FROM (
+SELECT {RollupColumn} LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], COUNT(DISTINCT(fpes.EncounterID)) Volume, 
+SUM({costColumn}) Cost, @IsBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+{billingJoin}
+{RollupJoin}
+WHERE fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+{innerJoin}
+  AND {RollupColumn} IN ({Data.OpportunityLevelIdAsCSV})
+GROUP BY {RollupColumn}, DATEPART(MONTH, fpes.DischargeDateTime)) q
+INNER JOIN RevenueTotals rt ON rt.LevelID = q.LevelID AND rt.Month = q.Month";
+        }
+
+        private string GetRollupJoin()
+        {
+            return HasRollupId
+#pragma warning disable S3358 // Ternary operators should not be nested
+                ? DepartmentRollupGlobalId == "Location"
+                    ? string.Empty
+                    : "INNER JOIN [fw].[DimDepartment] de ON de.DepartmentID = fpes.HighestVariableCostDepartmentID"
+#pragma warning restore S3358 // Ternary operators should not be nested
+                : "INNER JOIN clientdss.DimEntity de ON de.EntityID = fpes.EntityID";
+        }
+
+        private string GetRollupColumn()
+        {
+            return HasRollupId
+#pragma warning disable S3358 // Ternary operators should not be nested
+                ? DepartmentRollupGlobalId == "Location"
+                    ? "fpes.LocationID"
+                    : $"de.{DepartmentRollupGlobalId.Replace(" ", string.Empty)}ID"
+#pragma warning restore S3358 // Ternary operators should not be nested
+                : "de.FwEntityID";
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortOptions.cs b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortOptions.cs
new file mode 100644
index 0000000..9a90f59
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortOptions.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OrgDefined.Queries
+{
+    [ExcludeFromCodeCoverage]
+    public class OpportunityMetricCohortOptions
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public OpportunityMetricBase Data { get; set; }
+        public string InnerJoin { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortOrganizationQuery.cs b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortOrganizationQuery.cs
new file mode 100644
index 0000000..cd2214f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortOrganizationQuery.cs
@@ -0,0 +1,43 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Settings;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OrgDefined.Queries
+{
+    public class OpportunityMetricCohortOrganizationQuery : OpportunityMetricCohortQueryBase, IOpportunityMetricCohortQueryBase
+    {
+        public OpportunityMetricCohortOrganizationQuery(Configuration.Configuration config, IOpportunityMetricBase data, OpportunityTypes opportunityType, ISettingsService settingsService)
+            : base(config, data, opportunityType, settingsService)
+        {
+        }
+
+        public override async Task<string> GetSqlTemplate(string innerJoin, CancellationToken cancellationToken = default)
+        {
+            var revenueColumn = await base.RevenueColumn(cancellationToken);
+            var costColumn = await base.CostColumn(cancellationToken);
+            var billingJoin = await base.GetBillingJoin(cancellationToken);
+            var billing = await base.GetSqlTemplate(innerJoin, cancellationToken);
+
+            return $@"{billing}
+RevenueTotals AS (
+SELECT  0 LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], SUM({revenueColumn}) Revenue
+FROM clientdss.FactPatientEncounterSummary fpes 
+WHERE fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+{innerJoin}
+GROUP BY DATEPART(MONTH, fpes.DischargeDateTime) 
+)
+
+SELECT rt.Revenue, q.* FROM (
+SELECT 0 LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], COUNT(DISTINCT(fpes.EncounterID)) Volume, 
+SUM({costColumn}) Cost, @IsBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+{billingJoin}
+WHERE fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+{innerJoin}
+GROUP BY DATEPART(MONTH, fpes.DischargeDateTime)) q
+INNER JOIN RevenueTotals rt ON rt.LevelID = q.LevelID AND rt.Month = q.Month";
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortProviderQuery.cs b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortProviderQuery.cs
new file mode 100644
index 0000000..6a6353a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortProviderQuery.cs
@@ -0,0 +1,47 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Settings;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OrgDefined.Queries
+{
+    public class OpportunityMetricCohortProviderQuery : OpportunityMetricCohortQueryBase, IOpportunityMetricCohortQueryBase
+    {
+        public OpportunityMetricCohortProviderQuery(Configuration.Configuration config, IOpportunityMetricBase data, OpportunityTypes opportunityType, ISettingsService settingsService)
+            : base(config, data, opportunityType, settingsService)
+        {
+        }
+
+        public override async Task<string> GetSqlTemplate(string innerJoin, CancellationToken cancellationToken = default)
+        {
+            var revenueColumn = await base.RevenueColumn(cancellationToken);
+            var costColumn = await base.CostColumn(cancellationToken);
+            var billingJoin = await base.GetBillingJoin(cancellationToken);
+            var billing = await base.GetSqlTemplate(innerJoin, cancellationToken);
+
+            return $@"{billing}
+RevenueTotals AS (
+SELECT  dp.PhysicianID LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], SUM({revenueColumn}) Revenue
+FROM clientdss.FactPatientEncounterSummary fpes 
+INNER JOIN dss.DimPhysician dp on dp.PhysicianID = fpes.PrimaryPhysicianID
+WHERE fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+{innerJoin}
+AND dp.PhysicianID IN ({Data.OpportunityLevelIdAsCSV})
+GROUP BY dp.PhysicianID, DATEPART(MONTH, fpes.DischargeDateTime) 
+)
+
+SELECT rt.Revenue, q.* FROM (
+SELECT dp.PhysicianID LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], COUNT(DISTINCT(fpes.EncounterID)) Volume, 
+SUM({costColumn}) Cost, @IsBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+{billingJoin}
+INNER JOIN dss.DimPhysician dp on dp.PhysicianID = fpes.PrimaryPhysicianID
+WHERE fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+{innerJoin}
+  AND dp.PhysicianID IN ({Data.OpportunityLevelIdAsCSV})
+GROUP BY dp.PhysicianID, DATEPART(MONTH, fpes.DischargeDateTime)) q
+INNER JOIN RevenueTotals rt ON rt.LevelID = q.LevelID AND rt.Month = q.Month";
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortQueryBase.cs b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortQueryBase.cs
new file mode 100644
index 0000000..51089d8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortQueryBase.cs
@@ -0,0 +1,114 @@
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Encounter.Initiatives;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Settings;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OrgDefined.Queries
+{
+    public class OpportunityMetricCohortQueryBase : IOpportunityMetricCohortQueryBase
+    {
+        protected readonly Configuration.Configuration Config;
+        protected readonly IOpportunityMetricBase Data;
+        protected readonly ISettingsService SettingsService;
+
+        public OpportunityMetricCohortQueryBase(Configuration.Configuration config, IOpportunityMetricBase data, OpportunityTypes opportunityType, ISettingsService settingsService)
+        {
+            Config = config;
+            Data = data;
+            SettingsService = settingsService;
+        }
+
+        public static OpportunityMetricCohortQueryBase GetOpportunityMetricQuery(Configuration.Configuration config, IOpportunityMetricBase data, OpportunityTypes opportunityType, ISettingsService settingsService, JazzDbContext jazzDbContext = default)
+        {
+            switch (data.OpportunityLevel)
+            {
+                case nameof(OpportunityLevel.Organization):
+                    return new OpportunityMetricCohortOrganizationQuery(config, data, opportunityType, settingsService);
+                case nameof(OpportunityLevel.Entity):
+                    return new OpportunityMetricCohortEntityQuery(config, data, opportunityType, settingsService);
+                case nameof(OpportunityLevel.Specialty):
+                    return new OpportunityMetricCohortSpecialtyQuery(config, data, opportunityType, settingsService);
+                case nameof(OpportunityLevel.Provider):
+                    return new OpportunityMetricCohortProviderQuery(config, data, opportunityType, settingsService);
+                case nameof(OpportunityLevel.ServiceLine):
+                    return new OpportunityMetricCohortServiceLineQuery(config, data, opportunityType, settingsService, jazzDbContext);
+                default:
+                    return new OpportunityMetricCohortQueryBase(config, data, opportunityType, settingsService);
+            }
+        }
+
+        public virtual async Task<string> GetSnowflakeSqlTemplate(string innerJoin, CancellationToken cancellationToken)
+        {
+            var sqlSyntax = await GetSqlTemplate(innerJoin, cancellationToken);
+            return sqlSyntax.SnowflakeSyntax();
+        }
+
+        public virtual async Task<string> GetSqlTemplate(string innerJoin, CancellationToken cancellationToken = default)
+        {
+            var settings = await SettingsService.SystemSettingsAsync(cancellationToken);
+            var setting = settings.TryGetValue("EncounterInitiativesCostType", out var ret) ? ret : "0";
+            var costType = (EncounterInitiativeCostType)Convert.ToInt32(setting);
+            if (!(costType is EncounterInitiativeCostType.DetailBilling))
+            {
+                return await Task.FromResult("WITH ");
+            }
+            return await Task.FromResult(@"WITH billing as (
+                SELECT 
+                    EncounterId,
+                    FixedDirectCost
+                    ,FixedIndirectCost
+                    ,VariableDirectCost
+                    ,VariableIndirectCost
+                    ,FixedDirectCost + FixedIndirectCost FixedCost
+                    ,VariableDirectCost + VariableIndirectCost VariableCost
+                    ,FixedDirectCost + VariableDirectCost DirectCost
+                    ,FixedIndirectCost + VariableIndirectCost IndirectCost
+                    ,TotalCost
+                FROM  cci.EncounterChargeCodeCosts
+),
+");
+        }
+
+        protected virtual async Task<string> RevenueColumn(CancellationToken cancellationToken)
+        {
+            var settings = await SettingsService.SystemSettingsAsync(cancellationToken);
+            var setting = settings.TryGetValue("EncounterInitiativesRevenueCSF", out var ret) ? ret : "0";
+            return Convert.ToBoolean(Convert.ToInt32(setting)) ? "fpes.CustomEncounterInitiativesRevenue" : "fpes.NetRevenue";
+        }
+
+        protected virtual async Task<string> CostColumn(CancellationToken cancellationToken)
+        {
+            var settings = await SettingsService.SystemSettingsAsync(cancellationToken);
+            var setting = settings.TryGetValue("EncounterInitiativesCostType", out var ret) ? ret : "0";
+            var costType = (EncounterInitiativeCostType)Convert.ToInt32(setting);
+            switch (costType)
+            {
+                case EncounterInitiativeCostType.EncounterSummary:
+                    return Config.IsUsingIndirectCost ? "fpes.VariableIndirectCost + fpes.VariableDirectCost" : "fpes.VariableDirectCost";
+                case EncounterInitiativeCostType.CSF:
+                    return "fpes.CustomEncounterInitiativesCost";
+                case EncounterInitiativeCostType.DetailBilling:
+                    return Config.IsUsingIndirectCost ? "billing.VariableIndirectCost + billing.VariableDirectCost" : "billing.VariableDirectCost";
+            }
+
+            return "";
+        }
+
+        protected virtual async Task<string> GetBillingJoin(CancellationToken cancellationToken)
+        {
+            var settings = await SettingsService.SystemSettingsAsync(cancellationToken);
+            var setting = settings.TryGetValue("EncounterInitiativesCostType", out var ret) ? ret : "0";
+            var costType = (EncounterInitiativeCostType)Convert.ToInt32(setting);
+            if (costType is EncounterInitiativeCostType.DetailBilling)
+            {
+                return "INNER JOIN billing ON billing.EncounterId = fpes.EncounterId ";
+            }
+            return "";
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortServiceLineQuery.cs b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortServiceLineQuery.cs
new file mode 100644
index 0000000..e364697
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortServiceLineQuery.cs
@@ -0,0 +1,97 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Score;
+using Strata.ContinuousImprovement.Biz.Settings;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OrgDefined.Queries
+{
+    public class OpportunityMetricCohortServiceLineQuery : OpportunityMetricCohortQueryBase, IOpportunityMetricCohortQueryBase
+    {
+        private readonly JazzDbContext _jazzDbContext;
+
+        public OpportunityMetricCohortServiceLineQuery(Configuration.Configuration config, IOpportunityMetricBase data, OpportunityTypes opportunityType, ISettingsService settingsService, JazzDbContext jazzDbContext)
+            : base(config, data, opportunityType, settingsService)
+        {
+            _jazzDbContext = jazzDbContext;
+        }
+
+        public override async Task<string> GetSqlTemplate(string innerJoin, CancellationToken cancellationToken = default)
+        {
+            var serviceLineDimension = await Config.GetServiceLineDimension(_jazzDbContext, CancellationToken.None);
+            if (serviceLineDimension.FriendlyName == Dimension.Sg2ServiceLineCrosswalk)
+                return await GetSg2SqlTemplate(innerJoin, serviceLineDimension, cancellationToken);
+            return await GetServiceLineSqlTemplate(innerJoin, serviceLineDimension, cancellationToken);
+        }
+
+        public async Task<string> GetServiceLineSqlTemplate(string innerJoin, ScoreDimension serviceLineDimension, CancellationToken cancellationToken)
+        {
+            var revenueColumn = await base.RevenueColumn(cancellationToken);
+            var costColumn = await base.CostColumn(cancellationToken);
+            var billingJoin = await base.GetBillingJoin(cancellationToken);
+            var billing = await base.GetSqlTemplate(innerJoin, cancellationToken);
+
+            var serviceLine = "";
+            serviceLine = string.IsNullOrEmpty(serviceLineDimension.DefaultKey?.Name) ? "ServiceLineID" : serviceLine;
+
+            return $@"{billing}
+RevenueTotals AS (
+SELECT  fpes.{serviceLine} LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], SUM({revenueColumn}) Revenue
+FROM clientdss.FactPatientEncounterSummary fpes 
+WHERE fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+{innerJoin}
+AND fpes.{serviceLine} IN ({Data.OpportunityLevelIdAsCSV})
+GROUP BY fpes.{serviceLine}, DATEPART(MONTH, fpes.DischargeDateTime) 
+)
+
+SELECT rt.Revenue, q.* FROM (
+SELECT fpes.{serviceLine} LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], 
+COUNT(DISTINCT(fpes.EncounterID)) Volume, SUM({costColumn}) Cost, @IsBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+{billingJoin}
+WHERE fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+{innerJoin}
+  AND fpes.{serviceLine} IN ({Data.OpportunityLevelIdAsCSV})
+GROUP BY fpes.{serviceLine}, DATEPART(MONTH, fpes.DischargeDateTime)) q
+INNER JOIN RevenueTotals rt ON rt.LevelID = q.LevelID AND rt.Month = q.Month";
+        }
+
+        public async Task<string> GetSg2SqlTemplate(string innerJoin, ScoreDimension serviceLineDimension, CancellationToken cancellationToken)
+        {
+            var revenueColumn = await base.RevenueColumn(cancellationToken);
+            var costColumn = await base.CostColumn(cancellationToken);
+            var billingJoin = await base.GetBillingJoin(cancellationToken);
+            var billing = await base.GetSqlTemplate(innerJoin, cancellationToken);
+            var defaultKey = await _jazzDbContext.ScoreAttributes.FirstOrDefaultAsync(sa => sa.AttributeGuid == serviceLineDimension.DefaultKeyGuid, cancellationToken);
+            var serviceLine = defaultKey.Name;
+
+            return $@"{billing}
+ RevenueTotals AS (
+SELECT  sl.{serviceLine} LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], SUM({revenueColumn}) Revenue
+FROM clientdss.FactPatientEncounterSummary fpes 
+INNER JOIN dss.DimSg2CareFamily cf ON cf.Sg2CAREFamilyID = fpes.Sg2CAREFamilyID
+INNER JOIN dss.DimSg2ServiceLineCrosswalk sl ON sl.Sg2ServiceLine = cf.ServiceLine
+WHERE fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+{innerJoin}
+AND sl.{serviceLine} IN ({Data.OpportunityLevelIdAsCSV})
+GROUP BY sl.{serviceLine}, DATEPART(MONTH, fpes.DischargeDateTime) 
+)
+
+SELECT rt.Revenue, q.* FROM (
+SELECT sl.{serviceLine} LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], COUNT(DISTINCT(fpes.EncounterID)) Volume, 
+SUM({costColumn}) Cost, @IsBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+{billingJoin}
+INNER JOIN dss.DimSg2CareFamily cf ON cf.Sg2CAREFamilyID = fpes.Sg2CAREFamilyID
+INNER JOIN dss.DimSg2ServiceLineCrosswalk sl ON sl.Sg2ServiceLine = cf.ServiceLine
+WHERE fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+{innerJoin}
+  AND sl.{serviceLine} IN ({Data.OpportunityLevelIdAsCSV})
+GROUP BY sl.{serviceLine}, DATEPART(MONTH, fpes.DischargeDateTime)) q
+INNER JOIN RevenueTotals rt ON rt.LevelID = q.LevelID AND rt.Month = q.Month";
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortSpecialtyQuery.cs b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortSpecialtyQuery.cs
new file mode 100644
index 0000000..9f337ce
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/OrgDefined/Queries/OpportunityMetricCohortSpecialtyQuery.cs
@@ -0,0 +1,49 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Settings;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.OrgDefined.Queries
+{
+    public class OpportunityMetricCohortSpecialtyQuery : OpportunityMetricCohortQueryBase, IOpportunityMetricCohortQueryBase
+    {
+        public OpportunityMetricCohortSpecialtyQuery(Configuration.Configuration config, IOpportunityMetricBase data, OpportunityTypes opportunityType, ISettingsService settingsService)
+            : base(config, data, opportunityType, settingsService)
+        {
+        }
+
+        public override async Task<string> GetSqlTemplate(string innerJoin, CancellationToken cancellationToken = default)
+        {
+            var revenueColumn = await base.RevenueColumn(cancellationToken);
+            var costColumn = await base.CostColumn(cancellationToken);
+            var billingJoin = await base.GetBillingJoin(cancellationToken);
+            var billing = await base.GetSqlTemplate(innerJoin, cancellationToken);
+            var primaryPhysicianJoin = "INNER JOIN dss.DimPhysician pp ON pp.PhysicianID = fpes.PrimaryPhysicianID";
+
+            return $@"{billing}
+RevenueTotals AS (
+SELECT  ps.PhysicianSpecialtyID LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], SUM({revenueColumn}) Revenue
+FROM clientdss.FactPatientEncounterSummary fpes
+{primaryPhysicianJoin}
+INNER JOIN dss.DimPhysicianSpecialty ps ON ps.PhysicianSpecialtyID = pp.PhysicianSpecialtyID
+WHERE fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+{innerJoin}
+AND ps.PhysicianSpecialtyID IN ({Data.OpportunityLevelIdAsCSV})
+GROUP BY ps.PhysicianSpecialtyID, DATEPART(MONTH, fpes.DischargeDateTime) 
+)
+
+SELECT rt.Revenue,  q.* FROM (
+SELECT ps.PhysicianSpecialtyID LevelID, DATEPART(MONTH, fpes.DischargeDateTime) [Month], COUNT(DISTINCT(fpes.EncounterID)) Volume, 
+SUM({costColumn}) Cost, @IsBaseline IsBaseline
+FROM clientdss.FactPatientEncounterSummary fpes
+{billingJoin}
+{primaryPhysicianJoin}
+INNER JOIN dss.DimPhysicianSpecialty ps ON ps.PhysicianSpecialtyID = pp.PhysicianSpecialtyID
+WHERE fpes.DischargeDateTime >= @startDate AND fpes.DischargeDateTime < @endDate
+{innerJoin}
+  AND ps.PhysicianSpecialtyID IN ({Data.OpportunityLevelIdAsCSV})
+GROUP BY ps.PhysicianSpecialtyID, DATEPART(MONTH, fpes.DischargeDateTime)) q
+INNER JOIN RevenueTotals rt ON rt.LevelID = q.LevelID AND rt.Month = q.Month";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Pagination/IQueryableExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Pagination/IQueryableExtensions.cs
new file mode 100644
index 0000000..7afb0b9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Pagination/IQueryableExtensions.cs
@@ -0,0 +1,87 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Pagination
+{
+    public static class IQueryableExtensions
+    {
+        public static IQueryable<T> Where<T>(this IQueryable<T> query, IEnumerable<Expression<Func<T, bool>>> filters)
+        {
+            foreach (var e in filters)
+            {
+                query = query.Where(e);
+            }
+            return query;
+        }
+
+        public static IQueryable<T> OrderBy<T>(this IQueryable<T> query, SortOptions sortOptions)
+        {
+            if (sortOptions == null || string.IsNullOrWhiteSpace(sortOptions.SortField))
+            {
+                return query;
+            }
+            if (sortOptions.SortOrder == SortOrder.Asc)
+            {
+                return query.OrderBy(sortOptions.SortField);
+            } else
+            {
+                return query.OrderByDescending(sortOptions.SortField);
+            }
+        }
+        public static IOrderedQueryable<T> OrderBy<T>(this IQueryable<T> query, string propertyName) =>
+            query.OrderBy(ToLambda<T>(propertyName));
+
+        public static IOrderedQueryable<T> OrderByDescending<T>(this IQueryable<T> query, string propertyName) =>
+            query.OrderByDescending(ToLambda<T>(propertyName));
+
+        /// <summary>
+        ///     Asynchronously deletes any element of a sequence satisfies a condition.
+        /// </summary>
+        /// <remarks>
+        ///     <para>
+        ///         Multiple active operations on the same context instance are not supported. Use <see langword="await" /> to ensure
+        ///         that any asynchronous operations have completed before calling another method on this context.
+        ///         See <see href="https://aka.ms/efcore-docs-threading">Avoiding DbContext threading issues</see> for more information and examples.
+        ///     </para>
+        ///     <para>
+        ///         See <see href="https://aka.ms/efcore-docs-async-linq">Querying data with EF Core</see> for more information and examples.
+        ///     </para>
+        /// </remarks>
+        /// <typeparam name="TSource">The type of the elements of <paramref name="source" />.</typeparam>
+        /// <param name="source">An <see cref="IQueryable{T}" /> whose elements to test for a condition.</param>
+        /// <param name="predicate">A function to test each element for a condition.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken" /> to observe while waiting for the task to complete.</param>
+        /// <returns>
+        ///     A task that represents the asynchronous operation.
+        ///     The task if any elements in the source sequence pass the test in the specified
+        ///     predicate; otherwise, <see langword="false" />.
+        /// </returns>
+        /// <exception cref="ArgumentNullException">
+        ///     <paramref name="source" /> or <paramref name="predicate" /> is <see langword="null" />.
+        /// </exception>
+        /// <exception cref="OperationCanceledException">If the <see cref="CancellationToken" /> is canceled.</exception>
+        public static async Task ExecuteDeleteAsync<TSource>(
+            this IQueryable<TSource> source,
+            Expression<Func<TSource, bool>> predicate,
+            CancellationToken cancellationToken = default)
+        {
+            if (predicate == null)
+                throw new ArgumentNullException(nameof(predicate));
+
+            await source.Where(predicate).ExecuteDeleteAsync(cancellationToken);
+        }
+
+        private static Expression<Func<T, object>> ToLambda<T>(string propertyName)
+        {
+            var parameter = Expression.Parameter(typeof(T));
+            var property = Expression.Property(parameter, propertyName);
+            var propAsObject = Expression.Convert(property, typeof(object));
+            return Expression.Lambda<Func<T, object>>(propAsObject, parameter);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Pagination/PagingExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Pagination/PagingExtensions.cs
new file mode 100644
index 0000000..d1fa9c7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Pagination/PagingExtensions.cs
@@ -0,0 +1,51 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ApiLib.Standard.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Pagination
+{
+    public static class PagingExtensions
+    {
+
+        public static async Task<PagedApiResponse<T>> ToPagedAsync<T>(this IQueryable<T> query, PagingOptions pagingOptions, CancellationToken cancellationToken)
+        {
+            var count = await query.CountAsync(cancellationToken);
+            query = query.OrderBy(pagingOptions);
+            query = query
+                .Skip(pagingOptions.First)
+                .Take(pagingOptions.Rows);
+#if DEBUG
+            var sql = query.ToQueryString();
+#endif
+            var items = await query.ToListAsync(cancellationToken);
+            var pagingInfo = new PagingInfo()
+            {
+                PageNumber = (pagingOptions.Rows == 0 ? 0 : pagingOptions.First / pagingOptions.Rows) + 1,
+                ResultsPerPage = pagingOptions.Rows,
+                TotalNumberOfResults = count
+            };
+            return new PagedApiResponse<T>() { Data = items, PagingInfo = pagingInfo };
+        }
+
+        public static PagedApiResponse<T> ToFilteredPagedList<T>(this IList<T> list, PagingOptions pagingOptions, List<Expression<Func<T, bool>>> filters)
+        {
+            var sortedFilteredList = pagingOptions.SortOrder == SortOrder.Asc
+                ? list.AsQueryable().Where(filters).OrderBy(pagingOptions.SortField)
+                : list.AsQueryable().Where(filters).OrderByDescending(pagingOptions.SortField);
+            var pagedList = sortedFilteredList.Skip(pagingOptions.First).Take(pagingOptions.Rows).ToList();
+
+            var pagingInfo = new PagingInfo()
+            {
+                PageNumber = (pagingOptions.Rows == 0 ? 0 : pagingOptions.First / pagingOptions.Rows) + 1,
+                ResultsPerPage = pagingOptions.Rows,
+                TotalNumberOfResults = sortedFilteredList.Count()
+            };
+            return new PagedApiResponse<T>() { Data = pagedList, PagingInfo = pagingInfo };
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Pagination/PagingOptions.cs b/src/Strata.ContinuousImprovement.Biz/Pagination/PagingOptions.cs
new file mode 100644
index 0000000..f5728ab
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Pagination/PagingOptions.cs
@@ -0,0 +1,20 @@
+namespace Strata.ContinuousImprovement.Biz.Pagination
+{
+    public class PagingOptions: SortOptions
+    {
+        public int First { get; set; }
+        public int Rows { get; set; }
+
+        public PagingOptions(): base()
+        {
+            First = 0;
+            Rows = 25;
+        }
+
+        public PagingOptions(string sortField, SortOrder sortOrder): base(sortField, sortOrder)
+        {
+            First = 0;
+            Rows = 25;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Pagination/SortOptions.cs b/src/Strata.ContinuousImprovement.Biz/Pagination/SortOptions.cs
new file mode 100644
index 0000000..cf24a32
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Pagination/SortOptions.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Pagination
+{
+    public class SortOptions
+    {
+        public string SortField { get; set; }
+        public SortOrder SortOrder { get; set; }
+
+        public SortOptions()
+        {
+            SortField = "";
+            SortOrder = SortOrder.Asc;
+        }
+
+        public SortOptions(string sortField, SortOrder sortOrder) : this()
+        {
+            SortField = sortField;
+            SortOrder = sortOrder;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Pagination/SortOrder.cs b/src/Strata.ContinuousImprovement.Biz/Pagination/SortOrder.cs
new file mode 100644
index 0000000..f941050
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Pagination/SortOrder.cs
@@ -0,0 +1,10 @@
+
+
+namespace Strata.ContinuousImprovement.Biz.Pagination
+{
+    public enum SortOrder
+    {
+        Asc = 1,
+        Desc = -1
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PatientTypeMember/PatientType.cs b/src/Strata.ContinuousImprovement.Biz/PatientTypeMember/PatientType.cs
new file mode 100644
index 0000000..06eb523
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PatientTypeMember/PatientType.cs
@@ -0,0 +1,11 @@
+
+
+namespace Strata.ContinuousImprovement.Biz.PatientType
+{
+    public class PatientTypeMember
+    {
+        public int PatientTypeID { get; set; }
+        public int PatientTypeRollupID { get; set; }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Payroll/Initiatives/IPRInitiativeService.cs b/src/Strata.ContinuousImprovement.Biz/Payroll/Initiatives/IPRInitiativeService.cs
new file mode 100644
index 0000000..fb643a6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Payroll/Initiatives/IPRInitiativeService.cs
@@ -0,0 +1,9 @@
+using Strata.ContinuousImprovement.Biz.Initiatives;
+
+namespace Strata.ContinuousImprovement.Biz.Payroll.Initiatives
+{
+    public interface IPRInitiativeService : IInitiativeCreateService
+    {
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Payroll/Initiatives/PRInitiativeService.cs b/src/Strata.ContinuousImprovement.Biz/Payroll/Initiatives/PRInitiativeService.cs
new file mode 100644
index 0000000..dab5dd7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Payroll/Initiatives/PRInitiativeService.cs
@@ -0,0 +1,43 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Payroll.Initiatives
+{
+    public class PRInitiativeService : InitiativeCreateService, IPRInitiativeService
+    {
+        public PRInitiativeService(
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            IInitiativeSavingsService initiativeSavingsService,
+            IAuthorizationServiceClient authorizationServiceClient,
+            IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            ILogger<PRInitiativeService> logger)
+            : base(dbContextFactory, initiativeSavingsService, authorizationServiceClient, updateFactOpportunitySavingsService, logger)
+        {
+        }
+
+        public override async Task<IOpportunity> GetOpportunity(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+            return await dbContext.PayrollOpportunities.SingleOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken) as IOpportunity;
+        }
+
+        public override async Task SaveOpportunity(Guid opportunityGuid, Guid initiativeGuid, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+            var opportunity = await dbContext.PayrollOpportunities.SingleOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+            if (opportunity == null) { return; }
+
+            opportunity.InitiativeGuid = initiativeGuid;
+            await dbContext.SaveChangesAsync(cancellationToken);
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Payroll/Initiatives/PayrollInitiativeDto.cs b/src/Strata.ContinuousImprovement.Biz/Payroll/Initiatives/PayrollInitiativeDto.cs
new file mode 100644
index 0000000..f2239b6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Payroll/Initiatives/PayrollInitiativeDto.cs
@@ -0,0 +1,16 @@
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Payroll.Initiatives
+{
+    public class PayrollInitiativeDto : InitiativeDto
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public PayrollGoalType PayrollGoal { get; set; }
+        public IEnumerable<string> Departments { get; set; }
+        public IEnumerable<string> JobCodes { get; set; }
+        public IEnumerable<string> PayCodes { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/Filters/PRFilterOptions.cs b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/Filters/PRFilterOptions.cs
new file mode 100644
index 0000000..595d53b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/Filters/PRFilterOptions.cs
@@ -0,0 +1,10 @@
+using Strata.ContinuousImprovement.Biz.Filter;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Payroll.Opportunities.Filters
+{
+    public class PRFilterOptions
+    {
+        public IEnumerable<FilterMember> PayrollGoalTypes { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/Filters/PRFilters.cs b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/Filters/PRFilters.cs
new file mode 100644
index 0000000..ed58eb4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/Filters/PRFilters.cs
@@ -0,0 +1,39 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.Payroll.Opportunities.Filters
+{
+    public class PRFilters : FiltersOpportunity<PROpportunity>
+    {
+        public IEnumerable<string> PayrollGoalTypes { get; set; }
+
+        public PRFilters() : base()
+        {
+            PayrollGoalTypes = new List<string>();
+        }
+
+        public override IEnumerable<Expression<Func<PROpportunity, bool>>> GetFilters(JazzDbContext context)
+        {
+            var filters = base.GetFilters(context).ToList();
+
+            if (!string.IsNullOrEmpty(OpportunitySearch))
+            {
+                filters.Add(m => m.OpportunityKey.Contains(OpportunitySearch)
+                    || m.Name.Contains(OpportunitySearch)
+                    || m.PayrollGoal.Contains(OpportunitySearch));
+            }
+
+            if (PayrollGoalTypes.Any())
+            {
+                filters.Add(m => PayrollGoalTypes.Contains(m.PayrollGoal));
+            }
+
+            return filters;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/IPROpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/IPROpportunityService.cs
new file mode 100644
index 0000000..1c235e3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/IPROpportunityService.cs
@@ -0,0 +1,21 @@
+using ClosedXML.Excel;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities.Filters;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Payroll.Opportunities
+{
+    public interface IPROpportunityService : IOpportunityService<PROpportunity>
+    {
+        Task<PRFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken);
+        Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, PRFilters filters, CancellationToken cancellationToken);
+        Task<Guid> CreateAsync(PROpportunitySaveModel oppSaveModel, CancellationToken cancellationToken);
+        Task<Guid> CreateAsync(PROpportunityDataModel oppDataModel, CancellationToken cancellationToken);
+        Task<PROpportunity> GetPROpportunityById(Guid oppSaveModel, CancellationToken cancellationToken);
+        Task<InitiativeInfo> GetInitiativeInfoAsync(Guid oppSaveModel, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunity.cs b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunity.cs
new file mode 100644
index 0000000..d5c7c56
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunity.cs
@@ -0,0 +1,13 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Payroll.Opportunities
+{
+    [Table("viewPayrollOpportunity", Schema = "cci")]
+    public class PROpportunity : Opportunity
+    {
+        public string Name { get; set; }
+        public long OpportunityId { get; set; }
+        public string PayrollGoal { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunityDataModel.cs b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunityDataModel.cs
new file mode 100644
index 0000000..747fbbc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunityDataModel.cs
@@ -0,0 +1,69 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Payroll.Opportunities
+{
+    [Table("PayrollOpportunity", Schema = "cci")]
+    public class PROpportunityDataModel : IOpportunity, IWithAuthor, IWithOwner
+    {
+        public PROpportunityDataModel()
+        {
+            OpportunityGuid = Guid.NewGuid();
+            DateCreated = DateTime.Now;
+            DateModified = DateTime.Now;
+        }
+
+        [Key]
+        public Guid OpportunityGuid { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public string Name { get; set; }
+        public string Note { get; set; }
+        public DateTime DateCreated { get; set; }
+        public DateTime DateModified { get; set; }
+        public PayrollGoalType PayrollGoal { get; set; }
+        public Guid OwnerGuid { get; set; }
+        public string OwnerName { get; set; }
+        public Guid AuthorGuid { get; set; }
+        public string AuthorName { get; set; }
+        public string DepartmentFilterJSON { get; set; } = "[]";
+        public string JobCodeGroupFilterJSON { get; set; } = "[]";
+        public string PayCodeGroupFilterJSON { get; set; } = "[]";
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long OpportunityId { get; set; }
+
+        [NotMapped]
+        public string OpportunityKey
+        {
+            get => $"PR - {OpportunityId}"; set
+            { // ILB
+            }
+        }
+        [NotMapped]
+        public double IdentifiedSavings { get; set; }
+        [NotMapped]
+        public bool HasInitiative => !InitiativeGuid.Equals(Guid.Empty);
+        [NotMapped]
+        public string Initiative { get; set; }
+        public bool IsHidden { get; set; }
+        [NotMapped]
+        public string SourceOpportunity { get; set; }
+        [NotMapped]
+        public long SourceOpportunityId { get; set; }
+
+        public void Update(IOpportunity updates)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public enum PayrollGoalType : byte
+    {
+        Variable = 0,
+        Fixed = 1,
+        Both = 2
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunityDataModelMapper.cs b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunityDataModelMapper.cs
new file mode 100644
index 0000000..4f44ef3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunityDataModelMapper.cs
@@ -0,0 +1,45 @@
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Payroll.Initiatives;
+using System.Security.Claims;
+
+namespace Strata.ContinuousImprovement.Biz.Payroll.Opportunities
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class PROpportunityDataModelMapper
+    {
+        public static PROpportunityDataModel MapToDataModel(this PayrollInitiativeDto src, ClaimsPrincipal user)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) { return default; }
+            mapped.Note = "";
+            mapped.MapAuthor(user);
+            mapped.MapOwner(user);
+            mapped.DepartmentFilterJSON = src.Departments.MapToHierarchyPaths();
+            mapped.JobCodeGroupFilterJSON = src.JobCodes.MapToHierarchyPaths();
+            mapped.PayCodeGroupFilterJSON = src.PayCodes.MapToHierarchyPaths();
+            return mapped;
+        }
+
+        public static PROpportunityDataModel MapToDataModel(this PROpportunitySaveModel src)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) return default;
+            mapped.DepartmentFilterJSON = src.Departments.MapToHierarchyPaths();
+            mapped.JobCodeGroupFilterJSON = src.JobCodes.MapToHierarchyPaths();
+            mapped.PayCodeGroupFilterJSON = src.PayCodes.MapToHierarchyPaths();
+            return mapped;
+        }
+
+        [MapperIgnoreTarget(nameof(PROpportunityDataModel.OpportunityGuid))]
+        private static partial PROpportunityDataModel Mapped(PROpportunitySaveModel src);
+
+        [MapperIgnoreTarget(nameof(PROpportunityDataModel.OpportunityGuid))]
+        private static partial PROpportunityDataModel Mapped(PayrollInitiativeDto src);
+
+        public static partial PROpportunityDto Mapped(this PROpportunity src);
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunitySaveModel.cs b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunitySaveModel.cs
new file mode 100644
index 0000000..6af809d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunitySaveModel.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Payroll.Opportunities
+{
+    [ExcludeFromCodeCoverage]
+    public class PROpportunitySaveModel
+    {
+        [Required]
+        public Guid ConfigurationGuid { get; set; }
+        [Required]
+        [StringLength(200)]
+        public string Name { get; set; }
+        [Required]
+        public Guid OwnerGuid { get; set; }
+        public string OwnerName { get; set; }
+        public Guid AuthorGuid { get; set; }
+        public string AuthorName { get; set; }
+        public string Note { get; set; }
+        [Required]
+        public PayrollGoalType PayrollGoal { get; set; }
+        public List<string> Departments { get; set; }
+        public List<string> JobCodes { get; set; }
+        public List<string> PayCodes { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunityService.cs
new file mode 100644
index 0000000..38d53b9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Payroll/Opportunities/PROpportunityService.cs
@@ -0,0 +1,209 @@
+using ClosedXML.Excel;
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Export;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities.Filters;
+using Strata.CoreLib.Claims;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Hangfire.Jazz.Client.Models;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Payroll.Opportunities
+{
+    public class PROpportunityService : OpportunityService<PROpportunity>, IPROpportunityService
+    {
+        private readonly IJazzHangfireServiceClient _hangfireServiceClient;
+        private readonly IAuthorizationServiceClient _authorizationServiceClient;
+        private readonly IConfigurationService _configurationService;
+
+        public PROpportunityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IJazzHangfireServiceClient hangfireServiceClient,
+            IAuthorizationServiceClient authorizationServiceClient,
+            IInitiativeService initiativeService,
+            IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            IConfigurationService configurationService)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor, initiativeService, updateFactOpportunitySavingsService)
+        {
+            _hangfireServiceClient = hangfireServiceClient;
+            _authorizationServiceClient = authorizationServiceClient;
+            _configurationService = configurationService;
+
+        }
+
+        public async Task<PRFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+            if (dbContext == null) return null;
+
+            var opportunityContext = dbContext.Set<PROpportunity>();
+            var configuredOpportunities = opportunityContext.Where(en => en.ConfigurationGuid == configurationGuid);
+
+            var payrollGoalTypes = await configuredOpportunities
+                .Select(opp => new FilterMember { Id = opp.PayrollGoal, Text = opp.PayrollGoal }).Distinct()
+                .OrderBy(opp => opp.Text).ToListAsync(cancellationToken);
+
+            return new PRFilterOptions
+            {
+                PayrollGoalTypes = payrollGoalTypes
+            };
+        }
+
+        public async Task<Guid> CreateAsync(PROpportunitySaveModel oppSaveModel, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+
+            // check for duplicate name
+            var nameExists = await dbContext.PayrollOpportunitiesDataModel.AnyAsync(x => x.Name == oppSaveModel.Name, cancellationToken);
+            if (nameExists)
+            {
+                throw new ArgumentException("Enter a unique name");
+            }
+
+            var opportunity = oppSaveModel.MapToDataModel();
+
+            // save off populated opportunity to database
+            await dbContext.PayrollOpportunitiesDataModel.AddAsync(opportunity);
+            var result = await dbContext.SaveChangesAsync(cancellationToken);
+
+            await _authorizationServiceClient.AddPermissionsFromDefaultsAsync(opportunity.OpportunityGuid, SecurableEntityType.Opportunity, cancellationToken);
+
+            // queue up a hangfire task to run payroll savings
+            if (result > 0)
+            {
+                await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+                var job = new EnqueueJobDto
+                {
+                    TaskName = "Strata.CS.Jazz.Biz.CCI.Tasks.Payroll.RunPayrollSavingsTask, Strata.CS.Jazz.Biz.CCI",
+                    ContextData = JsonConvert.SerializeObject(new { opportunityGuid = opportunity.OpportunityGuid, configurationGuid = opportunity.ConfigurationGuid })
+                };
+
+                await _hangfireServiceClient.EnqueueJobAsync(job, cancellationToken);
+            }
+            else
+            {
+                throw new DbUpdateException("Error creating opportunity");
+            }
+
+            return opportunity.OpportunityGuid;
+        }
+
+        public async Task<Guid> CreateAsync(PROpportunityDataModel oppDataModel, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+
+            // save off populated opportunity to database
+            await dbContext.PayrollOpportunitiesDataModel.AddAsync(oppDataModel);
+            var result = await dbContext.SaveChangesAsync(cancellationToken);
+
+            await _authorizationServiceClient.AddPermissionsFromDefaultsAsync(oppDataModel.OpportunityGuid, SecurableEntityType.Opportunity, cancellationToken);
+
+            // queue up a hangfire task to run payroll savings
+            if (result > 0)
+            {
+                await _updateFactOpportunitySavingsService.UpdateFactOpportunitySavings(cancellationToken);
+                var job = new EnqueueJobDto
+                {
+                    TaskName = "Strata.CS.Jazz.Biz.CCI.Tasks.Payroll.RunPayrollSavingsTask, Strata.CS.Jazz.Biz.CCI",
+                    ContextData = JsonConvert.SerializeObject(new { opportunityGuid = oppDataModel.OpportunityGuid, configurationGuid = oppDataModel.ConfigurationGuid })
+                };
+
+                var response = await _hangfireServiceClient.EnqueueJobAsync(job, cancellationToken);
+                return response.JobId;
+            }
+            else
+            {
+                throw new DbUpdateException("Error creating opportunity");
+            }
+        }
+
+        public async Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, PRFilters filters, CancellationToken cancellationToken)
+        {
+            var exportOptions = this.GetExportOptions();
+
+            // get data
+            var opportunities = await this.GetAllAsync(sortOptions, filters, cancellationToken);
+            var data = opportunities.Select(opp => new
+            {
+                Opportunity = opp.OpportunityKey,
+                opp.Name,
+                opp.IdentifiedSavings,
+                opp.PayrollGoal,
+                opp.Initiative,
+                IsHidden = opp.IsHidden ? 1 : 0,
+                opp.Note
+            });
+
+            // configure column formats
+            exportOptions.AddColumnOptions("Identified Savings", "Currency2Dec");
+            exportOptions.AddColumnOptions("Is Hidden", "\"Yes\";-;\"No\"");
+
+            return ExportUtils.CreateExcelWorkbook(data, exportOptions);
+        }
+
+        public async Task<PROpportunity> GetPROpportunityById(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var opportunity = await dbContext.AddUserFilter(dbContext.Set<PROpportunity>().AsQueryable(), _user)
+                .FirstOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+
+            if (opportunity == null) { return null; }
+
+            if (opportunity is IWithSourceOpportunity && _centralDbContext != null)
+            {
+                try
+                {
+                    var clientNetworkOpportunity = await _centralDbContext.ClientNetworkOpportunities
+                        .Include(cno => cno.Opportunities)
+                        .Include(cno => cno.NetworkOpportunity)
+                        .SingleOrDefaultAsync(cno => cno.Opportunities.Any(link => link.OpportunityGuid == opportunity.OpportunityGuid));
+                    ((IWithSourceOpportunity)opportunity).SetSourceOpportunity(clientNetworkOpportunity);
+                }
+                catch
+                {
+                    // Intentionally left blank
+                }
+            }
+            return opportunity;
+        }
+
+        public async Task<InitiativeInfo> GetInitiativeInfoAsync(Guid opportunityGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) { return default; }
+            var opportunityItem = await dbContext.AddUserFilter(dbContext.Set<PROpportunity>().AsQueryable(), _user)
+                .SingleOrDefaultAsync(opp => opp.OpportunityGuid == opportunityGuid, cancellationToken);
+            if (opportunityItem == null) { return default; }
+            var configuration = await _configurationService.GetConfigurationAsync(opportunityItem.ConfigurationGuid, cancellationToken);
+
+            if (opportunityItem.InitiativeGuid != Guid.Empty)
+            {
+                var initiative = dbContext?.Initiatives.SingleOrDefault(i => i.InitiativeGUID == opportunityItem.InitiativeGuid);
+                var fiscalMonths = configuration.GetTrackingFiscalMonths(OpportunityTypes.OrgDefined, initiative.EffectiveDate);
+                return initiative?.InitiativeInfo(opportunityItem.OpportunityGuid, fiscalMonths, configuration.OrgDefinedTrackingStartDate, configuration.OrgDefinedTrackingEndDate);
+            }
+            var info = new InitiativeInfo
+            {
+                OpportunityGuid = opportunityGuid,
+                Name = opportunityItem.Name,
+                CostDriver = "Payroll",
+                StartMonth = configuration.OrgDefinedTrackingStartDate.ToString("yyyy-MM-dd"),
+                EndMonth = configuration.OrgDefinedTrackingEndDate.ToString("yyyy-MM-dd")
+            };
+            return info;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PeerGroups/Enums/PeerGroupCritetiaType.cs b/src/Strata.ContinuousImprovement.Biz/PeerGroups/Enums/PeerGroupCritetiaType.cs
new file mode 100644
index 0000000..331a8ea
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PeerGroups/Enums/PeerGroupCritetiaType.cs
@@ -0,0 +1,12 @@
+namespace Strata.ContinuousImprovement.Biz.PeerGroups.Enums
+{
+    public enum PeerGroupCritetiaType
+    {
+        EntityTypes,
+		CensusRegions,
+		OperatingExpenses,
+		AMCTypes,
+		UrbanRural,
+		BedSize
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PeerGroups/IPeerGroupService.cs b/src/Strata.ContinuousImprovement.Biz/PeerGroups/IPeerGroupService.cs
new file mode 100644
index 0000000..19b11d5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PeerGroups/IPeerGroupService.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.PeerGroups
+{
+    public interface IPeerGroupService
+    {
+        public PeerGroupDropdownItems GetDropdownItems();
+        public Task<IEnumerable<PeerGroupDto>> GetAllAsync(CancellationToken cancellationToken);
+        public Task<PeerGroupDto> GetByIdAsync(int peerGroupId, CancellationToken cancellationToken);
+        public Task<bool> ContainsAsync(int peerGroupId, CancellationToken cancellationToken);
+        public Task<bool> CreateAsync(PeerGroupDto dto, CancellationToken cancellationToken);
+        public Task<bool> IsNameValid(string name, CancellationToken cancellationToken, int peerGroupId = 0);
+        public Task DeleteAsync(int peerGroupId, CancellationToken cancellationToken);
+        public Task<bool> UpdateAsync(int peerGroupId, PeerGroupDto saveInfo, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroup.cs b/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroup.cs
new file mode 100644
index 0000000..569d029
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroup.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.PeerGroups
+{
+    [Table("PeerGroup", Schema = "cci")]
+    public class PeerGroup
+    {
+        [Key]
+        public int PeerGroupId { get; set; }
+        public string Name { get; set; }
+
+        public ICollection<PeerGroupCriteriaMapping> Mappings { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupCriteriaMapping.cs b/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupCriteriaMapping.cs
new file mode 100644
index 0000000..3519566
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupCriteriaMapping.cs
@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.PeerGroups
+{
+    [Table("PeerGroupCriteriaMapping", Schema = "cci")]
+    public class PeerGroupCriteriaMapping
+    {
+        [Key]
+        public int RowId { get; set; }
+        public int PeerGroupId { get; set; }
+        public byte MappingValue { get; set; }
+        public byte MappingType { get; set; }
+
+        public PeerGroup PeerGroup { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupDropdownItems.cs b/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupDropdownItems.cs
new file mode 100644
index 0000000..ae2852d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupDropdownItems.cs
@@ -0,0 +1,25 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.PeerGroups
+{
+    public class PeerGroupDropdownItems
+    {
+        public PeerGroupDropdownItems() 
+        { 
+            EntityTypeList = new List<PickerItem>();
+            CensusRegionList = new List<PickerItem>();
+            OperatingExpenseList = new List<PickerItem>();
+            AMCTypeList = new List<PickerItem>();
+            BedSizeList = new List<PickerItem>();
+            UrbanRuralList = new List<PickerItem>();
+		}
+
+        public List<PickerItem> EntityTypeList { get; set; }
+        public List<PickerItem> CensusRegionList { get; set; }
+        public List<PickerItem> OperatingExpenseList { get; set; }
+        public List<PickerItem> AMCTypeList { get; set; }
+        public List<PickerItem> BedSizeList { get; set; }
+        public List<PickerItem> UrbanRuralList { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupDto.cs b/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupDto.cs
new file mode 100644
index 0000000..3ffa65d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupDto.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.PeerGroups
+{
+    public class PeerGroupDto
+    {
+        public int PeerGroupId { get; set; }
+        public string Name { get; set; }
+        public IEnumerable<byte> AmcTypes { get; set; }
+        public IEnumerable<byte> EntityTypes { get; set; }
+        public IEnumerable<byte> CensusRegions { get; set; }
+        public IEnumerable<byte> OperatingExpenses { get; set; }
+        public IEnumerable<byte> BedSize { get; set; }
+		public IEnumerable<byte> UrbanRural { get; set; }
+	}
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupMapper.cs b/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupMapper.cs
new file mode 100644
index 0000000..ea7a3e2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupMapper.cs
@@ -0,0 +1,51 @@
+using Microsoft.Extensions.Logging;
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.PeerGroups.Enums;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.StrataSphereCompare.Client.Models.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.PeerGroups
+{
+    [Mapper()]
+    public static partial class PeerGroupMapper
+    {
+        public static PeerGroupDto MapToDto(this PeerGroup src, ILogger<PeerGroupService> logger, IEnumerable<PeerGroupCriteriaMapping> mappings)
+        {
+			var dto = src.Map();
+
+			try
+			{
+				dto.EntityTypes = GetMappingValues(mappings.Where(m => m.MappingType == (byte)PeerGroupCritetiaType.EntityTypes));
+				dto.UrbanRural = GetMappingValues(mappings.Where(m => m.MappingType == (byte)PeerGroupCritetiaType.UrbanRural));
+
+				if (mappings.FirstOrDefault(m => m.MappingType == (byte)PeerGroupCritetiaType.AMCTypes) != null)
+                {
+                    dto.AmcTypes = mappings
+                    .Where(m => m.MappingType == (byte)PeerGroupCritetiaType.AMCTypes).Count() == Enum.GetValues(typeof(IsAmc)).Length
+                    ? GetMappingValues(mappings.Where(m => m.MappingType == (byte)PeerGroupCritetiaType.AMCTypes))
+                    : GetMappingValues(mappings.Where(m => m.MappingType == (byte)PeerGroupCritetiaType.AMCTypes));
+                }
+
+				dto.CensusRegions = GetMappingValues(mappings.Where(m => m.MappingType == (byte)PeerGroupCritetiaType.CensusRegions));
+				dto.BedSize = GetMappingValues(mappings.Where(m => m.MappingType == (byte)PeerGroupCritetiaType.BedSize));
+				dto.OperatingExpenses = GetMappingValues(mappings.Where(m => m.MappingType == (byte)PeerGroupCritetiaType.OperatingExpenses));
+			}
+			catch (Exception ex)
+            {
+                logger.LogServiceError(ex, ex.Message, new Dictionary<string, object> { { "PeerGroup", src } });
+            }
+            return dto;
+        }
+
+        private static IEnumerable<byte> GetMappingValues(IEnumerable<PeerGroupCriteriaMapping> dbMappings)
+        {
+            return dbMappings.Select(m => m.MappingValue);
+        }
+
+        private static partial PeerGroupDto Map(this PeerGroup src);
+        public static partial PeerGroup Map(this PeerGroupDto src);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupService.cs b/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupService.cs
new file mode 100644
index 0000000..e3bdc8c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PeerGroups/PeerGroupService.cs
@@ -0,0 +1,204 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.ContinuousImprovement.Biz.PeerGroups.Enums;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using Strata.StrataSphereCompare.Client.Models.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.PeerGroups
+{
+    public class PeerGroupService : IPeerGroupService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly ILogger<PeerGroupService> _logger;
+
+        public PeerGroupService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory, ILogger<PeerGroupService> logger)
+        {
+            _dbContextFactory = dbContextFactory;
+            _logger = logger;
+        }
+
+        public async Task<bool> ContainsAsync(int peerGroupId, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await GetDbContext(cancellationToken);
+            return await dbContext.PeerGroups
+                .AnyAsync(x => x.PeerGroupId == peerGroupId, cancellationToken);
+        }
+
+        public async Task<IEnumerable<PeerGroupDto>> GetAllAsync(CancellationToken cancellationToken)
+        {
+            await using var dbContext = await GetDbContext(cancellationToken);
+            var peerGroups = await dbContext.PeerGroups.Include(pg => pg.Mappings).ToListAsync();
+            return peerGroups.Select(group => group.MapToDto(_logger, group.Mappings));
+        }
+
+        public async Task<PeerGroupDto> GetByIdAsync(int peerGroupId, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await GetDbContext(cancellationToken);
+            var peerGroup = await dbContext.PeerGroups.Include(pg => pg.Mappings).SingleOrDefaultAsync(irc => irc.PeerGroupId == peerGroupId, cancellationToken);
+            return peerGroup.MapToDto(_logger, peerGroup.Mappings);
+        }
+
+        public PeerGroupDropdownItems GetDropdownItems()
+        {
+            var dropdownItems = new PeerGroupDropdownItems();
+
+            GetDropdownList<HospitalType>(dropdownItems.EntityTypeList);
+            dropdownItems.EntityTypeList = dropdownItems.EntityTypeList.OrderBy(et => et.Text).ToList();
+
+            GetDropdownList<CensusRegion>(dropdownItems.CensusRegionList);
+            dropdownItems.CensusRegionList = dropdownItems.CensusRegionList.OrderBy(et => et.Text).ToList();
+
+            GetDropdownList<OperatingExpense>(dropdownItems.OperatingExpenseList);
+
+            GetDropdownList<BedSize>(dropdownItems.BedSizeList);
+
+			foreach (IsAmc amcType in Enum.GetValues(typeof(IsAmc)))
+			{
+				dropdownItems.AMCTypeList.Add(new PickerItem() { Value = (byte)amcType, Text = (byte)amcType != 0 ? "Yes" : "No" });
+			}
+			dropdownItems.AMCTypeList = dropdownItems.AMCTypeList.OrderBy(et => et.Text).ToList();
+
+			foreach (UrbanRural urbRur in Enum.GetValues(typeof(UrbanRural)))
+			{
+				dropdownItems.UrbanRuralList.Add(new PickerItem() { Value = (byte)urbRur, Text = (byte)urbRur != 0 ? "Rural" : "Urban" });
+			}
+			dropdownItems.UrbanRuralList = dropdownItems.UrbanRuralList.OrderBy(et => et.Text).ToList();
+
+			return dropdownItems;
+		}
+
+		public async Task<bool> CreateAsync(PeerGroupDto dto, CancellationToken cancellationToken)
+        {
+            var errorMessage = await ValidateName(0, dto, cancellationToken);
+            if (errorMessage != string.Empty)
+            {
+                throw new Exception(errorMessage);
+            }
+            await using var dbContext = await GetDbContext(cancellationToken);
+            var peerGroup = dto.Map();
+            peerGroup.Mappings = GetMappings(dto, peerGroup.PeerGroupId).ToList();
+
+            await dbContext.PeerGroups.AddAsync(peerGroup, cancellationToken);
+            var isAdded = await dbContext.SaveChangesAsync(cancellationToken) > 0;
+
+            return isAdded;
+        }
+
+        public async Task<bool> IsNameValid(string name, CancellationToken cancellationToken, int peerGroupId = 0)
+        {
+            await using var dbContext = await GetDbContext(cancellationToken);
+            return !await dbContext.PeerGroups.AnyAsync(x => x.PeerGroupId != peerGroupId && x.Name.ToLower() == name.ToLower(), cancellationToken);
+        }
+
+        public async Task DeleteAsync(int peerGroupId, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await GetDbContext(cancellationToken);
+            using var transaction = dbContext.Database.BeginTransaction();
+            try
+            {
+                var peerGroup = await dbContext.PeerGroups.Include(pg => pg.Mappings)
+                    .SingleOrDefaultAsync(irc => irc.PeerGroupId == peerGroupId, cancellationToken);
+
+                dbContext.PeerGroupCriteriaMappings.RemoveRange(peerGroup.Mappings);
+                await dbContext.SaveChangesAsync(cancellationToken);
+
+                dbContext.PeerGroups.Remove(peerGroup);
+                await dbContext.SaveChangesAsync(cancellationToken);
+                transaction.Commit();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+                transaction.Rollback();
+                throw;
+            }
+        }
+
+        public async Task<bool> UpdateAsync(int peerGroupId, PeerGroupDto saveInfo, CancellationToken cancellationToken)
+        {
+            var errorMessage = await ValidateName(peerGroupId, saveInfo, cancellationToken);
+            if (errorMessage != string.Empty)
+            {
+                throw new Exception(errorMessage);
+            }
+            await using var dbContext = await GetDbContext(cancellationToken);
+            using var transaction = dbContext.Database.BeginTransaction();
+            try
+            {
+
+                var peerGroup = await dbContext.PeerGroups.Include(pg => pg.Mappings)
+                    .SingleOrDefaultAsync(irc => irc.PeerGroupId == peerGroupId, cancellationToken);
+                if (peerGroup == null) return false;
+
+                peerGroup.Name = saveInfo.Name;
+                dbContext.PeerGroups.Update(peerGroup);
+                dbContext.PeerGroupCriteriaMappings.RemoveRange(peerGroup.Mappings);
+                var newMappings = GetMappings(saveInfo, peerGroupId);
+                dbContext.PeerGroupCriteriaMappings.AddRange(newMappings);
+                await dbContext.SaveChangesAsync(cancellationToken);
+                transaction.Commit();
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+                transaction.Rollback();
+                throw;
+            }
+        }
+
+        private async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        private IEnumerable<PeerGroupCriteriaMapping> GetMappings(PeerGroupDto dto, int peerGroupId)
+        {
+            var mappings = dto.EntityTypes.Select(et =>
+                new PeerGroupCriteriaMapping() { MappingValue = et, MappingType = (byte)PeerGroupCritetiaType.EntityTypes, PeerGroupId = peerGroupId }).ToList();
+			mappings.AddRange((dto.UrbanRural ?? Enumerable.Empty<byte>()).Select(et =>
+				new PeerGroupCriteriaMapping() { MappingValue = et, MappingType = (byte)PeerGroupCritetiaType.UrbanRural, PeerGroupId = peerGroupId }));
+			mappings.AddRange(dto.AmcTypes.Select(et =>
+				new PeerGroupCriteriaMapping() { MappingValue = et, MappingType = (byte)PeerGroupCritetiaType.AMCTypes, PeerGroupId = peerGroupId }));
+			mappings.AddRange(dto.CensusRegions.Select(et =>
+                new PeerGroupCriteriaMapping() { MappingValue = et, MappingType = (byte)PeerGroupCritetiaType.CensusRegions, PeerGroupId = peerGroupId }));
+			mappings.AddRange((dto.BedSize ?? Enumerable.Empty<byte>()).Select(et =>
+				new PeerGroupCriteriaMapping() { MappingValue = et, MappingType = (byte)PeerGroupCritetiaType.BedSize, PeerGroupId = peerGroupId }));
+			mappings.AddRange(dto.OperatingExpenses.Select(et =>
+                new PeerGroupCriteriaMapping() { MappingValue = et, MappingType = (byte)PeerGroupCritetiaType.OperatingExpenses, PeerGroupId = peerGroupId }));
+			return mappings;
+        }
+
+        private async Task<string> ValidateName(int peerGroupId, PeerGroupDto dto, CancellationToken cancellationToken)
+        {
+            if (!await IsNameValid(dto.Name, cancellationToken, peerGroupId))
+            {
+                return "Rollup column name already exists.";
+            }
+
+            if (dto.Name.Length > 100)
+            {
+                return "Rollup column exceeds maximum number of characters";
+            }
+
+            return string.Empty;
+        }
+
+        private void GetDropdownList<T>(List<PickerItem> items) where T : Enum
+        {
+            foreach (var entityType in Enum.GetValues(typeof(T)))
+            {
+                items.Add(new PickerItem() { Value = (int)entityType, Text = ((T)entityType).GetDescription() });
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceBaselineData.cs b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceBaselineData.cs
new file mode 100644
index 0000000..4f6782f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceBaselineData.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.PerformanceEngine
+{
+    public class PerformanceBaselineData
+    {
+
+        internal double BaselineUnits { get; set; }
+        internal double BaselineStats { get; set; }
+        internal int FiscalYearId { get; set; }
+        internal int FiscalMonthId { get; set; }
+
+        public PerformanceBaselineData(double baselineUnits, double baselineStats, int fiscalYearId, int fiscalMonthId)
+        {
+            BaselineUnits = baselineUnits;
+            BaselineStats = baselineStats;
+            FiscalYearId = fiscalYearId;
+            FiscalMonthId = fiscalMonthId;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceComparisonData.cs b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceComparisonData.cs
new file mode 100644
index 0000000..ea5d563
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceComparisonData.cs
@@ -0,0 +1,81 @@
+using DocumentFormat.OpenXml.Drawing.Diagrams;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.PerformanceEngine
+{
+    public class PerformanceComparisonData
+    {
+        internal double GoalUnits { get; set; }
+        internal double BaselineUnits { get; set; }
+        internal double BaselineStats { get; set; }
+        internal double TrackingUnits { get; set; }
+        internal double TrackingStats { get; set; }
+        internal double GoalUnitsOverall { get; set; }
+        internal double BaselineUnitsOverall { get; set; }
+        internal double TrackingUnitsOverall { get; set; }
+        internal int FiscalMonthId { get; set; }
+        internal int FiscalYearId { get; set; }
+
+#pragma warning disable S107 // Methods should not have too many parameters
+        public PerformanceComparisonData(int fiscalMonthID, int fiscalYearId, double goalUnits, double baselineUnits, double baselineStats, double trackingUnits, double trackingStats,
+            double goalUnitsOverall, double baselineUnitsOverall, double trackingUnitsOverall)
+#pragma warning restore S107 // Methods should not have too many parameters
+        {
+            FiscalMonthId = fiscalMonthID;
+            FiscalYearId = fiscalYearId;
+            GoalUnits = goalUnits;
+            BaselineUnits = baselineUnits;
+            BaselineStats = baselineStats;
+            TrackingUnits = trackingUnits;
+            TrackingStats = trackingStats;
+            GoalUnitsOverall = goalUnitsOverall;
+            BaselineUnitsOverall = baselineUnitsOverall;
+            TrackingUnitsOverall = trackingUnitsOverall;
+        }
+
+        public static List<PerformanceBaselineData> SetupBaselineDataList(double[] baselineUnits, double[] baselineStats, int fiscalYearId, int startMonthId = 1)
+        {
+            if (baselineUnits.Length != baselineStats.Length) throw new ArgumentException("All arrays should have the same length.");
+
+            var dataList = new List<PerformanceBaselineData>();
+            var iterator = 0;
+
+            while (iterator < baselineUnits.Length)
+            {
+                var data = new PerformanceBaselineData( baselineUnits[iterator], baselineStats[iterator], fiscalYearId, startMonthId);
+                dataList.Add(data);
+                if (startMonthId == 12)
+                {
+                    startMonthId = 0;
+                    fiscalYearId++;
+                }
+                else
+                {
+                    startMonthId++;
+                }
+                iterator++;
+            }
+
+            return dataList;
+        }
+
+        public static List<PerformanceTrackingData> SetupTrackingDataList(double[] goalUnits, double[] trackingUnits, double[] trackingStats, int fiscalYearId)
+        {
+            if (goalUnits.Length != trackingUnits.Length || trackingUnits.Length != trackingStats.Length) throw new ArgumentException("All arrays should have the same length.");
+
+            var dataList = new List<PerformanceTrackingData>();
+
+            for (int i = 0; i < trackingUnits.Length; i++)
+            {
+                var data = new PerformanceTrackingData(goalUnits[i], trackingUnits[i], trackingStats[i], fiscalYearId, i + 1);
+                dataList.Add(data);
+            }
+
+            return dataList;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceGroup.cs b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceGroup.cs
new file mode 100644
index 0000000..dda3aa5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceGroup.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.PerformanceEngine
+{
+    public class PerformanceGroup
+    {
+        internal int GroupId { get; set; }
+        internal string GroupName { get; set; }
+
+        public PerformanceGroup(int GroupId, string GroupName)
+        {
+            this.GroupId = GroupId;
+            this.GroupName = GroupName;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceMonthlySavingsData.cs b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceMonthlySavingsData.cs
new file mode 100644
index 0000000..1d56a5a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceMonthlySavingsData.cs
@@ -0,0 +1,14 @@
+namespace Strata.ContinuousImprovement.Biz.PerformanceEngine
+{
+    public class PerformanceMonthlySavingsData : PerformanceMonthlyUnitData
+    {
+        public double Savings { get; set; }
+        public double SavingsYtd { get; set; }
+
+        public PerformanceMonthlySavingsData(int fiscalMonthId, int fiscalYearId, double rampUp, double units, double stats, double savings, bool isInverse)
+        : base(fiscalMonthId, fiscalYearId, rampUp, units, stats)
+        {
+            Savings = savings * (isInverse ? -1 : 1);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceMonthlyUnitData.cs b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceMonthlyUnitData.cs
new file mode 100644
index 0000000..43acf13
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceMonthlyUnitData.cs
@@ -0,0 +1,47 @@
+using Strata.ContinuousImprovement.Biz.Utilities;
+
+namespace Strata.ContinuousImprovement.Biz.PerformanceEngine
+{
+    /// <summary>
+    /// A single monthly set of Performance data
+    /// </summary>
+    public class PerformanceMonthlyUnitData
+    {
+        public int FiscalMonthId { get; set; }
+        public int FiscalYearId { get; set; }
+        public double RampUp { get; set; }
+        public double Units { get; set; }
+        public double UnitsYtd { get; set; }
+        public double Stats { get; set; }
+        public double StatsYtd { get; set; }
+
+        /// <summary>
+        /// Units DivideBy Stats
+        /// </summary>
+        public double UnitsPerStat => Units.DivideBy(Stats);
+        public double UnitsPerStatYtd => UnitsYtd.DivideBy(StatsYtd);
+
+        public double UnitsRampUp => Units * RampUp;
+        public double StatsRampUp => Stats * RampUp;
+
+        public double UnitsPerStatRampUp => UnitsPerStat * RampUp;
+        public double UnitsPerStatRampUpYtd => UnitsPerStatYtd * RampUp;
+
+        /// <summary>
+        /// A single monthly set of Performance data
+        /// </summary>
+        /// <param name="fiscalMonthId">The Fiscal Month Id of the data unit</param>
+        /// /// <param name="fiscalYearId">The Fiscal Year Id of the data unit</param>
+        /// <param name="rampUp">The RampUp value of the data unit, 0 forces the Units to be 0</param>
+        /// <param name="units">The Units value of the data unit being measured</param>
+        /// <param name="stats">The Stats value of data unit</param>
+        public PerformanceMonthlyUnitData(int fiscalMonthId, int fiscalYearId, double rampUp, double units, double stats)
+        {
+            FiscalMonthId = fiscalMonthId;
+            FiscalYearId = fiscalYearId;
+            RampUp = rampUp;
+            Units = rampUp == 0 ? 0 : units;
+            Stats = stats;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceOptions.cs b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceOptions.cs
new file mode 100644
index 0000000..128f78a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceOptions.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.PerformanceEngine
+{
+    public class PerformanceOptions
+    {
+        internal bool IsSeasonal { get; set; }
+        internal bool IsInverse { get; set; }
+        internal bool HasStatistic { get; set; }
+
+        public PerformanceOptions(bool isSeasonal, bool isInverse, bool hasStatistic)
+        {
+            IsSeasonal = isSeasonal;
+            IsInverse = isInverse;
+            HasStatistic = hasStatistic;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceStatistics.cs b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceStatistics.cs
new file mode 100644
index 0000000..f02c8fd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceStatistics.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.PerformanceEngine
+{
+    public class PerformanceStatistics
+    {
+        internal double BaselineStats { get; set; }
+        internal double BaselineStatsOverall { get; set; }
+        internal double TrackingStats { get; set; }
+        internal double TrackingStatsOverall { get; set; }
+
+        public PerformanceStatistics(double baselineStats, double baselineStatsOverall, double trackingStats, double trackingStatsOverall)
+        {
+            BaselineStats = baselineStats;
+            BaselineStatsOverall = baselineStatsOverall;
+            TrackingStats = trackingStats;
+            TrackingStatsOverall = trackingStatsOverall;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceTrackingData.cs b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceTrackingData.cs
new file mode 100644
index 0000000..3b22bd0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceTrackingData.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.PerformanceEngine
+{
+    public class PerformanceTrackingData
+    {
+        internal double GoalUnits { get; set; }
+        internal double TrackingUnits { get; set; }
+        internal double TrackingStats { get; set; }
+        internal int FiscalYearId { get; set; }
+        internal int FiscalMonthId { get; set; }
+
+        public PerformanceTrackingData(double goalUnits, double trackingUnits, double trackingStats, int fiscalYearId, int fiscalMonthId)
+        {
+            GoalUnits = goalUnits;
+            TrackingUnits = trackingUnits;
+            TrackingStats = trackingStats;
+            FiscalYearId = fiscalYearId;
+            FiscalMonthId = fiscalMonthId;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceTrackingItem.cs b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceTrackingItem.cs
new file mode 100644
index 0000000..8033a4d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceTrackingItem.cs
@@ -0,0 +1,124 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.PerformanceEngine
+{
+    public class PerformanceTrackingItem
+    {
+        private readonly IList<PerformanceTrackingMonth> _monthlyTrackingData;
+
+        public int GroupId { get; set; }
+        public string GroupName { get; set; }
+
+        public IEnumerable<PerformanceTrackingMonth> MonthlyTrackingData => _monthlyTrackingData;
+
+        public PerformanceTrackingItem(PerformanceGroup group, IList<MonthlyRampUp> rampUps, PerformanceOptions options, 
+            IList<PerformanceBaselineData> baselineData, IList<PerformanceTrackingData> trackingData, IList<TrackingYearMonth> trackingYearMonths)
+        {
+            GroupId = group.GroupId;
+            GroupName = group.GroupName;
+
+            trackingYearMonths = trackingYearMonths.OrderBy(t => t.FiscalYearID).ThenBy(t => t.FiscalMonth.SortOrder).ToList();
+
+            var performanceComparisons = GetPerformanceComparisonData(baselineData, trackingData);
+
+            var baselineStatsOverall = options.HasStatistic ? baselineData.Sum(d => d.BaselineStats) : baselineData.Count();
+            var trackingStatsOverall = options.HasStatistic ? trackingData.Sum(d => d.TrackingStats) : trackingYearMonths.Count(m => m.IsTrackedMonth);
+
+            _monthlyTrackingData = new List<PerformanceTrackingMonth>();
+            foreach (var month in trackingYearMonths)
+            {
+                var trackingComparison = performanceComparisons.First(t => t.FiscalMonthId == month.FiscalMonthID && t.FiscalYearId == month.FiscalYearID);
+                var rampUp = rampUps.First(p => p.FiscalMonthId == month.FiscalMonthID && p.FiscalYearId == month.FiscalYearID);
+
+                var trackedMonth = month.IsTrackedMonth ? 1 : 0;
+                var baselineStats = options.HasStatistic ? trackingComparison.BaselineStats : 1;
+                var trackingStats = options.HasStatistic ? trackingComparison.TrackingStats : trackedMonth;
+
+                var statistics = new PerformanceStatistics(baselineStats, baselineStatsOverall, trackingStats, trackingStatsOverall);
+
+                var monthlyTrackingData = new PerformanceTrackingMonth(month, rampUp.ValuePercentage, trackingComparison, statistics, _monthlyTrackingData, options, baselineData.Count, trackingData.Count);
+
+                _monthlyTrackingData.Add(monthlyTrackingData);
+            }
+        }
+
+        private static List<PerformanceComparisonData> GetPerformanceComparisonData(IList<PerformanceBaselineData> baselineData, IList<PerformanceTrackingData> trackingData)
+        {
+            var performanceComparisonData = new List<PerformanceComparisonData>();
+            var baselineUnitsTotal = baselineData.Sum(b => b.BaselineUnits);
+            var baselineGoalUnitsTotal = trackingData.Sum(b => b.GoalUnits);
+            var trackingUnitsTotal = trackingData.Sum(b => b.TrackingUnits);
+
+            foreach (var trackingMonth in trackingData)
+            {
+                var baselineMatch = baselineData.Where(ym => ym.FiscalMonthId == trackingMonth.FiscalMonthId);
+                switch (baselineMatch.Count())
+                {
+                    //No matching month in the baseline - compare to full baseline average
+                    case 0:
+                        performanceComparisonData.Add(new PerformanceComparisonData(trackingMonth.FiscalMonthId, trackingMonth.FiscalYearId, trackingData.Average(d => d.GoalUnits), baselineData.Average(d => d.BaselineUnits), baselineData.Average(d => d.BaselineStats), trackingMonth.TrackingUnits, trackingMonth.TrackingStats, baselineGoalUnitsTotal, baselineUnitsTotal, trackingUnitsTotal));
+                        break;
+                    //One matching month in the baseline - compare directly
+                    case 1:
+                        var baselineMonth = baselineMatch.First();
+                        performanceComparisonData.Add(new PerformanceComparisonData(trackingMonth.FiscalMonthId, trackingMonth.FiscalYearId, trackingMonth.GoalUnits, baselineMonth.BaselineUnits, baselineMonth.BaselineStats, trackingMonth.TrackingUnits, trackingMonth.TrackingStats, baselineGoalUnitsTotal, baselineUnitsTotal, trackingUnitsTotal));
+                        break;
+                    //More than one matching month in the baseline - compare to average of matches
+                    default:
+                        performanceComparisonData.Add(new PerformanceComparisonData(trackingMonth.FiscalMonthId, trackingMonth.FiscalYearId, trackingData.Average(d => d.GoalUnits), baselineMatch.Average(d => d.BaselineUnits), baselineMatch.Average(d => d.BaselineStats), trackingMonth.TrackingUnits, trackingMonth.TrackingStats, baselineGoalUnitsTotal, baselineUnitsTotal, trackingUnitsTotal));
+                        break;
+                }
+            }
+            return performanceComparisonData;
+        }
+
+
+        public double AnnualGoal => _monthlyTrackingData
+            .Sum(p => double.IsNaN(p.CommittedSavings.Savings) ? 0 : p.CommittedSavings.Savings);
+
+        public double AnnualProjectActual => _monthlyTrackingData
+            .Sum(p => double.IsNaN(p.CommittedUnits) ? 0 : p.CommittedUnits);
+
+        public double YTDGoal => _monthlyTrackingData
+            .Where(p => p.Month.IsCurrentMonth)
+            .Sum(p => double.IsNaN(p.CommittedSavings.SavingsYtd) ? 0 : p.CommittedSavings.SavingsYtd);
+
+        public double YTDActual => _monthlyTrackingData
+            .Where(p => p.Month.IsCurrentMonth)
+            .Sum(p => double.IsNaN(p.ActualSavings.SavingsYtd) ? 0 : p.ActualSavings.SavingsYtd);
+
+        public double CurrentMonthGoal => _monthlyTrackingData
+            .Where(p => p.Month.IsCurrentMonth)
+            .Sum(p => double.IsNaN(p.CommittedSavings.Savings) ? 0 : p.CommittedSavings.Savings);
+
+        public double CurrentMonthActual => _monthlyTrackingData
+            .Where(p => p.Month.IsCurrentMonth)
+            .Sum(p => double.IsNaN(p.ActualSavings.Savings) ? 0 : p.ActualSavings.Savings);
+
+        public double ActualSavings(int elementAt) =>
+            double.IsNaN(_monthlyTrackingData.ElementAt(elementAt).ActualSavings.Savings) || !IsAfterEffectiveDate(elementAt)
+                ? 0.0
+                : _monthlyTrackingData.ElementAt(elementAt).ActualSavings.Savings;
+
+        public double ActualSavingsYTD(int elementAt) =>
+            double.IsNaN(_monthlyTrackingData.ElementAt(elementAt).ActualSavings.SavingsYtd) || !IsAfterEffectiveDate(elementAt)
+                ? 0.0
+                : _monthlyTrackingData.ElementAt(elementAt).ActualSavings.SavingsYtd;
+
+        public double CommittedSavings(int elementAt) =>
+            double.IsNaN(_monthlyTrackingData.ElementAt(elementAt).CommittedSavings.Savings) || !IsAfterEffectiveDate(elementAt)
+                ? 0.0
+                : _monthlyTrackingData.ElementAt(elementAt).CommittedSavings.Savings;
+
+        public double CommittedSavingsYTD(int elementAt) =>
+            double.IsNaN(_monthlyTrackingData.ElementAt(elementAt).CommittedSavings.SavingsYtd) || !IsAfterEffectiveDate(elementAt)
+                ? 0.0
+                : _monthlyTrackingData.ElementAt(elementAt).CommittedSavings.SavingsYtd;
+
+        public bool IsAfterEffectiveDate(int elementAt) => _monthlyTrackingData.ElementAt(elementAt).Month.IsAfterEffectiveDate;
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceTrackingMonth.cs b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceTrackingMonth.cs
new file mode 100644
index 0000000..8f921d1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/PerformanceTrackingMonth.cs
@@ -0,0 +1,104 @@
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.PerformanceEngine
+{
+    public class PerformanceTrackingMonth
+    {
+        public TrackingYearMonth Month { get; set; }
+        public int TrackingMonthsCount { get; set; }
+        public int BaselineMonthsCount { get; set; }
+        public double RampUp { get; set; }
+        public double GoalUnits { get; set; }
+        public double GoalUnitsYtd { get; set; }
+        public double CommittedUnits => IsSeasonal ? BaselineMonthlyUnitData.Units + GoalUnitVariance * RampUp 
+                                                           : (BaselineUnitsOverall / BaselineMonthsCount) + (GoalUnitVariance * RampUp);
+        public double CommittedUnitsYtd { get; set; }
+        public double GoalUnitsOverall { get; set; }
+        public double BaselineUnitsOverall { get; set; }
+        // units per statistic per month vs. units per month.
+        public double BaselineAverage => HasStatistic ? BaselineUnitsOverall.DivideBy(BaselineStatsOverall) : BaselineUnitsOverall / BaselineMonthsCount;
+        public double BaselineStatsOverall { get; set; }
+        public double TrackingUnitsOverall { get; set; }
+        public double TrackingStatsOverall { get; set; }
+        public bool HasStatistic { get; set; }
+        public bool IsSeasonal { get; set; }
+        public bool IsInverse {  get; set; }
+        public PerformanceMonthlyUnitData BaselineMonthlyUnitData { get; set; }
+        public PerformanceMonthlyUnitData TrackingMonthlyUnitData { get; set; }
+        public PerformanceMonthlySavingsData GoalSavings { get; set; }
+        public PerformanceMonthlySavingsData CommittedSavings { get; set; }
+        public PerformanceMonthlySavingsData ActualSavings { get; set; }
+        public double GoalUnitVariance => IsSeasonal ? GoalUnits - BaselineMonthlyUnitData.Units 
+                                                             : (GoalUnitsOverall / TrackingMonthsCount) - (BaselineUnitsOverall / BaselineMonthsCount);
+        public double ActualUnitVariance
+        {
+            get
+            {
+                if (RampUp.Equals(0) || BaselineMonthlyUnitData.Stats.Equals(0)) return 0;
+                return IsSeasonal ? (TrackingMonthlyUnitData.UnitsPerStat - BaselineMonthlyUnitData.UnitsPerStat) * TrackingMonthlyUnitData.Stats
+                                  : (TrackingMonthlyUnitData.UnitsPerStat - BaselineAverage) * TrackingMonthlyUnitData.Stats;
+            }
+        }
+
+        public double CommittedUnitVariance => GoalUnitVariance * RampUp;
+        public double CommittedStats => IsSeasonal ? BaselineMonthlyUnitData.Stats 
+                                                           : BaselineStatsOverall / BaselineMonthsCount;
+
+        public double CommittedRate => CommittedSavings.UnitsPerStat;
+
+        public PerformanceTrackingMonth(TrackingYearMonth month, double rampUp, PerformanceComparisonData comparisonData, PerformanceStatistics statistics, IList<PerformanceTrackingMonth> previousTrackingMonths, PerformanceOptions options, int baselineMonthsCount, int trackingMonthsCount)
+        {
+            BaselineMonthsCount = baselineMonthsCount;
+            TrackingMonthsCount = trackingMonthsCount;
+            Month = month;
+            RampUp = rampUp;
+            GoalUnits = comparisonData.GoalUnits;
+            GoalUnitsOverall = comparisonData.GoalUnitsOverall;
+            BaselineUnitsOverall = comparisonData.BaselineUnitsOverall;
+            BaselineStatsOverall = statistics.BaselineStatsOverall;
+            TrackingUnitsOverall = comparisonData.TrackingUnitsOverall;
+            TrackingStatsOverall = statistics.TrackingStatsOverall;
+            HasStatistic = options.HasStatistic;
+            IsSeasonal = options.IsSeasonal;
+            IsInverse = options.IsInverse;
+            BaselineMonthlyUnitData = new PerformanceMonthlyUnitData(month.FiscalMonthID, month.FiscalYearID, 1, comparisonData.BaselineUnits, statistics.BaselineStats);
+            TrackingMonthlyUnitData = new PerformanceMonthlyUnitData(month.FiscalMonthID, month.FiscalYearID, rampUp, comparisonData.TrackingUnits, statistics.TrackingStats);
+            GoalSavings = new PerformanceMonthlySavingsData(month.FiscalMonthID, month.FiscalYearID, 1, comparisonData.GoalUnits, statistics.BaselineStats, GoalUnitVariance, IsInverse);
+            CommittedSavings = new PerformanceMonthlySavingsData(month.FiscalMonthID, month.FiscalYearID, rampUp, CommittedUnits, CommittedStats, CommittedUnitVariance, IsInverse);
+
+            ActualSavings = month.IsTrackedMonth
+                ? new PerformanceMonthlySavingsData(month.FiscalMonthID, month.FiscalYearID, rampUp, comparisonData.TrackingUnits, statistics.TrackingStats, ActualUnitVariance, IsInverse)
+                : new PerformanceMonthlySavingsData(month.FiscalMonthID, month.FiscalYearID, rampUp, 0, 0, 0, IsInverse);
+
+            CalculateYTDTracking(previousTrackingMonths.Concat(new[] { this }).ToList());
+
+        }
+
+        private void CalculateYTDTracking(IList<PerformanceTrackingMonth> trackingMonths)
+        {
+            trackingMonths.Where(tm => tm.Month.IsAfterEffectiveDate)
+                .ForEach(month =>
+                {
+                    BaselineMonthlyUnitData.UnitsYtd += month.BaselineMonthlyUnitData.Units;
+                    BaselineMonthlyUnitData.StatsYtd += month.BaselineMonthlyUnitData.Stats;
+
+                    GoalUnitsYtd += month.GoalUnits;
+                    CommittedUnitsYtd += month.CommittedUnits;
+
+                    CommittedSavings.UnitsYtd += month.CommittedSavings.Units;
+                    CommittedSavings.StatsYtd += month.CommittedSavings.Stats;
+
+                    TrackingMonthlyUnitData.UnitsYtd += month.TrackingMonthlyUnitData.Units;
+                    TrackingMonthlyUnitData.StatsYtd += month.TrackingMonthlyUnitData.Stats;
+
+                    GoalSavings.SavingsYtd += month.GoalSavings.Savings;
+                    CommittedSavings.SavingsYtd += month.CommittedSavings.Savings;
+                    ActualSavings.SavingsYtd += month.ActualSavings.Savings;
+                });
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/YearMonthContractResolver.cs b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/YearMonthContractResolver.cs
new file mode 100644
index 0000000..c0463ea
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PerformanceEngine/YearMonthContractResolver.cs
@@ -0,0 +1,23 @@
+using System.Reflection;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using Strata.ContinuousImprovement.Biz.Shared;
+
+namespace Strata.ContinuousImprovement.Biz.PerformanceEngine
+{
+    public class YearMonthContractResolver : DefaultContractResolver
+    {
+        public new static readonly YearMonthContractResolver Instance = new YearMonthContractResolver();
+
+        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+        {
+            var property = base.CreateProperty(member, memberSerialization);
+            if (property.DeclaringType == typeof(YearMonth) && property.PropertyName == "FiscalMonth")
+            {
+                property.Ignored = true;
+            }
+
+            return property;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/PickerItems/IPickerItemService.cs b/src/Strata.ContinuousImprovement.Biz/PickerItems/IPickerItemService.cs
new file mode 100644
index 0000000..93151db
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PickerItems/IPickerItemService.cs
@@ -0,0 +1,14 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.PickerItems
+{
+    public interface IPickerItemService
+    {
+        Task<IEnumerable<PickerItem>> GetItems<T>(Func<T, PickerItem> selector, CancellationToken cancellationToken) where T : class, IWithStrataId;
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/PickerItems/PickerItemService.cs b/src/Strata.ContinuousImprovement.Biz/PickerItems/PickerItemService.cs
new file mode 100644
index 0000000..2904ba9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/PickerItems/PickerItemService.cs
@@ -0,0 +1,33 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.PickerItems
+{
+    internal class PickerItemService : IPickerItemService
+    {
+        private readonly CentralDbContext _centralDbContext;
+        private readonly ClaimsPrincipal _user;
+        public PickerItemService(CentralDbContext centralDbContext, IClaimsPrincipalAccessor claimsPrincipalAccessor)
+        {
+            _centralDbContext = centralDbContext;
+            _user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+        }
+
+        public async Task<IEnumerable<PickerItem>> GetItems<T>(Func<T, PickerItem> selector, CancellationToken cancellationToken) where T : class, IWithStrataId
+        {
+            var pickerItems = await _centralDbContext.Set<T>().Where(item => item.StrataId == _user.GetStrataId())
+                .Select(item => selector(item)).ToListAsync(cancellationToken);
+            return pickerItems;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Population/ExplorationInclusionExclusion.cs b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationInclusionExclusion.cs
new file mode 100644
index 0000000..39b14a8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationInclusionExclusion.cs
@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Population
+{
+    [Table("exploration_inclusion_exclusions")]
+    public class ExplorationInclusionExclusion
+    {
+        public long ExplorationPopulationId { get; set; }
+        public long EncounterId { get; set; }
+        public bool IsExcluded { get; set; }
+        public int StrataId { get; set; }
+        public ExplorationPopulation ExplorationPopulation { get; set; }
+        public ExplorationInclusionExclusion() { }
+
+        public ExplorationInclusionExclusion(long explorationPopulationId, long encounterId, bool isExcluded)
+        {
+            ExplorationPopulationId = explorationPopulationId;
+            EncounterId = encounterId;
+            IsExcluded = isExcluded;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulation.cs b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulation.cs
new file mode 100644
index 0000000..ea019a2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulation.cs
@@ -0,0 +1,48 @@
+using Newtonsoft.Json;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Replication.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Population
+{
+    [Table("exploration_populations")]
+    public class ExplorationPopulation : IPostgresReplicable<DimExplorationPopulation>, IWithStrataId
+    {
+        [Key]
+        public long ExplorationPopulationId { get; set; }
+        public string Name { get; set; }
+        public int CaseTypeFamilyId { get; set; }
+        public string CostDriver { get; set; }
+        public short LosExclusionType { get; set; }
+        public decimal LosExclusionValue { get; set; }
+        public short CostExclusionType { get; set; }
+        public decimal CostExclusionValue { get; set; }
+        public string FiltersJSON { get; set; }
+        public int TotalEncounters { get; set; }
+        public decimal TotalVariation { get; set; }
+        public short CodeType { get; set; }
+        public int StrataId { get; set; }
+
+        public ICollection<ExplorationPopulationEncounter> ExplorationPopulationEncounters { get; set; }
+        public ICollection<ExplorationInclusionExclusion> ExplorationInclusionExclusions { get; set; }
+
+        [NotMapped]
+        public List<FilterChipItem> FilterChipItems => JsonConvert.DeserializeObject<List<FilterChipItem>>(this.FiltersJSON);
+
+        public (DateTime, DateTime) GetDischargeDates()
+        {
+            var dateFilter = FilterChipItems?.FirstOrDefault(f => f.ChipType == ChipType.DateRange && f.Key == ChipKey.DischargeDateID);
+            return dateFilter != null ? (dateFilter.DateRange.FirstOrDefault(), dateFilter.DateRange.LastOrDefault()) : (default, default);
+        }
+
+        public DimExplorationPopulation MapToSnowflakeModel()
+        {
+            return this.MapToDimExplorationPopulation();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulationEncounter.cs b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulationEncounter.cs
new file mode 100644
index 0000000..e775a46
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulationEncounter.cs
@@ -0,0 +1,27 @@
+using Strata.ContinuousImprovement.Biz.Replication.Models;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Population
+{
+    [Table("exploration_population_encounters")]
+    public class ExplorationPopulationEncounter : IPostgresReplicable<FactExplorationPopulationEncounter>
+    {
+        public long ExplorationPopulationId { get; set; }
+        public long EncounterId { get; set; }
+        public int StrataId { get; set; }
+        public ExplorationPopulation ExplorationPopulation { get; set; }
+        public ExplorationPopulationEncounter() { }
+
+        public ExplorationPopulationEncounter(long explorationPopulationId, long encounterId)
+        {
+            ExplorationPopulationId = explorationPopulationId;
+            EncounterId = encounterId;
+        }
+
+        public FactExplorationPopulationEncounter MapToSnowflakeModel()
+        {
+            return this.MapToFactExplorationPopulationEncounter();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulationMapper.cs b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulationMapper.cs
new file mode 100644
index 0000000..b385630
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulationMapper.cs
@@ -0,0 +1,32 @@
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Replication.Models;
+using Strata.DecisionSupport.Models.Jazz;
+
+namespace Strata.ContinuousImprovement.Biz.Population
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class ExplorationPopulationMapper
+    {
+        public static ExplorationPopulationDto MapToExplorationPopulationDto(this ExplorationPopulation src)
+        {
+            var mapped = src.Mapped();
+            if (mapped == null) return default;
+
+            return mapped;
+        }
+
+        [MapperIgnoreSource(nameof(ExplorationPopulation.FilterChipItems))]
+        public static partial ExplorationPopulationInfo MapToExplorationPopulationInfo(this ExplorationPopulation src);
+
+        [MapperIgnoreSource(nameof(ExplorationPopulation.ExplorationPopulationEncounters))]
+        [MapperIgnoreSource(nameof(ExplorationPopulation.ExplorationInclusionExclusions))]
+        [MapperIgnoreTarget(nameof(ExplorationPopulationDto.ExplorationPopulationEncounters))]
+        [MapperIgnoreTarget(nameof(ExplorationPopulationDto.ExplorationInclusionExclusions))]
+        private static partial ExplorationPopulationDto Mapped(this ExplorationPopulation src);
+
+        public static partial DimExplorationPopulation MapToDimExplorationPopulation(this ExplorationPopulation src);
+
+        public static partial FactExplorationPopulationEncounter MapToFactExplorationPopulationEncounter(this ExplorationPopulationEncounter src);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulationReplicationJob.cs b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulationReplicationJob.cs
new file mode 100644
index 0000000..bfaed87
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulationReplicationJob.cs
@@ -0,0 +1,58 @@
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Replication;
+using Strata.ContinuousImprovement.Biz.Replication.Models;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Population
+{
+    internal class ExplorationPopulationReplicationJob
+    {
+        private const string EXPLORATION_POPULATION_TABLE = "cci.DimExplorationPopulation";
+        private const string EXPLORATION_POPULATION_ENCOUNTER_TABLE = "cci.FactExplorationPopulationEncounter";
+        private readonly CentralDbContext _centralDbContext;
+        private readonly IPostgresReplicationService _postgresReplicationService;
+        private readonly ILogger<ExplorationPopulationReplicationJob> _logger;
+
+        public ExplorationPopulationReplicationJob(
+             CentralDbContext centralDbContext,
+             IPostgresReplicationService postgresReplicationService,
+             ILogger<ExplorationPopulationReplicationJob> logger)
+        {
+            _centralDbContext = centralDbContext;
+            _postgresReplicationService = postgresReplicationService;
+            _logger = logger;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Replicate ExplorationPopulations to All Clients")]
+        [Semaphore(nameof(ReplicateAllClientExplorationPopulations))]
+        public async Task ReplicateAllClientExplorationPopulations(CancellationToken cancellationToken)
+        {
+            try
+            {
+                var expPopulationsByClient = await _centralDbContext.ExplorationPopulations.Where(exp => exp.StrataId != 0).GroupBy(exp => exp.StrataId).ToListAsync();
+                await _postgresReplicationService.Replicate<ExplorationPopulation, DimExplorationPopulation>(expPopulationsByClient, EXPLORATION_POPULATION_TABLE, cancellationToken);
+
+                var expPopEncountersByClient = await _centralDbContext.ExplorationPopulationEncounters.Where(exp => exp.StrataId != 0).GroupBy(exp => exp.StrataId).ToListAsync();
+                await _postgresReplicationService.Replicate<ExplorationPopulationEncounter, FactExplorationPopulationEncounter>
+                    (expPopEncountersByClient, EXPLORATION_POPULATION_ENCOUNTER_TABLE, cancellationToken);
+
+                _logger.LogServiceInformation("Replication of Exploration Population tables completed successfully.");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, "Replication of Exploration Population tables failed.");
+                throw;
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulationService.cs b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulationService.cs
new file mode 100644
index 0000000..3e0d35e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationPopulationService.cs
@@ -0,0 +1,686 @@
+using Hangfire;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Replication;
+using Strata.ContinuousImprovement.Biz.Replication.Models;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.DecisionSupport.Models.Jazz;
+using Strata.FeatureFlags.Client;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Hangfire.Jazz.Client.Models;
+using Strata.Id.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+
+namespace Strata.ContinuousImprovement.Biz.Population
+{
+    public class ExplorationPopulationService : IExplorationPopulationService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _jazzContextFactory;
+        private readonly CentralDbContext _centralDbContext;
+        private readonly ClaimsPrincipal _user;
+        private readonly IJazzHangfireServiceClient _hangfireServiceClient;
+        private readonly IBackgroundJobClient _backgroundJobClient;
+        private readonly IConfigurationService _configurationService;
+        private readonly ILogger<ExplorationPopulationService> _logger;
+        private readonly IPostgresReplicationService _postgresReplicationService;
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly IFeatureFlagServiceClient _featureFlagServiceClient;
+
+        public ExplorationPopulationService(IAsyncDbContextFactory<JazzDbContext> jazzContextFactory, CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor, IJazzHangfireServiceClient hangfireServiceClient, IBackgroundJobClient backgroundJobClient,
+            IConfigurationService configurationService, ILogger<ExplorationPopulationService> logger, IPostgresReplicationService postgresReplicationService,
+            IIdServiceClient idServiceClient, IFeatureFlagServiceClient featureFlagServiceClient)
+        {
+            _jazzContextFactory = jazzContextFactory;
+            _user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+            _centralDbContext = centralDbContext;
+            _hangfireServiceClient = hangfireServiceClient;
+            _backgroundJobClient = backgroundJobClient;
+            _configurationService = configurationService;
+            _logger = logger;
+            _postgresReplicationService = postgresReplicationService;
+            _idServiceClient = idServiceClient;
+            _featureFlagServiceClient = featureFlagServiceClient;
+        }
+
+        public async Task<bool> IsNameUnique(string name, CancellationToken cancellationToken)
+        {
+            var result = await _centralDbContext.ExplorationPopulations.Where(item => item.StrataId == _user.GetStrataId()).Select(item => item.Name).ContainsAsync(name, cancellationToken);
+            return !result;
+        }
+
+        public async Task<bool> AddPopulationAsync(ExplorationPopulationDto populationDto, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _jazzContextFactory.CreateDbContextAsync(cancellationToken);
+            var isUnique = await IsNameUnique(populationDto.Name, cancellationToken);
+
+            if (!isUnique)
+            {
+                var item = await _centralDbContext.ExplorationPopulations.FirstOrDefaultAsync(item => item.Name == populationDto.Name && item.StrataId == _user.GetStrataId(), cancellationToken);
+                populationDto.ExplorationPopulationId = item.ExplorationPopulationId;
+
+                return await UpdatePopulationAsync(populationDto, cancellationToken);
+            }
+            else
+            {
+                var strategy = _centralDbContext.Database.CreateExecutionStrategy();
+
+                var isAdded = await strategy.ExecuteAsync(async () =>
+                {
+                    using var transaction = await dbContext.Database.BeginTransactionAsync();
+                    using var centralTransaction = await _centralDbContext.Database.BeginTransactionAsync();
+                    try
+                    {
+                        var population = (ExplorationPopulation)populationDto;
+                        population.StrataId = _user.GetStrataId();
+                        _centralDbContext.ExplorationPopulations.Add(population);
+
+                        var isPopulationAdded = await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+
+                        var databaseGuid = _user.GetDatabaseGuid();
+                        dbContext.DimCaseTypes.Add(new DimCaseType
+                        {
+                            Name = population.Name,
+                            CaseTypeFamilyId = population.CaseTypeFamilyId,
+                            CaseTypeconfigJSON = "{}",
+                            IsAllEntity = true,
+                            CaseTypeCategory = (int)CaseTypeCategories.ExplorationPopulation,
+                            ExplorationPopulationId = population.ExplorationPopulationId
+                        });
+
+                        await dbContext.SaveChangesAsync(cancellationToken);
+
+                        var mappings = populationDto.MappingEncounterIds.Select(encID =>
+                            new ExplorationPopulationEncounter(population.ExplorationPopulationId, encID) { StrataId = _user.GetStrataId() });
+                        _centralDbContext.ExplorationPopulationEncounters.AddRange(mappings);
+
+                        var excludedEncounters = populationDto.ManuallyExcludedEncounterIds.Select(encID =>
+                            new ExplorationInclusionExclusion(population.ExplorationPopulationId, encID, true) { StrataId = _user.GetStrataId() });
+                        _centralDbContext.ExplorationInclusionExclusions.AddRange(excludedEncounters);
+
+                        var includedEncounters = populationDto.ManuallyIncludedEncounterIds.Select(encID =>
+                            new ExplorationInclusionExclusion(population.ExplorationPopulationId, encID, false) { StrataId = _user.GetStrataId() });
+                        _centralDbContext.ExplorationInclusionExclusions.AddRange(includedEncounters);
+
+                        await _centralDbContext.SaveChangesAsync(cancellationToken);
+
+                        await transaction.CommitAsync();
+                        await centralTransaction.CommitAsync();
+
+                        await ReplicateExplorationPopulations(cancellationToken);
+
+                        return isPopulationAdded;
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogServiceError(ex);
+                        await transaction.RollbackAsync();
+                        await centralTransaction.RollbackAsync();
+                        throw;
+                    }
+                });
+
+                return isAdded;
+            }
+        }
+
+        public async Task<bool> UpdatePopulationAsync(ExplorationPopulationDto populationDto, CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user?.GetDatabaseGuid() ?? Guid.Empty;
+            var strataId = _user.GetStrataId();
+            var strategicOpportunityWizardFeatureFlag = await _featureFlagServiceClient
+                .IsEnabledAsync(FeatureFlagLookup.Values[FeatureFlag.CiExplorationPopulationStrategicOpportunityWizard], databaseGuid, cancellationToken: cancellationToken);
+            var strategicOpportunities = new List<StrategicOpportunityChargeCode>();
+
+            if (strategicOpportunityWizardFeatureFlag)
+            {
+                strategicOpportunities = await _centralDbContext.StrategicOpportunityChargeCodes
+                    .Where(x => x.ExplorationPopulationId == populationDto.ExplorationPopulationId && x.StrataId == strataId)
+                    .ToListAsync(cancellationToken);
+
+                if (strategicOpportunities.Any(x => x.Status >= (byte)StrategicOpportunityStatus.NewInitiative))
+                    return false;
+            }
+
+            var strategy = _centralDbContext.Database.CreateExecutionStrategy();
+
+            var isUpdated = await strategy.ExecuteAsync(async () =>
+            {
+                using var transaction = await _centralDbContext.Database.BeginTransactionAsync();
+                try
+                {
+                    var population = (ExplorationPopulation)populationDto;
+                    population.StrataId = strataId;
+                    _centralDbContext.ExplorationPopulations.Update(population);
+
+                    var savedMappings = await _centralDbContext.ExplorationPopulationEncounters.Where(item => item.ExplorationPopulationId == populationDto.ExplorationPopulationId
+                        && item.StrataId == strataId).ToListAsync(cancellationToken);
+                    var savedMappingIds = savedMappings.Select(item => item.EncounterId);
+                    var deleteMappingIds = savedMappingIds.Except(populationDto.MappingEncounterIds).ToList();
+                    var newMappings = populationDto.MappingEncounterIds.Except(savedMappingIds).Select(encID =>
+                        new ExplorationPopulationEncounter(population.ExplorationPopulationId, encID) { StrataId = strataId });
+                    var deleteMappings = savedMappings.Where(item => deleteMappingIds.Contains(item.EncounterId));
+
+                    _centralDbContext.ExplorationPopulationEncounters.RemoveRange(deleteMappings);
+                    _centralDbContext.ExplorationPopulationEncounters.AddRange(newMappings);
+
+                    var explorationInclusionExclusions = _centralDbContext.ExplorationInclusionExclusions.Where(item => item.ExplorationPopulationId == populationDto.ExplorationPopulationId
+                        && item.StrataId == strataId);
+                    var explorationInclusionExclusionIds = explorationInclusionExclusions.Select(item => item.EncounterId);
+
+                    var deleteIds = await explorationInclusionExclusionIds.Except(populationDto.ManuallyExcludedEncounterIds).Except(populationDto.ManuallyIncludedEncounterIds).ToListAsync();
+                    var deleteItems = explorationInclusionExclusions.Where(item => deleteIds.Contains(item.EncounterId));
+                    var newExc = populationDto.ManuallyExcludedEncounterIds.Except(explorationInclusionExclusionIds);
+                    var newInc = populationDto.ManuallyIncludedEncounterIds.Except(explorationInclusionExclusionIds);
+
+                    _centralDbContext.ExplorationInclusionExclusions.RemoveRange(deleteItems);
+                    _centralDbContext.ExplorationInclusionExclusions.AddRange(newExc.Select(encID =>
+                        new ExplorationInclusionExclusion(population.ExplorationPopulationId, encID, true) { StrataId = strataId }));
+                    _centralDbContext.ExplorationInclusionExclusions.AddRange(newInc.Select(encID =>
+                        new ExplorationInclusionExclusion(population.ExplorationPopulationId, encID, false) { StrataId = strataId }));
+
+                    var isUpdated = await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+                    await transaction.CommitAsync();
+
+                    if (isUpdated) await ReplicateExplorationPopulations(cancellationToken);
+
+                    return isUpdated;
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogServiceError(ex);
+                    await transaction.RollbackAsync();
+                    throw;
+                }
+            });
+
+            if (strategicOpportunityWizardFeatureFlag && strategicOpportunities.Any())
+            {
+                foreach (var opportunity in strategicOpportunities)
+                {
+                    _backgroundJobClient.Enqueue<StrategicOpportunityJob>(job =>
+                        job.RefreshAssociatedOpportunity(strataId, opportunity.OpportunityId, CancellationToken.None));
+                }
+            }
+
+            return isUpdated;
+        }
+
+        public async Task<bool> UpdatePopulationMappingsAsync(long explorationPopulationId, IEnumerable<long> newIncludedEncounterIds, IEnumerable<long> newExcludedEncounterIds, CancellationToken cancellationToken)
+        {
+            var strategy = _centralDbContext.Database.CreateExecutionStrategy();
+
+            var isUpdated = await strategy.ExecuteAsync(async () =>
+            {
+                using var transaction = await _centralDbContext.Database.BeginTransactionAsync();
+                try
+                {
+                    // update ExplorationPopulationMappings
+                    var savedMappings = await _centralDbContext.ExplorationPopulationEncounters.Where(x => x.ExplorationPopulationId == explorationPopulationId
+                        && x.StrataId == _user.GetStrataId()).ToListAsync(cancellationToken);
+                    var savedMappingEncounterIds = savedMappings.Select(x => x.EncounterId);
+
+                    var toDeleteMappingIds = savedMappingEncounterIds.Except(newIncludedEncounterIds);
+                    var toDeleteMappings = savedMappings.Where(x => toDeleteMappingIds.Contains(x.EncounterId));
+                    _centralDbContext.ExplorationPopulationEncounters.RemoveRange(toDeleteMappings);
+
+                    var newMappings = newIncludedEncounterIds.Except(savedMappingEncounterIds).Select(encID =>
+                        new ExplorationPopulationEncounter(explorationPopulationId, encID) { StrataId = _user.GetStrataId() });
+                    _centralDbContext.ExplorationPopulationEncounters.AddRange(newMappings);
+
+                    // update ExplorationInclusionExclusions
+                    var toDeleteInclusionExclusions = await _centralDbContext.ExplorationInclusionExclusions.Where(x => x.ExplorationPopulationId == explorationPopulationId && x.StrataId == _user.GetStrataId()
+                        && ((!newIncludedEncounterIds.Contains(x.EncounterId) && !x.IsExcluded) || (!newExcludedEncounterIds.Contains(x.EncounterId) && x.IsExcluded))).ToListAsync(cancellationToken);
+                    _centralDbContext.ExplorationInclusionExclusions.RemoveRange(toDeleteInclusionExclusions);
+
+                    var isUpdated = await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+                    transaction.Commit();
+
+                    return isUpdated;
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogServiceError(ex);
+                    transaction.Rollback();
+                    throw;
+                }
+            });
+
+            return isUpdated;
+        }
+
+        public async Task<bool> UpdatePopulationName(long explorationPopulationId, string populationName, CancellationToken cancellationToken)
+        {
+            var population = await _centralDbContext.ExplorationPopulations
+                .FirstOrDefaultAsync(item => item.ExplorationPopulationId == explorationPopulationId && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            if (population == null) return false;
+            
+            population.Name = populationName;
+            var isUpdated = await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+            return isUpdated;
+        }
+
+        public async Task<IEnumerable<ExplorationPopulationDataDto>> GetPopulationsAsync(CancellationToken cancellationToken)
+        {
+            try
+            {
+                var databaseGuid = _user?.GetDatabaseGuid() ?? Guid.Empty;
+                var opportunities = await GetPopulationOpportunitiesAsync(null, cancellationToken);
+
+                var items = await _centralDbContext.ExplorationPopulations.Where(x => x.StrataId == _user.GetStrataId()).Select(item => new ExplorationPopulationDataDto()
+                {
+                    ExplorationPopulationId = item.ExplorationPopulationId,
+                    Name = item.Name,
+                    TotalEncounters = item.TotalEncounters,
+                    TotalVariation = item.TotalVariation,
+                    StartDischargeDate = item.MapToExplorationFilter().DischargeDateStart,
+                    EndDischargeDate = item.MapToExplorationFilter().DischargeDateEnd,
+                    Opportunities = opportunities[item.ExplorationPopulationId]
+                }).OrderBy(item => item.Name).ToListAsync(cancellationToken);
+
+                if (!await _featureFlagServiceClient.IsEnabledAsync(FeatureFlagLookup.Values[FeatureFlag.CiExplorationPopulationStrategicOpportunityWizard], databaseGuid, cancellationToken: cancellationToken))
+                    return items;
+
+                var explorationPopulationIds = items.Select(x => x.ExplorationPopulationId).ToList();
+
+                var strategicCounts = await _centralDbContext.StrategicOpportunityChargeCodes
+                    .Where(x => explorationPopulationIds.Contains(x.ExplorationPopulationId) && x.StrataId == _user.GetStrataId())
+                    .GroupBy(x => x.ExplorationPopulationId)
+                    .Select(x => new
+                    {
+                        ExplorationPopulationId = x.Key,
+                        AssociatedOpportunitiesCount = x.Count(x => x.Status < (byte)StrategicOpportunityStatus.NewInitiative),
+                        AssociatedInitiativesCount = x.Count(x => x.Status >= (byte)StrategicOpportunityStatus.NewInitiative)
+                    })
+                    .ToListAsync(cancellationToken);
+
+                var countLookup = strategicCounts.ToDictionary(x => x.ExplorationPopulationId);
+
+                foreach (var item in items)
+                {
+                    if (countLookup.TryGetValue(item.ExplorationPopulationId, out var counts))
+                    {
+                        item.AssociatedOpportunitiesCount = counts.AssociatedOpportunitiesCount;
+                        item.AssociatedInitiativesCount = counts.AssociatedInitiativesCount;
+                    }
+                }
+
+                return items;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, "Error getting exploration populations");
+                throw;
+            }
+        }
+
+        public async Task<ILookup<long, ExplorationPopulationOpportunityDto>> GetPopulationOpportunitiesAsync(IEnumerable<long> explorationPopulationIds, CancellationToken cancellationToken)
+        {
+            if (_user == null)
+            {
+                throw new InvalidOperationException("User context is required to get population opportunities.");
+            }
+            var databaseGuid = _user.GetDatabaseGuid();
+            var strataId = _user.GetStrataId();
+            List<ExplorationPopulationOpportunityDto> opportunities = [];
+
+            if (await _featureFlagServiceClient.IsEnabledAsync(FeatureFlagLookup.Values[FeatureFlag.CiExplorationPopulationStrategicOpportunityWizard], databaseGuid, cancellationToken: cancellationToken))
+            {
+                var strategicOpportunitiesDtos = await (
+                    from socc in _centralDbContext.StrategicOpportunityChargeCodes
+                    join so in _centralDbContext.StrategicOpportunities
+                    on socc.OpportunityId equals so.OpportunityId
+                    where socc.ExplorationPopulationId != 0 && socc.StrataId == strataId
+                    select new ExplorationPopulationOpportunityDto
+                        {
+                            OpportunityId = so.OpportunityId,
+                            ExplorationPopulationId = socc.ExplorationPopulationId,
+                            BaselineStartDate = so.BaselineStartDate.ToDateTime(TimeOnly.MinValue),
+                            BaselineEndDate = so.BaselineEndDate.ToDateTime(TimeOnly.MinValue)
+                        }
+                    ).ToListAsync(cancellationToken);
+
+                opportunities.AddRange(strategicOpportunitiesDtos);
+            }
+            else
+            {
+                await using var dbContext = await _jazzContextFactory.CreateDbContextAsync(cancellationToken);
+
+                var populationOpportunitiesQuery = new PopulationOpportunitiesQuery(explorationPopulationIds);
+                var query = FormattableStringFactory.Create(populationOpportunitiesQuery.GetQuery());
+                opportunities = await dbContext.Database.SqlQuery<ExplorationPopulationOpportunityDto>(query).ToListAsync(cancellationToken);
+            }
+
+            var configurations = await _configurationService.GetConfigurationsAsync(cancellationToken);
+            var opportunityExplorationPopulationIds = opportunities.Select(item => item.ExplorationPopulationId);
+            var explorationPopulations = await _centralDbContext.ExplorationPopulations.Where(item => opportunityExplorationPopulationIds.Contains(item.ExplorationPopulationId)
+                && item.StrataId == strataId).ToListAsync(cancellationToken);
+
+            if (opportunities.Count > 0)
+            {
+                opportunities.ForEach(opp =>
+                {
+                    var configuration = configurations.FirstOrDefault(item => item.ConfigurationGuid == opp.ConfigurationGuid);
+                    var explorationPopulation = explorationPopulations.FirstOrDefault(item => item.ExplorationPopulationId == opp.ExplorationPopulationId);
+
+                    if (explorationPopulation != null && configuration != null)
+                    {
+                        var explorationPopulationDischargeDates = explorationPopulation.GetDischargeDates();
+
+                        opp.BaselineStartDate = explorationPopulationDischargeDates.Item1;
+                        opp.BaselineEndDate = explorationPopulationDischargeDates.Item2;
+
+                        if (opp.InitiativeGuid != Guid.Empty && configuration != null)
+                        {
+                            opp.TrackingStartDate = GetTrackingStartDate(explorationPopulationDischargeDates.Item2, configuration);
+                            opp.TrackingEndDate = configuration.GetTrackingEndDate();
+                        }
+                    }
+                });
+            }
+            return opportunities.ToLookup(x => x.ExplorationPopulationId);
+        }
+
+        public DateTime GetTrackingStartDate(DateTime dischargeEndDate, Configuration.Configuration configuration)
+        {
+            return dischargeEndDate.AddDays(1) < configuration.GetTrackingStartDate(Generics.OpportunityTypes.Exploration)
+                            ? configuration.GetTrackingStartDate(Generics.OpportunityTypes.Exploration)
+                            : dischargeEndDate.AddDays(1);
+        }
+
+        public async Task<(DateTime, DateTime)> GetDischargeDates(long explorationPopulationId, CancellationToken cancellationToken)
+        {
+            var expPopulation = await _centralDbContext.ExplorationPopulations.FirstAsync(item => item.ExplorationPopulationId == explorationPopulationId && item.StrataId == _user.GetStrataId(), cancellationToken);
+            return expPopulation.GetDischargeDates();
+        }
+
+        public async Task<IDictionary<long, int>> GetPopulationCountOpportunitiesAsync(IEnumerable<long> explorationPopulationIds, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _jazzContextFactory.CreateDbContextAsync(cancellationToken);
+
+            var populationOpportunitiesQuery = new PopulationOpportunitiesQuery(explorationPopulationIds);
+            var query = FormattableStringFactory.Create(populationOpportunitiesQuery.GetCountQuery());
+
+            var opportunities = await dbContext.Database.SqlQuery<KeyValueDto<long, int>>(query).ToListAsync(cancellationToken);
+
+            return opportunities.ToDictionary(x => x.Key, x => x.Value);
+        }
+
+        public async Task<ExplorationPopulationDto> GetPopulationDataAsync(long populationId, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var databaseGuid = _user?.GetDatabaseGuid() ?? Guid.Empty;
+                var explorationInclusionExclusions = await _centralDbContext.ExplorationInclusionExclusions.Where(item => item.ExplorationPopulationId == populationId
+                    && item.StrataId == _user.GetStrataId()).ToListAsync(cancellationToken);
+                var expPopulation = await _centralDbContext.ExplorationPopulations.FirstAsync(item => item.ExplorationPopulationId == populationId && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+                ExplorationPopulationDto result = expPopulation.MapToExplorationPopulationDto();
+                result.ManuallyExcludedEncounterIds = explorationInclusionExclusions.Where(x => x.IsExcluded).Select(x => x.EncounterId).ToList();
+                result.ManuallyIncludedEncounterIds = explorationInclusionExclusions.Where(x => !x.IsExcluded).Select(x => x.EncounterId).ToList();
+
+                if (await _featureFlagServiceClient.IsEnabledAsync(FeatureFlagLookup.Values[FeatureFlag.CiExplorationPopulationStrategicOpportunityWizard], databaseGuid, cancellationToken: cancellationToken))
+                {
+                    var opportunities = _centralDbContext.StrategicOpportunityChargeCodes.Where(x => x.ExplorationPopulationId == populationId && x.StrataId == _user.GetStrataId());
+
+                    result.AssociatedOpportunitiesCount = await opportunities.CountAsync(x => x.Status < (byte)StrategicOpportunityStatus.NewInitiative, cancellationToken);
+                    result.AssociatedInitiativesCount = await opportunities.CountAsync(x => x.Status >= (byte)StrategicOpportunityStatus.NewInitiative, cancellationToken);
+                }
+
+                var counts = await GetPopulationCountOpportunitiesAsync([populationId], cancellationToken);
+                if (counts.TryGetValue(populationId, out int opportunitiesCount))
+                {
+                    result.OpportunitiesCount = opportunitiesCount;
+                }
+
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogContextError(ex, _centralDbContext, nameof(GetPopulationDataAsync));
+                throw;
+            }
+        }
+
+        public async Task<ExplorationPopulationDetailsDto> GetPopulationDetailsAsync(long populationId, CancellationToken cancellationToken)
+        {
+            var databaseGuid = _user?.GetDatabaseGuid() ?? Guid.Empty;
+            var strategicsItems = new List<StrategicOpportunityChargeCode>();
+
+            var explorationPopulation = await _centralDbContext.ExplorationPopulations.FirstOrDefaultAsync(item => item.ExplorationPopulationId == populationId
+                && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            if (explorationPopulation == null) return null;
+
+            var hasManuallyChangeEncounters = await _centralDbContext.ExplorationInclusionExclusions.AnyAsync(item => item.ExplorationPopulationId == populationId
+                && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            var featureFlag = await _featureFlagServiceClient.IsEnabledAsync(FeatureFlagLookup.Values[FeatureFlag.CiExplorationPopulationStrategicOpportunityWizard], databaseGuid, cancellationToken: cancellationToken);
+
+            if (featureFlag)
+                strategicsItems = await _centralDbContext.StrategicOpportunityChargeCodes.Where(x => x.ExplorationPopulationId == populationId && x.StrataId == _user.GetStrataId()).ToListAsync(cancellationToken);
+
+            var explorationPopulationDetails = new ExplorationPopulationDetailsDto
+            {
+                ExplorationPopulationId = explorationPopulation.ExplorationPopulationId,
+                Name = explorationPopulation.Name,
+                CostDriver = explorationPopulation.CostDriver,
+                ExclusionCriteria = new ExclusionCriteria
+                {
+                    CostExclusionType = (ExclusionCriteriaType)explorationPopulation.CostExclusionType,
+                    CostExclusionValue = (double)explorationPopulation.CostExclusionValue,
+                    LosExclusionType = (ExclusionCriteriaType)explorationPopulation.LosExclusionType,
+                    LosExclusionValue = (double)explorationPopulation.LosExclusionValue
+                },
+                Filters = explorationPopulation.FilterChipItems,
+                HasManuallyChangeEncounters = hasManuallyChangeEncounters,
+                AssociatedOpportunities = featureFlag ? [.. strategicsItems.Where(x => x.Status < (byte)StrategicOpportunityStatus.NewInitiative).Select(x => new ExplorationPopulationStrategicOpportunityDto(x.OpportunityId, x.Name))] : [],
+                AssociatedInitiatives = featureFlag ? [.. strategicsItems.Where(x => x.Status >= (byte)StrategicOpportunityStatus.NewInitiative).Select(x => new ExplorationPopulationStrategicOpportunityDto(x.OpportunityId, x.Name))] : []
+            };
+
+            return explorationPopulationDetails;
+        }
+
+        public async Task<IExplorationPopulationInfo> GetPopulationInfoAsync(long populationId, CancellationToken cancellationToken)
+        {
+            var population = await _centralDbContext.ExplorationPopulations.FirstOrDefaultAsync(item => item.ExplorationPopulationId == populationId
+                && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            return population?.MapToExplorationPopulationInfo();
+        }
+
+        public async Task<bool> DeletePopulation(long populationId, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _jazzContextFactory.CreateDbContextAsync(cancellationToken);
+
+            var explorationPopulation = await _centralDbContext.ExplorationPopulations.SingleOrDefaultAsync(item => item.ExplorationPopulationId == populationId
+                && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            var strategy = _centralDbContext.Database.CreateExecutionStrategy();
+
+            var isDeleted = await strategy.ExecuteAsync(async () =>
+            {
+                using var transaction = await dbContext.Database.BeginTransactionAsync();
+                using var centralTransaction = await _centralDbContext.Database.BeginTransactionAsync();
+                try
+                {
+                    var mappings = _centralDbContext.ExplorationPopulationEncounters.Where(item => item.ExplorationPopulationId == populationId && item.StrataId == _user.GetStrataId());
+                    _centralDbContext.ExplorationPopulationEncounters.RemoveRange(mappings);
+
+                    var manuallyChangeEncounters = _centralDbContext.ExplorationInclusionExclusions.Where(item => item.ExplorationPopulationId == populationId && item.StrataId == _user.GetStrataId());
+                    _centralDbContext.ExplorationInclusionExclusions.RemoveRange(manuallyChangeEncounters);
+
+                    await _centralDbContext.SaveChangesAsync(cancellationToken);
+
+                    var dimCaseType = dbContext.DimCaseTypes.Where(item => item.ExplorationPopulationId == populationId);
+                    dbContext.DimCaseTypes.RemoveRange(dimCaseType);
+
+                    await dbContext.SaveChangesAsync(cancellationToken);
+
+                    _centralDbContext.ExplorationPopulations.Remove(explorationPopulation);
+
+                    var isDeleted = await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+                    await transaction.CommitAsync();
+                    await centralTransaction.CommitAsync();
+
+                    if (isDeleted) await ReplicateExplorationPopulations(cancellationToken);
+
+                    return isDeleted;
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogServiceError(ex);
+                    await transaction.RollbackAsync();
+                    await centralTransaction.RollbackAsync();
+                    throw;
+                }
+            });
+
+            return isDeleted;
+        }
+
+        public async Task<ExplorationPopulationDataDto> DuplicatePopulation(long explorationPopulationId, string populationName, CancellationToken cancellationToken)
+        {
+            var strataId = _user.GetStrataId();
+
+            var population = await _centralDbContext.ExplorationPopulations
+                .FirstOrDefaultAsync(item => item.ExplorationPopulationId == explorationPopulationId && item.StrataId == strataId, cancellationToken);
+
+            if (population == null) return null;
+
+            var explorationPopulation = await GetPopulationDataAsync(explorationPopulationId, cancellationToken);
+            explorationPopulation.ExplorationPopulationId = 0;
+            explorationPopulation.Name = populationName;
+
+            var mappings = await _centralDbContext.ExplorationPopulationEncounters.Where(item => item.ExplorationPopulationId == explorationPopulationId
+                && item.StrataId == strataId).ToListAsync(cancellationToken);
+
+            explorationPopulation.MappingEncounterIds = [.. mappings.Select(item => item.EncounterId)];
+            explorationPopulation.ManuallyExcludedEncounterIds ??= [];
+            explorationPopulation.ManuallyIncludedEncounterIds ??= [];
+
+            await AddPopulationAsync(explorationPopulation, cancellationToken);
+
+            if (explorationPopulation.ExplorationPopulationId == 0) return null;
+
+            var expPopulationFilter = explorationPopulation.MapToExplorationFilter();
+
+            var duplicatedPopulation = new ExplorationPopulationDataDto()
+            {
+                ExplorationPopulationId = explorationPopulation.ExplorationPopulationId,
+                Name = explorationPopulation.Name,
+                TotalEncounters = explorationPopulation.TotalEncounters,
+                TotalVariation = explorationPopulation.TotalVariation,
+                AssociatedInitiativesCount = 0,
+                AssociatedOpportunitiesCount = 0,
+                StartDischargeDate = expPopulationFilter.DischargeDateStart,
+                EndDischargeDate = expPopulationFilter.DischargeDateEnd,
+                Opportunities = []
+            };
+
+            return duplicatedPopulation;
+        }
+
+        public async Task<bool> ContainsPopulation(long populationId, CancellationToken cancellationToken)
+        {
+            var explorationPopulation = await _centralDbContext.ExplorationPopulations.AnyAsync(item => item.ExplorationPopulationId == populationId
+                && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            return explorationPopulation;
+        }
+
+        public async Task<bool> CreateExplorationPopulationOpportunity(Guid configurationGuid, long populationId, bool waitForJob, CancellationToken cancellationToken)
+        {
+            try
+            {
+                await using var dbContext = await _jazzContextFactory.CreateDbContextAsync(cancellationToken);
+                if (dbContext != null)
+                {
+                    var caseType = await dbContext.DimCaseTypes.SingleOrDefaultAsync(x => x.ExplorationPopulationId == populationId);
+                    if (caseType != null)
+                    {
+                        var caseTypeGuids = new List<Guid>() { caseType.MemberGUID };
+                        var jobId = await RunExplorationVariationSavingsJob(configurationGuid, caseTypeGuids, cancellationToken);
+
+                        if (waitForJob)
+                        {
+                            var result = await _hangfireServiceClient.WaitForJob(jobId, cancellationToken);
+                            return result;
+                        }
+                        else
+                        {
+                            return true;
+                        }
+
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, "Error adding exploration population opportunity");
+                throw;
+            }
+            return false;
+        }
+
+        public async Task<bool> ReplicateExplorationPopulations(CancellationToken cancellationToken)
+        {
+            const string EXPLORATION_POPULATION_TABLE = "cci.DimExplorationPopulation";
+            const string EXPLORATION_POPULATION_ENCOUNTER_TABLE = "cci.FactExplorationPopulationEncounter";
+
+            try
+            {
+                var strataId = await _idServiceClient.GetStrataId(_user.GetDatabaseGuid(), cancellationToken);
+
+                var expPopulationsByClient = await _centralDbContext.ExplorationPopulations.Where(exp => exp.StrataId == strataId).GroupBy(exp => exp.StrataId).ToListAsync();
+                await _postgresReplicationService.Replicate<ExplorationPopulation, DimExplorationPopulation>(expPopulationsByClient, EXPLORATION_POPULATION_TABLE, cancellationToken);
+
+                var expPopEncountersByClient = await _centralDbContext.ExplorationPopulationEncounters.Where(exp => exp.StrataId == strataId).GroupBy(exp => exp.StrataId).ToListAsync();
+                await _postgresReplicationService.Replicate<ExplorationPopulationEncounter, FactExplorationPopulationEncounter>
+                    (expPopEncountersByClient, EXPLORATION_POPULATION_ENCOUNTER_TABLE, cancellationToken);
+
+                _logger.LogServiceInformation("Replication of Exploration Population tables completed successfully.");
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, "Replication of Exploration Population tables failed.");
+                return false;
+            }
+        }
+
+        private async Task<Guid> RunExplorationVariationSavingsJob(Guid configurationGuid, IEnumerable<Guid> caseTypeGuids, CancellationToken cancellationToken)
+        {
+            var runSavingsJob = new EnqueueJobDto
+            {
+                TaskName = "Strata.CS.Jazz.Biz.CCI.Tasks.Exploration.RunExplorationVariationSavingsTask, Strata.CS.Jazz.Biz.CCI",
+                ContextData = JsonConvert.SerializeObject(new { configurationGuid, caseTypeGuids })
+            };
+
+            var response = await _hangfireServiceClient.EnqueueJobAsync(runSavingsJob, cancellationToken);
+            return response.JobId;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Population/ExplorationVariationOpportunityDataModel.cs b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationVariationOpportunityDataModel.cs
new file mode 100644
index 0000000..c745f83
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Population/ExplorationVariationOpportunityDataModel.cs
@@ -0,0 +1,32 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Population
+{
+    [Table("ExplorationVariationOpportunity", Schema = "cci")]
+    public class ExplorationVariationOpportunityDataModel
+    {
+        [Key]
+        public Guid OpportunityGuid { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public short YearConsidered { get; set; }
+        public string CostDriver { get; set; }
+        public byte SavingsLevel { get; set; }
+        public double Savings { get; set; }
+        public double SavingsMedian { get; set; }
+        public double SavingsTarget { get; set; }
+        public int TotalCases { get; set; }
+        public double TotalCost { get; set; }
+        public double TotalVariableCost { get; set; }
+        public double CostMedian { get; set; }
+        public double CostMedicare { get; set; }
+        public double VariableCostMedian { get; set; }
+        public double VariableCostMedicare { get; set; }
+        public string Note { get; set; }
+        public DateTime DateModified { get; set; }
+        public DateTime DateCreated { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public bool IsHidden { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Population/IExplorationPopulationService.cs b/src/Strata.ContinuousImprovement.Biz/Population/IExplorationPopulationService.cs
new file mode 100644
index 0000000..44ba762
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Population/IExplorationPopulationService.cs
@@ -0,0 +1,31 @@
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.DecisionSupport.Models.Jazz;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Population
+{
+    public interface IExplorationPopulationService
+    {
+        Task<bool> IsNameUnique(string name, CancellationToken cancellationToken);
+        Task<bool> AddPopulationAsync(ExplorationPopulationDto populationDto, CancellationToken cancellationToken);
+        Task<bool> UpdatePopulationAsync(ExplorationPopulationDto populationDto, CancellationToken cancellationToken);
+        Task<bool> UpdatePopulationMappingsAsync(long explorationPopulationId, IEnumerable<long> newIncludedEncounterIds, IEnumerable<long> newExcludedEncounterIds, CancellationToken cancellationToken);
+        Task<bool> UpdatePopulationName(long explorationPopulationId, string populationName, CancellationToken cancellationToken);
+        Task<IEnumerable<ExplorationPopulationDataDto>> GetPopulationsAsync(CancellationToken cancellationToken);
+        Task<ILookup<long, ExplorationPopulationOpportunityDto>> GetPopulationOpportunitiesAsync(IEnumerable<long> explorationPopulationIds, CancellationToken cancellationToken);
+        Task<IDictionary<long, int>> GetPopulationCountOpportunitiesAsync(IEnumerable<long> explorationPopulationIds, CancellationToken cancellationToken);
+        Task<ExplorationPopulationDto> GetPopulationDataAsync(long populationId, CancellationToken cancellationToken);
+        Task<ExplorationPopulationDetailsDto> GetPopulationDetailsAsync(long populationId, CancellationToken cancellationToken);
+        Task<IExplorationPopulationInfo> GetPopulationInfoAsync(long populationId, CancellationToken cancellationToken);
+        Task<bool> DeletePopulation(long populationId, CancellationToken cancellationToken);
+        Task<ExplorationPopulationDataDto> DuplicatePopulation(long explorationPopulationId, string populationName, CancellationToken cancellationToken);
+        Task<bool> ContainsPopulation(long populationId, CancellationToken cancellationToken);
+        Task<bool> CreateExplorationPopulationOpportunity(Guid configurationGuid, long populationId, bool waitForJob, CancellationToken cancellationToken);
+        Task<bool> ReplicateExplorationPopulations(CancellationToken cancellationToken);
+        Task<(DateTime, DateTime)> GetDischargeDates(long explorationPopulationId, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Population/PopulationOpportunitiesQuery.cs b/src/Strata.ContinuousImprovement.Biz/Population/PopulationOpportunitiesQuery.cs
new file mode 100644
index 0000000..302f804
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Population/PopulationOpportunitiesQuery.cs
@@ -0,0 +1,57 @@
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Population
+{
+    public class PopulationOpportunitiesQuery
+    {
+        private readonly IEnumerable<long> _explorationPopulationIds;
+        public PopulationOpportunitiesQuery(IEnumerable<long> explorationPopulationIds)
+        {
+            _explorationPopulationIds = explorationPopulationIds;
+        }
+        public string GetQuery()
+        {
+            var sqlWhere = _explorationPopulationIds != null && _explorationPopulationIds.Any() ? $"WHERE dct.ExplorationPopulationId IN ({string.Join(", ", _explorationPopulationIds)})" : string.Empty;
+            return $@"
+SELECT
+    evo.OpportunityGUID,
+    evo.OpportunityID,
+    evo.InitiativeGUID,
+    evo.CostDriver,
+    evo.ConfigurationGUID,
+    dct.ExplorationPopulationId,
+    NULL AS BaselineStartDate,
+    NULL AS BaselineEndDate,
+    NULL AS TrackingStartDate, 
+    NULL AS TrackingEndDate
+FROM cci.ExplorationVariationOpportunity evo
+INNER JOIN dss.DimCaseType dct ON dct.CaseTypeId = evo.CaseTypeId
+INNER JOIN cci.Configuration conf ON conf.ConfigurationGUID = evo.ConfigurationGUID
+{sqlWhere}
+ORDER BY conf.FiscalYearID DESC
+            ";
+        }
+
+        public string GetCountQuery()
+        {
+            var sqlWhere = _explorationPopulationIds != null && _explorationPopulationIds.Any() ? $"WHERE dct.ExplorationPopulationId IN ({string.Join(", ", _explorationPopulationIds)})" : string.Empty;
+            return $@"
+SELECT
+    dct.ExplorationPopulationId AS [Key],
+    COUNT(1) AS [Value]
+FROM cci.ExplorationVariationOpportunity evo
+INNER JOIN dss.DimCaseType dct ON dct.CaseTypeId = evo.CaseTypeId
+{sqlWhere}
+GROUP BY dct.ExplorationPopulationId
+            ";
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/Filters/QVIBreakdownFilterOptions.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/Filters/QVIBreakdownFilterOptions.cs
new file mode 100644
index 0000000..2a420a6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/Filters/QVIBreakdownFilterOptions.cs
@@ -0,0 +1,11 @@
+using Strata.ContinuousImprovement.Biz.Filter;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns.Filters
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class QVIBreakdownFilterOptions
+    {
+        public IEnumerable<FilterMember> Breakdowns { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/Filters/QVIBreakdownFilters.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/Filters/QVIBreakdownFilters.cs
new file mode 100644
index 0000000..fd45c8a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/Filters/QVIBreakdownFilters.cs
@@ -0,0 +1,46 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Filter.Expressions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns.Filters
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class QVIBreakdownFilters : IFilters<QVIBreakdown>
+    {
+        public bool ExportFiltered { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public int IdentifiedSavings { get; set; }
+        public IEnumerable<string> BreakdownIds { get; set; }
+        public int QualityVariationCases { get; set; }
+
+        public QVIBreakdownFilters() : base()
+        {
+            ExportFiltered = true;
+            ConfigurationGuid = Guid.Empty;
+            IdentifiedSavings = 0;
+            BreakdownIds = new List<string>();
+            QualityVariationCases = 0;
+        }
+
+        public IEnumerable<Expression<Func<QVIBreakdown, bool>>> GetFilters(JazzDbContext context) 
+        {
+            var filters = new List<Expression<Func<QVIBreakdown, bool>>>();
+
+            filters.AddConfigurationGuidFilter(ConfigurationGuid);
+            filters.AddIdentifiedSavingsTotalFilter(IdentifiedSavings);
+
+            if (BreakdownIds.Any())
+                filters.Add(m => BreakdownIds.Contains(m.BreakdownId.ToString()));
+
+            if (QualityVariationCases > 0)
+                filters.Add(m => m.QVICasesTotal >= QualityVariationCases);
+
+            return filters;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/IQVIBreakdownService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/IQVIBreakdownService.cs
new file mode 100644
index 0000000..7c0d9f5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/IQVIBreakdownService.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns.Filters;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public interface IQVIBreakdownService : IJazzDbService<QVIBreakdown, int>
+    {
+        Task<QVIBreakdownFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/QVIBreakdown.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/QVIBreakdown.cs
new file mode 100644
index 0000000..ee7bf8e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/QVIBreakdown.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns
+{
+    [Keyless]
+    [Table("viewQualityVariationItemBreakdowns", Schema = "cci")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class QVIBreakdown : IWithConfigurationGuid, IWithIdentifiedSavingsTotal
+    {
+        public int BreakdownId { get; set; }
+        public string BreakdownName { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public int CasesTotal { get; set; }
+        public int QVICasesTotal { get; set; }
+        [Precision(29, 11)]
+        public decimal QVIRate { get; set; }
+        public double IdentifiedSavingsTotal { get; set; }
+        public int OpportunitiesCount { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/QVIBreakdownService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/QVIBreakdownService.cs
new file mode 100644
index 0000000..fadfa1b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Breakdowns/QVIBreakdownService.cs
@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns.Filters;
+using Strata.CoreLib.Claims;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class QVIBreakdownService : JazzDbService<QVIBreakdown, int>, IQVIBreakdownService
+    {
+        public QVIBreakdownService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext, IClaimsPrincipalAccessor claimsPrincipalAccessor)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor)
+        {
+        }
+
+        public async Task<QVIBreakdownFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) return null;
+
+            var breakdownContext = dbContext.Set<QVIBreakdown>();
+            var configuredBreakdowns = breakdownContext.Where(ct => ct.ConfigurationGuid == configurationGuid);
+
+            var breakdowns = configuredBreakdowns
+                .Select(vo => new FilterMember { Id = vo.BreakdownId.ToString(), Text = vo.BreakdownName })
+                .Distinct().OrderBy(oa => oa.Text);
+
+            return new QVIBreakdownFilterOptions()
+            {
+                Breakdowns = await breakdowns.ToListAsync(cancellationToken)
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/Filters/QVIEventFilterOptions.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/Filters/QVIEventFilterOptions.cs
new file mode 100644
index 0000000..727153b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/Filters/QVIEventFilterOptions.cs
@@ -0,0 +1,12 @@
+using Strata.ContinuousImprovement.Biz.Filter;
+using System.Collections.Generic;
+
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Events.Filters
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class QVIEventFilterOptions
+    {
+        public IEnumerable<FilterMember> QualityVariationEvents { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/Filters/QVIEventFilters.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/Filters/QVIEventFilters.cs
new file mode 100644
index 0000000..a70fdf1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/Filters/QVIEventFilters.cs
@@ -0,0 +1,47 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Filter.Expressions;
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Events.Filters
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class QVIEventFilters:IFilters<QVIEvent>
+    {
+        public bool ExportFiltered { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public IEnumerable<string> QualityVariationEventIds { get; set; }
+        public int IdentifiedSavings { get; set; }
+        public int QVICases { get; set; }
+
+        public QVIEventFilters() : base()
+        {
+            ExportFiltered = true;
+            ConfigurationGuid = Guid.Empty;
+            QualityVariationEventIds = new List<string>();
+            IdentifiedSavings = 0;
+            QVICases = 0;
+        }
+
+        public IEnumerable<Expression<Func<QVIEvent, bool>>> GetFilters(JazzDbContext context)
+        {
+            var filters = new List<Expression<Func<QVIEvent, bool>>>();
+
+            filters.AddConfigurationGuidFilter(ConfigurationGuid);
+            filters.AddIdentifiedSavingsTotalFilter(IdentifiedSavings);
+
+            if (QualityVariationEventIds.Any())
+                filters.Add(m => QualityVariationEventIds.Contains(m.QualityVariationEventId.ToString()));
+
+            if (QVICases > 0)
+                filters.Add(m => m.QVICasesTotal >= QVICases);
+
+            return filters;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/IQVIEventService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/IQVIEventService.cs
new file mode 100644
index 0000000..a0a23ce
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/IQVIEventService.cs
@@ -0,0 +1,14 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Events.Filters;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Events
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public interface IQVIEventService : IJazzDbService<QVIEvent, int>
+    {
+        Task<QVIEventFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/QVIEvent.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/QVIEvent.cs
new file mode 100644
index 0000000..d5432e8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/QVIEvent.cs
@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Events
+{
+    [Keyless]
+    [Table("viewQualityVariationItemEvents", Schema = "cci")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class QVIEvent : IWithConfigurationGuid, IWithIdentifiedSavingsTotal
+    {
+        public int QualityVariationEventId { get; set; }
+        public string QualityVariationEventName { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public double IdentifiedSavingsTotal { get; set; }
+        public int CasesTotal { get; set; }
+        public int QVICasesTotal { get; set; }
+        public int QVIPatientDaysTotal { get; set; }
+        public double QVICostToal { get; set; }
+        public double QVINetRevenueTotal { get; set; }
+        public int Opportunities { get; set; }
+        [Precision(29, 11)]
+        public decimal QVIRate { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/QVIEventService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/QVIEventService.cs
new file mode 100644
index 0000000..35f1daf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Events/QVIEventService.cs
@@ -0,0 +1,46 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Events.Filters;
+using Strata.CoreLib.Claims;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Events
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class QVIEventService : JazzDbService<QVIEvent, int>, IQVIEventService
+    {
+
+        public QVIEventService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext, IClaimsPrincipalAccessor claimsPrincipalAccessor)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor)
+        {
+        }
+
+        public async Task<QVIEventFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) return null;
+
+            var qviEventContext = dbContext.Set<QVIEvent>();
+            var configuredQVIEvents = qviEventContext.Where(ct => ct.ConfigurationGuid == configurationGuid);
+
+            var qviEvents = configuredQVIEvents
+                .Select(vo => new FilterMember { Id = vo.QualityVariationEventId.ToString(), Text = vo.QualityVariationEventName })
+                .Distinct().OrderBy(oa => oa.Text);
+
+            return new QVIEventFilterOptions()
+            {
+                QualityVariationEvents = await qviEvents.ToListAsync(cancellationToken)
+            };
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Jobs/QVIOpportunityMetricsJob.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Jobs/QVIOpportunityMetricsJob.cs
new file mode 100644
index 0000000..ee5df26
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Jobs/QVIOpportunityMetricsJob.cs
@@ -0,0 +1,45 @@
+using Hangfire;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Metrics;
+using Strata.Hangfire.Filters;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Jobs
+{
+    public class QviOpportunityMetricsJob
+    {
+        private readonly IQviMetricService _qviMetricService;
+        private readonly ILogger<QviOpportunityMetricsJob> _logger;
+
+        public QviOpportunityMetricsJob(
+            IQviMetricService qviMetricService,
+            ILogger<QviOpportunityMetricsJob> logger)
+        {
+            _qviMetricService = qviMetricService;
+            _logger = logger;
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Populate QVI Metrics for Configuration {0} (Baseline: {1})")]
+        [CaptureClaimsPrincipal]
+        public async Task PopulateQviMetricsAsync(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken)
+        {
+            try
+            {
+                await _qviMetricService.PopulateMetricsAsync(configurationGuid, isBaseline, cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(
+                    ex,
+                    "Error populating QVI metrics for Configuration {ConfigurationGuid}, IsBaseline: {IsBaseline}",
+                    configurationGuid,
+                    isBaseline);
+                throw;
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Metrics/IQVIMetricService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Metrics/IQVIMetricService.cs
new file mode 100644
index 0000000..07b846f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Metrics/IQVIMetricService.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Metrics
+{
+    public interface IQviMetricService
+    {
+        Task<int> PopulateMetricsAsync(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Metrics/QVIMetricData.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Metrics/QVIMetricData.cs
new file mode 100644
index 0000000..605d965
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Metrics/QVIMetricData.cs
@@ -0,0 +1,144 @@
+using Strata.ContinuousImprovement.Biz.ServiceLines;
+using System;
+using CIConfiguration = Strata.ContinuousImprovement.Biz.Configuration.Configuration;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Metrics
+{
+	public class QviMetricData
+	{
+		public Guid ConfigurationGuid { get; set; }
+		public short YearId { get; set; }
+		public byte MonthId { get; set; }
+		public int PhysicianId { get; set; }
+		public int EntityId { get; set; }
+		public int FinancialClassId { get; set; }
+		public int InsurancePlanId { get; set; }
+		public int ServiceLineId { get; set; }
+		public int CaseTypeFamilyId { get; set; }
+		public int TotalInpatientCases { get; set; }
+		public int TotalCasesWithoutQvi { get; set; }
+		public int TotalCasesWithQvi { get; set; }
+		public int TotalPatientDaysWithoutQvi { get; set; }
+		public decimal NetRevenueWithoutQvi { get; set; }
+		public decimal NetRevenueWithQvi { get; set; }
+		public decimal TotalCostWithoutQvi { get; set; }
+		public decimal TotalCostWithQvi { get; set; }
+		public bool IsBaseline { get; set; }
+
+		public static string BuildQuery(string entityIds, string sourceSystemIds, CIConfiguration config, ServiceLineInformation serviceLineInfo)
+		{
+			var caseTypeFamilyIdSqlColumn = config.GetCaseTypeFamilyIdSqlColumn();
+
+			var rollup = config.DepartmentRollupGlobalId;
+			string entityId;
+			string entityJoin;
+			var whereString = "";
+			switch (rollup)
+			{
+				case "Location":
+					entityId = "pes.LocationId";
+					entityJoin = "";
+					whereString = $"AND pes.LocationID IN ({entityIds})";
+					break;
+				case "":
+					entityId = "de.FwEntityID";
+					entityJoin = $@"
+                                inner join clientdss.DimEntity de on pes.EntityID = de.EntityID AND de.FwEntityID IN ({entityIds})";
+					break;
+				default:
+					var rollupID = rollup.Replace(" ", string.Empty) + "ID";
+					entityId = "department." + rollupID;
+					entityJoin = $@"
+                                inner join fw.DimDepartment department on pes.HighestVariableCostDepartmentID = department.DepartmentID
+                                                                              AND {entityId} IN ({entityIds})";
+					break;
+			}
+
+			var serviceLineJoin = serviceLineInfo.ServiceLineJoin;
+			if (serviceLineInfo.ServiceLineTableName?.Equals("fw.viewDimStrataDecisionServiceLine", StringComparison.OrdinalIgnoreCase) == true)
+			{
+				serviceLineJoin = serviceLineJoin.Replace("fw.viewDimStrataDecisionServiceLine", "fw.DimStrataDecisionServiceLine", StringComparison.OrdinalIgnoreCase);
+			}
+			else if (serviceLineInfo.ServiceLineTableName?.Equals("fw.viewDimServiceLine", StringComparison.OrdinalIgnoreCase) == true)
+			{
+				serviceLineJoin = serviceLineJoin.Replace("fw.viewDimServiceLine", "fw.DimServiceLine", StringComparison.OrdinalIgnoreCase);
+			}
+
+			var serviceLineColumn = ", " + serviceLineInfo.ServiceLineColumn;
+
+			return $@"
+                WITH EncounterData AS (
+                    SELECT
+                    pes.EncounterId,
+                    pes.DischargeDateTime,
+                    pes.PrimaryPhysicianID,
+                    pes.MSDRGCaseTypeFamilyID,
+                    pes.APRDRGCaseTypeFamilyID,
+                    pes.LengthOfStay,
+                    pes.NetRevenue,
+                    pes.InsurancePlan1ID,
+                    pes.SourceSystemID,
+                    {entityId} AS EntityID{serviceLineColumn} ServiceLine_ID
+                    FROM clientdss.FactPatientEncounterSummary pes{entityJoin}{serviceLineJoin}
+                        INNER JOIN fw.DimPatientType pt ON pes.PatientTypeID = pt.PatientTypeID
+                        INNER JOIN fw.DimPatientTypeRollup ptr ON pt.PatientTypeRollupID = ptr.PatientTypeRollupID AND ptr.Type = 'Inpatient'
+                    WHERE pes.DischargeDateTime >= :StartDate AND pes.DischargeDateTime < :EndDate
+                    {whereString}
+                    AND pes.SourceSystemID IN ({sourceSystemIds})
+                ),
+                QVIMetrics AS (
+                    SELECT
+                        YEAR(ed.DischargeDateTime) AS YearId,
+                        MONTH(ed.DischargeDateTime) AS MonthId,
+                        ed.PrimaryPhysicianID AS PhysicianId,
+                        ed.EntityID AS EntityId,
+                        fin.FinancialClassID AS FinancialClassId,
+                        ip.InsurancePlanID AS InsurancePlanId,
+                        ed.ServiceLine_ID AS ServiceLineId,
+                        ed.{caseTypeFamilyIdSqlColumn} AS CaseTypeFamilyId,
+                        COUNT(1) AS TotalInpatientCases,
+                        SUM(CASE WHEN qvili.IsPrimary IS NULL THEN 1 ELSE 0 END) AS TotalCasesWithoutQvi,
+                        SUM(CASE WHEN qvili.IsPrimary IS NOT NULL THEN 1 ELSE 0 END) AS TotalCasesWithQvi,
+                        COALESCE(SUM(CASE WHEN qvili.IsPrimary IS NULL THEN ed.LengthOfStay ELSE 0 END), 0) AS TotalPatientDaysWithoutQvi,
+                        COALESCE(SUM(CASE WHEN qvili.IsPrimary IS NULL THEN ed.NetRevenue ELSE 0 END), 0) AS NetRevenueWithoutQvi,
+                        COALESCE(SUM(CASE WHEN qvili.IsPrimary IS NOT NULL THEN ed.NetRevenue ELSE 0 END), 0) AS NetRevenueWithQvi,
+                        COALESCE(SUM(CASE WHEN qvili.IsPrimary IS NULL THEN cost.VariableDirectCost ELSE 0 END), 0) AS TotalCostWithoutQvi,
+                        COALESCE(SUM(CASE WHEN qvili.IsPrimary IS NOT NULL  THEN cost.VariableDirectCost ELSE 0 END), 0) AS TotalCostWithQvi,
+                        CAST(:IsBaseline AS BOOLEAN) AS IsBaseline
+                        FROM EncounterData ed
+                        INNER JOIN (
+                            SELECT EncounterId,
+                                    SUM(VariableDirectCost) AS VariableDirectCost
+                            FROM cci.encounterchargecodecosts
+                            GROUP BY EncounterId
+                        ) cost ON ed.EncounterId = cost.EncounterId
+                        INNER JOIN dss.DimInsurancePlan ip ON ed.InsurancePlan1ID = ip.InsurancePlanID
+                        INNER JOIN clientdss.DimFinancialClass fin ON ip.FinancialClassID = fin.FinancialClassID
+                        LEFT OUTER JOIN dss.FactPatientEncounterQualityVariationEvent qvili ON ed.EncounterId = qvili.EncounterId AND qvili.IsPrimary = 1
+                    GROUP BY
+                        YEAR(ed.DischargeDateTime), MONTH(ed.DischargeDateTime), ed.PrimaryPhysicianID, ed.EntityID, fin.FinancialClassID,
+                        ed.ServiceLine_ID, ed.{caseTypeFamilyIdSqlColumn}, ip.InsurancePlanID
+                )
+                SELECT
+                    :ConfigurationGuid,
+                    YearId,
+                    MonthId,
+                    PhysicianId,
+                    EntityId,
+                    FinancialClassId,
+                    InsurancePlanId,
+                    ServiceLineId,
+                    CaseTypeFamilyId,
+                    TotalInpatientCases,
+                    TotalCasesWithoutQvi,
+                    TotalCasesWithQvi,
+                    TotalPatientDaysWithoutQvi,
+                    NetRevenueWithoutQvi,
+                    NetRevenueWithQvi,
+                    TotalCostWithoutQvi,
+                    TotalCostWithQvi,
+                    IsBaseline
+                FROM QVIMetrics";
+		}
+	}
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Metrics/QVIMetricService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Metrics/QVIMetricService.cs
new file mode 100644
index 0000000..b06425f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Metrics/QVIMetricService.cs
@@ -0,0 +1,125 @@
+using EFCore.BulkExtensions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.ServiceLines;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Metrics
+{
+	public class QviMetricService : IQviMetricService
+	{
+		private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+		private readonly ISnowflakeDatabaseContext _snowflakeDatabaseContext;
+		private readonly IConfigurationService _configurationService;
+		private readonly ILogger<QviMetricService> _logger;
+
+		public QviMetricService(
+			IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+			ISnowflakeDatabaseContext snowflakeDatabaseContext,
+			IConfigurationService configurationService,
+			ILogger<QviMetricService> logger)
+		{
+			_dbContextFactory = dbContextFactory;
+			_snowflakeDatabaseContext = snowflakeDatabaseContext;
+			_configurationService = configurationService;
+			_logger = logger;
+		}
+
+		public async Task<int> PopulateMetricsAsync(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken)
+		{
+			await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+
+			var config = await _configurationService.GetConfigurationAsync(configurationGuid, cancellationToken);
+
+			var entityIds = config.GetConfiguredEntityIds().ToCSVList();
+			var sourceSystemIds = config.GetSourceSystemIds().ToCSVList();
+
+			if (string.IsNullOrWhiteSpace(entityIds) || string.IsNullOrWhiteSpace(sourceSystemIds))
+			{
+				return 0;
+			}
+
+			var serviceLineInformation = await ServiceLineInformation.GetServiceLineInformationAsync(dbContext, config, "pes", cancellationToken);
+
+			var startDate = isBaseline
+				? config.GetBaselineStartDate(OpportunityTypes.QualityVariation)
+				: config.GetTrackingStartDate(OpportunityTypes.QualityVariation);
+
+			var endDate = isBaseline
+					? config.BaselineEndDate(OpportunityTypes.QualityVariation)
+					: config.TrackingCurrentMonthEndDate(OpportunityTypes.QualityVariation);
+
+			// Step 1: Query Snowflake for encounter data and metrics
+			var snowflakeResults = await _snowflakeDatabaseContext.QueryAsync<QviMetricData>(
+				QviMetricData.BuildQuery(entityIds, sourceSystemIds, config, serviceLineInformation),
+				"PopulateMetrics",
+				new
+				{
+					ConfigurationGuid = configurationGuid,
+					StartDate = startDate,
+					EndDate = endDate,
+					IsBaseline = isBaseline
+				});
+
+			var metricsList = snowflakeResults.ToList();
+
+			if (!metricsList.Any())
+			{
+				return 0;
+			}
+
+			//Step 2: Clear existing QviMetrics 
+			await dbContext.QviMetrics
+			   .Where(m => m.ConfigurationGuid == configurationGuid && m.IsBaseline == isBaseline)
+			   .ExecuteDeleteAsync(cancellationToken);
+
+			// Step 3: Batch insert 
+			var qviMetrics = metricsList.Select(metric => new QviMetrics
+			{
+				ConfigurationGuid = configurationGuid,
+				FiscalYearId = metric.YearId,
+				FiscalMonthId = metric.MonthId,
+				PhysicianId = metric.PhysicianId,
+				EntityId = metric.EntityId,
+				FinancialClassId = metric.FinancialClassId,
+				InsurancePlanId = metric.InsurancePlanId,
+				ServiceLineId = metric.ServiceLineId,
+				CaseTypeFamilyId = metric.CaseTypeFamilyId,
+				InPatientCases = metric.TotalInpatientCases,
+				CasesWithoutQvi = metric.TotalCasesWithoutQvi,
+				CasesWithQvi = metric.TotalCasesWithQvi,
+				PatientDaysWithoutQvi = metric.TotalPatientDaysWithoutQvi,
+				NetRevenueWithoutQvi = metric.NetRevenueWithoutQvi,
+				NetRevenueWithQvi = metric.NetRevenueWithQvi,
+				CostWithoutQvi = metric.TotalCostWithoutQvi,
+				CostWithQvi = metric.TotalCostWithQvi,
+				IsBaseline = isBaseline
+			}).ToList();
+
+			try
+			{
+				await dbContext.BulkInsertAsync(qviMetrics, new BulkConfig
+				{
+					TrackingEntities = false,
+					BatchSize = 10000
+				}, cancellationToken: cancellationToken);
+
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Error during BulkInsert of QVIMetrics");
+				throw;
+			}
+			return qviMetrics.Count;
+		}
+	}
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Metrics/QVIMetrics.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Metrics/QVIMetrics.cs
new file mode 100644
index 0000000..4fd0d2e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Metrics/QVIMetrics.cs
@@ -0,0 +1,69 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Metrics
+{
+    [Table("QVIMetrics", Schema = "cci")]
+    public class QviMetrics
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        [Column("RowID")]
+        public long RowId { get; set; }
+
+        [Column("ConfigurationGUID")]
+        public Guid ConfigurationGuid { get; set; }
+
+        [Column("FiscalYearID")]
+        public short FiscalYearId { get; set; }
+
+        [Column("FiscalMonthID")]
+        public byte FiscalMonthId { get; set; }
+
+        [Column("PhysicianID")]
+        public int PhysicianId { get; set; }
+
+        [Column("EntityID")]
+        public int EntityId { get; set; }
+
+        [Column("InPatientCases")]
+        public int InPatientCases { get; set; }
+
+        [Column("CasesWithoutQVI")]
+        public int CasesWithoutQvi { get; set; }
+
+        [Column("PatientDaysWithoutQVI")]
+        public int PatientDaysWithoutQvi { get; set; }
+
+        [Column("NetRevenueWithoutQVI")]
+        public decimal NetRevenueWithoutQvi { get; set; }
+
+        [Column("CostWithoutQVI")]
+        public decimal CostWithoutQvi { get; set; }
+
+        [Column("IsBaseline")]
+        public bool IsBaseline { get; set; }
+
+        [Column("ServiceLineID")]
+        public int ServiceLineId { get; set; }
+
+        [Column("CaseTypeFamilyID")]
+        public int CaseTypeFamilyId { get; set; }
+
+        [Column("FinancialClassID")]
+        public int FinancialClassId { get; set; }
+
+        [Column("CasesWithQVI")]
+        public int CasesWithQvi { get; set; }
+
+        [Column("CostWithQVI")]
+        public decimal CostWithQvi { get; set; }
+
+        [Column("NetRevenueWithQVI")]
+        public decimal NetRevenueWithQvi { get; set; }
+
+        [Column("InsurancePlanID")]
+        public int InsurancePlanId { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/Filters/QVIFilterOptions.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/Filters/QVIFilterOptions.cs
new file mode 100644
index 0000000..0f254a6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/Filters/QVIFilterOptions.cs
@@ -0,0 +1,12 @@
+using Strata.ContinuousImprovement.Biz.Filter;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities.Filters
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class QVIFilterOptions
+    {
+        public IEnumerable<FilterMember> Breakdowns { get; set; }
+        public IEnumerable<FilterMember> QualityVariationEvents { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/Filters/QVIFilters.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/Filters/QVIFilters.cs
new file mode 100644
index 0000000..5848798
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/Filters/QVIFilters.cs
@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities.Filters
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class QVIFilters : FiltersOpportunity<QVIOpportunity>
+    {
+        public IEnumerable<string> BreakdownIds { get; set; }
+        public IEnumerable<string> QualityVariationEventIds { get; set; }
+        public int QVICases { get; set; }
+
+        public QVIFilters() : base()
+        {
+            BreakdownIds = new List<string>();
+            QualityVariationEventIds = new List<string>();
+            QVICases = 0;
+        }
+
+        public override IEnumerable<Expression<Func<QVIOpportunity, bool>>> GetFilters(JazzDbContext context)
+        {
+            var filters = base.GetFilters(context).ToList();
+
+            if (!string.IsNullOrEmpty(OpportunitySearch))
+            {
+                filters.Add(m => m.OpportunityKey.Contains(OpportunitySearch)
+                    || m.QualityVariationEventName.Contains(OpportunitySearch)
+                    || m.BreakdownName.Contains(OpportunitySearch)
+                    || m.QualityVariationEventName.Contains(OpportunitySearch));
+            }
+
+            if (QVICases > 0)
+                filters.Add(m => m.QVICases >= QVICases);
+
+            if (BreakdownIds.Any())
+                filters.Add(m => BreakdownIds.Contains(m.BreakdownId.ToString()));
+
+            if (QualityVariationEventIds.Any())
+                filters.Add(m => QualityVariationEventIds.Contains(m.QualityVariationEventId.ToString()));
+
+            return filters;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/IQVIOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/IQVIOpportunityService.cs
new file mode 100644
index 0000000..2a25687
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/IQVIOpportunityService.cs
@@ -0,0 +1,17 @@
+using ClosedXML.Excel;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities.Filters;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public interface IQVIOpportunityService : IOpportunityService<QVIOpportunity>
+    {
+        Task<QVIFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken);
+        Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, QVIFilters filters, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/QVIOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/QVIOpportunity.cs
new file mode 100644
index 0000000..effa0f3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/QVIOpportunity.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Generics;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities
+{
+    [Table("viewQualityVariationItemOpportunity", Schema = "cci")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase",
+        Justification = "Standard abbreviation")]
+    public class QVIOpportunity : Opportunity
+    {
+        public int QVICases { get; set; }
+        //move OpportunityId to Opportunity class after migration for opportunity tables
+        public long OpportunityId { get; set; }
+        public int BreakdownId { get; set; }
+        public string BreakdownName { get; set; }
+        public int Cases { get; set; }
+        public int QualityVariationEventId { get; set; }
+        public string QualityVariationEventName { get; set; }
+        [Precision(19, 4)]
+        public decimal QVIRate { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/QVIOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/QVIOpportunityService.cs
new file mode 100644
index 0000000..691339f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/Opportunities/QVIOpportunityService.cs
@@ -0,0 +1,110 @@
+using ClosedXML.Excel;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Export;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class QVIOpportunityService : OpportunityService<QVIOpportunity>, IQVIOpportunityService
+    {
+        private const int BREAKDOWN_COLUMN_INDEX = 6;
+        private readonly IConfigurationService _configurationService;
+        private readonly ILogger<QVIOpportunityService> _logger;
+
+        public QVIOpportunityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory, CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IInitiativeService initiativeService, IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService,
+            IConfigurationService configurationService,
+            ILogger<QVIOpportunityService> logger)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor, initiativeService, updateFactOpportunitySavingsService)
+        {
+            _configurationService = configurationService;
+            _logger = logger;
+        }
+
+        public async Task<QVIFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) return null;
+
+            var opportunityContext = dbContext.Set<QVIOpportunity>();
+            var configuredOpportunities = opportunityContext.Where(vo => vo.ConfigurationGuid == configurationGuid);
+
+            var breakdowns = configuredOpportunities
+                .Select(vo => new FilterMember { Id = vo.BreakdownId.ToString(), Text = vo.BreakdownName })
+                .Distinct().OrderBy(oa => oa.Text);
+
+            var qualityVariationEvents = configuredOpportunities
+                .Select(vo => new FilterMember { Id = vo.QualityVariationEventId.ToString(), Text = vo.QualityVariationEventName })
+                .Distinct().OrderBy(oa => oa.Text);
+
+            return new QVIFilterOptions()
+            {
+                Breakdowns = await breakdowns.ToListAsync(cancellationToken),
+                QualityVariationEvents = await qualityVariationEvents.ToListAsync(cancellationToken)
+            };
+        }
+
+        public async Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, QVIFilters filters, CancellationToken cancellationToken)
+        {
+            var exportOptions = this.GetExportOptions();
+
+            // get data
+            var opportunities = await GetAllAsync(sortOptions, filters, cancellationToken);
+            var data = opportunities.Select(opp => new
+            {
+                Opportunity = opp.OpportunityKey,
+                opp.IdentifiedSavings,
+                QualityVariationCases = opp.QVICases,
+                QualityVariationRate = opp.QVIRate,
+                QualityVariationEvent = opp.QualityVariationEventName,
+                ServiceLine = opp.BreakdownName,
+                opp.Initiative,
+                IsHidden = opp.IsHidden ? 1 : 0,
+                opp.Note
+            });
+
+            // configure column formats
+            exportOptions.AddColumnOptions("Identified Savings", "Currency2Dec");
+            exportOptions.AddColumnOptions("Quality Variation Cases", "Accounting");
+            exportOptions.AddColumnOptions("Is Hidden", "\"Yes\";-;\"No\"");
+            exportOptions.AddColumnOptions("Quality Variation Rate", "0%");
+
+            // special formatting for Breakdown column header
+            var workbook = ExportUtils.CreateExcelWorkbook(data, exportOptions);
+
+            if (opportunities.Any())
+            {
+                var breakdownName = await GetBreakdownNameAsync(opportunities.First().ConfigurationGuid, cancellationToken);
+                var ws = workbook.Worksheets.First();
+                ws.Cell(1, BREAKDOWN_COLUMN_INDEX).Value = breakdownName.SplitCamelCase();
+            }
+
+            return workbook;
+        }
+
+        protected async Task<string> GetBreakdownNameAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            return dbContext?.Configurations
+              .FirstOrDefault(c => c.ConfigurationGuid == configurationGuid)?
+              .QVIOpportunityBreakdownName ?? "Breakdown";
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/EncounterInfo.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/EncounterInfo.cs
new file mode 100644
index 0000000..15e0503
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/EncounterInfo.cs
@@ -0,0 +1,95 @@
+using Strata.ContinuousImprovement.Biz.ServiceLines;
+using System;
+using CIConfiguration = Strata.ContinuousImprovement.Biz.Configuration.Configuration;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.QVI
+{
+    public class EncounterInfo
+    {
+        public long EncounterId { get; set; }
+        public string EncounterRecordNumber { get; set; }
+        public string DrgType { get; set; }
+        public decimal VariableDirectCost { get; set; }
+        public int LengthOfStay { get; set; }
+        public decimal NetRevenue { get; set; }
+        public int CaseTypeFamilyId { get; set; }
+        public int EntityId { get; set; }
+        public string Entity { get; set; }
+        public int PhysicianSpecialtyId { get; set; }
+        public string PhysicianSpecialty { get; set; }
+        public int ServiceLineId { get; set; }
+        public string ServiceLine { get; set; }
+
+        public EncounterInfo() { }
+
+        public static string BuildQuery(string entityIds, string sourceSystemIds, CIConfiguration config, ServiceLineInformation serviceLineInfo)
+        {
+            var rollup = config.DepartmentRollupGlobalId;
+
+            string entity;
+            string entityJoin;
+            var whereEntityFilter = string.Empty;
+
+            switch (rollup)
+            {
+                case "Location":
+                    entity = "pes.LocationId";
+                    entityJoin = "INNER JOIN clientdss.DimLocation e ON e.LocationID = pes.LocationId";
+                    whereEntityFilter = $"AND pes.LocationId IN ({entityIds})";
+                    break;
+                case "":
+                    entity = "e.EntityID";
+                    entityJoin = $@"INNER JOIN clientdss.DimEntity de ON pes.EntityID = de.EntityID AND de.FwEntityID IN ({entityIds})
+    INNER JOIN fw.DimEntity e ON e.EntityID = de.FwEntityID";
+                    break;
+                default:
+                    var sanitizedRollup = rollup.Replace(" ", string.Empty);
+                    entity = $"department.{sanitizedRollup}ID";
+                    entityJoin = $@"INNER JOIN fw.DimDepartment department ON pes.HighestVariableCostDepartmentID = department.DepartmentID
+        AND department.{sanitizedRollup}ID IN ({entityIds})
+    INNER JOIN fw.Dim{sanitizedRollup} e ON e.{sanitizedRollup}ID = department.{sanitizedRollup}ID";
+                    break;
+            }
+
+            var serviceLineJoin = serviceLineInfo.ServiceLineJoin;
+            if (serviceLineInfo.ServiceLineTableName?.Equals("fw.viewDimStrataDecisionServiceLine", StringComparison.OrdinalIgnoreCase) == true)
+            {
+                serviceLineJoin = serviceLineJoin.Replace("fw.viewDimStrataDecisionServiceLine", "fw.DimStrataDecisionServiceLine", StringComparison.OrdinalIgnoreCase);
+            }
+            else if (serviceLineInfo.ServiceLineTableName?.Equals("fw.viewDimServiceLine", StringComparison.OrdinalIgnoreCase) == true)
+            {
+                serviceLineJoin = serviceLineJoin.Replace("fw.viewDimServiceLine", "fw.DimServiceLine", StringComparison.OrdinalIgnoreCase);
+            }
+
+            var joinCondition = config.QualityVariationIsUsingAPRDRG
+                ? @"INNER JOIN dss.DimAPRDRG drg ON pes.ReportingAPRDRGID = drg.APRDRGID
+    INNER JOIN dss.CaseTypeFamily ctf ON pes.APRDRGCaseTypeFamilyID = ctf.CaseTypeFamilyID"
+                : @"INNER JOIN dss.DimMSDRG drg ON pes.ReportingDRGID = drg.MSDRGID
+    INNER JOIN dss.CaseTypeFamily ctf ON pes.MSDRGCaseTypeFamilyID = ctf.CaseTypeFamilyID";
+
+            return $@"SELECT pes.EncounterId, pes.EncounterRecordNumber, drg.Type AS DrgType, cost.VariableDirectCost, pes.LengthOfStay
+    , pes.NetRevenue, ctf.CaseTypeFamilyID AS CaseTypeFamilyId, CAST({entity} AS INT) AS EntityId, e.Name AS Entity
+    , physp.PhysicianSpecialtyID AS PhysicianSpecialtyId, physp.Name AS PhysicianSpecialty
+    , {serviceLineInfo.ServiceLineColumn} AS ServiceLineId, sl.{serviceLineInfo.ServiceLineNameAttribute} AS ServiceLine
+FROM clientdss.FactPatientEncounterSummary pes
+    {entityJoin}
+    INNER JOIN (
+        SELECT EncounterId, SUM(VariableDirectCost) AS VariableDirectCost
+        FROM cci.encounterchargecodecosts
+        GROUP BY EncounterId
+    ) cost ON pes.EncounterId = cost.EncounterId
+    INNER JOIN fw.DimPatientType pt ON pes.PatientTypeID = pt.PatientTypeID
+    INNER JOIN fw.DimPatientTypeRollup ptr ON pt.PatientTypeRollupID = ptr.PatientTypeRollupID
+        AND ptr.Type = 'Inpatient'
+    INNER JOIN dss.DimPhysician phy ON pes.PrimaryPhysicianID = phy.PhysicianID
+    INNER JOIN dss.DimPhysicianSpecialty physp ON phy.PhysicianSpecialtyID = physp.PhysicianSpecialtyID
+    {serviceLineJoin}
+    {joinCondition}
+WHERE pes.DischargeDateTime >= :StartDate
+    AND pes.DischargeDateTime < :EndDate
+    {whereEntityFilter}
+    AND pes.EncounterId IN (SELECT EncounterId FROM dss.FactPatientEncounterQualityVariationEvent)
+    AND pes.SourceSystemID IN ({sourceSystemIds})";
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/INonQviSavingsService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/INonQviSavingsService.cs
new file mode 100644
index 0000000..860e93f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/INonQviSavingsService.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.QVI
+{
+	public interface INonQviSavingsService
+	{
+		Task<IEnumerable<NonQviCaseTypeFamilyInfo>> GetCaseTypeFamilyInfoAsync(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken);
+		Task<IEnumerable<NonQviDrgTypeInfo>> GetDrgTypeInfoAsync(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken);
+	}
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/IQviEncounterService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/IQviEncounterService.cs
new file mode 100644
index 0000000..dc3d3d1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/IQviEncounterService.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.QVI
+{
+    public interface IQviEncounterService
+    {
+        Task<IEnumerable<EncounterInfo>> GetEncounterInfoAsync(Guid configurationGuid, DateTime startDate, DateTime endDate, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/IQviLineItemSavingsService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/IQviLineItemSavingsService.cs
new file mode 100644
index 0000000..90f363b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/IQviLineItemSavingsService.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.QVI
+{
+    public interface IQviLineItemSavingsService
+    {
+        Task<IEnumerable<QviLineItemCaseTypeFamilyInfo>> GetCaseTypeFamilyInfoAsync(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken);
+        Task<IEnumerable<QviLineItemDrgTypeInfo>> GetDrgTypeInfoAsync(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken);
+        Task<IEnumerable<QviLineItemEncounterSavingInfo>> GetEncounterSavingInfoAsync(Guid configurationGuid, Guid? opportunityGuid, bool? isBaseline, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/NonQVICaseTypeFamilyInfo.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/NonQVICaseTypeFamilyInfo.cs
new file mode 100644
index 0000000..bddb207
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/NonQVICaseTypeFamilyInfo.cs
@@ -0,0 +1,76 @@
+using System;
+using CIConfiguration = Strata.ContinuousImprovement.Biz.Configuration.Configuration;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.QVI
+{
+    public class NonQviCaseTypeFamilyInfo
+    {
+        public int CaseTypeFamilyId { get; set; }
+        public decimal MedianVariableDirectCostPerCase { get; set; }
+        public int CaseCount { get; set; }
+
+        public NonQviCaseTypeFamilyInfo() { }
+
+        public NonQviCaseTypeFamilyInfo(int caseTypeFamilyId, double medianVariableDirectCostPerCase, int caseCount)
+        {
+            CaseTypeFamilyId = caseTypeFamilyId;
+            MedianVariableDirectCostPerCase = Convert.ToDecimal(medianVariableDirectCostPerCase);
+            CaseCount = caseCount;
+        }
+
+		public static string BuildQuery(string entityIds, string sourceSystemIds, CIConfiguration config)
+		{
+			var caseTypeFamilyIdColumn = config.GetCaseTypeFamilyIdSqlColumn();
+			var rollup = config.DepartmentRollupGlobalId;
+
+			string entityJoin;
+			var whereString = "";
+
+			switch (rollup)
+			{
+				case "Location":
+					entityJoin = "";
+					whereString = $"AND pes.LocationID IN ({entityIds})";
+					break;
+				case "":
+					entityJoin = $@"INNER JOIN clientdss.DimEntity de ON pes.EntityID = de.EntityID
+									AND de.FwEntityID IN ({entityIds})";
+					break;
+				default:
+					var rollupId = rollup.Replace(" ", string.Empty) + "ID";
+					var entityId = "department." + rollupId;
+					entityJoin = $@"INNER JOIN fw.DimDepartment department ON pes.HighestVariableCostDepartmentID = department.DepartmentID
+									AND {entityId} IN ({entityIds})";
+					break;
+			}
+
+			return $@"WITH EncounterData AS (
+	SELECT DISTINCT
+		pes.{caseTypeFamilyIdColumn} AS CaseTypeFamilyId,
+		pes.EncounterId,
+		PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY cost.VariableDirectCost)
+			OVER (PARTITION BY pes.{caseTypeFamilyIdColumn}) AS MedianVariableDirectCostPerCase
+	FROM clientdss.FactPatientEncounterSummary pes
+		{entityJoin}
+		INNER JOIN (
+			SELECT EncounterId, SUM(VariableDirectCost) AS VariableDirectCost
+			FROM cci.encounterchargecodecosts
+			GROUP BY EncounterId
+		) cost ON pes.EncounterId = cost.EncounterId
+		INNER JOIN fw.DimPatientType pt ON pes.PatientTypeID = pt.PatientTypeID
+		INNER JOIN fw.DimPatientTypeRollup ptr ON pt.PatientTypeRollupID = ptr.PatientTypeRollupID
+			AND ptr.Type = 'Inpatient'
+	WHERE pes.EncounterId NOT IN (
+			SELECT EncounterId FROM dss.FactPatientEncounterQualityVariationEvent
+		)
+		{whereString}
+		AND pes.DischargeDateTime >= :StartDate
+		AND pes.DischargeDateTime < :EndDate
+		AND pes.SourceSystemID IN ({sourceSystemIds})
+)
+SELECT CaseTypeFamilyId, MedianVariableDirectCostPerCase, COUNT(DISTINCT EncounterId) AS CaseCount
+FROM EncounterData
+GROUP BY CaseTypeFamilyId, MedianVariableDirectCostPerCase";
+		}
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/NonQVIDrgTypeInfo.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/NonQVIDrgTypeInfo.cs
new file mode 100644
index 0000000..02029a8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/NonQVIDrgTypeInfo.cs
@@ -0,0 +1,79 @@
+using System;
+using CIConfiguration = Strata.ContinuousImprovement.Biz.Configuration.Configuration;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.QVI
+{
+    public class NonQviDrgTypeInfo
+    {
+        public string DrgType { get; set; }
+        public decimal MedianVariableDirectCostPerCase { get; set; }
+        public int CaseCount { get; set; }
+
+		public NonQviDrgTypeInfo() { }
+
+		public NonQviDrgTypeInfo(string drgType, double medianVariableDirectCostPerCase, int caseCount)
+        {
+            DrgType = drgType;
+            MedianVariableDirectCostPerCase = Convert.ToDecimal(medianVariableDirectCostPerCase);
+            CaseCount = caseCount;
+        }
+
+        public static string BuildQuery(string entityIds, string sourceSystemIds, CIConfiguration config)
+        {
+            var joinCondition = config.QualityVariationIsUsingAPRDRG
+                ? "INNER JOIN dss.DimAPRDRG drg ON pes.ReportingAPRDRGID = drg.APRDRGID"
+                : "INNER JOIN dss.DimMSDRG drg ON pes.ReportingDRGID = drg.MSDRGID";
+
+            var rollup = config.DepartmentRollupGlobalId;
+            string entityJoin;
+            var whereString = "";
+
+            switch (rollup)
+            {
+                case "Location":
+                    entityJoin = "";
+                    whereString = $"AND pes.LocationID IN ({entityIds})";
+                    break;
+                case "":
+                    entityJoin = $@"INNER JOIN clientdss.DimEntity de ON pes.EntityID = de.EntityID
+                                    AND de.FwEntityID IN ({entityIds})";
+                    break;
+                default:
+                    var rollupId = rollup.Replace(" ", string.Empty) + "ID";
+                    var entityId = "department." + rollupId;
+                    entityJoin = $@"INNER JOIN fw.DimDepartment department ON pes.HighestVariableCostDepartmentID = department.DepartmentID
+                                    AND {entityId} IN ({entityIds})";
+                    break;
+            }
+
+            return $@"WITH EncounterData AS (
+    SELECT DISTINCT
+        drg.Type AS DRGType,
+        pes.EncounterId,
+        PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY cost.VariableDirectCost)
+            OVER (PARTITION BY drg.Type) AS MedianVariableDirectCostPerCase
+    FROM clientdss.FactPatientEncounterSummary pes
+        {entityJoin}
+        INNER JOIN (
+            SELECT EncounterId, SUM(VariableDirectCost) AS VariableDirectCost
+            FROM cci.encounterchargecodecosts
+            GROUP BY EncounterId
+        ) cost ON pes.EncounterId = cost.EncounterId
+        INNER JOIN fw.DimPatientType pt ON pes.PatientTypeID = pt.PatientTypeID
+        INNER JOIN fw.DimPatientTypeRollup ptr ON pt.PatientTypeRollupID = ptr.PatientTypeRollupID
+            AND ptr.Type = 'Inpatient'
+        {joinCondition}
+    WHERE pes.EncounterId NOT IN (
+            SELECT EncounterId FROM dss.FactPatientEncounterQualityVariationEvent
+        )
+        {whereString}
+        AND pes.DischargeDateTime >= :StartDate
+        AND pes.DischargeDateTime < :EndDate
+        AND pes.SourceSystemID IN ({sourceSystemIds})
+)
+SELECT DRGType, MedianVariableDirectCostPerCase, COUNT(DISTINCT EncounterId) AS CaseCount
+FROM EncounterData
+GROUP BY DRGType, MedianVariableDirectCostPerCase";
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/NonQviSavingsService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/NonQviSavingsService.cs
new file mode 100644
index 0000000..990c340
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/NonQviSavingsService.cs
@@ -0,0 +1,81 @@
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.QVI
+{
+    public class NonQviSavingsService : INonQviSavingsService
+    {
+        private readonly ISnowflakeDatabaseContext _snowflakeDatabaseContext;
+        private readonly IConfigurationService _configurationService;
+        private readonly ILogger<NonQviSavingsService> _logger;
+
+        public NonQviSavingsService(
+            ISnowflakeDatabaseContext snowflakeDatabaseContext,
+            IConfigurationService configurationService,
+            ILogger<NonQviSavingsService> logger)
+        {
+            _snowflakeDatabaseContext = snowflakeDatabaseContext;
+            _configurationService = configurationService;
+            _logger = logger;
+        }
+
+        public async Task<IEnumerable<NonQviCaseTypeFamilyInfo>> GetCaseTypeFamilyInfoAsync(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var config = await _configurationService.GetConfigurationAsync(configurationGuid, cancellationToken);
+                var entityIds = config.GetConfiguredEntityIds().ToCSVList();
+                var sourceSystemIds = config.GetSourceSystemIds().ToCSVList();
+                if (string.IsNullOrWhiteSpace(entityIds) || string.IsNullOrWhiteSpace(sourceSystemIds)) return Enumerable.Empty<NonQviCaseTypeFamilyInfo>();
+
+                var (startDate, endDate) = GetDateRange(config, isBaseline);
+
+                return await _snowflakeDatabaseContext.QueryAsync<NonQviCaseTypeFamilyInfo>(
+                    NonQviCaseTypeFamilyInfo.BuildQuery(entityIds, sourceSystemIds, config),
+                    nameof(GetCaseTypeFamilyInfoAsync),
+                    new { StartDate = startDate, EndDate = endDate });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error loading NonQVI case type family info for configuration {ConfigurationGuid}", configurationGuid);
+                throw;
+            }
+        }
+
+        public async Task<IEnumerable<NonQviDrgTypeInfo>> GetDrgTypeInfoAsync(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var config = await _configurationService.GetConfigurationAsync(configurationGuid, cancellationToken);
+                var entityIds = config.GetConfiguredEntityIds().ToCSVList();
+                var sourceSystemIds = config.GetSourceSystemIds().ToCSVList();
+                if (string.IsNullOrWhiteSpace(entityIds) || string.IsNullOrWhiteSpace(sourceSystemIds)) return Enumerable.Empty<NonQviDrgTypeInfo>();
+
+                var (startDate, endDate) = GetDateRange(config, isBaseline);
+
+                return await _snowflakeDatabaseContext.QueryAsync<NonQviDrgTypeInfo>(
+                    NonQviDrgTypeInfo.BuildQuery(entityIds, sourceSystemIds, config),
+                    nameof(GetDrgTypeInfoAsync),
+                    new { StartDate = startDate, EndDate = endDate });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error loading NonQVI DRG type info for configuration {ConfigurationGuid}", configurationGuid);
+                throw;
+            }
+        }
+
+        private static (DateTime startDate, DateTime endDate) GetDateRange(Configuration.Configuration config, bool isBaseline) =>
+            isBaseline
+                ? (config.GetBaselineStartDate(OpportunityTypes.QualityVariation), config.BaselineEndDate(OpportunityTypes.QualityVariation))
+                : (config.GetTrackingStartDate(OpportunityTypes.QualityVariation), config.TrackingCurrentMonthEndDate(OpportunityTypes.QualityVariation));
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviEncounterService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviEncounterService.cs
new file mode 100644
index 0000000..21e3df0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviEncounterService.cs
@@ -0,0 +1,59 @@
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.ServiceLines;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.QVI
+{
+    public class QviEncounterService : IQviEncounterService
+    {
+        private readonly ISnowflakeDatabaseContext _snowflakeDatabaseContext;
+        private readonly IConfigurationService _configurationService;
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly ILogger<QviEncounterService> _logger;
+
+        public QviEncounterService(
+            ISnowflakeDatabaseContext snowflakeDatabaseContext,
+            IConfigurationService configurationService,
+            IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            ILogger<QviEncounterService> logger)
+        {
+            _snowflakeDatabaseContext = snowflakeDatabaseContext;
+            _configurationService = configurationService;
+            _dbContextFactory = dbContextFactory;
+            _logger = logger;
+        }
+
+        public async Task<IEnumerable<EncounterInfo>> GetEncounterInfoAsync(Guid configurationGuid, DateTime startDate, DateTime endDate, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var config = await _configurationService.GetConfigurationAsync(configurationGuid, cancellationToken);
+                var entityIds = config.GetConfiguredEntityIds().ToCSVList();
+                var sourceSystemIds = config.GetSourceSystemIds().ToCSVList();
+                if (string.IsNullOrWhiteSpace(entityIds) || string.IsNullOrWhiteSpace(sourceSystemIds)) return Enumerable.Empty<EncounterInfo>();
+
+                await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+                var serviceLineInfo = await ServiceLineInformation.GetServiceLineInformationAsync(dbContext, config, "pes", cancellationToken);
+
+                return await _snowflakeDatabaseContext.QueryAsync<EncounterInfo>(
+                    EncounterInfo.BuildQuery(entityIds, sourceSystemIds, config, serviceLineInfo),
+                    nameof(GetEncounterInfoAsync),
+                    new { StartDate = startDate, EndDate = endDate });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error loading encounter info for configuration {ConfigurationGuid}", configurationGuid);
+                throw;
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviLineItemCaseTypeFamilyInfo.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviLineItemCaseTypeFamilyInfo.cs
new file mode 100644
index 0000000..2c653a0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviLineItemCaseTypeFamilyInfo.cs
@@ -0,0 +1,92 @@
+using System;
+using CIConfiguration = Strata.ContinuousImprovement.Biz.Configuration.Configuration;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.QVI
+{
+    public class QviLineItemCaseTypeFamilyInfo
+    {
+        public int QualityVariationEventId { get; set; }
+        public int CaseTypeFamilyId { get; set; }
+        public decimal MedianVariableDirectCostPerCase { get; set; }
+        public int CaseCount { get; set; }
+
+		public QviLineItemCaseTypeFamilyInfo() { }
+
+		public QviLineItemCaseTypeFamilyInfo(int qualityVariationEventId, int caseTypeFamilyId, double medianVariableDirectCostPerCase, int caseCount)
+        {
+            QualityVariationEventId = qualityVariationEventId;
+            CaseTypeFamilyId = caseTypeFamilyId;
+            MedianVariableDirectCostPerCase = Convert.ToDecimal(medianVariableDirectCostPerCase);
+            CaseCount = caseCount;
+        }
+
+        public static string BuildQuery(string entityIds, string sourceSystemIds, CIConfiguration config)
+        {
+            var caseTypeFamilyIdColumn = config.GetCaseTypeFamilyIdSqlColumn();
+
+            var rollup = config.DepartmentRollupGlobalId;
+            string entityJoin;
+            var whereString = "";
+
+            switch (rollup)
+            {
+                case "Location":
+                    entityJoin = "";
+                    whereString = $"AND pes.LocationID IN ({entityIds})";
+                    break;
+                case "":
+                    entityJoin = $@"INNER JOIN clientdss.DimEntity de ON pes.EntityID = de.EntityID
+                                    AND de.FwEntityID IN ({entityIds})";
+                    break;
+                default:
+                    var rollupId = rollup.Replace(" ", string.Empty) + "ID";
+                    var entityId = "department." + rollupId;
+                    entityJoin = $@"INNER JOIN fw.DimDepartment department ON pes.HighestVariableCostDepartmentID = department.DepartmentID
+                                    AND {entityId} IN ({entityIds})";
+                    break;
+            }
+
+            return $@"WITH EncounterData AS (
+    SELECT
+        pes.EncounterId,
+        cost.VariableDirectCost,
+        pes.{caseTypeFamilyIdColumn} AS CaseTypeFamilyID
+    FROM clientdss.FactPatientEncounterSummary pes
+        {entityJoin}
+        INNER JOIN (
+            SELECT EncounterId, SUM(VariableDirectCost) AS VariableDirectCost
+            FROM cci.encounterchargecodecosts
+            GROUP BY EncounterId
+        ) cost ON pes.EncounterId = cost.EncounterId
+        INNER JOIN fw.DimPatientType pt ON pes.PatientTypeID = pt.PatientTypeID
+        INNER JOIN fw.DimPatientTypeRollup ptr ON pt.PatientTypeRollupID = ptr.PatientTypeRollupID
+            AND ptr.Type = 'Inpatient'
+        LEFT JOIN dss.FactPatientEncounterQualityVariationEvent eqvli ON pes.EncounterId = eqvli.EncounterId
+    WHERE pes.DischargeDateTime >= :StartDate
+        AND pes.DischargeDateTime < :EndDate
+        {whereString}
+        AND pes.SourceSystemID IN ({sourceSystemIds})
+    GROUP BY pes.EncounterId, cost.VariableDirectCost, pes.{caseTypeFamilyIdColumn}
+    HAVING COUNT(DISTINCT eqvli.QualityVariationEventID) = 1
+),
+QVICostData AS (
+    SELECT
+        eqvli.QualityVariationEventID,
+        ed.CaseTypeFamilyID,
+        PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY ed.VariableDirectCost)
+            OVER (PARTITION BY eqvli.QualityVariationEventID, ed.CaseTypeFamilyID) AS MedianVariableDirectCostPerCase,
+        ed.EncounterId
+    FROM EncounterData ed
+        INNER JOIN dss.FactPatientEncounterQualityVariationEvent eqvli ON eqvli.EncounterId = ed.EncounterId
+            AND eqvli.IsPrimary = 1
+)
+SELECT
+    qcd.QualityVariationEventID,
+    qcd.CaseTypeFamilyID,
+    qcd.MedianVariableDirectCostPerCase,
+    COUNT(DISTINCT qcd.EncounterId) AS CaseCount
+FROM QVICostData qcd
+GROUP BY qcd.QualityVariationEventID, qcd.CaseTypeFamilyID, qcd.MedianVariableDirectCostPerCase";
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviLineItemDrgTypeInfo.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviLineItemDrgTypeInfo.cs
new file mode 100644
index 0000000..6d32170
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviLineItemDrgTypeInfo.cs
@@ -0,0 +1,96 @@
+using System;
+using CIConfiguration = Strata.ContinuousImprovement.Biz.Configuration.Configuration;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.QVI
+{
+    public class QviLineItemDrgTypeInfo
+    {
+        public int QualityVariationEventId { get; set; }
+        public string DrgType { get; set; }
+        public decimal MedianVariableDirectCostPerCase { get; set; }
+        public int CaseCount { get; set; }
+
+		public QviLineItemDrgTypeInfo() { }
+
+		public QviLineItemDrgTypeInfo(int qualityVariationEventId, string drgType, double medianVariableDirectCostPerCase, int caseCount)
+        {
+            QualityVariationEventId = qualityVariationEventId;
+            DrgType = drgType;
+            MedianVariableDirectCostPerCase = Convert.ToDecimal(medianVariableDirectCostPerCase);
+            CaseCount = caseCount;
+        }
+
+        public static string BuildQuery(string entityIds, string sourceSystemIds, CIConfiguration config)
+        {
+            var rollup = config.DepartmentRollupGlobalId;
+            string entityJoin;
+            var whereString = "";
+
+            switch (rollup)
+            {
+                case "Location":
+                    entityJoin = "";
+                    whereString = $"AND pes.LocationID IN ({entityIds})";
+                    break;
+                case "":
+                    entityJoin = $@"INNER JOIN clientdss.DimEntity de ON pes.EntityID = de.EntityID
+                                    AND de.FwEntityID IN ({entityIds})";
+                    break;
+                default:
+                    var rollupId = rollup.Replace(" ", string.Empty) + "ID";
+                    var entityId = "department." + rollupId;
+                    entityJoin = $@"INNER JOIN fw.DimDepartment department ON pes.HighestVariableCostDepartmentID = department.DepartmentID
+                                    AND {entityId} IN ({entityIds})";
+                    break;
+            }
+
+            var joinCondition = config.QualityVariationIsUsingAPRDRG
+                ? "INNER JOIN dss.DimAPRDRG drg ON pes.ReportingAPRDRGID = drg.APRDRGID"
+                : "INNER JOIN dss.DimMSDRG drg ON pes.ReportingDRGID = drg.MSDRGID";
+
+            return $@"WITH EncounterData AS (
+    SELECT
+        pes.EncounterId,
+        cost.VariableDirectCost,
+        drg.Type AS DRGType
+    FROM clientdss.FactPatientEncounterSummary pes
+        {entityJoin}
+        INNER JOIN (
+            SELECT EncounterId, SUM(VariableDirectCost) AS VariableDirectCost
+            FROM cci.encounterchargecodecosts
+            GROUP BY EncounterId
+        ) cost ON pes.EncounterId = cost.EncounterId
+        INNER JOIN fw.DimPatientType pt ON pes.PatientTypeID = pt.PatientTypeID
+        INNER JOIN fw.DimPatientTypeRollup ptr ON pt.PatientTypeRollupID = ptr.PatientTypeRollupID
+            AND ptr.Type = 'Inpatient'
+        {joinCondition}
+        LEFT JOIN dss.FactPatientEncounterQualityVariationEvent eqvli ON pes.EncounterId = eqvli.EncounterId
+    WHERE pes.DischargeDateTime >= :StartDate
+        AND pes.DischargeDateTime < :EndDate
+        {whereString}
+        AND pes.SourceSystemID IN ({sourceSystemIds})
+    GROUP BY pes.EncounterId, cost.VariableDirectCost, drg.Type
+    HAVING COUNT(DISTINCT eqvli.QualityVariationEventID) = 1
+),
+QVICostData AS (
+    SELECT
+        eqvli.QualityVariationEventID,
+        ed.DRGType,
+        PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY ed.VariableDirectCost)
+            OVER (PARTITION BY eqvli.QualityVariationEventID, ed.DRGType) AS MedianVariableDirectCostPerCase,
+        ed.EncounterId
+    FROM EncounterData ed
+        INNER JOIN dss.FactPatientEncounterQualityVariationEvent eqvli ON eqvli.EncounterId = ed.EncounterId
+            AND eqvli.IsPrimary = 1
+    WHERE ed.EncounterId IN (SELECT EncounterId FROM EncounterData)
+)
+SELECT
+    qcd.QualityVariationEventID,
+    qcd.DRGType,
+    qcd.MedianVariableDirectCostPerCase,
+    COUNT(DISTINCT qcd.EncounterId) AS CaseCount
+FROM QVICostData qcd
+GROUP BY qcd.QualityVariationEventID, qcd.DRGType, qcd.MedianVariableDirectCostPerCase";
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviLineItemEncounterSavingInfo.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviLineItemEncounterSavingInfo.cs
new file mode 100644
index 0000000..15421e5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviLineItemEncounterSavingInfo.cs
@@ -0,0 +1,87 @@
+using System;
+using CIConfiguration = Strata.ContinuousImprovement.Biz.Configuration.Configuration;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.QVI
+{
+	public class QviLineItemEncounterSavingInfo
+	{
+		public string EncounterRecordNumber { get; set; }
+		public decimal Savings { get; set; }
+		public bool IsBaseline { get; set; }
+		public int PhysicianID { get; set; }
+		public string PhysicianName { get; set; }
+		public int PhysicianSpecialtyID { get; set; }
+		public string PhysicianSpecialty { get; set; }
+		public int EntityID { get; set; }
+		public string Entity { get; set; }
+		public int FinancialClassID { get; set; }
+		public int PayorID { get; set; }
+		public int ContractGroupingID { get; set; }
+		public int PayorGroupID { get; set; }
+		public int InsurancePlanID { get; set; }
+		public decimal NetRevenue { get; set; }
+		public int LengthOfStay { get; set; }
+		public decimal PesVariableDirectCost { get; set; }
+		public decimal TotalCost { get; set; }
+		public DateTime DischargeDateTime { get; set; }
+		public int CaseTypeFamilyID { get; set; }
+		public decimal VariableDirectCost { get; set; }
+		public string ServiceLine { get; set; }
+		public int ServiceLineID { get; set; }
+		public string CaseTypeFamily { get; set; }
+
+		public QviLineItemEncounterSavingInfo() { }
+
+		public static string BuildQuery(CIConfiguration config, Guid? opportunityGuid = null, bool? isBaseline = null)
+		{
+			var opportunityFilter = opportunityGuid.HasValue ? "\n                AND OBJ.OpportunityGUID = :OpportunityGUID" : string.Empty;
+			var isBaselineFilter = isBaseline.HasValue ? "\n                AND OBJ.IsBaseline = :IsBaseline" : string.Empty;
+			var caseTypeFamilyIdColumn = config.GetCaseTypeFamilyIdSqlColumn();
+
+			return $@"SELECT OBJ.EncounterRecordNumber,
+                OBJ.Savings,
+                OBJ.IsBaseline,
+                p.PhysicianID,
+                p.FullName AS PhysicianName,
+                OBJ.PhysicianSpecialtyID,
+                OBJ.PhysicianSpecialty,
+                OBJ.EntityID,
+                OBJ.Entity,
+                fin.FinancialClassID,
+                ip.PayorID,
+                ip.ContractGroupingID,
+                py.PayorGroupID,
+                ip.InsurancePlanID,
+                pes.NetRevenue,
+                pes.LengthOfStay,
+                cost.VariableDirectCost AS PesVariableDirectCost,
+                (cost.VariableDirectCost + cost.VariableIndirectCost + cost.FixedDirectCost + cost.FixedIndirectCost) AS TotalCost,
+                pes.DischargeDateTime,
+                ctf.CaseTypeFamilyID,
+                OBJ.VariableDirectCost,
+                OBJ.ServiceLine,
+                OBJ.ServiceLineID,
+                ctf.Name AS CaseTypeFamily
+            FROM cci.QVILineItemEncounterSaving OBJ
+                INNER JOIN cci.QVILineItemOpportunity qvi ON qvi.OpportunityGUID = OBJ.OpportunityGUID
+                INNER JOIN clientdss.FactPatientEncounterSummary pes ON OBJ.EncounterId = pes.EncounterId
+                INNER JOIN (
+                    SELECT EncounterId,
+                           SUM(VariableDirectCost) AS VariableDirectCost,
+                           SUM(VariableIndirectCost) AS VariableIndirectCost,
+                           SUM(FixedDirectCost) AS FixedDirectCost,
+                           SUM(FixedIndirectCost) AS FixedIndirectCost
+                    FROM cci.encounterchargecodecosts
+                    GROUP BY EncounterId
+                ) cost ON pes.EncounterId = cost.EncounterId
+                INNER JOIN dss.DimInsurancePlan ip ON pes.InsurancePlan1ID = ip.InsurancePlanID
+                INNER JOIN fw.DimPayor py ON ip.PayorID = py.PayorID
+                INNER JOIN fw.DimPayorGroup pyg ON py.PayorGroupID = pyg.PayorGroupID
+                INNER JOIN clientdss.DimFinancialClass fin ON ip.FinancialClassID = fin.FinancialClassID
+                INNER JOIN dss.DimPhysician p ON pes.PrimaryPhysicianId = p.PhysicianID
+                INNER JOIN clientdss.DimEntity de ON pes.EntityID = de.EntityID
+                INNER JOIN dss.CaseTypeFamily ctf ON pes.{caseTypeFamilyIdColumn} = ctf.CaseTypeFamilyID
+            WHERE qvi.ConfigurationGUID = :ConfigurationGUID{opportunityFilter}{isBaselineFilter}";
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviLineItemSavingsService.cs b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviLineItemSavingsService.cs
new file mode 100644
index 0000000..6b5b96e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/QviLineItemSavingsService.cs
@@ -0,0 +1,98 @@
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.QualityVariation.QVI
+{
+	public class QviLineItemSavingsService : IQviLineItemSavingsService
+	{
+		private readonly ISnowflakeDatabaseContext _snowflakeDatabaseContext;
+		private readonly IConfigurationService _configurationService;
+		private readonly ILogger<QviLineItemSavingsService> _logger;
+
+		public QviLineItemSavingsService(
+			ISnowflakeDatabaseContext snowflakeDatabaseContext,
+			IConfigurationService configurationService,
+			ILogger<QviLineItemSavingsService> logger)
+		{
+			_snowflakeDatabaseContext = snowflakeDatabaseContext;
+			_configurationService = configurationService;
+			_logger = logger;
+		}
+
+		public async Task<IEnumerable<QviLineItemCaseTypeFamilyInfo>> GetCaseTypeFamilyInfoAsync(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken)
+		{
+			try
+			{
+				var config = await _configurationService.GetConfigurationAsync(configurationGuid, cancellationToken);
+				var entityIds = config.GetConfiguredEntityIds().ToCSVList();
+				var sourceSystemIds = config.GetSourceSystemIds().ToCSVList();
+				if (string.IsNullOrWhiteSpace(entityIds) || string.IsNullOrWhiteSpace(sourceSystemIds)) return Enumerable.Empty<QviLineItemCaseTypeFamilyInfo>();
+
+				var (startDate, endDate) = GetDateRange(config, isBaseline);
+
+				return await _snowflakeDatabaseContext.QueryAsync<QviLineItemCaseTypeFamilyInfo>(
+					QviLineItemCaseTypeFamilyInfo.BuildQuery(entityIds, sourceSystemIds, config),
+					nameof(GetCaseTypeFamilyInfoAsync),
+					new { StartDate = startDate, EndDate = endDate });
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Error loading QVI line item case type family info for configuration {ConfigurationGuid}", configurationGuid);
+				throw;
+			}
+		}
+
+		public async Task<IEnumerable<QviLineItemDrgTypeInfo>> GetDrgTypeInfoAsync(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken)
+		{
+			try
+			{
+				var config = await _configurationService.GetConfigurationAsync(configurationGuid, cancellationToken);
+				var entityIds = config.GetConfiguredEntityIds().ToCSVList();
+				var sourceSystemIds = config.GetSourceSystemIds().ToCSVList();
+				if (string.IsNullOrWhiteSpace(entityIds) || string.IsNullOrWhiteSpace(sourceSystemIds)) return Enumerable.Empty<QviLineItemDrgTypeInfo>();
+
+				var (startDate, endDate) = GetDateRange(config, isBaseline);
+
+				return await _snowflakeDatabaseContext.QueryAsync<QviLineItemDrgTypeInfo>(
+					QviLineItemDrgTypeInfo.BuildQuery(entityIds, sourceSystemIds, config),
+					nameof(GetDrgTypeInfoAsync),
+					new { StartDate = startDate, EndDate = endDate });
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Error loading QVI line item DRG type info for configuration {ConfigurationGuid}", configurationGuid);
+				throw;
+			}
+		}
+
+		public async Task<IEnumerable<QviLineItemEncounterSavingInfo>> GetEncounterSavingInfoAsync(Guid configurationGuid, Guid? opportunityGuid, bool? isBaseline, CancellationToken cancellationToken)
+		{
+			try
+			{
+				var config = await _configurationService.GetConfigurationAsync(configurationGuid, cancellationToken);
+				return await _snowflakeDatabaseContext.QueryAsync<QviLineItemEncounterSavingInfo>(
+					QviLineItemEncounterSavingInfo.BuildQuery(config, opportunityGuid, isBaseline),
+					nameof(GetEncounterSavingInfoAsync),
+					new { ConfigurationGUID = configurationGuid, OpportunityGUID = opportunityGuid, IsBaseline = isBaseline });
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Error loading QVI line item encounter saving info for configuration {ConfigurationGuid}", configurationGuid);
+				throw;
+			}
+		}
+
+		private static (DateTime startDate, DateTime endDate) GetDateRange(Configuration.Configuration config, bool isBaseline) =>
+			isBaseline
+				? (config.GetBaselineStartDate(OpportunityTypes.QualityVariation), config.BaselineEndDate(OpportunityTypes.QualityVariation))
+				: (config.GetTrackingStartDate(OpportunityTypes.QualityVariation), config.TrackingCurrentMonthEndDate(OpportunityTypes.QualityVariation));
+	}
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/quality-variation.md b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/quality-variation.md
new file mode 100644
index 0000000..42e0ccf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/QualityVariation/QVI/quality-variation.md
@@ -0,0 +1,83 @@
+# QVI — Quality Variation Index
+
+Data access layer for analyzing inpatient quality variation events. Provides Snowflake-backed services that compare QVI encounter costs against a non-QVI benchmark population to surface savings opportunities.
+
+## Services
+
+| Interface | Implementation | Purpose |
+|-----------|---------------|---------|
+| `IQviEncounterService` | `QviEncounterService` | Per-encounter details for QVI events within a date range |
+| `IQviLineItemSavingsService` | `QviLineItemSavingsService` | Savings analysis scoped to individual QVI line item opportunities |
+| `INonQviSavingsService` | `NonQviSavingsService` | Benchmark metrics for encounters with **no** QVI events |
+
+All three services follow the same call pattern:
+
+1. Load the CI configuration via `IConfigurationService`
+2. Extract entity IDs and source system IDs from the configuration
+3. Resolve the date range (baseline or tracking period) for `OpportunityTypes.QualityVariation`
+4. Execute a generated SQL query against `ISnowflakeDatabaseContext`
+
+---
+
+## Query Models
+
+Each model class owns its own SQL generation via a static `BuildQuery(...)` method. The generated SQL is parameterized (`:StartDate`, `:EndDate`, etc.) and executed by the service.
+
+### Non-QVI benchmark models
+
+| Class | Groups by | Key detail |
+|-------|-----------|-----------|
+| `NonQviCaseTypeFamilyInfo` | Case type family | Excludes encounters in `FactPatientEncounterQualityVariationEvent` |
+| `NonQviDrgTypeInfo` | DRG type (APR-DRG or MS-DRG) | Same exclusion; joins `DimAPRDRG` or `DimMSDRG` based on configuration |
+
+Both compute `MedianVariableDirectCostPerCase` using `PERCENTILE_CONT(0.5)` over aggregated charge code costs.
+
+### QVI line item models
+
+| Class | Groups by | Key detail |
+|-------|-----------|-----------|
+| `QviLineItemCaseTypeFamilyInfo` | QVI event + case type family | Only encounters with **exactly one** QVI event (`HAVING COUNT(DISTINCT QualityVariationEventID) = 1`) |
+| `QviLineItemDrgTypeInfo` | QVI event + DRG type | Same single-event filter; APR-DRG or MS-DRG join based on configuration |
+| `QviLineItemEncounterSavingInfo` | One row per encounter | Joins `QVILineItemEncounterSaving` with full financial and clinical context; supports optional `opportunityGuid` and `isBaseline` filters |
+
+### Encounter detail model
+
+`EncounterInfo` — returned by `IQviEncounterService`. One row per encounter that has at least one QVI event. Includes physician specialty, service line, entity, DRG type, variable direct cost, LOS, and net revenue.
+
+---
+
+## Entity Scoping
+
+All `BuildQuery` methods branch on `config.DepartmentRollupGlobalId` to apply the correct entity filter:
+
+| `DepartmentRollupGlobalId` | Filter strategy |
+|---------------------------|----------------|
+| `"Location"` | `pes.LocationID IN (entityIds)` |
+| `""` (empty) | Join `clientdss.DimEntity` → `fw.DimEntity` on `FwEntityID` |
+| Any other value | Join `fw.DimDepartment` → `fw.Dim{Rollup}` on the rollup ID column |
+
+---
+
+## DRG System
+
+`config.QualityVariationIsUsingAPRDRG` switches all DRG joins and case type family column lookups between APR-DRG (`dss.DimAPRDRG`, `APRDRGCaseTypeFamilyID`) and MS-DRG (`dss.DimMSDRG`, `MSDRGCaseTypeFamilyID`).
+
+---
+
+## Service Line Handling (`QviEncounterService`)
+
+`QviEncounterService` is the only service that also queries the Jazz SQL Server database. It calls `ServiceLineInformation.GetServiceLineInformationAsync` to resolve the correct service line view/table name, then substitutes view names with base table names before executing the query against Snowflake.
+
+---
+
+## Key Snowflake Tables
+
+| Schema | Table | Role |
+|--------|-------|------|
+| `clientdss` | `FactPatientEncounterSummary` | Core encounter fact table |
+| `cci` | `encounterchargecodecosts` | Charge code cost rollup per encounter |
+| `dss` | `FactPatientEncounterQualityVariationEvent` | QVI event membership |
+| `cci` | `QVILineItemEncounterSaving` | Pre-computed savings rows per encounter |
+| `cci` | `QVILineItemOpportunity` | QVI opportunity metadata, scoped by `ConfigurationGUID` |
+| `dss` | `CaseTypeFamily` | Case type family dimension |
+| `dss` | `DimAPRDRG` / `DimMSDRG` | DRG type dimensions |
diff --git a/src/Strata.ContinuousImprovement.Biz/Replication/IPostgresReplicationService.cs b/src/Strata.ContinuousImprovement.Biz/Replication/IPostgresReplicationService.cs
new file mode 100644
index 0000000..ee9f522
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Replication/IPostgresReplicationService.cs
@@ -0,0 +1,13 @@
+using Strata.ContinuousImprovement.Biz.Replication.Models;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Replication
+{
+    public interface IPostgresReplicationService
+    {
+        Task Replicate<T1, T2>(List<IGrouping<int, T1>> entitiesByClient, string table, CancellationToken cancellationToken) where T1 : IPostgresReplicable<T2>;
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Replication/Models/DimExplorationPopulation.cs b/src/Strata.ContinuousImprovement.Biz/Replication/Models/DimExplorationPopulation.cs
new file mode 100644
index 0000000..397db2b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Replication/Models/DimExplorationPopulation.cs
@@ -0,0 +1,12 @@
+namespace Strata.ContinuousImprovement.Biz.Replication.Models
+{
+    public class DimExplorationPopulation
+    {
+        public long ExplorationPopulationId { get; set; }
+        public string Name { get; set; }
+        public int CaseTypeFamilyId { get; set; }
+        public string CostDriver { get; set; }
+        public int TotalEncounters { get; set; }
+        public decimal TotalVariation { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Replication/Models/FactExplorationPopulationEncounter.cs b/src/Strata.ContinuousImprovement.Biz/Replication/Models/FactExplorationPopulationEncounter.cs
new file mode 100644
index 0000000..172620e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Replication/Models/FactExplorationPopulationEncounter.cs
@@ -0,0 +1,8 @@
+namespace Strata.ContinuousImprovement.Biz.Replication.Models
+{
+    public class FactExplorationPopulationEncounter
+    {
+        public long ExplorationPopulationId { get; set; }
+        public long EncounterId { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Replication/Models/IPostgresReplicable.cs b/src/Strata.ContinuousImprovement.Biz/Replication/Models/IPostgresReplicable.cs
new file mode 100644
index 0000000..5dfa6b3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Replication/Models/IPostgresReplicable.cs
@@ -0,0 +1,7 @@
+namespace Strata.ContinuousImprovement.Biz.Replication.Models
+{
+    public interface IPostgresReplicable<T>
+    {
+        T MapToSnowflakeModel();
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Replication/PostgresReplicationService.cs b/src/Strata.ContinuousImprovement.Biz/Replication/PostgresReplicationService.cs
new file mode 100644
index 0000000..a0ced76
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Replication/PostgresReplicationService.cs
@@ -0,0 +1,100 @@
+using CsvHelper;
+using CsvHelper.Configuration;
+using Microsoft.Extensions.Logging;
+using Strata.ApiCommunication.Http.Exceptions;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Replication.Models;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Id.Client;
+using Strata.Replication.Client;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Replication
+{
+    public class PostgresReplicationService : IPostgresReplicationService
+    {
+        private const string STAGE_NAME = "@cci.POSTGRES_REPLICATION_DATA";
+        private readonly IIdServiceClient _idServiceClient;
+        private readonly IReplicationServiceClient _replicationService;
+        private readonly ISnowflakeDatabaseContextFactory _snowflakeDbContextFactory;
+        private readonly ILogger<PostgresReplicationService> _logger;
+
+        public PostgresReplicationService(IIdServiceClient idServiceClient,
+             IReplicationServiceClient replicationService,
+             ISnowflakeDatabaseContextFactory snowflakeDbContextFactory,
+             ILogger<PostgresReplicationService> logger)
+        {
+            _idServiceClient = idServiceClient;
+            _replicationService = replicationService;
+            _snowflakeDbContextFactory = snowflakeDbContextFactory;
+            _logger = logger;
+        }
+
+        public async Task Replicate<T1, T2>(List<IGrouping<int, T1>> entitiesByClient, string table, CancellationToken cancellationToken) where T1 : IPostgresReplicable<T2>
+        {
+            foreach (var entities in entitiesByClient)
+            {
+                if (!(await _replicationService.IsOnboarded(entities.Key, cancellationToken)))
+                {
+                    continue;
+                }
+
+                try
+                {
+                    var fileName = $"{typeof(T1).Name}_{entities.Key}.csv";
+                    _logger.LogServiceInformation($"Replication of {entities.Count()} {typeof(T1).Name} for DB with Strata Id = {entities.Key} started");
+                    var databaseGuid = await _idServiceClient.GetDatabaseGUID(entities.Key);
+                    var snowflakeDbContext = _snowflakeDbContextFactory.Create(
+                        databaseGuid.ToString("N"));
+
+                    try
+                    {
+                        var tempFilePath = Path.Combine(Path.GetTempPath(), fileName);
+
+                        var startCsvTime = DateTime.Now;
+                        var snowflakeEntities = entities.Select(ex => ex.MapToSnowflakeModel());
+                        await using (var writer = new StreamWriter(tempFilePath))
+                        await using (var csv = new CsvWriter(writer, new CsvConfiguration(CultureInfo.InvariantCulture)))
+                        {
+                            await csv.WriteRecordsAsync(snowflakeEntities);
+                        }
+                        var endCsvTime = DateTime.Now;
+
+                        await snowflakeDbContext.ExecuteCommand($"PUT file://{tempFilePath} {STAGE_NAME};");
+                        await snowflakeDbContext.ExecuteCommandAsync($"TRUNCATE TABLE {table};");
+                        await snowflakeDbContext.ExecuteCommandAsync($@"
+COPY INTO {table}
+FROM {STAGE_NAME}/{fileName}
+FILE_FORMAT = (TYPE = CSV, PARSE_HEADER = TRUE) 
+MATCH_BY_COLUMN_NAME = CASE_INSENSITIVE
+ON_ERROR = 'CONTINUE';");
+                        var endUploadTime = DateTime.Now;
+
+                        var csvSeconds = endCsvTime.Subtract(startCsvTime).TotalSeconds;
+                        var uploadSeconds = endUploadTime.Subtract(endCsvTime).TotalSeconds;
+                        _logger.LogServiceInformation($"Replication of {typeof(T1).Name} completed successfully, CSV file generated in {csvSeconds} seconds " +
+                            $"and uploaded into snowflake in {uploadSeconds} seconds");
+                    }
+                    finally
+                    {
+                        await snowflakeDbContext.ExecuteCommandAsync($"REMOVE {STAGE_NAME}/{fileName};");
+                    }
+                }
+                catch (StrataHttpException ex)
+                {
+                    _logger.LogServiceError(ex, $"Network issue happened or database with id = {entities.Key} not found. Skipping replication of {typeof(T1).Name} data.");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogServiceError(ex, $"Unable to migrate {typeof(T1).Name} data to database with id = {entities.Key}");
+                }
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Reports/IReportService.cs b/src/Strata.ContinuousImprovement.Biz/Reports/IReportService.cs
new file mode 100644
index 0000000..9881fe5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Reports/IReportService.cs
@@ -0,0 +1,22 @@
+using Strata.ContinuousImprovement.Biz.DbContexts.Reports;
+using Strata.Stratasphere.Biz.DbContexts;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Reports
+{
+    public interface IReportService
+    {
+        Task<IEnumerable<REReport>> GetReportsByOpportunity(Guid opportunityGuid, Guid userGuid, bool isSdtEmployee, CancellationToken cancellationToken);
+        Task<IEnumerable<REReport>> GetReportsByModule(int sourceOfSavings, Guid userGuid, bool isSdtEmployee, CancellationToken cancellationToken);
+        Task<IEnumerable<REReport>> GetReports(Guid userGuid, bool isSdtEmployee, CancellationToken cancellationToken);
+        Task AddReportByOpportunity(Guid opportunityGuid, Guid reportGuid, CancellationToken cancellationToken);
+        Task AddReportByModule(int module, Guid reportGuid, CancellationToken cancellationToken);
+        Task DeleteReportByOpportunity(Guid opportunityGuid, Guid reportGuid, CancellationToken cancellationToken);
+        Task DeleteReportByModule(int module, Guid reportGuid, CancellationToken cancellationToken);
+        Task<FolderTree> GetReportFolders(CancellationToken cancellationToken);
+        Task<IEnumerable<REReport>> GetFolderReports(Guid folderGuid, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Reports/ReportService.cs b/src/Strata.ContinuousImprovement.Biz/Reports/ReportService.cs
new file mode 100644
index 0000000..99c7ef1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Reports/ReportService.cs
@@ -0,0 +1,145 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Reports;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using Strata.Stratasphere.Biz.DbContexts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Reports
+{
+    public class ReportService : IReportService
+    {
+        protected readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+
+        public ReportService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory)
+        {
+            _dbContextFactory = dbContextFactory;
+        }
+
+        public async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<IEnumerable<REReport>> GetReportsByOpportunity(Guid opportunityGuid, Guid userGuid, bool isSdtEmployee, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var reports = await dbContext.OpportunityReports
+                .Where(r => r.OpportunityGUID == opportunityGuid)
+                .Join(dbContext.REReports, s => s.ReportGUID, r => r.ReportGUID, (s, r) => r).ToListAsync(cancellationToken);
+            reports.ForEach(r => r.IsOpportunityReport = true);
+            return await GetPermitted(reports, userGuid, isSdtEmployee, cancellationToken);
+        }
+
+        public async Task<IEnumerable<REReport>> GetReportsByModule(int sourceOfSavings, Guid userGuid, bool isSdtEmployee, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var reports = await dbContext.SourceOfSavingsReports
+                .Where(r => r.SourceOfSavings == sourceOfSavings)
+                .Join(dbContext.REReports, s => s.ReportGUID, r => r.ReportGUID, (s, r) => r).ToListAsync(cancellationToken);
+            reports.ForEach(r => r.IsOpportunityReport = false);
+            return await GetPermitted(reports, userGuid, isSdtEmployee, cancellationToken);
+        }
+
+        public async Task<IEnumerable<REReport>> GetReports(Guid userGuid, bool isSdtEmployee, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var reports = await dbContext.REReports.ToListAsync(cancellationToken);
+            return await GetPermitted(reports, userGuid, isSdtEmployee, cancellationToken);
+        }
+
+        private async Task<IEnumerable<REReport>> GetPermitted(IEnumerable<REReport> reports, Guid userGuid, bool isSdtEmployee, CancellationToken cancellationToken)
+        {
+            if (isSdtEmployee) { return reports.OrderBy(r => r.Name); }
+            var dbContext = await GetDbContext(cancellationToken);
+            return reports.Join(dbContext.S3ACLSimples
+                .Where(s => s.UserGuid == userGuid && s.IsReadable != null && s.IsReadable == true),
+                    r => r.ReportGUID, s => s.LootId, (r, s) => r).OrderBy(r => r.Name);
+        }
+
+        public async Task AddReportByOpportunity(Guid opportunityGuid, Guid reportGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var opportunityReport = await dbContext.OpportunityReports
+                .SingleOrDefaultAsync(r => r.OpportunityGUID == opportunityGuid && r.ReportGUID == reportGuid, cancellationToken);
+            if (opportunityReport != null) { return; }
+            opportunityReport = new OpportunityReport { OpportunityGUID = opportunityGuid, ReportGUID = reportGuid };
+            await dbContext.OpportunityReports.AddAsync(opportunityReport, cancellationToken);
+            await dbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task AddReportByModule(int module, Guid reportGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var sourceOfSavingsReport = await dbContext.SourceOfSavingsReports
+                .SingleOrDefaultAsync(r => r.SourceOfSavings == module && r.ReportGUID == reportGuid, cancellationToken);
+            if (sourceOfSavingsReport != null) { return; }
+            sourceOfSavingsReport = new SourceOfSavingsReport { SourceOfSavings = module, ReportGUID = reportGuid };
+            await dbContext.SourceOfSavingsReports.AddAsync(sourceOfSavingsReport, cancellationToken);
+            await dbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task DeleteReportByOpportunity(Guid opportunityGuid, Guid reportGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var opportunityReport = await dbContext.OpportunityReports
+                .SingleOrDefaultAsync(r => r.OpportunityGUID == opportunityGuid && r.ReportGUID == reportGuid, cancellationToken);
+            if (opportunityReport == null) { return; }
+            dbContext.Remove(opportunityReport);
+            await dbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task DeleteReportByModule(int module, Guid reportGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var sourceOfSavingsReport = await dbContext.SourceOfSavingsReports
+                .SingleOrDefaultAsync(r => r.SourceOfSavings == module && r.ReportGUID == reportGuid, cancellationToken);
+            if (sourceOfSavingsReport == null) { return; }
+            dbContext.Remove(sourceOfSavingsReport);
+            await dbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task<FolderTree> GetReportFolders(CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var folders = await dbContext.Folders
+                .Join(dbContext.REReports,
+                    f => f.FolderGuid,
+                    r => r.FolderGuid,
+                    (f, r) => f).ToListAsync(cancellationToken);
+            var folderGuids = folders.Select(r => r.FolderGuid).Distinct();
+            var parentGuids = folders.Where(pf => pf.ParentFolderGuid != Guid.Empty
+                && !folderGuids.Any(x => x == pf.ParentFolderGuid)).Select(pf => pf.ParentFolderGuid);
+            var parentFolders = await GetMissingParentFolders(parentGuids, cancellationToken);
+            var lookup = folders.Union(parentFolders).ToLookup(r => r.ParentFolderGuid);
+            foreach (var folder in lookup.SelectMany(x => x))
+            {
+                folder.Folders = lookup[folder.FolderGuid].OrderBy(f => f.Name).ToList();
+                folder.Reports = (await GetFolderReports(folder.FolderGuid, cancellationToken)).OrderBy(x => x.Name).ToList();
+            }
+            var top = lookup[Guid.Empty].ToList();
+            return new FolderTree(top.First());
+        }
+
+        private async Task<IEnumerable<Folder>> GetMissingParentFolders(IEnumerable<Guid> folderGuids, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            var parentFolders = await dbContext.Folders
+                .Where(f => folderGuids.Contains(f.FolderGuid)).ToListAsync(cancellationToken);
+            if (!parentFolders.Any()) { return parentFolders; }
+            return parentFolders
+                .Union(await GetMissingParentFolders(parentFolders.Where(pf => pf.ParentFolderGuid != Guid.Empty).Select(pf => pf.ParentFolderGuid), cancellationToken));
+        }
+
+        public async Task<IEnumerable<REReport>> GetFolderReports(Guid folderGuid, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            return await dbContext.REReports.Where(r => r.FolderGuid == folderGuid).ToListAsync(cancellationToken);
+        }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Score/ScoreAttribute.cs b/src/Strata.ContinuousImprovement.Biz/Score/ScoreAttribute.cs
new file mode 100644
index 0000000..a7c9241
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Score/ScoreAttribute.cs
@@ -0,0 +1,27 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Score
+{
+    [Table("viewScoreAttribute", Schema = "dbo")]
+    public class ViewScoreAttribute
+    {
+        public Guid DimensionGuid { get; set; }
+        public string FriendlyName { get; set; }
+    }
+
+    [Table("ScoreAttribute", Schema = "dbo")]
+    public class ScoreAttribute
+    {
+        [Key]
+        public Guid AttributeGuid { get; set; }
+        public Guid DimensionGroupGuid { get; set; }
+        public string Name => FriendlyName;
+        public string SqlColumnName { get; set; }
+        public string FriendlyName { get; set; }
+        public bool IsKey { get; set; }
+        [NotMapped]
+        public string ColumnName { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Score/ScoreDimension.cs b/src/Strata.ContinuousImprovement.Biz/Score/ScoreDimension.cs
new file mode 100644
index 0000000..9e5d861
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Score/ScoreDimension.cs
@@ -0,0 +1,32 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Score
+{
+    [Table("ScoreDimension", Schema = "dbo")]
+    public class ScoreDimension
+    {
+        public Guid DimensionGuid { get; set; }
+        public string FriendlyName { get; set; }
+        public Guid DefaultLookupKeyGuid { get; set; }
+        public Guid DefaultKeyGuid { get; set; }
+        public string GlobalId { get; set; }
+        public string SQLSchemaName { get; set; }
+        public string SQLObjectName { get; set; }
+
+		[NotMapped]
+		public ScoreAttribute DefaultLookupKey { get; set; }
+        [NotMapped]
+        public ScoreAttribute DefaultKey { get; set; }
+        [NotMapped]
+        public string SQLObjectExpression
+            => $"{SQLSchemaName}.{SQLObjectName}";
+    }
+
+    public static class Dimension
+    {
+        public const string ServiceLine = "Service Line";
+        public const string Sg2CareFamily = "Sg2 CARE Family";
+        public const string Sg2ServiceLineCrosswalk = "Sg2 Service Line Crosswalk";
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Security/ISimpleSecurityService.cs b/src/Strata.ContinuousImprovement.Biz/Security/ISimpleSecurityService.cs
new file mode 100644
index 0000000..2243900
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Security/ISimpleSecurityService.cs
@@ -0,0 +1,13 @@
+using Strata.Authorization;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Security
+{
+    public interface ISimpleSecurityService
+    {
+        Task<IEnumerable<IdentityNode>> GetAllIdentities(CancellationToken cancellationToken);
+        Task<IEnumerable<SimplePermission>> GetSimplePermissionDefaults(SecurableEntityType entityType, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Security/Identity.cs b/src/Strata.ContinuousImprovement.Biz/Security/Identity.cs
new file mode 100644
index 0000000..e6050c5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Security/Identity.cs
@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Security
+{
+    [Keyless]
+    public class Identity
+    {
+        public Guid IdentityGuid { get; set; }
+        public string IdentityName { get; set; }
+    }
+
+    public class IdentityNode
+    {
+        public Guid Key { get; set; }
+        public string Title { get; set; }
+        public IdentityNode(Identity identity)
+        {
+            Key = identity.IdentityGuid;
+            Title = identity.IdentityName;
+        }
+
+        public IdentityNode()
+        {
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Security/S3SimplePermission.cs b/src/Strata.ContinuousImprovement.Biz/Security/S3SimplePermission.cs
new file mode 100644
index 0000000..bf88cc5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Security/S3SimplePermission.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Security
+{
+    [Table("S3SimplePermission", Schema = "dbo")]
+    public class S3SimplePermission
+    {
+        [Key]
+        public Guid PermissionGUID { get; set; }
+        public Guid LootID { get; set; }
+        public Guid IdentityGUID { get; set; }
+        public bool ReadValue { get; set; }
+        public bool WriteValue { get; set; }
+        public bool SecureValue { get; set; }
+
+        public S3SimplePermission(Guid lootID, Guid identityGUID, bool readValue, bool writeValue, bool secureValue)
+        {
+            LootID = lootID;
+            IdentityGUID = identityGUID;
+            ReadValue = readValue;
+            WriteValue = writeValue;
+            SecureValue = secureValue;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Security/S3SimplePermissionDefault.cs b/src/Strata.ContinuousImprovement.Biz/Security/S3SimplePermissionDefault.cs
new file mode 100644
index 0000000..a55d069
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Security/S3SimplePermissionDefault.cs
@@ -0,0 +1,16 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Security
+{
+    [Table("S3SimplePermissionDefault", Schema = "dbo")]
+    public class S3SimplePermissionDefault
+    {
+        public int EntityType { get; set; }
+        public Guid IdentityGuid { get; set; }
+        public bool ReadValue { get; set; }
+        public bool WriteValue { get; set; }
+        public bool SecureValue { get; set; }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Security/SimplePermission.cs b/src/Strata.ContinuousImprovement.Biz/Security/SimplePermission.cs
new file mode 100644
index 0000000..7c6d75a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Security/SimplePermission.cs
@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Security
+{
+    //This class reprents a combination of user and user group permisions
+    [Keyless]
+    public class SimplePermission
+    {
+        public string IdentityName { get; set; }
+        public Guid LootID { get; set; }
+        public Guid IdentityGUID { get; set; }
+        public bool ReadValue { get; set; }
+        public bool WriteValue { get; set; }
+        public bool SecureValue { get; set; }
+
+        public SimplePermission()
+        {
+
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Security/SimpleSecurityService.cs b/src/Strata.ContinuousImprovement.Biz/Security/SimpleSecurityService.cs
new file mode 100644
index 0000000..aec5db2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Security/SimpleSecurityService.cs
@@ -0,0 +1,51 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Security
+{
+    public class SimpleSecurityService : ISimpleSecurityService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+
+        public SimpleSecurityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory)
+        {
+            _dbContextFactory = dbContextFactory;
+        }
+
+        private async Task<JazzDbContext> GetDbContext(CancellationToken cancellationToken)
+        {
+            return await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+        }
+
+        public async Task<IEnumerable<IdentityNode>> GetAllIdentities(CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+            return await dbContext.UserProfiles.Select(up => new Identity { IdentityGuid = up.UserGuid, IdentityName = up.NameFull })
+                .Union(dbContext.UserGroups.Select(ug => new Identity { IdentityGuid = ug.UserGroupGuid, IdentityName = ug.Name }))
+                .Distinct().OrderBy(i => i.IdentityName)
+                .Select(i => new IdentityNode(i))
+                .ToListAsync(cancellationToken);
+        }
+
+        public async Task<IEnumerable<SimplePermission>> GetSimplePermissionDefaults(SecurableEntityType entityType, CancellationToken cancellationToken)
+        {
+            var dbContext = await GetDbContext(cancellationToken);
+
+            return await dbContext.S3SimplePermissionDefaults
+                .Join(dbContext.UserGroups,
+                    d => d.IdentityGuid,
+                    u => u.UserGroupGuid,
+                    (d, u) => new { d.EntityType, u.UserGroupGuid, d.ReadValue, d.WriteValue, d.SecureValue, u.Name, u.GlobalId })
+                .Where(dflt => dflt.EntityType == (int)entityType && (dflt.ReadValue || dflt.WriteValue))
+                .Select(item => new SimplePermission() { IdentityGUID = item.UserGroupGuid, IdentityName = item.Name, ReadValue = item.ReadValue, WriteValue = item.WriteValue, SecureValue = item.SecureValue })
+                .ToListAsync(cancellationToken);
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/ServiceLines/ServiceLineInformation.cs b/src/Strata.ContinuousImprovement.Biz/ServiceLines/ServiceLineInformation.cs
new file mode 100644
index 0000000..e4e9687
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/ServiceLines/ServiceLineInformation.cs
@@ -0,0 +1,56 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Score;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.ServiceLines
+{
+    public class ServiceLineInformation
+    {
+        private ScoreDimension ServiceLineDimension { get; set; }
+        private ScoreAttribute ServiceLineAttribute { get; set; }
+        private ScoreAttribute ServiceLineLookUpAttribute { get; set; }
+
+
+        public string FriendlyName => ServiceLineDimension.FriendlyName;
+        public string ServiceLineIdAttribute { get; set; }
+        public string ServiceLineTableName { get; set; }
+        public string ServiceLineNameAttribute { get; set; }
+        public string ServiceLineColumn { get; set; } = "";
+        public string ServiceLineJoin { get; set; } = "";
+        public string SelectClause { get; set; } = "";
+
+        public static async Task<ServiceLineInformation> GetServiceLineInformationAsync(JazzDbContext dbContext, Configuration.Configuration config, string schema = "OBJ", CancellationToken cancellationToken = default)
+        {
+            var serviceLineInformation = new ServiceLineInformation();
+            var serviceLineDimension = await config.GetServiceLineDimension(dbContext, cancellationToken);
+            var serviceLineAttribute = await config.GetServiceLineAttribute(dbContext, cancellationToken);
+
+			serviceLineInformation.ServiceLineDimension = serviceLineDimension;
+            serviceLineInformation.ServiceLineAttribute = serviceLineAttribute;
+
+			serviceLineInformation.ServiceLineLookUpAttribute = serviceLineDimension.DefaultLookupKey
+				?? await dbContext.ScoreAttributes.FirstOrDefaultAsync(a => a.AttributeGuid == serviceLineDimension.DefaultLookupKeyGuid, cancellationToken);
+
+            serviceLineInformation.ServiceLineIdAttribute = serviceLineAttribute.SqlColumnName;
+            serviceLineInformation.ServiceLineTableName = serviceLineInformation.ServiceLineDimension.SQLObjectExpression;
+     		serviceLineInformation.ServiceLineNameAttribute = serviceLineInformation.ServiceLineLookUpAttribute?.ColumnName ?? serviceLineAttribute?.ColumnName ?? "Name";
+			serviceLineInformation.SelectClause = $"\r\n, sl.{serviceLineInformation.ServiceLineNameAttribute} as ServiceLine";
+            serviceLineInformation.ServiceLineColumn = $"sl.{serviceLineInformation.ServiceLineIdAttribute}";
+
+            if (serviceLineInformation.ServiceLineDimension.FriendlyName == Dimension.Sg2ServiceLineCrosswalk)
+            {
+                serviceLineInformation.ServiceLineJoin = $"\r\nINNER JOIN dss.DimSg2CareFamily cf ON cf.Sg2CAREFamilyID = {schema}.Sg2CAREFamilyID"
+                    + "\r\nINNER JOIN dss.DimSg2ServiceLineCrosswalk sl ON sl.Sg2ServiceLine = cf.ServiceLine";
+            }
+            else
+            {
+                serviceLineInformation.ServiceLineJoin = $"\r\nINNER JOIN {serviceLineInformation.ServiceLineTableName} sl on sl.{serviceLineInformation.ServiceLineIdAttribute} = {schema}."
+                    + (schema == "m" ? "ServiceLineID" : serviceLineInformation.ServiceLineIdAttribute);
+            }
+            return serviceLineInformation;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Settings/ISettingsService.cs b/src/Strata.ContinuousImprovement.Biz/Settings/ISettingsService.cs
new file mode 100644
index 0000000..620b4d0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Settings/ISettingsService.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Settings
+{
+    public interface ISettingsService
+    {
+        Task<Dictionary<string, string>> GetSystemSettings(List<string> settings, CancellationToken cancellationToken);
+        Task<Dictionary<string, string>> SystemSettingsAsync(CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Settings/SettingsService.cs b/src/Strata.ContinuousImprovement.Biz/Settings/SettingsService.cs
new file mode 100644
index 0000000..7aa8cb8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Settings/SettingsService.cs
@@ -0,0 +1,63 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Microsoft.IdentityModel.Tokens;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Settings
+{
+    public class SettingsService : ISettingsService
+    {
+        private readonly IAsyncDbContextFactory<JazzDbContext> _dbContextFactory;
+        private readonly ILogger<SettingsService> _logger;
+
+        public SettingsService() { }
+
+        public SettingsService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory, ILogger<SettingsService> logger)
+        {
+            _dbContextFactory = dbContextFactory;
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// Get necessary system settings
+        /// </summary>
+        /// <param name="settings">List of system settings names</param>
+        /// <param name="cancellationToken"></param>
+        /// <returns>Dictionary with system settings name-value</returns>
+        public async Task<Dictionary<string, string>> GetSystemSettings(List<string> settings, CancellationToken cancellationToken)
+        {
+            if (settings.IsNullOrEmpty()) { return new Dictionary<string, string>(); }
+            var results = await SystemSettingsAsync(cancellationToken);
+            return results.Where(item => settings.Contains(item.Key))
+                .ToDictionary(item => item.Key, item => item.Value);
+        }
+
+        /// <summary>
+        /// Get dictionary of system settings
+        /// </summary>
+        /// <param name="cancellationToken"></param>
+        /// <returns>Dictionary with system settings</returns>
+        public async Task<Dictionary<string, string>> SystemSettingsAsync(CancellationToken cancellationToken)
+        {
+            try
+            {
+                await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+                if (dbContext == null) { return default; }
+                var results = await dbContext.SystemSettings.ToDictionaryAsync(item => item.Name, item => item.Value, cancellationToken);
+                return results;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, ex.Message);
+                throw;
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Shared/DatabaseRegexSection.cs b/src/Strata.ContinuousImprovement.Biz/Shared/DatabaseRegexSection.cs
new file mode 100644
index 0000000..d9fe619
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Shared/DatabaseRegexSection.cs
@@ -0,0 +1,11 @@
+using System.Text.RegularExpressions;
+
+namespace Strata.ContinuousImprovement.Biz.Shared
+{
+    public class DatabaseRegexSection
+    {
+        public string DatabaseRegex { get; set; }
+        public Regex DatabaseRegexExpression => DatabaseRegex == null
+            ? null : new Regex(DatabaseRegex, RegexOptions.IgnoreCase | RegexOptions.Compiled);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Shared/EncounterGroup.cs b/src/Strata.ContinuousImprovement.Biz/Shared/EncounterGroup.cs
new file mode 100644
index 0000000..1745f20
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Shared/EncounterGroup.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.Shared
+{
+    public enum EncounterGroup
+    {
+        Both = -1,
+        CaseType = 0,
+        PatientPopulation = 1
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Shared/EnumExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Shared/EnumExtensions.cs
new file mode 100644
index 0000000..c082a61
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Shared/EnumExtensions.cs
@@ -0,0 +1,22 @@
+using System;
+using System.ComponentModel;
+using System.Reflection;
+
+namespace Strata.ContinuousImprovement.Biz.Shared
+{
+    public static class EnumExtensions
+    {
+        public static string GetDescription(this Enum value)
+        {
+            FieldInfo field = value.GetType().GetField(value.ToString());
+
+            if (field != null &&
+                Attribute.GetCustomAttribute(field, typeof(DescriptionAttribute)) is DescriptionAttribute attr)
+            {
+                return attr.Description;
+            }
+
+            return value.ToString();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Shared/InitiativeStatuses.cs b/src/Strata.ContinuousImprovement.Biz/Shared/InitiativeStatuses.cs
new file mode 100644
index 0000000..6ad56ab
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Shared/InitiativeStatuses.cs
@@ -0,0 +1,8 @@
+namespace Strata.ContinuousImprovement.Biz.Shared;
+
+public enum InitiativeStatuses
+{
+    OnHold,
+    InProcess,
+    Completed
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Shared/MonthlyRampUp.cs b/src/Strata.ContinuousImprovement.Biz/Shared/MonthlyRampUp.cs
new file mode 100644
index 0000000..4f2c6f8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Shared/MonthlyRampUp.cs
@@ -0,0 +1,39 @@
+using System.Globalization;
+
+namespace Strata.ContinuousImprovement.Biz.Shared
+{
+    public sealed class MonthlyRampUp
+    {
+        #region Properties
+
+        public int FiscalMonthId { get; private set; }
+        public int FiscalYearId { get; private set; }
+        public string Month { get; private set; }
+        public double Value { get; internal set; }
+        public double ValuePercentage { get { return Value / 100.0; } }
+
+        #endregion
+
+        #region Ctors
+
+        public MonthlyRampUp(int fiscalMonthId, int fiscalYearId, double value)
+        {
+            FiscalMonthId = fiscalMonthId;
+            FiscalYearId = fiscalYearId;
+            Month = CultureInfo.CurrentCulture.DateTimeFormat.GetAbbreviatedMonthName(fiscalMonthId);
+            Value = value;
+        }
+
+        #endregion
+
+        public static MonthlyRampUp[] GetDefaultRampUps()
+        {
+            return new[]
+            {
+                new MonthlyRampUp(1, 0, 1), new MonthlyRampUp(2, 0, 1), new MonthlyRampUp(3, 0, 1), new MonthlyRampUp(4, 0, 1),
+                new MonthlyRampUp(5, 0, 1), new MonthlyRampUp(6, 0, 1), new MonthlyRampUp(7, 0, 1), new MonthlyRampUp(8, 0, 1),
+                new MonthlyRampUp(9, 0, 1), new MonthlyRampUp(10, 0, 1), new MonthlyRampUp(11, 0, 1), new MonthlyRampUp(12, 0, 1)
+            };
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Shared/NameItem.cs b/src/Strata.ContinuousImprovement.Biz/Shared/NameItem.cs
new file mode 100644
index 0000000..d94b56e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Shared/NameItem.cs
@@ -0,0 +1,16 @@
+namespace Strata.ContinuousImprovement.Biz.Shared
+{
+    public interface INameItem
+    {
+        string Name { get; set; }
+    }
+
+    public class NameItem : INameItem
+    {
+        public string Name { get; set; }
+        public NameItem(string name)
+        {
+            Name = name;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Shared/OpportunityLevel.cs b/src/Strata.ContinuousImprovement.Biz/Shared/OpportunityLevel.cs
new file mode 100644
index 0000000..ab51f22
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Shared/OpportunityLevel.cs
@@ -0,0 +1,11 @@
+namespace Strata.ContinuousImprovement.Biz.Shared
+{
+    public enum OpportunityLevel
+    {
+        Organization,
+        Entity,
+        ServiceLine,
+        Specialty,
+        Provider
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Shared/Period.cs b/src/Strata.ContinuousImprovement.Biz/Shared/Period.cs
new file mode 100644
index 0000000..dd04eb5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Shared/Period.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Shared
+{
+    public class Period<T>
+    {
+        public T Start { get; private set; }
+        public T End { get; private set; }
+
+        public Period(T start, T end)
+        {
+            Start = start;
+            End = end;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Shared/PickerItem.cs b/src/Strata.ContinuousImprovement.Biz/Shared/PickerItem.cs
new file mode 100644
index 0000000..7d37cf2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Shared/PickerItem.cs
@@ -0,0 +1,8 @@
+namespace Strata.ContinuousImprovement.Biz.Shared
+{
+    public class PickerItem
+    {
+        public long Value { get; set; }
+        public string Text { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Shared/SystemSetting.cs b/src/Strata.ContinuousImprovement.Biz/Shared/SystemSetting.cs
new file mode 100644
index 0000000..96e1321
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Shared/SystemSetting.cs
@@ -0,0 +1,18 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.Shared
+{
+    [Table("SystemSetting", Schema = "cci")]
+    public class SystemSetting
+    {
+        [Key]
+        public int SystemSettingId { get; set; }
+
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public int ColumnType { get; set; }
+        public string Value { get; set; }
+        public string DefaultValue { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Shared/TrackingYearMonth.cs b/src/Strata.ContinuousImprovement.Biz/Shared/TrackingYearMonth.cs
new file mode 100644
index 0000000..42f78d5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Shared/TrackingYearMonth.cs
@@ -0,0 +1,22 @@
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+
+namespace Strata.ContinuousImprovement.Biz.Shared
+{
+    public class TrackingYearMonth : YearMonth
+    {
+        public readonly bool IsAfterEffectiveDate;
+        public readonly bool IsBeforeTrackingDate;
+        public readonly bool IsCurrentMonth;
+
+        public bool IsTrackedMonth => IsAfterEffectiveDate && IsBeforeTrackingDate;
+
+        public TrackingYearMonth(int fiscalYear, int calendarYear, FiscalMonth fiscalMonth, bool isAfterEffectiveDate,
+            bool isBeforeTrackingDate, bool isCurrentMonth)
+            : base(fiscalYear, calendarYear, fiscalMonth)
+        {
+            IsAfterEffectiveDate = isAfterEffectiveDate;
+            IsBeforeTrackingDate = isBeforeTrackingDate;
+            IsCurrentMonth = isCurrentMonth;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Shared/YearMonth.cs b/src/Strata.ContinuousImprovement.Biz/Shared/YearMonth.cs
new file mode 100644
index 0000000..d89287f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Shared/YearMonth.cs
@@ -0,0 +1,39 @@
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.Shared
+{
+    public class YearMonth
+    {
+        public readonly int FiscalYear;
+        public readonly int CalendarYear;
+
+        public readonly FiscalMonth FiscalMonth;
+
+        public readonly DateTime FiscalYearMonth;
+
+        public readonly DateTime CalendarYearMonth;
+
+        #region Helper Properties  to corelate to database column names
+
+        public int FiscalYearID => FiscalYear;
+
+        /// <summary>
+        /// This is calendar month and FiscalMonth.SortOrder is the real FiscalMonth
+        /// we put it here so that we don't frikin confuse ourself between fiscalmonth and calendarmonth :x
+        /// </summary>
+        public int FiscalMonthID => FiscalMonth.FiscalMonthId;
+
+        #endregion
+
+        internal YearMonth(int fiscalYear, int calendarYear, FiscalMonth fiscalMonth)
+        {
+            FiscalYear = fiscalYear;
+            CalendarYear = calendarYear;
+            FiscalMonth = fiscalMonth;
+
+            FiscalYearMonth = new DateTime(fiscalYear, fiscalMonth.SortOrder, 1);
+            CalendarYearMonth = new DateTime(calendarYear, fiscalMonth.FiscalMonthId, 1);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Strata.ContinuousImprovement.Biz.csproj b/src/Strata.ContinuousImprovement.Biz/Strata.ContinuousImprovement.Biz.csproj
new file mode 100644
index 0000000..17b9757
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Strata.ContinuousImprovement.Biz.csproj
@@ -0,0 +1,155 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <CodeAnalysisRuleSet></CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>1701;1702</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="AutoMapper\**" />
+    <Compile Remove="StaffingToDemand\**" />
+    <EmbeddedResource Remove="AutoMapper\**" />
+    <EmbeddedResource Remove="StaffingToDemand\**" />
+    <None Remove="AutoMapper\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="Exploration\ExplorationServiceQueries\**\*.sql" />
+    <None Remove="StaffingToDemand\**" />
+    <EmbeddedResource Include="Exploration\ExplorationServiceQueries\**\*.sql" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="AutoMapperProfile.cs" />
+    <Compile Remove="ChargeCode\Jobs\CCOpportunityClientDetailRefreshJob.cs" />
+    <Compile Remove="ChargeCode\Opportunities\ChargeCodeOpportunityDetailCharges.cs" />
+    <Compile Remove="Configurations\IStrataS3TransferConfiguration.cs" />
+    <Compile Remove="Configurations\StrataS3TransferConfiguration.cs" />
+    <Compile Remove="Filter\FiltersDataExtensions.cs" />
+    <Compile Remove="FreeForm\Opportunities\BaselineMetric.cs" />
+    <Compile Remove="FreeForm\Opportunities\MonthlyBaselineMetric.cs" />
+    <Compile Remove="Generics\MemberJson.cs" />
+    <Compile Remove="OrgDefined\Queries\IOpportunityMetricBase.cs" />
+    <Compile Remove="SlugifyParameterTransformer.cs" />
+    <Compile Remove="Utilities\EnglishAssistant.cs" />
+    <Compile Remove="Utilities\GrammarRules.cs" />
+    <Compile Remove="Utilities\IGrammarAssistant.cs" />
+    <Compile Remove="Utilities\LanguageEngine.cs" />
+    <Compile Remove="UtilizationVariation\Opportunities\VariationOpportunityFilter.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\.sonarlint\strata.continuousimprovement\CSharp\SonarLint.xml" Link="SonarLint.xml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.Core" Version="3.7.400.37" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.405.1" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.7.400.37" />
+    <PackageReference Include="ClosedXML.Signed" Version="0.95.4" />
+    <PackageReference Include="CsvHelper" Version="33.1.0" />
+    <PackageReference Include="EasyCaching.InMemory" Version="1.9.2" />
+    <PackageReference Include="EFCore.BulkExtensions.MIT" Version="8.17.0" />
+    <PackageReference Include="FluentFTP" Version="51.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="morelinq" Version="4.3.0" />
+    <PackageReference Include="Nanoid" Version="3.1.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0" />
+    <PackageReference Include="RestSharp" Version="112.1.0" />
+    <PackageReference Include="Riok.Mapperly" Version="4.3.0" />
+    <PackageReference Include="Strata.Analytics.Client" Version="3.102.1" />
+    <PackageReference Include="Strata.Analytics.Models" Version="3.102.1" />
+    <PackageReference Include="Strata.ApiCommunication.Http" Version="7.0.4" />
+    <PackageReference Include="Strata.Authorization" Version="3.1.0" />
+    <PackageReference Include="Strata.CoreLib" Version="2.4.0" />
+    <PackageReference Include="Strata.DataSchema.Client" Version="3.120.0" />
+    <PackageReference Include="Strata.DataSchema.Models" Version="3.120.0" />
+    <PackageReference Include="Strata.ElastiCache.Redis" Version="2.0.7" />
+    <PackageReference Include="Strata.FeatureFlags.Client" Version="6.4.0" />
+    <PackageReference Include="Strata.Hangfire" Version="5.3.0" />
+    <PackageReference Include="Strata.Hangfire.Jazz.Client" Version="5.3.0" />
+    <PackageReference Include="Strata.Id.Client" Version="4.1.4" />
+    <PackageReference Include="Strata.Licenses.Client" Version="1.2.0" />
+    <PackageReference Include="Strata.Replication.Client" Version="1.50.0" />
+    <PackageReference Include="Strata.SnowflakeLib" Version="4.3.0" />
+    <PackageReference Include="Strata.SqlTools.Configuration.Postgres" Version="6.0.3" />
+    <PackageReference Include="Strata.SqlTools.Configuration.SqlServer" Version="6.0.3" />
+    <PackageReference Include="Strata.SqlTools.EntityFramework" Version="6.0.3" />
+    <PackageReference Include="Strata.Schema.Client" Version="5.0.5" />
+    <PackageReference Include="Strata.SMC.Client" Version="3.2.2" />
+    <PackageReference Include="Strata.StrataSphereCompare.Client" Version="0.305.12" />
+    <PackageReference Include="Strata.Users.Client" Version="2.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.Api.Test.Integration</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.Api.Test.Unit</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.Biz.Test.Unit</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.Biz.Test.Integration</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.Client.Test.Integration</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.JazzEntityFrameworkStub</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="StrategicOpportunities\Queries\**\*.sql" />
+    <EmbeddedResource Include="StrategicOpportunities\Queries\**\*.sql" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="StrategicOpportunities\DistributionProcess\**\*.sql" />
+    <EmbeddedResource Include="StrategicOpportunities\DistributionProcess\**\*.sql" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="StrategicOpportunities\Email\PrimaryMeasureMonitoringEmail.html" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="StrategicOpportunities\Email\PrimaryMeasureMonitoringEmail.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="GeneralLedger\Details\FactGL.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="DbContexts\SeedData\" />
+    <Folder Include="Snowflake\" />
+    <Folder Include="StrategicOpportunities\GL\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Strata.DecisionSupport.Models\Strata.DecisionSupport.Models.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Strata.ContinuousImprovement.Biz/Strata.ContinuousImprovement.Biz.csproj.DotSettings b/src/Strata.ContinuousImprovement.Biz/Strata.ContinuousImprovement.Biz.csproj.DotSettings
new file mode 100644
index 0000000..8064d49
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Strata.ContinuousImprovement.Biz.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=qualityvariation_005Copportunities/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/DistributionChargeCodeSummary.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/DistributionChargeCodeSummary.cs
new file mode 100644
index 0000000..d6ea504
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/DistributionChargeCodeSummary.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.ChargeCode
+{
+    public class DistributionChargeCodeSummary
+    {
+        public double ImprovementSum { get; set; }
+        public double EstimatedGoalSum { get; set; }
+        public double CommittedSum { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/DistributionProcessChargeCode.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/DistributionProcessChargeCode.cs
new file mode 100644
index 0000000..bfcf18d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/DistributionProcessChargeCode.cs
@@ -0,0 +1,61 @@
+using Dapper;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.Models;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.ChargeCode
+{
+    public class DistributionProcessChargeCode
+    {
+        const string REQUEST_TYPE = "Strategic Opportunity Detail";
+
+        private readonly ISnowflakeDatabaseContext _snowflakeDatabaseContext;
+        private readonly DistributionProcessChargeCodeSqlBuilder _sqlBuilder;
+
+        protected readonly long _opportunityId;
+        protected readonly Period<DateOnly> _baselinePeriod;
+        protected readonly Period<DateOnly> _goalPeriod;
+        protected readonly Period<DateOnly> _trackingPeriod;
+        protected readonly double[] _rampUps;
+
+        public DistributionProcessChargeCode(ISnowflakeDatabaseContext snowflakeDatabaseContext, long opportunityId, Period<DateOnly> baselinePeriod, Period<DateOnly> goalPeriod, Period<DateOnly> trackingPeriod, double[] rampUps)
+        {
+            _snowflakeDatabaseContext = snowflakeDatabaseContext;
+            _opportunityId = opportunityId;
+            _baselinePeriod = baselinePeriod;
+            _goalPeriod = goalPeriod;
+            _trackingPeriod = trackingPeriod;
+            _rampUps = rampUps;
+
+            _sqlBuilder = new DistributionProcessChargeCodeSqlBuilder(opportunityId, baselinePeriod, goalPeriod, trackingPeriod, rampUps);
+        }
+
+        public async Task<DistributionChargeCodeSummary> DistributeAsync(DistributionMethod methodType, DistributionStage stage)
+        {
+            var sqlBuilderResult = _sqlBuilder.BuildInsertDistributedSql(methodType, stage);
+            var result = await _snowflakeDatabaseContext.QueryMultipleReturnLastAsync<DistributionChargeCodeSummary>(sqlBuilderResult.Sql, REQUEST_TYPE, sqlBuilderResult.QueryCount, sqlBuilderResult.Parameters);
+            return result.FirstOrDefault();
+        }
+
+        public async Task<DistributionChargeCodeSummary> GetDistributionSummaryAsync(bool isInitiative)
+        {
+            var sqlBuilderResult = _sqlBuilder.BuildDistributionSummarySql(isInitiative);
+            var result = await _snowflakeDatabaseContext.QueryMultipleReturnLastAsync<DistributionChargeCodeSummary>(sqlBuilderResult.Sql, REQUEST_TYPE, sqlBuilderResult.QueryCount, sqlBuilderResult.Parameters);
+            return result.FirstOrDefault();
+        }
+
+        public async Task<DistributionChargeCodeSummary> UpdateDetailCommittedByRampUp(double[] oldRampUps)
+        {
+            var sqlBuilderResult = _sqlBuilder.BuildUpdateDetailCommittedByRampUpSql(oldRampUps);
+            var result = await _snowflakeDatabaseContext.QueryMultipleReturnLastAsync<DistributionChargeCodeSummary>(sqlBuilderResult.Sql, REQUEST_TYPE, sqlBuilderResult.QueryCount, sqlBuilderResult.Parameters);
+            return result.FirstOrDefault();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/DistributionProcessChargeCodeSqlBuilder.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/DistributionProcessChargeCodeSqlBuilder.cs
new file mode 100644
index 0000000..ee49c9e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/DistributionProcessChargeCodeSqlBuilder.cs
@@ -0,0 +1,455 @@
+using Dapper;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.Models;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.ChargeCode
+{
+    public class DistributionProcessChargeCodeSqlBuilder
+    {
+        private readonly Assembly _assembly;
+        private readonly long _opportunityId;
+        private readonly Period<DateOnly> _baselinePeriod;
+        private readonly Period<DateOnly> _goalPeriod;
+        private readonly Period<DateOnly> _trackingPeriod;
+        private readonly double[] _rampUps;
+
+        public DistributionProcessChargeCodeSqlBuilder(
+            long opportunityId,
+            Period<DateOnly> baselinePeriod,
+            Period<DateOnly> goalPeriod,
+            Period<DateOnly> trackingPeriod,
+            double[] rampUps)
+        {
+            _assembly = Assembly.GetExecutingAssembly();
+            _opportunityId = opportunityId;
+            _baselinePeriod = baselinePeriod;
+            _goalPeriod = goalPeriod;
+            _trackingPeriod = trackingPeriod;
+            _rampUps = rampUps;
+        }
+
+        public SqlBuilderResult BuildInsertDistributedSql(DistributionMethod methodType, DistributionStage stage)
+        {
+            var isInitiative = GetIsInitiative(stage);
+            var distributedPeriod = GetDistributedPeriod(isInitiative);
+            var sqlRampUpTable = GetRampUpTableSql(stage == DistributionStage.FromInitiativeToOpportunity ? _trackingPeriod : distributedPeriod, _rampUps, "rp");
+
+            var sbQuery = new StringBuilder();
+            var queryCount = (byte)0;
+
+            if (stage == DistributionStage.FromOpportunityToInitiative || stage == DistributionStage.FromInitiativeToOpportunity || stage == DistributionStage.InitiativeChangeTrackingPeriod)
+            {
+                if (!string.IsNullOrEmpty(sqlRampUpTable))
+                {
+                    Func<string, string, string, string> convertFunc = stage == DistributionStage.FromOpportunityToInitiative ?
+                        GetFromGoalToCommittedSql :
+                        GetFromCommittedToGoalSql;
+                    sbQuery.AppendLine($@"
+                        UPDATE {StrategicOpportunityService.StrategicOpportunityDetailTableName} AS tt
+                        SET
+                            tt.GoalUnits = st.GoalUnits,
+                            tt.GoalCost = st.GoalCost
+                        FROM (
+                            SELECT
+                                RowId,
+                                (CASE WHEN rp.RampUp IS NULL OR rp.RampUp = 1 THEN GoalUnits ELSE {convertFunc("GoalUnits", "DistributedUnits", "rp.RampUp")} END) AS GoalUnits,
+                                (CASE WHEN rp.RampUp IS NULL OR rp.RampUp = 1 THEN GoalCost ELSE {convertFunc("GoalCost", "DistributedCost", "rp.RampUp")} END) AS GoalCost
+
+                            FROM {StrategicOpportunityService.StrategicOpportunityDetailTableName} AS sd
+                            LEFT JOIN {sqlRampUpTable} ON rp.YearId = sd.DischargeFiscalYearId AND rp.MonthId = sd.DischargeFiscalMonthId
+                            WHERE OpportunityId = @OpportunityId AND IsBaseline = False
+                        ) AS st
+                        WHERE st.RowId = tt.RowId;
+                    ");
+                    queryCount += 1;
+                }
+            }
+
+            if (stage == DistributionStage.FromInitiativeToOpportunity)
+            {
+                sbQuery.AppendLine($@"
+                        UPDATE {StrategicOpportunityService.StrategicOpportunityDetailTableName} AS tt
+                        SET
+                            tt.Cost = 0,
+                            tt.Units = 0
+                        WHERE tt.OpportunityId = @OpportunityId AND tt.IsBaseline = False;
+                    ");
+                queryCount += 1;
+            }
+
+            if (!((stage == DistributionStage.FromOpportunityToInitiative || stage == DistributionStage.FromInitiativeToOpportunity) && IsDistributedPeriodsEqual()))
+            {
+                if (IsUseMultiplier(stage))
+                {
+                    sbQuery.AppendLine(ReadResource("DetailSourceDataMultiplier.sql"));
+                    queryCount += 3;
+                }
+                sbQuery.AppendLine($"DELETE FROM {StrategicOpportunityService.StrategicOpportunityDetailTableName} WHERE OpportunityId = @OpportunityId AND IsBaseline = False;");
+                sbQuery.AppendLine("DECLARE");
+                sbQuery.AppendLine(ReadResource("DeclareVariables.sql"));
+                sbQuery.AppendLine("BEGIN");
+                sbQuery.AppendLine($@"
+                    {GetInsertSql()}
+                    WITH
+                        {ReadResource("DatePeriodCTE.sql")},
+                        {ReadResource(GetDetailDataCteFile(methodType))}
+                    {GetSelectSql(stage)};
+                ");
+                sbQuery.AppendLine("END;");
+                queryCount += 2;
+            }
+
+            sbQuery.AppendLine(GetSummarySql(isInitiative));
+            queryCount += 1;
+
+            var parameters = GetParameters(sbQuery, queryCount, distributedPeriod);
+
+            return new SqlBuilderResult()
+            {
+                Sql = sbQuery.ToString().SnowflakeSyntax(),
+                QueryCount = queryCount,
+                Parameters = parameters
+            };
+        }
+
+        public SqlBuilderResult BuildDistributionSummarySql(bool isInitiative)
+        {
+            var sbQuery = new StringBuilder(GetSummarySql(isInitiative));
+            var queryCount = (byte)1;
+
+            var parameters = GetParameters(sbQuery, queryCount, GetDistributedPeriod(isInitiative));
+
+            return new SqlBuilderResult()
+            {
+                Sql = sbQuery.ToString().SnowflakeSyntax(),
+                QueryCount = queryCount,
+                Parameters = parameters
+            };
+        }
+
+        public SqlBuilderResult BuildUpdateDetailCommittedByRampUpSql(double[] oldRampUps)
+        {
+            var isInitiative = true;
+            var queryCount = (byte)0;
+            var sbQuery = new StringBuilder();
+
+            var distributedPeriod = GetDistributedPeriod(isInitiative);
+
+            var sqlOldRampUpTable = GetRampUpTableSql(distributedPeriod, oldRampUps, "orp");
+            var sqlNewRampUpTable = GetRampUpTableSql(distributedPeriod, _rampUps, "nrp");
+
+            if (!(string.IsNullOrEmpty(sqlOldRampUpTable) && string.IsNullOrEmpty(sqlNewRampUpTable)))
+            {
+                if (string.IsNullOrEmpty(sqlOldRampUpTable)) sqlOldRampUpTable = GetRampUpTableSql(distributedPeriod, oldRampUps, "orp", true);
+                if (string.IsNullOrEmpty(sqlNewRampUpTable)) sqlNewRampUpTable = GetRampUpTableSql(distributedPeriod, _rampUps, "nrp", true);
+
+                sbQuery.AppendLine($@"
+                    UPDATE {StrategicOpportunityService.StrategicOpportunityDetailTableName} AS tt
+                    SET
+                        tt.GoalUnits = st.GoalUnits,
+                        tt.GoalCost = st.GoalCost
+                    FROM (
+                        SELECT
+                            RowId,
+                            ({GetFromCommittedToGoalOnRampUpUpdateSql("GoalUnits", "DistributedUnits", "orp.RampUp", "nrp.RampUp")}) AS GoalUnits,
+                            ({GetFromCommittedToGoalOnRampUpUpdateSql("GoalCost", "DistributedCost", "orp.RampUp", "nrp.RampUp")}) AS GoalCost
+                        FROM {StrategicOpportunityService.StrategicOpportunityDetailTableName} AS sd
+                        LEFT JOIN {sqlOldRampUpTable} ON orp.YearId = sd.DischargeFiscalYearId AND orp.MonthId = sd.DischargeFiscalMonthId
+                        LEFT JOIN {sqlNewRampUpTable} ON nrp.YearId = sd.DischargeFiscalYearId AND nrp.MonthId = sd.DischargeFiscalMonthId
+                        WHERE OpportunityId = @OpportunityId AND IsBaseline = False
+                    ) AS st
+                    WHERE st.RowId = tt.RowId;                    
+                ");
+                queryCount += 1;
+            }
+
+            sbQuery.AppendLine(GetSummarySql(isInitiative));
+            queryCount += 1;
+
+            var parameters = GetParameters(sbQuery, queryCount, GetDistributedPeriod(isInitiative));
+
+            return new SqlBuilderResult()
+            {
+                Sql = sbQuery.ToString().SnowflakeSyntax(),
+                QueryCount = queryCount,
+                Parameters = parameters
+            };
+        }
+
+        private string ReadResource(string fileName)
+        {
+            return _assembly.ReadResource($"ChargeCode.SQL.{fileName}");
+        }
+
+        private bool GetIsInitiative(DistributionStage stage)
+        {
+            return stage switch
+            {
+                DistributionStage.FromSourceToOpportunity => false,
+                DistributionStage.OpportunityChangeGoalPeriod => false,
+                DistributionStage.FromOpportunityToInitiative => true,
+                DistributionStage.InitiativeChangeTrackingPeriod => true,
+                DistributionStage.FromInitiativeToOpportunity => false,
+                _ => false
+            };
+        }
+
+        private Period<DateOnly> GetDistributedPeriod(bool isInitiative)
+        {
+            return isInitiative ? _trackingPeriod : _goalPeriod;
+        }
+
+        private bool IsDistributedPeriodsEqual()
+        {
+            return _goalPeriod.Start.Year == _trackingPeriod.Start.Year &&
+                   _goalPeriod.Start.Month == _trackingPeriod.Start.Month &&
+                   _goalPeriod.End.Year == _trackingPeriod.End.Year &&
+                   _goalPeriod.End.Month == _trackingPeriod.End.Month;
+        }
+
+        private bool IsUseMultiplier(DistributionStage stage)
+        {
+            return stage == DistributionStage.FromOpportunityToInitiative || stage == DistributionStage.FromInitiativeToOpportunity || stage == DistributionStage.InitiativeChangeTrackingPeriod || stage == DistributionStage.OpportunityChangeGoalPeriod;
+        }
+
+        private string GetSelectSql(DistributionStage stage)
+        {
+            var distributionPeriod = GetDistributedPeriod(GetIsInitiative(stage));
+            var sqlRampUpTable = GetRampUpTableSql(distributionPeriod, _rampUps, "rp", true);
+            var isUseMultiplier = IsUseMultiplier(stage);
+
+            string goalValuesSql = $@"
+                dd.Units AS GoalUnits,
+                dd.Cost AS GoalCost
+            ";
+
+            if (!string.IsNullOrEmpty(sqlRampUpTable) && isUseMultiplier)
+            {
+                if (stage == DistributionStage.FromInitiativeToOpportunity)
+                {
+                    goalValuesSql = $@"
+                        dd.Units * MultiplierUnits AS GoalUnits,
+                        dd.Cost * MultiplierCost AS GoalCost
+                    ";
+                }
+                else
+                {
+                    goalValuesSql = $@"
+                        (CASE WHEN mlt.MultiplierUnits IS NULL THEN dd.Units ELSE dd.Units * mlt.MultiplierUnits END) AS NewGoalUnits,
+                        (CASE WHEN mlt.MultiplierCost IS NULL THEN dd.Cost ELSE dd.Cost * mlt.MultiplierCost END) AS NewGoalCost,
+                        (CASE WHEN rp.RampUp IS NULL OR rp.RampUp = 1 THEN NewGoalUnits ELSE {GetFromGoalToCommittedSql("NewGoalUnits", "dd.Units", "rp.RampUp")} END) AS GoalUnits,
+                        (CASE WHEN rp.RampUp IS NULL OR rp.RampUp = 1 THEN NewGoalCost ELSE {GetFromGoalToCommittedSql("NewGoalCost", "dd.Cost", "rp.RampUp")} END) AS GoalCost
+                    ";
+                }
+            }
+
+            string joinSql = !string.IsNullOrEmpty(sqlRampUpTable) && isUseMultiplier ? $@"
+                    LEFT JOIN DetailSourceDataMultiplier AS mlt ON
+		                mlt.EntityID = dd.EntityID AND
+		                mlt.PrimaryPhysicianID = dd.PrimaryPhysicianID AND
+		                mlt.PrimaryServiceLineID = dd.PrimaryServiceLineID AND
+		                mlt.DepartmentID = dd.DepartmentID AND
+		                mlt.PhysicianSpecialtyID = dd.PhysicianSpecialtyID AND
+		                mlt.ChargeCodeID = dd.ChargeCodeID AND		                
+		                mlt.CaseTypeFamilyId = dd.CaseTypeFamilyId AND
+                        mlt.CostDriver = dd.CostDriver
+                    LEFT JOIN {sqlRampUpTable} ON rp.YearId = dd.YearId AND rp.MonthId = dd.MonthId 
+                " : string.Empty;
+
+            var sql = $@"
+                SELECT
+                    {GetColumnsList()}
+                FROM (
+                    SELECT
+                        @OpportunityId AS OpportunityId,
+                        False AS IsBaseline,    
+                        dd.YearId AS DischargeFiscalYearId,
+                        dd.MonthId AS DischargeFiscalMonthId,
+                        dd.EntityID,
+                        dd.PrimaryPhysicianId,
+                        dd.PrimaryServiceLineId,
+                        dd.DepartmentId,
+                        dd.PhysicianSpecialtyId,
+                        dd.ChargeCodeID,                    
+                        dd.CaseTypeFamilyId,
+                        dd.CostDriver,
+                        0 AS Units,
+                        0 AS Cost,
+                        dd.Units AS DistributedUnits,
+                        dd.Cost AS DistributedCost,
+                        {goalValuesSql}
+                    FROM DetailNewAllData AS dd
+                    {joinSql}
+                )    
+            ";
+            return sql;
+        }
+
+        private string GetInsertSql()
+        {
+            var sql = $@"
+                INSERT INTO {StrategicOpportunityService.StrategicOpportunityDetailTableName} (
+                    {GetColumnsList()}
+                )                
+            ";
+            return sql;
+        }
+
+        private string GetColumnsList()
+        {
+            return @"
+                    OpportunityId,
+                    IsBaseline,
+                    DischargeFiscalYearId,
+                    DischargeFiscalMonthId,
+                    EntityId,
+                    PrimaryPhysicianId,
+                    PrimaryServiceLineId,
+                    DepartmentId,
+                    PhysicianSpecialtyId,
+                    ChargeCodeId,                    
+                    CaseTypeFamilyId,
+                    CostDriver,
+                    Units,
+                    Cost,
+                    DistributedUnits,
+                    DistributedCost,
+                    GoalUnits,
+                    GoalCost";
+        }
+
+        private string GetSummarySql(bool isInitiative)
+        {
+            if (isInitiative)
+            {
+                var sql = $@"
+                    SELECT
+                        0::FLOAT AS ImprovementSum,
+                        0::FLOAT AS EstimatedGoalSum,
+                        COALESCE(SUM(GoalCost), 0)::FLOAT AS CommittedSum               
+                    FROM {StrategicOpportunityService.StrategicOpportunityDetailTableName} AS dl
+                    WHERE OpportunityId = @OpportunityId AND IsBaseline = False;
+                ";
+                return sql;
+            }
+            else
+            {
+                var sqlRampUpTable = GetRampUpTableSql(GetDistributedPeriod(isInitiative), _rampUps, "rp");
+
+                var estimatedGoalSumSql = !string.IsNullOrEmpty(sqlRampUpTable) ?
+                    $"COALESCE(SUM((CASE WHEN rp.RampUp IS NULL OR rp.RampUp = 1 THEN GoalCost ELSE {GetFromGoalToCommittedSql("GoalCost", "DistributedCost", " rp.RampUp")} END)), 0)::FLOAT AS EstimatedGoalSum" :
+                    "COALESCE(SUM(GoalCost), 0)::FLOAT AS EstimatedGoalSum";
+                var joinSql = !string.IsNullOrEmpty(sqlRampUpTable) ?
+                    $"LEFT JOIN {sqlRampUpTable} ON rp.YearId = sd.DischargeFiscalYearId AND rp.MonthId = sd.DischargeFiscalMonthId" :
+                    string.Empty;
+
+                var sql = $@"
+                        SELECT
+                            COALESCE(SUM(DistributedCost - GoalCost), 0)::FLOAT AS ImprovementSum,
+                            {estimatedGoalSumSql},
+                            0::FLOAT AS CommittedSum                 
+                        FROM {StrategicOpportunityService.StrategicOpportunityDetailTableName} AS sd
+                        {joinSql}
+                        WHERE OpportunityId = @OpportunityId AND IsBaseline = False;
+                    ";
+                return sql;
+            }
+        }
+
+        private string GetDetailDataCteFile(DistributionMethod methodType)
+        {
+            if (methodType == DistributionMethod.Monthly)
+            {
+                return "DetailDataMonthlyCTE.sql";
+            }
+            else
+            {
+                return "DetailDataAverageCTE.sql";
+            }
+        }
+
+        private string GetRampUpTableSql(Period<DateOnly> period, double[] rampUps, string tableName = "RampUpTable", bool isReturnFakeOnEmpty = false)
+        {
+            if (rampUps.Length == 0)
+            {
+                if (isReturnFakeOnEmpty)
+                {
+                    return $@"
+                        (SELECT
+                            {period.Start.Year} AS YearId,
+                            {period.Start.Month} AS MonthId,
+                            1.0 AS RampUp
+                        ) AS {tableName} (YearId, MonthId, RampUp)
+                    ";
+                }
+                return string.Empty;
+            }
+            var baselineYearMonthList = YearMonthStruct.GetList(new YearMonthStruct(period.Start), new YearMonthStruct(period.End));
+            var sql = $@"
+                (VALUES
+                    {string.Join($",{Environment.NewLine}", baselineYearMonthList.Take(rampUps.Length).Select((x, ind) => $"({x.Year}, {x.Month}, {rampUps[ind]})"))}
+                ) AS {tableName} (YearId, MonthId, RampUp)
+            ";
+            return sql;
+        }
+
+        private DynamicParameters GetParameters(StringBuilder sbQuery, byte queryCount, Period<DateOnly> distributionPeriod)
+        {
+            var parameters = new Dictionary<string, string>
+            {
+                { "@OpportunityId", _opportunityId.ToString() },
+                { "@BaselineDateStart", $"'{_baselinePeriod.Start.ToString("yyyy-MM-dd")}'" },
+                { "@BaselineDateEnd", $"'{_baselinePeriod.End.ToString("yyyy-MM-dd")}'" },
+                { "@GoalDateStart", $"'{distributionPeriod.Start.ToString("yyyy-MM-dd")}'" },
+                { "@GoalDateEnd", $"'{distributionPeriod.End.ToString("yyyy-MM-dd")}'" }
+            };
+
+            foreach (var x in parameters)
+            {
+                sbQuery = sbQuery.Replace(x.Key, x.Value);
+            }
+
+            var queryOneParams = new DynamicParameters();
+            queryOneParams.Add("MULTI_STATEMENT_COUNT", queryCount);
+
+            return queryOneParams;
+        }
+
+        private string GetFromGoalToCommittedSql(string goalColumn, string distributedColumn, string rampUpColumn)
+        {
+            var sql = $"({distributedColumn} - ({distributedColumn} - {goalColumn}) * {rampUpColumn})";
+            return sql;
+        }
+
+        private string GetFromCommittedToGoalSql(string goalColumn, string distributedColumn, string rampUpColumn)
+        {
+            var sql = $"(({goalColumn} - {distributedColumn} * (1 - {rampUpColumn})) / {rampUpColumn})";
+            return sql;
+        }
+
+        private string GetFromCommittedToCommittedSql(string goalColumn, string distributedColumn, string oldRampUpColumn, string newRampUpColumn)
+        {
+            var sql = GetFromGoalToCommittedSql(GetFromCommittedToGoalSql(goalColumn, distributedColumn, oldRampUpColumn), distributedColumn, newRampUpColumn);
+            return sql;
+        }
+
+        private string GetFromCommittedToGoalOnRampUpUpdateSql(string goalColumn, string distributedColumn, string rampUpOldColumn, string rampUpNewColumn)
+        {
+            var sql = @$"CASE
+                WHEN ({rampUpOldColumn} IS NULL OR {rampUpOldColumn} = 1 ) AND ({rampUpNewColumn} IS NULL OR {rampUpNewColumn} = 1) THEN {goalColumn}
+                WHEN {rampUpOldColumn} <> 1 AND ({rampUpNewColumn} IS NULL OR {rampUpNewColumn} = 1) THEN {GetFromCommittedToGoalSql(goalColumn, distributedColumn, rampUpOldColumn)}
+                WHEN ({rampUpOldColumn} IS NULL OR {rampUpOldColumn} = 1 ) AND {rampUpNewColumn} <> 1 THEN {GetFromGoalToCommittedSql(goalColumn, distributedColumn, rampUpNewColumn)}
+                WHEN {rampUpOldColumn} <> 1 AND {rampUpNewColumn} <> 1 THEN {GetFromCommittedToCommittedSql(goalColumn, distributedColumn, rampUpOldColumn, rampUpNewColumn)}
+                ELSE {goalColumn}
+            END";
+            return sql;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DatePeriodCTE.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DatePeriodCTE.sql
new file mode 100644
index 0000000..ee1ddc8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DatePeriodCTE.sql
@@ -0,0 +1,36 @@
+BasePeriod AS (
+    SELECT
+        MONTH(monthDate) AS MonthId,
+        YEAR(monthDate) AS YearId
+    FROM (
+        SELECT
+            DATEADD('month', seq4(), @BaselineDateStart) AS monthDate
+        FROM TABLE(GENERATOR(ROWCOUNT => @BaselineMonthCount))
+    )
+),
+GoalPeriod AS (
+    SELECT
+        MONTH(monthDate) AS MonthId,
+        YEAR(monthDate) AS YearId
+    FROM (
+        SELECT
+            DATEADD('month', seq4(), @GoalDateStart) AS monthDate
+        FROM TABLE(GENERATOR(ROWCOUNT => @GoalMonthCount))
+    )
+),
+MonthData AS (
+    SELECT
+        COALESCE(base.MonthId, goal.MonthId) AS MonthId,        
+        COALESCE(base.monthCount, 0) AS BaselineMonthCount,
+        COALESCE(goal.monthCount, 0) AS GoalMonthCount,
+        (case when GoalMonthCount > 0 and BaselineMonthCount > 0 then True else False end)::BOOLEAN AS IsCross
+    FROM (SELECT MonthId, COUNT(*) AS monthCount FROM GoalPeriod group by MonthId) AS goal
+    FULL JOIN (SELECT MonthId, COUNT(*) AS monthCount FROM BasePeriod group by MonthId) AS base
+    ON base.MonthId = goal.MonthId
+),
+MonthDataSummary AS (
+    SELECT
+        SUM(case when IsCross = True then GoalMonthCount else 0 end) AS CrossCount,
+        SUM(case when IsCross = True then 0 else GoalMonthCount end) AS NotCrossCount,
+    FROM MonthData
+)
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DeclareVariables.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DeclareVariables.sql
new file mode 100644
index 0000000..d42b581
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DeclareVariables.sql
@@ -0,0 +1,2 @@
+GoalMonthCount INTEGER := (SELECT DATEDIFF('month', @GoalDateStart, @GoalDateEnd) + 1);
+BaselineMonthCount INTEGER := (SELECT DATEDIFF('month', @BaselineDateStart, @BaselineDateEnd) + 1);
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DetailDataAverageCTE.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DetailDataAverageCTE.sql
new file mode 100644
index 0000000..93f7332
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DetailDataAverageCTE.sql
@@ -0,0 +1,42 @@
+DetailData AS (    
+	SELECT
+        EntityID,
+        PrimaryPhysicianID,
+        PrimaryServiceLineID,
+        DepartmentID,
+        PhysicianSpecialtyID,
+        ChargeCodeID,
+        CaseTypeFamilyId,
+        CostDriver,
+        (CASE WHEN @BaselineMonthCount = 0 THEN 0 ELSE (SUM(Units)/@BaselineMonthCount) END) AS Units,
+        (CASE WHEN @BaselineMonthCount = 0 THEN 0 ELSE (SUM(Cost)/@BaselineMonthCount) END) AS Cost
+    FROM cci.FactStrategicChargeCodeDetail
+    WHERE IsBaseline = True AND OpportunityId = @OpportunityId
+    GROUP BY
+        EntityID,
+        PrimaryPhysicianID,
+        PrimaryServiceLineID,
+        DepartmentID,
+        PhysicianSpecialtyID,
+        ChargeCodeID,
+        CaseTypeFamilyId,
+        CostDriver        
+),
+
+DetailNewAllData AS (
+    SELECT
+		gp.YearId,
+		gp.MonthId,
+		dd.EntityID,
+		dd.PrimaryPhysicianID,
+		dd.PrimaryServiceLineID,
+		dd.DepartmentID,
+		dd.PhysicianSpecialtyID,
+		dd.ChargeCodeID,
+        dd.CaseTypeFamilyId,
+		dd.CostDriver,		
+		dd.Units,
+		dd.Cost
+	FROM DetailData AS dd
+	INNER JOIN GoalPeriod AS gp
+)
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DetailDataMonthlyCTE.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DetailDataMonthlyCTE.sql
new file mode 100644
index 0000000..6f6ac8f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DetailDataMonthlyCTE.sql
@@ -0,0 +1,148 @@
+DetailMonthData AS (
+	SELECT        
+        DischargeFiscalMonthId AS MonthId,        
+        EntityID,
+        PrimaryPhysicianID,
+        PrimaryServiceLineID,
+        DepartmentID,
+        PhysicianSpecialtyID,
+        ChargeCodeID,        
+        CaseTypeFamilyId,
+		CostDriver,
+		SUM(Units) AS SumMonthUnits,
+		SUM(Cost) AS SumMonthCost,
+		SUM(md.BaselineMonthCount) AS SumBaselineMonthCount,
+		SUM(md.GoalMonthCount) AS SumGoalMonthCount,
+		(CASE WHEN SumBaselineMonthCount = 0 OR SumGoalMonthCount = 0 THEN 0 ELSE ((SumMonthUnits/SumBaselineMonthCount) * SumGoalMonthCount) END) AS SumGoalMonthUnits,
+		(CASE WHEN SumBaselineMonthCount = 0 OR SumGoalMonthCount = 0 THEN 0 ELSE ((SumMonthCost/SumBaselineMonthCount) * SumGoalMonthCount) END) AS SumGoalMonthCost,
+        md.IsCross
+    FROM cci.FactStrategicChargeCodeDetail AS sd
+    INNER JOIN MonthData AS md ON md.MonthId = sd.DischargeFiscalMonthId
+    WHERE IsBaseline = True AND OpportunityId = @OpportunityId
+    GROUP BY
+		IsCross,
+        DischargeFiscalMonthId,
+        EntityID,
+        PrimaryPhysicianID,
+        PrimaryServiceLineID,
+        DepartmentID,
+        PhysicianSpecialtyID,
+        ChargeCodeID,        
+        CaseTypeFamilyId,
+		CostDriver
+),
+
+DetailTotalData AS (
+    SELECT
+        EntityID,
+        PrimaryPhysicianID,
+        PrimaryServiceLineID,
+        DepartmentID,
+        PhysicianSpecialtyID,
+        ChargeCodeID,
+		CaseTypeFamilyId,
+        CostDriver,        
+        SUM(dmd.SumMonthUnits) AS SumUnits,
+        SUM(dmd.SumMonthCost) AS SumCost,
+		(CASE WHEN @BaselineMonthCount = 0 THEN 0 ELSE (SumUnits/@BaselineMonthCount) END) AS AverageUnits,
+		(CASE WHEN @BaselineMonthCount = 0 THEN 0 ELSE (SumCost/@BaselineMonthCount) END) AS AverageCost,
+        SUM(case when IsCross = True then dmd.SumGoalMonthUnits else 0 end) AS CrossSumGoalMonthUnits,
+        SUM(case when IsCross = True then dmd.SumGoalMonthCost else 0 end) AS CrossSumGoalMonthCost,
+        SUM(case when IsCross = True then 1 else 0 end) AS CrossMonthCount
+    FROM DetailMonthData AS dmd
+    GROUP BY
+        EntityID,
+        PrimaryPhysicianID,
+        PrimaryServiceLineID,
+        DepartmentID,
+        PhysicianSpecialtyID,
+        ChargeCodeID,        
+        CaseTypeFamilyId,
+		CostDriver
+),
+
+DetailNewCross AS (
+	SELECT
+		md.MonthId AS MonthId,
+		dmd.EntityID,
+		dmd.PrimaryPhysicianID,
+		dmd.PrimaryServiceLineID,
+		dmd.DepartmentID,
+		dmd.PhysicianSpecialtyID,
+		dmd.ChargeCodeID,		
+		dmd.CaseTypeFamilyId,
+		dmd.CostDriver,
+		(case when dtd.CrossSumGoalMonthUnits = 0 then 0 else ((dtd.AverageUnits * mds.CrossCount) * (dmd.SumGoalMonthUnits / dtd.CrossSumGoalMonthUnits)/md.GoalMonthCount) end) AS Units,
+		(case when dtd.CrossSumGoalMonthCost = 0 then 0 else ((dtd.AverageCost * mds.CrossCount) * (dmd.SumGoalMonthCost / dtd.CrossSumGoalMonthCost)/md.GoalMonthCount) end) AS Cost
+	FROM MonthData AS md
+	INNER JOIN MonthDataSummary AS mds
+	INNER JOIN DetailMonthData AS dmd on
+		dmd.MonthId = md.MonthId
+		AND md.IsCross = True
+	INNER JOIN DetailTotalData AS dtd ON    
+		dtd.EntityID = dmd.EntityID AND
+		dtd.PrimaryPhysicianID = dmd.PrimaryPhysicianID AND
+		dtd.PrimaryServiceLineID = dmd.PrimaryServiceLineID AND
+		dtd.DepartmentID = dmd.DepartmentID AND
+		dtd.PhysicianSpecialtyID = dmd.PhysicianSpecialtyID AND
+		dtd.ChargeCodeID = dmd.ChargeCodeID AND				
+		dtd.CaseTypeFamilyId = dmd.CaseTypeFamilyId	AND
+		dtd.CostDriver = dmd.CostDriver
+),
+
+DetailNewNotCross AS (
+	SELECT
+		md.MonthId AS MonthId,
+		EntityID,
+		PrimaryPhysicianID,
+		PrimaryServiceLineID,
+		DepartmentID,
+		PhysicianSpecialtyID,
+		ChargeCodeID,				
+		CaseTypeFamilyId,	
+		CostDriver,
+		(case when md.BaselineMonthCount = 0 then AverageUnits else 0.0 end) AS Units,
+        (case when md.BaselineMonthCount = 0 then AverageCost else 0.0 end) AS Cost
+	FROM MonthData AS md
+	CROSS JOIN DetailTotalData AS dtd
+	WHERE md.GoalMonthCount > 0
+    AND (md.BaselineMonthCount = 0 OR dtd.CrossMonthCount = 0)
+),
+
+DetailData AS (
+	SELECT
+		dtd.MonthId,
+		dtd.EntityID,
+		dtd.PrimaryPhysicianID,
+		dtd.PrimaryServiceLineID,
+		dtd.DepartmentID,
+		dtd.PhysicianSpecialtyID,
+		dtd.ChargeCodeID,		
+		dtd.CaseTypeFamilyId,
+		dtd.CostDriver,
+		dtd.Units,
+		dtd.Cost
+	FROM (
+		SELECT * FROM DetailNewCross
+		UNION
+		SELECT * FROM DetailNewNotCross
+	) AS dtd
+),
+
+DetailNewAllData AS (
+    SELECT
+		gp.YearId,
+		gp.MonthId,
+		dd.EntityID,
+		dd.PrimaryPhysicianID,
+		dd.PrimaryServiceLineID,
+		dd.DepartmentID,
+		dd.PhysicianSpecialtyID,
+		dd.ChargeCodeID,		
+		dd.CaseTypeFamilyId,
+		dd.CostDriver,
+		dd.Units,
+		dd.Cost
+	FROM DetailData AS dd
+	INNER JOIN GoalPeriod AS gp  ON gp.MonthId = dd.MonthId
+)
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DetailSourceDataMultiplier.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DetailSourceDataMultiplier.sql
new file mode 100644
index 0000000..cc88c12
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/ChargeCode/SQL/DetailSourceDataMultiplier.sql
@@ -0,0 +1,56 @@
+DROP TABLE IF EXISTS DetailSourceDataMultiplier;
+CREATE TEMPORARY TABLE DetailSourceDataMultiplier (
+    EntityId INT NOT NULL,
+    PrimaryPhysicianId INT NOT NULL,
+    PrimaryServiceLineId INT NOT NULL,
+    DepartmentId INT NOT NULL,
+    PhysicianSpecialtyId INT NOT NULL,
+    ChargeCodeId INT NOT NULL,
+    CaseTypeFamilyId INT NOT NULL,
+    CostDriver VARCHAR(1024) NOT NULL COLLATE 'en-ci',
+    MultiplierUnits FLOAT NOT NULL,
+    MultiplierCost FLOAT NOT NULL
+);
+
+INSERT INTO DetailSourceDataMultiplier
+WITH DetailSourceDataMultiplierCTE AS (
+	SELECT
+		EntityID,
+		PrimaryPhysicianID,
+		PrimaryServiceLineID,
+		DepartmentID,
+		PhysicianSpecialtyID,
+		ChargeCodeID,
+		CaseTypeFamilyId,
+		CostDriver,		
+		SUM(DistributedUnits) AS UnitsDistributed,
+		SUM(GoalUnits) AS UnitsGoal,
+		SUM(DistributedCost) AS CostDistributed,
+		SUM(GoalCost) AS CostGoal,
+		(CASE WHEN UnitsGoal = 0 OR UnitsDistributed = 0 THEN 1 ELSE UnitsGoal / UnitsDistributed END) AS MultiplierUnits,
+		(CASE WHEN CostGoal = 0 OR CostDistributed = 0 THEN 1 ELSE CostGoal / CostDistributed END) AS MultiplierCost    
+	FROM cci.FactStrategicChargeCodeDetail    
+	WHERE OpportunityId = @OpportunityId AND IsBaseline = False
+	GROUP BY
+		EntityID,
+		PrimaryPhysicianID,
+		PrimaryServiceLineID,
+		DepartmentID,
+		PhysicianSpecialtyID,
+		ChargeCodeID,
+		CostDriver,
+		CaseTypeFamilyId
+)
+
+SELECT
+	EntityID,
+	PrimaryPhysicianID,
+	PrimaryServiceLineID,
+	DepartmentID,
+	PhysicianSpecialtyID,
+	ChargeCodeID,
+	CaseTypeFamilyId,
+	CostDriver,	
+	MultiplierUnits,
+	MultiplierCost
+FROM DetailSourceDataMultiplierCTE;
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/DISTRIBUTION_PROCESS.md b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/DISTRIBUTION_PROCESS.md
new file mode 100644
index 0000000..a2cb671
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/DISTRIBUTION_PROCESS.md
@@ -0,0 +1,130 @@
+# Distribution Process
+
+## What It Does
+
+The distribution process takes baseline period cost/unit data from Snowflake and distributes it
+across the **goal period** (or **tracking period**), applying ramp-up percentages and distribution
+method rules. The output is written back to the fact table as `IsBaseline = FALSE` rows.
+
+This is how "what do we expect to save each month?" rows are generated.
+
+---
+
+## Two Parallel Implementations
+
+| Class | Type | Fact Table |
+|---|---|---|
+| `DistributionProcessChargeCode` | Charge code opportunities | `cci.FactStrategicChargeCodeDetail` |
+| `DistributionProcessGL` | GL opportunities | `cci.FactStrategicGLDetail` |
+
+Both are created by `DistributionProcessFactory` using `ActivatorUtilities.CreateInstance` — this
+allows the factory to inject `ISnowflakeDatabaseContext` while the caller controls the other
+constructor arguments (periods, ramp-ups).
+
+---
+
+## Constructor Arguments
+
+Both process classes take the same set of arguments:
+
+```csharp
+(long opportunityId,
+ Period<DateOnly> baselinePeriod,
+ Period<DateOnly> goalPeriod,
+ Period<DateOnly> trackingPeriod,
+ double[] rampUps)
+```
+
+`rampUps` is an ordered array where index 0 = month 1 of the distributed period, index N-1 = last
+month. Values are decimal fractions (e.g. `0.5` = 50%).
+
+---
+
+## DistributionStage Enum
+
+`DistributionStage` controls which SQL path executes inside `BuildInsertDistributedSql`:
+
+| Stage | Meaning | When called |
+|---|---|---|
+| `Initial` | First population of goal rows | After creating an opportunity |
+| `FromOpportunityToInitiative` | Convert opportunity → initiative | `SetStatus` transition to `NewInitiative` |
+| `FromInitiativeToOpportunity` | Revert initiative → opportunity | `SetStatus` back below `NewInitiative` |
+| `InitiativeChangeTrackingPeriod` | Tracking dates changed on existing initiative | `UpdateInitiative` with new tracking dates |
+| `RampUpChange` | Ramp-up percentages were edited | `UpdateRampUps` |
+
+---
+
+## Two-Phase Population Strategy
+
+### Phase 1 — Goal Period (Opportunity)
+
+Called by `PopulateStrategicOpportunityGoalDetails` when the opportunity is in `IsOpportunity = true`
+state. Distributes baseline data across the **goal period** (computed: `BaselineStart+1mo` through
+`BaselineStart+EstimatedDuration mo`). Goal period is fixed until the opportunity is converted.
+
+### Phase 2 — Committed Period (Initiative)
+
+Called by `PopulateStrategicOpportunityCommittedDetails` when converting to initiative or when
+tracking dates change. Distributes across the user-set **tracking period**
+(`TrackingStartDate` / `TrackingEndDate`). Applies ramp-up percentages to `GoalUnits` / `GoalCost`.
+
+The key difference: Phase 2 also updates `GoalUnits`/`GoalCost` on existing rows via an UPDATE
+before the DELETE/INSERT sequence (to preserve ramp-up adjustments relative to the new period).
+
+---
+
+## Ramp-Up Application
+
+```sql
+-- Conceptually:
+GoalCost = DistributedCost * RampUp   -- for FromOpportunityToInitiative
+GoalCost = GoalCost / OldRampUp * NewRampUp  -- for RampUpChange
+```
+
+The SQL builder generates a CTE (`rp`) holding `(YearId, MonthId, RampUp)` values from the
+`_rampUps` array, then LEFT JOINs fact rows to it. Rows with no matching ramp-up month (or
+`RampUp = 1`) are left unchanged.
+
+`UpdateDetailCommittedByRampUp(double[] oldRampUps)` handles the ramp-up-change case: it
+recalculates `GoalUnits`/`GoalCost` by dividing out old ramp-up and applying new ramp-up,
+without re-running the full distribution.
+
+---
+
+## SQL Builder Pattern
+
+`DistributionProcessChargeCodeSqlBuilder` (and GL equivalent) build multi-statement SQL batches
+using `StringBuilder`. A single `DistributeAsync()` call may execute 3–7 SQL statements in
+sequence via `QueryMultipleReturnLastAsync` — the return value is taken from the **last** result
+set (a summary row).
+
+Embedded SQL resources loaded from `/DistributionProcess/ChargeCode/SQL/` or `/GL/SQL/`:
+- `DetailSourceDataMultiplier.sql` — creates temp data using a period multiplier
+- `DeclareVariables.sql` — Snowflake DECLARE block for scripting
+- Various INSERT templates
+
+`IsDistributedPeriodsEqual()` short-circuits the re-distribution if goal and tracking periods
+are identical — in that case only the ramp-up UPDATE runs, not the full DELETE/INSERT.
+
+---
+
+## DistributionMethod Enum
+
+The `DistributionMethod` on `StrategicOpportunity.BaselineDistribution` controls how baseline
+costs are spread across distributed months. The SQL builder switches on this value to select
+the appropriate distribution formula (equal split, weighted, etc.).
+
+---
+
+## Key Files
+
+| File | Purpose |
+|---|---|
+| `DistributionProcessFactory.cs` | Creates typed distributor instances via `ActivatorUtilities` |
+| `IDistributionProcessFactory.cs` | DI interface |
+| `ChargeCode/DistributionProcessChargeCode.cs` | Executes distribution against Snowflake |
+| `ChargeCode/DistributionProcessChargeCodeSqlBuilder.cs` | Builds multi-statement SQL batches |
+| `GL/DistributionProcessGL.cs` | GL equivalent |
+| `GL/DistributionProcessGLSqlBuilder.cs` | GL SQL builder |
+| `Models/SqlBuilderResult.cs` | Carries `Sql`, `QueryCount`, `Parameters` for multi-statement execution |
+| `Models/YearMonthStruct.cs` | Lightweight struct for period iteration |
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/DistributionProcessFactory.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/DistributionProcessFactory.cs
new file mode 100644
index 0000000..3924926
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/DistributionProcessFactory.cs
@@ -0,0 +1,28 @@
+using Microsoft.Extensions.DependencyInjection;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.ChargeCode;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.GL;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess
+{
+    public class DistributionProcessFactory : IDistributionProcessFactory
+    {
+        private readonly IServiceProvider _serviceProvider;
+
+        public DistributionProcessFactory(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+        }
+
+        public DistributionProcessChargeCode CreateDistributionProcessChargeCode(long opportunityId, Period<DateOnly> baselinePeriod, Period<DateOnly> goalPeriod, Period<DateOnly> trackingPeriod, double[] rampUps)
+        {
+            return ActivatorUtilities.CreateInstance<DistributionProcessChargeCode>(_serviceProvider, opportunityId, baselinePeriod, goalPeriod, trackingPeriod, rampUps);
+        }
+
+        public DistributionProcessGL CreateDistributionProcessGL(long opportunityId, Period<DateOnly> baselinePeriod, Period<DateOnly> goalPeriod, Period<DateOnly> trackingPeriod, double[] rampUps)
+        {
+            return ActivatorUtilities.CreateInstance<DistributionProcessGL>(_serviceProvider, opportunityId, baselinePeriod, goalPeriod, trackingPeriod, rampUps);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/DistributionGLSummary.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/DistributionGLSummary.cs
new file mode 100644
index 0000000..fd10e45
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/DistributionGLSummary.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.GL
+{
+    public class DistributionGLSummary
+    {
+        public double ImprovementSum { get; set; }
+        public double EstimatedGoalSum { get; set; }
+        public double CommittedSum { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/DistributionProcessGL.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/DistributionProcessGL.cs
new file mode 100644
index 0000000..ee92689
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/DistributionProcessGL.cs
@@ -0,0 +1,56 @@
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.GL
+{
+    public class DistributionProcessGL
+    {
+        const string REQUEST_TYPE = "Strategic GL Opportunity Detail";
+
+        private readonly ISnowflakeDatabaseContext _snowflakeDatabaseContext;
+        private readonly DistributionProcessGLSqlBuilder _sqlBuilder;
+
+        protected readonly long _opportunityId;
+        protected readonly Period<DateOnly> _baselinePeriod;
+        protected readonly Period<DateOnly> _goalPeriod;
+        protected readonly Period<DateOnly> _trackingPeriod;
+        protected readonly double[] _rampUps;
+
+        public DistributionProcessGL(ISnowflakeDatabaseContext snowflakeDatabaseContext, long opportunityId, Period<DateOnly> baselinePeriod, Period<DateOnly> goalPeriod, Period<DateOnly> trackingPeriod, double[] rampUps)
+        {
+            _snowflakeDatabaseContext = snowflakeDatabaseContext;
+            _opportunityId = opportunityId;
+            _baselinePeriod = baselinePeriod;
+            _goalPeriod = goalPeriod;
+            _trackingPeriod = trackingPeriod;
+            _rampUps = rampUps;
+
+            _sqlBuilder = new DistributionProcessGLSqlBuilder(opportunityId, baselinePeriod, goalPeriod, trackingPeriod, rampUps);
+        }
+
+        public async Task<DistributionGLSummary> DistributeAsync(DistributionMethod methodType, DistributionStage stage)
+        {
+            var sqlBuilderResult = _sqlBuilder.BuildInsertDistributedSql(methodType, stage);
+            var result = await _snowflakeDatabaseContext.QueryMultipleReturnLastAsync<DistributionGLSummary>(sqlBuilderResult.Sql, REQUEST_TYPE, sqlBuilderResult.QueryCount, sqlBuilderResult.Parameters);
+            return result.FirstOrDefault();
+        }
+
+        public async Task<DistributionGLSummary> GetDistributionSummaryAsync(bool isInitiative)
+        {
+            var sqlBuilderResult = _sqlBuilder.BuildDistributionSummarySql(isInitiative);
+            var result = await _snowflakeDatabaseContext.QueryMultipleReturnLastAsync<DistributionGLSummary>(sqlBuilderResult.Sql, REQUEST_TYPE, sqlBuilderResult.QueryCount, sqlBuilderResult.Parameters);
+            return result.FirstOrDefault();
+        }
+
+        public async Task<DistributionGLSummary> UpdateDetailCommittedByRampUp(double[] oldRampUps)
+        {
+            var sqlBuilderResult = _sqlBuilder.BuildUpdateDetailCommittedByRampUpSql(oldRampUps);
+            var result = await _snowflakeDatabaseContext.QueryMultipleReturnLastAsync<DistributionGLSummary>(sqlBuilderResult.Sql, REQUEST_TYPE, sqlBuilderResult.QueryCount, sqlBuilderResult.Parameters);
+            return result.FirstOrDefault();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/DistributionProcessGLSqlBuilder.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/DistributionProcessGLSqlBuilder.cs
new file mode 100644
index 0000000..b80aa79
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/DistributionProcessGLSqlBuilder.cs
@@ -0,0 +1,409 @@
+using Dapper;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.Models;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.GL
+{
+    public class DistributionProcessGLSqlBuilder
+    {
+        private readonly Assembly _assembly;
+        private readonly long _opportunityId;
+        private readonly Period<DateOnly> _baselinePeriod;
+        private readonly Period<DateOnly> _goalPeriod;
+        private readonly Period<DateOnly> _trackingPeriod;
+        private readonly double[] _rampUps;
+
+        public DistributionProcessGLSqlBuilder(
+            long opportunityId,
+            Period<DateOnly> baselinePeriod,
+            Period<DateOnly> goalPeriod,
+            Period<DateOnly> trackingPeriod,
+            double[] rampUps)
+        {
+            _assembly = Assembly.GetExecutingAssembly();
+            _opportunityId = opportunityId;
+            _baselinePeriod = baselinePeriod;
+            _goalPeriod = goalPeriod;
+            _trackingPeriod = trackingPeriod;
+            _rampUps = rampUps;
+        }
+
+        public SqlBuilderResult BuildInsertDistributedSql(DistributionMethod methodType, DistributionStage stage)
+        {
+            var isInitiative = GetIsInitiative(stage);
+            var distributedPeriod = GetDistributedPeriod(isInitiative);
+            var sqlRampUpTable = GetRampUpTableSql(stage == DistributionStage.FromInitiativeToOpportunity ? _trackingPeriod : distributedPeriod, _rampUps, "rp");
+
+            var sbQuery = new StringBuilder();
+            var queryCount = (byte)0;
+
+            if (stage == DistributionStage.FromOpportunityToInitiative || stage == DistributionStage.FromInitiativeToOpportunity || stage == DistributionStage.InitiativeChangeTrackingPeriod)
+            {
+                if (!string.IsNullOrEmpty(sqlRampUpTable))
+                {
+                    Func<string, string, string, string> convertFunc = stage == DistributionStage.FromOpportunityToInitiative ?
+                        GetFromGoalToCommittedSql :
+                        GetFromCommittedToGoalSql;
+                    sbQuery.AppendLine($@"
+                        UPDATE {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} AS tt
+                        SET
+                            tt.GoalAmount = st.GoalAmount
+                        FROM (
+                            SELECT
+                                RowId,
+                                (CASE WHEN rp.RampUp IS NULL OR rp.RampUp = 1 THEN GoalAmount ELSE {convertFunc("GoalAmount", "DistributedAmount", "rp.RampUp")} END) AS GoalAmount
+                            FROM {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} AS sd
+                            LEFT JOIN {sqlRampUpTable} ON rp.YearId = sd.FiscalYearId AND rp.MonthId = sd.FiscalMonthId
+                            WHERE OpportunityId = @OpportunityId AND IsBaseline = False
+                        ) AS st
+                        WHERE st.RowId = tt.RowId;
+                    ");
+                    queryCount += 1;
+                }
+            }
+
+            if (stage == DistributionStage.FromInitiativeToOpportunity)
+            {
+                sbQuery.AppendLine($@"
+                        UPDATE {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} AS tt
+                        SET
+                            tt.Amount = 0
+                        WHERE tt.OpportunityId = @OpportunityId AND tt.IsBaseline = False;
+                    ");
+                queryCount += 1;
+            }
+
+            if (!((stage == DistributionStage.FromOpportunityToInitiative || stage == DistributionStage.FromInitiativeToOpportunity) && IsDistributedPeriodsEqual()))
+            {
+                if (IsUseMultiplier(stage))
+                {
+                    sbQuery.AppendLine(ReadResource("DetailSourceDataMultiplier.sql"));
+                    queryCount += 3; // DetailSourceDataMultiplier.sql contains 3 statements: CREATE TEMP TABLE, INSERT, SELECT
+                }
+                sbQuery.AppendLine($"DELETE FROM {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} WHERE OpportunityId = @OpportunityId AND IsBaseline = False;");
+                sbQuery.AppendLine("DECLARE");
+                sbQuery.AppendLine(ReadResource("DeclareVariables.sql"));
+                sbQuery.AppendLine("BEGIN");
+                sbQuery.AppendLine($@"
+                    {GetInsertSql()}
+                    WITH
+                        {ReadResource("DatePeriodCTE.sql")},
+                        {ReadResource(GetDetailDataCteFile(methodType))}
+                    {GetSelectSql(stage)};
+                ");
+                sbQuery.AppendLine("END;");
+                queryCount += 2; // DELETE statement + DECLARE/BEGIN.../END block each count as 1 Snowflake statement
+            }
+
+            sbQuery.AppendLine(GetSummarySql(isInitiative));
+            queryCount += 1;
+
+            var parameters = GetParameters(sbQuery, queryCount, distributedPeriod);
+
+            return new SqlBuilderResult()
+            {
+                Sql = sbQuery.ToString().SnowflakeSyntax(),
+                QueryCount = queryCount,
+                Parameters = parameters
+            };
+        }
+
+        public SqlBuilderResult BuildDistributionSummarySql(bool isInitiative)
+        {
+            var sbQuery = new StringBuilder(GetSummarySql(isInitiative));
+            var queryCount = (byte)1;
+
+            var parameters = GetParameters(sbQuery, queryCount, GetDistributedPeriod(isInitiative));
+
+            return new SqlBuilderResult()
+            {
+                Sql = sbQuery.ToString().SnowflakeSyntax(),
+                QueryCount = queryCount,
+                Parameters = parameters
+            };
+        }
+
+        public SqlBuilderResult BuildUpdateDetailCommittedByRampUpSql(double[] oldRampUps)
+        {
+            var isInitiative = true;
+            var queryCount = (byte)0;
+            var sbQuery = new StringBuilder();
+
+            var distributedPeriod = GetDistributedPeriod(isInitiative);
+
+            var sqlOldRampUpTable = GetRampUpTableSql(distributedPeriod, oldRampUps, "orp");
+            var sqlNewRampUpTable = GetRampUpTableSql(distributedPeriod, _rampUps, "nrp");
+
+            if (!(string.IsNullOrEmpty(sqlOldRampUpTable) && string.IsNullOrEmpty(sqlNewRampUpTable)))
+            {
+                if (string.IsNullOrEmpty(sqlOldRampUpTable)) sqlOldRampUpTable = GetRampUpTableSql(distributedPeriod, oldRampUps, "orp", true);
+                if (string.IsNullOrEmpty(sqlNewRampUpTable)) sqlNewRampUpTable = GetRampUpTableSql(distributedPeriod, _rampUps, "nrp", true);
+
+                sbQuery.AppendLine($@"
+                    UPDATE {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} AS tt
+                    SET
+                        tt.GoalAmount = st.GoalAmount
+                    FROM (
+                        SELECT
+                            RowId,
+                            ({GetFromCommittedToGoalOnRampUpUpdateSql("GoalAmount", "DistributedAmount", "orp.RampUp", "nrp.RampUp")}) AS GoalAmount
+                        FROM {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} AS sd
+                        LEFT JOIN {sqlOldRampUpTable} ON orp.YearId = sd.FiscalYearId AND orp.MonthId = sd.FiscalMonthId
+                        LEFT JOIN {sqlNewRampUpTable} ON nrp.YearId = sd.FiscalYearId AND nrp.MonthId = sd.FiscalMonthId
+                        WHERE OpportunityId = @OpportunityId AND IsBaseline = False
+                    ) AS st
+                    WHERE st.RowId = tt.RowId;
+                ");
+                queryCount += 1;
+            }
+
+            sbQuery.AppendLine(GetSummarySql(isInitiative));
+            queryCount += 1;
+
+            var parameters = GetParameters(sbQuery, queryCount, GetDistributedPeriod(isInitiative));
+
+            return new SqlBuilderResult()
+            {
+                Sql = sbQuery.ToString().SnowflakeSyntax(),
+                QueryCount = queryCount,
+                Parameters = parameters
+            };
+        }
+
+        private string ReadResource(string fileName)
+        {
+            return _assembly.ReadResource($"GL.SQL.{fileName}");
+        }
+
+        private bool GetIsInitiative(DistributionStage stage)
+        {
+            return stage switch
+            {
+                DistributionStage.FromSourceToOpportunity => false,
+                DistributionStage.OpportunityChangeGoalPeriod => false,
+                DistributionStage.FromOpportunityToInitiative => true,
+                DistributionStage.InitiativeChangeTrackingPeriod => true,
+                DistributionStage.FromInitiativeToOpportunity => false,
+                _ => false
+            };
+        }
+
+        private Period<DateOnly> GetDistributedPeriod(bool isInitiative)
+        {
+            return isInitiative ? _trackingPeriod : _goalPeriod;
+        }
+
+        private bool IsDistributedPeriodsEqual()
+        {
+            return _goalPeriod.Start.Year == _trackingPeriod.Start.Year &&
+                   _goalPeriod.Start.Month == _trackingPeriod.Start.Month &&
+                   _goalPeriod.End.Year == _trackingPeriod.End.Year &&
+                   _goalPeriod.End.Month == _trackingPeriod.End.Month;
+        }
+
+        private bool IsUseMultiplier(DistributionStage stage)
+        {
+            return stage == DistributionStage.FromOpportunityToInitiative || stage == DistributionStage.FromInitiativeToOpportunity || stage == DistributionStage.InitiativeChangeTrackingPeriod || stage == DistributionStage.OpportunityChangeGoalPeriod;
+        }
+
+        private string GetSelectSql(DistributionStage stage)
+        {
+            var distributionPeriod = GetDistributedPeriod(GetIsInitiative(stage));
+            var sqlRampUpTable = GetRampUpTableSql(distributionPeriod, _rampUps, "rp", true);
+            var isUseMultiplier = IsUseMultiplier(stage);
+
+            string goalValuesSql = "dd.Amount AS GoalAmount";
+
+            if (!string.IsNullOrEmpty(sqlRampUpTable) && isUseMultiplier)
+            {
+                if (stage == DistributionStage.FromInitiativeToOpportunity)
+                {
+                    goalValuesSql = "dd.Amount * MultiplierAmount AS GoalAmount";
+                }
+                else
+                {
+                    goalValuesSql = $@"
+                        (CASE WHEN mlt.MultiplierAmount IS NULL THEN dd.Amount ELSE dd.Amount * mlt.MultiplierAmount END) AS NewGoalAmount,
+                        (CASE WHEN rp.RampUp IS NULL OR rp.RampUp = 1 THEN NewGoalAmount ELSE {GetFromGoalToCommittedSql("NewGoalAmount", "dd.Amount", "rp.RampUp")} END) AS GoalAmount
+                    ";
+                }
+            }
+
+            string joinSql = !string.IsNullOrEmpty(sqlRampUpTable) && isUseMultiplier ? $@"
+                    LEFT JOIN DetailSourceDataMultiplier AS mlt ON
+		                mlt.EntityID = dd.EntityID AND
+		                mlt.DepartmentID = dd.DepartmentID AND
+		                mlt.AccountId = dd.AccountId AND
+		                mlt.AccountType IS NOT DISTINCT FROM dd.AccountType
+                    LEFT JOIN {sqlRampUpTable} ON rp.YearId = dd.YearId AND rp.MonthId = dd.MonthId
+                " : string.Empty;
+
+            var sql = $@"
+                SELECT
+                    {GetColumnsList()}
+                FROM (
+                    SELECT
+                        @OpportunityId AS OpportunityId,
+                        False AS IsBaseline,
+                        dd.YearId AS FiscalYearId,
+                        dd.MonthId AS FiscalMonthId,
+                        dd.EntityID,
+                        dd.DepartmentId,
+                        dd.AccountId,
+                        dd.AccountType,
+                        0 AS Amount,
+                        dd.Amount AS DistributedAmount,
+                        {goalValuesSql}
+                    FROM DetailNewAllData AS dd
+                    {joinSql}
+                )
+            ";
+            return sql;
+        }
+
+        private string GetInsertSql()
+        {
+            return $@"
+                INSERT INTO {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} (
+                    {GetColumnsList()}
+                )
+            ";
+        }
+
+        private string GetColumnsList()
+        {
+            return @"
+                    OpportunityId,
+                    IsBaseline,
+                    FiscalYearId,
+                    FiscalMonthId,
+                    EntityId,
+                    DepartmentId,
+                    AccountId,
+                    AccountType,
+                    Amount,
+                    DistributedAmount,
+                    GoalAmount";
+        }
+
+        private string GetSummarySql(bool isInitiative)
+        {
+            if (isInitiative)
+            {
+                return $@"
+                    SELECT
+                        0::FLOAT AS ImprovementSum,
+                        0::FLOAT AS EstimatedGoalSum,
+                        COALESCE(SUM(GoalAmount), 0)::FLOAT AS CommittedSum
+                    FROM {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} AS dl
+                    WHERE OpportunityId = @OpportunityId AND IsBaseline = False;
+                ";
+            }
+            else
+            {
+                var sqlRampUpTable = GetRampUpTableSql(GetDistributedPeriod(isInitiative), _rampUps, "rp");
+
+                var estimatedGoalSumSql = !string.IsNullOrEmpty(sqlRampUpTable) ?
+                    $"COALESCE(SUM((CASE WHEN rp.RampUp IS NULL OR rp.RampUp = 1 THEN GoalAmount ELSE {GetFromGoalToCommittedSql("GoalAmount", "DistributedAmount", "rp.RampUp")} END)), 0)::FLOAT AS EstimatedGoalSum" :
+                    "COALESCE(SUM(GoalAmount), 0)::FLOAT AS EstimatedGoalSum";
+                var joinSql = !string.IsNullOrEmpty(sqlRampUpTable) ?
+                    $"LEFT JOIN {sqlRampUpTable} ON rp.YearId = sd.FiscalYearId AND rp.MonthId = sd.FiscalMonthId" :
+                    string.Empty;
+
+                return $@"
+                        SELECT
+                            COALESCE(SUM(DistributedAmount - GoalAmount), 0)::FLOAT AS ImprovementSum,
+                            {estimatedGoalSumSql},
+                            0::FLOAT AS CommittedSum
+                        FROM {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} AS sd
+                        {joinSql}
+                        WHERE OpportunityId = @OpportunityId AND IsBaseline = False;
+                    ";
+            }
+        }
+
+        private string GetDetailDataCteFile(DistributionMethod methodType)
+        {
+            return methodType == DistributionMethod.Monthly ? "DetailDataMonthlyCTE.sql" : "DetailDataAverageCTE.sql";
+        }
+
+        private string GetRampUpTableSql(Period<DateOnly> period, double[] rampUps, string tableName = "RampUpTable", bool isReturnFakeOnEmpty = false)
+        {
+            if (rampUps.Length == 0)
+            {
+                if (isReturnFakeOnEmpty)
+                {
+                    return $@"
+                        (SELECT
+                            {period.Start.Year} AS YearId,
+                            {period.Start.Month} AS MonthId,
+                            1.0 AS RampUp
+                        ) AS {tableName} (YearId, MonthId, RampUp)
+                    ";
+                }
+                return string.Empty;
+            }
+            var baselineYearMonthList = YearMonthStruct.GetList(new YearMonthStruct(period.Start), new YearMonthStruct(period.End));
+            return $@"
+                (VALUES
+                    {string.Join($",{Environment.NewLine}", baselineYearMonthList.Take(rampUps.Length).Select((x, ind) => $"({x.Year}, {x.Month}, {rampUps[ind]})"))}
+                ) AS {tableName} (YearId, MonthId, RampUp)
+            ";
+        }
+
+        private DynamicParameters GetParameters(StringBuilder sbQuery, byte queryCount, Period<DateOnly> distributionPeriod)
+        {
+            var parameters = new Dictionary<string, string>
+            {
+                { "@OpportunityId", _opportunityId.ToString() },
+                { "@BaselineDateStart", $"'{_baselinePeriod.Start:yyyy-MM-dd}'" },
+                { "@BaselineDateEnd", $"'{_baselinePeriod.End:yyyy-MM-dd}'" },
+                { "@GoalDateStart", $"'{distributionPeriod.Start:yyyy-MM-dd}'" },
+                { "@GoalDateEnd", $"'{distributionPeriod.End:yyyy-MM-dd}'" }
+            };
+
+            foreach (var x in parameters)
+            {
+                sbQuery = sbQuery.Replace(x.Key, x.Value);
+            }
+
+            var queryOneParams = new DynamicParameters();
+            queryOneParams.Add("MULTI_STATEMENT_COUNT", queryCount);
+
+            return queryOneParams;
+        }
+
+        private string GetFromGoalToCommittedSql(string goalColumn, string distributedColumn, string rampUpColumn)
+        {
+            return $"({distributedColumn} - ({distributedColumn} - {goalColumn}) * {rampUpColumn})";
+        }
+
+        private string GetFromCommittedToGoalSql(string goalColumn, string distributedColumn, string rampUpColumn)
+        {
+            return $"(({goalColumn} - {distributedColumn} * (1 - {rampUpColumn})) / {rampUpColumn})";
+        }
+
+        private string GetFromCommittedToCommittedSql(string goalColumn, string distributedColumn, string oldRampUpColumn, string newRampUpColumn)
+        {
+            return GetFromGoalToCommittedSql(GetFromCommittedToGoalSql(goalColumn, distributedColumn, oldRampUpColumn), distributedColumn, newRampUpColumn);
+        }
+
+        private string GetFromCommittedToGoalOnRampUpUpdateSql(string goalColumn, string distributedColumn, string rampUpOldColumn, string rampUpNewColumn)
+        {
+            return @$"CASE
+                WHEN ({rampUpOldColumn} IS NULL OR {rampUpOldColumn} = 1 ) AND ({rampUpNewColumn} IS NULL OR {rampUpNewColumn} = 1) THEN {goalColumn}
+                WHEN {rampUpOldColumn} <> 1 AND ({rampUpNewColumn} IS NULL OR {rampUpNewColumn} = 1) THEN {GetFromCommittedToGoalSql(goalColumn, distributedColumn, rampUpOldColumn)}
+                WHEN ({rampUpOldColumn} IS NULL OR {rampUpOldColumn} = 1 ) AND {rampUpNewColumn} <> 1 THEN {GetFromGoalToCommittedSql(goalColumn, distributedColumn, rampUpNewColumn)}
+                WHEN {rampUpOldColumn} <> 1 AND {rampUpNewColumn} <> 1 THEN {GetFromCommittedToCommittedSql(goalColumn, distributedColumn, rampUpOldColumn, rampUpNewColumn)}
+                ELSE {goalColumn}
+            END";
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DatePeriodCTE.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DatePeriodCTE.sql
new file mode 100644
index 0000000..219b751
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DatePeriodCTE.sql
@@ -0,0 +1,36 @@
+BasePeriod AS (
+    SELECT
+        MONTH(monthDate) AS MonthId,
+        YEAR(monthDate) AS YearId
+    FROM (
+        SELECT
+            DATEADD('month', seq4(), @BaselineDateStart) AS monthDate
+        FROM TABLE(GENERATOR(ROWCOUNT => @BaselineMonthCount))
+    )
+),
+GoalPeriod AS (
+    SELECT
+        MONTH(monthDate) AS MonthId,
+        YEAR(monthDate) AS YearId
+    FROM (
+        SELECT
+            DATEADD('month', seq4(), @GoalDateStart) AS monthDate
+        FROM TABLE(GENERATOR(ROWCOUNT => @GoalMonthCount))
+    )
+),
+MonthData AS (
+    SELECT
+        COALESCE(base.MonthId, goal.MonthId) AS MonthId,
+        COALESCE(base.monthCount, 0) AS BaselineMonthCount,
+        COALESCE(goal.monthCount, 0) AS GoalMonthCount,
+        (case when GoalMonthCount > 0 and BaselineMonthCount > 0 then True else False end)::BOOLEAN AS IsCross
+    FROM (SELECT MonthId, COUNT(*) AS monthCount FROM GoalPeriod group by MonthId) AS goal
+    FULL JOIN (SELECT MonthId, COUNT(*) AS monthCount FROM BasePeriod group by MonthId) AS base
+    ON base.MonthId = goal.MonthId
+),
+MonthDataSummary AS (
+    SELECT
+        SUM(case when IsCross = True then GoalMonthCount else 0 end) AS CrossCount,
+        SUM(case when IsCross = True then 0 else GoalMonthCount end) AS NotCrossCount,
+    FROM MonthData
+)
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DeclareVariables.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DeclareVariables.sql
new file mode 100644
index 0000000..d42b581
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DeclareVariables.sql
@@ -0,0 +1,2 @@
+GoalMonthCount INTEGER := (SELECT DATEDIFF('month', @GoalDateStart, @GoalDateEnd) + 1);
+BaselineMonthCount INTEGER := (SELECT DATEDIFF('month', @BaselineDateStart, @BaselineDateEnd) + 1);
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DetailDataAverageCTE.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DetailDataAverageCTE.sql
new file mode 100644
index 0000000..1f0090d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DetailDataAverageCTE.sql
@@ -0,0 +1,28 @@
+DetailData AS (
+	SELECT
+        EntityID,
+        DepartmentID,
+        AccountId,
+        AccountType,
+        (CASE WHEN @BaselineMonthCount = 0 THEN 0 ELSE (SUM(Amount)/@BaselineMonthCount) END) AS Amount
+    FROM cci.FactStrategicGLDetail
+    WHERE IsBaseline = True AND OpportunityId = @OpportunityId
+    GROUP BY
+        EntityID,
+        DepartmentID,
+        AccountId,
+        AccountType
+),
+
+DetailNewAllData AS (
+    SELECT
+		gp.YearId,
+		gp.MonthId,
+		dd.EntityID,
+		dd.DepartmentID,
+		dd.AccountId,
+		dd.AccountType,
+		dd.Amount
+	FROM DetailData AS dd
+	INNER JOIN GoalPeriod AS gp
+)
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DetailDataMonthlyCTE.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DetailDataMonthlyCTE.sql
new file mode 100644
index 0000000..3bf118f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DetailDataMonthlyCTE.sql
@@ -0,0 +1,103 @@
+DetailMonthData AS (
+	SELECT
+        FiscalMonthId AS MonthId,
+        EntityID,
+        DepartmentID,
+        AccountId,
+        AccountType,
+		SUM(Amount) AS SumMonthAmount,
+		SUM(md.BaselineMonthCount) AS SumBaselineMonthCount,
+		SUM(md.GoalMonthCount) AS SumGoalMonthCount,
+		(CASE WHEN SumBaselineMonthCount = 0 OR SumGoalMonthCount = 0 THEN 0 ELSE ((SumMonthAmount/SumBaselineMonthCount) * SumGoalMonthCount) END) AS SumGoalMonthAmount,
+        md.IsCross
+    FROM cci.FactStrategicGLDetail AS sd
+    INNER JOIN MonthData AS md ON md.MonthId = sd.FiscalMonthId
+    WHERE IsBaseline = True AND OpportunityId = @OpportunityId
+    GROUP BY
+		IsCross,
+        FiscalMonthId,
+        EntityID,
+        DepartmentID,
+        AccountId,
+        AccountType
+),
+
+DetailTotalData AS (
+    SELECT
+        EntityID,
+        DepartmentID,
+        AccountId,
+        AccountType,
+        SUM(dmd.SumMonthAmount) AS SumAmount,
+		(CASE WHEN @BaselineMonthCount = 0 THEN 0 ELSE (SumAmount/@BaselineMonthCount) END) AS AverageAmount,
+        SUM(case when IsCross = True then dmd.SumGoalMonthAmount else 0 end) AS CrossSumGoalMonthAmount,
+        SUM(case when IsCross = True then 1 else 0 end) AS CrossMonthCount
+    FROM DetailMonthData AS dmd
+    GROUP BY
+        EntityID,
+        DepartmentID,
+        AccountId,
+        AccountType
+),
+
+DetailNewCross AS (
+	SELECT
+		md.MonthId AS MonthId,
+		dmd.EntityID,
+		dmd.DepartmentID,
+		dmd.AccountId,
+		dmd.AccountType,
+		(case when dtd.CrossSumGoalMonthAmount = 0 then 0 else ((dtd.AverageAmount * mds.CrossCount) * (dmd.SumGoalMonthAmount / dtd.CrossSumGoalMonthAmount)/md.GoalMonthCount) end) AS Amount
+	FROM MonthData AS md
+	INNER JOIN MonthDataSummary AS mds
+	INNER JOIN DetailMonthData AS dmd on
+		dmd.MonthId = md.MonthId
+		AND md.IsCross = True
+	INNER JOIN DetailTotalData AS dtd ON
+		dtd.EntityID = dmd.EntityID AND
+		dtd.DepartmentID = dmd.DepartmentID AND
+		dtd.AccountId = dmd.AccountId AND
+		dtd.AccountType = dmd.AccountType
+),
+
+DetailNewNotCross AS (
+	SELECT
+		md.MonthId AS MonthId,
+		EntityID,
+		DepartmentID,
+		AccountId,
+		AccountType,
+		(case when md.BaselineMonthCount = 0 then AverageAmount else 0.0 end) AS Amount
+	FROM MonthData AS md
+	CROSS JOIN DetailTotalData AS dtd
+	WHERE md.GoalMonthCount > 0
+    AND (md.BaselineMonthCount = 0 OR dtd.CrossMonthCount = 0)
+),
+
+DetailData AS (
+	SELECT
+		dtd.MonthId,
+		dtd.EntityID,
+		dtd.DepartmentID,
+		dtd.AccountId,
+		dtd.AccountType,
+		dtd.Amount
+	FROM (
+		SELECT * FROM DetailNewCross
+		UNION
+		SELECT * FROM DetailNewNotCross
+	) AS dtd
+),
+
+DetailNewAllData AS (
+    SELECT
+		gp.YearId,
+		gp.MonthId,
+		dd.EntityID,
+		dd.DepartmentID,
+		dd.AccountId,
+		dd.AccountType,
+		dd.Amount
+	FROM DetailData AS dd
+	INNER JOIN GoalPeriod AS gp ON gp.MonthId = dd.MonthId
+)
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DetailSourceDataMultiplier.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DetailSourceDataMultiplier.sql
new file mode 100644
index 0000000..deee678
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/GL/SQL/DetailSourceDataMultiplier.sql
@@ -0,0 +1,35 @@
+DROP TABLE IF EXISTS DetailSourceDataMultiplier;
+CREATE TEMPORARY TABLE DetailSourceDataMultiplier (
+    EntityId INT NOT NULL,
+    DepartmentId INT NOT NULL,
+    AccountId INT NOT NULL,
+    AccountType TINYINT,
+    MultiplierAmount FLOAT NOT NULL
+);
+
+INSERT INTO DetailSourceDataMultiplier
+WITH DetailSourceDataMultiplierCTE AS (
+	SELECT
+		EntityID,
+		DepartmentID,
+		AccountId,
+		AccountType,
+		SUM(DistributedAmount) AS AmountDistributed,
+		SUM(GoalAmount) AS AmountGoal,
+		(CASE WHEN AmountGoal = 0 OR AmountDistributed = 0 THEN 1 ELSE AmountGoal / AmountDistributed END) AS MultiplierAmount
+	FROM cci.FactStrategicGLDetail
+	WHERE OpportunityId = @OpportunityId AND IsBaseline = False
+	GROUP BY
+		EntityID,
+		DepartmentID,
+		AccountId,
+		AccountType
+)
+
+SELECT
+	EntityID,
+	DepartmentID,
+	AccountId,
+	AccountType,
+	MultiplierAmount
+FROM DetailSourceDataMultiplierCTE;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/IDistributionProcessFactory.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/IDistributionProcessFactory.cs
new file mode 100644
index 0000000..6ea90b4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/IDistributionProcessFactory.cs
@@ -0,0 +1,13 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.ChargeCode;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.GL;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess
+{
+    public interface IDistributionProcessFactory
+    {
+        public DistributionProcessChargeCode CreateDistributionProcessChargeCode(long opportunityId, Period<DateOnly> baselinePeriod, Period<DateOnly> goalPeriod, Period<DateOnly> trackingPeriod, double[] rampUps);
+        public DistributionProcessGL CreateDistributionProcessGL(long opportunityId, Period<DateOnly> baselinePeriod, Period<DateOnly> goalPeriod, Period<DateOnly> trackingPeriod, double[] rampUps);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/Models/SqlBuilderResult.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/Models/SqlBuilderResult.cs
new file mode 100644
index 0000000..8217ebe
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/Models/SqlBuilderResult.cs
@@ -0,0 +1,16 @@
+using Dapper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.Models
+{
+    public class SqlBuilderResult
+    {
+        public string Sql { get; set; }
+        public byte QueryCount { get; set; }
+        public DynamicParameters Parameters { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/Models/YearMonthStruct.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/Models/YearMonthStruct.cs
new file mode 100644
index 0000000..038a3e6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/DistributionProcess/Models/YearMonthStruct.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.Models
+{
+    public struct YearMonthStruct : IComparable<YearMonthStruct>, IEquatable<YearMonthStruct>
+    {
+        public short Year { get; private set; }
+        public byte Month { get; private set; }
+
+        public YearMonthStruct(short year, byte month)
+        {
+            Year = year;
+            Month = month;
+        }
+
+        public YearMonthStruct(YearMonthStruct x)
+        {
+            Year = x.Year;
+            Month = x.Month;
+        }
+
+        public YearMonthStruct(DateOnly x)
+        {
+            Year = (short)x.Year;
+            Month = (byte)x.Month;
+        }
+
+        public static YearMonthStruct operator ++(YearMonthStruct operand)
+        {
+            return operand + 1;
+        }
+
+        public static YearMonthStruct operator +(YearMonthStruct x, int month)
+        {
+            int totalMonths = (x.Year * 12 + (x.Month - 1)) + month;
+            short newYear = (short)(totalMonths / 12);
+            byte newMonth = (byte)((totalMonths % 12) + 1);
+            return new YearMonthStruct(newYear, newMonth);
+        }
+
+        public static bool operator <=(YearMonthStruct left, YearMonthStruct right)
+        {
+            return left.GetMonths() <= right.GetMonths();
+        }
+
+        public static bool operator >=(YearMonthStruct left, YearMonthStruct right)
+        {
+            return left.GetMonths() >= right.GetMonths();
+        }
+
+        public static bool operator <(YearMonthStruct left, YearMonthStruct right)
+        {
+            return left.GetMonths() < right.GetMonths();
+        }
+
+        public static bool operator >(YearMonthStruct left, YearMonthStruct right)
+        {
+            return left.GetMonths() > right.GetMonths();
+        }
+
+        public static bool operator ==(YearMonthStruct left, YearMonthStruct right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(YearMonthStruct left, YearMonthStruct right)
+        {
+            return !left.Equals(right);
+        }
+
+        public static IEnumerable<YearMonthStruct> GetList(YearMonthStruct start, YearMonthStruct end)
+        {
+            for (YearMonthStruct x = start; x <= end; x++)
+            {
+                yield return x;
+            }
+        }
+
+        public static int GetListCount(YearMonthStruct start, YearMonthStruct end)
+        {
+            return GetList(start, end).Count();
+        }
+
+        public bool Equals(YearMonthStruct other)
+        {
+            return Year == other.Year && Month == other.Month;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is YearMonthStruct other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(Year, Month);
+        }
+
+        public int GetMonths()
+        {
+            return Year * 12 + (Month - 1);
+        }
+
+        public int CompareTo(YearMonthStruct other)
+        {
+            if (Year != other.Year)
+                return Year.CompareTo(other.Year);
+            return Month.CompareTo(other.Month);
+        }       
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/GeneralStrategicOpportunityItem.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/GeneralStrategicOpportunityItem.cs
new file mode 100644
index 0000000..936c3b2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/GeneralStrategicOpportunityItem.cs
@@ -0,0 +1,24 @@
+using System;
+using Strata.ContinuousImprovement.Biz.Generics;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class GeneralStrategicOpportunityItem
+    {
+        public long OpportunityId { get; set; }
+        public string Name { get; set; }
+        public string EncounterGroupName { get; set; }
+        public string PatientPopulationHPath { get; set; }
+        public long ExplorationPopulationId { get; set; }
+        public StrategicOpportunityTypes OpportunityType { get; set; }
+        public string OpportunityTypeName { get; set; }
+        public string Rollup1 { get; set; }
+        public string Rollup2 { get; set; }
+        public string Rollup3 { get; set; }
+        public string Population { get; set; }
+        public string AdditionalFilters { get; set; }
+        public string BaselinePeriod { get; set; }
+        public string StatusName { get; set; }
+        public DateOnly BaselineStartDate { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicInitiativeItem.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicInitiativeItem.cs
new file mode 100644
index 0000000..c612a5b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicInitiativeItem.cs
@@ -0,0 +1,17 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicInitiativeItem : GeneralStrategicOpportunityItem
+    {
+        public string TrackingPeriod { get; set; }
+        public double TotalCommitted { get; set; }
+        public double ProgressToDateCommitted { get; set; }
+        public double ProgressToDateActual { get; set; }
+        public double ProgressToDateVariance { get; set; }
+        public DateTime? LastRunTrackingDate { get; set; }
+        public byte LastRunTrackingStatus { get; set; }
+        public bool OnTrack { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicInitiativeUpdateDto.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicInitiativeUpdateDto.cs
new file mode 100644
index 0000000..0ab5a9d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicInitiativeUpdateDto.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicInitiativeUpdateDto
+    {
+        public string Name { get; set; }
+        public DateOnly TrackingStartDate { get; set; }
+        public DateOnly TrackingEndDate { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityChargeCodeDto.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityChargeCodeDto.cs
new file mode 100644
index 0000000..793e700
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityChargeCodeDto.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicOpportunityChargeCodeDto: StrategicOpportunityDto
+    {
+        public string PatientPopulationHPath { get; set; }
+        public long ExplorationPopulationId { get; set; }
+        public string ChargeCodeHPath { get; set; }
+        public int StrataId { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityChargeCodeUpdateDto.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityChargeCodeUpdateDto.cs
new file mode 100644
index 0000000..8b514e9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityChargeCodeUpdateDto.cs
@@ -0,0 +1,8 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicOpportunityChargeCodeUpdateDto
+    {
+        public StrategicOpportunityChargeCodeDto Opportunity { get; set; }
+        public bool ShouldPopulateOpportunityDetails { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityDetailData.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityDetailData.cs
new file mode 100644
index 0000000..6f76cad
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityDetailData.cs
@@ -0,0 +1,275 @@
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicOpportunityDetailDimension
+    {
+        public static readonly StrategicOpportunityDetailDimension Encounter = new StrategicOpportunityDetailDimension("encounter");
+        public static readonly StrategicOpportunityDetailDimension Entity = new StrategicOpportunityDetailDimension("entity");
+        public static readonly StrategicOpportunityDetailDimension PrimaryServiceLine = new StrategicOpportunityDetailDimension("primaryServiceLine");
+        public static readonly StrategicOpportunityDetailDimension CaseTypeFamily = new StrategicOpportunityDetailDimension("caseTypeFamily");
+        public static readonly StrategicOpportunityDetailDimension Physician = new StrategicOpportunityDetailDimension("physician");
+        public static readonly StrategicOpportunityDetailDimension PhysicianSpecialty = new StrategicOpportunityDetailDimension("physicianSpecialty");
+        public static readonly StrategicOpportunityDetailDimension CostDriver = new StrategicOpportunityDetailDimension("costDriver");
+        public static readonly StrategicOpportunityDetailDimension Department = new StrategicOpportunityDetailDimension("department");
+        public static readonly StrategicOpportunityDetailDimension ChargeCode = new StrategicOpportunityDetailDimension("chargeCode");
+        public static readonly StrategicOpportunityDetailDimension System = new StrategicOpportunityDetailDimension("system");
+        public static readonly StrategicOpportunityDetailDimension GLAccount = new StrategicOpportunityDetailDimension("glAccount");
+        public static readonly StrategicOpportunityDetailDimension GLRollup = new StrategicOpportunityDetailDimension("glRollup");
+
+        public string Value { get; private set; }
+
+        public static StrategicOpportunityDetailDimension GetFromString(string value)
+        {
+            if (Encounter.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) return Encounter;
+            else if (Entity.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) return Entity;
+            else if (PrimaryServiceLine.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) return PrimaryServiceLine;
+            else if (CaseTypeFamily.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) return CaseTypeFamily;
+            else if (Physician.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) return Physician;
+            else if (PhysicianSpecialty.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) return PhysicianSpecialty;
+            else if (CostDriver.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) return CostDriver;
+            else if (Department.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) return Department;
+            else if (ChargeCode.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) return ChargeCode;
+            else if (System.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) return System;
+            else if (GLAccount.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) return GLAccount;
+            else if (GLRollup.Value.Equals(value, StringComparison.OrdinalIgnoreCase)) return GLRollup;
+            else return null;
+        }
+
+        private StrategicOpportunityDetailDimension(string value)
+        {
+            Value = value;
+        }
+
+        public override string ToString()
+        {
+            return Value;
+        }
+    }
+
+    public class StrategicOpportunityDetailDimensionConfig
+    { 
+        public string SqlFile { get; set; }
+        public string ColumnName { get; set; }
+        public string AliasColumnName { get; set; }
+        public bool IsKeyString { get; set; }
+    }
+
+    public class StrategicOpportunityDetailData
+    {
+        public IEnumerable<StrategicOpportunityDetailGrouped> Data { get; set; }
+        public Dictionary<string, Dictionary<string, string>> DimensionsData { get; set; }
+        public Dictionary<string, float> EncounterData { get; set; }
+    }
+
+    public class StrategicOpportunityDetailGrouped
+    { 
+        public string Key { get; set; }
+        public bool IsBaseline { get; set; }
+        public double Units { get; set; }
+        public double Cost { get; set; }
+        public double GoalUnits { get; set; }
+        public double GoalCost { get; set; }
+    }
+
+    public class StrategicOpportunityDetailGroupedWithParsedKey
+    {
+        public string ParsedKey { get; private set; }
+        public StrategicOpportunityDetailGrouped StrategicOpportunityDetailGrouped { get; private set; }
+
+        public StrategicOpportunityDetailGroupedWithParsedKey(StrategicOpportunityDetailGrouped item, Dictionary<string, Dictionary<string, string>> dimensionsData, IEnumerable<string> layoutRows)
+        {
+            StrategicOpportunityDetailGrouped = item;
+            StringBuilder key = new StringBuilder();
+            var keys = item.Key.Split('|');
+
+            layoutRows.ForEach((row, i) =>
+            {
+                var value = dimensionsData[row].FirstOrDefault(v => v.Key == keys[i]).Value;
+                key.Append($"{value}|{keys[i]}|");
+            });
+
+            ParsedKey = key.ToString();
+        }
+    }
+
+    public class StrategicOpportunityGLDetailGoalValues
+    {
+        public long RowId { get; set; }
+        public double GoalAmount { get; set; }
+    }
+    public class StrategicOpportunityGLDetailData
+    {
+        public IEnumerable<StrategicOpportunityGLDetail> Data { get; set; }
+        public Dictionary<string, Dictionary<string, string>> DimensionsData { get; set; }
+    }
+
+    public class StrategicOpportunityGeneralInfo
+    {
+        public long OpportunityId { get; set; }
+        public byte OpportunityType { get; set; }
+        public string Name { get; set; }
+        public byte EstimatedTrackingDuration { get; set; }
+        public byte BaselineDuration { get; set; }
+        public DateOnly BaselineEndDate { get; set; }
+        public DateOnly TrackingStartDate { get; set; }
+        public DateOnly TrackingEndDate { get; set; }
+        public byte Status { get; set; }
+        public DateTime? LastRunTrackingDate { get; set; }
+        public byte LastRunTrackingStatus { get; set; }
+        public double TotalCommittedCost { get; set; }
+        public Guid OwnerGuid { get; set; }
+        public Guid ExecutiveSponsorGuid { get; set; }
+        public Guid CostLeaderGuid { get; set; }
+        public string TeamMembers { get; set; } = "";
+        public IEnumerable<Guid> Stakeholders { get; set; }
+        public IEnumerable<StrategicOpportunityMeasureDto> Measures { get; set; }
+        public byte? AccountType { get; set; }
+        public bool? HasStatistic { get; set; }
+        public StrategicOpportunityGeneralInfo() { }
+
+        public StrategicOpportunityGeneralInfo(StrategicOpportunity opportunity)
+        {
+            var baselineDuration = DateExtensions.GetMonthDifference(opportunity.BaselineStartDate, opportunity.BaselineEndDate, true);
+
+            OpportunityId = opportunity.OpportunityId;
+            OpportunityType = (byte)opportunity.OpportunityType;
+            Name = opportunity.Name;
+            BaselineDuration = (byte)baselineDuration;
+            EstimatedTrackingDuration = opportunity.EstimatedTrackingDuration;
+            TrackingStartDate = opportunity.TrackingStartDate;
+            TrackingEndDate = opportunity.TrackingEndDate;
+            BaselineEndDate = opportunity.BaselineEndDate;
+            Status = opportunity.Status;
+            LastRunTrackingDate = opportunity.LastRunTrackingDate;
+            LastRunTrackingStatus = (byte)opportunity.LastRunTrackingStatus;
+            TotalCommittedCost = opportunity is StrategicOpportunityChargeCode cc ? cc.TotalCommittedCost : 0;
+            AccountType = opportunity is StrategicOpportunityGL gl ? (byte)gl.AccountType : null;
+            HasStatistic = opportunity is StrategicOpportunityGL glStat ? glStat.HasStatistic : null;
+            OwnerGuid = opportunity.OwnerGuid;
+            ExecutiveSponsorGuid = opportunity.ExecutiveSponsorGuid;
+            CostLeaderGuid = opportunity.CostLeaderGuid;
+            TeamMembers = opportunity.TeamMembers;
+            Stakeholders = opportunity.Stakeholders != null ?
+                opportunity.Stakeholders.Select(s => s.UserGuid) :
+                new List<Guid>();
+            Measures = opportunity.Measures?.Select(item => item.MapToStrategicOpportunityMeasureDto()) ?? [];
+        }
+    }
+
+    public class StrategicOpportunityDrawerDetails
+    {
+        public string PopulationName { get; set; }
+        public List<string> Populations { get; set; }
+        public Dictionary<string, string> ChargeCodes { get; set; }
+        public string Filters { get; set; }
+        public string BaselinePeriod { get; set; }
+        public DateOnly TrackingStartDate { get; set; }
+        public DateOnly TrackingEndDate { get; set; }
+        public byte EstimatedTrackingDuration { get; set; }
+    }
+
+    public class StrategicOpportunityDetailGoalValues
+    {
+        public long RowId { get; set; }
+        public double GoalUnits { get; set; }
+        public double GoalCost { get; set; }
+    }
+
+    public class StrategicOpportunityChargeCodeAdjustment
+    {
+        public string NodeKey { get; set; }
+        public decimal? UnitsValue { get; set; }
+        public decimal? CostsValue { get; set; }        
+    }
+
+    public class StrategicOpportunityGLAdjustment
+    {
+        public string NodeKey { get; set; }
+        public decimal? GoalAmountValue { get; set; }
+        public byte? AccountType { get; set; }
+    }
+
+    public class UpdateGLDetailsDto
+    {
+        public IEnumerable<StrategicOpportunityGLAdjustment> Adjustments { get; set; }
+        public IEnumerable<string> Rows { get; set; }
+    }
+
+    public class StrategicOpportunityEditData
+    {
+        public string Name { get; set; }
+        public StrategicOpportunityTypes OpportunityType { get; set; }
+        public int Rollup1Id { get; set; }
+        public int Rollup2Id { get; set; }
+        public int Rollup3Id { get; set; }
+        public string Filters { get; set; }
+        public DateOnly BaselineStartDate { get; set; }
+        public DateOnly BaselineEndDate { get; set; }
+        public DistributionMethod BaselineDistribution { get; set; }
+        public byte EstimatedTrackingDuration { get; set; }
+        public List<StrategicOpportunityMeasureDto> Measures { get; set; }
+        public List<StrategicOpportunityWorkbookDto> Workbooks { get; set; }
+    }
+
+    public class StrategicOpportunityChargeCodeEditData : StrategicOpportunityEditData
+    {
+        public string EncounterGroupName { get; set; }
+        public string PatientPopulationHPath { get; set; }
+        public long ExplorationPopulationId { get; set; }
+        public List<PopulationMember> PopulationMembers { get; set; }
+        public List<string> ChargeCodeHPath { get; set; }
+        public List<ChargeCodePickerModel> ChargeCodes { get; set; }
+    }
+
+    public class StrategicOpportunityGLEditData : StrategicOpportunityEditData
+    {
+        public GLAccountType AccountType { get; set; }
+        public string DepartmentHPath { get; set; }
+        public string RevenueAccountHPath { get; set; }
+        public string ExpenseAccountHPath { get; set; }
+        public string StatisticAccountHPath { get; set; }
+        public bool HasStatistic { get; set; }
+    }
+
+    public class PopulationMember
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+
+    public class StrategicOpportunityCompleteInitiativeData
+    {
+        public bool IsThresholdMonitoring { get; set; }
+        public Single AcceptableThreshold { get; set; }
+    }
+
+    public class StrategicOpportunityGetDetailData
+    {
+        public string[] Dimensions { get; set; }
+        public DateOnly? DateStart { get; set; }
+        public DateOnly? DateEnd { get; set; }
+
+        public void SetFirstAndLastDayOfMonth()
+        {
+            if (DateStart.HasValue)
+            {
+                DateStart = new DateOnly(DateStart.Value.Year, DateStart.Value.Month, 1);
+            }
+            if (DateEnd.HasValue)
+            {
+                var lastDay = DateTime.DaysInMonth(DateEnd.Value.Year, DateEnd.Value.Month);
+                DateEnd = new DateOnly(DateEnd.Value.Year, DateEnd.Value.Month, lastDay);
+            }
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityDto.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityDto.cs
new file mode 100644
index 0000000..43190db
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityDto.cs
@@ -0,0 +1,34 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicOpportunityDto
+    {
+        public long OpportunityId { get; set; }
+        public string Name { get; set; }
+        public StrategicOpportunityTypes OpportunityType { get; set; }
+
+        public string OpportunityFiltersJSON { get; set; }
+        public StrategicOpportunityLayout Layout { get; set; }
+
+        public int Rollup1Id { get; set; }
+        public int Rollup2Id { get; set; }
+        public int Rollup3Id { get; set; }
+
+        public BaselineType BaselineType { get; set; }
+        public DistributionMethod BaselineDistribution { get; set; }
+
+        public DateOnly BaselineStartDate { get; set; }
+        public DateOnly BaselineEndDate { get; set; }
+
+        public byte EstimatedTrackingDuration { get; set; }
+
+        public IEnumerable<StrategicOpportunityMeasureDto> Measures { get; set; }
+        public IEnumerable<int> WorkbookIds { get; set; }
+
+        public int StrataId { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityGLDto.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityGLDto.cs
new file mode 100644
index 0000000..75909ec
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityGLDto.cs
@@ -0,0 +1,14 @@
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicOpportunityGLDto : StrategicOpportunityDto
+    {
+        public GLAccountType AccountType { get; set; }
+        public string DepartmentHPath { get; set; }
+        public string RevenueAccountHPath { get; set; }
+        public string ExpenseAccountHPath { get; set; }
+        public string StatisticAccountHPath { get; set; }
+        public bool HasStatistic { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityGLUpdateDto.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityGLUpdateDto.cs
new file mode 100644
index 0000000..5975aff
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityGLUpdateDto.cs
@@ -0,0 +1,8 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicOpportunityGLUpdateDto
+    {
+        public StrategicOpportunityGLDto Opportunity { get; set; }
+        public bool ShouldPopulateOpportunityDetails { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityItem.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityItem.cs
new file mode 100644
index 0000000..95b04fc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityItem.cs
@@ -0,0 +1,12 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicOpportunityItem : GeneralStrategicOpportunityItem
+    {
+        public byte EstimatedTrackDurationMonths { get; set; }
+        public double TotalImprovement { get; set; }
+        public double EstimatedGoal { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityMeasureDto.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityMeasureDto.cs
new file mode 100644
index 0000000..99854f4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityMeasureDto.cs
@@ -0,0 +1,18 @@
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicOpportunityMeasureDto
+    {
+        public long MeasureId { get; set; }
+        public int MeasureType { get; set; }
+        public string MeasureName { get; set; }
+        public byte DesiredResult { get; set; }
+        public Single AcceptableThreshold { get; set; }
+        public string FiltersJSON { get; set; }
+        public byte MeasureGroup { get; set; }
+        public double AverageValue { get; set; }
+        public int StrataId { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityRampUpDto.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityRampUpDto.cs
new file mode 100644
index 0000000..02d8261
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityRampUpDto.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicOpportunityRampUpDto
+    {
+        [Required]
+        public long OpportunityId { get; set; }
+        [Required]
+        public byte MonthNumber { get; set; }
+        [Required]
+        public double Percentage { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunitySourceDbTable.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunitySourceDbTable.cs
new file mode 100644
index 0000000..cb95d01
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunitySourceDbTable.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicOpportunitySourceDbTable
+    {
+        public static readonly StrategicOpportunitySourceDbTable FactPatientEncounterSummary = new("clientdss.FactPatientEncounterSummary.dsspes");
+        public static readonly StrategicOpportunitySourceDbTable FactPatientBillingLineItemDetail = new ("dss.FactPatientBillingLineItemDetail.pblid");
+        public static readonly StrategicOpportunitySourceDbTable FactPatientCostDetail = new ("dss.factpatientcostdetail.costdetail");
+        public static readonly StrategicOpportunitySourceDbTable DimChargeCode = new ("fw.dimChargeCode.cc");
+        public static readonly StrategicOpportunitySourceDbTable DimPatientType = new ("fw.dimPatientType.PATIENTTYPE");
+        public static readonly StrategicOpportunitySourceDbTable DimPhysician = new ("dss.dimPhysician.physPrimary");
+        public static readonly StrategicOpportunitySourceDbTable FactPatientEncounterCLinicalIndicator = new ("dss.factPatientEncounterCLinicalIndicator.dsspeci");
+        public static readonly StrategicOpportunitySourceDbTable FactExplorationPopulationEncounter = new ("cci.factExplorationPopulationEncounter.explorationPopulationEncounter");
+        public static readonly StrategicOpportunitySourceDbTable DimMsdrg = new ("dss.dimmsdrg.msdrg");
+
+        public string Value { get; private set; }
+
+        public string SqlAlias => Value.Split('.').Last();
+
+        public static IEnumerable<StrategicOpportunitySourceDbTable> GetAllValues()
+        {
+            return new List<StrategicOpportunitySourceDbTable>
+            {
+                FactPatientEncounterSummary,
+                FactPatientBillingLineItemDetail,
+                FactPatientCostDetail,
+                DimChargeCode,
+                DimPatientType,
+                DimPhysician,
+                FactPatientEncounterCLinicalIndicator,
+                FactExplorationPopulationEncounter,
+                DimMsdrg
+            };
+        }
+
+        public override string ToString()
+        {
+            return Value;
+        }
+
+        private StrategicOpportunitySourceDbTable(string value)
+        {
+            Value = value;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityUpdateStatusDto.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityUpdateStatusDto.cs
new file mode 100644
index 0000000..8893e87
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityUpdateStatusDto.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicOpportunityUpdateStatusDto
+    {
+        public byte Status { get; set; }
+        public DateOnly TrackingStartDate { get; set; }
+        public DateOnly TrackingEndDate { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityWorkbookDto.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityWorkbookDto.cs
new file mode 100644
index 0000000..85f04db
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicOpportunityWorkbookDto.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicOpportunityWorkbookDto
+    {
+        public long OpportunityId { get; set; }
+        public int WorkbookId { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicRolesUpdate.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicRolesUpdate.cs
new file mode 100644
index 0000000..032faab
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Dtos/StrategicRolesUpdate.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos
+{
+    public class StrategicRolesUpdate
+    {
+        public Guid OwnerGuid { get; set; }
+        public Guid ExecutiveSponsorGuid { get; set; }
+        public Guid CostLeaderGuid { get; set; }
+        public string TeamMembers { get; set; }
+        public IEnumerable<Guid> Stakeholders { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Email/IPrimaryMeasureMonitoringEmail.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Email/IPrimaryMeasureMonitoringEmail.cs
new file mode 100644
index 0000000..df8af48
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Email/IPrimaryMeasureMonitoringEmail.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Email
+{
+    public interface IPrimaryMeasureMonitoringEmail
+    {
+        Task<bool> SendEmail(Guid receiver, List<PrimaryMeasureMonitoringData> tableData, string appVersion, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Email/PrimaryMeasureMonitoringData.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Email/PrimaryMeasureMonitoringData.cs
new file mode 100644
index 0000000..7a17c14
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Email/PrimaryMeasureMonitoringData.cs
@@ -0,0 +1,12 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Email
+{
+    public class PrimaryMeasureMonitoringData
+    {
+        public long OpportunityId { get; set; }
+        public string Name { get; set; }
+        public double PeriodAverage { get; set; }
+        public double MonthAverage { get; set; }
+        public double Variance { get; set; }
+        public bool IsCurrencyMeasure { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Email/PrimaryMeasureMonitoringEmail.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Email/PrimaryMeasureMonitoringEmail.cs
new file mode 100644
index 0000000..4847766
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Email/PrimaryMeasureMonitoringEmail.cs
@@ -0,0 +1,67 @@
+using Microsoft.Extensions.Configuration;
+using Strata.ContinuousImprovement.Biz.Email;
+using Strata.Users.Client;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Email
+{
+    public class PrimaryMeasureMonitoringEmail : IPrimaryMeasureMonitoringEmail
+    {
+        private readonly IEmailNotificationService _emailNotificationService;
+        private readonly IConfiguration _config;
+        private readonly IUsersServiceClient _usersServiceClient;
+        
+        public PrimaryMeasureMonitoringEmail(IEmailNotificationService emailNotificationService, IConfiguration config, IUsersServiceClient usersServiceClient)
+        {
+            _emailNotificationService = emailNotificationService;
+            _usersServiceClient = usersServiceClient;
+            _config = config;
+        }
+        public async Task<bool> SendEmail(Guid receiver, List<PrimaryMeasureMonitoringData> tableData, string appVersion, CancellationToken cancellationToken)
+        {
+            var user = await _usersServiceClient.GetUserAsync(receiver, cancellationToken);
+            var result = await _emailNotificationService.SendEmailAsync(user.Email, new EmailInfo()
+            {
+                Subject = "Strategic Tracker primary measures have exceeded the defined threshold",
+                Body = GenerateEmailBody(tableData, appVersion)
+            });
+
+            return result;
+        }
+
+        private string GenerateEmailBody(List<PrimaryMeasureMonitoringData> tableData, string appVersion)
+        {
+            var templatePath = Path.Combine("StrategicOpportunities", "Email", "PrimaryMeasureMonitoringEmail.html");
+            var baseBody = _emailNotificationService.BuildEmailBody(templatePath, appVersion);
+            var link = _config["microapps:continuousImprovement"] + "strategic-opportunity";
+            var details = new StringBuilder();
+
+            foreach (var row in tableData)
+            {
+                var encodedName = WebUtility.HtmlEncode(row.Name);
+                details.Append(@$"
+<tr style=""height: 48px; font-size: 14px; border-bottom: 1px solid #dddddd;"">
+    <td style=""padding: 8px; border-right: none; border-left: none; text-align: right;""><a style=""font-weight: bold;"" href='{link}/{row.OpportunityId}'>{row.OpportunityId}</a></td>
+    <td style=""padding: 8px; border-right: none; border-left: none; text-align: left;""><h4>{encodedName}</h4></td>
+    <td style=""padding: 8px; border-right: none; border-left: none; text-align: right;"">{(row.IsCurrencyMeasure ? "$" : "")}{row.PeriodAverage.ToString("N0")}</td>
+    <td style=""padding: 8px; border-right: none; border-left: none; text-align: right;"">{(row.IsCurrencyMeasure ? "$" : "")}{row.MonthAverage.ToString("N0")}</td>
+    <td style=""padding: 8px; border-right: none; border-left: none; text-align: right; padding-right: 30px;"">{row.Variance.ToString("F1")}%</td>
+  </tr>
+");
+            }
+
+            var previousMonthDate = DateTime.UtcNow.AddMonths(-1);
+            baseBody = baseBody.Replace("[STRATA_MONTH_YEAR]", previousMonthDate.ToString("MMMM, yyyy"));
+            baseBody = baseBody.Replace("[STRATA_REQUEST_BODY]", details.ToString());
+            baseBody = baseBody.Replace("[STRATA_INITIATIVE_COUNT]", tableData.Count.ToString());
+
+            return baseBody;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/BaselineType.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/BaselineType.cs
new file mode 100644
index 0000000..2fa546a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/BaselineType.cs
@@ -0,0 +1,10 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums
+{
+    public enum BaselineType: byte
+    {
+        MonthRange = 1,
+        FlatBudget,
+        Custom,
+        Override
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/DesiredResult.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/DesiredResult.cs
new file mode 100644
index 0000000..c7a2018
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/DesiredResult.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums
+{
+    public enum DesiredResult : byte
+    {
+        Increase = 1,
+        Decrease,
+        Steady
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/DistributionMethod.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/DistributionMethod.cs
new file mode 100644
index 0000000..50198b0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/DistributionMethod.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums
+{
+    public enum DistributionMethod : byte
+    {
+        Average = 1,
+        Monthly
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/DistributionStage.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/DistributionStage.cs
new file mode 100644
index 0000000..f5a7fe1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/DistributionStage.cs
@@ -0,0 +1,11 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums
+{
+    public enum DistributionStage : byte
+    {
+        FromSourceToOpportunity = 1,
+        OpportunityChangeGoalPeriod,
+        FromOpportunityToInitiative,
+        InitiativeChangeTrackingPeriod,
+        FromInitiativeToOpportunity
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/GLAccountType.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/GLAccountType.cs
new file mode 100644
index 0000000..756662b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/GLAccountType.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums
+{
+    public enum GLAccountType : byte
+    {
+        Revenue = 0,
+        Expense = 1,
+        Margin = 2
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/MeasureGroup.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/MeasureGroup.cs
new file mode 100644
index 0000000..a48cb3c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/MeasureGroup.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums
+{
+    public enum MeasureGroup : byte
+    {
+        System = 0,
+        Primary,
+        Secondary
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/MeasureType.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/MeasureType.cs
new file mode 100644
index 0000000..473594a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/MeasureType.cs
@@ -0,0 +1,101 @@
+using System.Collections.Generic;
+using System.Collections.Immutable;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums
+{
+    public enum MeasureType : byte
+    {
+        UnitsOfService = 1,
+        UnitsOfServicePerCase,
+        DirectVariableCost,
+        DirectVariableCostPerCase,
+        DirectVariableCostPerUnit,
+        TotalDirectCost,
+        TotalDirectCostPerCase,
+        TotalDirectCostPerUnit,
+        TotalCharges,
+        TotalChargesPerCase,
+        TotalChargesPerUnit,
+        EncountersCases,
+        AcquisitionSupplyCost,
+        AcquisitionSupplyCostPerCase,
+        AcquisitionSupplyCostPerUnit,
+        AverageLengthOfStay,
+        Days,
+        TotalMargin,
+        MarginPerCase,
+        ContributionMargin,
+        ContributionMarginPerCase,
+        DirectMargin,
+        DirectMarginPerCase,
+        VariableMargin,
+        VariableMarginPerCase,
+
+        CommittedCost,
+        ActualCost,
+
+        // GL measure types
+        GLExpense,
+        GLRevenue,
+        GLVolume,
+        GLExpensePerUnit,
+        GLRevenuePerUnit,
+        GLExpensePerAdjDischarge,
+        GLRevenuePerAdjDischarge,
+        GLMargin,
+        GLMarginPerUnit,
+        GLMarginPerAdjDischarge
+    }
+
+    public static class MeasureTypeConstants
+    {
+        public readonly static ImmutableList<MeasureType> PER_UNIT_MEASURE_TYPES = ImmutableList.Create( 
+            MeasureType.DirectVariableCostPerUnit,
+            MeasureType.TotalDirectCostPerUnit, 
+            MeasureType.TotalChargesPerUnit, 
+            MeasureType.AcquisitionSupplyCostPerUnit);
+        public readonly static ImmutableList<MeasureType> PER_CASE_MEASURE_TYPES = ImmutableList.Create( 
+            MeasureType.DirectVariableCostPerCase,
+            MeasureType.TotalDirectCostPerCase, 
+            MeasureType.TotalChargesPerCase, 
+            MeasureType.AcquisitionSupplyCostPerCase,
+            MeasureType.UnitsOfServicePerCase, 
+            MeasureType.EncountersCases, 
+            MeasureType.AverageLengthOfStay, 
+            MeasureType.MarginPerCase,
+            MeasureType.ContributionMarginPerCase, 
+            MeasureType.DirectMarginPerCase, 
+            MeasureType.VariableMarginPerCase);
+        public readonly static ImmutableList<MeasureType> PATIENT_COST_MEASURE_TYPES = ImmutableList.Create( 
+            MeasureType.DirectVariableCost,
+            MeasureType.DirectVariableCostPerCase, 
+            MeasureType.DirectVariableCostPerUnit, 
+            MeasureType.TotalDirectCost, 
+            MeasureType.TotalDirectCostPerCase,
+            MeasureType.TotalDirectCostPerUnit );
+        public readonly static ImmutableList<MeasureType> MARGIN_MEASURE_TYPES = ImmutableList.Create( 
+            MeasureType.TotalMargin, 
+            MeasureType.MarginPerCase,
+            MeasureType.ContributionMargin, 
+            MeasureType.ContributionMarginPerCase, 
+            MeasureType.DirectMargin, 
+            MeasureType.DirectMarginPerCase,
+            MeasureType.VariableMargin,
+            MeasureType.VariableMarginPerCase );
+        public readonly static ImmutableList<MeasureType> GL_MEASURE_TYPES = ImmutableList.Create(
+            MeasureType.GLExpense,
+            MeasureType.GLRevenue,
+            MeasureType.GLVolume,
+            MeasureType.GLExpensePerUnit,
+            MeasureType.GLRevenuePerUnit,
+            MeasureType.GLExpensePerAdjDischarge,
+            MeasureType.GLRevenuePerAdjDischarge,
+            MeasureType.GLMargin,
+            MeasureType.GLMarginPerUnit,
+            MeasureType.GLMarginPerAdjDischarge);
+        public static bool IsEncounterLevelMeasure(MeasureType type)
+        {
+            return MARGIN_MEASURE_TYPES.Contains(type) || type == MeasureType.EncountersCases || type == MeasureType.AverageLengthOfStay;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/RunTrackingStatus.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/RunTrackingStatus.cs
new file mode 100644
index 0000000..5b7fb30
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/RunTrackingStatus.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums
+{
+    public enum RunTrackingStatus : byte
+    {
+        None,
+        Success,
+        Failed
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/StrategicOpportunityStatus.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/StrategicOpportunityStatus.cs
new file mode 100644
index 0000000..73976cf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Enums/StrategicOpportunityStatus.cs
@@ -0,0 +1,13 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums
+{
+    public enum StrategicOpportunityStatus
+    {
+        NewOpportunity,
+        InValidation,
+        PendingApproval,
+        NewInitiative,
+        Tracking,
+        Complete,
+        CompleteMonitoring
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/GLDataSourceStrategy.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/GLDataSourceStrategy.cs
new file mode 100644
index 0000000..a28da2f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/GLDataSourceStrategy.cs
@@ -0,0 +1,32 @@
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public class GLDataSourceStrategy(ISnowflakeDatabaseContext snowflakeContext) : IGLDataSourceStrategy
+    {
+        private const string FwGLTable = "fw.factglsampled";
+        private const string IntGLTable = "int.factgl";
+        private const string FwStatisticTable = "fw.factstatisticsampledmonthly";
+        private const string IntStatisticTable = "int.FactStatistic";
+
+        public async Task<string> GetGLFactTableAsync()
+        {
+            var hasData = await HasAnyDataAsync(FwGLTable);
+            return hasData ? FwGLTable : IntGLTable;
+        }
+
+        public async Task<string> GetStatisticTableAsync()
+        {
+            var hasData = await HasAnyDataAsync(FwStatisticTable);
+            return hasData ? FwStatisticTable : IntStatisticTable;
+        }
+
+        private async Task<bool> HasAnyDataAsync(string tableName)
+        {
+            var result = await snowflakeContext.ExecuteScalarAsync<int>(
+                $"SELECT CASE WHEN EXISTS (SELECT 1 FROM {tableName} LIMIT 1) THEN 1 ELSE 0 END");
+            return result == 1;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IGLDataSourceStrategy.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IGLDataSourceStrategy.cs
new file mode 100644
index 0000000..5926160
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IGLDataSourceStrategy.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public interface IGLDataSourceStrategy
+    {
+        Task<string> GetGLFactTableAsync();
+        Task<string> GetStatisticTableAsync();
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IStrategicChargeCodeOpportunityDetailService.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IStrategicChargeCodeOpportunityDetailService.cs
new file mode 100644
index 0000000..45dae44
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IStrategicChargeCodeOpportunityDetailService.cs
@@ -0,0 +1,26 @@
+using ClosedXML.Excel;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public interface IStrategicChargeCodeOpportunityDetailService
+    {
+        Task<StrategicOpportunityDetailData> GetStrategicOpportunityDetailData(long opportunityId, bool isTracking, StrategicOpportunityGetDetailData getData, CancellationToken cancellationToken);
+        Task PopulateTrackingDetails(StrategicOpportunityChargeCode opportunity, CancellationToken cancellationToken);
+        Task UpdateMeasuresDetails(StrategicOpportunityChargeCode opportunity, CancellationToken cancellationToken);
+        Task UpdateMeasuresAverage(StrategicOpportunityChargeCode opportunity, CancellationToken cancellationToken);
+        Task DeleteMeasuresDetails(long opportunityId, CancellationToken cancellationToken);
+        Task PopulateStrategicOpportunityDetails(StrategicOpportunityChargeCode opportunity, CancellationToken cancellationToken);
+        Task PopulateStrategicOpportunityGoalDetails(StrategicOpportunityChargeCode opportunity, DistributionStage stage, bool isSaveChanges, CancellationToken cancellationToken);
+        Task PopulateStrategicOpportunityCommittedDetails(StrategicOpportunityChargeCode opportunity, DistributionStage stage, bool isSaveChanges, CancellationToken cancellationToken);
+        Task PopulateDetailGoalSummary(StrategicOpportunityChargeCode opportunity, double[] rampUps, bool isSaveChanges, CancellationToken cancellationToken);
+        Task UpdateDetailCommittedByRampUp(StrategicOpportunityChargeCode opportunity, double[] oldRampUps, double[] newRampUps, bool isSaveChanges, CancellationToken cancellationToken);
+        Task<bool> UpdateStrategicOpportunityDetailsData(long opportunityId, IEnumerable<StrategicOpportunityChargeCodeAdjustment> adjustments, IEnumerable<string> rows, CancellationToken cancellationToken);
+        Task<IXLWorkbook> ExportInitiativeAsync(long opportunityId, bool isTracking, StrategicOpportunityGetDetailData getData, CancellationToken cancellationToken);
+        Task<IXLWorkbook> ExportOpportunityAsync(long opportunityId, StrategicOpportunityGetDetailData getData, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IStrategicGLOpportunityDetailService.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IStrategicGLOpportunityDetailService.cs
new file mode 100644
index 0000000..b71dd8a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IStrategicGLOpportunityDetailService.cs
@@ -0,0 +1,20 @@
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public interface IStrategicGLOpportunityDetailService
+    {
+        Task<StrategicOpportunityGLDetailData> GetStrategicOpportunityGLDetailData(long opportunityId, bool isTracking, string[] dimensions, CancellationToken cancellationToken);
+        Task PopulateStrategicOpportunityGLDetails(StrategicOpportunityGL opportunity, CancellationToken cancellationToken);
+        Task PopulateStrategicOpportunityGLGoalDetails(StrategicOpportunityGL opportunity, DistributionStage stage, bool isSaveChanges, CancellationToken cancellationToken);
+        Task PopulateStrategicOpportunityCommittedDetails(StrategicOpportunityGL opportunity, DistributionStage stage, bool isSaveChanges, CancellationToken cancellationToken);
+        Task UpdateDetailCommittedByRampUp(StrategicOpportunityGL opportunity, double[] oldRampUps, double[] newRampUps, bool isSaveChanges, CancellationToken cancellationToken);
+        Task PopulateGLDetailGoalSummary(StrategicOpportunityGL opportunity, double[] rampUps, bool isSaveChanges, CancellationToken cancellationToken);
+        Task<bool> UpdateStrategicOpportunityGLDetailsData(long opportunityId, IEnumerable<StrategicOpportunityGLAdjustment> adjustments, IEnumerable<string> rows, CancellationToken cancellationToken);
+        Task PopulateTrackingDetails(StrategicOpportunityGL opportunity, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IStrategicItemDimensionSyncService.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IStrategicItemDimensionSyncService.cs
new file mode 100644
index 0000000..953e79a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IStrategicItemDimensionSyncService.cs
@@ -0,0 +1,11 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public interface IStrategicItemDimensionSyncService
+    {
+        Task UpsertAsync(StrategicOpportunity opportunity, CancellationToken cancellationToken);
+        Task DeleteAsync(long opportunityId);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IStrategicOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IStrategicOpportunityService.cs
new file mode 100644
index 0000000..ed7fb16
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/IStrategicOpportunityService.cs
@@ -0,0 +1,40 @@
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public interface IStrategicOpportunityService
+    {
+        Task<List<StrategicOpportunityItem>> GetStrategicOpportunitiesAsync(CancellationToken cancellationToken);
+        Task<StrategicOpportunityGeneralInfo> GetStrategicOpportunityGeneralInfo(long opportunityId, CancellationToken cancellationToken);
+        Task<StrategicOpportunityChargeCodeEditData> GetStrategicOpportunityChargeCode(long opportunityId, CancellationToken cancellationToken);
+        Task<bool> ContainsAsync(long opportunityId, CancellationToken cancellationToken);
+        Task<bool> ContainsGLAsync(long opportunityId, CancellationToken cancellationToken);
+        Task<long> CreateOpportunityChargeCodeAsync(StrategicOpportunityChargeCodeDto opportunityDto, CancellationToken cancellationToken);
+        Task<long> UpdateOpportunityChargeCode(long opportunityId, StrategicOpportunityChargeCodeUpdateDto opportunityDto, CancellationToken cancellationToken);
+        Task<long> CreateOpportunityGeneralLedgerAsync(StrategicOpportunityGLDto opportunityDto, CancellationToken cancellationToken);
+        Task<long> UpdateOpportunityGeneralLedger(long opportunityId, StrategicOpportunityGLUpdateDto opportunityDto, CancellationToken cancellationToken);
+        Task<StrategicOpportunityGLEditData> GetStrategicOpportunityGL(long opportunityId, CancellationToken cancellationToken);
+        Task<bool> DeleteGeneralLedgerOpportunityAsync(long opportunityId, CancellationToken cancellationToken);
+        Task<StrategicOpportunityLayout> GetStrategicOpportunityLayout(long opportunityId, CancellationToken cancellationToken);
+        Task<bool> UpdateStrategicOpportunityLayout(long opportunityId, StrategicOpportunityLayout layout, CancellationToken cancellationToken);
+        Task<bool> UpdateStrategicOpportunityStatus(long opportunityId, StrategicOpportunityUpdateStatusDto updateStatusDto, CancellationToken cancellationToken);
+        Task<bool> DeleteChargeCodeOpportunityAsync(long opportunityId, CancellationToken cancellationToken);
+        Task<bool> NameIsValidAsync(string name, CancellationToken cancellationToken);
+        Task<bool> UpdateStrategicOpportunityRampUpsAsync(long opportunityId, List<StrategicOpportunityRampUpDto> rampUps, CancellationToken cancellationToken);
+        Task<bool> ResetStrategicOpportunityRampUps(long opportunityId, CancellationToken cancellationToken);
+        Task<bool> RunTrackingTask(long opportunityId, CancellationToken cancellationToken);
+        Task<bool> CompleteInitiative(long opportunityId, StrategicOpportunityCompleteInitiativeData completeInitiativeData, CancellationToken cancellationToken);
+        Task<List<StrategicOpportunityMeasureDto>> GetStrategicOpportunityMeasures(long opportunityId, CancellationToken cancellationToken);
+        Task<StrategicOpportunityMeasureDto> GetStrategicOpportunityPrimaryMeasure(long opportunityId, CancellationToken cancellationToken);
+        Task<List<StrategicOpportunityMeasureDetail>> GetStrategicOpportunityMeasureDetails(long measureId, CancellationToken cancellationToken);
+        Task<List<StrategicOpportunityRampUpDto>> GetStrategicOpportunityRampUpsAsync(long opportunityId, CancellationToken cancellationToken);
+        Task<StrategicOpportunityDrawerDetails> GetStrategicOpportunityDrawerDetails(long opportunityId, CancellationToken cancellationToken);
+        Task<List<StrategicInitiativeItem>> GetStrategicInitiativesAsync(CancellationToken cancellationToken);
+        Task<bool> UpdateStrategicInitiative(long opportunityId, StrategicInitiativeUpdateDto updateInitiativeDto, CancellationToken cancellationToken);
+        Task<bool> UpdateRoles(long opportunityId, StrategicRolesUpdate updateStakeholdersDto, CancellationToken cancellationToken);
+        Task<long> CopyStrategicOpportunity(long opportunityId, string opportunityName, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/PrimaryMeasureMonitoringJob.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/PrimaryMeasureMonitoringJob.cs
new file mode 100644
index 0000000..d84f004
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/PrimaryMeasureMonitoringJob.cs
@@ -0,0 +1,112 @@
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.ClientLicense;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Email;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public class PrimaryMeasureMonitoringJob(CentralDbContext centralDbContext,
+        ISnowflakeDatabaseContextFactory snowflakeDatabaseContextFactory,
+        IPrimaryMeasureMonitoringEmail primaryMeasureMonitoringEmail,
+        IBackgroundJobClient backgroundJobClient,
+        IClientLicenseService clientLicenseService,
+        ILogger<PrimaryMeasureMonitoringJob> logger = default)
+    {
+        private readonly List<MeasureType> _numberMeasureTypes = new List<MeasureType> { MeasureType.UnitsOfService, MeasureType.UnitsOfServicePerCase, MeasureType.EncountersCases, MeasureType.AverageLengthOfStay, MeasureType.Days };
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Run email sending task about primary measure monitoring")]
+        [Semaphore(nameof(PrimaryMeasureMonitoringJob.RunNotifyPrimaryMeasureMonitoring))]
+        public async Task RunNotifyPrimaryMeasureMonitoring(CancellationToken cancellationToken)
+        {
+            var clients = await clientLicenseService.GetEligibleCIClientsAsync(isLicensed: true, cancellationToken);
+
+            foreach (var client in clients)
+            {
+                var measures = await centralDbContext.StrategicOpportunityMeasures.Include(m => m.Opportunity).Where(m => m.StrataId == client.StrataId && m.MeasureGroup == MeasureGroup.Primary && m.Opportunity.Status == (byte)StrategicOpportunityStatus.CompleteMonitoring).ToListAsync(cancellationToken);
+
+                if (measures.Any())
+                {
+                    backgroundJobClient.Enqueue<PrimaryMeasureMonitoringJob>(job => job.SendEmail(client.DatabaseGUID, client.StrataId, client.AppVersion, cancellationToken));
+                }
+            }
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Send Primary Measure Monitoring Email ({1})")]
+        [CaptureJobParameter(DatabaseGuidArgumentPosition = 0, StrataIdArgumentPosition = 1)]
+        public async Task SendEmail(Guid databaseGuid, int strataId, string appVersion, CancellationToken cancellationToken)
+        {
+            try
+            {
+                using var snowflakeContext = snowflakeDatabaseContextFactory.Create(databaseGuid.ToString("N"));
+                var measures = await centralDbContext.StrategicOpportunityMeasures.Include(m => m.Opportunity).Where(m => m.StrataId == strataId && m.MeasureGroup == MeasureGroup.Primary && m.Opportunity.Status == (byte)StrategicOpportunityStatus.CompleteMonitoring).ToListAsync(cancellationToken);
+                var previousMonthDate = DateTime.UtcNow.AddMonths(-1);
+                var measureIds = measures.Select(m => m.MeasureId).Distinct().ToList();
+                var measureIdsInClause = string.Join(",", measureIds);
+                var sql = @$"SELECT MeasureId, Value FROM cci.StrategicOpportunityMeasureDetail
+                 WHERE YearId={previousMonthDate.Year} and MonthId={previousMonthDate.Month} and MeasureId IN ({measureIdsInClause})";
+                var measureDetails = await snowflakeContext.QueryAsync<StrategicOpportunityMeasureDetail>(sql, "MeasureDetails");
+                var notifyMeasures = new Dictionary<StrategicOpportunityMeasure, double>();
+
+                foreach (var measure in measures)
+                {
+                    var detail = measureDetails.FirstOrDefault(m => m.MeasureId == measure.MeasureId);
+
+                    if (detail != null && (detail.Value < measure.AverageValue * (1 - measure.AcceptableThreshold) || detail.Value > measure.AverageValue * (1 + measure.AcceptableThreshold)))
+                    {
+                        notifyMeasures.Add(measure, detail.Value);
+                    }
+                }
+
+                var userGuids = notifyMeasures
+                    .SelectMany(m => new[] { m.Key.Opportunity.OwnerGuid, m.Key.Opportunity.ExecutiveSponsorGuid })
+                    .Where(guid => guid != Guid.Empty)
+                    .Distinct()
+                    .ToList();
+                var sendEmails = new Dictionary<Guid, List<PrimaryMeasureMonitoringData>>();
+
+                foreach (var userGuid in userGuids)
+                {
+                    var sendMeasures = notifyMeasures.Where(m => m.Key.Opportunity.OwnerGuid == userGuid || m.Key.Opportunity.ExecutiveSponsorGuid == userGuid)
+                        .Select(m =>
+                        {
+                            return new PrimaryMeasureMonitoringData()
+                            {
+                                OpportunityId = m.Key.OpportunityId,
+                                Name = m.Key.Opportunity.Name,
+                                PeriodAverage = m.Key.AverageValue,
+                                MonthAverage = m.Value,
+                                IsCurrencyMeasure = !_numberMeasureTypes.Contains(m.Key.MeasureType),
+                                Variance = m.Key.AverageValue == 0 ? 0 : m.Value / m.Key.AverageValue * 100
+                            };
+                        })
+                        .ToList();
+
+                    sendEmails.Add(userGuid, sendMeasures);
+                }
+
+                string version = appVersion.Replace(".", "");
+                var sendEmailTasks = sendEmails.Select(email => primaryMeasureMonitoringEmail.SendEmail(email.Key, email.Value, version, cancellationToken));
+                await Task.WhenAll(sendEmailTasks);
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, $"Primary measure monitoring email failed for strataId: {strataId}");
+                throw;
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/IStrategicOpportunityDetailQueryBuilder.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/IStrategicOpportunityDetailQueryBuilder.cs
new file mode 100644
index 0000000..d54afca
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/IStrategicOpportunityDetailQueryBuilder.cs
@@ -0,0 +1,20 @@
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.DataSchema.Models.Query;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries
+{
+    public interface IStrategicOpportunityDetailQueryBuilder
+    {
+        string BuildDeleteQuery(long? opportunityId = null);        
+        string BuildInsertQuery(StrategicOpportunityChargeCode opportunity, string selectQuery, bool isUsingAprdrgAsync);        
+        string BuildMergeQuery(long opportunityId, string sqlQuery, bool isUsingAprdrg);
+        string GetDeleteAllMeasuresSql(IEnumerable<long> measureIds);        
+        string GetSelectMeasureSql(long opportunityId, MeasureType measureType, string sqlQuery, Dictionary<string, FilterCondition> marginMeasureFilters);
+        string BuildMergeSystemMeasureMergeQuery(long opportunityId, long measureId, MeasureType measureType, string startDate, int trackingMonths);
+        string WrapIntoMeasureAverageQuery(string query);
+        string WrapIntoMeasureMergeQuery(string query);
+        string BuildGetDistinctEncounterCountQuery(long opportunityId, string selectQuery, bool isUsingAprdrg, StrategicOpportunityGetDetailData getData);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/QUERY_BUILDERS.md b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/QUERY_BUILDERS.md
new file mode 100644
index 0000000..ecd2597
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/QUERY_BUILDERS.md
@@ -0,0 +1,153 @@
+# Strategic Opportunity Query Builders
+
+## Overview
+
+This folder contains dynamic SQL builders that generate Snowflake SQL at runtime. They are not
+ORM queries — they produce raw SQL strings that are executed via `ISnowflakeDatabaseContext`.
+
+All Snowflake tables targeted here are in the `cci` schema.
+
+---
+
+## Files
+
+| File | Builds SQL for |
+|---|---|
+| `StrategicOpportunityDetailQueryBuilder.cs` | Charge code detail: INSERT, MERGE, DELETE, encounter count, measure merge |
+| `StrategicOpportunityUpdateQueryBuilder.cs` | Manual adjustment UPDATEs on `FactStrategicChargeCodeDetail` |
+| `StrategicOpportunityGLDetailQueryBuilder.cs` | GL detail: equivalent INSERT/MERGE/DELETE for `FactStrategicGLDetail` |
+| `StrategicOpportunityGLUpdateQueryBuilder.cs` | Manual adjustment UPDATEs on `FactStrategicGLDetail` |
+| `StrategicOpportunityServiceQuery.cs` | Dimension key-value lookup queries (returns `Dictionary<dimension, sql>`) |
+| `StrategicOpportunityGLServiceQuery.cs` | GL dimension key-value lookups |
+| `SQL/` | Embedded SQL resource files loaded via `Assembly.ReadResource()` |
+
+---
+
+## StrategicOpportunityDetailQueryBuilder
+
+### Charge Code Injection Pattern
+
+The core technique is **anchor-based injection**. Source SELECT queries (loaded from `.sql` files
+in `/Queries/SQL/`) contain a known anchor string:
+
+```sql
+INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid
+```
+
+`InjectChargeCodeJoin()` finds every occurrence of this anchor and inserts after it:
+
+```sql
+INNER JOIN cci.StrategicChargeCodeIds_{opportunityId} CCID ON CC.chargecodeid = CCID.chargecodeid
+```
+
+`cci.StrategicChargeCodeIds_{opportunityId}` is a per-opportunity temp table that filters the
+query to only the charge codes selected for this opportunity. The table name is dynamic — it
+encodes the `opportunityId` directly in the name.
+
+### KEY_SEPARATOR
+
+```csharp
+private const string KEY_SEPARATOR = "|";
+```
+
+Used in encounter-count queries to build composite row keys:
+
+```sql
+ARRAY_TO_STRING(ARRAY_CONSTRUCT_COMPACT(dim1, dim2, ...), '|') AS key
+```
+
+The frontend `StrategicOpportunityDetailStoreTreeData` uses the same `|` separator to look up
+encounter counts by node key when populating the `encounters` field.
+
+### BuildInsertQuery vs BuildMergeQuery
+
+| Method | When used | Behavior |
+|---|---|---|
+| `BuildInsertQuery` | Initial baseline population | Plain `INSERT INTO cci.FactStrategicChargeCodeDetail` |
+| `BuildMergeQuery` | Re-population / refresh | `MERGE` matching on all 10 dimension columns — updates `Units/Cost`, inserts if missing |
+| `BuildDeleteQuery` | Before full re-population or on delete | `DELETE WHERE OpportunityId = X` |
+
+The MERGE match key is all 10 dimension columns:
+`OpportunityId, IsBaseline, FiscalYear, FiscalMonth, EntityId, PhysicianId, ServiceLineId, DepartmentId, PhysicianSpecialtyId, ChargeCodeId, CostDriver, CaseTypeFamilyId`
+
+### GetSubQuery — Aggregation Wrapper
+
+Every INSERT/MERGE wraps the source SELECT in a `GetSubQuery()` that:
+1. Maps Snowflake column aliases (e.g. `dsspesEntityID` → `EntityID`)
+2. Adds `:opportunityId` and `:isBaseline` bind parameters
+3. Groups by all 10 dimension columns, summing `Units` and `Cost`
+4. Sets `GoalUnits = 0, GoalCost = 0` (goal values are populated separately via distribution)
+
+### CaseTypeFamilyId — APR-DRG vs MS-DRG
+
+```csharp
+GetCaseTypeFamilyIdField(bool isUsingAprdrg)
+```
+
+For inpatient encounters, `CaseTypeFamilyId` is derived from either `APRDRGCaseTypeFamilyId`
+or `MSDRGCaseTypeFamilyId` depending on the `isUsingAprdrg` client setting. Outpatient always
+uses `CPTCodeCaseTypeFamilyId`. This flag is passed through from the opportunity's client
+configuration.
+
+### Measure Merge Queries
+
+`BuildMeasureMergeQuery` targets `cci.StrategicOpportunityMeasureDetail` (not the fact table).
+It MERGEs on `(MeasureId, YearId, MonthId)`.
+
+`BuildSystemMeasureMergeQuery` handles system-calculated measures (CommittedCost, Cost) by
+reading directly from `cci.FactStrategicChargeCodeDetail` with a date-range generator — no source
+query injection needed.
+
+`BuildMeasureCalculation()` maps `MeasureType` → the appropriate Snowflake aggregate expression
+(SUM, COUNT DISTINCT, per-case division, margin formula, etc.).
+
+---
+
+## Dimension Config — DimensionsConfig vs GLDimensionsConfig
+
+Defined as static dictionaries on `StrategicOpportunityService`:
+
+### Charge Code Dimensions (8)
+
+| Dimension | SQL File | Column (Snowflake) | Alias (source query) |
+|---|---|---|---|
+| Entity | `SelectEntityKeyValue.sql` | `EntityID` | `dsspesEntityID` |
+| PrimaryServiceLine | `SelectServiceLineKeyValue.sql` | `PrimaryServiceLineID` | `dsspesPrimaryServiceLineId` |
+| CaseTypeFamily | `SelectCaseTypeFamilyKeyValue.sql` | `CaseTypeFamilyId` | `CaseTypeFamilyId` |
+| Physician | `SelectPhysicianKeyValue.sql` | `PrimaryPhysicianID` | `dsspesPhysicianId` |
+| PhysicianSpecialty | `SelectPhysicianSpecialtyKeyValue.sql` | `PhysicianSpecialtyID` | `physPrimaryPhysicianSpecialtyId` |
+| CostDriver | `SelectCostDriverKeyValue.sql` | `CostDriver` | `ccCostDriver` |
+| Department | `SelectDepartmentKeyValue.sql` | `DepartmentID` | `pblidDepartmentId` |
+| ChargeCode | `SelectChargeCodeKeyValue.sql` | `ChargeCodeID` | `ccChargeCodeID` |
+
+### GL Dimensions (3)
+
+| Dimension | SQL File | Column (Snowflake) |
+|---|---|---|
+| Entity | `SelectGLEntityKeyValue.sql` | `EntityId` |
+| Department | `SelectDepartmentKeyValue.sql` | `DepartmentId` |
+| GLAccount | `SelectGLAccountKeyValue.sql` | `AccountId` |
+
+Note: GL uses a separate Entity SQL file (`SelectGLEntityKeyValue.sql`) from charge code
+(`SelectEntityKeyValue.sql`).
+
+---
+
+## StrategicOpportunityServiceQuery / StrategicOpportunityGLServiceQuery
+
+These are not query *builders* — they are query *providers*. They return a dictionary mapping each
+`StrategicOpportunityDetailDimension` to its lookup SQL. The calling service executes each query
+against Snowflake and builds a `DimensionsData` map for the frontend tree store.
+
+---
+
+## SQL Embedded Resources
+
+SQL files in `SQL/` are embedded assembly resources loaded via:
+
+```csharp
+Assembly.GetExecutingAssembly().ReadResource("QueryName.sql")
+```
+
+See `Biz/Utilities/ResourceExtensions.cs` for the loader. The resource name must match exactly
+(case-sensitive on Linux builds).
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectCaseTypeFamilyKeyValue.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectCaseTypeFamilyKeyValue.sql
new file mode 100644
index 0000000..1a1303b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectCaseTypeFamilyKeyValue.sql
@@ -0,0 +1,7 @@
+-- {queryDetailList}
+
+SELECT DISTINCT 
+    ctf.CaseTypeFamilyId as key,
+    ctf.Name as value
+FROM DetailList dl
+JOIN dss.CaseTypeFamily ctf ON ctf.CaseTypeFamilyId = dl.CaseTypeFamilyId;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectChargeCodeKeyValue.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectChargeCodeKeyValue.sql
new file mode 100644
index 0000000..3e32bfa
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectChargeCodeKeyValue.sql
@@ -0,0 +1,7 @@
+-- {queryDetailList}
+
+SELECT DISTINCT 
+    cc.ChargeCodeId as key,
+    cc.Name as value
+FROM DetailList dl
+JOIN fw.DimChargeCode cc ON cc.ChargeCodeId = dl.ChargeCodeId;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectCostDriverKeyValue.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectCostDriverKeyValue.sql
new file mode 100644
index 0000000..3f5f803
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectCostDriverKeyValue.sql
@@ -0,0 +1,6 @@
+-- {queryDetailList}
+
+SELECT DISTINCT 
+    dl.CostDriver as key,
+    dl.CostDriver as value
+FROM DetailList dl;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectDepartmentKeyValue.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectDepartmentKeyValue.sql
new file mode 100644
index 0000000..658067c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectDepartmentKeyValue.sql
@@ -0,0 +1,7 @@
+-- {queryDetailList}
+
+SELECT DISTINCT 
+    dd.DepartmentId as key,
+    dd.Name as value
+FROM DetailList dl
+JOIN fw.DimDepartment dd ON dd.DepartmentId = dl.DepartmentId;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectEntityKeyValue.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectEntityKeyValue.sql
new file mode 100644
index 0000000..f209b04
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectEntityKeyValue.sql
@@ -0,0 +1,7 @@
+-- {queryDetailList}
+
+SELECT DISTINCT 
+    de.EntityId as key,
+    de.Name as value
+FROM DetailList dl
+JOIN clientdss.DimEntity de ON de.EntityId = dl.EntityId;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectGLAccountKeyValue.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectGLAccountKeyValue.sql
new file mode 100644
index 0000000..799b98f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectGLAccountKeyValue.sql
@@ -0,0 +1,7 @@
+-- {queryDetailList}
+
+SELECT DISTINCT
+    da.AccountId as key,
+    da.Name as value
+FROM DetailList dl
+JOIN fw.DimAccount da ON da.AccountId = dl.AccountId;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectGLEntityKeyValue.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectGLEntityKeyValue.sql
new file mode 100644
index 0000000..f01b28d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectGLEntityKeyValue.sql
@@ -0,0 +1,7 @@
+-- {queryDetailList}
+
+SELECT DISTINCT
+    de.EntityId as key,
+    de.Name as value
+FROM DetailList dl
+JOIN fw.DimEntity de ON de.EntityId = dl.EntityId;
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectGLRollupKeyValue.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectGLRollupKeyValue.sql
new file mode 100644
index 0000000..0e0d1cd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectGLRollupKeyValue.sql
@@ -0,0 +1,6 @@
+-- {queryDetailList}
+
+SELECT DISTINCT
+    dl.GLRollup as key,
+    dl.GLRollup as value
+FROM DetailList dl;
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectPhysicianKeyValue.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectPhysicianKeyValue.sql
new file mode 100644
index 0000000..ee2faa0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectPhysicianKeyValue.sql
@@ -0,0 +1,7 @@
+-- {queryDetailList}
+
+SELECT DISTINCT 
+    ph.PhysicianId as key,
+    ph.FullName as value
+FROM DetailList dl
+JOIN dss.DimPhysician ph ON ph.PhysicianId = dl.PrimaryPhysicianId;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectPhysicianSpecialtyKeyValue.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectPhysicianSpecialtyKeyValue.sql
new file mode 100644
index 0000000..002259f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectPhysicianSpecialtyKeyValue.sql
@@ -0,0 +1,7 @@
+-- {queryDetailList}
+
+SELECT DISTINCT 
+    phs.PhysicianSpecialtyId as key,
+    phs.Name as value
+FROM DetailList dl
+JOIN dss.DimPhysicianSpecialty phs ON phs.PhysicianSpecialtyId = dl.PhysicianSpecialtyId;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectServiceLineKeyValue.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectServiceLineKeyValue.sql
new file mode 100644
index 0000000..56f4c98
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectServiceLineKeyValue.sql
@@ -0,0 +1,7 @@
+-- {queryDetailList}
+
+SELECT DISTINCT 
+    dsl.ServiceLineId as key,
+    dsl.Name as value
+FROM DetailList dl
+JOIN fw.DimServiceLine dsl ON dsl.ServiceLineId = dl.PrimaryServiceLineId;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectStrategicOpportunityDetail.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectStrategicOpportunityDetail.sql
new file mode 100644
index 0000000..12876a9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectStrategicOpportunityDetail.sql
@@ -0,0 +1,20 @@
+-- {queryDetailList}
+
+SELECT 
+    RowID,
+    IsBaseline,
+    DischargeFiscalYearId,
+    DischargeFiscalMonthId,
+    EntityID,
+    PrimaryPhysicianID,
+    PrimaryServiceLineID,
+    DepartmentID,
+    PhysicianSpecialtyID,
+    ChargeCodeID,
+    CostDriver,
+    CaseTypeFamilyId,
+    Units,
+    Cost,
+    GoalUnits,
+    GoalCost    
+FROM DetailList dl;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectStrategicOpportunityGLDetail.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectStrategicOpportunityGLDetail.sql
new file mode 100644
index 0000000..2765baf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/SelectStrategicOpportunityGLDetail.sql
@@ -0,0 +1,22 @@
+-- {queryDetailList}
+
+SELECT
+    RowID,
+    IsBaseline,
+    FiscalYearId,
+    FiscalMonthId,
+    EntityID,
+    DepartmentID,
+    AccountId,
+    GLRollup,
+    AccountType,
+    Amount,
+    GoalAmount,
+    DistributedAmount,
+    SUM(CASE WHEN AccountType = 0 THEN Amount ELSE 0 END) OVER (PARTITION BY IsBaseline, FiscalYearId, FiscalMonthId, EntityID, DepartmentID) AS RevenueAmount,
+    SUM(CASE WHEN AccountType = 1 THEN Amount ELSE 0 END) OVER (PARTITION BY IsBaseline, FiscalYearId, FiscalMonthId, EntityID, DepartmentID) AS ExpenseAmount,
+    SUM(CASE WHEN AccountType = 2 THEN Amount ELSE 0 END) OVER (PARTITION BY IsBaseline, FiscalYearId, FiscalMonthId, EntityID, DepartmentID) AS StatisticAmount,
+    SUM(CASE WHEN AccountType = 0 THEN GoalAmount ELSE 0 END) OVER (PARTITION BY IsBaseline, FiscalYearId, FiscalMonthId, EntityID, DepartmentID) AS GoalRevenueAmount,
+    SUM(CASE WHEN AccountType = 1 THEN GoalAmount ELSE 0 END) OVER (PARTITION BY IsBaseline, FiscalYearId, FiscalMonthId, EntityID, DepartmentID) AS GoalExpenseAmount,
+    SUM(CASE WHEN AccountType = 2 THEN GoalAmount ELSE 0 END) OVER (PARTITION BY IsBaseline, FiscalYearId, FiscalMonthId, EntityID, DepartmentID) AS GoalStatisticAmount
+FROM DetailList dl;
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/StrategicOpportunityDetailCTE.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/StrategicOpportunityDetailCTE.sql
new file mode 100644
index 0000000..5c8c18c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/StrategicOpportunityDetailCTE.sql
@@ -0,0 +1,23 @@
+
+WITH DetailList AS (
+    SELECT
+        RowID,
+        IsBaseline,
+        DischargeFiscalYearId,
+        DischargeFiscalMonthId,
+        EntityID,
+        PrimaryPhysicianID,
+        PrimaryServiceLineID,
+        DepartmentID,
+        PhysicianSpecialtyID,
+        ChargeCodeID,
+        CostDriver,
+        CaseTypeFamilyId,
+        Units,
+        Cost,
+        GoalUnits,
+        GoalCost        
+    FROM cci.FactStrategicChargeCodeDetail sod
+    WHERE sod.OpportunityId = @OpportunityId AND (@IsBaseline IS NULL OR IsBaseline = @IsBaseline)
+    -- {queryWhere}
+)
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/StrategicOpportunityGLDetailCTE.sql b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/StrategicOpportunityGLDetailCTE.sql
new file mode 100644
index 0000000..bba9e71
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/SQL/StrategicOpportunityGLDetailCTE.sql
@@ -0,0 +1,20 @@
+
+WITH DetailList AS (
+    SELECT
+        sod.RowID,
+        sod.IsBaseline,
+        sod.FiscalYearId,
+        sod.FiscalMonthId,
+        sod.EntityID,
+        sod.DepartmentID,
+        sod.AccountId,
+        da.GLRollup,
+        sod.AccountType,
+        sod.Amount,
+        sod.GoalAmount,
+        sod.DistributedAmount
+    FROM cci.FactStrategicGLDetail sod
+    JOIN fw.DimAccount da ON da.AccountId = sod.AccountId
+    WHERE sod.OpportunityId = @OpportunityId AND (@IsBaseline IS NULL OR sod.IsBaseline = @IsBaseline)
+    -- {queryWhere}
+)
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityDetailQueryBuilder.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityDetailQueryBuilder.cs
new file mode 100644
index 0000000..44afb90
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityDetailQueryBuilder.cs
@@ -0,0 +1,375 @@
+using Microsoft.IdentityModel.Tokens;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.DataSchema.Models.Query;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries
+{
+    internal class StrategicOpportunityDetailQueryBuilder : IStrategicOpportunityDetailQueryBuilder
+    {
+        private const string StrategicOpportunityMeasureTableName = "cci.StrategicOpportunityMeasureDetail";
+        private const string KEY_SEPARATOR = "|";
+
+        public string BuildInsertQuery(StrategicOpportunityChargeCode opportunity, string selectQuery, bool isUsingAprdrg)
+            => InjectInsert(selectQuery, isUsingAprdrg, opportunity.OpportunityId);
+
+        public string BuildDeleteQuery(long? opportunityId = null)
+        {
+            return $"DELETE FROM {StrategicOpportunityService.StrategicOpportunityDetailTableName} where OpportunityId = {(opportunityId.HasValue ? opportunityId.Value : ":opportunityId;")}";
+        }
+
+        public string BuildMergeQuery(long opportunityId, string selectQuery, bool isUsingAprdrg)
+        {
+            if (!selectQuery.StartsWith("SELECT", StringComparison.OrdinalIgnoreCase))
+            {
+                throw new InvalidOperationException("Unexpected SQL syntax. SELECT should be first word.");
+            }
+
+            selectQuery = InjectChargeCodeJoin(opportunityId, selectQuery);
+
+            var sql = $@"
+MERGE INTO {StrategicOpportunityService.StrategicOpportunityDetailTableName} t
+USING (
+{GetSubQuery(selectQuery, isUsingAprdrg)}
+) s 
+ON t.OpportunityId = s.""OpportunityId""
+    AND t.IsBaseline = s.""IsBaseline""
+    AND t.DischargeFiscalYearId = s.""DischargeFiscalYearId""
+    AND t.DischargeFiscalMonthId = s.""DischargeFiscalMonthId""
+    AND t.EntityId = s.""EntityID""
+    AND t.PrimaryPhysicianId = s.""PrimaryPhysicianId""
+    AND t.PrimaryServiceLineId = s.""PrimaryServiceLineId""
+    AND t.DepartmentId = s.""DepartmentId""
+    AND t.PhysicianSpecialtyId = s.""PhysicianSpecialtyId""
+    AND t.ChargeCodeId = s.""ChargeCodeID""
+    AND t.CostDriver = s.""CostDriver""
+    AND t.CaseTypeFamilyId = s.""CaseTypeFamilyId""
+WHEN MATCHED THEN
+    UPDATE SET
+        t.Units = s.""Units"",
+        t.Cost = s.""Cost""
+WHEN NOT MATCHED THEN
+    INSERT (
+    OpportunityId,
+    IsBaseline,
+    DischargeFiscalYearId,
+    DischargeFiscalMonthId,
+    EntityId,
+    PrimaryPhysicianId,
+    PrimaryServiceLineId,
+    DepartmentId,
+    PhysicianSpecialtyId,
+    ChargeCodeId,
+    CostDriver,
+    CaseTypeFamilyId,
+    Units,
+    Cost,
+    GoalUnits,
+    GoalCost
+    )
+VALUES (
+s.""OpportunityId"",
+    s.""IsBaseline"",    
+    s.""DischargeFiscalYearId"",
+    s.""DischargeFiscalMonthId"",
+    s.""EntityID"",
+    s.""PrimaryPhysicianId"",
+    s.""PrimaryServiceLineId"",
+    s.""DepartmentId"",
+    s.""PhysicianSpecialtyId"",
+    s.""ChargeCodeID"",
+    s.""CostDriver"",
+    s.""CaseTypeFamilyId"",
+    s.""Units"",
+    s.""Cost"",
+    s.""GoalUnits"",
+    s.""GoalCost""
+    )";
+            return sql;
+        }
+        public string BuildGetDistinctEncounterCountQuery(long opportunityId, string selectQuery, bool isUsingAprdrg, StrategicOpportunityGetDetailData getData)
+        {
+            if (!selectQuery.StartsWith("SELECT", StringComparison.OrdinalIgnoreCase))
+            {
+                throw new InvalidOperationException("Unexpected SQL syntax. SELECT should be first word.");
+            }
+            selectQuery = InjectChargeCodeJoin(opportunityId, selectQuery, null, null, "CC", "StrategicChargeCodeIds_CTE");
+
+            var dimensions = getData.Dimensions.Select(x => StrategicOpportunityDetailDimension.GetFromString(x)).ToList();
+            var dimensionColumnNames = new List<string>();
+            foreach (var dimension in dimensions)
+            {
+                if (StrategicOpportunityService.DimensionsConfig.TryGetValue(dimension, out var dimensionConfig))
+                {
+                    dimensionColumnNames.Add($"\"{dimensionConfig.AliasColumnName}\"");
+                }
+            }
+
+            var sqlDimensionColumnNames = string.Join(", ", dimensionColumnNames);
+
+            var sql = $@"
+                SELECT
+                    ARRAY_TO_STRING(ARRAY_CONSTRUCT_COMPACT({sqlDimensionColumnNames}), '{KEY_SEPARATOR}') AS key,
+                    COUNT(DISTINCT ""dsspesEncounterId"") AS value
+                FROM ({GetSubQueryForDistinctEncounter(selectQuery, isUsingAprdrg)}) AS t
+                GROUP BY ROLLUP ({sqlDimensionColumnNames})";
+            return sql;
+        }
+
+        public string BuildMergeSystemMeasureMergeQuery(long opportunityId, long measureId, MeasureType measureType, string startDate, int trackingMonths)
+        {
+            var selectQuery = $@"
+SELECT 
+    {measureId} AS ""MeasureId"",
+    ZEROIFNULL(SUM(""Value"")) AS ""Value"",
+    m.MonthId AS ""MonthId"",
+    m.YearId AS ""YearId""
+FROM (
+SELECT {(measureType == MeasureType.CommittedCost ? "GoalCost" : "Cost")} AS ""Value"",
+       DischargeFiscalMonthId AS ""MonthId"",
+       DischargeFiscalYearId AS ""YearId""
+    FROM cci.FactStrategicChargeCodeDetail 
+    WHERE Isbaseline = FALSE AND Opportunityid = {opportunityId}) AS ccd
+RIGHT JOIN (SELECT
+        MONTH(monthDate) AS MonthId,
+        YEAR(monthDate) AS YearId
+    FROM (
+        SELECT
+            DATEADD('month', seq4(), '{startDate}') AS monthDate
+        FROM TABLE(GENERATOR(ROWCOUNT => {trackingMonths}))
+    )) M on m.MonthId = ccd.""MonthId"" and m.YearId = ccd.""YearId""
+    GROUP BY m.MonthId, m.YearId
+";
+
+            return WrapIntoMeasureMergeQuery(selectQuery);
+        }
+
+        public string GetSelectMeasureSql(long opportunityId, MeasureType measureType, string selectQuery, Dictionary<string, FilterCondition> marginFilters)
+        {
+            string joinSql = null;
+            var anchorSql = "RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid";
+            if (MeasureTypeConstants.IsEncounterLevelMeasure(measureType))
+            {
+                var filtersClause = marginFilters.Select(f => $"det.{f.Key} {(f.Value.Operator == FilterOperator.In ? "IN" : "NOT IN")} ({string.Join(", ", f.Value.Values)})");
+                joinSql = @$"INNER JOIN (
+    SELECT DISTINCT encounterId FROM dss.FactPatientBillingLineItemDetail det 
+    JOIN StrategicChargeCodeIds_CTE ccf ON det.ChargeCodeId = ccf.ChargeCodeId
+{(filtersClause.Any() ? $"WHERE {string.Join(" AND ", filtersClause)} " : string.Empty)}) ENID ON DSSPES.EncounterId = ENID.EncounterId";
+            }
+            if (measureType == MeasureType.EncountersCases)
+            {
+                anchorSql = "FROM clientdss.FactPatientEncounterSummary AS DSSPES";
+            }
+            selectQuery = InjectChargeCodeJoin(opportunityId, selectQuery, joinSql, anchorSql, "PBLID", "StrategicChargeCodeIds_CTE");
+
+            return $@"
+SELECT 
+    :measureId AS ""MeasureId"",
+    m.YearId AS ""YearId"",
+    m.MonthId AS ""MonthId"", 
+    COALESCE({BuildMeasureCalculation(measureType)}, 0) AS ""Value""
+FROM ( 
+    {selectQuery}
+)
+        RIGHT JOIN (SELECT
+        MONTH(monthDate) AS MonthId,
+        YEAR(monthDate) AS YearId
+    FROM (
+        SELECT
+            DATEADD('month', seq4(), :startDate) AS monthDate
+        FROM TABLE(GENERATOR(ROWCOUNT => :monthsNumber))
+    )) M on m.MonthId = MONTH(TO_DATE(""DischargeDateTime"")) and m.YearId = YEAR(TO_DATE(""DischargeDateTime""))
+GROUP BY 
+    m.MonthId,
+    m.YearId";
+        }
+
+        public string WrapIntoMeasureMergeQuery(string selectQuery)
+        {
+            return $@"
+                MERGE INTO {StrategicOpportunityMeasureTableName} t
+                USING ({selectQuery}) s 
+                ON t.MeasureId = s.""MeasureId""
+                    AND t.YearId = s.""YearId""
+                    AND t.MonthId = s.""MonthId""
+                WHEN MATCHED THEN
+                    UPDATE SET
+                        t.Value = s.""Value""
+                WHEN NOT MATCHED THEN
+                    INSERT (MeasureId, YearId, MonthId, Value)
+                    VALUES (s.""MeasureId"", s.""YearId"", s.""MonthId"", s.""Value"")
+            ";
+        }
+
+        public string WrapIntoMeasureAverageQuery(string selectQuery)
+        {
+            return $@"SELECT AVG(""Value"") FROM ( {selectQuery} )";
+        }
+
+        public string GetDeleteAllMeasuresSql(IEnumerable<long> measureIds)
+        {
+            return measureIds != null && measureIds.Any() ? $@"
+                DELETE FROM {StrategicOpportunityMeasureTableName} AS td               
+                WHERE td.MeasureId IN ({string.Join(", ", measureIds)})
+            " : string.Empty;
+        }
+
+        private static string BuildMeasureCalculation(MeasureType measureType)
+        {
+            return measureType switch
+            {
+                MeasureType.UnitsOfService or MeasureType.DirectVariableCost or MeasureType.TotalDirectCost
+                    or MeasureType.TotalCharges or MeasureType.AcquisitionSupplyCost or MeasureType.Days => @"SUM(""Value"")",
+                MeasureType.UnitsOfServicePerCase or MeasureType.DirectVariableCostPerCase or MeasureType.TotalDirectCostPerCase
+                    or MeasureType.TotalChargesPerCase or MeasureType.AcquisitionSupplyCostPerCase
+                    or MeasureType.AverageLengthOfStay => @"SUM(""Value"") / COUNT(DISTINCT ""dsspesEncounterId"")",
+                MeasureType.DirectVariableCostPerUnit or MeasureType.TotalDirectCostPerUnit
+                    or MeasureType.TotalChargesPerUnit or MeasureType.AcquisitionSupplyCostPerUnit => @"SUM(""Value"") / SUM(""UnitsOfService"")",
+                MeasureType.EncountersCases => @"COUNT(DISTINCT ""dsspesEncounterId"")",
+                MeasureType.TotalMargin or MeasureType.ContributionMargin
+                    or MeasureType.DirectMargin or MeasureType.VariableMargin => @"SUM(""dsspesNetRevenue"" - ""Value"")",
+                MeasureType.MarginPerCase or MeasureType.ContributionMarginPerCase or MeasureType.DirectMarginPerCase
+                    or MeasureType.VariableMarginPerCase => @"SUM(""dsspesNetRevenue"" - ""Value"") / COUNT(DISTINCT ""dsspesEncounterId"")",
+                _ => null
+            };
+        }
+
+        private static string InjectInsert(string selectQuery, bool isUsingAprdrg, long opportunityId)
+        {
+            // replace 'SELECT' with 'SELECT :opportunityId'
+            if (!selectQuery.StartsWith("SELECT", StringComparison.OrdinalIgnoreCase))
+            {
+                throw new InvalidOperationException("Unexpected SQL syntax. SELECT should be first word.");
+            }
+
+            selectQuery = InjectChargeCodeJoin(opportunityId, selectQuery);
+
+            var sql = $@"
+INSERT INTO {StrategicOpportunityService.StrategicOpportunityDetailTableName} (
+    OpportunityId,
+    IsBaseline,
+    DischargeFiscalYearId,
+    DischargeFiscalMonthId,
+    EntityId,
+    PrimaryPhysicianId,
+    PrimaryServiceLineId,
+    DepartmentId,
+    PhysicianSpecialtyId,
+    ChargeCodeId,
+    CostDriver,
+    CaseTypeFamilyId,
+    Units,
+    Cost,
+    GoalUnits,
+    GoalCost
+)
+{GetSubQuery(selectQuery, isUsingAprdrg)}";
+            return sql;
+        }
+
+        private static string GetSubQueryForDistinctEncounter(string selectQuery, bool isUsingAprdrg) => $@"SELECT
+                ""dsspesEncounterId"",
+                ""dsspesDischargeDateTime"",
+                ""dsspesEntityID"",
+                ""dsspesPhysicianId"",
+                ""dsspesPrimaryServiceLineId"",
+                ""pblidDepartmentId"",
+                ""physPrimaryPhysicianSpecialtyId"",
+                ""ccChargeCodeID"",
+                ""ccCostDriver"",
+                {GetCaseTypeFamilyIdField(isUsingAprdrg)}
+            FROM ({selectQuery})
+            ";
+
+        private static string GetSubQuery(string selectQuery, bool isUsingAprdrg)
+        {
+            return $@"SELECT
+    :opportunityId AS ""OpportunityId"",
+    :isBaseline AS ""IsBaseline"",    
+    ""DischargeFiscalYearId"",
+    ""DischargeFiscalMonthId"",
+    ""EntityID"",
+    ""PrimaryPhysicianId"",
+    ""PrimaryServiceLineId"",
+    ""DepartmentId"",
+    ""PhysicianSpecialtyId"",
+    ""ChargeCodeID"",
+    ""CostDriver"",
+    ""CaseTypeFamilyId"",
+    SUM(""Units"") AS ""Units"",
+    SUM(""Cost"") AS ""Cost"",
+    0 AS ""GoalUnits"",
+    0 AS ""GoalCost""
+FROM (
+SELECT
+    YEAR(TO_DATE(""dsspesDischargeDateTime"")) AS ""DischargeFiscalYearId"",
+    MONTH(TO_DATE(""dsspesDischargeDateTime"")) AS ""DischargeFiscalMonthId"",
+    ""dsspesEntityID"" AS ""EntityID"",
+    ""dsspesPhysicianId"" AS ""PrimaryPhysicianId"",
+    ""dsspesPrimaryServiceLineId"" AS ""PrimaryServiceLineId"",
+    ""pblidDepartmentId"" AS ""DepartmentId"",
+    ""physPrimaryPhysicianSpecialtyId"" AS ""PhysicianSpecialtyId"",
+    ""ccChargeCodeID"" AS ""ChargeCodeID"",
+    ""ccCostDriver"" AS ""CostDriver"",
+    {GetCaseTypeFamilyIdField(isUsingAprdrg)},
+    ""Units"",
+    ""Cost""
+FROM ({selectQuery})
+)
+GROUP BY
+    ""DischargeFiscalYearId"",
+    ""DischargeFiscalMonthId"",
+    ""EntityID"",
+    ""PrimaryPhysicianId"",
+    ""PrimaryServiceLineId"",
+    ""DepartmentId"",
+    ""PhysicianSpecialtyId"",
+    ""ChargeCodeID"",
+    ""CostDriver"",
+    ""CaseTypeFamilyId""";
+        }
+
+        private static string InjectChargeCodeJoin(long opportunityId, string selectQuery, string joinSql = null, string anchorSql = null, string chargeCodeAlias = "CC", string chargeCodeIdsTable = null)
+        {
+            if (string.IsNullOrEmpty(chargeCodeIdsTable)) chargeCodeIdsTable = $"cci.StrategicChargeCodeIds_{opportunityId}";
+
+            var anchor = anchorSql.IsNullOrEmpty() ? "INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid" : anchorSql;
+            var injectJoin = joinSql.IsNullOrEmpty() ? $"INNER JOIN {chargeCodeIdsTable} CCID ON {chargeCodeAlias}.chargecodeid = CCID.chargecodeid" : joinSql;
+            var insertPositions = new List<int>();
+            int searchStart = 0;
+            while (true)
+            {
+                int index = selectQuery.IndexOf(anchor, searchStart, StringComparison.OrdinalIgnoreCase);
+                if (index == -1)
+                {
+                    break;
+                }
+                var endPosition = index + anchor.Length;
+                insertPositions.Add(endPosition);
+                searchStart = endPosition;
+            }
+
+            if (insertPositions.Count == 0) return selectQuery;
+            var sb = new StringBuilder(selectQuery);
+
+            for (int i = insertPositions.Count - 1; i >= 0; i--)
+            {
+                sb.Insert(insertPositions[i], Environment.NewLine + injectJoin);
+            }
+            return sb.ToString();
+        }
+
+
+        private static string GetCaseTypeFamilyIdField(bool isUsingAprdrg)
+        {
+            var drgColumn = isUsingAprdrg ? "\"dsspesAPRDRGCaseTypeFamilyId\"" : "\"dsspesMSDRGCaseTypeFamilyId\"";
+            return $@"
+    (CASE WHEN ""ptRollupName"" = 'Outpatient' THEN ""dsspesCPTCodeCaseTypeFamilyId"" ELSE {drgColumn}
+    END) AS ""CaseTypeFamilyId""";
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityGLDetailQueryBuilder.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityGLDetailQueryBuilder.cs
new file mode 100644
index 0000000..12d173f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityGLDetailQueryBuilder.cs
@@ -0,0 +1,214 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries
+{
+    internal class StrategicOpportunityGLDetailQueryBuilder
+    {
+        private const int InClauseThreshold = 5000;
+        private const string FwGLTable = "fw.factglsampled";
+
+        public string BuildDeleteQuery(long? opportunityId = null)
+        {
+            return $"DELETE FROM {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} WHERE OpportunityId = {(opportunityId.HasValue ? opportunityId.Value : ":opportunityId")}";
+        }
+
+        public string BuildInsertQuery(long opportunityId, string sourceTable, IEnumerable<int> departmentIds, IEnumerable<int> revenueAccountIds, IEnumerable<int> expenseAccountIds, IEnumerable<int> statisticAccountIds, DateOnly baselineStart, DateOnly baselineEnd)
+        {
+            var deptIds = departmentIds.ToList();
+            var allAcctIds = revenueAccountIds.Concat(expenseAccountIds).Concat(statisticAccountIds).Distinct().ToList();
+            var valueColumn = GetValueColumn(sourceTable);
+            var accountTypeMap = BuildAccountTypeMapSubquery(revenueAccountIds, expenseAccountIds, statisticAccountIds);
+            var sb = new StringBuilder();
+
+            BuildTempTables(sb, deptIds, allAcctIds);
+
+            sb.AppendLine($@"
+INSERT INTO {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} (
+    OpportunityId,
+    IsBaseline,
+    FiscalYearId,
+    FiscalMonthId,
+    EntityId,
+    DepartmentId,
+    AccountId,
+    AccountType,
+    Amount,
+    GoalAmount,
+    DistributedAmount
+)
+SELECT
+    {opportunityId} AS OpportunityId,
+    TRUE AS IsBaseline,
+    gl.FiscalYearId,
+    gl.FiscalMonthId,
+    dd.EntityId,
+    gl.DepartmentId,
+    gl.AccountId,
+    at.AccountType,
+    SUM(gl.{valueColumn}) AS Amount,
+    0 AS GoalAmount,
+    0 AS DistributedAmount
+FROM {sourceTable} gl
+JOIN fw.DimDepartment dd ON dd.DepartmentId = gl.DepartmentId
+JOIN {accountTypeMap} at ON at.AccountId = gl.AccountId");
+
+            AppendJoinsAndWhere(sb, deptIds, allAcctIds, baselineStart, baselineEnd);
+
+            sb.AppendLine(@"GROUP BY
+    gl.FiscalYearId,
+    gl.FiscalMonthId,
+    dd.EntityId,
+    gl.DepartmentId,
+    gl.AccountId,
+    at.AccountType;");
+
+            return sb.ToString();
+        }
+
+        public string BuildMergeQuery(long opportunityId, string sourceTable, IEnumerable<int> departmentIds, IEnumerable<int> revenueAccountIds, IEnumerable<int> expenseAccountIds, IEnumerable<int> statisticAccountIds, DateOnly trackingStart, DateOnly trackingEnd)
+        {
+            var deptIds = departmentIds.ToList();
+            var allAcctIds = revenueAccountIds.Concat(expenseAccountIds).Concat(statisticAccountIds).Distinct().ToList();
+            var valueColumn = GetValueColumn(sourceTable);
+            var accountTypeMap = BuildAccountTypeMapSubquery(revenueAccountIds, expenseAccountIds, statisticAccountIds);
+            var sb = new StringBuilder();
+
+            BuildTempTables(sb, deptIds, allAcctIds);
+
+            sb.AppendLine($@"
+MERGE INTO {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} t
+USING (
+    SELECT
+        {opportunityId} AS OpportunityId,
+        FALSE AS IsBaseline,
+        gl.FiscalYearId,
+        gl.FiscalMonthId,
+        dd.EntityId,
+        gl.DepartmentId,
+        gl.AccountId,
+        at.AccountType,
+        SUM(gl.{valueColumn}) AS Amount
+    FROM {sourceTable} gl
+    JOIN fw.DimDepartment dd ON dd.DepartmentId = gl.DepartmentId
+    JOIN {accountTypeMap} at ON at.AccountId = gl.AccountId");
+
+            AppendJoinsAndWhere(sb, deptIds, allAcctIds, trackingStart, trackingEnd, "    ");
+
+            sb.AppendLine(@"    GROUP BY
+        gl.FiscalYearId,
+        gl.FiscalMonthId,
+        dd.EntityId,
+        gl.DepartmentId,
+        gl.AccountId,
+        at.AccountType
+) s
+ON t.OpportunityId = s.OpportunityId
+    AND t.IsBaseline = s.IsBaseline
+    AND t.FiscalYearId = s.FiscalYearId
+    AND t.FiscalMonthId = s.FiscalMonthId
+    AND t.EntityId = s.EntityId
+    AND t.DepartmentId = s.DepartmentId
+    AND t.AccountId = s.AccountId
+    AND t.AccountType = s.AccountType
+WHEN MATCHED THEN
+    UPDATE SET
+        t.Amount = s.Amount
+WHEN NOT MATCHED THEN
+    INSERT (
+        OpportunityId, IsBaseline, FiscalYearId, FiscalMonthId,
+        EntityId, DepartmentId, AccountId, AccountType, Amount, GoalAmount, DistributedAmount
+    )
+    VALUES (
+        s.OpportunityId, s.IsBaseline, s.FiscalYearId, s.FiscalMonthId,
+        s.EntityId, s.DepartmentId, s.AccountId, s.AccountType, s.Amount, 0, 0
+    );");
+
+            return sb.ToString();
+        }
+
+        private static string BuildAccountTypeMapSubquery(IEnumerable<int> revenueIds, IEnumerable<int> expenseIds, IEnumerable<int> statisticIds)
+        {
+            var rows = revenueIds.Select(id => $"({id}, 0)")
+                .Concat(expenseIds.Select(id => $"({id}, 1)"))
+                .Concat(statisticIds.Select(id => $"({id}, 2)"))
+                .ToList();
+
+            if (!rows.Any())
+                return "(SELECT AccountId, AccountType FROM (VALUES (0, 0)) AS t(AccountId, AccountType) WHERE 1=0)";
+
+            return $"(SELECT AccountId, AccountType FROM (VALUES {string.Join(", ", rows)}) AS t(AccountId, AccountType))";
+        }
+
+        private static string GetValueColumn(string sourceTable)
+        {
+            return sourceTable.Equals(FwGLTable, StringComparison.OrdinalIgnoreCase) ? "Dollars" : "Value";
+        }
+
+        private static void BuildTempTables(StringBuilder sb, List<int> deptIds, List<int> acctIds)
+        {
+            if (deptIds.Count > InClauseThreshold)
+            {
+                sb.AppendLine("CREATE TEMPORARY TABLE tmp_gl_dept_ids (Id INT);");
+                foreach (var batch in BatchIds(deptIds))
+                {
+                    sb.AppendLine($"INSERT INTO tmp_gl_dept_ids VALUES {string.Join(",", batch.Select(id => $"({id})"))};");
+                }
+            }
+
+            if (acctIds.Count > InClauseThreshold)
+            {
+                sb.AppendLine("CREATE TEMPORARY TABLE tmp_gl_acct_ids (Id INT);");
+                foreach (var batch in BatchIds(acctIds))
+                {
+                    sb.AppendLine($"INSERT INTO tmp_gl_acct_ids VALUES {string.Join(",", batch.Select(id => $"({id})"))};");
+                }
+            }
+        }
+
+        private static void AppendJoinsAndWhere(StringBuilder sb, List<int> deptIds, List<int> acctIds, DateOnly periodStart, DateOnly periodEnd, string indent = "")
+        {
+            if (deptIds.Count > InClauseThreshold)
+                sb.AppendLine($"{indent}JOIN tmp_gl_dept_ids td ON gl.DepartmentId = td.Id");
+            if (acctIds.Count > InClauseThreshold)
+                sb.AppendLine($"{indent}JOIN tmp_gl_acct_ids ta ON gl.AccountId = ta.Id");
+
+            var conditions = new List<string>();
+
+            if (deptIds.Count <= InClauseThreshold)
+                conditions.Add($"gl.DepartmentId IN ({string.Join(",", deptIds)})");
+            if (acctIds.Count <= InClauseThreshold)
+                conditions.Add($"gl.AccountId IN ({string.Join(",", acctIds)})");
+
+            conditions.Add("gl.IsDeleted = FALSE");
+            //TimeClassId 1 = Actual
+            conditions.Add("gl.TimeClassId = 1");
+
+            if (periodStart.Year == periodEnd.Year)
+            {
+                conditions.Add($"gl.FiscalYearId = {periodStart.Year}");
+                conditions.Add($"gl.FiscalMonthId BETWEEN {periodStart.Month} AND {periodEnd.Month}");
+            }
+            else
+            {
+                conditions.Add($"gl.FiscalYearId BETWEEN {periodStart.Year} AND {periodEnd.Year}");
+                conditions.Add($@"NOT (
+{indent}        (gl.FiscalYearId = {periodStart.Year} AND gl.FiscalMonthId < {periodStart.Month})
+{indent}        OR (gl.FiscalYearId = {periodEnd.Year} AND gl.FiscalMonthId > {periodEnd.Month})
+{indent}    )");
+            }
+
+            sb.AppendLine($"{indent}WHERE {string.Join($"\n{indent}    AND ", conditions)}");
+        }
+
+        private static IEnumerable<List<int>> BatchIds(List<int> ids, int batchSize = 1000)
+        {
+            for (var i = 0; i < ids.Count; i += batchSize)
+            {
+                yield return ids.GetRange(i, Math.Min(batchSize, ids.Count - i));
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityGLServiceQuery.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityGLServiceQuery.cs
new file mode 100644
index 0000000..905b1c0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityGLServiceQuery.cs
@@ -0,0 +1,37 @@
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries
+{
+    internal class StrategicOpportunityGLServiceQuery
+    {
+        public static Dictionary<string, string> GetDetailQuery(IEnumerable<StrategicOpportunityDetailDimension> dimensions, bool onlyDimensions, string queryWhere = null)
+        {
+            var dicSql = new Dictionary<string, string>();
+            var assembly = Assembly.GetExecutingAssembly();
+            var queryDetailList = ApplyQueryWhere(queryWhere, assembly.ReadResource("StrategicOpportunityGLDetailCTE.sql"));
+            var sql = string.Empty;
+            foreach (var dimension in dimensions)
+            {
+                if (StrategicOpportunityService.GLDimensionsConfig.TryGetValue(dimension, out var dimensionConfig))
+                {
+                    sql = ApplyQueryListOfEncounters(queryDetailList, assembly.ReadResource(dimensionConfig.SqlFile));
+                    dicSql.Add(dimension.ToString(), sql);
+                }
+            }
+
+            if (!onlyDimensions)
+            {
+                sql = ApplyQueryListOfEncounters(queryDetailList, assembly.ReadResource("SelectStrategicOpportunityGLDetail.sql"));
+                dicSql.Add("detail", sql);
+            }
+
+            return dicSql;
+        }
+
+        private static string ApplyQueryListOfEncounters(string queryDetailList, string sql) => sql.Replace("-- {queryDetailList}", queryDetailList);
+        private static string ApplyQueryWhere(string queryWhere, string sql) => sql.Replace("-- {queryWhere}", string.IsNullOrEmpty(queryWhere) ? string.Empty : queryWhere);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityGLUpdateQueryBuilder.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityGLUpdateQueryBuilder.cs
new file mode 100644
index 0000000..a990e99
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityGLUpdateQueryBuilder.cs
@@ -0,0 +1,195 @@
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries
+{
+    public class StrategicOpportunityGLUpdateQueryBuilder
+    {
+        private const string DETAIL_TABLE_NAME = "cci.FactStrategicGLDetail";
+        private const string KEY_SEPARATOR = "|";
+
+        public (string Query, Dictionary<string, object> Parameters) BuildUpdateQuery(IEnumerable<StrategicOpportunityGLAdjustment> adjustments, long opportunityId, IEnumerable<string> rows)
+        {
+            var adjustmentList = adjustments.ToList();
+            var parameters = new Dictionary<string, object>
+            {
+                { "OpportunityId", opportunityId },
+                { "IsBaseline", false }
+            };
+
+            var finalQuery = string.Empty;
+            for (var index = 0; index < adjustmentList.Count; index++)
+            {
+                var adjustment = adjustmentList[index];
+                var (selectClause, selectParams) = GetSelectClause(opportunityId, adjustment, rows, index);
+                var joinClause = GetJoinClause(finalQuery);
+                var (whereClause, whereParams) = index == 0 ?
+                    GetWhereClauseWithParameters(opportunityId, adjustment.NodeKey, rows, index) :
+                    (string.Empty, new Dictionary<string, object>());
+
+                finalQuery = $@"
+                    {selectClause}
+                    {joinClause}
+                    {whereClause}
+                ";
+
+                foreach (var param in selectParams.Concat(whereParams).Where(p => !parameters.ContainsKey(p.Key)))
+                {
+                    parameters[param.Key] = param.Value;
+                }
+            }
+
+            var updateQuery = $@"
+                UPDATE {DETAIL_TABLE_NAME} detail
+                SET
+                    GoalAmount = COALESCE(tem.GoalAmount, detail.GoalAmount)
+                FROM (
+                    {finalQuery}
+                ) tem
+                where tem.RowId = detail.RowId
+            ";
+
+            return (updateQuery, parameters);
+        }
+
+        private (string SelectClause, Dictionary<string, object> Parameters) GetSelectClause(long opportunityId, StrategicOpportunityGLAdjustment adjustment, IEnumerable<string> rows, int index)
+        {
+            var parameters = new Dictionary<string, object>();
+            var isFirstAdj = index == 0;
+            var (goalAmountSelect, amountParams) = GetGoalSelect(adjustment.GoalAmountValue, index, isFirstAdj);
+
+            foreach (var param in amountParams)
+            {
+                parameters[param.Key] = param.Value;
+            }
+
+            var (whereClause, whereParams) = GetWhereClauseWithParameters(opportunityId, adjustment.NodeKey, rows, index, adjustment.AccountType);
+            foreach (var param in whereParams)
+            {
+                parameters[param.Key] = param.Value;
+            }
+
+            var selectClause = $@"
+                SELECT
+                    {(isFirstAdj ? "t1.RowId AS RowId" : "COALESCE(t1.RowId, t2.RowId) AS RowId")},
+                    {goalAmountSelect}
+                FROM {(isFirstAdj ? DETAIL_TABLE_NAME : $"( SELECT RowId, GoalAmount FROM {DETAIL_TABLE_NAME} \n{whereClause} )")} AS t1
+            ";
+
+            return (selectClause, parameters);
+        }
+
+        private static (string GoalSelect, Dictionary<string, object> Parameters) GetGoalSelect(decimal? value, int index, bool isFirstAdj)
+        {
+            var parameters = new Dictionary<string, object>();
+            string goalSelect;
+
+            if (value != null)
+            {
+                var paramName = $"AmountValue{index}";
+                parameters[paramName] = value.Value;
+
+                goalSelect = isFirstAdj ?
+                    $@"
+                        SUM(t1.GoalAmount) OVER () AS ""SumAmount{index}"",
+                        CASE WHEN ""SumAmount{index}"" != 0 THEN (t1.GoalAmount / ""SumAmount{index}"") * :{paramName} ELSE :{paramName} / COUNT(*) OVER() END AS GoalAmount
+                    " :
+                    $@"
+                        (CASE
+                            WHEN t1.GoalAmount IS NOT NULL AND t2.GoalAmount IS NOT NULL THEN t2.GoalAmount
+                            WHEN t1.GoalAmount IS NOT NULL THEN t1.GoalAmount
+                            ELSE NULL
+                        END) AS _goalAmount{index},
+                        SUM(CASE WHEN _goalAmount{index} IS NOT NULL AND t1.RowId IS NOT NULL THEN _goalAmount{index} ELSE 0 END) OVER () AS ""SumAmount{index}"",
+                        (CASE
+                            WHEN ""SumAmount{index}"" = 0 AND t1.RowId IS NOT NULL THEN :{paramName} / COUNT(*) OVER()
+                            WHEN _goalAmount{index} IS NOT NULL THEN (_goalAmount{index} / ""SumAmount{index}"") * :{paramName}
+                            ELSE t2.GoalAmount
+                        END) AS GoalAmount
+                    ";
+            }
+            else
+            {
+                goalSelect = isFirstAdj ? "GoalAmount" : "t2.GoalAmount AS GoalAmount";
+            }
+
+            return (goalSelect, parameters);
+        }
+
+        private string GetJoinClause(string joinCondition)
+        {
+            return !string.IsNullOrEmpty(joinCondition) ? $@"FULL OUTER JOIN ({joinCondition}) AS t2 ON t1.RowId = t2.RowId" : string.Empty;
+        }
+
+        private (string WhereClause, Dictionary<string, object> Parameters) GetWhereClauseWithParameters(long opportunityId, string nodeKey, IEnumerable<string> rows, int adjustmentIndex, byte? accountType = null)
+        {
+            if (opportunityId <= 0)
+                throw new ArgumentException("Invalid opportunity ID", nameof(opportunityId));
+
+            if (string.IsNullOrWhiteSpace(nodeKey))
+                throw new ArgumentException("Node key cannot be null or empty", nameof(nodeKey));
+
+            var parameters = new Dictionary<string, object>
+            {
+                { "OpportunityId", opportunityId },
+                { "IsBaseline", false }
+            };
+
+            if (nodeKey != "root")
+            {
+                var hierarchyIds = nodeKey.Split(KEY_SEPARATOR);
+                var filters = new List<string> { "OpportunityId = :OpportunityId", "IsBaseline = :IsBaseline" };
+
+                for (var paramIndex = 0; paramIndex < hierarchyIds.Length; paramIndex++)
+                {
+                    var id = hierarchyIds[paramIndex];
+
+                    if (string.IsNullOrWhiteSpace(id))
+                        throw new ArgumentException("Hierarchy ID cannot be null or empty");
+
+                    var rowIndex = rows.Contains(StrategicOpportunityDetailDimension.System.Value) ? paramIndex + 1 : paramIndex;
+                    var row = rows.ElementAt(rowIndex);
+                    var dimension = StrategicOpportunityDetailDimension.GetFromString(row);
+
+                    if (dimension == null)
+                        throw new ArgumentException($"Invalid dimension row: {row}");
+
+                    if (!StrategicOpportunityService.GLDimensionsConfig.TryGetValue(dimension, out var dimensionConfig))
+                        throw new ArgumentException($"Dimension configuration not found for: {dimension}");
+
+                    var columnName = dimensionConfig.ColumnName;
+
+                    if (string.IsNullOrWhiteSpace(columnName))
+                        throw new ArgumentException($"Invalid column name for dimension: {dimension}");
+
+                    var paramName = $"HierarchyId_{adjustmentIndex}_{paramIndex}";
+                    if (dimension == StrategicOpportunityDetailDimension.GLRollup)
+                        filters.Add($"AccountId IN (SELECT AccountId FROM fw.DimAccount WHERE GLRollup = :{paramName})");
+                    else
+                        filters.Add($"{columnName} = :{paramName}");
+                    parameters[paramName] = id;
+                }
+
+                if (accountType.HasValue)
+                {
+                    var accountTypeParamName = $"AccountType_{adjustmentIndex}";
+                    filters.Add($"AccountType = :{accountTypeParamName}");
+                    parameters[accountTypeParamName] = accountType.Value;
+                }
+
+                return ($"WHERE {string.Join(" AND ", filters)}", parameters);
+            }
+
+            var rootFilters = new List<string> { "OpportunityId = :OpportunityId", "IsBaseline = :IsBaseline" };
+            if (accountType.HasValue)
+            {
+                var accountTypeParamName = $"AccountType_{adjustmentIndex}";
+                rootFilters.Add($"AccountType = :{accountTypeParamName}");
+                parameters[accountTypeParamName] = accountType.Value;
+            }
+            return ($"WHERE {string.Join(" AND ", rootFilters)}", parameters);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityUpdateQueryBuilder.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityUpdateQueryBuilder.cs
new file mode 100644
index 0000000..a2a4d41
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/Queries/StrategicOpportunityUpdateQueryBuilder.cs
@@ -0,0 +1,193 @@
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries
+{
+    public class StrategicOpportunityUpdateQueryBuilder
+    {
+        private const string DETAIL_TABLE_NAME = "cci.FactStrategicChargeCodeDetail";
+        private const string KEY_SEPARATOR = "|";
+
+        private int adjustmentIndex = 0;
+
+        public (string Query, Dictionary<string, object> Parameters) BuildUpdateQuery(List<StrategicOpportunityChargeCodeAdjustment> adjustments, long opportunityId, IEnumerable<string> rows)
+        {
+            var parameters = new Dictionary<string, object>
+            {
+                { "OpportunityId", opportunityId },
+                { "IsBaseline", false }
+            };
+
+            var finalQuery = string.Empty;
+            for (var index = 0; index < adjustments.Count; index++)
+            {
+                adjustmentIndex = index; // Update the class-level index
+                var adjustment = adjustments[index];
+                var (selectClause, selectParams) = GetSelectClause(opportunityId, adjustment, rows, index);
+                var joinClause = GetJoinClause(finalQuery);
+                var (whereClause, whereParams) = index == 0 ?
+                    GetWhereClauseWithParameters(opportunityId, adjustment.NodeKey, rows) :
+                    (string.Empty, new Dictionary<string, object>());
+                
+                finalQuery = $@"
+                    {selectClause}
+                    {joinClause}
+                    {whereClause}
+                ";
+
+                // Merge parameters from selectClause and whereClause
+                foreach (var param in selectParams.Concat(whereParams))
+                {
+                    if (!parameters.ContainsKey(param.Key))
+                    {
+                        parameters[param.Key] = param.Value;
+                    }
+                }
+            }
+
+            var updateQuery = $@"
+                UPDATE {DETAIL_TABLE_NAME} detail
+                SET
+                    GoalCost = COALESCE(tem.GoalCost, detail.GoalCost),
+                    GoalUnits = COALESCE(tem.GoalUnits, detail.GoalUnits)
+                FROM (
+                    {finalQuery}
+                ) tem
+                where tem.RowId = detail.RowId
+            ";
+
+            return (updateQuery, parameters);
+        }
+
+        private (string SelectClause, Dictionary<string, object> Parameters) GetSelectClause(long opportunityId, StrategicOpportunityChargeCodeAdjustment adjustment, IEnumerable<string> rows, int index)
+        {
+            var parameters = new Dictionary<string, object>();
+            var isFirstAdj = index == 0;
+            var (goalCostSelect, costParams) = GetGoalSelect(adjustment.CostsValue, "Cost", index, isFirstAdj);
+            var (goalUnitsSelect, unitsParams) = GetGoalSelect(adjustment.UnitsValue, "Units", index, isFirstAdj);
+
+            // Merge parameters
+            foreach (var param in costParams.Concat(unitsParams))
+            {
+                parameters[param.Key] = param.Value;
+            }
+
+            var (whereClause, whereParams) = GetWhereClauseWithParameters(opportunityId, adjustment.NodeKey, rows);
+            foreach (var param in whereParams)
+            {
+                parameters[param.Key] = param.Value;
+            }
+
+            var selectClause = $@"
+                SELECT 
+                    {(isFirstAdj ? "t1.RowId AS RowId" : "COALESCE(t1.RowId, t2.RowId) AS RowId")},
+                    {goalCostSelect},
+                    {goalUnitsSelect}
+                FROM {(isFirstAdj ? DETAIL_TABLE_NAME : $"( SELECT RowId, GoalCost, GoalUnits FROM {DETAIL_TABLE_NAME} \n{whereClause} )")} AS t1
+            ";
+
+            return (selectClause, parameters);
+        }
+
+        private static (string GoalSelect, Dictionary<string, object> Parameters) GetGoalSelect(decimal? value, string columnName, int index, bool isFirstAdj)
+        {
+            var parameters = new Dictionary<string, object>();
+            string goalSelect;
+
+            if (value != null)
+            {
+                var paramName = $"{columnName}Value{index}";
+                parameters[paramName] = value.Value;
+
+                goalSelect = isFirstAdj ? 
+                    $@"
+                        SUM(t1.Goal{columnName}) OVER () AS ""Sum{columnName}{index}"",
+                        CASE WHEN ""Sum{columnName}{index}"" != 0 THEN (t1.Goal{columnName} / ""Sum{columnName}{index}"") * :{paramName} ELSE :{paramName} / COUNT(*) OVER() END AS Goal{columnName}
+                    " : 
+                    $@"
+                        (CASE
+                            WHEN t1.Goal{columnName} IS NOT NULL AND t2.Goal{columnName} IS NOT NULL THEN t2.Goal{columnName}
+                            WHEN t1.Goal{columnName} IS NOT NULL THEN t1.Goal{columnName}
+                            ELSE NULL
+                        END) AS _goal{columnName}{index},
+                        SUM(CASE WHEN _goal{columnName}{index} IS NOT NULL AND t1.RowId IS NOT NULL THEN _goal{columnName}{index} ELSE 0 END) OVER () AS ""Sum{columnName}{index}"",
+                        (CASE
+                            WHEN ""Sum{columnName}{index}"" = 0 AND t1.RowId IS NOT NULL THEN :{paramName} / COUNT(t1.*) OVER()
+                            WHEN _goal{columnName}{index} IS NOT NULL THEN (_goal{columnName}{index} / ""Sum{columnName}{index}"") * :{paramName}
+                            ELSE t2.Goal{columnName}
+                        END) AS Goal{columnName}
+                    ";
+            }
+            else
+            {
+                goalSelect = isFirstAdj ? $"Goal{columnName}" : $"t2.Goal{columnName} AS Goal{columnName}";
+            }
+
+            return (goalSelect, parameters);
+        }
+
+        private string GetJoinClause(string joinCondition)
+        {
+            return !string.IsNullOrEmpty(joinCondition) ? $@"FULL OUTER JOIN ({joinCondition}) AS t2 ON t1.RowId = t2.RowId" : string.Empty;
+        }
+
+        private (string WhereClause, Dictionary<string, object> Parameters) GetWhereClauseWithParameters(long opportunityId, string nodeKey, IEnumerable<string> rows)
+        {
+            // Validate inputs
+            if (opportunityId <= 0)
+                throw new ArgumentException("Invalid opportunity ID", nameof(opportunityId));
+
+            if (string.IsNullOrWhiteSpace(nodeKey))
+                throw new ArgumentException("Node key cannot be null or empty", nameof(nodeKey));
+
+            var parameters = new Dictionary<string, object>
+            {
+                { "OpportunityId", opportunityId },
+                { "IsBaseline", false }
+            };
+
+            if (nodeKey != "root")
+            {
+                var hierarchyIds = nodeKey.Split(KEY_SEPARATOR);
+                var filters = new List<string> { "OpportunityId = :OpportunityId", "IsBaseline = :IsBaseline" };
+
+                for (var paramIndex = 0; paramIndex < hierarchyIds.Length; paramIndex++)
+                {
+                    var id = hierarchyIds[paramIndex];
+
+                    // Sanitize the ID value
+                    if (string.IsNullOrWhiteSpace(id))
+                        throw new ArgumentException("Hierarchy ID cannot be null or empty");
+
+                    var rowIndex = rows.Contains(StrategicOpportunityDetailDimension.System.Value) ? paramIndex + 1 : paramIndex;
+                    var row = rows.ElementAt(rowIndex);
+                    var dimension = StrategicOpportunityDetailDimension.GetFromString(row);
+                    
+                    if (dimension == null)
+                        throw new ArgumentException($"Invalid dimension row: {row}");
+
+                    if (!StrategicOpportunityService.DimensionsConfig.TryGetValue(dimension, out var dimensionConfig))
+                        throw new ArgumentException($"Dimension configuration not found for: {dimension}");
+
+                    var columnName = dimensionConfig.ColumnName;
+                    
+                    if (string.IsNullOrWhiteSpace(columnName))
+                        throw new ArgumentException($"Invalid column name for dimension: {dimension}");
+
+                    var paramName = $"HierarchyId_{adjustmentIndex}_{paramIndex}";
+                    filters.Add($"{columnName} = :{paramName}");
+                    parameters[paramName] = id;
+                }
+
+                return ($"WHERE {string.Join(" AND ", filters)}", parameters);
+            }
+            
+            return ("WHERE OpportunityId = :OpportunityId AND IsBaseline = :IsBaseline", parameters);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/STRATEGIC_OPPORTUNITIES.md b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/STRATEGIC_OPPORTUNITIES.md
new file mode 100644
index 0000000..9f96e03
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/STRATEGIC_OPPORTUNITIES.md
@@ -0,0 +1,165 @@
+# Strategic Opportunities — Backend Overview
+
+## Domain Summary
+
+Strategic Opportunities are hospital cost/revenue improvement targets that progress through a lifecycle
+from analysis (`Opportunity`) to active tracking (`Initiative`) to completion. Two opportunity types
+exist with parallel implementations: **Charge Code** (encounter/charge-code-based) and **General Ledger**
+(GL account-based).
+
+Data is persisted across three systems:
+- **Central DB (PostgreSQL)** — entity metadata, measures, ramp-ups, roles, workbooks
+- **Snowflake (cci schema)** — fact detail rows for grids and reporting
+- **Snowflake DimStrategicItem** — warehouse dimension table for analytics/reporting
+
+---
+
+## Status Lifecycle
+
+```
+NewOpportunity (0)
+  InValidation (1)
+  PendingApproval (2)
+      ↓  ConvertToInitiative
+NewInitiative (3)
+  Tracking (4)
+      ↓  CompleteInitiative
+  Complete (5)
+  CompleteMonitoring (6)
+```
+
+**Key derived property:** `IsOpportunity = Status < NewInitiative (3)`
+
+This boolean gates which list endpoint returns the record (`GetStrategicOpportunitiesAsync` vs
+`GetStrategicInitiativesAsync`) and which detail population method is called.
+
+**Status transitions trigger backend side-effects:**
+- `NewOpportunity → NewInitiative`: calls `PopulateStrategicOpportunityCommittedDetails` with stage
+  `FromOpportunityToInitiative`, enqueues Hangfire tracking job, syncs DimStrategicItem
+- `NewInitiative → Complete`: calls `CompleteInitiativeAsync`, sets `TrackingEndDate`, syncs DimStrategicItem
+
+---
+
+## Two-Type Strategy Pattern
+
+### Inheritance
+
+```
+StrategicOpportunity         (Table: strategic_opportunity)
+├── StrategicOpportunityChargeCode  (Table: strategic_opportunity_charge_code)
+└── StrategicOpportunityGL          (Table: strategic_opportunity_gl)
+```
+
+Both subtypes use **table-per-type** mapping. Queries always load through `_centralDbContext.StrategicOpportunityChargeCodes`
+or `_centralDbContext.StrategicOpportunityGLs` — never through the base `StrategicOpportunities` DbSet
+(which is used only for existence checks and deletes).
+
+### Parallel Service Implementations
+
+| Concern | Charge Code | GL |
+|---|---|---|
+| Detail service | `IStrategicChargeCodeOpportunityDetailService` | `IStrategicGLOpportunityDetailService` |
+| Snowflake fact table | `cci.FactStrategicChargeCodeDetail` | `cci.FactStrategicGLDetail` |
+| Dimension config | `DimensionsConfig` (8 dims) | `GLDimensionsConfig` (3 dims) |
+| Distribution process | `DistributionProcessChargeCode` | `DistributionProcessGL` |
+
+Both are orchestrated by `StrategicOpportunityService`, which checks type and delegates accordingly.
+
+### Charge Code Specific Fields
+- `PatientPopulationHPath` / `ExplorationPopulationId` — patient population source (HPath = hierarchy path; ExplorationPopulationId = exploration-based)
+- `ChargeCodeHPath` — comma-separated hierarchy paths for selected charge codes
+- Dimension set: Entity, PSL, CaseTypeFamily, Physician, PhysicianSpecialty, CostDriver, Department, ChargeCode
+
+### GL Specific Fields
+- `AccountType` (Revenue/Expense/Statistic) — determines which account hierarchy columns apply
+- `DepartmentHPath`, `RevenueAccountHPath`, `ExpenseAccountHPath`, `StatisticAccountHPath`
+- `HasStatistic` — whether statistic accounts are included
+- Dimension set: Entity, Department, GLAccount
+
+---
+
+## Three-DB Write Pattern
+
+Every mutating operation must coordinate across three targets. The general flow:
+
+```
+1. Central DB transaction (EF Core)
+   └── Save entity + dependent records
+2. Snowflake fact rows
+   └── DistributionProcess or DetailService populates cci.Fact* table
+3. DimStrategicItem sync
+   └── strategicItemDimensionSyncService.UpsertAsync() / DeleteAsync()
+```
+
+**Important:** Snowflake writes happen outside the Central DB transaction. If Snowflake fails after
+Central DB commits, the error is caught and logged but does NOT roll back Central DB. This is
+intentional — Snowflake is considered a derived/reporting store.
+
+---
+
+## Create Flow (Charge Code)
+
+```
+CreateOpportunityChargeCodeAsync()
+  1. Map DTO → StrategicOpportunityChargeCode
+  2. Resolve strataId via IIdServiceClient
+  3. Save to Central DB
+  4. opportunityRoleAssignmentService.AddPermissionsFromDefaultsAsync()  ← adds default roles
+  5. strategicChargeCodeOpportunityDetailService.PopulateStrategicOpportunityDetails()  ← baseline data
+  6. strategicItemDimensionSyncService.UpsertAsync()  ← warehouse sync
+```
+
+GL creation follows the same pattern via `CreateOpportunityGeneralLedgerAsync`.
+
+---
+
+## Delete Flow (Charge Code)
+
+Delete uses `CreateExecutionStrategy()` for retry-safe transactions:
+
+```
+DeleteChargeCodeOpportunityAsync()
+  Central DB transaction:
+    1. ExecuteDeleteAsync: Measures, Workbooks, Comments, RampUps
+    2. Remove ChargeCode specification entity
+    3. Remove base StrategicOpportunity entity
+    4. Commit
+  If committed successfully:
+    5. StrategicOpportunityDetailQueryBuilder.BuildDeleteQuery() → Snowflake
+    6. strategicItemDimensionSyncService.DeleteAsync()
+```
+
+Steps 5-6 failures are caught/logged and do not throw — Central DB state is authoritative.
+
+---
+
+## Date Periods
+
+Three named periods are used throughout the system:
+
+| Period | Fields | Description |
+|---|---|---|
+| Baseline | `BaselineStartDate` / `BaselineEndDate` | Historical reference data period |
+| Goal | `GoalStartDate` / `GoalEndDate` (computed) | `BaselineStart+1mo` to `BaselineStart+EstimatedDuration mo` |
+| Tracking | `TrackingStartDate` / `TrackingEndDate` | Actual monitoring period, set when converting to initiative |
+
+`GoalStartDate` and `GoalEndDate` are `[NotMapped]` computed properties on `StrategicOpportunity` — they
+are never stored in the DB. `GetTrackingEndDateForFilters()` returns the first day of the month _after_
+`TrackingEndDate` (exclusive upper bound for Snowflake range queries).
+
+---
+
+## Key Files
+
+| File | Purpose |
+|---|---|
+| `StrategicOpportunity.cs` | Base entity, all shared fields and computed properties |
+| `StrategicOpportunityChargeCode.cs` | Charge code subtype entity |
+| `StrategicOpportunityGL.cs` | GL subtype entity |
+| `StrategicOpportunityService.cs` | Main orchestrator — CRUD, status transitions, layout, copy |
+| `StrategicChargeCodeOpportunityDetailService.cs` | Charge code detail population and retrieval |
+| `StrategicGLOpportunityDetailService.cs` | GL detail population and retrieval |
+| `StrategicItemDimensionSyncService.cs` | Warehouse dimension upsert/delete |
+| `StrategicOpportunityJob.cs` | Hangfire background tracking runner |
+| `Enums/StrategicOpportunityStatus.cs` | Lifecycle status enum (values 0–6) |
+| `Enums/DistributionStage.cs` | Controls which distribution path executes |
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicChargeCodeExportHelper.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicChargeCodeExportHelper.cs
new file mode 100644
index 0000000..dff212a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicChargeCodeExportHelper.cs
@@ -0,0 +1,66 @@
+using ClosedXML.Excel;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Data;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public static class StrategicChargeCodeExportHelper
+    {
+        public static readonly int TableStartRowIndex = 2;
+        public static readonly ImmutableDictionary<string, string> LayoutToRows = new Dictionary<string, string>()
+        {
+            { "entity", "EntityName" },
+            { "caseTypeFamily", "CaseTypeFamily" },
+            { "primaryServiceLine", "PrimaryServiceLine" },
+            { "physician", "PhysicianName" },
+            { "physicianSpecialty", "PhysicianSpecialty" },
+            { "costDriver", "CostDriver" },
+            { "department", "DepartmentName" },
+            { "chargeCode", "ChargeCode" },
+        }.ToImmutableDictionary();
+
+        public static void SetRowData(DataRow row, string key, IEnumerable<string> rows, Dictionary<string, Dictionary<string, string>> dimensionsData)
+        {
+            var keys = key.Split('|');
+
+            rows.Where(r => r != StrategicOpportunityDetailDimension.System.Value)
+                .ForEach((r, i) =>
+                {
+                    var colName = LayoutToRows[r];
+                    var value = dimensionsData[r].FirstOrDefault(v => v.Key == keys[i]).Value;
+                    row[colName] = value;
+                });
+        }
+
+        public static void StyleWorkSheet(IXLTable table, IXLRangeBase[] range)
+        {
+            range.ForEach(r =>
+            {
+                r.Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
+                r.Style.Font.Bold = true;
+            });
+
+            table.Theme = XLTableTheme.None;
+
+            var header = table.HeadersRow();
+            header.Style.Font.Bold = true;
+            header.Style.Border.BottomBorder = XLBorderStyleValues.Thin;
+        }
+    }
+
+    public class ExportHelper
+    {
+        public ExportHelper(string columnCaption, string columnFormat)
+        {
+            ColumnCaption = columnCaption;
+            ColumnFormat = columnFormat;
+        }
+
+        public string ColumnCaption { get; set; }
+        public string ColumnFormat { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicChargeCodeOpportunityDetailService.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicChargeCodeOpportunityDetailService.cs
new file mode 100644
index 0000000..f4d2228
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicChargeCodeOpportunityDetailService.cs
@@ -0,0 +1,1388 @@
+using ClosedXML.Excel;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Newtonsoft.Json;
+using Strata.Analytics.Models.Workbooks.WorksheetContent.Fields;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.DataSchema.Client;
+using Strata.DataSchema.Models.Query;
+using Strata.Schema.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using static Strata.ContinuousImprovement.Biz.Exploration.ExplorationService;
+using static Strata.ContinuousImprovement.Biz.Export.ExportUtils;
+using DataColumn = Strata.DataSchema.Models.Schema.DataColumn;
+using DataTable = Strata.DataSchema.Models.Schema.DataTable;
+using FilterGroup = Strata.DataSchema.Models.Query.FilterGroup;
+using Row = Strata.DataSchema.Models.Query.Row;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public class StrategicChargeCodeOpportunityDetailService(
+        IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+        CentralDbContext centralDbContext,
+        IClaimsPrincipalAccessor claimsPrincipalAccessor,
+        IDataSchemaService dataSchemaService,
+        ISchemaServiceClient schemaServiceClient,
+        ISnowflakeDatabaseContext databaseContext,
+        IExplorationFilterService explorationFilterService,
+        IDistributionProcessFactory distributionProcessFactory,
+        IStrategicOpportunityDetailQueryBuilder strategicOpportunityDetailQueryBuilder,
+        IHubContext<NotificationHub, INotificationHub> notificationHubContext,
+        IStrategicItemDimensionSyncService strategicItemDimensionSyncService,
+        ILogger<StrategicChargeCodeOpportunityDetailService> logger = default) : JazzDbService<StrategicOpportunity, long>(dbContextFactory, centralDbContext, claimsPrincipalAccessor), IStrategicChargeCodeOpportunityDetailService
+    {
+
+        public async Task<StrategicOpportunityDetailData> GetStrategicOpportunityDetailData(long opportunityId, bool isTracking, StrategicOpportunityGetDetailData getData, CancellationToken cancellationToken)
+        {
+            var dimensions = getData.Dimensions.Select(x => StrategicOpportunityDetailDimension.GetFromString(x)).ToList();
+            if (dimensions.Any(x => x == null)) return null;
+
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunityChargeCodes.FirstOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+            if (strategicOpportunity == null) return null;
+
+            var sqlWhere = string.Empty;
+            if (getData.DateStart.HasValue || getData.DateEnd.HasValue)
+            {
+                if (!getData.DateStart.HasValue) getData.DateStart = isTracking ? strategicOpportunity.TrackingStartDate : strategicOpportunity.GoalStartDate;
+                if (!getData.DateEnd.HasValue) getData.DateEnd = isTracking ? strategicOpportunity.TrackingEndDate : strategicOpportunity.GoalEndDate;
+                getData.SetFirstAndLastDayOfMonth();
+
+                var startYear = getData.DateStart.Value.Year;
+                var startMonth = getData.DateStart.Value.Month;
+                var endYear = getData.DateEnd.Value.Year;
+                var endMonth = getData.DateEnd.Value.Month;
+                sqlWhere = @$"
+                    AND (
+                        (DischargeFiscalYearId > {startYear})
+                        OR (DischargeFiscalYearId = {startYear} AND DischargeFiscalMonthId >= {startMonth})
+                    )
+                    AND (
+                        (DischargeFiscalYearId < {endYear})
+                        OR (DischargeFiscalYearId = {endYear} AND DischargeFiscalMonthId <= {endMonth})
+                    )
+                ";
+            }
+
+            var dicDimensionSql = StrategicOpportunityServiceQuery.GetDetailQuery(dimensions, false, sqlWhere);
+            var queryCount = dicDimensionSql.Count;
+            if (queryCount == 0) return null;
+            var querySelect = String.Join(Environment.NewLine, dicDimensionSql.Values);
+
+            var parametersReplace = new Dictionary<string, string>
+            {
+                { "@OpportunityId", opportunityId.ToString() },
+                { "@IsBaseline", isTracking ? "False" : "NULL" }
+            };
+            foreach (var x in parametersReplace)
+            {
+                querySelect = querySelect.Replace(x.Key, x.Value);
+            }
+
+            var queryOneParams = new Dictionary<string, object>
+            {
+                { "MULTI_STATEMENT_COUNT", queryCount }
+            };
+
+            var data = new StrategicOpportunityDetailData()
+            {
+                Data = [],
+                DimensionsData = dimensions.ToDictionary(x => x.ToString(), x => new Dictionary<string, string>()),
+                EncounterData = new Dictionary<string, float>()
+            };
+
+            try
+            {
+                var results = await databaseContext.QueryMultipleAsync(querySelect, "Entity Detail", queryOneParams);
+                foreach (var strDimension in dicDimensionSql.Keys)
+                {
+                    if (data.DimensionsData.ContainsKey(strDimension))
+                    {
+                        data.DimensionsData[strDimension] = results.Read<KeyValuePair<string, string>>().ToDictionary(x => x.Key, x => x.Value);
+                    }
+                }
+
+                data.Data = results.Read<StrategicOpportunityDetailGrouped>();
+
+                var encounterData = await GetDistinctEncounterCount(strategicOpportunity, getData, cancellationToken);
+                data.EncounterData = encounterData ?? data.EncounterData;
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, info: new Dictionary<string, object> { { "query", querySelect }, { "queryParams", queryOneParams } });
+                throw;
+            }
+
+            return data;
+        }
+
+        public async Task<IXLWorkbook> ExportInitiativeAsync(long opportunityId, bool isTracking, StrategicOpportunityGetDetailData getData, CancellationToken cancellationToken)
+        {
+            CultureInfo.CurrentCulture = new CultureInfo(_user.GetCulture());
+
+            if (!getData.DateEnd.HasValue)
+            {
+                throw new ArgumentException("DateEnd must be provided when exporting a strategic initiative.", nameof(getData));
+            }
+            var endDate = getData.DateEnd.Value;
+
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunities.FirstOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            if (strategicOpportunity == null || string.IsNullOrEmpty(strategicOpportunity.LayoutJSON))
+            {
+                return null;
+            }
+
+            var layout = JsonConvert.DeserializeObject<StrategicOpportunityLayout>(strategicOpportunity.LayoutJSON);
+            var periodList = await GetStrategicOpportunityDetailData(opportunityId, isTracking, getData, cancellationToken);
+
+            getData.DateStart = endDate;
+            var monthList = await GetStrategicOpportunityDetailData(opportunityId, isTracking, getData, cancellationToken);
+
+            var strategicInitiativeExport = new StrategicInitiativeChargeCodeExportService(layout, strategicOpportunity);
+            var exportOptions = strategicInitiativeExport.GetExportOptions();
+            var dataList = strategicInitiativeExport.MapStrategicInitiativeToDataTable(periodList, monthList);
+
+            var wb = CreateExcelWorkbook(dataList, exportOptions, StrategicChargeCodeExportHelper.TableStartRowIndex);
+            strategicInitiativeExport.StyleWorkSheet(wb, strategicOpportunity.TrackingStartDate, endDate);
+            return wb;
+        }
+
+        public async Task<IXLWorkbook> ExportOpportunityAsync(long opportunityId, StrategicOpportunityGetDetailData getData, CancellationToken cancellationToken)
+        {
+            CultureInfo.CurrentCulture = new CultureInfo(_user.GetCulture());
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunityChargeCodes.FirstOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            if (strategicOpportunity == null || string.IsNullOrEmpty(strategicOpportunity.LayoutJSON))
+            {
+                return null;
+            }
+
+            var layout = JsonConvert.DeserializeObject<StrategicOpportunityLayout>(strategicOpportunity.LayoutJSON);
+            var opportunitiesData = await GetStrategicOpportunityDetailData(opportunityId, false, getData, cancellationToken);
+            var strategicOpportunityExport = new StrategicOpportunityChargeCodeExportService(layout, strategicOpportunity);
+            var exportOptions = strategicOpportunityExport.GetExportOptions();
+            var dataList = strategicOpportunityExport.MapStrategicOpportunityToDataTable(opportunitiesData);
+            var wb = CreateExcelWorkbook(dataList, exportOptions, StrategicChargeCodeExportHelper.TableStartRowIndex);
+
+            strategicOpportunityExport.StyleWorkSheet(wb);
+            return wb;
+        }
+
+        public async Task PopulateStrategicOpportunityDetails(StrategicOpportunityChargeCode opportunity, CancellationToken cancellationToken)
+        {
+            var queryConfig = await GetQueryConfig(opportunity, null, true, cancellationToken);
+            var selectQuery = await dataSchemaService.BuildSqlQuery(queryConfig, cancellationToken);
+            var parameters = selectQuery.Parameters
+                .Append(new KeyValuePair<string, object>(":opportunityId", opportunity.OpportunityId))
+                .Append(new KeyValuePair<string, object>(":isBaseline", true))
+                .ToList();
+
+            var idsList = await GetChargeCodeIds(opportunity.ChargeCodeHPath, cancellationToken);
+            await PopulateTransientChargeCodeIds(idsList, opportunity.OpportunityId, cancellationToken);
+            var deleteSql = strategicOpportunityDetailQueryBuilder.BuildDeleteQuery();
+            var insertSql = strategicOpportunityDetailQueryBuilder.BuildInsertQuery(opportunity, selectQuery.SqlQuery, await IsUsingAprdrgAsync(cancellationToken));
+
+            await databaseContext.QueryAsync<StrategicOpportunityDetail>(deleteSql, $"{nameof(PopulateStrategicOpportunityDetails)}.Delete", parameters);
+            await databaseContext.QueryAsync<StrategicOpportunityDetail>(insertSql, $"{nameof(PopulateStrategicOpportunityDetails)}.Insert", parameters);
+            await CleanupTransientChargeCodeIds(opportunity);
+
+            await PopulateStrategicOpportunityGoalDetails(opportunity, DistributionStage.FromSourceToOpportunity, true, cancellationToken);
+        }
+
+        public async Task PopulateDetailGoalSummary(StrategicOpportunityChargeCode opportunity, double[] rampUps, bool isSaveChanges, CancellationToken cancellationToken)
+        {
+            if (rampUps == null)
+            {
+                rampUps = await _centralDbContext.StrategicOpportunityRampUps
+                    .Where(x => x.OpportunityId == opportunity.OpportunityId)
+                    .OrderBy(x => x.MonthNumber)
+                    .Select(x => x.Percentage)
+                    .ToArrayAsync(cancellationToken);
+            }
+
+            var distributionProcessChargeCode = distributionProcessFactory.CreateDistributionProcessChargeCode(
+                opportunity.OpportunityId,
+                new Shared.Period<DateOnly>(opportunity.BaselineStartDate, opportunity.BaselineEndDate),
+                new Shared.Period<DateOnly>(opportunity.GoalStartDate, opportunity.GoalEndDate),
+                new Shared.Period<DateOnly>(opportunity.TrackingStartDate, opportunity.TrackingEndDate),
+                rampUps
+            );
+
+            var distributionSummary = await distributionProcessChargeCode.GetDistributionSummaryAsync(false);
+            opportunity.TotalImprovement = distributionSummary.ImprovementSum;
+            opportunity.EstimatedGoal = distributionSummary.EstimatedGoalSum;
+
+            if (isSaveChanges) await _centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task UpdateMeasuresDetails(StrategicOpportunityChargeCode opportunity, CancellationToken cancellationToken)
+        {
+            var collectionMeasures = _centralDbContext.Entry(opportunity).Collection(o => o.Measures);
+            if (!collectionMeasures.IsLoaded)
+            {
+                await collectionMeasures.LoadAsync(cancellationToken);
+            }
+
+            var measures = new List<StrategicOpportunityMeasure>();
+            if (opportunity.Status == (byte)StrategicOpportunityStatus.CompleteMonitoring)
+            {
+                var primaryMeasure = opportunity.Measures.FirstOrDefault(m => m.MeasureGroup == Enums.MeasureGroup.Primary);
+                if (primaryMeasure != null)
+                    measures.Add(primaryMeasure);
+            }
+            else
+            {
+                measures.AddRange(opportunity.Measures.Where(m => m.MeasureGroup != Enums.MeasureGroup.System));
+            }
+
+            foreach (var measure in measures)
+            {
+                await UpdateOneMeasureDetails(opportunity, measure, cancellationToken);
+            }
+
+            if (opportunity.Status != (byte)StrategicOpportunityStatus.NewInitiative && opportunity.LastRunTrackingDate != null)
+            {
+                await UpdateSystemMeasures(opportunity, MeasureType.ActualCost, cancellationToken);
+            }
+        }
+
+        public async Task UpdateMeasuresAverage(StrategicOpportunityChargeCode opportunity, CancellationToken cancellationToken)
+        {
+            var collectionMeasures = _centralDbContext.Entry(opportunity).Collection(o => o.Measures);
+            if (!collectionMeasures.IsLoaded)
+            {
+                await collectionMeasures.LoadAsync(cancellationToken);
+            }
+
+            if (opportunity.Status == (byte)StrategicOpportunityStatus.CompleteMonitoring)
+            {
+                var primaryMeasure = opportunity.Measures.FirstOrDefault(m => m.MeasureGroup == Enums.MeasureGroup.Primary);
+                if (primaryMeasure != null)
+                {
+                    var dateRange = new Period<DateOnly>(opportunity.TrackingStartDate, opportunity.TrackingEndDate);
+                    primaryMeasure.AverageValue = await GetOneMeasureAverage(opportunity, primaryMeasure, dateRange, cancellationToken);
+                }
+
+            }
+            else
+            {
+                foreach (var measure in opportunity.Measures.Where(m => m.MeasureGroup != Enums.MeasureGroup.System))
+                {
+                    measure.AverageValue = await GetOneMeasureAverage(opportunity, measure, null, cancellationToken);
+                }
+            }
+
+            await _centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task DeleteMeasuresDetails(long opportunityId, CancellationToken cancellationToken)
+        {
+            var measureIds = await _centralDbContext.StrategicOpportunityMeasures
+                .Where(x => x.OpportunityId == opportunityId)
+                .Select(x => x.MeasureId)
+                .ToListAsync(cancellationToken);
+
+            if (measureIds.Count == 0) return;
+
+            var query = strategicOpportunityDetailQueryBuilder.GetDeleteAllMeasuresSql(measureIds);
+            if (!string.IsNullOrEmpty(query))
+                await databaseContext.ExecuteCommandAsync(query);
+        }
+
+        public async Task PopulateTrackingDetails(StrategicOpportunityChargeCode opportunity, CancellationToken cancellationToken)
+        {
+            var hub = notificationHubContext.Clients.Group(opportunity.OpportunityId.ToString());
+
+            try
+            {
+                if (opportunity.Status == (byte)StrategicOpportunityStatus.Tracking)
+                {
+                    var queryConfig = await GetQueryConfig(opportunity, null, true, cancellationToken);
+                    var selectQuery = await dataSchemaService.BuildSqlQuery(queryConfig, cancellationToken);
+                    var parameters = selectQuery.Parameters
+                        .Append(new KeyValuePair<string, object>(":opportunityId", opportunity.OpportunityId))
+                        .Append(new KeyValuePair<string, object>(":isBaseline", false))
+                        .ToList();
+
+                    if (string.IsNullOrEmpty(opportunity.PatientPopulationHPath))
+                    {
+                        (QueryParams queryParams, string ctfSummaryQuery) = await GetExplorationQuery(opportunity.ExplorationPopulationId, opportunity.TrackingStartDate, opportunity.TrackingEndDate, cancellationToken);
+                        selectQuery.SqlQuery = ApplyExplorationFilters(opportunity, selectQuery.SqlQuery, parameters, ctfSummaryQuery);
+                        parameters.AddRange(queryParams.AsDictionary);
+                        parameters = parameters.Append(new KeyValuePair<string, object>(":CaseTypeFamilyId", queryParams.CaseTypeFamilyId)).ToList();
+                    }
+
+                    var idsList = await GetChargeCodeIds(opportunity.ChargeCodeHPath, cancellationToken);
+                    await PopulateTransientChargeCodeIds(idsList, opportunity.OpportunityId, cancellationToken);
+                    var mergeSql = strategicOpportunityDetailQueryBuilder.BuildMergeQuery(opportunity.OpportunityId, selectQuery.SqlQuery, await IsUsingAprdrgAsync(cancellationToken));
+                    await databaseContext.QueryAsync<StrategicOpportunityDetail>(mergeSql, $"{nameof(PopulateTrackingDetails)}.Merge", parameters);
+                    await CleanupTransientChargeCodeIds(opportunity);
+
+                    var actualCost = await databaseContext.ExecuteScalarAsync<double>($"SELECT SUM(cost) FROM cci.FactStrategicChargeCodeDetail WHERE isbaseline = FALSE AND opportunityid = {opportunity.OpportunityId}");
+                    var committedCost = await databaseContext.ExecuteScalarAsync<double>(@$"SELECT SUM(goalcost) FROM cci.FactStrategicChargeCodeDetail WHERE isbaseline = FALSE 
+                    AND (dischargefiscalyearid < {DateTime.UtcNow.Year} OR (dischargefiscalyearid = {DateTime.UtcNow.Year} AND dischargefiscalmonthid <= {DateTime.UtcNow.Month})) AND opportunityid = {opportunity.OpportunityId}");
+
+                    opportunity.ProgressToDateActual = actualCost;
+                    opportunity.ProgressToDateCommitted = committedCost;
+                }
+
+                if (!opportunity.IsOpportunity)
+                {
+                    await UpdateMeasuresDetails(opportunity, cancellationToken);
+                }
+
+                await UpdateLastRunTracking(opportunity, RunTrackingStatus.Success, cancellationToken);
+                await hub.SendStrategicInitiativeTrackerSuccess(opportunity.OpportunityId.ToString(), (byte)opportunity.LastRunTrackingStatus, opportunity.LastRunTrackingDate);
+            }
+            catch (Exception ex)
+            
+            {
+                await UpdateLastRunTracking(opportunity, RunTrackingStatus.Failed, cancellationToken);
+                await hub.SendStrategicInitiativeTrackerError(opportunity.OpportunityId.ToString(), (byte)opportunity.LastRunTrackingStatus, opportunity.LastRunTrackingDate);
+                logger.LogServiceError(ex, ex.Message);
+                throw;
+            }
+        }
+
+        public async Task<bool> UpdateStrategicOpportunityDetailsData
+        (
+            long opportunityId,
+            IEnumerable<StrategicOpportunityChargeCodeAdjustment> adjustments,
+            IEnumerable<string> rows, CancellationToken cancellationToken
+        )
+        {
+            try
+            {
+                var opportunity = await _centralDbContext.StrategicOpportunityChargeCodes.SingleOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+                if (opportunity == null) return false;
+
+                var updateBuilder = new StrategicOpportunityUpdateQueryBuilder();
+                var (updateQuery, parameters) = updateBuilder.BuildUpdateQuery(adjustments.ToList(), opportunityId, rows);
+                await databaseContext.QueryAsync<StrategicOpportunityDetail>(updateQuery, $"{nameof(UpdateStrategicOpportunityDetailsData)}.Update", parameters);
+                opportunity.Status = (byte)StrategicOpportunityStatus.InValidation;
+
+                await PopulateDetailGoalSummary(opportunity, null, false, cancellationToken);
+
+                await _centralDbContext.SaveChangesAsync(cancellationToken);
+                await strategicItemDimensionSyncService.UpsertAsync(opportunity, cancellationToken);
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, ex.Message);
+                throw;
+            }
+        }
+
+        public async Task PopulateStrategicOpportunityGoalDetails(StrategicOpportunityChargeCode opportunity, DistributionStage stage, bool isSaveChanges, CancellationToken cancellationToken)
+        {
+            var rampUps = await _centralDbContext.StrategicOpportunityRampUps
+                .Where(x => x.OpportunityId == opportunity.OpportunityId)
+                .OrderBy(x => x.MonthNumber)
+                .Select(x => x.Percentage)
+                .ToArrayAsync(cancellationToken);
+
+            var distributionProcessChargeCode = distributionProcessFactory.CreateDistributionProcessChargeCode(
+                opportunity.OpportunityId,
+                new Shared.Period<DateOnly>(opportunity.BaselineStartDate, opportunity.BaselineEndDate),
+                new Shared.Period<DateOnly>(opportunity.GoalStartDate, opportunity.GoalEndDate),
+                new Shared.Period<DateOnly>(opportunity.TrackingStartDate, opportunity.TrackingEndDate),
+                rampUps
+            );
+
+            var distributionSummary = await distributionProcessChargeCode.DistributeAsync(opportunity.BaselineDistribution, stage);
+            opportunity.TotalImprovement = distributionSummary.ImprovementSum;
+            opportunity.EstimatedGoal = distributionSummary.EstimatedGoalSum;
+
+            if (isSaveChanges) await _centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task PopulateStrategicOpportunityCommittedDetails(StrategicOpportunityChargeCode opportunity, DistributionStage stage, bool isSaveChanges, CancellationToken cancellationToken)
+        {
+            var rampUps = await _centralDbContext.StrategicOpportunityRampUps
+                .Where(x => x.OpportunityId == opportunity.OpportunityId)
+                .OrderBy(x => x.MonthNumber)
+                .Select(x => x.Percentage)
+                .ToArrayAsync(cancellationToken);
+
+            var distributionProcessChargeCode = distributionProcessFactory.CreateDistributionProcessChargeCode(
+                opportunity.OpportunityId,
+                new Shared.Period<DateOnly>(opportunity.BaselineStartDate, opportunity.BaselineEndDate),
+                new Shared.Period<DateOnly>(opportunity.GoalStartDate, opportunity.GoalEndDate),
+                new Shared.Period<DateOnly>(opportunity.TrackingStartDate, opportunity.TrackingEndDate),
+                rampUps
+            );
+
+            var distributionSummary = await distributionProcessChargeCode.DistributeAsync(opportunity.BaselineDistribution, stage);
+            opportunity.TotalCommittedCost = distributionSummary.CommittedSum;
+
+            if (!opportunity.IsOpportunity)
+                await UpdateSystemMeasures(opportunity, MeasureType.CommittedCost, cancellationToken);
+
+            if (isSaveChanges) await _centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task UpdateDetailCommittedByRampUp(StrategicOpportunityChargeCode opportunity, double[] oldRampUps, double[] newRampUps, bool isSaveChanges, CancellationToken cancellationToken)
+        {
+            var distributionProcessChargeCode = distributionProcessFactory.CreateDistributionProcessChargeCode(
+                opportunity.OpportunityId,
+                new Shared.Period<DateOnly>(opportunity.BaselineStartDate, opportunity.BaselineEndDate),
+                new Shared.Period<DateOnly>(opportunity.GoalStartDate, opportunity.GoalEndDate),
+                new Shared.Period<DateOnly>(opportunity.TrackingStartDate, opportunity.TrackingEndDate),
+                newRampUps
+            );
+
+            var distributionSummary = await distributionProcessChargeCode.UpdateDetailCommittedByRampUp(oldRampUps);
+
+            await UpdateSystemMeasures(opportunity, MeasureType.CommittedCost, cancellationToken);
+
+            opportunity.TotalCommittedCost = distributionSummary.CommittedSum;
+
+            if (isSaveChanges) await _centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        private async Task UpdateOneMeasureDetails(StrategicOpportunityChargeCode opportunity,
+            StrategicOpportunityMeasure measure, CancellationToken cancellationToken)
+        {
+            var dateRange = new Period<DateOnly>(opportunity.TrackingStartDate, opportunity.Status == (byte)StrategicOpportunityStatus.CompleteMonitoring && measure.MeasureGroup == MeasureGroup.Primary ? DateOnly.FromDateTime(DateTime.Now) : opportunity.TrackingEndDate);
+            var result = await GetSelectMeasureDetailsSql(opportunity, measure, dateRange, cancellationToken);
+            var sqlMerge = strategicOpportunityDetailQueryBuilder.WrapIntoMeasureMergeQuery(result.Query);
+            await databaseContext.ExecuteCommandAsync(sqlMerge, result.Parameters);
+        }
+
+        private async Task<double> GetOneMeasureAverage(StrategicOpportunityChargeCode opportunity,
+            StrategicOpportunityMeasure measure, Period<DateOnly> dateRange, CancellationToken cancellationToken)
+        {
+            if (dateRange == null)
+                dateRange = new Period<DateOnly>(opportunity.BaselineStartDate, opportunity.BaselineEndDate);
+            var result = await GetSelectMeasureDetailsSql(opportunity, measure, dateRange, cancellationToken);
+            var query = strategicOpportunityDetailQueryBuilder.WrapIntoMeasureAverageQuery(result.Query);
+            var average = await databaseContext.ExecuteScalarAsync<double>(query, result.Parameters);
+            return average;
+        }
+
+        private async Task<(string Query, List<KeyValuePair<string, object>> Parameters)> GetSelectMeasureDetailsSql
+        (
+            StrategicOpportunityChargeCode opportunity,
+            StrategicOpportunityMeasure measure,
+            Period<DateOnly> dateRange,
+            CancellationToken cancellationToken
+        )
+        {
+            var columns = new List<StrategicColumn>
+            {
+                new("DischargeDateTime", "dsspes", "DischargeDateTime")
+            };
+            if (MeasureTypeConstants.PER_CASE_MEASURE_TYPES.Contains(measure.MeasureType))
+            {
+                columns.Add(new StrategicColumn("EncounterId", "dsspes", "dsspesEncounterId"));
+            }
+            if (MeasureTypeConstants.MARGIN_MEASURE_TYPES.Contains(measure.MeasureType))
+            {
+                columns.Add(new StrategicColumn("NetRevenue", "dsspes", "dsspesNetRevenue"));
+            }
+            var chargeCodeIds = await GetChargeCodeIds(opportunity.ChargeCodeHPath, cancellationToken);
+            var measureFilters = measure.MeasureGroup == Enums.MeasureGroup.Primary ?
+                new List<FilterChipItem>() :
+                JsonConvert.DeserializeObject<List<FilterChipItem>>(measure.FiltersJSON);
+
+            if (measure.MeasureGroup == Enums.MeasureGroup.Primary)
+            {
+                chargeCodeIds = chargeCodeIds.Intersect(JsonConvert.DeserializeObject<List<string>>(measure.FiltersJSON));
+            }
+            else
+            {
+                var chargeCodeFilter = measureFilters.FirstOrDefault(f => f.Key == ChipKey.ChargeCode);
+                if (chargeCodeFilter != null)
+                {
+                    var filteredChargeCodeIds = await GetChargeCodeIds(string.Join(",", chargeCodeFilter.Filters.Select(f => f.Id)), cancellationToken);
+                    chargeCodeIds = chargeCodeFilter.Operator == OperatorType.In ? chargeCodeIds.Intersect(filteredChargeCodeIds) : chargeCodeIds.Except(filteredChargeCodeIds);
+                }
+            }
+            var dataSourceId = await GetDataSourceId(cancellationToken);
+            var dataTables = await GetDataTablesForMeasure(opportunity, measure.MeasureType, dataSourceId, cancellationToken);
+            var rows = await GetRows(dataTables, columns, cancellationToken);
+            var values = await GetMeasureValues(measure.MeasureType, dataTables, cancellationToken);
+            var measureFilterDto = new MeasureFilterDto() { MeasureFilters = measureFilters, FiltersForMeasure = true, MeasureType = measure.MeasureType };
+            var filtersResult = await GetBaseFiltersAsync(opportunity, dateRange, dataTables, measureFilterDto, cancellationToken);
+
+            var queryConfig = new QueryConfig
+            {
+                Rows = rows,
+                Values = values.Select(v => v.ToSchemaValue()).ToList(),
+                FilterGroup = new FilterGroup() { Filters = filtersResult.FiltersList },
+                WithTotals = false,
+                SkipPhiCheck = false,
+                DisplayZeroIfNull = true,
+                SkipResultAggregation = false,
+                PrependExtraMetadataRow = false,
+                UseSqlModelv2 = false,
+                DataSourceId = dataSourceId
+            };
+
+            var selectQuery = await dataSchemaService.BuildSqlQuery(queryConfig, cancellationToken);
+            if (filtersResult.HaveNoIntersectedIds)
+            {
+                selectQuery.SqlQuery = selectQuery.SqlQuery.Replace("WHERE", "WHERE 1 != 1 AND");
+            }
+
+            var sbQuery = new StringBuilder();
+            sbQuery.AppendLine(GetSqlSelectChargeCodeIds(chargeCodeIds, true));
+
+            var selectSql = strategicOpportunityDetailQueryBuilder.GetSelectMeasureSql(opportunity.OpportunityId, measure.MeasureType, selectQuery.SqlQuery, measureFilterDto.MarginMeasureFilters);
+            var trackingMonths = DateExtensions.GetMonthDifference(dateRange.Start, dateRange.End, true);
+            var parameters = selectQuery.Parameters
+                .Append(new KeyValuePair<string, object>(":measureId", measure.MeasureId))
+                .Append(new KeyValuePair<string, object>(":startDate", dateRange.Start.ToString(DateExtensions.MEASURE_FORMAT_YYYY_MM_DD)))
+                .Append(new KeyValuePair<string, object>(":monthsNumber", trackingMonths))
+                .ToList();
+
+            if (string.IsNullOrEmpty(opportunity.PatientPopulationHPath))
+            {
+                (QueryParams queryParams, string ctfSummaryQuery) = await GetExplorationQuery(opportunity.ExplorationPopulationId, dateRange.Start, dateRange.End, cancellationToken);
+                selectSql = ApplyExplorationFilters(opportunity, selectSql, parameters, ctfSummaryQuery);
+                parameters.AddRange(queryParams.AsDictionary);
+                parameters = parameters.Append(new KeyValuePair<string, object>(":CaseTypeFamilyId", queryParams.CaseTypeFamilyId)).ToList();
+            }
+
+            sbQuery.AppendLine(selectSql);
+
+            return (sbQuery.ToString(), parameters);
+        }
+
+        private async Task<Dictionary<string, float>> GetDistinctEncounterCount(StrategicOpportunityChargeCode opportunity, StrategicOpportunityGetDetailData getData, CancellationToken cancellationToken)
+        {
+            var queryConfig = await GetQueryConfig(opportunity, new Period<DateOnly?>(getData.DateStart, getData.DateEnd), false, cancellationToken);
+            var selectQuery = await dataSchemaService.BuildSqlQuery(queryConfig, cancellationToken);
+
+            var parameters = selectQuery.Parameters
+                .Append(new KeyValuePair<string, object>(":opportunityId", opportunity.OpportunityId))
+                .Append(new KeyValuePair<string, object>(":isBaseline", false))
+                .ToList();
+
+            if (!opportunity.IsOpportunity && string.IsNullOrEmpty(opportunity.PatientPopulationHPath))
+            {
+                (QueryParams queryParams, string ctfSummaryQuery) = await GetExplorationQuery(opportunity.ExplorationPopulationId, opportunity.TrackingStartDate, opportunity.TrackingEndDate, cancellationToken);
+                selectQuery.SqlQuery = ApplyExplorationFilters(opportunity, selectQuery.SqlQuery, parameters, ctfSummaryQuery);
+                parameters.AddRange(queryParams.AsDictionary);
+                parameters = parameters.Append(new KeyValuePair<string, object>(":CaseTypeFamilyId", queryParams.CaseTypeFamilyId)).ToList();
+            }
+
+            var sbQuery = new StringBuilder();
+
+            var idsList = await GetChargeCodeIds(opportunity.ChargeCodeHPath, cancellationToken);
+            sbQuery.AppendLine(GetSqlSelectChargeCodeIds(idsList, true));
+
+            sbQuery.AppendLine(strategicOpportunityDetailQueryBuilder.BuildGetDistinctEncounterCountQuery(opportunity.OpportunityId, selectQuery.SqlQuery, await IsUsingAprdrgAsync(cancellationToken), getData));
+
+            var result = (await databaseContext.QueryAsync<KeyValuePair<string, float>>(sbQuery.ToString(), "Strategic Opportunity", parameters))
+                .ToDictionary(x => x.Key, x => x.Value);
+
+            return result;
+        }
+
+        private async Task<QueryConfig> GetQueryConfig(StrategicOpportunityChargeCode strategicOpportunity, Period<DateOnly?> dateRange, bool isGetValues, CancellationToken cancellationToken)
+        {
+            var dataSourceId = await GetDataSourceId(cancellationToken);
+            var dataTables = await GetDataTablesForOpportunity(strategicOpportunity, isGetValues, dataSourceId, cancellationToken);
+            var rows = await GetRows(dataTables, GetColumns(), cancellationToken);
+            var values = isGetValues ? await GetValues(dataTables, cancellationToken) : new List<QueryValue>();
+            var filterGroup = await GetBaseFilterGroup(strategicOpportunity, dateRange, dataTables, new List<FilterChipItem>(), cancellationToken);
+
+            var queryConfig = new QueryConfig
+            {
+                Rows = rows,
+                Values = values.Select(v => v.ToSchemaValue()).ToList(),
+                FilterGroup = filterGroup,
+                WithTotals = false,
+                SkipPhiCheck = false,
+                DisplayZeroIfNull = true,
+                SkipResultAggregation = false,
+                PrependExtraMetadataRow = false,
+                UseSqlModelv2 = false,
+                DataSourceId = dataSourceId
+            };
+            return queryConfig;
+        }
+
+        private async Task<FilterGroup> GetBaseFilterGroup(StrategicOpportunityChargeCode strategicOpportunity, Period<DateOnly?> dateRange, List<DataTable> dataTables,
+            List<FilterChipItem> measureFilters, CancellationToken cancellationToken)
+        {
+            var filterGroup = new FilterGroup();
+            var measureFilterDto = new MeasureFilterDto() { MeasureFilters = measureFilters };
+            var processedDateRange = GetProcessedDateRange(dateRange, strategicOpportunity, measureFilterDto);
+            filterGroup.Filters = (await GetBaseFiltersAsync(strategicOpportunity, processedDateRange, dataTables, measureFilterDto, cancellationToken)).FiltersList;
+            return filterGroup;
+        }
+
+        private async Task<List<QueryValue>> GetValues(List<DataTable> dataTables, CancellationToken cancellationToken)
+        {
+            var values = new List<QueryValue>();
+            var unitsOfServiceColumn = await GetDataColumn(new StrategicColumn("UnitsOfService", "pblid", "UnitsOfService"), dataTables, cancellationToken);
+            if (unitsOfServiceColumn != null)
+            {
+                values.Add(new QueryValue()
+                {
+                    Calculation = $"SUM([{unitsOfServiceColumn.DataColumnId}])",
+                    ColumnAlias = "Units"
+                });
+            }
+
+            var variableDirectCostColumn = await GetDataColumn(new StrategicColumn("VariableDirectCost", "costdetail", "VariableDirectCost"), dataTables, cancellationToken);
+            if (variableDirectCostColumn != null)
+            {
+                values.Add(new QueryValue()
+                {
+                    Calculation = $"SUM([{variableDirectCostColumn.DataColumnId}])",
+                    ColumnAlias = "Cost"
+                });
+            }
+
+            return values;
+        }
+
+        private async Task<List<Row>> GetRows(List<DataTable> dataTables, List<StrategicColumn> columns, CancellationToken cancellationToken)
+        {
+            var rows = new List<Row>();
+
+            foreach (var column in columns)
+            {
+                var dataColumn = await GetDataColumn(column, dataTables, cancellationToken);
+                if (dataColumn != null)
+                {
+                    rows.Add(new Row() { ColumnAlias = column.ColumnAlias, DataColumnId = dataColumn.DataColumnId });
+                }
+            }
+
+            return rows;
+        }
+
+        private static List<StrategicColumn> GetColumns()
+        {
+            // added table aliases before column alias so that there is no ambiguity for columns from different tables
+            var columns = new List<StrategicColumn>
+            {
+                // fpes
+                new StrategicColumn("EncounterId", "dsspes", "dsspesEncounterId"),
+                new StrategicColumn("DischargeDateTime", "dsspes", "dsspesDischargeDateTime"),
+                new StrategicColumn("EntityID", "dsspes", "dsspesEntityID"),
+                new StrategicColumn("PrimaryPhysicianId", "dsspes", "dsspesPhysicianId"),
+                new StrategicColumn("ServiceLineId", "dsspes", "dsspesPrimaryServiceLineId"),
+                new StrategicColumn("CPTCodeCaseTypeFamilyId", "dsspes", "dsspesCPTCodeCaseTypeFamilyId"),
+                new StrategicColumn("MSDRGCaseTypeFamilyId", "dsspes", "dsspesMSDRGCaseTypeFamilyId"),
+                new StrategicColumn("APRDRGCaseTypeFamilyId", "dsspes", "dsspesAPRDRGCaseTypeFamilyId"),
+                new StrategicColumn("PatientTypeRollupName", "PATIENTTYPE", "ptRollupName"),
+
+                // pblid
+                new StrategicColumn("DepartmentId", "pblid", "pblidDepartmentId"),
+        
+                // dimphys
+                new StrategicColumn("PhysicianSpecialtyId", "physPrimary", "physPrimaryPhysicianSpecialtyId"),
+        
+                // chargecode
+                new StrategicColumn("ChargeCodeID", "cc", "ccChargeCodeID"),
+                new StrategicColumn("CostDriver", "cc", "ccCostDriver"),
+
+};
+
+            return columns;
+        }
+
+        private async Task<DataColumn> GetDataColumn(StrategicColumn strategicColumn, List<DataTable> dataTables, CancellationToken cancellationToken)
+        {
+            var schemaColumns = await dataSchemaService.GetDataColumnsBySqlColumnNameAsync(strategicColumn.ColumnName, cancellationToken);
+            var dataTable = dataTables.FirstOrDefault(dt => string.Equals(dt.SqlAlias, strategicColumn.TableAlias, StringComparison.OrdinalIgnoreCase));
+            if (dataTable == null) return null;
+            var dataColumn = schemaColumns.FirstOrDefault(sc => sc.DataTableId == dataTable.DataTableId);
+            return dataColumn;
+        }
+
+        private async Task<int> GetDataSourceId(CancellationToken cancellationToken)
+        {
+            var dataSourceName = "DS Strata Encounter Cost Detail";
+            var dataSources = await dataSchemaService.GetDataSourcesAsync(cancellationToken);
+            var matchingDataSources = dataSources
+                .Where(ds => string.Equals(ds.Name, dataSourceName, StringComparison.OrdinalIgnoreCase))
+                .ToList();
+
+            if (matchingDataSources.Count == 0)
+            {
+                throw new InvalidOperationException($"Required data source '{dataSourceName}' was not found.");
+            }
+
+            if (matchingDataSources.Count > 1)
+            {
+                throw new InvalidOperationException($"Multiple data sources matched '{dataSourceName}'. Expected exactly one match.");
+            }
+
+            return matchingDataSources[0].DataSourceId;
+        }
+
+        private async Task<List<DataTable>> GetDataTablesForMeasure(StrategicOpportunityChargeCode strategicOpportunity, MeasureType measureType, int dataSourceId, CancellationToken cancellationToken)
+        {
+            var excludeTables = new List<StrategicOpportunitySourceDbTable>()
+            {
+                StrategicOpportunitySourceDbTable.DimPhysician
+            };
+
+            if (!(MeasureTypeConstants.PATIENT_COST_MEASURE_TYPES.Contains(measureType) || MeasureTypeConstants.MARGIN_MEASURE_TYPES.Contains(measureType)))
+            {
+                excludeTables.Add(StrategicOpportunitySourceDbTable.FactPatientCostDetail);
+            }
+            if (string.IsNullOrEmpty(strategicOpportunity.PatientPopulationHPath))
+            {
+                excludeTables.Add(StrategicOpportunitySourceDbTable.FactPatientEncounterCLinicalIndicator);
+            }
+            if (strategicOpportunity.ExplorationPopulationId == 0)
+            {
+                excludeTables.Add(StrategicOpportunitySourceDbTable.FactExplorationPopulationEncounter);
+            }
+
+            if (!ChipTypeExtensions.ContainsChips(strategicOpportunity.OpportunityFiltersJSON, [ChipKey.MSDRGRollupID]))
+            {
+                excludeTables.Add(StrategicOpportunitySourceDbTable.DimMsdrg);
+            }
+
+            var tableList = StrategicOpportunitySourceDbTable.GetAllValues().Except(excludeTables);
+            var dataTables = await GetDataTables(tableList, dataSourceId, cancellationToken);
+
+            return dataTables;
+        }
+
+        private async Task<List<DataTable>> GetDataTablesForOpportunity(StrategicOpportunityChargeCode strategicOpportunity, bool isGetValues, int dataSourceId, CancellationToken cancellationToken)
+        {
+            var excludeTables = new List<StrategicOpportunitySourceDbTable>();
+
+            if (!isGetValues)
+            {
+                excludeTables.Add(StrategicOpportunitySourceDbTable.FactPatientCostDetail);
+            }
+
+            if (string.IsNullOrEmpty(strategicOpportunity.PatientPopulationHPath))
+            {
+                excludeTables.Add(StrategicOpportunitySourceDbTable.FactPatientEncounterCLinicalIndicator);
+            }
+            if (strategicOpportunity.ExplorationPopulationId == 0)
+            {
+                excludeTables.Add(StrategicOpportunitySourceDbTable.FactExplorationPopulationEncounter);
+            }
+
+            if (!ChipTypeExtensions.ContainsChips(strategicOpportunity.OpportunityFiltersJSON, [ChipKey.MSDRGRollupID]))
+            {
+                excludeTables.Add(StrategicOpportunitySourceDbTable.DimMsdrg);
+            }
+
+            var tableList = StrategicOpportunitySourceDbTable.GetAllValues().Except(excludeTables);
+            var dataTables = await GetDataTables(tableList, dataSourceId, cancellationToken);
+
+            return dataTables;
+        }
+
+        private async Task<List<DataTable>> GetDataTables(IEnumerable<StrategicOpportunitySourceDbTable> tables, int dataSourceId, CancellationToken cancellationToken)
+        {
+            var allTables = await dataSchemaService.GetDataTablesByDataSourceId(dataSourceId, false, null, cancellationToken);
+            var aliasesToInclude = new HashSet<string>(tables.Select(t => t.SqlAlias), StringComparer.OrdinalIgnoreCase);
+            return allTables.Where(t => aliasesToInclude.Contains(t.SqlAlias)).ToList();
+        }
+
+        private Period<DateOnly> GetProcessedDateRange(Period<DateOnly?> dateRange, StrategicOpportunityChargeCode opportunity, MeasureFilterDto measureFilterDto)
+        {
+            var dateStart = dateRange?.Start ??
+                   (measureFilterDto.FiltersForMeasure || !opportunity.IsOpportunity ?
+                   opportunity.TrackingStartDate :
+                   opportunity.BaselineStartDate);
+
+            var dateEnd = dateRange?.End ??
+                (measureFilterDto.FiltersForMeasure ?
+                DateOnly.FromDateTime(DateTime.UtcNow) :
+                (!opportunity.IsOpportunity ? opportunity.GetTrackingEndDateForFilters() : opportunity.BaselineEndDate));
+
+            return new Period<DateOnly>(dateStart, dateEnd);
+        }
+
+        private async Task<(List<DataSchema.Models.Query.IFilterBase> FiltersList, bool HaveNoIntersectedIds)> GetBaseFiltersAsync(StrategicOpportunityChargeCode opportunity, Period<DateOnly> dateRange,
+            List<DataTable> dataTables, MeasureFilterDto measureFilterDto, CancellationToken cancellationToken)
+        {
+            var filterList = new List<DataSchema.Models.Query.IFilterBase>();
+            
+
+            var dischargeDateTimeColumn = await GetDataColumn(new StrategicColumn("DischargeDateTime", "dsspes", "DischargeDateTime"), dataTables, cancellationToken);
+            if (dischargeDateTimeColumn != null)
+            {   
+                var dateStartCondition = new DataSchema.Models.Query.FilterCondition()
+                {
+                    Operator = FilterOperator.GreaterThanOrEqualTo,
+                    Values = [dateRange.Start.ToString(DateExtensions.OPPORTUNITY_FORMAT_MM_DD_YYYY)]
+                };
+                var dateEndCondition = new DataSchema.Models.Query.FilterCondition()
+                {
+                    Operator = FilterOperator.LessThan,
+                    Values = [dateRange.End.AddDays(1).ToString(DateExtensions.OPPORTUNITY_FORMAT_MM_DD_YYYY)]
+                };
+
+                var dischargeDateFilter = new DataSchema.Models.Query.Filter()
+                {
+                    DataColumnId = dischargeDateTimeColumn.DataColumnId,
+                    FilterType = DataSchema.Models.Query.FilterType.Conditions,
+                    Conditions = new List<FilterCondition> { dateStartCondition, dateEndCondition },
+                    DatePart = DatePart.Day
+                };
+                filterList.Add(dischargeDateFilter);
+            }
+
+            if (!string.IsNullOrEmpty(opportunity.PatientPopulationHPath))
+            {
+                var dataColumn = await GetDataColumn(new StrategicColumn("ClinicalIndicatorId", "dsspeci", "ClinicalIndicatorId"), dataTables, cancellationToken);
+                if (dataColumn != null)
+                {
+                    var dimension = await schemaServiceClient.GetDimensionByGlobalIdAsync("Clinical Indicator");
+                    var hierarchyPaths = opportunity.PatientPopulationHPath.Split(",");
+                    foreach (var codeHpaths in hierarchyPaths.Batch(250))
+                    {
+                        var members = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid, codeHpaths, cancellationToken);
+                        var ids = members.Select(x => x.Id).ToList();
+                        var filterCondition = new FilterCondition() { Operator = FilterOperator.In, Values = ids };
+                        var filter = new DataSchema.Models.Query.Filter()
+                        {
+                            DataColumnId = dataColumn.DataColumnId,
+                            FilterType = FilterType.Conditions,
+                            Conditions = new List<FilterCondition> { filterCondition }
+                        };
+                        filterList.Add(filter);
+                    }
+                }
+            }
+            else if (string.IsNullOrEmpty(opportunity.PatientPopulationHPath))
+            {
+                var dataColumn = await GetDataColumn(new StrategicColumn("ExplorationPopulationId", "explorationPopulationEncounter", "ExplorationPopulationId"), dataTables, cancellationToken);
+                if (dataColumn != null)
+                {
+                    var ids = new List<object>() { opportunity.ExplorationPopulationId };
+                    var filterCondition = new DataSchema.Models.Query.FilterCondition() { Operator = FilterOperator.Equals, Values = ids };
+                    var filter = new DataSchema.Models.Query.Filter()
+                    {
+                        DataColumnId = dataColumn.DataColumnId,
+                        FilterType = DataSchema.Models.Query.FilterType.Conditions,
+                        Conditions = new List<FilterCondition> { filterCondition },
+                    };
+                    filterList.Add(filter);
+                }
+            }
+            bool haveNoIntersectedIds = false;
+            if ((opportunity.OpportunityFiltersJSON != string.Empty && opportunity.OpportunityFiltersJSON != "[]") || measureFilterDto.MeasureFilters.Any())
+            {
+                var additionalFilters = JsonConvert.DeserializeObject<List<FilterChipItem>>(opportunity.OpportunityFiltersJSON);
+                var sameFilters = new List<FilterChipItem>();
+                foreach (var measureFilter in measureFilterDto.MeasureFilters)
+                {
+                    if (measureFilter.Key == ChipKey.ChargeCode)
+                    {
+                        continue;
+                    }
+                    var existingFilter = additionalFilters.FirstOrDefault(f => f.Key == measureFilter.Key);
+                    if (existingFilter != null)
+                    {
+                        sameFilters.Add(measureFilter);
+                    }
+                    else
+                    {
+                        additionalFilters.Add(measureFilter);
+                    }
+                }
+
+                foreach (var filterChipItem in additionalFilters)
+                {
+                    if (filterChipItem.Key == ChipKey.CaseTypeFamilyID)
+                    {
+                        var dimension = await schemaServiceClient.GetDimensionByGlobalIdAsync(GetGlobalIdByChipKey(filterChipItem.Key));
+                        var members = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid, filterChipItem.Filters.Select(f => f.Id), cancellationToken);
+                        var ids = await JoinSameFilters(measureFilterDto.MeasureFilters, sameFilters, filterChipItem, dimension, members.Select(m => m.Id), cancellationToken);
+                        haveNoIntersectedIds = haveNoIntersectedIds || !ids.Any();
+                        var msDrgFilter = await GetCaseTypeFamilyFilter(filterChipItem, dataTables, ids, "MSDRGCaseTypeFamilyID", cancellationToken);
+                        var aprDrgFilter = await GetCaseTypeFamilyFilter(filterChipItem, dataTables, ids, "APRDRGCaseTypeFamilyID", cancellationToken);
+                        var cptFilter = await GetCaseTypeFamilyFilter(filterChipItem, dataTables, ids, "CPTCodeCaseTypeFamilyID", cancellationToken);
+                        filterList.Add(new FilterGroup(new List<IFilterBase> { msDrgFilter, aprDrgFilter, cptFilter },
+                            filterChipItem.Operator == OperatorType.In ? LogicalOperator.Or : LogicalOperator.And));
+                    }
+                    else
+                    {
+                        var stratColumn = GetColumnByChipKey(filterChipItem.Key);
+                        var dataColumn = await GetDataColumn(stratColumn, dataTables, cancellationToken);
+                        if (dataColumn != null)
+                        {
+                            var filterCondition = await GetFilterCondition(measureFilterDto.MeasureFilters, filterChipItem, sameFilters, cancellationToken);
+                            haveNoIntersectedIds = haveNoIntersectedIds || !filterCondition.Values.Any();
+                            // encounter level measure filters are only used to determine which encounterIds have at least one details with the filters
+                            // if there is at least one details that matches filters we will take all of the details to calculate costs
+                            if (stratColumn.TableAlias == "pblid" && measureFilterDto.FiltersForMeasure && MeasureTypeConstants.IsEncounterLevelMeasure(measureFilterDto.MeasureType))
+                            {
+                                measureFilterDto.MarginMeasureFilters.Add(stratColumn.ColumnName, filterCondition);
+                                continue;
+                            }
+                            var filter = new DataSchema.Models.Query.Filter()
+                            {
+                                DataColumnId = dataColumn.DataColumnId,
+                                FilterType = DataSchema.Models.Query.FilterType.Conditions,
+                                Conditions = new List<FilterCondition> { filterCondition },
+                            };
+                            filterList.Add(filter);
+                        }
+                    }
+                }
+            }
+
+            return (filterList, haveNoIntersectedIds);
+        }
+
+        private async Task<IEnumerable<string>> JoinSameFilters(List<FilterChipItem> measureFilters, List<FilterChipItem> sameFilters, FilterChipItem filterChipItem, Schema.Client.Dtos.Info.ScoreDimensionInfoDto dimension, IEnumerable<string> ids, CancellationToken cancellationToken)
+        {
+            if (sameFilters.Any(f => f.Key == filterChipItem.Key))
+            {
+                var measureMembers = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid,
+                    measureFilters.FirstOrDefault(f => f.Key == filterChipItem.Key).Filters.Select(f => f.Id), cancellationToken);
+                var measureFilter = sameFilters.FirstOrDefault(f => f.Key == filterChipItem.Key);
+                if (filterChipItem.Operator == OperatorType.In && measureFilter.Operator == OperatorType.In)
+                {
+                    ids = ids.Intersect(measureMembers.Select(m => m.Id));
+                }
+                else if (filterChipItem.Operator == OperatorType.NotIn && measureFilter.Operator == OperatorType.NotIn)
+                {
+                    ids = ids.Union(measureMembers.Select(m => m.Id));
+                }
+                else if (filterChipItem.Operator == OperatorType.In && measureFilter.Operator == OperatorType.NotIn)
+                {
+                    ids = ids.Except(measureMembers.Select(m => m.Id));
+                }
+                else
+                {
+                    filterChipItem.Operator = OperatorType.In;
+                    ids = measureMembers.Select(m => m.Id).Except(ids);
+                }
+            }
+
+            return ids;
+        }
+
+        private async Task<bool> IsUsingAprdrgAsync(CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            var ctfValueSetting = (await dbContext.SystemSettings.SingleOrDefaultAsync(item => item.Name == "Flexible Exploration Inpatient Case Type Family", cancellationToken))?.Value;
+            return ctfValueSetting == "1";
+        }
+
+        private async Task<FilterCondition> GetFilterCondition(List<FilterChipItem> measureFilters, FilterChipItem filterChipItem, List<FilterChipItem> sameFilters, CancellationToken cancellationToken)
+        {
+            var ids = new List<object>();
+            var oper = filterChipItem.Key switch
+            {
+                // 1 is an id for Yes and 0 is for No
+                ChipKey.IsGreaterThanZeroCharges => filterChipItem.Filters.Any(f => f.Id == "1") ? FilterOperator.GreaterThan : FilterOperator.LessThanOrEqualTo,
+                ChipKey.Mortality => filterChipItem.Filters.Any(f => f.Id == "1") ? FilterOperator.In : FilterOperator.NotIn,
+                _ => filterChipItem.Operator == OperatorType.In ? FilterOperator.In : FilterOperator.NotIn
+            };
+            var hasIntersectedFilters = measureFilters.Any(mf => mf.ChipType == filterChipItem.ChipType &&
+                (mf.Filters.Intersect(filterChipItem.Filters).Any() || mf.Operator != filterChipItem.Operator));
+
+            if (filterChipItem.Key == ChipKey.Mortality && ((sameFilters.Any(f => f.Key == filterChipItem.Key) && hasIntersectedFilters)
+                || !sameFilters.Any(f => f.Key == filterChipItem.Key)))
+            {
+                ids.AddRange(new List<object>() { 20, 41, 42, 43 });
+            }
+            else if (filterChipItem.Key == ChipKey.IsGreaterThanZeroCharges && ((sameFilters.Any(f => f.Key == filterChipItem.Key) && hasIntersectedFilters)
+                || !sameFilters.Any(f => f.Key == filterChipItem.Key)))
+            {
+                ids.Add(0);
+            }
+            else if (filterChipItem.Key == ChipKey.Supply)
+            {
+                if (sameFilters.Any(f => f.Key == filterChipItem.Key))
+                {
+                    var measureFilter = sameFilters.FirstOrDefault(f => f.Key == filterChipItem.Key);
+                    if (filterChipItem.Operator == measureFilter.Operator)
+                    {
+                        ids.AddRange(filterChipItem.Filters.Select(f => f.Id).Intersect(measureFilter.Filters.Select(f => f.Id)));
+                    }
+                    else if (filterChipItem.Operator == OperatorType.In && measureFilter.Operator == OperatorType.NotIn)
+                    {
+                        ids.AddRange(filterChipItem.Filters.Select(f => f.Id).Except(measureFilter.Filters.Select(f => f.Id)));
+                    }
+                    else
+                    {
+                        filterChipItem.Operator = OperatorType.In;
+                        ids.AddRange(measureFilter.Filters.Select(f => f.Id).Except(filterChipItem.Filters.Select(f => f.Id)));
+                    }
+                }
+                else
+                {
+                    ids.AddRange(filterChipItem.Filters.Select(f => f.Id));
+                }
+            }
+            else
+            {
+                var dimension = await schemaServiceClient.GetDimensionByGlobalIdAsync(GetGlobalIdByChipKey(filterChipItem.Key));
+                var members = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid, filterChipItem.Filters.Select(f => f.Id), cancellationToken);
+                ids.AddRange(await JoinSameFilters(measureFilters, sameFilters, filterChipItem, dimension, members.Select(m => m.Id), cancellationToken));
+            }
+
+            return new FilterCondition()
+            {
+                Operator = oper,
+                Values = ids
+            };
+        }
+
+        private async Task<DataSchema.Models.Query.Filter> GetCaseTypeFamilyFilter(FilterChipItem filterChipItem, List<DataTable> dataTables,
+            IEnumerable<string> ids, string columnName, CancellationToken cancellationToken)
+        {
+            var dataColumn = await GetDataColumn(new StrategicColumn(columnName, "dsspes", columnName), dataTables, cancellationToken);
+            var filter = new DataSchema.Models.Query.Filter()
+            {
+                DataColumnId = dataColumn.DataColumnId,
+                FilterType = DataSchema.Models.Query.FilterType.Conditions,
+                Conditions = new List<FilterCondition> { new FilterCondition()
+                {
+                    Operator = filterChipItem.Operator == OperatorType.In ? FilterOperator.In : FilterOperator.NotIn,
+                    Values = ids
+                } }
+            };
+            return filter;
+        }
+
+        private string GetGlobalIdByChipKey(ChipKey key)
+        {
+            return key switch
+            {
+                ChipKey.AdmitSourceID => "Admit Source",
+                ChipKey.AdmitTypeID => "Admit Type",
+                ChipKey.AgeCohortID => "Age Cohort",
+                ChipKey.AprDrgID => "APR DRG",
+                ChipKey.CaseTypeFamilyID => "Case Type Family",
+                ChipKey.DischargeStatusId => "Discharge Status",
+                ChipKey.EntityID => "DSS Entity",
+                ChipKey.EncounterID => "Patient Encounter",
+                ChipKey.GenderID => "Gender",
+                ChipKey.ICD10DXPrimaryDiagID => "ICD10 DX Primary",
+                ChipKey.ICD10PXPrimaryID => "ICD10 PX Primary",
+                ChipKey.InsurancePlan1ID => "Insurance Plan 1",
+                ChipKey.LocationID => "Location",
+                ChipKey.MSDRGRollupID => "MS DRG Rollup",
+                ChipKey.NewBornFlagID => "New Born Flag",
+                ChipKey.PatientTypeID => "Patient Type Rollup",
+                ChipKey.PrimaryCPTID => "Primary CPT",
+                ChipKey.PrimaryPhysicianID => "Physician Primary",
+                ChipKey.PrimaryQVIID => "Primary QVI",
+                ChipKey.SourceSystemID => "Source System",
+                ChipKey.BilledCPT => "Billed CPT",
+                ChipKey.Supply => "DSS Supply",
+                ChipKey.UBRevenueCode => "UB Revenue Code",
+                ChipKey.Department => "Department",
+                _ => null
+            };
+        }
+
+        private StrategicColumn GetColumnByChipKey(ChipKey key)
+        {
+            return key switch
+            {
+                ChipKey.AdmitSourceID => new StrategicColumn("AdmitSourceId", "dsspes", "AdmitSourceId"),
+                ChipKey.AdmitTypeID => new StrategicColumn("AdmitTypeId", "dsspes", "AdmitTypeId"),
+                ChipKey.AgeCohortID => new StrategicColumn("AgeCohortID", "dsspes", "AgeCohortID"),
+                ChipKey.AprDrgID => new StrategicColumn("AprdrgId", "dsspes", "AprdrgId"),
+                ChipKey.DischargeStatusId => new StrategicColumn("DischargeStatusId", "dsspes", "DischargeStatusId"),
+                ChipKey.EntityID => new StrategicColumn("EntityId", "dsspes", "EntityId"),
+                ChipKey.EncounterID => new StrategicColumn("EncounterId", "dsspes", "EncounterId"),
+                ChipKey.GenderID => new StrategicColumn("GenderId", "dsspes", "GenderId"),
+                ChipKey.ICD10DXPrimaryDiagID => new StrategicColumn("ICD10DXPrimaryDiagId", "dsspes", "ICD10DXPrimaryDiagId"),
+                ChipKey.ICD10PXPrimaryID => new StrategicColumn("ICD10PXPrimaryId", "dsspes", "ICD10PXPrimaryId"),
+                ChipKey.InsurancePlan1ID => new StrategicColumn("InsurancePlan1Id", "dsspes", "InsurancePlan1Id"),
+                ChipKey.IsGreaterThanZeroCharges => new StrategicColumn("TotalCharges", "dsspes", "TotalCharges"),
+                ChipKey.LocationID => new StrategicColumn("LocationId", "dsspes", "LocationId"),
+                ChipKey.Mortality => new StrategicColumn("DischargeStatusId", "dsspes", "DischargeStatusId"),
+                ChipKey.NewBornFlagID => new StrategicColumn("NewBornFlagId", "dsspes", "NewBornFlagId"),
+                ChipKey.PatientTypeID => new StrategicColumn("PatientTypeId", "dsspes", "PatientTypeId"),
+                ChipKey.PrimaryCPTID => new StrategicColumn("PrimaryCPTId", "dsspes", "PrimaryCPTId"),
+                ChipKey.PrimaryPhysicianID => new StrategicColumn("PrimaryPhysicianId", "dsspes", "PrimaryPhysicianId"),
+                ChipKey.PrimaryQVIID => new StrategicColumn("PrimaryQVIId", "dsspes", "PrimaryQVIId"),
+                ChipKey.SourceSystemID => new StrategicColumn("SourceSystemId", "dsspes", "SourceSystemId"),
+                ChipKey.BilledCPT => new StrategicColumn("BilledCPTId", "pblid", "BilledCPTId"),
+                ChipKey.Supply => new StrategicColumn("SupplyId", "pblid", "SupplyId"),
+                ChipKey.UBRevenueCode => new StrategicColumn("UBRevenueCodeId", "pblid", "UBRevenueCodeId"),
+                ChipKey.Department => new StrategicColumn("DepartmentId", "pblid", "DepartmentId"),
+                ChipKey.MSDRGRollupID => new StrategicColumn("msdrgRollupId", "msdrg", "msdrgRollupId"),
+                ChipKey.ChargeCode => new StrategicColumn("ChargeCodeId", "cc", "ChargeCodeId"),
+                _ => null
+            };
+        }
+
+        private async Task<List<QueryValue>> GetMeasureValues(MeasureType measure, List<DataTable> dataTables, CancellationToken cancellationToken)
+        {
+            var values = new List<QueryValue>();
+            if (measure != MeasureType.EncountersCases)
+            {
+                var column = measure switch
+                {
+                    MeasureType.UnitsOfService or MeasureType.UnitsOfServicePerCase => new StrategicColumn("UnitsOfService", "pblid", "UnitsOfService"),
+                    MeasureType.DirectVariableCost or MeasureType.DirectVariableCostPerCase
+                        or MeasureType.DirectVariableCostPerUnit => new StrategicColumn("VariableDirectCost", "costdetail", "VariableDirectCost"),
+                    MeasureType.TotalDirectCost or MeasureType.TotalDirectCostPerCase
+                        or MeasureType.TotalDirectCostPerUnit => new StrategicColumn("DirectCost", "costdetail", "DirectCost"),
+                    MeasureType.TotalCharges or MeasureType.TotalChargesPerCase
+                        or MeasureType.TotalChargesPerUnit => new StrategicColumn("Charge", "pblid", "Charge"),
+                    MeasureType.AcquisitionSupplyCost or MeasureType.AcquisitionSupplyCostPerCase
+                        or MeasureType.AcquisitionSupplyCostPerUnit => new StrategicColumn("SupplyTotalCost", "pblid", "SupplyTotalCost"),
+                    MeasureType.Days => new StrategicColumn("Days", "pblid", "Days"),
+                    MeasureType.AverageLengthOfStay => new StrategicColumn("LengthOfStay", "dsspes", "LengthOfStay"),
+                    _ => null
+                };
+                // add margin measure 
+                if (column != null)
+                {
+                    var dataColumn = await GetDataColumn(column, dataTables, cancellationToken);
+                    if (dataColumn != null)
+                    {
+                        values.Add(new QueryValue()
+                        {
+                            Calculation = $"SUM([{dataColumn.DataColumnId}])",
+                            ColumnAlias = "Value"
+                        });
+                    }
+                }
+                if (MeasureTypeConstants.PER_UNIT_MEASURE_TYPES.Contains(measure))
+                {
+                    var unitsOfService = await GetDataColumn(new StrategicColumn("UnitsOfService", "pblid", "UnitsOfService"), dataTables, cancellationToken);
+                    if (unitsOfService != null)
+                    {
+                        values.Add(new QueryValue()
+                        {
+                            Calculation = $"SUM([{unitsOfService.DataColumnId}])",
+                            ColumnAlias = "UnitsOfService"
+                        });
+                    }
+                }
+                if (MeasureTypeConstants.MARGIN_MEASURE_TYPES.Contains(measure))
+                {
+                    var variableDirectCost = await GetDataColumn(new StrategicColumn("VariableDirectCost", "costdetail", "VariableDirectCost"), dataTables, cancellationToken);
+                    switch (measure)
+                    {
+                        case MeasureType.ContributionMargin:
+                        case MeasureType.ContributionMarginPerCase:
+                            {
+                                if (variableDirectCost != null)
+                                {
+                                    values.Add(new QueryValue()
+                                    {
+                                        Calculation = $"SUM([{variableDirectCost.DataColumnId}])",
+                                        ColumnAlias = "Value"
+                                    });
+                                }
+                                break;
+                            }
+                        case MeasureType.DirectMargin:
+                        case MeasureType.DirectMarginPerCase:
+                            {
+                                var fixedDirectCost = await GetDataColumn(new StrategicColumn("FixedDirectCost", "costdetail", "FixedDirectCost"), dataTables, cancellationToken);
+
+                                if (variableDirectCost != null && fixedDirectCost != null)
+                                {
+                                    values.Add(new QueryValue()
+                                    {
+                                        Calculation = $"SUM([{variableDirectCost.DataColumnId}] + [{fixedDirectCost.DataColumnId}])",
+                                        ColumnAlias = "Value"
+                                    });
+                                }
+                                break;
+                            }
+                        case MeasureType.TotalMargin:
+                        case MeasureType.MarginPerCase:
+                            {
+                                var variableIndirectCost = await GetDataColumn(new StrategicColumn("VariableIndirectCost", "costdetail", "VariableIndirectCost"), dataTables, cancellationToken);
+                                var fixedDirectCost = await GetDataColumn(new StrategicColumn("FixedDirectCost", "costdetail", "FixedDirectCost"), dataTables, cancellationToken);
+                                var fixedIndirectCost = await GetDataColumn(new StrategicColumn("FixedIndirectCost", "costdetail", "FixedIndirectCost"), dataTables, cancellationToken);
+
+                                if (variableDirectCost != null && variableIndirectCost != null && fixedDirectCost != null && fixedIndirectCost != null)
+                                {
+                                    values.Add(new QueryValue()
+                                    {
+                                        Calculation = $"SUM([{variableDirectCost.DataColumnId}] + [{variableIndirectCost.DataColumnId}] + [{fixedDirectCost.DataColumnId}] + [{fixedIndirectCost.DataColumnId}])",
+                                        ColumnAlias = "Value"
+                                    });
+                                }
+                                break;
+                            }
+                        case MeasureType.VariableMargin:
+                        case MeasureType.VariableMarginPerCase:
+                            {
+                                var variableIndirectCost = await GetDataColumn(new StrategicColumn("VariableIndirectCost", "costdetail", "VariableIndirectCost"), dataTables, cancellationToken);
+
+                                if (variableDirectCost != null && variableIndirectCost != null)
+                                {
+                                    values.Add(new QueryValue()
+                                    {
+                                        Calculation = $"SUM([{variableDirectCost.DataColumnId}] + [{variableIndirectCost.DataColumnId}])",
+                                        ColumnAlias = "Value"
+                                    });
+                                }
+                                break;
+                            }
+                    }
+                }
+            }
+
+            return values;
+        }
+
+        private async Task UpdateLastRunTracking(StrategicOpportunityChargeCode opportunity, RunTrackingStatus status, CancellationToken cancellationToken)
+        {
+            opportunity.LastRunTrackingDate = DateTime.UtcNow;
+            opportunity.LastRunTrackingStatus = status;
+            _centralDbContext.StrategicOpportunityChargeCodes.Update(opportunity);
+            await _centralDbContext.SaveChangesAsync(cancellationToken);
+            await strategicItemDimensionSyncService.UpsertAsync(opportunity, cancellationToken);
+        }
+
+        private async Task PopulateTransientChargeCodeIds(IEnumerable<string> idsList, long opportunityId, CancellationToken cancellationToken)
+        {
+            var sql = $@"
+                CREATE OR REPLACE TRANSIENT TABLE cci.StrategicChargeCodeIds_{opportunityId} (ChargeCodeId INTEGER) AS
+                {GetSqlSelectChargeCodeIds(idsList, false)}
+            ";
+
+            await databaseContext.ExecuteCommandAsync(sql);
+        }
+
+        private string GetSqlSelectChargeCodeIds(IEnumerable<string> idsList, bool withCte)
+        {
+            var invalidId = idsList.FirstOrDefault(x => !long.TryParse(x, out _));
+            if (invalidId != default)
+                throw new InvalidOperationException($"Invalid ChargeCodeId: {invalidId}");
+
+            var selectSql = $@"
+                SELECT *
+                FROM (
+                    VALUES {string.Join(",", idsList.Select(id => $"({id})"))}
+                )
+            ";
+
+            return withCte ? $@"
+                WITH StrategicChargeCodeIds_CTE (ChargeCodeId) AS (
+                    {selectSql}
+                )
+            " : selectSql;
+        }
+
+        private async Task<IEnumerable<string>> GetChargeCodeIds(string chargeCodeHPath, CancellationToken cancellationToken)
+        {
+            var idsList = new List<string>();
+            var chargeCodeDimension = await schemaServiceClient.GetDimensionByGlobalIdAsync("Charge Code");
+            var hierarchyPaths = chargeCodeHPath.Split(",");
+            foreach (var batch in hierarchyPaths.Batch(250))
+            {
+                var members = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(chargeCodeDimension.DimensionGuid, batch, cancellationToken);
+                idsList.AddRange(members.Select(x => x.Id));
+            }
+
+            if (idsList.Count == 0)
+            {
+                throw new InvalidOperationException("No Charge Codes found for the provided hierarchy paths.");
+            }
+
+            return idsList;
+        }
+
+        private async Task CleanupTransientChargeCodeIds(StrategicOpportunityChargeCode opportunity)
+        {
+            var dropSql = $"DROP TABLE IF EXISTS cci.StrategicChargeCodeIds_{opportunity.OpportunityId};";
+            await databaseContext.ExecuteCommandAsync(dropSql);
+        }
+
+        private string ApplyExplorationFilters(StrategicOpportunityChargeCode opportunity, string selectQuery, 
+            List<KeyValuePair<string, object>> parameters, string ctfSummaryQuery)
+        {
+            selectQuery = System.Text.RegularExpressions.Regex.Replace(
+                selectQuery,
+                @"(INNER|LEFT|RIGHT)\s+JOIN\s+CCI\.FACTEXPLORATIONPOPULATIONENCOUNTER",
+                "INNER JOIN ( " + ctfSummaryQuery + " ) ",
+                System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+            selectQuery = selectQuery.Replace(
+                "EXPLORATIONPOPULATIONENCOUNTER.EncounterId",
+                "EXPLORATIONPOPULATIONENCOUNTER.\"FilterEncounterId\"",
+                StringComparison.CurrentCultureIgnoreCase
+            );
+            selectQuery = selectQuery.Replace(
+                "EXPLORATIONPOPULATIONENCOUNTER.ExplorationPopulationId",
+                opportunity.ExplorationPopulationId.ToString(),
+                StringComparison.CurrentCultureIgnoreCase
+            );
+            return selectQuery;
+        }
+
+        private async Task<(QueryParams queryParams, string ctfSummaryQuery)> GetExplorationQuery(long explorationPopulationId, DateOnly startDate, DateOnly endDate, CancellationToken cancellationToken)
+        {
+            var isUsingAprdrg = await IsUsingAprdrgAsync(cancellationToken);
+            var exploration = await centralDbContext.ExplorationPopulations.FirstOrDefaultAsync(e => e.ExplorationPopulationId == explorationPopulationId, cancellationToken);
+
+            var queryParams = new QueryParams
+            {
+                CodeType = isUsingAprdrg ? CaseTypeCategories.APRDRG : CaseTypeCategories.MSDRG,
+                CaseTypeFamilyId = exploration.CaseTypeFamilyId
+            };
+
+            var expFilters = exploration.FilterChipItems;
+            var dateFilters = expFilters.FirstOrDefault(f => f.ChipType == ChipType.DateRange);
+            dateFilters.DateRange = new List<DateTime>
+            {
+                startDate.ToDateTime(TimeOnly.MinValue),
+                // Info: Don't need to add 1 day to end date here like we do in other places because the exploration filter service will handle date range as inclusive and add 1 day to end date internally
+                endDate.ToDateTime(TimeOnly.MinValue)
+            };
+            var filters = await explorationFilterService.GetFilterStringsAsync(expFilters, queryParams, cancellationToken);
+            var ctfSummaryQuery = ExplorationServiceQuery.BuildCaseTypeFamilySummaryEncounterQuery(filters.QueryFilters, filters.EncounterSummaryFilters);
+            return (queryParams, ctfSummaryQuery);
+        }
+
+        private async Task UpdateSystemMeasures(StrategicOpportunityChargeCode opportunity, MeasureType measureType, CancellationToken cancellationToken)
+        {
+            var measure = await _centralDbContext.StrategicOpportunityMeasures.FirstOrDefaultAsync(m => m.OpportunityId == opportunity.OpportunityId && m.StrataId == _user.GetStrataId() && m.MeasureGroup == Enums.MeasureGroup.System && m.MeasureType == measureType, cancellationToken);
+            var trackingMonths = DateExtensions.GetMonthDifference(opportunity.TrackingStartDate, measureType == MeasureType.ActualCost ? DateOnly.FromDateTime(opportunity.LastRunTrackingDate!.Value) : opportunity.TrackingEndDate, true);
+
+            if (measure != null)
+            {
+                var query = strategicOpportunityDetailQueryBuilder.BuildMergeSystemMeasureMergeQuery(opportunity.OpportunityId, measure.MeasureId, measureType, opportunity.TrackingStartDate.ToString(DateExtensions.MEASURE_FORMAT_YYYY_MM_DD), trackingMonths);
+                await databaseContext.ExecuteCommandAsync(query);
+            }
+        }
+
+        private class MeasureFilterDto
+        {
+            internal List<FilterChipItem> MeasureFilters { get; set; }
+            internal bool FiltersForMeasure { get; set; }
+            internal MeasureType MeasureType { get; set; }
+            internal Dictionary<string, FilterCondition> MarginMeasureFilters { get; set; } = new Dictionary<string, FilterCondition>();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicColumn.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicColumn.cs
new file mode 100644
index 0000000..b815565
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicColumn.cs
@@ -0,0 +1,17 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public class StrategicColumn
+    {
+        public StrategicColumn(string columnName, string tableAlias, string columnAlias)
+        {
+            ColumnName = columnName;
+            TableAlias = tableAlias;
+            ColumnAlias = columnAlias;
+        }
+
+        public string ColumnName { get; set; }
+        public string TableAlias { get; set; }
+        public string ColumnAlias { get; set; }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicGLOpportunityDetailService.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicGLOpportunityDetailService.cs
new file mode 100644
index 0000000..72f87b1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicGLOpportunityDetailService.cs
@@ -0,0 +1,306 @@
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.Schema.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public class StrategicGLOpportunityDetailService(
+        CentralDbContext centralDbContext,
+        IClaimsPrincipalAccessor claimsPrincipalAccessor,
+        ISchemaServiceClient schemaServiceClient,
+        ISnowflakeDatabaseContext databaseContext,
+        IGLDataSourceStrategy glDataSourceStrategy,
+        IDistributionProcessFactory distributionProcessFactory,
+        IHubContext<NotificationHub, INotificationHub> notificationHubContext,
+        IStrategicItemDimensionSyncService strategicItemDimensionSyncService,
+        ILogger<StrategicGLOpportunityDetailService> logger = default) : IStrategicGLOpportunityDetailService
+    {
+        private readonly CentralDbContext _centralDbContext = centralDbContext;
+        private readonly ClaimsPrincipal _user = claimsPrincipalAccessor?.GetCurrentClaimsPrincipal();
+        public async Task<StrategicOpportunityGLDetailData> GetStrategicOpportunityGLDetailData(long opportunityId, bool isTracking, string[] strDimensions, CancellationToken cancellationToken)
+        {
+            var dimensions = strDimensions.Select(x => StrategicOpportunityDetailDimension.GetFromString(x)).ToList();
+            if (dimensions.Any(x => x == null)) return null;
+
+            var dicDimensionSql = StrategicOpportunityGLServiceQuery.GetDetailQuery(dimensions, false);
+            var queryCount = dicDimensionSql.Count;
+            if (queryCount == 0) return null;
+            var querySelect = string.Join(Environment.NewLine, dicDimensionSql.Values);
+
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunities.FirstOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+            if (strategicOpportunity == null) return null;
+
+            // NOTE: @IsBaseline is substituted as a literal string, not a bound parameter.
+            // When isTracking=false, "NULL" is injected so the SQL short-circuit
+            // (@IsBaseline IS NULL OR IsBaseline = @IsBaseline) returns all rows.
+            // Any new dimension SQL file using @IsBaseline MUST follow this same pattern.
+            var parametersReplace = new Dictionary<string, string>
+            {
+                { "@OpportunityId", opportunityId.ToString() },
+                { "@IsBaseline", isTracking ? "False" : "NULL" }
+            };
+            foreach (var x in parametersReplace)
+            {
+                querySelect = querySelect.Replace(x.Key, x.Value);
+            }
+
+            var queryOneParams = new Dictionary<string, object>
+            {
+                { "MULTI_STATEMENT_COUNT", queryCount }
+            };
+
+            var data = new StrategicOpportunityGLDetailData()
+            {
+                DimensionsData = dimensions.ToDictionary(x => x.ToString(), x => new Dictionary<string, string>()),
+                Data = []
+            };
+
+            try
+            {
+                var results = await databaseContext.QueryMultipleAsync(querySelect, "GL Entity Detail", queryOneParams);
+                foreach (var strDimension in dicDimensionSql.Keys.Where(data.DimensionsData.ContainsKey))
+                {
+                    var dimension = StrategicOpportunityDetailDimension.GetFromString(strDimension);
+                    var isStringKey = StrategicOpportunityService.GLDimensionsConfig.TryGetValue(dimension, out var dimConfig) && dimConfig.IsKeyString;
+                    data.DimensionsData[strDimension] = isStringKey
+                        ? results.Read<KeyValuePair<string, string>>().ToDictionary(x => x.Key, x => x.Value)
+                        : results.Read<KeyValuePair<int, string>>().ToDictionary(x => x.Key.ToString(), x => x.Value);
+                }
+
+                data.Data = results.Read<StrategicOpportunityGLDetail>();
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, info: new Dictionary<string, object> { { "query", querySelect }, { "queryParams", queryOneParams } });
+                throw;
+            }
+
+            return data;
+        }
+
+        public async Task PopulateStrategicOpportunityGLDetails(StrategicOpportunityGL opportunity, CancellationToken cancellationToken)
+        {
+            var departmentIds = await ResolveDimensionIds("Department", opportunity.DepartmentHPath, cancellationToken);
+            var (revenueAccountIds, expenseAccountIds, statisticAccountIds) = await ResolveAccountIdsByType(opportunity, cancellationToken);
+            var sourceTable = await glDataSourceStrategy.GetGLFactTableAsync();
+
+            var queryBuilder = new StrategicOpportunityGLDetailQueryBuilder();
+            var deleteSql = queryBuilder.BuildDeleteQuery(opportunity.OpportunityId);
+            var insertSql = queryBuilder.BuildInsertQuery(opportunity.OpportunityId, sourceTable, departmentIds, revenueAccountIds, expenseAccountIds, statisticAccountIds, opportunity.BaselineStartDate, opportunity.BaselineEndDate);
+
+            await databaseContext.QueryAsync<StrategicOpportunityGLDetail>(deleteSql, $"{nameof(PopulateStrategicOpportunityGLDetails)}.Delete");
+            await databaseContext.QueryAsync<StrategicOpportunityGLDetail>(insertSql, $"{nameof(PopulateStrategicOpportunityGLDetails)}.Insert");
+
+            await PopulateStrategicOpportunityGLGoalDetails(opportunity, DistributionStage.FromSourceToOpportunity, true, cancellationToken);
+        }
+
+        public async Task PopulateStrategicOpportunityGLGoalDetails(StrategicOpportunityGL opportunity, DistributionStage stage, bool isSaveChanges, CancellationToken cancellationToken)
+        {
+            var rampUps = await _centralDbContext.StrategicOpportunityRampUps
+                .Where(x => x.OpportunityId == opportunity.OpportunityId)
+                .OrderBy(x => x.MonthNumber)
+                .Select(x => x.Percentage)
+                .ToArrayAsync(cancellationToken);
+
+            var distributionProcessGL = distributionProcessFactory.CreateDistributionProcessGL(
+                opportunity.OpportunityId,
+                new Shared.Period<DateOnly>(opportunity.BaselineStartDate, opportunity.BaselineEndDate),
+                new Shared.Period<DateOnly>(opportunity.BaselineEndDate.AddMonths(1), opportunity.BaselineEndDate.AddMonths(opportunity.EstimatedTrackingDuration)),
+                new Shared.Period<DateOnly>(opportunity.TrackingStartDate, opportunity.TrackingEndDate),
+                rampUps
+            );
+
+            var distributionSummary = await distributionProcessGL.DistributeAsync(opportunity.BaselineDistribution, stage);
+            opportunity.TotalImprovement = distributionSummary.ImprovementSum;
+            opportunity.EstimatedGoal = distributionSummary.EstimatedGoalSum;
+
+            if (isSaveChanges) await _centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task PopulateGLDetailGoalSummary(StrategicOpportunityGL opportunity, double[] rampUps, bool isSaveChanges, CancellationToken cancellationToken)
+        {
+            if (rampUps == null)
+            {
+                rampUps = await _centralDbContext.StrategicOpportunityRampUps
+                    .Where(x => x.OpportunityId == opportunity.OpportunityId)
+                    .OrderBy(x => x.MonthNumber)
+                    .Select(x => x.Percentage)
+                    .ToArrayAsync(cancellationToken);
+            }
+
+            var distributionProcessGL = distributionProcessFactory.CreateDistributionProcessGL(
+                opportunity.OpportunityId,
+                new Shared.Period<DateOnly>(opportunity.BaselineStartDate, opportunity.BaselineEndDate),
+                new Shared.Period<DateOnly>(opportunity.BaselineEndDate.AddMonths(1), opportunity.BaselineEndDate.AddMonths(opportunity.EstimatedTrackingDuration)),
+                new Shared.Period<DateOnly>(opportunity.TrackingStartDate, opportunity.TrackingEndDate),
+                rampUps
+            );
+
+            var distributionSummary = await distributionProcessGL.GetDistributionSummaryAsync(false);
+            opportunity.TotalImprovement = distributionSummary.ImprovementSum;
+            opportunity.EstimatedGoal = distributionSummary.EstimatedGoalSum;
+
+            if (isSaveChanges) await _centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task PopulateStrategicOpportunityCommittedDetails(StrategicOpportunityGL opportunity, DistributionStage stage, bool isSaveChanges, CancellationToken cancellationToken)
+        {
+            var rampUps = await _centralDbContext.StrategicOpportunityRampUps
+                .Where(x => x.OpportunityId == opportunity.OpportunityId)
+                .OrderBy(x => x.MonthNumber)
+                .Select(x => x.Percentage)
+                .ToArrayAsync(cancellationToken);
+
+            var distributionProcessGL = distributionProcessFactory.CreateDistributionProcessGL(
+                opportunity.OpportunityId,
+                new Shared.Period<DateOnly>(opportunity.BaselineStartDate, opportunity.BaselineEndDate),
+                new Shared.Period<DateOnly>(opportunity.BaselineEndDate.AddMonths(1), opportunity.BaselineEndDate.AddMonths(opportunity.EstimatedTrackingDuration)),
+                new Shared.Period<DateOnly>(opportunity.TrackingStartDate, opportunity.TrackingEndDate),
+                rampUps
+            );
+
+            var distributionSummary = await distributionProcessGL.DistributeAsync(opportunity.BaselineDistribution, stage);
+            opportunity.TotalCommittedCost = distributionSummary.CommittedSum;
+
+            if (isSaveChanges) await _centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task UpdateDetailCommittedByRampUp(StrategicOpportunityGL opportunity, double[] oldRampUps, double[] newRampUps, bool isSaveChanges, CancellationToken cancellationToken)
+        {
+            var distributionProcessGL = distributionProcessFactory.CreateDistributionProcessGL(
+                opportunity.OpportunityId,
+                new Shared.Period<DateOnly>(opportunity.BaselineStartDate, opportunity.BaselineEndDate),
+                new Shared.Period<DateOnly>(opportunity.BaselineEndDate.AddMonths(1), opportunity.BaselineEndDate.AddMonths(opportunity.EstimatedTrackingDuration)),
+                new Shared.Period<DateOnly>(opportunity.TrackingStartDate, opportunity.TrackingEndDate),
+                newRampUps
+            );
+
+            var distributionSummary = await distributionProcessGL.UpdateDetailCommittedByRampUp(oldRampUps);
+            opportunity.TotalCommittedCost = distributionSummary.CommittedSum;
+
+            if (isSaveChanges) await _centralDbContext.SaveChangesAsync(cancellationToken);
+        }
+
+        public async Task<bool> UpdateStrategicOpportunityGLDetailsData(long opportunityId, IEnumerable<StrategicOpportunityGLAdjustment> adjustments, IEnumerable<string> rows, CancellationToken cancellationToken)
+        {
+            try
+            {
+                var opportunity = await _centralDbContext.StrategicOpportunityGLs.SingleOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+                if (opportunity == null) return false;
+
+                var queryBuilder = new StrategicOpportunityGLUpdateQueryBuilder();
+                var (updateQuery, parameters) = queryBuilder.BuildUpdateQuery(adjustments, opportunityId, rows);
+                await databaseContext.QueryAsync<StrategicOpportunityGLDetail>(updateQuery, nameof(UpdateStrategicOpportunityGLDetailsData), parameters);
+
+                opportunity.Status = (byte)StrategicOpportunityStatus.InValidation;
+
+                await PopulateGLDetailGoalSummary(opportunity, null, false, cancellationToken);
+
+                await _centralDbContext.SaveChangesAsync(cancellationToken);
+                await strategicItemDimensionSyncService.UpsertAsync(opportunity, cancellationToken);
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, ex.Message);
+                throw;
+            }
+        }
+
+        public async Task PopulateTrackingDetails(StrategicOpportunityGL opportunity, CancellationToken cancellationToken)
+        {
+            var hub = notificationHubContext.Clients.Group(opportunity.OpportunityId.ToString());
+
+            try
+            {
+                if (opportunity.Status == (byte)StrategicOpportunityStatus.Tracking)
+                {
+                    var departmentIds = await ResolveDimensionIds("Department", opportunity.DepartmentHPath, cancellationToken);
+                    var (revenueAccountIds, expenseAccountIds, statisticAccountIds) = await ResolveAccountIdsByType(opportunity, cancellationToken);
+                    var sourceTable = await glDataSourceStrategy.GetGLFactTableAsync();
+
+                    var queryBuilder = new StrategicOpportunityGLDetailQueryBuilder();
+                    var mergeSql = queryBuilder.BuildMergeQuery(opportunity.OpportunityId, sourceTable, departmentIds, revenueAccountIds, expenseAccountIds, statisticAccountIds, opportunity.TrackingStartDate, opportunity.TrackingEndDate);
+                    await databaseContext.QueryAsync<StrategicOpportunityGLDetail>(mergeSql, $"{nameof(PopulateTrackingDetails)}.Merge");
+
+                    var actualCost = await databaseContext.ExecuteScalarAsync<double>($"SELECT COALESCE(SUM(Amount), 0) FROM {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} WHERE IsBaseline = FALSE AND OpportunityId = {opportunity.OpportunityId}");
+                    var committedCost = await databaseContext.ExecuteScalarAsync<double>(@$"SELECT COALESCE(SUM(GoalAmount), 0) FROM {StrategicOpportunityService.StrategicOpportunityGLDetailTableName} WHERE IsBaseline = FALSE
+                    AND (FiscalYearId < {DateTime.UtcNow.Year} OR (FiscalYearId = {DateTime.UtcNow.Year} AND FiscalMonthId <= {DateTime.UtcNow.Month})) AND OpportunityId = {opportunity.OpportunityId}");
+
+                    opportunity.ProgressToDateActual = actualCost;
+                    opportunity.ProgressToDateCommitted = committedCost;
+                    await _centralDbContext.SaveChangesAsync(cancellationToken);
+                }
+
+                await UpdateLastRunTracking(opportunity, RunTrackingStatus.Success, cancellationToken);
+                await hub.SendStrategicInitiativeTrackerSuccess(opportunity.OpportunityId.ToString(), (byte)opportunity.LastRunTrackingStatus, opportunity.LastRunTrackingDate);
+            }
+            catch (Exception ex)
+            {
+                await UpdateLastRunTracking(opportunity, RunTrackingStatus.Failed, cancellationToken);
+                await hub.SendStrategicInitiativeTrackerError(opportunity.OpportunityId.ToString(), (byte)opportunity.LastRunTrackingStatus, opportunity.LastRunTrackingDate);
+                logger.LogServiceError(ex, ex.Message);
+                throw;
+            }
+        }
+
+        private async Task<List<int>> ResolveDimensionIds(string globalId, string hPath, CancellationToken cancellationToken)
+        {
+            var idsList = new List<int>();
+            if (string.IsNullOrEmpty(hPath)) return idsList;
+
+            var dimension = await schemaServiceClient.GetDimensionByGlobalIdAsync(globalId);
+            var hierarchyPaths = hPath.Split(",");
+            foreach (var batch in hierarchyPaths.Batch(250))
+            {
+                var members = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid, batch, cancellationToken);
+                idsList.AddRange(members.Select(x => int.Parse(x.Id)));
+            }
+            return idsList;
+        }
+
+        private async Task<(List<int> Revenue, List<int> Expense, List<int> Statistic)> ResolveAccountIdsByType(StrategicOpportunityGL opportunity, CancellationToken cancellationToken)
+        {
+            var revenueIds = string.IsNullOrEmpty(opportunity.RevenueAccountHPath)
+                ? []
+                : await ResolveDimensionIds("Account", opportunity.RevenueAccountHPath, cancellationToken);
+
+            var expenseIds = string.IsNullOrEmpty(opportunity.ExpenseAccountHPath)
+                ? []
+                : await ResolveDimensionIds("Account", opportunity.ExpenseAccountHPath, cancellationToken);
+
+            var statisticIds = opportunity.HasStatistic && !string.IsNullOrEmpty(opportunity.StatisticAccountHPath)
+                ? await ResolveDimensionIds("Account", opportunity.StatisticAccountHPath, cancellationToken)
+                : [];
+
+            return (revenueIds, expenseIds, statisticIds);
+        }
+
+        private async Task UpdateLastRunTracking(StrategicOpportunity opportunity, RunTrackingStatus status, CancellationToken cancellationToken)
+        {
+            opportunity.LastRunTrackingDate = DateTime.UtcNow;
+            opportunity.LastRunTrackingStatus = status;
+            await _centralDbContext.SaveChangesAsync(cancellationToken);
+            await strategicItemDimensionSyncService.UpsertAsync(opportunity, cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicInitiativeChargeCodeExportService.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicInitiativeChargeCodeExportService.cs
new file mode 100644
index 0000000..29f743d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicInitiativeChargeCodeExportService.cs
@@ -0,0 +1,213 @@
+using ClosedXML.Excel;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Data;
+using System.Linq;
+using static Strata.ContinuousImprovement.Biz.Export.ExportUtils;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public class StrategicInitiativeChargeCodeExportService(StrategicOpportunityLayout layout, StrategicOpportunity strategicOpportunity)
+    {
+        private readonly List<string> _allKeys = new List<string> { "totalEncounters", "totalUnits", "unitsPerEncounter", "costPerEncounter", "costPerUnit", "totalCommittedCost", "totalActualCost", "totalVariance", "progress" };
+        private readonly ImmutableList<string> _layoutCurrencyColumns = ImmutableList.Create("costPerEncounter", "costPerUnit", "totalCommittedCost", "totalActualCost", "totalVariance");
+        private readonly ImmutableList<string> _layoutNumberColumns = ImmutableList.Create("totalEncounters", "totalUnits", "unitsPerEncounter");
+        private readonly ImmutableDictionary<string, IEnumerable<string>> _layoutToColumns = new Dictionary<string, IEnumerable<string>>()
+        {
+            { "totalEncounters", new List<string>() { "MonthTotalDistinctEncounters", "PeriodTotalDistinctEncounters" } },
+            { "totalUnits", new List<string>() { "MonthTotalUnits", "PeriodTotalUnits" } },
+            { "unitsPerEncounter", new List<string>() { "MonthUnitsPerEncounter", "PeriodUnitsPerEncounter" } },
+            { "costPerEncounter", new List<string>() { "MonthVariableDirectCostPerEncounter", "PeriodVariableDirectCostPerEncounter" } },
+            { "costPerUnit", new List<string>() { "MonthVariableDirectCostPerUnit", "PeriodVariableDirectCostPerUnit" } },
+            { "totalCommittedCost", new List<string>() { "MonthTotalCommittedCost", "PeriodTotalCommittedCost" } },
+            { "totalActualCost", new List<string>() { "MonthTotalActualCost", "PeriodTotalActualCost" } },
+            { "totalVariance", new List<string>() { "MonthTotalVariance", "PeriodTotalVariance" } },
+            { "progress", new List<string>() { "MonthProgress", "PeriodProgress" } },
+        }.ToImmutableDictionary();
+
+        private readonly IImmutableDictionary<string, string> _layoutToColumnNames = new Dictionary<string, string>()
+        {
+            {"totalEncounters", "Total Distinct Encounters"},
+            {"totalUnits", "Total Units"},
+            {"unitsPerEncounter", "Units per Encounter"},
+            {"costPerEncounter", "Variable Direct Cost per Encounter"},
+            {"costPerUnit", "Variable Direct Cost per Unit"},
+            {"totalCommittedCost", "Total Committed Variable Direct Cost"},
+            {"totalActualCost", "Total Actual Variable Direct Cost"},
+            {"totalVariance", "Total Variance"},
+            {"progress", "Progress"}
+        }.ToImmutableDictionary();
+
+        private readonly IImmutableDictionary<string, Type> _layoutToColumnType = new Dictionary<string, Type>()
+        {
+            {"totalEncounters", typeof(double)},
+            {"totalUnits", typeof(double)},
+            {"unitsPerEncounter", typeof(double)},
+            {"costPerEncounter", typeof(double)},
+            {"costPerUnit", typeof(double)},
+            {"totalCommittedCost", typeof(double)},
+            {"totalActualCost", typeof(double)},
+            {"totalVariance", typeof(double)},
+            {"progress", typeof(string)}
+        }.ToImmutableDictionary();
+
+
+        public System.Data.DataTable MapStrategicInitiativeToDataTable(StrategicOpportunityDetailData periodList, StrategicOpportunityDetailData monthList)
+        {
+            System.Data.DataTable table = new System.Data.DataTable();
+            var rows = layout.Rows.Where(item => item != StrategicOpportunityDetailDimension.System.Value);
+            var columns = layout.Columns;
+            var monthDataByKey = monthList.Data.ToDictionary(m => m.Key);
+
+            foreach (var colName in rows.Select(r => StrategicChargeCodeExportHelper.LayoutToRows[r]))
+            {
+                table.Columns.Add(colName);
+            };
+
+            foreach (var col in _allKeys)
+            {
+                if (columns.Contains(col))
+                {
+                    IEnumerable<string> colInfo;
+                    _layoutToColumns.TryGetValue(col, out colInfo);
+
+                    if (colInfo != null)
+                    {
+                        var colName = colInfo.FirstOrDefault();
+                        table.Columns.Add(new System.Data.DataColumn(colName, _layoutToColumnType[col]) { Caption = _layoutToColumnNames[col] });
+                    }
+                }
+            };
+
+            foreach (var col in _allKeys)
+            {
+                if (columns.Contains(col))
+                {
+                    IEnumerable<string> colInfo;
+                    _layoutToColumns.TryGetValue(col, out colInfo);
+
+                    if (colInfo != null)
+                    {
+                        var colName = _layoutToColumns[col].LastOrDefault();
+                        table.Columns.Add(new System.Data.DataColumn(colName, _layoutToColumnType[col]) { Caption = $"{_layoutToColumnNames[col]} " });
+                    }
+                }
+            };
+
+            var sortedData = new List<StrategicOpportunityDetailGroupedWithParsedKey>();
+            periodList.Data.ForEach(d => sortedData.Add(new StrategicOpportunityDetailGroupedWithParsedKey(d, periodList.DimensionsData, rows)));
+
+            var data = sortedData.OrderBy(d => d.ParsedKey).Select(d => d.StrategicOpportunityDetailGrouped);
+            data.ForEach(periodItem =>
+            {
+                DataRow row = table.NewRow();
+                monthDataByKey.TryGetValue(periodItem.Key, out var monthItem);
+
+                StrategicChargeCodeExportHelper.SetRowData(row, periodItem.Key, layout.Rows.Where(r => r != StrategicOpportunityDetailDimension.System.Value), periodList.DimensionsData);
+
+                foreach (var c in layout.Columns)
+                {
+                    float periodEncounters = 0;
+                    float monthEncounters = 0;
+                    monthList.EncounterData.TryGetValue(periodItem.Key, out monthEncounters);
+                    periodList.EncounterData.TryGetValue(periodItem.Key, out periodEncounters);
+
+                    switch (c)
+                    {
+                        case "totalEncounters":
+                            row["MonthTotalDistinctEncounters"] = monthEncounters;
+                            row["PeriodTotalDistinctEncounters"] = periodEncounters;
+                            break;
+
+                        case "totalUnits":
+                            row["MonthTotalUnits"] = monthItem != null ? monthItem.Units : 0;
+                            row["PeriodTotalUnits"] = periodItem.Units;
+                            break;
+                        case "unitsPerEncounter":
+                            row["MonthUnitsPerEncounter"] = monthItem != null && monthEncounters != 0 ? monthItem.Units / monthEncounters : 0;
+                            row["PeriodUnitsPerEncounter"] = periodEncounters != 0 ? periodItem.Units / periodEncounters : 0;
+                            break;
+                        case "costPerEncounter":
+                            row["MonthVariableDirectCostPerEncounter"] = monthItem != null && monthEncounters != 0 ? monthItem.Cost / monthEncounters : 0;
+                            row["PeriodVariableDirectCostPerEncounter"] = periodEncounters != 0 ? periodItem.Cost / periodEncounters : 0;
+                            break;
+                        case "costPerUnit":
+                            row["MonthVariableDirectCostPerUnit"] = monthItem != null && monthItem.Units != 0 ? monthItem.Cost / monthItem.Units : 0;
+                            row["PeriodVariableDirectCostPerUnit"] = periodItem.Units != 0 ? periodItem.Cost / periodItem.Units : 0;
+                            break;
+                        case "totalCommittedCost":
+                            row["MonthTotalCommittedCost"] = monthItem != null ? monthItem.GoalCost : 0;
+                            row["PeriodTotalCommittedCost"] = periodItem.GoalCost;
+                            break;
+
+                        case "totalActualCost":
+                            row["MonthTotalActualCost"] = monthItem != null ? monthItem.Cost : 0;
+                            row["PeriodTotalActualCost"] = periodItem.Cost;
+                            break;
+
+                        case "totalVariance":
+                            row["MonthTotalVariance"] = monthItem != null ? monthItem.Cost - monthItem.GoalCost : 0;
+                            row["PeriodTotalVariance"] = periodItem.Cost - periodItem.GoalCost;
+                            break;
+
+                        case "progress":
+                            row["MonthProgress"] = strategicOpportunity.Status != (byte)StrategicOpportunityStatus.NewInitiative ? (monthItem != null ? monthItem.Cost - monthItem.GoalCost <= 0 : true) ? "On Track" : "Off Track" : string.Empty;
+                            row["PeriodProgress"] = strategicOpportunity.Status != (byte)StrategicOpportunityStatus.NewInitiative ? periodItem.Cost - periodItem.GoalCost <= 0 ? "On Track" : "Off Track" : string.Empty;
+                            break;
+                    }
+                }
+
+                table.Rows.Add(row);
+            });
+
+            return table;
+        }
+
+        public Export.ExportOptions GetExportOptions()
+        {
+            var exportOptions = new Export.ExportOptions { EmptyMessage = "No Initiatives" };
+
+            _layoutToColumnNames.ForEach((name) =>
+            {
+                if (layout.Columns.Contains(name.Key))
+                {
+                    if (_layoutCurrencyColumns.Contains(name.Key))
+                    {
+                        exportOptions.AddColumnOptions(name.Value, ExcelCurrencyFormatWithDecimals);
+                        exportOptions.AddColumnOptions($"{name.Value} ", ExcelCurrencyFormatWithDecimals);
+
+                    }
+                    else if (_layoutNumberColumns.Contains(name.Key))
+                    {
+                        exportOptions.AddColumnOptions(name.Value, "Accounting2Dec");
+                        exportOptions.AddColumnOptions($"{name.Value} ", "Accounting2Dec");
+                    }
+                }
+            });
+
+            return exportOptions;
+        }
+
+        public void StyleWorkSheet(XLWorkbook wb, DateOnly startDate, DateOnly endDate)
+        {
+            var ws = wb.Worksheets.First();
+            ws.Name = "Charge Code Initiative";
+
+            var table = ws.Tables.First();
+            var rowCount = layout.Rows.Where(r => r != StrategicOpportunityDetailDimension.System.Value).Count();
+            var columnCount = layout.Columns.Count();
+
+            if (columnCount > 0)
+            {
+                var progressCol = ws.Range(1, rowCount + columnCount + 1, 1, rowCount + columnCount + columnCount).Merge().SetValue($"Progress to Date ({DateExtensions.GetMonthDifference(startDate, endDate, true)} months)");
+                var monthCol = ws.Range(1, rowCount + 1, 1, rowCount + columnCount).Merge().SetValue(endDate.ToString("MMM, yyyy"));
+                StrategicChargeCodeExportHelper.StyleWorkSheet(table, [progressCol, monthCol]);
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicItemDimensionSyncService.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicItemDimensionSyncService.cs
new file mode 100644
index 0000000..74ff8f3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicItemDimensionSyncService.cs
@@ -0,0 +1,189 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public class StrategicItemDimensionSyncService(
+        IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+        CentralDbContext centralDbContext,
+        ISnowflakeDatabaseContext databaseContext) : IStrategicItemDimensionSyncService
+    {
+        public async Task UpsertAsync(StrategicOpportunity opportunity, CancellationToken cancellationToken)
+        {
+            if (opportunity == null)
+                throw new ArgumentNullException(nameof(opportunity));
+
+            var userGuids = new List<Guid>();
+            if (opportunity.CostLeaderGuid != Guid.Empty)
+                userGuids.Add(opportunity.CostLeaderGuid);
+            if (opportunity.ExecutiveSponsorGuid != Guid.Empty)
+                userGuids.Add(opportunity.ExecutiveSponsorGuid);
+            if (opportunity.OwnerGuid != Guid.Empty)
+                userGuids.Add(opportunity.OwnerGuid);
+
+            var stakeholderLinks = await centralDbContext.StakeholdersLinks
+                .Where(s => s.StrategicOpportunityId == opportunity.OpportunityId)
+                .ToListAsync(cancellationToken);
+
+            if (stakeholderLinks.Any())
+                userGuids.AddRange(stakeholderLinks.Select(s => s.UserGuid).Where(g => g != Guid.Empty));
+
+            var userNames = new Dictionary<Guid, string>();
+            if (userGuids.Any())
+            {
+                var distinctGuids = userGuids.Distinct().ToList();
+                await using var jazzDbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
+                var profiles = await jazzDbContext.UserProfiles
+                    .Where(up => distinctGuids.Contains(up.UserGuid))
+                    .ToListAsync(cancellationToken);
+                userNames = profiles.ToDictionary(up => up.UserGuid, up => up.GetDisplayName());
+            }
+
+            var costLeader = opportunity.CostLeaderGuid != Guid.Empty && userNames.ContainsKey(opportunity.CostLeaderGuid)
+                ? userNames[opportunity.CostLeaderGuid] : string.Empty;
+            var executiveSponsor = opportunity.ExecutiveSponsorGuid != Guid.Empty && userNames.ContainsKey(opportunity.ExecutiveSponsorGuid)
+                ? userNames[opportunity.ExecutiveSponsorGuid] : string.Empty;
+            var owner = opportunity.OwnerGuid != Guid.Empty && userNames.ContainsKey(opportunity.OwnerGuid)
+                ? userNames[opportunity.OwnerGuid] : string.Empty;
+
+            var stakeholderNames = stakeholderLinks
+                .Select(s => userNames.ContainsKey(s.UserGuid) ? userNames[s.UserGuid] : string.Empty)
+                .Where(name => !string.IsNullOrEmpty(name))
+                .OrderBy(name => name, StringComparer.OrdinalIgnoreCase)
+                .ToList();
+            var stakeholders = stakeholderNames.Any() ? string.Join(", ", stakeholderNames) : string.Empty;
+
+            var parameters = new
+            {
+                StrategicItemId = opportunity.OpportunityId,
+                Name = opportunity.Name,
+                RollupOneId = opportunity.Rollup1Id,
+                RollupTwoId = opportunity.Rollup2Id,
+                RollupThreeId = opportunity.Rollup3Id,
+                BaselineType = opportunity.BaselineType.ToString().SplitCamelCase(),
+                StrategicItemType = opportunity.IsOpportunity ? "Opportunity" : "Initiative",
+                OpportunityType = opportunity.OpportunityType switch
+                {
+                    StrategicOpportunityTypes.ChargeCode => "Charge Code",
+                    StrategicOpportunityTypes.GeneralLedger => "General Ledger",
+                    _ => opportunity.OpportunityType.ToString()
+                },
+                Status = ((StrategicOpportunityStatus)opportunity.Status).ToString().SplitCamelCase(),
+                BaselineDistribution = opportunity.BaselineDistribution.ToString(),
+                BaselineStartDate = opportunity.BaselineStartDate != default(DateOnly)
+                    ? opportunity.BaselineStartDate.ToString("yyyy-MM-dd") : (string)null,
+                BaselineEndDate = opportunity.BaselineEndDate != default(DateOnly)
+                    ? opportunity.BaselineEndDate.ToString("yyyy-MM-dd") : (string)null,
+                EstimatedTrackingDuration = opportunity.EstimatedTrackingDuration,
+                TrackingStartDate = opportunity.TrackingStartDate != default(DateOnly)
+                    ? opportunity.TrackingStartDate.ToString("yyyy-MM-dd") : (string)null,
+                TrackingEndDate = opportunity.TrackingEndDate != default(DateOnly)
+                    ? opportunity.TrackingEndDate.ToString("yyyy-MM-dd") : (string)null,
+                EstimatedGoal = opportunity.EstimatedGoal,
+                TotalImprovement = opportunity.TotalImprovement,
+                CostLeader = costLeader,
+                ExecutiveSponsor = executiveSponsor,
+                Owner = owner,
+                Stakeholders = stakeholders,
+                TeamMembers = opportunity.TeamMembers ?? string.Empty,
+                LastRunTrackingDate = opportunity.LastRunTrackingDate?.ToString("yyyy-MM-dd"),
+                LastRunTrackingStatus = opportunity.LastRunTrackingStatus.ToString()
+            };
+
+            await databaseContext.ExecuteCommandAsync(BuildMergeSql(), parameters);
+        }
+
+        public async Task DeleteAsync(long opportunityId)
+        {
+            var deleteSql = @"DELETE FROM cci.dimstrategicitem WHERE strategic_item_id = :StrategicItemId;";
+            await databaseContext.ExecuteCommandAsync(deleteSql, new { StrategicItemId = opportunityId });
+        }
+
+        private static string BuildMergeSql()
+        {
+            return @"
+MERGE INTO cci.dimstrategicitem AS target
+USING (
+    SELECT
+        :StrategicItemId AS strategic_item_id,
+        :Name AS name,
+        :RollupOneId AS rollup_one_id,
+        :RollupTwoId AS rollup_two_id,
+        :RollupThreeId AS rollup_three_id,
+        :BaselineType AS baseline_type,
+        :StrategicItemType AS strategic_item_type,
+        :OpportunityType AS opportunity_type,
+        :Status AS status,
+        :BaselineDistribution AS baseline_distribution,
+        :BaselineStartDate::DATE AS baseline_start_date,
+        :BaselineEndDate::DATE AS baseline_end_date,
+        :EstimatedTrackingDuration AS estimated_tracking_duration,
+        :TrackingStartDate::DATE AS tracking_start_date,
+        :TrackingEndDate::DATE AS tracking_end_date,
+        :EstimatedGoal AS estimated_goal,
+        :TotalImprovement AS total_improvement,
+        :CostLeader AS cost_leader,
+        :ExecutiveSponsor AS executive_sponsor,
+        :Owner AS owner,
+        :Stakeholders AS stakeholders,
+        :TeamMembers AS team_members,
+        :LastRunTrackingDate::DATE AS last_run_tracking_date,
+        :LastRunTrackingStatus AS last_run_tracking_status
+) AS source
+ON target.strategic_item_id = source.strategic_item_id
+WHEN MATCHED THEN
+    UPDATE SET
+        name = source.name,
+        rollup_one_id = source.rollup_one_id,
+        rollup_two_id = source.rollup_two_id,
+        rollup_three_id = source.rollup_three_id,
+        baseline_type = source.baseline_type,
+        strategic_item_type = source.strategic_item_type,
+        opportunity_type = source.opportunity_type,
+        status = source.status,
+        baseline_distribution = source.baseline_distribution,
+        baseline_start_date = source.baseline_start_date,
+        baseline_end_date = source.baseline_end_date,
+        estimated_tracking_duration = source.estimated_tracking_duration,
+        tracking_start_date = source.tracking_start_date,
+        tracking_end_date = source.tracking_end_date,
+        estimated_goal = source.estimated_goal,
+        total_improvement = source.total_improvement,
+        cost_leader = source.cost_leader,
+        executive_sponsor = source.executive_sponsor,
+        owner = source.owner,
+        stakeholders = source.stakeholders,
+        team_members = source.team_members,
+        last_run_tracking_date = source.last_run_tracking_date,
+        last_run_tracking_status = source.last_run_tracking_status
+WHEN NOT MATCHED THEN
+    INSERT (
+        strategic_item_id, name, rollup_one_id, rollup_two_id, rollup_three_id,
+        baseline_type, strategic_item_type, opportunity_type, status, baseline_distribution,
+        baseline_start_date, baseline_end_date, estimated_tracking_duration,
+        tracking_start_date, tracking_end_date, estimated_goal, total_improvement,
+        cost_leader, executive_sponsor, owner, stakeholders, team_members,
+        last_run_tracking_date, last_run_tracking_status
+    )
+    VALUES (
+        source.strategic_item_id, source.name, source.rollup_one_id, source.rollup_two_id, source.rollup_three_id,
+        source.baseline_type, source.strategic_item_type, source.opportunity_type, source.status, source.baseline_distribution,
+        source.baseline_start_date, source.baseline_end_date, source.estimated_tracking_duration,
+        source.tracking_start_date, source.tracking_end_date, source.estimated_goal, source.total_improvement,
+        source.cost_leader, source.executive_sponsor, source.owner, source.stakeholders, source.team_members,
+        source.last_run_tracking_date, source.last_run_tracking_status);";
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunity.cs
new file mode 100644
index 0000000..7089b70
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunity.cs
@@ -0,0 +1,61 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    [Table("strategic_opportunity")]
+    public class StrategicOpportunity
+    {
+        [Key]
+        public long OpportunityId { get; set; }
+        public string Name { get; set; }
+        public StrategicOpportunityTypes OpportunityType { get; set; }
+        public string OpportunityFiltersJSON { get; set; }
+        public string LayoutJSON { get; set; }
+        public int Rollup1Id { get; set; }
+        public int Rollup2Id { get; set; }
+        public int Rollup3Id { get; set; }
+        public BaselineType BaselineType { get; set; }
+        public DistributionMethod BaselineDistribution { get; set; }
+        public DateOnly BaselineStartDate { get; set; }
+        public DateOnly BaselineEndDate { get; set; }
+        public DateOnly TrackingStartDate { get; set; }
+        public DateOnly TrackingEndDate { get; set; }
+        public byte EstimatedTrackingDuration { get; set; }
+        public double TotalImprovement { get; set; }
+        public double EstimatedGoal { get; set; }
+        public byte Status { get; set; }
+        public DateTime? LastRunTrackingDate { get; set; }
+        public RunTrackingStatus LastRunTrackingStatus { get; set; }
+        public int StrataId { get; set; }
+        public Guid OwnerGuid { get; set; }
+        public Guid ExecutiveSponsorGuid { get; set; }
+        public Guid CostLeaderGuid { get; set; }
+        [MaxLength(4000)]
+        public string TeamMembers { get; set; } = "";
+
+        [NotMapped]
+        public DateOnly GoalStartDate => BaselineStartDate.AddMonths(1);
+
+        [NotMapped]
+        public DateOnly GoalEndDate => BaselineStartDate.AddMonths(EstimatedTrackingDuration);
+
+        [NotMapped]
+        public bool IsOpportunity => Status < (byte)StrategicOpportunityStatus.NewInitiative;
+
+        public ICollection<StrategicStakeholdersLink> Stakeholders { get; set; }
+        public ICollection<StrategicOpportunityMeasure> Measures { get; set; }
+        public ICollection<StrategicOpportunityWorkbook> Workbooks { get; set; }
+        public ICollection<StrategicOpportunityRampUp> RampUps { get; set; }
+
+        public DateOnly GetTrackingEndDateForFilters()
+        {
+            // Return the first day of the month following TrackingEndDate
+            return new DateOnly(TrackingEndDate.Year, TrackingEndDate.Month, 1).AddMonths(1);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityChargeCode.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityChargeCode.cs
new file mode 100644
index 0000000..2092723
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityChargeCode.cs
@@ -0,0 +1,43 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    [Table("strategic_opportunity_charge_code")]
+    public class StrategicOpportunityChargeCode: StrategicOpportunity
+    {
+        public string PatientPopulationHPath { get; set; }
+        public long ExplorationPopulationId { get; set; }
+        public string ChargeCodeHPath { get; set; }
+        public double TotalCommittedCost { get; set; }
+        public double ProgressToDateCommitted { get; set; }
+        public double ProgressToDateActual { get; set; }
+
+        public StrategicOpportunityChargeCode() { }
+
+        public StrategicOpportunityChargeCode(StrategicOpportunityChargeCode opportunity, string opportunityName)
+        {
+            Name = opportunityName;
+            OpportunityType = opportunity.OpportunityType;
+            OpportunityFiltersJSON = opportunity.OpportunityFiltersJSON;
+            Rollup1Id = opportunity.Rollup1Id;
+            Rollup2Id = opportunity.Rollup2Id;
+            Rollup3Id = opportunity.Rollup3Id;
+            BaselineType = opportunity.BaselineType;
+            BaselineDistribution = opportunity.BaselineDistribution;
+            BaselineStartDate = opportunity.BaselineStartDate;
+            BaselineEndDate = opportunity.BaselineEndDate;
+            EstimatedTrackingDuration = opportunity.EstimatedTrackingDuration;
+            StrataId = opportunity.StrataId;
+            LayoutJSON = opportunity.LayoutJSON;
+
+            PatientPopulationHPath = opportunity.PatientPopulationHPath;
+            ExplorationPopulationId = opportunity.ExplorationPopulationId;
+            ChargeCodeHPath = opportunity.ChargeCodeHPath;
+
+            TeamMembers = opportunity.TeamMembers;
+            OwnerGuid = opportunity.OwnerGuid;
+            ExecutiveSponsorGuid = opportunity.ExecutiveSponsorGuid;
+            CostLeaderGuid = opportunity.CostLeaderGuid;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityChargeCodeExportService.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityChargeCodeExportService.cs
new file mode 100644
index 0000000..97ea354
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityChargeCodeExportService.cs
@@ -0,0 +1,179 @@
+using ClosedXML.Excel;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Data;
+using System.Linq;
+using static Strata.ContinuousImprovement.Biz.Export.ExportUtils;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public class StrategicOpportunityChargeCodeExportService
+    {
+        private readonly ImmutableList<string> _baselineKeys = ImmutableList.Create("encountersMonth", "unitsMonth", "unitsPerEncounter", "costPerEncounter", "costPerUnit", "costMonth");
+        private readonly ImmutableList<string> _goalKeys = ImmutableList.Create("goalUnitsMonth", "goalUnitsPerEncounter", "goalCostPerEncounter", "goalCostPerUnit", "goalCostMonth");
+        private readonly StrategicOpportunityChargeCode _strategicOpportunity;
+        private readonly StrategicOpportunityLayout _layout;
+        private readonly ImmutableDictionary<string, ExportHelper> _layoutToColumns;
+        private readonly List<string> _allKeys;
+
+        public StrategicOpportunityChargeCodeExportService(StrategicOpportunityLayout layout, StrategicOpportunityChargeCode strategicOpportunity) : base()
+        {
+            var columns = new Dictionary<string, ExportHelper>() {
+                { "encountersMonth", new ExportHelper("Average Encounters", "Accounting" )},
+                { "unitsMonth", new ExportHelper("Average Units", "Accounting" ) },
+                { "unitsPerEncounter", new ExportHelper("Units per Encounter", "Accounting2Dec" ) },
+                { "costPerEncounter", new ExportHelper("Variable Direct Cost per Encounter", ExcelCurrencyFormatWithDecimals )},
+                { "costPerUnit", new ExportHelper("Variable Direct Cost per Unit", ExcelCurrencyFormatWithDecimals )},
+                { "costMonth", new ExportHelper("Variable Direct Cost Total", ExcelCurrencyFormatWithoutDecimals )},
+                { "goalUnitsMonth", new ExportHelper("Average Units ", "Accounting" )},
+                { "goalUnitsPerEncounter", new ExportHelper("Units per Encounter ", "Accounting2Dec" )},
+                { "goalCostPerEncounter", new ExportHelper("Variable Direct Cost per Encounter ", ExcelCurrencyFormatWithDecimals )},
+                { "goalCostPerUnit", new ExportHelper("Variable Direct Cost per Unit ", ExcelCurrencyFormatWithDecimals )},
+                { "goalCostMonth", new ExportHelper("Variable Direct Cost Total ", ExcelCurrencyFormatWithoutDecimals )},
+                { "totalImprovement", new ExportHelper($"Total Improvement for {strategicOpportunity.EstimatedTrackingDuration} months", ExcelCurrencyFormatWithoutDecimals )},
+            };
+
+            _strategicOpportunity = strategicOpportunity;
+            _layout = layout;
+            _layoutToColumns = columns.ToImmutableDictionary();
+            _allKeys = columns.Keys.ToList();
+        }
+
+        public System.Data.DataTable MapStrategicOpportunityToDataTable(StrategicOpportunityDetailData opportunitiesData)
+        {
+            System.Data.DataTable table = new System.Data.DataTable();
+            var monthCount = DateExtensions.GetMonthDifference(_strategicOpportunity.BaselineStartDate, _strategicOpportunity.BaselineEndDate, true);
+            var estimatedMonthCount = _strategicOpportunity.EstimatedTrackingDuration;
+            var monthCountMultiplier = monthCount != 0 ? (double)estimatedMonthCount / monthCount : 0;
+            var rows = _layout.Rows.Where(item => item != StrategicOpportunityDetailDimension.System.Value);
+            var columns = _layout.Columns;
+
+            foreach (var colName in rows.Select(r => StrategicChargeCodeExportHelper.LayoutToRows[r]))
+            {
+                table.Columns.Add(colName);
+            };
+
+            foreach (var col in _allKeys)
+            {
+                if (columns.Contains(col))
+                {
+                    ExportHelper colInfo;
+                    _layoutToColumns.TryGetValue(col, out colInfo);
+
+                    if (colInfo != null)
+                        table.Columns.Add(new System.Data.DataColumn(col, typeof(double)) { Caption = colInfo.ColumnCaption });
+                }
+            };
+
+            var sortedData = new List<StrategicOpportunityDetailGroupedWithParsedKey>();
+            opportunitiesData.Data.ForEach(o => sortedData.Add(new StrategicOpportunityDetailGroupedWithParsedKey(o, opportunitiesData.DimensionsData, rows)));
+
+            var data = sortedData.OrderBy(d => d.ParsedKey).Select(d => d.StrategicOpportunityDetailGrouped).GroupBy(o => o.Key).ToDictionary(o => o.Key, o => o.ToList());
+            data.ForEach(item =>
+            {
+                DataRow row = table.NewRow();
+                StrategicChargeCodeExportHelper.SetRowData(row, item.Key, _layout.Rows.Where(r => r != StrategicOpportunityDetailDimension.System.Value), opportunitiesData.DimensionsData);
+
+                foreach (var c in _layout.Columns)
+                {
+                    float encounters = 0;
+                    var baselineValues = item.Value.Where(i => i.IsBaseline).ToList();
+                    var notBaselineValues = item.Value.Where(i => !i.IsBaseline).ToList();
+                    var baselineUnitsSum = baselineValues.Sum(i => i.Units);
+                    var baselineCostSum = baselineValues.Sum(i => i.Cost);
+                    var goalUnitsSum = notBaselineValues.Sum(i => i.GoalUnits);
+                    var goalCostSum = notBaselineValues.Sum(i => i.GoalCost);
+                    opportunitiesData.EncounterData.TryGetValue(item.Key, out encounters);
+
+                    switch (c)
+                    {
+                        case "encountersMonth":
+                            row[c] = monthCount != 0 ? encounters / monthCount : 0;
+                            break;
+                        case "unitsMonth":
+                            row[c] = monthCount != 0 ? baselineUnitsSum / monthCount : 0;
+                            break;
+                        case "unitsPerEncounter":
+                            row[c] = Math.Abs(encounters) > float.Epsilon ? baselineUnitsSum / encounters : 0;
+                            break;
+                        case "costPerEncounter":
+                            row[c] = Math.Abs(encounters) > float.Epsilon ? baselineCostSum / encounters : 0;
+                            break;
+                        case "costPerUnit":
+                            row[c] = Math.Abs(baselineUnitsSum) > float.Epsilon ? baselineCostSum / baselineUnitsSum : 0; break;
+                        case "costMonth":
+                            row[c] = monthCount != 0 ? baselineCostSum / monthCount : 0;
+                            break;
+                        case "goalUnitsMonth":
+                            row[c] = estimatedMonthCount != 0 ? goalUnitsSum / estimatedMonthCount : 0;
+                            break;
+                        case "goalUnitsPerEncounter":
+                            row[c] = Math.Abs(encounters) > float.Epsilon && Math.Abs(monthCountMultiplier) > float.Epsilon ? goalUnitsSum / (encounters * monthCountMultiplier) : 0;
+                            break;
+                        case "goalCostPerEncounter":
+                            row[c] = Math.Abs(encounters) > float.Epsilon && Math.Abs(monthCountMultiplier) > float.Epsilon ? goalCostSum / (encounters * monthCountMultiplier) : 0;
+                            break;
+                        case "goalCostPerUnit":
+                            row[c] = Math.Abs(goalUnitsSum) > float.Epsilon ? goalCostSum / goalUnitsSum : 0;
+                            break;
+                        case "goalCostMonth":
+                            row[c] = estimatedMonthCount != 0 ? goalCostSum / estimatedMonthCount : 0;
+                            break;
+                        case "totalImprovement":
+                            row[c] = monthCount != 0 && estimatedMonthCount != 0 ? ((baselineCostSum / monthCount) - (goalCostSum / estimatedMonthCount)) * estimatedMonthCount : 0;
+                            break;
+                    }
+                }
+
+                table.Rows.Add(row);
+            });
+
+            return table;
+        }
+
+        public Export.ExportOptions GetExportOptions()
+        {
+            var exportOptions = new Export.ExportOptions { EmptyMessage = "No Opportunities" };
+
+            _layoutToColumns.ForEach((column) =>
+            {
+                if (_layout.Columns.Contains(column.Key))
+                {
+                    exportOptions.AddColumnOptions(column.Value.ColumnCaption, column.Value.ColumnFormat);
+                }
+            });
+
+            return exportOptions;
+        }
+
+        public void StyleWorkSheet(XLWorkbook wb)
+        {
+            var ws = wb.Worksheets.First();
+            ws.Name = $"Charge Code Opportunity";
+
+            var table = ws.Tables.First();
+            var goalColumnsCount = _layout.Columns.Where(col => _goalKeys.Contains(col)).Count();
+            var baselineColumnsCount = _layout.Columns.Where(col => _baselineKeys.Contains(col)).Count();
+            var rowCount = _layout.Rows.Where(r => r != StrategicOpportunityDetailDimension.System.Value).Count();
+            var headerRanges = new List<IXLRangeBase>();
+
+            if (goalColumnsCount > 0)
+            {
+                var goalCols = ws.Range(1, rowCount + baselineColumnsCount + 1, 1, rowCount + baselineColumnsCount + goalColumnsCount).Merge().SetValue("Monthly Goal");
+                headerRanges.Add(goalCols);
+            }
+
+            if (baselineColumnsCount > 0)
+            {
+                var baselineCols = ws.Range(1, rowCount + 1, 1, rowCount + baselineColumnsCount).Merge().SetValue("Monthly Baseline");
+                headerRanges.Add(baselineCols);
+            }
+
+            StrategicChargeCodeExportHelper.StyleWorkSheet(table, headerRanges.ToArray());
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityDetail.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityDetail.cs
new file mode 100644
index 0000000..15374e1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityDetail.cs
@@ -0,0 +1,29 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    [Table("FactStrategicChargeCodeDetail", Schema = "cci")]
+    public class StrategicOpportunityDetail
+    {
+        public long RowId { get; set; }
+        public bool IsBaseline { get; set; }
+        public short DischargeFiscalYearId { get; set; }
+        public byte DischargeFiscalMonthId { get; set; }
+        public long OpportunityId { get; set; }
+        public int CaseTypeFamilyId { get; set; }
+        public int DepartmentId { get; set; }
+        public int ChargeCodeId { get; set; }
+        public int EntityId { get; set; }
+        public int PrimaryPhysicianId { get; set; }
+        public int PrimaryServiceLineId { get; set; }
+        public int PhysicianSpecialtyId { get; set; }
+        public string CostDriver { get; set; }
+        public double Units { get; set; }
+        public double Cost { get; set; }
+        public double DistributedUnits { get; set; }
+        public double DistributedCost { get; set; }
+        public double GoalUnits { get; set; }
+        public double GoalCost { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityGL.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityGL.cs
new file mode 100644
index 0000000..3221eb7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityGL.cs
@@ -0,0 +1,50 @@
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    [Table("strategic_opportunity_gl")]
+    public class StrategicOpportunityGL : StrategicOpportunity
+    {
+        public GLAccountType AccountType { get; set; }
+        public string? DepartmentHPath { get; set; }
+        public string? RevenueAccountHPath { get; set; }
+        public string? ExpenseAccountHPath { get; set; }
+        public string? StatisticAccountHPath { get; set; }
+        public bool HasStatistic { get; set; }
+        public double TotalCommittedCost { get; set; }
+        public double ProgressToDateCommitted { get; set; }
+        public double ProgressToDateActual { get; set; }
+
+        public StrategicOpportunityGL() { }
+
+        public StrategicOpportunityGL(StrategicOpportunityGL opportunity, string opportunityName)
+        {
+            Name = opportunityName;
+            OpportunityType = opportunity.OpportunityType;
+            OpportunityFiltersJSON = opportunity.OpportunityFiltersJSON;
+            Rollup1Id = opportunity.Rollup1Id;
+            Rollup2Id = opportunity.Rollup2Id;
+            Rollup3Id = opportunity.Rollup3Id;
+            BaselineType = opportunity.BaselineType;
+            BaselineDistribution = opportunity.BaselineDistribution;
+            BaselineStartDate = opportunity.BaselineStartDate;
+            BaselineEndDate = opportunity.BaselineEndDate;
+            EstimatedTrackingDuration = opportunity.EstimatedTrackingDuration;
+            StrataId = opportunity.StrataId;
+            LayoutJSON = opportunity.LayoutJSON;
+
+            AccountType = opportunity.AccountType;
+            DepartmentHPath = opportunity.DepartmentHPath;
+            RevenueAccountHPath = opportunity.RevenueAccountHPath;
+            ExpenseAccountHPath = opportunity.ExpenseAccountHPath;
+            StatisticAccountHPath = opportunity.StatisticAccountHPath;
+            HasStatistic = opportunity.HasStatistic;
+
+            TeamMembers = opportunity.TeamMembers;
+            OwnerGuid = opportunity.OwnerGuid;
+            ExecutiveSponsorGuid = opportunity.ExecutiveSponsorGuid;
+            CostLeaderGuid = opportunity.CostLeaderGuid;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityGLDetail.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityGLDetail.cs
new file mode 100644
index 0000000..488c690
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityGLDetail.cs
@@ -0,0 +1,25 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public class StrategicOpportunityGLDetail
+    {
+        public long RowId { get; set; }
+        public bool IsBaseline { get; set; }
+        public short FiscalYearId { get; set; }
+        public byte FiscalMonthId { get; set; }
+        public long OpportunityId { get; set; }
+        public int DepartmentId { get; set; }
+        public int AccountId { get; set; }
+        public int EntityId { get; set; }
+        public string? GlRollup { get; set; }
+        public byte? AccountType { get; set; }
+        public double Amount { get; set; }
+        public double GoalAmount { get; set; }
+        public double DistributedAmount { get; set; }
+        public double RevenueAmount { get; set; }
+        public double ExpenseAmount { get; set; }
+        public double StatisticAmount { get; set; }
+        public double GoalRevenueAmount { get; set; }
+        public double GoalExpenseAmount { get; set; }
+        public double GoalStatisticAmount { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityJob.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityJob.cs
new file mode 100644
index 0000000..f6c6f75
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityJob.cs
@@ -0,0 +1,119 @@
+using Hangfire;
+using Hangfire.Throttling;
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Configurations.Hangfire;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.Hangfire.Filters;
+using Strata.Hangfire.Filters.Claims;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    [Throttling(ThrottlingAction.DeleteJob)]
+    public class StrategicOpportunityJob(CentralDbContext centralDbContext,
+        IStrategicChargeCodeOpportunityDetailService strategicChargeCodeOpportunityDetailService,
+        IStrategicGLOpportunityDetailService strategicGLOpportunityDetailService,
+        IBackgroundJobClient backgroundJobClient,
+        IStrategicOpportunityService strategicOpportunityService)
+    {
+        [DeleteOnSuccess]
+        [JobDisplayName("Run tracking task by user interaction for Strategic Opportunity w/ ID {1}")]
+        [CaptureClaimsPrincipal]
+        [Mutex("strataId:{0}:opportunityId:{1}")]
+        public async Task RunOpportunityTracking(int strataId, long opportunityId, CancellationToken cancellationToken)
+        {
+            var ccOpportunity = await centralDbContext.StrategicOpportunityChargeCodes.Include(opp => opp.Measures)
+                .FirstOrDefaultAsync(so => so.OpportunityId == opportunityId, cancellationToken: cancellationToken);
+            if (ccOpportunity != null)
+            {
+                await strategicChargeCodeOpportunityDetailService.PopulateTrackingDetails(ccOpportunity, cancellationToken);
+                return;
+            }
+
+            var glOpportunity = await centralDbContext.StrategicOpportunityGLs.Include(opp => opp.Measures)
+                .FirstOrDefaultAsync(so => so.OpportunityId == opportunityId, cancellationToken: cancellationToken);
+            if (glOpportunity != null)
+            {
+                await strategicGLOpportunityDetailService.PopulateTrackingDetails(glOpportunity, cancellationToken);
+            }
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Run UpdateMeasuresAverage task by user interaction for Strategic Opportunity w/ ID {1}")]
+        [CaptureClaimsPrincipal]
+        [Mutex("strataId:{0}:opportunityId:{1}")]
+        public async Task RunOpportunityUpdateMeasuresAverage(int strataId, long opportunityId, CancellationToken cancellationToken)
+        {
+            var opportunity = await centralDbContext.StrategicOpportunityChargeCodes.Include(opp => opp.Measures)
+                .FirstOrDefaultAsync(so => so.OpportunityId == opportunityId, cancellationToken: cancellationToken);
+
+            if (opportunity == null) return;
+
+            await strategicChargeCodeOpportunityDetailService.UpdateMeasuresAverage(opportunity, cancellationToken);
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Reset ramp-ups, run populate details, and update baseline date for Strategic Opportunity w/ ID {1}")]
+        [CaptureClaimsPrincipal]
+        [Mutex("strataId:{0}:opportunityId:{1}")]
+        public async Task RefreshAssociatedOpportunity(int strataId, long opportunityId, CancellationToken cancellationToken)
+        {
+            var ccOpportunity = await centralDbContext.StrategicOpportunityChargeCodes
+                .FirstOrDefaultAsync(so => so.OpportunityId == opportunityId && so.StrataId == strataId, cancellationToken);
+
+            if (ccOpportunity != null && ccOpportunity.IsOpportunity)
+            {
+                var population = await centralDbContext.ExplorationPopulations
+                    .FirstOrDefaultAsync(p => p.ExplorationPopulationId == ccOpportunity.ExplorationPopulationId && p.StrataId == strataId, cancellationToken: cancellationToken);
+
+                if (population != null)
+                {
+                    var populationDischargeDate = population.GetDischargeDates();
+                    var baselineStartDate = DateOnly.FromDateTime(populationDischargeDate.Item1);
+                    var baselineEndDate = DateOnly.FromDateTime(populationDischargeDate.Item2);
+
+                    if (ccOpportunity.BaselineStartDate != baselineStartDate || ccOpportunity.BaselineEndDate != baselineEndDate)
+                    {
+                        ccOpportunity.BaselineStartDate = baselineStartDate;
+                        ccOpportunity.BaselineEndDate = baselineEndDate;
+                        await centralDbContext.SaveChangesAsync(cancellationToken);
+                    }
+                }
+
+                await strategicOpportunityService.ResetStrategicOpportunityRampUps(opportunityId, cancellationToken);
+                await strategicChargeCodeOpportunityDetailService.PopulateStrategicOpportunityDetails(ccOpportunity, cancellationToken);
+                return;
+            }
+
+            var glOpportunity = await centralDbContext.StrategicOpportunityGLs
+                .FirstOrDefaultAsync(so => so.OpportunityId == opportunityId && so.StrataId == strataId, cancellationToken);
+
+            if (glOpportunity != null && glOpportunity.IsOpportunity)
+            {
+                await strategicOpportunityService.ResetStrategicOpportunityRampUps(opportunityId, cancellationToken);
+                await strategicGLOpportunityDetailService.PopulateStrategicOpportunityGLDetails(glOpportunity, cancellationToken);
+            }
+        }
+
+        [DeleteOnSuccess]
+        [JobDisplayName("Run tracking task for all Strategic Opportunities")]
+        [ImpersonateStrataUser]
+        [Mutex("strataId:{1}")]
+        public async Task RunTracking([DatabaseGuid] Guid databaseGuid, [StrataId] int strataId, CancellationToken cancellationToken)
+        {
+            // update tracking details for tracking initiatives and measure details for both tracking and complete monitoring initiatives
+            var trackingInitiatives = await centralDbContext.StrategicOpportunities.Where(o => (o.Status == (byte)StrategicOpportunityStatus.Tracking 
+                || o.Status == (byte)StrategicOpportunityStatus.CompleteMonitoring) && o.StrataId == strataId).ToListAsync(cancellationToken);
+            if (!trackingInitiatives.Any()) return;
+
+            foreach (var initiative in trackingInitiatives)
+            {
+                backgroundJobClient.Enqueue<StrategicOpportunityJob>((job) => job.RunOpportunityTracking(strataId, initiative.OpportunityId, CancellationToken.None));
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityLayout.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityLayout.cs
new file mode 100644
index 0000000..946e9c4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityLayout.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public class StrategicOpportunityLayout
+    {
+        public ICollection<string> Rows { get; set; }
+        public ICollection<string> Columns { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityMapper.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityMapper.cs
new file mode 100644
index 0000000..04b9369
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityMapper.cs
@@ -0,0 +1,26 @@
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    [Mapper()]
+    public static partial class StrategicOpportunityMapper
+    {
+        [MapperIgnoreSource(nameof(StrategicOpportunityChargeCodeDto.Measures))]
+        [MapperIgnoreSource(nameof(StrategicOpportunityChargeCodeDto.WorkbookIds))]
+        public static partial StrategicOpportunityChargeCode MapToStrategicOpportunityChargeCode(this StrategicOpportunityChargeCodeDto src);
+
+        [MapperIgnoreSource(nameof(StrategicOpportunityGLDto.Measures))]
+        [MapperIgnoreSource(nameof(StrategicOpportunityGLDto.WorkbookIds))]
+        public static partial StrategicOpportunityGL MapToStrategicOpportunityGL(this StrategicOpportunityGLDto src);
+
+        [MapperIgnoreSource(nameof(StrategicOpportunityMeasureDto.MeasureId))]
+        public static partial StrategicOpportunityMeasure MapToStrategicOpportunityMeasure(this StrategicOpportunityMeasureDto src);
+
+        public static partial StrategicOpportunityMeasureDto MapToStrategicOpportunityMeasureDto(this StrategicOpportunityMeasure src);
+
+        [MapperIgnoreSource(nameof(StrategicOpportunityWorkbook.StrataId))]
+        [MapperIgnoreSource(nameof(StrategicOpportunityWorkbook.Opportunity))]
+        public static partial StrategicOpportunityWorkbookDto MapToStrategicOpportunityWorkbookDto(this StrategicOpportunityWorkbook src);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityMeasure.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityMeasure.cs
new file mode 100644
index 0000000..511f555
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityMeasure.cs
@@ -0,0 +1,25 @@
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    [Table("strategic_opportunity_measure")]
+    public class StrategicOpportunityMeasure
+    {
+        [Key]
+        public long MeasureId { get; set; }
+        public long OpportunityId { get; set; }
+        public MeasureType MeasureType { get; set; }
+        public string MeasureName { get; set; }
+        public DesiredResult DesiredResult { get; set; }
+        public Single AcceptableThreshold { get; set; }
+        public string FiltersJSON { get; set; }
+        public MeasureGroup MeasureGroup { get; set; }
+        public double AverageValue { get; set; }
+        public int StrataId { get; set; }
+
+        public StrategicOpportunity Opportunity { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityMeasureDetail.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityMeasureDetail.cs
new file mode 100644
index 0000000..df50d7a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityMeasureDetail.cs
@@ -0,0 +1,10 @@
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public class StrategicOpportunityMeasureDetail
+    {
+        public long MeasureId { get; set; }
+        public short YearId { get; set; }
+        public byte MonthId { get; set; }
+        public double Value { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityRampUp.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityRampUp.cs
new file mode 100644
index 0000000..1020149
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityRampUp.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    [Table("strategic_opportunity_ramp_up")]
+    public class StrategicOpportunityRampUp
+    {
+        public long OpportunityId { get; set; }
+        public byte MonthNumber { get; set; }
+        public double Percentage { get; set; }
+
+        public StrategicOpportunity Opportunity { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityService.cs
new file mode 100644
index 0000000..5ab8fd6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityService.cs
@@ -0,0 +1,1354 @@
+using Dapper;
+using Hangfire;
+using IdentityModel;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using MoreLinq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.Models;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.Id.Client;
+using Strata.Schema.Client;
+using Strata.Schema.Client.Dtos;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using Strata.SqlTools.EntityFramework;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    public class StrategicOpportunityService(
+        IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+        CentralDbContext centralDbContext,
+        IClaimsPrincipalAccessor claimsPrincipalAccessor,
+        ISchemaServiceClient schemaServiceClient,
+        ISnowflakeDatabaseContext databaseContext,
+        IIdServiceClient idServiceClient,
+        IOpportunityRoleAssignmentService opportunityRoleAssignmentService,
+        IInitiativeRollupColumnService rollupColumnService,
+        IOpportunityWorkbookService opportunityWorkbookService,
+        IBackgroundJobClient backgroundJobClient,
+        IStrategicChargeCodeOpportunityDetailService strategicChargeCodeOpportunityDetailService,
+        IStrategicItemDimensionSyncService strategicItemDimensionSyncService,
+        IStrategicGLOpportunityDetailService strategicGLOpportunityDetailService,
+        ILogger<StrategicOpportunityService> logger = default) : JazzDbService<StrategicOpportunity, long>(dbContextFactory, centralDbContext, claimsPrincipalAccessor), IStrategicOpportunityService
+    {
+        public const string StrategicOpportunityDetailTableName = "cci.FactStrategicChargeCodeDetail";
+        public const string StrategicOpportunityGLDetailTableName = "cci.FactStrategicGLDetail";
+
+        public static readonly Dictionary<StrategicOpportunityDetailDimension, StrategicOpportunityDetailDimensionConfig> DimensionsConfig = new Dictionary<StrategicOpportunityDetailDimension, StrategicOpportunityDetailDimensionConfig>()
+        {
+            {  StrategicOpportunityDetailDimension.Entity, new StrategicOpportunityDetailDimensionConfig(){ SqlFile = "SelectEntityKeyValue.sql", ColumnName = "EntityID", AliasColumnName = "dsspesEntityID" } },
+            {  StrategicOpportunityDetailDimension.PrimaryServiceLine, new StrategicOpportunityDetailDimensionConfig(){ SqlFile = "SelectServiceLineKeyValue.sql", ColumnName = "PrimaryServiceLineID", AliasColumnName = "dsspesPrimaryServiceLineId" } },
+            {  StrategicOpportunityDetailDimension.CaseTypeFamily, new StrategicOpportunityDetailDimensionConfig(){ SqlFile = "SelectCaseTypeFamilyKeyValue.sql", ColumnName = "CaseTypeFamilyId", AliasColumnName = "CaseTypeFamilyId" } },
+            {  StrategicOpportunityDetailDimension.Physician, new StrategicOpportunityDetailDimensionConfig(){ SqlFile = "SelectPhysicianKeyValue.sql", ColumnName = "PrimaryPhysicianID", AliasColumnName = "dsspesPhysicianId" } },
+            {  StrategicOpportunityDetailDimension.PhysicianSpecialty, new StrategicOpportunityDetailDimensionConfig(){ SqlFile = "SelectPhysicianSpecialtyKeyValue.sql", ColumnName = "PhysicianSpecialtyID", AliasColumnName = "physPrimaryPhysicianSpecialtyId"} },
+            {  StrategicOpportunityDetailDimension.CostDriver, new StrategicOpportunityDetailDimensionConfig(){ SqlFile = "SelectCostDriverKeyValue.sql", ColumnName = "CostDriver" , AliasColumnName = "ccCostDriver"} },
+            {  StrategicOpportunityDetailDimension.Department, new StrategicOpportunityDetailDimensionConfig(){ SqlFile = "SelectDepartmentKeyValue.sql", ColumnName = "DepartmentID", AliasColumnName = "pblidDepartmentId"} },
+            {  StrategicOpportunityDetailDimension.ChargeCode, new StrategicOpportunityDetailDimensionConfig(){ SqlFile = "SelectChargeCodeKeyValue.sql", ColumnName = "ChargeCodeID", AliasColumnName = "ccChargeCodeID"} }
+        };
+
+        public static readonly Dictionary<StrategicOpportunityDetailDimension, StrategicOpportunityDetailDimensionConfig> GLDimensionsConfig = new Dictionary<StrategicOpportunityDetailDimension, StrategicOpportunityDetailDimensionConfig>()
+        {
+            {  StrategicOpportunityDetailDimension.Entity, new StrategicOpportunityDetailDimensionConfig(){ SqlFile = "SelectGLEntityKeyValue.sql", ColumnName = "EntityId" } },
+            {  StrategicOpportunityDetailDimension.Department, new StrategicOpportunityDetailDimensionConfig(){ SqlFile = "SelectDepartmentKeyValue.sql", ColumnName = "DepartmentId" } },
+            {  StrategicOpportunityDetailDimension.GLRollup, new StrategicOpportunityDetailDimensionConfig(){ SqlFile = "SelectGLRollupKeyValue.sql", ColumnName = "GLRollup", IsKeyString = true } },
+            {  StrategicOpportunityDetailDimension.GLAccount, new StrategicOpportunityDetailDimensionConfig(){ SqlFile = "SelectGLAccountKeyValue.sql", ColumnName = "AccountId" } }
+        };
+
+        public async Task<List<StrategicOpportunityItem>> GetStrategicOpportunitiesAsync(CancellationToken cancellationToken)
+        {
+            try
+            {
+                var opportunities = await GetAllStrategicChargeCodes(item => item.IsOpportunity, cancellationToken);
+                var rollups = await rollupColumnService.GetAllAsync(cancellationToken);
+
+                var results = opportunities.Select(so => new StrategicOpportunityItem
+                {
+                    OpportunityId = so.OpportunityId,
+                    Name = so.Name,
+                    OpportunityType = so.OpportunityType,
+                    OpportunityTypeName = GetOpportunityTypeName(so.OpportunityType),
+                    Rollup1 = GetRollupName(rollups, so.Rollup1Id, 0),
+                    Rollup2 = GetRollupName(rollups, so.Rollup2Id, 1),
+                    Rollup3 = GetRollupName(rollups, so.Rollup3Id, 2),
+                    PatientPopulationHPath = so.PatientPopulationHPath,
+                    ExplorationPopulationId = so.ExplorationPopulationId,
+                    EncounterGroupName = string.IsNullOrEmpty(so.PatientPopulationHPath) ? "Exploration Patient Population" : "Patient Population",
+                    AdditionalFilters = !string.IsNullOrEmpty(so.OpportunityFiltersJSON) && so.OpportunityFiltersJSON != "[]" ? "Yes" : "No",
+                    BaselinePeriod = $"{so.BaselineStartDate:MMM d, yyyy} - {so.BaselineEndDate:MMM d, yyyy}",
+                    EstimatedTrackDurationMonths = so.EstimatedTrackingDuration,
+                    BaselineStartDate = so.BaselineStartDate,
+                    TotalImprovement = so.TotalImprovement,
+                    EstimatedGoal = so.EstimatedGoal,
+                    StatusName = GetStatusName(so.Status)
+                }).ToList();
+                await SetPopulationName(results, cancellationToken);
+
+                var glOpportunities = await GetAllStrategicGLOpportunities(item => item.IsOpportunity, cancellationToken);
+                var glResults = glOpportunities.Select(so => new StrategicOpportunityItem
+                {
+                    OpportunityId = so.OpportunityId,
+                    Name = so.Name,
+                    OpportunityType = so.OpportunityType,
+                    OpportunityTypeName = GetOpportunityTypeName(so.OpportunityType),
+                    Rollup1 = GetRollupName(rollups, so.Rollup1Id, 0),
+                    Rollup2 = GetRollupName(rollups, so.Rollup2Id, 1),
+                    Rollup3 = GetRollupName(rollups, so.Rollup3Id, 2),
+                    EncounterGroupName = "General Ledger",
+                    AdditionalFilters = !string.IsNullOrEmpty(so.OpportunityFiltersJSON) && so.OpportunityFiltersJSON != "[]" ? "Yes" : "No",
+                    BaselinePeriod = $"{so.BaselineStartDate:MMM d, yyyy} - {so.BaselineEndDate:MMM d, yyyy}",
+                    EstimatedTrackDurationMonths = so.EstimatedTrackingDuration,
+                    BaselineStartDate = so.BaselineStartDate,
+                    TotalImprovement = so.TotalImprovement,
+                    EstimatedGoal = so.EstimatedGoal,
+                    StatusName = GetStatusName(so.Status)
+                }).ToList();
+
+                results.AddRange(glResults);
+                return results;
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, ex.Message);
+                throw;
+            }
+        }
+
+        public async Task<List<StrategicInitiativeItem>> GetStrategicInitiativesAsync(CancellationToken cancellationToken)
+        {
+            try
+            {
+                var initiatives = await GetAllStrategicChargeCodes(item => !item.IsOpportunity, cancellationToken);
+                var rollups = await rollupColumnService.GetAllAsync(cancellationToken);
+                var strategicOpportunities = await _centralDbContext.StrategicOpportunities.ToListAsync(cancellationToken);
+
+                var results = initiatives
+                    .Join(strategicOpportunities, i => i.OpportunityId, so => so.OpportunityId, (i, so) => new { Initiative = i, StrategicOpportunity = so })
+                    .Select(item => new StrategicInitiativeItem
+                    {
+                        OpportunityId = item.Initiative.OpportunityId,
+                        Name = item.Initiative.Name,
+                        OpportunityType = item.Initiative.OpportunityType,
+                        OpportunityTypeName = GetOpportunityTypeName(item.Initiative.OpportunityType),
+                        Rollup1 = GetRollupName(rollups, item.Initiative.Rollup1Id, 0),
+                        Rollup2 = GetRollupName(rollups, item.Initiative.Rollup2Id, 1),
+                        Rollup3 = GetRollupName(rollups, item.Initiative.Rollup3Id, 2),
+                        PatientPopulationHPath = item.Initiative.PatientPopulationHPath,
+                        ExplorationPopulationId = item.Initiative.ExplorationPopulationId,
+                        EncounterGroupName = string.IsNullOrEmpty(item.Initiative.PatientPopulationHPath) ? "Exploration Patient Population" : "Patient Population",
+                        AdditionalFilters = !string.IsNullOrEmpty(item.Initiative.OpportunityFiltersJSON) && item.Initiative.OpportunityFiltersJSON != "[]" ? "Yes" : "No",
+                        BaselinePeriod = $"{item.Initiative.BaselineStartDate:MMM d, yyyy} - {item.Initiative.BaselineEndDate:MMM d, yyyy}",
+                        TrackingPeriod = $"{item.Initiative.TrackingStartDate:MMM d, yyyy} - {item.Initiative.TrackingEndDate:MMM d, yyyy}",
+                        TotalCommitted = item.Initiative.TotalCommittedCost,
+                        ProgressToDateActual = item.Initiative.ProgressToDateActual,
+                        ProgressToDateCommitted = item.Initiative.ProgressToDateCommitted,
+                        ProgressToDateVariance = item.Initiative.ProgressToDateActual - item.Initiative.ProgressToDateCommitted,
+                        StatusName = GetStatusName(item.Initiative.Status),
+                        LastRunTrackingDate = item.StrategicOpportunity.LastRunTrackingDate,
+                        LastRunTrackingStatus = (byte)item.StrategicOpportunity.LastRunTrackingStatus,
+                        OnTrack = item.Initiative.ProgressToDateActual <= item.Initiative.ProgressToDateCommitted
+                    }).ToList();
+                await SetPopulationName(results, cancellationToken);
+
+                var glInitiatives = await GetAllStrategicGLOpportunities(item => !item.IsOpportunity, cancellationToken);
+                var glResults = glInitiatives
+                    .Join(strategicOpportunities, i => i.OpportunityId, so => so.OpportunityId, (i, so) => new { Initiative = i, StrategicOpportunity = so })
+                    .Select(item => new StrategicInitiativeItem
+                    {
+                        OpportunityId = item.Initiative.OpportunityId,
+                        Name = item.Initiative.Name,
+                        OpportunityType = item.Initiative.OpportunityType,
+                        OpportunityTypeName = GetOpportunityTypeName(item.Initiative.OpportunityType),
+                        Rollup1 = GetRollupName(rollups, item.Initiative.Rollup1Id, 0),
+                        Rollup2 = GetRollupName(rollups, item.Initiative.Rollup2Id, 1),
+                        Rollup3 = GetRollupName(rollups, item.Initiative.Rollup3Id, 2),
+                        EncounterGroupName = "General Ledger",
+                        AdditionalFilters = !string.IsNullOrEmpty(item.Initiative.OpportunityFiltersJSON) && item.Initiative.OpportunityFiltersJSON != "[]" ? "Yes" : "No",
+                        BaselinePeriod = $"{item.Initiative.BaselineStartDate:MMM d, yyyy} - {item.Initiative.BaselineEndDate:MMM d, yyyy}",
+                        TrackingPeriod = $"{item.Initiative.TrackingStartDate:MMM d, yyyy} - {item.Initiative.TrackingEndDate:MMM d, yyyy}",
+                        TotalCommitted = item.Initiative.TotalCommittedCost,
+                        ProgressToDateActual = item.Initiative.ProgressToDateActual,
+                        ProgressToDateCommitted = item.Initiative.ProgressToDateCommitted,
+                        ProgressToDateVariance = item.Initiative.ProgressToDateActual - item.Initiative.ProgressToDateCommitted,
+                        OnTrack = item.Initiative.AccountType == (byte)GLAccountType.Revenue
+                            ? item.Initiative.ProgressToDateActual >= item.Initiative.ProgressToDateCommitted
+                            : item.Initiative.ProgressToDateActual <= item.Initiative.ProgressToDateCommitted,
+                        StatusName = GetStatusName(item.Initiative.Status),
+                        LastRunTrackingDate = item.StrategicOpportunity.LastRunTrackingDate,
+                        LastRunTrackingStatus = (byte)item.StrategicOpportunity.LastRunTrackingStatus
+                    }).ToList();
+
+                results.AddRange(glResults);
+                return results;
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, ex.Message);
+                throw;
+            }
+        }
+
+        public async Task<StrategicOpportunityChargeCodeEditData> GetStrategicOpportunityChargeCode(long opportunityId, CancellationToken cancellationToken)
+        {
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunityChargeCodes.SingleOrDefaultAsync(opp => opp.OpportunityId == opportunityId, cancellationToken);
+            if (strategicOpportunity == null) return null;
+
+            var data = new StrategicOpportunityChargeCodeEditData
+            {
+                Name = strategicOpportunity.Name,
+                Rollup1Id = strategicOpportunity.Rollup1Id,
+                Rollup2Id = strategicOpportunity.Rollup2Id,
+                Rollup3Id = strategicOpportunity.Rollup3Id,
+                EncounterGroupName = string.IsNullOrEmpty(strategicOpportunity.PatientPopulationHPath) ? "Exploration Patient Population" : "Patient Population",
+                PatientPopulationHPath = strategicOpportunity.PatientPopulationHPath,
+                ExplorationPopulationId = strategicOpportunity.ExplorationPopulationId,
+                ChargeCodeHPath = [.. strategicOpportunity.ChargeCodeHPath.Split(",")],
+                Filters = strategicOpportunity.OpportunityFiltersJSON,
+                BaselineStartDate = strategicOpportunity.BaselineStartDate,
+                BaselineEndDate = strategicOpportunity.BaselineEndDate,
+                BaselineDistribution = strategicOpportunity.BaselineDistribution,
+                EstimatedTrackingDuration = strategicOpportunity.EstimatedTrackingDuration
+            };
+
+            // populate strategic opportunity populations
+            if (strategicOpportunity.ExplorationPopulationId != 0)
+            {
+                var explorationPopulation = await _centralDbContext.ExplorationPopulations
+                    .FirstOrDefaultAsync(ex => ex.ExplorationPopulationId == strategicOpportunity.ExplorationPopulationId, cancellationToken);
+                var populationMembers = new List<PopulationMember>
+                {
+                    new()
+                    {
+                        Id = (int)strategicOpportunity.ExplorationPopulationId,
+                        Name = explorationPopulation.Name
+                    }
+                };
+                data.PopulationMembers = populationMembers;
+            }
+            else
+            {
+                var patientPopulationsHPath = strategicOpportunity.PatientPopulationHPath.Split(",").ToList();
+                var populationMembers = GetDimensionMembersByHierarchyPaths<PopulationMember>("Clinical Indicator", patientPopulationsHPath, cancellationToken).Result;
+                data.PopulationMembers = populationMembers;
+            }
+
+            // populate strategic opportunity charge codes
+            var chargeCodeHPaths = strategicOpportunity.ChargeCodeHPath.Split(",").ToList();
+            var strategicOpportunityChargeCodes = GetDimensionMembersByHierarchyPaths<ChargeCodePickerModel>("Charge Code", chargeCodeHPaths, cancellationToken).Result;
+            data.ChargeCodes = strategicOpportunityChargeCodes;
+
+            // populate strategic opportunity measures
+            var measures = await _centralDbContext.StrategicOpportunityMeasures.Where(x => x.OpportunityId == strategicOpportunity.OpportunityId).ToListAsync(cancellationToken);
+            data.Measures = measures.Select(m => m.MapToStrategicOpportunityMeasureDto()).ToList();
+
+            // populate strategic opportunity workbooks
+            var strategicOpportunityWorkbooks = await _centralDbContext.StrategicOpportunityWorkbooks.Where(x => x.OpportunityId == strategicOpportunity.OpportunityId).ToListAsync(cancellationToken);
+            var workbooks = await opportunityWorkbookService.GetAllOpportunityWorkbooksAsync(false, cancellationToken);
+            data.Workbooks = strategicOpportunityWorkbooks.Select(wb => new StrategicOpportunityWorkbookDto
+            {
+                OpportunityId = strategicOpportunity.OpportunityId,
+                WorkbookId = wb.WorkbookId,
+                Name = workbooks.FirstOrDefault(x => x.WorkbookId == wb.WorkbookId).Name
+            }).ToList();
+
+            return data;
+        }
+
+        public async Task<StrategicOpportunityGeneralInfo> GetStrategicOpportunityGeneralInfo(long opportunityId, CancellationToken cancellationToken)
+        {
+            var strataId = _user.GetStrataId();
+
+            var chargeCode = await _centralDbContext.StrategicOpportunityChargeCodes
+                .Include(item => item.Stakeholders)
+                .Include(item => item.Measures)
+                .FirstOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == strataId, cancellationToken);
+
+            if (chargeCode != null) return new StrategicOpportunityGeneralInfo(chargeCode);
+
+            var gl = await _centralDbContext.StrategicOpportunityGLs
+                .Include(item => item.Stakeholders)
+                .Include(item => item.Measures)
+                .FirstOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == strataId, cancellationToken);
+
+            if (gl != null) return new StrategicOpportunityGeneralInfo(gl);
+
+            return null;
+        }
+
+        public async Task<bool> ContainsAsync(long opportunityId, CancellationToken cancellationToken)
+        {
+            return await centralDbContext.StrategicOpportunities
+                .AnyAsync(x => x.StrataId == _user.GetStrataId() && x.OpportunityId == opportunityId, cancellationToken);
+        }
+
+        public async Task<bool> ContainsGLAsync(long opportunityId, CancellationToken cancellationToken)
+        {
+            return await centralDbContext.StrategicOpportunityGLs
+                .AnyAsync(x => x.StrataId == _user.GetStrataId() && x.OpportunityId == opportunityId, cancellationToken);
+        }
+
+        public async Task<bool> DeleteChargeCodeOpportunityAsync(long opportunityId, CancellationToken cancellationToken)
+        {
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunities.SingleOrDefaultAsync(item => item.OpportunityId == opportunityId
+                && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            var strategy = _centralDbContext.Database.CreateExecutionStrategy();
+
+            var isDeleted = await strategy.ExecuteAsync(async () =>
+            {
+                using var centralTransaction = await _centralDbContext.Database.BeginTransactionAsync(CancellationToken.None);
+                try
+                {
+                    await _centralDbContext.StrategicOpportunityMeasures.ExecuteDeleteAsync(item => item.OpportunityId == opportunityId && item.StrataId == _user.GetStrataId(), CancellationToken.None);
+
+                    await _centralDbContext.StrategicOpportunityWorkbooks.ExecuteDeleteAsync(item => item.OpportunityId == opportunityId && item.StrataId == _user.GetStrataId(), CancellationToken.None);
+
+                    await _centralDbContext.Comments.ExecuteDeleteAsync(item => item.OpportunityId == opportunityId && item.StrataId == _user.GetStrataId(), CancellationToken.None);
+
+                    await _centralDbContext.StrategicOpportunityRampUps.ExecuteDeleteAsync(item => item.OpportunityId == opportunityId, CancellationToken.None);
+
+                    RemoveOpportunitySpecifications<StrategicOpportunityChargeCode>(opportunityId, cancellationToken);
+                    _centralDbContext.StrategicOpportunities.Remove(strategicOpportunity);
+
+                    var isDeleted = await _centralDbContext.SaveChangesAsync(CancellationToken.None) > 0;
+                    await centralTransaction.CommitAsync(CancellationToken.None);
+                    return isDeleted;
+                }
+                catch (Exception ex)
+                {
+                    logger.LogServiceError(ex);
+                    await centralTransaction.RollbackAsync(CancellationToken.None);
+                    throw;
+                }
+            });
+
+            if (isDeleted)
+            {
+                try
+                {
+                    var queryBuilder = new StrategicOpportunityDetailQueryBuilder();
+                    var deleteSql = queryBuilder.BuildDeleteQuery(opportunityId);
+                    await databaseContext.ExecuteCommandAsync(deleteSql);
+                    await strategicItemDimensionSyncService.DeleteAsync(opportunityId);
+                }
+                catch (Exception ex)
+                {
+                    logger.LogServiceError(ex, $"Error occurred while executing Snowflake cleanup for opportunity {opportunityId}.");
+                }
+            }
+
+            return isDeleted;
+        }
+
+        public async Task<long> CreateOpportunityChargeCodeAsync(StrategicOpportunityChargeCodeDto opportunityDto, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+
+            try
+            {
+                var opportunity = opportunityDto.MapToStrategicOpportunityChargeCode();
+
+                var dbGuid = claimsPrincipalAccessor.GetDatabaseGuid();
+                var strataId = await idServiceClient.GetStrataId(dbGuid, cancellationToken);
+                opportunity.StrataId = strataId;
+
+                InitializeNewOpportunity(opportunity, opportunityDto, strataId);
+
+                opportunity.Measures.Add(new StrategicOpportunityMeasure() { StrataId = strataId, MeasureGroup = MeasureGroup.System, MeasureType = MeasureType.CommittedCost, MeasureName = "CommittedCost" });
+                opportunity.Measures.Add(new StrategicOpportunityMeasure() { StrataId = strataId, MeasureGroup = MeasureGroup.System, MeasureType = MeasureType.ActualCost, MeasureName = "ActualCost" });
+
+                opportunity.Workbooks = GetStrategicOpportunityWorkbooks(opportunityDto.WorkbookIds.ToList(), strataId);
+
+                opportunity.LayoutJSON = JsonConvert.SerializeObject(opportunityDto.Layout);
+                opportunity.Status = (byte)StrategicOpportunityStatus.NewOpportunity;
+
+                _centralDbContext.StrategicOpportunityChargeCodes.Add(opportunity);
+
+                await _centralDbContext.SaveChangesAsync(cancellationToken);
+
+                await opportunityRoleAssignmentService.AddPermissionsFromDefaultsAsync(opportunity.OpportunityId, cancellationToken);
+
+                await strategicChargeCodeOpportunityDetailService.PopulateStrategicOpportunityDetails(opportunity, cancellationToken);
+                await strategicItemDimensionSyncService.UpsertAsync(opportunity, cancellationToken);
+
+                return opportunity.OpportunityId;
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, ex.Message);
+                throw;
+            }
+        }
+
+        public async Task<long> UpdateOpportunityChargeCode(long opportunityId, StrategicOpportunityChargeCodeUpdateDto opportunityDto, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+
+            try
+            {
+                var dbGuid = claimsPrincipalAccessor.GetDatabaseGuid();
+                var strataId = await idServiceClient.GetStrataId(dbGuid, cancellationToken);
+
+                var strategicOpportunity = await _centralDbContext.StrategicOpportunityChargeCodes.FirstOrDefaultAsync(opp => opp.OpportunityId == opportunityId && opp.StrataId == strataId, cancellationToken);
+                if (strategicOpportunity == null) return 0;
+
+                var trackingConfigChanged = UpdateOpportunityCore(strategicOpportunity, opportunityDto.Opportunity, strataId);
+
+                strategicOpportunity.ChargeCodeHPath = opportunityDto.Opportunity.ChargeCodeHPath;
+                strategicOpportunity.ExplorationPopulationId = opportunityDto.Opportunity.ExplorationPopulationId;
+                strategicOpportunity.PatientPopulationHPath = opportunityDto.Opportunity.PatientPopulationHPath;
+
+                _centralDbContext.StrategicOpportunityChargeCodes.Update(strategicOpportunity);
+                await _centralDbContext.SaveChangesAsync(cancellationToken);
+
+                if (opportunityDto.ShouldPopulateOpportunityDetails)
+                    await strategicChargeCodeOpportunityDetailService.PopulateStrategicOpportunityDetails(strategicOpportunity, cancellationToken);
+                else
+                {
+                    if (trackingConfigChanged)
+                        await strategicChargeCodeOpportunityDetailService.PopulateStrategicOpportunityGoalDetails(strategicOpportunity, DistributionStage.OpportunityChangeGoalPeriod, true, cancellationToken);
+                }
+                await strategicItemDimensionSyncService.UpsertAsync(strategicOpportunity, cancellationToken);
+                return strategicOpportunity.OpportunityId;
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, ex.Message);
+                throw;
+            }
+        }
+
+        public async Task<long> CreateOpportunityGeneralLedgerAsync(StrategicOpportunityGLDto opportunityDto, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+
+            try
+            {
+                var opportunity = opportunityDto.MapToStrategicOpportunityGL();
+
+                var dbGuid = claimsPrincipalAccessor.GetDatabaseGuid();
+                var strataId = await idServiceClient.GetStrataId(dbGuid, cancellationToken);
+                opportunity.StrataId = strataId;
+
+                InitializeNewOpportunity(opportunity, opportunityDto, strataId);
+
+                _centralDbContext.StrategicOpportunityGLs.Add(opportunity);
+                await _centralDbContext.SaveChangesAsync(cancellationToken);
+
+                await opportunityRoleAssignmentService.AddPermissionsFromDefaultsAsync(opportunity.OpportunityId, cancellationToken);
+
+                await strategicGLOpportunityDetailService.PopulateStrategicOpportunityGLDetails(opportunity, cancellationToken);
+
+                return opportunity.OpportunityId;
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, ex.Message);
+                throw;
+            }
+        }
+
+        public async Task<long> UpdateOpportunityGeneralLedger(long opportunityId, StrategicOpportunityGLUpdateDto opportunityDto, CancellationToken cancellationToken)
+        {
+            using var dbContext = await GetDbContext(cancellationToken);
+
+            try
+            {
+                var dbGuid = claimsPrincipalAccessor.GetDatabaseGuid();
+                var strataId = await idServiceClient.GetStrataId(dbGuid, cancellationToken);
+
+                var strategicOpportunity = await _centralDbContext.StrategicOpportunityGLs.FirstOrDefaultAsync(opp => opp.OpportunityId == opportunityId && opp.StrataId == strataId, cancellationToken);
+                if (strategicOpportunity == null) return 0;
+
+                var trackingConfigChanged = UpdateOpportunityCore(strategicOpportunity, opportunityDto.Opportunity, strataId);
+
+                strategicOpportunity.AccountType = opportunityDto.Opportunity.AccountType;
+                strategicOpportunity.DepartmentHPath = opportunityDto.Opportunity.DepartmentHPath;
+                strategicOpportunity.RevenueAccountHPath = opportunityDto.Opportunity.RevenueAccountHPath;
+                strategicOpportunity.ExpenseAccountHPath = opportunityDto.Opportunity.ExpenseAccountHPath;
+                strategicOpportunity.StatisticAccountHPath = opportunityDto.Opportunity.StatisticAccountHPath;
+                strategicOpportunity.HasStatistic = opportunityDto.Opportunity.HasStatistic;
+
+                _centralDbContext.StrategicOpportunityGLs.Update(strategicOpportunity);
+                await _centralDbContext.SaveChangesAsync(cancellationToken);
+
+                if (opportunityDto.ShouldPopulateOpportunityDetails)
+                    await strategicGLOpportunityDetailService.PopulateStrategicOpportunityGLDetails(strategicOpportunity, cancellationToken);
+                else if (trackingConfigChanged)
+                    await strategicGLOpportunityDetailService.PopulateStrategicOpportunityGLGoalDetails(strategicOpportunity, DistributionStage.OpportunityChangeGoalPeriod, true, cancellationToken);
+
+                return strategicOpportunity.OpportunityId;
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, ex.Message);
+                throw;
+            }
+        }
+
+        public async Task<StrategicOpportunityGLEditData> GetStrategicOpportunityGL(long opportunityId, CancellationToken cancellationToken)
+        {
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunityGLs.SingleOrDefaultAsync(opp => opp.OpportunityId == opportunityId, cancellationToken);
+            if (strategicOpportunity == null) return null;
+
+            var data = new StrategicOpportunityGLEditData
+            {
+                Name = strategicOpportunity.Name,
+                OpportunityType = strategicOpportunity.OpportunityType,
+                Rollup1Id = strategicOpportunity.Rollup1Id,
+                Rollup2Id = strategicOpportunity.Rollup2Id,
+                Rollup3Id = strategicOpportunity.Rollup3Id,
+                Filters = strategicOpportunity.OpportunityFiltersJSON,
+                BaselineStartDate = strategicOpportunity.BaselineStartDate,
+                BaselineEndDate = strategicOpportunity.BaselineEndDate,
+                BaselineDistribution = strategicOpportunity.BaselineDistribution,
+                EstimatedTrackingDuration = strategicOpportunity.EstimatedTrackingDuration,
+                AccountType = strategicOpportunity.AccountType,
+                DepartmentHPath = strategicOpportunity.DepartmentHPath,
+                RevenueAccountHPath = strategicOpportunity.RevenueAccountHPath,
+                ExpenseAccountHPath = strategicOpportunity.ExpenseAccountHPath,
+                StatisticAccountHPath = strategicOpportunity.StatisticAccountHPath,
+                HasStatistic = strategicOpportunity.HasStatistic
+            };
+
+            var measures = await _centralDbContext.StrategicOpportunityMeasures.Where(x => x.OpportunityId == strategicOpportunity.OpportunityId).ToListAsync(cancellationToken);
+            data.Measures = measures.Select(m => m.MapToStrategicOpportunityMeasureDto()).ToList();
+
+            var strategicOpportunityWorkbooks = await _centralDbContext.StrategicOpportunityWorkbooks.Where(x => x.OpportunityId == strategicOpportunity.OpportunityId).ToListAsync(cancellationToken);
+            var allWorkbooks = await opportunityWorkbookService.GetAllOpportunityWorkbooksAsync(false, cancellationToken);
+            data.Workbooks = strategicOpportunityWorkbooks.Select(wb => new StrategicOpportunityWorkbookDto
+            {
+                OpportunityId = strategicOpportunity.OpportunityId,
+                WorkbookId = wb.WorkbookId,
+                Name = allWorkbooks.FirstOrDefault(x => x.WorkbookId == wb.WorkbookId)?.Name
+            }).ToList();
+
+            return data;
+        }
+
+        public async Task<bool> DeleteGeneralLedgerOpportunityAsync(long opportunityId, CancellationToken cancellationToken)
+        {
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunities.SingleOrDefaultAsync(item => item.OpportunityId == opportunityId
+                && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            var strategy = _centralDbContext.Database.CreateExecutionStrategy();
+
+            var isDeleted = await strategy.ExecuteAsync(async () =>
+            {
+                using var centralTransaction = await _centralDbContext.Database.BeginTransactionAsync(CancellationToken.None);
+                try
+                {
+                    await _centralDbContext.StrategicOpportunityMeasures.ExecuteDeleteAsync(item => item.OpportunityId == opportunityId && item.StrataId == _user.GetStrataId(), CancellationToken.None);
+                    await _centralDbContext.StrategicOpportunityWorkbooks.ExecuteDeleteAsync(item => item.OpportunityId == opportunityId && item.StrataId == _user.GetStrataId(), CancellationToken.None);
+                    await _centralDbContext.Comments.ExecuteDeleteAsync(item => item.OpportunityId == opportunityId && item.StrataId == _user.GetStrataId(), CancellationToken.None);
+                    await _centralDbContext.StrategicOpportunityRampUps.ExecuteDeleteAsync(item => item.OpportunityId == opportunityId, CancellationToken.None);
+
+                    RemoveOpportunitySpecifications<StrategicOpportunityGL>(opportunityId, cancellationToken);
+                    _centralDbContext.StrategicOpportunities.Remove(strategicOpportunity);
+
+                    var isDeleted = await _centralDbContext.SaveChangesAsync(CancellationToken.None) > 0;
+                    await centralTransaction.CommitAsync(CancellationToken.None);
+                    return isDeleted;
+                }
+                catch (Exception ex)
+                {
+                    logger.LogServiceError(ex);
+                    await centralTransaction.RollbackAsync(CancellationToken.None);
+                    throw;
+                }
+            });
+
+            if (isDeleted)
+            {
+                try
+                {
+                    var glQueryBuilder = new Queries.StrategicOpportunityGLDetailQueryBuilder();
+                    var glDeleteSql = glQueryBuilder.BuildDeleteQuery(opportunityId);
+                    await databaseContext.QueryAsync<StrategicOpportunityGLDetail>(glDeleteSql, $"{nameof(DeleteGeneralLedgerOpportunityAsync)}.Delete");
+                    await strategicItemDimensionSyncService.DeleteAsync(opportunityId);
+                }
+                catch (OperationCanceledException)
+                {
+                    throw;
+                }
+                catch (DataException ex)
+                {
+                    logger.LogServiceError(ex, $"Error occurred while executing Snowflake cleanup for opportunity {opportunityId}.");
+                }
+            }
+
+            return isDeleted;
+        }
+
+        public async Task<bool> NameIsValidAsync(string name, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            var isExist = await _centralDbContext.StrategicOpportunities.Where(item => item.StrataId == _user.GetStrataId()).AnyAsync(x => x.Name.ToLower() == name.ToLower(), cancellationToken);
+            return !isExist;
+        }
+
+        public async Task<StrategicOpportunityLayout> GetStrategicOpportunityLayout(long opportunityId, CancellationToken cancellationToken)
+        {
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunities.FirstOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            if (strategicOpportunity != null && !string.IsNullOrEmpty(strategicOpportunity.LayoutJSON))
+            {
+                return JsonConvert.DeserializeObject<StrategicOpportunityLayout>(strategicOpportunity.LayoutJSON);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public async Task<bool> UpdateStrategicOpportunityLayout(long opportunityId, StrategicOpportunityLayout layout, CancellationToken cancellationToken)
+        {
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunities.SingleOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            if (strategicOpportunity != null)
+            {
+                strategicOpportunity.LayoutJSON = JsonConvert.SerializeObject(layout);
+                _centralDbContext.StrategicOpportunities.Update(strategicOpportunity);
+
+                return await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+            }
+            else return false;
+        }
+
+        public async Task<bool> UpdateStrategicInitiative(long opportunityId, StrategicInitiativeUpdateDto updateInitiativeDto, CancellationToken cancellationToken)
+        {
+            var strategicInitiative = await _centralDbContext.StrategicOpportunityChargeCodes.SingleOrDefaultAsync(item => item.OpportunityId == opportunityId
+                && item.Status >= (byte)StrategicOpportunityStatus.NewInitiative && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            if (strategicInitiative != null)
+            {
+                strategicInitiative.Name = updateInitiativeDto.Name;
+
+                var isYearMonthChanged =
+                    new YearMonthStruct(strategicInitiative.TrackingStartDate) != new YearMonthStruct(updateInitiativeDto.TrackingStartDate) ||
+                    new YearMonthStruct(strategicInitiative.TrackingEndDate) != new YearMonthStruct(updateInitiativeDto.TrackingEndDate);
+
+                if (isYearMonthChanged)
+                {
+                    await strategicChargeCodeOpportunityDetailService.DeleteMeasuresDetails(strategicInitiative.OpportunityId, cancellationToken);
+
+                    strategicInitiative.TrackingStartDate = updateInitiativeDto.TrackingStartDate;
+                    strategicInitiative.TrackingEndDate = updateInitiativeDto.TrackingEndDate;
+                    SyncRampUpWithTrackingPeriodChange(strategicInitiative.OpportunityId, updateInitiativeDto.TrackingStartDate, updateInitiativeDto.TrackingEndDate);
+                    await strategicChargeCodeOpportunityDetailService.PopulateStrategicOpportunityCommittedDetails(strategicInitiative, DistributionStage.InitiativeChangeTrackingPeriod, false, cancellationToken);
+                }
+                var saveResult = await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+
+                if (isYearMonthChanged && saveResult)
+                {
+                    if (strategicInitiative.Status != (byte)StrategicOpportunityStatus.NewInitiative)
+                        backgroundJobClient.Enqueue<StrategicOpportunityJob>((job) => job.RunOpportunityTracking(strategicInitiative.StrataId, strategicInitiative.OpportunityId, CancellationToken.None));
+                }
+
+                if (saveResult)
+                    await strategicItemDimensionSyncService.UpsertAsync(strategicInitiative, cancellationToken);
+
+                return saveResult;
+            }
+
+            var glInitiative = await _centralDbContext.StrategicOpportunityGLs.SingleOrDefaultAsync(item => item.OpportunityId == opportunityId
+                && item.Status >= (byte)StrategicOpportunityStatus.NewInitiative && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            if (glInitiative != null)
+            {
+                glInitiative.Name = updateInitiativeDto.Name;
+
+                var isYearMonthChanged =
+                    new YearMonthStruct(glInitiative.TrackingStartDate) != new YearMonthStruct(updateInitiativeDto.TrackingStartDate) ||
+                    new YearMonthStruct(glInitiative.TrackingEndDate) != new YearMonthStruct(updateInitiativeDto.TrackingEndDate);
+
+                if (isYearMonthChanged)
+                {
+                    glInitiative.TrackingStartDate = updateInitiativeDto.TrackingStartDate;
+                    glInitiative.TrackingEndDate = updateInitiativeDto.TrackingEndDate;
+                    SyncRampUpWithTrackingPeriodChange(glInitiative.OpportunityId, updateInitiativeDto.TrackingStartDate, updateInitiativeDto.TrackingEndDate);
+                    await strategicGLOpportunityDetailService.PopulateStrategicOpportunityCommittedDetails(glInitiative, DistributionStage.InitiativeChangeTrackingPeriod, false, cancellationToken);
+                }
+                var saveResult = await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+
+                if (isYearMonthChanged && glInitiative.Status != (byte)StrategicOpportunityStatus.NewInitiative && saveResult)
+                    backgroundJobClient.Enqueue<StrategicOpportunityJob>((job) => job.RunOpportunityTracking(glInitiative.StrataId, glInitiative.OpportunityId, CancellationToken.None));
+
+                if (saveResult)
+                    await strategicItemDimensionSyncService.UpsertAsync(glInitiative, cancellationToken);
+
+                return saveResult;
+            }
+
+            return false;
+        }
+        public async Task<bool> UpdateRoles(long opportunityId, StrategicRolesUpdate updateRolesDto, CancellationToken cancellationToken)
+        {
+            var strategicEntity = await _centralDbContext.StrategicOpportunities.SingleOrDefaultAsync(item => item.OpportunityId == opportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            if (strategicEntity != null)
+            {
+                var strategy = _centralDbContext.Database.CreateExecutionStrategy();
+
+                var isUpdated = await strategy.ExecuteAsync(async () =>
+                {
+                    using var centralTransaction = await _centralDbContext.Database.BeginTransactionAsync(cancellationToken);
+                    try
+                    {
+                        await _centralDbContext.StakeholdersLinks
+                            .Where(link => link.StrategicOpportunityId == opportunityId)
+                            .ExecuteDeleteAsync(cancellationToken);
+
+                        strategicEntity.CostLeaderGuid = updateRolesDto.CostLeaderGuid;
+                        strategicEntity.OwnerGuid = updateRolesDto.OwnerGuid;
+                        strategicEntity.ExecutiveSponsorGuid = updateRolesDto.ExecutiveSponsorGuid;
+                        strategicEntity.TeamMembers = updateRolesDto.TeamMembers;
+                        strategicEntity.Stakeholders = updateRolesDto.Stakeholders
+                            .Select(s => new StrategicStakeholdersLink(strategicEntity.OpportunityId, s))
+                            .ToList();
+
+                        _centralDbContext.StrategicOpportunities.Update(strategicEntity);
+
+                        var isUpdated = await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+                        await centralTransaction.CommitAsync(CancellationToken.None);
+                        if (isUpdated)
+                            await strategicItemDimensionSyncService.UpsertAsync(strategicEntity, cancellationToken);
+                        return isUpdated;
+                    }
+                    catch (Exception ex)
+                    {
+                        logger.LogServiceError(ex);
+                        await centralTransaction.RollbackAsync(CancellationToken.None);
+                        throw;
+                    }
+                });
+
+                return isUpdated;
+            }
+            else return false;
+        }
+
+        public async Task<bool> UpdateStrategicOpportunityStatus(long opportunityId, StrategicOpportunityUpdateStatusDto updateStatusDto, CancellationToken cancellationToken)
+        {
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunityChargeCodes.SingleOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            if (strategicOpportunity != null)
+            {
+                strategicOpportunity.Status = updateStatusDto.Status;
+                if (updateStatusDto.Status == (byte)StrategicOpportunityStatus.NewInitiative)
+                {
+                    strategicOpportunity.TrackingStartDate = updateStatusDto.TrackingStartDate;
+                    strategicOpportunity.TrackingEndDate = updateStatusDto.TrackingEndDate;
+                    SyncRampUpWithTrackingPeriodChange(strategicOpportunity.OpportunityId, updateStatusDto.TrackingStartDate, updateStatusDto.TrackingEndDate);
+                    await strategicChargeCodeOpportunityDetailService.DeleteMeasuresDetails(strategicOpportunity.OpportunityId, cancellationToken);
+                    await strategicChargeCodeOpportunityDetailService.PopulateStrategicOpportunityCommittedDetails(strategicOpportunity, DistributionStage.FromOpportunityToInitiative, false, cancellationToken);
+                }
+                else if (updateStatusDto.Status == (byte)StrategicOpportunityStatus.NewOpportunity)
+                {
+                    strategicOpportunity.LastRunTrackingDate = null;
+                    strategicOpportunity.LastRunTrackingStatus = RunTrackingStatus.None;
+                    strategicOpportunity.TrackingStartDate = default;
+                    strategicOpportunity.TrackingEndDate = default;
+                    strategicOpportunity.ProgressToDateActual = 0;
+                    strategicOpportunity.ProgressToDateCommitted = 0;
+                    await strategicChargeCodeOpportunityDetailService.DeleteMeasuresDetails(strategicOpportunity.OpportunityId, cancellationToken);
+                    await strategicChargeCodeOpportunityDetailService.PopulateStrategicOpportunityGoalDetails(strategicOpportunity, DistributionStage.FromInitiativeToOpportunity, false, cancellationToken);                    
+                }
+
+                var saveResult = await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+
+                if (saveResult)
+                {
+                    if (updateStatusDto.Status == (byte)StrategicOpportunityStatus.NewInitiative || updateStatusDto.Status == (byte)StrategicOpportunityStatus.CompleteMonitoring)
+                    {
+                        backgroundJobClient.Enqueue<StrategicOpportunityJob>((job) => job.RunOpportunityUpdateMeasuresAverage(strategicOpportunity.StrataId, strategicOpportunity.OpportunityId, CancellationToken.None));
+                    }
+                    await strategicItemDimensionSyncService.UpsertAsync(strategicOpportunity, cancellationToken);
+                }
+                
+                return saveResult;
+            }
+
+            var glOpportunity = await _centralDbContext.StrategicOpportunityGLs.SingleOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+
+            if (glOpportunity != null)
+            {
+                glOpportunity.Status = updateStatusDto.Status;
+                if (updateStatusDto.Status == (byte)StrategicOpportunityStatus.NewInitiative)
+                {
+                    glOpportunity.TrackingStartDate = updateStatusDto.TrackingStartDate;
+                    glOpportunity.TrackingEndDate = updateStatusDto.TrackingEndDate;
+                    SyncRampUpWithTrackingPeriodChange(glOpportunity.OpportunityId, updateStatusDto.TrackingStartDate, updateStatusDto.TrackingEndDate);
+                    await strategicGLOpportunityDetailService.PopulateStrategicOpportunityCommittedDetails(glOpportunity, DistributionStage.FromOpportunityToInitiative, false, cancellationToken);
+                }
+                else if (updateStatusDto.Status == (byte)StrategicOpportunityStatus.NewOpportunity)
+                {
+                    glOpportunity.LastRunTrackingDate = null;
+                    glOpportunity.LastRunTrackingStatus = RunTrackingStatus.None;
+                    glOpportunity.TrackingStartDate = default;
+                    glOpportunity.TrackingEndDate = default;
+                    glOpportunity.ProgressToDateActual = 0;
+                    glOpportunity.ProgressToDateCommitted = 0;
+                    await strategicGLOpportunityDetailService.PopulateStrategicOpportunityGLGoalDetails(glOpportunity, DistributionStage.FromInitiativeToOpportunity, false, cancellationToken);
+                }
+                var glSaveResult = await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+                if (glSaveResult) await strategicItemDimensionSyncService.UpsertAsync(glOpportunity, cancellationToken);
+                return glSaveResult;
+            }
+
+            return false;
+        }
+
+        public async Task<bool> UpdateStrategicOpportunityRampUpsAsync(long opportunityId, List<StrategicOpportunityRampUpDto> rampUps, CancellationToken cancellationToken)
+        {
+            // Remove existing ramp-ups for the opportunity
+            var existingRampUps = _centralDbContext.StrategicOpportunityRampUps.Where(r => r.OpportunityId == opportunityId);
+            _centralDbContext.StrategicOpportunityRampUps.RemoveRange(existingRampUps);
+
+            // Add new ramp-ups
+            var newRampUps = rampUps.Select(dto => new StrategicOpportunityRampUp
+            {
+                OpportunityId = dto.OpportunityId,
+                MonthNumber = dto.MonthNumber,
+                Percentage = dto.Percentage
+            }).ToList();
+            await _centralDbContext.StrategicOpportunityRampUps.AddRangeAsync(newRampUps, cancellationToken);
+            
+            var opportunity = await _centralDbContext.StrategicOpportunityChargeCodes.SingleOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+            if (opportunity != null) {
+                var newRampUpValues = newRampUps.OrderBy(r => r.MonthNumber).Select(r => r.Percentage).ToArray();
+                if (opportunity.Status >= (byte)StrategicOpportunityStatus.NewInitiative)
+                {
+                    var oldRampUpValues = existingRampUps.OrderBy(r => r.MonthNumber).Select(r => r.Percentage).ToArray();
+                    await strategicChargeCodeOpportunityDetailService.UpdateDetailCommittedByRampUp(opportunity, oldRampUpValues, newRampUpValues, false, cancellationToken);
+                }
+                else
+                {
+                    await strategicChargeCodeOpportunityDetailService.PopulateDetailGoalSummary(opportunity, newRampUpValues, false, cancellationToken);
+                }
+            }
+
+            var glOpportunity = await _centralDbContext.StrategicOpportunityGLs.SingleOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+            if (glOpportunity != null)
+            {
+                var newRampUpValues = newRampUps.OrderBy(r => r.MonthNumber).Select(r => r.Percentage).ToArray();
+                if (glOpportunity.Status >= (byte)StrategicOpportunityStatus.NewInitiative)
+                {
+                    var oldRampUpValues = existingRampUps.OrderBy(r => r.MonthNumber).Select(r => r.Percentage).ToArray();
+                    await strategicGLOpportunityDetailService.UpdateDetailCommittedByRampUp(glOpportunity, oldRampUpValues, newRampUpValues, false, cancellationToken);
+                }
+                else
+                {
+                    await strategicGLOpportunityDetailService.PopulateGLDetailGoalSummary(glOpportunity, newRampUpValues, false, cancellationToken);
+                }
+            }
+
+            return await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+        }
+
+        public async Task<bool> ResetStrategicOpportunityRampUps(long opportunityId, CancellationToken cancellationToken)
+        {
+            var rampUps = await _centralDbContext.StrategicOpportunityRampUps
+                .Where(r => r.OpportunityId == opportunityId)
+                .ToListAsync(cancellationToken);
+
+            if (rampUps != null && rampUps.Count != 0)
+            {
+                foreach (var rampUp in rampUps)
+                    rampUp.Percentage = 1;
+
+                return await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+            }
+            return false;
+        }
+
+        public async Task<StrategicOpportunityDrawerDetails> GetStrategicOpportunityDrawerDetails(long opportunityId, CancellationToken cancellationToken)
+        {
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunityChargeCodes.FirstOrDefaultAsync(item => opportunityId == item.OpportunityId && item.StrataId == _user.GetStrataId(), cancellationToken);
+            if (strategicOpportunity == null) return null;
+
+            var chargeCodeDimension = new List<StrategicOpportunityDetailDimension>
+            {
+                StrategicOpportunityDetailDimension.ChargeCode
+            };
+
+            var dicDimensionSql = StrategicOpportunityServiceQuery.GetDetailQuery(chargeCodeDimension, true);
+            if (dicDimensionSql.Count == 0) return null;
+
+            var strategicOpportunityItem = new List<StrategicOpportunityItem>()
+            {
+                new()
+                {
+                    PatientPopulationHPath = strategicOpportunity.PatientPopulationHPath,
+                    ExplorationPopulationId = strategicOpportunity.ExplorationPopulationId
+                }
+            };
+
+            await SetPopulationName(strategicOpportunityItem, cancellationToken);
+            var populations = strategicOpportunityItem.FirstOrDefault().Population.Split(", ").ToList();
+
+            var data = new StrategicOpportunityDrawerDetails()
+            {
+                PopulationName = string.IsNullOrEmpty(strategicOpportunity.PatientPopulationHPath) ? "Exploration Patient Population" : "Patient Population",
+                Populations = populations,
+                Filters = strategicOpportunity.OpportunityFiltersJSON,
+                BaselinePeriod = $"{strategicOpportunity.BaselineStartDate:MM/dd/yyyy} to {strategicOpportunity.BaselineEndDate:MM/dd/yyyy}",
+                TrackingStartDate = strategicOpportunity.TrackingStartDate,
+                TrackingEndDate = strategicOpportunity.TrackingEndDate,
+                EstimatedTrackingDuration = strategicOpportunity.EstimatedTrackingDuration
+            };
+
+            var querySelect = String.Join(Environment.NewLine, dicDimensionSql.Values).SnowflakeSyntax();
+            var queryOneParams = new
+            {
+                OpportunityId = opportunityId,
+                IsBaseline = strategicOpportunity.Status < (byte)StrategicOpportunityStatus.NewInitiative ? (bool?)null : false
+            };
+
+            try
+            {
+                var results = await databaseContext.QueryAsync<KeyValuePair<int, string>>(querySelect, "Charge Codes", queryOneParams);
+                data.ChargeCodes = results.ToDictionary(x => x.Key.ToString(), x => x.Value);
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, info: new Dictionary<string, object> { { "query", querySelect }, { "queryParams", queryOneParams } });
+                throw;
+            }
+
+            return data;
+        }
+
+
+        public async Task<bool> CompleteInitiative(long opportunityId, StrategicOpportunityCompleteInitiativeData completeInitiativeData, CancellationToken cancellationToken)
+        {
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunityChargeCodes.FindAsync([opportunityId], cancellationToken: cancellationToken);
+            if (strategicOpportunity == null) return false;
+
+            if (completeInitiativeData.IsThresholdMonitoring)
+            {
+                strategicOpportunity.Status = (byte)StrategicOpportunityStatus.CompleteMonitoring;
+                var primaryMeasure = await _centralDbContext.StrategicOpportunityMeasures
+                    .Where(pm => pm.OpportunityId == opportunityId && pm.MeasureGroup == MeasureGroup.Primary)
+                    .SingleOrDefaultAsync(cancellationToken);
+
+                if (primaryMeasure != null)
+                    primaryMeasure.AcceptableThreshold = completeInitiativeData.AcceptableThreshold;
+
+                await strategicChargeCodeOpportunityDetailService.UpdateMeasuresAverage(strategicOpportunity, cancellationToken);
+            } else
+            {
+                strategicOpportunity.Status = (byte)StrategicOpportunityStatus.Complete;
+            }
+
+            await _centralDbContext.SaveChangesAsync(cancellationToken);
+            await strategicItemDimensionSyncService.UpsertAsync(strategicOpportunity, cancellationToken);
+            return true;
+        }
+
+        public async Task<List<StrategicOpportunityMeasureDto>> GetStrategicOpportunityMeasures(long opportunityId, CancellationToken cancellationToken)
+        {
+            var measures = await _centralDbContext.StrategicOpportunityMeasures.Where(measure => measure.OpportunityId == opportunityId).ToListAsync(cancellationToken);
+
+            return measures.Any() ? measures.Select(m => new StrategicOpportunityMeasureDto() { MeasureId = m.MeasureId, MeasureName = m.MeasureName }).ToList() 
+                : new List<StrategicOpportunityMeasureDto>();
+        }
+
+        public async Task<StrategicOpportunityMeasureDto> GetStrategicOpportunityPrimaryMeasure(long opportunityId, CancellationToken cancellationToken)
+        {
+            var strategicOpportunity = await _centralDbContext.StrategicOpportunityMeasures
+                .Where(pm => pm.OpportunityId == opportunityId && pm.MeasureGroup == MeasureGroup.Primary)
+                .FirstOrDefaultAsync(cancellationToken);
+
+            if (strategicOpportunity == null) return null;
+
+            return strategicOpportunity.MapToStrategicOpportunityMeasureDto();
+        }
+
+
+        public async Task<List<StrategicOpportunityRampUpDto>> GetStrategicOpportunityRampUpsAsync(long opportunityId, CancellationToken cancellationToken)
+        {
+            var rampUps = await _centralDbContext.StrategicOpportunityRampUps
+                .Where(r => r.OpportunityId == opportunityId)
+                .OrderBy(r => r.MonthNumber)
+                .Select(r => new StrategicOpportunityRampUpDto
+                {
+                    OpportunityId = r.OpportunityId,
+                    MonthNumber = r.MonthNumber,
+                    Percentage = r.Percentage
+                })
+                .ToListAsync(cancellationToken);
+            return rampUps;
+        }
+
+        public async Task<bool> RunTrackingTask(long opportunityId, CancellationToken cancellationToken)
+        {
+            var opportunityChargeCode = await _centralDbContext.StrategicOpportunityChargeCodes.FindAsync([opportunityId], cancellationToken: cancellationToken);
+            if (opportunityChargeCode != null)
+            {
+                backgroundJobClient.Enqueue<StrategicOpportunityJob>((job) => job.RunOpportunityTracking(opportunityChargeCode.StrataId, opportunityId, cancellationToken));
+                opportunityChargeCode.Status = (byte)StrategicOpportunityStatus.Tracking;
+                return await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+            }
+
+            var opportunityGL = await _centralDbContext.StrategicOpportunityGLs.FindAsync([opportunityId], cancellationToken: cancellationToken);
+            if (opportunityGL != null)
+            {
+                backgroundJobClient.Enqueue<StrategicOpportunityJob>((job) => job.RunOpportunityTracking(opportunityGL.StrataId, opportunityId, cancellationToken));
+                opportunityGL.Status = (byte)StrategicOpportunityStatus.Tracking;
+                var saveResult = await _centralDbContext.SaveChangesAsync(cancellationToken) > 0;
+                if (saveResult) await strategicItemDimensionSyncService.UpsertAsync(opportunityGL, cancellationToken);
+                return saveResult;
+            }
+
+            return false;
+        }
+
+        public async Task<List<StrategicOpportunityMeasureDetail>> GetStrategicOpportunityMeasureDetails(long measureId, CancellationToken cancellationToken)
+        {
+            var measure = await _centralDbContext.StrategicOpportunityMeasures.Where(measure => measure.MeasureId == measureId).SingleOrDefaultAsync(cancellationToken);
+
+            if (measure == null) return null;
+
+            var querySelect = "SELECT * FROM cci.StrategicOpportunityMeasureDetail WHERE MeasureId = :MeasureId";
+            var queryOneParams = new
+            {
+                MeasureId = measureId
+            };
+
+            try
+            {
+                var data = await databaseContext.QueryAsync<StrategicOpportunityMeasureDetail>(querySelect, "Strategic Opportunity Measures", queryOneParams);
+                return data.ToList();
+            }
+            catch (Exception ex)
+            {
+                logger.LogServiceError(ex, info: new Dictionary<string, object> { { "query", querySelect }, { "queryParams", queryOneParams } });
+                throw;
+            }
+        }
+
+        public async Task<long> CopyStrategicOpportunity(long opportunityId, string opportunityName, CancellationToken cancellationToken)
+        {
+            var ccOpportunity = await _centralDbContext.StrategicOpportunityChargeCodes.FindAsync([opportunityId], cancellationToken: cancellationToken);
+            var glOpportunity = ccOpportunity == null
+                ? await _centralDbContext.StrategicOpportunityGLs.FindAsync([opportunityId], cancellationToken: cancellationToken)
+                : null;
+
+            if (ccOpportunity == null && glOpportunity == null) return 0;
+
+            var isGL = glOpportunity != null;
+            var strategy = _centralDbContext.Database.CreateExecutionStrategy();
+            StrategicOpportunity newOpportunity = null;
+
+            var copiedOpportunityId = await strategy.ExecuteAsync(async () =>
+            {
+                using var copyOpportunityTransaction = await _centralDbContext.Database.BeginTransactionAsync(cancellationToken);
+                try
+                {
+                    if (isGL)
+                    {
+                        var newGL = new StrategicOpportunityGL(glOpportunity, opportunityName);
+                        newGL.LayoutJSON = glOpportunity.LayoutJSON;
+                        await _centralDbContext.StrategicOpportunityGLs.AddAsync(newGL, cancellationToken);
+                        newOpportunity = newGL;
+                    }
+                    else
+                    {
+                        var newCC = new StrategicOpportunityChargeCode(ccOpportunity, opportunityName);
+
+                        // set default layout json columns for new opportunity
+                        var layoutJson = JObject.Parse(newCC.LayoutJSON);
+                        layoutJson["Columns"] = new JArray{ "encounters", "encountersMonth", "unitsMonth", "unitsPerEncounter", "costPerEncounter", "costPerUnit", "costMonth", "goalUnitsMonth",
+                            "goalUnitsPerEncounter", "goalCostPerEncounter", "goalCostPerUnit", "goalCostMonth", "units", "cost", "goalUnits", "goalCost", "totalImprovement" };
+                        newCC.LayoutJSON = JsonConvert.SerializeObject(layoutJson);
+
+                        await _centralDbContext.StrategicOpportunityChargeCodes.AddAsync(newCC, cancellationToken);
+                        newOpportunity = newCC;
+                    }
+
+                    await _centralDbContext.SaveChangesAsync(cancellationToken);
+                    long newOpportunityId = newOpportunity.OpportunityId;
+
+                    // copy measures
+                    newOpportunity.Measures = [];
+                    var strategicOpportunityMeasures = _centralDbContext.StrategicOpportunityMeasures.Where(opp => opp.OpportunityId == opportunityId);
+                    foreach (var measure in strategicOpportunityMeasures)
+                    {
+                        var newMeasure = new StrategicOpportunityMeasure()
+                        {
+                            OpportunityId = newOpportunityId,
+                            MeasureType = measure.MeasureType,
+                            MeasureName = measure.MeasureName,
+                            DesiredResult = measure.DesiredResult,
+                            AcceptableThreshold = measure.AcceptableThreshold,
+                            FiltersJSON = measure.FiltersJSON,
+                            MeasureGroup = measure.MeasureGroup,
+                            StrataId = measure.StrataId
+                        };
+                        newOpportunity.Measures.Add(newMeasure);
+                    }
+
+                    // copy workbooks
+                    newOpportunity.Workbooks = [];
+                    var strategicOpportunityWorkbooks = _centralDbContext.StrategicOpportunityWorkbooks.Where(x => x.OpportunityId == opportunityId);
+                    foreach (var workbook in strategicOpportunityWorkbooks)
+                    {
+                        var newWorkbook = new StrategicOpportunityWorkbook()
+                        {
+                            OpportunityId = newOpportunityId,
+                            WorkbookId = workbook.WorkbookId,
+                            StrataId = workbook.StrataId
+                        };
+                        newOpportunity.Workbooks.Add(newWorkbook);
+                    }
+
+                    // copy stakeholders
+                    var stakeholders = _centralDbContext.StakeholdersLinks.Where(m => m.StrategicOpportunityId == opportunityId);
+                    if (stakeholders.Any())
+                    {
+                        var newStakeholders = stakeholders.Select(s => new StrategicStakeholdersLink(newOpportunityId, s.UserGuid)).ToList();
+                        await _centralDbContext.StakeholdersLinks.AddRangeAsync(newStakeholders, cancellationToken);
+                    }
+
+                    // copy user roles
+                    await opportunityRoleAssignmentService.CopyTo(opportunityId, newOpportunityId, cancellationToken);
+
+                    await _centralDbContext.SaveChangesAsync(cancellationToken);
+                    await copyOpportunityTransaction.CommitAsync(CancellationToken.None);
+                    return newOpportunityId;
+                }
+                catch (Exception ex)
+                {
+                    logger.LogServiceError(ex);
+                    await copyOpportunityTransaction.RollbackAsync(CancellationToken.None);
+                    throw;
+                }
+            });
+
+            if (copiedOpportunityId > 0)
+            {
+                if (isGL)
+                    await strategicGLOpportunityDetailService.PopulateStrategicOpportunityGLDetails(newOpportunity as StrategicOpportunityGL, cancellationToken);
+                else
+                    await strategicChargeCodeOpportunityDetailService.PopulateStrategicOpportunityDetails(newOpportunity as StrategicOpportunityChargeCode, cancellationToken);
+                await strategicItemDimensionSyncService.UpsertAsync(newOpportunity, cancellationToken);
+            }
+
+            return copiedOpportunityId;
+        }
+
+        private void RemoveOpportunitySpecifications<T>(long opportunityId, CancellationToken cancellationToken) where T : StrategicOpportunity
+        {
+            var specifications = _centralDbContext.Set<T>().Where(item => item.OpportunityId == opportunityId && item.StrataId == _user.GetStrataId());
+            _centralDbContext.Set<T>().RemoveRange(specifications);
+        }
+
+        private string GetRollupName(IEnumerable<InitiativeRollupColumn> rollups, int rollupId, int index)
+        {
+            var rollup = rollups.Skip(index).FirstOrDefault();
+            if (rollup != null)
+                return rollup.InitiativeRollupValues.FirstOrDefault(r => r.InitiativeRollupValueId == rollupId)?.Value ?? string.Empty;
+
+            return string.Empty;
+        }
+
+        private string GetOpportunityTypeName(StrategicOpportunityTypes opportunityType)
+        {
+            return opportunityType switch
+            {
+                StrategicOpportunityTypes.ChargeCode => "Charge Code",
+                StrategicOpportunityTypes.GeneralLedger => "General Ledger",
+                _ => string.Empty
+            };
+        }
+
+        // We should use the existing StrategicOpportunityStatus enum
+        private string GetStatusName(byte status)
+        {
+            return status switch
+            {
+                (byte)StrategicOpportunityStatus.NewOpportunity or (byte)StrategicOpportunityStatus.NewInitiative => "New",
+                (byte)StrategicOpportunityStatus.InValidation => "In Validation",
+                (byte)StrategicOpportunityStatus.PendingApproval => "Pending Approval",
+                (byte)StrategicOpportunityStatus.Tracking => "Tracking",
+                (byte)StrategicOpportunityStatus.Complete => "Complete",
+                (byte)StrategicOpportunityStatus.CompleteMonitoring => "Complete Monitoring",
+                _ => string.Empty
+            };
+        }
+
+        private async Task SetPopulationName<T>(List<T> results, CancellationToken cancellationToken) where T : GeneralStrategicOpportunityItem
+        {
+            var explorationIds = results.Where(r => r.ExplorationPopulationId > 0).Select(r => r.ExplorationPopulationId).Distinct().ToList();
+            var explorations = await _centralDbContext.ExplorationPopulations
+                .Where(ep => explorationIds.Contains(ep.ExplorationPopulationId)).ToDictionaryAsync(ep => ep.ExplorationPopulationId, ep => ep.Name, cancellationToken);
+            var dimension = await schemaServiceClient.GetDimensionByGlobalIdAsync("Clinical Indicator");
+            var hPaths = results.Where(r => r.ExplorationPopulationId == 0 && !string.IsNullOrEmpty(r.PatientPopulationHPath)).SelectMany(r => r.PatientPopulationHPath.Split(",")).Distinct();
+            var members = new List<HierarchyNodeDto>();
+            foreach (var codeHpaths in hPaths.Batch(250))
+            {
+                members.AddRange(await schemaServiceClient.GetHierarchyNodesFromHierarchyPathsAsync(dimension.DimensionGuid, codeHpaths, cancellationToken));
+            }
+            foreach (var item in results)
+            {
+                item.Population = item.ExplorationPopulationId > 0
+                    ? explorations.FirstOrDefault(e => e.Key == item.ExplorationPopulationId).Value
+                    : string.Join(", ", members.Where(m => item.PatientPopulationHPath.Split(",").Contains(m.Path)).Select(m => m.Name));
+            }
+        }
+
+        private async Task<List<T>> GetDimensionMembersByHierarchyPaths<T>(string dimensionGlobalId, List<string> hierarchyPaths, CancellationToken cancellationToken)
+        {
+            var dimension = await schemaServiceClient.GetDimensionByGlobalIdAsync(dimensionGlobalId, cancellationToken);
+            var allMembers = new List<T>();
+
+            foreach (var batch in hierarchyPaths.Batch(250))
+            {
+                var members = await schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(dimension.DimensionGuid, batch, cancellationToken);
+                foreach (var memberBatch in members.Batch(250))
+                {
+                    var ids = memberBatch.Select(m => int.Parse(m.Id)).ToList();
+                    var filteredMembers = await schemaServiceClient.GetFilteredDimensionMembersByGlobalIdAsync<T>(dimensionGlobalId, ids, cancellationToken);
+                    allMembers.AddRange(filteredMembers);
+                }
+            }
+
+            return allMembers;
+        }
+
+        private static List<StrategicOpportunityWorkbook> GetStrategicOpportunityWorkbooks(List<int> workbookIds, int strataId)
+        {
+            var workbooks = new List<StrategicOpportunityWorkbook>();
+            foreach (var workbookId in workbookIds)
+            {
+                var workbook = new StrategicOpportunityWorkbook()
+                {
+                    WorkbookId = workbookId,
+                    StrataId = strataId
+                };
+                workbooks.Add(workbook);
+            }
+            return workbooks;
+        }
+
+        private void InitializeNewOpportunity(StrategicOpportunity entity, StrategicOpportunityDto dto, int strataId)
+        {
+            entity.Measures = dto.Measures.Select(measureDto =>
+            {
+                var measure = measureDto.MapToStrategicOpportunityMeasure();
+                measure.StrataId = strataId;
+                return measure;
+            }).ToList();
+            entity.Measures.Add(new StrategicOpportunityMeasure() { StrataId = strataId, MeasureGroup = MeasureGroup.System, MeasureType = MeasureType.CommittedCost });
+            entity.Measures.Add(new StrategicOpportunityMeasure() { StrataId = strataId, MeasureGroup = MeasureGroup.System, MeasureType = MeasureType.ActualCost });
+            entity.Workbooks = GetStrategicOpportunityWorkbooks(dto.WorkbookIds.ToList(), strataId);
+            entity.LayoutJSON = JsonConvert.SerializeObject(dto.Layout);
+            entity.Status = (byte)StrategicOpportunityStatus.NewOpportunity;
+        }
+
+        // Returns true if tracking config changed (callers use to decide partial repopulation)
+        private bool UpdateOpportunityCore(StrategicOpportunity entity, StrategicOpportunityDto dto, int strataId)
+        {
+            var trackingConfigChanged =
+                entity.EstimatedTrackingDuration != dto.EstimatedTrackingDuration ||
+                entity.BaselineDistribution != dto.BaselineDistribution;
+
+            entity.Name = dto.Name;
+            entity.Rollup1Id = dto.Rollup1Id;
+            entity.Rollup2Id = dto.Rollup2Id;
+            entity.Rollup3Id = dto.Rollup3Id;
+            entity.OpportunityType = dto.OpportunityType;
+            entity.OpportunityFiltersJSON = dto.OpportunityFiltersJSON;
+            entity.BaselineType = dto.BaselineType;
+            entity.BaselineDistribution = dto.BaselineDistribution;
+            entity.BaselineStartDate = dto.BaselineStartDate;
+            entity.BaselineEndDate = dto.BaselineEndDate;
+            entity.EstimatedTrackingDuration = dto.EstimatedTrackingDuration;
+
+            var secondaryMeasures = _centralDbContext.StrategicOpportunityMeasures
+                .Where(m => m.OpportunityId == entity.OpportunityId && m.MeasureGroup != MeasureGroup.System);
+            _centralDbContext.StrategicOpportunityMeasures.RemoveRange(secondaryMeasures);
+            entity.Measures = dto.Measures.Select(x => x.MapToStrategicOpportunityMeasure()).ToList();
+
+            var existingWorkbooks = _centralDbContext.StrategicOpportunityWorkbooks
+                .Where(w => w.OpportunityId == entity.OpportunityId);
+            _centralDbContext.StrategicOpportunityWorkbooks.RemoveRange(existingWorkbooks);
+            entity.Workbooks = GetStrategicOpportunityWorkbooks(dto.WorkbookIds.ToList(), strataId);
+
+            return trackingConfigChanged;
+        }
+
+        private void SyncRampUpWithTrackingPeriodChange(long opportunityId, DateOnly start, DateOnly end)
+        {
+            int monthsDifference = DateExtensions.GetMonthDifference(start, end, true);
+            var existingRampUps = _centralDbContext.StrategicOpportunityRampUps.Where(r => r.OpportunityId == opportunityId && r.MonthNumber > monthsDifference);
+            _centralDbContext.StrategicOpportunityRampUps.RemoveRange(existingRampUps);
+        }
+
+        private async Task<List<StrategicOpportunityChargeCode>> GetAllStrategicChargeCodes(Func<StrategicOpportunityChargeCode, bool> filterPredicate, CancellationToken cancellationToken)
+        {
+            var strataId = _user.GetStrataId();
+            var sdtUser = _user.IsSdtEmployee();
+            var userGroups = _user.Claims
+               .Where(c => c.Type == JwtClaimTypes.Role)
+               .Select(c => c.Value);
+            var chargeCodes = await _centralDbContext.StrategicOpportunityChargeCodes.ToListAsync(cancellationToken);
+            var result = chargeCodes.Where(item => filterPredicate(item) && item.StrataId == strataId);
+
+            if (!sdtUser)
+            {
+                var roleAssignments = await _centralDbContext.OpportunityRoleAssignments.Where(r => r.StrataId == strataId && (r.IdentityGuid.Equals(_user.GetUserGuid()) || userGroups.Contains(r.IdentityName))).ToListAsync(cancellationToken);
+
+                result = result.Where(o =>
+                    roleAssignments.Any(r =>
+                        r.OpportunityId == o.OpportunityId &&
+                        (r.IsRead || r.IsWrite || r.IsSecureWrite)));
+            }
+
+            return result.ToList();
+        }
+
+        private async Task<List<StrategicOpportunityGL>> GetAllStrategicGLOpportunities(Func<StrategicOpportunityGL, bool> filterPredicate, CancellationToken cancellationToken)
+        {
+            var strataId = _user.GetStrataId();
+            var sdtUser = _user.IsSdtEmployee();
+            var userGroups = _user.Claims
+               .Where(c => c.Type == JwtClaimTypes.Role)
+               .Select(c => c.Value);
+            var glOpportunities = await _centralDbContext.StrategicOpportunityGLs.ToListAsync(cancellationToken);
+            var result = glOpportunities.Where(item => filterPredicate(item) && item.StrataId == strataId);
+
+            if (!sdtUser)
+            {
+                var roleAssignments = await _centralDbContext.OpportunityRoleAssignments.Where(r => r.StrataId == strataId && (r.IdentityGuid.Equals(_user.GetUserGuid()) || userGroups.Contains(r.IdentityName))).ToListAsync(cancellationToken);
+
+                result = result.Where(o =>
+                    roleAssignments.Any(r =>
+                        r.OpportunityId == o.OpportunityId &&
+                        (r.IsRead || r.IsWrite || r.IsSecureWrite)));
+            }
+
+            return result.ToList();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityServiceQuery.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityServiceQuery.cs
new file mode 100644
index 0000000..4ccdcba
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityServiceQuery.cs
@@ -0,0 +1,58 @@
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    internal class StrategicOpportunityServiceQuery
+    {
+        private const string KEY_SEPARATOR = "|";
+
+        public static Dictionary<string, string> GetDetailQuery(IEnumerable<StrategicOpportunityDetailDimension> dimensions, bool onlyDimensions, string queryWhere = null)
+        {
+            var dicSql = new Dictionary<string, string>();
+            var assembly = Assembly.GetExecutingAssembly();
+            var queryDetailList = ApplyQueryWhere(queryWhere, assembly.ReadResource("StrategicOpportunityDetailCTE.sql"));
+            var sql = string.Empty;
+            var dimensionColumnNames = new List<string>();
+            foreach (var dimension in dimensions)
+            {
+                if (StrategicOpportunityService.DimensionsConfig.TryGetValue(dimension, out var dimensionConfig))
+                {
+                    sql = ApplyQueryListOfEncounters(queryDetailList, assembly.ReadResource(dimensionConfig.SqlFile));
+                    dicSql.Add(dimension.ToString(), sql);
+                    dimensionColumnNames.Add(dimensionConfig.ColumnName);
+                }
+            }
+
+            if (!onlyDimensions)
+            {                
+                var sqlSelect = @$"
+                    -- {{queryDetailList}}
+                    
+                    SELECT 
+                        {(dimensionColumnNames.Count != 0 ? $"CONCAT({string.Join($", '{KEY_SEPARATOR}', ", dimensionColumnNames.Select(x => $"REPLACE(COALESCE(CAST({x} AS VARCHAR), ''), '{KEY_SEPARATOR}', '')"))})" : "''")} AS Key,
+                        IsBaseline,
+                        SUM(Units) AS Units,
+                        SUM(Cost) AS Cost,
+                        SUM(GoalUnits) AS GoalUnits,
+                        SUM(GoalCost) AS GoalCost
+                    FROM DetailList dl
+                    GROUP BY IsBaseline {(dimensionColumnNames.Count != 0 ? $", {string.Join(", ", dimensionColumnNames)}" : "")};
+                ";
+                sql = ApplyQueryListOfEncounters(queryDetailList, sqlSelect);
+                dicSql.Add("detail", sql);
+            }
+
+            return dicSql;
+        }
+
+        private static string ApplyQueryListOfEncounters(string queryDetailList, string sql) => sql.Replace("-- {queryDetailList}", queryDetailList);
+        private static string ApplyQueryWhere(string queryWhere, string sql) => sql.Replace("-- {queryWhere}", string.IsNullOrEmpty(queryWhere) ? string.Empty : queryWhere);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityWorkbook.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityWorkbook.cs
new file mode 100644
index 0000000..55cdc1b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicOpportunityWorkbook.cs
@@ -0,0 +1,18 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    [Table("strategic_opportunity_workbook")]
+    public class StrategicOpportunityWorkbook : IOpportunityWorkbook, IWithStrataId
+    {
+        public long OpportunityId { get; set; }
+        public int WorkbookId { get; set; }
+        public int StrataId { get; set; }
+
+        public StrategicOpportunity Opportunity { get; set; }
+        [NotMapped]
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicStakeholdersLink.cs b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicStakeholdersLink.cs
new file mode 100644
index 0000000..dadeb6f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/StrategicOpportunities/StrategicStakeholdersLink.cs
@@ -0,0 +1,20 @@
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.StrategicOpportunities
+{
+    [Table("strategic_stakeholders_link")]
+    public class StrategicStakeholdersLink
+    {
+        public long StrategicOpportunityId { get; set; }
+        public Guid UserGuid { get; set; }
+
+        public StrategicOpportunity Opportunity { get; set; }
+
+        public StrategicStakeholdersLink(long strategicOpportunityId, Guid userGuid)
+        {
+            StrategicOpportunityId = strategicOpportunityId;
+            UserGuid = userGuid;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UserProfiles/UserGroup.cs b/src/Strata.ContinuousImprovement.Biz/UserProfiles/UserGroup.cs
new file mode 100644
index 0000000..c5e17bb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UserProfiles/UserGroup.cs
@@ -0,0 +1,15 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.UserProfiles
+{
+    [Table("UserGroup", Schema = "dbo")]
+    public class UserGroup
+    {
+        [Key]
+        public Guid UserGroupGuid { get; set; }
+        public string Name { get; set; }
+        public string GlobalId { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UserProfiles/UserProfile.cs b/src/Strata.ContinuousImprovement.Biz/UserProfiles/UserProfile.cs
new file mode 100644
index 0000000..d204ddb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UserProfiles/UserProfile.cs
@@ -0,0 +1,28 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.UserProfiles
+{
+    [Table("UserProfile", Schema = "dbo")]
+    public class UserProfile
+    {
+        [Key]
+        public Guid UserGuid { get; set; }
+        public string UserName { get; set; }
+        public string NameFull { get; set; }
+        public string NameFirst { get; set; }
+        public string NameLast { get; set; }
+
+        public string GetDisplayName()
+        {
+            if (!string.IsNullOrWhiteSpace(NameFull))
+                return NameFull;
+            var composed = string.Join(", ", new[] { NameLast, NameFirst }.Where(n => !string.IsNullOrWhiteSpace(n)));
+            if (!string.IsNullOrEmpty(composed))
+                return composed;
+            return UserName ?? string.Empty;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UserService/CIUser.cs b/src/Strata.ContinuousImprovement.Biz/UserService/CIUser.cs
new file mode 100644
index 0000000..57a5cdd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UserService/CIUser.cs
@@ -0,0 +1,17 @@
+using Strata.Users.Client.Users.Models;
+
+namespace Strata.ContinuousImprovement.Biz.UserService
+{
+    public class CIUser : User
+    {
+        public CIUser(User user)
+        {
+            this.Username = user.Username;
+            this.UserGuid = user.UserGuid;
+            this.FirstName = user.FirstName;
+            this.LastName = user.LastName;
+        }
+
+        public string FullName => $"{FirstName} {LastName}";
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UserService/IUserService.cs b/src/Strata.ContinuousImprovement.Biz/UserService/IUserService.cs
new file mode 100644
index 0000000..d67b8fd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UserService/IUserService.cs
@@ -0,0 +1,17 @@
+using Strata.Users.Client.UserGroups.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.UserService
+{
+    public interface IUserService
+    {
+        Task<IEnumerable<CIUser>> GetUsersByGlobalId(string globalId, CancellationToken cancellationToken);
+        Task<IEnumerable<UserGroup>> GetUserGroups(CancellationToken cancellationToken);
+        Task<IEnumerable<CIUser>> GetAllCIUsers(CancellationToken cancellationToken);
+        Task<CIUser> GetUser(Guid userGuid, CancellationToken cancellationToken);
+        Task<IEnumerable<CIUser>> GetJazzUsers(CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/UserService/UserService.cs b/src/Strata.ContinuousImprovement.Biz/UserService/UserService.cs
new file mode 100644
index 0000000..845c9f1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UserService/UserService.cs
@@ -0,0 +1,55 @@
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Users.Client;
+using Strata.Users.Client.UserGroups.Models;
+using Strata.Users.Client.Users.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.UserService
+{
+    public class UserService : IUserService
+    {
+        private readonly IUsersServiceClient _usersService;
+
+        public UserService(IUsersServiceClient usersService)
+        {
+            _usersService = usersService;
+        }
+
+        public async Task<IEnumerable<CIUser>> GetUsersByGlobalId(string globalId, CancellationToken cancellationToken)
+        {
+            var users = await _usersService.GetAllUserGroupUsersAsync(globalId, cancellationToken);
+            return users.Select(u => new CIUser(u))
+                .Where(u => Guid.TryParse(u.UserGuid.ToString(), out var result) && !string.IsNullOrEmpty(u.UserGuid.ToString()))
+                .OrderBy(u => u.FullName);
+        }
+        public async Task<IEnumerable<UserGroup>> GetUserGroups(CancellationToken cancellationToken)
+            => (await _usersService.GetAllUserGroupsAsync(cancellationToken))
+                .Where(ug => ug.GlobalId.StartsWith("CCI"));
+
+        public async Task<CIUser> GetUser(Guid userGuid, CancellationToken cancellationToken)
+            => new CIUser(await _usersService.GetUserAsync(userGuid, cancellationToken));
+
+        public async Task<IEnumerable<CIUser>> GetJazzUsers(CancellationToken cancellationToken)
+            => (await _usersService.GetAllUsersAsync(false, cancellationToken))
+                .Select(u => new CIUser(u))
+                .OrderBy(u => u.FullName);
+
+        public async Task<IEnumerable<CIUser>> GetAllCIUsers(CancellationToken cancellationToken)
+        {
+            var users = new List<User>();
+            var userGroups = await GetUserGroups(cancellationToken);
+            foreach (var userGroup in userGroups)
+            {
+                users.AddRange(await _usersService.GetAllUserGroupUsersAsync(userGroup.GlobalId, cancellationToken));
+            }
+            return users.DistinctBy(u => u.UserGuid).Select(u => new CIUser(u))
+                .Where(u => u.UserGuid.CheckGuidFormat())
+                .OrderBy(u => u.FullName);
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UserSetting/CciUserSetting.cs b/src/Strata.ContinuousImprovement.Biz/UserSetting/CciUserSetting.cs
new file mode 100644
index 0000000..c0fe3eb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UserSetting/CciUserSetting.cs
@@ -0,0 +1,15 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.UserSetting
+{
+    [Table("UserSetting", Schema = "cci")]
+    public class CciUserSetting
+    {
+        [Key]
+        public Guid UserGuid { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UserSetting/DboUserSetting.cs b/src/Strata.ContinuousImprovement.Biz/UserSetting/DboUserSetting.cs
new file mode 100644
index 0000000..87b380e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UserSetting/DboUserSetting.cs
@@ -0,0 +1,20 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.UserSetting
+{
+    [Table("UserSetting", Schema = "dbo")]
+    public class DboUserSetting
+    {
+        [Key]
+        public Guid UserSettingGuid { get; set; }
+        public Guid UserGuid { get; set; }
+        public string Name { get; set; }
+        public string Setting { get; set; }
+
+        public static string CCI_INITIATIVES_FILTERS = nameof(CCI_INITIATIVES_FILTERS);
+        public static string CCI_INITIATIVES_COLUMNS = nameof(CCI_INITIATIVES_COLUMNS);
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UserSetting/IUserSettingService.cs b/src/Strata.ContinuousImprovement.Biz/UserSetting/IUserSettingService.cs
new file mode 100644
index 0000000..c6777c0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UserSetting/IUserSettingService.cs
@@ -0,0 +1,22 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.InitiativeDetailColumns;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.UserSetting
+{
+    public interface IUserSettingService : IJazzDbService<CciUserSetting, Guid>
+    {
+        Task<CciUserSetting> SetUserSetting(CciUserSetting userSetting, CancellationToken cancellationToken);
+        Task<T> GetDboUserSetting<T>(string name, Guid userGuid, CancellationToken cancellationToken);
+        Task<IEnumerable<T>> GetDboUserSettings<T>(string name, Guid userGuid, CancellationToken cancellationToken);
+        Task SetDboUserSetting(string name, Guid userGuid, object setting, CancellationToken cancellationToken);
+        Task SetDboUserSetting(string name, Guid userGuid, string setting, CancellationToken cancellationToken);
+        Task UpdateFilterForDeletedGroupCategory(string deletedName, CancellationToken cancellationToken);
+        Task DeleteInitiativeColumnForAllUsers(string name, CancellationToken cancellationToken);
+        Task UpdateInitiativeColumnForAllUsers(string oldName, string newName, CancellationToken cancellationToken);
+        Task AddInitiativeColumnForAllUsers(InitiativeDetailColumn initiativeDetail, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UserSetting/UserSettingService.cs b/src/Strata.ContinuousImprovement.Biz/UserSetting/UserSettingService.cs
new file mode 100644
index 0000000..3783660
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UserSetting/UserSettingService.cs
@@ -0,0 +1,212 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.InitiativeDetailColumns;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Initiatives.Filters;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.UserSetting
+{
+    public class UserSettingService : Generics.JazzDbService<CciUserSetting, Guid>, IUserSettingService
+    {
+        private readonly ILogger<UserSettingService> _logger;
+
+        public UserSettingService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext, IClaimsPrincipalAccessor claimsPrincipalAccessor,
+             ILogger<UserSettingService> logger)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor)
+        {
+            _logger = logger;
+        }
+
+        public override async Task<CciUserSetting> GetById(Guid id, CancellationToken cancellationToken)
+        {
+            try
+            {
+                await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+                if (dbContext is null) return default;
+                return await dbContext.UserSettings.FirstOrDefaultAsync(us => us.UserGuid == id, cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex);
+                throw;
+            }
+        }
+
+        public async Task<CciUserSetting> SetUserSetting(CciUserSetting userSetting, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext is null) return default;
+            var userSettingItem = dbContext?.Set<CciUserSetting>()
+                .SingleOrDefault(us => us.UserGuid == userSetting.UserGuid);
+            if (userSettingItem == null) dbContext?.Add(userSetting);
+            else userSettingItem.ConfigurationGuid = userSetting.ConfigurationGuid;
+            await dbContext?.SaveChangesAsync(cancellationToken);
+            return userSetting;
+        }
+
+        public async Task<T> GetDboUserSetting<T>(string name, Guid userGuid, CancellationToken cancellationToken)
+        {
+            var newObj = (T)Activator.CreateInstance(typeof(T));
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) { return newObj; }
+            var userSettings = await dbContext.DboUserSettings
+                .Where(u => u.Name == name && u.UserGuid == userGuid).SingleOrDefaultAsync(cancellationToken);
+            if (userSettings == null) { return newObj; }
+            return JsonConvert.DeserializeObject<T>(userSettings.Setting);
+        }
+
+        public async Task<IEnumerable<T>> GetDboUserSettings<T>(string name, Guid userGuid, CancellationToken cancellationToken)
+        {
+            var newList = Enumerable.Empty<T>();
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) { return newList; }
+            var userSettings = await dbContext.DboUserSettings
+                .Where(u => u.Name == name && u.UserGuid == userGuid).SingleOrDefaultAsync(cancellationToken);
+            if (userSettings == null) { return newList; }
+            return JsonConvert.DeserializeObject<IEnumerable<T>>(userSettings.Setting);
+        }
+
+        public async Task SetDboUserSetting(string name, Guid userGuid, object setting, CancellationToken cancellationToken)
+            => await SetDboUserSetting(name, userGuid, JsonConvert.SerializeObject(setting), cancellationToken);
+
+        public async Task SetDboUserSetting(string name, Guid userGuid, string setting, CancellationToken cancellationToken)
+        {
+            try
+            {
+                await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+                if (dbContext == null) { return; }
+                var userSettings = await dbContext.DboUserSettings
+                    .Where(u => u.Name == name
+                        && u.UserGuid == userGuid).SingleOrDefaultAsync(cancellationToken);
+                if (userSettings == null)
+                {
+                    userSettings = new DboUserSetting
+                    {
+                        Name = name,
+                        UserGuid = userGuid,
+                        Setting = setting
+                    };
+                    await dbContext.DboUserSettings.AddAsync(userSettings);
+                }
+                else
+                {
+                    userSettings.Setting = setting;
+                    dbContext.DboUserSettings.Update(userSettings);
+                }
+                await dbContext.SaveChangesAsync();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceInformation("Error saving user settings");
+            }
+        }
+
+        public async Task UpdateInitiativeColumnForAllUsers(string oldName, string newName, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) { return; }
+            var userSettings = await dbContext.DboUserSettings
+                .Where(u => u.Name == "CCI_INITIATIVES_COLUMNS").ToListAsync(cancellationToken);
+
+            userSettings.ForEach(userSetting =>
+            {
+                var settings = JsonConvert.DeserializeObject<IEnumerable<InitiativeDetailColumn>>(userSetting.Setting).ToList();
+                var oldItem = settings.FirstOrDefault(x => x.Heading == oldName);
+
+                if (oldItem != null)
+                {
+                    oldItem.Heading = newName;
+                    userSetting.Setting = JsonConvert.SerializeObject(settings);
+                    dbContext.DboUserSettings.Update(userSetting);
+                }
+            });
+
+            await dbContext.SaveChangesAsync();
+        }
+
+        public async Task DeleteInitiativeColumnForAllUsers(string name, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) { return; }
+            var userSettings = await dbContext.DboUserSettings
+                .Where(u => u.Name == "CCI_INITIATIVES_COLUMNS").ToListAsync(cancellationToken);
+
+            userSettings.ForEach(userSetting =>
+            {
+                var settings = JsonConvert.DeserializeObject<IEnumerable<InitiativeDetailColumn>>(userSetting.Setting).ToList();
+                var oldItem = settings.FirstOrDefault(x => x.Heading == name);
+
+                if (oldItem != null)
+                {
+                    settings.Remove(oldItem);
+                    settings.Where(x => x.Index > oldItem.Index).ToList().ForEach(x => x.Index = --x.Index);
+
+                    userSetting.Setting = JsonConvert.SerializeObject(settings);
+                    dbContext.DboUserSettings.Update(userSetting);
+                }
+            });
+
+            await dbContext.SaveChangesAsync();
+        }
+
+        public async Task AddInitiativeColumnForAllUsers(InitiativeDetailColumn initiativeDetail, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) { return; }
+            var userSettings = await dbContext.DboUserSettings
+                .Where(u => u.Name == "CCI_INITIATIVES_COLUMNS").ToListAsync(cancellationToken);
+
+            userSettings.ForEach(userSetting =>
+            {
+                var settings = JsonConvert.DeserializeObject<IEnumerable<InitiativeDetailColumn>>(userSetting.Setting).ToList();
+                var jsonSetting = settings.Find(item => item.Name == initiativeDetail.Name);
+                if (jsonSetting is not null)
+                {
+                    jsonSetting.Heading = initiativeDetail.Heading;
+                    jsonSetting.IsLocked = initiativeDetail.IsLocked;
+                    jsonSetting.IsHidden = initiativeDetail.IsHidden;
+                    jsonSetting.InitiativeRollupColumnId = initiativeDetail.InitiativeRollupColumnId;
+                }
+                else
+                {
+                    settings.Add(initiativeDetail);
+                    userSetting.Setting = JsonConvert.SerializeObject(settings);
+                }
+            });
+
+            await dbContext.SaveChangesAsync();
+        }
+
+        public async Task UpdateFilterForDeletedGroupCategory(string deletedName, CancellationToken cancellationToken)
+        {
+            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+            if (dbContext == null) { return; }
+            var userSettings = await dbContext.DboUserSettings
+                .Where(u => u.Name == DboUserSetting.CCI_INITIATIVES_FILTERS).ToListAsync(cancellationToken);
+
+            userSettings.ForEach(userSetting =>
+            {
+                InitiativeFilters filter = JsonConvert.DeserializeObject<InitiativeFilters>(userSetting.Setting);
+                if (filter.GroupByCategory.ToString() == deletedName)
+                {
+                    filter.GroupByCategory = InitiativeGroupByCategory.Workstream;
+                    userSetting.Setting = JsonConvert.SerializeObject(filter);
+                    dbContext.DboUserSettings.Update(userSetting);
+                }
+            });
+
+            await dbContext.SaveChangesAsync();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/Constants.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/Constants.cs
new file mode 100644
index 0000000..f0fbc65
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/Constants.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class Constants
+    {
+        public const string TREE_DATA_LEVEL_SEPARATOR = " | ";
+        public const string NOT_SPECIFIED = "Not Specified";
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/CsvUtils.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/CsvUtils.cs
new file mode 100644
index 0000000..1dbc2b9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/CsvUtils.cs
@@ -0,0 +1,30 @@
+using CsvHelper.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class CsvUtils
+    {
+        public sealed class DynamicMap<T> : ClassMap<T>
+        {
+            public DynamicMap(IEnumerable<string> columnsToIgnore)
+            {
+                AutoMap(CultureInfo.InvariantCulture);
+                var mapType = typeof(T);
+                foreach (var column in columnsToIgnore)
+                {
+                    var property = mapType.GetProperty(column);
+                    if (property != null)
+                    {
+                        Map(mapType, property).Ignore();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/DateExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/DateExtensions.cs
new file mode 100644
index 0000000..9274c07
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/DateExtensions.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class DateExtensions
+    {
+        public const string MEASURE_FORMAT_YYYY_MM_DD = "yyyy-MM-dd";
+        public const string OPPORTUNITY_FORMAT_MM_DD_YYYY = "MM/dd/yyyy";
+        public static IList<int> GetMonthsBetweenDates(this DateTime startDate, DateTime endDate)
+        {
+            var months = new List<int>();
+            if (endDate < startDate) { return months; }
+
+            var curDate = startDate;
+            while (curDate <= endDate)
+            {
+                months.Add(curDate.Month);
+                curDate = curDate.AddMonths(1);
+            }
+            return months;
+        }
+
+        public static DateTime GetStartOrEndDateOfYearPeriod(this DateTime date, int diffYear)
+        {
+            var diffDirection = Math.Sign(diffYear);
+            var result = diffDirection > 0 ?
+                date.AddYears(diffYear).AddDays(-diffDirection) :
+                date.AddDays(-diffDirection).AddYears(diffYear);
+            return result;
+        }
+
+        public static int GetMonthDifference(DateOnly dateFrom, DateOnly dateTo, bool includeFromMonth = false, bool canProduceNegative = false)
+        {
+            if (dateFrom > dateTo)
+            {
+                return canProduceNegative ? -GetMonthDifference(dateTo, dateFrom, includeFromMonth, canProduceNegative) : 0;
+            }
+
+            var yearsDiff = dateTo.Year - dateFrom.Year;
+            var monthsDiff = dateTo.Month - dateFrom.Month;
+
+            var diff = (yearsDiff * 12) + monthsDiff;
+            if (includeFromMonth) diff += (diff >= 0 ? 1 : -1);
+
+            return diff;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/DeserializeDetailSelections.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/DeserializeDetailSelections.cs
new file mode 100644
index 0000000..aed5fb5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/DeserializeDetailSelections.cs
@@ -0,0 +1,44 @@
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.Schema.Client.Dtos;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class DeserializeDetailSelections
+    {
+        public static IEnumerable<MemberDto> Selections(this string jsonString)
+        {
+            try
+            {
+                return JsonSerializer.Deserialize<HierarchyPathsAndMembers>(jsonString).Members;
+            }
+            catch
+            {
+                try
+                {
+                    return JsonSerializer.Deserialize<IEnumerable<MemberDto>>(jsonString);
+                }
+                catch
+                {
+                    try
+                    {
+                        return JsonSerializer.Deserialize<IEnumerable<HierarchyNodeDto>>(jsonString)
+                            .Select(x => new MemberDto { Name = x.Name });
+                    }
+                    catch
+                    {
+                        return Enumerable.Empty<MemberDto>();
+                    }
+                }
+            }
+        }
+
+        public static IEnumerable<string> HierarchyPaths(this string jsonString)
+        {
+            return JsonSerializer.Deserialize<HierarchyPathsAndMembers>(jsonString).HierarchyPaths;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/EntityQueryableExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/EntityQueryableExtensions.cs
new file mode 100644
index 0000000..bc332a4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/EntityQueryableExtensions.cs
@@ -0,0 +1,331 @@
+using Hangfire.Annotations;
+using Microsoft.Data.SqlClient;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.Extensions.Logging;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.Schema.Client.Dtos;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class EntityQueryableExtensions
+    {
+
+        /// <summary>
+        ///     <para>
+        ///         Creates a LINQ query based on a raw SQL query.
+        ///     </para>
+        ///     <para>
+        ///         If the database provider supports composing on the supplied SQL, you can compose on top of the raw SQL query using
+        ///         LINQ operators: <c>context.Blogs.FromSqlRaw("SELECT * FROM Blogs").OrderBy(b => b.Name)</c>.
+        ///     </para>
+        ///     <para>
+        ///         As with any API that accepts SQL it is important to parameterize any user input to protect against a SQL injection
+        ///         attack. You can include parameter place holders in the SQL query string and then supply parameter values as additional
+        ///         arguments. Any parameter values you supply will automatically be converted to a <see cref="DbParameter" />:
+        ///     </para>
+        ///     <code>context.Blogs.FromRawSql("SELECT * FROM Blogs WHERE Name = {0}", userSuppliedSearchTerm)</code>
+        ///     <para>
+        ///         However, <b>never</b> pass a concatenated or interpolated string (<c>$""</c>) with non-validated user-provided values
+        ///         into this method. Doing so may expose your application to SQL injection attacks. To use the interpolated string syntax,
+        ///         consider using <see cref="FromSqlInterpolated{TEntity}" /> to create parameters.
+        ///     </para>
+        ///     <para>
+        ///         This overload also accepts <see cref="DbParameter" /> instances as parameter values. In addition to using positional
+        ///         placeholders as above (<c>{0}</c>), you can also use named placeholders directly in the SQL query string:
+        ///     </para>
+        ///     <code>context.Blogs.FromRawSql("SELECT * FROM Blogs WHERE Name = @searchTerm", new SqlParameter("@searchTerm", userSuppliedSearchTerm))</code>
+        /// </summary>
+        /// <typeparam name="TEntity">The type of the elements of <paramref name="source" />.</typeparam>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="source">
+        ///     An <see cref="IQueryable{TEntity}" /> to use as the base of the raw SQL query (typically a <see cref="DbSet{TEntity}" />).
+        /// </param>
+        /// <param name="logger"><see cref="ILogger{T}"></param>
+        /// <param name="sql">The raw SQL query.</param>
+        /// <returns>An <see cref="IQueryable{TEntity}" /> representing the raw SQL query.</returns>
+        [StringFormatMethod("sql")]
+        public static IQueryable<TEntity> FromRawSql<TEntity, T>(
+            this DbSet<TEntity> source,
+            ILogger<T> logger,
+            [NotParameterized] string sql) where TEntity : class where T : class
+        {
+            var results = Enumerable.Empty<TEntity>().AsQueryable();
+            var dbContext = source.GetService<ICurrentDbContext>().Context;
+            var dbSetName = typeof(TEntity).Name;
+            try
+            {
+                results = source.FromSqlRaw(sql);
+            }
+            catch (Exception ex)
+            {
+                var dictionary = new Dictionary<string, object> {
+                        { "query", new Dictionary<string, object>
+                        {
+                            { "queryName", dbSetName},
+                            { "sql-query", sql },
+                            { "parameters", new Dictionary<string, object>
+                            { { "count", 0 } }
+                            }
+                        }
+                        }
+                    };
+                logger.LogQueryError(ex, dbContext, dbSetName, dictionary);
+            }
+            logger.LogServiceInformation(dbContext, $"{dbSetName} returned {results.Count()} results.");
+            return results;
+        }
+
+        /// <summary>
+        ///     <para>
+        ///         Creates a LINQ query based on a raw SQL query.
+        ///     </para>
+        ///     <para>
+        ///         If the database provider supports composing on the supplied SQL, you can compose on top of the raw SQL query using
+        ///         LINQ operators: <c>context.Blogs.FromSqlRaw("SELECT * FROM Blogs").OrderBy(b => b.Name)</c>.
+        ///     </para>
+        ///     <para>
+        ///         As with any API that accepts SQL it is important to parameterize any user input to protect against a SQL injection
+        ///         attack. You can include parameter place holders in the SQL query string and then supply parameter values as additional
+        ///         arguments. Any parameter values you supply will automatically be converted to a <see cref="DbParameter" />:
+        ///     </para>
+        ///     <code>context.Blogs.FromRawSql("SELECT * FROM Blogs WHERE Name = {0}", userSuppliedSearchTerm)</code>
+        ///     <para>
+        ///         However, <b>never</b> pass a concatenated or interpolated string (<c>$""</c>) with non-validated user-provided values
+        ///         into this method. Doing so may expose your application to SQL injection attacks. To use the interpolated string syntax,
+        ///         consider using <see cref="FromSqlInterpolated{TEntity}" /> to create parameters.
+        ///     </para>
+        ///     <para>
+        ///         This overload also accepts <see cref="DbParameter" /> instances as parameter values. In addition to using positional
+        ///         placeholders as above (<c>{0}</c>), you can also use named placeholders directly in the SQL query string:
+        ///     </para>
+        ///     <code>context.Blogs.FromRawSql("SELECT * FROM Blogs WHERE Name = @searchTerm", new SqlParameter("@searchTerm", userSuppliedSearchTerm))</code>
+        /// </summary>
+        /// <typeparam name="TEntity">The type of the elements of <paramref name="source" />.</typeparam>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="source">
+        ///     An <see cref="IQueryable{TEntity}" /> to use as the base of the raw SQL query (typically a <see cref="DbSet{TEntity}" />).
+        /// </param>
+        /// <param name="logger"><see cref="ILogger{T}"></param>
+        /// <param name="sql">The raw SQL query.</param>
+        /// <param name="parameters">The values to be assigned to parameters.</param>
+        /// <returns>An <see cref="IQueryable{TEntity}" /> representing the raw SQL query.</returns>
+        [StringFormatMethod("sql")]
+        public static IQueryable<TEntity> FromRawSql<TEntity, T>(
+            this DbSet<TEntity> source,
+            ILogger<T> logger,
+            [NotParameterized] string sql,
+            params object[] parameters) where TEntity : class where T : class
+        {
+            var dbContext = source.GetService<ICurrentDbContext>().Context;
+            var dbSetName = typeof(TEntity).Name;
+            try
+            {
+                return source.FromSqlRaw(sql, parameters.ToArray());
+            }
+            catch (Exception ex)
+            {
+                var paramDictionary = parameters
+                    .SelectMany(p => p.ParamDictionary(keyProp: "ParameterName"))
+                    .ToDictionary(p => p.Key, v => v.Value);
+                paramDictionary.Add("count", parameters.Count());
+                var dictionary = new Dictionary<string, object> {
+                        { "query", new Dictionary<string, object>
+                        {
+                            { "queryName", dbSetName},
+                            { "sql-query", sql },
+                            { "parameters", paramDictionary }
+                        }
+                        }
+                    };
+                logger.LogQueryError(ex, dbContext, dbSetName, dictionary);
+            }
+            return Enumerable.Empty<TEntity>().AsQueryable();
+        }
+
+        [StringFormatMethod("sql")]
+        public static IQueryable<TEntity> FromRawSql<TEntity, T>(
+            this DbSet<TEntity> source,
+            ILogger<T> logger,
+            [NotParameterized] string sql,
+            [NotParameterized] TimeSpan timeout,
+            params object[] parameters) where TEntity : class where T : class
+        {
+            var dbContext = source.GetService<ICurrentDbContext>().Context;
+            dbContext.Database.SetCommandTimeout(timeout);
+            var dbSetName = typeof(TEntity).Name;
+            try
+            {
+                return source.FromSqlRaw(sql, parameters.ToArray());
+            }
+            catch (Exception ex)
+            {
+                var paramDictionary = parameters
+                    .SelectMany(p => p.ParamDictionary(keyProp: "ParameterName"))
+                    .ToDictionary(p => p.Key, v => v.Value);
+                paramDictionary.Add("count", parameters.Count());
+                var dictionary = new Dictionary<string, object> {
+                        { "query", new Dictionary<string, object>
+                        {
+                            { "queryName", dbSetName},
+                            { "sql-query", sql },
+                            { "parameters", paramDictionary }
+                        }
+                        }
+                    };
+                logger.LogQueryError(ex, dbContext, dbSetName, dictionary);
+            }
+            return Enumerable.Empty<TEntity>().AsQueryable();
+        }
+
+        /// <summary>
+        ///     <para>
+        ///         Creates a LINQ query based on a raw SQL query.
+        ///     </para>
+        ///     <para>
+        ///         If the database provider supports composing on the supplied SQL, you can compose on top of the raw SQL query using
+        ///         LINQ operators: <c>context.Blogs.FromSqlRaw("SELECT * FROM Blogs").OrderBy(b => b.Name)</c>.
+        ///     </para>
+        ///     <para>
+        ///         As with any API that accepts SQL it is important to parameterize any user input to protect against a SQL injection
+        ///         attack. You can include parameter place holders in the SQL query string and then supply parameter values as additional
+        ///         arguments. Any parameter values you supply will automatically be converted to a <see cref="DbParameter" />:
+        ///     </para>
+        ///     <code>context.Blogs.FromRawSql("SELECT * FROM Blogs WHERE Name = {0}", userSuppliedSearchTerm)</code>
+        ///     <para>
+        ///         However, <b>never</b> pass a concatenated or interpolated string (<c>$""</c>) with non-validated user-provided values
+        ///         into this method. Doing so may expose your application to SQL injection attacks. To use the interpolated string syntax,
+        ///         consider using <see cref="FromSqlInterpolated{TEntity}" /> to create parameters.
+        ///     </para>
+        ///     <para>
+        ///         This overload also accepts <see cref="DbParameter" /> instances as parameter values. In addition to using positional
+        ///         placeholders as above (<c>{0}</c>), you can also use named placeholders directly in the SQL query string:
+        ///     </para>
+        ///     <code>context.Blogs.FromRawSql("SELECT * FROM Blogs WHERE Name = @searchTerm", new SqlParameter("@searchTerm", userSuppliedSearchTerm))</code>
+        /// </summary>
+        /// <typeparam name="TEntity">The type of the elements of <paramref name="source" />.</typeparam>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="source">
+        ///     An <see cref="IQueryable{TEntity}" /> to use as the base of the raw SQL query (typically a <see cref="DbSet{TEntity}" />).
+        /// </param>
+        /// <param name="logger"><see cref="ILogger{T}"></param>
+        /// <param name="sql">The raw SQL query.</param>
+        /// <param name="parameters">The values to be assigned to parameters.</param>
+        /// <returns>An <see cref="IQueryable{TEntity}" /> representing the raw SQL query.</returns>
+        [StringFormatMethod("sql")]
+        public static IQueryable<TEntity> FromRawSql<TEntity, T>(
+            this DbSet<TEntity> source,
+            ILogger<T> logger,
+            [NotParameterized] string sql,
+            IEnumerable<object> parameters) where TEntity : class where T : class
+        {
+            var dbContext = source.GetService<ICurrentDbContext>().Context;
+            var dbSetName = typeof(TEntity).Name;
+            try
+            {
+                return source.FromSqlRaw(sql, parameters);
+            }
+            catch (Exception ex)
+            {
+                var paramDictionary = parameters
+                    .SelectMany(p => p.ParamDictionary(keyProp: "ParameterName"))
+                    .ToDictionary(p => p.Key, v => v.Value);
+                paramDictionary.Add("count", parameters.Count());
+                var dictionary = new Dictionary<string, object> {
+                        { "query", new Dictionary<string, object>
+                        {
+                            { "queryName", dbSetName},
+                            { "sql-query", sql },
+                            { "parameters", paramDictionary }
+                        }
+                        }
+                    };
+                logger.LogQueryError(ex, dbContext, dbSetName, dictionary);
+            }
+            return Enumerable.Empty<TEntity>().AsQueryable();
+        }
+
+        #region Charge Code Opportunity Query Extensions
+
+        public static async Task<List<TEntity>> PerformQuery<TEntity, TService>(this string query, IEnumerable<SqlParameter> sqlParameters,
+            ISnowflakeDatabaseContext snowflakeDbContext, IJazzDbContext jazzDbContext, ILogger<TService> logging,
+            CancellationToken cancellationToken)
+            where TEntity : class
+            where TService : class
+        {
+            var result = new List<TEntity>();
+
+            try
+            {
+                if (snowflakeDbContext != null)
+                {
+                    var snowflakeQuery = query.ConvertSqlToSnowflakeParameterSyntax();
+                    var snowflakeParams = sqlParameters.Select(p => new KeyValuePair<string, object>(p.ParameterName.Replace("@", ":"), p.Value)).ToDictionary();
+                    result = (await snowflakeDbContext.QueryAsync<TEntity>(snowflakeQuery, typeof(TService).Name.SplitCamelCase(), snowflakeParams)).ToList();
+                }
+                else
+                {
+                    query = query.InterpolateQueryArrayValues(ref sqlParameters);
+                    var dbSet = ((JazzDbContext)jazzDbContext).Set<TEntity>();
+                    if (dbSet == null) { return result; }
+                    result = await dbSet.FromRawSql(logging, query, TimeSpan.FromMinutes(30), sqlParameters.ToArray()).ToListAsync(cancellationToken);
+                }
+            }
+            catch (Exception ex)
+            {
+                logging.LogServiceError(ex, info: new Dictionary<string, object>
+                    {
+                        {nameof(query), query },
+                        { nameof(sqlParameters), sqlParameters.ToDictionary(k => k.ParameterName, v => v.Value)}
+                    });
+            }
+            return result;
+        }
+
+        public static string InterpolateQueryArrayValues(this string query, ref IEnumerable<SqlParameter> sqlParameters)
+        {
+            var sqlParametersToKeep = sqlParameters
+                .Where(p => query.Contains(p.ParameterName, StringComparison.CurrentCultureIgnoreCase))
+                .Select(p => p.ParameterName).ToList();
+            foreach (var sqlParam in sqlParameters.Where(p => p.Value is IEnumerable))
+            {
+                var regex = new Regex($@"(\s+IN)\s+\(\s*{sqlParam.ParameterName}\s*\)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+                if (regex.IsMatch(query))
+                {
+                    var csv = sqlParam.Value.GetType().GetGenericArguments()[0].Name switch
+                    {
+                        nameof(Decimal) => string.Join(",", (IEnumerable<decimal>)sqlParam.Value),
+                        nameof(Double) => string.Join(",", (IEnumerable<double>)sqlParam.Value),
+                        nameof(Byte) => string.Join(",", (IEnumerable<byte>)sqlParam.Value),
+                        nameof(Int16) => string.Join(",", (IEnumerable<short>)sqlParam.Value),
+                        nameof(Int32) => string.Join(",", (IEnumerable<int>)sqlParam.Value),
+                        nameof(Int64) => string.Join(",", (IEnumerable<long>)sqlParam.Value),
+                        nameof(String) => "'" + string.Join("','", (IEnumerable<string>)sqlParam.Value) + "'",
+                        _ => "'" + string.Join("','", ((IEnumerable)sqlParam.Value).Cast<object>().ToArray()) + "'"
+                    };
+                    query = regex.Replace(query, $"$1 ({csv})");
+                    sqlParametersToKeep = sqlParametersToKeep.Where(p => p != sqlParam.ParameterName).ToList();
+                }
+            }
+            sqlParameters = sqlParameters.Where(p => sqlParametersToKeep.Contains(p.ParameterName));
+            return query;
+        }
+
+        #endregion
+
+        public static IEnumerable<int> GetIdsForMemberDtos(this IEnumerable<MemberDto> members)
+    => members.Select(x => int.TryParse(x.Id, out var id) ? id : 0).Where(id => id >= 0);
+        public static string GetCsvForMemberDtos(this IEnumerable<MemberDto> members)
+            => string.Join(",", members.Select(x => int.TryParse(x.Id, out var id) ? id : 0).Where(id => id >= 0));
+
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/FTPClientExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/FTPClientExtensions.cs
new file mode 100644
index 0000000..0aade93
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/FTPClientExtensions.cs
@@ -0,0 +1,42 @@
+using FluentFTP;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Xml.Serialization;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class FTPClientExtensions
+    {
+        /// <summary>
+        /// Deserializes archived (.zip) XML files from FTP client
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="client"></param>
+        /// <param name="archiveFileNameStartsWith"></param>
+        /// <param name="xmlRootElement"></param>
+        /// <returns></returns>
+        public static T DeserializeZippedXMLFromFTP<T>(FtpClient client, string archiveFileNameStartsWith, string xmlRootElement) where T : class
+        {
+            var files = client.GetListing("/");
+            var targetFile = files.Where(file => file.Name.StartsWith(archiveFileNameStartsWith)).OrderByDescending(file => file.Modified).FirstOrDefault();
+            if (targetFile == null) { return null; }
+
+            T readFile = null;
+            var zipFileStream = new MemoryStream();
+            if (client.DownloadStream(zipFileStream, targetFile.FullName))
+            {
+                zipFileStream.Position = 0;
+                using var zip = new ZipArchive(zipFileStream, ZipArchiveMode.Read);
+                var file = zip.Entries.FirstOrDefault(entry => entry.Name.StartsWith(archiveFileNameStartsWith));
+                if (file == null) { return null; }
+
+                using var stream = file.Open();
+                var serializer = new XmlSerializer(typeof(T), new XmlRootAttribute(xmlRootElement));
+                readFile = (T)serializer.Deserialize(stream);
+            }
+
+            return readFile;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/FeatureFlag.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/FeatureFlag.cs
new file mode 100644
index 0000000..4d80d5f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/FeatureFlag.cs
@@ -0,0 +1,77 @@
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    /// <summary>
+    /// Enumeration of all feature flags available in the CCI (Continuous Improvement) module.
+    /// Each enumeration value corresponds to a specific feature flag that can be toggled on or off
+    /// to control system behavior and feature availability.
+    /// </summary>
+    /// <seealso cref="FeatureFlagLookup"/>
+    /// <seealso cref="FeatureFlagWrapper"/>
+    public enum FeatureFlag
+    {
+        /// <summary>
+        /// Controls access to charge code beta features.
+        /// </summary>
+        ChargeCodeBeta,
+
+        /// <summary>
+        /// Controls whether continuous integration benchmarking is enabled.
+        /// </summary>
+        CiBenchmarkingEnabled,
+
+        /// <summary>
+        /// Controls if the Add Opportunity button on the Exploration Population page launches the Strategic Opportunity Wizard.
+        /// </summary>
+        CiExplorationPopulationStrategicOpportunityWizard,
+
+        /// <summary>
+        /// Controls access to flexible exploration features for non-SDT employees.
+        /// </summary>
+        CiFlexibleExplorationEnabled,
+
+        /// <summary>
+        /// Controls access to the flexible exploration information page (third page).
+        /// </summary>
+        CiFlexibleExplorationPage3Enabled,
+
+        /// <summary>
+        /// Controls whether CCI opportunity workbooks functionality is enabled in the web UI.
+        /// </summary>
+        CiOpportunityWorkbooks,
+
+        /// <summary>
+        /// Controls whether encounter opportunities are enabled in the Tempo interface.
+        /// </summary>
+        EnableEncounterOpportunityInTempo,
+
+        /// <summary>
+        /// Controls whether payroll opportunities are enabled in the Tempo interface.
+        /// </summary>
+        EnablePayrollOpportunityInTempo,
+
+        /// <summary>
+        /// Controls whether Snowflake-based decision support queries are executed instead of traditional SQL Server queries.
+        /// </summary>
+        IsDecisionSupportQueriesEnabled,
+
+        /// <summary>
+        /// Controls whether exploration population data is loaded from PostgreSQL instead of SQL Server.
+        /// </summary>
+        LoadExplorationPopulationDataFromPostgres,
+
+        /// <summary>
+        /// Enables the evolution of flexible exploration to use the strategic opportunity process.
+        /// </summary>
+        StrategicOpportunityEnabled,
+
+        /// <summary>
+        /// Enables the performance logging for flexible exploration features.
+        /// </summary>
+        CiFlexExPerformanceLoggingEnabled,
+
+        /// <summary>
+        /// Controls whether the General Ledger opportunity type is available in the Strategic Opportunity wizard.
+        /// </summary>
+        CiStrategicOpportunityGLEnabled
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/FeatureFlagExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/FeatureFlagExtensions.cs
new file mode 100644
index 0000000..a154b86
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/FeatureFlagExtensions.cs
@@ -0,0 +1,23 @@
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class FeatureFlagExtensions
+    {
+        /// <summary>
+        /// Gets the all of feature flags and their states for the given database and area
+        /// </summary>
+        /// <param name="client">The IFeatureFlagServiceClient instance</param>
+        /// <param name="databaseGuid">The id of the database to check</param>
+        /// <param name="areaAbbrevation">The area abbreviation to filter the results by</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
+        public static async Task<IEnumerable<FeatureFlags.Dtos.FeatureFlagClientStateDto>> GetFeatureFlagClientStatesByArea(this IFeatureFlagServiceClient client, Guid databaseGuid, string areaAbbrevation, CancellationToken cancellationToken = default)
+            => (await client.GetFeatureFlagStatesByClient(databaseGuid, cancellationToken))
+                .Where(ff => ff.Area.Equals(areaAbbrevation, StringComparison.OrdinalIgnoreCase));
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/FeatureFlagLookup.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/FeatureFlagLookup.cs
new file mode 100644
index 0000000..14ae472
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/FeatureFlagLookup.cs
@@ -0,0 +1,134 @@
+using System.Collections.Generic;
+using System.Collections.Immutable;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    /// <summary>
+    /// Provides a centralized lookup mechanism for mapping feature flag enumeration values to their corresponding string keys.
+    /// This static class serves as the single source of truth for all feature flag key mappings used throughout the CCI module.
+    /// </summary>
+    /// <seealso cref="FeatureFlagWrapper"/>
+    /// <seealso cref="FeatureFlag"/>
+    public static class FeatureFlagLookup
+    {
+        public static readonly IImmutableDictionary<FeatureFlag, string> Values = new Dictionary<FeatureFlag, string>
+        {
+            /// <summary>
+            /// Maps the charge code beta feature flag to its string key.
+            /// Key: "chargecodebeta"
+            /// Purpose: Controls access to charge code beta features
+            /// Default: false (hide beta features)
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.ChargeCodeBeta, "chargecodebeta" },
+
+            /// <summary>
+            /// Maps the continuous improvement benchmarking feature flag to its string key.
+            /// Key: "cibenchmarkingenabled"
+            /// Purpose: Controls benchmarking features in continuous improvement
+            /// Default: false
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.CiBenchmarkingEnabled, "cibenchmarkingenabled" },
+
+            /// <summary>
+            /// Maps the CI exploration population strategic opportunity wizard feature flag to its string key.
+            /// Key: "ciexplorationpopulationstrategicopportunitywizard"
+            /// Purpose: Controls if the Add Opportunity button on the Exploration Population page launches the Strategic Opportunity Wizard
+            /// Default: false (use standard workflow)
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.CiExplorationPopulationStrategicOpportunityWizard, "ciexplorationpopulationstrategicopportunitywizard" },
+
+            /// <summary>
+            /// Maps the CI flexible exploration feature flag to its string key.
+            /// Key: "ciflexibleexplorationenabled"
+            /// Purpose: Controls access to flexible exploration features for non-SDT employees
+            /// Default: false (SDT employees always have access)
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.CiFlexibleExplorationEnabled, "ciflexibleexplorationenabled" },
+
+            /// <summary>
+            /// Maps the flexible exploration page 3 feature flag to its string key.
+            /// Key: "ciflexibleexplorationpage3enabled"
+            /// Purpose: Controls access to the flexible exploration information page (third page)
+            /// Default: false
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.CiFlexibleExplorationPage3Enabled, "ciflexibleexplorationpage3enabled" },
+
+            /// <summary>
+            /// Maps the CCI opportunity workbooks feature flag to its string key.
+            /// Key: "ciopportunityworkbooks"
+            /// Purpose: Controls availability of workbooks functionality in web UI
+            /// Default: false (workbooks functionality hidden)
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.CiOpportunityWorkbooks, "ciopportunityworkbooks" },
+
+            /// <summary>
+            /// Maps the encounter opportunity tempo feature flag to its string key.
+            /// Key: "enableencounteropportunityintempo"
+            /// Purpose: Controls whether encounter opportunities are enabled in the Tempo interface
+            /// Default: false (use Jazz interface)
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.EnableEncounterOpportunityInTempo, "enableencounteropportunityintempo" },
+
+            /// <summary>
+            /// Maps the payroll opportunity tempo feature flag to its string key.
+            /// Key: "enablepayrollopportunityintempo"
+            /// Purpose: Controls whether payroll opportunities are enabled in the Tempo interface
+            /// Default: false (use Jazz interface)
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.EnablePayrollOpportunityInTempo, "enablepayrollopportunityintempo" },
+
+            /// <summary>
+            /// Maps the decision support queries feature flag to its string key.
+            /// Key: "is-decision-support-queries-enabled"
+            /// Purpose: Controls Snowflake vs SQL Server query execution strategy
+            /// Default: false (use SQL Server queries)
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.IsDecisionSupportQueriesEnabled, "is-decision-support-queries-enabled" },
+            
+            /// <summary>
+            /// Maps the exploration population data source feature flag to its string key.
+            /// Key: "loadexplorationpopulationdatafrompostgres"
+            /// Purpose: Controls PostgreSQL vs SQL Server data source for exploration population data
+            /// Default: false (use SQL Server data source)
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.LoadExplorationPopulationDataFromPostgres, "loadexplorationpopulationdatafrompostgres" },
+            
+            /// <summary>
+            /// Maps the strategic opportunity evolution feature flag to its string key.
+            /// Key: "strategic-opportunity-enabled"
+            /// Purpose: Enables evolution of flexible exploration to use strategic opportunity process
+            /// Default: false (use traditional exploration process)
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.StrategicOpportunityEnabled, "strategic-opportunity-enabled" },
+
+            /// <summary>
+            /// Maps the flexible exploration performance logging feature flag to its string key.
+            /// Key: "ciflexexperformanceloggingenabled"
+            /// Purpose: Enables performance logging for flexible exploration features
+            /// Default: false (performance logging disabled)
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.CiFlexExPerformanceLoggingEnabled, "ciflexexperformanceloggingenabled" },
+
+            /// <summary>
+            /// Maps the strategic opportunity GL enabled feature flag to its string key.
+            /// Key: "cistrategicopportunitygl"
+            /// Purpose: Controls whether the General Ledger opportunity type is available in the Strategic Opportunity wizard
+            /// Default: false (GL type hidden)
+            /// Owner: CCI Team
+            /// </summary>
+            { FeatureFlag.CiStrategicOpportunityGLEnabled, "cistrategicopportunitygl" }
+        }.ToImmutableDictionary();
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/FeatureFlagWrapper.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/FeatureFlagWrapper.cs
new file mode 100644
index 0000000..53dea4e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/FeatureFlagWrapper.cs
@@ -0,0 +1,107 @@
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public class FeatureFlagWrapper(
+        IFeatureFlagServiceClient featureFlagServiceClient,
+        IClaimsPrincipalAccessor claimsPrincipalAccessor
+        ) : IFeatureFlagWrapper
+    {
+        private readonly ClaimsPrincipal _user = claimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+
+        /// <summary>
+        /// Evaluates whether a specific feature flag is enabled.
+        /// </summary>
+        /// <param name="featureFlag">The feature flag enumeration value to evaluate.</param>
+        /// <param name="defaultValue">The default value to return if the feature flag evaluation fails or is not configured. Default is <c>false</c>.</param>
+        /// <returns>
+        /// <c>true</c> if the feature flag is enabled; <c>false</c> if disabled or if evaluation fails.
+        /// Returns the <paramref name="defaultValue"/> if the feature flag cannot be evaluated.
+        /// </returns>
+        /// <exception cref="System.ArgumentException">Thrown when the <paramref name="featureFlag"/> is not found in the lookup dictionary.</exception>
+        public async Task<bool> IsFeatureFlagOn(FeatureFlag featureFlag, Guid clientId, bool defaultValue = false)
+        {
+            string flagKey = FeatureFlagLookup.Values[featureFlag];
+            return await featureFlagServiceClient.IsEnabledAsync(flagKey, clientId, defaultValue);
+        }
+
+        public async Task<bool> IsChargeCodeBetaEnabled(bool defaultValue = false)
+            => await IsChargeCodeBetaEnabled(_user.GetDatabaseGuid(), defaultValue);
+
+        public async Task<bool> IsChargeCodeBetaEnabled(Guid clientId, bool defaultValue = false)
+            => await IsFeatureFlagOn(FeatureFlag.ChargeCodeBeta, clientId, defaultValue);
+
+        public async Task<bool> IsCiBenchmarkingEnabled(bool defaultValue = false)
+            => await IsCiBenchmarkingEnabled(_user.GetDatabaseGuid(), defaultValue);
+
+        public async Task<bool> IsCiBenchmarkingEnabled(Guid clientId, bool defaultValue = false)
+            => await IsFeatureFlagOn(FeatureFlag.CiBenchmarkingEnabled, clientId, defaultValue);
+
+        public async Task<bool> IsCiExplorationPopulationStrategicOpportunityWizardEnabled(bool defaultValue = false)
+            => await IsCiExplorationPopulationStrategicOpportunityWizardEnabled(_user.GetDatabaseGuid(), defaultValue);
+
+        public async Task<bool> IsCiExplorationPopulationStrategicOpportunityWizardEnabled(Guid clientId, bool defaultValue = false)
+            => await IsFeatureFlagOn(FeatureFlag.CiExplorationPopulationStrategicOpportunityWizard, clientId, defaultValue);
+
+        public async Task<bool> IsCiFlexibleExplorationEnabled(bool defaultValue = false)
+            => await IsCiFlexibleExplorationEnabled(_user.GetDatabaseGuid(), defaultValue);
+
+        public async Task<bool> IsCiFlexibleExplorationEnabled(Guid clientId, bool defaultValue = false)
+            => await IsFeatureFlagOn(FeatureFlag.CiFlexibleExplorationEnabled, clientId, defaultValue);
+
+        public async Task<bool> IsCiFlexibleExplorationPage3Enabled(bool defaultValue = false)
+            => await IsCiFlexibleExplorationPage3Enabled(_user.GetDatabaseGuid(), defaultValue);
+
+        public async Task<bool> IsCiFlexibleExplorationPage3Enabled(Guid clientId, bool defaultValue = false)
+            => await IsFeatureFlagOn(FeatureFlag.CiFlexibleExplorationPage3Enabled, clientId, defaultValue);
+
+        public async Task<bool> IsCiOpportunityWorkbooksEnabled(bool defaultValue = false)
+            => await IsCiOpportunityWorkbooksEnabled(_user.GetDatabaseGuid(), defaultValue);
+
+        public async Task<bool> IsCiOpportunityWorkbooksEnabled(Guid clientId, bool defaultValue = false)
+            => await IsFeatureFlagOn(FeatureFlag.CiOpportunityWorkbooks, clientId, defaultValue);
+
+        public async Task<bool> IsDecisionSupportQueriesEnabled(bool defaultValue = false)
+            => await IsDecisionSupportQueriesEnabled(_user.GetDatabaseGuid(), defaultValue);
+
+        public async Task<bool> IsDecisionSupportQueriesEnabled(Guid clientId, bool defaultValue = false)
+            => await IsFeatureFlagOn(FeatureFlag.IsDecisionSupportQueriesEnabled, clientId, defaultValue);
+
+        public async Task<bool> IsEnableEncounterOpportunityInTempoEnabled(bool defaultValue = false)
+            => await IsEnableEncounterOpportunityInTempoEnabled(_user.GetDatabaseGuid(), defaultValue);
+
+        public async Task<bool> IsEnableEncounterOpportunityInTempoEnabled(Guid clientId, bool defaultValue = false)
+            => await IsFeatureFlagOn(FeatureFlag.EnableEncounterOpportunityInTempo, clientId, defaultValue);
+
+        public async Task<bool> IsEnablePayrollOpportunityInTempoEnabled(bool defaultValue = false)
+            => await IsEnablePayrollOpportunityInTempoEnabled(_user.GetDatabaseGuid(), defaultValue);
+
+        public async Task<bool> IsEnablePayrollOpportunityInTempoEnabled(Guid clientId, bool defaultValue = false)
+            => await IsFeatureFlagOn(FeatureFlag.EnablePayrollOpportunityInTempo, clientId, defaultValue);
+
+        public async Task<bool> IsLoadExplorationPopulationDataFromPostgresEnabled(bool defaultValue = false)
+            => await IsLoadExplorationPopulationDataFromPostgresEnabled(_user.GetDatabaseGuid(), defaultValue);
+
+        public async Task<bool> IsLoadExplorationPopulationDataFromPostgresEnabled(Guid clientId, bool defaultValue = false)
+            => await IsFeatureFlagOn(FeatureFlag.LoadExplorationPopulationDataFromPostgres, clientId, defaultValue);
+
+        public async Task<bool> IsStrategicOpportunityEnabled(bool defaultValue = false)
+            => await IsStrategicOpportunityEnabled(_user.GetDatabaseGuid(), defaultValue);
+
+        public async Task<bool> IsStrategicOpportunityEnabled(Guid clientId, bool defaultValue = false)
+            => await IsFeatureFlagOn(FeatureFlag.StrategicOpportunityEnabled, clientId, defaultValue);
+
+        public async Task<bool> IsCiFlexExPerformanceLoggingEnabled(bool defaultValue = false)
+            => await IsCiFlexExPerformanceLoggingEnabled(_user.GetDatabaseGuid(), defaultValue);
+
+        public async Task<bool> IsCiFlexExPerformanceLoggingEnabled(Guid clientId, bool defaultValue = false)
+            => await IsFeatureFlagOn(FeatureFlag.CiFlexExPerformanceLoggingEnabled, clientId, defaultValue);
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/HangfireExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/HangfireExtensions.cs
new file mode 100644
index 0000000..75a904d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/HangfireExtensions.cs
@@ -0,0 +1,27 @@
+using Hangfire.States;
+using Strata.Hangfire.Jazz.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class HangfireExtensions
+    {
+        public static async Task<bool> WaitForJob(this IJazzHangfireServiceClient client, Guid jobId, CancellationToken cancellationToken)
+        {
+            var result = await client.GetJobInfoAsync(jobId, cancellationToken);
+            var notDoneJobStates = new string[] { ProcessingState.StateName, ScheduledState.StateName, EnqueuedState.StateName };
+            while (notDoneJobStates.Contains(result.State.Name))
+            {
+                await Task.Delay(500);
+                result = await client.GetJobInfoAsync(jobId, cancellationToken);
+            }
+            if (result.State.Name != SucceededState.StateName) { return false; }
+            return true;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/IFeatureFlagWrapper.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/IFeatureFlagWrapper.cs
new file mode 100644
index 0000000..5a5bd29
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/IFeatureFlagWrapper.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public interface IFeatureFlagWrapper
+    {
+        Task<bool> IsChargeCodeBetaEnabled(bool defaultValue = false);
+        Task<bool> IsChargeCodeBetaEnabled(Guid clientId, bool defaultValue = false);
+        Task<bool> IsCiBenchmarkingEnabled(bool defaultValue = false);
+        Task<bool> IsCiBenchmarkingEnabled(Guid clientId, bool defaultValue = false);
+        Task<bool> IsCiExplorationPopulationStrategicOpportunityWizardEnabled(bool defaultValue = false);
+        Task<bool> IsCiExplorationPopulationStrategicOpportunityWizardEnabled(Guid clientId, bool defaultValue = false);
+        Task<bool> IsCiFlexibleExplorationEnabled(bool defaultValue = false);
+        Task<bool> IsCiFlexibleExplorationEnabled(Guid clientId, bool defaultValue = false);
+        Task<bool> IsCiFlexibleExplorationPage3Enabled(bool defaultValue = false);
+        Task<bool> IsCiFlexibleExplorationPage3Enabled(Guid clientId, bool defaultValue = false);
+        Task<bool> IsCiOpportunityWorkbooksEnabled(bool defaultValue = false);
+        Task<bool> IsCiOpportunityWorkbooksEnabled(Guid clientId, bool defaultValue = false);
+        Task<bool> IsDecisionSupportQueriesEnabled(bool defaultValue = false);
+        Task<bool> IsDecisionSupportQueriesEnabled(Guid clientId, bool defaultValue = false);
+        Task<bool> IsEnableEncounterOpportunityInTempoEnabled(bool defaultValue = false);
+        Task<bool> IsEnableEncounterOpportunityInTempoEnabled(Guid clientId, bool defaultValue = false);
+        Task<bool> IsEnablePayrollOpportunityInTempoEnabled(bool defaultValue = false);
+        Task<bool> IsEnablePayrollOpportunityInTempoEnabled(Guid clientId, bool defaultValue = false);
+        Task<bool> IsFeatureFlagOn(FeatureFlag featureFlag, Guid clientId, bool defaultValue = false);
+        Task<bool> IsLoadExplorationPopulationDataFromPostgresEnabled(bool defaultValue = false);
+        Task<bool> IsLoadExplorationPopulationDataFromPostgresEnabled(Guid clientId, bool defaultValue = false);
+        Task<bool> IsStrategicOpportunityEnabled(bool defaultValue = false);
+        Task<bool> IsStrategicOpportunityEnabled(Guid clientId, bool defaultValue = false);
+        Task<bool> IsCiFlexExPerformanceLoggingEnabled(bool defaultValue = false);
+        Task<bool> IsCiFlexExPerformanceLoggingEnabled(Guid clientId, bool defaultValue = false);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/JobInfoDtoExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/JobInfoDtoExtensions.cs
new file mode 100644
index 0000000..b288942
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/JobInfoDtoExtensions.cs
@@ -0,0 +1,17 @@
+using Strata.Hangfire.Jazz.Client.Models;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class JobInfoDtoExtensions
+    {
+        public static Status ToStatus(this JobInfoDto jobInfo)
+            => jobInfo.State.Name.Map();
+        public static bool IsSuccessful(this JobInfoDto jobInfo)
+            => jobInfo.ToStatus().IsSuccessful();
+
+        public static bool IsFinalStatus(this JobInfoDto jobInfo)
+            => jobInfo.ToStatus().IsFinalStatus();
+        public static bool IsRunningStatus(this JobInfoDto jobInfo)
+            => jobInfo.ToStatus().IsRunningStatus();
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/ListExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/ListExtensions.cs
new file mode 100644
index 0000000..f9db341
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/ListExtensions.cs
@@ -0,0 +1,105 @@
+using Hangfire.Annotations;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    [ExcludeFromCodeCoverage]
+    public static class ListExtensions
+    {
+        public static Dictionary<string, int> ColumnDictionary<T>(this IEnumerable<T> data, bool splitCamelCase = false)
+        {
+            return data.FirstOrDefault()?.GetType().GetProperties()
+                    .Select((p, i) => new { i, p.Name }).ToDictionary(key => splitCamelCase ? key.Name.SplitCamelCase() : key.Name, value => value.i + 1)
+                    ?? new Dictionary<string, int>();
+        }
+
+        public static Dictionary<string, object> ParamDictionary<T>(this IEnumerable<T> data, bool splitCamelCase = false, string keyProp = null)
+        {
+            return data
+                .SelectMany(p => p.ParamDictionary(splitCamelCase, keyProp))
+                .ToDictionary(p => p.Key, v => v.Value);
+        }
+
+        public static Dictionary<string, object> ParamDictionary<T>(this T data, bool splitCamelCase = false, string keyProp = null)
+        {
+            var props = data.GetType().GetProperties().Select((p, i) => new { i, p.Name });
+            if (!props.Any()) return new Dictionary<string, object>();
+            var key = string.IsNullOrEmpty(keyProp) ? "" : data.GetType().GetProperty(keyProp).GetValue(data, null).ToString();
+            var value = props
+                    .OrderBy(p => p.Name)
+                    .ToDictionary(
+                        key => splitCamelCase ? key.Name.SplitCamelCase() : key.Name,
+                        value => data.GetType().GetProperty(value.Name).GetValue(data, null)
+                    );
+
+            return new Dictionary<string, object> { { key, value } };
+        }
+
+        public static Dictionary<string, int> ColumnDictionary(this DataTable data, bool splitCamelCase = false)
+        {
+            var result = new Dictionary<string, int>();
+            var idx = 0;
+            foreach (DataColumn column in data.Columns)
+            {
+                result.Add(splitCamelCase ? column.ColumnName.SplitCamelCase() : column.ColumnName, ++idx);
+            }
+            return result;
+        }
+
+        public static DataTable AsDataTable(this IEnumerable<dynamic> items)
+        {
+            var data = items.ToArray();
+            if (data.Count() == 0) return null;
+
+            var dt = new DataTable();
+            foreach (var key in ((IDictionary<string, object>)data[0]).Keys)
+            {
+                dt.Columns.Add(key);
+            }
+            foreach (var d in data)
+            {
+                dt.Rows.Add(((IDictionary<string, object>)d).Values.ToArray());
+            }
+            return dt;
+        }
+
+        public static bool IsEmpty<T>(this IEnumerable<T> items)
+            => items == null || !items.Any();
+
+        public static double Median<TSource>(this IEnumerable<TSource> source, Func<TSource, float> predicate)
+        {
+            ArgumentNullException.ThrowIfNull(predicate);
+
+            if (source.IsEmpty()) return 0;
+            return source.Select(x => predicate(x)).Median();
+        }
+
+        public static String ToCSVList<T>(this IEnumerable<T> items, Func<T, string> selector)
+        {
+            return ToSeperatedList(items, ",", selector);
+        }
+
+        public static String ToSeperatedList<T>([InstantHandle] this IEnumerable<T> items, String delimiter, Func<T, string> selector)
+        {
+            var sb = new StringBuilder();
+            foreach (T s in items)
+            {
+                sb.AppendFormat("{0}{1}", selector(s), delimiter);
+            }
+
+            var result = sb.ToString().TrimEnd(delimiter.ToCharArray());
+            return result;
+        }
+
+        public static IEnumerable<string> ExcludeNullAndEmpty(this IEnumerable<string> items)
+        {
+            return items.Where(x => !string.IsNullOrWhiteSpace(x));
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/LogUtilsExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/LogUtilsExtensions.cs
new file mode 100644
index 0000000..23ce994
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/LogUtilsExtensions.cs
@@ -0,0 +1,369 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Internal;
+using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.GMDN;
+using Strata.Id.Client.DTO;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.IO;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    [ExcludeFromCodeCoverage]
+    public static class LogUtilsExtensions
+    {
+        internal static readonly string Microservice = "strata-continuousimprovement-";
+
+        public static Dictionary<string, TValue> ToDictionary<TValue>(this object obj)
+        {
+            var json = JsonConvert.SerializeObject(obj);
+            Dictionary<string, TValue> dictionary = new Dictionary<string, TValue>();
+            try
+            {
+                dictionary = JsonConvert.DeserializeObject<Dictionary<string, TValue>>(json);
+            }
+            catch
+            {
+                dictionary = new Dictionary<string, TValue> { { "object", (TValue)obj } };
+            }
+            return dictionary;
+        }
+
+        public static Dictionary<string, object> DatabaseDictionary(this StrataIdFullDto database, string service)
+        {
+            var dictionary = new Dictionary<string, object> { { "service", $"{Microservice}{service}" } };
+            if (database != null)
+            {
+                dictionary.Add("db", new Dictionary<string, object> {
+                    { "guid", database.DatabaseGUID },
+                    { "instance", database.PhysicalName },
+                    { "server", database.ServerName },
+                    { "strata_id", database.StrataId },
+                    { "org_pin", database.OrgPin },
+                    { "name", database.DatabaseName }
+                });
+            }
+            return dictionary;
+        }
+
+        /// <summary>
+        /// <para>
+        /// This turns the dbContext connction string into a dictionary of elements.
+        /// </para>
+        /// <para>
+        /// It splits the string by semi-colons, then splits each of those by the equal symbol.
+        /// </para>
+        /// <para>
+        /// The left side is the dictionary key, the right side is the dictionary value, ignoring the Password (if present).
+        /// </para>
+        /// </summary>
+        /// <param name="dbContext"></param>
+        /// <returns></returns>
+        public static Dictionary<string, object> DbContextDictionary(this DatabaseFacade dbContext, string service)
+        {
+            var dictionary = dbContext?.GetConnectionString().Split(';')
+                .Select(x => x.Split('='))
+                .Select(y => new { key = y[0].Replace(" ", ""), value = y[1] })
+                .Where(x => !new[] { "password" }.Contains(x.key.ToLowerInvariant()))
+                .ToDictionary(x => x.key, x => x.value) ?? new Dictionary<string, string>();
+            return new Dictionary<string, object> { { "service", $"{Microservice}{service}" }, { "dbContext", dictionary } };
+        }
+
+        public static void LogContextError<T>(this ILogger<T> logger, Exception exception, DbContext dbContext, string message, Dictionary<string, object> info = null)
+            => logger.LogQueryError(exception, dbContext, message, info);
+
+        public static void LogContextError<T>(this ILogger<T> logger, Exception exception, StrataIdFullDto dbContext, string message, Dictionary<string, object> info = null)
+            => logger.LogQueryError(exception, dbContext, message, info);
+
+        public static void LogQueryError<T>(this ILogger<T> logger, Exception exception, DbContext dbContext, string message, Dictionary<string, object> info = null)
+        {
+            if (logger == null) { return; }
+            var dictionary = dbContext.Database.DbContextDictionary(typeof(T).Name);
+            if (info != null)
+            {
+                dictionary.Add("information", info);
+            }
+            using (logger.BeginScope(dictionary))
+                logger.LogError(exception, message);
+        }
+
+        public static void LogQueryError<T>(this ILogger<T> logger, Exception exception, StrataIdFullDto dbContext, string message, Dictionary<string, object> info = null)
+        {
+            if (logger == null) { return; }
+            var dictionary = dbContext.DatabaseDictionary(typeof(T).Name);
+            if (info != null)
+            {
+                dictionary.Add("information", info);
+            }
+            using (logger.BeginScope(dictionary))
+                logger.LogError(exception, message);
+        }
+
+        public static void LogContextWarning<T>(this ILogger<T> logger, DbContext dbContext, string message, Dictionary<string, object> info = null)
+        {
+            if (logger == null) { return; }
+            var dictionary = dbContext.Database.DbContextDictionary(typeof(T).Name);
+            if (info != null)
+            {
+                dictionary.Add("information", info);
+            }
+            using (logger.BeginScope(dictionary))
+                logger.LogWarning(message);
+        }
+
+        public static void LogQueryInformation<T>(this ILogger<T> logger, DbContext dbContext,
+        string queryName,
+        [NotParameterized] string sql,
+            params object[] parameters)
+        {
+            Dictionary<string, object> paramDictionary = default;
+            try
+            {
+                paramDictionary = parameters.ParamDictionary();
+            }
+            catch
+            {
+                // ILB
+            }
+            var dictionary = dbContext.Database.DbContextDictionary(typeof(T).Name);
+            dictionary.Add("query", new Dictionary<string, object> {
+                { "name", queryName},
+                { "sql", sql},
+                { "parameters", paramDictionary}
+            });
+            using (logger.BeginScope(dictionary))
+                logger.LogInformation(queryName);
+        }
+
+        public static void LogQueryError<T>(this ILogger<T> logger, Exception exception, JazzDbContext dbContext, string queryName, string sql)
+        {
+            if (logger == null) { return; }
+            var dictionary = dbContext.Database.DbContextDictionary(typeof(T).Name);
+            dictionary.Add("query", queryName);
+            using (logger.BeginScope(dictionary))
+                logger.LogError(exception.InnerException ?? exception, sql);
+        }
+
+        public static void LogServiceError<T>(this ILogger<T> logger, Exception exception, string message, IEnumerable<GUDIDTerm> terms)
+            => logger.LogServiceError(exception, message, new Dictionary<string, object> { { "terms", terms } });
+
+        public static void LogServiceError<T>(this ILogger<T> logger, Exception exception, string message = null, Dictionary<string, object> info = null)
+        {
+            if (logger == null) { return; }
+            if (exception.InnerException != null)
+            {
+                logger.LogServiceError(exception.InnerException, message, info);
+                return;
+            }
+            var dictionary = new Dictionary<string, object> {
+                    { "service", Microservice + typeof(T).Name }
+                };
+            if (info != null)
+            {
+                dictionary.Add("information", info);
+            }
+            var msg = !string.IsNullOrEmpty(message)
+                ? message
+                : exception.InnerException?.Message ?? exception.Message;
+            using (logger.BeginScope(dictionary))
+                logger.LogError(exception.InnerException ?? exception, msg);
+        }
+
+        public static void LogServiceInformation<T>(this ILogger<T> logger, string message)
+        {
+            if (logger == null) { return; }
+            var dictionary = new Dictionary<string, object> {
+                    { "service", Microservice + typeof(T).Name }
+                };
+            using (logger.BeginScope(dictionary))
+                logger.LogInformation(message);
+        }
+
+        public static void LogServiceInformation<T>(this ILogger<T> logger, DbContext dbContext, string message, Dictionary<string, object> info = null)
+        {
+            if (logger == null) { return; }
+            var dictionary = dbContext.Database.DbContextDictionary(typeof(T).Name);
+            if (info != null)
+            {
+                dictionary.Add("information", info);
+            }
+            using (logger.BeginScope(dictionary))
+                logger.LogInformation(message);
+        }
+
+        public static void LogServiceInformation<T>(this ILogger<T> logger, string message, Dictionary<string, object> dictionary)
+        {
+            if (logger == null) { return; }
+            dictionary.Add("service", Microservice + typeof(T).Name);
+            using (logger.BeginScope(dictionary))
+                logger.LogInformation(message);
+        }
+
+        public static void LogServiceQuery<T>(this ILogger<T> logger, string message, string query, IEnumerable<string> queryFilters, object queryParams)
+        {
+            var dictionary = new Dictionary<string, object>
+            {
+                {"service", Microservice + typeof(T).Name},
+                {"query", new Dictionary<string, object>
+                    {
+                        { nameof(query), query },
+                        { nameof(queryParams), queryParams }
+                    }
+                }
+            };
+            using (logger.BeginScope(dictionary))
+                logger.LogWarning(message);
+        }
+
+        private static string SanitizeForLogging(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return value;
+            }
+
+            // Remove line breaks to mitigate log forging via user-controlled values.
+            return value.Replace("\r", string.Empty)
+                        .Replace("\n", string.Empty);
+        }
+
+        public static void LogOpportunityError<T>(this ILogger<T> logger, Exception exception, StrataIdFullDto dbContext, string name, Guid opportunityGuid)
+        {
+            if (exception.InnerException != null)
+            {
+                logger.LogOpportunityError(exception.InnerException, dbContext, SanitizeForLogging(name), opportunityGuid);
+                return;
+            }
+            var dictionary = dbContext.DatabaseDictionary(typeof(T).Name);
+            dictionary.Add("opportunity", SanitizeForLogging(name));
+            dictionary.Add("opportunityGuid", opportunityGuid);
+            using (logger.BeginScope(dictionary))
+                logger.LogError(exception.InnerException ?? exception, exception.InnerException?.Message ?? exception.Message);
+        }
+
+        public static void LogOpportunityError<T>(this ILogger<T> logger, Exception exception, JazzDbContext dbContext, string name, Guid opportunityGuid)
+        {
+            if (exception.InnerException != null)
+            {
+                logger.LogOpportunityError(exception.InnerException, dbContext, SanitizeForLogging(name), opportunityGuid);
+                return;
+            }
+            var dictionary = dbContext.Database.DbContextDictionary(typeof(T).Name);
+            dictionary.Add("opportunity", SanitizeForLogging(name));
+            dictionary.Add("opportunityGuid", opportunityGuid);
+            using (logger.BeginScope(dictionary))
+                logger.LogError(exception.InnerException ?? exception, exception.InnerException?.Message ?? exception.Message);
+        }
+
+        public static void LogOpportunityError<T>(this ILogger<T> logger, Exception exception, string name, Guid opportunityGuid)
+        {
+            if (exception.InnerException != null)
+            {
+                logger.LogOpportunityError(exception.InnerException, SanitizeForLogging(name), opportunityGuid);
+                return;
+            }
+            var dictionary = new Dictionary<string, object> {
+                { "service", $"strata-continuousimprovement-{typeof(T).Name}" },
+                { "opportunity", SanitizeForLogging(name)},
+                { "opportunityGuid", opportunityGuid }
+            };
+            using (logger.BeginScope(dictionary))
+                logger.LogError(exception.InnerException ?? exception, exception.InnerException?.Message ?? exception.Message);
+        }
+
+        public static void LogInitiativeError<T>(this ILogger<T> logger, Exception exception, StrataIdFullDto dbContext, string name, Guid opportunityGuid, Guid initiativeGuid)
+        {
+            if (exception.InnerException != null)
+            {
+                logger.LogInitiativeError(exception.InnerException, dbContext, SanitizeForLogging(name), opportunityGuid, initiativeGuid);
+                return;
+            }
+            var dictionary = dbContext.DatabaseDictionary(typeof(T).Name);
+            dictionary.Add("initiative", SanitizeForLogging(name));
+            dictionary.Add("opportunityGuid", opportunityGuid);
+            dictionary.Add("initiativeGuid", initiativeGuid);
+            using (logger.BeginScope(dictionary))
+                logger.LogError(exception.InnerException ?? exception, exception.InnerException?.Message ?? exception.Message);
+        }
+
+        public static void LogInitiativeError<T>(this ILogger<T> logger, Exception exception, JazzDbContext dbContext, string name, Guid opportunityGuid, Guid initiativeGuid)
+        {
+            if (exception.InnerException != null)
+            {
+                logger.LogInitiativeError(exception.InnerException, dbContext, SanitizeForLogging(name), opportunityGuid, initiativeGuid);
+                return;
+            }
+            var dictionary = dbContext.Database.DbContextDictionary(typeof(T).Name);
+            dictionary.Add("initiative", SanitizeForLogging(name));
+            dictionary.Add("opportunityGuid", opportunityGuid);
+            dictionary.Add("initiativeGuid", initiativeGuid);
+            using (logger.BeginScope(dictionary))
+                logger.LogError(exception.InnerException ?? exception, exception.InnerException?.Message ?? exception.Message);
+        }
+
+        public static void LogInitiativeError<T>(this ILogger<T> logger, Exception exception, string name, Guid opportunityGuid, Guid initiativeGuid)
+        {
+            if (exception.InnerException != null)
+            {
+                logger.LogInitiativeError(exception.InnerException, SanitizeForLogging(name), opportunityGuid, initiativeGuid);
+                return;
+            }
+            var dictionary = new Dictionary<string, object> {
+                { "service", $"strata-continuousimprovement-{typeof(T).Name}" },
+                { "initiative", SanitizeForLogging(name) },
+                { "opportunityGuid", opportunityGuid },
+                { "initiativeGuid", initiativeGuid }
+            };
+            using (logger.BeginScope(dictionary))
+                logger.LogError(exception.InnerException ?? exception, exception.InnerException?.Message ?? exception.Message);
+        }
+
+        public static void LogMappingJobError<T>(this ILogger<T> _logger, Exception ex, JazzDbContext dbContext, string jobName)
+            => _logger.LogMappingError<T>(ex, dbContext, $"{jobName} Job Failed");
+
+        private static void LogMappingError<T>(this ILogger<T> _logger, Exception ex, JazzDbContext dbContext, string jobName)
+        {
+            using (_logger.BeginScope(dbContext.Database.DbContextDictionary(typeof(T).Name)))
+                _logger.LogError(ex, jobName);
+        }
+
+        public static void LogMappingJobInformation<T>(this ILogger<T> _logger, Exception ex, JazzDbContext dbContext, string jobName)
+            => _logger.LogMappingInformation<T>(ex, dbContext, $"{jobName} Job Failed");
+
+        private static void LogMappingInformation<T>(this ILogger<T> _logger, Exception ex, JazzDbContext dbContext, string jobName)
+        {
+            using (_logger.BeginScope(dbContext.Database.DbContextDictionary(typeof(T).Name)))
+                _logger.LogInformation(ex, jobName);
+        }
+
+        public static void LogPerformanceInformation<T>(this ILogger<T> _logger, 
+            string incomingMessage, 
+            [CallerMemberName] string caller = "",
+            [CallerFilePath] string filePath = "",
+            [CallerLineNumber] int lineNumber = 0)
+        {
+            if (_logger == null) { return; }
+
+            string fileName = Path.GetFileName(filePath);
+            string timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
+
+            var message = $"[{timestamp}] {fileName}:{lineNumber} ({caller}) - {incomingMessage}";
+#if DEBUG
+            System.Diagnostics.Debug.WriteLine(message);
+#endif
+            var dictionary = new Dictionary<string, object> {
+                    { "performance", Microservice + typeof(T).Name }
+                };
+            using (_logger.BeginScope(dictionary))
+                _logger.LogInformation(message);
+
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/MathExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/MathExtensions.cs
new file mode 100644
index 0000000..e8ca6f2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/MathExtensions.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    [ExcludeFromCodeCoverage]
+    public static class MathExtensions
+    {
+        public static double DivideBy(this double value, double divisor)
+        {
+            if (divisor == 0.0)
+            {
+                return 0.0;
+            }
+            return value / divisor;
+        }
+
+        public static decimal DivideBy(this decimal dividend, decimal divisor)
+        {
+            if (divisor == 0)
+            {
+                return 0;
+            }
+            return dividend / divisor;
+        }
+
+        public static double DivideBy(this int dividend, int divisor)
+        {
+            if (divisor == 0)
+            {
+                return 0;
+            }
+
+            return (double)dividend / divisor;
+        }
+
+        public static double DivideBy(this int dividend, double divisor)
+        {
+            if (divisor == 0.0)
+            {
+                return 0;
+            }
+
+            return dividend / divisor;
+        }
+
+	    /// <summary>
+	    /// Median is the middle value in a set of numbers that have been arranged in order from smallest to largest. It's also known as the 50th percentile, meaning that half of the numbers in the set are less than the median and half are greater than it.
+	    /// </summary>
+	    public static double Median(this IEnumerable<float> values)
+	    {
+		    if (!values.Any()) { return 0; }
+		    var count = values.Count();
+		    return (count % 2 == 0)
+			    ? values.OrderBy(x => x).Skip((count / 2) - 1).Take(2).Average()
+			    : values.OrderBy(x => x).ElementAt(count / 2);
+	    }
+
+        /// <summary>
+	    /// Median is the middle value in a set of numbers that have been arranged in order from smallest to largest. It's also known as the 50th percentile, meaning that half of the numbers in the set are less than the median and half are greater than it.
+	    /// </summary>
+        public static double Median(this IEnumerable<double> values)
+        {
+            if (!values.Any()) { return 0; }
+            var count = values.Count();
+            return (count % 2 == 0)
+                ? values.OrderBy(x => x).Skip((count / 2) - 1).Take(2).Average()
+                : values.OrderBy(x => x).ElementAt(count / 2);
+        }
+
+        /// <summary>
+        /// Calculate weighted average.  Will NOT throw dividebyzero exception.
+        /// </summary>
+        public static double WeightedAverage<T>(this IEnumerable<T> records, Func<T, double> value, Func<T, double> weight)
+        {
+            // http://stackoverflow.com/questions/2714639/weighted-average-with-linq
+            records = records as IList<T> ?? records.ToList();
+
+            var weightSum = records.Sum(weight);
+
+            if (!(weightSum > 0)) return 0;
+
+            var weightedValueSum = records.Sum(x => value(x) * weight(x));
+            return weightedValueSum / weightSum;
+        }
+
+        /// <summary>
+        /// Calculates the Observed/Expected (O/E) ratio with null and zero handling.
+        /// Returns null if either value is null or if expected is zero.
+        /// </summary>
+        /// <param name="observed">The observed (customer) value.</param>
+        /// <param name="expected">The expected (benchmark) value.</param>
+        /// <returns>The O/E ratio, or null if calculation is not possible.</returns>
+        public static decimal? CalculateOeRatio(decimal? observed, decimal? expected)
+        {
+            if (!observed.HasValue || !expected.HasValue || expected.Value == 0)
+                return null;
+
+            return observed.Value / expected.Value;
+        }
+
+        /// <summary>
+        /// Calculates the Observed/Expected (O/E) ratio with null and zero handling.
+        /// </summary>
+        /// <param name="observed">The observed (customer) value.</param>
+        /// <param name="expected">The expected (benchmark) value.</param>
+        /// <returns>The O/E ratio, or null if calculation is not possible.</returns>
+        public static double? CalculateOeRatio(double observed, double expected)
+        {
+            if (expected == 0)
+            {
+                return null;
+            }
+            return observed / expected;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/ObjectExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/ObjectExtensions.cs
new file mode 100644
index 0000000..747b84f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/ObjectExtensions.cs
@@ -0,0 +1,45 @@
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using System;
+using System.Reflection;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class ObjectExtensions
+    {
+        public static bool TrySetPropertyValue(this object obj, string propertyName, object value, bool ignoreCase = false)
+        {
+            var propertyInfo = ignoreCase
+                ? obj.GetType().GetProperty(propertyName, BindingFlags.IgnoreCase | BindingFlags.Public | BindingFlags.Instance)
+                : obj.GetType().GetProperty(propertyName);
+
+            if (propertyInfo == null)
+            {
+                return false;
+            }
+
+            propertyInfo.SetValue(obj, Convert.ChangeType(value, propertyInfo.PropertyType), null);
+
+            return true;
+        }
+        public static bool TryGetPropertyValue<T>(this object src, string propName, out T value, bool ignoreCase = false)
+        {
+            var prop = ignoreCase
+                ? src.GetType().GetProperty(propName, BindingFlags.IgnoreCase | BindingFlags.Public | BindingFlags.Instance)
+                : src.GetType().GetProperty(propName);
+            if (prop == null)
+            {
+                value = default(T);
+                return false;
+            }
+
+            value = (T)prop.GetValue(src, null);
+            return true;
+        }
+
+        public static bool IsEquivalent(this OpportunityMetricCohortData data, ENOpportunityMetricData metric)
+        {
+            return data.IsBaseline == metric.IsBaseline && data.LevelID == metric.LevelID && data.Month == metric.Month;
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/ProblemDefaults.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/ProblemDefaults.cs
new file mode 100644
index 0000000..3b4d907
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/ProblemDefaults.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class ProblemDefaults
+    {
+        private static readonly Dictionary<int, (string Type, string Title)> Defaults = new()
+        {
+            [204] = ("https://tools.ietf.org/html/rfc9110#section-15.3.5", "No Content"),
+            [404] = ("https://tools.ietf.org/html/rfc9110#section-15.5.5", "Not Found")
+        };
+
+        public static string ProblemDetailTitle(this int? statusCode)
+            => Defaults.TryGetValue(statusCode.GetValueOrDefault(-1), out var dflt)
+                ? dflt.Title
+                : string.Empty;
+
+        public static string ProblemDetailType(this int? statusCode)
+            => Defaults.TryGetValue(statusCode.GetValueOrDefault(-1), out var dflt)
+                ? dflt.Type
+                : string.Empty;
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/ResourceExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/ResourceExtensions.cs
new file mode 100644
index 0000000..eabe60d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/ResourceExtensions.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class ResourceExtensions
+    {
+        public static string ReadResource(this Assembly assembly, string resourceName)
+        {
+            // Format: "{Namespace}.{Folder}.{filename}.{Extension}"
+            if (!resourceName.StartsWith("Strata.ContinuousImprovement.Biz"))
+            {
+                var regex = new Regex(@"Strata.ContinuousImprovement.Biz\..*\." + resourceName, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+                resourceName = assembly.GetManifestResourceNames()
+                    .SingleOrDefault(str => regex.IsMatch(str));
+            }
+            if (resourceName is null) return null;
+            using Stream stream = assembly.GetManifestResourceStream(resourceName)!;
+            using StreamReader reader = new(stream);
+            return reader.ReadToEnd();
+        }
+
+        public static async Task<string> ReadResourceAsync(this Assembly assembly, string resourceName)
+        {
+            // Format: "{ Namespace}.{Folder}.{filename}.{Extension}"
+            if (!resourceName.StartsWith("Strata.ContinuousImprovement.Biz"))
+            {
+                resourceName = assembly.GetManifestResourceNames()
+                    .SingleOrDefault(str => str.EndsWith(resourceName));
+            }
+            if (resourceName is null) return null;
+            using Stream stream = assembly.GetManifestResourceStream(resourceName)!;
+            using StreamReader reader = new(stream);
+            return await reader.ReadToEndAsync();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/StatusMapper.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/StatusMapper.cs
new file mode 100644
index 0000000..bc511b0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/StatusMapper.cs
@@ -0,0 +1,42 @@
+using Strata.Hangfire.Jazz.Client.Models;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public enum Status
+    {
+        Unknown,
+        Enqueued,
+        Processing,
+        Error,
+        Deleted,
+        Completed
+    }
+
+    public static class StatusMapper
+    {
+        public static Status Map(this string status)
+        {
+            return status switch
+            {
+                "Scheduled" or "Enqueued" or nameof(Status.Enqueued) => Status.Enqueued,
+                "Processing" or nameof(Status.Processing) => Status.Processing,
+                "Failed" or nameof(Status.Error) => Status.Error,
+                "Succeeded" or nameof(Status.Completed) => Status.Completed,
+                "Deleted" or nameof(Status.Deleted) => Status.Deleted,
+                _ => Status.Unknown,
+            };
+        }
+
+        public static Status Map(this JobInfoDto jobInfo)
+            => jobInfo.State.Name.Map();
+
+        public static bool IsSuccessful(this Status status)
+            => status == Status.Completed || status == Status.Deleted;
+
+        public static bool IsFinalStatus(this Status status)
+            => status == Status.Error || status == Status.Deleted || status == Status.Completed;
+
+        public static bool IsRunningStatus(this Status status)
+            => status == Status.Processing || status == Status.Enqueued;
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/StringExtensions.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/StringExtensions.cs
new file mode 100644
index 0000000..a413a4d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/StringExtensions.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    public static class StringExtensions
+    {
+        /// <summary>
+        /// Parses a comma-separated string of integers and returns a list of valid integers.
+        /// </summary>
+        /// <param name="csv">The comma-separated string to parse.</param>
+        /// <returns>A list of integers parsed from the CSV string.</returns>
+        public static IList<int> ParseIntCsv(this string csv)
+        {
+            if (string.IsNullOrEmpty(csv))
+                return new List<int>();
+
+            return csv.Split(',')
+                .Where(str => int.TryParse(str, out _))
+                .Select(int.Parse)
+                .ToList();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/Utilities/StringUtils.cs b/src/Strata.ContinuousImprovement.Biz/Utilities/StringUtils.cs
new file mode 100644
index 0000000..a2e973b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/Utilities/StringUtils.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace Strata.ContinuousImprovement.Biz.Utilities
+{
+    [ExcludeFromCodeCoverage]
+    public static class StringUtils
+    {
+        public static string SplitCamelCase(this string input)
+        {
+            if (string.IsNullOrEmpty(input)) { return input; }
+
+            const string pattern = "([a-z](?=[A-Z])|[A-Z](?=[A-Z][a-r + t-z])|[A-Z](?=[A-Z][s][a-z]))";
+
+            if (input.StartsWith("FY", StringComparison.Ordinal))
+            {   // hack for FY2012, etc
+                return "FY " + Regex.Replace(input.Remove(0, 2), pattern, "$1 ");
+            }
+            return Regex.Replace(input, pattern, "$1 ");
+        }
+
+        public static string TightenUp(this string input)
+        {
+            var crlf = Environment.NewLine;
+            // clean up any black lines
+            input = Regex.Replace(input, $@"\s*{crlf}\s*{crlf}", crlf);
+            // clean up line straggling semi-colons
+            return Regex.Replace(input, $@"\s*{crlf}\s*;", ";");
+        }
+
+        public static string YesNo(this bool input) => input ? "Yes" : "No";
+
+        public static IEnumerable<int> SplitCSV(this string aString) =>
+            aString.Split(',')
+                .Where(str => int.TryParse(str, out var x) && x != 0)
+                .Distinct()
+                .Select(int.Parse);
+
+        public static IEnumerable<string> GetNodeNames(this string nodes)
+            => nodes.Selections().Select(x => x.Name);
+
+        public static string ToMoment(this string aString)
+            => DateTime.TryParse(aString, out var date) ? date.ToString("yyyyMMdd") : "";
+
+        public static DateTime ToInitiativeEffectiveDate(this string aString)
+        {
+            var date = DateTime.ParseExact(Regex.Replace(aString, @"[^\d]", ""), "yyyyMMdd", CultureInfo.InvariantCulture);
+            return new DateTime(date.Year, date.Month, 1);
+        }
+
+        public static string Maxlength(this string aString, int maxlength)
+            => aString.Length <= maxlength ? aString : aString.Substring(0, maxlength);
+
+        public static bool AsBoolean(this string aString)
+            => aString.Maxlength(5).Equals("true", StringComparison.CurrentCultureIgnoreCase);
+
+        public static decimal AppVersion(this string aString)
+            => decimal.TryParse(aString, out var result) ? result : decimal.MinValue;
+
+        public static String ToCSVList(this IEnumerable<int> items)
+            => ToSeperatedList(items, ",", s => s.ToString());
+
+        public static String ToSeperatedList<T>(this IEnumerable<T> items, String delimiter, Func<T, string> selector)
+        {
+            return string.Join(delimiter, items.Select(selector).ToArray());
+        }
+
+        public static String IsNotSpecified(this string aString)
+            => string.IsNullOrEmpty(aString) ? Constants.NOT_SPECIFIED : aString;
+
+        public static string SnowflakeSyntax(this string sql)
+        {
+            var result = Regex.Replace(sql.Replace("@", ":").Replace("--", ""),
+                @"IN \((:[^)]*)\)", "IN $1",
+                RegexOptions.IgnoreCase | RegexOptions.Multiline);
+            result = Regex.Replace(Regex.Replace(result, @"DATEPART\((MONTH|DAY|YEAR),\s+", "$1("),
+                @"\[|\]", "");
+            return result;
+        }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public static class GuidUtils
+    {
+        public static bool CheckGuidFormat(this Guid guid)
+            => !string.IsNullOrEmpty(guid.ToString()) && Guid.TryParse(guid.ToString(), out _);
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/DatabaseFunctionService.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/DatabaseFunctionService.cs
new file mode 100644
index 0000000..9c125c8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/DatabaseFunctionService.cs
@@ -0,0 +1,19 @@
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation
+{
+    public class DatabaseFunctionService: IDatabaseFunctionService
+    {
+        public Expression<Func<UVOpportunity, bool>> SplitString(IEnumerable<string> entityIds)
+        {
+            return m => SqlFunctions.Split(m.EntityId, ",").Any(entity => entityIds.Contains(entity.Value));
+        }
+    }
+}
+
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/DimCaseType.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/DimCaseType.cs
new file mode 100644
index 0000000..fa5afff
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/DimCaseType.cs
@@ -0,0 +1,28 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation
+{
+    [Table("DimCaseType", Schema = "dss")]
+    public class DimCaseType
+    {
+        [Key]
+        public int CaseTypeId { get; set; }
+        public Guid MemberGUID { get; set; }
+        public string Name { get; set; }
+        public int CaseTypeFamilyId { get; set; }
+        public Guid ConfigurationGUID { get; set; }
+        public string CaseTypeconfigJSON { get; set; }
+        public bool IsAllEntity { get; set; }
+        public int ClinicalIndicatorId { get; set; }
+        public int CaseTypeCategory { get; set; }
+        public string ChargeCodeGroupJSON { get; set; } = "[]";
+        public long ExplorationPopulationId { get; set; }
+
+        public DimCaseType()
+        {
+            MemberGUID = Guid.NewGuid();
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/DimEntity.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/DimEntity.cs
new file mode 100644
index 0000000..e44942b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/DimEntity.cs
@@ -0,0 +1,20 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation
+{
+    [Table("DimEntity", Schema = "fw")]
+    public class DimEntity
+    {
+        [Key]
+        public int EntityID { get; set; }
+        public Guid MemberGUID { get; set; }
+        public string Code { get; set; }
+        public string Description { get; set; }
+        public int SortOrder { get; set; }
+        public short EntityType { get; set; }
+        public bool IsActive { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/IDatabaseFunctionService.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/IDatabaseFunctionService.cs
new file mode 100644
index 0000000..badeb8c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/IDatabaseFunctionService.cs
@@ -0,0 +1,12 @@
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation
+{
+    public interface IDatabaseFunctionService
+    {
+        Expression<Func<UVOpportunity, bool>> SplitString(IEnumerable<string> entityIds);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/Filters/UVFilterOptions.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/Filters/UVFilterOptions.cs
new file mode 100644
index 0000000..6e8b459
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/Filters/UVFilterOptions.cs
@@ -0,0 +1,13 @@
+using Strata.ContinuousImprovement.Biz.Filter;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities.Filters
+{
+    public class UVFilterOptions
+    {
+        public IEnumerable<FilterMember> CaseTypes { get; set; }
+        public IEnumerable<FilterMember> CostDrivers { get; set; }
+        public IEnumerable<FilterMember> Entities { get; set; }
+        public IEnumerable<FilterMember> ServiceLines { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/Filters/UVFilters.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/Filters/UVFilters.cs
new file mode 100644
index 0000000..4ee3f24
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/Filters/UVFilters.cs
@@ -0,0 +1,56 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities.Filters
+{
+    public class UVFilters : FiltersOpportunity<UVOpportunity>
+    {
+        public IEnumerable<Guid> CaseTypeGuids { get; set; }
+        public IEnumerable<string> CostDrivers { get; set; }
+        public IEnumerable<string> EntityIds { get; set; }
+        public IEnumerable<string> ServiceLineIds { get; set; }
+
+        public UVFilters() : base()
+        {
+            CaseTypeGuids = new List<Guid>();
+            CostDrivers = new List<string>();
+            EntityIds = new List<string>();
+            ServiceLineIds = new List<string>();
+        }
+
+        public override IEnumerable<Expression<Func<UVOpportunity, bool>>> GetFilters(JazzDbContext context)
+        {
+            var filters = base.GetFilters(context).ToList();
+
+            if (!string.IsNullOrEmpty(OpportunitySearch))
+            {
+                filters.Add(m => m.OpportunityKey.Contains(OpportunitySearch)
+                    || m.CaseTypeName.Contains(OpportunitySearch)
+                    || m.ServiceLineName.Contains(OpportunitySearch)
+                    || m.EntityName.Contains(OpportunitySearch)
+                    || m.CostDriver.Contains(OpportunitySearch));
+            }
+
+            if (CaseTypeGuids.Any())
+                filters.Add(m => CaseTypeGuids.Contains(m.CaseTypeGuid));
+
+            if (CostDrivers.Any())
+                filters.Add(m => CostDrivers.Contains(m.CostDriver));
+
+            if (EntityIds.Any())
+                filters.Add(context.DatabaseFunctionService.SplitString(EntityIds));
+
+            if (ServiceLineIds.Any())
+                filters.Add(m => ServiceLineIds.Contains(m.ServiceLineId.ToString()));
+
+            return filters;
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/IUVOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/IUVOpportunityService.cs
new file mode 100644
index 0000000..55a5cf4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/IUVOpportunityService.cs
@@ -0,0 +1,18 @@
+using ClosedXML.Excel;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities.Filters;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities
+{
+    public interface IUVOpportunityService : IOpportunityService<UVOpportunity>
+    {
+        Task<UVFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken);
+
+        Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, UVFilters filters, CancellationToken cancellationToken);
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/UVOpportunity.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/UVOpportunity.cs
new file mode 100644
index 0000000..34fcb30
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/UVOpportunity.cs
@@ -0,0 +1,21 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities
+{
+    [Table("viewVariationOpportunity", Schema = "cci")]
+    public class UVOpportunity : Opportunity
+    {
+        public Guid CaseTypeGuid { get; set; }
+        public string CaseTypeName { get; set; }
+        public string CostDriver { get; set; }
+        public int Cases { get; set; }
+        public string EntityId { get; set; }
+        public string EntityName { get; set; }
+        public int ServiceLineId { get; set; }
+        public string ServiceLineName { get; set; }
+        public double VariationPerCase { get; set; }
+        public long OpportunityId { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/UVOpportunityService.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/UVOpportunityService.cs
new file mode 100644
index 0000000..5ce226e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/UVOpportunityService.cs
@@ -0,0 +1,93 @@
+using ClosedXML.Excel;
+using Microsoft.EntityFrameworkCore;
+using MoreLinq;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Export;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities.Filters;
+using Strata.CoreLib.Claims;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities
+{
+    public class UVOpportunityService : OpportunityService<UVOpportunity>, IUVOpportunityService
+    {
+        public UVOpportunityService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory, CentralDbContext centralDbContext,
+            IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            IInitiativeService initiativeService, IUpdateFactOpportunitySavingsService updateFactOpportunitySavingsService)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor,
+                  initiativeService, updateFactOpportunitySavingsService)
+        {
+        }
+
+        public async Task<IXLWorkbook> ExportAsync(SortOptions sortOptions, UVFilters filters, CancellationToken cancellationToken)
+        {
+            var exportOptions = this.GetExportOptions();
+
+            // get data
+            var data = (await this.GetAllAsync(sortOptions, filters, cancellationToken)).Select(opp => new
+            {
+                Opportunity = opp.OpportunityKey,
+                opp.VariationPerCase,
+                opp.IdentifiedSavings,
+                opp.Cases,
+                CaseType = opp.CaseTypeName,
+                opp.CostDriver,
+                Entity = opp.EntityName,
+                ServiceLine = opp.ServiceLineName,
+                opp.Initiative,
+                IsHidden = opp.IsHidden ? 1 : 0,
+                opp.Note
+            });
+
+            // configure column formats
+            exportOptions.AddColumnOptions("Variation Per Case", "Currency");
+            exportOptions.AddColumnOptions("Identified Savings", "Currency2Dec");
+            exportOptions.AddColumnOptions("Cases", "Accounting");
+            exportOptions.AddColumnOptions("Is Hidden", "\"Yes\";-;\"No\"");
+
+            return ExportUtils.CreateExcelWorkbook(data, exportOptions);
+        }
+
+        public async Task<UVFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) return null;
+
+            var configuredOpportunities = dbContext.Set<UVOpportunity>().Where(vo => vo.ConfigurationGuid == configurationGuid);
+
+            var caseTypes = configuredOpportunities
+                .Select(vo => new FilterMember { Id = vo.CaseTypeGuid.ToString(), Text = vo.CaseTypeName })
+                .Distinct().OrderBy(ct => ct.Text);
+
+            var entities = configuredOpportunities
+                .Select(vo => new FilterMember { Id = vo.EntityId.ToString(), Text = vo.EntityName }).
+                Distinct().OrderBy(oa => oa.Text);
+
+            var costDrivers = configuredOpportunities
+                .Select(vo => new FilterMember { Id = vo.CostDriver, Text = vo.CostDriver })
+                .Distinct().OrderBy(oa => oa.Text);
+
+            var serviceLines = configuredOpportunities
+                .Select(vo => new FilterMember { Id = vo.ServiceLineId.ToString(), Text = vo.ServiceLineName })
+                .Distinct().OrderBy(oa => oa.Text);
+
+            return new UVFilterOptions
+            {
+                CaseTypes = await caseTypes.ToListAsync(cancellationToken),
+                Entities = await entities.ToListAsync(cancellationToken),
+                CostDrivers = await costDrivers.ToListAsync(cancellationToken),
+                ServiceLines = await serviceLines.ToListAsync(cancellationToken)
+            };
+        }
+
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/VariationOpportunityDataModel.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/VariationOpportunityDataModel.cs
new file mode 100644
index 0000000..971eeb4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/Opportunities/VariationOpportunityDataModel.cs
@@ -0,0 +1,32 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities
+{
+    [Table("VariationOpportunity", Schema = "cci")]
+    public class VariationOpportunityDataModel
+    {
+        [Key]
+        public Guid OpportunityGuid { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public short YearConsidered { get; set; }
+        public string CostDriver { get; set; }
+        public byte SavingsLevel { get; set; }
+        public double Savings { get; set; }
+        public double SavingsMedian { get; set; }
+        public double SavingsTarget { get; set; }
+        public int TotalCases { get; set; }
+        public double TotalCost { get; set; }
+        public double TotalVariableCost { get; set; }
+        public double CostMedian { get; set; }
+        public double CostMedicare { get; set; }
+        public double VariableCostMedian { get; set; }
+        public double VariableCostMedicare { get; set; }
+        public string Note { get; set; }
+        public DateTime DateModified { get; set; }
+        public DateTime DateCreated { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public bool IsHidden { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/CaseTypeCategories.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/CaseTypeCategories.cs
new file mode 100644
index 0000000..59ffa51
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/CaseTypeCategories.cs
@@ -0,0 +1,11 @@
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes
+{
+    public enum CaseTypeCategories
+    {
+        MSDRG = 0,
+        APRDRG = 1,
+        PatientPopulation = 2,
+        CPTCode = 3,
+        ExplorationPopulation = 4
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/CaseTypeTaggingMode.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/CaseTypeTaggingMode.cs
new file mode 100644
index 0000000..5755dab
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/CaseTypeTaggingMode.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes
+{
+    public enum CaseTypeTaggingMode
+    {
+        InitialSetup = 0,
+        Savings = 1,
+        Tracking = 2
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/Filters/UVCaseTypeFilters.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/Filters/UVCaseTypeFilters.cs
new file mode 100644
index 0000000..666a66e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/Filters/UVCaseTypeFilters.cs
@@ -0,0 +1,42 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Filter.Expressions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes.Filters
+{
+    public class UVCaseTypeFilters:IFilters<UVCaseType>
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public double? IdentifiedSavings { get; set; }
+        public IEnumerable<Guid> CaseTypeGuids { get; set; }
+        public IEnumerable<string> ServiceLineIds { get; set; }
+
+        public UVCaseTypeFilters() : base()
+        {
+            ConfigurationGuid = Guid.Empty;
+            CaseTypeGuids = new List<Guid>();
+            ServiceLineIds = new List<string>();
+        }
+
+        public IEnumerable<Expression<Func<UVCaseType, bool>>> GetFilters(JazzDbContext context)
+        {
+            var filters = new List<Expression<Func<UVCaseType, bool>>>();
+            filters.AddConfigurationGuidFilter(ConfigurationGuid);
+            filters.AddIdentifiedSavingsTotalFilter(IdentifiedSavings);
+
+            if (CaseTypeGuids.Any())
+                filters.Add(m => CaseTypeGuids.Contains(m.CaseTypeGuid));
+
+            if (ServiceLineIds.Any())
+                filters.Add(m => ServiceLineIds.Contains(m.ServiceLineId.ToString()));
+
+            return filters;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/IUVCaseTypeService.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/IUVCaseTypeService.cs
new file mode 100644
index 0000000..1f6bd6a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/IUVCaseTypeService.cs
@@ -0,0 +1,16 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities.Filters;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public interface IUVCaseTypeService : IJazzDbService<UVCaseType, int>
+    {
+        Task<UVFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken);
+        Task<bool> AddPatientPopulationCaseTypes(Guid configurationGuid, string userName, List<string> patientPopulations, CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/UVCaseType.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/UVCaseType.cs
new file mode 100644
index 0000000..cc277bd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/UVCaseType.cs
@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes
+{
+    [Keyless]
+    [Table("viewVariationCaseType", Schema = "cci")]
+    public class UVCaseType : IWithConfigurationGuid, IWithIdentifiedSavingsTotal
+    {
+        public int CaseTypeId { get; set; }
+        public Guid CaseTypeGuid { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public string CaseTypeName { get; set; }
+        public int ServiceLineId { get; set; }
+        public string ServiceLineName { get; set; }
+        public double IdentifiedSavingsTotal { get; set; }
+        public int OpportunitiesCount { get; set; }
+        public int CaseTypeCategory { get; set; }
+        public string CostDriver { get; set; }
+        public Guid AssociatedOpportunityGuid { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/UVCaseTypeService.cs b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/UVCaseTypeService.cs
new file mode 100644
index 0000000..86fcc30
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/UtilizationVariation/VariationCaseTypes/UVCaseTypeService.cs
@@ -0,0 +1,171 @@
+using DocumentFormat.OpenXml.Drawing;
+using Hangfire;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Azure;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities.Filters;
+using Strata.CoreLib.Claims;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Hangfire.Jazz.Client.Models;
+using Strata.Schema.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class UVCaseTypeService : JazzDbService<UVCaseType, int>, IUVCaseTypeService
+    {
+        private readonly ISchemaServiceClient _schemaServiceClient;
+        private readonly IHubContext<NotificationHub, INotificationHub> _notificationHubContext;
+        private readonly IJazzHangfireServiceClient _hangfireServiceClient;
+        private readonly ILogger<UVCaseTypeService> _logger;
+        private readonly IConfigurationService _configurationService;
+
+        public UVCaseTypeService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext, IClaimsPrincipalAccessor claimsPrincipalAccessor)
+            : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor)
+        {
+        }
+
+        public UVCaseTypeService(IAsyncDbContextFactory<JazzDbContext> dbContextFactory,
+            CentralDbContext centralDbContext, IClaimsPrincipalAccessor claimsPrincipalAccessor,
+            ISchemaServiceClient schemaServiceClient,
+            IHubContext<NotificationHub, INotificationHub> notificationHubContext,
+            IJazzHangfireServiceClient hangfireServiceClient,
+            ILogger<UVCaseTypeService> logger,
+            IConfigurationService configurationService) : base(dbContextFactory, centralDbContext, claimsPrincipalAccessor)
+        {
+            _schemaServiceClient = schemaServiceClient;
+            _notificationHubContext = notificationHubContext;
+            _hangfireServiceClient = hangfireServiceClient;
+            _logger = logger;
+            _configurationService = configurationService;
+        }
+
+        public async Task<bool> AddPatientPopulationCaseTypes(Guid configurationGuid, string userName, List<string> patientPopulations, CancellationToken cancellationToken)
+        {
+            var hub = _notificationHubContext.Clients.Group(userName);
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) return false;
+
+            var patientPopulationDimension = await _schemaServiceClient.GetDimensionByGlobalIdAsync("Clinical Indicator");
+            var members = await _schemaServiceClient.GetDimensionMembersFromHierarchyPathsAsync(patientPopulationDimension.DimensionGuid, patientPopulations, cancellationToken);
+            var patientPopCaseTypes = new List<DimCaseType>();
+            var configuration = await _configurationService.GetConfigurationAsync(configurationGuid, cancellationToken);
+
+            foreach (var member in members)
+            {
+                var patientPopCaseType = new DimCaseType()
+                {
+                    ConfigurationGUID = Guid.Empty, // case types are configured for all configurations 
+                    Name = member.Name,
+                    CaseTypeconfigJSON = "{\"PhysicianMinVolume\":0}",
+                    IsAllEntity = true,
+                    ClinicalIndicatorId = Convert.ToInt32(member.Id),
+                    CaseTypeCategory = (int)CaseTypeCategories.PatientPopulation,
+                };
+
+                patientPopCaseTypes.Add(patientPopCaseType);
+            }
+
+            var caseTypeContext = dbContext.Set<DimCaseType>();
+
+            var newCaseTypes = patientPopCaseTypes
+                .Where(newCaseType => !caseTypeContext.Any(existingCaseType =>
+                    existingCaseType.ClinicalIndicatorId == newCaseType.ClinicalIndicatorId
+                    && existingCaseType.IsAllEntity == newCaseType.IsAllEntity
+                    && existingCaseType.CaseTypeCategory == newCaseType.CaseTypeCategory)).ToList();
+            var existingCaseTypes = patientPopCaseTypes.Except(newCaseTypes).ToList();
+            try
+            {
+                // Save new case types
+                await caseTypeContext.AddRangeAsync(newCaseTypes);
+                await dbContext.SaveChangesAsync(cancellationToken);
+
+                if (newCaseTypes.Any())
+                {
+                    // Run jobs to retag encounter case types and recalculate UV savings with new case types
+                    await RunCaseTypeTaggingJob(cancellationToken);
+                    await RunSavingsForNewCaseTypesJob(configurationGuid, newCaseTypes, cancellationToken);
+                    await hub.SendPatientPopulationCaseTypeCreateSuccess(userName, newCaseTypes.Count.ToString());
+                }
+
+                if (existingCaseTypes.Count() > 0)
+                {
+                    await hub.SendPatientPopulationCaseTypeAlreadyExist(userName + "SendPatientPopulationCaseTypeAlreadyExist", existingCaseTypes.Count().ToString());
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                await hub.SendPatientPopulationCaseTypeCreateError(userName);
+
+                // If there's an error clear out added types - users can't delete existing or re-add duplicate to trigger tagging/savings.
+                caseTypeContext.RemoveRange(newCaseTypes);
+                await dbContext.SaveChangesAsync(cancellationToken);
+
+                _logger.LogError(ex, "Error adding patient population case types.");
+                return false;
+            }
+        }
+
+        public async Task<UVFilterOptions> GetFilterOptionsAsync(Guid configurationGuid, CancellationToken cancellationToken)
+        {
+            await using var dbContext = GetDbContext(cancellationToken).Result;
+            if (dbContext == null) return (UVFilterOptions)null;
+
+            var caseTypeContext = dbContext.Set<UVCaseType>();
+            var configuredCaseTypes = caseTypeContext.Where(ct => ct.ConfigurationGuid == configurationGuid);
+
+            var caseTypes = configuredCaseTypes
+                .Select(vo => new FilterMember { Id = vo.CaseTypeGuid.ToString(), Text = vo.CaseTypeName })
+                .Distinct().OrderBy(ct => ct.Text);
+
+            var serviceLines = configuredCaseTypes
+                .Select(vo => new FilterMember { Id = vo.ServiceLineId.ToString(), Text = vo.ServiceLineName })
+                .Distinct().OrderBy(oa => oa.Text);
+
+            return new UVFilterOptions()
+            {
+                CaseTypes = await caseTypes.ToListAsync(cancellationToken),
+                ServiceLines = await serviceLines.ToListAsync(cancellationToken)
+            };
+        }
+
+        private async Task RunCaseTypeTaggingJob(CancellationToken cancellationToken)
+        {
+            var caseTypeTaggingJob = new EnqueueJobDto
+            {
+                TaskName = "Strata.CS.Jazz.Biz.CCI.Tasks.Variation.PatientEncounterSummaryUpdateCaseTypeIdTask, Strata.CS.Jazz.Biz.CCI",
+                ContextData = JsonConvert.SerializeObject(new { Mode = (int)CaseTypeTaggingMode.InitialSetup })
+            };
+
+            await _hangfireServiceClient.EnqueueJobAsync(caseTypeTaggingJob, cancellationToken);
+        }
+
+        private async Task RunSavingsForNewCaseTypesJob(Guid configurationGuid, IEnumerable<DimCaseType> newCaseTypes, CancellationToken cancellationToken)
+        {
+            var runSavingsJob = new EnqueueJobDto
+            {
+                TaskName = "Strata.CS.Jazz.Biz.CCI.Tasks.Variation.RunVariationSavingsTask, Strata.CS.Jazz.Biz.CCI",
+                ContextData = JsonConvert.SerializeObject(new { configurationGuid = configurationGuid, caseTypeGuids = newCaseTypes.Select(x => x.MemberGUID) })
+            };
+
+            await _hangfireServiceClient.EnqueueJobAsync(runSavingsJob, cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/WorkbookClient/WorkbookClientMapper.cs b/src/Strata.ContinuousImprovement.Biz/WorkbookClient/WorkbookClientMapper.cs
new file mode 100644
index 0000000..44c907e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/WorkbookClient/WorkbookClientMapper.cs
@@ -0,0 +1,17 @@
+using Riok.Mapperly.Abstractions;
+using Strata.Analytics.Models.Workbooks;
+using Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.DecisionSupport.Models.Jazz;
+
+namespace Strata.ContinuousImprovement.Biz.WorkbookClient
+{
+    [Mapper(UseDeepCloning = true)]
+    public static partial class WorkbookClientMapper
+    {
+        public static partial WorkbookClientInfo Mapped(this Workbook src);
+        public static partial OpportunityTypeWorkbookClientInfo Mapped(this OpportunityTypeWorkbook src);
+        public static partial OpportunityWorkbookClientInfo Mapped(this OpportunityWorkbook src);
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Biz/runtimeconfig.template.json b/src/Strata.ContinuousImprovement.Biz/runtimeconfig.template.json
new file mode 100644
index 0000000..9cbaf60
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Biz/runtimeconfig.template.json
@@ -0,0 +1,5 @@
+{
+  "configProperties": {
+    "System.Drawing.EnableUnixSupport":  true
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/ChargeCodeDetailInfo.cs b/src/Strata.ContinuousImprovement.Client/ChargeCodeDetailInfo.cs
new file mode 100644
index 0000000..09cc6da
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/ChargeCodeDetailInfo.cs
@@ -0,0 +1,10 @@
+namespace Strata.ContinuousImprovement.Client
+{
+    public class ChargeCodeDetailInfo
+    {
+        public int StrataId { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        public bool IsBaseline { get; set; }
+        public bool IsUpdate { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/ChargeCodeOpportunityJobRequestInfo.cs b/src/Strata.ContinuousImprovement.Client/ChargeCodeOpportunityJobRequestInfo.cs
new file mode 100644
index 0000000..dc243b5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/ChargeCodeOpportunityJobRequestInfo.cs
@@ -0,0 +1,11 @@
+namespace Strata.ContinuousImprovement.Client
+{
+    /// <summary>
+    /// Contains information required to request a charge code opportunity job.
+    /// </summary>
+    public class ChargeCodeOpportunityJobRequestInfo
+    {
+        public int StrataId { get; set; }
+        public Guid OpportunityGuid { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Client/ClientNetworkOpportunityDeleteInfo.cs b/src/Strata.ContinuousImprovement.Client/ClientNetworkOpportunityDeleteInfo.cs
new file mode 100644
index 0000000..f153c11
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/ClientNetworkOpportunityDeleteInfo.cs
@@ -0,0 +1,17 @@
+namespace Strata.ContinuousImprovement.Client
+{
+    public class ClientNetworkOpportunityDeleteInfo
+    {
+        public Guid DatabaseGuid { get; set; }
+        public Guid Configuration { get; set; }
+        public Guid Id { get; set; }
+
+        public ClientNetworkOpportunityDeleteInfo() { }
+        public ClientNetworkOpportunityDeleteInfo(Guid databaseGuid, Guid configuration, Guid id)
+        {
+            DatabaseGuid = databaseGuid;
+            Configuration = configuration;
+            Id = id;
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/ClientNetworkOpportunityResultDto.cs b/src/Strata.ContinuousImprovement.Client/ClientNetworkOpportunityResultDto.cs
new file mode 100644
index 0000000..cd14286
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/ClientNetworkOpportunityResultDto.cs
@@ -0,0 +1,11 @@
+namespace Strata.ContinuousImprovement.Client
+{
+    public class ClientNetworkOpportunityResultDto
+    {
+        public int NetworkOpportunityId { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/ConfigurationInfo.cs b/src/Strata.ContinuousImprovement.Client/ConfigurationInfo.cs
new file mode 100644
index 0000000..632be91
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/ConfigurationInfo.cs
@@ -0,0 +1,10 @@
+namespace Strata.ContinuousImprovement.Client
+{
+    public class ConfigurationInfo
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public string Name { get; set; }
+        public byte DisplayOrder { get; set; }
+        public short FiscalYearId { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/ContinuousImprovementService.cs b/src/Strata.ContinuousImprovement.Client/ContinuousImprovementService.cs
new file mode 100644
index 0000000..f271729
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/ContinuousImprovementService.cs
@@ -0,0 +1,152 @@
+using Strata.ApiCommunication.Http;
+using Strata.DecisionSupport.Models.Encounters;
+using Strata.DecisionSupport.Models.Jazz;
+using Strata.DecisionSupport.Models.Queries;
+using Jazz = Strata.DecisionSupport.Models.Jazz;
+
+namespace Strata.ContinuousImprovement.Client
+{
+    public partial class ContinuousImprovementService : IContinuousImprovementService
+    {
+        private readonly HttpClient _httpClient;
+
+        public ContinuousImprovementService(HttpClient httpClient)
+        {
+            _httpClient = httpClient;
+        }
+
+        public async Task DeleteOpportunityLink(Guid databaseGuid, Guid configurationGuid, Guid opportunityGuid, CancellationToken cancellationToken = default)

+        {
            var request = new HttpRequestMessage(HttpMethod.Delete, $"api/v1/client-network-opportunity-link/delete-opportunity-link");
            await request.SetContentAsJsonAsync(new ClientNetworkOpportunityDeleteInfo(databaseGuid, configurationGuid, opportunityGuid), cancellationToken);
            await _httpClient.SendAsync(request, cancellationToken);
        }
+
+        public async Task DeleteInitiativeLink(Guid databaseGuid, Guid configurationGuid, Guid initiativeGuid, CancellationToken cancellationToken = default)
+        {
            var request = new HttpRequestMessage(HttpMethod.Delete, $"api/v1/client-network-opportunity-link/delete-initiative-link");
            await request.SetContentAsJsonAsync(new ClientNetworkOpportunityDeleteInfo(databaseGuid, configurationGuid, initiativeGuid), cancellationToken);
            await _httpClient.SendAsync(request, cancellationToken);
        }

+
+        public async Task<ClientNetworkOpportunityResultDto> RolloverOpportunityLink(Guid databaseGuid,
+            Guid sourceConfigurationGuid, Guid sourceOpportunityGuid,
+            Guid rolloverConfigurationGuid, Guid rolloverOpportunityGuid, Guid rolloverInitiativeGuid, CancellationToken cancellationToken = default)
        {
            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/client-network-opportunity-link");
            await request.SetContentAsJsonAsync(new RolloverOpportunityInfo(databaseGuid, sourceConfigurationGuid, sourceOpportunityGuid,
                rolloverConfigurationGuid, rolloverOpportunityGuid, rolloverInitiativeGuid), cancellationToken);
            return await _httpClient.SendAsync<ClientNetworkOpportunityResultDto>(request, cancellationToken);
        }
+
+        public async Task<ClientNetworkOpportunityResultDto> RolloverOpportunity(RolloverOpportunityInfo rolloverOpportunityInfo, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/client-network-opportunity-link");
            await request.SetContentAsJsonAsync(rolloverOpportunityInfo, cancellationToken);
            return await _httpClient.SendAsync<ClientNetworkOpportunityResultDto>(request, cancellationToken);
        }
+
+        #region Decision Support Encounter queries
+
+        public async Task<IEnumerable<Jazz.MSDRGEncounterInfo>> DecisionSupportMsdrgEncounterInfo(EncounterQueryInfo encounterInfo, CancellationToken cancellationToken = default)
+           => await DecisionSupportEncounters<Jazz.MSDRGEncounterInfo>(encounterInfo, cancellationToken);
+
+        public async Task<IEnumerable<Jazz.APRDRGEncounterInfo>> DecisionSupportAprdrgEncounterInfo(EncounterQueryInfo encounterInfo, CancellationToken cancellationToken = default)
+           => await DecisionSupportEncounters<Jazz.APRDRGEncounterInfo>(encounterInfo, cancellationToken);
+
+        public async Task<IEnumerable<Jazz.CPTCodeEncounterInfo>> DecisionSupportCptCodeEncounterInfo(EncounterQueryInfo encounterInfo, CancellationToken cancellationToken = default)
+           => await DecisionSupportEncounters<Jazz.CPTCodeEncounterInfo>(encounterInfo, cancellationToken);
+
+        public async Task<IEnumerable<Jazz.PatientPopulationEncounterInfo>> DecisionSupportPatientPopulationEncounterInfo(EncounterQueryInfo encounterInfo, CancellationToken cancellationToken = default)
+           => await DecisionSupportEncounters<Jazz.PatientPopulationEncounterInfo>(encounterInfo, cancellationToken);
+
+        public async Task<IEnumerable<IJazzExplorationEncounterInfo>> ExplorationEncounterInfo(long explorationId, Guid configurationGuid, CancellationToken cancellationToken = default)
+        {
            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v1/exploration-populations/{explorationId}/encounters?configurationGuid={configurationGuid}");
            return await _httpClient.SendAsync<IEnumerable<ExplorationEncounterInfo>>(request, cancellationToken);
+        }
+
+        public async Task<IExplorationPopulationInfo> GetExplorationPopulationById(long explorationId, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v1/exploration-populations/info/{explorationId}");
+            return await _httpClient.SendAsync<ExplorationPopulationInfo>(request, cancellationToken);
+        }
+
+#pragma warning disable S4457 // Split this method into two, one handling parameter check and the other handling the asynchronous code
+        private async Task<IEnumerable<T>> DecisionSupportEncounters<T>(EncounterQueryInfo encounterInfo, CancellationToken cancellationToken = default)
+#pragma warning restore S4457 // Split this method into two, one handling parameter check and the other handling the asynchronous code
+        {
            if (encounterInfo.EntityIDs == null || !encounterInfo.EntityIDs.Any())
            {
                throw new ArgumentNullException(nameof(encounterInfo));
            }
            return await DecisionSupportEncountersAsync<T>(encounterInfo, cancellationToken);
+        }
+
+        private async Task<IEnumerable<T>> DecisionSupportEncountersAsync<T>(EncounterQueryInfo encounterInfo, CancellationToken cancellationToken = default)
+        {
            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/encounters");
            await request.SetContentAsJsonAsync(encounterInfo, cancellationToken);
            return await _httpClient.SendAsync<IEnumerable<T>>(request, cancellationToken);
        }
+
+        public async Task<IEnumerable<EncounterCostInfo>> DecisionSupportEncounterCostInfo(EncounterCostQueryInfo encounterCostInfo, CancellationToken cancellationToken = default)
+        {
            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/encounters/cost-info");
            await request.SetContentAsJsonAsync(encounterCostInfo, cancellationToken);
            return await _httpClient.SendAsync<IEnumerable<EncounterCostInfo>>(request, cancellationToken);
        }
+
+        public async Task<IEnumerable<DepartmentEncounterUnitOfService>> DecisionSupportDepartmentEncounterUnitOfServiceInfo(DepartmentEncounterUnitOfServiceQueryInfo departmentEncounterUnitOfServiceQueryInfo, CancellationToken cancellationToken = default)
+        {
            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/encounters/department-unit-of-service-info");
            await request.SetContentAsJsonAsync(departmentEncounterUnitOfServiceQueryInfo, cancellationToken);
            return await _httpClient.SendAsync<IEnumerable<DepartmentEncounterUnitOfService>>(request, cancellationToken);
        }
+
+        public async Task<IEnumerable<EncounterUnitOfService>> DecisionSupportEncounterUnitOfServiceInfo(EncounterUnitOfServiceQueryInfo encounterUnitOfServiceQueryInfo, CancellationToken cancellationToken = default)
+        {
            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/encounters/unit-of-service-info");
            await request.SetContentAsJsonAsync(encounterUnitOfServiceQueryInfo, cancellationToken);
            return await _httpClient.SendAsync<IEnumerable<EncounterUnitOfService>>(request, cancellationToken);
+        }
+
+        public async Task<IEnumerable<VariationEncounterChargeInfo>> DecisionSupportVariationEncounterChargeInfo(VariationEncounterChargeQueryInfo variationEncounterChargeQueryInfo, CancellationToken cancellationToken = default)
+        {
            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/encounters/variation-encounter-charge-info");
            await request.SetContentAsJsonAsync(variationEncounterChargeQueryInfo, cancellationToken);
            return await _httpClient.SendAsync<IEnumerable<VariationEncounterChargeInfo>>(request, cancellationToken);
+        }
+
+        public async Task<IEnumerable<LOSOpportunityInfo>> DecisionSupportLOSOpportunityInfo(LOSOpportunityQueryInfo losOpportunityInfoqueryInfo, CancellationToken cancellationToken = default)
+        {
            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/encounters/los-opportunity-info");
            await request.SetContentAsJsonAsync(losOpportunityInfoqueryInfo, cancellationToken);
            return await _httpClient.SendAsync<IEnumerable<Jazz.LOSOpportunityInfo>>(request, cancellationToken);
+        }
+
+        public async Task<IEnumerable<EncounterChargeInfo>> DecisionSupportEncounterChargeInfo(EncounterChargeQueryInfo encounterChargeQueryInfo, CancellationToken cancellationToken = default)
+        {
            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/encounters/encounter-charge-info");
            await request.SetContentAsJsonAsync(encounterChargeQueryInfo, cancellationToken);
            return await _httpClient.SendAsync<IEnumerable<EncounterChargeInfo>>(request, cancellationToken);
+        }

+        #endregion
+
+        #region Opportunity Metric Cohort Data
+
+        public async Task<IEnumerable<OpportunityMetricCohortInfo>> ChargeCodeOpportunityMetricCohortInfo(OpportunityMetricCohortOptions options, CancellationToken cancellationToken)
        {
            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/charge-code-opportunities/opportunity-metric-cohort-data");
            await request.SetContentAsJsonAsync(options, cancellationToken);
            return await _httpClient.SendAsync<IEnumerable<OpportunityMetricCohortInfo>>(request, cancellationToken);
+        }
+
+        public async Task<IEnumerable<OpportunityMetricCohortInfo>> EncounterOpportunityMetricCohortInfo(OpportunityMetricCohortOptions options, CancellationToken cancellationToken)
        {
            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/encounter-opportunities/opportunity-metric-cohort-data");
            await request.SetContentAsJsonAsync(options, cancellationToken);
            return await _httpClient.SendAsync<IEnumerable<OpportunityMetricCohortInfo>>(request, cancellationToken);
+        }
+
+        #endregion
+
+        [Obsolete]
+        public async Task CreateChargeCodeOpportunityDetails(ChargeCodeDetailInfo detailInfo, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/charge-code-opportunity-details/create");
+            await request.SetContentAsJsonAsync(detailInfo, cancellationToken);
+            await _httpClient.SendAsync(request, cancellationToken);
+        }

+        #region Workbook Opportunity

+        public async Task<IEnumerable<WorkbookClientInfo>> GetAllWorkbooks(CancellationToken cancellationToken = default)
        {
            var request = new HttpRequestMessage(HttpMethod.Get, "api/v1/client-opportunity-workbooks/workbooks");
            return await _httpClient.SendAsync<IEnumerable<WorkbookClientInfo>>(request, cancellationToken);
        }

+        public async Task<IEnumerable<OpportunityWorkbookClientInfo>> GetOpportunityWorkbooks(Guid opportunityGuid, CancellationToken cancellationToken = default)
        {
            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v1/client-opportunity-workbooks/{opportunityGuid}");
            return await _httpClient.SendAsync<IEnumerable<OpportunityWorkbookClientInfo>>(request, cancellationToken);
        }

+        public async Task<IEnumerable<OpportunityTypeWorkbookClientInfo>> GetOpportunityTypeWorkbooks(int opportunityType, CancellationToken cancellationToken = default)
        {
            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v1/client-opportunity-type-workbooks/{opportunityType}");
            return await _httpClient.SendAsync<IEnumerable<OpportunityTypeWorkbookClientInfo>>(request, cancellationToken);
        }

+        public async Task<IEnumerable<OpportunityWorkbookClientInfo>> CreateOpportunityWorkbooks(IEnumerable<OpportunityWorkbookClientInfo> opportunityWorkbooks, CancellationToken cancellationToken = default)
        {
            var request = new HttpRequestMessage(HttpMethod.Post, "api/v1/client-opportunity-workbooks");
            await request.SetContentAsJsonAsync(opportunityWorkbooks, cancellationToken);
            return await _httpClient.SendAsync<IEnumerable<OpportunityWorkbookClientInfo>>(request, cancellationToken);
        }

+        public async Task<IEnumerable<OpportunityTypeWorkbookClientInfo>> CreateOpportunityTypeWorkbooks(IEnumerable<OpportunityTypeWorkbookClientInfo> opportunityTypeWorkbooks, CancellationToken cancellationToken = default)
        {
            var request = new HttpRequestMessage(HttpMethod.Post, "api/v1/client-opportunity-type-workbooks");
            await request.SetContentAsJsonAsync(opportunityTypeWorkbooks, cancellationToken);
            return await _httpClient.SendAsync<IEnumerable<OpportunityTypeWorkbookClientInfo>>(request, cancellationToken);
        }

+        public async Task<HttpResponseMessage> DeleteOpportunityWorkbook(Guid opportunityGuid, int workbookId, CancellationToken cancellationToken = default)
        {
            var request = new HttpRequestMessage(HttpMethod.Delete, $"api/v1/client-opportunity-workbooks/{opportunityGuid}/workbooks/{workbookId}");
+            return await _httpClient.SendAsync(request, cancellationToken);
        }

+        public async Task<HttpResponseMessage> DeleteOpportunityTypeWorkbook(int opportunityType, int workbookId, CancellationToken cancellationToken = default)
        {
            var request = new HttpRequestMessage(HttpMethod.Delete, $"api/v1/client-opportunity-type-workbooks/{opportunityType}/workbooks/{workbookId}");
            return await _httpClient.SendAsync(request, cancellationToken);
        }
+
+        #endregion
+
+        public async Task<string> RefreshChargeCodeOpportunityBaselineDetailsAsync(int strataId, Guid opportunityGuid, CancellationToken cancellationToken = default)
+        {
+            return await RefreshChargeCodeOpportunityDetailsAsync(strataId, opportunityGuid, "api/v1/charge-code-opportunity-details/refresh-baseline-details", cancellationToken);
+        }
+
+        public async Task<string> RefreshChargeCodeOpportunityTrackingDetailsAsync(int strataId, Guid opportunityGuid, CancellationToken cancellationToken = default)
+        {
+            return await RefreshChargeCodeOpportunityDetailsAsync(strataId, opportunityGuid, "api/v1/charge-code-opportunity-details/refresh-tracking-details", cancellationToken);
+        }
+
+        internal async Task<string> RefreshChargeCodeOpportunityDetailsAsync(int strataId, Guid opportunityGuid, string url, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Post, url);
+            var jobRequestInfo = new ChargeCodeOpportunityJobRequestInfo
+            {
+                StrataId = strataId,
+                OpportunityGuid = opportunityGuid
+            };
+            await request.SetContentAsJsonAsync(jobRequestInfo, cancellationToken);
+            return await _httpClient.SendAsync<string>(request, cancellationToken);
+        }
+
+
+        public async Task<string> GetBackgroundClientJobStatus(string jobId, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v1/background-client-job/{jobId}/status");
+            return await _httpClient.SendAsync<string>(request, cancellationToken);
+        }
+
+        public async Task<string> PopulateQviMetrics(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Post, $"api/v1/quality-variation-item-opportunities/populate-qvi-metrics?configurationGuid={configurationGuid}&isBaseline={isBaseline}");
+            return await _httpClient.SendAsync<string>(request, cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/ContinuousImprovementServiceCollectionExtension.cs b/src/Strata.ContinuousImprovement.Client/ContinuousImprovementServiceCollectionExtension.cs
new file mode 100644
index 0000000..05d55a8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/ContinuousImprovementServiceCollectionExtension.cs
@@ -0,0 +1,35 @@
+#if NETCOREAPP
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+
+namespace Strata.ContinuousImprovement.Client
+{
+    [ExcludeFromCodeCoverage]
+    public static class ContinuousImprovementServiceCollectionExtension
+    {
+        /// <summary>
+        /// Registers an instance of an <see cref="IContinuousImprovementService"/> to the given <see cref="IServiceCollection"/>
+        /// </summary>
+        /// <returns>An <see cref="IHttpClientBuilder"/> that can be used to configure the client.</returns>
+        public static IHttpClientBuilder AddContinuousImprovementService(this IServiceCollection services)
+        {
+            return services.AddHttpClientWithStrataHandlers<IContinuousImprovementService, ContinuousImprovementService>((provider, client) =>
+            {
+                var config = provider.GetService<IConfiguration>();
+
+                var endpoint = config.GetValue<string>("endPoints:continuousimprovement");
+                if (string.IsNullOrWhiteSpace(endpoint))
+                {
+                    throw new InvalidOperationException(
+                        "Endpoint for the Continuous Improvement service was not found in the configuration with the key of 'endPoints:continuousimprovement'");
+                }
+
+                client.BaseAddress = new Uri(endpoint);
+            });
+        }
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Client/IContinuousImprovementService.cs b/src/Strata.ContinuousImprovement.Client/IContinuousImprovementService.cs
new file mode 100644
index 0000000..bbe7577
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/IContinuousImprovementService.cs
@@ -0,0 +1,45 @@
+using Strata.DecisionSupport.Models.Encounters;
+using Strata.DecisionSupport.Models.Jazz;
+using Strata.DecisionSupport.Models.Queries;
+using Jazz = Strata.DecisionSupport.Models.Jazz;
+
+namespace Strata.ContinuousImprovement.Client
+{
+    public partial interface IContinuousImprovementService
+    {
+        Task DeleteOpportunityLink(Guid databaseGuid, Guid configurationGuid, Guid opportunityGuid, CancellationToken cancellationToken);
+        Task DeleteInitiativeLink(Guid databaseGuid, Guid configurationGuid, Guid initiativeGuid, CancellationToken cancellationToken);
+        Task<ClientNetworkOpportunityResultDto> RolloverOpportunity(RolloverOpportunityInfo rolloverOpportunityInfo, CancellationToken cancellationToken);
+        Task<ClientNetworkOpportunityResultDto> RolloverOpportunityLink(Guid databaseGuid,
+            Guid sourceConfigurationGuid, Guid sourceOpportunityGuid,
+            Guid rolloverConfigurationGuid, Guid rolloverOpportunityGuid, Guid rolloverInitiativeGuid, CancellationToken cancellationToken);
+        [Obsolete]
+        Task CreateChargeCodeOpportunityDetails(ChargeCodeDetailInfo detailInfo, CancellationToken cancellationToken);
+
+        Task<IEnumerable<Jazz.MSDRGEncounterInfo>> DecisionSupportMsdrgEncounterInfo(EncounterQueryInfo encounterInfo, CancellationToken cancellationToken = default);
+        Task<IEnumerable<Jazz.APRDRGEncounterInfo>> DecisionSupportAprdrgEncounterInfo(EncounterQueryInfo encounterInfo, CancellationToken cancellationToken = default);
+        Task<IEnumerable<Jazz.CPTCodeEncounterInfo>> DecisionSupportCptCodeEncounterInfo(EncounterQueryInfo encounterInfo, CancellationToken cancellationToken = default);
+        Task<IEnumerable<Jazz.PatientPopulationEncounterInfo>> DecisionSupportPatientPopulationEncounterInfo(EncounterQueryInfo encounterInfo, CancellationToken cancellationToken = default);
+        Task<IEnumerable<EncounterCostInfo>> DecisionSupportEncounterCostInfo(EncounterCostQueryInfo encounterCostInfo, CancellationToken cancellationToken = default);
+        Task<IEnumerable<DepartmentEncounterUnitOfService>> DecisionSupportDepartmentEncounterUnitOfServiceInfo(DepartmentEncounterUnitOfServiceQueryInfo departmentEncounterUnitOfServiceQueryInfo, CancellationToken cancellationToken = default);
+        Task<IEnumerable<EncounterUnitOfService>> DecisionSupportEncounterUnitOfServiceInfo(EncounterUnitOfServiceQueryInfo enounterUnitOfServiceQueryInfo, CancellationToken cancellationToken = default);
+        Task<IEnumerable<VariationEncounterChargeInfo>> DecisionSupportVariationEncounterChargeInfo(VariationEncounterChargeQueryInfo variationEncounterChargeQueryInfo, CancellationToken cancellationToken = default);
+        Task<IEnumerable<EncounterChargeInfo>> DecisionSupportEncounterChargeInfo(EncounterChargeQueryInfo encounterChargeQueryInfo, CancellationToken cancellationToken = default);
+        Task<IEnumerable<Jazz.LOSOpportunityInfo>> DecisionSupportLOSOpportunityInfo(LOSOpportunityQueryInfo losOpportunityInfoqueryInfo, CancellationToken cancellationToken = default);
+        Task<IEnumerable<IJazzExplorationEncounterInfo>> ExplorationEncounterInfo(long explorationId, Guid configurationGuid, CancellationToken cancellationToken = default);
+        Task<IExplorationPopulationInfo> GetExplorationPopulationById(long explorationId, CancellationToken cancellationToken = default);
+        Task<IEnumerable<WorkbookClientInfo>> GetAllWorkbooks(CancellationToken cancellationToken = default);
+        Task<IEnumerable<OpportunityWorkbookClientInfo>> GetOpportunityWorkbooks(Guid opportunityGuid, CancellationToken cancellationToken = default);
+        Task<IEnumerable<OpportunityTypeWorkbookClientInfo>> GetOpportunityTypeWorkbooks(int opportunityType, CancellationToken cancellationToken = default);
+        Task<IEnumerable<OpportunityWorkbookClientInfo>> CreateOpportunityWorkbooks(IEnumerable<OpportunityWorkbookClientInfo> opportunityWorkbooks, CancellationToken cancellationToken = default);
+        Task<IEnumerable<OpportunityTypeWorkbookClientInfo>> CreateOpportunityTypeWorkbooks(IEnumerable<OpportunityTypeWorkbookClientInfo> opportunityTypeWorkbooks, CancellationToken cancellationToken = default);
+        Task<HttpResponseMessage> DeleteOpportunityWorkbook(Guid opportunityGuid, int workbookId, CancellationToken cancellationToken = default);
+        Task<HttpResponseMessage> DeleteOpportunityTypeWorkbook(int opportunityType, int workbookId, CancellationToken cancellationToken = default);
+        Task<IEnumerable<OpportunityMetricCohortInfo>> ChargeCodeOpportunityMetricCohortInfo(OpportunityMetricCohortOptions options, CancellationToken cancellationToken);
+        Task<IEnumerable<OpportunityMetricCohortInfo>> EncounterOpportunityMetricCohortInfo(OpportunityMetricCohortOptions options, CancellationToken cancellationToken);
+        Task<string> RefreshChargeCodeOpportunityBaselineDetailsAsync(int strataId, Guid opportunityGuid, CancellationToken cancellationToken = default);
+        Task<string> RefreshChargeCodeOpportunityTrackingDetailsAsync(int strataId, Guid opportunityGuid, CancellationToken cancellationToken = default);
+        Task<string> GetBackgroundClientJobStatus(string jobId, CancellationToken cancellationToken = default);
+        Task<string> PopulateQviMetrics(Guid configurationGuid, bool isBaseline, CancellationToken cancellationToken = default);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Client/IOpportunityMetricBase.cs b/src/Strata.ContinuousImprovement.Client/IOpportunityMetricBase.cs
new file mode 100644
index 0000000..26c6ac0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/IOpportunityMetricBase.cs
@@ -0,0 +1,26 @@
+namespace Strata.ContinuousImprovement.Client
+{
+    public interface IOpportunityMetricBase
+    {
+        int EncounterGroup { get; }
+        IEnumerable<int> CaseTypeIds { get; }
+        IEnumerable<int> PatientPopulationIds { get; }
+        IEnumerable<int> ChargeCodeIds { get; }
+        string OpportunityLevel { get; set; }
+        bool IsBaseline { get; set; }
+        IEnumerable<int> OpportunityLevelIds { get; }
+        string OpportunityLevelIdAsCSV { get; }
+        OpportunityLevel OpportunityLevelEnum { get; }
+
+    }
+
+    public enum OpportunityLevel
+    {
+        Organization,
+        Entity,
+        ServiceLine,
+        Specialty,
+        Provider
+    }
+
+}
diff --git a/src/Strata.ContinuousImprovement.Client/IQualityVariationService.cs b/src/Strata.ContinuousImprovement.Client/IQualityVariationService.cs
new file mode 100644
index 0000000..7250a26
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/IQualityVariationService.cs
@@ -0,0 +1,14 @@
+using Strata.ContinuousImprovement.Client.Models.Qvi;
+
+namespace Strata.ContinuousImprovement.Client
+{
+    public partial interface IContinuousImprovementService
+    {
+        Task<IEnumerable<NonQviCaseTypeFamilyInfo>> GetNonQviCaseTypeFamilies(Guid configurationGuid, bool isBaseline = false, CancellationToken cancellationToken = default);
+        Task<IEnumerable<NonQviDrgTypeInfo>> GetNonQviDrgTypes(Guid configurationGuid, bool isBaseline = false, CancellationToken cancellationToken = default);
+        Task<IEnumerable<QviLineItemCaseTypeFamilyInfo>> GetQviLineItemCaseTypeFamilies(Guid configurationGuid, bool isBaseline = false, CancellationToken cancellationToken = default);
+        Task<IEnumerable<QviLineItemDrgTypeInfo>> GetQviLineItemDrgTypes(Guid configurationGuid, bool isBaseline = false, CancellationToken cancellationToken = default);
+        Task<IEnumerable<QviLineItemEncounterSavingInfo>> GetQviLineItemEncounterSavings(Guid configurationGuid, Guid? opportunityGuid = null, bool? isBaseline = null, CancellationToken cancellationToken = default);
+        Task<IEnumerable<QviEncounterInfo>> GetQviEncounters(Guid configurationGuid, DateTime startDate, DateTime endDate, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/IUtilizationVarianceService.cs b/src/Strata.ContinuousImprovement.Client/IUtilizationVarianceService.cs
new file mode 100644
index 0000000..af84bcc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/IUtilizationVarianceService.cs
@@ -0,0 +1,11 @@
+using Strata.DecisionSupport.Models.Jazz;
+using Strata.DecisionSupport.Models.Queries;
+
+namespace Strata.ContinuousImprovement.Client
+{
+    public partial interface IContinuousImprovementService
+    {
+        Task<IEnumerable<AllChargeInfo>> AllChargeInfo(AllChargeQueryInfo allChargeQueryInfo, CancellationToken cancellationToken = default);
+        Task<IEnumerable<ChargeInfo>> ChargeInfo(ChargeQueryInfo chargeQueryInfo, CancellationToken cancellationToken = default);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Client/Models/Qvi/NonQviCaseTypeFamilyInfo.cs b/src/Strata.ContinuousImprovement.Client/Models/Qvi/NonQviCaseTypeFamilyInfo.cs
new file mode 100644
index 0000000..316e9c4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/Models/Qvi/NonQviCaseTypeFamilyInfo.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Client.Models.Qvi
+{
+    public class NonQviCaseTypeFamilyInfo
+    {
+        public int CaseTypeFamilyId { get; set; }
+        public decimal MedianVariableDirectCostPerCase { get; set; }
+        public int CaseCount { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/Models/Qvi/NonQviDrgTypeInfo.cs b/src/Strata.ContinuousImprovement.Client/Models/Qvi/NonQviDrgTypeInfo.cs
new file mode 100644
index 0000000..1101e8c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/Models/Qvi/NonQviDrgTypeInfo.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Client.Models.Qvi
+{
+    public class NonQviDrgTypeInfo
+    {
+        public string DrgType { get; set; }
+        public decimal MedianVariableDirectCostPerCase { get; set; }
+        public int CaseCount { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/Models/Qvi/QviEncounterInfo.cs b/src/Strata.ContinuousImprovement.Client/Models/Qvi/QviEncounterInfo.cs
new file mode 100644
index 0000000..afe185d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/Models/Qvi/QviEncounterInfo.cs
@@ -0,0 +1,19 @@
+namespace Strata.ContinuousImprovement.Client.Models.Qvi
+{
+    public class QviEncounterInfo
+    {
+        public long EncounterId { get; set; }
+        public string EncounterRecordNumber { get; set; }
+        public string DrgType { get; set; }
+        public decimal VariableDirectCost { get; set; }
+        public int LengthOfStay { get; set; }
+        public decimal NetRevenue { get; set; }
+        public int CaseTypeFamilyId { get; set; }
+        public int EntityId { get; set; }
+        public string Entity { get; set; }
+        public int PhysicianSpecialtyId { get; set; }
+        public string PhysicianSpecialty { get; set; }
+        public int ServiceLineId { get; set; }
+        public string ServiceLine { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/Models/Qvi/QviLineItemCaseTypeFamilyInfo.cs b/src/Strata.ContinuousImprovement.Client/Models/Qvi/QviLineItemCaseTypeFamilyInfo.cs
new file mode 100644
index 0000000..96037c1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/Models/Qvi/QviLineItemCaseTypeFamilyInfo.cs
@@ -0,0 +1,10 @@
+namespace Strata.ContinuousImprovement.Client.Models.Qvi
+{
+    public class QviLineItemCaseTypeFamilyInfo
+    {
+        public int QualityVariationEventId { get; set; }
+        public int CaseTypeFamilyId { get; set; }
+        public decimal MedianVariableDirectCostPerCase { get; set; }
+        public int CaseCount { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/Models/Qvi/QviLineItemDrgTypeInfo.cs b/src/Strata.ContinuousImprovement.Client/Models/Qvi/QviLineItemDrgTypeInfo.cs
new file mode 100644
index 0000000..9882f25
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/Models/Qvi/QviLineItemDrgTypeInfo.cs
@@ -0,0 +1,10 @@
+namespace Strata.ContinuousImprovement.Client.Models.Qvi
+{
+    public class QviLineItemDrgTypeInfo
+    {
+        public int QualityVariationEventId { get; set; }
+        public string DrgType { get; set; }
+        public decimal MedianVariableDirectCostPerCase { get; set; }
+        public int CaseCount { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/Models/Qvi/QviLineItemEncounterSavingInfo.cs b/src/Strata.ContinuousImprovement.Client/Models/Qvi/QviLineItemEncounterSavingInfo.cs
new file mode 100644
index 0000000..e5ac5bd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/Models/Qvi/QviLineItemEncounterSavingInfo.cs
@@ -0,0 +1,30 @@
+namespace Strata.ContinuousImprovement.Client.Models.Qvi
+{
+    public class QviLineItemEncounterSavingInfo
+    {
+        public string EncounterRecordNumber { get; set; }
+        public decimal Savings { get; set; }
+        public bool IsBaseline { get; set; }
+        public int PhysicianId { get; set; }
+        public string PhysicianName { get; set; }
+        public int PhysicianSpecialtyId { get; set; }
+        public string PhysicianSpecialty { get; set; }
+        public int EntityId { get; set; }
+        public string Entity { get; set; }
+        public int FinancialClassId { get; set; }
+        public int PayorId { get; set; }
+        public int ContractGroupingId { get; set; }
+        public int PayorGroupId { get; set; }
+        public int InsurancePlanId { get; set; }
+        public decimal NetRevenue { get; set; }
+        public int LengthOfStay { get; set; }
+        public decimal PesVariableDirectCost { get; set; }
+        public decimal TotalCost { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+        public int CaseTypeFamilyId { get; set; }
+        public decimal VariableDirectCost { get; set; }
+        public string ServiceLine { get; set; }
+        public int ServiceLineId { get; set; }
+        public string CaseTypeFamily { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/OpportunityMetricBase.cs b/src/Strata.ContinuousImprovement.Client/OpportunityMetricBase.cs
new file mode 100644
index 0000000..f4ecdd5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/OpportunityMetricBase.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Client
+{
+    public class OpportunityMetricBase : IOpportunityMetricBase
+    {
+        public int EncounterGroup { get; set; }
+
+        public IEnumerable<int> CaseTypeIds { get; set; }
+
+        public IEnumerable<int> PatientPopulationIds { get; set; }
+
+        public IEnumerable<int> ChargeCodeIds { get; set; }
+
+        public string OpportunityLevel { get; set; }
+        public bool IsBaseline { get; set; }
+
+        public IEnumerable<int> OpportunityLevelIds { get; set; }
+
+        public string OpportunityLevelIdAsCSV { get; set; }
+
+        public OpportunityLevel OpportunityLevelEnum { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/OpportunityMetricCohortInfo.cs b/src/Strata.ContinuousImprovement.Client/OpportunityMetricCohortInfo.cs
new file mode 100644
index 0000000..58cbd2d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/OpportunityMetricCohortInfo.cs
@@ -0,0 +1,16 @@
+namespace Strata.ContinuousImprovement.Client
+{
+    public class OpportunityMetricCohortInfo
+    {
+        public int LevelID { get; set; }
+        public string Name { get; set; }
+        public int Month { get; set; }
+        public int Volume { get; set; }
+        public decimal Revenue { get; set; }
+        public decimal Cost { get; set; }
+        public decimal Margin { get; set; }
+        public decimal RevenuePerCase { get; set; }
+        public decimal CostPerCase { get; set; }
+        public bool IsBaseline { get; set; }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/OpportunityMetricCohortOptions.cs b/src/Strata.ContinuousImprovement.Client/OpportunityMetricCohortOptions.cs
new file mode 100644
index 0000000..55e356f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/OpportunityMetricCohortOptions.cs
@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Strata.ContinuousImprovement.Client
+{
+    public class OpportunityMetricCohortOptions
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public OpportunityMetricBase Data { get; set; }
+        public string InnerJoin { get; set; } = string.Empty;
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/QualityVariationService.cs b/src/Strata.ContinuousImprovement.Client/QualityVariationService.cs
new file mode 100644
index 0000000..b1d770e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/QualityVariationService.cs
@@ -0,0 +1,47 @@
+using Strata.ApiCommunication.Http;
+using Strata.ContinuousImprovement.Client.Models.Qvi;
+
+namespace Strata.ContinuousImprovement.Client
+{
+    public partial class ContinuousImprovementService : IContinuousImprovementService
+    {
+        public async Task<IEnumerable<NonQviCaseTypeFamilyInfo>> GetNonQviCaseTypeFamilies(Guid configurationGuid, bool isBaseline = false, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v1/quality-variation-savings/non-qvi/case-type-families?configurationGuid={configurationGuid}&isBaseline={isBaseline}");
+            return await _httpClient.SendAsync<IEnumerable<NonQviCaseTypeFamilyInfo>>(request, cancellationToken);
+        }
+
+        public async Task<IEnumerable<NonQviDrgTypeInfo>> GetNonQviDrgTypes(Guid configurationGuid, bool isBaseline = false, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v1/quality-variation-savings/non-qvi/drg-types?configurationGuid={configurationGuid}&isBaseline={isBaseline}");
+            return await _httpClient.SendAsync<IEnumerable<NonQviDrgTypeInfo>>(request, cancellationToken);
+        }
+
+        public async Task<IEnumerable<QviLineItemCaseTypeFamilyInfo>> GetQviLineItemCaseTypeFamilies(Guid configurationGuid, bool isBaseline = false, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v1/quality-variation-savings/line-items/case-type-families?configurationGuid={configurationGuid}&isBaseline={isBaseline}");
+            return await _httpClient.SendAsync<IEnumerable<QviLineItemCaseTypeFamilyInfo>>(request, cancellationToken);
+        }
+
+        public async Task<IEnumerable<QviLineItemDrgTypeInfo>> GetQviLineItemDrgTypes(Guid configurationGuid, bool isBaseline = false, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v1/quality-variation-savings/line-items/drg-types?configurationGuid={configurationGuid}&isBaseline={isBaseline}");
+            return await _httpClient.SendAsync<IEnumerable<QviLineItemDrgTypeInfo>>(request, cancellationToken);
+        }
+
+        public async Task<IEnumerable<QviLineItemEncounterSavingInfo>> GetQviLineItemEncounterSavings(Guid configurationGuid, Guid? opportunityGuid = null, bool? isBaseline = null, CancellationToken cancellationToken = default)
+        {
+            var url = $"api/v1/quality-variation-savings/line-items/encounter-savings?configurationGuid={configurationGuid}";
+            if (opportunityGuid.HasValue) url += $"&opportunityGuid={opportunityGuid.Value}";
+            if (isBaseline.HasValue) url += $"&isBaseline={isBaseline.Value}";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            return await _httpClient.SendAsync<IEnumerable<QviLineItemEncounterSavingInfo>>(request, cancellationToken);
+        }
+
+        public async Task<IEnumerable<QviEncounterInfo>> GetQviEncounters(Guid configurationGuid, DateTime startDate, DateTime endDate, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, $"api/v1/quality-variation-encounters?configurationGuid={configurationGuid}&startDate={startDate:yyyy-MM-dd}&endDate={endDate:yyyy-MM-dd}");
+            return await _httpClient.SendAsync<IEnumerable<QviEncounterInfo>>(request, cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/RolloverOpportunityInfo.cs b/src/Strata.ContinuousImprovement.Client/RolloverOpportunityInfo.cs
new file mode 100644
index 0000000..992480b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/RolloverOpportunityInfo.cs
@@ -0,0 +1,24 @@
+namespace Strata.ContinuousImprovement.Client
+{
+    public class RolloverOpportunityInfo
+    {
+        public Guid? DatabaseGuid { get; set; }
+        public Guid SourceConfigurationGuid { get; set; }
+        public Guid SourceOpportunityGuid { get; set; }
+        public Guid RolloverConfigurationGuid { get; set; }
+        public Guid RolloverOpportunityGuid { get; set; }
+        public Guid RolloverInitiativeGuid { get; set; }
+
+        public RolloverOpportunityInfo() { }
+
+        public RolloverOpportunityInfo(Guid? databaseGuid, Guid sourceConfigurationGuid, Guid sourceOpportunityGuid, Guid rolloverConfigurationGuid, Guid rolloverOpportunityGuid, Guid rolloverInitiativeGuid)
+        {
+            DatabaseGuid = databaseGuid;
+            SourceConfigurationGuid = sourceConfigurationGuid;
+            SourceOpportunityGuid = sourceOpportunityGuid;
+            RolloverConfigurationGuid = rolloverConfigurationGuid;
+            RolloverOpportunityGuid = rolloverOpportunityGuid;
+            RolloverInitiativeGuid = rolloverInitiativeGuid;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Client/Strata.ContinuousImprovement.Client.csproj b/src/Strata.ContinuousImprovement.Client/Strata.ContinuousImprovement.Client.csproj
new file mode 100644
index 0000000..f3a6189
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/Strata.ContinuousImprovement.Client.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>10.0</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="ConfigurationInfo.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.1" />
+    <PackageReference Include="Strata.ApiCommunication.Http" Version="7.0.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Strata.DecisionSupport.Models\Strata.DecisionSupport.Models.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Strata.ContinuousImprovement.Client/UtilizationVariationService.cs b/src/Strata.ContinuousImprovement.Client/UtilizationVariationService.cs
new file mode 100644
index 0000000..bb97dd9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/UtilizationVariationService.cs
@@ -0,0 +1,23 @@
+using Strata.ApiCommunication.Http;
+using Strata.DecisionSupport.Models.Jazz;
+using Strata.DecisionSupport.Models.Queries;
+
+namespace Strata.ContinuousImprovement.Client
+{
+    public partial class ContinuousImprovementService : IContinuousImprovementService
+    {
+        public async Task<IEnumerable<AllChargeInfo>> AllChargeInfo(AllChargeQueryInfo allChargeQueryInfo, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Post, $"/api/v1/utilization-variation/all-charge-info");
+            await request.SetContentAsJsonAsync(allChargeQueryInfo, cancellationToken);
+            return await _httpClient.SendAsync<IEnumerable<AllChargeInfo>>(request, cancellationToken);
+        }
+
+        public async Task<IEnumerable<ChargeInfo>> ChargeInfo(ChargeQueryInfo chargeQueryInfo, CancellationToken cancellationToken = default)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Post, $"/api/v1/utilization-variation/charge-info");
+            await request.SetContentAsJsonAsync(chargeQueryInfo, cancellationToken);
+            return await _httpClient.SendAsync<IEnumerable<ChargeInfo>>(request, cancellationToken);
+        }
+    }
+}
diff --git a/src/Strata.ContinuousImprovement.Client/runtimeconfig.template.json b/src/Strata.ContinuousImprovement.Client/runtimeconfig.template.json
new file mode 100644
index 0000000..9cbaf60
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Client/runtimeconfig.template.json
@@ -0,0 +1,5 @@
+{
+  "configProperties": {
+    "System.Drawing.EnableUnixSupport":  true
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Dashboard/Program.cs b/src/Strata.ContinuousImprovement.Dashboard/Program.cs
new file mode 100644
index 0000000..68e0999
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Dashboard/Program.cs
@@ -0,0 +1,24 @@
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Strata.ContinuousImprovement.Biz.Configurations;
+
+namespace Strata.ContinuousImprovement.Dashboard
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            CreateHostBuilder(args).Build().Run();
+        }
+
+        public static IWebHostBuilder CreateHostBuilder(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddStrataHangfire()
+                            .AddContinuousImprovementServices(hostContext.Configuration);
+                })
+                .UseStartup<Startup>();
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Dashboard/Properties/launchSettings.json b/src/Strata.ContinuousImprovement.Dashboard/Properties/launchSettings.json
new file mode 100644
index 0000000..7b0105d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Dashboard/Properties/launchSettings.json
@@ -0,0 +1,30 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:49534",
+      "sslPort": 44369
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "Hangfire__RunLocally": "true",
+        "AWS_S3_US_EAST_1_REGIONAL_ENDPOINT": "regional",
+        "AWS_Profile": "sdt-continuous-improvement-service-role",
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Strata.ContinuousImprovement.Dashboard": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Dashboard/Startup.cs b/src/Strata.ContinuousImprovement.Dashboard/Startup.cs
new file mode 100644
index 0000000..4255fbb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Dashboard/Startup.cs
@@ -0,0 +1,37 @@
+using Hangfire;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
+using Strata.Hangfire.AspNetCore.Filters.Dashboard;
+
+namespace Strata.ContinuousImprovement.Dashboard
+{
+    public class Startup
+    {
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        // ReSharper disable once UnusedMember.Global
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        {
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
+            var pathMatch = "/dashboard";
+
+#if DEBUG
+            pathMatch = string.Empty;
+#endif
+
+            app.UseHangfireDashboard(pathMatch, new DashboardOptions
+            {
+                Authorization = new[] { new AllowAnyoneDashboardAuthorizationFilter() }
+            });
+
+            app.UseRouting();
+        }
+    }
+
+   
+}
+
diff --git a/src/Strata.ContinuousImprovement.Dashboard/Strata.ContinuousImprovement.Dashboard.csproj b/src/Strata.ContinuousImprovement.Dashboard/Strata.ContinuousImprovement.Dashboard.csproj
new file mode 100644
index 0000000..b1eac17
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Dashboard/Strata.ContinuousImprovement.Dashboard.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Authors>Strata Decision Technology</Authors>
+    <Copyright>Copyright © Strata Decision Technology 2023</Copyright>
+    <Description>Hangfire dashboard for Continuous Improvement Service</Description>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Strata.Hangfire.AspNetCore" Version="5.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Strata.ContinuousImprovement.Biz\Strata.ContinuousImprovement.Biz.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Strata.ContinuousImprovement.Dashboard/appsettings.Development.json b/src/Strata.ContinuousImprovement.Dashboard/appsettings.Development.json
new file mode 100644
index 0000000..b02fb38
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Dashboard/appsettings.Development.json
@@ -0,0 +1,16 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+
+  "configuration": {
+    "basicAuthUsername": "BkQsRDdmdjkFNhKVuTI.TpujQJXuKhGDcV.F_hjADMRTaEUWMJnviaesoOrhhfnz",
+    "basicAuthPassword": "GWPIIWECDqh.hjDNdpxVEfeFe-bYFwPSx-oBGFD_od_SUQVk-QqTIkZY_NXMeqeo"
+  },
+
+  "StrataConfigServerBaseUrl": "https://configuration.dev.stratanetwork.net"
+}
diff --git a/src/Strata.ContinuousImprovement.Dashboard/appsettings.json b/src/Strata.ContinuousImprovement.Dashboard/appsettings.json
new file mode 100644
index 0000000..733f852
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Dashboard/appsettings.json
@@ -0,0 +1,16 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+
+  "Snowflake": {
+    "Url": "https://stratadev.us-east-1.privatelink.snowflakecomputing.com",
+    "Account": "stratadev"
+  },
+
+  "AllowedHosts": "*"
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Dashboard/runtimeconfig.template.json b/src/Strata.ContinuousImprovement.Dashboard/runtimeconfig.template.json
new file mode 100644
index 0000000..9cbaf60
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Dashboard/runtimeconfig.template.json
@@ -0,0 +1,5 @@
+{
+  "configProperties": {
+    "System.Drawing.EnableUnixSupport":  true
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Service/Program.cs b/src/Strata.ContinuousImprovement.Service/Program.cs
new file mode 100644
index 0000000..1df5078
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Service/Program.cs
@@ -0,0 +1,62 @@
+using Hangfire;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Strata.Configuration.Client.DependencyInjection;
+using Strata.ContinuousImprovement.Biz.Configurations;
+using Strata.ContinuousImprovement.Biz.Hubs;
+using Strata.Hangfire.Configuration;
+using Strata.Logging.DependencyInjection;
+using Strata.SignalR.Configuration;
+using System;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.AutoMapper
+{
+    public class Program
+    {
+        public static async Task Main(string[] args)
+        {
+            var host = Host.CreateDefaultBuilder()
+                .ConfigureLogging(x => x.AddConsole().SetMinimumLevel(LogLevel.Information))
+                .UseWindowsService()
+                .UseStrataConfiguration()
+                .UseStrataLogging()
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.Configure<HostOptions>(option => { option.ShutdownTimeout = TimeSpan.FromSeconds(60); })
+                        .AddStrataHangfire()
+                        .AddStrataSignalR()
+                        .AddContinuousImprovementServices(hostContext.Configuration)
+
+                        .AddHangfireServer(options =>
+                        {
+                            options.StopTimeout = TimeSpan.FromSeconds(15);
+                            options.ShutdownTimeout = TimeSpan.FromSeconds(30);
+                            options.ServerTimeout = TimeSpan.FromMinutes(5);
+                            options.Queues = new[] { "default" };
+
+                        })
+                        .AddHangfireServer(options =>
+                        {
+                            options.WorkerCount = 25;
+                            options.StopTimeout = TimeSpan.FromSeconds(15);
+                            options.ShutdownTimeout = TimeSpan.FromSeconds(30);
+                            options.ServerTimeout = TimeSpan.FromMinutes(5);
+                            options.Queues = new[] { "continuousimprovement-standards" };
+
+                        })
+                        .AddHostedService<ContinuousImprovementBootstrapperService>();
+
+                    services.Configure<HangfireOptions>(options =>
+                    {
+                        options.Configure((provider, configuration) => configuration.UseFilter<NotifyJobFilter>(provider));
+                    });
+
+                })
+                .Build();
+
+            await host.RunAsync();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Service/Properties/launchSettings.json b/src/Strata.ContinuousImprovement.Service/Properties/launchSettings.json
new file mode 100644
index 0000000..1d99bfe
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Service/Properties/launchSettings.json
@@ -0,0 +1,13 @@
+{
+  "profiles": {
+    "Strata.ContinuousImprovement.Service": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "Hangfire__RunLocally": "true",
+        "DOTNET_ENVIRONMENT": "Development",
+        "AWS_S3_US_EAST_1_REGIONAL_ENDPOINT": "regional",
+        "AWS_Profile": "sdt-continuous-improvement-service-role"
+      }
+    }
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Service/Strata.ContinuousImprovement.Service.csproj b/src/Strata.ContinuousImprovement.Service/Strata.ContinuousImprovement.Service.csproj
new file mode 100644
index 0000000..37086b3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Service/Strata.ContinuousImprovement.Service.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk.Worker">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <UserSecretsId>dotnet-Strata.Replication.Service-3BECFA0B-EDE2-4517-AB7C-6544CAFB731B</UserSecretsId>
+    <Authors>Strata Decision Technology</Authors>
+    <Company>Strata Decision Technology</Company>
+    <Description>Continuous Improvement Service</Description>
+    <Copyright>Copyright © Strata Decision Technology 2023</Copyright>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
+    <PackageReference Include="RestSharp" Version="112.1.0" />
+    <PackageReference Include="Strata.Configuration.Client" Version="9.15.1" />
+    <PackageReference Include="Strata.Hangfire.NetCore" Version="5.3.0" />
+    <PackageReference Include="Strata.Licenses.Client" Version="1.2.0" />
+    <PackageReference Include="Strata.Logging" Version="4.1.1" />
+    <PackageReference Include="Strata.SignalR" Version="2.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Strata.ContinuousImprovement.Biz\Strata.ContinuousImprovement.Biz.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/Strata.ContinuousImprovement.Service/appsettings.Development.json b/src/Strata.ContinuousImprovement.Service/appsettings.Development.json
new file mode 100644
index 0000000..f50f253
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Service/appsettings.Development.json
@@ -0,0 +1,47 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+
+  "configuration": {
+    "basicAuthUsername": "BkQsRDdmdjkFNhKVuTI.TpujQJXuKhGDcV.F_hjADMRTaEUWMJnviaesoOrhhfnz",
+    "basicAuthPassword": "GWPIIWECDqh.hjDNdpxVEfeFe-bYFwPSx-oBGFD_od_SUQVk-QqTIkZY_NXMeqeo"
+  },
+
+  "StrataConfigServerBaseUrl": "https://configuration.dev.stratanetwork.net",
+
+  "strataApi": {
+    "clientSecret": "V_okTrkWYBs-PqMP.inbJShIvMGWcpdqCDq_ZjntVF.ydgRCoYaDVJYEWEIdsjJ_"
+  },
+  "gmdnFTP": {
+    "ftpHostUrl": "ftp.gmdnagency.org",
+    "termUser": {
+      "userName": "user49",
+      "password": "6sdt!@yUyfXpamX5"
+    },
+    "categoryUser": {
+      "userName": "userC1030",
+      "password": "TtTmiH96yzbMqh"
+    }
+  },
+  "databases": {
+    "databaseRegex": "^D[\\d]{4}-sql-[\\d]{2}\\.sdt\\.local$"
+  },
+  "QueryRecursion": {
+    "CCOpportunityDetailQuery": {
+      "Start": 1,
+      "End": 30,
+      "Increment": 5
+    }
+  },
+  "MailGun": {
+    "ApiKey": "",
+    "BaseUrl": "https://api.mailgun.net/v3/",
+    "Domain": "notifications-dev.stratanetwork.com",
+    "FromEmailAddress": "noreply@notifications-dev.stratanetwork.com"
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Service/appsettings.QA.json b/src/Strata.ContinuousImprovement.Service/appsettings.QA.json
new file mode 100644
index 0000000..8983e0f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Service/appsettings.QA.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Service/appsettings.json b/src/Strata.ContinuousImprovement.Service/appsettings.json
new file mode 100644
index 0000000..456e746
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Service/appsettings.json
@@ -0,0 +1,18 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "endpoints": {
+    "dataschema": "https://dataschema-api.dev.stratanetwork.net/",
+    "schema": "https://schema-api.dev.stratanetwork.net",
+    "analytics": "https://analytics-api.dev.stratanetwork.net"
+  },
+  "Snowflake": {
+    "Url": "https://stratadev.us-east-1.privatelink.snowflakecomputing.com",
+    "Account": "stratadev"
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Service/runtimeconfig.template.json b/src/Strata.ContinuousImprovement.Service/runtimeconfig.template.json
new file mode 100644
index 0000000..9cbaf60
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Service/runtimeconfig.template.json
@@ -0,0 +1,5 @@
+{
+  "configProperties": {
+    "System.Drawing.EnableUnixSupport":  true
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/Strata.ContinuousImprovement.Web.csproj b/src/Strata.ContinuousImprovement.Web/Strata.ContinuousImprovement.Web.csproj
new file mode 100644
index 0000000..0f9305c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/Strata.ContinuousImprovement.Web.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <CodeAnalysisRuleSet></CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="e2e\tests\" />
+    <Folder Include="e2e\pages\" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Strata.ContinuousImprovement.Web/Strata.ContinuousImprovement.Web.sln b/src/Strata.ContinuousImprovement.Web/Strata.ContinuousImprovement.Web.sln
new file mode 100644
index 0000000..fe987ce
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/Strata.ContinuousImprovement.Web.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.2.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Strata.ContinuousImprovement.Web", "Strata.ContinuousImprovement.Web.csproj", "{14AB6776-4DB2-2C3E-B6C8-4649A72F6DA4}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{14AB6776-4DB2-2C3E-B6C8-4649A72F6DA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14AB6776-4DB2-2C3E-B6C8-4649A72F6DA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14AB6776-4DB2-2C3E-B6C8-4649A72F6DA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14AB6776-4DB2-2C3E-B6C8-4649A72F6DA4}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0C56B17D-050B-455A-BC2B-83D595DFC0BE}
+	EndGlobalSection
+EndGlobal
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/README.md b/src/Strata.ContinuousImprovement.Web/continuousimprovement/README.md
new file mode 100644
index 0000000..6f17918
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/README.md
@@ -0,0 +1,67 @@
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Getting Started
+
+Verify `public/config.js` has the correct values for your application.  
+Run `npm install --legacy-peer-deps`
+Run `npm outdated` to see if you have any outdated dependencies. You should update all dependencies to latest by running `npm update`.
+**FOLLOW THE GUIDE HERE FOR ESLINT SETUP:** [https://confluence.sdt.local/pages/viewpage.action?pageId=53429096](https://confluence.sdt.local/pages/viewpage.action?pageId=53429096)
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.<br />
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.<br />
+You will also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.<br />
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm build`
+
+Builds the app for production to the `build` folder.<br />
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.<br />
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).
+
+## Debugger for Chrome
+
+Add the `Debugger for Chrome` extension from the Visual Studio Code extension store.
+Now, click on the bug icon on the left pane of Visual Studio Code, find the gear icon near the top right corner of the left side pane that is now open, and click "Add New Configuration".
+
+Choose the `Chrome: Launch` configuration.
+In the launch.json file update the port of the url: `"url": "http://localhost:3000"`.
+For more information the configuration should match the set up as described in [Configure the Chrome Debugger](https://code.visualstudio.com/docs/nodejs/reactjs-tutorial).
+Setting breakpoints should now work in Visual Studio Code with Chrome.
+
+## React Developer Tools
+
+Add the `React Developer Tools` extension from the Chrome web store as described [here](https://reactjs.org/blog/2015/09/02/new-react-developer-tools.html#installation)
+You will get two new tabs in your Chrome DevTools: `⚛️ Components` and `⚛️ Profiler`.
+Now you can select/inspect the components & view/edit the current props and state.
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/docs/exploration-grid-architecture.md b/src/Strata.ContinuousImprovement.Web/continuousimprovement/docs/exploration-grid-architecture.md
new file mode 100644
index 0000000..c674bba
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/docs/exploration-grid-architecture.md
@@ -0,0 +1,789 @@
+# Exploration Grid Architecture
+
+## Overview
+
+This document details the architecture and interaction patterns between the Case Type Family exploration grids (Summary and Detail views) and their supporting React hooks. The architecture emphasizes code reuse, separation of concerns, and maintainability through a custom hook-based approach.
+
+## Component Overview
+
+```mermaid
+graph TB
+    subgraph "Grid Components"
+        Summary[CaseTypeFamilySummaryGrid]
+        Detail[CaseTypeFamilyDetailGrid]
+        RefinementDrawer[RefinementOptionsDrawer]
+    end
+    
+    subgraph "Shared Hooks"
+        ColumnConfigs[useExplorationColumnConfigs]
+        ColumnMgmt[useColumnManagement]
+        FilterMgmt[useFilterManagement]
+        ScrollMgmt[useScrollManagement]
+        EncounterMgmt[useEncounterManagement]
+        DataFetch[useExplorationDataFetching]
+        BannerHook[useBenchmarkingBanner]
+        DrawerHook[useRefinementDrawer]
+    end
+    
+    Summary --> ColumnConfigs
+    Summary --> ColumnMgmt
+    Summary --> FilterMgmt
+    Summary --> ScrollMgmt
+    Summary --> BannerHook
+    Summary --> DataFetch
+    
+    Detail --> ColumnConfigs
+    Detail --> ColumnMgmt
+    Detail --> FilterMgmt
+    Detail --> EncounterMgmt
+    Detail --> BannerHook
+    Detail --> DataFetch
+    
+    RefinementDrawer --> DrawerHook
+    RefinementDrawer --> BannerHook
+    
+    ColumnMgmt --> ColumnConfigs
+    
+    style ColumnConfigs fill:#e1f5ff
+    style ColumnMgmt fill:#e1f5ff
+    style FilterMgmt fill:#fff4e1
+    style BannerHook fill:#e1f5ff
+    style DrawerHook fill:#e1f5ff
+    style Summary fill:#f0f0f0
+    style Detail fill:#f0f0f0
+    style RefinementDrawer fill:#f0f0f0
+```
+
+## Hook Dependencies and Data Flow
+
+### 1. useExplorationColumnConfigs Hook
+
+**Purpose**: Provides unified column configuration logic for both Summary and Detail grids.
+
+**Key Features**:
+- Single source of truth for column definitions
+- View-specific customizations (detail vs summary)
+- Conditional column visibility
+- Dynamic body function assignment
+- Includes column rendering helpers (getNameColumnBody, getMortalityRate)
+- All column-related logic in one location
+
+```mermaid
+flowchart LR
+    subgraph "Input"
+        ViewType[viewType: 'summary' | 'detail']
+        DetailConfig[detailConfig?: IDetailViewConfig]
+    end
+    
+    subgraph "useExplorationColumnConfigs"
+        GetConfigs[getColumnConfigs Function]
+        
+        subgraph "Column Groups"
+            Name[Name Column]
+            Detail_CB[Detail Checkbox]
+            Population[Entire Population]
+            Benchmark[Benchmark Data]
+            Refined[Refined Population]
+            Excluded[Excluded Population]
+        end
+    end
+    
+    subgraph "Output"
+        Configs[ITreeGridColumnConfig[]]
+    end
+    
+    ViewType --> GetConfigs
+    DetailConfig --> GetConfigs
+    
+    GetConfigs --> Name
+    GetConfigs --> Detail_CB
+    GetConfigs --> Population
+    GetConfigs --> Benchmark
+    GetConfigs --> Refined
+    GetConfigs --> Excluded
+    
+    Name --> Configs
+    Detail_CB --> Configs
+    Population --> Configs
+    Benchmark --> Configs
+    Refined --> Configs
+    Excluded --> Configs
+```
+
+**Column Differences by View**:
+
+| Column Group | Detail View | Summary View |
+|-------------|-------------|--------------|
+| Name | Custom body with navigation links | Simple body with navigation |
+| isExcluded (Checkbox) | ✓ Visible | ✗ Hidden |
+| medianGrossCharges | ✓ Visible | ✗ Hidden |
+| Column Widths | Auto | Explicit (86px) |
+| Body Functions | Custom for parent/child rows | Custom for leaf/non-leaf rows |
+
+### 2. useFilterManagement Hook
+
+**Purpose**: Centralized filter state management with session persistence.
+
+```mermaid
+sequenceDiagram
+    participant Component as Grid Component
+    participant Hook as useFilterManagement
+    participant Session as Session Storage
+    participant API as Exploration API
+    
+    Component->>Hook: Initialize with config
+    Hook->>Session: Load saved filters
+    Session-->>Hook: Return filters (if any)
+    Hook-->>Component: Return filter state & handlers
+    
+    Component->>Hook: User modifies filters
+    Hook->>Session: Persist updated filters
+    Hook->>Component: Trigger renderFilterBar()
+    
+    Note over Component,API: Filter changes trigger data fetch
+    Component->>API: Fetch with new filters
+```
+
+**Provides**:
+- `filters` - Current filter chip items
+- `exclusionCriteria` - Exclusion rules
+- `peerGroupFilters` - Peer group selection
+- `renderFilterBar()` - Pre-configured FilterBar component
+- `handleDrawerApply()` - Filter drawer handler
+
+### 3. useColumnManagement Hook
+
+**Purpose**: Manages column visibility, ordering, and user preferences.
+
+```mermaid
+flowchart TD
+    subgraph "Input"
+        GridName[gridName: string]
+        AddlGrids[additionalGridNames?: string[]]
+        GetConfigs[getColumnConfigs: Function]
+        ShowBenchmark[showPeerGroupBenchmarking: boolean]
+    end
+    
+    subgraph "useColumnManagement"
+        LoadPrefs[Load Column Preferences]
+        ApplyVisibility[Apply Visibility Rules]
+        SyncGrids[Sync Across Grids]
+        
+        LoadPrefs --> ApplyVisibility
+        ApplyVisibility --> SyncGrids
+    end
+    
+    subgraph "Output"
+        GetWithVis[getColumnsWithVisibility]
+        RenderPanel[renderColumnManagerPanel]
+    end
+    
+    GridName --> LoadPrefs
+    AddlGrids --> SyncGrids
+    GetConfigs --> ApplyVisibility
+    ShowBenchmark --> ApplyVisibility
+    
+    SyncGrids --> GetWithVis
+    SyncGrids --> RenderPanel
+```
+
+**Grid Synchronization**:
+- `FlexibleExplorationSummary` ↔ `FlexibleExplorationDetails`
+- Column preferences are shared between both grids
+- Changes in one grid reflect in the other
+
+### 4. useScrollManagement Hook
+
+**Purpose**: Manages programmatic scrolling to specific rows in the TreeGrid (Summary grid only).
+
+**Use Case**: When user clicks on heatmap cell, scroll to and expand the corresponding TreeGrid row.
+
+```mermaid
+sequenceDiagram
+    participant User
+    participant Heatmap as BenchmarkingHeatMap
+    participant Summary as SummaryGrid
+    participant Hook as useScrollManagement
+    participant TreeGrid
+    
+    User->>Heatmap: Click cell
+    Heatmap->>Summary: handleHeatMapCellClick(rowName, costDriver)
+    Summary->>Summary: Find matching row
+    
+    alt Row needs expansion
+        Summary->>Summary: Load children (if needed)
+        Summary->>Summary: Update expandedRowKeys
+    end
+    
+    Summary->>Hook: scrollToRow({ containerRef, rowKey, dataArray })
+    Hook->>TreeGrid: Calculate position & scroll
+    TreeGrid-->>User: Row visible & highlighted
+```
+
+### 5. useEncounterManagement Hook
+
+**Purpose**: Manages encounter inclusion/exclusion logic specific to the Detail grid.
+**Location**: `src/exploration/hooks/useEncounterManagement.ts`
+
+**State Management**:
+- Uses multiple `useState` hooks for state arrays with functional updates to prevent stale closures
+- `encounterExclusions` - Pending manual exclusions
+- `encounterInclusions` - Pending manual inclusions
+- `gridEncounterExclusions` - Initial loaded state (immutable reference)
+- `encounterExclusionsApplied/InclusionsApplied` - Applied changes
+- Applied vs pending changes tracking via `useEffect` with XOR comparison
+
+**Key Functions**:
+- `handleSetEncounterExclusion()` - Toggle individual encounter (uses functional state updates)
+- `handleApplyExclusions()` - Apply pending changes
+- `handleCancelApplyExclusions()` - Cancel pending changes
+- `clearEncounterExclusionsInclusionsStates()` - Reset all exclusions
+- `setInitialEncounterExclusions()` - Initialize from grid data
+- `isEncounterIncluded()` - Check encounter status
+
+```mermaid
+stateDiagram-v2
+    [*] --> Loaded: Load encounter data
+    
+    Loaded --> Pending: User toggles checkbox
+    Pending --> Pending: More toggles
+    Pending --> Applied: User clicks Apply
+    Pending --> Loaded: User clicks Cancel
+    
+    Applied --> Pending: User toggles checkbox
+    Applied --> [*]: Data refresh
+    
+    note right of Loaded
+        Grid shows initial
+        exclusion state
+    end note
+    
+    note right of Pending
+        Changes tracked in
+        encounterExclusions/Inclusions
+        arrays (not yet applied)
+    end note
+    
+    note right of Applied
+        Applied to
+        encounterExclusionsApplied
+        encounterInclusionsApplied
+        Triggers data refetch
+    end note
+```
+
+### 6. useExplorationDataFetching Hook
+
+**Purpose**: Centralizes data fetching logic for the Detail grid.
+**Location**: `src/exploration/hooks/useExplorationDataFetching.ts`
+
+**Key Features**:
+- Manages loading states (loading, firstLoading)
+- Fetches encounter group details and metrics
+- Handles filter and exclusion criteria changes
+- Integrates with population data
+- Processes and transforms API responses
+- **Returns fresh data** from fetchData to avoid stale state issues
+
+**Provides**:
+- `encounterGroupDetails` - Tree grid data (state)
+- `metrics` - Case type family metrics
+- `loading` / `firstLoading` - Loading states
+- `fetchData()` - Manual data fetch with parameters, **returns Promise<IEncounterGroupDetailTreeGridData[] | undefined>**
+- `useDataFetching()` - Automatic data fetching effect
+
+**Important**: The `fetchData` function returns the freshly fetched data in addition to updating state. This prevents race conditions where post-fetch operations might use stale state values before React's state updates complete.
+
+### 7. useBenchmarkingBanner Hook
+
+**Purpose**: Manages benchmarking banner visibility state across components.
+**Location**: `src/exploration/hooks/useBenchmarkingBanner.ts`
+
+**Key Features**:
+- Session-scoped banner dismissal state
+- Conditional visibility based on benchmarking status and optional peer group selection
+- Used by Summary Grid, Detail Grid, and RefinementOptionsDrawer
+- **Flexible peerGroupId parameter**: optional to support contexts without peer group selection
+
+**Banner Display Rules**:
+```typescript
+// When peerGroupId is provided
+showBanner = !dismissed && benchmarking && peerGroupId !== 0
+
+// When peerGroupId is undefined (e.g., in RefinementOptionsDrawer)
+showBanner = !dismissed && benchmarking
+```
+
+**Parameter Behavior**:
+- `peerGroupId` provided: Banner shows only if benchmarking enabled AND peer group selected
+- `peerGroupId` undefined/omitted: Banner shows based solely on benchmarking flag (peer group check bypassed)
+
+**Benefits**:
+- Consistent banner behavior across all exploration components
+- Persists user preference in session storage
+- Single line of code to add banner to any component
+- Explicit API design for contexts with/without peer group selection
+
+### 8. useRefinementDrawer Hook
+
+**Purpose**: Extracts all business logic from RefinementOptionsDrawer component.
+**Location**: `src/exploration/hooks/useRefinementDrawer.ts`
+
+**Key Features**:
+- Manages filter popover state and handlers
+- Manages SPH (Statistical Process Healthcare) criteria popover
+- Handles chip operations (add, delete, update, click)
+- Manages exclusion criteria (ALOS, TDVC)
+- Synchronizes population filters to benchmarking criteria
+- Provides `getApplyPayload()` for final data preparation
+
+**State Managed** (~360 lines of logic):
+- Filter chips and custom filters
+- Active filter selection
+- Popover visibility states
+- Exclusion criteria (ALOS trim, TDVC trim)
+- Date range handling
+
+**Benefits**:
+- Reduced RefinementOptionsDrawer from 431 to 246 lines (43% reduction)
+- Presentational component purely focused on UI
+- Business logic fully testable in isolation
+- Complex chip synchronization logic encapsulated
+
+## Component Interaction Patterns
+
+### Summary Grid Flow
+
+```mermaid
+sequenceDiagram
+    participant User
+    participant Summary as CaseTypeFamilySummaryGrid
+    participant FilterHook as useFilterManagement
+    participant ColumnHook as useExplorationColumnConfigs
+    participant ColMgmtHook as useColumnManagement
+    participant API as explorationService
+    
+    User->>Summary: Load page
+    Summary->>FilterHook: Initialize filters
+    Summary->>ColumnHook: getColumnConfigs(viewType: 'summary')
+    ColumnHook-->>Summary: Column configs
+    
+    Summary->>ColMgmtHook: Initialize with configs
+    ColMgmtHook-->>Summary: getColumnsWithVisibility()
+    
+    Summary->>API: fetchData(filters, exclusionCriteria)
+    API-->>Summary: encounterGroupSummaries[]
+    
+    Summary->>Summary: Render TreeGrid
+    
+    User->>Summary: Expand row
+    Summary->>API: loadCostDriverChildren(id)
+    API-->>Summary: Updated children
+    Summary->>Summary: Update state & re-render
+    
+    User->>Summary: Click heatmap cell
+    Summary->>Summary: handleHeatMapCellClick()
+    Summary->>Summary: Expand row & scroll
+```
+
+### Detail Grid Flow
+
+```mermaid
+sequenceDiagram
+    participant User
+    participant Detail as CaseTypeFamilyDetailGrid
+    participant FilterHook as useFilterManagement
+    participant ColumnHook as useExplorationColumnConfigs
+    participant API as explorationService
+    
+    User->>Detail: Load page with caseTypeFamilyId & costDriver
+    Detail->>FilterHook: Initialize filters (with population data)
+    Detail->>Detail: Initialize encounter exclusions/inclusions
+    
+    Detail->>ColumnHook: getColumnConfigs(viewType: 'detail', detailConfig)
+    Note over ColumnHook: detailConfig includes:<br/>- isEncounterIncluded<br/>- handleSetEncounterExclusion
+    ColumnHook-->>Detail: Column configs with checkbox column
+    
+    Detail->>API: fetchData(filters, encounterExclusions, encounterInclusions)
+    API-->>Detail: encounterGroupDetails[] + metrics
+    
+    Detail->>Detail: Render TreeGrid with checkboxes
+    
+    User->>Detail: Toggle encounter checkbox
+    Detail->>Detail: handleSetEncounterExclusion(id, isIncluded)
+    Detail->>Detail: Update encounterExclusions/Inclusions
+    Detail->>Detail: Show Apply/Cancel action bar
+    
+    User->>Detail: Click Apply
+    Detail->>Detail: setEncounterExclusionsApplied()
+    Detail->>API: fetchData with new exclusions
+    API-->>Detail: Updated data
+```
+
+## Data Flow Architecture
+
+### Filter to Data Pipeline
+
+```mermaid
+flowchart TD
+    User[User Input] --> FilterBar[Filter Bar]
+    FilterBar --> FilterState[Filter State]
+    
+    subgraph "useFilterManagement"
+        FilterState
+        SessionStorage[(Session Storage)]
+        FilterState <--> SessionStorage
+    end
+    
+    FilterState --> ExclusionCriteria[Exclusion Criteria]
+    FilterState --> PeerGroupFilters[Peer Group Filters]
+    FilterState --> ChipItems[Filter Chip Items]
+    
+    ExclusionCriteria --> APICall[API Request]
+    PeerGroupFilters --> APICall
+    ChipItems --> APICall
+    
+    APICall --> ExplorationService[explorationService]
+    
+    subgraph "API Methods"
+        ExplorationService --> GetSummaries[getCaseTypeFamilySummaries]
+        ExplorationService --> GetDetails[getCaseTypeFamilyInfo]
+        ExplorationService --> GetChildren[getCaseTypeFamilyCostDriverInfo]
+        ExplorationService --> GetHeatMap[getHeatMapSummary]
+    end
+    
+    GetSummaries --> TreeGridData[TreeGrid Data]
+    GetDetails --> TreeGridData
+    GetChildren --> TreeGridData
+    GetHeatMap --> HeatMapData[HeatMap Data]
+    
+    TreeGridData --> SummaryGrid[Summary Grid]
+    TreeGridData --> DetailGrid[Detail Grid]
+    HeatMapData --> SummaryGrid
+```
+
+### Column Configuration Pipeline
+
+```mermaid
+flowchart LR
+    subgraph "Configuration Phase"
+        ViewType[View Type] --> GetColumnConfigs[useExplorationColumnConfigs]
+        DetailConfig[Detail Config] --> GetColumnConfigs
+        GetColumnConfigs --> BaseConfigs[Base Column Configs]
+    end
+    
+    subgraph "Management Phase"
+        BaseConfigs --> ColManagement[useColumnManagement]
+        UserPrefs[(User Preferences)] --> ColManagement
+        ShowBenchmark[Show Benchmarking] --> ColManagement
+        
+        ColManagement --> ApplyVisibility[Apply Visibility Rules]
+        ColManagement --> ApplyOrdering[Apply Column Order]
+        ApplyVisibility --> ManagedConfigs[Managed Column Configs]
+        ApplyOrdering --> ManagedConfigs
+    end
+    
+    subgraph "Rendering Phase"
+        ManagedConfigs --> BuildTreeGrid[buildTreeGrid Helper]
+        BuildTreeGrid --> Columns[Column Components]
+        BuildTreeGrid --> HeaderGroup[Header Group]
+        
+        Columns --> TreeGrid[TreeGrid Component]
+        HeaderGroup --> TreeGrid
+    end
+```
+
+## State Management Patterns
+
+### Summary Grid State
+
+```mermaid
+classDiagram
+    class SummaryGridState {
+        +loading: boolean
+        +firstLoading: boolean
+        +encounterGroupSummaries: IEncounterGroupTreeGridData[]
+        +sortField: string
+        +sortOrder: number
+        +expandedRowKeys: string[]
+        +heatMapData: IHeatMapData[]
+        +heatMapLoading: boolean
+        +manageColumnsVisible: boolean
+    }
+    
+    class FilterState {
+        +filters: IFilterState
+        +exclusionCriteria: IExclusionCriteria
+        +peerGroupFilters: IPeerGroupFilters
+    }
+    
+    class ColumnState {
+        +columnConfigs: ITreeGridColumnConfig[]
+        +showPeerGroupBenchmarking: boolean
+    }
+    
+    SummaryGridState --> FilterState : uses
+    SummaryGridState --> ColumnState : uses
+```
+
+### Detail Grid State
+
+```mermaid
+classDiagram
+    class DetailGridState {
+        +loading: boolean
+        +firstLoading: boolean
+        +encounterGroupDetails: IEncounterGroupDetailTreeGridData[]
+        +metrics: ICaseTypeFamilyMetricDetail
+        +treeGridKeysData: string[]
+        +expandedLevel: number
+        +manageColumnsVisible: boolean
+    }
+    
+    class EncounterState {
+        +gridEncounterExclusions: number[]
+        +encounterExclusions: number[]
+        +encounterInclusions: number[]
+        +encounterExclusionsApplied: number[]
+        +encounterInclusionsApplied: number[]
+        +isApplyExclusionActionBarVisible: boolean
+    }
+    
+    class FilterState {
+        +filters: IFilterState
+        +exclusionCriteria: IExclusionCriteria
+        +peerGroupFilters: IPeerGroupFilters
+        +explorationPopulationData: IExplorationPopulation
+    }
+    
+    DetailGridState --> EncounterState : uses
+    DetailGridState --> FilterState : uses
+```
+
+## Key Design Decisions
+
+### 1. Shared Column Configuration Hook
+
+**Problem**: Two grids with 95% identical column definitions but small view-specific differences.
+
+**Solution**: Created `useExplorationColumnConfigs` hook that:
+- Accepts `viewType` parameter ('summary' | 'detail')
+- Uses spread operators for conditional properties
+- Employs ternary operators for view-specific body functions
+- Maintains single source of truth
+
+**Benefits**:
+- Reduced ~370 lines of duplicate code to ~250 lines of shared code
+- Easier maintenance - changes apply to both grids
+- Type-safe with TypeScript interfaces
+- Clear separation of concerns
+
+### 2. Filter Management Centralization
+
+**Problem**: Complex filter state with session persistence needed in both grids.
+
+**Solution**: `useFilterManagement` hook encapsulates:
+- Filter state management
+- Session storage persistence
+- Pre-configured FilterBar component
+- Drawer apply handlers
+
+**Benefits**:
+- Consistent filter behavior across grids
+- Automatic session persistence
+- Reduced boilerplate in components
+
+### 3. Column Synchronization
+
+**Problem**: User expects column preferences to sync between Summary and Detail grids.
+
+**Solution**: `useColumnManagement` with `additionalGridNames`:
+- Summary grid references Detail grid: `additionalGridNames: ['FlexibleExplorationDetails']`
+- Detail grid references Summary grid: `additionalGridNames: ['FlexibleExplorationSummary']`
+- Shared preference storage key
+
+**Benefits**:
+- Seamless user experience
+- Single configuration for both grids
+- Automatic synchronization
+
+### 4. Encounter State Management
+
+**Problem**: Complex state tracking for pending vs applied encounter exclusions/inclusions with potential race conditions.
+
+**Solution**: Separate state arrays with XOR comparison and functional state updates:
+- `gridEncounterExclusions` - Initial loaded state (immutable reference)
+- `encounterExclusions/Inclusions` - Pending changes (updated via functional setters)
+- `encounterExclusionsApplied/InclusionsApplied` - Applied changes
+- All state updates use functional form `setState(prev => ...)` to prevent stale closures
+
+**Benefits**:
+- Clear separation of pending vs applied state
+- Ability to cancel pending changes
+- Prompts user before navigation with unsaved changes
+- **Safe under React batching**: functional updates compose correctly even with rapid toggles
+- **No stale closure issues**: always operates on current state
+
+## Performance Considerations
+
+### Memoization Strategy
+
+```mermaid
+graph LR
+    subgraph "Memoized Values"
+        ColumnConfigs[columnConfigs]
+        Columns[columns]
+        HeaderGroup[headerGroup]
+        ShowPeerBench[showPeerGroupBenchmarking]
+    end
+    
+    subgraph "Dependencies"
+        GetColumns[getColumnsWithVisibility]
+        ColumnConfigsInput[columnConfigs]
+        Benchmarking[benchmarking]
+        PeerFilters[peerGroupFilters]
+    end
+    
+    GetColumns --> ColumnConfigs
+    ColumnConfigsInput --> Columns
+    ColumnConfigsInput --> HeaderGroup
+    Benchmarking --> ShowPeerBench
+    PeerFilters --> ShowPeerBench
+    
+    style ColumnConfigs fill:#e1f5ff
+    style Columns fill:#e1f5ff
+    style HeaderGroup fill:#e1f5ff
+    style ShowPeerBench fill:#e1f5ff
+```
+
+**Key Optimizations**:
+1. `useMemo` for expensive operations (column building, tree grid construction)
+2. `useCallback` for event handlers to prevent unnecessary re-renders
+3. Selective dependency arrays in `useEffect` hooks
+4. Session storage for filter persistence (reduces API calls)
+
+## Accessibility Improvements
+
+### BenchmarkingGridHeatMap Button Refactoring
+
+The heatmap cells were refactored from clickable `<div>` elements to Ant Design `<Button>` components:
+
+**Before**:
+```typescript
+<div onClick={...} onKeyDown={...} tabIndex={0} role="button" aria-label={...}>
+```
+
+**After**:
+```typescript
+<Button type="text" onClick={...} aria-label={...}>
+```
+
+**Benefits**:
+- Automatic keyboard navigation support
+- Proper focus management
+- Standard button semantics and ARIA attributes
+- Consistent styling and hover states
+- Reduced manual accessibility code
+
+## Code Consolidation History
+
+**Files Deleted** (functionality moved to hooks):
+- `MappedColumnManager.tsx` - Functions moved to useExplorationColumnConfigs
+- `ExplorationPageComponents.tsx` - Rendering helpers moved to useExplorationColumnConfigs
+- `CaseTypeFamilyFunctions.tsx` - Converted to `.ts`, enhanced with JSDoc and utility functions
+
+**Code Reduction Metrics**:
+- Initial column config duplication: ~370 lines eliminated
+- RefinementOptionsDrawer refactoring: 185 lines moved to hook (43% reduction)
+- CaseTypeFamilyDetailGrid refactoring: 163 lines removed (27% reduction from 601→438 lines)
+- Total reduction across all refactoring: ~800+ lines
+
+**Code Quality Improvements**:
+- Replaced magic numbers with named constants (`ChipKey.DischargeDate` instead of `25`)
+- Implemented functional state updates to prevent stale closures
+- Enhanced type safety with proper TypeScript interfaces
+- Added comprehensive JSDoc documentation
+- Fixed async state handling by returning fresh data from fetch operations
+
+## Future Enhancements
+
+### Potential Improvements
+
+1. **Loading States**: Further centralize loading state management patterns
+2. **Error Handling**: Create shared error handling hook with consistent user feedback
+3. **Testing**: Add unit tests for individual hooks (especially useRefinementDrawer)
+4. **Type Safety**: Strengthen TypeScript types for column configurations
+5. **Performance**: Consider memoization strategies for large datasets
+
+### Architecture Evolution
+
+```mermaid
+graph TB
+    subgraph "Phase 1: Initial State"
+        C1[Components with<br/>embedded logic<br/>~800 duplicate lines]
+    end
+    
+    subgraph "Phase 2: Current Architecture ✓"
+        C2[Thin presentation<br/>components]
+        H2[useExplorationColumnConfigs]
+        H3[useEncounterManagement]
+        H4[useExplorationDataFetching]
+        H5[useBenchmarkingBanner]
+        H6[useRefinementDrawer]
+    end
+    
+    subgraph "Phase 3: Future Enhancements"
+        H7[useErrorHandling]
+        H8[useLoadingState]
+        H9[Additional test coverage]
+    end
+    
+    C1 --> C2
+    C1 --> H2
+    C1 --> H3
+    C1 --> H4
+    C1 --> H5
+    C1 --> H6
+    
+    C2 -.future.-> H7
+    C2 -.future.-> H8
+    H2 -.future.-> H9
+    
+    style C1 fill:#ffcccc
+    style C2 fill:#90ee90
+    style H2 fill:#90ee90
+    style H3 fill:#90ee90
+    style H4 fill:#90ee90
+    style H5 fill:#90ee90
+    style H6 fill:#90ee90
+    style H7 fill:#e1f5ff
+    style H8 fill:#e1f5ff
+    style H9 fill:#e1f5ff
+```
+
+## Conclusion
+
+The Exploration Grid architecture demonstrates modern React patterns for code reuse and maintainability. Through multiple iterations of refactoring, the codebase has achieved significant improvements:
+
+### Achievements
+
+- **Maintainability**: Single source of truth for shared logic (~800+ lines eliminated)
+- **Testability**: Hooks can be unit tested independently from UI components
+- **Type Safety**: Strong TypeScript typing prevents runtime errors
+- **Performance**: Strategic memoization reduces unnecessary renders
+- **User Experience**: Consistent behavior across grids with synchronized preferences
+- **Accessibility**: Semantic HTML with proper ARIA attributes and keyboard navigation
+- **Separation of Concerns**: Business logic fully extracted from presentational components
+
+### Current Hooks Inventory
+
+1. **useExplorationColumnConfigs** - Column configuration with rendering helpers (~520 lines)
+2. **useColumnManagement** - Column visibility and preferences
+3. **useFilterManagement** - Filter state with session persistence
+4. **useScrollManagement** - Programmatic scrolling (Summary grid)
+5. **useEncounterManagement** - Encounter exclusion/inclusion state (Detail grid)
+6. **useExplorationDataFetching** - Data fetching and loading states (Detail grid)
+7. **useBenchmarkingBanner** - Banner visibility state management
+8. **useRefinementDrawer** - Filter drawer business logic (~360 lines)
+
+This architecture serves as a template for other complex grid implementations in the application and demonstrates the value of iterative refactoring toward better separation of concerns.
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/docs/react-refactoring-guidelines.md b/src/Strata.ContinuousImprovement.Web/continuousimprovement/docs/react-refactoring-guidelines.md
new file mode 100644
index 0000000..095301e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/docs/react-refactoring-guidelines.md
@@ -0,0 +1,457 @@
+# React Component Refactoring Guidelines
+
+## Problem: Complex Components with useEffect Dependency Issues
+
+### Common Issues
+- Multiple interdependent useEffect hooks
+- Functions used in useEffect but not in dependencies
+- Complex state interactions spread across many useState calls
+- Hard to test and maintain components
+
+## Solution: Extract Logic into Custom Hooks
+
+### 1. Identify State Domains
+
+Group related state and effects by domain:
+
+```typescript
+// ❌ Before: Mixed concerns in one component
+const [filters, setFilters] = useState();
+const [exclusionCriteria, setExclusionCriteria] = useState();
+const [encounterExclusions, setEncounterExclusions] = useState();
+const [loading, setLoading] = useState();
+const [data, setData] = useState();
+
+// ✅ After: Separated by domain
+const filterState = useFilterManagement(options);
+const encounterState = useEncounterManagement(options);
+const dataState = useDataFetching(options);
+```
+
+### 2. Custom Hook Pattern Template
+
+```typescript
+export interface IUseCustomHookOptions {
+  // Input dependencies
+  configuration: any;
+  otherDeps: string;
+}
+
+export interface IUseCustomHookResult {
+  // Exposed state
+  data: SomeType;
+  loading: boolean;
+
+  // Exposed functions
+  handleSomething: (param: Type) => void;
+}
+
+export const useCustomHook = (options: IUseCustomHookOptions): IUseCustomHookResult => {
+  const { configuration, otherDeps } = options;
+
+  // Internal state
+  const [data, setData] = useState<SomeType>();
+  const [loading, setLoading] = useState(false);
+
+  // ✅ Stable function with useCallback and correct dependencies
+  const fetchData = useCallback(async () => {
+    setLoading(true);
+    try {
+      const result = await api.getData(configuration);
+      setData(result);
+    } finally {
+      setLoading(false);
+    }
+  }, [configuration]); // ✅ Include all dependencies
+
+  // ✅ Effect with stable function reference
+  useEffect(() => {
+    fetchData();
+  }, [fetchData]); // ✅ fetchData is stable due to useCallback
+
+  // ✅ Stable handler
+  const handleSomething = useCallback((param: Type) => {
+    // Implementation
+  }, [/* dependencies */]);
+
+  return {
+    data,
+    loading,
+    handleSomething
+  };
+};
+```
+
+### 3. Specific Hook Patterns
+
+#### Filter Management Hook
+
+**Description**
+
+Encapsulates filter and exclusion criteria management with proper dependency tracking. This hook consolidates filter initialization logic into a stable callback and automatically reinitializes filters when configuration or exploration data changes. Ideal for components that need to maintain complex filter state synchronized with external data.
+
+**Parameters**
+
+| Parameter | Type | Description |
+|-----------|------|-------------|
+| `configuration` | `Object` | Configuration object that affects filter initialization |
+| `explorationData` | `Object` | Exploration data used to derive initial filter values |
+
+**Returns**
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `filters` | `Object` | Current filter state object |
+| `exclusionCriteria` | `Object` | Current exclusion criteria state |
+| `handleFilterChange` | `Function` | Stable callback to update filter values |
+
+**Example: Basic Usage**
+
+```typescript
+const { filters, exclusionCriteria, handleFilterChange } = useFilterManagement({
+  configuration: { type: 'encounter', clientId: '123' },
+  explorationData: { availableFilters: [...], defaults: {...} }
+});
+
+// Render filters
+<FilterPanel
+  filters={filters}
+  onChange={handleFilterChange}
+/>
+
+// Use exclusion criteria in data fetching
+const { data } = useDataFetching({
+  configuration,
+  filters,
+  exclusionCriteria
+});
+```
+
+**Example: Advanced Filter Initialization**
+
+```typescript
+const initializeFilters = useCallback(() => {
+  const defaultFilters = {
+    dateRange: explorationData.defaultDateRange,
+    status: ['active', 'pending'],
+    categories: explorationData.availableCategories
+  };
+  
+  const criteria = {
+    excludeArchived: configuration.excludeArchived || true,
+    minThreshold: configuration.minThreshold || 0
+  };
+  
+  setFilters(defaultFilters);
+  setExclusionCriteria(criteria);
+}, [configuration, explorationData]);
+```
+
+**Benefits**
+
+- ✅ Centralized filter initialization logic
+- ✅ Automatic reinitialization when dependencies change
+- ✅ Stable callback references prevent unnecessary re-renders
+- ✅ Clear separation of filter state from component logic
+- ✅ Reusable across multiple components with similar filter needs
+- ✅ Easy to test filter initialization independently
+
+**Implementation**
+
+```typescript
+const useFilterManagement = ({ configuration, explorationData }) => {
+  const [filters, setFilters] = useState();
+  const [exclusionCriteria, setExclusionCriteria] = useState();
+
+  // ✅ Consolidate filter initialization
+  const initializeFilters = useCallback(() => {
+    // All filter initialization logic
+  }, [configuration, explorationData]);
+
+  useEffect(() => {
+    initializeFilters();
+  }, [initializeFilters]);
+
+  return { filters, exclusionCriteria, handleFilterChange };
+};
+```
+
+**See Also**
+- [React useCallback](https://react.dev/reference/react/useCallback)
+- [React useState](https://react.dev/reference/react/useState)
+
+---
+
+#### Data Fetching Hook
+
+**Description**
+
+Encapsulates data fetching logic with loading states and automatic refetching when dependencies change. This pattern ensures stable function references through useCallback and automatically triggers data fetching when configuration or filters change. The hook provides a refetch function for manual data reloading.
+
+**Parameters**
+
+| Parameter | Type | Description |
+|-----------|------|-------------|
+| `configuration` | `Object` | Configuration object for the data fetch |
+| `filters` | `Object` | Filter criteria to apply to the data fetch |
+| `exclusionCriteria` | `Object` | Exclusion criteria to filter results |
+
+**Returns**
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `data` | `any` | Fetched data or undefined if not yet loaded |
+| `loading` | `boolean` | Loading state indicator |
+| `refetch` | `Function` | Stable callback to manually trigger data refetch |
+
+**Example: Basic Usage**
+
+```typescript
+const { data, loading, refetch } = useDataFetching({
+  configuration: { id: '123', type: 'opportunities' },
+  filters: { status: 'active', startDate: '2024-01-01' },
+  exclusionCriteria: { excludeArchived: true }
+});
+
+if (loading) return <Spinner />;
+if (!data) return <EmptyState />;
+
+return (
+  <div>
+    <DataTable data={data} />
+    <Button onClick={refetch}>Refresh</Button>
+  </div>
+);
+```
+
+**Example: Conditional Fetching**
+
+```typescript
+const { data, loading, refetch } = useDataFetching({
+  configuration: selectedConfig,
+  filters: activeFilters,
+  exclusionCriteria: null
+});
+
+// Data automatically refetches when selectedConfig or activeFilters change
+// If configuration or filters are null/undefined, fetch is skipped
+```
+
+**Benefits**
+
+- ✅ Automatic refetching when dependencies change
+- ✅ Stable function references prevent unnecessary re-renders
+- ✅ Built-in loading state management
+- ✅ Manual refetch capability for user-triggered updates
+- ✅ Guards against fetching with invalid dependencies
+- ✅ Consistent loading state handling with finally block
+
+**Implementation**
+
+```typescript
+const useDataFetching = ({ configuration, filters, exclusionCriteria }) => {
+  const [data, setData] = useState();
+  const [loading, setLoading] = useState(false);
+
+  const fetchData = useCallback(async () => {
+    if (!configuration || !filters) return;
+
+    setLoading(true);
+    try {
+      const result = await api.fetchData(configuration, filters, exclusionCriteria);
+      setData(result);
+    } finally {
+      setLoading(false);
+    }
+  }, [configuration, filters, exclusionCriteria]);
+
+  useEffect(() => {
+    fetchData();
+  }, [fetchData]);
+
+  return { data, loading, refetch: fetchData };
+};
+```
+
+**See Also**
+- [React useCallback](https://react.dev/reference/react/useCallback)
+- [React useEffect](https://react.dev/reference/react/useEffect)
+
+---
+
+#### Complex State with Reducer
+
+**Description**
+
+Manages complex encounter state using useReducer for predictable state updates. This pattern is ideal when state updates depend on previous state or when multiple state properties need to be updated together atomically. The reducer pattern eliminates dependency issues in callbacks since dispatch is stable.
+
+**Parameters**
+
+| Parameter | Type | Description |
+|-----------|------|-------------|
+| `configurationId` | `string` | Configuration identifier for encounters |
+| `initialExclusions` | `Array` | Initial exclusion list to populate state |
+
+**Returns**
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `exclusions` | `Array` | Current list of encounter exclusions |
+| `handleSetExclusion` | `Function` | Stable callback to update exclusion status |
+
+**Example: Basic Usage**
+
+```typescript
+const { exclusions, handleSetExclusion } = useEncounterManagement({
+  configurationId: '123',
+  initialExclusions: []
+});
+
+// Update exclusion status
+handleSetExclusion(encounterId, false); // Exclude encounter
+handleSetExclusion(encounterId, true);  // Include encounter
+```
+
+**Example: Reducer Definition**
+
+```typescript
+const encounterReducer = (state, action) => {
+  switch (action.type) {
+    case 'SET_EXCLUSION':
+      return {
+        ...state,
+        exclusions: state.exclusions.map(item =>
+          item.id === action.id
+            ? { ...item, isIncluded: action.isIncluded }
+            : item
+        )
+      };
+    default:
+      return state;
+  }
+};
+```
+
+**Benefits**
+
+- ✅ No dependency array issues - dispatch is always stable
+- ✅ Predictable state updates with pure reducer functions
+- ✅ Easier to test - reducer is a pure function
+- ✅ Better for complex state with multiple related properties
+- ✅ Atomic state updates prevent race conditions
+
+**Implementation**
+
+```typescript
+const useEncounterManagement = (options) => {
+  const [state, dispatch] = useReducer(encounterReducer, initialState);
+
+  const handleSetExclusion = useCallback((id: number, isIncluded: boolean) => {
+    dispatch({ type: 'SET_EXCLUSION', id, isIncluded });
+  }, []); // ✅ No dependencies with reducer
+
+  return {
+    exclusions: state.exclusions,
+    handleSetExclusion
+  };
+};
+```
+
+**See Also**
+- [React useReducer](https://react.dev/reference/react/useReducer)
+
+### 4. Component Refactoring Checklist
+
+#### Before Refactoring
+- [ ] Identify all useEffect blocks and their dependencies
+- [ ] Group related state by domain (filtering, data fetching, UI state)
+- [ ] List all functions used in useEffect
+- [ ] Note any complex state interactions
+
+#### During Refactoring
+- [ ] Create custom hooks for each domain
+- [ ] Wrap all functions in useCallback with correct dependencies
+- [ ] Use useReducer for complex state interactions
+- [ ] Ensure each useEffect has single responsibility
+- [ ] Test each hook independently
+
+#### After Refactoring
+- [ ] No useEffect dependency warnings
+- [ ] Each hook has clear, single responsibility
+- [ ] Component is simplified and easier to read
+- [ ] Functions are stable (wrapped in useCallback)
+- [ ] All tests pass
+
+### 5. Anti-Patterns to Avoid
+
+#### ❌ Don't suppress dependency warnings
+```typescript
+useEffect(() => {
+  fetchData();
+}, [someValue]); // eslint-disable-line react-hooks/exhaustive-deps
+```
+
+#### ❌ Don't create functions inside useEffect
+```typescript
+useEffect(() => {
+  const fetchData = async () => { /* ... */ }; // ❌ Recreated every render
+  fetchData();
+}, [dependency]);
+```
+
+#### ❌ Don't mix multiple concerns in one useEffect
+```typescript
+useEffect(() => {
+  // ❌ Handling filters, data fetching, and UI state in one effect
+  if (filtersChanged) { /* filter logic */ }
+  if (dataChanged) { /* data logic */ }
+  if (uiChanged) { /* UI logic */ }
+}, [filters, data, ui]);
+```
+
+### 6. Benefits of This Approach
+
+1. **No dependency warnings**: All dependencies correctly specified
+2. **Better testability**: Each hook can be tested in isolation
+3. **Reusability**: Hooks can be shared between components
+4. **Separation of concerns**: Each hook handles one domain
+5. **Easier debugging**: Issues isolated to specific hooks
+6. **Better TypeScript support**: Clear input/output types
+
+### 7. Migration Strategy
+
+1. **Start with one domain** (e.g., data fetching)
+2. **Create custom hook** with proper dependencies
+3. **Replace useEffect blocks** one at a time
+4. **Test thoroughly** before moving to next domain
+5. **Apply same pattern** to related components
+
+### 8. Claude Skill Integration
+
+This pattern can be codified into a Claude skill for automatic refactoring:
+
+```typescript
+// Skill: refactor-react-component
+// Input: Component with useEffect issues
+// Output: Refactored component with custom hooks
+// Pattern: Extract state domains → Create custom hooks → Simplify main component
+```
+
+## Example Commands for Claude
+
+1. **"Refactor this component's useEffect dependencies"**
+   - Identify all dependency issues
+   - Create appropriate custom hooks
+   - Fix all exhaustive-deps warnings
+
+2. **"Extract filter management into a custom hook"**
+   - Create `useFilterManagement` hook
+   - Move all filter-related state and effects
+   - Return stable handlers
+
+3. **"Simplify this component using the reducer pattern"**
+   - Identify complex state interactions
+   - Create reducer for state management
+   - Replace useState with useReducer
+
+This systematic approach ensures components are maintainable, testable, and follow React best practices.
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/docs/react-state-management-patterns.md b/src/Strata.ContinuousImprovement.Web/continuousimprovement/docs/react-state-management-patterns.md
new file mode 100644
index 0000000..1a0c876
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/docs/react-state-management-patterns.md
@@ -0,0 +1,174 @@
+# React State Management & useEffect Best Practices
+
+## Common Problems
+
+### 1. Exhaustive Dependencies Warnings
+```typescript
+// ❌ Problem: Function in useEffect but not in dependencies
+useEffect(() => {
+  fetchData(); // Function not in deps
+}, [someValue]); // Missing fetchData
+
+// ❌ Problem: Complex interdependent effects
+useEffect(() => {
+  if (configuration && !explorationPopulationId) {
+    setOutliersFromSession(); // Function not stable
+    setSummaryFilters(sessionFilters); // State setter
+  }
+}, [configuration, filters, explorationPopulationId]); // Missing deps
+```
+
+## Solutions
+
+### 1. Use useCallback for Stable Function References
+```typescript
+// ✅ Solution: Wrap functions in useCallback
+const fetchData = useCallback(async (criteria: IExclusionCriteria, filters: IFilter) => {
+  // Implementation
+}, [configuration, caseTypeFamilyId, costDriver]); // Include actual dependencies
+
+const setOutliersFromSession = useCallback(() => {
+  // Implementation
+}, [costOutlierValue, losOutlierValue, exclusionCriteria]);
+
+useEffect(() => {
+  fetchData(exclusionCriteria, filters);
+}, [fetchData, exclusionCriteria, filters]); // Now fetchData is stable
+```
+
+### 2. Extract Complex State Logic into Custom Hooks
+```typescript
+// ✅ Custom hook for filter management
+const useFilterManagement = (configuration, explorationPopulationData) => {
+  const [filters, setFilters] = useState();
+  const [summaryFilters, setSummaryFilters] = useState();
+
+  const initializeFilters = useCallback(() => {
+    // Consolidate filter initialization logic
+  }, [configuration, explorationPopulationData]);
+
+  return { filters, summaryFilters, initializeFilters };
+};
+```
+
+### 3. Use Reducer for Complex State Interactions
+```typescript
+// ✅ Reducer for encounter exclusion state
+type EncounterState = {
+  exclusions: number[];
+  inclusions: number[];
+  exclusionsApplied: number[];
+  inclusionsApplied: number[];
+};
+
+type EncounterAction =
+  | { type: 'SET_EXCLUSION'; id: number; isIncluded: boolean }
+  | { type: 'APPLY_CHANGES' }
+  | { type: 'RESET' };
+
+const encounterReducer = (state: EncounterState, action: EncounterAction): EncounterState => {
+  switch (action.type) {
+    case 'SET_EXCLUSION':
+      // Handle complex exclusion logic
+      return state;
+    case 'APPLY_CHANGES':
+      return { ...state, exclusionsApplied: state.exclusions, inclusionsApplied: state.inclusions };
+    default:
+      return state;
+  }
+};
+```
+
+## Recommended Patterns
+
+### Pattern 1: Single Responsibility Effects
+```typescript
+// ✅ Each effect has single responsibility
+useEffect(() => {
+  // Only handle configuration initialization
+  if (configuration && !explorationPopulationId) {
+    initializeFromConfiguration();
+  }
+}, [configuration, explorationPopulationId, initializeFromConfiguration]);
+
+useEffect(() => {
+  // Only handle exploration population data
+  if (explorationPopulationData) {
+    initializeFromPopulationData();
+  }
+}, [explorationPopulationData, initializeFromPopulationData]);
+```
+
+### Pattern 2: Stable Function References
+```typescript
+// ✅ All functions wrapped in useCallback with correct dependencies
+const handlePeerGroupFiltering = useCallback((filters: IPeerGroupFilters) => {
+  setPeerGroupFilters(filters);
+}, [setPeerGroupFilters]); // Include setter if needed
+
+const handleSetEncounterExclusion = useCallback((id: number, isIncluded: boolean) => {
+  dispatch({ type: 'SET_EXCLUSION', id, isIncluded });
+}, []); // No dependencies if using reducer
+```
+
+### Pattern 3: Custom Hooks for Related Logic
+```typescript
+// ✅ Extract related state and effects
+const useDataFetching = (configuration, filters, exclusionCriteria) => {
+  const [loading, setLoading] = useState(false);
+  const [data, setData] = useState(null);
+
+  const fetchData = useCallback(async () => {
+    if (!configuration || !filters) return;
+
+    setLoading(true);
+    try {
+      const result = await explorationService.getCaseTypeFamilyDetails(/* params */);
+      setData(result);
+    } finally {
+      setLoading(false);
+    }
+  }, [configuration, filters, exclusionCriteria]);
+
+  useEffect(() => {
+    fetchData();
+  }, [fetchData]);
+
+  return { data, loading, refetch: fetchData };
+};
+```
+
+## Anti-Patterns to Avoid
+
+### ❌ Don't: Ignore exhaustive-deps warnings
+```typescript
+// eslint-disable-next-line react-hooks/exhaustive-deps
+useEffect(() => {
+  fetchData();
+}, [someValue]); // Don't suppress warnings
+```
+
+### ❌ Don't: Put everything in one giant useEffect
+```typescript
+useEffect(() => {
+  // 50 lines of mixed concerns
+  if (condition1) { /* logic 1 */ }
+  if (condition2) { /* logic 2 */ }
+  if (condition3) { /* logic 3 */ }
+}, [dep1, dep2, dep3, dep4, dep5]); // Too many dependencies
+```
+
+### ❌ Don't: Create functions inside useEffect
+```typescript
+useEffect(() => {
+  const fetchData = async () => { /* implementation */ }; // Recreated every render
+  fetchData();
+}, [deps]);
+```
+
+## Tools and Linting Rules
+
+1. **Enable exhaustive-deps rule**: Catches missing dependencies
+2. **Use React DevTools Profiler**: Identify unnecessary re-renders
+3. **Consider React Query/SWR**: For server state management
+4. **Use TypeScript**: Better type safety for hook dependencies
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/package-lock.json b/src/Strata.ContinuousImprovement.Web/continuousimprovement/package-lock.json
new file mode 100644
index 0000000..a125ec9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/package-lock.json
@@ -0,0 +1,22224 @@
+{
+  "name": "continuousimprovement",
+  "version": "0.1.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "continuousimprovement",
+      "version": "0.1.0",
+      "dependencies": {
+        "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+        "@strata/charts": "^0.2.0",
+        "@strata/core": "^5.3.0",
+        "@strata/eslint-config": "^3.6.0-1",
+        "@strata/jazz": "^0.6.0",
+        "@strata/logging": "^0.2.0",
+        "@strata/navbar": "^4.27.0",
+        "@strata/score": "^2.4.3",
+        "@strata/signalr": "^0.8.0",
+        "@strata/tempo": "^6.33.0",
+        "@testing-library/jest-dom": "^5.16.5",
+        "@testing-library/react": "^11.2.7",
+        "@types/jest": "^27.5.2",
+        "@types/node": "^14.18.36",
+        "@types/react": "^17.0.53",
+        "@types/react-dom": "^17.0.19",
+        "@types/react-router": "^5.1.20",
+        "@types/react-router-dom": "^5.3.3",
+        "@types/react-test-renderer": "^17.0.2",
+        "@typescript-eslint/eslint-plugin": "^4.33.0",
+        "chart.js": "^2.9.4",
+        "dayjs": "^1.11.9",
+        "eslint": "^7.32.0",
+        "eslint-plugin-flowtype": "^5.10.0",
+        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-jsx-a11y": "^6.7.1",
+        "eslint-plugin-prettier": "^3.4.1",
+        "eslint-plugin-react": "^7.32.2",
+        "eslint-plugin-react-hooks": "^4.6.0",
+        "lodash": "^4.17.21",
+        "lodash.debounce": "^4.0.8",
+        "pkg.json": "^2.0.8",
+        "prettier": "^2.8.4",
+        "react": "^17.0.1",
+        "react-app-polyfill": "^2.0.0",
+        "react-chartjs-2": "^2.11.1",
+        "react-dom": "^17.0.1",
+        "react-router": "^5.3.4",
+        "react-router-dom": "^5.3.4",
+        "react-scripts": "^5.0.1",
+        "react-test-renderer": "^17.0.1",
+        "react-to-print": "^2.14.12",
+        "sass": "^1.64.1",
+        "source-map-explorer": "^2.5.3",
+        "typescript": "^4.9.5",
+        "usehooks-ts": "^3.1.1"
+      },
+      "devDependencies": {
+        "@strata/test-utils": "^2.0.0",
+        "@types/lodash.debounce": "^4.0.7",
+        "ajv": "^8.16.0",
+        "ajv-keywords": "^5.1.0",
+        "schema-utils": "^4.2.0"
+      }
+    },
+    "node_modules/@adobe/css-tools": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.0.tgz",
+      "integrity": "sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ=="
+    },
+    "node_modules/@alloc/quick-lru": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
+      "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@ant-design/colors": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-7.2.1.tgz",
+      "integrity": "sha512-lCHDcEzieu4GA3n8ELeZ5VQ8pKQAWcGGLRTQ50aQM2iqPpq2evTxER84jfdPvsPAtEcZ7m44NI45edFMo8oOYQ==",
+      "dependencies": {
+        "@ant-design/fast-color": "^2.0.6"
+      }
+    },
+    "node_modules/@ant-design/cssinjs": {
+      "version": "1.23.0",
+      "resolved": "https://registry.npmjs.org/@ant-design/cssinjs/-/cssinjs-1.23.0.tgz",
+      "integrity": "sha512-7GAg9bD/iC9ikWatU9ym+P9ugJhi/WbsTWzcKN6T4gU0aehsprtke1UAaaSxxkjjmkJb3llet/rbUSLPgwlY4w==",
+      "dependencies": {
+        "@babel/runtime": "^7.11.1",
+        "@emotion/hash": "^0.8.0",
+        "@emotion/unitless": "^0.7.5",
+        "classnames": "^2.3.1",
+        "csstype": "^3.1.3",
+        "rc-util": "^5.35.0",
+        "stylis": "^4.3.4"
+      },
+      "peerDependencies": {
+        "react": ">=16.0.0",
+        "react-dom": ">=16.0.0"
+      }
+    },
+    "node_modules/@ant-design/cssinjs-utils": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@ant-design/cssinjs-utils/-/cssinjs-utils-1.1.3.tgz",
+      "integrity": "sha512-nOoQMLW1l+xR1Co8NFVYiP8pZp3VjIIzqV6D6ShYF2ljtdwWJn5WSsH+7kvCktXL/yhEtWURKOfH5Xz/gzlwsg==",
+      "dependencies": {
+        "@ant-design/cssinjs": "^1.21.0",
+        "@babel/runtime": "^7.23.2",
+        "rc-util": "^5.38.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/@ant-design/fast-color": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@ant-design/fast-color/-/fast-color-2.0.6.tgz",
+      "integrity": "sha512-y2217gk4NqL35giHl72o6Zzqji9O7vHh9YmhUVkPtAOpoTCH4uWxo/pr4VE8t0+ChEPs0qo4eJRC5Q1eXWo3vA==",
+      "dependencies": {
+        "@babel/runtime": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=8.x"
+      }
+    },
+    "node_modules/@ant-design/icons": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-5.6.1.tgz",
+      "integrity": "sha512-0/xS39c91WjPAZOWsvi1//zjx6kAp4kxWwctR6kuU6p133w8RU0D2dSCvZC19uQyharg/sAvYxGYWl01BbZZfg==",
+      "dependencies": {
+        "@ant-design/colors": "^7.0.0",
+        "@ant-design/icons-svg": "^4.4.0",
+        "@babel/runtime": "^7.24.8",
+        "classnames": "^2.2.6",
+        "rc-util": "^5.31.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "peerDependencies": {
+        "react": ">=16.0.0",
+        "react-dom": ">=16.0.0"
+      }
+    },
+    "node_modules/@ant-design/icons-svg": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz",
+      "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA=="
+    },
+    "node_modules/@ant-design/react-slick": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-1.1.2.tgz",
+      "integrity": "sha512-EzlvzE6xQUBrZuuhSAFTdsr4P2bBBHGZwKFemEfq8gIGyIQCxalYfZW/T2ORbtQx5rU69o+WycP3exY/7T1hGA==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.4",
+        "classnames": "^2.2.5",
+        "json2mq": "^0.2.0",
+        "resize-observer-polyfill": "^1.5.1",
+        "throttle-debounce": "^5.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0"
+      }
+    },
+    "node_modules/@apideck/better-ajv-errors": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz",
+      "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==",
+      "dependencies": {
+        "json-schema": "^0.4.0",
+        "jsonpointer": "^5.0.0",
+        "leven": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "ajv": ">=8"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
+      "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
+      "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.26.0",
+        "@babel/generator": "^7.26.0",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.0",
+        "@babel/parser": "^7.26.0",
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.26.0",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/eslint-parser": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.9.tgz",
+      "integrity": "sha512-5UXfgpK0j0Xr/xIdgdLEhOFxaDZ0bRPWJJchRpqOSur/3rZoPbqqki5mm0p4NE2cs28krBEiSM2MB7//afRSQQ==",
+      "dependencies": {
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.11.0",
+        "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
+      "dependencies": {
+        "@babel/parser": "^7.26.2",
+        "@babel/types": "^7.26.0",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
+      "dependencies": {
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz",
+      "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==",
+      "dependencies": {
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+      "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
+      "dependencies": {
+        "@babel/compat-data": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "browserslist": "^4.24.0",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz",
+      "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz",
+      "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "regexpu-core": "^6.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
+      "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+      "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
+      "dependencies": {
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+      "dependencies": {
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+      "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
+      "dependencies": {
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+      "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-wrap-function": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz",
+      "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==",
+      "dependencies": {
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz",
+      "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==",
+      "dependencies": {
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+      "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
+      "dependencies": {
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+      "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
+      "dependencies": {
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+      "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
+      "dependencies": {
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.9.tgz",
+      "integrity": "sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "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"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
+      "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
+      "dependencies": {
+        "@babel/types": "^7.26.0"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
+      "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
+      "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+      "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
+      "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-class-properties": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-decorators": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.25.9.tgz",
+      "integrity": "sha512-smkNLL/O1ezy9Nhy4CNosc4Va+1wo5w4gzSZeLe6y6dM4mmHfYOCPolXQPHQxonZCF+ZyebxN9vqOolkYrSn5g==",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-syntax-decorators": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-numeric-separator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-chaining": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
+      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-methods": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.21.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz",
+      "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.21.0",
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-decorators": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.25.9.tgz",
+      "integrity": "sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-flow": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.26.0.tgz",
+      "integrity": "sha512-B+O2DnPc0iG+YXFqOxv2WNuNU97ToWjOomUQ78DouOENWUaM5sVrmet9mcomUGQFwpJd//gvUagXBSdzO1fRKg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-assertions": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+      "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+      "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+      "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+      "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+      "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz",
+      "integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-remap-async-to-generator": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-remap-async-to-generator": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
+      "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+      "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+      "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-static-block": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
+      "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+      "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+      "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/template": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+      "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+      "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+      "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+      "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz",
+      "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==",
+      "dependencies": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-export-namespace-from": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+      "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-flow-strip-types": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.25.9.tgz",
+      "integrity": "sha512-/VVukELzPDdci7UUsWQaSkhgnjIWXnIyRpM02ldxaVoFK96c41So8JcKT3m0gYjyv7j5FNPGS5vfELrWalkbDA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-syntax-flow": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz",
+      "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+      "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-json-strings": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+      "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+      "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+      "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+      "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+      "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz",
+      "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-simple-access": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+      "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+      "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+      "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz",
+      "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-numeric-separator": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+      "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-rest-spread": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+      "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+      "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+      "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-methods": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+      "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-property-in-object": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+      "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+      "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-constant-elements": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.25.9.tgz",
+      "integrity": "sha512-Ncw2JFsJVuvfRsa2lSHiC55kETQVLSnsYGQ1JDDwkUeWGTL/8Tom8aLTnlqgoeuopWrbbGndrc9AlLYrIosrow==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-display-name": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.9.tgz",
+      "integrity": "sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-jsx": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz",
+      "integrity": "sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-syntax-jsx": "^7.25.9",
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-jsx-development": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.9.tgz",
+      "integrity": "sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==",
+      "dependencies": {
+        "@babel/plugin-transform-react-jsx": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-pure-annotations": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.9.tgz",
+      "integrity": "sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+      "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "regenerator-transform": "^0.15.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regexp-modifiers": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz",
+      "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+      "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz",
+      "integrity": "sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.10.6",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+      "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+      "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+      "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
+      "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
+      "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typescript": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.9.tgz",
+      "integrity": "sha512-7PbZQZP50tzv2KGGnhh82GSyMB01yKY9scIjf1a+GfZCtInOWqUH5+1EBU4t9fyR5Oykkkc9vFTs4OHrhHXljQ==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-syntax-typescript": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+      "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+      "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-regex": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+      "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+      "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.0.tgz",
+      "integrity": "sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==",
+      "dependencies": {
+        "@babel/compat-data": "^7.26.0",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+        "@babel/plugin-syntax-import-assertions": "^7.26.0",
+        "@babel/plugin-syntax-import-attributes": "^7.26.0",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.25.9",
+        "@babel/plugin-transform-async-generator-functions": "^7.25.9",
+        "@babel/plugin-transform-async-to-generator": "^7.25.9",
+        "@babel/plugin-transform-block-scoped-functions": "^7.25.9",
+        "@babel/plugin-transform-block-scoping": "^7.25.9",
+        "@babel/plugin-transform-class-properties": "^7.25.9",
+        "@babel/plugin-transform-class-static-block": "^7.26.0",
+        "@babel/plugin-transform-classes": "^7.25.9",
+        "@babel/plugin-transform-computed-properties": "^7.25.9",
+        "@babel/plugin-transform-destructuring": "^7.25.9",
+        "@babel/plugin-transform-dotall-regex": "^7.25.9",
+        "@babel/plugin-transform-duplicate-keys": "^7.25.9",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
+        "@babel/plugin-transform-dynamic-import": "^7.25.9",
+        "@babel/plugin-transform-exponentiation-operator": "^7.25.9",
+        "@babel/plugin-transform-export-namespace-from": "^7.25.9",
+        "@babel/plugin-transform-for-of": "^7.25.9",
+        "@babel/plugin-transform-function-name": "^7.25.9",
+        "@babel/plugin-transform-json-strings": "^7.25.9",
+        "@babel/plugin-transform-literals": "^7.25.9",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
+        "@babel/plugin-transform-member-expression-literals": "^7.25.9",
+        "@babel/plugin-transform-modules-amd": "^7.25.9",
+        "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+        "@babel/plugin-transform-modules-systemjs": "^7.25.9",
+        "@babel/plugin-transform-modules-umd": "^7.25.9",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
+        "@babel/plugin-transform-new-target": "^7.25.9",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9",
+        "@babel/plugin-transform-numeric-separator": "^7.25.9",
+        "@babel/plugin-transform-object-rest-spread": "^7.25.9",
+        "@babel/plugin-transform-object-super": "^7.25.9",
+        "@babel/plugin-transform-optional-catch-binding": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9",
+        "@babel/plugin-transform-private-methods": "^7.25.9",
+        "@babel/plugin-transform-private-property-in-object": "^7.25.9",
+        "@babel/plugin-transform-property-literals": "^7.25.9",
+        "@babel/plugin-transform-regenerator": "^7.25.9",
+        "@babel/plugin-transform-regexp-modifiers": "^7.26.0",
+        "@babel/plugin-transform-reserved-words": "^7.25.9",
+        "@babel/plugin-transform-shorthand-properties": "^7.25.9",
+        "@babel/plugin-transform-spread": "^7.25.9",
+        "@babel/plugin-transform-sticky-regex": "^7.25.9",
+        "@babel/plugin-transform-template-literals": "^7.25.9",
+        "@babel/plugin-transform-typeof-symbol": "^7.25.9",
+        "@babel/plugin-transform-unicode-escapes": "^7.25.9",
+        "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
+        "@babel/plugin-transform-unicode-regex": "^7.25.9",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.10.6",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
+        "core-js-compat": "^3.38.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env/node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.6-no-external-plugins",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@babel/preset-react": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
+      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-transform-react-display-name": "^7.25.9",
+        "@babel/plugin-transform-react-jsx": "^7.25.9",
+        "@babel/plugin-transform-react-jsx-development": "^7.25.9",
+        "@babel/plugin-transform-react-pure-annotations": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-typescript": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.26.0.tgz",
+      "integrity": "sha512-NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-syntax-jsx": "^7.25.9",
+        "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+        "@babel/plugin-transform-typescript": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
+      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/runtime-corejs3": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.26.0.tgz",
+      "integrity": "sha512-YXHu5lN8kJCb1LOb9PgV6pvak43X2h4HvRApcN5SdWeaItQOzfn1hgP6jasD6KWQyJDBxrVmA9o9OivlnNJK/w==",
+      "dependencies": {
+        "core-js-pure": "^3.30.2",
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+      "dependencies": {
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+      "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+      "dependencies": {
+        "@babel/code-frame": "^7.25.9",
+        "@babel/generator": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.25.9",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
+      "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
+    },
+    "node_modules/@csstools/normalize.css": {
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.1.1.tgz",
+      "integrity": "sha512-YAYeJ+Xqh7fUou1d1j9XHl44BmsuThiTr4iNrgCQ3J27IbhXsxXDGZ1cXv8Qvs99d4rBbLiSKy3+WZiet32PcQ=="
+    },
+    "node_modules/@csstools/postcss-cascade-layers": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
+      "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.2",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-color-function": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
+      "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-font-format-keywords": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
+      "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-hwb-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
+      "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-ic-unit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
+      "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
+      "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-nested-calc": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
+      "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-normalize-display-values": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
+      "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-oklab-function": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
+      "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-progressive-custom-properties": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
+      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-stepped-value-functions": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
+      "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-text-decoration-shorthand": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
+      "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-trigonometric-functions": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
+      "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-unset-value": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
+      "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@datadog/browser-core": {
+      "version": "1.26.3",
+      "resolved": "https://registry.npmjs.org/@datadog/browser-core/-/browser-core-1.26.3.tgz",
+      "integrity": "sha512-/YrSvljK4RnjiLBX18P23PtcpYUPnSUVafy+41MatN8ZjtdzFsdK4VxQWhLFygG/Au8pvXacU1Kg7CVRk7hbMQ==",
+      "dependencies": {
+        "tslib": "^1.10.0"
+      }
+    },
+    "node_modules/@datadog/browser-logs": {
+      "version": "1.26.3",
+      "resolved": "https://registry.npmjs.org/@datadog/browser-logs/-/browser-logs-1.26.3.tgz",
+      "integrity": "sha512-bVE4hWV+vkUtG3bh3o0K+rWCGlMLtDmqoBvmjylWMbmLkHM/ua1QTqgQY2m36erS6MPXgQDVy4q0BAp9vwjFPA==",
+      "dependencies": {
+        "@datadog/browser-core": "1.26.3",
+        "tslib": "^1.10.0"
+      }
+    },
+    "node_modules/@emotion/hash": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
+      "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
+    },
+    "node_modules/@emotion/unitless": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
+      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
+      "dependencies": {
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "deprecated": "Use @eslint/config-array instead",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "deprecated": "Use @eslint/object-schema instead"
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/console/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/console/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/console/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
+      "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/reporters": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.8.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^27.5.1",
+        "jest-config": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-resolve-dependencies": "^27.5.1",
+        "jest-runner": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "jest-watcher": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/core/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/core/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
+      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+      "dependencies": {
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/environment/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/environment/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/environment/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
+      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@sinonjs/fake-timers": "^8.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/fake-timers/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/fake-timers/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/fake-timers/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/globals": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
+      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "expect": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/reporters": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
+      "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-haste-map": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^8.1.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
+      "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
+      "dependencies": {
+        "@sinclair/typebox": "^0.24.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
+      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+      "dependencies": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/test-result/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/test-result/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/test-result/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/test-sequencer": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
+      "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+      "dependencies": {
+        "@jest/test-result": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-runtime": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
+      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^27.5.1",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+    },
+    "node_modules/@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/types/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@leichtgewicht/ip-codec": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
+      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw=="
+    },
+    "node_modules/@microsoft/signalr": {
+      "version": "8.0.7",
+      "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-8.0.7.tgz",
+      "integrity": "sha512-PHcdMv8v5hJlBkRHAuKG5trGViQEkPYee36LnJQx4xHOQ5LL4X0nEWIxOp5cCtZ7tu+30quz5V3k0b1YNuc6lw==",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "eventsource": "^2.0.2",
+        "fetch-cookie": "^2.0.3",
+        "node-fetch": "^2.6.7",
+        "ws": "^7.4.5"
+      }
+    },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dependencies": {
+        "eslint-scope": "5.1.1"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+      "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.0",
+        "@parcel/watcher-darwin-arm64": "2.5.0",
+        "@parcel/watcher-darwin-x64": "2.5.0",
+        "@parcel/watcher-freebsd-x64": "2.5.0",
+        "@parcel/watcher-linux-arm-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm-musl": "2.5.0",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm64-musl": "2.5.0",
+        "@parcel/watcher-linux-x64-glibc": "2.5.0",
+        "@parcel/watcher-linux-x64-musl": "2.5.0",
+        "@parcel/watcher-win32-arm64": "2.5.0",
+        "@parcel/watcher-win32-ia32": "2.5.0",
+        "@parcel/watcher-win32-x64": "2.5.0"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+      "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+      "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+      "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+      "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+      "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+      "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+      "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+      "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+      "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+      "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+      "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+      "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+      "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@pkgr/core": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+      "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
+    "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
+      "version": "0.5.15",
+      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.15.tgz",
+      "integrity": "sha512-LFWllMA55pzB9D34w/wXUCf8+c+IYKuJDgxiZ3qMhl64KRMBHYM1I3VdGaD2BV5FNPV2/S2596bppxHbv2ZydQ==",
+      "dependencies": {
+        "ansi-html": "^0.0.9",
+        "core-js-pure": "^3.23.3",
+        "error-stack-parser": "^2.0.6",
+        "html-entities": "^2.1.0",
+        "loader-utils": "^2.0.4",
+        "schema-utils": "^4.2.0",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">= 10.13"
+      },
+      "peerDependencies": {
+        "@types/webpack": "4.x || 5.x",
+        "react-refresh": ">=0.10.0 <1.0.0",
+        "sockjs-client": "^1.4.0",
+        "type-fest": ">=0.17.0 <5.0.0",
+        "webpack": ">=4.43.0 <6.0.0",
+        "webpack-dev-server": "3.x || 4.x || 5.x",
+        "webpack-hot-middleware": "2.x",
+        "webpack-plugin-serve": "0.x || 1.x"
+      },
+      "peerDependenciesMeta": {
+        "@types/webpack": {
+          "optional": true
+        },
+        "sockjs-client": {
+          "optional": true
+        },
+        "type-fest": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        },
+        "webpack-hot-middleware": {
+          "optional": true
+        },
+        "webpack-plugin-serve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@rc-component/async-validator": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@rc-component/async-validator/-/async-validator-5.0.4.tgz",
+      "integrity": "sha512-qgGdcVIF604M9EqjNF0hbUTz42bz/RDtxWdWuU5EQe3hi7M8ob54B6B35rOsvX5eSvIHIzT9iH1R3n+hk3CGfg==",
+      "dependencies": {
+        "@babel/runtime": "^7.24.4"
+      },
+      "engines": {
+        "node": ">=14.x"
+      }
+    },
+    "node_modules/@rc-component/color-picker": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@rc-component/color-picker/-/color-picker-2.0.1.tgz",
+      "integrity": "sha512-WcZYwAThV/b2GISQ8F+7650r5ZZJ043E57aVBFkQ+kSY4C6wdofXgB0hBx+GPGpIU0Z81eETNoDUJMr7oy/P8Q==",
+      "dependencies": {
+        "@ant-design/fast-color": "^2.0.6",
+        "@babel/runtime": "^7.23.6",
+        "classnames": "^2.2.6",
+        "rc-util": "^5.38.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/@rc-component/context": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@rc-component/context/-/context-1.4.0.tgz",
+      "integrity": "sha512-kFcNxg9oLRMoL3qki0OMxK+7g5mypjgaaJp/pkOis/6rVxma9nJBF/8kCIuTYHUQNr0ii7MxqE33wirPZLJQ2w==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "rc-util": "^5.27.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/@rc-component/mini-decimal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rc-component/mini-decimal/-/mini-decimal-1.1.0.tgz",
+      "integrity": "sha512-jS4E7T9Li2GuYwI6PyiVXmxTiM6b07rlD9Ge8uGZSCz3WlzcG5ZK7g5bbuKNeZ9pgUuPK/5guV781ujdVpm4HQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.18.0"
+      },
+      "engines": {
+        "node": ">=8.x"
+      }
+    },
+    "node_modules/@rc-component/mutate-observer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rc-component/mutate-observer/-/mutate-observer-1.1.0.tgz",
+      "integrity": "sha512-QjrOsDXQusNwGZPf4/qRQasg7UFEj06XiCJ8iuiq/Io7CrHrgVi6Uuetw60WAMG1799v+aM8kyc+1L/GBbHSlw==",
+      "dependencies": {
+        "@babel/runtime": "^7.18.0",
+        "classnames": "^2.3.2",
+        "rc-util": "^5.24.4"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/@rc-component/portal": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@rc-component/portal/-/portal-1.1.2.tgz",
+      "integrity": "sha512-6f813C0IsasTZms08kfA8kPAGxbbkYToa8ALaiDIGGECU4i9hj8Plgbx0sNJDrey3EtHO30hmdaxtT0138xZcg==",
+      "dependencies": {
+        "@babel/runtime": "^7.18.0",
+        "classnames": "^2.3.2",
+        "rc-util": "^5.24.4"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/@rc-component/qrcode": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@rc-component/qrcode/-/qrcode-1.0.0.tgz",
+      "integrity": "sha512-L+rZ4HXP2sJ1gHMGHjsg9jlYBX/SLN2D6OxP9Zn3qgtpMWtO2vUfxVFwiogHpAIqs54FnALxraUy/BCO1yRIgg==",
+      "dependencies": {
+        "@babel/runtime": "^7.24.7",
+        "classnames": "^2.3.2",
+        "rc-util": "^5.38.0"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/@rc-component/tour": {
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/@rc-component/tour/-/tour-1.15.1.tgz",
+      "integrity": "sha512-Tr2t7J1DKZUpfJuDZWHxyxWpfmj8EZrqSgyMZ+BCdvKZ6r1UDsfU46M/iWAAFBy961Ssfom2kv5f3UcjIL2CmQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.18.0",
+        "@rc-component/portal": "^1.0.0-9",
+        "@rc-component/trigger": "^2.0.0",
+        "classnames": "^2.3.2",
+        "rc-util": "^5.24.4"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/@rc-component/trigger": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.2.7.tgz",
+      "integrity": "sha512-Qggj4Z0AA2i5dJhzlfFSmg1Qrziu8dsdHOihROL5Kl18seO2Eh/ZaTYt2c8a/CyGaTChnFry7BEYew1+/fhSbA==",
+      "dependencies": {
+        "@babel/runtime": "^7.23.2",
+        "@rc-component/portal": "^1.1.0",
+        "classnames": "^2.3.2",
+        "rc-motion": "^2.0.0",
+        "rc-resize-observer": "^1.3.1",
+        "rc-util": "^5.44.0"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/@rollup/plugin-babel": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
+      "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@rollup/pluginutils": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "@types/babel__core": "^7.1.9",
+        "rollup": "^1.20.0||^2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/babel__core": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-node-resolve": {
+      "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
+      "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "builtin-modules": "^3.1.0",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0"
+      }
+    },
+    "node_modules/@rollup/plugin-replace": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz",
+      "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "magic-string": "^0.25.7"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0 || ^2.0.0"
+      }
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
+      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+      "dependencies": {
+        "@types/estree": "0.0.39",
+        "estree-walker": "^1.0.1",
+        "picomatch": "^2.2.2"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0"
+      }
+    },
+    "node_modules/@rollup/pluginutils/node_modules/@types/estree": {
+      "version": "0.0.39",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
+    },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g=="
+    },
+    "node_modules/@rushstack/eslint-patch": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.10.4.tgz",
+      "integrity": "sha512-WJgX9nzTqknM393q1QJDJmoW28kUfEnybeTfVNcNAPnIx210RXm2DiXiHzfNPJNIUUb1tJnz/l4QGtJ30PgWmA=="
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.24.51",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
+      "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/@strata/charts": {
+      "version": "0.2.0",
+      "resolved": "https://proget.ops.stratanetwork.net/npm/npm/%40strata/charts/-/charts-0.2.0.tgz",
+      "integrity": "sha512-1KFk+vg0Tt9YkGVeJM1Rxm/bymKJFZ10UoTdWhfbhMXQa3ctTgVHIhrXEGpksBeriBo+f3pRPDJrTixPRougng==",
+      "license": "ISC",
+      "dependencies": {
+        "@types/chart.js": "^2.9.29",
+        "@types/lodash.merge": "^4.6.6",
+        "chart.js": "^2.9.4",
+        "lodash.merge": "^4.6.2",
+        "react-chartjs-2": "^2.11.1"
+      },
+      "peerDependencies": {
+        "react": "^16.13.1"
+      }
+    },
+    "node_modules/@strata/core": {
+      "version": "5.3.0",
+      "resolved": "https://proget.ops.stratanetwork.net/npm/npm/%40strata/core/-/core-5.3.0.tgz",
+      "integrity": "sha512-i39o21wXlscNdOGsI5v3tjr20UHMFvGGgy9Ja4QpE3WBcy648U5GSoDaAnxmkghnsSRmMysDZPLAJth8UUUuEA==",
+      "license": "ISC",
+      "dependencies": {
+        "@strata/eslint-config": "^3.6.0",
+        "@strata/intl": "^4.1.0",
+        "@strata/logging": "^0.2.0",
+        "@strata/strataweb": "^2.304.1",
+        "@types/pendo-io-browser": "^2.19.1",
+        "@typescript-eslint/eslint-plugin": "^4.28.0",
+        "downloadjs": "^1.4.7",
+        "eslint": "^7.32.0",
+        "eslint-plugin-flowtype": "^5.10.0",
+        "eslint-plugin-import": "^2.28.1",
+        "eslint-plugin-jsx-a11y": "^6.7.1",
+        "eslint-plugin-prettier": "^3.4.1",
+        "eslint-plugin-react": "^7.33.2",
+        "eslint-plugin-react-hooks": "^4.6.0",
+        "oidc-client-ts": "^2.4.0",
+        "prettier": "^2.8.8",
+        "react-oidc-context": "^2.3.1"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0"
+      }
+    },
+    "node_modules/@strata/eslint-config": {
+      "version": "3.6.0",
+      "resolved": "https://proget.sdt.local/npm/npm/@strata/eslint-config/-/eslint-config-3.6.0.tgz",
+      "integrity": "sha512-soD6eIAlhxi20zM5I4rmzhbD/4XIYc/elSpdF+g6C7GVmfyhepJ8ty4CNMcY2HPYnfu/Uo4cjYRMrMaBFIDA1A==",
+      "license": "ISC",
+      "dependencies": {
+        "@typescript-eslint/parser": "^4.15.2",
+        "babel-eslint": "^10.1.0",
+        "eslint-config-prettier": "^7.1.0",
+        "eslint-config-react-app": "^6.0.0"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^4.15.2",
+        "eslint": "^7.20.0",
+        "eslint-plugin-flowtype": "^5.3.0",
+        "eslint-plugin-import": "^2.22.1",
+        "eslint-plugin-jsx-a11y": "^6.4.1",
+        "eslint-plugin-prettier": "^3.3.1",
+        "eslint-plugin-react": "^7.22.0",
+        "eslint-plugin-react-hooks": "^4.2.0",
+        "prettier": "^2.2.1",
+        "react": ">=16.13.1"
+      }
+    },
+    "node_modules/@strata/intl": {
+      "version": "4.2.1",
+      "resolved": "https://proget.sdt.local/npm/npm/@strata/intl/-/intl-4.2.1.tgz",
+      "integrity": "sha512-zYnOGArdcux3X6aXqxl8TtST2M31i8gAAlinbMtZkHKd3FVrjwIdGFjEQDLGjmutnhr2T3CpMqQlrP/ymyfo3A==",
+      "license": "ISC",
+      "dependencies": {
+        "@strata/eslint-config": "^3.5.0",
+        "@typescript-eslint/eslint-plugin": "^4.28.0",
+        "dayjs": "^1.11.8",
+        "eslint": "^7.29.0",
+        "eslint-plugin-flowtype": "^5.7.2",
+        "eslint-plugin-import": "^2.23.4",
+        "eslint-plugin-jsx-a11y": "^6.4.1",
+        "eslint-plugin-prettier": "^3.4.0",
+        "eslint-plugin-react": "^7.24.0",
+        "eslint-plugin-react-hooks": "^4.2.0",
+        "numbro": "^2.3.2",
+        "prettier": "^2.3.1"
+      }
+    },
+    "node_modules/@strata/jazz": {
+      "version": "0.6.1",
+      "resolved": "https://proget.sdt.local/npm/npm/@strata/jazz/-/jazz-0.6.1.tgz",
+      "integrity": "sha512-tiWtAlT/JxofKnUfUap3n67xLToTMAHPHp5pncOMb7fwGjaZmGkPrh1pSkJYQFCga7D3GD+wiXfl11x9W39zyg==",
+      "license": "ISC",
+      "dependencies": {
+        "@strata/core": "^5.0.0",
+        "@strata/eslint-config": "^3.6.0-1",
+        "@strata/settings": "^0.3.0",
+        "@strata/tempo": "^6.12.0",
+        "@typescript-eslint/eslint-plugin": "^4.28.0",
+        "eslint": "^8.56.0",
+        "eslint-plugin-flowtype": "^8.0.3",
+        "eslint-plugin-import": "^2.29.1",
+        "eslint-plugin-jsx-a11y": "^6.8.0",
+        "eslint-plugin-prettier": "^5.1.3",
+        "eslint-plugin-react": "^7.33.2",
+        "eslint-plugin-react-hooks": "^4.6.0",
+        "prettier": "^3.2.5"
+      },
+      "peerDependencies": {
+        "react": "^16.13.1"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/@humanwhocodes/config-array": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
+      "deprecated": "Use @eslint/config-array instead",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.3",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead"
+    },
+    "node_modules/@strata/jazz/node_modules/acorn": {
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "node_modules/@strata/jazz/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/eslint": {
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/eslint-plugin-flowtype": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
+      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "string-natural-compare": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@babel/plugin-syntax-flow": "^7.14.5",
+        "@babel/plugin-transform-react-jsx": "^7.14.9",
+        "eslint": "^8.1.0"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/eslint-plugin-prettier": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz",
+      "integrity": "sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==",
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.0",
+        "synckit": "^0.9.1"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-plugin-prettier"
+      },
+      "peerDependencies": {
+        "@types/eslint": ">=8.0.0",
+        "eslint": ">=8.0.0",
+        "eslint-config-prettier": "*",
+        "prettier": ">=3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/eslint": {
+          "optional": true
+        },
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/find-up": {
+      "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"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/js-yaml": {
+      "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"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/@strata/jazz/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/prettier": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/@strata/jazz/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@strata/logging": {
+      "version": "0.2.0",
+      "resolved": "https://proget.ops.stratanetwork.net/npm/npm/%40strata/logging/-/logging-0.2.0.tgz",
+      "integrity": "sha512-ryVU6EDwPpFE/bwbzJCvckfo5VHHOrBwdZi8TQo9q+Z5nbTg5hdJj+l9E5I+278g9iQ72dZq932WGyf/nR2N0w==",
+      "license": "ISC",
+      "dependencies": {
+        "@datadog/browser-logs": "^1.25.2",
+        "@strata/eslint-config": "^3.5.0",
+        "@typescript-eslint/eslint-plugin": "^4.28.0",
+        "eslint": "^7.29.0",
+        "eslint-plugin-flowtype": "^5.7.2",
+        "eslint-plugin-import": "^2.23.4",
+        "eslint-plugin-jsx-a11y": "^6.4.1",
+        "eslint-plugin-prettier": "^3.4.0",
+        "eslint-plugin-react": "^7.24.0",
+        "eslint-plugin-react-hooks": "^4.2.0",
+        "prettier": "^2.3.1"
+      },
+      "peerDependencies": {
+        "react": "^16.13.1",
+        "react-router-dom": "^5.2.0"
+      }
+    },
+    "node_modules/@strata/navbar": {
+      "version": "4.27.0",
+      "resolved": "https://proget.ops.stratanetwork.net/npm/npm/%40strata/navbar/-/navbar-4.27.0.tgz",
+      "integrity": "sha512-u2O29s/7PJbvgO1wuHT3ZLuAC7dyrVMBBVxpuFp5obGTJplEBf440r5G+17X46CRyTTbXfZSuU5rxt9tJrXbJw==",
+      "dependencies": {
+        "@strata/core": "^5.0.0"
+      },
+      "peerDependencies": {
+        "react": "^16.13.1"
+      }
+    },
+    "node_modules/@strata/score": {
+      "version": "2.4.3",
+      "resolved": "https://proget.ops.stratanetwork.net/npm/npm/%40strata/score/-/score-2.4.3.tgz",
+      "integrity": "sha512-dVWj1MhmE9d9arB448yHkQVaTrt0Ee7WkO/4R7DqPHTDV3Iwval10xCrgLUaRFDTecN6vfKaowbzLazm5zOv4Q==",
+      "license": "ISC",
+      "dependencies": {
+        "@strata/core": "^5.0.0",
+        "@strata/eslint-config": "^3.5.0",
+        "@strata/tempo": "^6.0.0",
+        "@typescript-eslint/eslint-plugin": "^4.28.0",
+        "eslint": "^7.29.0",
+        "eslint-plugin-flowtype": "^5.7.2",
+        "eslint-plugin-import": "^2.23.4",
+        "eslint-plugin-jsx-a11y": "^6.4.1",
+        "eslint-plugin-prettier": "^3.4.0",
+        "eslint-plugin-react": "^7.24.0",
+        "eslint-plugin-react-hooks": "^4.2.0",
+        "prettier": "^2.3.1"
+      },
+      "peerDependencies": {
+        "react": "^16.13.1"
+      }
+    },
+    "node_modules/@strata/settings": {
+      "version": "0.3.0",
+      "resolved": "https://proget.sdt.local/npm/npm/@strata/settings/-/settings-0.3.0.tgz",
+      "integrity": "sha512-yLuSyILUBWFadtP5zRsj9S9F+UIo2P5I9D2RlkmwSYffY6pt3TBoMkK4RA7pXSTeF/Pq6sEqc36MkdiypICISA==",
+      "license": "ISC",
+      "dependencies": {
+        "@strata/core": "^5.0.0",
+        "@strata/eslint-config": "^3.6.0-1",
+        "@typescript-eslint/eslint-plugin": "^4.28.0",
+        "eslint": "^8.56.0",
+        "eslint-plugin-flowtype": "^8.0.3",
+        "eslint-plugin-import": "^2.29.1",
+        "eslint-plugin-jsx-a11y": "^6.8.0",
+        "eslint-plugin-prettier": "^5.1.3",
+        "eslint-plugin-react": "^7.33.2",
+        "eslint-plugin-react-hooks": "^4.6.0",
+        "prettier": "^3.2.5"
+      },
+      "peerDependencies": {
+        "react": "^16.13.1"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/@humanwhocodes/config-array": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
+      "deprecated": "Use @eslint/config-array instead",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.3",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead"
+    },
+    "node_modules/@strata/settings/node_modules/acorn": {
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "node_modules/@strata/settings/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/eslint": {
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/eslint-plugin-flowtype": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
+      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "string-natural-compare": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@babel/plugin-syntax-flow": "^7.14.5",
+        "@babel/plugin-transform-react-jsx": "^7.14.9",
+        "eslint": "^8.1.0"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/eslint-plugin-prettier": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz",
+      "integrity": "sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==",
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.0",
+        "synckit": "^0.9.1"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-plugin-prettier"
+      },
+      "peerDependencies": {
+        "@types/eslint": ">=8.0.0",
+        "eslint": ">=8.0.0",
+        "eslint-config-prettier": "*",
+        "prettier": ">=3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/eslint": {
+          "optional": true
+        },
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@strata/settings/node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/find-up": {
+      "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"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/js-yaml": {
+      "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"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/@strata/settings/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/prettier": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/@strata/settings/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@strata/signalr": {
+      "version": "0.8.1",
+      "resolved": "https://proget.sdt.local/npm/npm/@strata/signalr/-/signalr-0.8.1.tgz",
+      "integrity": "sha512-gtBvLDOO3JmVSHS8ZF3g82+7O4QRXaby7s0fcRZn1RSnmhzZiXXQdDyROuV7SipZOJ4NJpT6XOJ3crhVTkiWOw==",
+      "license": "ISC",
+      "dependencies": {
+        "@microsoft/signalr": "^8.0.0",
+        "@strata/core": "^5.0.0",
+        "@strata/eslint-config": "^3.5.0",
+        "@typescript-eslint/eslint-plugin": "^4.28.0",
+        "eslint": "^7.29.0",
+        "eslint-plugin-flowtype": "^5.7.2",
+        "eslint-plugin-import": "^2.23.4",
+        "eslint-plugin-jsx-a11y": "^6.4.1",
+        "eslint-plugin-prettier": "^3.4.0",
+        "eslint-plugin-react": "^7.24.0",
+        "eslint-plugin-react-hooks": "^4.2.0",
+        "prettier": "^2.3.1"
+      },
+      "peerDependencies": {
+        "react": "^16.13.1"
+      }
+    },
+    "node_modules/@strata/strataweb": {
+      "version": "2.330.0",
+      "resolved": "https://proget.sdt.local/npm/npm/@strata/strataweb/-/strataweb-2.330.0.tgz",
+      "integrity": "sha512-qidl/Y46KpyDgsW5zNWPewr4IE0xTohfOyt18n917h84nDIDxzeP1/85V7Vc04+JQsjPsaFlkhyTaiZT6f+Tyg==",
+      "license": "ISC"
+    },
+    "node_modules/@strata/styles": {
+      "version": "3.2.0",
+      "resolved": "https://proget.ops.stratanetwork.net/npm/npm/%40strata/styles/-/styles-3.2.0.tgz",
+      "integrity": "sha512-2nO1wWgs4LTMbFiqkF37ATGQnCDev2QJ9mQgubJP5VixTJPiw9I9SF7aPSgvRGRddAiYeTGc+lZD5ao8/bkIXw=="
+    },
+    "node_modules/@strata/tempo": {
+      "version": "6.33.0",
+      "resolved": "https://proget.ops.stratanetwork.net/npm/npm/%40strata/tempo/-/tempo-6.33.0.tgz",
+      "integrity": "sha512-7JYUTLem/xuHKSlQna0BMeufsuLLnpCj5hBhI5LTaihkgTqXf9LW81MyiNtVoBNEefta8ppTdfVvn6sqw+Yj+w==",
+      "dependencies": {
+        "@ant-design/icons": "^5.1.4",
+        "@strata/intl": "^4.1.0",
+        "@strata/logging": "0.0.3",
+        "@strata/styles": "^3.2.0",
+        "@types/url-parse": "^1.4.3",
+        "antd": "^5.25.3",
+        "async-validator": "^3.4.0",
+        "bootstrap": "^4.5.0",
+        "less": "^3.11.3",
+        "lodash": "^4.17.15",
+        "primereact": "6.3.2",
+        "react-svg": "^11.0.28",
+        "react-transition-group": "^4.4.1",
+        "url-parse": "^1.4.7"
+      },
+      "peerDependencies": {
+        "react": "^16.13.1",
+        "react-dom": "^16.13.1",
+        "react-router-dom": "^5.2.0"
+      }
+    },
+    "node_modules/@strata/tempo/node_modules/@strata/logging": {
+      "version": "0.0.3",
+      "resolved": "https://proget.sdt.local/npm/npm/@strata/logging/-/logging-0.0.3.tgz",
+      "integrity": "sha1-ZJTBiN/nYBgPxlbFjrzrozpoHPI=",
+      "license": "ISC",
+      "dependencies": {
+        "@datadog/browser-logs": "^1.25.2"
+      },
+      "peerDependencies": {
+        "react": "^16.13.1",
+        "react-router-dom": "^5.2.0"
+      }
+    },
+    "node_modules/@strata/test-utils": {
+      "version": "2.0.0",
+      "resolved": "https://proget.sdt.local/npm/npm/@strata/test-utils/-/test-utils-2.0.0.tgz",
+      "integrity": "sha512-i95v2u4TWB02DZ809txjB5PZ6AMuX8VpvA4PtFDOVBzyWTYZb48lL8b+mRLmFHtgiSKS9jIUVWPODUs8ZZi/SA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@strata/eslint-config": "^3.6.0",
+        "@typescript-eslint/eslint-plugin": "^4.15.2",
+        "eslint": "^7.20.0",
+        "eslint-plugin-flowtype": "^5.3.0",
+        "eslint-plugin-import": "^2.22.1",
+        "eslint-plugin-jsx-a11y": "^6.4.1",
+        "eslint-plugin-prettier": "^3.3.1",
+        "eslint-plugin-react": "^7.22.0",
+        "eslint-plugin-react-hooks": "^4.2.0",
+        "prettier": "^2.3.1"
+      },
+      "peerDependencies": {
+        "@testing-library/jest-dom": "5.16.1",
+        "@testing-library/react": "12.1.2",
+        "@testing-library/user-event": "13.5.0",
+        "react": "^16.13.1",
+        "react-dom": "^16.13.1"
+      }
+    },
+    "node_modules/@surma/rollup-plugin-off-main-thread": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
+      "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
+      "dependencies": {
+        "ejs": "^3.1.6",
+        "json5": "^2.2.0",
+        "magic-string": "^0.25.0",
+        "string.prototype.matchall": "^4.0.6"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz",
+      "integrity": "sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-remove-jsx-attribute": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz",
+      "integrity": "sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz",
+      "integrity": "sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz",
+      "integrity": "sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-svg-dynamic-title": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz",
+      "integrity": "sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-svg-em-dimensions": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz",
+      "integrity": "sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-transform-react-native-svg": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz",
+      "integrity": "sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-transform-svg-component": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz",
+      "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/babel-preset": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz",
+      "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==",
+      "dependencies": {
+        "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0",
+        "@svgr/babel-plugin-remove-jsx-attribute": "^5.4.0",
+        "@svgr/babel-plugin-remove-jsx-empty-expression": "^5.0.1",
+        "@svgr/babel-plugin-replace-jsx-attribute-value": "^5.0.1",
+        "@svgr/babel-plugin-svg-dynamic-title": "^5.4.0",
+        "@svgr/babel-plugin-svg-em-dimensions": "^5.4.0",
+        "@svgr/babel-plugin-transform-react-native-svg": "^5.4.0",
+        "@svgr/babel-plugin-transform-svg-component": "^5.5.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/core": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz",
+      "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==",
+      "dependencies": {
+        "@svgr/plugin-jsx": "^5.5.0",
+        "camelcase": "^6.2.0",
+        "cosmiconfig": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/hast-util-to-babel-ast": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz",
+      "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==",
+      "dependencies": {
+        "@babel/types": "^7.12.6"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/plugin-jsx": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz",
+      "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@svgr/babel-preset": "^5.5.0",
+        "@svgr/hast-util-to-babel-ast": "^5.5.0",
+        "svg-parser": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/plugin-svgo": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz",
+      "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==",
+      "dependencies": {
+        "cosmiconfig": "^7.0.0",
+        "deepmerge": "^4.2.2",
+        "svgo": "^1.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/webpack": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz",
+      "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/plugin-transform-react-constant-elements": "^7.12.1",
+        "@babel/preset-env": "^7.12.1",
+        "@babel/preset-react": "^7.12.5",
+        "@svgr/core": "^5.5.0",
+        "@svgr/plugin-jsx": "^5.5.0",
+        "@svgr/plugin-svgo": "^5.5.0",
+        "loader-utils": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@tanem/svg-injector": {
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/@tanem/svg-injector/-/svg-injector-8.2.5.tgz",
+      "integrity": "sha512-jQ6UPPY2oSu2d0YLngtvnOIoKheYsB/s2bNP/QdsLrsvlz+PzUUO4RUWBN3+8clZPi2SI5OMF/YoTiTKt5v2xw==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.13",
+        "content-type": "^1.0.4",
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@tanem/svg-injector/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+    },
+    "node_modules/@testing-library/dom": {
+      "version": "7.31.2",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.31.2.tgz",
+      "integrity": "sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==",
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/runtime": "^7.12.5",
+        "@types/aria-query": "^4.2.0",
+        "aria-query": "^4.2.2",
+        "chalk": "^4.1.0",
+        "dom-accessibility-api": "^0.5.6",
+        "lz-string": "^1.4.4",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@testing-library/dom/node_modules/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/@testing-library/dom/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@testing-library/jest-dom": {
+      "version": "5.17.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz",
+      "integrity": "sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==",
+      "dependencies": {
+        "@adobe/css-tools": "^4.0.1",
+        "@babel/runtime": "^7.9.2",
+        "@types/testing-library__jest-dom": "^5.9.1",
+        "aria-query": "^5.0.0",
+        "chalk": "^3.0.0",
+        "css.escape": "^1.5.1",
+        "dom-accessibility-api": "^0.5.6",
+        "lodash": "^4.17.15",
+        "redent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8",
+        "npm": ">=6",
+        "yarn": ">=1"
+      }
+    },
+    "node_modules/@testing-library/react": {
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz",
+      "integrity": "sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@testing-library/dom": "^7.28.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-dom": "*"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@trysound/sax": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@types/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig=="
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.20.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+      "dependencies": {
+        "@babel/types": "^7.20.7"
+      }
+    },
+    "node_modules/@types/body-parser": {
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
+      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/bonjour": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/chart.js": {
+      "version": "2.9.41",
+      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.41.tgz",
+      "integrity": "sha512-3dvkDvueckY83UyUXtJMalYoH6faOLkWQoaTlJgB4Djde3oORmNP0Jw85HtzTuXyliUHcdp704s0mZFQKio/KQ==",
+      "dependencies": {
+        "moment": "^2.10.2"
+      }
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
+      "dependencies": {
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/eslint": {
+      "version": "8.56.12",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.12.tgz",
+      "integrity": "sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==",
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
+    },
+    "node_modules/@types/express": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
+      "dependencies": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.33",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "node_modules/@types/express-serve-static-core": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.1.tgz",
+      "integrity": "sha512-CRICJIl0N5cXDONAdlTv5ShATZ4HEwk6kDDIW2/w9qOWKg+NU/5F8wYRWCrONad0/UKkloNSmmyN/wX4rtpbVA==",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/express/node_modules/@types/express-serve-static-core": {
+      "version": "4.19.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
+      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/history": {
+      "version": "4.7.11",
+      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
+      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA=="
+    },
+    "node_modules/@types/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
+    },
+    "node_modules/@types/http-errors": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="
+    },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.15",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
+      "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest": {
+      "version": "27.5.2",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.2.tgz",
+      "integrity": "sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==",
+      "dependencies": {
+        "jest-matcher-utils": "^27.0.0",
+        "pretty-format": "^27.0.0"
+      }
+    },
+    "node_modules/@types/jest/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@types/jest/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.17.13",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
+      "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg=="
+    },
+    "node_modules/@types/lodash.debounce": {
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@types/lodash.debounce/-/lodash.debounce-4.0.9.tgz",
+      "integrity": "sha512-Ma5JcgTREwpLRwMM+XwBR7DaWe96nC38uCBDFKZWbNKD+osjVzdpnUSwBcqCptrp16sSOLBAUb50Car5I0TCsQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
+    "node_modules/@types/lodash.merge": {
+      "version": "4.6.9",
+      "resolved": "https://registry.npmjs.org/@types/lodash.merge/-/lodash.merge-4.6.9.tgz",
+      "integrity": "sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==",
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
+    "node_modules/@types/mime": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
+    },
+    "node_modules/@types/node": {
+      "version": "14.18.63",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
+      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ=="
+    },
+    "node_modules/@types/node-forge": {
+      "version": "1.3.11",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+      "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
+    },
+    "node_modules/@types/pendo-io-browser": {
+      "version": "2.19.1",
+      "resolved": "https://registry.npmjs.org/@types/pendo-io-browser/-/pendo-io-browser-2.19.1.tgz",
+      "integrity": "sha512-bk/0qU1mSSVhDq0db6Zvtvwh8XXf5t5SwlDeDZUVkwKb8am07YAZkURSl/gDxgcqYS499Vw4vpwVYIYzSFuUZw=="
+    },
+    "node_modules/@types/prettier": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
+      "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA=="
+    },
+    "node_modules/@types/prop-types": {
+      "version": "15.7.13",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz",
+      "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA=="
+    },
+    "node_modules/@types/q": {
+      "version": "1.5.8",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.8.tgz",
+      "integrity": "sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw=="
+    },
+    "node_modules/@types/qs": {
+      "version": "6.9.17",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
+      "integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ=="
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="
+    },
+    "node_modules/@types/react": {
+      "version": "17.0.83",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.83.tgz",
+      "integrity": "sha512-l0m4ArKJvmFtR4e8UmKrj1pB4tUgOhJITf+mADyF/p69Ts1YAR/E+G9XEM0mHXKVRa1dQNHseyyDNzeuAXfXQw==",
+      "dependencies": {
+        "@types/prop-types": "*",
+        "@types/scheduler": "^0.16",
+        "csstype": "^3.0.2"
+      }
+    },
+    "node_modules/@types/react-dom": {
+      "version": "17.0.25",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.25.tgz",
+      "integrity": "sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==",
+      "dependencies": {
+        "@types/react": "^17"
+      }
+    },
+    "node_modules/@types/react-router": {
+      "version": "5.1.20",
+      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.20.tgz",
+      "integrity": "sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==",
+      "dependencies": {
+        "@types/history": "^4.7.11",
+        "@types/react": "*"
+      }
+    },
+    "node_modules/@types/react-router-dom": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
+      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
+      "dependencies": {
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "@types/react-router": "*"
+      }
+    },
+    "node_modules/@types/react-test-renderer": {
+      "version": "17.0.9",
+      "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-17.0.9.tgz",
+      "integrity": "sha512-bOfxcu5oZ+KxvACScbkTwZ4eGCtZFTz4VZCOVAIfGbThxqiXSIGipKVG8ubaYBXquUSQROzNIUzviWdSnnAlzg==",
+      "dependencies": {
+        "@types/react": "^17"
+      }
+    },
+    "node_modules/@types/resolve": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
+    },
+    "node_modules/@types/scheduler": {
+      "version": "0.16.8",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
+      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A=="
+    },
+    "node_modules/@types/semver": {
+      "version": "7.5.8",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+      "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ=="
+    },
+    "node_modules/@types/send": {
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
+      "dependencies": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/serve-index": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
+      "dependencies": {
+        "@types/express": "*"
+      }
+    },
+    "node_modules/@types/serve-static": {
+      "version": "1.15.7",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
+      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
+      "dependencies": {
+        "@types/http-errors": "*",
+        "@types/node": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/sockjs": {
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
+    },
+    "node_modules/@types/testing-library__jest-dom": {
+      "version": "5.14.9",
+      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.9.tgz",
+      "integrity": "sha512-FSYhIjFlfOpGSRyVoMBMuS3ws5ehFQODymf3vlI7U1K8c7PHwWwFY7VREfmsuzHSOnoKs/9/Y983ayOs7eRzqw==",
+      "dependencies": {
+        "@types/jest": "*"
+      }
+    },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
+    },
+    "node_modules/@types/url-parse": {
+      "version": "1.4.11",
+      "resolved": "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.11.tgz",
+      "integrity": "sha512-FKvKIqRaykZtd4n47LbK/W/5fhQQ1X7cxxzG9A48h0BGN+S04NH7ervcCjM8tyR0lyGru83FAHSmw2ObgKoESg=="
+    },
+    "node_modules/@types/ws": {
+      "version": "8.5.13",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
+      "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/yargs": {
+      "version": "15.0.19",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
+      "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "4.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
+      "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "4.33.0",
+        "@typescript-eslint/scope-manager": "4.33.0",
+        "debug": "^4.3.1",
+        "functional-red-black-tree": "^1.0.1",
+        "ignore": "^5.1.8",
+        "regexpp": "^3.1.0",
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^4.0.0",
+        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils": {
+      "version": "4.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz",
+      "integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.7",
+        "@typescript-eslint/scope-manager": "4.33.0",
+        "@typescript-eslint/types": "4.33.0",
+        "@typescript-eslint/typescript-estree": "4.33.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "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==",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "4.33.0",
+        "@typescript-eslint/types": "4.33.0",
+        "@typescript-eslint/typescript-estree": "4.33.0",
+        "debug": "^4.3.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "4.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz",
+      "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==",
+      "dependencies": {
+        "@typescript-eslint/types": "4.33.0",
+        "@typescript-eslint/visitor-keys": "4.33.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
+      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "4.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz",
+      "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==",
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "4.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz",
+      "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==",
+      "dependencies": {
+        "@typescript-eslint/types": "4.33.0",
+        "@typescript-eslint/visitor-keys": "4.33.0",
+        "debug": "^4.3.1",
+        "globby": "^11.0.3",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "4.33.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz",
+      "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==",
+      "dependencies": {
+        "@typescript-eslint/types": "4.33.0",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA=="
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ=="
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA=="
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA=="
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ=="
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "deprecated": "Use your platform's native atob() and btoa() methods instead"
+    },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
+    "node_modules/abs": {
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/abs/-/abs-1.3.14.tgz",
+      "integrity": "sha512-PrS26IzwKLWwuURpiKl8wRmJ2KdR/azaVrLEBWG/TALwT20Y7qjtYp1qcMLHA4206hBHY5phv3w4pjf9NPv4Vw==",
+      "dependencies": {
+        "ul": "^5.0.0"
+      }
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/accepts/node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/address": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
+      "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
+      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "regex-parser": "^2.2.11"
+      },
+      "engines": {
+        "node": ">=8.9"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz",
+      "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.4.1"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "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==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-html": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.9.tgz",
+      "integrity": "sha512-ozbS3LuenHVxNRh/wdnN16QapUHzauqSomAl1jwwJRRsGwFwtj644lIhxfWu0Fy0acCij2+AEgHvjscq3dlVXg==",
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
+    "node_modules/ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/antd": {
+      "version": "5.26.4",
+      "resolved": "https://registry.npmjs.org/antd/-/antd-5.26.4.tgz",
+      "integrity": "sha512-e1EnOvEkvvqcQ18dxfzChBJyJACyih13WpNf2OtnP9z2POh/SF0fXL+ynUemT1zfr+p+P1po/tmHXaMc5PMghg==",
+      "dependencies": {
+        "@ant-design/colors": "^7.2.1",
+        "@ant-design/cssinjs": "^1.23.0",
+        "@ant-design/cssinjs-utils": "^1.1.3",
+        "@ant-design/fast-color": "^2.0.6",
+        "@ant-design/icons": "^5.6.1",
+        "@ant-design/react-slick": "~1.1.2",
+        "@babel/runtime": "^7.26.0",
+        "@rc-component/color-picker": "~2.0.1",
+        "@rc-component/mutate-observer": "^1.1.0",
+        "@rc-component/qrcode": "~1.0.0",
+        "@rc-component/tour": "~1.15.1",
+        "@rc-component/trigger": "^2.2.7",
+        "classnames": "^2.5.1",
+        "copy-to-clipboard": "^3.3.3",
+        "dayjs": "^1.11.11",
+        "rc-cascader": "~3.34.0",
+        "rc-checkbox": "~3.5.0",
+        "rc-collapse": "~3.9.0",
+        "rc-dialog": "~9.6.0",
+        "rc-drawer": "~7.3.0",
+        "rc-dropdown": "~4.2.1",
+        "rc-field-form": "~2.7.0",
+        "rc-image": "~7.12.0",
+        "rc-input": "~1.8.0",
+        "rc-input-number": "~9.5.0",
+        "rc-mentions": "~2.20.0",
+        "rc-menu": "~9.16.1",
+        "rc-motion": "^2.9.5",
+        "rc-notification": "~5.6.4",
+        "rc-pagination": "~5.1.0",
+        "rc-picker": "~4.11.3",
+        "rc-progress": "~4.0.0",
+        "rc-rate": "~2.13.1",
+        "rc-resize-observer": "^1.4.3",
+        "rc-segmented": "~2.7.0",
+        "rc-select": "~14.16.8",
+        "rc-slider": "~11.1.8",
+        "rc-steps": "~6.0.1",
+        "rc-switch": "~4.1.0",
+        "rc-table": "~7.51.1",
+        "rc-tabs": "~15.6.1",
+        "rc-textarea": "~1.10.0",
+        "rc-tooltip": "~6.4.0",
+        "rc-tree": "~5.13.1",
+        "rc-tree-select": "~5.27.0",
+        "rc-upload": "~4.9.2",
+        "rc-util": "^5.44.4",
+        "scroll-into-view-if-needed": "^3.1.0",
+        "throttle-debounce": "^5.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/ant-design"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/arg": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/aria-query": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
+      "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array.prototype.findlast": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
+      "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.reduce": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz",
+      "integrity": "sha512-mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-array-method-boxes-properly": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.tosorted": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
+      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
+    },
+    "node_modules/ast-types-flow": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz",
+      "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ=="
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/async": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="
+    },
+    "node_modules/async-validator": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.5.2.tgz",
+      "integrity": "sha512-8eLCg00W9pIRZSB781UUX/H6Oskmm8xloZfr09lz5bikRpBVDlJ3hRVuxxP1SxcwsEYfJ4IU8Q19Y8/893r3rQ=="
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/autoprefixer": {
+      "version": "10.4.20",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+      "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "browserslist": "^4.23.3",
+        "caniuse-lite": "^1.0.30001646",
+        "fraction.js": "^4.3.7",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.0.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/axe-core": {
+      "version": "4.10.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz",
+      "integrity": "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/axobject-query": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
+      "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/babel-eslint": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
+      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
+      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "eslint": ">= 4.12.1"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/eslint-visitor-keys": {
+      "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==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/babel-jest": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+      "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+      "dependencies": {
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^27.5.1",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
+      }
+    },
+    "node_modules/babel-jest/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/babel-jest/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/babel-jest/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/babel-loader": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.4.1.tgz",
+      "integrity": "sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==",
+      "dependencies": {
+        "find-cache-dir": "^3.3.1",
+        "loader-utils": "^2.0.4",
+        "make-dir": "^3.1.0",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 8.9"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "webpack": ">=2"
+      }
+    },
+    "node_modules/babel-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/babel-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/babel-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/babel-loader/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/babel-loader/node_modules/schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+      "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/babel-plugin-macros": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "cosmiconfig": "^7.0.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">=10",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/babel-plugin-named-asset-import": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz",
+      "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==",
+      "peerDependencies": {
+        "@babel/core": "^7.1.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
+      "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
+      "dependencies": {
+        "@babel/compat-data": "^7.22.6",
+        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "semver": "^6.3.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.10.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+      "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "core-js-compat": "^3.38.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
+      "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.6.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-transform-react-remove-prop-types": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
+      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
+      "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+      "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^27.5.1",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-preset-react-app": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz",
+      "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==",
+      "dependencies": {
+        "@babel/core": "^7.16.0",
+        "@babel/plugin-proposal-class-properties": "^7.16.0",
+        "@babel/plugin-proposal-decorators": "^7.16.4",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.0",
+        "@babel/plugin-proposal-private-methods": "^7.16.0",
+        "@babel/plugin-transform-flow-strip-types": "^7.16.0",
+        "@babel/plugin-transform-react-display-name": "^7.16.0",
+        "@babel/plugin-transform-runtime": "^7.16.4",
+        "@babel/preset-env": "^7.16.4",
+        "@babel/preset-react": "^7.16.0",
+        "@babel/preset-typescript": "^7.16.0",
+        "@babel/runtime": "^7.16.3",
+        "babel-plugin-macros": "^3.1.0",
+        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
+    },
+    "node_modules/bfj": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.1.0.tgz",
+      "integrity": "sha512-I6MMLkn+anzNdCUp9hMRyui1HaNEUCco50lxbvNS4+EyXg8lN3nJ48PjPWtbH8UVS9CuMoaKE9U2V3l29DaRQw==",
+      "dependencies": {
+        "bluebird": "^3.7.2",
+        "check-types": "^11.2.3",
+        "hoopy": "^0.1.4",
+        "jsonpath": "^1.1.1",
+        "tryer": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/bignumber.js": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
+      "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "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"
+      }
+    },
+    "node_modules/body-parser/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/bonjour-service": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
+      "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
+      }
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
+    },
+    "node_modules/bootstrap": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
+      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/twbs"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/bootstrap"
+        }
+      ],
+      "peerDependencies": {
+        "jquery": "1.9.1 - 3",
+        "popper.js": "^1.16.1"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+    },
+    "node_modules/browserslist": {
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001669",
+        "electron-to-chromium": "^1.5.41",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.1"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/btoa": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==",
+      "bin": {
+        "btoa": "bin/btoa.js"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+    },
+    "node_modules/builtin-modules": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "dependencies": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/camel-case/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+    },
+    "node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/camelcase-css": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
+      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001678",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001678.tgz",
+      "integrity": "sha512-RR+4U/05gNtps58PEBDZcPWTgEO2MBeoPZ96aQcjmfkBWRIDfN451fW2qyDA9/+HohLLIL5GqiMwA+IB1pWarw==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ]
+    },
+    "node_modules/capture-stack-trace": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.2.tgz",
+      "integrity": "sha512-X/WM2UQs6VMHUtjUDnZTRI+i1crWteJySFzr9UpGoQa4WQffXVTTXuekjl7TjZRlcF2XfjgITT0HxZ9RnxeT0w==",
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/case-sensitive-paths-webpack-plugin": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
+      "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chart.js": {
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz",
+      "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==",
+      "dependencies": {
+        "chartjs-color": "^2.1.0",
+        "moment": "^2.10.2"
+      }
+    },
+    "node_modules/chartjs-color": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz",
+      "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==",
+      "dependencies": {
+        "chartjs-color-string": "^0.6.0",
+        "color-convert": "^1.9.3"
+      }
+    },
+    "node_modules/chartjs-color-string": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
+      "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
+      "dependencies": {
+        "color-name": "^1.0.0"
+      }
+    },
+    "node_modules/chartjs-color/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/chartjs-color/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/check-types": {
+      "version": "11.2.3",
+      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.3.tgz",
+      "integrity": "sha512-+67P1GkJRaxQD6PKK0Et9DhwQB+vGg3PM5+aavopCpZT1lj9jeqfvpgTLAWErNj8qApkkmXlu/Ug74kmhagkXg=="
+    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "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"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
+      "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA=="
+    },
+    "node_modules/classnames": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
+      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
+    },
+    "node_modules/clean-css": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
+      "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
+      "dependencies": {
+        "source-map": "~0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.0"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "dependencies": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/coa/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/chalk": {
+      "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"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/coa/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/coa/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/coa/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/colord": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
+    },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/common-tags": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
+      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
+    },
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/compression": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
+      "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
+        "debug": "2.6.9",
+        "negotiator": "~0.6.4",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.2.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/compression/node_modules/debug": {
+      "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"
+      }
+    },
+    "node_modules/compression/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/compression/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/compute-scroll-into-view": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.1.tgz",
+      "integrity": "sha512-VRhuHOLoKYOy4UbilLbUzbYg93XLjv2PncJC50EuTWPA3gaja1UjBsUP/D/9/juV3vQFr6XBEzn9KCAHdUvOHw=="
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="
+    },
+    "node_modules/connect-history-api-fallback": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-disposition/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+    },
+    "node_modules/cookie": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+    },
+    "node_modules/copy-anything": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
+      "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
+      "dependencies": {
+        "is-what": "^3.14.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
+    "node_modules/copy-to-clipboard": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz",
+      "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==",
+      "dependencies": {
+        "toggle-selection": "^1.0.6"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.39.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.39.0.tgz",
+      "integrity": "sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat": {
+      "version": "3.39.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz",
+      "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==",
+      "dependencies": {
+        "browserslist": "^4.24.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-pure": {
+      "version": "3.39.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.39.0.tgz",
+      "integrity": "sha512-7fEcWwKI4rJinnK+wLTezeg2smbFFdSBP6E2kQZNbnzM2s1rpKQ6aaRteZSSg7FLU3P0HGGVo/gbpfanU36urg==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+    },
+    "node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "integrity": "sha512-gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw==",
+      "dependencies": {
+        "capture-stack-trace": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
+      "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
+    "node_modules/crypto-random-string": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
+      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/css-blank-pseudo": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
+      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "bin": {
+        "css-blank-pseudo": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-declaration-sorter": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
+      "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.9"
+      }
+    },
+    "node_modules/css-has-pseudo": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
+      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "bin": {
+        "css-has-pseudo": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
+      "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.33",
+        "postcss-modules-extract-imports": "^3.1.0",
+        "postcss-modules-local-by-default": "^4.0.5",
+        "postcss-modules-scope": "^3.2.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/css-loader/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/css-minimizer-webpack-plugin": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
+      "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
+      "dependencies": {
+        "cssnano": "^5.0.6",
+        "jest-worker": "^27.0.2",
+        "postcss": "^8.3.5",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@parcel/css": {
+          "optional": true
+        },
+        "clean-css": {
+          "optional": true
+        },
+        "csso": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/css-prefers-color-scheme": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
+      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
+      "bin": {
+        "css-prefers-color-scheme": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-select-base-adapter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
+    },
+    "node_modules/css-tree": {
+      "version": "1.0.0-alpha.37",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+      "dependencies": {
+        "mdn-data": "2.0.4",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css.escape": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
+      "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg=="
+    },
+    "node_modules/cssdb": {
+      "version": "7.11.2",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.11.2.tgz",
+      "integrity": "sha512-lhQ32TFkc1X4eTefGfYPvgovRSzIMofHkigfH8nWtyRL4XJLsRhJFreRvEgKzept7x1rjBuy3J/MurXLaFxW/A==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        }
+      ]
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cssnano": {
+      "version": "5.1.15",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
+      "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
+      "dependencies": {
+        "cssnano-preset-default": "^5.2.14",
+        "lilconfig": "^2.0.3",
+        "yaml": "^1.10.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/cssnano"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/cssnano-preset-default": {
+      "version": "5.2.14",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+      "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
+      "dependencies": {
+        "css-declaration-sorter": "^6.3.1",
+        "cssnano-utils": "^3.1.0",
+        "postcss-calc": "^8.2.3",
+        "postcss-colormin": "^5.3.1",
+        "postcss-convert-values": "^5.1.3",
+        "postcss-discard-comments": "^5.1.2",
+        "postcss-discard-duplicates": "^5.1.0",
+        "postcss-discard-empty": "^5.1.1",
+        "postcss-discard-overridden": "^5.1.0",
+        "postcss-merge-longhand": "^5.1.7",
+        "postcss-merge-rules": "^5.1.4",
+        "postcss-minify-font-values": "^5.1.0",
+        "postcss-minify-gradients": "^5.1.1",
+        "postcss-minify-params": "^5.1.4",
+        "postcss-minify-selectors": "^5.2.1",
+        "postcss-normalize-charset": "^5.1.0",
+        "postcss-normalize-display-values": "^5.1.0",
+        "postcss-normalize-positions": "^5.1.1",
+        "postcss-normalize-repeat-style": "^5.1.1",
+        "postcss-normalize-string": "^5.1.0",
+        "postcss-normalize-timing-functions": "^5.1.0",
+        "postcss-normalize-unicode": "^5.1.1",
+        "postcss-normalize-url": "^5.1.0",
+        "postcss-normalize-whitespace": "^5.1.1",
+        "postcss-ordered-values": "^5.1.3",
+        "postcss-reduce-initial": "^5.1.2",
+        "postcss-reduce-transforms": "^5.1.0",
+        "postcss-svgo": "^5.1.0",
+        "postcss-unique-selectors": "^5.1.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/cssnano-utils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "dependencies": {
+        "css-tree": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "dependencies": {
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
+    },
+    "node_modules/cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+    },
+    "node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+    },
+    "node_modules/damerau-levenshtein": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA=="
+    },
+    "node_modules/data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/data-urls/node_modules/tr46": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/data-urls/node_modules/whatwg-url": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "dependencies": {
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
+        "webidl-conversions": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+    },
+    "node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
+    },
+    "node_modules/dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+      "dependencies": {
+        "execa": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/deffy": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/deffy/-/deffy-2.2.4.tgz",
+      "integrity": "sha512-pLc9lsbsWjr6RxmJ2OLyvm+9l4j1yK69h+TML/gUit/t3vTijpkNGh8LioaJYTGO7F25m6HZndADcUOo2PsiUg==",
+      "dependencies": {
+        "typpy": "^2.0.0"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
+    },
+    "node_modules/detect-port-alt": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
+      "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
+      "dependencies": {
+        "address": "^1.0.1",
+        "debug": "^2.6.0"
+      },
+      "bin": {
+        "detect": "bin/detect-port",
+        "detect-port": "bin/detect-port"
+      },
+      "engines": {
+        "node": ">= 4.2.1"
+      }
+    },
+    "node_modules/detect-port-alt/node_modules/debug": {
+      "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"
+      }
+    },
+    "node_modules/detect-port-alt/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/didyoumean": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
+      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
+    },
+    "node_modules/diff-sequences": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dlv": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
+    },
+    "node_modules/dns-packet": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+      "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
+      "dependencies": {
+        "@leichtgewicht/ip-codec": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dom-accessibility-api": {
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
+      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg=="
+    },
+    "node_modules/dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "dependencies": {
+        "utila": "~0.4"
+      }
+    },
+    "node_modules/dom-helpers": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+      "dependencies": {
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "deprecated": "Use your platform's native DOMException instead",
+      "dependencies": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/dot-case/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+    },
+    "node_modules/dotenv": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/dotenv-expand": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
+      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
+    },
+    "node_modules/downloadjs": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/downloadjs/-/downloadjs-1.4.7.tgz",
+      "integrity": "sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q=="
+    },
+    "node_modules/duplexer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
+    },
+    "node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+    },
+    "node_modules/ejs": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "dependencies": {
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.52",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.52.tgz",
+      "integrity": "sha512-xtoijJTZ+qeucLBDNztDOuQBE1ksqjvNjvqFoST3nGC7fSpqJ+X6BdTBaY5BHG+IhWWmpc6b/KfpeuEDupEPOQ=="
+    },
+    "node_modules/emittery": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
+      "dependencies": {
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/err": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/err/-/err-1.1.1.tgz",
+      "integrity": "sha512-N97Ybd2jJHVQ+Ft3Q5+C2gM3kgygkdeQmEqbN2z15UTVyyEsIwLA1VK39O1DHEJhXbwIFcJLqm6iARNhFANcQA==",
+      "dependencies": {
+        "typpy": "^2.2.0"
+      }
+    },
+    "node_modules/errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "optional": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/error-stack-parser": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
+      "dependencies": {
+        "stackframe": "^1.3.4"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.3",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-array-method-boxes-properly": {
+      "version": "1.0.0",
+      "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=="
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-iterator-helpers": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.0.tgz",
+      "integrity": "sha512-tpxqxncxnpw3c93u8n3VOzACmRFoVmWJqbWXvX/JfKbkhBw1oslgPrUfeSt2psuqyEJFD6N/9lg5i7bsKpoq+Q==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.3",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.7",
+        "iterator.prototype": "^1.1.3",
+        "safe-array-concat": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw=="
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "dependencies": {
+        "hasown": "^2.0.0"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/eslint": {
+      "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==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "dependencies": {
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.1.2",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.9",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-prettier": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz",
+      "integrity": "sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==",
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-config-react-app": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-6.0.0.tgz",
+      "integrity": "sha512-bpoAAC+YRfzq0dsTk+6v9aHm/uqnDwayNAXleMypGl6CpxI9oXXscVHo4fk3eJPIn+rsbtNetB4r/ZIidFIE8A==",
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.10"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^4.0.0",
+        "@typescript-eslint/parser": "^4.0.0",
+        "babel-eslint": "^10.0.0",
+        "eslint": "^7.5.0",
+        "eslint-plugin-flowtype": "^5.2.0",
+        "eslint-plugin-import": "^2.22.0",
+        "eslint-plugin-jest": "^24.0.0",
+        "eslint-plugin-jsx-a11y": "^6.3.1",
+        "eslint-plugin-react": "^7.20.3",
+        "eslint-plugin-react-hooks": "^4.0.8",
+        "eslint-plugin-testing-library": "^3.9.0"
+      },
+      "peerDependenciesMeta": {
+        "eslint-plugin-jest": {
+          "optional": true
+        },
+        "eslint-plugin-testing-library": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-flowtype": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.10.0.tgz",
+      "integrity": "sha512-vcz32f+7TP+kvTUyMXZmCnNujBQZDNmcqPImw8b9PZ+16w1Qdm6ryRuYZYVaG9xRqqmAPr2Cs9FAX5gN+x/bjw==",
+      "dependencies": {
+        "lodash": "^4.17.15",
+        "string-natural-compare": "^3.0.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.1.0"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
+      "dependencies": {
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.12.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
+        "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.8",
+        "tsconfig-paths": "^3.15.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsx-a11y": {
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
+      "integrity": "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==",
+      "dependencies": {
+        "aria-query": "^5.3.2",
+        "array-includes": "^3.1.8",
+        "array.prototype.flatmap": "^1.3.2",
+        "ast-types-flow": "^0.0.8",
+        "axe-core": "^4.10.0",
+        "axobject-query": "^4.1.0",
+        "damerau-levenshtein": "^1.0.8",
+        "emoji-regex": "^9.2.2",
+        "hasown": "^2.0.2",
+        "jsx-ast-utils": "^3.3.5",
+        "language-tags": "^1.0.9",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.includes": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9"
+      }
+    },
+    "node_modules/eslint-plugin-prettier": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz",
+      "integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==",
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=5.0.0",
+        "prettier": ">=1.13.0"
+      },
+      "peerDependenciesMeta": {
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-react": {
+      "version": "7.37.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz",
+      "integrity": "sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==",
+      "dependencies": {
+        "array-includes": "^3.1.8",
+        "array.prototype.findlast": "^1.2.5",
+        "array.prototype.flatmap": "^1.3.2",
+        "array.prototype.tosorted": "^1.1.4",
+        "doctrine": "^2.1.0",
+        "es-iterator-helpers": "^1.1.0",
+        "estraverse": "^5.3.0",
+        "hasown": "^2.0.2",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.8",
+        "object.fromentries": "^2.0.8",
+        "object.values": "^1.2.0",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.5",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.11",
+        "string.prototype.repeat": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
+      }
+    },
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
+      "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.5",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-webpack-plugin": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==",
+      "dependencies": {
+        "@types/eslint": "^7.29.0 || ^8.4.1",
+        "jest-worker": "^28.0.2",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/jest-worker": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
+      "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/supports-color": {
+      "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"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/@babel/code-frame": {
+      "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"
+      }
+    },
+    "node_modules/eslint/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "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==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/eslint/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/eslint/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dependencies": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "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==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/eventsource": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz",
+      "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/exec-limiter": {
+      "version": "3.2.13",
+      "resolved": "https://registry.npmjs.org/exec-limiter/-/exec-limiter-3.2.13.tgz",
+      "integrity": "sha512-86Ri699bwiHZVBzTzNj8gspqAhCPchg70zPVWIh3qzUOA1pUMcb272Em3LPk8AE0mS95B9yMJhtqF8vFJAn0dA==",
+      "dependencies": {
+        "limit-it": "^3.0.0",
+        "typpy": "^2.1.0"
+      }
+    },
+    "node_modules/execa": {
+      "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"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/execa/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/expect/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/expect/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/expect/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.21.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
+      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.3",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.7.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.3.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.3",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.10",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.13.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/express/node_modules/debug": {
+      "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"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/express/node_modules/path-to-regexp": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+    },
+    "node_modules/express/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "node_modules/fast-diff": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw=="
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "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"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+    },
+    "node_modules/fast-uri": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
+      "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw=="
+    },
+    "node_modules/fastq": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fetch-cookie": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-2.2.0.tgz",
+      "integrity": "sha512-h9AgfjURuCgA2+2ISl8GbavpUdR+WGAM2McW/ovn4tVccegp8ZqCKWSBR8uRdM8dDNlx5WdKRWxBYUwteLDCNQ==",
+      "dependencies": {
+        "set-cookie-parser": "^2.4.8",
+        "tough-cookie": "^4.0.0"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/file-loader": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/file-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/file-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/file-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/file-loader/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "dependencies": {
+        "minimatch": "^5.0.1"
+      }
+    },
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/filelist/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/filesize": {
+      "version": "8.0.7",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz",
+      "integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "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"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/find-cache-dir": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+      }
+    },
+    "node_modules/find-cache-dir/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/find-up": {
+      "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"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw=="
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "node_modules/foreground-child": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz",
+      "integrity": "sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==",
+      "dependencies": {
+        "@babel/code-frame": "^7.8.3",
+        "@types/json-schema": "^7.0.5",
+        "chalk": "^4.1.0",
+        "chokidar": "^3.4.2",
+        "cosmiconfig": "^6.0.0",
+        "deepmerge": "^4.2.2",
+        "fs-extra": "^9.0.0",
+        "glob": "^7.1.6",
+        "memfs": "^3.1.2",
+        "minimatch": "^3.0.4",
+        "schema-utils": "2.7.0",
+        "semver": "^7.3.2",
+        "tapable": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10",
+        "yarn": ">=1.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">= 6",
+        "typescript": ">= 2.7",
+        "vue-template-compiler": "*",
+        "webpack": ">= 4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        },
+        "vue-template-compiler": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.7.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+      "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.4",
+        "ajv": "^6.12.2",
+        "ajv-keywords": "^3.4.1"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.2.tgz",
+      "integrity": "sha512-sJe+TQb2vIaIyO783qN6BlMYWMw3WBOHA1Ay2qxsnjuafEOQFJ2JakedOQirT6D5XPRxDvS7AHYyem9fTpb4LQ==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fraction.js": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://github.com/sponsors/rawify"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/fs-monkey": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
+      "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg=="
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/function.name": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/function.name/-/function.name-1.0.13.tgz",
+      "integrity": "sha512-mVrqdoy5npWZyoXl4DxCeuVF6delDcQjVS9aPdvLYlBxtMTZDR2B5GVEQEoM1jJyspCqg3C0v4ABkLE7tp9xFA==",
+      "dependencies": {
+        "noop6": "^1.0.1"
+      }
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-own-enumerable-property-symbols": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
+      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/git-package-json": {
+      "version": "1.4.10",
+      "resolved": "https://registry.npmjs.org/git-package-json/-/git-package-json-1.4.10.tgz",
+      "integrity": "sha512-DRAcvbzd2SxGK7w8OgYfvKqhFliT5keX0lmSmVdgScgf1kkl5tbbo7Pam6uYoCa1liOiipKxQZG8quCtGWl/fA==",
+      "dependencies": {
+        "deffy": "^2.2.1",
+        "err": "^1.1.1",
+        "gry": "^5.0.0",
+        "normalize-package-data": "^2.3.5",
+        "oargv": "^3.4.1",
+        "one-by-one": "^3.1.0",
+        "r-json": "^1.2.1",
+        "r-package-json": "^1.0.0",
+        "tmp": "0.0.28"
+      }
+    },
+    "node_modules/git-source": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/git-source/-/git-source-1.1.10.tgz",
+      "integrity": "sha512-XZZ7ZgnLL35oLgM/xjnLYgtlKlxJG0FohC1kWDvGkU7s1VKGXK0pFF/g1itQEwQ3D+uTQzBnzPi8XbqOv7Wc1Q==",
+      "dependencies": {
+        "git-url-parse": "^5.0.1"
+      }
+    },
+    "node_modules/git-up": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/git-up/-/git-up-1.2.1.tgz",
+      "integrity": "sha512-SRVN3rOLACva8imc7BFrB6ts5iISWKH1/h/1Z+JZYoUI7UVQM7gQqk4M2yxUENbq2jUUT09NEND5xwP1i7Ktlw==",
+      "dependencies": {
+        "is-ssh": "^1.0.0",
+        "parse-url": "^1.0.0"
+      }
+    },
+    "node_modules/git-url-parse": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-5.0.1.tgz",
+      "integrity": "sha512-4uSiOgrryNEMBX+gTWogenYRUh2j1D+95STTSEF2RCTgLkfJikl8c7BGr0Bn274hwuxTsbS2/FQ5pVS9FoXegQ==",
+      "dependencies": {
+        "git-up": "^1.0.0"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "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=="
+    },
+    "node_modules/global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "dependencies": {
+        "global-prefix": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+      "dependencies": {
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/global-prefix/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/got": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-5.6.0.tgz",
+      "integrity": "sha512-MnypzkaW8dldA8AbJFjMs7y14+ykd2V8JCLKSvX1Gmzx1alH3Y+3LArywHDoAF2wS3pnZp4gacoYtvqBeF6drQ==",
+      "dependencies": {
+        "create-error-class": "^3.0.1",
+        "duplexer2": "^0.1.4",
+        "is-plain-obj": "^1.0.0",
+        "is-redirect": "^1.0.0",
+        "is-retry-allowed": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "lowercase-keys": "^1.0.0",
+        "node-status-codes": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "parse-json": "^2.1.0",
+        "pinkie-promise": "^2.0.0",
+        "read-all-stream": "^3.0.0",
+        "readable-stream": "^2.0.5",
+        "timed-out": "^2.0.0",
+        "unzip-response": "^1.0.0",
+        "url-parse-lax": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
+    },
+    "node_modules/gry": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/gry/-/gry-5.0.8.tgz",
+      "integrity": "sha512-meq9ZjYVpLzZh3ojhTg7IMad9grGsx6rUUKHLqPnhLXzJkRQvEL2U3tQpS5/WentYTtHtxkT3Ew/mb10D6F6/g==",
+      "dependencies": {
+        "abs": "^1.2.1",
+        "exec-limiter": "^3.0.0",
+        "one-by-one": "^3.0.0",
+        "ul": "^5.0.0"
+      }
+    },
+    "node_modules/gzip-size": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
+      "dependencies": {
+        "duplexer": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
+    },
+    "node_modules/harmony-reflect": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
+      "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g=="
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/history": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
+      "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
+      "dependencies": {
+        "@babel/runtime": "^7.1.2",
+        "loose-envify": "^1.2.0",
+        "resolve-pathname": "^3.0.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0",
+        "value-equal": "^1.0.1"
+      }
+    },
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "dependencies": {
+        "react-is": "^16.7.0"
+      }
+    },
+    "node_modules/hoist-non-react-statics/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "node_modules/hoopy": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
+      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+    },
+    "node_modules/hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dependencies": {
+        "whatwg-encoding": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/html-entities": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
+      "integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/mdevils"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/mdevils"
+        }
+      ]
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+    },
+    "node_modules/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "clean-css": "^5.2.2",
+        "commander": "^8.3.0",
+        "he": "^1.2.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.10.0"
+      },
+      "bin": {
+        "html-minifier-terser": "cli.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/html-webpack-plugin": {
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz",
+      "integrity": "sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==",
+      "dependencies": {
+        "@types/html-minifier-terser": "^6.0.0",
+        "html-minifier-terser": "^6.0.2",
+        "lodash": "^4.17.21",
+        "pretty-error": "^4.0.0",
+        "tapable": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/html-webpack-plugin"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "webpack": "^5.20.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-parser-js": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http-proxy-middleware": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
+      "dependencies": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/idb": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
+      "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ=="
+    },
+    "node_modules/identity-obj-proxy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
+      "integrity": "sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==",
+      "dependencies": {
+        "harmony-reflect": "^1.4.6"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
+      "optional": true,
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/immer": {
+      "version": "9.0.21",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz",
+      "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
+      }
+    },
+    "node_modules/immutable": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw=="
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+    },
+    "node_modules/is-async-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
+      "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "dependencies": {
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-finalizationregistry": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
+      "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==",
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-generator-function": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
+    },
+    "node_modules/is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
+      "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-retry-allowed": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-root": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
+      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "dependencies": {
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-ssh": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz",
+      "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==",
+      "dependencies": {
+        "protocols": "^2.0.1"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "dependencies": {
+        "which-typed-array": "^1.1.14"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
+    },
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz",
+      "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-what": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
+      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA=="
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/iterate-object": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/iterate-object/-/iterate-object-1.3.4.tgz",
+      "integrity": "sha512-4dG1D1x/7g8PwHS9aK6QV5V94+ZvyP4+d19qDv43EzImmrndysIl4prmJ1hWWIGCqrZHyaHBm6BSEWHOLnpoNw=="
+    },
+    "node_modules/iterator.prototype": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.3.tgz",
+      "integrity": "sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==",
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "get-intrinsic": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "reflect.getprototypeof": "^1.0.4",
+        "set-function-name": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/jake": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+      "dependencies": {
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
+      },
+      "bin": {
+        "jake": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jake/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
+      "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
+      "dependencies": {
+        "@jest/core": "^27.5.1",
+        "import-local": "^3.0.2",
+        "jest-cli": "^27.5.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
+      "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "execa": "^5.0.0",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-circus": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
+      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-circus/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-circus/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-cli": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
+      "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+      "dependencies": {
+        "@jest/core": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "import-local": "^3.0.2",
+        "jest-config": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "prompts": "^2.0.1",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-cli/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-cli/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-cli/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
+      "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
+      "dependencies": {
+        "@babel/core": "^7.8.0",
+        "@jest/test-sequencer": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "babel-jest": "^27.5.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^27.5.1",
+        "jest-environment-jsdom": "^27.5.1",
+        "jest-environment-node": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-jasmine2": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-runner": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-config/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-config/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-config/node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-config/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-diff/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-diff/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
+      "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
+      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-each/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-each/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-environment-jsdom": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
+      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jsdom": "^16.6.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
+      "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
+      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^27.5.1",
+        "jest-serializer": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-jasmine2": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
+      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
+      "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+      "dependencies": {
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-leak-detector/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-leak-detector/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
+      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-mock/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-mock/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-mock/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
+      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
+      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^1.1.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
+      "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-snapshot": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-resolve-dependencies/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
+      "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.8.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^27.5.1",
+        "jest-environment-jsdom": "^27.5.1",
+        "jest-environment-node": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-leak-detector": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "source-map-support": "^0.5.6",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-runner/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
+      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/globals": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-serializer": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
+      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
+      "dependencies": {
+        "@types/node": "*",
+        "graceful-fs": "^4.2.9"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
+      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+      "dependencies": {
+        "@babel/core": "^7.7.2",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/traverse": "^7.7.2",
+        "@babel/types": "^7.0.0",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.1.5",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^27.5.1",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-util/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-util/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-util/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
+      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "leven": "^3.1.0",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-validate/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-validate/node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-watch-typeahead": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
+      "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
+      "dependencies": {
+        "ansi-escapes": "^4.3.1",
+        "chalk": "^4.0.0",
+        "jest-regex-util": "^28.0.0",
+        "jest-watcher": "^28.0.0",
+        "slash": "^4.0.0",
+        "string-length": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "jest": "^27.0.0 || ^28.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/@jest/console": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
+      "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
+      "dependencies": {
+        "@jest/types": "^28.1.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^28.1.3",
+        "jest-util": "^28.1.3",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/@jest/console/node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/@jest/test-result": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
+      "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
+      "dependencies": {
+        "@jest/console": "^28.1.3",
+        "@jest/types": "^28.1.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/@jest/types": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
+      "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
+      "dependencies": {
+        "@jest/schemas": "^28.1.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/@types/yargs": {
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/emittery": {
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
+      "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/jest-message-util": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
+      "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^28.1.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^28.1.3",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/jest-message-util/node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/jest-regex-util": {
+      "version": "28.0.2",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
+      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/jest-util": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
+      "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
+      "dependencies": {
+        "@jest/types": "^28.1.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/jest-watcher": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
+      "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
+      "dependencies": {
+        "@jest/test-result": "^28.1.3",
+        "@jest/types": "^28.1.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.10.2",
+        "jest-util": "^28.1.3",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/jest-watcher/node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/jest-watcher/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/pretty-format": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
+      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
+      "dependencies": {
+        "@jest/schemas": "^28.1.3",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/react-is": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+    },
+    "node_modules/jest-watch-typeahead/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/string-length": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
+      "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
+      "dependencies": {
+        "char-regex": "^2.0.0",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/string-length/node_modules/char-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
+      "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==",
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
+      "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+      "dependencies": {
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^27.5.1",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/@types/yargs": {
+      "version": "16.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz",
+      "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/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==",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "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"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jiti": {
+      "version": "1.21.6",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
+      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "dependencies": {
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsdom/node_modules/acorn": {
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/tr46": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jsdom/node_modules/whatwg-url": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "dependencies": {
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
+        "webidl-conversions": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "node_modules/json-schema": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
+    },
+    "node_modules/json2mq": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
+      "integrity": "sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==",
+      "dependencies": {
+        "string-convert": "^0.2.0"
+      }
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsonpath": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz",
+      "integrity": "sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==",
+      "dependencies": {
+        "esprima": "1.2.2",
+        "static-eval": "2.0.2",
+        "underscore": "1.12.1"
+      }
+    },
+    "node_modules/jsonpath/node_modules/esprima": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz",
+      "integrity": "sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/jsonpointer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
+      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jsx-ast-utils": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+      "dependencies": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/jwt-decode": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
+      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/klona": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/language-subtag-registry": {
+      "version": "0.3.23",
+      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz",
+      "integrity": "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ=="
+    },
+    "node_modules/language-tags": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz",
+      "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==",
+      "dependencies": {
+        "language-subtag-registry": "^0.3.20"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/launch-editor": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.9.1.tgz",
+      "integrity": "sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==",
+      "dependencies": {
+        "picocolors": "^1.0.0",
+        "shell-quote": "^1.8.1"
+      }
+    },
+    "node_modules/less": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.13.1.tgz",
+      "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==",
+      "dependencies": {
+        "copy-anything": "^2.0.1",
+        "tslib": "^1.10.0"
+      },
+      "bin": {
+        "lessc": "bin/lessc"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "optionalDependencies": {
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "make-dir": "^2.1.0",
+        "mime": "^1.4.1",
+        "native-request": "^1.0.5",
+        "source-map": "~0.6.0"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lilconfig": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/limit-it": {
+      "version": "3.2.10",
+      "resolved": "https://registry.npmjs.org/limit-it/-/limit-it-3.2.10.tgz",
+      "integrity": "sha512-T0NK99pHnkimldr1WUqvbGV1oWDku/xC9J/OqzJFsV1jeOS6Bwl8W7vkeQIBqwiON9dTALws+rX/XPMQqWerDQ==",
+      "dependencies": {
+        "typpy": "^2.0.0"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "node_modules/lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/lower-case/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+    },
+    "node_modules/lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/lz-string": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
+      "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
+      "bin": {
+        "lz-string": "bin/bin.js"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+      "dependencies": {
+        "sourcemap-codec": "^1.4.8"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "optional": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memfs": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+      "dependencies": {
+        "fs-monkey": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
+      "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
+      "dependencies": {
+        "schema-utils": "^4.0.0",
+        "tapable": "^2.2.1"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/multicast-dns": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+      "dependencies": {
+        "dns-packet": "^5.2.2",
+        "thunky": "^1.0.2"
+      },
+      "bin": {
+        "multicast-dns": "cli.js"
+      }
+    },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/native-request": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.1.2.tgz",
+      "integrity": "sha512-/etjwrK0J4Ebbcnt35VMWnfiUX/B04uwGJxyJInagxDqf2z5drSt/lsOvEMWGYunz1kaLZAFrV4NDAbOoDKvAQ==",
+      "optional": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+    },
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g=="
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+    },
+    "node_modules/no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "dependencies": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/no-case/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+    },
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "optional": true
+    },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+    },
+    "node_modules/node-status-codes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
+      "integrity": "sha512-1cBMgRxdMWE8KeWCqk2RIOrvUb0XCwYfEsY5/y2NlXyq4Y/RumnOZvTj4Nbr77+Vb2C+kyBoRTdkNOS8L3d/aQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/noop6": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/noop6/-/noop6-1.0.9.tgz",
+      "integrity": "sha512-DB3Hwyd89dPr5HqEPg3YHjzvwh/mCqizC1zZ8vyofqc+TQRyPDnT4wgXXbLGF4z9YAzwwTLi8pNLhGqcbSjgkA=="
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/numbro": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/numbro/-/numbro-2.5.0.tgz",
+      "integrity": "sha512-xDcctDimhzko/e+y+Q2/8i3qNC9Svw1QgOkSkQoO0kIPI473tR9QRbo2KP88Ty9p8WbPy+3OpTaAIzehtuHq+A==",
+      "dependencies": {
+        "bignumber.js": "^8 || ^9"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.13",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.13.tgz",
+      "integrity": "sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ=="
+    },
+    "node_modules/oargv": {
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/oargv/-/oargv-3.4.10.tgz",
+      "integrity": "sha512-SXaMANv9sr7S/dP0vj0+Ybipa47UE1ntTWQ2rpPRhC6Bsvfl+Jg03Xif7jfL0sWKOYWK8oPjcZ5eJ82t8AP/8g==",
+      "dependencies": {
+        "iterate-object": "^1.1.0",
+        "ul": "^5.0.0"
+      }
+    },
+    "node_modules/obj-def": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/obj-def/-/obj-def-1.0.9.tgz",
+      "integrity": "sha512-bQ4ya3VYD6FAA1+s6mEhaURRHSmw4+sKaXE6UyXZ1XDYc5D+c7look25dFdydmLd18epUegh398gdDkMUZI9xg==",
+      "dependencies": {
+        "deffy": "^2.2.2"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-hash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
+      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.getownpropertydescriptors": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz",
+      "integrity": "sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==",
+      "dependencies": {
+        "array.prototype.reduce": "^1.0.6",
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "gopd": "^1.0.1",
+        "safe-array-concat": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
+    },
+    "node_modules/oidc-client-ts": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/oidc-client-ts/-/oidc-client-ts-2.4.1.tgz",
+      "integrity": "sha512-IxlGMsbkZPsHJGCliWT3LxjUcYzmiN21656n/Zt2jDncZlBFc//cd8WqFF0Lt681UT3AImM57E6d4N53ziTCYA==",
+      "dependencies": {
+        "crypto-js": "^4.2.0",
+        "jwt-decode": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.13.0"
+      }
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/one-by-one": {
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/one-by-one/-/one-by-one-3.2.8.tgz",
+      "integrity": "sha512-HR/pSzZdm46Xqj58K+Bu64kMbSTw8/u77AwWvV+rprO/OsuR++pPlkUJn+SmwqBGRgHKwSKQ974V3uls7crIeQ==",
+      "dependencies": {
+        "obj-def": "^1.0.0",
+        "sliced": "^1.0.1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+      "dependencies": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/package-json": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
+      "integrity": "sha512-PRg65iXMTt/uK8Rfh5zvzkUbfAPitF17YaCY+IbHsYgksiLvtzWWTUildHth3mVaZ7871OJ7gtP4LBRBlmAdXg==",
+      "dependencies": {
+        "got": "^5.0.0",
+        "registry-auth-token": "^3.0.1",
+        "registry-url": "^3.0.3",
+        "semver": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
+    },
+    "node_modules/package-json-path": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/package-json-path/-/package-json-path-1.0.9.tgz",
+      "integrity": "sha512-uNu7f6Ef7tQHZRnkyVnCtzdSYVN9uBtge/sG7wzcUaawFWkPYUq67iXxRGrQSg/q0tzxIB8jSyIYUKjG2Jn//A==",
+      "dependencies": {
+        "abs": "^1.2.1"
+      }
+    },
+    "node_modules/package-json/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/param-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/param-case/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse-url": {
+      "version": "1.3.11",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-1.3.11.tgz",
+      "integrity": "sha512-1wj9nkgH/5EboDxLwaTMGJh3oH3f+Gue+aGdh631oCqoSBpokzmMmOldvOeBPtB8GJBYJbaF93KPzlkU+Y1ksg==",
+      "dependencies": {
+        "is-ssh": "^1.3.0",
+        "protocols": "^1.4.0"
+      }
+    },
+    "node_modules/parse-url/node_modules/protocols": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz",
+      "integrity": "sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg=="
+    },
+    "node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/pascal-case/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
+    },
+    "node_modules/path-to-regexp": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz",
+      "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==",
+      "dependencies": {
+        "isarray": "0.0.1"
+      }
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-up": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
+      "dependencies": {
+        "find-up": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-up/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-up/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-up/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-up/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg.json": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/pkg.json/-/pkg.json-2.0.8.tgz",
+      "integrity": "sha512-iIBceNPwO452wLbF73GCV5z/TY9UydLWEV+wBjegAObPF/PihDL9ZUr2g2EFI7XqPFMTLEX/QtL63Z+zzFZ7yA==",
+      "dependencies": {
+        "git-package-json": "^1.4.0",
+        "git-source": "^1.1.0",
+        "package-json": "^2.3.1"
+      }
+    },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.0",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
+      "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-browser-comments": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz",
+      "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "peerDependencies": {
+        "browserslist": ">=4",
+        "postcss": ">=8"
+      }
+    },
+    "node_modules/postcss-calc": {
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.2"
+      }
+    },
+    "node_modules/postcss-clamp": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
+      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=7.6.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.6"
+      }
+    },
+    "node_modules/postcss-color-functional-notation": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
+      "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
+      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-color-rebeccapurple": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
+      "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-colormin": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+      "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "caniuse-api": "^3.0.0",
+        "colord": "^2.9.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-convert-values": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+      "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-custom-media": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
+      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/postcss-custom-properties": {
+      "version": "12.1.11",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz",
+      "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-custom-selectors": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
+      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/postcss-dir-pseudo-class": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
+      "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-discard-comments": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+      "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-discard-duplicates": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-discard-empty": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-discard-overridden": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-double-position-gradients": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
+      "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-env-function": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
+      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-flexbugs-fixes": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz",
+      "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==",
+      "peerDependencies": {
+        "postcss": "^8.1.4"
+      }
+    },
+    "node_modules/postcss-focus-visible": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
+      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-focus-within": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
+      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-font-variant": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
+      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-gap-properties": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
+      "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-image-set-function": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
+      "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-import": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
+      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+      "dependencies": {
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-initial": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
+      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-js": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+      "dependencies": {
+        "camelcase-css": "^2.0.1"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >= 16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.21"
+      }
+    },
+    "node_modules/postcss-lab-function": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
+      "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-load-config": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
+      "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "lilconfig": "^3.0.0",
+        "yaml": "^2.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "peerDependencies": {
+        "postcss": ">=8.0.9",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "postcss": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/postcss-load-config/node_modules/lilconfig": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
+      "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
+      }
+    },
+    "node_modules/postcss-load-config/node_modules/yaml": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
+      "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/postcss-loader": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
+      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
+      "dependencies": {
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.5",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss-logical": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
+      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-media-minmax": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
+      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-merge-longhand": {
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+      "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0",
+        "stylehacks": "^5.1.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-merge-rules": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+      "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "caniuse-api": "^3.0.0",
+        "cssnano-utils": "^3.1.0",
+        "postcss-selector-parser": "^6.0.5"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-minify-font-values": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+      "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-minify-gradients": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+      "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
+      "dependencies": {
+        "colord": "^2.9.1",
+        "cssnano-utils": "^3.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-minify-params": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+      "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "cssnano-utils": "^3.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-minify-selectors": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+      "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.5"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
+      "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
+      "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-nested": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
+      "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "postcss-selector-parser": "^6.1.1"
+      },
+      "engines": {
+        "node": ">=12.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.14"
+      }
+    },
+    "node_modules/postcss-nesting": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
+      "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-normalize": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-10.0.1.tgz",
+      "integrity": "sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA==",
+      "dependencies": {
+        "@csstools/normalize.css": "*",
+        "postcss-browser-comments": "^4",
+        "sanitize.css": "*"
+      },
+      "engines": {
+        "node": ">= 12"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4",
+        "postcss": ">= 8"
+      }
+    },
+    "node_modules/postcss-normalize-charset": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-normalize-display-values": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+      "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-normalize-positions": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+      "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-normalize-repeat-style": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+      "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-normalize-string": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+      "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-normalize-timing-functions": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+      "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-normalize-unicode": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+      "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-normalize-url": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+      "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
+      "dependencies": {
+        "normalize-url": "^6.0.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-normalize-whitespace": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+      "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-opacity-percentage": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
+      "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
+      "funding": [
+        {
+          "type": "kofi",
+          "url": "https://ko-fi.com/mrcgrtz"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/mrcgrtz"
+        }
+      ],
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-ordered-values": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+      "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
+      "dependencies": {
+        "cssnano-utils": "^3.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-overflow-shorthand": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
+      "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-page-break": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
+      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
+      "peerDependencies": {
+        "postcss": "^8"
+      }
+    },
+    "node_modules/postcss-place": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
+      "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-preset-env": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz",
+      "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==",
+      "dependencies": {
+        "@csstools/postcss-cascade-layers": "^1.1.1",
+        "@csstools/postcss-color-function": "^1.1.1",
+        "@csstools/postcss-font-format-keywords": "^1.0.1",
+        "@csstools/postcss-hwb-function": "^1.0.2",
+        "@csstools/postcss-ic-unit": "^1.0.1",
+        "@csstools/postcss-is-pseudo-class": "^2.0.7",
+        "@csstools/postcss-nested-calc": "^1.0.0",
+        "@csstools/postcss-normalize-display-values": "^1.0.1",
+        "@csstools/postcss-oklab-function": "^1.1.1",
+        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
+        "@csstools/postcss-stepped-value-functions": "^1.0.1",
+        "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
+        "@csstools/postcss-trigonometric-functions": "^1.0.2",
+        "@csstools/postcss-unset-value": "^1.0.2",
+        "autoprefixer": "^10.4.13",
+        "browserslist": "^4.21.4",
+        "css-blank-pseudo": "^3.0.3",
+        "css-has-pseudo": "^3.0.4",
+        "css-prefers-color-scheme": "^6.0.3",
+        "cssdb": "^7.1.0",
+        "postcss-attribute-case-insensitive": "^5.0.2",
+        "postcss-clamp": "^4.1.0",
+        "postcss-color-functional-notation": "^4.2.4",
+        "postcss-color-hex-alpha": "^8.0.4",
+        "postcss-color-rebeccapurple": "^7.1.1",
+        "postcss-custom-media": "^8.0.2",
+        "postcss-custom-properties": "^12.1.10",
+        "postcss-custom-selectors": "^6.0.3",
+        "postcss-dir-pseudo-class": "^6.0.5",
+        "postcss-double-position-gradients": "^3.1.2",
+        "postcss-env-function": "^4.0.6",
+        "postcss-focus-visible": "^6.0.4",
+        "postcss-focus-within": "^5.0.4",
+        "postcss-font-variant": "^5.0.0",
+        "postcss-gap-properties": "^3.0.5",
+        "postcss-image-set-function": "^4.0.7",
+        "postcss-initial": "^4.0.1",
+        "postcss-lab-function": "^4.2.1",
+        "postcss-logical": "^5.0.4",
+        "postcss-media-minmax": "^5.0.0",
+        "postcss-nesting": "^10.2.0",
+        "postcss-opacity-percentage": "^1.1.2",
+        "postcss-overflow-shorthand": "^3.0.4",
+        "postcss-page-break": "^3.0.4",
+        "postcss-place": "^7.0.5",
+        "postcss-pseudo-class-any-link": "^7.1.6",
+        "postcss-replace-overflow-wrap": "^4.0.0",
+        "postcss-selector-not": "^6.0.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
+      "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-reduce-initial": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+      "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "caniuse-api": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-reduce-transforms": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+      "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-replace-overflow-wrap": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
+      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
+      "peerDependencies": {
+        "postcss": "^8.0.3"
+      }
+    },
+    "node_modules/postcss-selector-not": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
+      "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-svgo": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+      "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0",
+        "svgo": "^2.7.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "dependencies": {
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
+    },
+    "node_modules/postcss-svgo/node_modules/svgo": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
+      "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+      "dependencies": {
+        "@trysound/sax": "0.2.0",
+        "commander": "^7.2.0",
+        "css-select": "^4.1.3",
+        "css-tree": "^1.1.3",
+        "csso": "^4.2.0",
+        "picocolors": "^1.0.0",
+        "stable": "^0.1.8"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/postcss-unique-selectors": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+      "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.5"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dependencies": {
+        "fast-diff": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/pretty-bytes": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pretty-error": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
+      "dependencies": {
+        "lodash": "^4.17.20",
+        "renderkid": "^3.0.0"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/primereact": {
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/primereact/-/primereact-6.3.2.tgz",
+      "integrity": "sha512-lfvipaSD8uSJhuFfw5Akn2AE/mr/494HtiPfMFdD1aRbTkpxk0EKNlkQNqHEdNFq8c6nrIwFTX2GyiSNWSc/Uw=="
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/promise": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
+      "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
+      "dependencies": {
+        "asap": "~2.0.6"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/prop-types/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "node_modules/protocols": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz",
+      "integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q=="
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/proxy-addr/node_modules/ipaddr.js": {
+      "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==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
+      "optional": true
+    },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
+      "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)",
+      "engines": {
+        "node": ">=0.6.0",
+        "teleport": ">=0.2.0"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/r-json": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/r-json/-/r-json-1.3.0.tgz",
+      "integrity": "sha512-xesd+RHCpymPCYd9DvDvUr1w1IieSChkqYF1EpuAYrvCfLXji9NP36DvyYZJZZB5soVDvZ0WUtBoZaU1g5Yt9A==",
+      "dependencies": {
+        "w-json": "1.3.10"
+      }
+    },
+    "node_modules/r-package-json": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/r-package-json/-/r-package-json-1.0.9.tgz",
+      "integrity": "sha512-G4Vpf1KImWmmPFGdtWQTU0L9zk0SjqEC4qs/jE7AQ+Ylmr5kizMzGeC4wnHp5+ijPqNN+2ZPpvyjVNdN1CDVcg==",
+      "dependencies": {
+        "package-json-path": "^1.0.0",
+        "r-json": "^1.2.1"
+      }
+    },
+    "node_modules/raf": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+      "dependencies": {
+        "performance-now": "^2.1.0"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "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",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/rc-cascader": {
+      "version": "3.34.0",
+      "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.34.0.tgz",
+      "integrity": "sha512-KpXypcvju9ptjW9FaN2NFcA2QH9E9LHKq169Y0eWtH4e/wHQ5Wh5qZakAgvb8EKZ736WZ3B0zLLOBsrsja5Dag==",
+      "dependencies": {
+        "@babel/runtime": "^7.25.7",
+        "classnames": "^2.3.1",
+        "rc-select": "~14.16.2",
+        "rc-tree": "~5.13.0",
+        "rc-util": "^5.43.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-checkbox": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-3.5.0.tgz",
+      "integrity": "sha512-aOAQc3E98HteIIsSqm6Xk2FPKIER6+5vyEFMZfo73TqM+VVAIqOkHoPjgKLqSNtVLWScoaM7vY2ZrGEheI79yg==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "classnames": "^2.3.2",
+        "rc-util": "^5.25.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-collapse": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-3.9.0.tgz",
+      "integrity": "sha512-swDdz4QZ4dFTo4RAUMLL50qP0EY62N2kvmk2We5xYdRwcRn8WcYtuetCJpwpaCbUfUt5+huLpVxhvmnK+PHrkA==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "classnames": "2.x",
+        "rc-motion": "^2.3.4",
+        "rc-util": "^5.27.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-dialog": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-9.6.0.tgz",
+      "integrity": "sha512-ApoVi9Z8PaCQg6FsUzS8yvBEQy0ZL2PkuvAgrmohPkN3okps5WZ5WQWPc1RNuiOKaAYv8B97ACdsFU5LizzCqg==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "@rc-component/portal": "^1.0.0-8",
+        "classnames": "^2.2.6",
+        "rc-motion": "^2.3.0",
+        "rc-util": "^5.21.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-drawer": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-7.3.0.tgz",
+      "integrity": "sha512-DX6CIgiBWNpJIMGFO8BAISFkxiuKitoizooj4BDyee8/SnBn0zwO2FHrNDpqqepj0E/TFTDpmEBCyFuTgC7MOg==",
+      "dependencies": {
+        "@babel/runtime": "^7.23.9",
+        "@rc-component/portal": "^1.1.1",
+        "classnames": "^2.2.6",
+        "rc-motion": "^2.6.1",
+        "rc-util": "^5.38.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-dropdown": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-4.2.1.tgz",
+      "integrity": "sha512-YDAlXsPv3I1n42dv1JpdM7wJ+gSUBfeyPK59ZpBD9jQhK9jVuxpjj3NmWQHOBceA1zEPVX84T2wbdb2SD0UjmA==",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "@rc-component/trigger": "^2.0.0",
+        "classnames": "^2.2.6",
+        "rc-util": "^5.44.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.11.0",
+        "react-dom": ">=16.11.0"
+      }
+    },
+    "node_modules/rc-field-form": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-2.7.0.tgz",
+      "integrity": "sha512-hgKsCay2taxzVnBPZl+1n4ZondsV78G++XVsMIJCAoioMjlMQR9YwAp7JZDIECzIu2Z66R+f4SFIRrO2DjDNAA==",
+      "dependencies": {
+        "@babel/runtime": "^7.18.0",
+        "@rc-component/async-validator": "^5.0.3",
+        "rc-util": "^5.32.2"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-image": {
+      "version": "7.12.0",
+      "resolved": "https://registry.npmjs.org/rc-image/-/rc-image-7.12.0.tgz",
+      "integrity": "sha512-cZ3HTyyckPnNnUb9/DRqduqzLfrQRyi+CdHjdqgsyDpI3Ln5UX1kXnAhPBSJj9pVRzwRFgqkN7p9b6HBDjmu/Q==",
+      "dependencies": {
+        "@babel/runtime": "^7.11.2",
+        "@rc-component/portal": "^1.0.2",
+        "classnames": "^2.2.6",
+        "rc-dialog": "~9.6.0",
+        "rc-motion": "^2.6.2",
+        "rc-util": "^5.34.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-input": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/rc-input/-/rc-input-1.8.0.tgz",
+      "integrity": "sha512-KXvaTbX+7ha8a/k+eg6SYRVERK0NddX8QX7a7AnRvUa/rEH0CNMlpcBzBkhI0wp2C8C4HlMoYl8TImSN+fuHKA==",
+      "dependencies": {
+        "@babel/runtime": "^7.11.1",
+        "classnames": "^2.2.1",
+        "rc-util": "^5.18.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.0.0",
+        "react-dom": ">=16.0.0"
+      }
+    },
+    "node_modules/rc-input-number": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-9.5.0.tgz",
+      "integrity": "sha512-bKaEvB5tHebUURAEXw35LDcnRZLq3x1k7GxfAqBMzmpHkDGzjAtnUL8y4y5N15rIFIg5IJgwr211jInl3cipag==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "@rc-component/mini-decimal": "^1.0.1",
+        "classnames": "^2.2.5",
+        "rc-input": "~1.8.0",
+        "rc-util": "^5.40.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-mentions": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-2.20.0.tgz",
+      "integrity": "sha512-w8HCMZEh3f0nR8ZEd466ATqmXFCMGMN5UFCzEUL0bM/nGw/wOS2GgRzKBcm19K++jDyuWCOJOdgcKGXU3fXfbQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.22.5",
+        "@rc-component/trigger": "^2.0.0",
+        "classnames": "^2.2.6",
+        "rc-input": "~1.8.0",
+        "rc-menu": "~9.16.0",
+        "rc-textarea": "~1.10.0",
+        "rc-util": "^5.34.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-menu": {
+      "version": "9.16.1",
+      "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-9.16.1.tgz",
+      "integrity": "sha512-ghHx6/6Dvp+fw8CJhDUHFHDJ84hJE3BXNCzSgLdmNiFErWSOaZNsihDAsKq9ByTALo/xkNIwtDFGIl6r+RPXBg==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "@rc-component/trigger": "^2.0.0",
+        "classnames": "2.x",
+        "rc-motion": "^2.4.3",
+        "rc-overflow": "^1.3.1",
+        "rc-util": "^5.27.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-motion": {
+      "version": "2.9.5",
+      "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.5.tgz",
+      "integrity": "sha512-w+XTUrfh7ArbYEd2582uDrEhmBHwK1ZENJiSJVb7uRxdE7qJSYjbO2eksRXmndqyKqKoYPc9ClpPh5242mV1vA==",
+      "dependencies": {
+        "@babel/runtime": "^7.11.1",
+        "classnames": "^2.2.1",
+        "rc-util": "^5.44.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-notification": {
+      "version": "5.6.4",
+      "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-5.6.4.tgz",
+      "integrity": "sha512-KcS4O6B4qzM3KH7lkwOB7ooLPZ4b6J+VMmQgT51VZCeEcmghdeR4IrMcFq0LG+RPdnbe/ArT086tGM8Snimgiw==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "classnames": "2.x",
+        "rc-motion": "^2.9.0",
+        "rc-util": "^5.20.1"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-overflow": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rc-overflow/-/rc-overflow-1.4.1.tgz",
+      "integrity": "sha512-3MoPQQPV1uKyOMVNd6SZfONi+f3st0r8PksexIdBTeIYbMX0Jr+k7pHEDvsXtR4BpCv90/Pv2MovVNhktKrwvw==",
+      "dependencies": {
+        "@babel/runtime": "^7.11.1",
+        "classnames": "^2.2.1",
+        "rc-resize-observer": "^1.0.0",
+        "rc-util": "^5.37.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-pagination": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-5.1.0.tgz",
+      "integrity": "sha512-8416Yip/+eclTFdHXLKTxZvn70duYVGTvUUWbckCCZoIl3jagqke3GLsFrMs0bsQBikiYpZLD9206Ej4SOdOXQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "classnames": "^2.3.2",
+        "rc-util": "^5.38.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-picker": {
+      "version": "4.11.3",
+      "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-4.11.3.tgz",
+      "integrity": "sha512-MJ5teb7FlNE0NFHTncxXQ62Y5lytq6sh5nUw0iH8OkHL/TjARSEvSHpr940pWgjGANpjCwyMdvsEV55l5tYNSg==",
+      "dependencies": {
+        "@babel/runtime": "^7.24.7",
+        "@rc-component/trigger": "^2.0.0",
+        "classnames": "^2.2.1",
+        "rc-overflow": "^1.3.2",
+        "rc-resize-observer": "^1.4.0",
+        "rc-util": "^5.43.0"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "date-fns": ">= 2.x",
+        "dayjs": ">= 1.x",
+        "luxon": ">= 3.x",
+        "moment": ">= 2.x",
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      },
+      "peerDependenciesMeta": {
+        "date-fns": {
+          "optional": true
+        },
+        "dayjs": {
+          "optional": true
+        },
+        "luxon": {
+          "optional": true
+        },
+        "moment": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/rc-progress": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-4.0.0.tgz",
+      "integrity": "sha512-oofVMMafOCokIUIBnZLNcOZFsABaUw8PPrf1/y0ZBvKZNpOiu5h4AO9vv11Sw0p4Hb3D0yGWuEattcQGtNJ/aw==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "classnames": "^2.2.6",
+        "rc-util": "^5.16.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-rate": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.13.1.tgz",
+      "integrity": "sha512-QUhQ9ivQ8Gy7mtMZPAjLbxBt5y9GRp65VcUyGUMF3N3fhiftivPHdpuDIaWIMOTEprAjZPC08bls1dQB+I1F2Q==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "classnames": "^2.2.5",
+        "rc-util": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-resize-observer": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/rc-resize-observer/-/rc-resize-observer-1.4.3.tgz",
+      "integrity": "sha512-YZLjUbyIWox8E9i9C3Tm7ia+W7euPItNWSPX5sCcQTYbnwDb5uNpnLHQCG1f22oZWUhLw4Mv2tFmeWe68CDQRQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.20.7",
+        "classnames": "^2.2.1",
+        "rc-util": "^5.44.1",
+        "resize-observer-polyfill": "^1.5.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-segmented": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/rc-segmented/-/rc-segmented-2.7.0.tgz",
+      "integrity": "sha512-liijAjXz+KnTRVnxxXG2sYDGd6iLL7VpGGdR8gwoxAXy2KglviKCxLWZdjKYJzYzGSUwKDSTdYk8brj54Bn5BA==",
+      "dependencies": {
+        "@babel/runtime": "^7.11.1",
+        "classnames": "^2.2.1",
+        "rc-motion": "^2.4.4",
+        "rc-util": "^5.17.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.0.0",
+        "react-dom": ">=16.0.0"
+      }
+    },
+    "node_modules/rc-select": {
+      "version": "14.16.8",
+      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.16.8.tgz",
+      "integrity": "sha512-NOV5BZa1wZrsdkKaiK7LHRuo5ZjZYMDxPP6/1+09+FB4KoNi8jcG1ZqLE3AVCxEsYMBe65OBx71wFoHRTP3LRg==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "@rc-component/trigger": "^2.1.1",
+        "classnames": "2.x",
+        "rc-motion": "^2.0.1",
+        "rc-overflow": "^1.3.1",
+        "rc-util": "^5.16.1",
+        "rc-virtual-list": "^3.5.2"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-dom": "*"
+      }
+    },
+    "node_modules/rc-slider": {
+      "version": "11.1.8",
+      "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-11.1.8.tgz",
+      "integrity": "sha512-2gg/72YFSpKP+Ja5AjC5DPL1YnV8DEITDQrcc1eASrUYjl0esptaBVJBh5nLTXCCp15eD8EuGjwezVGSHhs9tQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "classnames": "^2.2.5",
+        "rc-util": "^5.36.0"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-steps": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-6.0.1.tgz",
+      "integrity": "sha512-lKHL+Sny0SeHkQKKDJlAjV5oZ8DwCdS2hFhAkIjuQt1/pB81M0cA0ErVFdHq9+jmPmFw1vJB2F5NBzFXLJxV+g==",
+      "dependencies": {
+        "@babel/runtime": "^7.16.7",
+        "classnames": "^2.2.3",
+        "rc-util": "^5.16.1"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-switch": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-4.1.0.tgz",
+      "integrity": "sha512-TI8ufP2Az9oEbvyCeVE4+90PDSljGyuwix3fV58p7HV2o4wBnVToEyomJRVyTaZeqNPAp+vqeo4Wnj5u0ZZQBg==",
+      "dependencies": {
+        "@babel/runtime": "^7.21.0",
+        "classnames": "^2.2.1",
+        "rc-util": "^5.30.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-table": {
+      "version": "7.51.1",
+      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.51.1.tgz",
+      "integrity": "sha512-5iq15mTHhvC42TlBLRCoCBLoCmGlbRZAlyF21FonFnS/DIC8DeRqnmdyVREwt2CFbPceM0zSNdEeVfiGaqYsKw==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "@rc-component/context": "^1.4.0",
+        "classnames": "^2.2.5",
+        "rc-resize-observer": "^1.1.0",
+        "rc-util": "^5.44.3",
+        "rc-virtual-list": "^3.14.2"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-tabs": {
+      "version": "15.6.1",
+      "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-15.6.1.tgz",
+      "integrity": "sha512-/HzDV1VqOsUWyuC0c6AkxVYFjvx9+rFPKZ32ejxX0Uc7QCzcEjTA9/xMgv4HemPKwzBNX8KhGVbbumDjnj92aA==",
+      "dependencies": {
+        "@babel/runtime": "^7.11.2",
+        "classnames": "2.x",
+        "rc-dropdown": "~4.2.0",
+        "rc-menu": "~9.16.0",
+        "rc-motion": "^2.6.2",
+        "rc-resize-observer": "^1.0.0",
+        "rc-util": "^5.34.1"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-textarea": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/rc-textarea/-/rc-textarea-1.10.0.tgz",
+      "integrity": "sha512-ai9IkanNuyBS4x6sOL8qu/Ld40e6cEs6pgk93R+XLYg0mDSjNBGey6/ZpDs5+gNLD7urQ14po3V6Ck2dJLt9SA==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "classnames": "^2.2.1",
+        "rc-input": "~1.8.0",
+        "rc-resize-observer": "^1.0.0",
+        "rc-util": "^5.27.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-tooltip": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-6.4.0.tgz",
+      "integrity": "sha512-kqyivim5cp8I5RkHmpsp1Nn/Wk+1oeloMv9c7LXNgDxUpGm+RbXJGL+OPvDlcRnx9DBeOe4wyOIl4OKUERyH1g==",
+      "dependencies": {
+        "@babel/runtime": "^7.11.2",
+        "@rc-component/trigger": "^2.0.0",
+        "classnames": "^2.3.1",
+        "rc-util": "^5.44.3"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-tree": {
+      "version": "5.13.1",
+      "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-5.13.1.tgz",
+      "integrity": "sha512-FNhIefhftobCdUJshO7M8uZTA9F4OPGVXqGfZkkD/5soDeOhwO06T/aKTrg0WD8gRg/pyfq+ql3aMymLHCTC4A==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.1",
+        "classnames": "2.x",
+        "rc-motion": "^2.0.1",
+        "rc-util": "^5.16.1",
+        "rc-virtual-list": "^3.5.1"
+      },
+      "engines": {
+        "node": ">=10.x"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-dom": "*"
+      }
+    },
+    "node_modules/rc-tree-select": {
+      "version": "5.27.0",
+      "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-5.27.0.tgz",
+      "integrity": "sha512-2qTBTzwIT7LRI1o7zLyrCzmo5tQanmyGbSaGTIf7sYimCklAToVVfpMC6OAldSKolcnjorBYPNSKQqJmN3TCww==",
+      "dependencies": {
+        "@babel/runtime": "^7.25.7",
+        "classnames": "2.x",
+        "rc-select": "~14.16.2",
+        "rc-tree": "~5.13.0",
+        "rc-util": "^5.43.0"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-dom": "*"
+      }
+    },
+    "node_modules/rc-upload": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-4.9.2.tgz",
+      "integrity": "sha512-nHx+9rbd1FKMiMRYsqQ3NkXUv7COHPBo3X1Obwq9SWS6/diF/A0aJ5OHubvwUAIDs+4RMleljV0pcrNUc823GQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "classnames": "^2.2.5",
+        "rc-util": "^5.2.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-util": {
+      "version": "5.44.4",
+      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.44.4.tgz",
+      "integrity": "sha512-resueRJzmHG9Q6rI/DfK6Kdv9/Lfls05vzMs1Sk3M2P+3cJa+MakaZyWY8IPfehVuhPJFKrIY1IK4GqbiaiY5w==",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "react-is": "^18.2.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc-util/node_modules/react-is": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+    },
+    "node_modules/rc-virtual-list": {
+      "version": "3.19.1",
+      "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.19.1.tgz",
+      "integrity": "sha512-DCapO2oyPqmooGhxBuXHM4lFuX+sshQwWqqkuyFA+4rShLe//+GEPVwiDgO+jKtKHtbeYwZoNvetwfHdOf+iUQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.20.0",
+        "classnames": "^2.2.6",
+        "rc-resize-observer": "^1.0.0",
+        "rc-util": "^5.36.0"
+      },
+      "engines": {
+        "node": ">=8.x"
+      },
+      "peerDependencies": {
+        "react": ">=16.9.0",
+        "react-dom": ">=16.9.0"
+      }
+    },
+    "node_modules/rc/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
+      "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-app-polyfill": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-2.0.0.tgz",
+      "integrity": "sha512-0sF4ny9v/B7s6aoehwze9vJNWcmCemAUYBVasscVr92+UYiEqDXOxfKjXN685mDaMRNF3WdhHQs76oTODMocFA==",
+      "dependencies": {
+        "core-js": "^3.6.5",
+        "object-assign": "^4.1.1",
+        "promise": "^8.1.0",
+        "raf": "^3.4.1",
+        "regenerator-runtime": "^0.13.7",
+        "whatwg-fetch": "^3.4.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/react-app-polyfill/node_modules/regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
+    "node_modules/react-chartjs-2": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.11.2.tgz",
+      "integrity": "sha512-hcPS9vmRJeAALPPf0uo02BiD8BDm0HNmneJYTZVR74UKprXOpql+Jy1rVuj93rKw0Jfx77mkcRfXPxTe5K83uw==",
+      "dependencies": {
+        "lodash": "^4.17.19",
+        "prop-types": "^15.7.2"
+      },
+      "peerDependencies": {
+        "chart.js": "^2.3",
+        "react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
+        "react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+      }
+    },
+    "node_modules/react-dev-utils": {
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
+      "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==",
+      "dependencies": {
+        "@babel/code-frame": "^7.16.0",
+        "address": "^1.1.2",
+        "browserslist": "^4.18.1",
+        "chalk": "^4.1.2",
+        "cross-spawn": "^7.0.3",
+        "detect-port-alt": "^1.1.6",
+        "escape-string-regexp": "^4.0.0",
+        "filesize": "^8.0.6",
+        "find-up": "^5.0.0",
+        "fork-ts-checker-webpack-plugin": "^6.5.0",
+        "global-modules": "^2.0.0",
+        "globby": "^11.0.4",
+        "gzip-size": "^6.0.0",
+        "immer": "^9.0.7",
+        "is-root": "^2.1.0",
+        "loader-utils": "^3.2.0",
+        "open": "^8.4.0",
+        "pkg-up": "^3.1.0",
+        "prompts": "^2.4.2",
+        "react-error-overlay": "^6.0.11",
+        "recursive-readdir": "^2.2.2",
+        "shell-quote": "^1.7.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/react-dev-utils/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/react-dev-utils/node_modules/find-up": {
+      "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"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-dev-utils/node_modules/loader-utils": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz",
+      "integrity": "sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==",
+      "engines": {
+        "node": ">= 12.13.0"
+      }
+    },
+    "node_modules/react-dev-utils/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-dev-utils/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-dev-utils/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
+      "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "scheduler": "^0.20.2"
+      },
+      "peerDependencies": {
+        "react": "17.0.2"
+      }
+    },
+    "node_modules/react-error-overlay": {
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
+      "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
+    },
+    "node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+    },
+    "node_modules/react-oidc-context": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/react-oidc-context/-/react-oidc-context-2.4.0.tgz",
+      "integrity": "sha512-7xbEXlBBlWBQfdSibjeA7jC5w1oKTvZVAodd9A+fmqDRt4bD+gGODWgGT8dX+a0S96Vfo7lzIrEBP7eZCFkwWw==",
+      "engines": {
+        "node": ">=12.13.0"
+      },
+      "peerDependencies": {
+        "oidc-client-ts": "^2.4.1",
+        "react": ">=16.8.0"
+      }
+    },
+    "node_modules/react-refresh": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
+      "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-router": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz",
+      "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.13",
+        "history": "^4.9.0",
+        "hoist-non-react-statics": "^3.1.0",
+        "loose-envify": "^1.3.1",
+        "path-to-regexp": "^1.7.0",
+        "prop-types": "^15.6.2",
+        "react-is": "^16.6.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=15"
+      }
+    },
+    "node_modules/react-router-dom": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz",
+      "integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.13",
+        "history": "^4.9.0",
+        "loose-envify": "^1.3.1",
+        "prop-types": "^15.6.2",
+        "react-router": "5.3.4",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=15"
+      }
+    },
+    "node_modules/react-router/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "node_modules/react-scripts": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
+      "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==",
+      "dependencies": {
+        "@babel/core": "^7.16.0",
+        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
+        "@svgr/webpack": "^5.5.0",
+        "babel-jest": "^27.4.2",
+        "babel-loader": "^8.2.3",
+        "babel-plugin-named-asset-import": "^0.3.8",
+        "babel-preset-react-app": "^10.0.1",
+        "bfj": "^7.0.2",
+        "browserslist": "^4.18.1",
+        "camelcase": "^6.2.1",
+        "case-sensitive-paths-webpack-plugin": "^2.4.0",
+        "css-loader": "^6.5.1",
+        "css-minimizer-webpack-plugin": "^3.2.0",
+        "dotenv": "^10.0.0",
+        "dotenv-expand": "^5.1.0",
+        "eslint": "^8.3.0",
+        "eslint-config-react-app": "^7.0.1",
+        "eslint-webpack-plugin": "^3.1.1",
+        "file-loader": "^6.2.0",
+        "fs-extra": "^10.0.0",
+        "html-webpack-plugin": "^5.5.0",
+        "identity-obj-proxy": "^3.0.0",
+        "jest": "^27.4.3",
+        "jest-resolve": "^27.4.2",
+        "jest-watch-typeahead": "^1.0.0",
+        "mini-css-extract-plugin": "^2.4.5",
+        "postcss": "^8.4.4",
+        "postcss-flexbugs-fixes": "^5.0.2",
+        "postcss-loader": "^6.2.1",
+        "postcss-normalize": "^10.0.1",
+        "postcss-preset-env": "^7.0.1",
+        "prompts": "^2.4.2",
+        "react-app-polyfill": "^3.0.0",
+        "react-dev-utils": "^12.0.1",
+        "react-refresh": "^0.11.0",
+        "resolve": "^1.20.0",
+        "resolve-url-loader": "^4.0.0",
+        "sass-loader": "^12.3.0",
+        "semver": "^7.3.5",
+        "source-map-loader": "^3.0.0",
+        "style-loader": "^3.3.1",
+        "tailwindcss": "^3.0.2",
+        "terser-webpack-plugin": "^5.2.5",
+        "webpack": "^5.64.4",
+        "webpack-dev-server": "^4.6.0",
+        "webpack-manifest-plugin": "^4.0.2",
+        "workbox-webpack-plugin": "^6.4.1"
+      },
+      "bin": {
+        "react-scripts": "bin/react-scripts.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      },
+      "peerDependencies": {
+        "react": ">= 16",
+        "typescript": "^3.2.1 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-scripts/node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@humanwhocodes/config-array": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
+      "deprecated": "Use @eslint/config-array instead",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.3",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead"
+    },
+    "node_modules/react-scripts/node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
+      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.4.0",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/type-utils": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-scripts/node_modules/@typescript-eslint/experimental-utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz",
+      "integrity": "sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==",
+      "dependencies": {
+        "@typescript-eslint/utils": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@typescript-eslint/parser": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
+      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-scripts/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-scripts/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/react-scripts/node_modules/acorn": {
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/react-scripts/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "node_modules/react-scripts/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/react-scripts/node_modules/eslint": {
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/react-scripts/node_modules/eslint-config-react-app": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
+      "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
+      "dependencies": {
+        "@babel/core": "^7.16.0",
+        "@babel/eslint-parser": "^7.16.3",
+        "@rushstack/eslint-patch": "^1.1.0",
+        "@typescript-eslint/eslint-plugin": "^5.5.0",
+        "@typescript-eslint/parser": "^5.5.0",
+        "babel-preset-react-app": "^10.0.1",
+        "confusing-browser-globals": "^1.0.11",
+        "eslint-plugin-flowtype": "^8.0.3",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jest": "^25.3.0",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.27.1",
+        "eslint-plugin-react-hooks": "^4.3.0",
+        "eslint-plugin-testing-library": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^8.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/eslint-plugin-flowtype": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
+      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "string-natural-compare": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@babel/plugin-syntax-flow": "^7.14.5",
+        "@babel/plugin-transform-react-jsx": "^7.14.9",
+        "eslint": "^8.1.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/eslint-plugin-jest": {
+      "version": "25.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
+      "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^4.0.0 || ^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@typescript-eslint/eslint-plugin": {
+          "optional": true
+        },
+        "jest": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-scripts/node_modules/eslint-plugin-testing-library": {
+      "version": "5.11.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.1.tgz",
+      "integrity": "sha512-5eX9e1Kc2PqVRed3taaLnAAqPZGEX75C+M/rXzUAI3wIg/ZxzUm1OVAwfe/O+vE+6YXOLetSe9g5GKD2ecXipw==",
+      "dependencies": {
+        "@typescript-eslint/utils": "^5.58.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0",
+        "npm": ">=6"
+      },
+      "peerDependencies": {
+        "eslint": "^7.5.0 || ^8.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/react-scripts/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/react-scripts/node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/react-scripts/node_modules/find-up": {
+      "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"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-scripts/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-scripts/node_modules/js-yaml": {
+      "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"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/react-scripts/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/react-scripts/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-scripts/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-scripts/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-scripts/node_modules/react-app-polyfill": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz",
+      "integrity": "sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w==",
+      "dependencies": {
+        "core-js": "^3.19.2",
+        "object-assign": "^4.1.1",
+        "promise": "^8.1.0",
+        "raf": "^3.4.1",
+        "regenerator-runtime": "^0.13.9",
+        "whatwg-fetch": "^3.6.2"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/react-scripts/node_modules/regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
+    "node_modules/react-scripts/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/react-scripts/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-shallow-renderer": {
+      "version": "16.15.0",
+      "resolved": "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz",
+      "integrity": "sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "react-is": "^16.12.0 || ^17.0.0 || ^18.0.0"
+      },
+      "peerDependencies": {
+        "react": "^16.0.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/react-svg": {
+      "version": "11.2.5",
+      "resolved": "https://registry.npmjs.org/react-svg/-/react-svg-11.2.5.tgz",
+      "integrity": "sha512-uUMhRVdU//5qktiTSO2W6nQeHRLwYA1FsWANQFB5O33UgT2uT0V5wVapu46+wz1mx6wt1j53+1aA8QuNn4lJ6A==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.13",
+        "@tanem/svg-injector": "^8.2.4",
+        "prop-types": "^15.7.2"
+      },
+      "peerDependencies": {
+        "react": "^15.5.4 || ^16.0.0 || ^17.0.0",
+        "react-dom": "^15.5.4 || ^16.0.0 || ^17.0.0"
+      }
+    },
+    "node_modules/react-test-renderer": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-17.0.2.tgz",
+      "integrity": "sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ==",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "react-is": "^17.0.2",
+        "react-shallow-renderer": "^16.13.1",
+        "scheduler": "^0.20.2"
+      },
+      "peerDependencies": {
+        "react": "17.0.2"
+      }
+    },
+    "node_modules/react-to-print": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/react-to-print/-/react-to-print-2.15.1.tgz",
+      "integrity": "sha512-1foogIFbCpzAVxydkhBiDfMiFYhIMphiagDOfcG4X/EcQ+fBPqJ0rby9Wv/emzY1YLkIQy/rEgOrWQT+rBKhjw==",
+      "peerDependencies": {
+        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/react-transition-group": {
+      "version": "4.4.5",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.6.0",
+        "react-dom": ">=16.6.0"
+      }
+    },
+    "node_modules/read-all-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
+      "integrity": "sha512-DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==",
+      "dependencies": {
+        "pinkie-promise": "^2.0.0",
+        "readable-stream": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+      "dependencies": {
+        "pify": "^2.3.0"
+      }
+    },
+    "node_modules/read-cache/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "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"
+      }
+    },
+    "node_modules/readable-stream/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/recursive-readdir": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
+      "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
+      "dependencies": {
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dependencies": {
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz",
+      "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.1",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "globalthis": "^1.0.3",
+        "which-builtin-type": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
+    },
+    "node_modules/regenerate-unicode-properties": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+      "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
+      "dependencies": {
+        "regenerate": "^1.4.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+    },
+    "node_modules/regenerator-transform": {
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
+      "dependencies": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "node_modules/regex-parser": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
+      "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg=="
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz",
+      "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/regexpu-core": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz",
+      "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==",
+      "dependencies": {
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.2.0",
+        "regjsgen": "^0.8.0",
+        "regjsparser": "^0.11.0",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/registry-auth-token": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+      "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
+      "dependencies": {
+        "rc": "^1.1.6",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/registry-url": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+      "integrity": "sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==",
+      "dependencies": {
+        "rc": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q=="
+    },
+    "node_modules/regjsparser": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.2.tgz",
+      "integrity": "sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==",
+      "dependencies": {
+        "jsesc": "~3.0.2"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/renderkid": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
+      "dependencies": {
+        "css-select": "^4.1.3",
+        "dom-converter": "^0.2.0",
+        "htmlparser2": "^6.1.0",
+        "lodash": "^4.17.21",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+    },
+    "node_modules/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=="
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-cwd/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-pathname": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
+      "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
+    },
+    "node_modules/resolve-url-loader": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
+      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
+      "dependencies": {
+        "adjust-sourcemap-loader": "^4.0.0",
+        "convert-source-map": "^1.7.0",
+        "loader-utils": "^2.0.0",
+        "postcss": "^7.0.35",
+        "source-map": "0.6.1"
+      },
+      "engines": {
+        "node": ">=8.9"
+      },
+      "peerDependencies": {
+        "rework": "1.0.1",
+        "rework-visit": "1.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rework": {
+          "optional": true
+        },
+        "rework-visit": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+    },
+    "node_modules/resolve-url-loader/node_modules/picocolors": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
+    },
+    "node_modules/resolve-url-loader/node_modules/postcss": {
+      "version": "7.0.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "dependencies": {
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/resolve.exports": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz",
+      "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "2.79.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
+      "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/rollup-plugin-terser": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
+      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
+      "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser",
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "jest-worker": "^26.2.1",
+        "serialize-javascript": "^4.0.0",
+        "terser": "^5.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.0.0"
+      }
+    },
+    "node_modules/rollup-plugin-terser/node_modules/jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/rollup-plugin-terser/node_modules/serialize-javascript": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-array-concat/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/sanitize.css": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz",
+      "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="
+    },
+    "node_modules/sass": {
+      "version": "1.80.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz",
+      "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==",
+      "dependencies": {
+        "chokidar": "^4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
+      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
+      "dependencies": {
+        "klona": "^2.0.4",
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sass/node_modules/chokidar": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
+      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/sass/node_modules/readdirp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
+      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/scheduler": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
+      "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/scroll-into-view-if-needed": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-3.1.0.tgz",
+      "integrity": "sha512-49oNpRjWRvnU8NyGVmUaYG4jtTkNonFZI86MmGRDqBphEK2EXT9gdEUoQPZhuBM8yWHxCWbobltqYO5M4XrUvQ==",
+      "dependencies": {
+        "compute-scroll-into-view": "^3.0.2"
+      }
+    },
+    "node_modules/select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
+    },
+    "node_modules/selfsigned": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+      "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
+      "dependencies": {
+        "@types/node-forge": "^1.3.0",
+        "node-forge": "^1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "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"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/debug": {
+      "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"
+      }
+    },
+    "node_modules/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "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"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+    },
+    "node_modules/serve-index/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/serve-index/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+    },
+    "node_modules/serve-index/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+      "dependencies": {
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.19.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
+      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ=="
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shell-quote": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/sliced": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
+      "integrity": "sha512-VZBmZP8WU3sMOZm1bdgTadsQbcscK0UM8oKxKVBs4XAhUo2Xxzm/OFMGBkPusxw9xL3Uy8LrzEqGqJhclsr0yA=="
+    },
+    "node_modules/sockjs": {
+      "version": "0.3.24",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+      "dependencies": {
+        "faye-websocket": "^0.11.3",
+        "uuid": "^8.3.2",
+        "websocket-driver": "^0.7.4"
+      }
+    },
+    "node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-explorer": {
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-explorer/-/source-map-explorer-2.5.3.tgz",
+      "integrity": "sha512-qfUGs7UHsOBE5p/lGfQdaAj/5U/GWYBw2imEpD6UQNkqElYonkow8t+HBL1qqIl3CuGZx7n8/CQo4x1HwSHhsg==",
+      "dependencies": {
+        "btoa": "^1.2.1",
+        "chalk": "^4.1.0",
+        "convert-source-map": "^1.7.0",
+        "ejs": "^3.1.5",
+        "escape-html": "^1.0.3",
+        "glob": "^7.1.6",
+        "gzip-size": "^6.0.0",
+        "lodash": "^4.17.20",
+        "open": "^7.3.1",
+        "source-map": "^0.7.4",
+        "temp": "^0.9.4",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "sme": "bin/cli.js",
+        "source-map-explorer": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/source-map-explorer/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/source-map-explorer/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+    },
+    "node_modules/source-map-explorer/node_modules/open": {
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/source-map-explorer/node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-loader": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
+      "integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
+      "dependencies": {
+        "abab": "^2.0.5",
+        "iconv-lite": "^0.6.3",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "deprecated": "Please use @jridgewell/sourcemap-codec instead"
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w=="
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.20",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
+      "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw=="
+    },
+    "node_modules/spdy": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      }
+    },
+    "node_modules/spdy-transport/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+    },
+    "node_modules/stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility"
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/stack-utils/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stackframe": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
+      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="
+    },
+    "node_modules/static-eval": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz",
+      "integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==",
+      "dependencies": {
+        "escodegen": "^1.8.1"
+      }
+    },
+    "node_modules/static-eval/node_modules/escodegen": {
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/static-eval/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/static-eval/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/static-eval/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/static-eval/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/static-eval/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/string_decoder": {
+      "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"
+      }
+    },
+    "node_modules/string-convert": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
+      "integrity": "sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A=="
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-natural-compare": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
+      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw=="
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "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"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "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"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/string-width/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/string.prototype.includes": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz",
+      "integrity": "sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/string.prototype.matchall": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
+      "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.7",
+        "regexp.prototype.flags": "^1.5.2",
+        "set-function-name": "^2.0.2",
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.repeat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
+      "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/stringify-object": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
+      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
+      "dependencies": {
+        "get-own-enumerable-property-symbols": "^3.0.0",
+        "is-obj": "^1.0.1",
+        "is-regexp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
+      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "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==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/style-loader": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
+      "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/stylehacks": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
+      "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/stylis": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.6.tgz",
+      "integrity": "sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ=="
+    },
+    "node_modules/sucrase": {
+      "version": "3.35.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
+      "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "commander": "^4.0.0",
+        "glob": "^10.3.10",
+        "lines-and-columns": "^1.1.6",
+        "mz": "^2.7.0",
+        "pirates": "^4.0.1",
+        "ts-interface-checker": "^0.1.9"
+      },
+      "bin": {
+        "sucrase": "bin/sucrase",
+        "sucrase-node": "bin/sucrase-node"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/sucrase/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/sucrase/node_modules/commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/sucrase/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/sucrase/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/svg-parser": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
+      "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ=="
+    },
+    "node_modules/svgo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
+        "css-select": "^2.0.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.37",
+        "csso": "^4.0.2",
+        "js-yaml": "^3.13.1",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.1.0",
+        "sax": "~1.2.4",
+        "stable": "^0.1.8",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/svgo/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/chalk": {
+      "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"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/svgo/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/svgo/node_modules/css-select": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^3.2.1",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
+      }
+    },
+    "node_modules/svgo/node_modules/css-what": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/svgo/node_modules/dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/svgo/node_modules/domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "dependencies": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/svgo/node_modules/domutils/node_modules/domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+    },
+    "node_modules/svgo/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/svgo/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "dependencies": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "node_modules/svgo/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
+    },
+    "node_modules/synckit": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz",
+      "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==",
+      "dependencies": {
+        "@pkgr/core": "^0.1.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
+    "node_modules/synckit/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+    },
+    "node_modules/table": {
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz",
+      "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==",
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/tailwindcss": {
+      "version": "3.4.14",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.14.tgz",
+      "integrity": "sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==",
+      "dependencies": {
+        "@alloc/quick-lru": "^5.2.0",
+        "arg": "^5.0.2",
+        "chokidar": "^3.5.3",
+        "didyoumean": "^1.2.2",
+        "dlv": "^1.1.3",
+        "fast-glob": "^3.3.0",
+        "glob-parent": "^6.0.2",
+        "is-glob": "^4.0.3",
+        "jiti": "^1.21.0",
+        "lilconfig": "^2.1.0",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "object-hash": "^3.0.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.23",
+        "postcss-import": "^15.1.0",
+        "postcss-js": "^4.0.1",
+        "postcss-load-config": "^4.0.1",
+        "postcss-nested": "^6.0.1",
+        "postcss-selector-parser": "^6.0.11",
+        "resolve": "^1.22.2",
+        "sucrase": "^3.32.0"
+      },
+      "bin": {
+        "tailwind": "lib/cli.js",
+        "tailwindcss": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tailwindcss/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/temp": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz",
+      "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==",
+      "dependencies": {
+        "mkdirp": "^0.5.1",
+        "rimraf": "~2.6.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/temp-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
+      "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/temp/node_modules/rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/tempy": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz",
+      "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
+      "dependencies": {
+        "is-stream": "^2.0.0",
+        "temp-dir": "^2.0.0",
+        "type-fest": "^0.16.0",
+        "unique-string": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/tempy/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/tempy/node_modules/type-fest": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
+      "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terminal-link": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "supports-hyperlinks": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.36.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.36.0.tgz",
+      "integrity": "sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==",
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.10",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.20",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.26.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser/node_modules/acorn": {
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/terser/node_modules/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=="
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+    },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/throat": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz",
+      "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ=="
+    },
+    "node_modules/throttle-debounce": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-5.0.2.tgz",
+      "integrity": "sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==",
+      "engines": {
+        "node": ">=12.22"
+      }
+    },
+    "node_modules/thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
+    },
+    "node_modules/timed-out": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
+      "integrity": "sha512-pqqJOi1rF5zNs/ps4vmbE4SFCrM4iR7LW+GHAsHqO/EumqbIWceioevYLM5xZRgQSH6gFgL9J/uB7EcJhQ9niQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/tiny-invariant": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
+      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg=="
+    },
+    "node_modules/tiny-warning": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+    },
+    "node_modules/tmp": {
+      "version": "0.0.28",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz",
+      "integrity": "sha512-c2mmfiBmND6SOVxzogm1oda0OJ1HZVIk/5n26N59dDTh80MUeavpiCls4PGAdkX1PFkKokLpcf7prSjCeXLsJg==",
+      "dependencies": {
+        "os-tmpdir": "~1.0.1"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toggle-selection": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
+      "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ=="
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/tryer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
+      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
+    },
+    "node_modules/ts-interface-checker": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "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"
+      }
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/typpy": {
+      "version": "2.3.13",
+      "resolved": "https://registry.npmjs.org/typpy/-/typpy-2.3.13.tgz",
+      "integrity": "sha512-vOxIcQz9sxHi+rT09SJ5aDgVgrPppQjwnnayTrMye1ODaU8gIZTDM19t9TxmEElbMihx2Nq/0/b/MtyKfayRqA==",
+      "dependencies": {
+        "function.name": "^1.0.3"
+      }
+    },
+    "node_modules/ul": {
+      "version": "5.2.15",
+      "resolved": "https://registry.npmjs.org/ul/-/ul-5.2.15.tgz",
+      "integrity": "sha512-svLEUy8xSCip5IWnsRa0UOg+2zP0Wsj4qlbjTmX6GJSmvKMHADBuHOm1dpNkWqWPIGuVSqzUkV3Cris5JrlTRQ==",
+      "dependencies": {
+        "deffy": "^2.2.2",
+        "typpy": "^2.3.4"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="
+    },
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+      "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+      "dependencies": {
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+      "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unique-string": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
+      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
+      "dependencies": {
+        "crypto-random-string": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
+    },
+    "node_modules/unzip-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
+      "integrity": "sha512-pwCcjjhEcpW45JZIySExBHYv5Y9EeL2OIGEfrSKp2dMUFGFv4CpvZkwJbVge8OvGH2BNNtJBx67DuKuJhf+N5Q==",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "engines": {
+        "node": ">=4",
+        "yarn": "*"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.0"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha512-BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA==",
+      "dependencies": {
+        "prepend-http": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/usehooks-ts": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/usehooks-ts/-/usehooks-ts-3.1.1.tgz",
+      "integrity": "sha512-I4diPp9Cq6ieSUH2wu+fDAVQO43xwtulo+fKEidHUwZPnYImbtkTjzIJYcDcJqxgmX31GVqNFURodvcgHcW0pA==",
+      "dependencies": {
+        "lodash.debounce": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=16.15.0"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0  || ^17 || ^18 || ^19 || ^19.0.0-rc"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "node_modules/util.promisify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
+      "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw=="
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
+      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
+    "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+    },
+    "node_modules/v8-to-istanbul/node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/value-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
+      "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/w-json": {
+      "version": "1.3.10",
+      "resolved": "https://registry.npmjs.org/w-json/-/w-json-1.3.10.tgz",
+      "integrity": "sha512-XadVyw0xE+oZ5FGApXsdswv96rOhStzKqL53uSe5UaTadABGkWIg1+DTx8kiZ/VqTZTBneoL0l65RcPe4W3ecw=="
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "dependencies": {
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dependencies": {
+        "makeerror": "1.0.12"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dependencies": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "engines": {
+        "node": ">=10.4"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.96.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
+      "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.17.1",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.11",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.1",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-middleware": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+      "dependencies": {
+        "colorette": "^2.0.10",
+        "memfs": "^3.4.3",
+        "mime-types": "^2.1.31",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/webpack-dev-server": {
+      "version": "4.15.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
+      "integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
+      "dependencies": {
+        "@types/bonjour": "^3.5.9",
+        "@types/connect-history-api-fallback": "^1.3.5",
+        "@types/express": "^4.17.13",
+        "@types/serve-index": "^1.9.1",
+        "@types/serve-static": "^1.13.10",
+        "@types/sockjs": "^0.3.33",
+        "@types/ws": "^8.5.5",
+        "ansi-html-community": "^0.0.8",
+        "bonjour-service": "^1.0.11",
+        "chokidar": "^3.5.3",
+        "colorette": "^2.0.10",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^2.0.0",
+        "default-gateway": "^6.0.3",
+        "express": "^4.17.3",
+        "graceful-fs": "^4.2.6",
+        "html-entities": "^2.3.2",
+        "http-proxy-middleware": "^2.0.3",
+        "ipaddr.js": "^2.0.1",
+        "launch-editor": "^2.6.0",
+        "open": "^8.0.9",
+        "p-retry": "^4.5.0",
+        "rimraf": "^3.0.2",
+        "schema-utils": "^4.0.0",
+        "selfsigned": "^2.1.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.24",
+        "spdy": "^4.0.2",
+        "webpack-dev-middleware": "^5.3.4",
+        "ws": "^8.13.0"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.37.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        },
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ws": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-manifest-plugin": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz",
+      "integrity": "sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow==",
+      "dependencies": {
+        "tapable": "^2.0.0",
+        "webpack-sources": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.22.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.44.2 || ^5.47.0"
+      }
+    },
+    "node_modules/webpack-manifest-plugin/node_modules/webpack-sources": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
+      "dependencies": {
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "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==",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack/node_modules/acorn": {
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/webpack/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/webpack/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/webpack/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/websocket-driver": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dependencies": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/whatwg-fetch": {
+      "version": "3.6.20",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
+      "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/whatwg-url/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/which": {
+      "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"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz",
+      "integrity": "sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==",
+      "dependencies": {
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.0.5",
+        "is-finalizationregistry": "^1.0.2",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.1.4",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "dependencies": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/workbox-background-sync": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.6.0.tgz",
+      "integrity": "sha512-jkf4ZdgOJxC9u2vztxLuPT/UjlH7m/nWRQ/MgGL0v8BJHoZdVGJd18Kck+a0e55wGXdqyHO+4IQTk0685g4MUw==",
+      "dependencies": {
+        "idb": "^7.0.1",
+        "workbox-core": "6.6.0"
+      }
+    },
+    "node_modules/workbox-broadcast-update": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.6.0.tgz",
+      "integrity": "sha512-nm+v6QmrIFaB/yokJmQ/93qIJ7n72NICxIwQwe5xsZiV2aI93MGGyEyzOzDPVz5THEr5rC3FJSsO3346cId64Q==",
+      "dependencies": {
+        "workbox-core": "6.6.0"
+      }
+    },
+    "node_modules/workbox-build": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.6.0.tgz",
+      "integrity": "sha512-Tjf+gBwOTuGyZwMz2Nk/B13Fuyeo0Q84W++bebbVsfr9iLkDSo6j6PST8tET9HYA58mlRXwlMGpyWO8ETJiXdQ==",
+      "dependencies": {
+        "@apideck/better-ajv-errors": "^0.3.1",
+        "@babel/core": "^7.11.1",
+        "@babel/preset-env": "^7.11.0",
+        "@babel/runtime": "^7.11.2",
+        "@rollup/plugin-babel": "^5.2.0",
+        "@rollup/plugin-node-resolve": "^11.2.1",
+        "@rollup/plugin-replace": "^2.4.1",
+        "@surma/rollup-plugin-off-main-thread": "^2.2.3",
+        "ajv": "^8.6.0",
+        "common-tags": "^1.8.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "fs-extra": "^9.0.1",
+        "glob": "^7.1.6",
+        "lodash": "^4.17.20",
+        "pretty-bytes": "^5.3.0",
+        "rollup": "^2.43.1",
+        "rollup-plugin-terser": "^7.0.0",
+        "source-map": "^0.8.0-beta.0",
+        "stringify-object": "^3.3.0",
+        "strip-comments": "^2.0.1",
+        "tempy": "^0.6.0",
+        "upath": "^1.2.0",
+        "workbox-background-sync": "6.6.0",
+        "workbox-broadcast-update": "6.6.0",
+        "workbox-cacheable-response": "6.6.0",
+        "workbox-core": "6.6.0",
+        "workbox-expiration": "6.6.0",
+        "workbox-google-analytics": "6.6.0",
+        "workbox-navigation-preload": "6.6.0",
+        "workbox-precaching": "6.6.0",
+        "workbox-range-requests": "6.6.0",
+        "workbox-recipes": "6.6.0",
+        "workbox-routing": "6.6.0",
+        "workbox-strategies": "6.6.0",
+        "workbox-streams": "6.6.0",
+        "workbox-sw": "6.6.0",
+        "workbox-window": "6.6.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/workbox-build/node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/workbox-build/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/workbox-build/node_modules/source-map": {
+      "version": "0.8.0-beta.0",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
+      "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
+      "dependencies": {
+        "whatwg-url": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/workbox-build/node_modules/tr46": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+      "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/workbox-build/node_modules/webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+    },
+    "node_modules/workbox-build/node_modules/whatwg-url": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
+      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
+      "dependencies": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^1.0.1",
+        "webidl-conversions": "^4.0.2"
+      }
+    },
+    "node_modules/workbox-cacheable-response": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.6.0.tgz",
+      "integrity": "sha512-JfhJUSQDwsF1Xv3EV1vWzSsCOZn4mQ38bWEBR3LdvOxSPgB65gAM6cS2CX8rkkKHRgiLrN7Wxoyu+TuH67kHrw==",
+      "deprecated": "workbox-background-sync@6.6.0",
+      "dependencies": {
+        "workbox-core": "6.6.0"
+      }
+    },
+    "node_modules/workbox-core": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.6.0.tgz",
+      "integrity": "sha512-GDtFRF7Yg3DD859PMbPAYPeJyg5gJYXuBQAC+wyrWuuXgpfoOrIQIvFRZnQ7+czTIQjIr1DhLEGFzZanAT/3bQ=="
+    },
+    "node_modules/workbox-expiration": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.6.0.tgz",
+      "integrity": "sha512-baplYXcDHbe8vAo7GYvyAmlS4f6998Jff513L4XvlzAOxcl8F620O91guoJ5EOf5qeXG4cGdNZHkkVAPouFCpw==",
+      "dependencies": {
+        "idb": "^7.0.1",
+        "workbox-core": "6.6.0"
+      }
+    },
+    "node_modules/workbox-google-analytics": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.6.0.tgz",
+      "integrity": "sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==",
+      "deprecated": "It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained",
+      "dependencies": {
+        "workbox-background-sync": "6.6.0",
+        "workbox-core": "6.6.0",
+        "workbox-routing": "6.6.0",
+        "workbox-strategies": "6.6.0"
+      }
+    },
+    "node_modules/workbox-navigation-preload": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.6.0.tgz",
+      "integrity": "sha512-utNEWG+uOfXdaZmvhshrh7KzhDu/1iMHyQOV6Aqup8Mm78D286ugu5k9MFD9SzBT5TcwgwSORVvInaXWbvKz9Q==",
+      "dependencies": {
+        "workbox-core": "6.6.0"
+      }
+    },
+    "node_modules/workbox-precaching": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.6.0.tgz",
+      "integrity": "sha512-eYu/7MqtRZN1IDttl/UQcSZFkHP7dnvr/X3Vn6Iw6OsPMruQHiVjjomDFCNtd8k2RdjLs0xiz9nq+t3YVBcWPw==",
+      "dependencies": {
+        "workbox-core": "6.6.0",
+        "workbox-routing": "6.6.0",
+        "workbox-strategies": "6.6.0"
+      }
+    },
+    "node_modules/workbox-range-requests": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.6.0.tgz",
+      "integrity": "sha512-V3aICz5fLGq5DpSYEU8LxeXvsT//mRWzKrfBOIxzIdQnV/Wj7R+LyJVTczi4CQ4NwKhAaBVaSujI1cEjXW+hTw==",
+      "dependencies": {
+        "workbox-core": "6.6.0"
+      }
+    },
+    "node_modules/workbox-recipes": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.6.0.tgz",
+      "integrity": "sha512-TFi3kTgYw73t5tg73yPVqQC8QQjxJSeqjXRO4ouE/CeypmP2O/xqmB/ZFBBQazLTPxILUQ0b8aeh0IuxVn9a6A==",
+      "dependencies": {
+        "workbox-cacheable-response": "6.6.0",
+        "workbox-core": "6.6.0",
+        "workbox-expiration": "6.6.0",
+        "workbox-precaching": "6.6.0",
+        "workbox-routing": "6.6.0",
+        "workbox-strategies": "6.6.0"
+      }
+    },
+    "node_modules/workbox-routing": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.6.0.tgz",
+      "integrity": "sha512-x8gdN7VDBiLC03izAZRfU+WKUXJnbqt6PG9Uh0XuPRzJPpZGLKce/FkOX95dWHRpOHWLEq8RXzjW0O+POSkKvw==",
+      "dependencies": {
+        "workbox-core": "6.6.0"
+      }
+    },
+    "node_modules/workbox-strategies": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.6.0.tgz",
+      "integrity": "sha512-eC07XGuINAKUWDnZeIPdRdVja4JQtTuc35TZ8SwMb1ztjp7Ddq2CJ4yqLvWzFWGlYI7CG/YGqaETntTxBGdKgQ==",
+      "dependencies": {
+        "workbox-core": "6.6.0"
+      }
+    },
+    "node_modules/workbox-streams": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.6.0.tgz",
+      "integrity": "sha512-rfMJLVvwuED09CnH1RnIep7L9+mj4ufkTyDPVaXPKlhi9+0czCu+SJggWCIFbPpJaAZmp2iyVGLqS3RUmY3fxg==",
+      "dependencies": {
+        "workbox-core": "6.6.0",
+        "workbox-routing": "6.6.0"
+      }
+    },
+    "node_modules/workbox-sw": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.6.0.tgz",
+      "integrity": "sha512-R2IkwDokbtHUE4Kus8pKO5+VkPHD2oqTgl+XJwh4zbF1HyjAbgNmK/FneZHVU7p03XUt9ICfuGDYISWG9qV/CQ=="
+    },
+    "node_modules/workbox-webpack-plugin": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.6.0.tgz",
+      "integrity": "sha512-xNZIZHalboZU66Wa7x1YkjIqEy1gTR+zPM+kjrYJzqN7iurYZBctBLISyScjhkJKYuRrZUP0iqViZTh8rS0+3A==",
+      "dependencies": {
+        "fast-json-stable-stringify": "^2.1.0",
+        "pretty-bytes": "^5.4.1",
+        "upath": "^1.2.0",
+        "webpack-sources": "^1.4.3",
+        "workbox-build": "6.6.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.4.0 || ^5.9.0"
+      }
+    },
+    "node_modules/workbox-webpack-plugin/node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/workbox-window": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.6.0.tgz",
+      "integrity": "sha512-L4N9+vka17d16geaJXXRjENLFldvkWy7JyGxElRD0JvBxvFEd8LOhr+uXCcar/NzAmIBRv9EZ+M+Qr4mOoBITw==",
+      "dependencies": {
+        "@types/trusted-types": "^2.0.2",
+        "workbox-core": "6.6.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "node_modules/write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+    },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/yargs": {
+      "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"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/package.json b/src/Strata.ContinuousImprovement.Web/continuousimprovement/package.json
new file mode 100644
index 0000000..447cf30
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/package.json
@@ -0,0 +1,96 @@
+{
+  "name": "continuousimprovement",
+  "version": "0.1.0",
+  "private": true,
+  "homepage": "/continuousimprovement",
+  "dependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "@strata/charts": "^0.2.0",
+    "@strata/core": "^5.3.0",
+    "@strata/eslint-config": "^3.6.0-1",
+    "@strata/jazz": "^0.6.0",
+    "@strata/logging": "^0.2.0",
+    "@strata/navbar": "^4.27.0",
+    "@strata/score": "^2.4.3",
+    "@strata/signalr": "^0.8.0",
+    "@strata/tempo": "^6.33.0",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^11.2.7",
+    "@types/jest": "^27.5.2",
+    "@types/node": "^14.18.36",
+    "@types/react": "^17.0.53",
+    "@types/react-dom": "^17.0.19",
+    "@types/react-router": "^5.1.20",
+    "@types/react-router-dom": "^5.3.3",
+    "@types/react-test-renderer": "^17.0.2",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "chart.js": "^2.9.4",
+    "dayjs": "^1.11.9",
+    "eslint": "^7.32.0",
+    "eslint-plugin-flowtype": "^5.10.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "lodash": "^4.17.21",
+    "lodash.debounce": "^4.0.8",
+    "pkg.json": "^2.0.8",
+    "prettier": "^2.8.4",
+    "react": "^17.0.1",
+    "react-app-polyfill": "^2.0.0",
+    "react-chartjs-2": "^2.11.1",
+    "react-dom": "^17.0.1",
+    "react-router": "^5.3.4",
+    "react-router-dom": "^5.3.4",
+    "react-scripts": "^5.0.1",
+    "react-test-renderer": "^17.0.1",
+    "react-to-print": "^2.14.12",
+    "sass": "^1.64.1",
+    "source-map-explorer": "^2.5.3",
+    "typescript": "^4.9.5",
+    "usehooks-ts": "^3.1.1"
+  },
+  "scripts": {
+    "analyze": "source-map-explorer 'build/static/js/*.js'",
+    "serve": "npx serve -s build",
+    "start": "react-scripts --max_old_space_size=8192 start",
+    "build": "react-scripts --max_old_space_size=8192 build",
+    "test": "react-scripts test",
+    "test-ci": "react-scripts test --watchAll=false",
+    "eject": "react-scripts eject"
+  },
+  "eslintConfig": {
+    "extends": "@strata"
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all",
+      "ie 11"
+    ],
+    "development": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all",
+      "ie 11"
+    ]
+  },
+  "jest": {
+    "collectCoverageFrom": [
+      "**/*.{ts,tsx}",
+      "!**/coverage/**",
+      "!**/node_modules/**",
+      "!**/babel.config.js",
+      "!**/jest/Setup.js"
+    ]
+  },
+  "devDependencies": {
+    "@strata/test-utils": "^2.0.0",
+    "@types/lodash.debounce": "^4.0.7",
+    "ajv": "^8.16.0",
+    "ajv-keywords": "^5.1.0",
+    "schema-utils": "^4.2.0"
+  }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/public/config.js b/src/Strata.ContinuousImprovement.Web/continuousimprovement/public/config.js
new file mode 100644
index 0000000..2ba300f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/public/config.js
@@ -0,0 +1,16 @@
+window['config'] = {
+  appName: 'continuousimprovement',
+  apiUrl: 'https://localhost:8443/api/',
+  //apiUrl: 'https://continuousimprovement-api.dev.stratanetwork.net/api/',
+  analyticsApi: 'https://analytics-api.dev.stratanetwork.net/api/',
+  identityServerUrl: 'https://identity.dev.stratanetwork.net/',
+  menuUrl: 'https://menu.dev.stratanetwork.net/api/',
+  env: 'local',
+  jazzUrl: 'https://dev.sdt.local/StrataJazz',
+  scoreUrl: 'https://schema-api.dev.stratanetwork.net/api/v2/',
+  walkMeScriptUrl: 'https://cdn.walkme.com/users/5d201c99fc674ba1a85ac2680bfc4bfa/test/walkme_5d201c99fc674ba1a85ac2680bfc4bfa_https.js',
+  helpCenterUrl: 'https://stratadecisiontechnology.mcoutput.com/stratajazz/',
+  analyticsUrl: 'https://analytics.dev.stratanetwork.net/analytics/',
+  hangfireUrl: 'https://localhost:44369',
+  contractsUrl: 'https://contracts.dev.stratanetwork.net/contracts/'
+};
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/public/manifest.json b/src/Strata.ContinuousImprovement.Web/continuousimprovement/public/manifest.json
new file mode 100644
index 0000000..1f2f141
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/public/manifest.json
@@ -0,0 +1,15 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/public/robots.txt b/src/Strata.ContinuousImprovement.Web/continuousimprovement/public/robots.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/App.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/App.tsx
new file mode 100644
index 0000000..67c3a31
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/App.tsx
@@ -0,0 +1,51 @@
+import { initChartDefaults } from '@strata/charts/lib';
+import { AuthProvider } from '@strata/core/lib';
+import { RouteLogger } from '@strata/logging/lib/RouteLogger';
+import ErrorBoundary from '@strata/tempo/lib/errorboundary';
+import PageLoader from '@strata/tempo/lib/pageloader';
+import TempoProvider from '@strata/tempo/lib/tempoprovider/TempoProvider';
+import Unload from '@strata/tempo/lib/unload';
+import React from 'react';
+import { BrowserRouter } from 'react-router-dom';
+import { ConfigurationsProvider } from './shared/configuration/ConfigurationContext';
+import { FeatureFlagProvider } from './shared/featureFlag/FeatureFlagContext';
+import Navigation from './shared/Navigation';
+import NotificationHub from './shared/notification/NotificationHub';
+import NotificationNotifier from './shared/notification/NotificationNotifier';
+import { SystemSettingsProvider } from './shared/systemSettings/SystemSettingsContext';
+import { UserSettingsProvider } from './shared/userSetting/UserSettingContext';
+
+const App: React.FC = () => {
+  initChartDefaults();
+
+  return (
+    <TempoProvider>
+      <ErrorBoundary>
+        <Unload>
+          <AuthProvider basename='/continuousimprovement'>
+            <NotificationHub.Provider>
+              <BrowserRouter basename='/continuousimprovement'>
+                <RouteLogger></RouteLogger>
+                <UserSettingsProvider>
+                  <ConfigurationsProvider>
+                    <FeatureFlagProvider>
+                      <SystemSettingsProvider>
+                        <NotificationNotifier>
+                          <PageLoader>
+                            <Navigation />
+                          </PageLoader>
+                        </NotificationNotifier>
+                      </SystemSettingsProvider>
+                    </FeatureFlagProvider>
+                  </ConfigurationsProvider>
+                </UserSettingsProvider>
+              </BrowserRouter>
+            </NotificationHub.Provider>
+          </AuthProvider>
+        </Unload>
+      </ErrorBoundary>
+    </TempoProvider>
+  );
+};
+
+export default App;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/AppConfig.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/AppConfig.ts
new file mode 100644
index 0000000..d0fce74
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/AppConfig.ts
@@ -0,0 +1,12 @@
+declare global {
+  interface Window {
+    config: any;
+  }
+}
+
+const appSettings = {
+  API_URL: window.config.API_URL,
+  ENV: window.config.ENV
+};
+
+export default appSettings;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/ChargeCode.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/ChargeCode.tsx
new file mode 100644
index 0000000..cbf7496
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/ChargeCode.tsx
@@ -0,0 +1,28 @@
+import React, { useEffect, useState } from 'react';
+import Opportunities from './opportunities/Opportunities';
+import OpportunitiesHeader from '../shared/opportunities/OpportunitiesHeader';
+import { useFeatureFlags } from '../shared/featureFlag/FeatureFlagContext';
+
+const ChargeCode: React.FC = () => {
+  const [chargeCodeBeta, setChargeCodeBeta] = useState<boolean>(false);
+
+  const featureFlags = useFeatureFlags();
+
+  useEffect(() => {
+    if (featureFlags.isEnabled) {
+      const beta = featureFlags.isEnabled('chargecodebeta');
+      setChargeCodeBeta(beta);
+    }
+  }, [featureFlags]);
+
+  return chargeCodeBeta ? (
+    <>
+      <OpportunitiesHeader headerTitle='Charge Code Opportunities' helpId='1829' />
+      <Opportunities />
+    </>
+  ) : (
+    <></>
+  );
+};
+
+export default ChargeCode;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/ChargeCodeDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/ChargeCodeDetail.tsx
new file mode 100644
index 0000000..84065b9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/ChargeCodeDetail.tsx
@@ -0,0 +1,251 @@
+import ScoreMemberPicker from '@strata/score/lib/ScoreMemberPicker/ScoreMemberPicker';
+import { Button } from '@strata/tempo/lib';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import Form from '@strata/tempo/lib/form/Form';
+import UploadIcon from '@strata/tempo/lib/icon/UploadIcon';
+import RadioGroup from '@strata/tempo/lib/radiogroup/RadioGroup';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text';
+import React, { useEffect, useState } from 'react';
+import { IEntityInfo, newEntityInfo } from '../../shared/configuration/IEntityInfo';
+import { IServiceLineInfo, newServiceLineInfo } from '../../shared/configuration/IServiceLineInfo';
+import { configurationService } from '../../shared/configuration/configurationService';
+import { EncounterGroup } from '../../shared/opportunities/data/EncounterGroup';
+import { IScoreFieldInfo } from '../../shared/opportunities/data/IScoreFieldInfo';
+import { OpportunityLevelTypes } from '../../shared/opportunities/data/OpportunityLevelTypes';
+import { settingsService } from '../../shared/settingsService';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { explorationPopulationIdAttributeGuid, splitCamelCase } from '../../shared/utilities';
+
+export interface IChargeCodeDetailProps {
+  setUploadModalVisible: (visible: boolean) => void;
+  encounterGroup: number;
+  opportunityLevel: number;
+  isSeasonal: boolean;
+  chargeCodeValidation: (chargeCodes: string[]) => Promise<boolean>;
+  opportunityLevelValidation: (opportunityLevel: number, opportunityLevels: string[]) => Promise<boolean>;
+  setIsLoading?: (isLoading: boolean) => void;
+}
+const ChargeCodeDetail: React.FC<IChargeCodeDetailProps> = (props: IChargeCodeDetailProps) => {
+  const { setUploadModalVisible, chargeCodeValidation, opportunityLevelValidation, setIsLoading } = props;
+  const [modalEntityProperties, setModalEntityProperties] = useState<IEntityInfo>(newEntityInfo);
+  const [modalServiceLineProperties, setModalServiceLineProperties] = useState<IServiceLineInfo>(newServiceLineInfo);
+  const [encounterGroup, setEncounterGroup] = useState<EncounterGroup>(props.encounterGroup);
+  const [opportunityLevel, setOpportunityLevel] = useState<OpportunityLevelTypes>(props.opportunityLevel);
+  const { userSetting } = React.useContext(UserSettingContext);
+
+  useEffect(() => {
+    const loadData = async (configurationGuid: string) => {
+      if (setIsLoading) setIsLoading(true);
+      const entityInfo = await configurationService.getEntityInfo(configurationGuid);
+      const serviceLineInfo = await configurationService.getServiceLineInfo(configurationGuid);
+      setModalEntityProperties(entityInfo);
+      setModalServiceLineProperties(serviceLineInfo);
+      if (setIsLoading) setIsLoading(false);
+    };
+    if (userSetting.configurationGuid !== '') {
+      loadData(userSetting.configurationGuid);
+    }
+  }, [userSetting.configurationGuid, setIsLoading]);
+
+  const handleOpportunityLevelChange = (e: OpportunityLevelTypes) => {
+    setOpportunityLevel(e);
+  };
+
+  const getOpportunityLevelFieldInfo = (): IScoreFieldInfo => {
+    switch (opportunityLevel) {
+      case OpportunityLevelTypes.Entity:
+        return {
+          dimensionName: modalEntityProperties.entityLabel,
+          dimensionGuidOrGlobalId: modalEntityProperties.departmentRollupGlobalId,
+          modalTitle: modalEntityProperties.entityTitle
+        };
+      case OpportunityLevelTypes.ServiceLine:
+        return {
+          dimensionName: modalServiceLineProperties.serviceLineName,
+          dimensionGuidOrGlobalId: modalServiceLineProperties.serviceLineDimensionGuid,
+          modalTitle: modalServiceLineProperties.serviceLineTitle
+        };
+      case OpportunityLevelTypes.Specialty:
+        return {
+          dimensionName: 'DSS Physician Specialty',
+          dimensionGuidOrGlobalId: 'DSS Physician Specialty',
+          modalTitle: 'Physician Specialties'
+        };
+      case OpportunityLevelTypes.Provider:
+        return {
+          dimensionName: 'Primary Physicians',
+          dimensionGuidOrGlobalId: 'Physician Primary',
+          modalTitle: 'Primary Physicians'
+        };
+      default:
+        return {
+          dimensionName: '',
+          dimensionGuidOrGlobalId: '',
+          modalTitle: ''
+        };
+    }
+  };
+
+  const getEncounterGroupFieldInfo = (): IScoreFieldInfo => {
+    if (encounterGroup === EncounterGroup.PatientPopulation) {
+      return {
+        dimensionName: 'Patient Populations',
+        dimensionGuidOrGlobalId: 'Clinical Indicator',
+        modalTitle: 'Patient Populations'
+      };
+    } else {
+      return {
+        dimensionName: 'Case Type',
+        dimensionGuidOrGlobalId: 'Case Type',
+        hierarchyGuid: 'c20b06b1-5a60-4fa5-825d-8e9a0524f783',
+        filters: [{ op: 'Equals', attributeGuid: explorationPopulationIdAttributeGuid, value: 0 }],
+        modalTitle: 'Case Types'
+      };
+    }
+  };
+
+  const opportunityLevelFieldInfo = getOpportunityLevelFieldInfo();
+  const encounterGroupFieldInfo = getEncounterGroupFieldInfo();
+
+  const chargeCodeLabel = (
+    <>
+      <Spacing hAlign='space-between' width='100%'>
+        <Text size='normal' strong>
+          Charge Codes
+        </Text>
+        <Button icon={<UploadIcon />} type='link' onClick={() => setUploadModalVisible(true)}>
+          Upload
+        </Button>
+      </Spacing>
+    </>
+  );
+
+  return (
+    <>
+      <Spacing padding={16} column>
+        <Form.Item label='Encounter Group' name='encounterGroup' rules={[{ required: true }]}>
+          <RadioGroup
+            onChange={(e) => setEncounterGroup(e.target.value as EncounterGroup)}
+            options={[
+              { value: EncounterGroup.CaseType, label: 'Case Type' },
+              { value: EncounterGroup.PatientPopulation, label: 'Patient Population' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item
+          label={encounterGroupFieldInfo.modalTitle}
+          name='encounterGroups'
+          rules={[
+            { required: true },
+            () => ({
+              async validator(_, value) {
+                if (!value) {
+                  return Promise.reject();
+                }
+                if (value.length > 20) {
+                  return Promise.reject(`You have exceeded the maximum of 20 ${splitCamelCase(EncounterGroup[encounterGroup])} selections.`);
+                }
+                return Promise.resolve();
+              }
+            })
+          ]}
+        >
+          <ScoreMemberPicker
+            dimensionGuidOrGlobalId={encounterGroupFieldInfo.dimensionGuidOrGlobalId}
+            hierarchyGuid={encounterGroupFieldInfo.hierarchyGuid}
+            filters={encounterGroupFieldInfo.filters ?? []}
+            showHierarchyDropdown={false}
+            modalTitle={encounterGroupFieldInfo.modalTitle}
+            selectionMode='multiple'
+            okText='Select'
+          ></ScoreMemberPicker>
+        </Form.Item>
+        <Form.Item
+          label={chargeCodeLabel}
+          name='chargeCodes'
+          rules={[
+            { required: true },
+            () => ({
+              async validator(_, value) {
+                if (!value) {
+                  return Promise.reject();
+                }
+                if (!(await chargeCodeValidation(value))) {
+                  return Promise.reject(`You have exceeded the maximum of ${await settingsService.getChargeCodeLimit()} charge code selections. Expand the rollups to narrow down your selections.`);
+                }
+                return Promise.resolve();
+              }
+            })
+          ]}
+        >
+          <ScoreMemberPicker
+            dimensionGuidOrGlobalId={'Charge Code'}
+            showHierarchyDropdown={false}
+            hierarchyGuid={'1f7bd500-a966-457d-9b47-a6944b02841b'}
+            modalTitle={'Charge Codes'}
+            selectionMode='multiple'
+            okText='Select'
+          ></ScoreMemberPicker>
+        </Form.Item>
+        <Form.Item label='Opportunity Level' name='opportunityLevel' rules={[{ required: true }]}>
+          <DropDown
+            onChange={(e) => handleOpportunityLevelChange(e as OpportunityLevelTypes)}
+            placeholder='Opportunity Level'
+            items={[
+              { value: OpportunityLevelTypes.Organization, text: 'System' },
+              { value: OpportunityLevelTypes.Entity, text: `${modalEntityProperties.entityText}` },
+              { value: OpportunityLevelTypes.ServiceLine, text: `${modalServiceLineProperties.serviceLineName}` },
+              { value: OpportunityLevelTypes.Specialty, text: 'Specialty' },
+              { value: OpportunityLevelTypes.Provider, text: 'Physician' }
+            ]}
+          />
+        </Form.Item>
+        {opportunityLevel !== undefined && opportunityLevel !== OpportunityLevelTypes.Organization && opportunityLevelFieldInfo.dimensionName !== '' && (
+          <>
+            <Form.Item
+              label={opportunityLevelFieldInfo.dimensionName}
+              name='opportunityLevels'
+              rules={[
+                { required: opportunityLevel !== undefined },
+                () => ({
+                  async validator(_, value) {
+                    if (!value) {
+                      return Promise.reject();
+                    }
+                    if (!(await opportunityLevelValidation(opportunityLevel, value))) {
+                      return Promise.reject(
+                        `You have exceeded the maximum of ${await settingsService.getOpportunityLevelLimit()} ${splitCamelCase(
+                          OpportunityLevelTypes[opportunityLevel]
+                        )} selections. Expand the rollups to narrow down your selections.`
+                      );
+                    }
+                    return Promise.resolve();
+                  }
+                })
+              ]}
+            >
+              <ScoreMemberPicker
+                dimensionGuidOrGlobalId={opportunityLevelFieldInfo.dimensionGuidOrGlobalId}
+                showHierarchyDropdown={false}
+                modalTitle={opportunityLevelFieldInfo.modalTitle}
+                selectionMode='multiple'
+                okText='Select'
+              ></ScoreMemberPicker>
+            </Form.Item>
+          </>
+        )}
+        <Form.Item label='Seasonality' name='isSeasonal' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: true, label: 'With Seasonality' },
+              { value: false, label: 'Without Seasonality' }
+            ]}
+          />
+        </Form.Item>
+      </Spacing>
+    </>
+  );
+};
+
+export default ChargeCodeDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/Initiative.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/Initiative.tsx
new file mode 100644
index 0000000..4d44bf7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/Initiative.tsx
@@ -0,0 +1,284 @@
+import { useHelpCenter } from '@strata/core/lib';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import Header from '@strata/tempo/lib/header/Header';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import useToast from '@strata/tempo/lib/toast';
+import Wizard from '@strata/tempo/lib/wizard';
+import dayjs from 'dayjs';
+import isBetween from 'dayjs/plugin/isBetween';
+import React, { useContext, useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import InitiativeDetail from '../../shared/initiatives/InitiativeDetail';
+import InitiativeMilestones from '../../shared/initiatives/InitiativeMilestones';
+import InitiativeRoles from '../../shared/initiatives/InitiativeRoles';
+import { IInitiative } from '../../shared/initiatives/data/IInitiative';
+import { IInitiativeProps } from '../../shared/initiatives/data/IInitiativeProps';
+import { newOrgDefinedInitiative } from '../../shared/initiatives/data/IOrgDefinedInitiative';
+import { IUserProfile } from '../../shared/initiatives/data/IUserProfile';
+import { IWorkstream } from '../../shared/initiatives/data/IWorkstream';
+import { initiativeService } from '../../shared/initiatives/data/initiativeService';
+import notificationHub from '../../shared/notification/NotificationHub';
+import { nameValidationService } from '../../shared/opportunities/data/nameValidationService';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { usersService } from '../../shared/users/usersService';
+import ChargeCodeUploadModal from '../opportunities/ChargeCodeUploadModal';
+import { IChargeCodeOpportunitySaveModel, newChargeCodeOpportunitySaveModel } from '../opportunities/data/IChargeCodeOpportunitySaveModel';
+import { opportunityService } from '../opportunities/data/opportunityService';
+import ChargeCodeDetail from './ChargeCodeDetail';
+import { IChargeCodeInitiative, newChargeCodeInitiative } from './data/IChargeCodeInitiative';
+import { cleanUpChargeCodeInitiative } from './data/IChargeCodeInitiativeDto';
+import { chargeCodeInitiativeService } from './data/chargeCodeInitiativeService';
+import { RegEx } from '../../shared/validation/RegEx';
+
+const Initiative: React.FC<IInitiativeProps> = () => {
+  const { currentConfiguration } = useConfigurations();
+  const [opportunity, setOpportunity] = useState<IChargeCodeOpportunitySaveModel>(newChargeCodeOpportunitySaveModel(''));
+  const [initiative, setInitiative] = useState<IInitiative>(newOrgDefinedInitiative(currentConfiguration));
+  const [owners, setOwners] = React.useState<IUserProfile[]>([]);
+  const [costLeaders, setCostLeaders] = React.useState<IUserProfile[]>([]);
+  const [executiveSponsors, setExecutiveSponsors] = React.useState<IUserProfile[]>([]);
+  const [workstreams, setWorkstreams] = React.useState<IWorkstream[]>([]);
+  const [form] = Form.useForm();
+  const [stepNumber, setStepNumber] = useState(0);
+  const [loading, setLoading] = useState(false);
+  const [milestoneIdx, setMilestoneIdx] = useState<number>(0);
+  const [uploadModalVisible, setUploadModalVisible] = useState<boolean>(false);
+  const { userSetting } = useContext(UserSettingContext);
+  const history = useHistory();
+  const hub = notificationHub.useConnection();
+  const toast = useToast();
+
+  const { networkOpportunityName, networkOpportunityId, opportunityGuid } = history.location.state as IInitiativeProps;
+
+  dayjs.extend(isBetween);
+
+  useEffect(() => {
+    const loadData = async () => {
+      setLoading(true);
+      if (!opportunityGuid) {
+        // create
+        const newInitiative = newChargeCodeInitiative(currentConfiguration);
+        if (networkOpportunityName) {
+          newInitiative.name = networkOpportunityName;
+        }
+        setInitiative(newInitiative);
+        form.setFieldsValue(newInitiative);
+      } else {
+        // edit
+        const editOpportunity = await opportunityService.getEditModel(opportunityGuid);
+        setOpportunity(editOpportunity);
+        form.setFieldsValue({ ...form, ...editOpportunity });
+        if (opportunityService.getInitiativeInfo) {
+          const editInitiative = await opportunityService.getInitiativeInfo(opportunityGuid);
+          editInitiative.startTracking = dayjs(editInitiative.trackingStart);
+          setInitiative(editInitiative);
+          form.setFieldsValue({ ...form, ...editOpportunity, ...editInitiative });
+        }
+        setLoading(false);
+      }
+      const owners = await usersService.getOwners();
+      const costLeaders = await usersService.getCostLeaders();
+      const execSponsors = await usersService.getExecutiveSponsors();
+      const workstreams = await initiativeService.getWorkstreams();
+      setOwners(owners);
+      setCostLeaders(costLeaders);
+      setExecutiveSponsors(execSponsors);
+      setWorkstreams(workstreams);
+    };
+    if (currentConfiguration) {
+      loadData();
+    }
+    setLoading(false);
+  }, [currentConfiguration, networkOpportunityName, form, opportunityGuid]);
+
+  const helpCenter = useHelpCenter();
+
+  const handleWizardChange = async (currentStep: number, newStep: number) => {
+    form.submit();
+    const formValues = form.getFieldsValue();
+
+    if (newStep < currentStep) {
+      setStepNumber(newStep);
+      return;
+    } else {
+      switch (currentStep) {
+        case 0:
+          if (formValues.name.trim() === '' || !RegEx.JazzRestrictedCharacters.test(formValues.name) || !(await validateName(formValues.name)) || !formValues.startTracking) {
+            return;
+          }
+          break;
+        case 1:
+          if (
+            formValues.encounterGroup === undefined ||
+            formValues.encounterGroups === undefined ||
+            formValues.encounterGroups.length === 0 ||
+            formValues.chargeCodes === undefined ||
+            formValues.chargeCodes.length === 0 ||
+            !(await validateChargeCodes(formValues.chargeCodes)) ||
+            formValues.opportunityLevel === undefined ||
+            (formValues.opportunityLevel > 0 && (formValues.opportunityLevels === undefined || formValues.opportunityLevels.length === 0)) ||
+            !(await validateOpportunityLevels(formValues.opportunityLevel, formValues.opportunityLevels))
+          ) {
+            return;
+          }
+          break;
+        case 2:
+          if (
+            formValues.costLeader === '' ||
+            formValues.costLeader === undefined ||
+            formValues.executiveSponsor === '' ||
+            formValues.executiveSponsor === undefined ||
+            formValues.owner === '' ||
+            formValues.owner === undefined
+          ) {
+            return;
+          }
+          break;
+      }
+    }
+
+    setStepNumber(newStep);
+  };
+
+  const handleCancel = () => {
+    history.goBack();
+  };
+
+  const handleSave = async () => {
+    form.submit(); // trigger any validation
+    setLoading(true);
+    try {
+      const detailValues = form.getFieldsValue();
+      const cleanedInitiative = cleanUpChargeCodeInitiative({ ...opportunity, ...initiative, ...detailValues });
+      const data = newChargeCodeInitiative(currentConfiguration, cleanedInitiative);
+      notificationHub.register(
+        hub,
+        async () => {
+          if (!opportunityGuid) {
+            await chargeCodeInitiativeService.create(data, networkOpportunityId);
+          } else {
+            await chargeCodeInitiativeService.update(data, networkOpportunityId);
+          }
+        },
+        cleanedInitiative.name
+      );
+    } catch (error) {
+      // Handles exceptions or unhandled validation from server
+      toast.show({
+        key: opportunity.name,
+        message: `${opportunity.name} Opportunity was not saved. Try again and contact us if the issue continues.`,
+        toastType: 'error'
+      });
+    }
+  };
+
+  const handleFormValuesChanged = (changedValues: any) => {
+    const changedInitiative = { ...opportunity, ...initiative, ...changedValues };
+
+    // if trackingStart changed, update startTracking
+    if (changedValues.startTracking != null) {
+      const startTrackingDate: dayjs.Dayjs = dayjs(changedValues.startTracking);
+      changedInitiative.trackingStart = startTrackingDate.format('YYYYMMDD');
+    }
+
+    // if encounterGroup changed, we have to reset the selected encounterGroups
+    if (changedValues.encounterGroup != null) {
+      changedInitiative.encounterGroups = [];
+      form.resetFields(['encounterGroups']);
+      form.setFieldValue('encounterGroups', changedValues.encounterGroups);
+    }
+
+    if (changedValues.opportunityLevel != null) {
+      changedInitiative.opportunityLevels = [];
+      form.resetFields(['opportunityLevels']);
+      form.setFieldValue('opportunityLevels', changedValues.opportunityLevels);
+    }
+
+    setOpportunity(changedInitiative);
+    setInitiative(changedInitiative);
+  };
+
+  const handleChargeCodesUploaded = (chargeCodes: string[]) => {
+    const changedInitiative = { ...initiative, ...{ chargeCodes: chargeCodes } } as IChargeCodeInitiative;
+    setInitiative(changedInitiative);
+    form.setFieldsValue(changedInitiative);
+    setUploadModalVisible(false);
+  };
+
+  const validateName = async (name: string) => {
+    return await nameValidationService.nameIsValid(userSetting.configurationGuid, OpportunityTypes.ChargeCode, name, opportunityGuid);
+  };
+
+  const validateChargeCodes = async (chargeCodes: string[]) => {
+    setLoading(true);
+    const valid = await opportunityService.validateChargeCodes(chargeCodes);
+    setLoading(false);
+    return valid;
+  };
+
+  const validateOpportunityLevels = async (opportunityLevel: number, opportunityLevels: string[]) => {
+    setLoading(true);
+    const valid = await opportunityService.validateOpportunityLevels(opportunityLevel, opportunityLevels, currentConfiguration?.configurationGuid);
+    setLoading(false);
+    return valid;
+  };
+
+  const wizardSteps = () => {
+    const startMonth = dayjs(currentConfiguration?.orgDefinedTrackingStartDate);
+    const endMonth = dayjs(currentConfiguration?.orgDefinedTrackingEndDate);
+    const steps: JSX.Element[] = [
+      <Wizard.Step key='0' title='Initiative Details'>
+        <InitiativeDetail isLocked={false} startMonth={startMonth} endMonth={endMonth} workstreams={workstreams} nameIsValid={validateName} />
+      </Wizard.Step>
+    ];
+    steps.push(
+      <Wizard.Step key='1' title='Charge Code Opportunity'>
+        <ChargeCodeDetail
+          setUploadModalVisible={setUploadModalVisible}
+          encounterGroup={opportunity.encounterGroup}
+          opportunityLevel={opportunity.opportunityLevel ?? 0}
+          isSeasonal={opportunity.isSeasonal}
+          chargeCodeValidation={validateChargeCodes}
+          opportunityLevelValidation={validateOpportunityLevels}
+          setIsLoading={setLoading}
+        />
+      </Wizard.Step>
+    );
+    steps.push(
+      <Wizard.Step key='2' title='Key Stakeholders'>
+        <InitiativeRoles owners={owners} costLeaders={costLeaders} executiveSponsors={executiveSponsors} stakeholders={owners} isLocked={false} />
+      </Wizard.Step>
+    );
+    steps.push(
+      <Wizard.Step key='3' title='Milestones'>
+        <InitiativeMilestones startMonth={initiative.startTracking} endMonth={initiative.endTracking} milestoneIdx={milestoneIdx} setMilestoneIdx={setMilestoneIdx} />
+      </Wizard.Step>
+    );
+    return steps;
+  };
+
+  return (
+    <>
+      <Header
+        title={`${!opportunityGuid ? 'Create' : 'Edit'} Charge Code Opportunity and Initiative`}
+        extra={<Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1440')} />}
+      />
+      <Form form={form} layout='vertical' maxWidth={800} initialValues={{ ...opportunity, ...initiative }} onValuesChange={handleFormValuesChanged}>
+        <Wizard currentStep={stepNumber} submitButtonText='Save' onSubmit={handleSave} onChange={handleWizardChange} onCancel={handleCancel} loading={loading}>
+          {wizardSteps()}
+        </Wizard>
+      </Form>
+      <ChargeCodeUploadModal
+        isVisible={uploadModalVisible}
+        opportunityGuid={initiative?.opportunityGuid ?? ''}
+        chargeCodes={form.getFieldValue('chargeCodes')}
+        onCancel={() => setUploadModalVisible(false)}
+        onOk={handleChargeCodesUploaded}
+      />
+    </>
+  );
+};
+export default Initiative;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/data/IChargeCodeInitiative.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/data/IChargeCodeInitiative.ts
new file mode 100644
index 0000000..b4b4017
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/data/IChargeCodeInitiative.ts
@@ -0,0 +1,24 @@
+import { IOrgDefinedInitiative, newOrgDefinedInitiative } from '../../../shared/initiatives/data/IOrgDefinedInitiative';
+import { EncounterGroup } from '../../../shared/opportunities/data/EncounterGroup';
+import { OpportunityLevelTypes } from '../../../shared/opportunities/data/OpportunityLevelTypes';
+import { IConfiguration } from '../../../shared/configuration/IConfiguration';
+
+export interface IChargeCodeInitiative extends IOrgDefinedInitiative {
+  encounterGroup?: EncounterGroup;
+  opportunityLevel?: OpportunityLevelTypes | undefined;
+  encounterGroups?: [];
+  opportunityLevels?: [];
+  chargeCodes: string[];
+  isSeasonal: boolean;
+}
+
+export const newChargeCodeInitiative = (configuration: IConfiguration | undefined, data: Partial<IChargeCodeInitiative> = {}): IChargeCodeInitiative => {
+  const initiative = newOrgDefinedInitiative(configuration, data) as IChargeCodeInitiative;
+  initiative.costDriver = 'Charge Code';
+  initiative.encounterGroup = data.encounterGroup ?? EncounterGroup.CaseType;
+  initiative.opportunityLevel = data.opportunityLevel ?? OpportunityLevelTypes.Organization;
+  initiative.encounterGroups = data.encounterGroups ?? [];
+  initiative.chargeCodes = data.chargeCodes ?? [];
+  initiative.isSeasonal = data.isSeasonal ?? false;
+  return initiative;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/data/IChargeCodeInitiativeDto.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/data/IChargeCodeInitiativeDto.ts
new file mode 100644
index 0000000..70b27c0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/data/IChargeCodeInitiativeDto.ts
@@ -0,0 +1,35 @@
+import { cleanUpOrgDefinedInitiative } from '../../../shared/initiatives/data/IOrgDefinedInitiative';
+import { IOrgDefinedInitiativeDto, newOrgDefinedInitiativeDto } from '../../../shared/initiatives/data/IOrgDefinedInitiativeDto';
+import { EncounterGroup } from '../../../shared/opportunities/data/EncounterGroup';
+import { OpportunityLevelTypes } from '../../../shared/opportunities/data/OpportunityLevelTypes';
+import { IChargeCodeInitiative } from './IChargeCodeInitiative';
+
+export interface IChargeCodeInitiativeDto extends IOrgDefinedInitiativeDto {
+  configurationGuid: string;
+  encounterGroup: EncounterGroup;
+  opportunityLevel: OpportunityLevelTypes | undefined;
+  encounterGroups: [];
+  opportunityLevels: [];
+  chargeCodes: string[];
+  isSeasonal: boolean;
+}
+
+export const newChargeCodeInitiativeDto = (data: Partial<IChargeCodeInitiativeDto> = {}): IChargeCodeInitiativeDto => {
+  const initiative = newOrgDefinedInitiativeDto(data) as IChargeCodeInitiativeDto;
+  initiative.encounterGroup = data.encounterGroup ?? EncounterGroup.CaseType;
+  initiative.encounterGroups = data.encounterGroups ?? [];
+  initiative.chargeCodes = data.chargeCodes ?? [];
+  initiative.opportunityLevel = data.opportunityLevel ?? OpportunityLevelTypes.Organization;
+  initiative.opportunityLevels = data.opportunityLevels ?? [];
+  initiative.isSeasonal = data.isSeasonal ?? false;
+  return initiative;
+};
+
+export const cleanUpChargeCodeInitiative = (data: Partial<IChargeCodeInitiative>): IChargeCodeInitiativeDto => {
+  try {
+    return newChargeCodeInitiativeDto({ ...cleanUpOrgDefinedInitiative({ ...data }), ...data });
+  } catch (error) {
+    alert(error);
+    return newChargeCodeInitiativeDto({ ...data });
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/data/chargeCodeInitiativeService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/data/chargeCodeInitiativeService.ts
new file mode 100644
index 0000000..570f779
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/initiatives/data/chargeCodeInitiativeService.ts
@@ -0,0 +1,25 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import { getSecureService } from '@strata/core/lib/http/getSecureService';
+import { IInitiativeDto } from '../../../shared/initiatives/data/IInitiativeDto';
+import { IChargeCodeInitiative } from './IChargeCodeInitiative';
+
+const { httpPost, httpGet } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'initiatives';
+
+export const chargeCodeInitiativeService = {
+  create: function (initiative: IChargeCodeInitiative, networkOpportunityId?: number): Promise<string> {
+    return httpPost(`${url}/create-charge-code`, {
+      initiative,
+      networkOpportunityId
+    });
+  },
+  update: function (initiative: IInitiativeDto, networkOpportunityId?: number): Promise<string> {
+    return httpPost(`${url}/update-charge-code`, {
+      initiative,
+      networkOpportunityId
+    });
+  },
+  finalize: async (initiativeGuid: string, callback: () => void): Promise<void> => {
+    return httpGet<void>(`${url}/${initiativeGuid}/finalize`).then(callback);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/ChargeCodeOpportunityDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/ChargeCodeOpportunityDetail.tsx
new file mode 100644
index 0000000..5c7ad75
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/ChargeCodeOpportunityDetail.tsx
@@ -0,0 +1,533 @@
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import { ICellArgs, ICellEditorArgs, TreeUtils, usePageLoader, useToast } from '@strata/tempo/lib';
+import Button from '@strata/tempo/lib/button';
+import Card from '@strata/tempo/lib/card';
+import { DataHeaderCell, DataHeaderGroup, DataHeaderRow } from '@strata/tempo/lib/dataheader';
+import Divider from '@strata/tempo/lib/divider';
+import LayoutGrid from '@strata/tempo/lib/layoutgrid';
+import { useModal } from '@strata/tempo/lib/modal';
+import TreeGrid from '@strata/tempo/lib/treegrid';
+import debounce from 'lodash/debounce';
+import sumBy from 'lodash/sumBy';
+import React, { useEffect, useMemo, useState, useCallback } from 'react';
+import { useHistory, useParams } from 'react-router';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import InitiativeCreateModal from '../../shared/initiatives/InitiativeCreateModal';
+import { IInitiative, getGuid, getInitiative, newInitiative } from '../../shared/initiatives/data/IInitiative';
+import { cleanUpInitiative } from '../../shared/initiatives/data/IInitiativeDto';
+import notificationHub from '../../shared/notification/NotificationHub';
+import NotesModal from '../../shared/opportunities/NotesModal';
+import OpportunityDetail from '../../shared/opportunities/OpportunityDetail';
+import OpportunityDetailHeader from '../../shared/opportunities/OpportunityDetailHeader';
+import { IOpportunity } from '../../shared/opportunities/data/IOpportunity';
+import { securityService } from '../../shared/security/data/securityService';
+import { newChargeCodeInitiative } from '../initiatives/data/IChargeCodeInitiative';
+import { chargeCodeInitiativeService } from '../initiatives/data/chargeCodeInitiativeService';
+import OpportunityDetailsCard from '../../shared/opportunities/OpportunityDetailsCard';
+import ChargeCodeOpportunityEditModal from './ChargeCodeOpportunityEditModal';
+import { IChargeCodeOpportunity } from './data/IChargeCodeOpportunity';
+import { IChargeCodeOpportunitySaveModel } from './data/IChargeCodeOpportunitySaveModel';
+import { opportunityService } from './data/opportunityService';
+import { TREE_DATA_LEVEL_SEPARATOR } from '../../shared/constants';
+import { DefaultChargeCodeOpportunityDetailChanges, IChargeCodeOpportunityDetailChanges } from './data/IChargeCodeOpportunityDetailChanges';
+
+const escapeRegExp = (value: string): string => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+const reTreeDataLevelSeparator = new RegExp(escapeRegExp(TREE_DATA_LEVEL_SEPARATOR), 'g');
+const validationLevel = 3;
+
+const ChargeCodeOpportunityDetail: React.FC = () => {
+  const { opportunityGuid } = useParams<{ opportunityGuid: string }>();
+  const gridRef = React.useRef<TreeGrid>(null);
+  const changedValues = React.useRef<{ [key: string]: IChargeCodeOpportunityDetailChanges }>({});
+  const [opportunityId, setOpportunityId] = useState<number>(0);
+  const [gridLoading, setGridLoading] = useState(false);
+  const [opportunityDetailData, setOpportunityDetailData] = useState<IChargeCodeOpportunity>();
+  const [initiativeModalVisible, setInitiativeModalVisible] = useState(false);
+  const [initiativeData, setInitiativeData] = useState<IInitiative>(newInitiative);
+  const [hasInitiative, setHasInitiative] = useState<boolean>(false);
+  const [startMonth, setStartMonth] = useState<string>('');
+  const [endMonth, setEndMonth] = useState<string>('');
+  const jazzUrl = useJazzUrlWithVersion();
+  const [isLocked, setIsLocked] = useState<boolean>(false);
+  const [notesModalVisible, setNotesModalVisible] = useState<boolean>(false);
+  const [chargeCodeEditModalVisible, setChargeCodeEditModalVisible] = useState(false);
+  const [isCardVisible, setCardVisible] = useState(false);
+  const [isReadable, setIsReadable] = useState(true);
+  const [isEditable, setIsEditable] = useState(false);
+  const [isSecurityEditable, setIsSecurityEditable] = useState(false);
+  const hub = notificationHub.useConnection();
+
+  const { setLoading } = usePageLoader();
+  const modal = useModal();
+  const toast = useToast();
+  const history = useHistory();
+  const { currentConfiguration } = useConfigurations();
+
+  useEffect(() => {
+    // prevent users w/o read access page access
+    if (!isReadable) {
+      history.push('/');
+    }
+  }, [isReadable, history]);
+
+  useEffect(() => {
+    gridRef?.current?.validateGrid();
+    changedValues.current = {};
+  }, [opportunityDetailData]);
+
+  useEffect(() => {
+    const setUserPermissions = async () => {
+      setIsReadable(await securityService.getGeneralAccessPermissions());
+      const userPermissions = await securityService.getUserPermissions(opportunityGuid);
+      setIsEditable(userPermissions.canWrite);
+      setIsSecurityEditable(userPermissions.canSecure);
+    };
+
+    const fetchData = async () => {
+      setLoading(true);
+      setCardVisible(false);
+      const opportunityDetail = await opportunityService.getById(opportunityGuid);
+      setOpportunityDetailData(opportunityDetail);
+      setOpportunityId(opportunityDetail.opportunityId);
+      if (opportunityService.getInitiativeInfo) {
+        const info = await opportunityService.getInitiativeInfo(opportunityGuid);
+        setInitiativeData(info);
+        setHasInitiative(info.trackingStart !== null && info.trackingStart !== '');
+        setStartMonth(info.startMonth);
+        setEndMonth(info.endMonth);
+        setIsLocked(info.isLocked);
+      }
+      setCardVisible(true);
+      setLoading(false);
+    };
+
+    setUserPermissions();
+    fetchData();
+  }, [opportunityGuid, setLoading]);
+
+  const handleHideOrShow = () => {
+    const updateHidden = async () => {
+      if (opportunityDetailData === undefined) {
+        return;
+      }
+      await opportunityService.setHidden(opportunityGuid, !opportunityDetailData.isHidden);
+      setOpportunityDetailData({ ...opportunityDetailData, ...{ isHidden: !opportunityDetailData.isHidden } });
+    };
+    updateHidden();
+  };
+
+  const handleSaveNotes = async (note: string) => {
+    if (opportunityDetailData !== undefined) {
+      await opportunityService.setNote(opportunityGuid, note);
+    }
+    setOpportunityDetailData({ ...opportunityDetailData, ...{ note: note } } as IChargeCodeOpportunity);
+    setNotesModalVisible(false);
+  };
+
+  const handleDelete = async (callback: () => void, failed: (err: any) => void) => {
+    await opportunityService.delete(opportunityGuid, callback, failed);
+  };
+
+  const handleUpdate = async (updatedOpportunity: IChargeCodeOpportunitySaveModel) => {
+    modal.confirm({
+      title: `Update Opportunity?`,
+      content: `Updating will reset this opportunity's goals.`,
+      okText: 'Update',
+      cancelText: 'Cancel',
+      async onOk() {
+        notificationHub.register(
+          hub,
+          async () => {
+            setGridLoading(true);
+            setChargeCodeEditModalVisible(false);
+            const result = await opportunityService.updateChargeCodeOpportunity(updatedOpportunity);
+            // notifier logic redirects page if result == true
+            if (!result) {
+              setGridLoading(false);
+            }
+          },
+          updatedOpportunity.name
+        );
+        toast.show({
+          key: updatedOpportunity.name,
+          toastType: 'loading',
+          message: `Updating ${updatedOpportunity.name} Opportunity`,
+          duration: 30
+        });
+      }
+    });
+  };
+
+  const goalErrorModal = () => {
+    modal.alert({
+      title: 'Goal Failed to Update',
+      content: 'An unknown error occurred. Try editing the goal again and contact us if the issue continues.',
+      alertType: 'error'
+    });
+  };
+
+  const updateGoals = useCallback(async () => {
+    if (!changedValues.current) return;
+
+    setGridLoading(true);
+
+    try {
+      const changes = Object.values(changedValues.current);
+      const result = await opportunityService.updateGoals(opportunityGuid, changes);
+
+      if (!result) {
+        goalErrorModal();
+      }
+
+      const opportunityDetail = await opportunityService.getById(opportunityGuid);
+      setOpportunityDetailData(opportunityDetail);
+    } finally {
+      setGridLoading(false);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [opportunityGuid, changedValues]);
+
+  const onCellEdit = (args: ICellEditorArgs, newCellValue: number) => {
+    if (!changedValues.current[args.rowKey]) {
+      changedValues.current[args.rowKey] = { ...DefaultChargeCodeOpportunityDetailChanges, key: args.rowKey };
+    }
+    switch (args.field) {
+      case 'goalTotalUnitsOfService':
+        changedValues.current[args.rowKey].goalTotalUnitsOfService = newCellValue || 0;
+        break;
+      case 'goalCostPerUnit':
+        changedValues.current[args.rowKey].goalCostPerUnit = newCellValue || 0;
+        break;
+    }
+    updateGoalWithDebounce();
+  };
+
+  const updateGoalWithDebounce = useMemo(
+    () =>
+      debounce(() => {
+        gridRef?.current?.validateGrid().then((invalidCells) => {
+          if (!(invalidCells && invalidCells.some((x) => (x.rowKey.match(reTreeDataLevelSeparator) || []).length >= validationLevel - 1))) {
+            updateGoals();
+          }
+        });
+      }, 1000),
+    [updateGoals]
+  );
+  useEffect(() => {
+    return () => {
+      updateGoalWithDebounce.cancel();
+    };
+  }, [updateGoalWithDebounce]);
+
+  const isCellEditable = (args: ICellArgs) => {
+    if (isLocked || !isEditable) {
+      return false;
+    } else {
+      return args.row.children == null || args.row.children.length === 0;
+    }
+  };
+
+  const getLeafSum = (args: ICellArgs) => {
+    const node = args.row;
+    if (node.children && node.children.length > 0) {
+      const leafData = TreeUtils.flattenLeafOnly(node.children).map((leafNode) => leafNode.data);
+      return sumBy(leafData, args.field);
+    } else {
+      return node.data[args.field];
+    }
+  };
+
+  const hideRollupCaseValue = (args: ICellArgs) => {
+    const node = args.row;
+    if (node.children && node.children.length > 0 && node.children[0].children && node.children[0].children.length === 0) {
+      return '';
+    }
+    return node.data[args.field];
+  };
+
+  const getInitiativeUrl = (initiativeGuid: string): string => {
+    return `${jazzUrl}CCI/ChargeCode/InitiativeViewer.aspx?id=${initiativeGuid}`;
+  };
+
+  const getInitiativeInfo = async () => {
+    if (!hasInitiative) {
+      setInitiativeModalVisible(true);
+    } else {
+      window.location.assign(getInitiativeUrl(initiativeData.initiativeGuid));
+    }
+  };
+
+  const finalizeInitiative = async () => {
+    try {
+      toast.show({
+        key: initiativeData.initiativeGuid,
+        toastType: 'loading',
+        message: `Finalizing initiative.`,
+        duration: 0
+      });
+
+      if (opportunityDetailData) {
+        setLoading(true);
+        const opportunityDetail = await opportunityService.getById(opportunityGuid);
+        setOpportunityDetailData(opportunityDetail);
+        setLoading(false);
+      }
+      await chargeCodeInitiativeService.finalize(initiativeData.initiativeGuid, async function () {
+        toast.show({
+          key: initiativeData.initiativeGuid,
+          toastType: 'success',
+          message: `Initiative has been finalized and tracking has been run.`
+        });
+        // refresh initiative info now that tracking has been run
+        if (opportunityService.getInitiativeInfo) {
+          const info = await opportunityService.getInitiativeInfo(opportunityGuid);
+          setInitiativeData(info);
+          setHasInitiative(info.trackingStart !== null && info.trackingStart !== '');
+          setStartMonth(info.startMonth);
+          setEndMonth(info.endMonth);
+          setIsLocked(info.isLocked);
+        }
+      });
+    } catch (error) {
+      if (error instanceof Response) {
+        // Handles exceptions or unhandled validation from server
+        toast.show({
+          key: initiativeData.initiativeGuid,
+          message: `An error occurred while finalizing the initiative.`,
+          toastType: 'error'
+        });
+      }
+    }
+  };
+
+  const handleInitiativeClose = async () => {
+    setInitiativeModalVisible(false);
+  };
+
+  const handleInitiativeOk = async (initiative: IInitiative) => {
+    setInitiativeModalVisible(false);
+    initiative.costDriver = 'Charge Code';
+    try {
+      const data = newChargeCodeInitiative(currentConfiguration, cleanUpInitiative({ ...initiative }));
+      const initiativeGuid = await chargeCodeInitiativeService.create(data);
+      if (getGuid(initiativeGuid) === undefined) {
+        toast.show({ toastType: 'error', duration: 0, message: 'Failed to create initiative' });
+        return;
+      }
+      if (opportunityService.getInitiativeInfo) {
+        const info = await opportunityService.getInitiativeInfo(opportunityGuid);
+        setInitiativeData(info);
+      }
+      setHasInitiative(true);
+      toast.show({
+        key: initiativeGuid,
+        toastType: 'success',
+        duration: 0,
+        message: (
+          <>
+            <Button
+              onClick={() => {
+                window.location.assign(getInitiativeUrl(initiativeGuid));
+              }}
+              type='link'
+            >
+              {initiative.name}
+            </Button>{' '}
+            is created.
+          </>
+        )
+      });
+    } catch (e) {
+      alert(e);
+    }
+  };
+
+  return (
+    <>
+      <OpportunityDetailHeader
+        title={`Opportunity ${opportunityDetailData?.opportunityKey} • ${opportunityDetailData?.name}`}
+        breadcrumbHref={'/charge-code/opportunities'}
+        breadcrumbText={'Identify Opportunities'}
+        opportunityType={OpportunityTypes.ChargeCode}
+        opportunityId={opportunityId ?? 0}
+        opportunityGuid={opportunityGuid}
+        initiativeGuid={initiativeData.initiativeGuid}
+        sourceOpportunityId={opportunityDetailData?.sourceOpportunityId ?? -1}
+        hasInitiative={hasInitiative}
+        isEditable={isEditable}
+        isHidden={opportunityDetailData?.isHidden}
+        isLocked={isLocked}
+        isSecurityEditable={isSecurityEditable}
+        helpId={'1830'}
+        handleHideOrShow={handleHideOrShow}
+        handleDelete={handleDelete}
+        editInitiative={(opportunityGuid: string) => history.push(`/initiatives/edit/charge-code`, { opportunityGuid: opportunityGuid })}
+        getInitiativeInfo={getInitiativeInfo}
+        finalizeInitiative={finalizeInitiative}
+      />
+      <OpportunityDetail
+        totalCases={opportunityDetailData?.totalCases ?? 0}
+        totalCost={opportunityDetailData?.totalCost ?? 0}
+        costPerCase={opportunityDetailData?.costPerCase ?? 0}
+        goalTotalCost={opportunityDetailData?.goalTotalCost ?? 0}
+        goalCostPerCase={opportunityDetailData?.goalCostPerCase ?? 0}
+        improvementTotalCost={opportunityDetailData?.improvementTotalCost ?? 0}
+        improvementCostPerCase={opportunityDetailData?.improvementCostPerCase ?? 0}
+      ></OpportunityDetail>
+      <Divider margin={0} extended={false}></Divider>
+      <LayoutGrid>
+        <LayoutGrid.Row>
+          <LayoutGrid.Column span={12}>
+            <Card removeBodyPadding>
+              <TreeGrid
+                ref={gridRef}
+                sortField=''
+                sortOrder={1}
+                value={opportunityDetailData?.treeGridData}
+                loading={gridLoading}
+                onCellEdit={onCellEdit}
+                validationMode='manual'
+                scrollable
+                scrollHeight='1000px'
+                defaultExpandAll
+                columnHeaderGroup={
+                  <DataHeaderGroup>
+                    <DataHeaderRow>
+                      <DataHeaderCell width={120} />
+                      <DataHeaderCell isGap />
+                      <DataHeaderCell colSpan={5} header='Baseline' align='center' width={600} />
+                      <DataHeaderCell isGap />
+                      <DataHeaderCell colSpan={5} header='Goal' align='center' width={600} />
+                      <DataHeaderCell isGap />
+                      <DataHeaderCell width={120} />
+                      <DataHeaderCell />
+                    </DataHeaderRow>
+                    <DataHeaderRow>
+                      <DataHeaderCell field='totalCases' header='Number of Cases' sortable align='right'></DataHeaderCell>
+                      <DataHeaderCell isGap />
+                      <DataHeaderCell field='baselineUnitsOfServicePerCase' header='Units of Service Per Case' sortable align='right'></DataHeaderCell>
+                      <DataHeaderCell field='baselineTotalUnitsOfService' header='Total Units of Service' sortable align='right'></DataHeaderCell>
+                      <DataHeaderCell field='baselineCostPerUnit' header='Cost Per Unit' sortable align='right'></DataHeaderCell>
+                      <DataHeaderCell field='baselineCostPerCase' header='Cost Per Case' sortable align='right'></DataHeaderCell>
+                      <DataHeaderCell field='baselineTotalCost' header='Total Cost' sortable align='right'></DataHeaderCell>
+                      <DataHeaderCell isGap />
+                      <DataHeaderCell field='goalUnitsOfServicePerCase' header='Units of Service Per Case' sortable align='right'></DataHeaderCell>
+                      <DataHeaderCell field='goalTotalUnitsOfService' header='Total Units of Service' sortable align='right'></DataHeaderCell>
+                      <DataHeaderCell field='goalCostPerUnit' header='Cost Per Unit' sortable align='right'></DataHeaderCell>
+                      <DataHeaderCell field='goalCostPerCase' header='Cost Per Case' sortable align='right'></DataHeaderCell>
+                      <DataHeaderCell field='goalTotalCost' header='Total Cost' sortable align='right'></DataHeaderCell>
+                      <DataHeaderCell isGap />
+                      <DataHeaderCell header='Improvement' align='right'></DataHeaderCell>
+                      <DataHeaderCell />
+                    </DataHeaderRow>
+                  </DataHeaderGroup>
+                }
+              >
+                <TreeGrid.Column expander collapseLongText frozen field='name' header='' width={300} headerStyle={{ height: 111 }} />
+                <TreeGrid.NumberColumn width={120} field='totalCases' format='number' header='Number of Cases' customCellValue={hideRollupCaseValue} sortable />
+                <TreeGrid.GapColumn />
+                <TreeGrid.NumberColumn
+                  width={120}
+                  field='baselineUnitsOfServicePerCase'
+                  format='decimal'
+                  header='Units of Service Per Case'
+                  customCellValue={hideRollupCaseValue}
+                  sortable
+                  align='right'
+                />
+                <TreeGrid.NumberColumn width={120} field='baselineTotalUnitsOfService' format='decimal' header='Total Units of Service' sortable align='right' />
+                <TreeGrid.NumberColumn width={120} field='baselineCostPerUnit' format='currencyDecimal' header='Cost Per Unit' sortable align='right' />
+                <TreeGrid.NumberColumn width={120} field='baselineCostPerCase' format='currency' header='Cost Per Case' customCellValue={hideRollupCaseValue} sortable align='right' />
+                <TreeGrid.NumberColumn width={120} field='baselineTotalCost' format='currency' header='Total Cost' sortable align='right' />
+                <TreeGrid.GapColumn />
+                <TreeGrid.NumberColumn width={120} field='goalUnitsOfServicePerCase' format='decimal' header='Units of Service Per Case' customCellValue={hideRollupCaseValue} sortable align='right' />
+                <TreeGrid.NumberColumn
+                  width={120}
+                  editable
+                  field='goalTotalUnitsOfService'
+                  format='decimal'
+                  formatOptions={{ nullValue: '0.00' }}
+                  header='Total Units of Service'
+                  sortable
+                  align='right'
+                  isCellEditable={isCellEditable}
+                  customCellValue={getLeafSum}
+                  validationRules={[
+                    {
+                      type: 'number',
+                      min: 0
+                    }
+                  ]}
+                />
+                <TreeGrid.NumberColumn
+                  width={120}
+                  editable
+                  field='goalCostPerUnit'
+                  format='currencyDecimal'
+                  formatOptions={{ nullValue: '0.00' }}
+                  inputProps={{ precision: 2 }}
+                  header='Cost Per Unit'
+                  sortable
+                  align='right'
+                  isCellEditable={isCellEditable}
+                  validationRules={[
+                    {
+                      type: 'number',
+                      min: 0
+                    }
+                  ]}
+                />
+                <TreeGrid.NumberColumn width={120} field='goalCostPerCase' format='currency' header='Cost Per Case' customCellValue={hideRollupCaseValue} sortable align='right' />
+                <TreeGrid.NumberColumn width={120} field='goalTotalCost' format='currency' header='Total Cost' customCellValue={getLeafSum} sortable align='right' />
+                <TreeGrid.GapColumn />
+                <TreeGrid.NumberColumn width={120} field='improvement' format='currency' header='Improvement' align='right' customCellValue={getLeafSum} />
+                <TreeGrid.EmptyColumn />
+              </TreeGrid>
+            </Card>
+          </LayoutGrid.Column>
+        </LayoutGrid.Row>
+        <LayoutGrid.Row>
+          <LayoutGrid.Column span={6}>
+            <OpportunityDetailsCard
+              isVisible={isCardVisible}
+              opportunity={opportunityDetailData}
+              isEditButtonVisible={!hasInitiative && isEditable}
+              onEdit={() => {
+                setChargeCodeEditModalVisible(true);
+              }}
+            />
+          </LayoutGrid.Column>
+        </LayoutGrid.Row>
+      </LayoutGrid>
+      <NotesModal opportunity={opportunityDetailData as IOpportunity} isVisible={notesModalVisible} onSave={handleSaveNotes} onCancel={() => setNotesModalVisible(false)} />
+      {initiativeModalVisible && (
+        <InitiativeCreateModal
+          isVisible={initiativeModalVisible}
+          trackingStart={startMonth}
+          trackingEnd={endMonth}
+          opportunityType={OpportunityTypes.ChargeCode}
+          initiative={getInitiative(initiativeData, opportunityGuid, opportunityDetailData?.name ?? '')}
+          helpId='1831'
+          onCancel={handleInitiativeClose}
+          onOK={handleInitiativeOk}
+        />
+      )}
+      {chargeCodeEditModalVisible && (
+        <ChargeCodeOpportunityEditModal
+          isVisible={chargeCodeEditModalVisible}
+          opportunityGuid={opportunityGuid}
+          onCancel={() => {
+            setChargeCodeEditModalVisible(false);
+          }}
+          onUpdate={(updatedOpportunity: IChargeCodeOpportunitySaveModel) => {
+            handleUpdate(updatedOpportunity);
+          }}
+        />
+      )}
+    </>
+  );
+};
+
+export default ChargeCodeOpportunityDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/ChargeCodeOpportunityEditModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/ChargeCodeOpportunityEditModal.tsx
new file mode 100644
index 0000000..ae46cac
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/ChargeCodeOpportunityEditModal.tsx
@@ -0,0 +1,303 @@
+import { useHelpCenter } from '@strata/core/lib';
+import { ScoreMemberPicker } from '@strata/score/lib/ScoreMemberPicker';
+import Button from '@strata/tempo/lib/button';
+import DropDown from '@strata/tempo/lib/dropdown';
+import Form from '@strata/tempo/lib/form';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import UploadIcon from '@strata/tempo/lib/icon/UploadIcon';
+import Input from '@strata/tempo/lib/input';
+import Modal from '@strata/tempo/lib/modal';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import Spacing from '@strata/tempo/lib/spacing';
+import Text from '@strata/tempo/lib/text';
+import React, { useEffect, useState } from 'react';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { configurationService } from '../../shared/configuration/configurationService';
+import { IEntityInfo, newEntityInfo } from '../../shared/configuration/IEntityInfo';
+import { IServiceLineInfo, newServiceLineInfo } from '../../shared/configuration/IServiceLineInfo';
+import { EncounterGroup } from '../../shared/opportunities/data/EncounterGroup';
+import { IScoreFieldInfo } from '../../shared/opportunities/data/IScoreFieldInfo';
+import { nameIsDuplicate, nameValidationService } from '../../shared/opportunities/data/nameValidationService';
+import { OpportunityLevelTypes } from '../../shared/opportunities/data/OpportunityLevelTypes';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { explorationPopulationIdAttributeGuid } from '../../shared/utilities';
+import { RegEx } from '../../shared/validation/RegEx';
+import ChargeCodeUploadModal from './ChargeCodeUploadModal';
+import { IChargeCodeOpportunitySaveModel } from './data/IChargeCodeOpportunitySaveModel';
+import { opportunityService } from './data/opportunityService';
+
+export interface IChargeCodeOpportunityEditModalProps {
+  isVisible: boolean;
+  opportunityGuid: string;
+  onCancel?: () => void;
+  onUpdate?: (updatedOpportunity: IChargeCodeOpportunitySaveModel) => void;
+}
+
+const ChargeCodeOpportunityEditModal: React.FC<IChargeCodeOpportunityEditModalProps> = (props: IChargeCodeOpportunityEditModalProps) => {
+  const { isVisible, opportunityGuid, onCancel, onUpdate } = props;
+  const [form] = Form.useForm<IChargeCodeOpportunitySaveModel>();
+  const [opportunity, setOpportunity] = useState<IChargeCodeOpportunitySaveModel>();
+  const [modalEntityProperties, setModalEntityProperties] = useState<IEntityInfo>(newEntityInfo);
+  const [modalServiceLineProperties, setModalServiceLineProperties] = useState<IServiceLineInfo>(newServiceLineInfo);
+  const [uploadModalVisible, setUploadModalVisible] = useState<boolean>(false);
+
+  const [initialOpportunity, setInitialOpportunity] = useState<IChargeCodeOpportunitySaveModel>();
+  const helpCenter = useHelpCenter();
+
+  const { userSetting } = React.useContext(UserSettingContext);
+
+  useEffect(() => {
+    const loadData = async (configurationGuid: string) => {
+      const entityInfo = await configurationService.getEntityInfo(configurationGuid);
+      const serviceLineInfo = await configurationService.getServiceLineInfo(configurationGuid);
+      const editModel = await opportunityService.getEditModel(opportunityGuid);
+      setInitialOpportunity(editModel);
+      setOpportunity(editModel);
+      setModalEntityProperties(entityInfo);
+      setModalServiceLineProperties(serviceLineInfo);
+      form.setFieldsValue(editModel);
+    };
+    if (userSetting.configurationGuid !== '') {
+      loadData(userSetting.configurationGuid);
+    }
+  }, [userSetting.configurationGuid, opportunityGuid, form]);
+
+  // Save form, clear fields
+  const handleFormFinish = (values: any) => {
+    handleOpportunitySave({ ...opportunity, ...values });
+  };
+
+  const handleValuesChanged = (changedValues: any) => {
+    const mergedOpportunity = { ...opportunity, ...changedValues } as IChargeCodeOpportunitySaveModel;
+
+    if (changedValues.encounterGroup !== undefined && initialOpportunity) {
+      if (initialOpportunity.encounterGroup !== changedValues.encounterGroup) {
+        mergedOpportunity.encounterGroups = [];
+      } else {
+        mergedOpportunity.encounterGroups = initialOpportunity.encounterGroups;
+      }
+      form.resetFields(['encounterGroups']);
+    }
+
+    if (changedValues.opportunityLevel !== undefined && initialOpportunity) {
+      if (initialOpportunity.opportunityLevel !== changedValues.opportunityLevel) {
+        mergedOpportunity.opportunityLevels = [];
+      } else {
+        mergedOpportunity.opportunityLevels = initialOpportunity.opportunityLevels;
+      }
+      form.resetFields(['opportunityLevels']);
+    }
+
+    setOpportunity(mergedOpportunity);
+    form.setFieldsValue(mergedOpportunity);
+  };
+
+  const handleCancel = async () => {
+    const editModel = await opportunityService.getEditModel(opportunityGuid);
+    setOpportunity(editModel);
+    form.setFieldsValue(editModel);
+    if (onCancel) {
+      onCancel();
+    }
+  };
+
+  const handleChargeCodesUploaded = (chargeCodes: string[]) => {
+    const updated = { ...opportunity, ...{ chargeCodes: chargeCodes } } as IChargeCodeOpportunitySaveModel;
+    setOpportunity(updated);
+    form.setFieldsValue(updated);
+    setUploadModalVisible(false);
+  };
+
+  const handleOpportunitySave = async (updatedOpportunity: IChargeCodeOpportunitySaveModel) => {
+    if (onUpdate && updatedOpportunity.name.trim() !== '' && RegEx.JazzRestrictedCharacters.test(updatedOpportunity.name)) {
+      onUpdate(updatedOpportunity);
+    }
+  };
+
+  const getOpportunityLevelFieldInfo = (): IScoreFieldInfo => {
+    if (modalEntityProperties && modalServiceLineProperties) {
+      switch (opportunity?.opportunityLevel) {
+        case OpportunityLevelTypes.Entity:
+          return {
+            dimensionName: modalEntityProperties.entityLabel,
+            dimensionGuidOrGlobalId: modalEntityProperties.departmentRollupGlobalId,
+            modalTitle: modalEntityProperties.entityTitle
+          };
+        case OpportunityLevelTypes.ServiceLine:
+          return {
+            dimensionName: modalServiceLineProperties.serviceLineName,
+            dimensionGuidOrGlobalId: modalServiceLineProperties.serviceLineDimensionGuid,
+            modalTitle: modalServiceLineProperties.serviceLineTitle
+          };
+        case OpportunityLevelTypes.Specialty:
+          return {
+            dimensionName: 'DSS Physician Specialty',
+            dimensionGuidOrGlobalId: 'DSS Physician Specialty',
+            modalTitle: 'Physician Specialties'
+          };
+        case OpportunityLevelTypes.Provider:
+          return {
+            dimensionName: 'Primary Physicians',
+            dimensionGuidOrGlobalId: 'Physician Primary',
+            modalTitle: 'Primary Physicians'
+          };
+        default:
+          return {
+            dimensionName: '',
+            dimensionGuidOrGlobalId: '',
+            modalTitle: ''
+          };
+      }
+    } else {
+      return {
+        dimensionName: '',
+        dimensionGuidOrGlobalId: '',
+        modalTitle: ''
+      };
+    }
+  };
+
+  const opportunityLevelFieldInfo = getOpportunityLevelFieldInfo();
+
+  const getEncounterGroupFieldInfo = (): IScoreFieldInfo => {
+    if (opportunity?.encounterGroup === EncounterGroup.PatientPopulation) {
+      return {
+        dimensionName: 'Patient Populations',
+        dimensionGuidOrGlobalId: 'Clinical Indicator',
+        modalTitle: 'Patient Populations'
+      };
+    } else {
+      return {
+        dimensionName: 'Case Type',
+        dimensionGuidOrGlobalId: 'Case Type',
+        hierarchyGuid: 'c20b06b1-5a60-4fa5-825d-8e9a0524f783',
+        filters: [{ op: 'Equals', attributeGuid: explorationPopulationIdAttributeGuid, value: 0 }],
+        modalTitle: 'Case Types'
+      };
+    }
+  };
+  const encounterGroupFieldInfo = getEncounterGroupFieldInfo();
+
+  const chargeCodeLabel = (
+    <>
+      <Spacing hAlign='space-between' width='100%'>
+        <Text size='normal' strong>
+          Charge Codes
+        </Text>
+        <Button icon={<UploadIcon />} type='link' onClick={() => setUploadModalVisible(true)}>
+          Upload
+        </Button>
+      </Spacing>
+    </>
+  );
+
+  return (
+    <Modal
+      title='Edit Charge Code Opportunity'
+      visible={isVisible}
+      onCancel={handleCancel}
+      footer={
+        <>
+          <Spacing hAlign='space-between'>
+            <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1828')}></Button>
+            <Spacing>
+              <Button onClick={handleCancel}>Cancel</Button>
+              <Button type='primary' onClick={() => form.submit()}>
+                Update
+              </Button>
+            </Spacing>
+          </Spacing>
+        </>
+      }
+    >
+      <Form form={form} onFinish={handleFormFinish} hideOptionalLabels onValuesChange={handleValuesChanged}>
+        <Form.Item
+          label='Name'
+          name='name'
+          rules={[
+            { required: true, whitespace: false, max: 200, pattern: RegEx.JazzRestrictedCharacters },
+            () => ({
+              async validator(_, value) {
+                if (!value || (await nameValidationService.nameIsValid(userSetting.configurationGuid, OpportunityTypes.ChargeCode, value, opportunityGuid))) {
+                  return Promise.resolve();
+                }
+                return Promise.reject(nameIsDuplicate);
+              }
+            })
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item label='Encounter Group' name='encounterGroup' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: EncounterGroup.CaseType, label: 'Case Type' },
+              { value: EncounterGroup.PatientPopulation, label: 'Patient Population' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label={encounterGroupFieldInfo.modalTitle} name='encounterGroups' rules={[{ required: true }]}>
+          <ScoreMemberPicker
+            dimensionGuidOrGlobalId={encounterGroupFieldInfo.dimensionGuidOrGlobalId}
+            hierarchyGuid={encounterGroupFieldInfo.hierarchyGuid}
+            filters={encounterGroupFieldInfo.filters ?? []}
+            showHierarchyDropdown={false}
+            modalTitle={encounterGroupFieldInfo.modalTitle}
+            selectionMode='multiple'
+            okText='Select'
+          ></ScoreMemberPicker>
+        </Form.Item>
+        <Form.Item label={chargeCodeLabel} name='chargeCodes' rules={[{ required: true }]}>
+          <ScoreMemberPicker
+            dimensionGuidOrGlobalId={'Charge Code'}
+            showHierarchyDropdown={false}
+            hierarchyGuid={'1f7bd500-a966-457d-9b47-a6944b02841b'}
+            modalTitle={'Charge Codes'}
+            selectionMode='multiple'
+            okText='Select'
+          ></ScoreMemberPicker>
+        </Form.Item>
+        <Form.Item label='Opportunity Level' name='opportunityLevel' rules={[{ required: true }]}>
+          <DropDown
+            placeholder='Opportunity Level'
+            items={[
+              { value: OpportunityLevelTypes.Organization, text: 'System' },
+              { value: OpportunityLevelTypes.Entity, text: `${modalEntityProperties.entityText}` },
+              { value: OpportunityLevelTypes.ServiceLine, text: `${modalServiceLineProperties.serviceLineName}` },
+              { value: OpportunityLevelTypes.Specialty, text: 'Specialty' },
+              { value: OpportunityLevelTypes.Provider, text: 'Physician' }
+            ]}
+          />
+        </Form.Item>
+        {modalEntityProperties && modalServiceLineProperties && opportunity?.opportunityLevel !== undefined && opportunity.opportunityLevel !== OpportunityLevelTypes.Organization && (
+          <Form.Item label={opportunityLevelFieldInfo.dimensionName} name='opportunityLevels' rules={[{ required: opportunity.opportunityLevel !== undefined }]}>
+            <ScoreMemberPicker
+              dimensionGuidOrGlobalId={opportunityLevelFieldInfo.dimensionGuidOrGlobalId}
+              showHierarchyDropdown={false}
+              modalTitle={opportunityLevelFieldInfo.modalTitle}
+              selectionMode='multiple'
+              okText='Select'
+            ></ScoreMemberPicker>
+          </Form.Item>
+        )}
+        <Form.Item label='Seasonality' name='isSeasonal' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: true, label: 'With Seasonality' },
+              { value: false, label: 'Without Seasonality' }
+            ]}
+          />
+        </Form.Item>
+      </Form>
+      <ChargeCodeUploadModal
+        isVisible={uploadModalVisible}
+        opportunityGuid={opportunityGuid}
+        chargeCodes={form.getFieldValue('chargeCodes')}
+        onCancel={() => setUploadModalVisible(false)}
+        onOk={handleChargeCodesUploaded}
+      />
+    </Modal>
+  );
+};
+
+export default ChargeCodeOpportunityEditModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/ChargeCodeUploadModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/ChargeCodeUploadModal.tsx
new file mode 100644
index 0000000..992fc00
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/ChargeCodeUploadModal.tsx
@@ -0,0 +1,77 @@
+import React, { useEffect, useState } from 'react';
+import { opportunityService } from './data/opportunityService';
+import Button from '@strata/tempo/lib/button';
+import Divider from '@strata/tempo/lib/divider';
+import Modal from '@strata/tempo/lib/modal';
+import Spacing from '@strata/tempo/lib/spacing';
+import Tag from '@strata/tempo/lib/tag';
+import Text from '@strata/tempo/lib/text';
+import UploadButton, { UploadChangeParam } from '@strata/tempo/lib/uploadbutton';
+import DownloadIcon from '@strata/tempo/lib/icon/DownloadIcon';
+
+export interface IChargeCodeUploadModalProps {
+  isVisible: boolean;
+  opportunityGuid: string;
+  chargeCodes: string[];
+  onOk: (chargeCodes: string[]) => void;
+  onCancel: () => void;
+}
+
+const ChargeCodeUploadModal: React.FC<IChargeCodeUploadModalProps> = (props: IChargeCodeUploadModalProps) => {
+  const { isVisible, opportunityGuid, chargeCodes, onOk, onCancel } = props;
+  const [visible, setVisible] = useState<boolean>(false);
+
+  useEffect(() => {
+    if (isVisible) {
+      setVisible(isVisible);
+    }
+  }, [isVisible]);
+
+  const handleModalClose = () => {
+    setVisible(false);
+    onCancel();
+  };
+
+  const downloadFile = async () => {
+    await opportunityService.exportChargeCodes(opportunityGuid, chargeCodes);
+  };
+
+  const uploadFile = async (info: UploadChangeParam) => {
+    const chargeCodes = await opportunityService.importChargeCodes(info.file as unknown as File);
+    const hpaths = chargeCodes.map((result: { costDriver: string; rollup: string; chargeCodeId: string }) => `CC|CCRU|${result.costDriver}|${result.rollup}|${result.chargeCodeId}`);
+    setVisible(false);
+    onOk(hpaths);
+  };
+
+  return (
+    <Modal title='Upload Charge Codes' footer={null} visible={visible} onCancel={() => handleModalClose()}>
+      <Spacing>
+        <Spacing column width='50%' padding={16} itemSpacing={24}>
+          <Spacing column>
+            <Tag color='secondary'>STEP 1</Tag>
+            <Text size='large' strong>
+              Download the Excel template
+            </Text>
+          </Spacing>
+          <Button icon={<DownloadIcon />} block onClick={() => downloadFile()}>
+            Download
+          </Button>
+        </Spacing>
+
+        <Divider vertical extended />
+
+        <Spacing column width='50%' padding={16} itemSpacing={24}>
+          <Spacing column>
+            <Tag color='secondary'>STEP 2</Tag>
+            <Text size='large' strong>
+              Upload file with charge codes to add
+            </Text>
+          </Spacing>
+          <UploadButton buttonType='secondary' buttonText='Upload' buttonBlock onChange={uploadFile} accept='.xlsx' />
+        </Spacing>
+      </Spacing>
+    </Modal>
+  );
+};
+
+export default ChargeCodeUploadModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/Filters.tsx
new file mode 100644
index 0000000..a1f7144
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/Filters.tsx
@@ -0,0 +1,122 @@
+import React, { useCallback } from 'react';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import Drawer from '@strata/tempo/lib/drawer';
+import DropDown from '@strata/tempo/lib/dropdown';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing';
+import Checkbox from '@strata/tempo/lib/checkbox';
+import { initialFilters, IChargeCodeFilters, ChargeCodeGroup } from './data/IChargeCodeFilters';
+import { useEffect, useState } from 'react';
+import { opportunityService } from './data/opportunityService';
+import { IListMember } from '../../shared/data/IListMember';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+import { SeasonalityType } from '../../shared/data/SeasonalityType';
+
+interface IFiltersProps {
+  filters: IChargeCodeFilters;
+  isVisible: boolean;
+  onApply: (filters: IChargeCodeFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const [opportunityLevels, setOpportunityLevels] = useState<IListMember[]>();
+  const { currentConfiguration } = useConfigurations();
+
+  const [form] = Form.useForm<IChargeCodeFilters>();
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      if (currentConfiguration == null) {
+        return;
+      }
+      const { opportunityLevels } = await opportunityService.getFilterOptions(currentConfiguration.configurationGuid);
+
+      setOpportunityLevels(opportunityLevels);
+      handleClearFilters();
+    };
+
+    loadFiltersOptions();
+  }, [currentConfiguration, handleClearFilters]);
+
+  const handleApplyFilters = () => {
+    const filters: IChargeCodeFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Identified Variation Minimum' name='identifiedSavings'>
+          <InputNumber format='currency' placeholder='' precision={0} />
+        </Form.Item>
+        <Form.Item label='Case Minimum' name='cases'>
+          <InputNumber placeholder='0' precision={0} />
+        </Form.Item>
+        <Form.Item label='Level' name='opportunityLevels'>
+          <DropDown multiSelect items={opportunityLevels} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Encounter Group' name='chargeCodeGroups'>
+          <RadioGroup
+            options={[
+              { value: ChargeCodeGroup.Both, label: 'Both' },
+              { value: ChargeCodeGroup.CaseType, label: 'Case Type' },
+              { value: ChargeCodeGroup.PatientPopulation, label: 'Patient Population' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Seasonality' name='seasonality'>
+          <RadioGroup
+            options={[
+              { value: SeasonalityType.WithAndWithout, label: 'With & Without Seasonality' },
+              { value: SeasonalityType.With, label: 'With Seasonality' },
+              { value: SeasonalityType.Without, label: 'Without Seasonality' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Display' name='viewVisible'>
+          <RadioGroup
+            options={[
+              { value: true, label: 'Visible Opportunities' },
+              { value: false, label: 'Hidden Opportunities' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Initiatives' name='excludeInitiatives' valuePropName='checked'>
+          <Checkbox>Exclude Opportunities with Initiatives</Checkbox>
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/Opportunities.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/Opportunities.tsx
new file mode 100644
index 0000000..8e52907
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/Opportunities.tsx
@@ -0,0 +1,114 @@
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import { useOidcSession } from '@strata/core/lib/auth';
+import Button from '@strata/tempo/lib/button/Button';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import OpportunitiesGrid from '../../shared/opportunities/OpportunitiesGrid';
+import { IOpportunity } from '../../shared/opportunities/data';
+import Filters from './Filters';
+import { IChargeCodeFilters, initialFilters, numberOfFilters } from './data/IChargeCodeFilters';
+import { opportunityService } from './data/opportunityService';
+
+const Opportunities: React.FC = () => {
+  const [filters, setFilters] = useState<IChargeCodeFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const jazzUrl = useJazzUrlWithVersion();
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+  const [chargeCodeBeta, setChargeCodeBeta] = useState(false);
+  const history = useHistory();
+  const session = useOidcSession();
+
+  useEffect(() => {
+    const checkForBeta = async () => {
+      const isChargeCodeBeta = await opportunityService.chargeCodeBeta();
+      setChargeCodeBeta(isChargeCodeBeta);
+    };
+    document.title = 'Charge Code Opportunities';
+    checkForBeta();
+  }, []);
+
+  useEffect(() => {
+    if (currentConfiguration == null) {
+      return;
+    }
+    setFilters(initialFilters);
+    setCurrentConfigurationGuid(currentConfiguration.configurationGuid);
+  }, [currentConfiguration]);
+
+  const handleApplyFilters = (newFilters: IChargeCodeFilters) => {
+    setFiltersVisible(false);
+    setFilters({ ...filters, ...newFilters });
+  };
+
+  const handleSearch = (searchValue: string) => {
+    setFilters((filters) => {
+      return { ...filters, opportunitySearch: searchValue };
+    });
+  };
+
+  const getOpportunityUrl = (opportunity: IOpportunity) => {
+    return `/charge-code-opportunity/${opportunity.opportunityGuid}`;
+  };
+
+  const getInitiativeUrl = (opportunity: IOpportunity) => {
+    return `${jazzUrl}CCI/ChargeCode/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+  };
+
+  const addOpportunityButton = (
+    <>
+      {chargeCodeBeta || session.isStrata ? (
+        <Button
+          type='primary'
+          icon={<PlusIcon />}
+          onClick={() =>
+            history.push('/initiatives/create/charge-code', {
+              networkOpportunityId: undefined,
+              networkOpportunityName: undefined
+            })
+          }
+        >
+          Opportunity
+        </Button>
+      ) : (
+        ''
+      )}
+    </>
+  );
+
+  return (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />
+      <OpportunitiesGrid
+        configurationGuid={currentConfigurationGuid}
+        getOpportunityUrl={getOpportunityUrl}
+        getInitiativeUrl={getInitiativeUrl}
+        filters={filters}
+        opportunityService={opportunityService}
+        identifiedSavingsIndex={2}
+        numOfSelectedFilters={numberOfFilters(filters)}
+        searchPlaceholderText='Search'
+        onFilter={() => setFiltersVisible(true)}
+        onSearch={handleSearch}
+        customAction={addOpportunityButton}
+      >
+        <DataGrid.Column field='name' header='Name' sortable width={160} />
+        <DataGrid.NumberColumn field='cases' header='Cases' sortable width={96} />
+        <DataGrid.Column field='chargeCodeGroupValue' header='Encounter Group' sortable width={144} />
+        <DataGrid.Column
+          field='opportunityLevel'
+          header='Level'
+          sortable
+          width={200}
+          customCellValue={(args) => (args.rowData[args.field] === 'ServiceLine' ? 'Service Line' : args.rowData[args.field])}
+        />
+        <DataGrid.Column field='isSeasonal' header='Seasonality' sortable width={104} customCellValue={(args) => (args.rowData[args.field] ? 'With' : 'Without')} />
+      </OpportunitiesGrid>
+    </>
+  );
+};
+
+export default Opportunities;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/ICCOpportunityRowData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/ICCOpportunityRowData.ts
new file mode 100644
index 0000000..509346c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/ICCOpportunityRowData.ts
@@ -0,0 +1,12 @@
+export interface ICCOpportunityRowData {
+  name: string;
+  totalCases: number;
+  baselineUnitsOfServicePerCase: number;
+  baselineTotalUnitsOfService: number;
+  baselineCostPerCase: number;
+  baselineTotalCost: number;
+  goalUnitsOfServicePerCase: number;
+  goalTotalUnitsOfService: number;
+  goalCostPerCase: number;
+  goalTotalCost: number;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/ICCOpportunityTreeGridModel.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/ICCOpportunityTreeGridModel.ts
new file mode 100644
index 0000000..c238d91
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/ICCOpportunityTreeGridModel.ts
@@ -0,0 +1,7 @@
+import { ICCOpportunityRowData } from './ICCOpportunityRowData';
+
+export interface ICCOpportunityTreeGridModel {
+  key: string;
+  data: ICCOpportunityRowData;
+  children: ICCOpportunityTreeGridModel[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCode.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCode.ts
new file mode 100644
index 0000000..db12590
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCode.ts
@@ -0,0 +1,8 @@
+export interface IChargeCode {
+  chargeCodeId: number;
+  chargeCode: string;
+  memberGuid: string;
+  name: string;
+  costDriver: string;
+  rollup: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeFilterOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeFilterOptions.ts
new file mode 100644
index 0000000..3947c37
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeFilterOptions.ts
@@ -0,0 +1,14 @@
+import { IListMember } from '../../../shared/data/IListMember';
+
+export interface IChargeCodeFilterOptions {
+  opportunityLevels: IListMember[];
+}
+
+export const newFilterOptions = (data: Partial<IChargeCodeFilterOptions> = {}): IChargeCodeFilterOptions => {
+  return {
+    ...{
+      opportunityLevels: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeFilters.ts
new file mode 100644
index 0000000..55d7b5c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeFilters.ts
@@ -0,0 +1,38 @@
+import { SeasonalityType } from '../../../shared/data/SeasonalityType';
+import { IOpportunityFilters } from '../../../shared/opportunities/data';
+
+export interface IChargeCodeFilters extends IOpportunityFilters {
+  cases?: number;
+  opportunityLevels: string[];
+  chargeCodeGroups: ChargeCodeGroup;
+  seasonality: SeasonalityType;
+}
+
+export enum ChargeCodeGroup {
+  Both = -1,
+  CaseType = 0,
+  PatientPopulation = 1
+}
+
+export const initialFilters: IChargeCodeFilters = {
+  identifiedSavings: undefined,
+  cases: undefined,
+  chargeCodeGroups: ChargeCodeGroup.Both,
+  opportunityLevels: [],
+  seasonality: SeasonalityType.WithAndWithout,
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+export const numberOfFilters = (filters: IChargeCodeFilters): number => {
+  let filtersCount = 0;
+  if (filters.identifiedSavings != null) filtersCount++;
+  if (filters.cases != null) filtersCount++;
+  if (filters.chargeCodeGroups !== ChargeCodeGroup.Both) filtersCount++;
+  if (filters.opportunityLevels.length > 0) filtersCount++;
+  if (filters.seasonality !== SeasonalityType.WithAndWithout) filtersCount++;
+  if (filters.viewVisible === false) filtersCount++;
+  if (filters.excludeInitiatives === true) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeOpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeOpportunity.ts
new file mode 100644
index 0000000..e0f7aa5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeOpportunity.ts
@@ -0,0 +1,22 @@
+import { IOpportunityDetails } from '../../../shared/opportunities/data/IOpportunity';
+import { ICCOpportunityTreeGridModel } from './ICCOpportunityTreeGridModel';
+
+export interface IChargeCodeOpportunity extends IOpportunityDetails {
+  opportunityId: number;
+  opportunityKey: string;
+  name: string;
+  totalCases: number;
+  costPerCase: number;
+  goalCostPerCase: number;
+  improvementCostPerCase: number;
+  totalCost: number;
+  goalTotalCost: number;
+  improvementTotalCost: number;
+  opportunityLevel: string;
+  chargeCodeJson: string;
+  clinicalIndicatorJson: string;
+  opportunityLevelJson: string;
+  treeGridData: ICCOpportunityTreeGridModel[];
+  chargeCodeGroupValue: string;
+  opportunityLevels: string[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeOpportunityDetailChanges.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeOpportunityDetailChanges.ts
new file mode 100644
index 0000000..cefbcb1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeOpportunityDetailChanges.ts
@@ -0,0 +1,11 @@
+export interface IChargeCodeOpportunityDetailChanges {
+  key: string;
+  goalTotalUnitsOfService?: number;
+  goalCostPerUnit?: number;
+}
+
+export const DefaultChargeCodeOpportunityDetailChanges: IChargeCodeOpportunityDetailChanges = {
+  key: '',
+  goalTotalUnitsOfService: undefined,
+  goalCostPerUnit: undefined
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeOpportunitySaveModel.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeOpportunitySaveModel.ts
new file mode 100644
index 0000000..b27abb7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/IChargeCodeOpportunitySaveModel.ts
@@ -0,0 +1,33 @@
+import { EncounterGroup } from '../../../shared/opportunities/data/EncounterGroup';
+import { OpportunityLevelTypes } from '../../../shared/opportunities/data/OpportunityLevelTypes';
+
+export interface IChargeCodeOpportunitySaveModel {
+  configurationGuid: string;
+  opportunityGuid: string;
+  name: string;
+  encounterGroup: EncounterGroup;
+  encounterGroups: string[];
+  chargeCodes: string[];
+  opportunityLevel: OpportunityLevelTypes | undefined;
+  opportunityLevels: string[];
+  isSeasonal: boolean;
+  isFromWizard: boolean;
+}
+
+export const newChargeCodeOpportunitySaveModel = (configurationGuid: string, data: Partial<IChargeCodeOpportunitySaveModel> = {}): IChargeCodeOpportunitySaveModel => {
+  return {
+    ...{
+      configurationGuid: configurationGuid,
+      opportunityGuid: '00000000-0000-0000-0000-000000000000',
+      name: '',
+      encounterGroup: EncounterGroup.CaseType,
+      encounterGroups: [],
+      chargeCodes: [],
+      opportunityLevel: undefined,
+      opportunityLevels: [],
+      isSeasonal: false,
+      isFromWizard: false
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/opportunityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/opportunityService.ts
new file mode 100644
index 0000000..ad41ea0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/charge-code/opportunities/data/opportunityService.ts
@@ -0,0 +1,120 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IInitiative } from '../../../shared/initiatives/data/IInitiative';
+import { IOpportunityFilters, IOpportunityService } from '../../../shared/opportunities/data';
+import { IPagedApiResponse, IPagingOptions, ISortOptions } from '../../../shared/paging';
+import { IChargeCode } from './IChargeCode';
+import { IChargeCodeFilterOptions } from './IChargeCodeFilterOptions';
+import { IChargeCodeOpportunity } from './IChargeCodeOpportunity';
+import { IChargeCodeOpportunitySaveModel } from './IChargeCodeOpportunitySaveModel';
+import { IChargeCodeOpportunityDetailChanges } from './IChargeCodeOpportunityDetailChanges';
+import { IChargeCodeCustomPickerModel } from '../../../strategic-opportunities/data/IChargeCodeCustomPickerModel';
+
+const { httpGet, httpPost, httpPut, httpDelete, httpDownloadAndDisplayFile } = getSecureService(`${appConfig.apiUrl}v1/`);
+const { httpUpload } = getSecureService(`${appConfig.scoreUrl}`);
+const url = 'charge-code-opportunities';
+
+export const opportunityService: IOpportunityService = {
+  getOpportunities: async (configurationGuid: string, pagingOptions: IPagingOptions, filters: IOpportunityFilters): Promise<IPagedApiResponse<IChargeCodeOpportunity>> => {
+    return httpPost<IPagedApiResponse<IChargeCodeOpportunity>>(`charge-code-opps`, {
+      pagingOptions,
+      filters: {
+        ...filters,
+        configurationGuid
+      }
+    });
+  },
+
+  export: async (configurationGuid: string, sortOptions: ISortOptions, filters: IOpportunityFilters): Promise<void> => {
+    const date = new Date();
+    const fileName = 'ChargeCode_CI_Opportunities_' + date.toISOString().split('T')[0];
+    httpDownloadAndDisplayFile(
+      'charge-code-opps/export',
+      {
+        method: 'post',
+        body: JSON.stringify({
+          sortOptions,
+          filters: {
+            ...filters,
+            configurationGuid
+          }
+        })
+      },
+      fileName
+    );
+  },
+
+  getFilterOptions: (configurationGuid: string): Promise<IChargeCodeFilterOptions> => {
+    return httpGet<IChargeCodeFilterOptions>(`charge-code-opps/${configurationGuid}/filter-options`);
+  },
+
+  setHidden: async (opportunityGuid: string, isHidden: boolean): Promise<void> => {
+    await httpPut(`charge-code-opps/${opportunityGuid}/set-hidden`, isHidden);
+  },
+
+  setNote: async (opportunityGuid: string, note: string): Promise<void> => {
+    await httpPut(`charge-code-opps/${opportunityGuid}/set-note`, note);
+  },
+  updateChargeCodeOpportunity: async (opportunity: IChargeCodeOpportunitySaveModel): Promise<string> => {
+    return httpPut(`${url}/${opportunity.opportunityGuid}/update-opportunity`, opportunity);
+  },
+  validateChargeCodes: async (chargeCodes: string[]): Promise<boolean> => {
+    return httpPost(`${url}/validate-charge-codes`, { chargeCodes });
+  },
+  getChargeCodePickerModels: async (hPaths: string[]): Promise<IChargeCodeCustomPickerModel> => {
+    return httpPost(`${url}/charge-code-members`, hPaths);
+  },
+  validateOpportunityLevels: async (opportunityLevel: number, opportunityLevels: string[], configuration: string): Promise<boolean> => {
+    return httpPost(`${url}/validate-opportunity-levels`, { opportunityLevel, opportunityLevels, configuration });
+  },
+  getById(opportunityGuid: string | number): Promise<IChargeCodeOpportunity> {
+    return httpGet<IChargeCodeOpportunity>(`${url}/${opportunityGuid}`);
+  },
+  getEditModel(opportunityGuid: string | number): Promise<IChargeCodeOpportunitySaveModel> {
+    return httpGet(`${url}/${opportunityGuid}/edit-model`);
+  },
+  updateGoalTotalUnitsOfService(opportunityGuid: string, key: string, goalValue: number): Promise<boolean> {
+    return httpPut(`${url}/${opportunityGuid}/update-goal-total-units-of-service`, { key, goalValue });
+  },
+  updateGoalCostPerUnit(opportunityGuid: string, key: string, goalValue: number): Promise<boolean> {
+    return httpPut(`${url}/${opportunityGuid}/update-goal-cost-per-unit`, { key, goalValue });
+  },
+  updateGoals(opportunityGuid: string, changes: IChargeCodeOpportunityDetailChanges[]): Promise<boolean> {
+    return httpPut(`${url}/${opportunityGuid}/update-goals`, changes);
+  },
+  delete: async (opportunityGuid: string, callback: () => void, failed: (err: any) => void): Promise<void> => {
+    httpDelete(`${url}/${opportunityGuid}/delete`)
+      .then(callback)
+      .catch((e) => failed(e));
+  },
+  getInitiativeInfo: (opporturnityGuid: string): Promise<IInitiative> => {
+    return httpGet(`${url}/${opporturnityGuid}/initiative-info`);
+  },
+  exportChargeCodes: function (opportunityGuid: string | undefined, chargeCodes: string[] | undefined) {
+    const filename = 'ChargeCodes.xlsx';
+    const body = JSON.stringify({ chargeCodes });
+    httpDownloadAndDisplayFile(
+      `${url}/${opportunityGuid ?? '00000000-0000-0000-0000-000000000000'}/export`,
+      {
+        method: 'post',
+        body: body
+      },
+      filename
+    );
+  },
+
+  importChargeCodes: async (file: File): Promise<IChargeCode[]> => {
+    const globalId = 'Charge Code';
+    const cols = ['chargeCodeId', 'costDriver', 'rollup'];
+    const columns = cols.map((column) => `columns=${column}`).join('&');
+    const formData = new FormData();
+    const requestPath = `dimensions/${globalId}/members-filtered-by-file?${columns}&valueFilterColumn=ChargeCode&maxResults=1000`;
+    formData.append('valuesToFilterFile', file);
+
+    const results = await httpUpload(requestPath, formData, undefined, 'post');
+    return results as IChargeCode[];
+  },
+
+  chargeCodeBeta: async (): Promise<boolean> => {
+    return httpGet(`${url}/opportunity-create-enabled`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/AddPeerGroupDrawer.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/AddPeerGroupDrawer.tsx
new file mode 100644
index 0000000..968015b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/AddPeerGroupDrawer.tsx
@@ -0,0 +1,175 @@
+import Button from '@strata/tempo/lib/button/Button';
+import Drawer from '@strata/tempo/lib/drawer/Drawer';
+import DropDown, { DropDownValue } from '@strata/tempo/lib/dropdown/DropDown';
+import Form from '@strata/tempo/lib/form/Form';
+import Input from '@strata/tempo/lib/input/Input';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import React, { useEffect, useState } from 'react';
+import { IPeerGroupFilters } from '../../shared/configuration/IPeerGroupFilters';
+import { RegEx } from '../../shared/validation/RegEx';
+import { PeerGroupDropdownItems } from './data/PeerGroupDropdownItems';
+import { peerGroupService } from './data/peerGroupService';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import { useHelpCenter } from '@strata/core/lib/help/useHelpCenter';
+
+export interface IPeerGroupDefinitionDrawerProps {
+  isVisible: boolean;
+  title: string;
+  editPeerGroup: IPeerGroupFilters | undefined;
+  onApply?: (filters: IPeerGroupFilters) => void;
+  onClose: () => void;
+}
+
+const nameIsDuplicate = 'Peer Group name already exists.';
+
+const AddPeerGroupDrawer: React.FC<IPeerGroupDefinitionDrawerProps> = (props) => {
+  const { isVisible, title, editPeerGroup, onApply, onClose } = props;
+  const [isLoading, setIsLoading] = useState<boolean>();
+  const [drawerFilters, setDrawerFilters] = useState<IPeerGroupFilters>();
+  const [dropdownItems, setDropdownItems] = useState<PeerGroupDropdownItems>();
+
+  const [form] = Form.useForm<IPeerGroupFilters>();
+  const helpCenter = useHelpCenter();
+
+  useEffect(() => {
+    const fetchFilters = async () => {
+      setIsLoading(true);
+      try {
+        const items = await peerGroupService.getDropdownItems();
+        setDropdownItems(items);
+        if (!editPeerGroup && !drawerFilters) {
+          const filters = {
+            peerGroupId: 0,
+            name: '',
+            entityTypes: items.entityTypeList.map((i) => i.value),
+            censusRegions: items.censusRegionList.map((i) => i.value),
+            operatingExpenses: items.operatingExpenseList.map((i) => i.value),
+            amcTypes: items.amcTypeList.map((i) => i.value),
+            bedSize: items.bedSizeList.map((i) => i.value),
+            urbanRural: items.urbanRuralList.map((i) => i.value)
+          };
+          setDrawerFilters(filters);
+          form.setFieldsValue(filters);
+        } else if (editPeerGroup && !drawerFilters) {
+          setDrawerFilters(editPeerGroup);
+          form.setFieldsValue(editPeerGroup);
+        }
+      } finally {
+        setIsLoading(false);
+      }
+    };
+    if (isVisible && !dropdownItems) {
+      fetchFilters();
+    }
+  }, [isVisible, dropdownItems, drawerFilters, editPeerGroup, form]);
+
+  const handleClear = () => {
+    if (dropdownItems) form.setFieldsValue(getInitialFilters(dropdownItems));
+  };
+
+  const getInitialFilters = (dropdownItems: PeerGroupDropdownItems): IPeerGroupFilters => {
+    const filters: IPeerGroupFilters = {
+      peerGroupId: 0,
+      name: '',
+      entityTypes: [],
+      censusRegions: [],
+      operatingExpenses: [],
+      amcTypes: [],
+      bedSize: [],
+      urbanRural: []
+    };
+    return filters;
+  };
+
+  const handleCancel = () => {
+    onClose();
+  };
+
+  const handleFormFinish = async () => {
+    if (onApply) {
+      const formValues = form.getFieldsValue();
+      onApply(formValues);
+    }
+    onClose();
+  };
+
+  const handleDropDownChange = (value: DropDownValue, fieldName: 'entityTypes' | 'censusRegions' | 'operatingExpenses' | 'amcTypes' | 'bedSize' | 'urbanRural') => {
+    // Tempo may call onChange with undefined/empty during open/close; ignore no-op transitions
+    if (value == null) return;
+    const arr = Array.isArray(value) ? (value as number[]) : [value as number];
+    // If it’s an “open/close” transient empty, keep existing selection
+    if (arr.length === 0) {
+      const current = form.getFieldValue(fieldName) as number[] | undefined;
+      if (current && current.length > 0) return;
+    }
+    form.setFieldValue(fieldName, arr);
+  };
+  return (
+    <Drawer
+      title={title}
+      visible={isVisible}
+      onClose={() => onClose()}
+      loading={isLoading}
+      width={600}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Spacing>
+            <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1900')} />
+            <Button type='tertiary' onClick={handleClear}>
+              Clear
+            </Button>
+          </Spacing>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={() => form.submit()}>
+              Save
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+    >
+      <Form form={form} onFinish={handleFormFinish} maxWidth='100%' initialValues={drawerFilters} hideOptionalLabels>
+        <Form.Item
+          label='Peer Group Name'
+          name='name'
+          rules={[
+            { required: true, whitespace: false, max: 100, pattern: RegEx.JazzRestrictedCharacters },
+            () => ({
+              async validator(_, value) {
+                if (!value) {
+                  return Promise.resolve();
+                }
+                if (!(await peerGroupService.nameIsValid(editPeerGroup?.peerGroupId ?? 0, value))) {
+                  return Promise.reject(nameIsDuplicate);
+                }
+                return Promise.resolve();
+              }
+            })
+          ]}
+        >
+          <Input width={320} />
+        </Form.Item>
+        <Form.Item label='Entity Type' name='entityTypes'>
+          <DropDown multiSelect items={dropdownItems?.entityTypeList} onChange={(value: DropDownValue, option: any) => handleDropDownChange(value, 'entityTypes')} />
+        </Form.Item>
+        <Form.Item label='Urban/Rural' name='urbanRural'>
+          <DropDown multiSelect items={dropdownItems?.urbanRuralList} onChange={(value: DropDownValue, option: any) => handleDropDownChange(value, 'urbanRural')} />
+        </Form.Item>
+        <Form.Item label='Academic Medical Center' name='amcTypes'>
+          <DropDown multiSelect items={dropdownItems?.amcTypeList} onChange={(value: DropDownValue, option: any) => handleDropDownChange(value, 'amcTypes')} />
+        </Form.Item>
+        <Form.Item label='Census Region' name='censusRegions'>
+          <DropDown multiSelect items={dropdownItems?.censusRegionList} onChange={(value: DropDownValue, option: any) => handleDropDownChange(value, 'censusRegions')} />
+        </Form.Item>
+        <Form.Item label='Bed Size' name='bedSize'>
+          <DropDown multiSelect items={dropdownItems?.bedSizeList} onChange={(value: DropDownValue, option: any) => handleDropDownChange(value, 'bedSize')} />
+        </Form.Item>
+        <Form.Item label='Operating Expense' name='operatingExpenses'>
+          <DropDown multiSelect items={dropdownItems?.operatingExpenseList} onChange={(value: DropDownValue, option: any) => handleDropDownChange(value, 'operatingExpenses')} />
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default AddPeerGroupDrawer;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/PeerGroupTab.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/PeerGroupTab.tsx
new file mode 100644
index 0000000..a1f8a48
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/PeerGroupTab.tsx
@@ -0,0 +1,144 @@
+import ActionBar from '@strata/tempo/lib/actionbar/ActionBar';
+import Button from '@strata/tempo/lib/button/Button';
+import DataGrid from '@strata/tempo/lib/datagrid/DataGrid';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import EditIcon from '@strata/tempo/lib/icon/EditIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import useModal from '@strata/tempo/lib/modal/useModal';
+import Tooltip from '@strata/tempo/lib/tooltip/Tooltip';
+import React, { useEffect, useState } from 'react';
+import { IPeerGroupFilters } from '../../shared/configuration/IPeerGroupFilters';
+import { MAX_PEER_GROUP } from '../../shared/constants';
+import AddPeerGroupDrawer from './AddPeerGroupDrawer';
+import { peerGroupService } from './data/peerGroupService';
+
+export interface IPeerGroupTabProps {
+  setLoading: (loading: boolean) => void;
+}
+
+const addDrawerTitle = 'Add Peer Group';
+
+const PeerGroupTab: React.FC<IPeerGroupTabProps> = (props: IPeerGroupTabProps) => {
+  const { setLoading } = props;
+  const [peerGroup, setPeerGroup] = useState<IPeerGroupFilters>();
+  const [peerGroups, setPeerGroups] = useState<IPeerGroupFilters[]>([]);
+  const [isPeerGroupDrawerVisible, setIsPeerGroupDrawerVisible] = useState<boolean>(false);
+
+  const modal = useModal();
+
+  useEffect(() => {
+    loadData();
+  }, []);
+
+  const loadData = async () => {
+    setLoading(true);
+    try {
+      const loadedPeerGroups = await peerGroupService.getGroups();
+      setPeerGroups(loadedPeerGroups);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleAddPeerGroup = () => {
+    setPeerGroup(undefined);
+    setIsPeerGroupDrawerVisible(true);
+  };
+
+  const handleEditPeerGroup = async (peerGroupId: number) => {
+    const editPeerGroup = await peerGroupService.getById(peerGroupId);
+    setPeerGroup(editPeerGroup);
+    setIsPeerGroupDrawerVisible(true);
+  };
+
+  const handleDeletePeerGroup = async (peerGroup: any) => {
+    modal.confirm({
+      title: `Delete ${peerGroup.name}?`,
+      content: 'Are you sure you want to delete this peer group?',
+      okText: 'Delete Peer Group',
+      cancelText: 'Cancel',
+      confirmType: 'danger',
+      async onOk() {
+        setLoading(true);
+        try {
+          await peerGroupService.delete(peerGroup.peerGroupId);
+          await loadData();
+        } finally {
+          setLoading(false);
+        }
+      }
+    });
+  };
+
+  const onClosePeerGroupDefinition = () => {
+    setIsPeerGroupDrawerVisible(false);
+  };
+
+  const onPeerGroupFiltersChange = async (filterSettings: IPeerGroupFilters) => {
+    setLoading(true);
+    try {
+      if (peerGroup) {
+        await peerGroupService.update(peerGroup.peerGroupId, filterSettings);
+      } else {
+        await peerGroupService.create(filterSettings);
+      }
+      await loadData();
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <>
+      <ActionBar
+        actions={
+          <Tooltip
+            title={peerGroups.length >= MAX_PEER_GROUP ? `You have reached the maximum number of ${MAX_PEER_GROUP} peer groups. Please delete a peer group or modify an existing peer group.` : ''}
+          >
+            <Button type='secondary' icon={<PlusIcon />} onClick={() => handleAddPeerGroup()} disabled={peerGroups.length >= MAX_PEER_GROUP}>
+              Add Peer Group
+            </Button>
+          </Tooltip>
+        }
+      />
+
+      <DataGrid value={peerGroups} density='dense'>
+        <DataGrid.GapColumn></DataGrid.GapColumn>
+        <DataGrid.Column field='name' header='Peer Group Name' width={450} sortable />
+        <DataGrid.EmptyColumn />
+        <DataGrid.Column
+          key='edit'
+          header=''
+          width={30}
+          body={(rowData) => (
+            <Tooltip title='Edit'>
+              <Button type='link' icon={<EditIcon />} onClick={() => handleEditPeerGroup(rowData.peerGroupId)} />
+            </Tooltip>
+          )}
+        />
+        <DataGrid.Column
+          key='delete'
+          header=''
+          width={30}
+          body={(rowData) => (
+            <Tooltip title='Delete'>
+              <Button type='link' icon={<DeleteIcon />} onClick={() => handleDeletePeerGroup(rowData)} />
+            </Tooltip>
+          )}
+        />
+        <DataGrid.GapColumn />
+      </DataGrid>
+      {isPeerGroupDrawerVisible && (
+        <AddPeerGroupDrawer
+          title={peerGroup ? `Edit ${peerGroup.name}` : addDrawerTitle}
+          isVisible={isPeerGroupDrawerVisible}
+          editPeerGroup={peerGroup}
+          onClose={onClosePeerGroupDefinition}
+          onApply={onPeerGroupFiltersChange}
+        ></AddPeerGroupDrawer>
+      )}
+    </>
+  );
+};
+
+export default PeerGroupTab;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/RollupTab.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/RollupTab.tsx
new file mode 100644
index 0000000..056118c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/RollupTab.tsx
@@ -0,0 +1,125 @@
+import ActionBar from '@strata/tempo/lib/actionbar/ActionBar';
+import Button from '@strata/tempo/lib/button/Button';
+import DataGrid from '@strata/tempo/lib/datagrid/DataGrid';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import EditIcon from '@strata/tempo/lib/icon/EditIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import useModal from '@strata/tempo/lib/modal/useModal';
+import Tooltip from '@strata/tempo/lib/tooltip/Tooltip';
+import React, { useEffect, useState } from 'react';
+import { IInitiativeRollupColumn } from '../../initiatives/data/IInitiativeRollupColumn';
+import { initiativeRollupColumnService } from '../../initiatives/data/initiativeRollupColumnService';
+import ManageRollupColumns from '../../initiatives/ManageRollupColumns';
+import { MAX_ROLLUP_COLUMNS } from '../../shared/constants';
+
+const RollupTab: React.FC = () => {
+  const [rollupColumn, setRollupColumn] = useState<IInitiativeRollupColumn>();
+  const [rollupColumns, setRollupColumns] = useState<IInitiativeRollupColumn[]>([]);
+  const [isRollupColumnDrawerVisible, setIsRollupColumnDrawerVisible] = useState<boolean>(false);
+  const [isRollupColumnDrawerLoading, setIsRollupColumnDrawerLoading] = useState<boolean>(false);
+
+  const modal = useModal();
+
+  const handleAddRollupColumn = () => {
+    setRollupColumn(undefined);
+    setIsRollupColumnDrawerVisible(true);
+  };
+
+  const handleEditRollupColumn = async (rollupColumnId: number) => {
+    const editRollupColumn = await initiativeRollupColumnService.getById(rollupColumnId);
+    setRollupColumn(editRollupColumn);
+    setIsRollupColumnDrawerVisible(true);
+  };
+
+  const handleDeleteRollupColumn = async (rollupColumnId: number) => {
+    const rollupColumn = rollupColumns.find((x) => x.initiativeRollupColumnId === rollupColumnId);
+    modal.confirm({
+      title: `Delete ${rollupColumn?.name}?`,
+      content: `${rollupColumn?.name} and associated rollup values will no longer appear in the Strategic Opportunity.`,
+      confirmType: 'danger',
+      okText: 'Delete Rollup',
+      cancelText: 'Cancel',
+      async onOk() {
+        await initiativeRollupColumnService.delete(rollupColumnId);
+        await loadData();
+        if (isRollupColumnDrawerVisible) {
+          setIsRollupColumnDrawerVisible(false);
+        }
+      }
+    });
+  };
+
+  const loadData = async () => {
+    const rollupColumns = await initiativeRollupColumnService.getColumns();
+    setRollupColumns(rollupColumns);
+  };
+
+  useEffect(() => {
+    loadData();
+  }, []);
+
+  return (
+    <>
+      <ActionBar
+        actions={
+          <Tooltip
+            title={rollupColumns.length >= MAX_ROLLUP_COLUMNS ? `You have reached the maximum number of ${MAX_ROLLUP_COLUMNS} rollups.  Please delete a rollup or modify an existing rollup.` : ''}
+          >
+            <Button type='secondary' icon={<PlusIcon />} onClick={() => handleAddRollupColumn()} disabled={rollupColumns.length >= MAX_ROLLUP_COLUMNS}>
+              Add Rollup
+            </Button>
+          </Tooltip>
+        }
+      ></ActionBar>
+
+      <DataGrid value={rollupColumns} density='dense'>
+        <DataGrid.GapColumn></DataGrid.GapColumn>
+        <DataGrid.Column field='name' header='Rollup Name' width={450} sortable />
+        <DataGrid.EmptyColumn />
+        <DataGrid.Column
+          key='edit'
+          header=''
+          width={30}
+          body={(rowData) => (
+            <>
+              <Tooltip title='Edit'>
+                <Button type='link' icon={<EditIcon />} onClick={() => handleEditRollupColumn(rowData.initiativeRollupColumnId)} />
+              </Tooltip>
+            </>
+          )}
+        />
+        <DataGrid.Column
+          key='delete'
+          header=''
+          width={30}
+          body={(rowData) => (
+            <>
+              <Tooltip title='Delete'>
+                <Button type='link' icon={<DeleteIcon />} onClick={() => handleDeleteRollupColumn(rowData.initiativeRollupColumnId)} />
+              </Tooltip>
+            </>
+          )}
+        />
+        <DataGrid.GapColumn />
+      </DataGrid>
+      {isRollupColumnDrawerVisible && (
+        <ManageRollupColumns
+          rollupColumn={rollupColumn}
+          rollupColumns={rollupColumns}
+          isStrategicOpportunity
+          setRollupColumns={setRollupColumns}
+          isLoading={isRollupColumnDrawerLoading}
+          setIsLoading={setIsRollupColumnDrawerLoading}
+          isVisible={isRollupColumnDrawerVisible}
+          setIsVisible={setIsRollupColumnDrawerVisible}
+          onCancel={() => setIsRollupColumnDrawerVisible(false)}
+          onAfterSave={loadData}
+          // eslint-disable-next-line @typescript-eslint/no-empty-function
+          deleteRollupFromData={() => {}}
+        ></ManageRollupColumns>
+      )}
+    </>
+  );
+};
+
+export default RollupTab;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/data/PeerGroupDropdownItems.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/data/PeerGroupDropdownItems.ts
new file mode 100644
index 0000000..4f8172e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/data/PeerGroupDropdownItems.ts
@@ -0,0 +1,10 @@
+import { IPickerItem } from '../../../shared/data/IPickerItem';
+
+export interface PeerGroupDropdownItems {
+  entityTypeList: IPickerItem[];
+  censusRegionList: IPickerItem[];
+  operatingExpenseList: IPickerItem[];
+  amcTypeList: IPickerItem[];
+  bedSizeList: IPickerItem[];
+  urbanRuralList: IPickerItem[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/data/peerGroupService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/data/peerGroupService.ts
new file mode 100644
index 0000000..e7ce863
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/configuration/tabs/data/peerGroupService.ts
@@ -0,0 +1,30 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IPeerGroupFilters } from '../../../shared/configuration/IPeerGroupFilters';
+import { PeerGroupDropdownItems } from './PeerGroupDropdownItems';
+
+const { httpGet, httpPost, httpPut, httpDelete } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'peer-group';
+
+export const peerGroupService = {
+  getById: (rollupColumnId: number): Promise<IPeerGroupFilters> => {
+    return httpGet<IPeerGroupFilters>(`${url}/${rollupColumnId}`);
+  },
+  getGroups: (): Promise<IPeerGroupFilters[]> => {
+    return httpGet<IPeerGroupFilters[]>(`${url}`);
+  },
+  getDropdownItems: (): Promise<PeerGroupDropdownItems> => {
+    return httpGet<PeerGroupDropdownItems>(`${url}/dropdown-items`);
+  },
+  create: function (peerGroup: IPeerGroupFilters): Promise<IPeerGroupFilters> {
+    return httpPost(`${url}`, peerGroup);
+  },
+  update: function (peerGroupId: number, peerGroup: IPeerGroupFilters): Promise<IPeerGroupFilters> {
+    return httpPut(`${url}/${peerGroupId}`, peerGroup);
+  },
+  nameIsValid: async (peerGroupId: number, name: string) => {
+    return await httpPost<boolean>(`${url}/is-name-valid/${peerGroupId}`, name);
+  },
+  delete: async (peerGroupId: number) => {
+    return await httpDelete(`${url}/${peerGroupId}`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/Encounter.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/Encounter.tsx
new file mode 100644
index 0000000..e32319d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/Encounter.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import Opportunities from './opportunities/Opportunities';
+import OpportunitiesHeader from '../shared/opportunities/OpportunitiesHeader';
+
+const Encounter: React.FC = () => {
+  return (
+    <>
+      <OpportunitiesHeader headerTitle='Encounter Opportunities' helpId='1301' />
+      <Opportunities />
+    </>
+  );
+};
+
+export default Encounter;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/EncounterDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/EncounterDetail.tsx
new file mode 100644
index 0000000..c887c04
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/EncounterDetail.tsx
@@ -0,0 +1,160 @@
+import React, { useEffect, useState } from 'react';
+import Form from '@strata/tempo/lib/form/Form';
+import RadioGroup from '@strata/tempo/lib/radiogroup/RadioGroup';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import ScoreMemberPicker from '@strata/score/lib/ScoreMemberPicker/ScoreMemberPicker';
+import { IScoreFieldInfo } from '../../shared/opportunities/data/IScoreFieldInfo';
+import { EncounterGroup } from '../../shared/opportunities/data/EncounterGroup';
+import { OpportunityLevelTypes } from '../../shared/opportunities/data/OpportunityLevelTypes';
+import { IEntityInfo, newEntityInfo } from '../../shared/configuration/IEntityInfo';
+import { IServiceLineInfo, newServiceLineInfo } from '../../shared/configuration/IServiceLineInfo';
+import { IValidationMessage } from '../../shared/validation/IValidationMessage';
+import { configurationService } from '../../shared/configuration/configurationService';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { explorationPopulationIdAttributeGuid } from '../../shared/utilities';
+
+export interface IEncounterDetailProps {
+  encounterGroup: number;
+  opportunityLevel: number;
+  setEncounterGroup: (group: EncounterGroup) => void;
+  setOpportunityLevel: (level: OpportunityLevelTypes) => void;
+}
+
+const EncounterDetail: React.FC<IEncounterDetailProps> = (props: IEncounterDetailProps) => {
+  const [modalEntityProperties, setModalEntityProperties] = useState<IEntityInfo>(newEntityInfo);
+  const [modalServiceLineProperties, setModalServiceLineProperties] = useState<IServiceLineInfo>(newServiceLineInfo);
+  const [customValidation, setCustomValidation] = useState<IValidationMessage>({ isValid: true, validationMessage: '' }); // eslint-disable-line
+  const { userSetting } = React.useContext(UserSettingContext);
+
+  useEffect(() => {
+    setCustomValidation({ isValid: true, validationMessage: '' });
+    const loadData = async (configurationGuid: string) => {
+      const entityInfo = await configurationService.getEntityInfo(configurationGuid);
+      const serviceLineInfo = await configurationService.getServiceLineInfo(configurationGuid);
+      setModalEntityProperties(entityInfo);
+      setModalServiceLineProperties(serviceLineInfo);
+    };
+    if (userSetting.configurationGuid !== '') {
+      loadData(userSetting.configurationGuid);
+    }
+  }, [userSetting.configurationGuid]);
+
+  const getEncounterGroupFieldInfo = (): IScoreFieldInfo => {
+    if (props.encounterGroup === EncounterGroup.PatientPopulation) {
+      return {
+        dimensionName: 'Patient Populations',
+        dimensionGuidOrGlobalId: 'Clinical Indicator',
+        modalTitle: 'Patient Populations'
+      };
+    } else {
+      return {
+        dimensionName: 'Case Type',
+        dimensionGuidOrGlobalId: 'Case Type',
+        hierarchyGuid: 'c20b06b1-5a60-4fa5-825d-8e9a0524f783',
+        filters: [{ op: 'Equals', attributeGuid: explorationPopulationIdAttributeGuid, value: 0 }],
+        modalTitle: 'Case Types'
+      };
+    }
+  };
+
+  const getOpportunityLevelFieldInfo = (): IScoreFieldInfo => {
+    switch (props.opportunityLevel) {
+      case OpportunityLevelTypes.Entity:
+        return {
+          dimensionName: modalEntityProperties.entityLabel,
+          dimensionGuidOrGlobalId: modalEntityProperties.departmentRollupGlobalId,
+          modalTitle: modalEntityProperties.entityTitle
+        };
+      case OpportunityLevelTypes.ServiceLine:
+        return {
+          dimensionName: modalServiceLineProperties.serviceLineName,
+          dimensionGuidOrGlobalId: modalServiceLineProperties.serviceLineDimensionGuid,
+          modalTitle: modalServiceLineProperties.serviceLineTitle
+        };
+      case OpportunityLevelTypes.Specialty:
+        return {
+          dimensionName: 'DSS Physician Specialty',
+          dimensionGuidOrGlobalId: 'DSS Physician Specialty',
+          label: 'Physician Specialty',
+          modalTitle: 'Physician Specialties'
+        };
+      case OpportunityLevelTypes.Provider:
+        return {
+          dimensionName: 'Primary Physicians',
+          dimensionGuidOrGlobalId: 'Physician Primary',
+          modalTitle: 'Primary Physicians'
+        };
+      default:
+        return {
+          dimensionName: '',
+          dimensionGuidOrGlobalId: '',
+          modalTitle: ''
+        };
+    }
+  };
+
+  const encounterGroupFieldInfo = getEncounterGroupFieldInfo();
+  const opportunityLevelFieldInfo = getOpportunityLevelFieldInfo();
+
+  return (
+    <>
+      <Spacing padding={16} column>
+        <Form.Item label='Encounter Group' name='encounterGroup' rules={[{ required: true }]}>
+          <RadioGroup
+            onChange={(e) => props.setEncounterGroup(e.target.value as EncounterGroup)}
+            options={[
+              { value: EncounterGroup.CaseType, label: 'Case Type' },
+              { value: EncounterGroup.PatientPopulation, label: 'Patient Population' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label={encounterGroupFieldInfo.modalTitle} name='encounterGroups' rules={[{ required: true }]}>
+          <ScoreMemberPicker
+            dimensionGuidOrGlobalId={encounterGroupFieldInfo.dimensionGuidOrGlobalId}
+            hierarchyGuid={encounterGroupFieldInfo.hierarchyGuid}
+            filters={encounterGroupFieldInfo.filters ?? []}
+            showHierarchyDropdown={false}
+            modalTitle={encounterGroupFieldInfo.modalTitle}
+            selectionMode='multiple'
+            okText='Select'
+          ></ScoreMemberPicker>
+        </Form.Item>
+        <Form.Item label='Opportunity Level' name='opportunityLevel' rules={[{ required: true }]}>
+          <DropDown
+            onChange={(e) => props.setOpportunityLevel(e as OpportunityLevelTypes)}
+            placeholder='Opportunity Level'
+            items={[
+              { value: OpportunityLevelTypes.Organization, text: 'System' },
+              { value: OpportunityLevelTypes.Entity, text: `${modalEntityProperties.entityText}` },
+              { value: OpportunityLevelTypes.ServiceLine, text: `${modalServiceLineProperties.serviceLineName}` },
+              { value: OpportunityLevelTypes.Specialty, text: 'Specialty' },
+              { value: OpportunityLevelTypes.Provider, text: 'Physician' }
+            ]}
+          />
+        </Form.Item>
+        {props.opportunityLevel !== undefined && props.opportunityLevel !== OpportunityLevelTypes.Organization && opportunityLevelFieldInfo.dimensionName !== '' && (
+          <Form.Item label={opportunityLevelFieldInfo.label ?? opportunityLevelFieldInfo.dimensionName} name='opportunityLevels' rules={[{ required: props.opportunityLevel !== undefined }]}>
+            <ScoreMemberPicker
+              dimensionGuidOrGlobalId={opportunityLevelFieldInfo.dimensionGuidOrGlobalId}
+              showHierarchyDropdown={false}
+              modalTitle={opportunityLevelFieldInfo.modalTitle}
+              selectionMode='multiple'
+              okText='Select'
+            ></ScoreMemberPicker>
+          </Form.Item>
+        )}
+        <Form.Item label='Seasonality' name='isSeasonal' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: true, label: 'With Seasonality' },
+              { value: false, label: 'Without Seasonality' }
+            ]}
+          />
+        </Form.Item>
+      </Spacing>
+    </>
+  );
+};
+
+export default EncounterDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/EncounterInitiative.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/EncounterInitiative.tsx
new file mode 100644
index 0000000..96ded49
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/EncounterInitiative.tsx
@@ -0,0 +1,161 @@
+import { FormInstance } from '@strata/tempo/lib/form/Form';
+import useToast from '@strata/tempo/lib/toast/useToast';
+import Wizard from '@strata/tempo/lib/wizard/Wizard';
+import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
+import { clientOpportunityLinkService } from '../../network/opportunities/data/clientOppportunityLinkService';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import CreateInitiative from '../../shared/initiatives/CreateInitiative';
+import { IInitiative } from '../../shared/initiatives/data/IInitiative';
+import { IInitiativeProps } from '../../shared/initiatives/data/IInitiativeProps';
+import notificationHub from '../../shared/notification/NotificationHub';
+import { EncounterGroup } from '../../shared/opportunities/data/EncounterGroup';
+import { OpportunityLevelTypes } from '../../shared/opportunities/data/OpportunityLevelTypes';
+import { nameValidationService } from '../../shared/opportunities/data/nameValidationService';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { opportunityService } from '../opportunities/data/opportunityService';
+import EncounterDetail from './EncounterDetail';
+import { IEncounterInitiative, newEncounterInitiative } from './data/IEncounterInitiative';
+import { cleanUpEncounterInitiative } from './data/IEncounterInitiativeDto';
+import { initiativeService } from './data/initiativeService';
+
+const EncounterInitiative: React.FC = () => {
+  const [initiative, setInitiative] = React.useState<IInitiative>();
+  const [isLoading, setLoading] = React.useState<boolean>(false);
+  const [isEditing, setEditing] = React.useState<boolean>(true);
+  const { currentConfiguration } = useConfigurations();
+  const { userSetting } = React.useContext(UserSettingContext);
+  const history = useHistory();
+  const { networkOpportunityId, networkOpportunityName, opportunityGuid } = history.location.state as IInitiativeProps;
+  const [encounterGroup, setEncounterGroup] = useState<EncounterGroup>(EncounterGroup.CaseType);
+  const [opportunityLevel, setOpportunityLevel] = useState<OpportunityLevelTypes>(OpportunityLevelTypes.Organization);
+  const hub = notificationHub.useConnection();
+  const toast = useToast();
+
+  useEffect(() => {
+    setLoading(true);
+
+    const loadInitiative = async () => {
+      if (opportunityService.getInitiativeInfo && opportunityGuid) {
+        const initiativeInfo = await opportunityService.getInitiativeInfo(opportunityGuid);
+        const opportunity = await opportunityService.getEditModel(opportunityGuid);
+
+        setOpportunityLevel(opportunity.opportunityLevel);
+        setEncounterGroup(opportunity.encounterGroup);
+
+        if (initiativeInfo) {
+          const updates = newEncounterInitiative(currentConfiguration, { ...opportunity, ...initiativeInfo });
+          setInitiative(updates);
+        }
+        setEditing(true);
+      }
+    };
+
+    const loadData = async () => {
+      if (!currentConfiguration) return;
+
+      if (!opportunityGuid) {
+        // create
+        const initiativeInfo = newEncounterInitiative(currentConfiguration);
+        if (networkOpportunityName) {
+          initiativeInfo.name = networkOpportunityName;
+        }
+        setInitiative(initiativeInfo);
+      } else {
+        // edit
+        loadInitiative();
+      }
+      setEditing(false);
+    };
+
+    try {
+      loadData();
+    } finally {
+      setLoading(false);
+    }
+  }, [currentConfiguration, networkOpportunityName, opportunityGuid]);
+
+  const nameIsValid = async (name: string): Promise<boolean> => {
+    return await nameValidationService.nameIsValid(userSetting.configurationGuid, OpportunityTypes.Encounter, name, opportunityGuid);
+  };
+
+  const pageIsValid = (currentStep: number, detailValues: IEncounterInitiative): boolean => {
+    if (!detailValues.encounterGroups || detailValues.encounterGroups.length === 0) {
+      return false;
+    }
+    if (detailValues.opportunityLevel !== OpportunityLevelTypes.Organization && (!detailValues.opportunityLevels || detailValues.opportunityLevels.length === 0)) {
+      return false;
+    }
+    return true;
+  };
+
+  const createOpportunity = async (detailValues: IEncounterInitiative): Promise<void> => {
+    const cleanup = cleanUpEncounterInitiative({ ...initiative, ...detailValues });
+    try {
+      setLoading(true);
+
+      let _opportunityGuid = '';
+
+      notificationHub.register(
+        hub,
+        async () => {
+          if (opportunityGuid) {
+            await initiativeService.update(cleanup);
+            _opportunityGuid = opportunityGuid;
+          } else {
+            _opportunityGuid = await initiativeService.create(cleanup);
+
+            // save network opp if applicable
+            if (networkOpportunityId) {
+              await clientOpportunityLinkService.addClientOpportunityLink(networkOpportunityId, _opportunityGuid);
+            }
+          }
+        },
+        cleanup.name
+      );
+    } catch (error) {
+      // Handles exceptions or unhandled validation from server
+      toast.show({
+        key: initiative?.name ?? '',
+        message: `${initiative?.name ?? ''} Opportunity was not saved. Try again and contact us if the issue continues.`,
+        toastType: 'error'
+      });
+    }
+  };
+
+  const handleFormValuesChange = (form: FormInstance<any>, changedValues: { [name: string]: any }) => {
+    if (changedValues.encounterGroup != null) {
+      form.resetFields(['encounterGroups']);
+      form.setFieldValue('encounterGroups', changedValues.encounterGroups);
+    }
+
+    if (changedValues.opportunityLevel != null) {
+      form.resetFields(['opportunityLevels']);
+      form.setFieldValue('opportunityLevels', changedValues.opportunityLevels);
+    }
+  };
+
+  return (
+    <>
+      <CreateInitiative
+        opportunityType='Encounter'
+        helpId='1726'
+        newInitiative={initiative}
+        nameIsValid={nameIsValid}
+        pageIsValid={pageIsValid}
+        createOpportunity={createOpportunity}
+        onFormValuesChanged={handleFormValuesChange}
+        isEditing={isEditing}
+        isLoading={isLoading}
+      >
+        <Wizard.Step key='1' title='Encounter Opportunity'>
+          <EncounterDetail encounterGroup={encounterGroup} opportunityLevel={opportunityLevel} setEncounterGroup={setEncounterGroup} setOpportunityLevel={setOpportunityLevel} />
+        </Wizard.Step>
+        <></>
+      </CreateInitiative>
+    </>
+  );
+};
+
+export default EncounterInitiative;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/data/IEncounterInitiative.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/data/IEncounterInitiative.ts
new file mode 100644
index 0000000..f5a161b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/data/IEncounterInitiative.ts
@@ -0,0 +1,25 @@
+import { IOrgDefinedInitiative, newOrgDefinedInitiative } from '../../../shared/initiatives/data/IOrgDefinedInitiative';
+import { EncounterGroup } from '../../../shared/opportunities/data/EncounterGroup';
+import { OpportunityLevelTypes } from '../../../shared/opportunities/data/OpportunityLevelTypes';
+import { IConfiguration } from '../../../shared/configuration/IConfiguration';
+
+export interface IEncounterInitiative extends IOrgDefinedInitiative {
+  encounterGroup?: EncounterGroup;
+  opportunityLevel?: OpportunityLevelTypes | undefined;
+  encounterGroups?: [];
+  opportunityLevels?: [];
+  isSeasonal?: boolean;
+}
+
+export const newEncounterInitiative = (configuration: IConfiguration | undefined, data: Partial<IEncounterInitiative> = {}): IEncounterInitiative => {
+  const initiative = newOrgDefinedInitiative(configuration, data) as IEncounterInitiative;
+  initiative.costDriver = 'Encounter';
+  initiative.encounterGroup = EncounterGroup.CaseType;
+  initiative.opportunityLevel = OpportunityLevelTypes.Organization;
+  initiative.isSeasonal = false;
+
+  return {
+    ...initiative,
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/data/IEncounterInitiativeDto.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/data/IEncounterInitiativeDto.ts
new file mode 100644
index 0000000..d1da2cf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/data/IEncounterInitiativeDto.ts
@@ -0,0 +1,21 @@
+import { IOrgDefinedInitiativeDto, cleanUpOrgDefinedInitiativeDto, newOrgDefinedInitiativeDto } from '../../../shared/initiatives/data/IOrgDefinedInitiativeDto';
+import { OpportunityLevelTypes } from '../../../shared/opportunities/data/OpportunityLevelTypes';
+import { EncounterGroup } from '../../opportunities/data/IEncounterFilters';
+import { IEncounterInitiative } from './IEncounterInitiative';
+
+export interface IEncounterInitiativeDto extends IOrgDefinedInitiativeDto {
+  encounterGroup: EncounterGroup;
+  opportunityLevel: OpportunityLevelTypes | undefined;
+  encounterGroups: [];
+  opportunityLevels: [];
+  isSeasonal?: boolean;
+}
+
+export const newEncounterInitiativeDto = (data: Partial<IEncounterInitiativeDto> = {}): IEncounterInitiativeDto => {
+  const initiative = newOrgDefinedInitiativeDto(data) as IEncounterInitiativeDto;
+  return initiative;
+};
+
+export const cleanUpEncounterInitiative = (data: Partial<IEncounterInitiative>): IEncounterInitiativeDto => {
+  return newEncounterInitiativeDto({ ...data, ...cleanUpOrgDefinedInitiativeDto({ ...data }) });
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/data/initiativeService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/data/initiativeService.ts
new file mode 100644
index 0000000..d184157
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/initiatives/data/initiativeService.ts
@@ -0,0 +1,15 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import { getSecureService } from '@strata/core/lib/http/getSecureService';
+import { IInitiativeDto } from '../../../shared/initiatives/data/IInitiativeDto';
+
+const { httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'initiatives';
+
+export const initiativeService = {
+  create: function (initiative: IInitiativeDto): Promise<string> {
+    return httpPost(`${url}/create-encounter`, initiative);
+  },
+  update: function (initiative: IInitiativeDto): Promise<IInitiativeDto> {
+    return httpPost(`${url}/update-encounter`, initiative);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/EncounterOpportunityDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/EncounterOpportunityDetail.tsx
new file mode 100644
index 0000000..82e15fe
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/EncounterOpportunityDetail.tsx
@@ -0,0 +1,487 @@
+import Divider from '@strata/tempo/lib/divider';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useHistory, useParams } from 'react-router';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { getInitiative, IInitiative, newInitiative } from '../../shared/initiatives/data/IInitiative';
+import OpportunityDetailHeader from '../../shared/opportunities/OpportunityDetailHeader';
+import { securityService } from '../../shared/security/data/securityService';
+import { opportunityService } from './data/opportunityService';
+import { initiativeService } from '../../shared/initiatives/data/initiativeService';
+import { usePageLoader } from '@strata/tempo/lib/pageloader/usePageLoader';
+import { getGuid, zeroGuid } from '../../shared/utilities';
+import MetricGroup from '@strata/tempo/lib/metricgroup/MetricGroup';
+import { IEncounterOpportunity } from './data/IEncounterOpportunity';
+import LayoutGrid from '@strata/tempo/lib/layoutgrid/LayoutGrid';
+import { ILayoutRowProps } from '@strata/tempo/lib/layoutrow/LayoutRow';
+import EncounterOpportunityDetailGrid from './EncounterOpportunityDetailGrid';
+import OpportunityDetailsCard from '../../shared/opportunities/OpportunityDetailsCard';
+import InitiativeCreateModal from '../../shared/initiatives/InitiativeCreateModal';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { IEncounterInitiative, newEncounterInitiative } from '../initiatives/data/IEncounterInitiative';
+import Button from '@strata/tempo/lib/button/Button';
+import useToast from '@strata/tempo/lib/toast/useToast';
+import { initiativeService as initiativeEncounterService } from '../initiatives/data/initiativeService';
+import { cleanUpEncounterInitiative } from '../initiatives/data/IEncounterInitiativeDto';
+import { useJazzUrlWithVersion } from '@strata/core/lib/auth/useJazzUrlWithVersion';
+import notificationHub from '../../shared/notification/NotificationHub';
+import { debounce } from 'lodash';
+import ICellEditorArgs from '@strata/tempo/lib/datacolumn/ICellEditorArgs';
+import Card from '@strata/tempo/lib/card/Card';
+import DataGrid from '@strata/tempo/lib/datagrid/DataGrid';
+import { DefaultEncounterOpportunitySaveModelChanges, IEncounterOpportunitySaveModelChanges } from './data/IEncounterOpportunitySaveModelChanges';
+import EncounterOpportunityEditModal from './EncounterOpportunityEditModal';
+import { useModal } from '@strata/tempo/lib/modal';
+
+interface IChangedValues {
+  [key: number]: {
+    gridRef: React.RefObject<DataGrid>;
+    data: IEncounterOpportunitySaveModelChanges;
+  };
+}
+
+const EncounterOpportunityDetail: React.FC = () => {
+  const { opportunityGuid } = useParams<{ opportunityGuid: string }>();
+  const [opportunityId, setOpportunityId] = useState<number>(0);
+  const [initiativeData, setInitiativeData] = useState<IInitiative>(newInitiative);
+  const [hasInitiative, setHasInitiative] = useState<boolean>(false);
+  const [gridLoading, setGridLoading] = useState(false);
+  const [opportunityDetailData, setOpportunityDetailData] = useState<IEncounterOpportunity>();
+  const [isReadable, setIsReadable] = useState(true);
+  const [isEditable, setIsEditable] = useState(false);
+  const [encounterEditModalVisible, setEncounterEditModalVisible] = useState(false);
+  const [isCardVisible, setCardVisible] = useState(false);
+  const [isFinalized, setIsFinalized] = useState(false);
+  const [isLocked, setIsLocked] = useState(true);
+  const [isSecurityEditable, setIsSecurityEditable] = useState(false);
+  const [initiativeModalVisible, setInitiativeModalVisible] = useState(false);
+  const [startMonth, setStartMonth] = useState<string>('');
+  const [endMonth, setEndMonth] = useState<string>('');
+  const hub = notificationHub.useConnection();
+
+  const changedValues = React.useRef<IChangedValues>({});
+  const modal = useModal();
+
+  const { currentConfiguration } = useConfigurations();
+  const jazzUrl = useJazzUrlWithVersion();
+  const toast = useToast();
+  const { setLoading } = usePageLoader();
+  const history = useHistory();
+  const initiativeUrl = `${jazzUrl}CCI/Encounter/InitiativeViewer.aspx?id=`;
+
+  useEffect(() => {
+    // prevent users w/o read access page access
+    if (!isReadable) {
+      history.push('/');
+    }
+  }, [isReadable]);
+
+  useEffect(() => {
+    const setUserPermissions = async () => {
+      setIsReadable(await securityService.getGeneralAccessPermissions());
+      const userPermissions = await securityService.getUserPermissions(opportunityGuid);
+      setIsSecurityEditable(userPermissions.canSecure);
+      setIsEditable(userPermissions.canWrite);
+    };
+
+    const fetchData = async () => {
+      const opportunityDetail = await opportunityService.getById(opportunityGuid);
+      document.title = opportunityDetail.name;
+      setOpportunityDetailData(opportunityDetail);
+      setOpportunityId(opportunityDetail.opportunityId);
+      if (opportunityService.getInitiativeInfo) {
+        const info = await opportunityService.getInitiativeInfo(opportunityGuid);
+        setInitiativeData(info);
+        setHasInitiative((info && info.initiativeGuid !== undefined && info.initiativeGuid !== zeroGuid) ?? false);
+        setIsFinalized((info && info.isFinalized) ?? false);
+        setStartMonth(info.startMonth ?? currentConfiguration?.orgDefinedTrackingStartDate);
+        setEndMonth(info.endMonth ?? currentConfiguration?.orgDefinedTrackingEndDate);
+        setIsLocked(info.isLocked);
+      } else {
+        setIsLocked(false);
+      }
+    };
+
+    if (opportunityGuid && opportunityGuid !== zeroGuid) {
+      setLoading(true);
+      setCardVisible(false);
+      Promise.all([setUserPermissions(), fetchData()]).finally(() => {
+        setLoading(false);
+        setCardVisible(true);
+      });
+    }
+  }, [opportunityGuid]);
+
+  const goalErrorModal = () => {
+    modal.alert({
+      title: 'Goal Failed to Update',
+      content: 'An unknown error occurred. Try editing the goal again and contact us if the issue continues.',
+      alertType: 'error'
+    });
+  };
+
+  useEffect(() => {
+    changedValues.current = {};
+  }, [opportunityDetailData]);
+
+  const updateGoals = useCallback(async () => {
+    if (!changedValues.current) return;
+
+    setGridLoading(true);
+
+    try {
+      const changes = Object.values(changedValues.current).map((x) => x.data);
+      const result = await opportunityService.updateGoals(opportunityGuid, changes);
+
+      if (!result) {
+        goalErrorModal();
+      }
+
+      const opportunityDetail = await opportunityService.getById(opportunityGuid);
+      setOpportunityDetailData(opportunityDetail);
+    } finally {
+      setGridLoading(false);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [opportunityGuid, changedValues]);
+
+  const handleHideOrShow = () => {
+    const updateHidden = async () => {
+      if (opportunityDetailData === undefined) {
+        return;
+      }
+      await opportunityService.setHidden(opportunityGuid, !opportunityDetailData.isHidden);
+      setOpportunityDetailData({ ...opportunityDetailData, ...{ isHidden: !opportunityDetailData.isHidden } });
+    };
+    updateHidden();
+  };
+
+  const handleDelete = async (callback: () => void, failed: (err: any) => void) => {
+    await opportunityService.delete(opportunityGuid, callback, failed);
+  };
+
+  const getInitiativeInfo = async () => {
+    if (!hasInitiative) {
+      setInitiativeModalVisible(true);
+    } else {
+      window.location.assign(initiativeUrl + initiativeData.initiativeGuid);
+    }
+  };
+
+  const finalizeInitiative = async () => {
+    try {
+      setLoading(true);
+      toast.show({
+        key: initiativeData.initiativeGuid,
+        toastType: 'loading',
+        message: `Finalizing initiative.`,
+        duration: 0
+      });
+      if (opportunityDetailData) {
+        const opportunityDetail = await opportunityService.getById(opportunityGuid);
+        setOpportunityDetailData(opportunityDetail);
+      }
+      await initiativeService.finalize(initiativeData.initiativeGuid, async function () {
+        toast.show({
+          key: initiativeData.initiativeGuid,
+          toastType: 'success',
+          message: `Initiative has been finalized and tracking has been run.`
+        });
+        // refresh initiative info now that tracking has been run
+        if (opportunityService.getInitiativeInfo) {
+          const info = await opportunityService.getInitiativeInfo(opportunityGuid);
+          setInitiativeData(info);
+          setHasInitiative(info.trackingStart !== null && info.trackingStart !== '');
+          setStartMonth(info.startMonth);
+          setEndMonth(info.endMonth);
+          setIsLocked(info.isLocked);
+        }
+      });
+    } catch (error) {
+      if (error instanceof Response) {
+        // Handles exceptions or unhandled validation from server
+        toast.show({
+          key: initiativeData.initiativeGuid,
+          message: `An error occurred while finalizing the initiative.`,
+          toastType: 'error'
+        });
+      }
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const onOpporunityEdit = async (updatedOpportunity: IEncounterOpportunity) => {
+    modal.confirm({
+      title: `Update Opportunity?`,
+      content: `Updating will reset this opportunity's goals.`,
+      okText: 'Update',
+      cancelText: 'Cancel',
+      async onOk() {
+        notificationHub.register(
+          hub,
+          async () => {
+            setGridLoading(true);
+            setEncounterEditModalVisible(false);
+            const result = await opportunityService.updateEncounterOpportunity(updatedOpportunity);
+            // notifier logic redirects page if result == true
+            // if only name is edited - result will be empty string, so we need to reload data for opportunity and show seccussfull toast (think about the way when it errored, so that message is shown)
+            if (!result) {
+              setGridLoading(false);
+            }
+          },
+          updatedOpportunity.name
+        );
+        toast.show({
+          key: updatedOpportunity.name,
+          toastType: 'loading',
+          message: `Updating ${updatedOpportunity.name} Opportunity`,
+          duration: 30
+        });
+      }
+    });
+  };
+
+  const updateGoalWithDebounce = useMemo(
+    () =>
+      debounce(async () => {
+        if (changedValues.current) {
+          const invalidCells = [];
+          for (const val of Object.values(changedValues.current)) {
+            const _invalidCells = await val?.gridRef?.current?.validateGrid();
+            invalidCells.push(..._invalidCells);
+          }
+          if (!invalidCells.length) updateGoals();
+        }
+      }, 1000),
+    [updateGoals]
+  );
+  useEffect(() => {
+    return () => {
+      updateGoalWithDebounce.cancel();
+    };
+  }, [updateGoalWithDebounce]);
+
+  const handleCellEdit = useCallback(
+    (gridRef: React.RefObject<DataGrid>, args: ICellEditorArgs, newCellValue: number) => {
+      if (!changedValues.current[args.row.levelId]) {
+        changedValues.current[args.row.levelId] = {
+          gridRef: gridRef,
+          data: { ...DefaultEncounterOpportunitySaveModelChanges, levelId: args.row.levelId }
+        };
+      }
+      changedValues.current[args.row.levelId].data.volume = Math.round(args.row.volume);
+      changedValues.current[args.row.levelId].data.costPerCase = args.row.costPerCase || 0;
+      changedValues.current[args.row.levelId].data.revenuePerCase = args.row.revenuePerCase || 0;
+
+      updateGoalWithDebounce();
+    },
+    [updateGoalWithDebounce]
+  );
+
+  const dataGrids = useMemo(() => {
+    const elements: React.ReactElement<ILayoutRowProps>[] =
+      opportunityDetailData && opportunityDetailData.gridData
+        ? Object.entries(opportunityDetailData.gridData).map(([key, value]) => (
+            <LayoutGrid.Row key={key}>
+              <LayoutGrid.Column span={12}>
+                <Card removeBodyPadding>
+                  <EncounterOpportunityDetailGrid gridName={key} handleCellEdit={handleCellEdit} gridLoading={gridLoading} gridData={value} isEditable={isEditable} isLocked={isLocked} />
+                </Card>
+              </LayoutGrid.Column>
+            </LayoutGrid.Row>
+          ))
+        : [];
+    return <LayoutGrid>{elements}</LayoutGrid>;
+  }, [handleCellEdit, isEditable, isLocked, gridLoading, opportunityDetailData]);
+
+  const handleInitiativeClose = async () => {
+    setInitiativeModalVisible(false);
+  };
+
+  const handleInitiativeOk = async (initiative: IEncounterInitiative) => {
+    setInitiativeModalVisible(false);
+    initiative.costDriver = 'Encounter';
+
+    const data = newEncounterInitiative(currentConfiguration, { ...cleanUpEncounterInitiative({ ...initiative }), encounterGroup: initiative.encounterGroup });
+    data.configurationGuid = currentConfiguration?.configurationGuid;
+
+    const newInitiative = await initiativeEncounterService.update(data);
+    if (getGuid(newInitiative.initiativeGuid) === undefined) {
+      toast.show({ toastType: 'error', duration: 0, message: 'Failed to save initiative' });
+      return;
+    }
+    if (opportunityService.getInitiativeInfo) {
+      const info = await opportunityService.getInitiativeInfo(opportunityGuid);
+      setInitiativeData(info);
+    }
+    setHasInitiative(true);
+    toast.show({
+      key: newInitiative.initiativeGuid,
+      toastType: 'success',
+      duration: 0,
+      message: (
+        <>
+          <Button
+            onClick={() => {
+              window.location.assign(initiativeUrl + newInitiative.initiativeGuid);
+            }}
+            type='link'
+          >
+            {initiative.name}
+          </Button>{' '}
+          is created.
+        </>
+      )
+    });
+  };
+
+  const getMetrics = () => {
+    return (
+      <MetricGroup
+        items={[
+          {
+            key: 'revenue',
+            label: 'Revenue',
+            values: [
+              {
+                key: 'total-revenue-goal',
+                label: 'Total Revenue Goal',
+                value: opportunityDetailData?.revenueGoal,
+                format: 'currencyDecimal',
+                formatOptions: {
+                  nullValue: '-'
+                }
+              },
+              {
+                key: 'revenue-improvement',
+                label: 'Revenue Improvement',
+                value: opportunityDetailData?.revenueImprovement,
+                format: 'currencyDecimal',
+                formatOptions: {
+                  nullValue: '-'
+                }
+              }
+            ]
+          },
+          {
+            key: 'cost',
+            label: 'Cost',
+            values: [
+              {
+                key: 'total-cost-goal',
+                label: 'Total Cost Goal',
+                value: opportunityDetailData?.costGoal,
+                format: 'currencyDecimal',
+                formatOptions: {
+                  nullValue: '-'
+                }
+              },
+              {
+                key: 'cost-improvement',
+                label: 'Cost Improvement',
+                value: opportunityDetailData?.costImprovement,
+                format: 'currencyDecimal',
+                formatOptions: {
+                  nullValue: '-'
+                }
+              }
+            ]
+          },
+          {
+            key: 'margin',
+            label: 'Margin',
+            values: [
+              {
+                key: 'total-margin-goal',
+                label: 'Total Margin Goal',
+                value: opportunityDetailData?.marginGoal,
+                format: 'currencyDecimal',
+                formatOptions: {
+                  nullValue: '-'
+                }
+              },
+              {
+                key: 'margin-improvement',
+                label: 'Margin Improvement',
+                value: opportunityDetailData?.marginImprovement,
+                format: 'currencyDecimal',
+                formatOptions: {
+                  nullValue: '-'
+                }
+              }
+            ]
+          }
+        ]}
+      />
+    );
+  };
+
+  return (
+    <>
+      <OpportunityDetailHeader
+        title={`Opportunity ${opportunityDetailData?.opportunityKey} • ${opportunityDetailData?.name}`}
+        breadcrumbHref='/encounter/opportunities'
+        breadcrumbText='Identify Opportunities'
+        opportunityType={OpportunityTypes.Encounter}
+        opportunityId={opportunityId ?? 0}
+        opportunityGuid={opportunityGuid}
+        initiativeGuid={initiativeData.initiativeGuid}
+        sourceOpportunityId={opportunityDetailData?.sourceOpportunityId ?? -1}
+        hasInitiative={hasInitiative}
+        isEditable={isEditable}
+        isHidden={opportunityDetailData?.isHidden}
+        isLocked={isLocked || !isEditable || isFinalized}
+        isSecurityEditable={isSecurityEditable}
+        helpId={'1250'}
+        handleHideOrShow={handleHideOrShow}
+        handleDelete={handleDelete}
+        editInitiative={(opportunityGuid: string) => history.push(`/initiatives/edit/encounter`, { opportunityGuid: opportunityGuid })}
+        getInitiativeInfo={getInitiativeInfo}
+        finalizeInitiative={finalizeInitiative}
+      />
+      {getMetrics()}
+      <Divider margin={0} extended={false}></Divider>
+      {dataGrids}
+      <LayoutGrid>
+        <LayoutGrid.Row>
+          <LayoutGrid.Column span={6}>
+            <OpportunityDetailsCard
+              isVisible={isCardVisible}
+              isEditButtonVisible={!hasInitiative && isEditable}
+              opportunity={opportunityDetailData}
+              onEdit={() => {
+                setEncounterEditModalVisible(true);
+              }}
+            />
+          </LayoutGrid.Column>
+        </LayoutGrid.Row>
+      </LayoutGrid>
+      {initiativeModalVisible && (
+        <InitiativeCreateModal
+          isVisible={initiativeModalVisible}
+          trackingStart={startMonth}
+          trackingEnd={endMonth}
+          opportunityType={OpportunityTypes.Encounter}
+          initiative={getInitiative(newEncounterInitiative(currentConfiguration), opportunityGuid, opportunityDetailData?.name ?? '')}
+          helpId='1355'
+          onCancel={handleInitiativeClose}
+          onOK={handleInitiativeOk}
+        />
+      )}
+      {encounterEditModalVisible && (
+        <EncounterOpportunityEditModal
+          isVisible={encounterEditModalVisible}
+          initialOpportunity={opportunityDetailData}
+          onCancel={() => {
+            setEncounterEditModalVisible(false);
+          }}
+          onUpdate={(updatedOpportunity: IEncounterOpportunity) => {
+            onOpporunityEdit(updatedOpportunity);
+          }}
+        />
+      )}
+    </>
+  );
+};
+
+export default EncounterOpportunityDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/EncounterOpportunityDetailGrid.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/EncounterOpportunityDetailGrid.tsx
new file mode 100644
index 0000000..017f14c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/EncounterOpportunityDetailGrid.tsx
@@ -0,0 +1,140 @@
+import React from 'react';
+import Spacing from '@strata/tempo/lib/spacing';
+import DataGrid from '@strata/tempo/lib/datagrid/DataGrid';
+import DataHeaderCell from '@strata/tempo/lib/dataheader/DataHeaderCell';
+import DataHeaderRow from '@strata/tempo/lib/dataheader/DataHeaderRow';
+import DataHeaderGroup from '@strata/tempo/lib/dataheader/DataHeaderGroup';
+import { IEncounterGridRow } from './data/IEncounterOpportunity';
+import ICellEditorArgs from '@strata/tempo/lib/datacolumn/ICellEditorArgs';
+import ICellArgs from '@strata/tempo/lib/datacolumn/ICellArgs';
+
+export interface EncounterOpportunityDetailGridProps {
+  gridName: string;
+  gridData: IEncounterGridRow[];
+  gridLoading: boolean;
+  isEditable: boolean;
+  isLocked: boolean;
+  handleCellEdit: (gridRef: React.RefObject<DataGrid>, args: ICellEditorArgs, newCellValue: number) => void;
+}
+
+const EncounterOpportunityDetailGrid: React.FC<EncounterOpportunityDetailGridProps> = (props: EncounterOpportunityDetailGridProps) => {
+  const gridRef = React.useRef<DataGrid>(null);
+
+  const { gridData, gridLoading, gridName, isEditable, isLocked, handleCellEdit } = props;
+
+  const onCellEdit = (args: ICellEditorArgs, newCellValue: number) => {
+    handleCellEdit(gridRef, args, newCellValue);
+  };
+
+  const isCellEditable = (args: ICellArgs) => isEditable && !isLocked && args.row.text === 'Goal';
+
+  return (
+    <Spacing padding={16}>
+      <DataGrid
+        ref={gridRef}
+        dataKey='volume'
+        sortField='text'
+        sortOrder={1}
+        onCellEdit={onCellEdit}
+        validationMode='manual'
+        value={gridData}
+        loading={gridLoading}
+        columnHeaderGroup={
+          <DataHeaderGroup>
+            <DataHeaderRow>
+              <DataHeaderCell width={300} />
+              <DataHeaderCell width={200} />
+              <DataHeaderCell isGap />
+              <DataHeaderCell colSpan={2} header='Revenue' align='center' width={240} />
+              <DataHeaderCell isGap />
+              <DataHeaderCell colSpan={2} header='Cost' align='center' width={240} />
+              <DataHeaderCell isGap />
+              <DataHeaderCell colSpan={2} header='Margin' align='center' width={240} />
+              <DataHeaderCell />
+            </DataHeaderRow>
+            <DataHeaderRow>
+              <DataHeaderCell field='text' header={gridName} sortable align='left' />
+              <DataHeaderCell field='totalCases' header='Number of Cases' align='right' editable isCellEditable={isCellEditable}></DataHeaderCell>
+              <DataHeaderCell isGap />
+              <DataHeaderCell field='revenuePerCase' header='Per Case' align='right' editable isCellEditable={isCellEditable}></DataHeaderCell>
+              <DataHeaderCell field='revenueTotal' header='Total' align='right'></DataHeaderCell>
+              <DataHeaderCell isGap />
+              <DataHeaderCell field='costPerCase' header='Per Case' align='right' editable isCellEditable={isCellEditable}></DataHeaderCell>
+              <DataHeaderCell field='costTotal' header='Total' align='right'></DataHeaderCell>
+              <DataHeaderCell isGap />
+              <DataHeaderCell field='marginPerCase' header='Per Case' align='right'></DataHeaderCell>
+              <DataHeaderCell field='marginTotal' header='Total' align='right'></DataHeaderCell>
+              <DataHeaderCell />
+            </DataHeaderRow>
+          </DataHeaderGroup>
+        }
+      >
+        <DataGrid.Column field='text' header={gridName} width={300} sortable />
+        <DataGrid.NumberColumn
+          width={200}
+          field='volume'
+          format='number'
+          formatOptions={{ nullValue: '0' }}
+          inputProps={{ precision: 0 }}
+          header='Number of Cases'
+          sortable
+          editable
+          isCellEditable={isCellEditable}
+          validationRules={[
+            {
+              type: 'number',
+              min: 0,
+              max: 1000000000
+            }
+          ]}
+        />
+        <DataGrid.GapColumn />
+        <DataGrid.NumberColumn
+          width={120}
+          field='revenuePerCase'
+          format='currencyDecimal'
+          formatOptions={{ nullValue: '0.00' }}
+          inputProps={{ precision: 2 }}
+          header='Per Case'
+          align='right'
+          editable
+          isCellEditable={isCellEditable}
+          validationRules={[
+            {
+              type: 'number',
+              min: 0,
+              max: 1000000000
+            }
+          ]}
+        />
+        <DataGrid.NumberColumn width={120} field='revenueTotal' format='currencyDecimal' header='Total' align='right' />
+        <DataGrid.GapColumn />
+        <DataGrid.NumberColumn
+          width={120}
+          field='costPerCase'
+          format='currencyDecimal'
+          formatOptions={{ nullValue: '0.00' }}
+          inputProps={{ precision: 2 }}
+          header='Per Case'
+          align='right'
+          editable
+          isCellEditable={isCellEditable}
+          validationRules={[
+            {
+              type: 'number',
+              min: 0,
+              max: 1000000000
+            }
+          ]}
+        />
+        <DataGrid.NumberColumn width={120} field='costTotal' format='currencyDecimal' header='Total' align='right' />
+        <DataGrid.GapColumn />
+        <DataGrid.NumberColumn width={120} field='marginPerCase' format='currencyDecimal' header='Per Case' align='right' />
+        <DataGrid.NumberColumn width={120} field='marginTotal' format='currencyDecimal' header='Total' align='right' />
+        <DataGrid.EmptyColumn />
+      </DataGrid>
+    </Spacing>
+  );
+};
+
+export default EncounterOpportunityDetailGrid;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/EncounterOpportunityEditModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/EncounterOpportunityEditModal.tsx
new file mode 100644
index 0000000..265287e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/EncounterOpportunityEditModal.tsx
@@ -0,0 +1,262 @@
+import React, { useEffect, useState } from 'react';
+import Modal from '@strata/tempo/lib/modal';
+import Form from '@strata/tempo/lib/form';
+import Input from '@strata/tempo/lib/input';
+import Button from '@strata/tempo/lib/button';
+import Spacing from '@strata/tempo/lib/spacing';
+import { useHelpCenter } from '@strata/core/lib';
+import { configurationService } from '../../shared/configuration/configurationService';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { ScoreMemberPicker } from '@strata/score/lib/ScoreMemberPicker';
+import { RegEx } from '../../shared/validation/RegEx';
+import { OpportunityLevelTypes } from '../../shared/opportunities/data/OpportunityLevelTypes';
+import DropDown from '@strata/tempo/lib/dropdown';
+import { IEntityInfo } from '../../shared/configuration/IEntityInfo';
+import { IServiceLineInfo } from '../../shared/configuration/IServiceLineInfo';
+import { IScoreFieldInfo } from '../../shared/opportunities/data/IScoreFieldInfo';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import { EncounterGroup } from '../../shared/opportunities/data/EncounterGroup';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import { IEncounterOpportunity } from './data/IEncounterOpportunity';
+import { nameIsDuplicate, nameValidationService } from '../../shared/opportunities/data/nameValidationService';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { explorationPopulationIdAttributeGuid } from '../../shared/utilities';
+
+export interface IEncounterOpportunityEditModalProps {
+  isVisible: boolean;
+  initialOpportunity: IEncounterOpportunity | undefined;
+  onCancel?: () => void;
+  onUpdate?: (updatedOpportunity: IEncounterOpportunity) => void;
+}
+
+const EncounterOpportunityEditModal: React.FC<IEncounterOpportunityEditModalProps> = (props: IEncounterOpportunityEditModalProps) => {
+  const { isVisible, initialOpportunity, onCancel, onUpdate } = props;
+  const [form] = Form.useForm<IEncounterOpportunity>();
+  const [opportunity, setOpportunity] = useState<IEncounterOpportunity | undefined>(initialOpportunity);
+  const [loading, setLoading] = useState<boolean>(false);
+  const [modalEntityProperties, setModalEntityProperties] = useState<IEntityInfo>();
+  const [modalServiceLineProperties, setModalServiceLineProperties] = useState<IServiceLineInfo>();
+  const helpCenter = useHelpCenter();
+
+  const { userSetting } = React.useContext(UserSettingContext);
+
+  useEffect(() => {
+    const loadData = async (configurationGuid: string) => {
+      const entityInfo = await configurationService.getEntityInfo(configurationGuid);
+      const serviceLineInfo = await configurationService.getServiceLineInfo(configurationGuid);
+      setModalEntityProperties(entityInfo);
+      setModalServiceLineProperties(serviceLineInfo);
+    };
+    if (userSetting.configurationGuid !== '') {
+      setLoading(true);
+      loadData(userSetting.configurationGuid).finally(() => {
+        setLoading(false);
+      });
+    }
+  }, [userSetting.configurationGuid]);
+
+  // Save form, clear fields
+  const handleFormFinish = (values: any) => {
+    handleOpportunitySave({ ...opportunity, ...values });
+  };
+
+  const handleValuesChanged = (changedValues: any) => {
+    const mergedOpportunity = { ...opportunity, ...changedValues } as IEncounterOpportunity;
+
+    if (changedValues.encounterGroup !== undefined && initialOpportunity) {
+      if (initialOpportunity.encounterGroup !== changedValues.encounterGroup) {
+        mergedOpportunity.encounterGroupIds = [];
+      } else {
+        mergedOpportunity.encounterGroupIds = initialOpportunity.encounterGroupIds;
+      }
+      form.resetFields(['encounterGroupIds']);
+    }
+
+    if (changedValues.opportunityLevel !== undefined && initialOpportunity) {
+      if (initialOpportunity.opportunityLevel !== changedValues.opportunityLevel) {
+        mergedOpportunity.opportunityLevelIds = [];
+      } else {
+        mergedOpportunity.opportunityLevelIds = initialOpportunity.opportunityLevelIds;
+      }
+      form.resetFields(['opportunityLevelIds']);
+    }
+
+    setOpportunity(mergedOpportunity);
+    form.setFieldsValue(mergedOpportunity);
+  };
+
+  const handleCancel = async () => {
+    if (initialOpportunity) {
+      setOpportunity(initialOpportunity);
+      form.setFieldsValue(initialOpportunity);
+    }
+    if (onCancel) {
+      onCancel();
+    }
+  };
+
+  const handleOpportunitySave = async (updatedOpportunity: IEncounterOpportunity) => {
+    if (onUpdate && updatedOpportunity.name.trim() !== '' && RegEx.JazzRestrictedCharacters.test(updatedOpportunity.name)) {
+      onUpdate(updatedOpportunity);
+    }
+  };
+
+  const getOpportunityLevelFieldInfo = (): IScoreFieldInfo => {
+    if (modalEntityProperties && modalServiceLineProperties) {
+      switch (opportunity?.opportunityLevel) {
+        case OpportunityLevelTypes.Entity:
+          return {
+            dimensionName: modalEntityProperties.entityLabel,
+            dimensionGuidOrGlobalId: modalEntityProperties.departmentRollupGlobalId,
+            modalTitle: modalEntityProperties.entityTitle
+          };
+        case OpportunityLevelTypes.ServiceLine:
+          return {
+            dimensionName: modalServiceLineProperties.serviceLineName,
+            dimensionGuidOrGlobalId: modalServiceLineProperties.serviceLineDimensionGuid,
+            modalTitle: modalServiceLineProperties.serviceLineTitle
+          };
+        case OpportunityLevelTypes.Specialty:
+          return {
+            dimensionName: 'DSS Physician Specialty',
+            dimensionGuidOrGlobalId: 'Physician Specialty',
+            label: 'Physician Specialty',
+            modalTitle: 'Physician Specialties'
+          };
+        case OpportunityLevelTypes.Provider:
+          return {
+            dimensionName: 'Primary Physicians',
+            dimensionGuidOrGlobalId: 'Physician Primary',
+            modalTitle: 'Primary Physicians'
+          };
+        default:
+          return {
+            dimensionName: '',
+            dimensionGuidOrGlobalId: '',
+            modalTitle: ''
+          };
+      }
+    } else {
+      return {
+        dimensionName: '',
+        dimensionGuidOrGlobalId: '',
+        modalTitle: ''
+      };
+    }
+  };
+
+  const opportunityLevelFieldInfo = getOpportunityLevelFieldInfo();
+
+  const getEncounterGroupFieldInfo = (): IScoreFieldInfo => {
+    if (opportunity?.encounterGroup === EncounterGroup.PatientPopulation) {
+      return {
+        dimensionName: 'Patient Populations',
+        dimensionGuidOrGlobalId: 'Clinical Indicator',
+        modalTitle: 'Patient Populations'
+      };
+    } else {
+      return {
+        dimensionName: 'Case Type',
+        dimensionGuidOrGlobalId: 'Case Type',
+        hierarchyGuid: 'c20b06b1-5a60-4fa5-825d-8e9a0524f783',
+        filters: [{ op: 'Equals', attributeGuid: explorationPopulationIdAttributeGuid, value: 0 }],
+        modalTitle: 'Case Types'
+      };
+    }
+  };
+  const encounterGroupFieldInfo = getEncounterGroupFieldInfo();
+
+  return (
+    <Modal
+      title='Edit Encounter Opportunity'
+      visible={isVisible}
+      onCancel={handleCancel}
+      loading={loading}
+      footer={
+        <>
+          <Spacing hAlign='space-between'>
+            <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1726')}></Button>
+            <Spacing>
+              <Button onClick={handleCancel}>Cancel</Button>
+              <Button type='primary' onClick={() => form.submit()}>
+                Update
+              </Button>
+            </Spacing>
+          </Spacing>
+        </>
+      }
+    >
+      <Form form={form} onFinish={handleFormFinish} initialValues={opportunity} hideOptionalLabels onValuesChange={handleValuesChanged}>
+        <Form.Item
+          label='Name'
+          name='name'
+          rules={[
+            { required: true, whitespace: false, max: 200, pattern: RegEx.JazzRestrictedCharacters },
+            () => ({
+              async validator(_, value) {
+                if (!value || (await nameValidationService.nameIsValid(userSetting.configurationGuid, OpportunityTypes.Encounter, value, opportunity?.opportunityGuid))) {
+                  return Promise.resolve();
+                }
+                return Promise.reject(nameIsDuplicate);
+              }
+            })
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item label='Encounter Group' name='encounterGroup' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: EncounterGroup.CaseType, label: 'Case Type' },
+              { value: EncounterGroup.PatientPopulation, label: 'Patient Population' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label={encounterGroupFieldInfo.modalTitle} name='encounterGroupIds' rules={[{ required: true }]}>
+          <ScoreMemberPicker
+            dimensionGuidOrGlobalId={encounterGroupFieldInfo.dimensionGuidOrGlobalId}
+            hierarchyGuid={encounterGroupFieldInfo.hierarchyGuid}
+            filters={encounterGroupFieldInfo.filters ?? []}
+            showHierarchyDropdown={false}
+            modalTitle={encounterGroupFieldInfo.modalTitle}
+            selectionMode='multiple'
+            okText='Select'
+          ></ScoreMemberPicker>
+        </Form.Item>
+        <Form.Item label='Opportunity Level' name='opportunityLevel' rules={[{ required: true }]}>
+          <DropDown
+            placeholder='Opportunity Level'
+            items={[
+              { value: OpportunityLevelTypes.Organization, text: 'System' },
+              { value: OpportunityLevelTypes.Entity, text: `${modalEntityProperties?.entityText ?? ''}` },
+              { value: OpportunityLevelTypes.ServiceLine, text: `${modalServiceLineProperties?.serviceLineName ?? ''}` },
+              { value: OpportunityLevelTypes.Specialty, text: 'Specialty' },
+              { value: OpportunityLevelTypes.Provider, text: 'Physician' }
+            ]}
+          />
+        </Form.Item>
+        {modalEntityProperties && modalServiceLineProperties && opportunity?.opportunityLevel !== undefined && opportunity.opportunityLevel !== OpportunityLevelTypes.Organization && (
+          <Form.Item label={opportunityLevelFieldInfo.dimensionName} name='opportunityLevelIds' rules={[{ required: opportunity.opportunityLevel !== undefined }]}>
+            <ScoreMemberPicker
+              dimensionGuidOrGlobalId={opportunityLevelFieldInfo.dimensionGuidOrGlobalId}
+              showHierarchyDropdown={false}
+              modalTitle={opportunityLevelFieldInfo.modalTitle}
+              selectionMode='multiple'
+              okText='Select'
+            ></ScoreMemberPicker>
+          </Form.Item>
+        )}
+        <Form.Item label='Seasonality' name='isSeasonal' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: true, label: 'With Seasonality' },
+              { value: false, label: 'Without Seasonality' }
+            ]}
+          />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export default EncounterOpportunityEditModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/EncounterOpportunityModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/EncounterOpportunityModal.tsx
new file mode 100644
index 0000000..c4e2ce1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/EncounterOpportunityModal.tsx
@@ -0,0 +1,347 @@
+import React, { useEffect, useState } from 'react';
+import { hangfireService } from '../../shared/hangfire/hangfireService';
+import { IEncounterOpportunitySaveModel, newEncounterOpportunitySaveModel } from './data/IEncounterOpportunitySaveModel';
+import Modal from '@strata/tempo/lib/modal';
+import Form from '@strata/tempo/lib/form';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import Input from '@strata/tempo/lib/input';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import Button from '@strata/tempo/lib/button';
+import Spacing from '@strata/tempo/lib/spacing';
+import useToast from '@strata/tempo/lib/toast';
+import Link from '@strata/tempo/lib/link/Link';
+import { useHelpCenter, useJazzUrlWithVersion } from '@strata/core/lib';
+import { configurationService } from '../../shared/configuration/configurationService';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { ScoreMemberPicker } from '@strata/score/lib/ScoreMemberPicker';
+import { RegEx } from '../../shared/validation/RegEx';
+import { IEntityInfo, newEntityInfo } from '../../shared/configuration/IEntityInfo';
+import { IServiceLineInfo, newServiceLineInfo } from '../../shared/configuration/IServiceLineInfo';
+import { useInterval } from '../../shared/utilities';
+import { opportunityService } from './data/opportunityService';
+import { IOpportunityJobResults } from '../../shared/hangfire/IOpportunityJobResults';
+import { OpportunityLevelTypes } from '../../shared/opportunities/data/OpportunityLevelTypes';
+import { IScoreFieldInfo } from '../../shared/opportunities/data/IScoreFieldInfo';
+import { nameIsDuplicate, nameValidationService } from '../../shared/opportunities/data/nameValidationService';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { EncounterGroup } from '../../shared/opportunities/data/EncounterGroup';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+
+// should the on(s) be EventTarget types
+export interface IEncounterOpportunityModalProps {
+  isVisible: boolean;
+  onCancel?: () => void;
+  onAdd?: () => void;
+}
+
+const EncounterOpportunityModal: React.FC<IEncounterOpportunityModalProps> = (props: IEncounterOpportunityModalProps) => {
+  const { isVisible, onCancel, onAdd } = props;
+  const [form] = Form.useForm<IEncounterOpportunitySaveModel>();
+  const [opportunity, setOpportunity] = useState<IEncounterOpportunitySaveModel>(newEncounterOpportunitySaveModel(''));
+
+  const [modalEntityProperties, setModalEntityProperties] = useState<IEntityInfo>(newEntityInfo);
+  const [modalServiceLineProperties, setModalServiceLineProperties] = useState<IServiceLineInfo>(newServiceLineInfo);
+  const helpCenter = useHelpCenter();
+  const toast = useToast();
+
+  const { userSetting } = React.useContext(UserSettingContext);
+
+  const [delay] = useState<number>(1000);
+  const [isWaiting, setWaiting] = useState<boolean>(false);
+  const [isSaving, setSaving] = useState<boolean>(false);
+  const [name, setName] = useState<string>('');
+  const [jobResults, setJobResults] = useState<IOpportunityJobResults>({ jobId: '', opportunityGuid: '' });
+  const jazzUrl = useJazzUrlWithVersion();
+
+  useEffect(() => {
+    const loadData = async (configurationGuid: string) => {
+      setOpportunity(newEncounterOpportunitySaveModel(configurationGuid));
+      const entityInfo = await configurationService.getEntityInfo(configurationGuid);
+      const serviceLineInfo = await configurationService.getServiceLineInfo(configurationGuid);
+      setModalEntityProperties(entityInfo);
+      setModalServiceLineProperties(serviceLineInfo);
+    };
+    if (userSetting.configurationGuid !== '') {
+      loadData(userSetting.configurationGuid);
+    }
+  }, [userSetting.configurationGuid]);
+
+  useEffect(() => {
+    if (isVisible) {
+      resetForm();
+    }
+  }, [isVisible]);
+
+  const tick = async () => {
+    const status = await hangfireService.jobStatus(jobResults?.jobId);
+    const stateName = status.state.name;
+    switch (stateName) {
+      case 'Failed':
+        // Handles exceptions or unhandled validation from server
+        toast.show({
+          key: name,
+          message: `${name} Opportunity was not created. Try again and contact us if the issue continues.`,
+          toastType: 'error'
+        });
+        setWaiting(false);
+        break;
+      case 'Succeeded':
+        toast.show({
+          key: name,
+          toastType: 'success',
+          duration: 0,
+          message: (
+            <>
+              <Link href={getEncounterOpportunityUrl(jobResults?.opportunityGuid)}>{name}</Link>
+              &nbsp;Opportunity Created
+            </>
+          )
+        });
+        setWaiting(false);
+        break;
+    }
+  };
+
+  useInterval(tick, isWaiting ? delay : null);
+
+  // Save form, clear fields
+  const handleFormFinish = (values: any) => {
+    handleOpportunitySave({ ...opportunity, ...values });
+  };
+
+  const handleFinishFailed = (fields: any) => {
+    return;
+  };
+
+  const handleValuesChanged = (changedValues: any) => {
+    const mergedOpportunity = { ...opportunity, ...changedValues } as IEncounterOpportunitySaveModel;
+
+    // if encounterGroup or opportunityLevel changed, we have to reset the selected encounterGroups or opportunityLevels
+    if (changedValues.encounterGroup != null) {
+      mergedOpportunity.encounterGroups = [];
+      form.resetFields(['encounterGroups']);
+    }
+    if (changedValues.opportunityLevel != null) {
+      mergedOpportunity.opportunityLevels = [];
+      form.resetFields(['opportunityLevels']);
+    }
+
+    setOpportunity(mergedOpportunity);
+    form.setFieldsValue(mergedOpportunity);
+  };
+
+  const validationMessage = (message: string): boolean => {
+    // Handles exceptions or unhandled validation from server
+    if (message && message.length !== 0) {
+      if (message !== 'Enter a unique name') {
+        toast.show({
+          key: name,
+          message: `${name} Opportunity was not created. Try again and contact us if the issue continues.`,
+          toastType: 'error'
+        });
+      }
+      return true;
+    }
+    return false;
+  };
+
+  const getEncounterGroupFieldInfo = (): IScoreFieldInfo => {
+    if (opportunity.encounterGroup === EncounterGroup.PatientPopulation) {
+      return {
+        dimensionName: 'Patient Populations',
+        dimensionGuidOrGlobalId: 'Clinical Indicator',
+        modalTitle: 'Patient Populations'
+      };
+    } else {
+      return {
+        dimensionName: 'Case Type',
+        dimensionGuidOrGlobalId: 'Case Type',
+        hierarchyGuid: 'c20b06b1-5a60-4fa5-825d-8e9a0524f783',
+        modalTitle: 'Case Types'
+      };
+    }
+  };
+
+  const getOpportunityLevelFieldInfo = (): IScoreFieldInfo => {
+    switch (opportunity.opportunityLevel) {
+      case OpportunityLevelTypes.Entity:
+        return {
+          dimensionName: modalEntityProperties.entityLabel,
+          dimensionGuidOrGlobalId: modalEntityProperties.departmentRollupGlobalId,
+          modalTitle: modalEntityProperties.entityTitle
+        };
+      case OpportunityLevelTypes.ServiceLine:
+        return {
+          dimensionName: modalServiceLineProperties.serviceLineName,
+          dimensionGuidOrGlobalId: modalServiceLineProperties.serviceLineDimensionGuid,
+          modalTitle: modalServiceLineProperties.serviceLineTitle
+        };
+      case OpportunityLevelTypes.Specialty:
+        return {
+          dimensionName: 'DSS Physician Specialty',
+          dimensionGuidOrGlobalId: 'Physician Specialty',
+          label: 'Physician Specialty',
+          modalTitle: 'Physician Specialties'
+        };
+      case OpportunityLevelTypes.Provider:
+        return {
+          dimensionName: 'Primary Physicians',
+          dimensionGuidOrGlobalId: 'Physician Primary',
+          modalTitle: 'Primary Physicians'
+        };
+      default:
+        return {
+          dimensionName: '',
+          dimensionGuidOrGlobalId: '',
+          modalTitle: ''
+        };
+    }
+  };
+
+  const handleModalClose = async () => {
+    if (onCancel) {
+      onCancel();
+    }
+    resetForm();
+  };
+
+  const getEncounterOpportunityUrl = (opportunityGuid: string) => {
+    return `${jazzUrl}CCI/Encounter/OpportunityViewer.aspx?opportunityGuid=${opportunityGuid}`;
+  };
+
+  const resetForm = async () => {
+    // clear custom validation style/message
+    const newOpportunity = newEncounterOpportunitySaveModel(userSetting.configurationGuid);
+    setOpportunity(newOpportunity);
+    form.setFieldsValue(newOpportunity);
+  };
+
+  const handleOpportunitySave = async (saveOpportunity: IEncounterOpportunitySaveModel) => {
+    setSaving(true);
+    setName(saveOpportunity.name);
+    try {
+      const results = await opportunityService.createOpportunity(saveOpportunity);
+      if (onAdd) {
+        onAdd();
+      }
+      toast.show({
+        key: name,
+        toastType: 'loading',
+        message: `Creating ${saveOpportunity.name} Opportunity`,
+        duration: 2
+      });
+      setJobResults(results);
+      setWaiting(true);
+    } catch (error) {
+      if (error instanceof Response) {
+        const responseBody = await error.json();
+        if (validationMessage(responseBody.message)) {
+          if (responseBody.message !== 'Enter a unique name') {
+            handleModalClose();
+          }
+        }
+      }
+    }
+    setSaving(false);
+  };
+
+  const validateName = (name: string) => {
+    return nameValidationService.nameIsValid(userSetting.configurationGuid, OpportunityTypes.Encounter, name);
+  };
+
+  const encounterGroupFieldInfo = getEncounterGroupFieldInfo();
+  const opportunityLevelFieldInfo = getOpportunityLevelFieldInfo();
+
+  return (
+    <Modal
+      title='Build Encounter Opportunity'
+      visible={isVisible}
+      loading={isSaving}
+      onCancel={handleModalClose}
+      footer={
+        <>
+          <Spacing hAlign='space-between'>
+            <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1308')}></Button>
+            <Spacing>
+              <Button onClick={handleModalClose}>Cancel</Button>
+              <Button type='primary' onClick={() => form.submit()}>
+                Add
+              </Button>
+            </Spacing>
+          </Spacing>
+        </>
+      }
+    >
+      <Form form={form} onFinish={handleFormFinish} initialValues={opportunity} hideOptionalLabels onValuesChange={handleValuesChanged} onFinishFailed={handleFinishFailed}>
+        <Form.Item
+          label='Name'
+          name='name'
+          rules={[
+            { required: true, whitespace: false, max: 200, pattern: RegEx.JazzRestrictedCharacters },
+            () => ({
+              async validator(_, value) {
+                if (!value || (await validateName(value))) {
+                  return Promise.resolve();
+                }
+                return Promise.reject(nameIsDuplicate);
+              }
+            })
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item label='Encounter Group' name='encounterGroup' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: EncounterGroup.CaseType, label: 'Case Type' },
+              { value: EncounterGroup.PatientPopulation, label: 'Patient Population' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label={encounterGroupFieldInfo.modalTitle} name='encounterGroups' rules={[{ required: true }]}>
+          <ScoreMemberPicker
+            dimensionGuidOrGlobalId={encounterGroupFieldInfo.dimensionGuidOrGlobalId}
+            hierarchyGuid={encounterGroupFieldInfo.hierarchyGuid}
+            showHierarchyDropdown={false}
+            modalTitle={encounterGroupFieldInfo.modalTitle}
+            selectionMode='multiple'
+            okText='Select'
+          ></ScoreMemberPicker>
+        </Form.Item>
+        <Form.Item label='Opportunity Level' name='opportunityLevel' rules={[{ required: true }]}>
+          <DropDown
+            placeholder='Opportunity Level'
+            items={[
+              { value: OpportunityLevelTypes.Organization, text: 'System' },
+              { value: OpportunityLevelTypes.Entity, text: `${modalEntityProperties.entityText}` },
+              { value: OpportunityLevelTypes.ServiceLine, text: `${modalServiceLineProperties.serviceLineName}` },
+              { value: OpportunityLevelTypes.Specialty, text: 'Specialty' },
+              { value: OpportunityLevelTypes.Provider, text: 'Physician' }
+            ]}
+          />
+        </Form.Item>
+        {opportunity.opportunityLevel !== undefined && opportunity.opportunityLevel !== OpportunityLevelTypes.Organization && (
+          <Form.Item label={opportunityLevelFieldInfo.dimensionName} name='opportunityLevels' rules={[{ required: opportunity.opportunityLevel !== undefined }]}>
+            <ScoreMemberPicker
+              dimensionGuidOrGlobalId={opportunityLevelFieldInfo.dimensionGuidOrGlobalId}
+              showHierarchyDropdown={false}
+              modalTitle={opportunityLevelFieldInfo.modalTitle}
+              selectionMode='multiple'
+              okText='Select'
+            ></ScoreMemberPicker>
+          </Form.Item>
+        )}
+        <Form.Item label='Seasonality' name='seasonality' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: true, label: 'With Seasonality' },
+              { value: false, label: 'Without Seasonality' }
+            ]}
+          />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export default EncounterOpportunityModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/Filters.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/Filters.test.tsx
new file mode 100644
index 0000000..37f7ab5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/Filters.test.tsx
@@ -0,0 +1,92 @@
+import React from 'react';
+import { render, screen, fireEvent } from '../../test-utils/testUtils';
+import { opportunityService } from './data/opportunityService';
+import Filters from './Filters';
+import { IEncounterFilterOptions, newFilterOptions } from './data/IEncounterFilterOptions';
+import { EncounterGroup, IEncounterFilters } from './data/IEncounterFilters';
+import { dropDownTestUtils } from '@strata/test-utils/lib';
+import { SeasonalityType } from '../../shared/data/SeasonalityType';
+
+const mockFilterOptions: IEncounterFilterOptions = newFilterOptions({
+  opportunityLevels: [
+    { text: 'Opportunity Level 1', id: '1' },
+    { text: 'Opportunity Level 2', id: '2' }
+  ]
+});
+
+const mockInitialFilters: IEncounterFilters = {
+  identifiedSavings: undefined,
+  cases: undefined,
+  encounterGroups: EncounterGroup.All,
+  opportunityLevels: [],
+  seasonality: SeasonalityType.WithAndWithout,
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+test('Filters default to empty', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const opportunityLevelDropdown = dropDownTestUtils.getDropDown('Level');
+
+  // verify default value is set correctly
+  expect(dropDownTestUtils.getSelectedOption(opportunityLevelDropdown)).toEqual('');
+});
+
+test('Filters clear', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const opportunityLevelDropdown = dropDownTestUtils.getDropDown('Level');
+  const identifiedSavingsInput = screen.getByRole('spinbutton', { name: 'Identified Savings Minimum' });
+  const caseMinimumInput = screen.getByRole('spinbutton', { name: 'Case Minimum' });
+
+  // verify default value is set correctly
+  for (const txt of mockFilterOptions.opportunityLevels) {
+    await dropDownTestUtils.selectOption(opportunityLevelDropdown, txt.text);
+  }
+  fireEvent.change(identifiedSavingsInput, { target: { value: 123 } });
+  fireEvent.change(caseMinimumInput, { target: { value: 123 } });
+
+  const label = `All ${mockFilterOptions.opportunityLevels.length} selected`;
+  expect(dropDownTestUtils.getSelectedOption(opportunityLevelDropdown)).toEqual(label);
+  expect(identifiedSavingsInput).toHaveValue('123');
+  expect(caseMinimumInput).toHaveValue('123');
+
+  const clearButton = screen.getByRole('button', { name: 'Clear Filters' });
+  fireEvent.click(clearButton);
+
+  expect(dropDownTestUtils.getSelectedOption(opportunityLevelDropdown)).toEqual('');
+  expect(identifiedSavingsInput).not.toHaveValue();
+  expect(caseMinimumInput).not.toHaveValue();
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/Filters.tsx
new file mode 100644
index 0000000..cb6f716
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/Filters.tsx
@@ -0,0 +1,122 @@
+import React, { useCallback } from 'react';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import Drawer from '@strata/tempo/lib/drawer';
+import DropDown from '@strata/tempo/lib/dropdown';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing';
+import Checkbox from '@strata/tempo/lib/checkbox';
+import { initialFilters, IEncounterFilters, EncounterGroup } from './data/IEncounterFilters';
+import { useEffect, useState } from 'react';
+import { opportunityService } from './data/opportunityService';
+import { IListMember } from '../../shared/data/IListMember';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+import { SeasonalityType } from '../../shared/data/SeasonalityType';
+
+interface IFiltersProps {
+  filters: IEncounterFilters;
+  isVisible: boolean;
+  onApply: (filters: IEncounterFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const [opportunityLevels, setOpportunityLevels] = useState<IListMember[]>();
+  const { currentConfiguration } = useConfigurations();
+
+  const [form] = Form.useForm<IEncounterFilters>();
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      if (currentConfiguration == null) {
+        return;
+      }
+      const { opportunityLevels } = await opportunityService.getFilterOptions(currentConfiguration.configurationGuid);
+
+      setOpportunityLevels(opportunityLevels);
+      handleClearFilters();
+    };
+
+    loadFiltersOptions();
+  }, [currentConfiguration, handleClearFilters]);
+
+  const handleApplyFilters = () => {
+    const filters: IEncounterFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Identified Savings Minimum' name='identifiedSavings'>
+          <InputNumber format='currency' placeholder='' precision={0} />
+        </Form.Item>
+        <Form.Item label='Case Minimum' name='cases'>
+          <InputNumber placeholder='0' precision={0} />
+        </Form.Item>
+        <Form.Item label='Level' name='opportunityLevels'>
+          <DropDown multiSelect items={opportunityLevels} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Encounter Group' name='encounterGroups'>
+          <RadioGroup
+            options={[
+              { value: EncounterGroup.All, label: 'Both' },
+              { value: EncounterGroup.CaseType, label: 'Case Type' },
+              { value: EncounterGroup.PatientPopulation, label: 'Patient Population' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Seasonality' name='seasonality'>
+          <RadioGroup
+            options={[
+              { value: SeasonalityType.WithAndWithout, label: 'With & Without Seasonality' },
+              { value: SeasonalityType.With, label: 'With Seasonality' },
+              { value: SeasonalityType.Without, label: 'Without Seasonality' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Display' name='viewVisible'>
+          <RadioGroup
+            options={[
+              { value: true, label: 'Visible Opportunities' },
+              { value: false, label: 'Hidden Opportunities' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Initiatives' name='excludeInitiatives' valuePropName='checked'>
+          <Checkbox>Exclude Opportunities with Initiatives</Checkbox>
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/Opportunities.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/Opportunities.test.tsx
new file mode 100644
index 0000000..3f1a85a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/Opportunities.test.tsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import { render, screen, within } from '../../test-utils/testUtils';
+import { IEncounterOpportunity, newEncounterOpportunity } from './data/IEncounterOpportunity';
+import { OpportunityLevelTypes } from '../../shared/opportunities/data/OpportunityLevelTypes';
+import { opportunityService } from './data/opportunityService';
+import { IPagedApiResponse } from '../../shared/paging/IPagedApiResponse';
+import Opportunities from './Opportunities';
+
+const mockOpportunities: IEncounterOpportunity[] = [
+  newEncounterOpportunity({
+    opportunityKey: 'EN - 1',
+    name: 'Encounter 1',
+    identifiedSavings: 100,
+    cases: 10,
+    encounterGroup: 0,
+    opportunityLevel: OpportunityLevelTypes.Entity,
+    isSeasonal: true
+  }),
+  newEncounterOpportunity({
+    opportunityKey: 'EN - 2',
+    name: 'Encounter 2',
+    identifiedSavings: 200,
+    cases: 20,
+    encounterGroup: 1,
+    opportunityLevel: OpportunityLevelTypes.Organization,
+    isSeasonal: false
+  })
+];
+
+const mockPagedOpportunities: IPagedApiResponse<IEncounterOpportunity> = {
+  data: mockOpportunities,
+  pagingInfo: {
+    pageNumber: 1,
+    resultsPerPage: 25,
+    totalNumberOfResults: 2,
+    totalPages: 1
+  }
+};
+
+test('All opportunities are shown', async () => {
+  jest.spyOn(opportunityService, 'getOpportunities').mockImplementation(() => Promise.resolve(mockPagedOpportunities));
+
+  // render component
+  render(<Opportunities />);
+
+  // wait for grid to load
+  const cell = await screen.findByRole('cell', { name: mockPagedOpportunities.data[0].opportunityKey });
+
+  // get rows
+  const tableBody = cell?.parentElement?.parentElement as HTMLElement;
+  const rows = within(tableBody).getAllByRole('row');
+
+  // verify data shows in grid
+  mockPagedOpportunities.data.forEach((opportunity, index) => {
+    const row = rows[index];
+    within(row).getByText(opportunity.opportunityKey);
+    within(row).getByText(opportunity.name);
+    within(row).getByText(opportunity.opportunityLevel);
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/Opportunities.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/Opportunities.tsx
new file mode 100644
index 0000000..5472b79
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/Opportunities.tsx
@@ -0,0 +1,102 @@
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import { usePageLoader } from '@strata/tempo/lib';
+import Button from '@strata/tempo/lib/button/Button';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import OpportunitiesGrid from '../../shared/opportunities/OpportunitiesGrid';
+import { IOpportunity } from '../../shared/opportunities/data';
+import Filters from './Filters';
+import { IEncounterFilters, initialFilters, numberOfFilters } from './data/IEncounterFilters';
+import { opportunityService } from './data/opportunityService';
+
+const Opportunities: React.FC = () => {
+  const [filters, setFilters] = useState<IEncounterFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const [isTempoOpportunityPageEnabled, setIsTempoOpportunityPageEnabled] = useState<boolean | undefined>();
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+
+  const jazzUrl = useJazzUrlWithVersion();
+  const history = useHistory();
+  const { setLoading } = usePageLoader();
+
+  useEffect(() => {
+    document.title = 'Encounter Opportunities';
+    setLoading(true);
+    opportunityService
+      .isOpportunityTempoPageEnabled()
+      .then((result: boolean) => {
+        setIsTempoOpportunityPageEnabled(result);
+      })
+      .finally(setLoading(false));
+  }, [setLoading]);
+
+  useEffect(() => {
+    if (currentConfiguration == null) {
+      return;
+    }
+    setFilters(initialFilters);
+    setCurrentConfigurationGuid(currentConfiguration.configurationGuid);
+  }, [currentConfiguration]);
+
+  const handleApplyFilters = (newFilters: IEncounterFilters) => {
+    setFiltersVisible(false);
+    setFilters({ ...filters, ...newFilters });
+  };
+
+  const handleSearch = (searchValue: string) => {
+    setFilters((filters) => {
+      return { ...filters, opportunitySearch: searchValue };
+    });
+  };
+
+  const getOpportunityUrl = (opportunity: IOpportunity) => {
+    return isTempoOpportunityPageEnabled ? `/encounter-opportunity/${opportunity.opportunityGuid}` : `${jazzUrl}CCI/Encounter/OpportunityViewer.aspx?opportunityGuid=${opportunity.opportunityGuid}`;
+  };
+
+  const getInitiativeUrl = (opportunity: IOpportunity) => {
+    return `${jazzUrl}CCI/Encounter/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+  };
+
+  const addOpportunityButton = (
+    <Button type='primary' icon={<PlusIcon />} onClick={() => history.push(`/initiatives/create/encounter`, { networkOpportunityId: undefined, networkOpportunityName: undefined })}>
+      Opportunity
+    </Button>
+  );
+
+  return isTempoOpportunityPageEnabled === undefined ? null : (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />
+      <OpportunitiesGrid
+        configurationGuid={currentConfigurationGuid}
+        getOpportunityUrl={getOpportunityUrl}
+        getInitiativeUrl={getInitiativeUrl}
+        filters={filters}
+        opportunityService={opportunityService}
+        identifiedSavingsIndex={2}
+        numOfSelectedFilters={numberOfFilters(filters)}
+        searchPlaceholderText='Search'
+        onFilter={() => setFiltersVisible(true)}
+        onSearch={handleSearch}
+        customAction={addOpportunityButton}
+      >
+        <DataGrid.Column field='name' header='Name' sortable width={160} />
+        <DataGrid.NumberColumn field='cases' header='Cases' sortable width={96} />
+        <DataGrid.Column field='encounterGroupValue' header='Encounter Group' sortable width={144} />
+        <DataGrid.Column
+          field='opportunityLevel'
+          header='Level'
+          sortable
+          width={200}
+          customCellValue={(args) => (args.rowData[args.field] === 'ServiceLine' ? 'Service Line' : args.rowData[args.field])}
+        />
+        <DataGrid.Column field='isSeasonal' header='Seasonality' sortable width={104} customCellValue={(args) => (args.rowData[args.field] ? 'With' : 'Without')} />
+      </OpportunitiesGrid>
+    </>
+  );
+};
+
+export default Opportunities;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterFilterOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterFilterOptions.ts
new file mode 100644
index 0000000..24ad24a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterFilterOptions.ts
@@ -0,0 +1,14 @@
+import { IListMember } from '../../../shared/data/IListMember';
+
+export interface IEncounterFilterOptions {
+  opportunityLevels: IListMember[];
+}
+
+export const newFilterOptions = (data: Partial<IEncounterFilterOptions> = {}): IEncounterFilterOptions => {
+  return {
+    ...{
+      opportunityLevels: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterFilters.ts
new file mode 100644
index 0000000..374bedb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterFilters.ts
@@ -0,0 +1,39 @@
+import { SeasonalityType } from '../../../shared/data/SeasonalityType';
+import { IOpportunityFilters } from '../../../shared/opportunities/data';
+
+export interface IEncounterFilters extends IOpportunityFilters {
+  cases?: number;
+  opportunityLevels: string[];
+  encounterGroups: EncounterGroup;
+  seasonality: SeasonalityType;
+}
+
+export enum EncounterGroup {
+  All = -1,
+  CaseType = 0,
+  PatientPopulation = 1,
+  FlexibleExplorationPatientPopulation = 2
+}
+
+export const initialFilters: IEncounterFilters = {
+  identifiedSavings: undefined,
+  cases: undefined,
+  encounterGroups: EncounterGroup.All,
+  opportunityLevels: [],
+  seasonality: SeasonalityType.WithAndWithout,
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+export const numberOfFilters = (filters: IEncounterFilters): number => {
+  let filtersCount = 0;
+  if (filters.identifiedSavings != null) filtersCount++;
+  if (filters.cases != null) filtersCount++;
+  if (filters.encounterGroups !== EncounterGroup.All) filtersCount++;
+  if (filters.opportunityLevels.length > 0) filtersCount++;
+  if (filters.seasonality !== SeasonalityType.WithAndWithout) filtersCount++;
+  if (filters.viewVisible === false) filtersCount++;
+  if (filters.excludeInitiatives === true) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterOpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterOpportunity.ts
new file mode 100644
index 0000000..9280b70
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterOpportunity.ts
@@ -0,0 +1,73 @@
+import { IOpportunityDetails } from '../../../shared/opportunities/data/IOpportunity';
+import { EncounterGroup } from '../../../shared/opportunities/data/EncounterGroup';
+import { OpportunityLevelTypes } from '../../../shared/opportunities/data/OpportunityLevelTypes';
+
+export interface IEncounterOpportunity extends IOpportunityDetails {
+  name: string;
+  cases: number;
+  opportunityId: number;
+  opportunityLevel: OpportunityLevelTypes;
+  encounterGroupIds: string[];
+  opportunityLevelIds: string[];
+  revenueGoal: number;
+  revenueImprovement: number;
+  costGoal: number;
+  costImprovement: number;
+  marginGoal: number;
+  marginImprovement: number;
+  gridData: IEncounterGridData | null;
+}
+
+export const newEncounterOpportunity = (data: Partial<IEncounterOpportunity> = {}): IEncounterOpportunity => {
+  return {
+    ...{
+      name: '',
+      opportunityKey: '',
+      opportunityId: 0,
+      opportunityGuid: '',
+      identifiedSavings: 0,
+      cases: 0,
+      encounterGroup: EncounterGroup.CaseType,
+      encounterGroups: [],
+      opportunityLevel: OpportunityLevelTypes.Organization,
+      isSeasonal: false,
+      hasInitiative: false,
+      note: '',
+      isHidden: false,
+      initiativeGuid: '',
+      sourceOpportunity: '',
+      sourceOpportunityId: -1,
+      revenueGoal: 0,
+      revenueImprovement: 0,
+      costGoal: 0,
+      costImprovement: 0,
+      marginGoal: 0,
+      marginImprovement: 0,
+      gridData: null,
+      baselineStartDate: new Date(),
+      baselineEndDate: new Date(),
+      trackingStartDate: new Date(),
+      trackingEndDate: new Date(),
+      chargeCodes: undefined,
+      encounterGroupIds: [],
+      opportunityLevelIds: []
+    },
+    ...data
+  };
+};
+
+interface IEncounterGridData {
+  [key: string]: IEncounterGridRow[];
+}
+
+export interface IEncounterGridRow {
+  text: string;
+  levelId: number;
+  volume: number;
+  revenuePerCase: number;
+  revenueTotal: number;
+  costPerCase: number;
+  costTotal: number;
+  marginPerCase: number;
+  marginTotal: number;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterOpportunitySaveModel.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterOpportunitySaveModel.ts
new file mode 100644
index 0000000..e460a3f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterOpportunitySaveModel.ts
@@ -0,0 +1,29 @@
+import { EncounterGroup } from '../../../shared/opportunities/data/EncounterGroup';
+import { OpportunityLevelTypes } from '../../../shared/opportunities/data/OpportunityLevelTypes';
+
+export interface IEncounterOpportunitySaveModel {
+  opportunityGuid: string;
+  configurationGuid: string;
+  name: string;
+  encounterGroup: EncounterGroup;
+  opportunityLevel: OpportunityLevelTypes | undefined;
+  encounterGroups: [];
+  opportunityLevels: [];
+  seasonality: boolean;
+}
+
+export const newEncounterOpportunitySaveModel = (configurationGuid: string, data: Partial<IEncounterOpportunitySaveModel> = {}): IEncounterOpportunitySaveModel => {
+  return {
+    ...{
+      opportunityGuid: '',
+      configurationGuid: configurationGuid,
+      name: '',
+      encounterGroup: EncounterGroup.CaseType,
+      opportunityLevel: undefined,
+      encounterGroups: [],
+      opportunityLevels: [],
+      seasonality: true
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterOpportunitySaveModelChanges.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterOpportunitySaveModelChanges.ts
new file mode 100644
index 0000000..946e109
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/IEncounterOpportunitySaveModelChanges.ts
@@ -0,0 +1,13 @@
+export interface IEncounterOpportunitySaveModelChanges {
+  levelId: number;
+  volume: number;
+  revenuePerCase?: number;
+  costPerCase?: number;
+}
+
+export const DefaultEncounterOpportunitySaveModelChanges: IEncounterOpportunitySaveModelChanges = {
+  levelId: 0,
+  volume: 0,
+  revenuePerCase: 0,
+  costPerCase: 0
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/opportunityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/opportunityService.ts
new file mode 100644
index 0000000..345e98e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/encounter/opportunities/data/opportunityService.ts
@@ -0,0 +1,92 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IOpportunityJobResults } from '../../../shared/hangfire/IOpportunityJobResults';
+import { IOpportunityFilters, IOpportunityService } from '../../../shared/opportunities/data';
+import { IPagedApiResponse, IPagingOptions, ISortOptions } from '../../../shared/paging';
+import { IEncounterFilterOptions } from './IEncounterFilterOptions';
+import { IEncounterOpportunity } from './IEncounterOpportunity';
+import { IEncounterOpportunitySaveModel } from './IEncounterOpportunitySaveModel';
+import { IInitiative } from '../../../shared/initiatives/data/IInitiative';
+import { IEncounterOpportunitySaveModelChanges } from './IEncounterOpportunitySaveModelChanges';
+
+const { httpGet, httpPost, httpPut, httpDelete, httpDownloadAndDisplayFile } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'encounter-opportunities';
+
+export const opportunityService: IOpportunityService = {
+  getOpportunities: async (configurationGuid: string, pagingOptions: IPagingOptions, filters: IOpportunityFilters): Promise<IPagedApiResponse<IEncounterOpportunity>> => {
+    return httpPost<IPagedApiResponse<IEncounterOpportunity>>(`encounter-opportunities`, {
+      pagingOptions,
+      filters: {
+        ...filters,
+        configurationGuid
+      }
+    });
+  },
+
+  getOpportunity: async (opportunityGuid: string): Promise<IEncounterOpportunity> => {
+    return httpGet<IEncounterOpportunity>(`${url}/${opportunityGuid}`);
+  },
+
+  export: async (configurationGuid: string, sortOptions: ISortOptions, filters: IOpportunityFilters): Promise<void> => {
+    const date = new Date();
+    const fileName = 'Encounter_CI_Opportunities_' + date.toISOString().split('T')[0];
+    httpDownloadAndDisplayFile(
+      'encounter-opportunities/export',
+      {
+        method: 'post',
+        body: JSON.stringify({
+          sortOptions,
+          filters: {
+            ...filters,
+            configurationGuid
+          }
+        })
+      },
+      fileName
+    );
+  },
+
+  getFilterOptions: (configurationGuid: string): Promise<IEncounterFilterOptions> => {
+    return httpGet<IEncounterFilterOptions>(`encounter-opportunities/${configurationGuid}/filter-options`);
+  },
+
+  setHidden: async (opportunityGuid: string, isHidden: boolean): Promise<void> => {
+    await httpPut(`encounter-opportunities/${opportunityGuid}/set-hidden`, isHidden);
+  },
+
+  setNote: async (opportunityGuid: string, note: string): Promise<void> => {
+    await httpPut(`encounter-opportunities/${opportunityGuid}/set-note`, note);
+  },
+
+  createOpportunity: async (opportunity: IEncounterOpportunitySaveModel): Promise<IOpportunityJobResults> => {
+    return httpPost<IOpportunityJobResults>(`encounter-opportunities/create`, opportunity);
+  },
+
+  getInitiativeInfo: (opporturnityGuid: string): Promise<IInitiative> => {
+    return httpGet(`${url}/${opporturnityGuid}/initiative-info`);
+  },
+
+  getById(opportunityGuid: string | number): Promise<IEncounterOpportunity> {
+    return httpGet<IEncounterOpportunity>(`${url}/${opportunityGuid}`);
+  },
+  getEditModel(opportunityGuid: string | number): Promise<IEncounterOpportunitySaveModel> {
+    return httpGet<IEncounterOpportunitySaveModel>(`${url}/${opportunityGuid}/edit-model`);
+  },
+
+  isOpportunityTempoPageEnabled: async (): Promise<boolean> => {
+    return httpGet(`${url}/tempo-page-enabled`);
+  },
+
+  updateGoals(opportunityGuid: string, changes: IEncounterOpportunitySaveModelChanges[]): Promise<boolean> {
+    return httpPut(`${url}/${opportunityGuid}/update-goals`, changes);
+  },
+
+  delete: async (opportunityGuid: string, callback: () => void, failed: (err: any) => void): Promise<void> => {
+    httpDelete(`${url}/${opportunityGuid}/delete`)
+      .then(callback)
+      .catch((e) => failed(e));
+  },
+
+  updateEncounterOpportunity: async (opportunity: IEncounterOpportunity): Promise<string> => {
+    return httpPut(`${url}/${opportunity.opportunityGuid}/update-opportunity`, opportunity);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/CaseTypeFamilyDetailGrid.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/CaseTypeFamilyDetailGrid.tsx
new file mode 100644
index 0000000..590659c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/CaseTypeFamilyDetailGrid.tsx
@@ -0,0 +1,512 @@
+// #region Imports
+
+// Third-party imports
+import { isEmpty } from 'lodash';
+import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useParams } from 'react-router';
+
+// Strata Tempo UI imports
+import Button from '@strata/tempo/lib/button/Button';
+import FixedActionBar from '@strata/tempo/lib/fixedactionbar/FixedActionBar';
+import RouteConfirm from '@strata/tempo/lib/routeconfirm/RouteConfirm';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import TreeGrid from '@strata/tempo/lib/treegrid';
+
+// Internal imports - data
+import { ChipKey } from '../shared/components/FilterBar/data/IFilterChipItem';
+
+// Internal imports - components
+import CaseTypeFamilyMetrics from './CaseTypeFamilyMetrics';
+import { BenchmarkingBannerText } from './components/BenchmarkingBannerText';
+import { buildTreeGrid } from './components/BuildTreeGrid';
+
+// Internal imports - data & services
+import { toggleGridResetKey } from './data/CaseTypeFamilyFunctions';
+import { ICaseTypeFamilyMetricDetail } from './data/ICaseTypeFamilyMetricDetail';
+import IExclusionCriteria from './data/IExclusionCriteria';
+import IFilter from './data/IFilter';
+
+// Internal imports - hooks
+import { useCaseTypeFamilyGridBase } from './hooks/useCaseTypeFamilyGridBase';
+import { useColumnManagement } from './hooks/useColumnManagement';
+import { useEncounterManagement } from './hooks/useEncounterManagement';
+import { useExplorationColumnConfigs } from './hooks/useExplorationColumnConfigs';
+import { useExplorationDataFetching } from './hooks/useExplorationDataFetching';
+import { TreeGridLevel, useTreeGridExpansion } from './hooks/useTreeGridExpansion';
+
+// Internal imports - types
+import { IExplorationPopulation } from './opportunities/data/IExplorationPopulation';
+
+// #endregion
+
+// #region Constants
+
+// ============================================================================
+// Constants
+// ============================================================================
+
+const DEFAULT_SORT_FIELD = 'name';
+const GRID_NAME_PRIMARY = 'FlexibleExplorationDetails';
+const GRID_NAME_LINKED = 'FlexibleExplorationSummary';
+const COLUMNS_NOT_TO_HIDE = ['name', 'isExcluded'];
+
+const EXPANDER_LEVELS = [
+  { text: 'Entity', value: TreeGridLevel.Entity },
+  { text: 'Code', value: TreeGridLevel.Code },
+  { text: 'Primary Physician', value: TreeGridLevel.Physician },
+  { text: 'Encounter', value: TreeGridLevel.Encounter }
+];
+
+// #endregion
+
+// #region Types
+
+// ============================================================================
+// Types
+// ============================================================================
+
+/**
+ * Props for the CaseTypeFamilyDetailGrid component.
+ */
+interface ICaseTypeFamilyDetailGridProps {
+  /** Callback to update the case type family name in parent */
+  setCaseTypeFamilyName: (updatedOpportunity: string) => void;
+  /** Callback to update metrics in parent */
+  updateMetrics: (m: ICaseTypeFamilyMetricDetail) => void;
+  /** Currently applied encounter exclusions */
+  encounterExclusionsApplied: number[];
+  /** Callback to set applied encounter exclusions */
+  setEncounterExclusionsApplied: (exclusions: number[]) => void;
+  /** Currently applied encounter inclusions */
+  encounterInclusionsApplied: number[];
+  /** Callback to set applied encounter inclusions */
+  setEncounterInclusionsApplied: (inclusions: number[]) => void;
+  /** Callback to set encounter IDs used in mapping */
+  setMappingEncounterIds: (mappings: number[]) => void;
+  /** Exploration population data when editing an existing population */
+  explorationPopulationData: IExplorationPopulation | undefined;
+  /** Controls visibility of save populations UI */
+  isModalsVisible: boolean;
+  /** Controls whether the grid is read-only */
+  isGridReadOnly: boolean;
+  /** Controls visibility of the column layout manager */
+  setColumnLayoutVisible: boolean;
+  /** Callback to hide the column layout manager */
+  onHideColumnLayout: () => void;
+}
+
+// #endregion
+
+// #region Component
+
+// ============================================================================
+// Component
+// ============================================================================
+
+/**
+ * CaseTypeFamilyDetailGrid displays detailed encounter-level data with:
+ * - Hierarchical tree grid with drill-down capability (Entity > Code > Physician > Encounter)
+ * - Manual encounter inclusion/exclusion management
+ * - Expandable level controls
+ * - Population metrics display
+ * - Column management and filtering capabilities
+ * - Route confirmation prompts for unsaved changes
+ */
+const CaseTypeFamilyDetailGrid: React.FC<ICaseTypeFamilyDetailGridProps> = ({
+  setCaseTypeFamilyName,
+  encounterExclusionsApplied,
+  setEncounterExclusionsApplied,
+  updateMetrics,
+  setMappingEncounterIds,
+  encounterInclusionsApplied,
+  setEncounterInclusionsApplied,
+  explorationPopulationData,
+  isModalsVisible,
+  setColumnLayoutVisible,
+  isGridReadOnly,
+  onHideColumnLayout
+}) => {
+  // #region Route Parameters
+
+  // ========================================================================
+  // Route Parameters
+  // ========================================================================
+
+  const { caseTypeFamilyId, costDriver, explorationPopulationId } = useParams<{
+    caseTypeFamilyId: string;
+    costDriver: string;
+    explorationPopulationId: string;
+  }>();
+
+  // #endregion
+
+  // #region Hooks
+
+  // ========================================================================
+  // Hooks - Base (shared logic)
+  // ========================================================================
+
+  const {
+    modal,
+    configuration,
+    loadingConfiguration,
+    firstLoading,
+    setFirstLoading,
+    gridResetKey,
+    setGridResetKey,
+    filters,
+    exclusionCriteria,
+    peerGroupFilters,
+    markDataAsLoaded,
+    renderFilterBar,
+    showBanner,
+    onDismissBanner,
+    showPeerGroupBenchmarking,
+    previousPeerGroupIdRef
+  } = useCaseTypeFamilyGridBase({
+    explorationPopulationData,
+    explorationPopulationId,
+    isBaseOptionsReadOnly: isGridReadOnly,
+    onDrawerApply: () => {
+      hasAppliedFiltersRef.current = true;
+      setFirstLoading(false);
+      clearEncounterExclusionsInclusionsStates();
+    }
+  });
+
+  // ========================================================================
+  // Hooks - Data Fetching
+  // ========================================================================
+
+  // Allow auto-fetch if we have exploration population data (editing saved population)
+  // OR if we have URL parameters (navigated from summary grid)
+  useEffect(() => {
+    if (explorationPopulationData || (caseTypeFamilyId && costDriver)) {
+      hasAppliedFiltersRef.current = true;
+    }
+  }, [explorationPopulationData, caseTypeFamilyId, costDriver]);
+
+  const {
+    encounterGroupDetails,
+    metrics,
+    caseTypeFamilyType,
+    isExplorationInformationPageEnabled,
+    loading,
+    fetchData: fetchDataFromHook
+  } = useExplorationDataFetching({
+    configuration,
+    caseTypeFamilyId,
+    costDriver,
+    explorationPopulationData,
+    peerGroupFilters: peerGroupFilters || { peerGroupId: 0, name: '', entityTypes: [], censusRegions: [], operatingExpenses: [], amcTypes: [], bedSize: [], urbanRural: [] },
+    updateMetrics,
+    setCaseTypeFamilyName,
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    setSummaryFilters: () => {} // Not used in detail grid
+  });
+
+  // ========================================================================
+  // Hooks - Tree Grid Expansion
+  // ========================================================================
+
+  const { treeGridKeysData, expandedLevel, updateExpandedLevels } = useTreeGridExpansion({
+    encounterGroupDetails
+  });
+
+  // ========================================================================
+  // Hooks - Encounter Management
+  // ========================================================================
+
+  const {
+    encounterExclusions,
+    encounterInclusions,
+    isApplyExclusionActionBarVisible,
+    isEncounterIncluded,
+    handleSetEncounterExclusion,
+    setInitialEncounterExclusions,
+    handleApplyExclusions,
+    handleCancelApplyExclusions,
+    clearEncounterExclusionsInclusionsStates
+  } = useEncounterManagement({
+    encounterExclusionsApplied,
+    setEncounterExclusionsApplied,
+    encounterInclusionsApplied,
+    setEncounterInclusionsApplied,
+    setMappingEncounterIds,
+    explorationPopulationData,
+    updateExpandedLevels
+  });
+
+  // ========================================================================
+  // Hooks - Custom
+  // ========================================================================
+
+  const hiddenFilterChips = useMemo(() => [ChipKey.CaseTypeFamilyID, ChipKey.CostDriver, ChipKey.TopN], []);
+
+  const { getColumnConfigs } = useExplorationColumnConfigs({
+    viewType: 'detail',
+    detailConfig: {
+      caseTypeFamilyType,
+      isExplorationInformationPageEnabled,
+      caseTypeFamilyId,
+      costDriver,
+      encounterExclusions,
+      encounterInclusions,
+      isEncounterIncluded,
+      handleSetEncounterExclusion
+    },
+    isIncludedInPopulationColumnReadOnly: isGridReadOnly
+  });
+
+  const { getColumnsWithVisibility, renderColumnManagerPanel } = useColumnManagement({
+    gridName: GRID_NAME_PRIMARY,
+    additionalGridNames: [GRID_NAME_LINKED],
+    getColumnConfigs,
+    showPeerGroupBenchmarking,
+    columnManagerPanel: {
+      columnsNotToHide: COLUMNS_NOT_TO_HIDE
+    }
+  });
+
+  // ========================================================================
+  // Refs
+  // ========================================================================
+
+  const initialDataLoadedRef = useRef<boolean>(false);
+  const hasAppliedFiltersRef = useRef<boolean>(false);
+
+  // ========================================================================
+  // Callbacks - Data fetching
+  // ========================================================================
+
+  /**
+   * Core data fetching logic. Extracted to avoid unstable dependencies.
+   * Takes all required data as parameters instead of closing over state.
+   */
+  const executeDataFetch = useCallback(
+    async (currentFilters: IFilter, currentExclusionCriteria: IExclusionCriteria, currentEncounterExclusions: number[], currentEncounterInclusions: number[]): Promise<void> => {
+      const freshEncounterGroupDetails = await fetchDataFromHook(currentExclusionCriteria, currentFilters, currentEncounterExclusions, currentEncounterInclusions);
+
+      if (freshEncounterGroupDetails) {
+        setInitialEncounterExclusions(freshEncounterGroupDetails);
+      }
+      setGridResetKey((prev: number) => toggleGridResetKey(prev));
+      updateExpandedLevels(TreeGridLevel.Entity);
+    },
+    [fetchDataFromHook, setInitialEncounterExclusions, setGridResetKey, updateExpandedLevels]
+  );
+
+  // Ref storage for callbacks to avoid stale closures
+  // Store latest executeDataFetch in ref to avoid dependency issues
+  const executeDataFetchRef = useRef(executeDataFetch);
+  useEffect(() => {
+    executeDataFetchRef.current = executeDataFetch;
+  });
+
+  // Store latest callbacks in refs
+  const markDataAsLoadedRef = useRef(markDataAsLoaded);
+  useEffect(() => {
+    markDataAsLoadedRef.current = markDataAsLoaded;
+  });
+
+  // ========================================================================
+  // Callbacks - Event handlers
+  // ========================================================================
+
+  /**
+   * Handles changes to encounters filters with confirmation prompt if manual changes exist.
+   * @param resolve - Callback to execute if user confirms the action
+   */
+  const handleChangeEncountersFilters = useCallback(
+    (resolve: () => void): void => {
+      const hasManualChanges = !isEmpty(encounterExclusions) || !isEmpty(encounterInclusions) || !isEmpty(encounterExclusionsApplied) || !isEmpty(encounterInclusionsApplied);
+
+      if (hasManualChanges) {
+        modal.confirmChanges({
+          title: 'Remove manually changed encounters?',
+          content: <Spacing>Changing refinement options will remove manually changed encounters from the population.</Spacing>,
+          okText: 'Continue',
+          cancelText: 'Cancel',
+          onOk() {
+            resolve();
+          }
+        });
+      } else {
+        resolve();
+      }
+    },
+    [encounterExclusions, encounterInclusions, encounterExclusionsApplied, encounterInclusionsApplied, modal]
+  );
+
+  // #endregion
+
+  // #region Effects
+
+  // ========================================================================
+  // Effects
+  // ========================================================================
+  // Stable serialized keys for deep comparison
+  const filtersKey = useMemo(() => JSON.stringify(filters), [filters]);
+  const exclusionCriteriaKey = useMemo(() => JSON.stringify(exclusionCriteria), [exclusionCriteria]);
+  const hasExplorationPopulationData = !!explorationPopulationData;
+  // Fetch data when filters, peer group, or applied encounter changes occur
+  useEffect(() => {
+    // Early exit if required data not ready
+    if (!filters || !exclusionCriteria || !peerGroupFilters || loadingConfiguration || !configuration) {
+      return;
+    }
+
+    // Check if we should fetch
+    const canFetch = hasAppliedFiltersRef.current;
+    const hasRequiredContext = !!(caseTypeFamilyId && costDriver) || !!explorationPopulationData;
+
+    if (!canFetch || !hasRequiredContext) {
+      if (firstLoading) setFirstLoading(false);
+      return;
+    }
+
+    // Prevent duplicate fetches during peer group initialization
+    if (!initialDataLoadedRef.current && previousPeerGroupIdRef.current !== peerGroupFilters.peerGroupId) {
+      previousPeerGroupIdRef.current = peerGroupFilters.peerGroupId;
+    }
+
+    // Execute fetch with current values
+    const doFetch = async () => {
+      await executeDataFetchRef.current(filters, exclusionCriteria, encounterExclusions, encounterInclusions);
+
+      if (firstLoading) {
+        setFirstLoading(false);
+        markDataAsLoadedRef.current();
+        initialDataLoadedRef.current = true;
+      }
+    };
+
+    doFetch();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [
+    filtersKey,
+    exclusionCriteriaKey,
+    peerGroupFilters?.peerGroupId,
+    encounterExclusionsApplied,
+    encounterInclusionsApplied,
+    caseTypeFamilyId,
+    costDriver,
+    hasExplorationPopulationData,
+    loadingConfiguration,
+    configuration?.configurationGuid,
+    firstLoading
+  ]);
+
+  // #endregion
+
+  // #region Memoized Values
+
+  // ========================================================================
+  // Memoized Values
+  // ========================================================================
+
+  const columnConfigs = useMemo(() => getColumnsWithVisibility(), [getColumnsWithVisibility]);
+
+  const { columns, headerGroup } = useMemo(() => buildTreeGrid(columnConfigs, { isDetailPage: true }), [columnConfigs]);
+
+  const encounterChangePromptCondition = useMemo(
+    () =>
+      !explorationPopulationId && !isModalsVisible && (!isEmpty(encounterExclusions) || !isEmpty(encounterInclusions) || !isEmpty(encounterExclusionsApplied) || !isEmpty(encounterInclusionsApplied)),
+    [explorationPopulationId, isModalsVisible, encounterExclusions, encounterInclusions, encounterExclusionsApplied, encounterInclusionsApplied]
+  );
+
+  const editSessionPromptCondition = useMemo(() => !!explorationPopulationId && !isModalsVisible, [explorationPopulationId, isModalsVisible]);
+
+  // #endregion
+
+  // #region Render
+
+  // ========================================================================
+  // Render
+  // ========================================================================
+
+  return (
+    <>
+      {/* Route confirmation prompts */}
+      <RouteConfirm
+        showPrompt={encounterChangePromptCondition}
+        title='Remove manually changed encounters?'
+        content={<Spacing>Leaving this page will remove manually changed encounters from the population.</Spacing>}
+        okText='Continue'
+        cancelText='Cancel'
+      />
+      <RouteConfirm
+        showPrompt={editSessionPromptCondition}
+        title={`Stop editing ${explorationPopulationData?.name}?`}
+        content={<Spacing>Leaving this page will stop edit session of the {explorationPopulationData?.name}. All unsaved changes will be lost.</Spacing>}
+        okText='Continue'
+        cancelText='Cancel'
+      />
+
+      {/* Benchmarking banner */}
+      <BenchmarkingBannerText hasDismissButton showBenchmarkingBanner={showBanner} onDismissBanner={onDismissBanner} />
+
+      {/* Filter bar with expandable level controls */}
+      {renderFilterBar({
+        excludedChips: hiddenFilterChips,
+        hiddenChips: hiddenFilterChips,
+        expandableLevels: EXPANDER_LEVELS,
+        expandedLevelPos: expandedLevel,
+        setExpandedLevelPos: updateExpandedLevels,
+        onChangeEncounters: handleChangeEncountersFilters,
+        hideTopNFilter: true
+      })}
+
+      {/* Population metrics display */}
+      <CaseTypeFamilyMetrics
+        encountersExcluded={metrics.encountersExcluded}
+        totalEncounters={metrics.totalEncounters}
+        identifiedVariation={metrics.identifiedVariation}
+        encountersIncluded={metrics.encountersIncluded}
+        variationIncluded={metrics.variationIncluded}
+        variationExcluded={metrics.variationExcluded}
+      />
+
+      {/* Tree grid with hierarchical data */}
+      <TreeGrid
+        key={gridResetKey}
+        scrollable
+        sortField={DEFAULT_SORT_FIELD}
+        sortOrder={1}
+        value={encounterGroupDetails}
+        density='dense'
+        loading={loading}
+        expandedRowKeys={treeGridKeysData}
+        columnHeaderGroup={headerGroup}
+      >
+        {columns}
+      </TreeGrid>
+
+      {/* Column manager panel */}
+      {renderColumnManagerPanel({
+        isVisible: setColumnLayoutVisible,
+        onCancel: onHideColumnLayout,
+        onApplyComplete: onHideColumnLayout
+      })}
+
+      {/* Fixed action bar for applying/canceling encounter changes */}
+      <FixedActionBar
+        visible={isApplyExclusionActionBarVisible}
+        rightContent={
+          <>
+            <Button onClick={handleCancelApplyExclusions}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyExclusions}>
+              Apply
+            </Button>
+          </>
+        }
+      />
+    </>
+  );
+};
+
+// #endregion
+
+// #endregion
+
+export default CaseTypeFamilyDetailGrid;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/CaseTypeFamilyInformationGrid.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/CaseTypeFamilyInformationGrid.tsx
new file mode 100644
index 0000000..d2ac6b9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/CaseTypeFamilyInformationGrid.tsx
@@ -0,0 +1,374 @@
+import ActionBar from '@strata/tempo/lib/actionbar/ActionBar';
+import Button from '@strata/tempo/lib/button/Button';
+import Checkbox from '@strata/tempo/lib/checkbox/Checkbox';
+import DataHeaderCell from '@strata/tempo/lib/dataheader/DataHeaderCell';
+import DataHeaderGroup from '@strata/tempo/lib/dataheader/DataHeaderGroup';
+import DataHeaderRow from '@strata/tempo/lib/dataheader/DataHeaderRow';
+import { DropDownValue } from '@strata/tempo/lib/dropdown/DropDown';
+import FixedActionBar from '@strata/tempo/lib/fixedactionbar/FixedActionBar';
+import LayoutGrid from '@strata/tempo/lib/layoutgrid/LayoutGrid';
+import { usePageLoader } from '@strata/tempo/lib/pageloader/usePageLoader';
+import Text from '@strata/tempo/lib/text';
+import Tooltip from '@strata/tempo/lib/tooltip/Tooltip';
+import TreeGrid from '@strata/tempo/lib/treegrid/TreeGrid';
+import dayjs from 'dayjs';
+import { isEmpty, xor } from 'lodash';
+import React, { useEffect, useState } from 'react';
+import { useParams } from 'react-router';
+import { useSessionStorage } from 'usehooks-ts';
+import { ChipKey, IFilterChipItem } from '../shared/components/FilterBar/data/IFilterChipItem';
+import FilterBar from '../shared/components/FilterBar/FilterBar';
+import { useConfigurations } from '../shared/configuration/ConfigurationContext';
+import CaseTypeFamilyMetrics from './CaseTypeFamilyMetrics';
+import Filters from './components/Filters';
+import { setDateStates } from './data/CaseTypeFamilyFunctions';
+import { explorationService } from './data/explorationService';
+import { ICaseTypeFamilyMetricDetail, newMetricDetail } from './data/ICaseTypeFamilyMetricDetail';
+import { IEncounterGroupDetailTreeGridData } from './data/IEncounterGroupDetail';
+import IExclusionCriteria, { newExclusionCriteria, parseCostTrimValue, parseLosCostSelection, parseLosTrimValue } from './data/IExclusionCriteria';
+import IFilter, { defaultFilter, getSessionFilter } from './data/IFilter';
+
+interface ICaseTypeFamilyInformationGrid {
+  setCaseTypeFamilyName: (updatedOpportunity: string) => void;
+  setColumnName: (columnName: string) => void;
+}
+
+const CaseTypeFamilyInformationGrid: React.FC<ICaseTypeFamilyInformationGrid> = (props) => {
+  const { setCaseTypeFamilyName, setColumnName } = props;
+  const { caseTypeFamilyId, costDriver, column } = useParams<{ caseTypeFamilyId: string; costDriver: string; column: string }>();
+  const [loading, setLoading] = React.useState(false);
+  const [firstLoading, setFirstLoading] = React.useState<boolean>(true);
+  const [isApplyExclusionActionBarVisible, setIsApplyExclusionActionBarVisible] = React.useState<boolean>();
+  const [pendingEncounterExclusions, setPendingEncounterExclusions] = React.useState<number[]>([]);
+  const [gridEncounterExclusions, setGridEncounterExclusions] = React.useState<number[]>([]);
+  const [queryEncounterExclusions, setQueryEncounterExclusions] = React.useState<number[]>([]);
+  const [exclusionCriteria, setExclusionCriteria] = React.useState<IExclusionCriteria>(newExclusionCriteria());
+  const [filters, setFilters] = React.useState<IFilter>();
+  const [groupInformations] = React.useState<IEncounterGroupDetailTreeGridData[]>();
+  const [metrics] = React.useState<ICaseTypeFamilyMetricDetail>(newMetricDetail);
+  const [treeGridKeysData] = React.useState<string[]>([]);
+  const [dateStart, setDateStart] = useState<dayjs.Dayjs>(dayjs());
+  const [dateEnd, setDateEnd] = useState<dayjs.Dayjs>(dayjs());
+
+  const [summaryFilters, setSummaryFilters] = useSessionStorage('summaryFilters', defaultFilter);
+  const [costOutlierValue, setCostOutlierValue] = useSessionStorage('costOutlierValue', '');
+  const [losOutlierValue, setLosOutlierValue] = useSessionStorage('losOutlierValue', '');
+
+  const { currentConfiguration: configuration } = useConfigurations();
+  const { setLoading: setLoadingPage } = usePageLoader();
+  const hiddenFilterChips = [ChipKey.CaseTypeFamilyID, ChipKey.CostDriver];
+
+  // Simple outlier initialization
+  const setOutliersFromSession = (): void => {
+    const costSelection = parseLosCostSelection(costOutlierValue);
+    const losSelection = parseLosCostSelection(losOutlierValue);
+    setExclusionCriteria({
+      ...exclusionCriteria,
+      losExclusionType: losSelection.exclusionType,
+      losExclusionValue: losSelection.value,
+      costExclusionType: costSelection.exclusionType,
+      costExclusionValue: costSelection.value
+    });
+  };
+
+  // Simple data fetching
+  const fetchData = async () => {
+    if (configuration && filters) {
+      !firstLoading && setLoading(true);
+      try {
+        const filterChipItems = filters.filterChipItems.filter((item: IFilterChipItem) => !hiddenFilterChips.includes(item.key));
+
+        const detailInfo = await explorationService.getCaseTypeFamilyDetails(
+          configuration.configurationGuid,
+          caseTypeFamilyId,
+          costDriver,
+          queryEncounterExclusions,
+          [],
+          exclusionCriteria,
+          {
+            ...filters,
+            filterChipItems: filterChipItems
+          },
+          null, // codeType
+          0 // peerGroupId
+        );
+
+        setCaseTypeFamilyName(detailInfo.caseTypeFamilyName);
+        setColumnName(column);
+      } catch {
+        //prevent double error modal
+      } finally {
+        if (firstLoading) setFirstLoading(false);
+        else setLoading(false);
+      }
+    }
+  };
+
+  // Simple initialization effect
+  useEffect(() => {
+    if (configuration) {
+      setOutliersFromSession();
+      if (!filters || !filters.filterChipItems) {
+        const sessionFilters = getSessionFilter(configuration, summaryFilters);
+        setDateStates(sessionFilters, setDateStart, setDateEnd);
+        setSummaryFilters(sessionFilters);
+        setFilters(sessionFilters);
+      }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [configuration]);
+
+  useEffect(() => {
+    setLoadingPage(firstLoading);
+  }, [firstLoading, setLoadingPage]);
+
+  // Simple data fetching effect
+  useEffect(() => {
+    if (configuration && filters) {
+      fetchData();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [queryEncounterExclusions, exclusionCriteria, filters, configuration]);
+
+  useEffect(() => {
+    //using lodash to check if these two arrays are equal regardless of order
+    setIsApplyExclusionActionBarVisible(!isEmpty(xor(gridEncounterExclusions, pendingEncounterExclusions)));
+  }, [gridEncounterExclusions, pendingEncounterExclusions]);
+
+  useEffect(() => {
+    setInitialEncounterExclusions(groupInformations ?? []);
+  }, [groupInformations]);
+
+  const handleALOSChange = (value: DropDownValue) => {
+    // handle Average Length of Stay exclusions
+    const selection = parseLosCostSelection(value.toString());
+    setLosOutlierValue(value.toString());
+    setExclusionCriteria({ ...exclusionCriteria, ...{ losExclusionType: selection.exclusionType, losExclusionValue: selection.value } });
+    resetEncounterExclusionCheckboxes();
+    setQueryEncounterExclusions([]);
+  };
+
+  const handleTDVCChange = (value: DropDownValue) => {
+    // handle Total Direct Variable Cost exclusions
+    const selection = parseLosCostSelection(value.toString());
+    setCostOutlierValue(value.toString());
+    setExclusionCriteria({ ...exclusionCriteria, ...{ costExclusionType: selection.exclusionType, costExclusionValue: selection.value } });
+    resetEncounterExclusionCheckboxes();
+    setQueryEncounterExclusions([]);
+  };
+
+  // Simple encounter exclusion initialization
+  const setInitialEncounterExclusions = (groupDetails: IEncounterGroupDetailTreeGridData[]) => {
+    if (groupDetails) {
+      const excludedEncounters: number[] = [];
+      groupDetails
+        ?.flatMap((x) => x.children.flatMap((y) => y.children.flatMap((z) => z.children)))
+        .forEach((detail) => {
+          if (detail.data.isExcluded) excludedEncounters.push(detail.data.id);
+        });
+      setPendingEncounterExclusions(excludedEncounters);
+      setGridEncounterExclusions(excludedEncounters);
+    }
+  };
+
+  // Simple encounter exclusion handler
+  const handleSetEncounterExclusion = (key: number, isIncluded: boolean) => {
+    const index = pendingEncounterExclusions.indexOf(key);
+    if (!isIncluded && index === -1) {
+      setPendingEncounterExclusions([...pendingEncounterExclusions, ...[key]]);
+    } else if (isIncluded && index !== -1) {
+      setPendingEncounterExclusions([...pendingEncounterExclusions.slice(0, index), ...pendingEncounterExclusions.slice(index + 1)]);
+    }
+    // set flag for target encounter for grid display check/uncheck
+    const targetEncounter = groupInformations?.flatMap((x) => x.children.flatMap((y) => y.children.flatMap((z) => z.children))).find((x) => x.key === key.toString());
+    if (targetEncounter) {
+      targetEncounter.data.isExcluded = !isIncluded;
+    }
+  };
+
+  const handleApplyExclusions = () => {
+    setQueryEncounterExclusions(pendingEncounterExclusions);
+    setIsApplyExclusionActionBarVisible(false);
+  };
+
+  const handleCancelApplyExclusions = () => {
+    setIsApplyExclusionActionBarVisible(false);
+    resetEncounterExclusionCheckboxes();
+  };
+
+  const resetEncounterExclusionCheckboxes = () => {
+    setPendingEncounterExclusions(gridEncounterExclusions);
+
+    // reset all encounter exclusion checkboxes to what was last loaded
+    groupInformations
+      ?.flatMap((x) => x.children.flatMap((y) => y.children.flatMap((z) => z.children)))
+      .forEach((encounter) => {
+        if (gridEncounterExclusions.includes(encounter.key as unknown as number)) {
+          encounter.data.isExcluded = true;
+        } else {
+          encounter.data.isExcluded = false;
+        }
+      });
+  };
+
+  return (
+    <>
+      <LayoutGrid fullWidth removeMargin>
+        <ActionBar
+          filters={Filters({
+            handleALOSChange,
+            handleTDVCChange,
+            parseLosTrimValue,
+            parseCostTrimValue,
+            exclusionCriteria
+          })}
+        />
+        <FilterBar
+          filterId={''}
+          isFilterReadOnly={false}
+          filterChips={filters?.filterChipItems ?? []}
+          excludedChips={hiddenFilterChips}
+          hiddenChips={hiddenFilterChips}
+          dateStart={dateStart}
+          dateEnd={dateEnd}
+          exclusionCriteria={exclusionCriteria}
+        />
+        <CaseTypeFamilyMetrics
+          encountersExcluded={metrics.encountersExcluded}
+          totalEncounters={metrics.totalEncounters}
+          identifiedVariation={metrics.identifiedVariation}
+          encountersIncluded={metrics.encountersIncluded}
+          variationIncluded={metrics.variationIncluded}
+          variationExcluded={metrics.variationExcluded}
+        />
+        <TreeGrid
+          scrollable={true}
+          sortField='name'
+          sortOrder={1}
+          value={groupInformations}
+          density={'dense'}
+          expandedRowKeys={treeGridKeysData}
+          emptyMessage='Select row levels to see details'
+          loading={loading}
+          columnHeaderGroup={
+            <DataHeaderGroup>
+              <DataHeaderRow>
+                <DataHeaderCell width={220} />
+                <DataHeaderCell width={100} />
+                <DataHeaderCell width={240} colSpan={3} header='Entire Population' align='center' />
+                <DataHeaderCell rowSpan={2} isGap />
+                <DataHeaderCell colSpan={8} width={640} header='Refined Population' align='center' />
+                <DataHeaderCell rowSpan={2} isGap />
+                <DataHeaderCell colSpan={2} width={160} header='Excluded Population' align='center' />
+              </DataHeaderRow>
+              <DataHeaderRow>
+                <DataHeaderCell field='name' header='Label' sortable width={220} />
+                <DataHeaderCell field='isExcluded' header='Included in Population' sortable width={100} />
+                <DataHeaderCell field='totalEncounters' header='Total Encounters' sortable width={80} />
+                <DataHeaderCell field='totalVariationEncounters' header='Encounters with Cost Driver Variation' sortable width={80} />
+                <DataHeaderCell field='identifiedVariation' header='Identified Cost Driver Variation' sortable width={80} />
+                <DataHeaderCell field='includedEncounterCount' header='Encounters Included' sortable width={80} />
+                <DataHeaderCell field='mortalityRate' header='Mortality Rate' sortable sortField='dischargeStatusCode' width={80} />
+                <DataHeaderCell field='medianLos' header='Length of Stay' sortable width={80} />
+                <DataHeaderCell field='medianGrossCharges' header='Gross Charges' sortable width={80} />
+                <DataHeaderCell field='medianCost' header='Variable Direct Cost' sortable width={80} />
+                <DataHeaderCell field='includedEncountersBelowMedian' header='Encounters At or Below Median Included' sortable width={80} />
+                <DataHeaderCell field='includedEncountersAboveMedian' header='Encounters Above Median Included' sortable width={80} />
+                <DataHeaderCell field='includedVariation' header='Cost Driver Variation Included' sortable width={80} />
+                <DataHeaderCell field='excludedEncountersAboveMedian' header='Encounters Above Median Excluded' sortable width={80} />
+                <DataHeaderCell field='excludedVariation' header='Cost Driver Variation Excluded' sortable width={80} />
+              </DataHeaderRow>
+            </DataHeaderGroup>
+          }
+        >
+          <TreeGrid.Column expander field='name' sortable width={220} />
+          <TreeGrid.Column
+            field='isExcluded'
+            sortable
+            width={100}
+            align='right'
+            body={(rowData) => (!rowData.children ? <Checkbox checked={!rowData.data.isExcluded} onChange={(e) => handleSetEncounterExclusion(rowData.key, e.target.checked)} /> : <></>)}
+          />
+
+          <TreeGrid.NumberColumn field='totalEncounters' header='Total Encounters' sortable width={80} body={(rowData) => (rowData.children ? <>{rowData.data.totalEncounters}</> : <></>)} />
+          <TreeGrid.NumberColumn
+            field='totalVariationEncounters'
+            header='Encounters with Cost Driver Variation'
+            sortable
+            width={80}
+            body={(rowData) => (rowData.children ? <>{rowData.data.totalVariationEncounters}</> : <></>)}
+          />
+          <TreeGrid.NumberColumn field='identifiedVariation' format='currency' header='Identified Cost Driver Variation' sortable width={80} />
+          <TreeGrid.GapColumn />
+          <TreeGrid.NumberColumn
+            field='includedEncounterCount'
+            header='Encounters Included'
+            sortable
+            width={80}
+            body={(rowData) => (rowData.children ? <>{rowData.data.includedEncounterCount}</> : <></>)}
+          />
+          <TreeGrid.NumberColumn
+            field='mortalityRate'
+            format='percent'
+            header='Mortality Rate'
+            sortField='dischargeStatusCode'
+            sortable
+            width={80}
+            body={(rowData) =>
+              rowData.children ? (
+                <>{(rowData.data.mortalityRate * 100).toFixed(0)}%</>
+              ) : (
+                <>
+                  {
+                    <Tooltip title={rowData.data.dischargeStatusDescription}>
+                      <Text>{rowData.data.dischargeStatusCode}</Text>
+                    </Tooltip>
+                  }
+                </>
+              )
+            }
+          />
+          <TreeGrid.NumberColumn field='medianLos' header='Length of Stay' sortable width={80} />
+          <TreeGrid.NumberColumn field='medianGrossCharges' format='currency' header='Gross Charges' sortable width={80} />
+          <TreeGrid.NumberColumn field='medianCost' format='currency' header='Variable Direct Cost' sortable width={80} />
+          <TreeGrid.NumberColumn
+            field='includedEncountersBelowMedian'
+            header='Encounters At or Below Median Included'
+            sortable
+            width={80}
+            body={(rowData) => (rowData.children ? <>{rowData.data.includedEncountersBelowMedian}</> : <></>)}
+          />
+          <TreeGrid.NumberColumn
+            field='includedEncountersAboveMedian'
+            header='Encounters Above Median Included'
+            sortable
+            width={80}
+            body={(rowData) => (rowData.children ? <>{rowData.data.includedEncountersAboveMedian}</> : <></>)}
+          />
+          <TreeGrid.NumberColumn field='includedVariation' format='currency' header='Cost Driver Variation Included' sortable width={80} />
+          <TreeGrid.GapColumn />
+          <TreeGrid.NumberColumn
+            field='excludedEncountersAboveMedian'
+            header='Encounters Above Median Excluded'
+            sortable
+            width={80}
+            body={(rowData) => (rowData.children ? <>{rowData.data.excludedEncountersAboveMedian}</> : <></>)}
+          />
+          <TreeGrid.NumberColumn field='excludedVariation' format='currency' header='Cost Driver Variation Excluded' sortable width={80} />
+        </TreeGrid>
+      </LayoutGrid>
+      <FixedActionBar
+        visible={isApplyExclusionActionBarVisible}
+        rightContent={
+          <>
+            <Button onClick={handleCancelApplyExclusions}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyExclusions}>
+              Apply
+            </Button>
+          </>
+        }
+      />
+    </>
+  );
+};
+export default CaseTypeFamilyInformationGrid;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/CaseTypeFamilyMetrics.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/CaseTypeFamilyMetrics.tsx
new file mode 100644
index 0000000..c0853db
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/CaseTypeFamilyMetrics.tsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import MetricGroup from '@strata/tempo/lib/metricgroup/MetricGroup';
+import { ICaseTypeFamilyMetricDetail } from './data/ICaseTypeFamilyMetricDetail';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+
+const CaseTypeFamilyMetrics: React.FC<ICaseTypeFamilyMetricDetail> = (props: ICaseTypeFamilyMetricDetail) => {
+  return (
+    <Spacing background='white' border='bottom' padding={0} margin={0}>
+      <MetricGroup
+        items={[
+          {
+            key: 'entire-population',
+            label: 'Entire Population',
+            values: [
+              {
+                key: 'total-encounters',
+                label: 'Unique Encounters Before Refinement',
+                value: props.totalEncounters,
+                formatOptions: {
+                  nullValue: '-'
+                }
+              },
+              {
+                key: 'identified-variation',
+                label: 'Cost Driver Identified Variation',
+                format: 'currency',
+                value: props.identifiedVariation,
+                formatOptions: {
+                  nullValue: '-'
+                }
+              }
+            ]
+          },
+          {
+            key: 'refined-population',
+            label: 'Refined Population',
+            values: [
+              {
+                key: 'encounters-included',
+                label: 'Encounters Included',
+                value: props.encountersIncluded,
+                formatOptions: {
+                  nullValue: '-'
+                }
+              },
+              {
+                key: 'variatoin-included',
+                label: 'Variation Included',
+                value: props.variationIncluded,
+                format: 'currency',
+                formatOptions: {
+                  nullValue: '-'
+                }
+              }
+            ]
+          },
+          {
+            key: 'excluded-population',
+            label: 'Excluded Population',
+            values: [
+              {
+                key: 'encounters-excluded',
+                label: 'Encounters Excluded',
+                value: props.encountersExcluded,
+                formatOptions: {
+                  nullValue: '-'
+                }
+              },
+              {
+                key: 'variation-excluded',
+                label: 'Variation Excluded',
+                value: props.variationExcluded,
+                format: 'currency',
+                formatOptions: {
+                  nullValue: '-'
+                }
+              }
+            ]
+          }
+        ]}
+      />
+    </Spacing>
+  );
+};
+
+export default CaseTypeFamilyMetrics;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/CaseTypeFamilySummaryGrid.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/CaseTypeFamilySummaryGrid.tsx
new file mode 100644
index 0000000..ccf35d7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/CaseTypeFamilySummaryGrid.tsx
@@ -0,0 +1,863 @@
+// #region Imports
+
+// Third-party imports
+import React, { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+
+// Strata Tempo UI imports
+import Accordion from '@strata/tempo/lib/accordion';
+import Card from '@strata/tempo/lib/card/Card';
+import { IDataGridSortEvent } from '@strata/tempo/lib/datagrid/DataGrid';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import Text from '@strata/tempo/lib/text/Text';
+import TreeGrid, { ITreeGridExpandEvent } from '@strata/tempo/lib/treegrid';
+
+// Internal imports - utilities
+import { ChipKey } from '../shared/components/FilterBar/data/IFilterChipItem';
+import { getErrorData, getErrorMessage } from '../shared/error/utils';
+
+// Internal imports - components
+import { BenchmarkingBannerText } from './components/BenchmarkingBannerText';
+import BenchmarkingHeatMapGrid from './components/BenchmarkingGridHeatMap';
+import { BenchmarkingLegendPopover } from './components/BenchmarkingLegendView';
+import { buildTreeGrid } from './components/BuildTreeGrid';
+
+// Internal imports - data & services
+import { BenchmarkingInsightsGranularity } from './data/BenchmarkingInsightsGranularity';
+import { applyTopNFilter, getTopNSortField, shouldFetchData, toggleGridResetKey } from './data/CaseTypeFamilyFunctions';
+import { explorationService } from './data/explorationService';
+import { IEncounterGroupTreeGridData } from './data/IEncounterGroupSummary';
+import { IHeatMapData } from './data/IHeatMapData';
+
+// Internal imports - hooks
+import { useCaseTypeFamilyGridBase } from './hooks/useCaseTypeFamilyGridBase';
+import { useColumnManagement } from './hooks/useColumnManagement';
+import { useExplorationColumnConfigs } from './hooks/useExplorationColumnConfigs';
+import { useScrollManagement } from './hooks/useScrollManagement';
+
+// #endregion
+
+// #region Constants
+
+// ============================================================================
+// Constants
+// ============================================================================
+
+const MemoBenchmarkingHeatMapGrid = memo(BenchmarkingHeatMapGrid);
+
+const DEFAULT_SORT_FIELD = 'name';
+const DEFAULT_SORT_ORDER = 1;
+const GRID_SPACING = 12;
+const GRID_PADDING = '12px 12px';
+const CONTAINER_BOTTOM_GAP = 0;
+// Accounts for the Card component's 1px top border + 1px bottom border (Ant Design default).
+// Without this offset the scroll body would be 2px too tall, causing a hairline overflow.
+const CARD_BORDER_WIDTH = 2;
+const GRID_NAME_PRIMARY = 'FlexibleExplorationSummary';
+const GRID_NAME_LINKED = 'FlexibleExplorationDetails';
+const UNINITIALIZED_CHILD_KEY = '2-';
+
+// #endregion
+
+// #region Types
+
+// ============================================================================
+// Types
+// ============================================================================
+
+/**
+ * Props for the CaseTypeFamilySummaryGrid component.
+ */
+interface ICaseTypeFamilySummaryGridProps {
+  /** Controls visibility of the column layout manager */
+  setColumnLayoutVisible: boolean;
+  /** Callback to hide the column layout manager */
+  onHideColumnLayout: () => void;
+}
+
+// #endregion
+
+// #region Component
+
+// ============================================================================
+// Component
+// ============================================================================
+
+/**
+ * CaseTypeFamilySummaryGrid displays a summary view of case type families with:
+ * - Hierarchical tree grid with expandable cost driver details
+ * - Optional benchmarking heatmap when peer group is selected
+ * - Column management and filtering capabilities
+ * - Integration with exploration population data
+ */
+const CaseTypeFamilySummaryGrid: React.FC<ICaseTypeFamilySummaryGridProps> = ({ setColumnLayoutVisible, onHideColumnLayout }) => {
+  // #region Hooks
+
+  // ========================================================================
+  // Hooks - Base (shared logic)
+  // ========================================================================
+
+  const {
+    modal,
+    loading,
+    setLoading,
+    firstLoading,
+    setFirstLoading,
+    configuration,
+    benchmarking,
+    gridResetKey,
+    setGridResetKey,
+    manageColumnsVisible,
+    setManageColumnsVisible,
+    filters,
+    exclusionCriteria,
+    peerGroupFilters,
+    markDataAsLoaded,
+    renderFilterBar,
+    showBanner,
+    onDismissBanner,
+    showPeerGroupBenchmarking,
+    handlePeerGroupChange,
+    previousPeerGroupIdRef,
+    featureFlags,
+    granularity,
+    setGranularity
+  } = useCaseTypeFamilyGridBase({
+    onDrawerApply: () => {
+      hasAppliedFiltersRef.current = true;
+      setFirstLoading(false);
+    },
+    isBaseOptionsReadOnly: false
+  });
+
+  const isCodeLevelEnhancementEnabled = featureFlags.isEnabled('cibenchmarkinginsightscodelevelenhancement');
+
+  // ========================================================================
+  // Hooks - State (component-specific)
+  // ========================================================================
+
+  // Grid data state
+  const [encounterGroupSummaries, setEncounterGroupSummaries] = useState<IEncounterGroupTreeGridData[]>();
+  const [expandedRowKeys, setExpandedRowKeys] = useState<string[]>([]);
+
+  // Sort state
+  const [sortField, setSortField] = useState<string | undefined>(DEFAULT_SORT_FIELD);
+  const [sortOrder, setSortOrder] = useState<number | undefined>(DEFAULT_SORT_ORDER);
+  const [heatMapNameOrder, setHeatMapNameOrder] = useState<Map<string, number> | null>(null);
+
+  // Heatmap state
+  const [heatMapData, setHeatMapData] = useState<IHeatMapData[]>();
+  const [heatMapLoading, setHeatMapLoading] = useState<boolean>(false);
+  const [showLegend, setShowLegend] = useState<boolean>(false);
+  const [activeAccordionKeys, setActiveAccordionKeys] = useState<string | string[] | undefined>(['1']);
+  const [treeGridScrollHeight, setTreeGridScrollHeight] = useState<string | undefined>(undefined);
+
+  // ========================================================================
+  // Hooks - Refs
+  // ========================================================================
+
+  const containerRef = useRef<HTMLDivElement>(null);
+  const accordionRef = useRef<HTMLDivElement>(null);
+  const treeGridWrapperRef = useRef<HTMLDivElement>(null);
+  const rafIdRef = useRef<number | null>(null);
+  const hasHandledFirstLoadRef = useRef<boolean>(false);
+  const initialDataLoadedRef = useRef<boolean>(false);
+  const hasAppliedFiltersRef = useRef<boolean>(false);
+  const reloadHandledRef = useRef<boolean>(false);
+  const encounterGroupSummariesRef = useRef<IEncounterGroupTreeGridData[]>();
+
+  // ========================================================================
+  // Hooks - Custom
+  // ========================================================================
+
+  const scrollToRow = useScrollManagement();
+
+  const { getColumnConfigs } = useExplorationColumnConfigs({
+    viewType: 'summary'
+  });
+
+  const { getColumnsWithVisibility, renderColumnManagerPanel: renderColumnManagerDialog } = useColumnManagement({
+    gridName: GRID_NAME_PRIMARY,
+    additionalGridNames: [GRID_NAME_LINKED],
+    getColumnConfigs,
+    showPeerGroupBenchmarking
+  });
+
+  // #endregion
+
+  // #region Callbacks
+
+  // ========================================================================
+  // Callbacks - Data fetching
+  // ========================================================================
+
+  /**
+   * Fetches case type family summaries based on current filter configuration.
+   * Resets expanded rows and grid state on successful fetch.
+   * Returns the fetched summaries for use by caller.
+   */
+  const fetchGridData = useCallback(async (): Promise<IEncounterGroupTreeGridData[]> => {
+    if (!configuration || !filters || !exclusionCriteria || !peerGroupFilters) {
+      return [];
+    }
+
+    setLoading(true);
+
+    try {
+      const summaries = await explorationService.getCaseTypeFamilySummaries(configuration.configurationGuid, exclusionCriteria, filters, peerGroupFilters.peerGroupId);
+
+      setEncounterGroupSummaries(summaries);
+      encounterGroupSummariesRef.current = summaries;
+      setExpandedRowKeys([]);
+      setGridResetKey((prev: number) => toggleGridResetKey(prev));
+
+      // Mark that initial data has been loaded (used for peer group change detection)
+      if (!initialDataLoadedRef.current) {
+        initialDataLoadedRef.current = true;
+      }
+
+      return summaries;
+    } catch (error) {
+      const errorMessage = getErrorMessage(await getErrorData(error, { 500: undefined }));
+
+      if (errorMessage) {
+        modal.alert({
+          title: 'Unable to load data',
+          content: errorMessage,
+          alertType: 'error'
+        });
+      }
+      return [];
+    } finally {
+      if (firstLoading) {
+        setFirstLoading(false);
+        markDataAsLoaded();
+      }
+      setLoading(false);
+    }
+  }, [configuration, filters, exclusionCriteria, peerGroupFilters, firstLoading, setLoading, setFirstLoading, modal, setGridResetKey, markDataAsLoaded]);
+
+  /**
+   * Fetches raw heatmap data from API.
+   * Does not apply filtering - that is handled by fetchData after both grid and heatmap load.
+   */
+  const fetchHeatMapData = useCallback(async () => {
+    if (!configuration || !filters || !exclusionCriteria || !peerGroupFilters || peerGroupFilters.peerGroupId === 0 || !benchmarking) {
+      return [];
+    }
+
+    try {
+      const data = await explorationService.getHeatMapSummary(configuration.configurationGuid, exclusionCriteria, filters, peerGroupFilters.peerGroupId, granularity);
+      return data;
+    } catch (error) {
+      const errorMessage = getErrorMessage(await getErrorData(error, { 500: undefined }));
+
+      if (errorMessage) {
+        modal.alert({
+          title: 'Unable to load heatmap data',
+          content: errorMessage,
+          alertType: 'error'
+        });
+      }
+      return [];
+    }
+  }, [configuration, filters, exclusionCriteria, peerGroupFilters, benchmarking, granularity, modal]);
+
+  /**
+   * Fetches grid data and optionally heatmap data.
+   * Determines if heatmap should be fetched based on benchmarking and peer group settings.
+   * When both are needed, they're fetched in parallel. Once complete, filters heatmap to only show case type families in the grid data.
+   */
+  const fetchData = useCallback(async () => {
+    const shouldFetchHeatmap = benchmarking && (peerGroupFilters?.peerGroupId ?? 0) !== 0;
+
+    if (!shouldFetchHeatmap) {
+      await fetchGridData();
+      return;
+    }
+
+    setHeatMapLoading(true);
+    try {
+      // Fetch both grid and heatmap data in parallel
+      const [gridData, heatMapGridData] = await Promise.all([fetchGridData(), fetchHeatMapData()]);
+
+      // Clear heatmap data if no grid data is returned
+      if (!gridData || gridData.length === 0) {
+        setHeatMapData(undefined);
+        return;
+      }
+
+      // Keep only customer case type families and preserve the same order as the grid data.
+      // IHeatMapData is flat (one record per CTF × cost driver), so we filter + sort rather than
+      // map by name (which would collapse multiple cost driver records into one).
+      const gridOrderByName = new Map(gridData.map((s, i) => [s.data.name, i]));
+      const filteredData = (heatMapGridData ?? []).filter((heatMapRow) => gridOrderByName.has(heatMapRow.name)).sort((a, b) => (gridOrderByName.get(a.name) ?? 0) - (gridOrderByName.get(b.name) ?? 0));
+
+      setHeatMapData(filteredData);
+    } finally {
+      setHeatMapLoading(false);
+    }
+  }, [benchmarking, peerGroupFilters, fetchGridData, fetchHeatMapData]);
+
+  /**
+   * Loads cost driver children for a specific case type family node.
+   * Updates only the children to preserve peer data in parent node.
+   */
+  const loadCostDriverChildren = useCallback(
+    async (id: string): Promise<void> => {
+      if (!configuration || !filters?.filterChipItems || !exclusionCriteria || !peerGroupFilters) {
+        return;
+      }
+
+      setLoading(true);
+
+      try {
+        const costDriverData = await explorationService.getCaseTypeFamilyCostDriverInfo(configuration.configurationGuid, id, exclusionCriteria, filters, peerGroupFilters.peerGroupId);
+
+        const expandedNodeData = costDriverData[0];
+
+        setEncounterGroupSummaries((nodes) => nodes?.map((node) => (node.key === expandedNodeData.key ? { ...node, children: expandedNodeData.children } : node)));
+      } finally {
+        setLoading(false);
+      }
+    },
+    [configuration, filters, exclusionCriteria, peerGroupFilters, setLoading]
+  );
+
+  // ========================================================================
+  // Callbacks - Event handlers
+  // ========================================================================
+
+  /**
+   * Handles tree node expansion. Loads cost driver children if not already loaded.
+   */
+  const handleNodeExpand = useCallback(
+    async (e: ITreeGridExpandEvent): Promise<void> => {
+      const expandedNode = { ...e.node };
+
+      // Check if children are already loaded
+      const hasUninitializedChildren = expandedNode.children?.[0]?.key === UNINITIALIZED_CHILD_KEY;
+
+      if (expandedNode.children && !hasUninitializedChildren) {
+        return;
+      }
+
+      await loadCostDriverChildren(expandedNode.data.id);
+    },
+    [loadCostDriverChildren]
+  );
+
+  /**
+   * Handles sort field and order updates from the grid.
+   */
+  const handleSortUpdate = useCallback((sortOptions: IDataGridSortEvent): void => {
+    setSortField(sortOptions.sortField);
+    setSortOrder(sortOptions.sortOrder);
+    setHeatMapNameOrder(null);
+  }, []);
+
+  /**
+   * Handles heatmap sort — stores the resulting CTF name order and clears the TreeGrid sort
+   * so the pre-sorted data order from displayedSummaries takes effect.
+   */
+  const handleHeatMapSort = useCallback((sortedNames: string[]): void => {
+    setHeatMapNameOrder(new Map(sortedNames.map((name, i) => [name, i])));
+    setSortField(undefined);
+    setSortOrder(undefined);
+  }, []);
+
+  /**
+   * Handles row toggle (expand/collapse) state updates.
+   */
+  const handleRowToggle = useCallback((keys: string[]): void => {
+    setExpandedRowKeys(keys);
+  }, []);
+
+  /**
+   * Handles heatmap cell click events.
+   * Navigates to and expands the corresponding row in the TreeGrid, then scrolls to it.
+   */
+  const handleHeatMapCellClick = useCallback(
+    async (rowName: string, costDriver: string): Promise<void> => {
+      if (!encounterGroupSummaries) {
+        return;
+      }
+
+      // Ignore column header clicks (have cost driver but no row name)
+      if (costDriver.length > 0 && rowName.length === 0) {
+        return;
+      }
+
+      // Find matching row
+      const matchingRow = encounterGroupSummaries.find((row) => row.data.name === rowName);
+      if (!matchingRow) {
+        return;
+      }
+
+      const rowKey = matchingRow.key;
+
+      // Expand row if not already expanded
+      if (!expandedRowKeys.includes(rowKey)) {
+        // Load children if needed
+        const hasUninitializedChildren = matchingRow.children?.[0]?.key === UNINITIALIZED_CHILD_KEY;
+        if (!matchingRow.children || hasUninitializedChildren) {
+          await loadCostDriverChildren(matchingRow.data.id.toString());
+        }
+
+        setExpandedRowKeys((prev) => [...prev, rowKey]);
+      }
+
+      // Scroll to the row
+      scrollToRow({
+        containerRef: treeGridWrapperRef,
+        rowKey,
+        dataArray: encounterGroupSummaries
+      });
+    },
+    [encounterGroupSummaries, expandedRowKeys, loadCostDriverChildren, scrollToRow]
+  );
+
+  const handleAccordionChange = useCallback(
+    (key: string | string[]) => {
+      setActiveAccordionKeys((previousShowAccordion) => {
+        if (!showLegend) {
+          // When the legend is hidden, mirror the accordion's key selection directly.
+          return key;
+        }
+        // When the legend is visible, keep item '1' open if it was previously open.
+        const hasLegendOpen = Array.isArray(previousShowAccordion) ? previousShowAccordion.includes('1') : previousShowAccordion === '1';
+        // If item '1' was not previously open, behave like the default accordion behavior.
+        if (!hasLegendOpen) {
+          return key;
+        }
+        // Item '1' was previously open; ensure it stays open in the new state.
+        if (Array.isArray(key)) {
+          return Array.from(new Set(['1', ...key.map(String)]));
+        }
+        return ['1', String(key)];
+      });
+    },
+    [showLegend]
+  );
+
+  // ========================================================================
+  // Callbacks - Layout
+  // ========================================================================
+
+  /**
+   * Measures the available height for the TreeGrid scroll body and updates React state.
+   * Used for initial mount, banner/filter-bar changes, and post-animation sync.
+   * Queries .p-treetable-scrollable-body directly so Card + column header heights are
+   * accounted for without hard-coded offsets.
+   */
+  const measureScrollHeight = useCallback(() => {
+    if (!containerRef.current || !treeGridWrapperRef.current) return;
+    const scrollBody = treeGridWrapperRef.current.querySelector('.p-treetable-scrollable-body') as HTMLElement | null;
+    if (!scrollBody) return;
+    const containerBottom = containerRef.current.getBoundingClientRect().bottom;
+    const paddingBottom = parseFloat(getComputedStyle(containerRef.current).paddingBottom) || 0;
+    const available = containerBottom - paddingBottom - scrollBody.getBoundingClientRect().top - CARD_BORDER_WIDTH;
+    setTreeGridScrollHeight(`${Math.max(0, available)}px`);
+  }, []);
+
+  // #endregion
+
+  // Derived early so layout effects can reference it as a stable dependency.
+  const shouldShowHeatmap = useMemo(() => benchmarking && peerGroupFilters?.peerGroupId !== 0, [benchmarking, peerGroupFilters?.peerGroupId]);
+
+  // #region Effects
+
+  // ========================================================================
+  // Effects
+  // ========================================================================
+
+  /**
+   * Fetches data when filters or peer group configuration changes.
+   * Fetches grid data and heatmap data in parallel when both are needed.
+   */
+  const peerGroupId = peerGroupFilters?.peerGroupId ?? 0;
+
+  useEffect(() => {
+    if (!filters || !exclusionCriteria || !peerGroupFilters) {
+      return;
+    }
+
+    // Check if this is a peer group change vs other filter changes
+    const isPeerGroupChange = previousPeerGroupIdRef.current !== peerGroupFilters.peerGroupId;
+    previousPeerGroupIdRef.current = peerGroupFilters.peerGroupId;
+
+    // Block peer group changes from triggering loads before initial data is loaded
+    if (isPeerGroupChange && !initialDataLoadedRef.current) {
+      return;
+    }
+
+    // When peer group changes or filters change, clear heatmap data to ensure fresh data fetch
+    if (isPeerGroupChange || hasAppliedFiltersRef.current) {
+      setHeatMapData(undefined);
+    }
+
+    // Handle peer group change by removing SPH criteria if switching to no peer group
+    if (!firstLoading) {
+      handlePeerGroupChange();
+    }
+
+    // Skip data fetch if filters haven't been applied yet
+    // UNLESS the peer group changed (then always fetch with the new peer group)
+    if (!hasAppliedFiltersRef.current && !isPeerGroupChange) {
+      // Clear firstLoading to prevent page loader from blocking UI
+      if (firstLoading) {
+        setFirstLoading(false);
+      }
+      return;
+    }
+
+    // Check if data should be fetched
+    // Skip this check if peer group changed (peer group is sufficient reason to refetch)
+    const shouldFetch = shouldFetchData(filters, firstLoading);
+    if (!isPeerGroupChange && !shouldFetch) {
+      // Clear firstLoading even if we don't fetch to prevent infinite loading state
+      // Use ref to prevent triggering a second fetch when firstLoading becomes false
+      if (firstLoading && !hasHandledFirstLoadRef.current) {
+        hasHandledFirstLoadRef.current = true;
+        setFirstLoading(false);
+      }
+      return;
+    }
+
+    fetchData();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [
+    filters,
+    exclusionCriteria?.losExclusionType,
+    exclusionCriteria?.losExclusionValue,
+    exclusionCriteria?.costExclusionType,
+    exclusionCriteria?.costExclusionValue,
+    peerGroupFilters?.peerGroupId,
+    benchmarking,
+    granularity,
+    markDataAsLoaded
+  ]);
+
+  /**
+   * Synchronizes column layout visibility with parent component.
+   */
+  useEffect(() => {
+    setManageColumnsVisible(setColumnLayoutVisible);
+  }, [setColumnLayoutVisible, setManageColumnsVisible]);
+
+  /**
+   * When a Top N filter is applied, automatically sort the grid by the selected Top N field descending.
+   * This is client-side only — sort state is local to this component and is not persisted or sent to the API.
+   */
+  useEffect(() => {
+    if (exclusionCriteria?.topN && exclusionCriteria?.topNField) {
+      setSortField(getTopNSortField(exclusionCriteria.topNField));
+      setSortOrder(-1);
+      setHeatMapNameOrder(null);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [exclusionCriteria?.topN, exclusionCriteria?.topNField]);
+
+  /**
+   * When returning from detail page, check if filters exist in session storage and reload with them
+   * This allows users to return to the same state they left off in after drilling into details and back out
+   */
+  useEffect(() => {
+    // Only reload if filters exist AND we're not in initial loading state
+    // (which means filters came from session storage after a previous session, not just loaded from config)
+    if (filters && exclusionCriteria && peerGroupFilters && configuration && !reloadHandledRef.current && !firstLoading) {
+      // Check if we have meaningful filters (more than just date filter)
+      const hasNonDateFilters = filters.filterChipItems && filters.filterChipItems.some((chip) => chip.key !== ChipKey.DischargeDate);
+
+      if (hasNonDateFilters) {
+        reloadHandledRef.current = true;
+        hasAppliedFiltersRef.current = true;
+
+        fetchData();
+      }
+    }
+  }, [filters, exclusionCriteria, peerGroupFilters, configuration, benchmarking, firstLoading, fetchData]);
+
+  /**
+   * Sets container height to fill the viewport and schedules a scroll-height re-measurement.
+   * Runs after every render (no deps) so banner appearance and filter-bar height changes
+   * are automatically handled without needing explicit dependencies.
+   */
+  useLayoutEffect(() => {
+    if (!containerRef.current) return;
+    const top = containerRef.current.getBoundingClientRect().top;
+    containerRef.current.style.height = `${window.innerHeight - top - CONTAINER_BOTTOM_GAP}px`;
+    if (rafIdRef.current !== null) cancelAnimationFrame(rafIdRef.current);
+    rafIdRef.current = requestAnimationFrame(measureScrollHeight);
+    return () => {
+      if (rafIdRef.current !== null) {
+        cancelAnimationFrame(rafIdRef.current);
+        rafIdRef.current = null;
+      }
+    };
+  });
+
+  /**
+   * Fires the instant the accordion's height transition ends.
+   * One measurement, zero timers, zero per-frame work.
+   * Filtered to height transitions only so unrelated child transitions are ignored.
+   */
+  const handleAccordionTransitionEnd = useCallback(
+    (e: React.TransitionEvent<HTMLDivElement>) => {
+      if (e.propertyName === 'height') measureScrollHeight();
+    },
+    [measureScrollHeight]
+  );
+
+  /**
+   * Re-measures container height and scroll height on window resize.
+   */
+  useEffect(() => {
+    const handleResize = () => {
+      if (!containerRef.current) return;
+      const top = containerRef.current.getBoundingClientRect().top;
+      containerRef.current.style.height = `${window.innerHeight - top - CONTAINER_BOTTOM_GAP}px`;
+      measureScrollHeight();
+    };
+    window.addEventListener('resize', handleResize);
+    return () => window.removeEventListener('resize', handleResize);
+  }, [measureScrollHeight]);
+
+  // #endregion
+
+  // #region Memoized Values
+
+  // ========================================================================
+  // Memoized values
+  // ========================================================================
+
+  const columnConfigs = useMemo(() => getColumnsWithVisibility(), [getColumnsWithVisibility]);
+
+  const { columns, headerGroup } = useMemo(() => buildTreeGrid(columnConfigs, { isDetailPage: false }), [columnConfigs]);
+
+  // Summaries after topN filtering only — stable across sort events.
+  // Used by displayedHeatMapData so heatmap filtering doesn't re-run on every sort.
+  const filteredSummaries = useMemo(() => {
+    if (!encounterGroupSummaries) return encounterGroupSummaries;
+    if (exclusionCriteria?.topN && exclusionCriteria?.topNField) {
+      return applyTopNFilter(encounterGroupSummaries, exclusionCriteria.topN, exclusionCriteria.topNField);
+    }
+    return encounterGroupSummaries;
+  }, [encounterGroupSummaries, exclusionCriteria?.topN, exclusionCriteria?.topNField]);
+
+  // Summaries after topN filtering and sort ordering applied.
+  const displayedSummaries = useMemo(() => {
+    if (!filteredSummaries) return filteredSummaries;
+
+    if (heatMapNameOrder) {
+      // Heatmap is driving sort — reorder to match CTF name order; unknowns go to the end.
+      const maxIndex = heatMapNameOrder.size;
+      return [...filteredSummaries].sort((a, b) => (heatMapNameOrder.get(a.data.name) ?? maxIndex) - (heatMapNameOrder.get(b.data.name) ?? maxIndex));
+    }
+
+    if (sortField && sortOrder) {
+      // Summary grid is driving sort — pre-sort here so treeGridNameOrder can read the order directly.
+      // Nulls sort to the bottom, consistent with heatmap sort behavior.
+      return [...filteredSummaries].sort((a, b) => {
+        const aVal = (a.data as Record<string, unknown>)[sortField] as number | string | undefined;
+        const bVal = (b.data as Record<string, unknown>)[sortField] as number | string | undefined;
+        if (aVal == null && bVal != null) return 1;
+        if (aVal != null && bVal == null) return -1;
+        if (aVal == null || bVal == null) return 0;
+        return (aVal < bVal ? -1 : aVal > bVal ? 1 : 0) * sortOrder;
+      });
+    }
+
+    return filteredSummaries;
+  }, [filteredSummaries, heatMapNameOrder, sortField, sortOrder]);
+
+  // Heatmap rows filtered to the CTFs present in the grid after topN.
+  // Depends on filteredSummaries (not displayedSummaries) so it stays stable across sort events.
+  const displayedHeatMapData = useMemo(() => {
+    if (!heatMapData || !filteredSummaries) return heatMapData;
+    const summaryNames = new Set(filteredSummaries.map((s) => s.data.name));
+
+    // Preserve array reference when all heatmap rows are in the summary set.
+    // This prevents unnecessary downstream sort-state resets in the heatmap grid.
+    const isSubset = heatMapData.every((h) => summaryNames.has(h.name));
+    if (isSubset) {
+      return heatMapData;
+    }
+
+    return heatMapData.filter((h) => summaryNames.has(h.name));
+  }, [heatMapData, filteredSummaries]);
+
+  // Name order derived from the TreeGrid's sort, passed to the heatmap so it can mirror the order.
+  // Null when the heatmap is driving the sort.
+  // displayedSummaries is already pre-sorted by sortField/sortOrder, so no re-sort needed here.
+  const treeGridNameOrder = useMemo(() => {
+    if (!displayedSummaries || !sortField || !sortOrder) return null;
+    return new Map(displayedSummaries.map((s, i) => [s.data.name, i]));
+  }, [displayedSummaries, sortField, sortOrder]);
+
+  const emptyMessage = useMemo(
+    () =>
+      encounterGroupSummaries && encounterGroupSummaries.length === 0 ? (
+        'No Items'
+      ) : (
+        <Text>
+          Select <Text strong>Refinement Options</Text>, update the criteria, and click <Text strong>Apply</Text> to generate results.
+        </Text>
+      ),
+    [encounterGroupSummaries]
+  );
+
+  /**
+   * TreeGrid component displaying case type family summaries with expandable cost driver details.
+   * Configured with sorting, loading state, and empty message.
+   * Wrapped in a Card and connected to the treeGridRef for scroll management.
+   */
+  const treeGridComponent = useMemo(
+    () => (
+      <div
+        ref={containerRef}
+        style={{
+          display: 'flex',
+          flexDirection: 'column',
+          rowGap: GRID_SPACING,
+          padding: GRID_PADDING,
+          boxSizing: 'border-box'
+        }}
+      >
+        {shouldShowHeatmap && (
+          // flex: '0 0 auto' — accordion takes its natural height, never grows or shrinks.
+          // No overflow:hidden here — the legend popover renders in a portal and must not be clipped.
+          <div ref={accordionRef} style={{ flex: '0 0 auto' }} onTransitionEnd={handleAccordionTransitionEnd}>
+            <Accordion
+              activeKey={activeAccordionKeys}
+              onChange={handleAccordionChange}
+              collapse={false}
+              items={[
+                {
+                  key: '1',
+                  removeBodyPadding: true,
+                  label: 'Comparison of benchmark variable direct costs',
+                  extra: (
+                    <div style={{ display: 'flex', alignItems: 'center', gap: 8 }} onClick={(e) => e.stopPropagation()}>
+                      {isCodeLevelEnhancementEnabled && (
+                        <RadioGroup
+                          vertical={false}
+                          value={granularity}
+                          onChange={(e) => setGranularity(Number(e.target.value) as BenchmarkingInsightsGranularity)}
+                          options={[
+                            { value: BenchmarkingInsightsGranularity.CaseTypeFamily, label: 'Case Type Family' },
+                            { value: BenchmarkingInsightsGranularity.DrgCode, label: 'MS-DRG / APR-DRG' },
+                            { value: BenchmarkingInsightsGranularity.PrimaryCpt, label: 'Primary CPT' }
+                          ]}
+                        />
+                      )}
+                      <BenchmarkingLegendPopover open={showLegend} onOpenChange={setShowLegend} />
+                    </div>
+                  ),
+                  children: (
+                    <Card removeBodyPadding>
+                      <MemoBenchmarkingHeatMapGrid
+                        heatMapData={displayedHeatMapData}
+                        loading={heatMapLoading}
+                        onCellClick={handleHeatMapCellClick}
+                        onSort={handleHeatMapSort}
+                        nameOrder={treeGridNameOrder}
+                      />
+                    </Card>
+                  )
+                }
+              ]}
+            />
+          </div>
+        )}
+        {/*
+          flex: 1 absorbs all remaining vertical space after the accordion.
+          minHeight: 0 is required — without it a flex child cannot shrink below its content size.
+        */}
+        <div ref={treeGridWrapperRef} style={{ flex: 1, minHeight: 0 }}>
+          <Card removeBodyPadding title='Summary of cost drivers for each case type family'>
+            <TreeGrid
+              key={gridResetKey}
+              scrollable
+              scrollHeight={treeGridScrollHeight}
+              density='dense'
+              loading={loading}
+              sortField={sortField}
+              sortOrder={sortOrder}
+              value={displayedSummaries}
+              expandedRowKeys={expandedRowKeys}
+              columnHeaderGroup={headerGroup}
+              emptyMessage={emptyMessage}
+              onExpand={handleNodeExpand}
+              onSort={handleSortUpdate}
+              onRowToggle={handleRowToggle}
+            >
+              {columns}
+            </TreeGrid>
+          </Card>
+        </div>
+      </div>
+    ),
+    [
+      loading,
+      sortField,
+      sortOrder,
+      displayedSummaries,
+      expandedRowKeys,
+      headerGroup,
+      emptyMessage,
+      columns,
+      gridResetKey,
+      handleNodeExpand,
+      handleSortUpdate,
+      handleRowToggle,
+      shouldShowHeatmap,
+      activeAccordionKeys,
+      handleAccordionChange,
+      showLegend,
+      displayedHeatMapData,
+      heatMapLoading,
+      handleHeatMapCellClick,
+      handleHeatMapSort,
+      treeGridNameOrder,
+      isCodeLevelEnhancementEnabled,
+      granularity,
+      setGranularity,
+      treeGridScrollHeight,
+      handleAccordionTransitionEnd
+    ]
+  );
+
+  // #endregion
+
+  // #region Render
+
+  // ========================================================================
+  // Render
+  // ========================================================================
+
+  return (
+    <>
+      {/* Benchmarking Banner */}
+      <BenchmarkingBannerText hasDismissButton showBenchmarkingBanner={showBanner} onDismissBanner={onDismissBanner} />
+
+      {/* Filter Bar */}
+      {renderFilterBar()}
+
+      {/* Main Content: Heatmap and TreeGrid */}
+      {treeGridComponent}
+
+      {/* Column Manager Dialog */}
+      {renderColumnManagerDialog({
+        isVisible: manageColumnsVisible,
+        onCancel: onHideColumnLayout,
+        onApplyComplete: onHideColumnLayout
+      })}
+    </>
+  );
+};
+
+// #endregion
+
+// #endregion
+
+export default CaseTypeFamilySummaryGrid;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/Exploration.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/Exploration.tsx
new file mode 100644
index 0000000..88d7ceb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/Exploration.tsx
@@ -0,0 +1,31 @@
+import { useHelpCenter } from '@strata/core/lib';
+import Button from '@strata/tempo/lib/button';
+import Header from '@strata/tempo/lib/header';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import React from 'react';
+import CaseTypeFamilySummaryGrid from './CaseTypeFamilySummaryGrid';
+
+const Encounter: React.FC = () => {
+  const helpCenter = useHelpCenter();
+  const [manageColumnsVisible, setManageColumnsVisible] = React.useState<boolean>(false);
+
+  return (
+    <>
+      <Header
+        title='Explore Case Type Families'
+        extra={
+          <Spacing>
+            <Button type='secondary' onClick={() => setManageColumnsVisible(true)}>
+              Edit Column Layout
+            </Button>
+            <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1870')} />
+          </Spacing>
+        }
+      />
+      <CaseTypeFamilySummaryGrid setColumnLayoutVisible={manageColumnsVisible} onHideColumnLayout={() => setManageColumnsVisible(false)} />
+    </>
+  );
+};
+
+export default Encounter;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/ExplorationDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/ExplorationDetail.tsx
new file mode 100644
index 0000000..6e375db
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/ExplorationDetail.tsx
@@ -0,0 +1,120 @@
+import { useHelpCenter } from '@strata/core/lib';
+import Banner from '@strata/tempo/lib/banner/Banner';
+import Button from '@strata/tempo/lib/button/Button';
+import Header from '@strata/tempo/lib/header';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import Spacing from '@strata/tempo/lib/spacing';
+import React, { useEffect, useState } from 'react';
+import ReactDOM from 'react-dom';
+import { useParams } from 'react-router';
+import { useFeatureFlags } from '../shared/featureFlag/FeatureFlagContext';
+import CaseTypeFamilyDetailGrid from './CaseTypeFamilyDetailGrid';
+import SaveRefinedPopulationModal from './SaveRefinedPopulationModal';
+import { ICaseTypeFamilyMetricDetail, newMetricDetail } from './data/ICaseTypeFamilyMetricDetail';
+import ExplorationDuplicatePopulationModal from './opportunities/ExplorationDuplicatePopulationModal';
+import { IExplorationPopulation } from './opportunities/data/IExplorationPopulation';
+import { populationService } from './opportunities/data/populationService';
+
+const ExplorationDetail: React.FC = () => {
+  const { costDriver, explorationPopulationId } = useParams<{ caseTypeFamilyId: string; costDriver: string; explorationPopulationId: string }>();
+  const [isStrategicOpportunityWizardEnabled, setStrategicOpportunityWizardEnabled] = React.useState(false);
+  const [populationId, setPopulationId] = React.useState<number>(0);
+  const [isModalVisible, setModalVisible] = useState<boolean>(false);
+  const [metric, setMetric] = useState<ICaseTypeFamilyMetricDetail>(newMetricDetail);
+  const [associatedOpportunitiesCount, setAssociatedOpportunitiesCount] = useState<number>(0);
+  const [associatedInitiativesCount, setAssociatedInitiativesCount] = useState<number>(0);
+  const [mappingEncounterIds, setMappingEncounterIds] = React.useState<number[]>([]);
+  const [encounterExclusionsApplied, setEncounterExclusionsApplied] = React.useState<number[]>([]);
+  const [encounterInclusionsApplied, setEncounterInclusionsApplied] = React.useState<number[]>([]);
+  const [explorationPopulation, setExplorationPopulation] = React.useState<IExplorationPopulation | undefined>(undefined);
+  const [caseTypeFamilyName, setCaseTypeFamilyName] = React.useState<string>('');
+  const [costDriverName, setCostDriverName] = React.useState<string>('');
+  const [manageColumnsVisible, setManageColumnsVisible] = React.useState<boolean>(false);
+  const [duplicatePopulationVisible, setDuplicatePopulationVisible] = React.useState<boolean>(false);
+
+  const featureFlags = useFeatureFlags();
+  const helpCenter = useHelpCenter();
+
+  useEffect(() => {
+    setStrategicOpportunityWizardEnabled(featureFlags.isEnabled('ciexplorationpopulationstrategicopportunitywizard'));
+  }, [featureFlags]);
+
+  useEffect(() => {
+    if (explorationPopulationId) {
+      const id = parseInt(explorationPopulationId, 10);
+      if (!isNaN(id)) {
+        setPopulationId(id);
+        populationService.getPopulationData(id).then((data) => {
+          ReactDOM.unstable_batchedUpdates(() => {
+            setCostDriverName(data.costDriver);
+            setExplorationPopulation(data);
+            setAssociatedOpportunitiesCount(data.associatedOpportunitiesCount ?? 0);
+            setAssociatedInitiativesCount(data.associatedInitiativesCount ?? 0);
+          });
+        });
+      }
+    }
+  }, [explorationPopulationId]);
+
+  return (
+    <>
+      {isStrategicOpportunityWizardEnabled && associatedInitiativesCount > 0 && (
+        <Banner extra={<Button onClick={() => setDuplicatePopulationVisible(true)}>Duplicate Population</Button>}>
+          {`This population is read-only because ${associatedInitiativesCount} ${
+            associatedInitiativesCount > 1 ? 'initiatives' : 'initiative'
+          } associated with it. Duplicate the population to make changes.`}
+        </Banner>
+      )}
+      <Header
+        title={`${caseTypeFamilyName} • ${populationId ? costDriverName : costDriver}`}
+        breadcrumbText='Explore Case Type Families'
+        subtitle={populationId ? `Editing ${explorationPopulation?.name}` : ''}
+        breadcrumbHref='/explorectf'
+        extra={
+          <Spacing>
+            <Button type='secondary' disabled={isStrategicOpportunityWizardEnabled && associatedInitiativesCount > 0} style={{ marginTop: '20px' }} onClick={() => setManageColumnsVisible(true)}>
+              Edit Column Layout
+            </Button>
+            <Button type='primary' disabled={isStrategicOpportunityWizardEnabled && associatedInitiativesCount > 0} style={{ marginTop: '20px' }} onClick={() => setModalVisible(true)}>
+              {populationId ? 'Save Refined Population Changes' : 'Save Refined Population'}
+            </Button>
+            <Button style={{ marginTop: '20px' }} type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1878')} />
+          </Spacing>
+        }
+      />
+      <CaseTypeFamilyDetailGrid
+        updateMetrics={setMetric}
+        isModalsVisible={isModalVisible || duplicatePopulationVisible}
+        encounterExclusionsApplied={encounterExclusionsApplied}
+        setEncounterExclusionsApplied={setEncounterExclusionsApplied}
+        encounterInclusionsApplied={encounterInclusionsApplied}
+        setEncounterInclusionsApplied={setEncounterInclusionsApplied}
+        setMappingEncounterIds={setMappingEncounterIds}
+        setCaseTypeFamilyName={setCaseTypeFamilyName}
+        explorationPopulationData={explorationPopulation}
+        setColumnLayoutVisible={manageColumnsVisible}
+        isGridReadOnly={isStrategicOpportunityWizardEnabled && associatedInitiativesCount > 0}
+        onHideColumnLayout={() => setManageColumnsVisible(false)}
+      />
+      <SaveRefinedPopulationModal
+        metric={metric}
+        explorationPopulation={explorationPopulation}
+        isVisible={isModalVisible}
+        associatedOpportunitiesCount={associatedOpportunitiesCount}
+        closeModal={() => setModalVisible(false)}
+        encounterExclusionsApplied={encounterExclusionsApplied}
+        encounterInclusionsApplied={encounterInclusionsApplied}
+        mappingEncounterIds={mappingEncounterIds}
+        isStrategicOpportunityWizardEnabled={isStrategicOpportunityWizardEnabled}
+      />
+      <ExplorationDuplicatePopulationModal
+        isVisible={duplicatePopulationVisible}
+        populationId={populationId}
+        populationName={explorationPopulation?.name ?? ''}
+        closeModal={() => setDuplicatePopulationVisible(false)}
+      />
+    </>
+  );
+};
+
+export default ExplorationDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/ExplorationInformation.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/ExplorationInformation.tsx
new file mode 100644
index 0000000..0dd6baa
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/ExplorationInformation.tsx
@@ -0,0 +1,24 @@
+import Header from '@strata/tempo/lib/header';
+import React from 'react';
+import CaseTypeFamilyInformationGrid from './CaseTypeFamilyInformationGrid';
+import { useParams } from 'react-router-dom';
+import { getBetaTitle } from '../shared/components/ContinuousImprovementExtensions';
+
+const Encounter: React.FC = () => {
+  const { costDriver, caseTypeFamilyId } = useParams<{ caseTypeFamilyId: string; costDriver: string }>();
+  const [caseTypeFamilyName, setCaseTypeFamilyName] = React.useState<string>('');
+  const [columnName, setColumnName] = React.useState<string>('');
+
+  return (
+    <>
+      <Header
+        title={getBetaTitle(`${caseTypeFamilyName} • ${costDriver} • ${columnName}`)}
+        breadcrumbText='Explore Case Type Families'
+        breadcrumbHref={`/explorectf/${caseTypeFamilyId}/costDriver/${costDriver}`}
+      />
+      <CaseTypeFamilyInformationGrid setCaseTypeFamilyName={setCaseTypeFamilyName} setColumnName={setColumnName}></CaseTypeFamilyInformationGrid>
+    </>
+  );
+};
+
+export default Encounter;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/SaveRefinedPopulationModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/SaveRefinedPopulationModal.tsx
new file mode 100644
index 0000000..ecd5048
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/SaveRefinedPopulationModal.tsx
@@ -0,0 +1,202 @@
+import intlService from '@strata/intl/lib';
+import Form from '@strata/tempo/lib/form/Form';
+import Input from '@strata/tempo/lib/input/Input';
+import Modal, { useModal } from '@strata/tempo/lib/modal';
+import { usePageLoader } from '@strata/tempo/lib/pageloader/usePageLoader';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import dayjs from 'dayjs';
+import { isString } from 'lodash';
+import React, { useEffect } from 'react';
+import { useParams } from 'react-router';
+import { IFilterChipItem } from '../shared/components/FilterBar/data/IFilterChipItem';
+import { useConfigurations } from '../shared/configuration/ConfigurationContext';
+import { CodeType } from '../shared/constants';
+import { useClientScopedSessionStorage } from '../shared/hooks/useClientScopedSessionStorage';
+import { useSystemSettings } from '../shared/systemSettings/SystemSettingsContext';
+import { RegEx } from '../shared/validation/RegEx';
+import { updateDischargeDate } from './data/CaseTypeFamilyFunctions';
+import { ICaseTypeFamilyMetricDetail } from './data/ICaseTypeFamilyMetricDetail';
+import { parseLosCostSelection } from './data/IExclusionCriteria';
+import { defaultFilter } from './data/IFilter';
+import { IExplorationPopulation } from './opportunities/data/IExplorationPopulation';
+import { populationService } from './opportunities/data/populationService';
+
+export interface ISaveRefinedPopulationModalProps {
+  isVisible: boolean;
+  metric: ICaseTypeFamilyMetricDetail;
+  explorationPopulation: IExplorationPopulation | undefined;
+  associatedOpportunitiesCount: number;
+  closeModal: () => void;
+  encounterExclusionsApplied: number[];
+  encounterInclusionsApplied: number[];
+  mappingEncounterIds: number[];
+  isStrategicOpportunityWizardEnabled?: boolean;
+}
+
+const SaveRefinedPopulationModal: React.FC<ISaveRefinedPopulationModalProps> = (props: ISaveRefinedPopulationModalProps) => {
+  const { caseTypeFamilyId, costDriver, explorationPopulationId } = useParams<{ caseTypeFamilyId: string; costDriver: string; explorationPopulationId: string }>();
+  const {
+    isVisible,
+    metric,
+    closeModal,
+    encounterExclusionsApplied,
+    encounterInclusionsApplied,
+    mappingEncounterIds,
+    explorationPopulation,
+    associatedOpportunitiesCount,
+    isStrategicOpportunityWizardEnabled
+  } = props;
+  const [isLoading, setIsLoading] = React.useState<boolean>(false);
+
+  const [summaryFilters] = useClientScopedSessionStorage('summaryFilters', defaultFilter);
+  const [costOutlierValue, setCostOutlierValue] = useClientScopedSessionStorage('costOutlierValue', '');
+  const [losOutlierValue, setLosOutlierValue] = useClientScopedSessionStorage('losOutlierValue', '');
+
+  const { currentConfiguration } = useConfigurations();
+  const { setLoading } = usePageLoader();
+  const [form] = Form.useForm();
+  const modal = useModal();
+  const settings = useSystemSettings();
+
+  const getFiltersData = (): [IFilterChipItem[], dayjs.Dayjs[] | undefined] => {
+    const dateRange = updateDischargeDate(summaryFilters.filterChipItems);
+    return [summaryFilters.filterChipItems, dateRange];
+  };
+
+  useEffect(() => {
+    if (isVisible && currentConfiguration && explorationPopulation) {
+      const [filterChipItems, dateRange] = getFiltersData();
+      const endDischargeDate = dateRange && dateRange.length > 1 ? dateRange[1].toDate() : undefined;
+      // Info: because in fact currentConfiguration.orgDefinedTrackingEndDate is tring we need to convert to Date
+      const trackingEndDate = isString(currentConfiguration.orgDefinedTrackingEndDate) ? new Date(currentConfiguration.orgDefinedTrackingEndDate) : currentConfiguration.orgDefinedTrackingEndDate;
+
+      if (explorationPopulation.opportunitiesCount && endDischargeDate && trackingEndDate <= endDischargeDate) {
+        modal.alert({
+          title: 'Update opportunity',
+          content: (
+            <>
+              This opportunity&apos;s baseline includes all months of the current configured fiscal year and/or includes months from future fiscal years.
+              <br />
+              Please choose a different baseline range that will allow tracking for at least one month of the current fiscal year or change your configuration to the future fiscal year.
+            </>
+          ),
+          alertType: 'error',
+          onClose() {
+            closeModal();
+          }
+        });
+      } else {
+        modal.confirm({
+          title: `Save changes to ${explorationPopulation?.name}?`,
+          content:
+            isStrategicOpportunityWizardEnabled && associatedOpportunitiesCount
+              ? `Save your changes to recalculate ${associatedOpportunitiesCount} strategic
+              ${associatedOpportunitiesCount > 1 ? 'opportunities' : 'opportunity'} associated with this population. Previously entered Goals and Ramp-Up values will be reset.`
+              : `Saving changes will replace the existing population ${explorationPopulation?.opportunitiesCount ? 'and recalculate or create opportunity in selected fiscal year' : ''}.`,
+          okText: 'Save Changes',
+          onOk() {
+            saveData(explorationPopulation?.name || '', true, filterChipItems);
+          },
+          onCancel() {
+            closeModal();
+          }
+        });
+      }
+    }
+  }, [isVisible, explorationPopulation, isStrategicOpportunityWizardEnabled, associatedOpportunitiesCount]);
+
+  const handleModalClose = () => {
+    closeModal();
+    form.resetFields();
+  };
+
+  const handleSave = async () => {
+    try {
+      await form.validateFields();
+      form.submit();
+    } catch {
+      // invalid fields so let form show validation errors
+    }
+  };
+
+  const handleFormFinish = async (values: any) => {
+    setIsLoading(true);
+    await populationService.isNameUnique(values.name).then((data: boolean) => {
+      setIsLoading(false);
+
+      if (data) {
+        saveData(values.name);
+      } else {
+        modal.confirm({
+          title: `Save changes to ${values.name}?`,
+          content: `${values.name} already exist. Saving will replace the existing population.`,
+          okText: 'Save and Replace',
+          onOk() {
+            saveData(values.name);
+          }
+        });
+      }
+    });
+  };
+
+  const saveData = async (name: string, isUpdate = false, filterChipItems: IFilterChipItem[] | undefined = undefined) => {
+    const costSelection = parseLosCostSelection(costOutlierValue);
+    const losSelection = parseLosCostSelection(losOutlierValue);
+
+    if (!filterChipItems) {
+      [filterChipItems] = getFiltersData();
+    }
+
+    const population = {
+      explorationPopulationId: explorationPopulationId ? parseInt(explorationPopulationId) : 0,
+      name: name,
+      caseTypeFamilyId: explorationPopulationId ? explorationPopulation?.caseTypeFamilyId : +caseTypeFamilyId,
+      costDriver: explorationPopulationId ? explorationPopulation?.costDriver : costDriver,
+      losExclusionType: losSelection.exclusionType,
+      losExclusionValue: losSelection.value,
+      costExclusionType: costSelection.exclusionType,
+      costExclusionValue: costSelection.value,
+      filtersJSON: JSON.stringify(filterChipItems),
+      totalEncounters: metric.encountersIncluded,
+      totalVariation: metric.variationIncluded,
+      codeType: settings.systemSettings?.flexibleExplorationInpatientCTF ? CodeType.APRDRG : CodeType.MSDRG,
+      manuallyExcludedEncounterIds: encounterExclusionsApplied,
+      manuallyIncludedEncounterIds: encounterInclusionsApplied,
+      mappingEncounterIds: mappingEncounterIds
+    };
+    setIsLoading(true);
+    setLoading(true);
+
+    try {
+      if (isUpdate) await populationService.updatePopulation(population as IExplorationPopulation);
+      else await populationService.savePopulation(population as IExplorationPopulation);
+
+      window.location.assign(`/continuousimprovement/exploration-populations`);
+    } finally {
+      setIsLoading(false);
+      setLoading(false);
+    }
+    handleModalClose();
+  };
+
+  return !explorationPopulationId ? (
+    <Modal title='Save as Refined Population' visible={isVisible} loading={isLoading} onCancel={handleModalClose} onOk={handleSave}>
+      <Form style={{ marginBottom: '25px', marginTop: '25px' }} form={form} hideOptionalLabels onFinish={handleFormFinish}>
+        <Form.Item label='Population Name' name='name' rules={[{ required: true, whitespace: true, max: 200 }, { pattern: RegEx.JazzRestrictedCharacters }]}>
+          <Input />
+        </Form.Item>
+        <Form.Item label='Total Encounters Included'>
+          <Spacing>{intlService.formatNumber(metric.encountersIncluded, 'number')}</Spacing>
+        </Form.Item>
+        <Form.Item label='Total Variation Included'>
+          <Spacing>{intlService.formatNumber(metric.variationIncluded, 'currency')}</Spacing>
+        </Form.Item>
+      </Form>
+      <Spacing>Saving starts encounter tagging and opens the Population Management screen, where you can manage and use the population for opportunities.</Spacing>
+    </Modal>
+  ) : (
+    <></>
+  );
+};
+
+export default SaveRefinedPopulationModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/BenchmarkingBannerText.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/BenchmarkingBannerText.tsx
new file mode 100644
index 0000000..27e226d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/BenchmarkingBannerText.tsx
@@ -0,0 +1,40 @@
+import Banner from '@strata/tempo/lib/banner/Banner';
+import Button from '@strata/tempo/lib/button/Button';
+import Text from '@strata/tempo/lib/text/Text';
+import React from 'react';
+
+export interface BenchmarkingBannerProps {
+  hasDismissButton: boolean;
+  showBenchmarkingBanner: boolean;
+  showBenchmarkingText?: boolean;
+  onDismissBanner?: () => void;
+}
+
+export const BenchmarkingBannerText: React.FC<BenchmarkingBannerProps> = ({ hasDismissButton, showBenchmarkingBanner, showBenchmarkingText, onDismissBanner }) => {
+  const handleDismissBanner = () => {
+    onDismissBanner && onDismissBanner();
+  };
+
+  if (!showBenchmarkingBanner) {
+    return null;
+  }
+
+  if (showBenchmarkingText) {
+    return <Text>* Indicates criteria impacts both exploration data and benchmarking data</Text>;
+  }
+
+  return (
+    <Banner
+      extra={
+        hasDismissButton && (
+          <Button type='secondary' onClick={handleDismissBanner}>
+            Dismiss
+          </Button>
+        )
+      }
+      type='info'
+    >
+      Only certain criteria apply to benchmarking data. See Help Center to learn more.
+    </Banner>
+  );
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/BenchmarkingGridHeatMap.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/BenchmarkingGridHeatMap.tsx
new file mode 100644
index 0000000..ffdb17d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/BenchmarkingGridHeatMap.tsx
@@ -0,0 +1,218 @@
+import { formatNumber } from '@strata/intl/lib';
+import DataGrid, { IDataGridSortEvent } from '@strata/tempo/lib/datagrid';
+import Text from '@strata/tempo/lib/text';
+import Tooltip from '@strata/tempo/lib/tooltip';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { IHeatMapData, IHeatMapPivotedRow, pivotHeatMapData } from '../data/IHeatMapData';
+import { getHeatMapBorderStyle, getHeatMapColor, getHeatMapColorDescription } from '../data/heatMapColors';
+
+// Nulls sort to the bottom, consistent with summary grid sort behavior.
+function sortRows(rowsToSort: IHeatMapPivotedRow[], field: string, order: number): IHeatMapPivotedRow[] {
+  return [...rowsToSort].sort((a, b) => {
+    const aVal = a[field] as number | string | null | undefined;
+    const bVal = b[field] as number | string | null | undefined;
+    if (aVal == null && bVal != null) return 1;
+    if (aVal != null && bVal == null) return -1;
+    if (aVal == null || bVal == null) return 0;
+    return (aVal < bVal ? -1 : aVal > bVal ? 1 : 0) * order;
+  });
+}
+
+interface IBenchmarkingHeatMapGridProps {
+  /** Raw heatmap data from API */
+  heatMapData?: IHeatMapData[];
+  /** Loading state */
+  loading?: boolean;
+  /** Callback when a cell is clicked - provides row name and cost driver */
+  onCellClick?: (rowName: string, costDriver: string) => void;
+  /** Callback when the grid is sorted — provides the resulting CTF name order */
+  onSort?: (sortedNames: string[]) => void;
+  /** External name order from the TreeGrid sort — heatmap mirrors this order when provided */
+  nameOrder?: Map<string, number> | null;
+}
+
+/**
+ * Renders an O/E ratio cell with heatmap coloring.
+ * Uses Tempo-approved color palette with opacity variants.
+ */
+const OeRatioCell: React.FC<{
+  oeRatio: number | null;
+  rowName: string;
+  costDriver: string;
+  clickedDivRef: React.MutableRefObject<HTMLDivElement | null>;
+  onCellClick?: (rowName: string, costDriver: string) => void;
+}> = ({ oeRatio, rowName, costDriver, clickedDivRef, onCellClick }) => {
+  const backgroundColor = getHeatMapColor(oeRatio);
+  const description = getHeatMapColorDescription(oeRatio);
+  const displayValue = oeRatio !== null ? formatNumber(oeRatio, 'decimal') : '-';
+
+  const handleClick = (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+    if (!onCellClick) {
+      return;
+    }
+
+    if (clickedDivRef.current) {
+      clickedDivRef.current.style.border = getHeatMapBorderStyle(); // Reset default border
+    }
+    clickedDivRef.current = event.currentTarget;
+    event.currentTarget.style.border = getHeatMapBorderStyle(event.currentTarget.textContent || '');
+    onCellClick(rowName, costDriver);
+  };
+
+  return (
+    <Tooltip title={description}>
+      <div
+        onClick={handleClick}
+        style={{
+          backgroundColor,
+          padding: '4px 8px',
+          margin: '-4px -8px',
+          textAlign: 'right',
+          border: getHeatMapBorderStyle(),
+          cursor: onCellClick ? 'pointer' : 'default',
+          minHeight: '24px'
+        }}
+      >
+        {displayValue}
+      </div>
+    </Tooltip>
+  );
+};
+
+/**
+ * Benchmarking Heatmap Grid component.
+ *
+ * Displays a pivoted grid where:
+ * - Rows are case type families (or codes when includeCodeLevel is true)
+ * - Columns are cost drivers (Pharmacy, Laboratory, etc.)
+ * - Cell values are O/E ratios with color-coded backgrounds
+ *
+ * Color Legend (Tempo-approved palette):
+ * - Red shades: O/E > 1 (customer costs exceed benchmark - unfavorable)
+ * - Green shades: O/E < 1 (customer costs below benchmark - favorable)
+ * - Transparent: O/E = 1 or no data
+ */
+export const BenchmarkingHeatMapGrid: React.FC<IBenchmarkingHeatMapGridProps> = (props: IBenchmarkingHeatMapGridProps) => {
+  const { heatMapData, loading, onCellClick, onSort: onSortProp, nameOrder } = props;
+  const clickedDivRef = React.useRef<HTMLDivElement | null>(null);
+
+  // Controlled sort state — reset when data changes or TreeGrid takes over sorting
+  const [sortField, setSortField] = useState<string | undefined>(undefined);
+  const [sortOrder, setSortOrder] = useState<number | undefined>(undefined);
+
+  // Pivot the data: rows are case type families, columns are cost drivers
+  const { rows: pivotedRows, costDrivers } = useMemo(() => {
+    if (!heatMapData || heatMapData.length === 0) {
+      return { rows: [], costDrivers: [] };
+    }
+    return pivotHeatMapData(heatMapData);
+  }, [heatMapData]);
+
+  // When nameOrder is provided (TreeGrid sorted), sort rows to match.
+  // When null (heatmap is driving sort), apply local sort or use original order.
+  const rows = useMemo(() => {
+    if (nameOrder) {
+      const maxIndex = nameOrder.size;
+      return [...pivotedRows].sort((a, b) => (nameOrder.get(a.name) ?? maxIndex) - (nameOrder.get(b.name) ?? maxIndex));
+    }
+
+    if (sortField && sortOrder) {
+      return sortRows(pivotedRows, sortField, sortOrder);
+    }
+
+    return pivotedRows;
+  }, [pivotedRows, nameOrder, sortField, sortOrder]);
+
+  const handleSort = useCallback(
+    (e: IDataGridSortEvent) => {
+      setSortField(e.sortField);
+      setSortOrder(e.sortOrder);
+
+      if (onSortProp) {
+        onSortProp(sortRows(pivotedRows, e.sortField, e.sortOrder).map((r) => r.name));
+      }
+    },
+    [onSortProp, pivotedRows]
+  );
+
+  // Reset clicked cell reference and sort state when data changes
+  useEffect(() => {
+    if (clickedDivRef.current) {
+      clickedDivRef.current.style.border = '';
+    }
+    clickedDivRef.current = null;
+    setSortField(undefined);
+    setSortOrder(undefined);
+  }, [heatMapData]);
+
+  // When TreeGrid sort takes over (nameOrder provided), clear local sort
+  useEffect(() => {
+    if (nameOrder) {
+      setSortField(undefined);
+      setSortOrder(undefined);
+    }
+  }, [nameOrder]);
+
+  // Build columns array for DataGrid
+  const columns = useMemo(() => {
+    const cols: React.ReactElement[] = [];
+
+    // Name column (Case Type Family or Code)
+    cols.push(
+      <DataGrid.Column
+        key='name'
+        field='name'
+        header='Case Type Family'
+        sortable
+        width={250}
+        body={(rowData: IHeatMapPivotedRow) => (
+          <div
+            onClick={() => onCellClick && onCellClick(rowData.name, '')}
+            onKeyDown={(event) => {
+              if (!onCellClick) {
+                return;
+              }
+              if (event.key === 'Enter' || event.key === ' ') {
+                event.preventDefault();
+                onCellClick(rowData.name, '');
+              }
+            }}
+            role='button'
+            tabIndex={0}
+            style={{ cursor: onCellClick ? 'pointer' : 'default' }}
+          >
+            <Text>{rowData.name}</Text>
+          </div>
+        )}
+      />
+    );
+
+    // Dynamic cost driver columns
+    costDrivers.forEach((costDriver) => {
+      cols.push(
+        <DataGrid.Column
+          key={costDriver}
+          field={costDriver}
+          header={costDriver}
+          sortable
+          width={200}
+          align='right'
+          body={(rowData: IHeatMapPivotedRow) => (
+            <OeRatioCell oeRatio={rowData[costDriver] as number | null} rowName={rowData.name} costDriver={costDriver} clickedDivRef={clickedDivRef} onCellClick={onCellClick} />
+          )}
+        />
+      );
+    });
+
+    cols.push(<DataGrid.EmptyColumn />);
+    return cols;
+  }, [costDrivers, onCellClick]);
+
+  return (
+    <DataGrid value={rows} lazy scrollHeight='300px' loading={loading} density='dense' scrollable sortField={sortField} sortOrder={sortOrder} onSort={handleSort}>
+      {columns}
+    </DataGrid>
+  );
+};
+
+export default BenchmarkingHeatMapGrid;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/BenchmarkingLegendView.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/BenchmarkingLegendView.tsx
new file mode 100644
index 0000000..d1d86fd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/BenchmarkingLegendView.tsx
@@ -0,0 +1,173 @@
+// #region Imports
+
+// Third-party imports
+import React from 'react';
+
+// Strata Tempo UI imports
+import Button from '@strata/tempo/lib/button/Button';
+import Popover from '@strata/tempo/lib/popover/Popover';
+import Spacing from '@strata/tempo/lib/spacing';
+import Text from '@strata/tempo/lib/text/Text';
+
+// Internal imports - data & utilities
+import { getHeatMapColor, HEATMAP_COLORS, OE_RATIO_THRESHOLDS } from '../data/heatMapColors';
+
+// #endregion
+
+// #region Constants
+
+// ============================================================================
+// Constants
+// ============================================================================
+
+/**
+ * Legend content for the heatmap, mapping OE ratio thresholds to their display labels.
+ * Used to display the comparison factor legend in the heatmap accordion.
+ */
+const formatOeRatioThreshold = (value: number): string => value.toFixed(2);
+
+const createLegendContent = (): { oeRatio: number; label: string }[] => {
+  const thresholds = OE_RATIO_THRESHOLDS;
+
+  const highRed = thresholds.HIGH_RED;
+  const mediumRed = thresholds.MEDIUM_RED;
+  const lowRed = thresholds.LOW_RED;
+  const neutral = thresholds.NEUTRAL;
+  const lowGreen = thresholds.LOW_GREEN;
+  const mediumGreen = thresholds.MEDIUM_GREEN;
+  const highGreen = thresholds.HIGH_GREEN;
+
+  return [
+    {
+      oeRatio: highRed,
+      label: `>= ${formatOeRatioThreshold(highRed)}`
+    },
+    {
+      oeRatio: mediumRed,
+      label: `>= ${formatOeRatioThreshold(mediumRed)} and < ${formatOeRatioThreshold(highRed)}`
+    },
+    {
+      oeRatio: lowRed,
+      label: `>= ${formatOeRatioThreshold(lowRed)} and < ${formatOeRatioThreshold(mediumRed)}`
+    },
+    {
+      oeRatio: neutral,
+      label: `= ${formatOeRatioThreshold(neutral)}`
+    },
+    {
+      oeRatio: lowGreen,
+      label: `>= ${formatOeRatioThreshold(mediumGreen)} and < ${formatOeRatioThreshold(neutral)}`
+    },
+    {
+      oeRatio: mediumGreen,
+      label: `>= ${formatOeRatioThreshold(highGreen)} and < ${formatOeRatioThreshold(mediumGreen)}`
+    },
+    {
+      oeRatio: highGreen,
+      label: `< ${formatOeRatioThreshold(highGreen)}`
+    }
+  ];
+};
+
+export const LEGEND_CONTENT = createLegendContent();
+// #endregion
+
+// #region Types
+
+// ============================================================================
+// Types
+// ============================================================================
+
+/**
+ * Props for the HeatMapLegendSwatch component.
+ */
+export type HeatMapLegendSwatchProps = {
+  /** The background color for the legend swatch, determined by the OE ratio thresholds */
+  color: string;
+  /** The border style for the legend swatch, used to indicate the threshold boundary */
+  border: string;
+  /** The label describing the OE ratio range for this legend item */
+  label: string;
+};
+
+/**
+ * Props for the BenchmarkingLegendPopover component.
+ */
+export type BenchmarkingLegendPopoverProps = {
+  /** Whether the legend popover is currently open */
+  open: boolean;
+  /** Callback fired when the popover open state changes */
+  onOpenChange: (open: boolean) => void;
+};
+
+// #endregion
+
+// #region Components
+
+// ============================================================================
+// Components
+// ============================================================================
+
+/**
+ * HeatMapLegendSwatch displays a single item in the heatmap legend.
+ * Shows a colored box with a corresponding OE ratio label.
+ *
+ * @param color - The background color for the legend swatch, determined by the OE ratio thresholds.
+ * @param border - The border style for the legend swatch, used to indicate the threshold boundary.
+ * @param label - The label describing the OE ratio range for this legend item.
+ * @returns A React element representing a single item in the heatmap legend, consisting of a colored box and a label.
+ */
+export const HeatMapLegendSwatch: React.FC<HeatMapLegendSwatchProps> = ({ color, border, label }) => (
+  <Spacing itemSpacing={8}>
+    <div
+      style={{
+        backgroundColor: color,
+        border,
+        padding: '4px 8px',
+        margin: '-4px -8px',
+        height: '24px'
+      }}
+    >
+      &nbsp;
+    </div>
+    <Text>{label}</Text>
+  </Spacing>
+);
+
+HeatMapLegendSwatch.displayName = 'HeatMapLegendSwatch';
+
+/**
+ * BenchmarkingLegendPopover displays the heatmap legend in a popover.
+ * Shows colored swatches with OE ratio labels and provides a button to open the popover.
+ *
+ * @param open - Whether the legend popover is currently open
+ * @param onOpenChange - Callback fired when the popover open state changes
+ * @returns A popover component with legend content and a "View Legend" button
+ */
+export const BenchmarkingLegendPopover: React.FC<BenchmarkingLegendPopoverProps> = ({ open, onOpenChange }) => (
+  <Popover
+    title='Comparison Factor'
+    open={open}
+    onOpenChange={onOpenChange}
+    content={
+      <Spacing itemSpacing={8} column>
+        {LEGEND_CONTENT.map(({ oeRatio, label }) => (
+          <HeatMapLegendSwatch
+            key={oeRatio}
+            color={getHeatMapColor(oeRatio)}
+            border={oeRatio === OE_RATIO_THRESHOLDS.NEUTRAL ? `2px solid ${HEATMAP_COLORS.blue700rgb}` : `2px solid transparent`}
+            label={label}
+          />
+        ))}
+      </Spacing>
+    }
+  >
+    <Button type='link' onClick={() => onOpenChange(true)}>
+      View Legend
+    </Button>
+  </Popover>
+);
+
+BenchmarkingLegendPopover.displayName = 'BenchmarkingLegendPopover';
+
+// #endregion
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/BuildTreeGrid.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/BuildTreeGrid.tsx
new file mode 100644
index 0000000..c26f25f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/BuildTreeGrid.tsx
@@ -0,0 +1,303 @@
+/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+import React, { JSX } from 'react';
+import DataHeaderCell from '@strata/tempo/lib/dataheader/DataHeaderCell';
+import DataHeaderGroup from '@strata/tempo/lib/dataheader/DataHeaderGroup';
+import DataHeaderRow from '@strata/tempo/lib/dataheader/DataHeaderRow';
+import Text from '@strata/tempo/lib/text';
+import TreeGrid from '@strata/tempo/lib/treegrid';
+import { ColumnGroup, isGapColumn, isNumberColumn, ITreeGridColumnConfig, DEFAULT_GRID_PX_WIDTH } from '../data/ITreeGridColumnConfig';
+
+// #region Type Definitions
+
+/**
+ * Configuration options for building TreeGrid components.
+ */
+export interface IBuildTreeGridOptions {
+  /** Whether the grid is displayed on the detail page (affects detail column visibility). */
+  isDetailPage: boolean;
+}
+
+/**
+ * Result containing both TreeGrid columns and header group.
+ */
+export interface IBuildTreeGridResult {
+  /** Array of TreeGrid column elements ready to render. */
+  columns: JSX.Element[];
+  /** DataHeaderGroup element for TreeGrid header. */
+  headerGroup: JSX.Element;
+}
+
+// #endregion
+
+// #region Constants
+
+/**
+ * Header group display configuration mapping column groups to their display names.
+ * Groups with null values (name, detail) do not display group headers.
+ */
+const GROUP_HEADERS: Record<ColumnGroup, string | null> = {
+  name: null,
+  detail: null,
+  entirePopulation: 'Entire Population',
+  refinedPopulation: 'Refined Population',
+  benchmark: 'Benchmark Data',
+  excludedPopulation: 'Excluded Population'
+};
+
+// #endregion
+
+// #region Helper Functions
+
+/**
+ * Gets visible (non-hidden, non-gap) columns for a specific group.
+ * @param configs - Array of column configurations
+ * @param group - The column group to filter by
+ * @returns Array of visible columns in the group
+ */
+const getVisibleColumnsForGroup = (configs: ITreeGridColumnConfig[], group: ColumnGroup): ITreeGridColumnConfig[] => {
+  return configs.filter((c) => c.group === group && !c.hidden && !c.isGap);
+};
+
+/**
+ * Checks if a group has any visible columns.
+ * @param configs - Array of column configurations
+ * @param group - The column group to check
+ * @returns True if the group has at least one visible column
+ */
+const hasVisibleColumns = (configs: ITreeGridColumnConfig[], group: ColumnGroup): boolean => {
+  return getVisibleColumnsForGroup(configs, group).length > 0;
+};
+
+/**
+ * Calculates the number of visible columns in a group (for colspan).
+ * @param configs - Array of column configurations
+ * @param group - The column group to calculate span for
+ * @returns Number of visible columns in the group
+ */
+const getGroupSpan = (configs: ITreeGridColumnConfig[], group: ColumnGroup): number => {
+  return getVisibleColumnsForGroup(configs, group).length;
+};
+
+/**
+ * Calculates the total width for all visible columns in a group.
+ * @param configs - Array of column configurations
+ * @param group - The column group to calculate width for
+ * @returns Total width in pixels
+ */
+const getGroupWidth = (configs: ITreeGridColumnConfig[], group: ColumnGroup): number => {
+  return getVisibleColumnsForGroup(configs, group).reduce((sum, col) => sum + (col.width ?? DEFAULT_GRID_PX_WIDTH), 0);
+};
+
+/**
+ * Checks if a gap column exists after the specified group.
+ * @param configs - Array of column configurations
+ * @param group - The column group to check for gaps after
+ * @returns True if a gap exists after the group
+ */
+const hasGapAfterGroup = (configs: ITreeGridColumnConfig[], group: ColumnGroup): boolean => {
+  return configs.some((c) => c.group === group && c.isGap);
+};
+
+/**
+ * Gets unique column groups in the order they appear in configurations.
+ * @param configs - Array of column configurations
+ * @returns Array of unique groups in display order
+ */
+const getGroupOrder = (configs: ITreeGridColumnConfig[]): ColumnGroup[] => {
+  const groupOrder: ColumnGroup[] = [];
+  const seenGroups = new Set<ColumnGroup>();
+
+  configs.forEach((config) => {
+    if (!seenGroups.has(config.group) && !config.isGap) {
+      groupOrder.push(config.group);
+      seenGroups.add(config.group);
+    }
+  });
+
+  return groupOrder;
+};
+
+// #endregion
+
+// #region Column Builders
+
+/**
+ * Builds TreeGrid column elements from column configurations.
+ * @param configs - Array of column configurations (excluding hidden columns)
+ * @returns Array of TreeGrid column JSX elements
+ */
+const buildTreeGridColumns = (configs: ITreeGridColumnConfig[]): JSX.Element[] => {
+  return configs.map((config, index) => {
+    const key = config.key ?? config.field ?? `col-${index}`;
+
+    if (isGapColumn(config)) {
+      return <TreeGrid.GapColumn key={key} />;
+    }
+
+    if (isNumberColumn(config)) {
+      return (
+        <TreeGrid.NumberColumn
+          key={key}
+          field={config.field}
+          header={config.header}
+          sortable={config.sortable ?? true}
+          sortField={config.sortField ?? config.field}
+          format={config.format ?? 'number'}
+          body={config.body}
+          align={config.align ?? 'right'}
+          width={config.width ?? DEFAULT_GRID_PX_WIDTH}
+        />
+      );
+    }
+
+    return (
+      <TreeGrid.Column
+        key={key}
+        expander={config.expander}
+        field={config.field}
+        header={config.header}
+        sortable={config.sortable ?? true}
+        sortField={config.sortField ?? config.field}
+        body={config.body}
+        align={config.align}
+        width={config.width ?? DEFAULT_GRID_PX_WIDTH}
+      />
+    );
+  });
+};
+
+// #endregion
+
+// #region Header Builders
+
+/**
+ * Builds the primary header row containing group headers.
+ * @param configs - Array of column configurations
+ * @param isDetailPage - Whether the grid is on the detail page
+ * @returns DataHeaderRow element with group headers
+ */
+const buildPrimaryHeaderRow = (configs: ITreeGridColumnConfig[], isDetailPage: boolean): JSX.Element => {
+  const headerCells: JSX.Element[] = [];
+  const groupOrder = getGroupOrder(configs);
+
+  groupOrder.forEach((group) => {
+    if (!hasVisibleColumns(configs, group)) {
+      return;
+    }
+
+    // Special handling for name and detail columns (no group headers)
+    if (group === 'name' || group === 'detail') {
+      const width = getGroupWidth(configs, group);
+      const key = group === 'name' ? 'name-header' : 'detail-header';
+
+      // Only show detail column on detail page
+      if (group === 'detail' && !isDetailPage) {
+        return;
+      }
+
+      headerCells.push(<DataHeaderCell key={key} width={width} />);
+
+      // Add gap after name column (column 2 position)
+      if (group === 'name') {
+        headerCells.push(<DataHeaderCell key='gap-after-name' rowSpan={2} isGap />);
+      }
+
+      return;
+    }
+
+    // Regular group headers
+    const span = getGroupSpan(configs, group);
+    const width = getGroupWidth(configs, group);
+    const headerText = GROUP_HEADERS[group];
+
+    if (headerText) {
+      headerCells.push(<DataHeaderCell key={`${group}-header`} colSpan={span} width={width} header={<Text strong>{headerText}</Text>} align='center' />);
+    }
+
+    // Add gap after group if it exists
+    if (hasGapAfterGroup(configs, group)) {
+      headerCells.push(<DataHeaderCell key={`gap-${group}`} rowSpan={2} isGap />);
+    }
+  });
+
+  return <DataHeaderRow key='primary-header'>{headerCells}</DataHeaderRow>;
+};
+
+/**
+ * Builds the secondary header row containing individual column headers.
+ * @param configs - Array of column configurations (only visible columns)
+ * @returns DataHeaderRow element with column headers
+ */
+const buildSecondaryHeaderRow = (configs: ITreeGridColumnConfig[]): JSX.Element => {
+  const headerCells: JSX.Element[] = [];
+
+  // Only include visible, non-gap columns
+  const visibleColumns = configs.filter((c) => !c.hidden && !c.isGap);
+
+  visibleColumns.forEach((col, index) => {
+    headerCells.push(
+      <DataHeaderCell
+        key={col.key ?? col.field ?? `col-${index}`}
+        field={col.field}
+        header={col.header}
+        sortable={col.sortable ?? true}
+        sortField={col.sortField ?? col.field}
+        align={col.align ?? 'right'}
+        width={col.width ?? DEFAULT_GRID_PX_WIDTH}
+      />
+    );
+  });
+
+  return <DataHeaderRow key='secondary-header'>{headerCells}</DataHeaderRow>;
+};
+
+/**
+ * Builds the complete header group with primary and secondary rows.
+ * @param configs - Array of column configurations
+ * @param isDetailPage - Whether the grid is on the detail page
+ * @returns DataHeaderGroup element
+ */
+const buildHeaderGroup = (configs: ITreeGridColumnConfig[], isDetailPage: boolean): JSX.Element => {
+  return (
+    <DataHeaderGroup>
+      {buildPrimaryHeaderRow(configs, isDetailPage)}
+      {buildSecondaryHeaderRow(configs)}
+    </DataHeaderGroup>
+  );
+};
+
+// #endregion
+
+// #region Main Export
+
+/**
+ * Builds both TreeGrid columns and header group from unified column configurations.
+ * Ensures columns and headers stay synchronized by deriving both from the same source.
+ *
+ * @param configs - Array of column configurations with visibility and group settings
+ * @param options - Build options including detail page flag
+ * @returns Object containing both TreeGrid columns and header group elements
+ *
+ * @example
+ * const { columns, headerGroup } = buildTreeGrid(columnConfigs, { isDetailPage: true });
+ *
+ * <TreeGrid columnHeaderGroup={headerGroup}>
+ *   {columns}
+ * </TreeGrid>
+ */
+export const buildTreeGrid = (configs: ITreeGridColumnConfig[], options: IBuildTreeGridOptions): IBuildTreeGridResult => {
+  const { isDetailPage } = options;
+
+  // Filter to only visible columns for rendering
+  const visibleConfigs = configs.filter((config) => !config.hidden);
+
+  // Build column elements
+  const columns = buildTreeGridColumns(visibleConfigs);
+
+  // Build header group
+  const headerGroup = buildHeaderGroup(configs, isDetailPage);
+
+  return { columns, headerGroup };
+};
+
+// #endregion
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/Filters.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/Filters.test.tsx
new file mode 100644
index 0000000..6791164
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/Filters.test.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import { render } from '../../test-utils/testUtils';
+import { dropDownTestUtils } from '@strata/test-utils/lib';
+import Filters from './Filters';
+import { newExclusionCriteria, parseLosTrimValue, parseCostTrimValue } from '../data/IExclusionCriteria';
+
+const baseProps = {
+  handleALOSChange: jest.fn(),
+  handleTDVCChange: jest.fn(),
+  parseLosTrimValue,
+  parseCostTrimValue,
+  exclusionCriteria: newExclusionCriteria()
+};
+
+test('Length of Stay dropdown defaults to No Exclusion', () => {
+  render(<Filters {...baseProps} />);
+  const losDropdown = dropDownTestUtils.getDropDown('Length of Stay');
+  expect(dropDownTestUtils.getSelectedOption(losDropdown)).toEqual('No Exclusion');
+});
+
+test('Variable Direct Cost dropdown defaults to No Exclusion', () => {
+  render(<Filters {...baseProps} />);
+  const vdcDropdown = dropDownTestUtils.getDropDown('Variable Direct Cost');
+  expect(dropDownTestUtils.getSelectedOption(vdcDropdown)).toEqual('No Exclusion');
+});
+
+test('handleALOSChange is called when LOS selection changes', async () => {
+  const handleALOSChange = jest.fn();
+  render(<Filters {...baseProps} handleALOSChange={handleALOSChange} />);
+  const losDropdown = dropDownTestUtils.getDropDown('Length of Stay');
+  await dropDownTestUtils.selectOption(losDropdown, 'Exclude > 2 Deviations');
+  expect(handleALOSChange).toHaveBeenCalled();
+});
+
+test('handleTDVCChange is called when VDC selection changes', async () => {
+  const handleTDVCChange = jest.fn();
+  render(<Filters {...baseProps} handleTDVCChange={handleTDVCChange} />);
+  const vdcDropdown = dropDownTestUtils.getDropDown('Variable Direct Cost');
+  await dropDownTestUtils.selectOption(vdcDropdown, 'Exclude > 2 Deviations');
+  expect(handleTDVCChange).toHaveBeenCalled();
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/Filters.tsx
new file mode 100644
index 0000000..d61bed6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/Filters.tsx
@@ -0,0 +1,101 @@
+import DropDown, { DropDownValue } from '@strata/tempo/lib/dropdown/DropDown';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text';
+import React from 'react';
+import IExclusionCriteria from '../data/IExclusionCriteria';
+
+export interface IFiltersProps {
+  handleALOSChange: (value: DropDownValue) => void;
+  handleTDVCChange: (value: DropDownValue) => void;
+  parseLosTrimValue: (exclusionCriteria: IExclusionCriteria) => void;
+  parseCostTrimValue: (exclusionCriteria: IExclusionCriteria) => void;
+  exclusionCriteria: IExclusionCriteria;
+}
+
+const Filters: React.FC<IFiltersProps> = (props) => {
+  const { handleALOSChange, handleTDVCChange, parseLosTrimValue, parseCostTrimValue, exclusionCriteria } = props;
+
+  const handleParseLosTrimValue = (exclusionCriteria: IExclusionCriteria) => {
+    if (parseLosTrimValue) {
+      return parseLosTrimValue(exclusionCriteria);
+    }
+    return 'none0';
+  };
+  const handleParseCostTrimValue = (exclusionCriteria: IExclusionCriteria) => {
+    if (parseCostTrimValue) {
+      return parseCostTrimValue(exclusionCriteria);
+    }
+    return 'none0';
+  };
+
+  return (
+    <>
+      <Spacing itemSpacing={8} vAlign='center' column margin='0px 0px 8px 0px'>
+        <Text strong>Length of Stay</Text>
+        <DropDown width={250} onChange={handleALOSChange} defaultValue={'none0'} value={handleParseLosTrimValue(exclusionCriteria) ?? 'none0'}>
+          <DropDown.Item value='none0' hierarchy='parent'>
+            No Exclusion
+          </DropDown.Item>
+          <DropDown.Item value='mad' hierarchy='parent' disabled>
+            Median Absolute Deviation (MAD)
+          </DropDown.Item>
+          <DropDown.Item value='mad2' hierarchy='child'>
+            Exclude &gt; 2 Deviations
+          </DropDown.Item>
+          <DropDown.Item value='mad3' hierarchy='child'>
+            Exclude &gt; 3 Deviations
+          </DropDown.Item>
+          <DropDown.Item value='iqr' hierarchy='parent' disabled>
+            Interquartile Range (IQR)
+          </DropDown.Item>
+          <DropDown.Item value='iqr1' hierarchy='child'>
+            Exclude &gt; 1 IQR
+          </DropDown.Item>
+          <DropDown.Item value='iqr1.5' hierarchy='child'>
+            Exclude &gt; 1.5 IQR
+          </DropDown.Item>
+          <DropDown.Item value='iqr2' hierarchy='child'>
+            Exclude &gt; 2 IQR
+          </DropDown.Item>
+          <DropDown.Item value='iqr2.5' hierarchy='child'>
+            Exclude &gt; 2.5 IQR
+          </DropDown.Item>
+        </DropDown>
+      </Spacing>
+      <Spacing itemSpacing={8} margin={'12px 0 0 0'} vAlign='center' column>
+        <Text strong>Variable Direct Cost</Text>
+        <DropDown width={250} onChange={handleTDVCChange} defaultValue={'none0'} value={handleParseCostTrimValue(exclusionCriteria) ?? 'none0'}>
+          <DropDown.Item value='none0' hierarchy='parent'>
+            No Exclusion
+          </DropDown.Item>
+          <DropDown.Item value='1' hierarchy='parent' disabled>
+            Median Absolute Deviation (MAD)
+          </DropDown.Item>
+          <DropDown.Item value='mad2' hierarchy='child'>
+            Exclude &gt; 2 Deviations
+          </DropDown.Item>
+          <DropDown.Item value='mad3' hierarchy='child'>
+            Exclude &gt; 3 Deviations
+          </DropDown.Item>
+          <DropDown.Item value='4' hierarchy='parent' disabled>
+            Interquartile Range (IQR)
+          </DropDown.Item>
+          <DropDown.Item value='iqr1' hierarchy='child'>
+            Exclude &gt; 1 IQR
+          </DropDown.Item>
+          <DropDown.Item value='iqr1.5' hierarchy='child'>
+            Exclude &gt; 1.5 IQR
+          </DropDown.Item>
+          <DropDown.Item value='iqr2' hierarchy='child'>
+            Exclude &gt; 2 IQR
+          </DropDown.Item>
+          <DropDown.Item value='iqr2.5' hierarchy='child'>
+            Exclude &gt; 2.5 IQR
+          </DropDown.Item>
+        </DropDown>
+      </Spacing>
+    </>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/RefinementOptionsDrawer.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/RefinementOptionsDrawer.tsx
new file mode 100644
index 0000000..2d370d5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/RefinementOptionsDrawer.tsx
@@ -0,0 +1,278 @@
+import { useHelpCenter } from '@strata/core/lib/help/useHelpCenter';
+import Button from '@strata/tempo/lib/button/Button';
+import Drawer from '@strata/tempo/lib/drawer/Drawer';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import InputNumber from '@strata/tempo/lib/inputnumber/InputNumber';
+import useModal from '@strata/tempo/lib/modal/useModal';
+import Popover from '@strata/tempo/lib/popover/Popover';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text';
+import dayjs from 'dayjs';
+import React from 'react';
+import { ChipKey, ChipType, IFilterChipItem } from '../../shared/components/FilterBar/data/IFilterChipItem';
+import FilterChip from '../../shared/components/FilterBar/FilterChip';
+import FilterTree from '../../shared/components/FilterBar/FilterTree';
+import IExclusionCriteria, { parseCostTrimValue, parseLosTrimValue, TopNField } from '../data/IExclusionCriteria';
+import IFilter from '../data/IFilter';
+import { useBenchmarkingBanner } from '../hooks/useBenchmarkingBanner';
+import { useRefinementDrawer } from '../hooks/useRefinementDrawer';
+import { BenchmarkingBannerText } from './BenchmarkingBannerText';
+import Filters from './Filters';
+
+export interface IRefinementOptionsDrawerProps {
+  isVisible: boolean;
+  filterId: string;
+  filterChips: IFilterChipItem[];
+  excludedChips: ChipKey[];
+  hiddenChips: ChipKey[];
+  dateRange: [dayjs.Dayjs, dayjs.Dayjs];
+  exclusionCriteria: IExclusionCriteria;
+  hasBenchmarking?: boolean;
+  hideTopNFilter?: boolean;
+  onClose: () => void;
+  onApply?: (drawerExclusionCriteria: IExclusionCriteria, drawerFilters: IFilter) => void;
+  setDateRange: (dateRange: [dayjs.Dayjs, dayjs.Dayjs]) => void;
+  onChangeEncounters?: (resolve: any) => void;
+}
+
+const RefinementOptionsDrawer: React.FC<IRefinementOptionsDrawerProps> = (props) => {
+  const { isVisible, filterChips, excludedChips, hiddenChips, dateRange, exclusionCriteria, hasBenchmarking, hideTopNFilter, onApply, onClose, setDateRange, onChangeEncounters } = props;
+
+  const helpCenter = useHelpCenter();
+  const modal = useModal();
+
+  // Manage benchmarking banner visibility
+  // Note: peerGroupId is omitted here as the drawer doesn't have peer group context
+  // The banner will show based solely on the hasBenchmarking flag
+  const { showBanner: showBannerForFilters, onDismiss: onDismissForFilters } = useBenchmarkingBanner({ benchmarking: hasBenchmarking ?? false });
+
+  // Use hook to manage all drawer state and logic
+  const {
+    filters,
+    drawerChipFilters,
+    drawerExclusionCriteria,
+    activeFilterId,
+    isFilterPopoverVisible,
+    selectedKeys,
+    handleOpenChange,
+    handleClose,
+    handleSelect,
+    handleAddFilter,
+    isSphPopoverVisible,
+    sphSelectedKeys,
+    sphCustomItems,
+    handleSphOpenChange,
+    handleSphClose,
+    handleSphSelect,
+    handleAddSphFilter,
+    handleChipOpenChange,
+    handleFilterChange,
+    handleChipDelete,
+    handleChipClick,
+    handleALOSChange,
+    handleTDVCChange,
+    handleTopNFieldChange,
+    handleTopNChange,
+    getApplyPayload
+  } = useRefinementDrawer({
+    isVisible,
+    filterChips,
+    excludedChips,
+    dateRange,
+    exclusionCriteria,
+    hasBenchmarking,
+    setDateRange
+  });
+
+  const handleApplyClick = () => {
+    const applyChanges = () => {
+      if (onApply) {
+        const { drawerExclusionCriteria: criteria, activeFilters } = getApplyPayload();
+        onApply(criteria, { filterChipItems: activeFilters });
+      }
+      onClose();
+    };
+
+    if (onChangeEncounters) {
+      onChangeEncounters(applyChanges);
+    } else if (!drawerChipFilters?.some((fil) => fil.chipType !== ChipType.dateRange)) {
+      modal.confirmChanges({
+        title: 'Loading data without filters may take a while. To speed up the process, please apply filters to narrow down the results.',
+        okText: 'Continue',
+        cancelText: 'Refinement Options',
+        onOk() {
+          applyChanges();
+        }
+      });
+    } else {
+      applyChanges();
+    }
+  };
+
+  return (
+    <Drawer
+      title='Refinement Options'
+      visible={isVisible}
+      onClose={() => onClose()}
+      width={500}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1877')}></Button>
+          <Spacing>
+            <Button onClick={() => onClose()}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyClick}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+    >
+      <BenchmarkingBannerText hasDismissButton={false} showBenchmarkingBanner={showBannerForFilters} onDismissBanner={onDismissForFilters} />
+      <Spacing margin='8px 0px'>
+        <Text.Heading level={3} strong>
+          Population Criteria
+        </Text.Heading>
+      </Spacing>
+      <Spacing margin='0px 0px 16px 0px'>
+        <Popover
+          title=' '
+          open={isFilterPopoverVisible}
+          onOpenChange={handleOpenChange}
+          content={
+            <Spacing width={380} height={hasBenchmarking ? 'auto' : 400} itemSpacing={8} column>
+              <BenchmarkingBannerText hasDismissButton={false} showBenchmarkingBanner={hasBenchmarking ?? false} showBenchmarkingText={true} />
+              <FilterTree
+                excludedChips={[
+                  ...excludedChips,
+                  // Exclude criteria that are already added
+                  ...(drawerChipFilters ?? []).map((chip) => chip.key as ChipKey)
+                ]}
+                selectedKeys={selectedKeys}
+                isVisible={isFilterPopoverVisible}
+                hasBenchmarking={hasBenchmarking}
+                treeHeight={310}
+                onSelect={handleSelect}
+              />
+              <Spacing height={'100%'} vAlign='bottom' hAlign='right'>
+                <Button onClick={handleClose}>Cancel</Button>
+                <Button disabled={selectedKeys.length === 0} onClick={handleAddFilter} type='primary'>
+                  Add
+                </Button>
+              </Spacing>
+            </Spacing>
+          }
+        >
+          <Button disabled={filters.length === 0} style={{ marginRight: '8px' }} icon={<PlusIcon />}>
+            Add Population Criteria
+          </Button>
+        </Popover>
+      </Spacing>
+      <FilterChip
+        filters={(drawerChipFilters ?? []).filter((chip) => chip.chipType !== ChipType.sphCriteria)}
+        activeFilterId={activeFilterId}
+        disabledChips={excludedChips}
+        hiddenChips={hiddenChips}
+        dateStart={dateRange[0]}
+        dateEnd={dateRange[1]}
+        onChipClick={handleChipClick}
+        onChipDelete={handleChipDelete}
+        onOpenChange={handleChipOpenChange}
+        onFilterChange={handleFilterChange}
+        isReadOnly={false}
+      />
+      <Spacing margin='32px 0px 12px 0px'>
+        <Text.Heading level={3} strong>
+          Outlier Exclusions
+        </Text.Heading>
+      </Spacing>
+      {Filters({ handleALOSChange, handleTDVCChange, parseLosTrimValue, parseCostTrimValue, exclusionCriteria: drawerExclusionCriteria })}
+      {/* SPH Criteria Section - Only show when benchmarking is enabled */}
+      {hasBenchmarking && (
+        <>
+          <Spacing margin='32px 0px 8px 0px'>
+            <Text.Heading level={3} strong>
+              Benchmarking Criteria
+            </Text.Heading>
+          </Spacing>
+          <Spacing margin='0px 0px 16px 0px'>
+            <Popover
+              title='Benchmarking Criteria'
+              open={isSphPopoverVisible}
+              onOpenChange={handleSphOpenChange}
+              content={
+                <Spacing width={380} height={400} itemSpacing={8} column>
+                  <FilterTree
+                    isVisible={isSphPopoverVisible}
+                    selectedKeys={sphSelectedKeys}
+                    excludedChips={[]}
+                    customItems={[
+                      // Exclude benchmarking criteria that are already added
+                      ...sphCustomItems.filter(
+                        (sphItem) => !(drawerChipFilters ?? []).filter((chip) => chip.chipType === ChipType.sphCriteria).some((existingChip) => existingChip.key === sphItem.key)
+                      )
+                    ]}
+                    onSelect={handleSphSelect}
+                    treeHeight={310}
+                  />
+                  <Spacing height={'100%'} vAlign='bottom' hAlign='right'>
+                    <Button onClick={handleSphClose}>Cancel</Button>
+                    <Button disabled={sphSelectedKeys.length === 0} onClick={handleAddSphFilter} type='primary'>
+                      Add
+                    </Button>
+                  </Spacing>
+                </Spacing>
+              }
+            >
+              <Button style={{ marginRight: '8px' }} icon={<PlusIcon />}>
+                Add Benchmarking Criteria
+              </Button>
+            </Popover>
+          </Spacing>
+
+          <FilterChip
+            filters={(drawerChipFilters ?? []).filter((chip) => chip.chipType === ChipType.sphCriteria)}
+            activeFilterId={activeFilterId}
+            disabledChips={excludedChips}
+            hiddenChips={hiddenChips}
+            dateStart={dateRange[0]}
+            dateEnd={dateRange[1]}
+            onChipClick={handleChipClick}
+            onChipDelete={handleChipDelete}
+            onOpenChange={handleChipOpenChange}
+            onFilterChange={handleFilterChange}
+            isReadOnly={false}
+          />
+        </>
+      )}
+      {!hideTopNFilter && (
+        <>
+          <Spacing margin='32px 0px 12px 0px'>
+            <Text.Heading level={3} strong>
+              Top N Filter
+            </Text.Heading>
+          </Spacing>
+          <Spacing itemSpacing={8} vAlign='center' column>
+            <Text strong>Dimension</Text>
+            <DropDown width={250} allowClear value={drawerExclusionCriteria.topNField ?? undefined} onChange={(value) => handleTopNFieldChange && handleTopNFieldChange((value as TopNField) ?? null)}>
+              <DropDown.Item value={TopNField.EncounterVolume}>Encounter Volume</DropDown.Item>
+              {hasBenchmarking && <DropDown.Item value={TopNField.CostOeRatio}>O/E Variable Direct Cost</DropDown.Item>}
+              <DropDown.Item value={TopNField.IdentifiedVariation}>Cost Driver Identified Variation</DropDown.Item>
+            </DropDown>
+            <Text strong>Limit (1–50)</Text>
+            <InputNumber
+              disabled={!drawerExclusionCriteria.topNField}
+              width={250}
+              precision={0}
+              value={drawerExclusionCriteria.topN ?? undefined}
+              onChange={(value) => handleTopNChange && handleTopNChange(typeof value === 'number' ? Math.max(1, Math.min(value, 50)) : null)}
+            />
+          </Spacing>
+        </>
+      )}
+    </Drawer>
+  );
+};
+
+export default RefinementOptionsDrawer;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/StrataSignalPopover.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/StrataSignalPopover.tsx
new file mode 100644
index 0000000..8934969
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/components/StrataSignalPopover.tsx
@@ -0,0 +1,143 @@
+import React from 'react';
+import Popover from '@strata/tempo/lib/popover';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text';
+import { PropsWithChildren } from 'react';
+import CustomIcon from '@strata/tempo/lib/icon/CustomIcon';
+
+const StrataSignalIconSvg = () => (
+  <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 81.4 86.87' height='1em' width='1em'>
+    <g>
+      <g>
+        <path
+          fill='#007fa3'
+          d='M26.44,36.58s-.06.04-.09.05l-14.31,7.65c-2.67,1.43-3.68,4.75-2.25,7.42.99,1.85,2.88,2.9,4.84,2.9.87,0,1.76-.21,2.58-.65l14.31-7.65c3.98-2.13,6.36-5.54,6.53-9.35.09-2.02-.45-3.98-1.53-5.75l-10.08,5.38ZM27.16,36.92h0,0Z'
+        />
+        <path
+          fill='#77c5d5'
+          d='M32.4,27.04L8.5,11.32c-2.53-1.66-5.93-.96-7.6,1.57-1.67,2.53-.96,5.93,1.57,7.6l23.89,15.73c.12.08.23.16.32.23-.07.05-.16.09-.24.14l10.08-5.38c-.96-1.57-2.35-2.99-4.12-4.16Z'
+        />
+      </g>
+      <g>
+        <path fill='#9ec752' d='M69.7,51.62l-14.72-9.72c-3.85-2.54-7.97-2.97-11.3-1.17-1.75.94-3.1,2.4-4,4.24l9.71,6.4v-.02l14.27,9.42c2.53,1.67,5.93.97,7.6-1.56,1.67-2.53.97-5.93-1.56-7.6Z' />
+        <path fill='#6ab650' d='M38.41,50.8l-.03,30.58c0,3.03,2.45,5.49,5.48,5.49h0c3.03,0,5.48-2.45,5.49-5.48l.03-30.02-9.71-6.4c-.81,1.67-1.25,3.64-1.26,5.83Z' />
+      </g>
+    </g>
+    <g>
+      <path
+        fill='#f2ab49'
+        d='M80.76,13.81c-1.43-2.67-4.75-3.68-7.42-2.26l-16.42,8.77-7.08,3.78c-.16.08-.3.15-.42.2h0s-9.8,5.23-9.8,5.23c0,.01.01.03.02.04.88,1.88,2.22,3.41,3.96,4.45,1.57.94,3.35,1.41,5.21,1.41,2.02,0,4.13-.55,6.2-1.66l23.51-12.55c2.67-1.43,3.68-4.75,2.26-7.42Z'
+      />
+      <path fill='#e86b05' d='M49.38,23.83l-.02-18.36c0-3.03-2.46-5.48-5.49-5.48h0c-3.03,0-5.48,2.46-5.48,5.49l.02,18.36c0,2.1.42,4.02,1.19,5.68l9.8-5.23c-.01-.13-.02-.29-.02-.47Z' />
+    </g>
+  </svg>
+);
+
+const StrataSignalIconWithTextSvg = () => (
+  <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 304.74 77.65' width='1em'>
+    <g>
+      <path
+        fill='#2d353c'
+        d='M166.51,47.02s-1.47,1.14-3.36,1.14c-1.64,0-2.86-.8-2.86-3.62v-11.78h4.48s1.17,0,1.17,0c.73,0,1.33-.59,1.33-1.33s-.59-1.33-1.33-1.33h-5.65v-4.41h-3.2v4.41h-3.09c-.73,0-1.33.59-1.33,1.33s.59,1.33,1.33,1.33h.01s3.07,0,3.07,0v11.69c0,4.79,2.14,6.56,5.76,6.56,2.23,0,3.91-.97,4.71-1.51l-1.05-2.48Z'
+      />
+      <path
+        fill='#2d353c'
+        d='M111.71,47.02s-1.47,1.14-3.36,1.14c-1.64,0-2.86-.8-2.86-3.62v-11.78h4.48s1.17,0,1.17,0c.73,0,1.33-.59,1.33-1.33s-.59-1.33-1.33-1.33h-5.65v-4.41h-3.2v4.41h-3.09c-.73,0-1.33.59-1.33,1.33s.59,1.33,1.33,1.33h.01s3.07,0,3.07,0v11.69c0,4.79,2.14,6.56,5.76,6.56,2.23,0,3.91-.97,4.71-1.51l-1.05-2.48Z'
+      />
+      <path
+        fill='#2d353c'
+        d='M80.32,47.91l1.3-2.6c1.51,1.47,3.7,2.69,6.68,2.69,2.81,0,5.12-1.3,5.12-3.15,0-2.14-2.48-2.73-4.96-3.36-3.78-.97-7.23-2.02-7.23-5.92,0-3.7,3.86-5.84,7.31-5.84,2.81,0,4.87.76,6.97,2.18l-1.26,2.6c-1.72-1.18-3.53-1.76-5.67-1.76s-4.07,1.18-4.07,2.77c0,2.02,2.27,2.48,4.66,2.98,3.7.84,7.52,2.23,7.52,6.26,0,4.33-4.41,6.26-8.4,6.26s-6.81-1.89-7.98-3.11Z'
+      />
+      <path fill='#2d353c' d='M116.47,30.14h3.19v4.33c1.18-2.69,3.82-4.75,7.9-4.75v3.49c-4.79,0-7.9,2.69-7.9,7.69v9.7h-3.19v-20.46Z' />
+      <path
+        fill='#2d353c'
+        d='M129.9,40.39c0-6.01,3.99-10.67,9.66-10.67,3.28,0,6.18,1.34,7.69,3.99v-3.57h3.19v20.46h-3.19v-3.57c-1.51,2.69-4.41,3.99-7.69,3.99-5.67,0-9.66-4.7-9.66-10.63ZM147.25,40.39c0-4.28-3.07-7.56-6.97-7.56s-7.1,3.19-7.1,7.56,3.02,7.52,7.1,7.52,6.97-3.23,6.97-7.52Z'
+      />
+      <path
+        fill='#2d353c'
+        d='M169.63,40.39c0-6.01,3.99-10.67,9.66-10.67,3.28,0,6.18,1.34,7.69,3.99v-3.57h3.19v20.46h-3.19v-3.57c-1.51,2.69-4.41,3.99-7.69,3.99-5.67,0-9.66-4.7-9.66-10.63ZM186.98,40.39c0-4.28-3.07-7.56-6.97-7.56s-7.1,3.19-7.1,7.56,3.02,7.52,7.1,7.52,6.97-3.23,6.97-7.52Z'
+      />
+      <path
+        fill='#007fa3'
+        d='M195.71,47.99l1.76-3.82c1.34,1.09,3.49,2.48,6.6,2.48,1.89,0,4.12-.71,4.12-2.19s-2.1-1.89-4.16-2.48c-3.95-1.09-7.31-2.27-7.31-6.34s4.16-6.26,7.81-6.26c3.11,0,5.17.8,7.44,2.14l-1.72,3.78c-1.85-1.05-3.61-1.55-5.67-1.55-1.55,0-3.11.71-3.11,1.81,0,1.43,1.72,1.76,3.57,2.14,3.86.84,7.9,2.39,7.9,6.68,0,4.87-5,6.64-8.86,6.64-4.29,0-7.23-1.93-8.36-3.02Z'
+      />
+      <path fill='#007fa3' d='M216.43,23.97c0-1.55,1.26-2.86,2.81-2.86s2.86,1.3,2.86,2.86-1.3,2.81-2.86,2.81-2.81-1.26-2.81-2.81ZM216.93,29.81h4.66v20.79h-4.66v-20.79Z' />
+      <path
+        fill='#007fa3'
+        d='M227.39,54l1.81-2.94c1.64,1.43,4.07,2.14,6.22,2.14,4.45,0,6.64-2.86,6.64-7.1v-.17c-.84,1.68-3.07,3.57-6.85,3.57-5.75,0-9.54-4.45-9.54-10.04s3.78-10.08,9.54-10.08c3.15,0,5.96,1.47,7.06,3.53v-3.11h4.45v16.05c0,7.27-4.87,10.92-10.84,10.92-3.57,0-6.55-1.05-8.49-2.77ZM242.05,39.3c0-3.32-2.56-5.84-5.84-5.84s-5.8,2.56-5.8,6.01,2.52,5.96,5.8,5.96,5.84-2.52,5.84-6.13Z'
+      />
+      <path
+        fill='#007fa3'
+        d='M251.45,29.81h4.66v2.98c1.55-2.31,3.95-3.4,6.72-3.4,5.63,0,7.48,3.74,7.48,9.28v11.93h-4.66v-11.34c0-3.4-.76-5.38-4.24-5.38-3.07,0-5.29,2.39-5.29,5.84v10.88h-4.66v-20.79Z'
+      />
+      <path
+        fill='#007fa3'
+        d='M273.93,40.22c0-6.01,3.91-10.84,9.62-10.84,2.81,0,5.29,1.13,6.93,3.07v-2.65h4.66v20.79h-4.66v-2.6c-1.64,1.93-4.12,3.02-6.93,3.02-5.71,0-9.62-4.83-9.62-10.8ZM290.48,40.22c0-3.65-2.44-6.34-5.75-6.34-3.53,0-6.05,2.69-6.05,6.34s2.52,6.3,6.05,6.3c3.28,0,5.75-2.6,5.75-6.3Z'
+      />
+      <path fill='#007fa3' d='M300.08,22.96h4.66v27.64h-4.66v-27.64Z' />
+    </g>
+    <g>
+      <g>
+        <g>
+          <path
+            fill='#007fa3'
+            d='M23.63,32.69s-.05.03-.08.05l-12.79,6.84c-2.39,1.28-3.29,4.25-2.01,6.64.88,1.65,2.58,2.59,4.33,2.59.78,0,1.57-.19,2.31-.58l12.79-6.84c3.55-1.9,5.68-4.95,5.84-8.36.08-1.81-.4-3.56-1.37-5.14l-9.01,4.81ZM24.28,33h0,0Z'
+          />
+          <path
+            fill='#77c5d5'
+            d='M28.96,24.17L7.6,10.12c-2.26-1.49-5.3-.86-6.79,1.4-1.49,2.26-.86,5.3,1.4,6.79l21.36,14.06c.11.07.2.14.28.2-.06.04-.14.08-.22.13l9.01-4.81c-.86-1.4-2.1-2.67-3.68-3.72Z'
+          />
+        </g>
+        <g>
+          <path
+            fill='#9ec752'
+            d='M62.3,46.14l-13.16-8.68c-3.44-2.27-7.12-2.65-10.1-1.05-1.56.84-2.77,2.15-3.58,3.79l8.68,5.72h0s12.75,8.4,12.75,8.4c2.26,1.49,5.3.87,6.79-1.39,1.49-2.26.87-5.3-1.39-6.79Z'
+          />
+          <path fill='#6ab650' d='M34.34,45.41l-.02,27.33c0,2.71,2.19,4.9,4.9,4.91h0c2.71,0,4.9-2.19,4.9-4.9l.02-26.83-8.68-5.72c-.73,1.49-1.12,3.26-1.12,5.22Z' />
+        </g>
+      </g>
+      <g>
+        <path
+          fill='#f2ab49'
+          d='M72.18,12.34c-1.28-2.39-4.25-3.29-6.63-2.02l-14.68,7.84-6.33,3.38c-.14.07-.27.13-.38.18h0s-8.76,4.67-8.76,4.67c0,.01,0,.03.02.04.79,1.68,1.99,3.05,3.54,3.98,1.41.84,2.99,1.26,4.66,1.26,1.8,0,3.69-.49,5.54-1.48l21.01-11.22c2.39-1.28,3.29-4.25,2.02-6.63Z'
+        />
+        <path fill='#e86b05' d='M44.14,21.3l-.02-16.41c0-2.71-2.2-4.9-4.9-4.9h0c-2.71,0-4.9,2.2-4.9,4.91l.02,16.41c0,1.88.38,3.59,1.07,5.08l8.76-4.67c-.01-.12-.02-.26-.02-.42Z' />
+      </g>
+    </g>
+  </svg>
+);
+
+// tempo's CustomIcon goes up to 40px, so for larger sizes we use AntDesign's Icon component
+export const StrataSignalIcon = () => <CustomIcon component={StrataSignalIconSvg} style={{ fontSize: 18 }} />;
+export const StrataSignalIconWithText = () => <CustomIcon component={StrataSignalIconWithTextSvg} style={{ fontSize: 60 }} />;
+
+const StrataSignalPopoverContent = () => {
+  return (
+    <Spacing column width={256} itemSpacing={4}>
+      <Spacing column itemSpacing={16}>
+        <p>You are viewing benchmark results generated using the StrataSphere Cost Model, Strata&apos;s standard cost model template used to produce consistent, comparable costing outputs.</p>
+        <p>Your results are shown alongside a benchmark cohort, which groups organizations with similar characteristics to provide context for comparison.</p>
+        <p>Benchmark values reflect cohort-level aggregates and should be interpreted as directional reference points rather than exact matches to your organization’s unique costing approach.</p>
+      </Spacing>
+      <Spacing margin={'10px 0 0 0'}>
+        <Text size='small' color='secondary'>
+          <Spacing column={false} itemSpacing={4} vAlign='center'>
+            <span>Powered by</span>
+            <StrataSignalIconWithText />
+          </Spacing>
+        </Text>
+      </Spacing>
+    </Spacing>
+  );
+};
+
+// adds a popover around the icon and any children passed in
+export const StrataSignalPopover = (props: PropsWithChildren<unknown>) => {
+  return (
+    <Popover title='Benchmark Cohort' trigger='click' content={StrataSignalPopoverContent}>
+      <div style={{ display: 'inline-flex', alignItems: 'center' }}>
+        {props.children} <span style={{ marginLeft: 8, cursor: 'pointer' }}>{StrataSignalIcon()}</span>
+      </div>
+    </Popover>
+  );
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/BenchmarkingInsightsGranularity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/BenchmarkingInsightsGranularity.ts
new file mode 100644
index 0000000..375643b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/BenchmarkingInsightsGranularity.ts
@@ -0,0 +1,5 @@
+export enum BenchmarkingInsightsGranularity {
+  CaseTypeFamily = 0,
+  DrgCode = 1,
+  PrimaryCpt = 2
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/CaseTypeFamilyFunctions.test.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/CaseTypeFamilyFunctions.test.ts
new file mode 100644
index 0000000..2dba103
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/CaseTypeFamilyFunctions.test.ts
@@ -0,0 +1,90 @@
+import { applyTopNFilter, getTopNSortField } from './CaseTypeFamilyFunctions';
+import { IEncounterGroupTreeGridData } from './IEncounterGroupSummary';
+import { TopNField } from './IExclusionCriteria';
+
+const makeSummary = (
+  name: string,
+  totalEncounters: number,
+  costOeRatio: number | undefined,
+  identifiedVariation: number
+): IEncounterGroupTreeGridData => ({
+  key: name,
+  leaf: true,
+  children: [],
+  data: {
+    key: name,
+    id: 1,
+    name,
+    totalEncounters,
+    costOeRatio,
+    identifiedVariation,
+    totalVariationEncounters: 0,
+    includedEncounterCount: 0,
+    mortalityRate: 0,
+    medianLos: 0,
+    averageLengthOfStay: 0,
+    medianCost: 0,
+    includedEncountersBelowMedian: 0,
+    includedEncountersAboveMedian: 0,
+    includedVariation: 0,
+    excludedEncountersAboveMedian: 0,
+    excludedVariation: 0,
+    peerMedianALos: 0,
+    peerMedianCost: 0,
+    customerBenchmarkMedianCost: 0,
+    customerBenchmarkALos: 0
+  }
+});
+
+describe('getTopNSortField', () => {
+  test('maps EncounterVolume to totalEncounters', () => {
+    expect(getTopNSortField(TopNField.EncounterVolume)).toBe('totalEncounters');
+  });
+
+  test('maps CostOeRatio to costOeRatio', () => {
+    expect(getTopNSortField(TopNField.CostOeRatio)).toBe('costOeRatio');
+  });
+
+  test('maps IdentifiedVariation to identifiedVariation', () => {
+    expect(getTopNSortField(TopNField.IdentifiedVariation)).toBe('identifiedVariation');
+  });
+});
+
+describe('applyTopNFilter', () => {
+  test('sorts descending by EncounterVolume and slices to N', () => {
+    const summaries = [makeSummary('A', 100, 1, 500), makeSummary('B', 300, 1, 200), makeSummary('C', 200, 1, 100)];
+    const result = applyTopNFilter(summaries, 2, TopNField.EncounterVolume);
+    expect(result).toHaveLength(2);
+    expect(result[0].data.name).toBe('B');
+    expect(result[1].data.name).toBe('C');
+  });
+
+  test('sorts descending by CostOeRatio, nulls sort last', () => {
+    const summaries = [makeSummary('A', 0, undefined, 0), makeSummary('B', 0, 2.5, 0), makeSummary('C', 0, 1.0, 0)];
+    const result = applyTopNFilter(summaries, 3, TopNField.CostOeRatio);
+    expect(result[0].data.name).toBe('B');
+    expect(result[1].data.name).toBe('C');
+    expect(result[2].data.name).toBe('A');
+  });
+
+  test('sorts descending by IdentifiedVariation and slices to N', () => {
+    const summaries = [makeSummary('A', 0, 0, 50), makeSummary('B', 0, 0, 200), makeSummary('C', 0, 0, 100)];
+    const result = applyTopNFilter(summaries, 2, TopNField.IdentifiedVariation);
+    expect(result).toHaveLength(2);
+    expect(result[0].data.name).toBe('B');
+    expect(result[1].data.name).toBe('C');
+  });
+
+  test('returns all items when N >= array length', () => {
+    const summaries = [makeSummary('A', 10, 1, 10), makeSummary('B', 20, 2, 20), makeSummary('C', 30, 3, 30)];
+    const result = applyTopNFilter(summaries, 100, TopNField.EncounterVolume);
+    expect(result).toHaveLength(3);
+  });
+
+  test('does not mutate the original array', () => {
+    const summaries = [makeSummary('A', 100, 1, 500), makeSummary('B', 300, 1, 200), makeSummary('C', 200, 1, 100)];
+    const originalFirst = summaries[0].data.name;
+    applyTopNFilter(summaries, 2, TopNField.EncounterVolume);
+    expect(summaries[0].data.name).toBe(originalFirst);
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/CaseTypeFamilyFunctions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/CaseTypeFamilyFunctions.ts
new file mode 100644
index 0000000..8ddf1c9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/CaseTypeFamilyFunctions.ts
@@ -0,0 +1,140 @@
+import dayjs from 'dayjs';
+import React from 'react';
+import { ChipKey, ChipType, IFilterChipItem } from '../../shared/components/FilterBar/data/IFilterChipItem';
+import { IPeerGroupFilters } from '../../shared/configuration/IPeerGroupFilters';
+import { DATE_FORMAT } from '../../shared/constants';
+import IFilter from './IFilter';
+import { IEncounterGroupTreeGridData } from './IEncounterGroupSummary';
+import { TopNField } from './IExclusionCriteria';
+
+/**
+ * Updates discharge date filter chips to use properly formatted dayjs objects.
+ * Finds the discharge date filter chip and maps its date range to dayjs objects with custom JSON serialization.
+ * @param filterChips - Array of filter chip items to process
+ * @returns The updated date range as dayjs objects, or undefined if no discharge date filter exists
+ */
+export const updateDischargeDate = (filterChips: IFilterChipItem[]): dayjs.Dayjs[] | undefined => {
+  // Early return if no chips to process
+  if (filterChips.length === 0) {
+    return undefined;
+  }
+
+  // Find the discharge date filter chip
+  const dischargeDateFilter = filterChips.find((fc) => fc.key === ChipKey.DischargeDate);
+  if (!dischargeDateFilter) {
+    return undefined;
+  }
+
+  // Validate date range exists and has at least 2 dates
+  const dateRange = dischargeDateFilter.dateRange;
+  if (!dateRange || dateRange.length < 2) {
+    return undefined;
+  }
+
+  // Map dates to dayjs objects with custom JSON serialization
+  dischargeDateFilter.dateRange = dateRange.map((date) => {
+    const dateObj = dayjs(date);
+    dateObj.toJSON = () => dateObj.format(DATE_FORMAT);
+    return dateObj;
+  });
+
+  return dischargeDateFilter.dateRange;
+};
+
+/**
+ * Extracts and sets date range state from filter chips.
+ * Finds the date range filter chip and updates the provided state setters with start and end dates.
+ * @param filters - Filter object containing filter chip items
+ * @param setDateStart - State setter function for start date
+ * @param setDateEnd - State setter function for end date
+ */
+export const setDateStates = (filters: IFilter, setDateStart: (value: React.SetStateAction<dayjs.Dayjs>) => void, setDateEnd: (value: React.SetStateAction<dayjs.Dayjs>) => void) => {
+  const dateRangeFilter = filters.filterChipItems.find((fil) => fil.chipType === ChipType.dateRange);
+  if (dateRangeFilter && dateRangeFilter.dateRange) {
+    setDateStart(dateRangeFilter.dateRange[0]);
+    setDateEnd(dateRangeFilter.dateRange[1]);
+  }
+};
+
+/**
+ * Generates the appropriate header text for case type family grid based on family type.
+ * @param caseTypeFamilyType - Optional string indicating the specific case type family type
+ * @returns Formatted header string for the grid display
+ */
+export const caseTypeFamilyTypeHeader = (caseTypeFamilyType?: string) =>
+  !caseTypeFamilyType ? 'Case Type Family / Cost Driver' : `Entity / ${caseTypeFamilyType ?? 'CPT'} / Primary Physician / Encounter`;
+
+/**
+ * Determines if peer group benchmarking columns should be displayed.
+ * Columns are shown when benchmarking is enabled and a valid peer group is selected.
+ * @param benchmarking - Whether benchmarking feature is enabled
+ * @param peerGroupFilters - Optional peer group filter configuration
+ * @returns true if benchmarking columns should be displayed
+ */
+export const peerGroupBenchmarkingColumns = (benchmarking: boolean, peerGroupFilters?: IPeerGroupFilters): boolean => peerGroupFilters?.peerGroupId !== 0 && benchmarking;
+
+/**
+ * Checks if data should be fetched based on current filter state.
+ * Returns false if no filters or only date filter is applied on first load.
+ * @param filters - Current filter state
+ * @param firstLoading - Whether this is the first load
+ * @returns true if data should be fetched
+ */
+export const shouldFetchData = (filters: IFilter | undefined, firstLoading: boolean): boolean => {
+  if (!filters?.filterChipItems || filters.filterChipItems.length === 0) {
+    return false;
+  }
+
+  // Check if we ONLY have the date filter
+  // On first load, skip the fetch (just show the prompt to apply filters)
+  // When user clears filters mid-session, DO fetch to show all data
+  const onlyDateFilter = filters.filterChipItems.every((chip) => chip.key === ChipKey.DischargeDate);
+  if (onlyDateFilter && firstLoading) {
+    return false;
+  }
+
+  if (onlyDateFilter) {
+    return true;
+  }
+
+  return true;
+};
+
+/**
+ * Toggles grid reset key to force TreeGrid to reset its drill-down state.
+ * @param currentKey - Current grid reset key value
+ * @returns New grid reset key value
+ */
+export const toggleGridResetKey = (currentKey: number): number => {
+  return currentKey === 0 ? 1 : 0;
+};
+
+const getTopNValue = (s: IEncounterGroupTreeGridData, field: TopNField): number => {
+  switch (field) {
+    case TopNField.EncounterVolume:
+      return s.data.totalEncounters;
+    case TopNField.CostOeRatio:
+      return s.data.costOeRatio ?? 0;
+    case TopNField.IdentifiedVariation:
+      return s.data.identifiedVariation;
+    default:
+      // Fallback to a sentinel to avoid NaN in sort comparisons for unexpected TopNField values
+      return 0;
+  }
+};
+
+export const applyTopNFilter = (summaries: IEncounterGroupTreeGridData[], topN: number, topNField: TopNField): IEncounterGroupTreeGridData[] =>
+  [...summaries].sort((a, b) => getTopNValue(b, topNField) - getTopNValue(a, topNField)).slice(0, topN);
+
+export const getTopNSortField = (field: TopNField): string => {
+  switch (field) {
+    case TopNField.EncounterVolume:
+      return 'totalEncounters';
+    case TopNField.CostOeRatio:
+      return 'costOeRatio';
+    case TopNField.IdentifiedVariation:
+      return 'identifiedVariation';
+    default:
+      return 'totalEncounters';
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IAddHeaderCellProps.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IAddHeaderCellProps.ts
new file mode 100644
index 0000000..12e5d5c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IAddHeaderCellProps.ts
@@ -0,0 +1,28 @@
+import { IDataHeaderCellProps } from '@strata/tempo/lib/dataheader/DataHeaderCell';
+
+export interface IAddHeaderCellProps extends IDataHeaderCellProps {
+  key: string;
+}
+
+export const addHeaderOptions = (
+  key: string,
+  field: string,
+  header: string | React.ReactNode,
+  sortField?: string,
+  sortable?: true,
+  align?: 'left' | 'right' | 'center',
+  width?: number
+  // eslint-disable-next-line max-params
+): IAddHeaderCellProps => {
+  return {
+    key,
+    field,
+    header,
+    sortable,
+    align: align ?? 'right',
+    width: width ?? 80,
+    sortField
+  } as IAddHeaderCellProps;
+};
+
+export default addHeaderOptions;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IAddTreeGridColumnNumberOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IAddTreeGridColumnNumberOptions.ts
new file mode 100644
index 0000000..ce07b4f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IAddTreeGridColumnNumberOptions.ts
@@ -0,0 +1,40 @@
+import { NumberFormat } from '@strata/intl/lib';
+
+export interface IAddTreeGridColumnNumberOptions {
+  key: string;
+  field: string;
+  header: string;
+  width: number;
+  align?: 'left' | 'right' | 'center';
+  sortable?: boolean;
+  sortField?: string;
+  format?: NumberFormat; // from @strata/intl
+  body?: (rowData: any, column: any) => any;
+}
+
+export const addTreeGridColumnNumberOptions = (
+  key: string,
+  field: string,
+  header: string,
+  width?: number,
+  align?: 'left' | 'right' | 'center',
+  sortable?: true,
+  sortField?: string,
+  format?: NumberFormat,
+  body?: (rowData: any, column: any) => any
+  // eslint-disable-next-line max-params
+) => {
+  return {
+    key,
+    field,
+    header,
+    width: width ?? 80,
+    align: align ?? 'right',
+    sortable: sortable ?? true,
+    sortField,
+    format,
+    body
+  } as IAddTreeGridColumnNumberOptions;
+};
+
+export default addTreeGridColumnNumberOptions;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/ICaseTypeFamilyDetailInfo.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/ICaseTypeFamilyDetailInfo.ts
new file mode 100644
index 0000000..a0686a3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/ICaseTypeFamilyDetailInfo.ts
@@ -0,0 +1,9 @@
+import { ICaseTypeFamilyMetricDetail } from './ICaseTypeFamilyMetricDetail';
+import { IEncounterGroupDetailTreeGridData } from './IEncounterGroupDetail';
+
+export interface ICaseTypeFamilyDetailInfo {
+  caseTypeFamilyType: string;
+  caseTypeFamilyName: string;
+  metrics: ICaseTypeFamilyMetricDetail;
+  caseTypeFamilyDetails: IEncounterGroupDetailTreeGridData[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/ICaseTypeFamilyMetricDetail.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/ICaseTypeFamilyMetricDetail.ts
new file mode 100644
index 0000000..6ec0f24
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/ICaseTypeFamilyMetricDetail.ts
@@ -0,0 +1,19 @@
+export interface ICaseTypeFamilyMetricDetail {
+  totalEncounters: number;
+  identifiedVariation: number;
+  encountersIncluded: number;
+  variationIncluded: number;
+  encountersExcluded: number;
+  variationExcluded: number;
+}
+
+export const newMetricDetail = (data: Partial<ICaseTypeFamilyMetricDetail> = {}): ICaseTypeFamilyMetricDetail => {
+  return {
+    totalEncounters: 0,
+    identifiedVariation: 0,
+    encountersIncluded: 0,
+    variationIncluded: 0,
+    encountersExcluded: 0,
+    variationExcluded: 0
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IEncounterGroupDetail.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IEncounterGroupDetail.ts
new file mode 100644
index 0000000..16a0e94
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IEncounterGroupDetail.ts
@@ -0,0 +1,14 @@
+import IEncounterGroupSummary from './IEncounterGroupSummary';
+
+export interface IEncounterGroupDetailTreeGridData {
+  key: string;
+  data: IEncounterGroupDetailRowData;
+  children: IEncounterGroupDetailTreeGridData[];
+}
+
+export interface IEncounterGroupDetailRowData extends IEncounterGroupSummary {
+  dischargeStatusCode: string;
+  dischargeStatusDescription: string;
+  medianGrossCharges: number;
+  isExcluded: boolean;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IEncounterGroupSummary.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IEncounterGroupSummary.ts
new file mode 100644
index 0000000..5174224
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IEncounterGroupSummary.ts
@@ -0,0 +1,32 @@
+export interface IEncounterGroupTreeGridData {
+  key: string;
+  data: IEncounterGroupSummary;
+  leaf: boolean;
+  children: IEncounterGroupTreeGridData[];
+}
+
+export default interface IEncounterGroupSummary {
+  key: string;
+  id: number;
+  name: string;
+  totalEncounters: number;
+  totalVariationEncounters: number;
+  identifiedVariation: number;
+  includedEncounterCount: number;
+  mortalityRate: number;
+  medianLos: number;
+  averageLengthOfStay: number;
+  medianCost: number;
+  includedEncountersBelowMedian: number;
+  includedEncountersAboveMedian: number;
+  includedVariation: number;
+  excludedEncountersAboveMedian: number;
+  excludedVariation: number;
+  peerMedianALos: number;
+  peerMedianCost: number;
+  customerBenchmarkMedianCost: number;
+  customerBenchmarkALos: number;
+  costOeRatio?: number;
+  alosOeRatio?: number;
+  [field: string]: string | number | boolean | undefined;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IExclusionCriteria.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IExclusionCriteria.ts
new file mode 100644
index 0000000..5a10bb6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IExclusionCriteria.ts
@@ -0,0 +1,100 @@
+export default interface IExclusionCriteria {
+  losExclusionType: ExclusionCriteriaType;
+  losExclusionValue: number;
+  costExclusionType: ExclusionCriteriaType;
+  costExclusionValue: number;
+  topN?: number | null;
+  topNField?: TopNField | null;
+}
+
+export enum ExclusionCriteriaType {
+  None,
+  Mad,
+  Iqr
+}
+
+export enum TopNField {
+  EncounterVolume = 'encounterVolume',
+  CostOeRatio = 'costOeRatio',
+  IdentifiedVariation = 'identifiedVariation'
+}
+
+export const newExclusionCriteria = (): IExclusionCriteria => {
+  return {
+    losExclusionType: ExclusionCriteriaType.None,
+    losExclusionValue: 0,
+    costExclusionType: ExclusionCriteriaType.None,
+    costExclusionValue: 0,
+    topN: null,
+    topNField: null
+  };
+};
+
+export const parseLosCostSelection = (selection: string) => {
+  switch (selection) {
+    case 'none0':
+      return { exclusionType: ExclusionCriteriaType.None, value: 0 };
+    case 'mad2':
+      return { exclusionType: ExclusionCriteriaType.Mad, value: 2 };
+    case 'mad3':
+      return { exclusionType: ExclusionCriteriaType.Mad, value: 3 };
+    case 'iqr1':
+      return { exclusionType: ExclusionCriteriaType.Iqr, value: 1 };
+    case 'iqr1.5':
+      return { exclusionType: ExclusionCriteriaType.Iqr, value: 1.5 };
+    case 'iqr2':
+      return { exclusionType: ExclusionCriteriaType.Iqr, value: 2 };
+    case 'iqr2.5':
+      return { exclusionType: ExclusionCriteriaType.Iqr, value: 2.5 };
+    default:
+      return { exclusionType: ExclusionCriteriaType.None, value: 0 };
+  }
+};
+
+export const parseLosTrimValue = (exclusionCriteria: IExclusionCriteria) => {
+  const exclusionType = ExclusionCriteriaType[exclusionCriteria.losExclusionType].toString().toLowerCase();
+  return exclusionType + exclusionCriteria.losExclusionValue;
+};
+
+export const parseCostTrimValue = (exclusionCriteria: IExclusionCriteria) => {
+  const exclusionType = ExclusionCriteriaType[exclusionCriteria.costExclusionType].toString().toLowerCase();
+  return exclusionType + exclusionCriteria.costExclusionValue;
+};
+
+// Info: actually, this function gets a string value instead of ExclusionCriteriaType
+export const getExclusionCriteriaName = (exclusionType: ExclusionCriteriaType, exclusionValue: number) => {
+  if (exclusionType === null || exclusionType === undefined) return undefined;
+  return getExclusionCriteriaNameByString(exclusionType.toString(), exclusionValue);
+};
+
+export const getExclusionCriteriaNameByType = (exclusionType: ExclusionCriteriaType, exclusionValue: number) => {
+  if (exclusionType in ExclusionCriteriaType) {
+    return getExclusionCriteriaNameByString(ExclusionCriteriaType[exclusionType], exclusionValue);
+  }
+  return undefined;
+};
+
+export const getExclusionCriteriaNameByString = (exclusionType: string, exclusionValue: number) => {
+  if (exclusionType === null || exclusionType === undefined) return undefined;
+  const exclusion = exclusionType.toLowerCase() + exclusionValue;
+  switch (exclusion) {
+    case 'none0':
+      return 'No Exclusion';
+    case 'mad':
+      return 'Median Absolute Deviation (MAD)';
+    case 'mad2':
+      return 'Exclude > 2 Deviations';
+    case 'mad3':
+      return 'Exclude > 3 Deviations';
+    case 'iqr':
+      return 'Interquartile Range (IQR)';
+    case 'iqr1':
+      return 'Exclude > 1 IQR';
+    case 'iqr1.5':
+      return 'Exclude > 1.5 IQR';
+    case 'iqr2':
+      return 'Exclude > 2 IQR';
+    case 'iqr2.5':
+      return 'Exclude > 2.5 IQR';
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IFilter.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IFilter.ts
new file mode 100644
index 0000000..86d370c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IFilter.ts
@@ -0,0 +1,35 @@
+import dayjs from 'dayjs';
+import { ChipKey, IFilterChipItem, newDateRangeChipItem } from '../../shared/components/FilterBar/data/IFilterChipItem';
+import { IConfiguration } from '../../shared/configuration/IConfiguration';
+import { RangeValue } from '@strata/tempo/lib/datepicker/RangePicker';
+
+export default interface IFilter {
+  filterChipItems: IFilterChipItem[];
+}
+
+export const defaultFilter: IFilter = {
+  filterChipItems: []
+};
+
+export const getSessionFilter = (configuration: IConfiguration, filterItem: IFilter): IFilter => {
+  const dischargeDateStart = dayjs(configuration.lastFiscalYearStartDate);
+  const dischargeDateEnd = dayjs(configuration.lastFiscalYearEndDate);
+
+  // get from session if set or configuration
+  if (filterItem) {
+    console.info(filterItem);
+    const filters = filterItem;
+    if (filters?.filterChipItems) {
+      if (filters.filterChipItems.length === 0 || filters.filterChipItems.findIndex((fci) => fci.key === ChipKey.DischargeDate) === -1) {
+        const dateFilter = newDateRangeChipItem([dischargeDateStart, dischargeDateEnd] as RangeValue);
+        if (dateFilter) {
+          filters.filterChipItems.push(...[dateFilter]);
+        }
+      }
+    }
+    if (filters?.filterChipItems) {
+      return filters;
+    }
+  }
+  return { filterChipItems: [newDateRangeChipItem([dischargeDateStart, dischargeDateEnd] as RangeValue)] } as IFilter;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IHeatMapData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IHeatMapData.ts
new file mode 100644
index 0000000..b0a3454
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/IHeatMapData.ts
@@ -0,0 +1,106 @@
+/**
+ * Simplified DTO for heatmap visualization containing only the essential
+ * benchmarking metrics needed for the UI. Supports both case type family
+ * and code-level (MS-DRG/APR-DRG/CPT) granularity.
+ */
+export interface IHeatMapData {
+  /**
+   * The display name for the row. Contains either the case type family name
+   * or the code value (MS-DRG/APR-DRG/CPT) depending on the granularity level.
+   */
+  name: string;
+
+  /**
+   * The cost driver name (e.g., "Pharmacy", "Laboratory").
+   */
+  costDriver: string;
+
+  /**
+   * Customer's 50th percentile variable direct cost.
+   */
+  customerMedianCost: number | null;
+
+  /**
+   * Benchmark cohort's 50th percentile variable direct cost.
+   */
+  benchmarkMedianCost: number | null;
+
+  /**
+   * Pre-calculated O/E ratio (CustomerMedianCost / BenchmarkMedianCost).
+   * Null if benchmark is null or zero.
+   */
+  costOeRatio: number | null;
+
+  /**
+   * Customer's average length of stay.
+   */
+  customerAlos: number | null;
+
+  /**
+   * Benchmark cohort's 50th percentile average length of stay.
+   */
+  benchmarkMedianAlos: number | null;
+
+  /**
+   * Pre-calculated O/E ratio (CustomerMedianAlos / BenchmarkMedianAlos).
+   * Null if benchmark is null or zero.
+   */
+  alosOeRatio: number | null;
+}
+
+/**
+ * Pivoted heatmap row with cost drivers as dynamic columns.
+ * Each cost driver becomes a property containing its O/E ratio.
+ */
+export interface IHeatMapPivotedRow {
+  /** The case type family or code name */
+  name: string;
+  /** Dynamic cost driver columns - key is cost driver name, value is O/E ratio */
+  [costDriver: string]: number | null | string;
+}
+
+/**
+ * Transforms flat heatmap data into pivoted rows with cost drivers as columns.
+ * @param data Raw heatmap data from API
+ * @returns Object containing pivoted rows and unique cost driver names
+ */
+export const pivotHeatMapData = (data: IHeatMapData[]): { rows: IHeatMapPivotedRow[]; costDrivers: string[] } => {
+  // Get unique cost drivers (these become columns)
+  const costDriverSet = new Set<string>();
+  data.forEach((item) => {
+    if (item.costDriver) {
+      costDriverSet.add(item.costDriver);
+    }
+  });
+  const costDrivers = Array.from(costDriverSet).sort((a, b) => {
+    // 'Total' always comes first, and 'All Other' last
+    if (a === 'Total' || b === 'All Other') return -1;
+    if (b === 'Total' || a === 'All Other') return 1;
+    if (a === 'Total Filtered' || b === 'All Other') return -1;
+    if (b === 'Total Filtered' || a === 'All Other') return 1;
+    // All others sorted alphabetically
+    return a.localeCompare(b);
+  });
+
+  // Group by name (case type family or code)
+  const rowMap = new Map<string, IHeatMapPivotedRow>();
+
+  data.forEach((item) => {
+    if (!rowMap.has(item.name)) {
+      rowMap.set(item.name, { name: item.name });
+    }
+
+    const row = rowMap.get(item.name);
+    if (row && item.costDriver) {
+      if (!item.benchmarkMedianCost || item.benchmarkMedianCost === 0 || item.customerMedianCost === null) {
+        row[item.costDriver] = null;
+      } else {
+        row[item.costDriver] = item.customerMedianCost / item.benchmarkMedianCost;
+      }
+    }
+  });
+
+  const rows = Array.from(rowMap.values());
+
+  return { rows, costDrivers };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/ITreeGridColumnConfig.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/ITreeGridColumnConfig.ts
new file mode 100644
index 0000000..6c3e031
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/ITreeGridColumnConfig.ts
@@ -0,0 +1,68 @@
+import { NumberFormat } from '@strata/intl/lib';
+import { IEncounterGroupTreeGridData } from './IEncounterGroupSummary';
+
+export const DEFAULT_GRID_PX_WIDTH = 100;
+/** Column group for header grouping */
+export type ColumnGroup = 'name' | 'detail' | 'entirePopulation' | 'refinedPopulation' | 'benchmark' | 'excludedPopulation';
+
+export interface ITreeGridColumnConfig {
+  key?: string;
+  field?: string;
+  header?: string | React.ReactNode;
+  /* Optional fixed width for the column in pixels. If not provided, a default of DEFAULT_GRID_PX_WIDTH width will be applied. */
+  width?: number;
+  hidden?: boolean;
+  sortable?: boolean;
+  sortField?: string;
+  format?: NumberFormat;
+  body?: (rowData: IEncounterGroupTreeGridData) => React.ReactNode;
+  /* Alignment of the column. Default is 'right'. */
+  align?: 'left' | 'center' | 'right';
+  expander?: boolean;
+  /** Header group this column belongs to */
+  group: ColumnGroup;
+  /** Whether this is a gap column (visual separator between groups) */
+  isGap?: boolean;
+}
+
+export const newTreeGridColumnConfig = (data: Partial<ITreeGridColumnConfig> & { group: ColumnGroup }): ITreeGridColumnConfig => {
+  return {
+    key: data.key,
+    field: data.field,
+    header: data.header,
+    width: data.width ?? DEFAULT_GRID_PX_WIDTH,
+    hidden: data.hidden ?? false,
+    sortable: data.sortable ?? true,
+    sortField: data.sortField,
+    format: data.format,
+    body: data.body,
+    align: data.align ?? 'right',
+    expander: data.expander ?? false,
+    group: data.group,
+    isGap: data.isGap ?? false
+  };
+};
+
+export const isNumberColumn = (config: ITreeGridColumnConfig): config is ITreeGridColumnConfig & { format: NumberFormat } => {
+  return config.format !== undefined;
+};
+
+export const isGapColumn = (config: ITreeGridColumnConfig): boolean => {
+  return config.isGap === true;
+};
+
+export const isStandardColumn = (config: ITreeGridColumnConfig): boolean => {
+  return config.field !== undefined && config.header !== undefined && config.format === undefined && !config.isGap;
+};
+
+export const newGapColumn = (group: ColumnGroup): ITreeGridColumnConfig => {
+  return {
+    key: `gap-${group}`,
+    field: undefined,
+    header: undefined,
+    sortable: false,
+    hidden: false,
+    group: group,
+    isGap: true
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/explorationColumnHeaders.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/explorationColumnHeaders.ts
new file mode 100644
index 0000000..b413ee1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/explorationColumnHeaders.ts
@@ -0,0 +1,34 @@
+/**
+ * Column header constants for the Exploration grids.
+ * Used in CaseTypeFamilyDetailGrid and CaseTypeFamilySummaryGrid.
+ */
+
+// Detail Column
+export const COLUMN_HEADER_INCLUDED_IN_POPULATION = 'Included in Population';
+
+// Entire Population Group
+export const COLUMN_HEADER_TOTAL_ENCOUNTERS = 'Total Encounters';
+export const COLUMN_HEADER_ENCOUNTERS_WITH_COST_DRIVER_VARIATION = 'Encounters with Cost Driver Variation';
+export const COLUMN_HEADER_IDENTIFIED_COST_DRIVER_VARIATION = 'Identified Cost Driver Variation';
+
+// Benchmark Data Group
+export const COLUMN_HEADER_CUSTOMER_MEDIAN_VARIABLE_DIRECT_COST = 'Customer Average Variable Direct Cost';
+export const COLUMN_HEADER_COHORT_MEDIAN_VARIABLE_DIRECT_COST = 'Peer Group Median Variable Direct Cost';
+export const COLUMN_HEADER_CUSTOMER_MEDIAN_ALOS = 'Customer ALOS';
+export const COLUMN_HEADER_COHORT_MEDIAN_ALOS = 'Peer Group Median ALOS';
+export const COLUMN_HEADER_OE_ALOS_RATIO = 'O / E ALOS Ratio';
+export const COLUMN_HEADER_OE_VARIABLE_DIRECT_COST_RATIO = 'O / E Variable Direct Cost Ratio';
+
+// Refined Population Group
+export const COLUMN_HEADER_ENCOUNTERS_INCLUDED = 'Encounters Included';
+export const COLUMN_HEADER_MORTALITY_RATE = 'Mortality Rate';
+export const COLUMN_HEADER_AVERAGE_LENGTH_OF_STAY = 'ALOS';
+export const COLUMN_HEADER_MEDIAN_GROSS_CHARGES = 'Median Gross Charges';
+export const COLUMN_HEADER_MEDIAN_VARIABLE_DIRECT_COST = 'Median Variable Direct Cost';
+export const COLUMN_HEADER_ENCOUNTERS_AT_OR_BELOW_MEDIAN_INCLUDED = 'Encounters At or Below Median Included';
+export const COLUMN_HEADER_ENCOUNTERS_ABOVE_MEDIAN_INCLUDED = 'Encounters Above Median Included';
+export const COLUMN_HEADER_COST_DRIVER_VARIATION_INCLUDED = 'Cost Driver Variation Included';
+
+// Excluded Population Group
+export const COLUMN_HEADER_ENCOUNTERS_ABOVE_MEDIAN_EXCLUDED = 'Encounters Above Median Excluded';
+export const COLUMN_HEADER_COST_DRIVER_VARIATION_EXCLUDED = 'Cost Driver Variation Excluded';
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/explorationService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/explorationService.ts
new file mode 100644
index 0000000..0d0b33d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/explorationService.ts
@@ -0,0 +1,90 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { adjustDatetimeToDateString } from '../../shared/utilities';
+import { BenchmarkingInsightsGranularity } from './BenchmarkingInsightsGranularity';
+import { ICaseTypeFamilyDetailInfo } from './ICaseTypeFamilyDetailInfo';
+import { IEncounterGroupTreeGridData } from './IEncounterGroupSummary';
+import IExclusionCriteria from './IExclusionCriteria';
+import IFilter from './IFilter';
+import { IHeatMapData } from './IHeatMapData';
+
+const { httpGet, httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const explorationService = {
+  getCaseTypeFamilySummaries: async (configurationGuid: string, exclusionCriteria: IExclusionCriteria, filters: IFilter, peerGroupId: number): Promise<IEncounterGroupTreeGridData[]> => {
+    return httpPost<IEncounterGroupTreeGridData[]>(`exploration/case-type-family-summary`, {
+      configurationGuid,
+      exclusionCriteria,
+      filters: adjustDatetimeToDateString({ ...filters }),
+      peerGroupId
+    });
+  },
+
+  getCaseTypeFamilyCostDriverInfo: async (
+    configurationGuid: string,
+    caseTypeFamilyId: string,
+    exclusionCriteria: IExclusionCriteria,
+    filters: IFilter,
+    peerGroupId: number
+  ): Promise<IEncounterGroupTreeGridData[]> => {
+    return httpPost<IEncounterGroupTreeGridData[]>(`exploration/case-type-family-cost-driver-info`, {
+      configurationGuid,
+      caseTypeFamilyId,
+      exclusionCriteria,
+      filters: adjustDatetimeToDateString({ ...filters }),
+      peerGroupId
+    });
+  },
+
+  getCaseTypeFamilyDetails: async (
+    configurationGuid: string,
+    caseTypeFamilyId: string,
+    costDriver: string,
+    excludedEncounters: number[],
+    includedEncounters: number[],
+    exclusionCriteria: IExclusionCriteria,
+    filters: IFilter,
+    codeType: number | null,
+    peerGroupId: number | null
+  ): Promise<ICaseTypeFamilyDetailInfo> => {
+    return httpPost<ICaseTypeFamilyDetailInfo>(`exploration/case-type-family-details`, {
+      configurationGuid,
+      caseTypeFamilyId,
+      costDriver,
+      excludedEncounters,
+      includedEncounters,
+      exclusionCriteria,
+      filters: adjustDatetimeToDateString({ ...filters }),
+      codeType,
+      peerGroupId
+    });
+  },
+
+  isFlexibleExplorationInformationPageEnabled: async (): Promise<boolean> => {
+    return httpGet<boolean>(`exploration/flexible-exploration-information-page`);
+  },
+
+  /**
+   * Fetches heatmap data for benchmarking visualization.
+   * @param configurationGuid - The configuration GUID
+   * @param exclusionCriteria - Exclusion criteria for filtering
+   * @param filters - Filter settings
+   * @param peerGroupId - The peer group ID for benchmarking
+   * @param granularity - Row granularity: CaseTypeFamily, DrgCode, or PrimaryCpt
+   * @returns Array of heatmap data with cost driver metrics
+   */
+  getHeatMapSummary: async (
+    configurationGuid: string,
+    exclusionCriteria: IExclusionCriteria,
+    filters: IFilter,
+    peerGroupId: number,
+    granularity = BenchmarkingInsightsGranularity.CaseTypeFamily
+  ): Promise<IHeatMapData[]> => {
+    return httpPost<IHeatMapData[]>(`exploration/case-type-family-summary-heatmap`, {
+      configurationGuid,
+      exclusionCriteria,
+      filters: adjustDatetimeToDateString({ ...filters }),
+      peerGroupId,
+      granularity
+    });
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/heatMapColors.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/heatMapColors.ts
new file mode 100644
index 0000000..53bd7e6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/data/heatMapColors.ts
@@ -0,0 +1,140 @@
+/**
+ * Heatmap color utilities using Tempo-approved color palette.
+ *
+ * Approved color palette for heatmap ONLY:
+ * - Red 500 (#D52117) with opacity 50%, 30%
+ * - Red 200 (#FEEDEC)
+ * - Green 500 (#008000) with opacity 50%, 30%
+ * - Green 200 (#EAFBEA)
+ *
+ * Text color: Black (default)
+ * Border color: Transparent (default)
+ *
+ * NOTE: The use of opacity to render additional shades of green and red
+ * has ONLY been approved for the Heatmap use case. Do not use elsewhere.
+ */
+
+// Tempo color values (used for reference, computed RGBA values below)
+const TEMPO_RED_500 = '#D52117';
+const TEMPO_RED_200 = '#FEEDEC';
+const TEMPO_GREEN_500 = '#008000';
+const TEMPO_GREEN_200 = '#EAFBEA';
+
+const TEMPO_BLUE_700 = '#005F7A';
+
+// Pre-computed RGBA values for opacity variants
+export const HEATMAP_COLORS = {
+  // Red variants (O/E > 1 means customer is higher than benchmark - unfavorable)
+  red500: TEMPO_RED_500,
+  red500Opacity50: `rgba(213, 33, 23, 0.5)`, // Red 500 at 50% opacity
+  red500Opacity30: `rgba(213, 33, 23, 0.3)`, // Red 500 at 30% opacity
+  red200rgb: 'rgb(254, 237, 236)', // red200 in computed rgb format
+  red200: TEMPO_RED_200,
+
+  // Green variants (O/E < 1 means customer is lower than benchmark - favorable)
+  green500: TEMPO_GREEN_500,
+  green500Opacity50: `rgba(0, 128, 0, 0.5)`, // Green 500 at 50% opacity
+  green500Opacity30: `rgba(0, 128, 0, 0.3)`, // Green 500 at 30% opacity
+  green200rgb: 'rgb(234, 251, 234)', // green200 in computed rgb format
+  green200: TEMPO_GREEN_200,
+
+  blue700rgb: 'rgb(0, 95, 122)', // Border color for selected cells
+  blue700: TEMPO_BLUE_700,
+
+  // No data
+  noDataRgb: 'rgba(0, 0, 0, 0)',
+
+  // Neutral
+  transparent: 'transparent'
+} as const;
+
+/**
+ * O/E Ratio thresholds for color mapping.
+ * Values > 1 indicate customer costs exceed benchmark (unfavorable - red)
+ * Values < 1 indicate customer costs below benchmark (favorable - green)
+ */
+export const OE_RATIO_THRESHOLDS = {
+  HIGH_RED: 1.2, // >= 1.20: Red 500 @ 50%
+  MEDIUM_RED: 1.1, // 1.10 - 1.19: Red 500 @ 30%
+  LOW_RED: 1.01, // 1.01 - 1.09: Red 200
+  NEUTRAL: 1.0, // 1.00: Transparent
+  LOW_GREEN: 0.99, // 0.91 - 0.99: Green 200
+  MEDIUM_GREEN: 0.9, // 0.81 - 0.90: Green 500 @ 30%
+  HIGH_GREEN: 0.8 // <= 0.80: Green 500 @ 50%
+} as const;
+
+/**
+ * Gets the appropriate border color for a heatmap cell based on its background color.
+ * @param cellText The text content of the heatmap cell
+ * @returns CSS border color string
+ */
+export const getHeatMapBorderStyle = (cellText?: string): string => {
+  const hasValue = cellText && cellText !== '';
+
+  // Show blue border if cell has color or has a value
+  if (hasValue) {
+    return `2px solid ${HEATMAP_COLORS.blue700rgb}`;
+  }
+
+  // Otherwise, no border (transparent)
+  return `2px solid ${HEATMAP_COLORS.transparent}`;
+};
+
+/**
+ * Gets the appropriate heatmap background color based on O/E ratio.
+ * @param oeRatio The O/E ratio value (customer / benchmark)
+ * @returns CSS background color string
+ */
+export const getHeatMapColor = (oeRatio: number | null | undefined): string => {
+  if (oeRatio === null || oeRatio === undefined) {
+    return HEATMAP_COLORS.transparent;
+  }
+
+  const { HIGH_RED, MEDIUM_RED, NEUTRAL, HIGH_GREEN, MEDIUM_GREEN } = OE_RATIO_THRESHOLDS;
+
+  // Customer exceeds benchmark (unfavorable - red shades)
+  if (oeRatio >= HIGH_RED) return HEATMAP_COLORS.red500Opacity50;
+  if (oeRatio >= MEDIUM_RED) return HEATMAP_COLORS.red500Opacity30;
+  if (oeRatio > NEUTRAL) return HEATMAP_COLORS.red200;
+
+  // Neutral (exactly 1.0)
+  if (oeRatio === NEUTRAL) return HEATMAP_COLORS.transparent;
+
+  // Customer below benchmark (favorable - green shades)
+  if (oeRatio <= HIGH_GREEN) return HEATMAP_COLORS.green500Opacity50;
+  if (oeRatio <= MEDIUM_GREEN) return HEATMAP_COLORS.green500Opacity30;
+
+  // 0.91 - 0.99
+  return HEATMAP_COLORS.green200;
+};
+
+/**
+ * Gets a human-readable description of what the O/E ratio color means.
+ * Useful for tooltips or accessibility.
+ */
+export const getHeatMapColorDescription = (oeRatio: number | null | undefined): string => {
+  if (oeRatio === null || oeRatio === undefined) {
+    return 'No data available';
+  }
+
+  if (oeRatio >= OE_RATIO_THRESHOLDS.HIGH_RED) {
+    return 'Significantly above benchmark (≥20%)';
+  }
+  if (oeRatio >= OE_RATIO_THRESHOLDS.MEDIUM_RED) {
+    return 'Moderately above benchmark (10-19%)';
+  }
+  if (oeRatio > OE_RATIO_THRESHOLDS.NEUTRAL) {
+    return 'Slightly above benchmark (1-9%)';
+  }
+  if (oeRatio === OE_RATIO_THRESHOLDS.NEUTRAL) {
+    return 'At benchmark';
+  }
+  if (oeRatio <= OE_RATIO_THRESHOLDS.HIGH_GREEN) {
+    return 'Significantly below benchmark (≥20%)';
+  }
+  if (oeRatio <= OE_RATIO_THRESHOLDS.MEDIUM_GREEN) {
+    return 'Moderately below benchmark (10-19%)';
+  }
+
+  return 'Slightly below benchmark (1-9%)';
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useBenchmarkingBanner.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useBenchmarkingBanner.ts
new file mode 100644
index 0000000..fce418c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useBenchmarkingBanner.ts
@@ -0,0 +1,49 @@
+import { useClientScopedSessionStorage } from '../../shared/hooks/useClientScopedSessionStorage';
+
+export interface IUseBenchmarkingBannerProps {
+  /** Whether benchmarking is enabled */
+  benchmarking?: boolean;
+  /**
+   * Optional peer group ID.
+   * - When provided: banner shows only if benchmarking enabled AND peerGroupId !== 0
+   * - When undefined: banner shows if benchmarking enabled (peer group check bypassed)
+   * Use undefined in contexts where peer group selection is not applicable (e.g., refinement drawer)
+   */
+  peerGroupId?: number;
+}
+
+export interface IUseBenchmarkingBannerResult {
+  /** Whether to show the benchmarking banner */
+  showBanner: boolean;
+  /** Callback to dismiss the banner */
+  onDismiss: () => void;
+}
+
+/**
+ * Hook to manage benchmarking banner visibility state.
+ * Banner is shown when:
+ * - User hasn't dismissed it (stored in session storage)
+ * - Benchmarking is enabled
+ * - Peer group check passes:
+ *   - If peerGroupId is provided: peerGroupId !== 0
+ *   - If peerGroupId is undefined: peer group check is bypassed
+ */
+export const useBenchmarkingBanner = (props: IUseBenchmarkingBannerProps): IUseBenchmarkingBannerResult => {
+  const { benchmarking = false, peerGroupId } = props;
+
+  const [hideBenchmarkingBanner, setHideBenchmarkingBanner] = useClientScopedSessionStorage('hideBenchmarkingBanner', false);
+
+  // When peerGroupId is undefined, skip peer group check (useful in contexts like refinement drawer)
+  // When peerGroupId is provided, require it to be non-zero
+  const peerGroupCheckPasses = peerGroupId === undefined || peerGroupId !== 0;
+  const showBanner = !hideBenchmarkingBanner && benchmarking && peerGroupCheckPasses;
+
+  const onDismiss = () => {
+    setHideBenchmarkingBanner(true);
+  };
+
+  return {
+    showBanner,
+    onDismiss
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useCaseTypeFamilyGridBase.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useCaseTypeFamilyGridBase.ts
new file mode 100644
index 0000000..380d5e0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useCaseTypeFamilyGridBase.ts
@@ -0,0 +1,199 @@
+import { useModal } from '@strata/tempo/lib/modal';
+import { usePageLoader } from '@strata/tempo/lib/pageloader/usePageLoader';
+import { Dispatch, SetStateAction, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { ChipKey, ChipType } from '../../shared/components/FilterBar/data/IFilterChipItem';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { IConfiguration } from '../../shared/configuration/IConfiguration';
+import { IPeerGroupFilters } from '../../shared/configuration/IPeerGroupFilters';
+import { useFeatureFlags } from '../../shared/featureFlag/FeatureFlagContext';
+import { peerGroupBenchmarkingColumns } from '../data/CaseTypeFamilyFunctions';
+import { BenchmarkingInsightsGranularity } from '../data/BenchmarkingInsightsGranularity';
+import IExclusionCriteria from '../data/IExclusionCriteria';
+import IFilter from '../data/IFilter';
+import { IExplorationPopulation } from '../opportunities/data/IExplorationPopulation';
+import { useBenchmarkingBanner } from './useBenchmarkingBanner';
+import { useFilterManagement } from './useFilterManagement';
+
+interface UseCaseTypeFamilyGridBaseOptions {
+  explorationPopulationData?: IExplorationPopulation;
+  explorationPopulationId?: string;
+  isBaseOptionsReadOnly: boolean;
+  onDrawerApply?: () => void;
+}
+
+interface UseCaseTypeFamilyGridBaseResult {
+  // Common state
+  modal: ReturnType<typeof useModal>;
+  loading: boolean;
+  setLoading: (loading: boolean) => void;
+  firstLoading: boolean;
+  setFirstLoading: (loading: boolean) => void;
+  configuration: IConfiguration | undefined;
+  loadingConfiguration: boolean;
+  benchmarking: boolean;
+  gridResetKey: number;
+  setGridResetKey: Dispatch<SetStateAction<number>>;
+  manageColumnsVisible: boolean;
+  setManageColumnsVisible: (visible: boolean) => void;
+
+  // Filter management
+  filters: IFilter | undefined;
+  exclusionCriteria: IExclusionCriteria | undefined;
+  peerGroupFilters: IPeerGroupFilters | undefined;
+  setFilters: (filters: IFilter) => void;
+  markDataAsLoaded: () => void;
+  renderFilterBar: (options?: {
+    filterId?: string;
+    excludedChips?: ChipKey[];
+    hiddenChips?: ChipKey[];
+    expandableLevels?: Array<{ text: string; value: number }>;
+    expandedLevelPos?: number;
+    setExpandedLevelPos?: (levelPos: number) => void;
+    onChangeEncounters?: (resolve: any) => void;
+    onApply?: (exclusionCriteria: IExclusionCriteria, filters: IFilter) => void | Promise<void>;
+    hideTopNFilter?: boolean;
+  }) => React.ReactElement;
+  previousPeerGroupIdRef: React.MutableRefObject<number>;
+
+  // Feature flags
+  featureFlags: ReturnType<typeof useFeatureFlags>;
+
+  // Benchmarking banner
+  showBanner: boolean;
+  onDismissBanner: () => void;
+
+  // Computed values
+  showPeerGroupBenchmarking: boolean;
+
+  // Granularity selection
+  granularity: BenchmarkingInsightsGranularity;
+  setGranularity: Dispatch<SetStateAction<BenchmarkingInsightsGranularity>>;
+
+  // Utility functions
+  handlePeerGroupChange: () => boolean;
+}
+
+/**
+ * Base hook for Case Type Family grid components (Detail and Summary).
+ * Encapsulates common state management, filter handling, and feature flag logic.
+ */
+export const useCaseTypeFamilyGridBase = (options: UseCaseTypeFamilyGridBaseOptions = { isBaseOptionsReadOnly: false }): UseCaseTypeFamilyGridBaseResult => {
+  const { explorationPopulationData, explorationPopulationId, onDrawerApply, isBaseOptionsReadOnly } = options;
+
+  // Common hooks
+  const modal = useModal();
+  const { currentConfiguration: configuration, loading: loadingConfiguration } = useConfigurations();
+  const { setLoading: setLoadingPage } = usePageLoader();
+  const featureFlags = useFeatureFlags();
+
+  // Common state
+  const [loading, setLoading] = useState(false);
+  const [firstLoading, setFirstLoading] = useState<boolean>(true);
+  const [benchmarking, setBenchmarking] = useState<boolean>(false);
+  const [granularity, setGranularity] = useState<BenchmarkingInsightsGranularity>(BenchmarkingInsightsGranularity.CaseTypeFamily);
+  const [gridResetKey, setGridResetKey] = useState<number>(0);
+  const [manageColumnsVisible, setManageColumnsVisible] = useState(false);
+
+  /**
+   * Centralized filter management with session persistence.
+   * Provides filter state (filters, exclusionCriteria, peerGroupFilters) for data fetching
+   * and a pre-configured FilterBar component with all handlers wired up.
+   */
+  const { filters, exclusionCriteria, peerGroupFilters, setFilters, markDataAsLoaded, renderFilterBar } = useFilterManagement({
+    configuration,
+    explorationPopulationData,
+    explorationPopulationId,
+    isFilterReadOnly: isBaseOptionsReadOnly,
+    onDrawerApply
+  });
+
+  const previousPeerGroupIdRef = useRef<number>(peerGroupFilters?.peerGroupId ?? 0);
+
+  // Set page loading based on first load state
+  useEffect(() => {
+    setLoadingPage(firstLoading || loadingConfiguration);
+  }, [firstLoading, loadingConfiguration, setLoadingPage]);
+
+  // Initialize feature flags
+  useEffect(() => {
+    if (featureFlags.isEnabled && !featureFlags.loading) {
+      setBenchmarking(featureFlags.isEnabled('cibenchmarkingenabled'));
+    }
+  }, [featureFlags]);
+
+  // Manage benchmarking banner visibility
+  const { showBanner, onDismiss: onDismissBanner } = useBenchmarkingBanner({
+    benchmarking,
+    peerGroupId: peerGroupFilters?.peerGroupId
+  });
+
+  // Compute whether to show peer group benchmarking columns
+  const showPeerGroupBenchmarking = useMemo(() => {
+    return peerGroupBenchmarkingColumns(benchmarking, peerGroupFilters);
+  }, [benchmarking, peerGroupFilters]);
+
+  /**
+   * Handle peer group changes - remove SPH criteria filters if switching to no peer group
+   * @returns true if filters were modified and component should exit early to re-run effect
+   */
+  const handlePeerGroupChange = useCallback((): boolean => {
+    if (!filters || !peerGroupFilters) return false;
+
+    const peerGroupChanged = previousPeerGroupIdRef.current !== peerGroupFilters.peerGroupId;
+
+    if (peerGroupChanged) {
+      // Remove SPH criteria filters if switching to no peer group
+      if (peerGroupFilters.peerGroupId === 0 && filters.filterChipItems) {
+        const filteredChips = filters.filterChipItems.filter((chip) => chip.chipType !== ChipType.sphCriteria);
+        setFilters({ ...filters, filterChipItems: filteredChips });
+        previousPeerGroupIdRef.current = peerGroupFilters.peerGroupId;
+        return true; // Signal to exit early
+      }
+      previousPeerGroupIdRef.current = peerGroupFilters.peerGroupId;
+    }
+
+    return false;
+  }, [filters, peerGroupFilters, setFilters]);
+
+  return {
+    // Common state
+    modal,
+    loading,
+    setLoading,
+    firstLoading,
+    setFirstLoading,
+    configuration,
+    loadingConfiguration,
+    benchmarking,
+    gridResetKey,
+    setGridResetKey,
+    manageColumnsVisible,
+    setManageColumnsVisible,
+
+    // Filter management
+    filters,
+    exclusionCriteria,
+    peerGroupFilters,
+    setFilters,
+    markDataAsLoaded,
+    renderFilterBar,
+    previousPeerGroupIdRef,
+
+    // Feature flags
+    featureFlags,
+
+    // Benchmarking banner
+    showBanner,
+    onDismissBanner,
+
+    // Computed values
+    showPeerGroupBenchmarking,
+
+    // Granularity selection
+    granularity,
+    setGranularity,
+
+    // Utility functions
+    handlePeerGroupChange
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useColumnManagement.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useColumnManagement.ts
new file mode 100644
index 0000000..4fd8a6b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useColumnManagement.ts
@@ -0,0 +1,461 @@
+import { get } from 'lodash';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import BaseColumnManager from '../../shared/components/ColumnManager/BaseColumnManager';
+import { baseColumnManagerService } from '../../shared/components/ColumnManager/data/baseColumnManagerService';
+import { IMappedColumn } from '../../shared/components/IMappedColumn';
+import { ITreeGridColumnConfig } from '../data/ITreeGridColumnConfig';
+
+export interface IUseColumnManagementOptions {
+  /** Primary grid name for column management */
+  gridName: string;
+  /** Additional grid names to sync column visibility with */
+  additionalGridNames?: string[];
+  /** Function to generate column configs given managed columns and isFieldHidden callback */
+  getColumnConfigs: (managedColumns: IMappedColumn[], isFieldHidden: (fieldName: string) => boolean, showPeerGroupBenchmarking?: boolean) => ITreeGridColumnConfig[];
+  /** Whether to show peer group benchmarking columns */
+  showPeerGroupBenchmarking?: boolean;
+  /** Optional column manager service for fetching and saving column layouts. Defaults to baseColumnManagerService */
+  columnManagerService?: {
+    getColumnList: (name: string) => Promise<IMappedColumn[]>;
+    setColumnList: (name: string, columns: IMappedColumn[]) => Promise<void>;
+  };
+  /** Optional configuration for the column manager panel */
+  columnManagerPanel?: {
+    /** Title for the column manager panel. Defaults to 'Edit Column Layout' */
+    title?: string;
+    /** Whether columns are sortable in the panel. Defaults to false */
+    isSortable?: boolean;
+    /** Column names that cannot be hidden. Defaults to ['name'] */
+    columnsNotToHide?: string[];
+  };
+  /** Name of the key column field that will be auto-included in managed columns if not explicitly defined. Defaults to 'key'. The column is added hidden by default and rendered with zero width for DOM accessibility. */
+  keyColumnField?: string;
+  /** Whether to automatically include a key column for row identification. Defaults to true. Set to false to disable all key column auto-addition logic. */
+  hasKeyColumnField?: boolean;
+}
+
+export interface IUseColumnManagementResult {
+  /** Current managed columns with visibility state */
+  managedColumns: IMappedColumn[];
+  /** Whether column management is initialized */
+  isInitialized: boolean;
+  /** Columns mapped for the column manager panel */
+  mappedColumns: IMappedColumn[];
+  /** Handler for when column manager applies changes */
+  handleColumnApply: (columns: IMappedColumn[]) => void;
+  /** Get the current column configs with managed visibility applied */
+  getColumnsWithVisibility: () => ITreeGridColumnConfig[];
+  /** Utility function to check if a field is hidden in the current column configuration */
+  isFieldHidden: (fieldName: string) => boolean;
+  /** Render function for the column manager panel */
+  renderColumnManagerPanel: (props: IColumnManagerDialogProps) => JSX.Element;
+}
+
+export interface IColumnManagerDialogProps {
+  /** Whether the dialog is visible */
+  isVisible: boolean;
+  /** Callback when dialog is cancelled */
+  onCancel: () => void;
+  /** Optional callback after columns are applied successfully */
+  onApplyComplete?: () => void;
+}
+
+/**
+ * Fetches column layout from server and merges with existing columns
+ * @internal
+ */
+const fetchColumns = async (
+  name: string,
+  getColumns: IMappedColumn[],
+  columnManagerService: {
+    getColumnList: (name: string) => Promise<IMappedColumn[]>;
+  }
+): Promise<IMappedColumn[]> => {
+  let fetchResult: IMappedColumn[] = getColumns.length > 0 ? [...getColumns] : [];
+  await columnManagerService
+    .getColumnList(name)
+    .then((columns) => {
+      columns.forEach((col) => {
+        const match = fetchResult.find((c) => c.name === col.name);
+        if (match) {
+          // Only update visibility for columns that exist in the grid definition
+          match.isHidden = col.isHidden;
+        }
+        // Ignore columns from server that don't exist in current grid definition
+      });
+    })
+    .catch(() => (fetchResult = []));
+  return fetchResult;
+};
+
+/**
+ * Fetches and merges column layouts from multiple grid names
+ * @internal
+ */
+const fetchAndSetColumns = async (
+  gridNames: string[],
+  getColumns: IMappedColumn[],
+  columnManagerService: {
+    getColumnList: (name: string) => Promise<IMappedColumn[]>;
+    setColumnList: (name: string, columns: IMappedColumn[]) => Promise<void>;
+  }
+): Promise<IMappedColumn[]> => {
+  let columnsResult: IMappedColumn[] = getColumns.length > 0 ? [...getColumns] : [];
+  for (const name of gridNames.filter((name) => name !== '')) {
+    columnsResult = await fetchColumns(name, columnsResult, columnManagerService);
+  }
+  await columnManagerService.setColumnList(gridNames[0], columnsResult);
+  return columnsResult;
+};
+
+/**
+ * Fetches column list from server and merges with passed columns, preserving order
+ * @param name - Grid name identifier
+ * @param passedColumns - Default column configuration
+ * @param columnManagerService - Service for fetching column layouts
+ * @returns Merged and sorted column list
+ */
+export const getColumnList = async (
+  name: string,
+  passedColumns: IMappedColumn[],
+  columnManagerService: { getColumnList: (name: string) => Promise<IMappedColumn[]> } = baseColumnManagerService
+): Promise<IMappedColumn[]> => {
+  let result: IMappedColumn[] = [];
+  if (passedColumns.length === 0) {
+    return result;
+  }
+  await columnManagerService.getColumnList(name).then((columns) => {
+    passedColumns.forEach((col: IMappedColumn) => {
+      const match = columns.find((c: IMappedColumn) => c.name === col.name);
+      if (match) {
+        result.push({ ...match });
+      } else {
+        result.push({ ...col });
+      }
+    });
+    result.forEach((col: IMappedColumn) => {
+      const match = passedColumns.find((c: IMappedColumn) => c.name === col.name);
+      if (!match) {
+        col.index = undefined;
+      }
+    });
+    result = result.filter((col: IMappedColumn) => col.index !== undefined).sort((a: IMappedColumn, b: IMappedColumn) => (a.index ?? 0) - (b.index ?? 0));
+  });
+  return result;
+};
+
+/**
+ * Custom hook for managing TreeGrid column visibility with persistent server-side storage.
+ *
+ * Features:
+ * - Persistent column visibility across sessions
+ * - Multi-grid synchronization (e.g., summary and detail grids share settings)
+ * - Integrated column manager dialog
+ * - Automatic fallback to default columns
+ * - Auto-inclusion of key column for row identification (hidden by default, zero-width for DOM access)
+ *
+ * @param options.gridName - Primary grid identifier for persistence
+ * @param options.additionalGridNames - Optional grids to sync column settings with
+ * @param options.getColumnConfigs - Function that returns column configurations
+ * @param options.showPeerGroupBenchmarking - Whether to show peer group benchmarking columns
+ * @param options.keyColumnField - Field name for auto-included key column (defaults to 'key')
+ * @param options.hasKeyColumnField - Whether to auto-include key column (defaults to true)
+ * @param options.columnManagerService - Optional custom service for fetching/saving columns
+ * @param options.columnManagerPanel - Optional dialog configuration (title, isSortable, columnsNotToHide)
+ *
+ * @returns managedColumns - Current columns with visibility state (includes auto-added key column)
+ * @returns isInitialized - Whether initialization is complete
+ * @returns mappedColumns - Columns for the column manager dialog
+ * @returns handleColumnApply - Apply column changes
+ * @returns getColumnsWithVisibility - Get columns with visibility applied (auto-adds key column if needed)
+ * @returns isFieldHidden - Check if a field is hidden
+ * @returns renderColumnManagerPanel - Render the column manager dialog
+ *
+ * @example
+ * const { getColumnsWithVisibility, renderColumnManagerPanel } = useColumnManagement({
+ *   gridName: 'mySummaryGrid',
+ *   additionalGridNames: ['myDetailGrid'],
+ *   getColumnConfigs: (columns, isFieldHidden) => [
+ *     { field: 'name', header: 'Name', hidden: isFieldHidden('name') },
+ *     { field: 'value', header: 'Value', hidden: isFieldHidden('value') }
+ *   ]
+ * });
+ */
+export const useColumnManagement = (options: IUseColumnManagementOptions): IUseColumnManagementResult => {
+  const {
+    gridName,
+    additionalGridNames = [],
+    getColumnConfigs,
+    showPeerGroupBenchmarking = false,
+    columnManagerService = baseColumnManagerService,
+    columnManagerPanel = {},
+    keyColumnField = 'key',
+    hasKeyColumnField = true
+  } = options;
+
+  const { title = 'Edit Column Layout', isSortable = false, columnsNotToHide = ['name'] } = columnManagerPanel;
+
+  const [managedColumns, setManagedColumns] = useState<IMappedColumn[]>([]);
+  const [defaultColumns, setDefaultColumns] = useState<IMappedColumn[]>([]);
+  const [mappedColumns, setMappedColumns] = useState<IMappedColumn[]>([]);
+  const [isInitialized, setIsInitialized] = useState(false);
+
+  // Track initialization to ensure it only runs once on mount
+  const hasInitializedRef = useRef(false);
+
+  // Track whether the key column was explicitly included (vs auto-added)
+  const keyColumnExplicitlyIncludedRef = useRef(false);
+
+  // Track last fetch time to detect when to refresh columns from other grids
+  const lastFetchTimeRef = useRef<number>(0);
+
+  // Initialize columns only once on mount to prevent data loss from re-initialization
+  useEffect(() => {
+    const initializeColumns = async () => {
+      if (!gridName || hasInitializedRef.current) return;
+
+      hasInitializedRef.current = true;
+
+      try {
+        // Get default column configs to extract column metadata
+        // Pass a dummy isFieldHidden that always returns false for initialization
+        const defaultConfigs = getColumnConfigs([], () => false, showPeerGroupBenchmarking);
+        const passedColumns: IMappedColumn[] = defaultConfigs
+          .filter((col) => col.header !== undefined && col.header !== '' && !col.isGap)
+          .map((col, index) => ({
+            index,
+            name: col.field ?? '',
+            heading: typeof col.header === 'string' ? col.header : 'Column',
+            isHidden: col.hidden ?? false,
+            isLocked: col.expander ?? col.field === 'name',
+            initiativeRollupColumnId: 0
+          }));
+
+        // Auto-add key column if enabled and not explicitly defined in getColumnConfigs
+        // The key column enables row identification for scrolling and selection
+        if (hasKeyColumnField) {
+          const hasKeyColumn = passedColumns.some((col) => col.name === keyColumnField);
+          keyColumnExplicitlyIncludedRef.current = hasKeyColumn;
+          if (!hasKeyColumn) {
+            passedColumns.push({
+              index: passedColumns.length,
+              name: keyColumnField,
+              heading: 'Key',
+              isHidden: true, // Hidden by default, will be rendered with zero width
+              isLocked: false,
+              initiativeRollupColumnId: 0
+            });
+          }
+        }
+
+        // Fetch saved column layouts from all grid names
+        const allGridNames = [gridName, ...additionalGridNames].filter((name) => name);
+        const columnsResult = await fetchAndSetColumns(allGridNames, passedColumns, columnManagerService);
+
+        setManagedColumns(columnsResult);
+        setDefaultColumns(passedColumns);
+        setIsInitialized(true);
+        lastFetchTimeRef.current = Date.now();
+      } catch (error) {
+        // Reset initialization flag on error to allow retry
+        hasInitializedRef.current = false;
+        throw error;
+      }
+    };
+
+    initializeColumns();
+    // Only initialize once on mount - ignore changes to other dependencies
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [gridName]);
+
+  // Update default columns when showPeerGroupBenchmarking changes
+  useEffect(() => {
+    if (!isInitialized) return;
+
+    // Regenerate default columns with updated showPeerGroupBenchmarking
+    const updatedDefaultConfigs = getColumnConfigs([], () => false, showPeerGroupBenchmarking);
+    const updatedPassedColumns: IMappedColumn[] = updatedDefaultConfigs
+      .filter((col) => col.header !== undefined && col.header !== '' && !col.isGap)
+      .map((col, index) => ({
+        index,
+        name: col.field ?? '',
+        heading: typeof col.header === 'string' ? col.header : 'Column',
+        isHidden: col.hidden ?? false,
+        isLocked: col.expander ?? col.field === 'name',
+        initiativeRollupColumnId: 0
+      }));
+
+    // Auto-add key column if enabled and not found in updated configs
+    if (hasKeyColumnField) {
+      const hasKeyColumn = updatedPassedColumns.some((col) => col.name === keyColumnField);
+      if (!hasKeyColumn) {
+        updatedPassedColumns.push({
+          index: updatedPassedColumns.length,
+          name: keyColumnField,
+          heading: 'Key',
+          isHidden: true, // Hidden by default for auto-added columns
+          isLocked: false,
+          initiativeRollupColumnId: 0
+        });
+      }
+    }
+
+    setDefaultColumns(updatedPassedColumns);
+
+    // Merge columns preserving order from updated config and visibility settings from managed columns
+    const updatedManagedColumns: IMappedColumn[] = updatedPassedColumns.map((newCol) => {
+      const existingCol = managedColumns.find((c) => c.name === newCol.name);
+      if (existingCol) {
+        // Preserve visibility settings from existing column
+        return {
+          ...newCol,
+          isHidden: existingCol.isHidden
+        };
+      }
+      // New column - use default visibility
+      return newCol;
+    });
+
+    // Only update if columns actually changed
+    if (JSON.stringify(updatedManagedColumns) !== JSON.stringify(managedColumns)) {
+      setManagedColumns(updatedManagedColumns);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [showPeerGroupBenchmarking, isInitialized]);
+
+  // Refresh columns when page becomes visible to sync changes from other grids
+  useEffect(() => {
+    const handleVisibilityChange = async () => {
+      if (!document.hidden && isInitialized && gridName) {
+        // Only refresh if it's been more than 100ms since last fetch to avoid rapid re-fetching
+        const timeSinceLastFetch = Date.now() - lastFetchTimeRef.current;
+        if (timeSinceLastFetch > 100) {
+          try {
+            // Fetch latest columns from all grid names to sync changes
+            const allGridNames = [gridName, ...additionalGridNames].filter((name) => name);
+            const currentColumns = managedColumns.length > 0 ? managedColumns : defaultColumns;
+
+            if (currentColumns.length > 0) {
+              const refreshedColumns = await fetchAndSetColumns(allGridNames, currentColumns, columnManagerService);
+
+              // Only update if columns actually changed
+              const columnsChanged = JSON.stringify(refreshedColumns) !== JSON.stringify(managedColumns);
+              if (columnsChanged) {
+                setManagedColumns(refreshedColumns);
+              }
+
+              lastFetchTimeRef.current = Date.now();
+            }
+          } catch (error) {
+            // Silently fail on refresh - don't disrupt user experience
+            console.error('Failed to refresh column layout:', error);
+          }
+        }
+      }
+    };
+
+    document.addEventListener('visibilitychange', handleVisibilityChange);
+    return () => {
+      document.removeEventListener('visibilitychange', handleVisibilityChange);
+    };
+  }, [isInitialized, gridName, additionalGridNames, managedColumns, defaultColumns, columnManagerService]);
+
+  // Update mapped columns when managed columns change (for column manager dialog)
+  useEffect(() => {
+    if (managedColumns.length > 0) {
+      setMappedColumns(managedColumns);
+    } else if (defaultColumns.length > 0) {
+      setMappedColumns(defaultColumns);
+    }
+  }, [managedColumns, defaultColumns]);
+
+  const handleColumnApply = useCallback(
+    async (columns: IMappedColumn[]) => {
+      // Update state first - React will batch these updates
+      setManagedColumns(columns);
+      setMappedColumns(columns);
+
+      // Save to all grid names to keep them in sync
+      const allGridNames = [gridName, ...additionalGridNames].filter((name) => name);
+      await Promise.all(allGridNames.map((name) => columnManagerService.setColumnList(name, columns)));
+    },
+    [gridName, additionalGridNames, columnManagerService]
+  );
+
+  /**
+   * Stable callback to check if a field is hidden in the current column configuration.
+   * Automatically bound to the current managed or default columns state.
+   */
+  const isFieldHidden = useCallback(
+    (fieldName: string): boolean => {
+      const columnsToUse = managedColumns.length > 0 ? managedColumns : defaultColumns;
+      if (columnsToUse.length === 0) {
+        return false;
+      }
+      const managedColumn = columnsToUse.find((col) => get(col, 'name') === fieldName);
+      return managedColumn?.isHidden ?? false;
+    },
+    [managedColumns, defaultColumns]
+  );
+
+  const getColumnsWithVisibility = useCallback((): ITreeGridColumnConfig[] => {
+    const columnsToUse = managedColumns.length > 0 ? managedColumns : defaultColumns;
+    const configs = getColumnConfigs(columnsToUse, isFieldHidden, showPeerGroupBenchmarking);
+
+    // Key column is NOT rendered in the grid - it's only tracked in managedColumns for persistence
+    // TreeGrid uses the data structure's key property for row identification
+
+    return configs;
+  }, [managedColumns, defaultColumns, getColumnConfigs, isFieldHidden, showPeerGroupBenchmarking]);
+
+  /**
+   * Render function for the column manager dialog.
+   * Returns a BaseColumnManager component with all necessary props pre-configured.
+   * Auto-added key columns are excluded from the column manager UI.
+   */
+  const renderColumnManagerPanel = useCallback(
+    ({ isVisible, onCancel, onApplyComplete }: IColumnManagerDialogProps) => {
+      const handleApply = async (columns: IMappedColumn[]) => {
+        // Re-add auto-added key column to persisted columns if enabled (it's not in the UI)
+        let columnsWithKey = columns;
+        if (hasKeyColumnField) {
+          const keyColumn = mappedColumns.find((col) => col.name === keyColumnField);
+          columnsWithKey = keyColumn && !keyColumnExplicitlyIncludedRef.current ? [...columns, keyColumn] : columns;
+        }
+
+        // Update state and save to all synchronized grids
+        await handleColumnApply(columnsWithKey);
+        // Trigger completion callback after state updates
+        onApplyComplete?.();
+      };
+
+      // Hide auto-added key column from column manager UI if enabled (only show explicitly defined columns)
+      const columnsForUI = hasKeyColumnField && !keyColumnExplicitlyIncludedRef.current ? mappedColumns.filter((col) => col.name !== keyColumnField) : mappedColumns;
+
+      return React.createElement(BaseColumnManager, {
+        title,
+        isVisible,
+        isSortable,
+        name: gridName,
+        useStandardService: false, // We handle saving manually to sync all grids
+        columnsNotToHide,
+        getColumns: columnsForUI,
+        onApply: handleApply,
+        onCancel
+      });
+    },
+    [title, isSortable, gridName, columnsNotToHide, mappedColumns, handleColumnApply, keyColumnField, hasKeyColumnField]
+  );
+
+  return {
+    managedColumns,
+    isInitialized,
+    mappedColumns,
+    handleColumnApply,
+    getColumnsWithVisibility,
+    isFieldHidden,
+    renderColumnManagerPanel
+  };
+};
+
+export default useColumnManagement;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useEncounterManagement.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useEncounterManagement.ts
new file mode 100644
index 0000000..5b0c7a6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useEncounterManagement.ts
@@ -0,0 +1,238 @@
+import React from 'react';
+import { isEmpty, xor } from 'lodash';
+import { useCallback, useEffect, useState } from 'react';
+import { IEncounterGroupDetailTreeGridData } from '../data/IEncounterGroupDetail';
+import { IExplorationPopulation } from '../opportunities/data/IExplorationPopulation';
+import { TreeGridLevel } from './useTreeGridExpansion';
+
+/**
+ * Configuration options for the encounter management hook.
+ */
+interface IUseEncounterManagementConfig {
+  /** Currently applied encounter exclusions from parent */
+  encounterExclusionsApplied: number[];
+  /** Callback to update applied exclusions in parent */
+  setEncounterExclusionsApplied: (exclusions: number[]) => void;
+  /** Currently applied encounter inclusions from parent */
+  encounterInclusionsApplied: number[];
+  /** Callback to update applied inclusions in parent */
+  setEncounterInclusionsApplied: (inclusions: number[]) => void;
+  /** Callback to set encounter IDs used in mapping */
+  setMappingEncounterIds: (mappings: number[]) => void;
+  /** Exploration population data when editing an existing population */
+  explorationPopulationData: IExplorationPopulation | undefined;
+  /** Callback to update expanded tree grid levels (resets to Entity on apply) */
+  updateExpandedLevels: (levelPos: TreeGridLevel) => void;
+}
+
+/**
+ * Return value from the encounter management hook.
+ */
+interface IUseEncounterManagementReturn {
+  /** Array of encounter IDs that should be excluded */
+  encounterExclusions: number[];
+  /** Array of encounter IDs that should be included */
+  encounterInclusions: number[];
+  /** Array of encounter IDs from initial grid load that were excluded */
+  gridEncounterExclusions: number[];
+  /** Whether the apply/cancel action bar should be visible */
+  isApplyExclusionActionBarVisible: boolean;
+  /** Determines if an encounter is included based on current state */
+  isEncounterIncluded: (encounterId: number) => boolean;
+  /** Handles toggling encounter inclusion/exclusion status */
+  handleSetEncounterExclusion: (id: number, isIncluded: boolean) => void;
+  /** Initializes encounter exclusions from loaded grid data */
+  setInitialEncounterExclusions: (groupDetails: IEncounterGroupDetailTreeGridData[]) => void;
+  /** Applies pending encounter exclusion/inclusion changes */
+  handleApplyExclusions: () => Promise<void>;
+  /** Cancels pending encounter exclusion/inclusion changes */
+  handleCancelApplyExclusions: () => Promise<void>;
+  /** Clears all encounter exclusion and inclusion state arrays */
+  clearEncounterExclusionsInclusionsStates: () => void;
+  /** Updates encounter exclusion state (exposed for external updates) */
+  setEncounterExclusions: React.Dispatch<React.SetStateAction<number[]>>;
+  /** Updates encounter inclusion state (exposed for external updates) */
+  setEncounterInclusions: React.Dispatch<React.SetStateAction<number[]>>;
+}
+
+/**
+ * Custom hook for managing encounter inclusion/exclusion state and operations.
+ *
+ * Handles the complex logic of tracking which encounters should be included or excluded
+ * from a population, managing both the initial loaded state and pending user changes,
+ * and coordinating with parent components to apply changes.
+ *
+ * @param config - Configuration options for encounter management
+ * @returns Object containing state and functions for encounter management
+ */
+export const useEncounterManagement = (config: IUseEncounterManagementConfig): IUseEncounterManagementReturn => {
+  const {
+    encounterExclusionsApplied,
+    setEncounterExclusionsApplied,
+    encounterInclusionsApplied,
+    setEncounterInclusionsApplied,
+    setMappingEncounterIds,
+    explorationPopulationData,
+    updateExpandedLevels
+  } = config;
+
+  // ========================================================================
+  // State
+  // ========================================================================
+
+  const [gridEncounterExclusions, setGridEncounterExclusions] = useState<number[]>([]);
+  const [encounterExclusions, setEncounterExclusions] = useState<number[]>([]);
+  const [encounterInclusions, setEncounterInclusions] = useState<number[]>([]);
+  const [isApplyExclusionActionBarVisible, setIsApplyExclusionActionBarVisible] = useState<boolean>(false);
+
+  // ========================================================================
+  // Callbacks
+  // ========================================================================
+
+  /**
+   * Initializes encounter exclusions from loaded grid data.
+   * Separates encounters into excluded and mapping (included) arrays.
+   */
+  const setInitialEncounterExclusions = useCallback(
+    (groupDetails: IEncounterGroupDetailTreeGridData[]): void => {
+      if (!groupDetails) {
+        return;
+      }
+
+      const excludedEncounters: number[] = [];
+      const mappingEncounters: number[] = [];
+
+      groupDetails
+        ?.flatMap((x) => x.children.flatMap((y) => y.children.flatMap((z) => z.children)))
+        .forEach((detail) => {
+          if (detail.data.isExcluded) {
+            excludedEncounters.push(detail.data.id);
+          } else {
+            mappingEncounters.push(detail.data.id);
+          }
+        });
+
+      setGridEncounterExclusions(excludedEncounters);
+      setMappingEncounterIds(mappingEncounters);
+    },
+    [setMappingEncounterIds]
+  );
+
+  /**
+   * Determines if an encounter is included in the population.
+   * Checks pending manual changes first, then falls back to initial loaded state.
+   */
+  const isEncounterIncluded = useCallback(
+    (encounterId: number): boolean => {
+      if (encounterExclusions.includes(encounterId)) {
+        return false;
+      }
+      if (encounterInclusions.includes(encounterId)) {
+        return true;
+      }
+      return !gridEncounterExclusions.includes(encounterId);
+    },
+    [encounterExclusions, encounterInclusions, gridEncounterExclusions]
+  );
+
+  /**
+   * Handles toggling encounter inclusion/exclusion status.
+   * Manages state transitions based on initial loaded state and user actions.
+   */
+  const handleSetEncounterExclusion = useCallback(
+    (id: number, isIncluded: boolean): void => {
+      const wasInitiallyExcluded = gridEncounterExclusions.includes(id);
+
+      if (isIncluded) {
+        setEncounterInclusions((prev) => {
+          const isInInclusionList = prev.includes(id);
+          return wasInitiallyExcluded && !isInInclusionList ? [...prev, id] : prev;
+        });
+        setEncounterExclusions((prev) => {
+          const isInExclusionList = prev.includes(id);
+          return isInExclusionList ? prev.filter((x) => x !== id) : prev;
+        });
+      } else {
+        setEncounterExclusions((prev) => {
+          const isInExclusionList = prev.includes(id);
+          return !wasInitiallyExcluded && !isInExclusionList ? [...prev, id] : prev;
+        });
+        setEncounterInclusions((prev) => {
+          const isInInclusionList = prev.includes(id);
+          return isInInclusionList ? prev.filter((x) => x !== id) : prev;
+        });
+      }
+    },
+    [gridEncounterExclusions]
+  );
+
+  /**
+   * Applies pending encounter exclusion/inclusion changes and resets expanded levels.
+   */
+  const handleApplyExclusions = useCallback(async (): Promise<void> => {
+    setEncounterExclusionsApplied([...encounterExclusions]);
+    setEncounterInclusionsApplied([...encounterInclusions]);
+    setIsApplyExclusionActionBarVisible(false);
+    updateExpandedLevels(TreeGridLevel.Entity);
+  }, [encounterExclusions, encounterInclusions, setEncounterExclusionsApplied, setEncounterInclusionsApplied, updateExpandedLevels]);
+
+  /**
+   * Cancels pending encounter exclusion/inclusion changes and reverts to applied state.
+   */
+  const handleCancelApplyExclusions = useCallback(async (): Promise<void> => {
+    setIsApplyExclusionActionBarVisible(false);
+    setEncounterExclusions([...encounterExclusionsApplied]);
+    setEncounterInclusions([...encounterInclusionsApplied]);
+  }, [encounterExclusionsApplied, encounterInclusionsApplied]);
+
+  /**
+   * Clears all encounter exclusion and inclusion state arrays.
+   */
+  const clearEncounterExclusionsInclusionsStates = useCallback((): void => {
+    setEncounterExclusionsApplied([]);
+    setEncounterInclusionsApplied([]);
+    setEncounterExclusions([]);
+    setEncounterInclusions([]);
+  }, [setEncounterExclusionsApplied, setEncounterInclusionsApplied]);
+
+  // ========================================================================
+  // Effects
+  // ========================================================================
+
+  // Initialize encounter exclusions/inclusions from saved population data
+  useEffect(() => {
+    if (!explorationPopulationData) {
+      return;
+    }
+
+    setEncounterExclusions([...explorationPopulationData.manuallyExcludedEncounterIds]);
+    setEncounterInclusions([...explorationPopulationData.manuallyIncludedEncounterIds]);
+    setEncounterExclusionsApplied([...explorationPopulationData.manuallyExcludedEncounterIds]);
+    setEncounterInclusionsApplied([...explorationPopulationData.manuallyIncludedEncounterIds]);
+  }, [explorationPopulationData, setEncounterExclusionsApplied, setEncounterInclusionsApplied]);
+
+  // Show action bar when pending encounter changes exist
+  useEffect(() => {
+    const hasUnappliedChanges = !isEmpty(xor(encounterInclusions, encounterInclusionsApplied)) || !isEmpty(xor(encounterExclusions, encounterExclusionsApplied));
+    setIsApplyExclusionActionBarVisible(hasUnappliedChanges);
+  }, [encounterInclusions, encounterExclusions, encounterInclusionsApplied, encounterExclusionsApplied]);
+
+  // ========================================================================
+  // Return
+  // ========================================================================
+
+  return {
+    encounterExclusions,
+    encounterInclusions,
+    gridEncounterExclusions,
+    isApplyExclusionActionBarVisible,
+    isEncounterIncluded,
+    handleSetEncounterExclusion,
+    setInitialEncounterExclusions,
+    handleApplyExclusions,
+    handleCancelApplyExclusions,
+    clearEncounterExclusionsInclusionsStates,
+    setEncounterExclusions,
+    setEncounterInclusions
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useExplorationColumnConfigs.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useExplorationColumnConfigs.tsx
new file mode 100644
index 0000000..d946781
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useExplorationColumnConfigs.tsx
@@ -0,0 +1,439 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import intlService from '@strata/intl/lib';
+import Checkbox from '@strata/tempo/lib/checkbox/Checkbox';
+import Link from '@strata/tempo/lib/link/Link';
+import Text from '@strata/tempo/lib/text';
+import Tooltip from '@strata/tempo/lib/tooltip/Tooltip';
+import React, { useCallback } from 'react';
+import { IMappedColumn } from '../../shared/components/IMappedColumn';
+import { caseTypeFamilyTypeHeader } from '../data/CaseTypeFamilyFunctions';
+import {
+  COLUMN_HEADER_AVERAGE_LENGTH_OF_STAY,
+  COLUMN_HEADER_COHORT_MEDIAN_ALOS,
+  COLUMN_HEADER_COHORT_MEDIAN_VARIABLE_DIRECT_COST,
+  COLUMN_HEADER_COST_DRIVER_VARIATION_EXCLUDED,
+  COLUMN_HEADER_COST_DRIVER_VARIATION_INCLUDED,
+  COLUMN_HEADER_CUSTOMER_MEDIAN_ALOS,
+  COLUMN_HEADER_CUSTOMER_MEDIAN_VARIABLE_DIRECT_COST,
+  COLUMN_HEADER_ENCOUNTERS_ABOVE_MEDIAN_EXCLUDED,
+  COLUMN_HEADER_ENCOUNTERS_ABOVE_MEDIAN_INCLUDED,
+  COLUMN_HEADER_ENCOUNTERS_AT_OR_BELOW_MEDIAN_INCLUDED,
+  COLUMN_HEADER_ENCOUNTERS_INCLUDED,
+  COLUMN_HEADER_ENCOUNTERS_WITH_COST_DRIVER_VARIATION,
+  COLUMN_HEADER_IDENTIFIED_COST_DRIVER_VARIATION,
+  COLUMN_HEADER_INCLUDED_IN_POPULATION,
+  COLUMN_HEADER_MEDIAN_GROSS_CHARGES,
+  COLUMN_HEADER_MEDIAN_VARIABLE_DIRECT_COST,
+  COLUMN_HEADER_MORTALITY_RATE,
+  COLUMN_HEADER_OE_ALOS_RATIO,
+  COLUMN_HEADER_OE_VARIABLE_DIRECT_COST_RATIO,
+  COLUMN_HEADER_TOTAL_ENCOUNTERS
+} from '../data/explorationColumnHeaders';
+import { getHeatMapColor } from '../data/heatMapColors';
+import { IEncounterGroupTreeGridData } from '../data/IEncounterGroupSummary';
+import { DEFAULT_GRID_PX_WIDTH, ITreeGridColumnConfig, newGapColumn, newTreeGridColumnConfig } from '../data/ITreeGridColumnConfig';
+
+/**
+ * Interface for name column detail properties
+ */
+interface INameColumnDetailProps {
+  caseTypeFamilyId: string;
+  costDriver: string;
+  encounterExclusions: number[];
+  encounterInclusions: number[];
+  isExplorationInformationPageEnabled?: boolean;
+}
+
+/**
+ * Interface for name column body properties
+ */
+interface INameColumnBodyProps {
+  rowData: IEncounterGroupTreeGridData;
+  details?: INameColumnDetailProps;
+}
+
+/**
+ * Renders the name column body with appropriate links and styling.
+ * Handles both summary and detail views with drill-down navigation.
+ */
+const getNameColumnBody = (props: INameColumnBodyProps) => {
+  const contractsUrl = `${appConfig.contractsUrl}`;
+  const { rowData, details } = props;
+  const { caseTypeFamilyId, costDriver, encounterExclusions, encounterInclusions, isExplorationInformationPageEnabled } = details || {};
+
+  if (!details) {
+    return rowData.leaf ? <Link href={`/explorectf/${rowData.data.id}/costdriver/${rowData.data.name}`}> {rowData.data.name}</Link> : <Text>{rowData.data.name}</Text>;
+  }
+  let column;
+
+  if (rowData.children) {
+    if (rowData.key.includes('Entity')) {
+      column = 'entity';
+    } else if (rowData.children[0]?.children) {
+      column = 'code';
+    } else {
+      column = 'physician';
+    }
+  }
+
+  return rowData.children && rowData.children?.length !== 0 ? (
+    isExplorationInformationPageEnabled ? (
+      <Link href={`/explorectf/${caseTypeFamilyId}/costdriver/${costDriver}/${column}/${rowData.data.id}`}> {rowData.data.name}</Link>
+    ) : (
+      <Text>{rowData.data.name}</Text>
+    )
+  ) : !rowData.children && (encounterExclusions?.map(Number).includes(Number(rowData.data.id)) || encounterInclusions?.map(Number).includes(Number(rowData.data.id))) ? (
+    <>
+      <Text>
+        {rowData.data.name}
+        <span style={{ fontStyle: 'italic', fontSize: '14px', opacity: 0.75 }}> (manually changed)</span>
+      </Text>
+    </>
+  ) : (
+    <Link href={`${contractsUrl}encounter-viewer?isBillingSummaryModel=false&encounterId=${rowData.data.id}`} newTab>
+      {rowData.data.name}
+    </Link>
+  );
+};
+
+/**
+ * Renders mortality rate with tooltip for discharge status description.
+ * Shows either formatted percentage or discharge status code with description.
+ */
+const getMortalityRate = (rowData: any): React.ReactNode => {
+  return !rowData.data.dischargeStatusDescription ? (
+    `${intlService.formatNumber(rowData.data.mortalityRate, 'percent')}`
+  ) : (
+    <Tooltip title={rowData.data.dischargeStatusDescription}>
+      <Text>{rowData.data.dischargeStatusCode}</Text>
+    </Tooltip>
+  );
+};
+
+/**
+ * Shared ratio renderer with heat-map background styling.
+ */
+const HeatMapRatioCell = ({ ratio }: { ratio: number }) => (
+  <div
+    style={{
+      backgroundColor: getHeatMapColor(ratio),
+      display: 'inline-block',
+      width: '100%'
+    }}
+  >
+    {intlService.formatNumber(ratio, 'decimal')}
+  </div>
+);
+
+/**
+ * Helper function to create name column configuration.
+ * This is the leftmost column with the case type/family name and expander.
+ */
+const nameColumnConfig = ({ caseTypeFamilyType, body }: { caseTypeFamilyType?: string; body?: (rowData: any) => JSX.Element }): ITreeGridColumnConfig =>
+  newTreeGridColumnConfig({
+    field: 'name',
+    header: caseTypeFamilyTypeHeader(caseTypeFamilyType),
+    width: 220,
+    align: 'left',
+    expander: true,
+    body: body,
+    group: 'name'
+  });
+
+/**
+ * Enum defining where a column should be visible
+ */
+export enum ColumnVisibility {
+  /** Only visible in summary view */
+  Summary = 'summary',
+  /** Only visible in detail view */
+  Detail = 'detail',
+  /** Visible in both summary and detail views */
+  Both = 'both'
+}
+
+/**
+ * Type of view for column configuration
+ */
+export type ViewType = 'summary' | 'detail';
+
+/**
+ * Configuration options for detail view
+ */
+export interface IDetailViewConfig {
+  caseTypeFamilyType?: string;
+  isExplorationInformationPageEnabled?: boolean;
+  caseTypeFamilyId?: string;
+  costDriver?: string;
+  encounterExclusions?: number[];
+  encounterInclusions?: number[];
+  isEncounterIncluded: (encounterId: number) => boolean;
+  handleSetEncounterExclusion: (id: number, isIncluded: boolean) => void;
+}
+
+/**
+ * Props for useExplorationColumnConfigs hook
+ */
+export interface IUseExplorationColumnConfigsProps {
+  /** Type of view: 'summary' or 'detail' */
+  viewType: ViewType;
+  /** Configuration for detail view (required if viewType is 'detail') */
+  detailConfig?: IDetailViewConfig;
+  /** Controls whether the "Included in Population" column is editable */
+  isIncludedInPopulationColumnReadOnly?: boolean;
+}
+
+/**
+ * Shared hook for generating exploration grid column configurations.
+ * Provides unified column definitions for both summary and detail views with view-specific overrides.
+ *
+ * @param props - Configuration options including view type and detail-specific config
+ * @returns A function that generates column configurations based on visibility settings
+ */
+export const useExplorationColumnConfigs = (props: IUseExplorationColumnConfigsProps) => {
+  const { viewType, detailConfig, isIncludedInPopulationColumnReadOnly } = props;
+
+  /**
+   * Generates TreeGrid column configurations with visibility and benchmarking options.
+   * Filters columns based on the current view type and applies view-specific customizations.
+   */
+  const getColumnConfigs = useCallback(
+    (managedColumns: IMappedColumn[], isFieldHidden: (fieldName: string) => boolean, showPeerGroupBenchmarking = false): ITreeGridColumnConfig[] => {
+      const columnConfigs: ITreeGridColumnConfig[] = [];
+      const isDetailView = viewType === 'detail';
+
+      // Name column
+      if (isDetailView && detailConfig) {
+        columnConfigs.push(
+          nameColumnConfig({
+            caseTypeFamilyType: detailConfig.caseTypeFamilyType,
+            body: (rowData) =>
+              getNameColumnBody({
+                rowData,
+                details: {
+                  isExplorationInformationPageEnabled: detailConfig.isExplorationInformationPageEnabled,
+                  caseTypeFamilyId: detailConfig.caseTypeFamilyId ?? '',
+                  costDriver: detailConfig.costDriver ?? '',
+                  encounterExclusions: detailConfig.encounterExclusions ?? [],
+                  encounterInclusions: detailConfig.encounterInclusions ?? []
+                }
+              })
+          })
+        );
+      } else {
+        columnConfigs.push(nameColumnConfig({ body: (rowData) => getNameColumnBody({ rowData }) }));
+      }
+
+      // Detail column (Included in Population checkbox) - Detail view only
+      if (isDetailView && detailConfig) {
+        columnConfigs.push({
+          field: 'isExcluded',
+          header: COLUMN_HEADER_INCLUDED_IN_POPULATION,
+          width: 100,
+          align: 'center',
+          group: 'detail',
+          body: (rowData: any) =>
+            !rowData.children ? (
+              <Checkbox
+                disabled={isIncludedInPopulationColumnReadOnly}
+                checked={detailConfig.isEncounterIncluded(rowData.data.id)}
+                onChange={(e) => detailConfig.handleSetEncounterExclusion(rowData.data.id, e.target.checked)}
+              />
+            ) : (
+              <></>
+            )
+        });
+      }
+
+      // Entire Population group
+      columnConfigs.push(
+        {
+          field: 'totalEncounters',
+          header: COLUMN_HEADER_TOTAL_ENCOUNTERS,
+          hidden: isFieldHidden('totalEncounters'),
+          format: 'number',
+          group: 'entirePopulation',
+          ...(isDetailView && { body: (rowData) => (rowData.children ? `${intlService.formatNumber(rowData.data.totalEncounters, 'number')}` : '-') })
+        },
+        {
+          field: 'totalVariationEncounters',
+          header: COLUMN_HEADER_ENCOUNTERS_WITH_COST_DRIVER_VARIATION,
+          hidden: isFieldHidden('totalVariationEncounters'),
+          format: 'number',
+          group: 'entirePopulation',
+          ...(isDetailView && { body: (rowData) => (rowData.data.totalVariationEncounters ? `${intlService.formatNumber(rowData.data.totalVariationEncounters, 'number')}` : '-') })
+        },
+        { field: 'identifiedVariation', header: COLUMN_HEADER_IDENTIFIED_COST_DRIVER_VARIATION, hidden: isFieldHidden('identifiedVariation'), format: 'currency', group: 'entirePopulation' }
+      );
+
+      // Gap after Entire Population
+      columnConfigs.push(newGapColumn('entirePopulation'));
+
+      // Benchmark Data group (peer benchmark columns)
+      if (showPeerGroupBenchmarking) {
+        columnConfigs.push(
+          {
+            field: 'customerBenchmarkMedianCost',
+            header: COLUMN_HEADER_CUSTOMER_MEDIAN_VARIABLE_DIRECT_COST,
+            hidden: isFieldHidden('customerBenchmarkMedianCost'),
+            format: 'currency',
+            group: 'benchmark',
+            ...(isDetailView && { body: (rowData) => (rowData.data.customerBenchmarkMedianCost ? `${intlService.formatNumber(rowData.data.customerBenchmarkMedianCost, 'currency')}` : '-') })
+          },
+          {
+            field: 'peerMedianCost',
+            header: COLUMN_HEADER_COHORT_MEDIAN_VARIABLE_DIRECT_COST,
+            hidden: isFieldHidden('peerMedianCost'),
+            format: 'currency',
+            group: 'benchmark',
+            ...(isDetailView && { body: (rowData) => (rowData.data.peerMedianCost ? `${intlService.formatNumber(rowData.data.peerMedianCost, 'currency')}` : '-') })
+          },
+          {
+            field: 'costOeRatio',
+            header: COLUMN_HEADER_OE_VARIABLE_DIRECT_COST_RATIO,
+            hidden: isFieldHidden('costOeRatio'),
+            format: 'decimal',
+            body: (rowData) => {
+              if (!rowData.data.costOeRatio || rowData.data.costOeRatio === 0) return '-';
+              const ratio = rowData.data.costOeRatio;
+              return <HeatMapRatioCell ratio={ratio} />;
+            },
+            group: 'benchmark'
+          },
+          {
+            field: 'customerBenchmarkALos',
+            header: COLUMN_HEADER_CUSTOMER_MEDIAN_ALOS,
+            hidden: isFieldHidden('customerBenchmarkALos'),
+            format: 'decimal',
+            body: isDetailView
+              ? (rowData) => (rowData.data.customerBenchmarkALos ? `${intlService.formatNumber(rowData.data.customerBenchmarkALos, 'decimal')}` : '-')
+              : (rowData) => (!rowData.leaf ? `${intlService.formatNumber(rowData.data.customerBenchmarkALos, 'decimal')}` : '-'),
+            group: 'benchmark'
+          },
+          {
+            field: 'peerMedianALos',
+            header: COLUMN_HEADER_COHORT_MEDIAN_ALOS,
+            hidden: isFieldHidden('peerMedianALos'),
+            format: 'decimal',
+            body: isDetailView
+              ? (rowData) => (rowData.data.peerMedianALos ? `${intlService.formatNumber(rowData.data.peerMedianALos, 'decimal')}` : '-')
+              : (rowData) => (!rowData.leaf ? `${intlService.formatNumber(rowData.data.peerMedianALos, 'decimal')}` : '-'),
+            group: 'benchmark'
+          },
+          {
+            field: 'alosOeRatio',
+            header: COLUMN_HEADER_OE_ALOS_RATIO,
+            hidden: isFieldHidden('alosOeRatio'),
+            format: 'decimal',
+            body: (rowData) => {
+              if (rowData.leaf || !rowData.data.alosOeRatio || rowData.data.alosOeRatio === 0) return '-';
+              const ratio = rowData.data.alosOeRatio;
+              return <HeatMapRatioCell ratio={ratio} />;
+            },
+            group: 'benchmark'
+          },
+          newGapColumn('benchmark')
+        );
+      }
+
+      // Refined Population group
+      columnConfigs.push(
+        {
+          field: 'includedEncounterCount',
+          header: COLUMN_HEADER_ENCOUNTERS_INCLUDED,
+          hidden: isFieldHidden('includedEncounterCount'),
+          format: 'number',
+          group: 'refinedPopulation',
+          ...(!isDetailView && { width: DEFAULT_GRID_PX_WIDTH }),
+          ...(isDetailView && { body: (rowData) => (rowData.children ? `${intlService.formatNumber(rowData.data.includedEncounterCount, 'number')}` : '-') })
+        },
+        {
+          field: 'mortalityRate',
+          header: COLUMN_HEADER_MORTALITY_RATE,
+          hidden: isFieldHidden('mortalityRate'),
+          format: 'percent',
+          group: 'refinedPopulation',
+          body: (rowData) => getMortalityRate(rowData),
+          ...(isDetailView && { sortField: 'dischargeStatusCode' })
+        },
+        {
+          field: 'averageLengthOfStay',
+          header: COLUMN_HEADER_AVERAGE_LENGTH_OF_STAY,
+          hidden: isFieldHidden('averageLengthOfStay'),
+          format: 'decimal',
+          group: 'refinedPopulation',
+          ...(!isDetailView && { body: (rowData) => (!rowData.leaf ? `${intlService.formatNumber(rowData.data.averageLengthOfStay, 'decimal')}` : '-') })
+        }
+      );
+
+      // medianGrossCharges - Detail view only
+      if (isDetailView) {
+        columnConfigs.push({
+          field: 'medianGrossCharges',
+          header: COLUMN_HEADER_MEDIAN_GROSS_CHARGES,
+          hidden: isFieldHidden('medianGrossCharges'),
+          format: 'currency',
+          group: 'refinedPopulation'
+        });
+      }
+
+      columnConfigs.push(
+        {
+          field: 'medianCost',
+          header: COLUMN_HEADER_MEDIAN_VARIABLE_DIRECT_COST,
+          hidden: isFieldHidden('medianCost'),
+          format: 'currency',
+          group: 'refinedPopulation',
+          ...(!isDetailView && { width: DEFAULT_GRID_PX_WIDTH })
+        },
+        {
+          field: 'includedEncountersBelowMedian',
+          header: COLUMN_HEADER_ENCOUNTERS_AT_OR_BELOW_MEDIAN_INCLUDED,
+          hidden: isFieldHidden('includedEncountersBelowMedian'),
+          format: 'number',
+          group: 'refinedPopulation',
+          ...(!isDetailView && { width: DEFAULT_GRID_PX_WIDTH }),
+          ...(isDetailView && { body: (rowData) => (rowData.children ? `${intlService.formatNumber(rowData.data.includedEncountersBelowMedian, 'number')}` : '-') })
+        },
+        {
+          field: 'includedEncountersAboveMedian',
+          header: COLUMN_HEADER_ENCOUNTERS_ABOVE_MEDIAN_INCLUDED,
+          hidden: isFieldHidden('includedEncountersAboveMedian'),
+          format: 'number',
+          group: 'refinedPopulation',
+          ...(!isDetailView && { width: DEFAULT_GRID_PX_WIDTH }),
+          ...(isDetailView && { body: (rowData) => (rowData.children ? `${intlService.formatNumber(rowData.data.includedEncountersAboveMedian, 'number')}` : '-') })
+        },
+        {
+          field: 'includedVariation',
+          header: COLUMN_HEADER_COST_DRIVER_VARIATION_INCLUDED,
+          hidden: isFieldHidden('includedVariation'),
+          format: 'currency',
+          group: 'refinedPopulation',
+          ...(!isDetailView && { width: DEFAULT_GRID_PX_WIDTH })
+        }
+      );
+
+      // Gap after Refined Population
+      columnConfigs.push(newGapColumn('refinedPopulation'));
+
+      // Excluded Population group
+      columnConfigs.push(
+        {
+          field: 'excludedEncountersAboveMedian',
+          header: COLUMN_HEADER_ENCOUNTERS_ABOVE_MEDIAN_EXCLUDED,
+          hidden: isFieldHidden('excludedEncountersAboveMedian'),
+          format: 'number',
+          group: 'excludedPopulation',
+          ...(isDetailView && { body: (rowData) => (rowData.children ? `${intlService.formatNumber(rowData.data.excludedEncountersAboveMedian, 'number')}` : '-') })
+        },
+        { field: 'excludedVariation', header: COLUMN_HEADER_COST_DRIVER_VARIATION_EXCLUDED, hidden: isFieldHidden('excludedVariation'), format: 'currency', group: 'excludedPopulation' }
+      );
+
+      return columnConfigs;
+    },
+    [viewType, detailConfig]
+  );
+
+  return { getColumnConfigs };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useExplorationDataFetching.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useExplorationDataFetching.ts
new file mode 100644
index 0000000..60ec524
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useExplorationDataFetching.ts
@@ -0,0 +1,159 @@
+import { IFilterChipItem } from '../../shared/components/FilterBar/data/IFilterChipItem';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { IPeerGroupFilters } from '../../shared/configuration/IPeerGroupFilters';
+import { explorationService } from '../data/explorationService';
+import { ICaseTypeFamilyMetricDetail, newMetricDetail } from '../data/ICaseTypeFamilyMetricDetail';
+import { IEncounterGroupDetailTreeGridData } from '../data/IEncounterGroupDetail';
+import IExclusionCriteria from '../data/IExclusionCriteria';
+import IFilter from '../data/IFilter';
+import { IExplorationPopulation } from '../opportunities/data/IExplorationPopulation';
+
+const hiddenFilterChips = ['CaseTypeFamilyID', 'CostDriver'];
+
+export interface IUseExplorationDataFetchingOptions {
+  configuration: any;
+  caseTypeFamilyId?: string;
+  costDriver?: string;
+  explorationPopulationData?: IExplorationPopulation;
+  peerGroupFilters: IPeerGroupFilters;
+  updateMetrics: (metrics: ICaseTypeFamilyMetricDetail) => void;
+  setCaseTypeFamilyName: (name: string) => void;
+  setSummaryFilters: (filters: any) => void;
+}
+
+export interface IUseExplorationDataFetchingResult {
+  // Data
+  encounterGroupDetails?: IEncounterGroupDetailTreeGridData[];
+  metrics: ICaseTypeFamilyMetricDetail;
+  caseTypeFamilyType: string;
+  isExplorationInformationPageEnabled: boolean;
+
+  // Loading states
+  loading: boolean;
+  firstLoading: boolean;
+
+  // Functions
+  fetchData: (
+    drawerExclusionCriteria: IExclusionCriteria,
+    drawerFilters: IFilter | undefined,
+    encounterExclusions: number[],
+    encounterInclusions: number[]
+  ) => Promise<IEncounterGroupDetailTreeGridData[] | undefined>;
+  useDataFetching: (filters: IFilter | undefined, exclusionCriteria: IExclusionCriteria, encounterExclusions: number[], encounterInclusions: number[]) => void;
+  setLoading: (loading: boolean) => void;
+}
+
+export const useExplorationDataFetching = ({
+  configuration,
+  caseTypeFamilyId,
+  costDriver,
+  explorationPopulationData,
+  peerGroupFilters,
+  updateMetrics,
+  setCaseTypeFamilyName,
+  setSummaryFilters
+}: IUseExplorationDataFetchingOptions): IUseExplorationDataFetchingResult => {
+  // Data states
+  const [encounterGroupDetails, setEncounterGroupDetails] = useState<IEncounterGroupDetailTreeGridData[]>();
+  const [metrics, setMetrics] = useState<ICaseTypeFamilyMetricDetail>(newMetricDetail);
+  const [caseTypeFamilyType, setCaseTypeFamilyType] = useState<string>('');
+  const [isExplorationInformationPageEnabled, setIsExplorationInformationPageEnabled] = useState<boolean>(true);
+
+  // Loading states
+  const [loading, setLoading] = useState(false);
+  const [firstLoading, setFirstLoading] = useState<boolean>(true);
+
+  // Refs for tracking changes
+  const previousPeerGroupIdRef = useRef<number>(peerGroupFilters.peerGroupId);
+
+  const fetchData = useCallback(
+    async (
+      drawerExclusionCriteria: IExclusionCriteria,
+      drawerFilters: IFilter | undefined,
+      encounterExclusions: number[],
+      encounterInclusions: number[]
+    ): Promise<IEncounterGroupDetailTreeGridData[] | undefined> => {
+      if (!configuration || !drawerFilters) return undefined;
+
+      !firstLoading && setLoading(true);
+      try {
+        const filterChipItems = drawerFilters.filterChipItems.filter((item: IFilterChipItem) => !hiddenFilterChips.includes(item.key.toString()));
+
+        await explorationService.isFlexibleExplorationInformationPageEnabled().then((result: boolean) => setIsExplorationInformationPageEnabled(result));
+        const paramCaseTypeFamilyId = explorationPopulationData ? explorationPopulationData.caseTypeFamilyId.toString() : caseTypeFamilyId;
+        const paramCostDriver = explorationPopulationData ? explorationPopulationData.costDriver : costDriver;
+        const detailInfo = await explorationService.getCaseTypeFamilyDetails(
+          configuration.configurationGuid,
+          paramCaseTypeFamilyId ?? '0',
+          paramCostDriver ?? '',
+          encounterExclusions,
+          encounterInclusions,
+          drawerExclusionCriteria,
+          {
+            ...drawerFilters,
+            filterChipItems: filterChipItems
+          },
+          explorationPopulationData ? explorationPopulationData.codeType : null,
+          peerGroupFilters.peerGroupId
+        );
+
+        setCaseTypeFamilyType(detailInfo.caseTypeFamilyType);
+        setEncounterGroupDetails(detailInfo.caseTypeFamilyDetails);
+        setMetrics(detailInfo.metrics);
+        setCaseTypeFamilyName(detailInfo.caseTypeFamilyName);
+        updateMetrics(detailInfo.metrics);
+
+        return detailInfo.caseTypeFamilyDetails;
+      } catch {
+        // Prevent double error modal
+        return undefined;
+      } finally {
+        if (firstLoading) {
+          setFirstLoading(false);
+        } else {
+          setLoading(false);
+        }
+      }
+    },
+    [configuration, caseTypeFamilyId, costDriver, explorationPopulationData, peerGroupFilters.peerGroupId, firstLoading, setCaseTypeFamilyName, updateMetrics]
+  );
+
+  // Effect to handle data fetching when dependencies change
+  useEffect(() => {
+    const peerGroupChanged = previousPeerGroupIdRef.current !== peerGroupFilters.peerGroupId;
+
+    if (peerGroupChanged) {
+      // Remove SPH criteria filters if switching to no peer group
+      if (peerGroupFilters.peerGroupId === 0) {
+        // This logic should be handled by the parent component
+        // The hook shouldn't directly modify filters
+      }
+      previousPeerGroupIdRef.current = peerGroupFilters.peerGroupId;
+    }
+  }, [peerGroupFilters.peerGroupId]);
+
+  // Function to trigger data fetching from component
+  const useDataFetching = useCallback(
+    (filters: IFilter | undefined, exclusionCriteria: IExclusionCriteria, encounterExclusions: number[], encounterInclusions: number[]) => {
+      fetchData(exclusionCriteria, filters, encounterExclusions, encounterInclusions);
+    },
+    [fetchData]
+  );
+
+  return {
+    // Data
+    encounterGroupDetails,
+    metrics,
+    caseTypeFamilyType,
+    isExplorationInformationPageEnabled,
+
+    // Loading states
+    loading,
+    firstLoading,
+
+    // Functions
+    fetchData,
+    useDataFetching,
+    setLoading
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useFilterManagement.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useFilterManagement.ts
new file mode 100644
index 0000000..bf7494c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useFilterManagement.ts
@@ -0,0 +1,243 @@
+import dayjs from 'dayjs';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import FilterBar from '../../shared/components/FilterBar/FilterBar';
+import { ChipKey } from '../../shared/components/FilterBar/data/IFilterChipItem';
+import { defaultPeerGroupFilter, IPeerGroupFilters } from '../../shared/configuration/IPeerGroupFilters';
+import { useClientScopedSessionStorage } from '../../shared/hooks/useClientScopedSessionStorage';
+import { setDateStates } from '../data/CaseTypeFamilyFunctions';
+import IExclusionCriteria, { newExclusionCriteria, parseCostTrimValue, parseLosCostSelection, parseLosTrimValue, TopNField } from '../data/IExclusionCriteria';
+import IFilter, { defaultFilter, getSessionFilter } from '../data/IFilter';
+import { IExplorationPopulation } from '../opportunities/data/IExplorationPopulation';
+
+export interface IPickerItem {
+  text: string;
+  value: number;
+}
+
+export interface IUseFilterManagementOptions {
+  configuration: any;
+  explorationPopulationData?: IExplorationPopulation;
+  explorationPopulationId?: string;
+  isFilterReadOnly: boolean;
+  onDrawerApply?: () => void;
+}
+
+/**
+ * Manages exploration filter state with session storage persistence and population data loading.
+ *
+ * Handles filters, exclusion criteria (LOS/cost outliers), peer groups, and date ranges with
+ * automatic synchronization between session storage and local state.
+ *
+ * @param options.configuration - Configuration object for default filter settings
+ * @param options.explorationPopulationData - Optional saved population data to restore
+ * @param options.explorationPopulationId - Optional population ID to prevent config overrides
+ *
+ * @returns Object containing:
+ *   - State: filters, exclusionCriteria, peerGroupFilters, dateStart, dateEnd, summaryFilters
+ *   - Setters: setFilters, setExclusionCriteria
+ *   - Handlers: handlePeerGroupFiltering, handleDrawerApply
+ *   - Render: renderFilterBar
+ *
+ * @example
+ * const { filters, renderFilterBar, handleDrawerApply } = useFilterManagement({
+ *   configuration,
+ *   explorationPopulationData: savedPopulation
+ * });
+ */
+export const useFilterManagement = ({ configuration, explorationPopulationData, explorationPopulationId, isFilterReadOnly, onDrawerApply }: IUseFilterManagementOptions) => {
+  // Session storage states
+  const [summaryFilters, setSummaryFilters] = useClientScopedSessionStorage('summaryFilters', defaultFilter);
+  const [peerGroupFilters, setPeerGroupFilters] = useClientScopedSessionStorage('peerGroupFilters', defaultPeerGroupFilter);
+  const [costOutlierValue, setCostOutlierValue] = useClientScopedSessionStorage('costOutlierValue', '');
+  const [losOutlierValue, setLosOutlierValue] = useClientScopedSessionStorage('losOutlierValue', '');
+  const [topNValue, setTopNValue] = useClientScopedSessionStorage<number | null>('topNValue', null);
+  const [topNFieldValue, setTopNFieldValue] = useClientScopedSessionStorage<TopNField | null>('topNFieldValue', null);
+
+  // Local states
+  const [filters, setFilters] = useState<IFilter>();
+  const [exclusionCriteria, setExclusionCriteria] = useState<IExclusionCriteria>(newExclusionCriteria());
+  const [dateStart, setDateStart] = useState<dayjs.Dayjs>(dayjs());
+  const [dateEnd, setDateEnd] = useState<dayjs.Dayjs>(dayjs());
+
+  // Track initialization to prevent redundant updates
+  const configInitializedRef = useRef(false);
+  const populationInitializedRef = useRef(false);
+  const peerGroupInitializedRef = useRef(false);
+  const dataLoadedRef = useRef(false);
+
+  // Initialize from session storage outliers
+  const setOutliersFromSession = useCallback((): void => {
+    const costSelection = parseLosCostSelection(costOutlierValue);
+    const losSelection = parseLosCostSelection(losOutlierValue);
+    setExclusionCriteria((prev) => ({
+      ...prev,
+      losExclusionType: losSelection.exclusionType,
+      losExclusionValue: losSelection.value,
+      costExclusionType: costSelection.exclusionType,
+      costExclusionValue: costSelection.value,
+      topN: topNValue,
+      topNField: topNFieldValue
+    }));
+  }, [costOutlierValue, losOutlierValue, topNValue, topNFieldValue]);
+
+  // Initialize filters from configuration (only once)
+  useEffect(() => {
+    if (configuration && !explorationPopulationId && !configInitializedRef.current) {
+      configInitializedRef.current = true;
+
+      setOutliersFromSession();
+
+      const sessionFilters = getSessionFilter(configuration, summaryFilters);
+      setDateStates(sessionFilters, setDateStart, setDateEnd);
+      setSummaryFilters(sessionFilters);
+      setFilters(sessionFilters);
+    }
+  }, [configuration, explorationPopulationId, summaryFilters, setSummaryFilters, setOutliersFromSession]);
+
+  // Initialize from exploration population data (only once)
+  useEffect(() => {
+    if (explorationPopulationData && !populationInitializedRef.current) {
+      populationInitializedRef.current = true;
+
+      const populationFilters = {
+        filterChipItems: JSON.parse(explorationPopulationData.filtersJSON)
+      };
+
+      setFilters(populationFilters);
+      setSummaryFilters(populationFilters);
+
+      const exclusCriteria = {
+        losExclusionType: explorationPopulationData.losExclusionType,
+        losExclusionValue: explorationPopulationData.losExclusionValue,
+        costExclusionType: explorationPopulationData.costExclusionType,
+        costExclusionValue: explorationPopulationData.costExclusionValue
+      };
+
+      setExclusionCriteria(exclusCriteria);
+      setLosOutlierValue(parseLosTrimValue(exclusCriteria));
+      setCostOutlierValue(parseCostTrimValue(exclusCriteria));
+    }
+  }, [explorationPopulationData, setSummaryFilters, setCostOutlierValue, setLosOutlierValue]);
+
+  const handlePeerGroupFiltering = useCallback(
+    (newPeerGroupFilters: IPeerGroupFilters) => {
+      // On first call, initialize the peer group (from FilterBar's initial setup)
+      if (!peerGroupInitializedRef.current) {
+        peerGroupInitializedRef.current = true;
+        setPeerGroupFilters(newPeerGroupFilters);
+        return;
+      }
+
+      // After initialization, always allow peer group updates to flow through so column visibility can update
+      // The actual data fetch is guarded in the grid components' useEffects
+      if (peerGroupFilters?.peerGroupId !== newPeerGroupFilters.peerGroupId) {
+        setPeerGroupFilters(newPeerGroupFilters);
+      }
+    },
+    [peerGroupFilters, setPeerGroupFilters]
+  );
+
+  /**
+   * Callback for consuming components to signal that initial data load is complete.
+   * After this is called, peer group changes will be allowed to trigger data reloads.
+   */
+  const markDataAsLoaded = useCallback(() => {
+    dataLoadedRef.current = true;
+    peerGroupInitializedRef.current = true;
+  }, []);
+
+  const handleDrawerApply = useCallback(
+    (drawerExclusionCriteria: IExclusionCriteria, drawerFilters: IFilter) => {
+      // Update filters directly with what came from the drawer
+      setFilters(drawerFilters);
+      setSummaryFilters(drawerFilters);
+
+      // Update exclusion criteria
+      setExclusionCriteria(drawerExclusionCriteria);
+
+      // Persist outlier values to session storage
+      setLosOutlierValue(parseLosTrimValue(drawerExclusionCriteria));
+      setCostOutlierValue(parseCostTrimValue(drawerExclusionCriteria));
+
+      // Persist Top N values to session storage
+      setTopNValue(drawerExclusionCriteria.topN ?? null);
+      setTopNFieldValue(drawerExclusionCriteria.topNField ?? null);
+
+      // Call callback if provided (to perform post 'apply' actions)
+      onDrawerApply?.();
+    },
+    [setSummaryFilters, setLosOutlierValue, setCostOutlierValue, setTopNValue, setTopNFieldValue, onDrawerApply]
+  );
+
+  /**
+   * Renders the FilterBar component with all filter management state and handlers pre-wired
+   *
+   * @param options - Configuration options for the FilterBar
+   * @param options.filterId - Optional filter identifier
+   * @param options.excludedChips - Optional array of chip keys to exclude from display
+   * @param options.hiddenChips - Optional array of chip keys to hide
+   * @param options.expandableLevels - Optional array of expandable level picker items (for detail view)
+   * @param options.expandedLevelPos - Optional current expanded level position
+   * @param options.setExpandedLevelPos - Optional callback to update expanded level position
+   * @param options.onChangeEncounters - Optional callback when encounters change
+   * @param options.onApply - Optional custom onApply handler (overrides default)
+   * @returns FilterBar component configured with current filter state
+   */
+  const renderFilterBar = useCallback(
+    (options?: {
+      filterId?: string;
+      excludedChips?: ChipKey[];
+      hiddenChips?: ChipKey[];
+      expandableLevels?: IPickerItem[];
+      expandedLevelPos?: number;
+      setExpandedLevelPos?: (levelPos: number) => void;
+      onChangeEncounters?: (resolve: any) => void;
+      onApply?: (exclusionCriteria: IExclusionCriteria, filters: IFilter) => void | Promise<void>;
+      hideTopNFilter?: boolean;
+    }): React.ReactElement => {
+      return React.createElement(FilterBar, {
+        filterId: options?.filterId ?? '',
+        isFilterReadOnly: isFilterReadOnly,
+        filterChips: filters?.filterChipItems ?? [],
+        excludedChips: options?.excludedChips ?? [],
+        hiddenChips: options?.hiddenChips ?? [],
+        dateStart,
+        dateEnd,
+        exclusionCriteria,
+        onPeerGroupFiltersChange: handlePeerGroupFiltering,
+        onApply: options?.onApply ?? handleDrawerApply,
+        hideTopNFilter: options?.hideTopNFilter,
+        ...(options?.expandableLevels && { expandableLevels: options.expandableLevels }),
+        ...(options?.expandedLevelPos !== undefined && { expandedLevelPos: options.expandedLevelPos }),
+        ...(options?.setExpandedLevelPos && { setExpandedLevelPos: options.setExpandedLevelPos }),
+        ...(options?.onChangeEncounters && { onChangeEncounters: options.onChangeEncounters })
+      });
+    },
+    [isFilterReadOnly, filters, dateStart, dateEnd, exclusionCriteria, handlePeerGroupFiltering, handleDrawerApply]
+  );
+
+  return useMemo(
+    () => ({
+      // States
+      filters,
+      exclusionCriteria,
+      peerGroupFilters,
+      dateStart,
+      dateEnd,
+      summaryFilters,
+
+      // Setters
+      setFilters,
+      setExclusionCriteria,
+
+      // Handlers
+      handlePeerGroupFiltering,
+      handleDrawerApply,
+      markDataAsLoaded,
+
+      // Render functions
+      renderFilterBar
+    }),
+    [filters, exclusionCriteria, peerGroupFilters, dateStart, dateEnd, summaryFilters, handlePeerGroupFiltering, handleDrawerApply, markDataAsLoaded, renderFilterBar]
+  );
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useRefinementDrawer.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useRefinementDrawer.ts
new file mode 100644
index 0000000..2a9a421
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useRefinementDrawer.ts
@@ -0,0 +1,373 @@
+import { DropDownValue } from '@strata/tempo/lib/dropdown/DropDown';
+import { RangeValue } from '@strata/tempo/lib/datepicker/RangePicker';
+import { ITreeNode, Key } from '@strata/tempo/lib/tree/Tree';
+import dayjs from 'dayjs';
+import { isEqual } from 'lodash';
+import { useEffect, useMemo, useState } from 'react';
+import {
+  ChipKey,
+  ChipType,
+  defaultFilterBarItemsExcluded,
+  IFilterChipItem,
+  isDualFilterChip,
+  newDateRangeChipItem,
+  OperatorType,
+  sphCriteriaFilterItems
+} from '../../shared/components/FilterBar/data/IFilterChipItem';
+import { DATE_FORMAT } from '../../shared/constants';
+import { useClientScopedSessionStorage } from '../../shared/hooks/useClientScopedSessionStorage';
+import { useSystemSettings } from '../../shared/systemSettings/SystemSettingsContext';
+import IExclusionCriteria, { parseCostTrimValue, parseLosCostSelection, parseLosTrimValue, TopNField } from '../data/IExclusionCriteria';
+
+export interface IUseRefinementDrawerProps {
+  isVisible: boolean;
+  filterChips: IFilterChipItem[];
+  excludedChips: ChipKey[];
+  dateRange: [dayjs.Dayjs, dayjs.Dayjs];
+  exclusionCriteria: IExclusionCriteria;
+  hasBenchmarking?: boolean;
+  setDateRange: (dateRange: [dayjs.Dayjs, dayjs.Dayjs]) => void;
+}
+
+export interface IUseRefinementDrawerResult {
+  // State
+  filters: IFilterChipItem[];
+  drawerChipFilters: IFilterChipItem[] | undefined;
+  drawerExclusionCriteria: IExclusionCriteria;
+  activeFilterId: React.Key;
+
+  // Filter popover state
+  isFilterPopoverVisible: boolean;
+  selectedKeys: Key[];
+  selectedNode: ITreeNode;
+
+  // SPH popover state
+  isSphPopoverVisible: boolean;
+  sphSelectedKeys: Key[];
+  sphSelectedNode: ITreeNode;
+  sphCustomItems: IFilterChipItem[];
+
+  // Handlers - Filter popover
+  handleOpenChange: (isOpen: boolean) => void;
+  handleClose: () => void;
+  handleSelect: (selectedKeys: Key[], node: ITreeNode) => void;
+  handleAddFilter: () => void;
+
+  // Handlers - SPH popover
+  handleSphOpenChange: (isOpen: boolean) => void;
+  handleSphClose: () => void;
+  handleSphSelect: (selectedKeys: Key[], node: ITreeNode) => void;
+  handleAddSphFilter: () => void;
+
+  // Handlers - Chips
+  handleChipOpenChange: (isOpen: boolean) => void;
+  handleFilterChange: (filter: IFilterChipItem) => void;
+  handleChipDelete: (chipId: React.Key) => void;
+  handleChipClick: (chipId: React.Key) => void;
+
+  // Handlers - Exclusion criteria
+  handleALOSChange: (value: DropDownValue) => void;
+  handleTDVCChange: (value: DropDownValue) => void;
+  handleTopNFieldChange: (value: TopNField | null) => void;
+  handleTopNChange: (value: number | null) => void;
+
+  // Apply handler
+  getApplyPayload: () => { drawerExclusionCriteria: IExclusionCriteria; activeFilters: IFilterChipItem[] };
+}
+
+/**
+ * Custom hook to manage RefinementOptionsDrawer state and business logic.
+ * Handles filter management, popover states, exclusion criteria, and chip synchronization.
+ */
+export const useRefinementDrawer = (props: IUseRefinementDrawerProps): IUseRefinementDrawerResult => {
+  const { isVisible, filterChips, excludedChips, dateRange, exclusionCriteria, hasBenchmarking, setDateRange } = props;
+
+  // Session storage for outlier values
+  const [, setCostOutlierValue] = useClientScopedSessionStorage('costOutlierValue', '');
+  const [, setLosOutlierValue] = useClientScopedSessionStorage('losOutlierValue', '');
+
+  const { systemSettings } = useSystemSettings();
+  const isUsingAprDrg = systemSettings?.flexibleExplorationInpatientCTF ?? false;
+
+  // Filter state
+  const filters = useMemo<IFilterChipItem[]>(() => defaultFilterBarItemsExcluded(excludedChips, false, isUsingAprDrg), [excludedChips, isUsingAprDrg]);
+  const [drawerChipFilters, setDrawerChipFilters] = useState<IFilterChipItem[] | undefined>();
+  const [drawerExclusionCriteria, setDrawerExclusionCriteria] = useState<IExclusionCriteria>(exclusionCriteria);
+  const [activeFilterId, setActiveFilterId] = useState<React.Key>('');
+
+  // Filter popover state
+  const [isFilterPopoverVisible, setIsFilterPopoverVisible] = useState<boolean>(false);
+  const [selectedKeys, setSelectedKeys] = useState<Key[]>([]);
+  const [selectedNode, setSelectedNode] = useState<ITreeNode>({} as ITreeNode);
+
+  // SPH popover state
+  const [isSphPopoverVisible, setIsSphPopoverVisible] = useState<boolean>(false);
+  const [sphSelectedKeys, setSphSelectedKeys] = useState<Key[]>([]);
+  const [sphSelectedNode, setSphSelectedNode] = useState<ITreeNode>({} as ITreeNode);
+  const sphCustomItems = sphCriteriaFilterItems();
+
+  // Sync drawer state with props when drawer becomes visible
+  useEffect(() => {
+    if (isVisible) {
+      const filtersCopy = filterChips.map((fil) => ({ ...fil }));
+      setDrawerChipFilters(filtersCopy);
+    }
+  }, [filterChips, isVisible]);
+
+  useEffect(() => {
+    if (isVisible) {
+      setDrawerExclusionCriteria({ ...exclusionCriteria });
+    }
+  }, [exclusionCriteria, isVisible]);
+
+  // O/E Variable Direct Cost requires a peer group. If the drawer is open when the peer group
+  // is deselected, clear the Top N field so a stale O/E selection isn't carried through on apply.
+  useEffect(() => {
+    if (!hasBenchmarking) {
+      setDrawerExclusionCriteria((prev) => (prev.topNField === TopNField.CostOeRatio ? { ...prev, topNField: null, topN: null } : prev));
+    }
+  }, [hasBenchmarking]);
+
+  // Sync benchmarking criteria with population criteria
+  useEffect(() => {
+    if (!hasBenchmarking || !drawerChipFilters) return;
+
+    const populationCriteriaDualFilters = drawerChipFilters.filter((chip) => chip.chipType !== ChipType.sphCriteria && isDualFilterChip(chip));
+    const benchmarkingFilters = drawerChipFilters.filter((chip) => chip.chipType === ChipType.sphCriteria);
+
+    // Remove readOnly benchmarking filters that no longer have corresponding population filters
+    const benchmarkingFiltersToRemove = benchmarkingFilters.filter((benchmarkChip) => {
+      if (!benchmarkChip.isReadOnly) return false;
+      return !populationCriteriaDualFilters.some((popFilter) => `${popFilter.key}_benchmark` === benchmarkChip.key.toString());
+    });
+
+    const drawerFilters = [...drawerChipFilters];
+    let hasChanges = benchmarkingFiltersToRemove.length > 0;
+
+    populationCriteriaDualFilters.forEach((filter) => {
+      const benchmarkFilterKey = `${filter.key}_benchmark` as unknown as ChipKey;
+      const benchmarkFilterIndex = drawerFilters.findIndex((chip) => chip.key === benchmarkFilterKey);
+
+      if (benchmarkFilterIndex >= 0) {
+        // Update existing benchmark chip in place
+        const current = drawerFilters[benchmarkFilterIndex];
+        if (!isEqual(current.filters, filter.filters) || current.operator !== filter.operator) {
+          drawerFilters[benchmarkFilterIndex] = {
+            ...current,
+            filters: filter.filters,
+            operator: filter.operator
+          };
+          hasChanges = true;
+        }
+      } else {
+        // Add new benchmark chip
+        drawerFilters.push({
+          ...filter,
+          key: benchmarkFilterKey,
+          chipType: ChipType.sphCriteria,
+          isReadOnly: true
+        });
+        hasChanges = true;
+      }
+    });
+
+    // Apply all changes at once
+    if (hasChanges) {
+      setDrawerChipFilters(drawerFilters.filter((chip) => !benchmarkingFiltersToRemove.some((toRemove) => toRemove.key === chip.key)));
+    }
+  }, [drawerChipFilters, hasBenchmarking]);
+
+  // Filter popover handlers
+  const handleOpenChange = (isOpen: boolean) => {
+    if (isOpen) {
+      setIsFilterPopoverVisible(isOpen);
+    } else {
+      handleClose();
+    }
+  };
+
+  const handleClose = () => {
+    setSelectedNode({} as ITreeNode);
+    setSelectedKeys([]);
+    setIsFilterPopoverVisible(false);
+  };
+
+  const handleSelect = (selectedKeys: Key[], node: ITreeNode) => {
+    setSelectedKeys(selectedKeys);
+    setSelectedNode(node);
+  };
+
+  const handleAddFilter = () => {
+    setIsFilterPopoverVisible(false);
+    const filter = filters.find((cf) => ChipKey[cf.key] === (selectedNode.key as string));
+    if (filter) {
+      const newFilter = Object.assign({}, filter);
+      const newFilters = [...(drawerChipFilters ?? []), newFilter];
+      setDrawerChipFilters(newFilters);
+      setActiveFilterId(filter.key);
+    }
+  };
+
+  // SPH popover handlers
+  const handleSphOpenChange = (isOpen: boolean) => {
+    if (isOpen) {
+      setIsSphPopoverVisible(true);
+    } else {
+      handleSphClose();
+    }
+  };
+
+  const handleSphClose = () => {
+    setSphSelectedNode({} as ITreeNode);
+    setSphSelectedKeys([]);
+    setIsSphPopoverVisible(false);
+  };
+
+  const handleSphSelect = (selectedKeys: Key[], node: ITreeNode) => {
+    setSphSelectedKeys(selectedKeys);
+    setSphSelectedNode(node);
+  };
+
+  const handleAddSphFilter = () => {
+    if (sphSelectedKeys.length === 0) return;
+    const match = sphCustomItems.find((it) => ChipKey[it.key] === (sphSelectedNode.key as string));
+    if (!match) return;
+
+    const newFilter = { ...match } as IFilterChipItem;
+    const newFilters = [...(drawerChipFilters ?? []), newFilter];
+    setDrawerChipFilters(newFilters);
+    setActiveFilterId(newFilter.key);
+    handleSphClose();
+  };
+
+  // Chip handlers
+  const handleChipOpenChange = (isOpen: boolean) => {
+    if (!isOpen) setActiveFilterId('');
+  };
+
+  const handleFilterChange = (filter: IFilterChipItem) => {
+    const newFilters = [...(drawerChipFilters ?? [])];
+    const index = newFilters.findIndex((f) => f.key === filter.key);
+    if (index < 0) return;
+
+    newFilters[index].operator = filter.operator ?? OperatorType.In;
+    newFilters[index].filters = filter.filters;
+    newFilters[index].isSelected = filter.isSelected;
+    newFilters[index].dateRange = filter.dateRange;
+
+    const filterStartDate = filter.dateRange?.[0];
+    const filterEndDate = filter.dateRange?.[1];
+
+    if (filterStartDate && filterEndDate && filterStartDate.isValid() && filterEndDate.isValid()) {
+      const normalizedStartDate = dayjs(filterStartDate.format(DATE_FORMAT));
+      const normalizedEndDate = dayjs(filterEndDate.format(DATE_FORMAT));
+      setDateRange([normalizedStartDate, normalizedEndDate]);
+    }
+    setDrawerChipFilters(newFilters);
+  };
+
+  const handleChipDelete = (chipId: React.Key) => {
+    const filterChipItems = drawerChipFilters?.filter((x) => x.key !== chipId && ChipKey[x.key] !== chipId);
+    if (filterChipItems) {
+      const dateFilter = newDateRangeChipItem([dateRange[0], dateRange[1]] as RangeValue);
+      if (filterChipItems.length === 0 || filterChipItems.findIndex((fci) => fci.key === ChipKey.DischargeDate) === -1) {
+        if (dateFilter) {
+          filterChipItems.push(...[dateFilter]);
+        }
+      }
+      setDrawerChipFilters(filterChipItems);
+    }
+    setActiveFilterId('');
+  };
+
+  const handleChipClick = (chipId: React.Key) => {
+    const clickedChip = drawerChipFilters?.find((chip) => chip.key === chipId);
+
+    // Prevent clicking on readOnly benchmark chips (prevents popover selection)
+    if (clickedChip?.isReadOnly && clickedChip.chipType === ChipType.sphCriteria) {
+      return;
+    }
+
+    setActiveFilterId(chipId === activeFilterId ? '' : chipId);
+  };
+
+  // Exclusion criteria handlers
+  const handleALOSChange = (value: DropDownValue) => {
+    const selection = parseLosCostSelection(value.toString());
+    if (drawerExclusionCriteria) {
+      setDrawerExclusionCriteria({ ...drawerExclusionCriteria, losExclusionType: selection.exclusionType, losExclusionValue: selection.value });
+    }
+  };
+
+  const handleTDVCChange = (value: DropDownValue) => {
+    const selection = parseLosCostSelection(value.toString());
+    if (drawerExclusionCriteria) {
+      setDrawerExclusionCriteria({ ...drawerExclusionCriteria, costExclusionType: selection.exclusionType, costExclusionValue: selection.value });
+    }
+  };
+
+  const handleTopNFieldChange = (value: TopNField | null) => {
+    setDrawerExclusionCriteria({ ...drawerExclusionCriteria, topNField: value, topN: value === null ? null : drawerExclusionCriteria.topN });
+  };
+
+  const handleTopNChange = (value: number | null) => {
+    setDrawerExclusionCriteria({ ...drawerExclusionCriteria, topN: value });
+  };
+
+  // Prepare data for apply action
+  const getApplyPayload = () => {
+    // Save outlier values to session storage
+    setLosOutlierValue(parseLosTrimValue(drawerExclusionCriteria));
+    setCostOutlierValue(parseCostTrimValue(drawerExclusionCriteria));
+
+    // Filter out readOnly benchmark chips - only return active filters
+    const activeFilters = (drawerChipFilters ?? []).filter((chip) => !chip.isReadOnly);
+
+    return {
+      drawerExclusionCriteria,
+      activeFilters
+    };
+  };
+
+  return {
+    // State
+    filters,
+    drawerChipFilters,
+    drawerExclusionCriteria,
+    activeFilterId,
+
+    // Filter popover
+    isFilterPopoverVisible,
+    selectedKeys,
+    selectedNode,
+    handleOpenChange,
+    handleClose,
+    handleSelect,
+    handleAddFilter,
+
+    // SPH popover
+    isSphPopoverVisible,
+    sphSelectedKeys,
+    sphSelectedNode,
+    sphCustomItems,
+    handleSphOpenChange,
+    handleSphClose,
+    handleSphSelect,
+    handleAddSphFilter,
+
+    // Chips
+    handleChipOpenChange,
+    handleFilterChange,
+    handleChipDelete,
+    handleChipClick,
+
+    // Exclusion criteria
+    handleALOSChange,
+    handleTDVCChange,
+    handleTopNFieldChange,
+    handleTopNChange,
+
+    // Apply
+    getApplyPayload
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useScrollManagement.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useScrollManagement.ts
new file mode 100644
index 0000000..c2550e3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useScrollManagement.ts
@@ -0,0 +1,118 @@
+import { RefObject, useCallback } from 'react';
+
+interface IUseScrollManagementOptions {
+  /** Maximum number of attempts to find the element before giving up */
+  maxAttempts?: number;
+  /** Delay between retry attempts in milliseconds */
+  retryDelay?: number;
+  /** Initial delay before starting the scroll attempt in milliseconds */
+  initialDelay?: number;
+}
+
+interface IScrollToRowOptions {
+  /** The container ref that holds the TreeGrid */
+  containerRef: RefObject<HTMLDivElement>;
+  /** The full row key for index-based fallback search */
+  rowKey: string;
+  /** Array of data to use for index-based fallback */
+  dataArray?: Array<{ key: string; data?: { name?: string } }>;
+}
+
+/**
+ * Custom hook for managing smooth scrolling to TreeGrid rows.
+ *
+ * Provides a polling mechanism to wait for DOM updates and locate rows by
+ * searching for the row with the matching key in the current DOM.
+ *
+ * @param options - Configuration options for scroll behavior
+ * @returns scrollToRow - Function to initiate scrolling to a specific row
+ *
+ * @example
+ * const scrollToRow = useScrollManagement({ maxAttempts: 20, retryDelay: 50 });
+ *
+ * // Later, in a click handler:
+ * scrollToRow({
+ *   containerRef: treeGridRef,
+ *   rowKey: matchingRow.key,
+ *   dataArray: encounterGroupSummaries
+ * });
+ */
+export const useScrollManagement = (options: IUseScrollManagementOptions = {}) => {
+  const { maxAttempts = 20, retryDelay = 50, initialDelay = 100 } = options;
+
+  /**
+   * Scrolls to a row in the TreeGrid using various search strategies.
+   * Uses a polling mechanism to wait for the element to appear in the DOM.
+   */
+  const scrollToRow = useCallback(
+    (scrollOptions: IScrollToRowOptions) => {
+      const { containerRef, rowKey, dataArray } = scrollOptions;
+
+      const attemptScroll = (attempts = 0) => {
+        if (attempts > maxAttempts) {
+          return; // Give up after max attempts
+        }
+
+        let rowElement: Element | null | undefined = null;
+
+        if (containerRef.current) {
+          // Fast-path: Try direct query using data-row-key attribute
+          rowElement = containerRef.current.querySelector(`[data-row-key="${rowKey}"]`);
+        }
+
+        // Fallback: If direct query didn't find the row, try name/level scan
+        if (!rowElement && dataArray && containerRef.current) {
+          // Find the target row data
+          const targetRow = dataArray.find((row) => row.key === rowKey);
+
+          if (targetRow) {
+            const targetName = targetRow.data?.name;
+            // Determine the expected tree level from the rowKey (e.g., "1-abc" = level 1)
+            const expectedLevel = rowKey.split('-')[0];
+
+            if (targetName) {
+              // Search all DOM rows for one with matching name at the correct level
+              const allRows = containerRef.current.querySelectorAll('tbody tr');
+
+              for (let i = 0; i < allRows.length; i++) {
+                const row = allRows[i];
+
+                // Check if this row is at the expected tree level
+                const rowLevel = row.getAttribute('aria-level') || row.getAttribute('data-level');
+
+                // Look for the name in the row
+                const nameCell = row.querySelector('span.p-treetable-node-label, td span') as HTMLElement;
+                const cellName = nameCell?.textContent?.trim();
+
+                // Match both the name and the tree level to ensure we get the right row
+                if (cellName === targetName && (!rowLevel || rowLevel === expectedLevel)) {
+                  rowElement = row;
+                  break;
+                }
+              }
+            }
+          }
+        }
+
+        if (rowElement) {
+          rowElement.scrollIntoView({
+            behavior: 'smooth',
+            block: 'center',
+            inline: 'nearest'
+          });
+        } else {
+          // Element not yet in DOM, try again
+          setTimeout(() => attemptScroll(attempts + 1), retryDelay);
+        }
+      };
+
+      // Start the scroll attempt after initial delay
+      setTimeout(() => attemptScroll(), initialDelay);
+    },
+    [maxAttempts, retryDelay, initialDelay]
+  );
+
+  return scrollToRow;
+};
+
+export default useScrollManagement;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useTreeGridExpansion.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useTreeGridExpansion.ts
new file mode 100644
index 0000000..154e0e2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/hooks/useTreeGridExpansion.ts
@@ -0,0 +1,98 @@
+import { useCallback, useState } from 'react';
+import { IEncounterGroupDetailTreeGridData } from '../data/IEncounterGroupDetail';
+
+/**
+ * Configuration options for the tree grid expansion hook.
+ */
+interface IUseTreeGridExpansionConfig {
+  /** The encounter group details data used to build expandable keys */
+  encounterGroupDetails: IEncounterGroupDetailTreeGridData[] | undefined;
+}
+
+/**
+ * Return value from the tree grid expansion hook.
+ */
+interface IUseTreeGridExpansionReturn {
+  /** Array of tree grid node keys that are currently expanded */
+  treeGridKeysData: string[];
+  /** Current expanded level (Entity, Code, Physician, or Encounter) */
+  expandedLevel: TreeGridLevel;
+  /** Updates the expanded tree grid levels based on the specified position */
+  updateExpandedLevels: (levelPos: TreeGridLevel) => void;
+}
+
+/**
+ * Enumeration for tree grid levels corresponding to the hierarchy of the data.
+ */
+export enum TreeGridLevel {
+  Entity = 0,
+  Code = 1,
+  Physician = 2,
+  Encounter = 3
+}
+
+/**
+ * Custom hook for managing tree grid expansion state and operations.
+ *
+ * Handles the logic of expanding/collapsing tree grid nodes at different hierarchy levels,
+ * collecting all expandable keys, and filtering them based on the target expansion level.
+ *
+ * @param config - Configuration options for tree grid expansion
+ * @returns Object containing state and functions for tree grid expansion management
+ */
+export const useTreeGridExpansion = (config: IUseTreeGridExpansionConfig): IUseTreeGridExpansionReturn => {
+  const { encounterGroupDetails } = config;
+
+  // ========================================================================
+  // State
+  // ========================================================================
+
+  const [treeGridKeysData, setTreeGridKeysData] = useState<string[]>([]);
+  const [expandedLevel, setExpandedLevel] = useState<TreeGridLevel>(TreeGridLevel.Entity);
+
+  // ========================================================================
+  // Callbacks
+  // ========================================================================
+
+  /**
+   * Updates the expanded tree grid levels based on the specified position.
+   * Collects all expandable keys from the tree structure and filters them to the target level.
+   * @param levelPos - The tree grid level to expand to
+   */
+  const updateExpandedLevels = useCallback(
+    (levelPos: TreeGridLevel): void => {
+      const keys: string[] = [];
+
+      /**
+       * Recursively collects all expandable keys from tree nodes.
+       * Keys are in the format "level-index" (e.g., "0-0", "1-2", "2-5").
+       */
+      function collectAllKeys(nodes: IEncounterGroupDetailTreeGridData[]): void {
+        nodes.forEach((node) => {
+          if (node.children && node.children.length) {
+            keys.push(node.key);
+            collectAllKeys(node.children);
+          }
+        });
+      }
+
+      collectAllKeys(encounterGroupDetails || []);
+
+      // Filter keys to only include those at or below the target level
+      // The level is determined by the first number in the key (before the hyphen)
+      setTreeGridKeysData(keys.filter((key) => parseInt(key.split('-')[0], 10) <= levelPos));
+      setExpandedLevel(levelPos);
+    },
+    [encounterGroupDetails]
+  );
+
+  // ========================================================================
+  // Return
+  // ========================================================================
+
+  return {
+    treeGridKeysData,
+    expandedLevel,
+    updateExpandedLevels
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationDuplicatePopulationModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationDuplicatePopulationModal.tsx
new file mode 100644
index 0000000..8b5f48f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationDuplicatePopulationModal.tsx
@@ -0,0 +1,115 @@
+import Button from '@strata/tempo/lib/button/Button';
+import Form from '@strata/tempo/lib/form/Form';
+import Input from '@strata/tempo/lib/input/Input';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import useToast from '@strata/tempo/lib/toast';
+import React, { useEffect } from 'react';
+import { RegEx } from '../../shared/validation/RegEx';
+import { populationService } from './data/populationService';
+
+export interface IExplorationDuplicatePopulationModalProps {
+  isVisible: boolean;
+  populationId: number;
+  populationName: string;
+  closeModal: () => void;
+}
+
+interface IExplorationDuplicatePopulationFormValues {
+  name?: string;
+}
+
+const ExplorationDuplicatePopulationModal: React.FC<IExplorationDuplicatePopulationModalProps> = (props: IExplorationDuplicatePopulationModalProps) => {
+  const { isVisible, populationId, populationName, closeModal } = props;
+  const [loading, setLoading] = React.useState<boolean>(false);
+  const [form] = Form.useForm<IExplorationDuplicatePopulationFormValues>();
+  const toast = useToast();
+
+  useEffect(() => {
+    if (isVisible) {
+      form.setFieldsValue({ name: `${populationName} Copy` });
+    }
+  }, [populationName, isVisible, form]);
+
+  const handleFinish = async (values: IExplorationDuplicatePopulationFormValues) => {
+    try {
+      setLoading(true);
+      const result = await populationService.duplicatePopulation(populationId, values.name ?? '');
+      if (result && result.explorationPopulationId) {
+        toast.show({
+          key: `Exploration Population - ${result.explorationPopulationId}`,
+          toastType: 'success',
+          message: 'Exploration Population duplicated.'
+        });
+        window.location.assign(`/continuousimprovement/exploration-populations/${result.explorationPopulationId}`);
+        closeModal();
+      } else {
+        toast.show({
+          key: `Exploration Population - ${populationId}`,
+          toastType: 'error',
+          message: 'Exploration Population was not duplicated. Try again and contact us if the issue continues.'
+        });
+      }
+    } catch {
+      toast.show({
+        key: `Exploration Population - ${populationId}`,
+        toastType: 'error',
+        message: `Unable to duplicate the Exploration Population.`,
+        duration: 0
+      });
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleCloseDuplicateModal = () => {
+    form.resetFields(['name']);
+    closeModal();
+  };
+
+  return (
+    <Modal title='Duplicate Population' visible={isVisible} loading={loading} onCancel={handleCloseDuplicateModal} footer={null}>
+      <Spacing column>
+        <Form form={form} onFinish={handleFinish}>
+          <Form.Item
+            label='Population Name'
+            name='name'
+            style={{ marginBottom: '16px' }}
+            rules={[
+              { required: true, whitespace: true, max: 200 },
+              { pattern: RegEx.JazzRestrictedCharacters },
+              () => ({
+                async validator(_, value) {
+                  if (!value) {
+                    return Promise.resolve();
+                  }
+                  try {
+                    const isNameUnique = await populationService.isNameUnique(value);
+                    if (!isNameUnique) {
+                      return Promise.reject('Exploration population with that name already exists');
+                    }
+                    return Promise.resolve();
+                  } catch {
+                    return Promise.reject('Unable to validate name uniqueness. Please try again.');
+                  }
+                }
+              })
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item>
+            <Button htmlType='button' onClick={handleCloseDuplicateModal}>
+              Cancel
+            </Button>
+            <Button type='primary' htmlType='submit'>
+              Duplicate
+            </Button>
+          </Form.Item>
+        </Form>
+      </Spacing>
+    </Modal>
+  );
+};
+
+export default ExplorationDuplicatePopulationModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationOpportunityDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationOpportunityDetail.tsx
new file mode 100644
index 0000000..8899637
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationOpportunityDetail.tsx
@@ -0,0 +1,177 @@
+import { useModal } from '@strata/tempo/lib';
+import Button from '@strata/tempo/lib/button';
+import ButtonMenu from '@strata/tempo/lib/buttonmenu/ButtonMenu';
+import Divider from '@strata/tempo/lib/divider';
+import DropDown, { DropDownValue } from '@strata/tempo/lib/dropdown';
+import Header from '@strata/tempo/lib/header';
+import BorderIcon from '@strata/tempo/lib/icon/BorderIcon';
+import CheckIcon from '@strata/tempo/lib/icon/CheckIcon';
+import EditIcon from '@strata/tempo/lib/icon/EditIcon';
+import MetricGroup, { IMetricItem } from '@strata/tempo/lib/metricgroup';
+import Spacing from '@strata/tempo/lib/spacing';
+import Text from '@strata/tempo/lib/text';
+import React, { useEffect, useState } from 'react';
+import { useParams } from 'react-router';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { analyticsService } from '../../shared/analytics/data/analyticsService';
+import CommentsDrawer from '../../shared/comments/CommentsDrawer';
+import { IInitiativeStatuses } from '../../shared/data/IInitiativeStatuses';
+import ExplorationOpportunityModal from './ExplorationOpportunityModal';
+import { IExplorationOpportunity } from './data/IExplorationOpportunity';
+import { opportunityService } from './data/opportunityservice';
+
+const ExplorationOpportunityDetail: React.FC = () => {
+  const { opportunityGuid } = useParams<{ opportunityGuid: string }>();
+  const [opportunityId, setOpportunityId] = useState<number>(0);
+  const [modalVisible, setModalVisible] = useState(false);
+  const [opportunityDetailData, setOpportunityDetailData] = useState<IExplorationOpportunity>();
+  const modal = useModal();
+  const [showComments, setShowComments] = useState<boolean>(false);
+  const [presentationMode, setPresentationMode] = useState<boolean>(false);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      await opportunityService.checkWorkbook(opportunityGuid);
+      const opportunityDetail: IExplorationOpportunity = await opportunityService.getById(opportunityGuid);
+      setOpportunityId(opportunityDetail.opportunityId);
+      setOpportunityDetailData(opportunityDetail);
+    };
+    fetchData();
+  }, [opportunityGuid, modalVisible]);
+
+  const metrics: IMetricItem[] = [
+    {
+      key: 'identified-savings',
+      label: 'IDENTIFIED VARIATION',
+      values: [
+        {
+          key: 'identifiedsavings',
+          label: 'Identified Variation',
+          value: opportunityDetailData?.identifiedSavings,
+          format: 'currency'
+        }
+      ]
+    }
+  ];
+
+  const handleDelete = async () => {
+    if (!opportunityDetailData) {
+      return;
+    }
+    modal.confirm({
+      title: `Permanently delete opportunity ${opportunityDetailData.name}?`,
+      content: `This will permanently delete the opportunity ${opportunityDetailData.name}.`,
+      okText: 'Delete',
+      async onOk() {
+        try {
+          const workbookId = opportunityDetailData.analyticsWorkbookId;
+          if (workbookId !== 0) {
+            await analyticsService.deleteWorkbook(workbookId);
+          }
+        } finally {
+          await opportunityService.delete(opportunityGuid);
+          window.location.replace(`/continuousimprovement/opportunities`);
+        }
+      }
+    });
+  };
+
+  const addComment = async () => {
+    setShowComments(true);
+  };
+
+  const headerExtra = (
+    <>
+      <Button type='secondary' onClick={() => addComment()} disabled={!opportunityDetailData}>
+        Add Comment
+      </Button>
+      <ButtonMenu type='secondary' buttonText='Tools' items={[{ key: 'delete', label: 'Delete Opportunity', onClick: handleDelete }]} />
+      <Button type='secondary' icon={presentationMode ? <CheckIcon /> : <BorderIcon />} onClick={() => setPresentationMode(!presentationMode)} disabled={!opportunityDetailData}>
+        {presentationMode ? 'Exit' : 'Present'}
+      </Button>
+    </>
+  );
+
+  return (
+    <>
+      <Header title={opportunityDetailData?.name} subtitle={opportunityDetailData?.description} breadcrumbHref='/opportunities' breadcrumbText='Identify Opportunities' extra={headerExtra} />
+      {!presentationMode && (
+        <>
+          <Spacing>
+            <Spacing>
+              <MetricGroup items={metrics} />
+              <Spacing hAlign='right' padding={'16px 16px 0 0'} height={'0'}>
+                <Button
+                  type='link'
+                  icon={<EditIcon />}
+                  onClick={() => {
+                    setModalVisible(true);
+                  }}
+                ></Button>
+              </Spacing>
+            </Spacing>
+            <Spacing vAlign='top' padding={'16px 0 32px 0'}>
+              <Divider vertical />
+              <Spacing column>
+                <Spacing padding={'0 0 16px 0'}>
+                  <Text strong color='secondary' size='small'>
+                    STATUS
+                  </Text>
+                </Spacing>
+                <DropDown
+                  width={120}
+                  value={opportunityDetailData?.initiativeStatus}
+                  onChange={async (value: DropDownValue) => {
+                    const opp = await opportunityService.setStatus(opportunityGuid, value);
+                    setOpportunityDetailData(opp);
+                  }}
+                  items={[
+                    { text: 'On Hold', value: IInitiativeStatuses[IInitiativeStatuses.OnHold] },
+                    { text: 'In Process', value: IInitiativeStatuses[IInitiativeStatuses.InProcess] },
+                    { text: 'Completed', value: IInitiativeStatuses[IInitiativeStatuses.Completed] }
+                  ]}
+                />
+              </Spacing>
+            </Spacing>
+          </Spacing>
+
+          <Divider />
+        </>
+      )}
+      {opportunityDetailData?.analyticsWorkbookId !== 0 && (
+        <Spacing column>
+          <iframe
+            title='Workbook'
+            src={`https://analytics.dev.stratanetwork.net/analytics/workbooks/${opportunityDetailData?.analyticsWorkbookId}?p=1&embedded=1&presentation=${presentationMode ? 1 : 0}`}
+            height={1500}
+            style={{ overflow: 'hidden', borderWidth: '0px' }}
+          />
+        </Spacing>
+      )}
+      <CommentsDrawer
+        isVisible={showComments}
+        isGlobal={false}
+        isEditable={true}
+        opportunityType={OpportunityTypes.Exploration}
+        opportunityId={opportunityId ?? 0}
+        onOk={async (comment: string) => {
+          await opportunityService.setNote(opportunityGuid, comment);
+          setShowComments(false);
+        }}
+        onCancel={() => setShowComments(false)}
+      />
+      <ExplorationOpportunityModal
+        isVisible={modalVisible}
+        explorationOpportunity={opportunityDetailData}
+        onOk={async (opportunity: IExplorationOpportunity) => {
+          const opp = await opportunityService.update(opportunity.opportunityGuid, opportunity);
+          setOpportunityDetailData(opp);
+          setModalVisible(false);
+        }}
+        onCancel={() => setModalVisible(false)}
+      />
+    </>
+  );
+};
+
+export default ExplorationOpportunityDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationOpportunityModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationOpportunityModal.tsx
new file mode 100644
index 0000000..a8a2d41
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationOpportunityModal.tsx
@@ -0,0 +1,136 @@
+import React, { useEffect, useState } from 'react';
+import { RegEx } from '../../shared/validation/RegEx';
+import { nameIsDuplicate, nameValidationService } from '../../shared/opportunities/data/nameValidationService';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { IExplorationOpportunity, newExplorationOpportunity } from './data/IExplorationOpportunity';
+import { useOidcSession } from '@strata/core/lib/auth';
+import Form from '@strata/tempo/lib/form/Form';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import Input from '@strata/tempo/lib/input/Input';
+import notificationHub from '../../shared/notification/NotificationHub';
+import useToast from '@strata/tempo/lib/toast';
+import InputNumber from '@strata/tempo/lib/inputnumber/InputNumber';
+import DropDown from '@strata/tempo/lib/dropdown';
+import { IInitiativeStatuses } from '../../shared/data/IInitiativeStatuses';
+
+export interface IExplorationOpportunityProps {
+  isVisible: boolean;
+  explorationOpportunity?: IExplorationOpportunity;
+  onCancel?: () => void;
+  onOk?: (opportunity: IExplorationOpportunity) => void;
+}
+
+const ExplorationOpportunityModal: React.FC<IExplorationOpportunityProps> = (props: IExplorationOpportunityProps) => {
+  const { isVisible, explorationOpportunity, onCancel, onOk } = props;
+  const [form] = Form.useForm<IExplorationOpportunityProps>();
+  const { userSetting } = React.useContext(UserSettingContext);
+  const [opportunity, setOpportunity] = useState<IExplorationOpportunity>(newExplorationOpportunity(''));
+  const hub = notificationHub.useConnection();
+  const toast = useToast();
+  const session = useOidcSession();
+
+  useEffect(() => {
+    if (explorationOpportunity) {
+      setOpportunity(explorationOpportunity);
+    }
+  }, [explorationOpportunity]);
+
+  useEffect(() => {
+    const loadData = async (configurationGuid: string) => {
+      setOpportunity(newExplorationOpportunity(configurationGuid));
+    };
+    if (userSetting.configurationGuid !== '') {
+      loadData(userSetting.configurationGuid);
+    }
+  }, [userSetting.configurationGuid]);
+
+  const handleModalClose = async () => {
+    if (onCancel) {
+      onCancel();
+    }
+  };
+
+  const handleFormFinish = (values: any) => {
+    const key = session.userName + values.name;
+    const updatedOpportunity = { ...opportunity, ...values };
+    notificationHub.register(
+      hub,
+      async () => {
+        if (onOk) {
+          onOk(updatedOpportunity);
+        }
+      },
+      key
+    );
+
+    if (explorationOpportunity) {
+      return;
+    }
+    toast.show({
+      key: key,
+      toastType: 'loading',
+      message: `Creating ${values.name} Opportunity`,
+      duration: 30
+    });
+  };
+
+  const handleSave = async () => {
+    try {
+      await form.validateFields();
+      form.submit();
+    } catch {
+      // invalid fields so let form show validation errors
+    }
+  };
+
+  const validateName = (name: string) => {
+    if (explorationOpportunity) {
+      return true;
+    }
+    return nameValidationService.nameIsValid(userSetting.configurationGuid, OpportunityTypes.Exploration, name);
+  };
+
+  return (
+    <Modal title='Build Opportunity' visible={isVisible} onCancel={handleModalClose} onOk={handleSave}>
+      <Form form={form} preserve={false} onFinish={handleFormFinish} initialValues={explorationOpportunity}>
+        <Form.Item
+          label='Name'
+          name='name'
+          rules={[
+            { required: true, whitespace: false, max: 200, pattern: RegEx.JazzRestrictedCharacters },
+            () => ({
+              async validator(_, value) {
+                if (!value || (await validateName(value))) {
+                  return Promise.resolve();
+                }
+                return Promise.reject(nameIsDuplicate);
+              }
+            })
+          ]}
+        >
+          <Input disabled={explorationOpportunity !== undefined} />
+        </Form.Item>
+        <Form.Item label='Description' name='description'>
+          <Input disabled={explorationOpportunity !== undefined} />
+        </Form.Item>
+        {explorationOpportunity && (
+          <>
+            <Form.Item label='Identified Variation' name='identifiedSavings' initialValue={opportunity?.identifiedSavings} rules={[{ required: true }, { type: 'number', min: 1 }]}>
+              <InputNumber />
+            </Form.Item>
+            <Form.Item label='Status' name='initiativeStatus' rules={[{ required: true }]}>
+              <DropDown>
+                <DropDown.Item value={IInitiativeStatuses[IInitiativeStatuses.OnHold]}>On Hold</DropDown.Item>
+                <DropDown.Item value={IInitiativeStatuses[IInitiativeStatuses.InProcess]}>In Process</DropDown.Item>
+                <DropDown.Item value={IInitiativeStatuses[IInitiativeStatuses.Completed]}>Completed</DropDown.Item>
+              </DropDown>
+            </Form.Item>
+          </>
+        )}
+      </Form>
+    </Modal>
+  );
+};
+
+export default ExplorationOpportunityModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationPopulation.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationPopulation.tsx
new file mode 100644
index 0000000..4b288cb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationPopulation.tsx
@@ -0,0 +1,19 @@
+import { useHelpCenter } from '@strata/core/lib';
+import Button from '@strata/tempo/lib/button';
+import Header from '@strata/tempo/lib/header';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import React from 'react';
+import ExplorationPopulationGrid from './ExplorationPopulationGrid';
+
+const ExplorationPopulation: React.FC = () => {
+  const helpCenter = useHelpCenter();
+
+  return (
+    <>
+      <Header title='Exploration Population Management' extra={<Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1873')} />} />
+      <ExplorationPopulationGrid />
+    </>
+  );
+};
+
+export default ExplorationPopulation;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationPopulationGrid.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationPopulationGrid.tsx
new file mode 100644
index 0000000..79c9106
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/ExplorationPopulationGrid.tsx
@@ -0,0 +1,507 @@
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import intlService from '@strata/intl/lib';
+import ActionBar from '@strata/tempo/lib/actionbar/ActionBar';
+import Button from '@strata/tempo/lib/button/Button';
+import ButtonMenu from '@strata/tempo/lib/buttonmenu/ButtonMenu';
+import DataGrid from '@strata/tempo/lib/datagrid/DataGrid';
+import Divider from '@strata/tempo/lib/divider';
+import Drawer from '@strata/tempo/lib/drawer/Drawer';
+import Form from '@strata/tempo/lib/form/Form';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import EditIcon from '@strata/tempo/lib/icon/EditIcon';
+import MoreIcon from '@strata/tempo/lib/icon/MoreIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import Input from '@strata/tempo/lib/input/Input';
+import Link from '@strata/tempo/lib/link';
+import List from '@strata/tempo/lib/list';
+import { useModal } from '@strata/tempo/lib/modal';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text';
+import useToast from '@strata/tempo/lib/toast/useToast';
+import Tooltip from '@strata/tempo/lib/tooltip/Tooltip';
+import { isEmpty } from 'lodash';
+import React, { useContext, useEffect } from 'react';
+import { useHistory } from 'react-router';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { useFeatureFlags } from '../../shared/featureFlag/FeatureFlagContext';
+import UserSettingContext, { useUserSetting } from '../../shared/userSetting/UserSettingContext';
+import { RegEx } from '../../shared/validation/RegEx';
+import { getExclusionCriteriaName } from '../data/IExclusionCriteria';
+import { IExplorationPopulationModal, IExplorationPopulationStrategicOpportunityData, IOutlierExclusions, getDefaultExplorationPopulationModal } from './data/IExplorationPopulation';
+import { IExplorationPopulationGridData, IExplorationPopulationOpportunityData } from './data/IExplorationPopulationGridData';
+import { populationService } from './data/populationService';
+import ExplorationDuplicatePopulationModal from './ExplorationDuplicatePopulationModal';
+
+// TODO: Move to shared place and use for Opportunities grid
+const getExplorationPopulationViewOpportunityUrl = (costDriver: string, opportunityGuid: string): string => {
+  const opportunityPage = costDriver === 'LOS' ? 'LOSOpportunityViewer' : 'OpportunityViewer';
+  return `CCI/ExplorationVariation/${opportunityPage}.aspx?opportunityGuid=${opportunityGuid}`;
+};
+
+const ExplorationPopulationGrid: React.FC = () => {
+  const [isStrategicOpportunityWizardEnabled, setStrategicOpportunityWizardEnabled] = React.useState(false);
+  const [globalFilterValue, setGlobalFilterValue] = React.useState({ fields: ['name'], value: '' });
+  const [loading, setLoading] = React.useState<boolean>();
+  const [detailsComponentVisible, setDetailsComponentVisible] = React.useState(false);
+  const [detailsComponentLoading, setDetailsComponentLoading] = React.useState(false);
+  const [duplicateModalVisible, setDuplicateModalVisible] = React.useState<boolean>(false);
+  const [populations, setPopulations] = React.useState<IExplorationPopulationGridData[]>([]);
+  const [explorationPopulationId, setExplorationPopulationId] = React.useState<number>(0);
+  const [explorationPopulationName, setExplorationPopulationName] = React.useState<string>('');
+  const [populationDetails, setPopulationDetails] = React.useState<IExplorationPopulationModal>(getDefaultExplorationPopulationModal());
+  const [dischargeDate, setDischargeDate] = React.useState<string>('');
+  const [outlierExclusions, setOutlierExclusions] = React.useState<IOutlierExclusions[]>([]);
+  const [isPopulationNameValid, setIsPopulationNameValid] = React.useState(false);
+  const { currentConfiguration } = useConfigurations();
+
+  const modal = useModal();
+  const toast = useToast();
+  const history = useHistory();
+  const jazzUrl = useJazzUrlWithVersion();
+  const featureFlags = useFeatureFlags();
+  const [form] = Form.useForm();
+  const { userSetting } = useUserSetting();
+  const { isAdmin } = useContext(UserSettingContext);
+
+  useEffect(() => {
+    setStrategicOpportunityWizardEnabled(featureFlags.isEnabled('ciexplorationpopulationstrategicopportunitywizard'));
+  }, [featureFlags]);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      setLoading(true);
+      try {
+        const data = await populationService.getPopulations();
+        setPopulations(data);
+      } catch {
+        //prevent double error modal
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchData();
+  }, []);
+
+  const handleOpenDetailsComponent = async (explorationPopulationId: number) => {
+    const fetchPopulationDetailsData = async () => {
+      try {
+        setDetailsComponentLoading(true);
+        const data = await populationService.getPopulationDetails(explorationPopulationId);
+        setPopulationDetails(data);
+        form.setFieldsValue({ name: data.name });
+
+        const dateRange = data.filters?.find((x) => x.globalId === 'Discharge Date')?.dateRange;
+        if (dateRange && dateRange.length > 1) {
+          setDischargeDate(getFormattedDate(dateRange[0].toDate(), dateRange[1].toDate()));
+        } else {
+          setDischargeDate(getFormattedDate(undefined, undefined));
+        }
+
+        const losExclusionCriteriaName = getExclusionCriteriaName(data.exclusionCriteria.losExclusionType, data.exclusionCriteria.losExclusionValue); // No Exclusion
+        const costExclusionCriteriaName = getExclusionCriteriaName(data.exclusionCriteria.costExclusionType, data.exclusionCriteria.costExclusionValue); // abc
+
+        if (losExclusionCriteriaName !== 'No Exclusion' || costExclusionCriteriaName !== 'No Exclusion') {
+          setOutlierExclusions((prevItems) => [...prevItems, { title: `Average Length of Stay: ${losExclusionCriteriaName}` }]);
+          setOutlierExclusions((prevItems) => [...prevItems, { title: `Variable Direct Cost: ${costExclusionCriteriaName}` }]);
+        }
+      } catch {
+        //prevent double error modal
+      } finally {
+        setDetailsComponentLoading(false);
+      }
+    };
+
+    setIsPopulationNameValid(false);
+    setDetailsComponentVisible(true);
+    fetchPopulationDetailsData();
+  };
+
+  const handleCloseDetailsModal = () => {
+    setDetailsComponentVisible(false);
+    setPopulationDetails(getDefaultExplorationPopulationModal());
+    setOutlierExclusions([]);
+  };
+
+  const handleSaveDetailsDrawer = async () => {
+    try {
+      setDetailsComponentLoading(true);
+      const populationName = form.getFieldValue('name');
+      const result = await populationService.updatePopulationName(populationDetails.explorationPopulationId, populationName);
+
+      if (result) {
+        setPopulations((prev) => prev.map((population) => (population.explorationPopulationId === populationDetails.explorationPopulationId ? { ...population, name: populationName } : population)));
+        setDetailsComponentVisible(false);
+        setOutlierExclusions([]);
+        form.resetFields();
+        toast.show({
+          key: `Exploration Population - ${populationDetails.explorationPopulationId}`,
+          toastType: 'success',
+          message: `Exploration Population name updated.`
+        });
+      } else {
+        toast.show({
+          key: `Exploration Population - ${populationDetails.explorationPopulationId}`,
+          toastType: 'error',
+          message: 'Exploration Population was not updated. Try again and contact us if the issue continues.'
+        });
+      }
+    } catch {
+      toast.show({
+        key: `Exploration Population - ${populationDetails.explorationPopulationId}`,
+        toastType: 'error',
+        message: `Unable to update the Exploration Population name.`,
+        duration: 0
+      });
+    } finally {
+      setDetailsComponentLoading(false);
+    }
+  };
+
+  const handleCloseDetailsDrawer = () => {
+    setDetailsComponentVisible(false);
+    form.resetFields();
+    setPopulationDetails(getDefaultExplorationPopulationModal());
+    setOutlierExclusions([]);
+    setIsPopulationNameValid(false);
+  };
+
+  const handleOpenDuplicateModal = (id: number) => {
+    const population = populations.find((population) => population.explorationPopulationId === id);
+    setExplorationPopulationId(population?.explorationPopulationId ?? 0);
+    setExplorationPopulationName(population?.name ?? '');
+    setDuplicateModalVisible(true);
+  };
+
+  const handleCloseDuplicateModal = () => {
+    setDuplicateModalVisible(false);
+    setExplorationPopulationId(0);
+    setExplorationPopulationName('');
+  };
+
+  const handleDeletePopulation = async (explorationPopulation: IExplorationPopulationGridData) => {
+    const deletePopulation = async () => {
+      try {
+        setLoading(true);
+        await populationService.deletePopulation(explorationPopulation.explorationPopulationId).then(() => {
+          setPopulations(populations.filter((item) => item.explorationPopulationId !== explorationPopulation.explorationPopulationId));
+        });
+      } catch {
+        //prevent double error modal
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    modal.confirmChanges({
+      title: `Permanently delete ${explorationPopulation.name}?`,
+      content: `This will permanently delete ${explorationPopulation.name} and remove population from tagged encounters.`,
+      confirmType: 'danger',
+      okText: 'Delete Population',
+      cancelText: 'Keep Population',
+      onOk() {
+        deletePopulation();
+      },
+      onCancel() {
+        return;
+      }
+    });
+  };
+
+  const getCurrentOpportunity = (rowData: IExplorationPopulationGridData): IExplorationPopulationOpportunityData => {
+    let viewOpportunity;
+    if (userSetting.configurationGuid) {
+      viewOpportunity = rowData.opportunities.find((x) => x.configurationGuid === userSetting.configurationGuid);
+    }
+    if (!viewOpportunity) {
+      viewOpportunity = rowData.opportunities[0];
+    }
+
+    return viewOpportunity;
+  };
+
+  const handleViewOpportunity = (rowData: IExplorationPopulationGridData) => {
+    const viewOpportunity = getCurrentOpportunity(rowData);
+    const viewOpportunityUrl = getExplorationPopulationViewOpportunityUrl(viewOpportunity.costDriver, viewOpportunity.opportunityGuid);
+    window.location.assign(`${jazzUrl}${viewOpportunityUrl}`);
+  };
+
+  const handleAddOpportunity = async (rowData: IExplorationPopulationGridData) => {
+    if (currentConfiguration && currentConfiguration.orgDefinedTrackingEndDate <= rowData.endDischargeDate) {
+      modal.alert({
+        title: 'Add opportunity',
+        content: (
+          <>
+            This opportunity&apos;s baseline includes all months of the current configured fiscal year and/or includes months from future fiscal years.
+            <br />
+            Please choose a different baseline range that will allow tracking for at least one month of the current fiscal year or change your configuration to the future fiscal year.
+          </>
+        ),
+        alertType: 'error'
+      });
+    } else {
+      addOpportunity(rowData);
+    }
+  };
+
+  const getFormattedDate = (startDate: Date | undefined, endDate: Date | undefined): string => {
+    if (!startDate || !endDate) {
+      return '';
+    }
+    return `${intlService.formatDate(startDate, 'date')}\xa0-\xa0${intlService.formatDate(endDate, 'date')}`;
+  };
+
+  const addOpportunity = async (rowData: IExplorationPopulationGridData) => {
+    if (rowData) {
+      if (featureFlags.isEnabled('ciexplorationpopulationstrategicopportunitywizard')) {
+        // Navigate to the charge code wizard, passing population data as query params
+        const params = new URLSearchParams({
+          explorationPopulationId: rowData.explorationPopulationId?.toString() || ''
+        });
+        window.location.assign(`/continuousimprovement/strategic-opportunities/create/charge-code?${params.toString()}`);
+      } else {
+        toast.show({
+          key: rowData.name,
+          toastType: 'loading',
+          message: `A task has been submitted to create an opportunity for population ${rowData.name}. Once opportunity is created button will change to 'View Opportunity'`
+        });
+        rowData.isAddingOpportunity = true;
+        setPopulations([...populations]);
+
+        try {
+          const newOpportunity = await populationService.createPopulationOpportunity(rowData.explorationPopulationId);
+          if (newOpportunity?.opportunityGuid) {
+            rowData.opportunities.push(newOpportunity);
+            toast.show({
+              key: rowData.name,
+              toastType: 'success',
+              message: `Opportunity has been added for population ${rowData.name}.`
+            });
+          } else {
+            toast.show({
+              key: rowData.name,
+              toastType: 'error',
+              message: `Opportunity has NOT been added for population ${rowData.name}. Please try later.`
+            });
+          }
+        } catch {
+          toast.show({
+            key: rowData.name,
+            message: `An error occurred while adding the opportunity for population ${rowData.name}.`,
+            toastType: 'error'
+          });
+        } finally {
+          rowData.isAddingOpportunity = false;
+          setPopulations([...populations]);
+        }
+      }
+    }
+  };
+
+  const getAssociatedDrawerGrid = (title: string, headerName: string, data: IExplorationPopulationStrategicOpportunityData[]) => {
+    return (
+      <>
+        <Spacing padding='8px 0 8px 24px'>
+          <Text strong>{title}</Text>
+        </Spacing>
+        <DataGrid value={data} scrollHeight='250px' scrollable>
+          <DataGrid.Column width={400} field='name' header={headerName} sortable body={(rowData) => <Link href={`/strategic-tracker/opportunity/${rowData.opportunityId}`}>{rowData.name}</Link>} />
+        </DataGrid>
+      </>
+    );
+  };
+
+  return (
+    <>
+      <ActionBar
+        filters={<Input search width={300} onChange={(value) => setGlobalFilterValue({ fields: ['name'], value: value.target.value })} />}
+        actions={
+          <Button type='primary' icon={<PlusIcon />} onClick={() => history.push('/explorectf')}>
+            Create Population
+          </Button>
+        }
+      />
+      <DataGrid
+        scrollable
+        dataKey='explorationPopulationId'
+        sortField='name'
+        sortOrder={1}
+        value={populations}
+        loading={loading}
+        globalFilterValue={globalFilterValue ?? { fields: ['name'], value: '' }}
+      >
+        {/* {columns} */}
+        <DataGrid.Column
+          field='name'
+          header='Population Name'
+          sortable
+          width={500}
+          body={(rowData) => <Link href={`/exploration-populations/${rowData.explorationPopulationId}`}>{rowData.name}</Link>}
+        />
+        <DataGrid.Column
+          header='Discharge Date Range'
+          width={200}
+          body={(rowData) => {
+            return rowData.startDischargeDate && rowData.endDischargeDate ? getFormattedDate(rowData.startDischargeDate, rowData.endDischargeDate) : '—';
+          }}
+        />
+        <DataGrid.NumberColumn format='number' field='totalEncounters' header='Total Encounters Included' sortable width={200} />
+        {!isStrategicOpportunityWizardEnabled ? (
+          <DataGrid.NumberColumn format='currency' field='totalVariation' header='Total Variation Included' sortable width={200} />
+        ) : (
+          <DataGrid.NumberColumn format='number' field='associatedOpportunitiesCount' header='Associated Opportunities' sortable width={250} />
+        )}
+        {!isStrategicOpportunityWizardEnabled ? <></> : <DataGrid.NumberColumn format='number' field='associatedInitiativesCount' header='Associated Initiatives' sortable width={250} />}
+        <DataGrid.EmptyColumn />
+        <DataGrid.Column
+          width={isStrategicOpportunityWizardEnabled ? 120 : 230}
+          body={(rowData) => (
+            <>
+              <Button type='link' onClick={() => handleOpenDetailsComponent(rowData.explorationPopulationId)}>
+                View Details
+              </Button>
+              {!isStrategicOpportunityWizardEnabled && (
+                <Button type='link' disabled={rowData.isAddingOpportunity} onClick={() => (rowData.opportunities?.length ? handleViewOpportunity(rowData) : handleAddOpportunity(rowData))}>
+                  {rowData.opportunities?.length ? 'View Opportunity' : 'Add Opportunity'}
+                </Button>
+              )}
+            </>
+          )}
+        />
+        {!isStrategicOpportunityWizardEnabled ? (
+          <DataGrid.Column
+            width={90}
+            body={(rowData) => (
+              <>
+                <Button type='link' icon={<EditIcon />} onClick={() => window.location.assign(`/continuousimprovement/exploration-populations/${rowData.explorationPopulationId}`)} />
+                {isAdmin ? <Button type='link' disabled={rowData.opportunities?.length || rowData.isAddingOpportunity} icon={<DeleteIcon />} onClick={() => handleDeletePopulation(rowData)} /> : <></>}
+              </>
+            )}
+          />
+        ) : (
+          <DataGrid.Column
+            width={120}
+            body={(rowData) => (
+              <Spacing itemSpacing={8}>
+                <Tooltip title='Edit Population'>
+                  <Button type='link' icon={<EditIcon />} onClick={() => window.location.assign(`/continuousimprovement/exploration-populations/${rowData.explorationPopulationId}`)} />
+                </Tooltip>
+                <Tooltip title='Add Opportunity'>
+                  <Button type='link' icon={<PlusIcon />} onClick={() => handleAddOpportunity(rowData)} />
+                </Tooltip>
+                <ButtonMenu
+                  type='link'
+                  icon={<MoreIcon />}
+                  items={[
+                    { key: '1', label: 'Duplicate Population', onClick: () => handleOpenDuplicateModal(rowData.explorationPopulationId) },
+                    { key: '2', type: 'divider' },
+                    { key: '3', label: 'Delete', disabled: rowData.opportunities?.length || rowData.isAddingOpportunity, icon: <DeleteIcon />, onClick: () => handleDeletePopulation(rowData) }
+                  ]}
+                />
+              </Spacing>
+            )}
+          />
+        )}
+      </DataGrid>
+      {!isStrategicOpportunityWizardEnabled ? (
+        <Modal title={populationDetails.name + ' Details'} footer={null} visible={detailsComponentVisible} loading={detailsComponentLoading} onCancel={handleCloseDetailsModal}>
+          <Divider extended />
+          <Form layout='vertical' initialValues={populationDetails}>
+            <Form.Item label='Population Criteria' name='filters' rules={[{ required: true }]}>
+              {isEmpty(populationDetails.filters) ? (
+                <Text>No population criteria applied</Text>
+              ) : (
+                <List
+                  dataSource={populationDetails.filters}
+                  renderItem={(item) => (
+                    <List.Item>
+                      {isEmpty(item.filters)
+                        ? item.label
+                        : item.operator.toString() === 'In'
+                        ? `${item.label}: ${item.filters.map((item) => item.displayText).join(', ')}`
+                        : `${item.label}: not in ${item.filters.map((item) => item.displayText).join(', ')}`}
+                    </List.Item>
+                  )}
+                />
+              )}
+            </Form.Item>
+            <Form.Item label='Outlier Exclusions' name='' rules={[{ required: true }]}>
+              {isEmpty(outlierExclusions) ? <Text>No exclusions</Text> : <List dataSource={outlierExclusions} renderItem={(item) => <List.Item>{item.title}</List.Item>} />}
+            </Form.Item>
+            <Form.Item label='Encounters Manually Included or Excluded' name='encountersManuallyIncludedExcluded' rules={[{ required: true }]}>
+              <Text>{populationDetails.hasManuallyChangeEncounters ? 'Yes' : 'No'}</Text>
+            </Form.Item>
+          </Form>
+        </Modal>
+      ) : (
+        <Drawer
+          title='View Details'
+          width={450}
+          visible={detailsComponentVisible}
+          loading={detailsComponentLoading}
+          onClose={handleCloseDetailsDrawer}
+          removeBodyPadding
+          footer={
+            <>
+              <Button onClick={handleCloseDetailsDrawer}>Cancel</Button>
+              <Button type='primary' disabled={!isPopulationNameValid} onClick={handleSaveDetailsDrawer}>
+                Save
+              </Button>
+            </>
+          }
+        >
+          <Spacing padding='8px 0 0 24px'>
+            <Form form={form} layout='vertical'>
+              <Form.Item
+                label='Population Name'
+                name='name'
+                style={{ marginBottom: '16px' }}
+                rules={[
+                  { required: true, whitespace: true, max: 200 },
+                  { pattern: RegEx.JazzRestrictedCharacters },
+                  () => ({
+                    async validator(_, value) {
+                      if (!value || value.trim().toLowerCase() === populationDetails.name.trim().toLowerCase()) {
+                        setIsPopulationNameValid(false);
+                        return Promise.resolve();
+                      }
+                      const isNameNotUnique = populations.some((population) => population.name.trim().toLowerCase() === value.trim().toLowerCase());
+                      if (isNameNotUnique) {
+                        setIsPopulationNameValid(false);
+                        return Promise.reject('Exploration population with that name already exists');
+                      }
+                      setIsPopulationNameValid(true);
+                      return Promise.resolve();
+                    }
+                  })
+                ]}
+              >
+                <Input />
+              </Form.Item>
+            </Form>
+          </Spacing>
+          <Spacing padding='0 0 0 24px' column>
+            <Spacing column padding='0 0 16px 0'>
+              <Text strong>Discharge Date</Text>
+              <Text>{dischargeDate}</Text>
+            </Spacing>
+            <Spacing column padding='0 0 16px 0'>
+              <Text strong>Outlier Exclusions</Text>
+              {isEmpty(outlierExclusions) ? <Text>No exclusions</Text> : <List dataSource={outlierExclusions} renderItem={(item) => <List.Item>{item.title}</List.Item>} />}
+            </Spacing>
+            <Spacing column padding='0 0 8px 0'>
+              <Text strong>Encounters Manually Included or Excluded</Text>
+              <Text>{populationDetails.hasManuallyChangeEncounters ? 'Yes' : 'No'}</Text>
+            </Spacing>
+          </Spacing>
+          {populationDetails.associatedOpportunities.length > 0 && getAssociatedDrawerGrid('Associated Opportunities', 'Opportunity Name', populationDetails.associatedOpportunities)}
+          {populationDetails.associatedInitiatives.length > 0 && getAssociatedDrawerGrid('Associated Initiatives', 'Initiative Name', populationDetails.associatedInitiatives)}
+        </Drawer>
+      )}
+      <ExplorationDuplicatePopulationModal isVisible={duplicateModalVisible} populationId={explorationPopulationId} populationName={explorationPopulationName} closeModal={handleCloseDuplicateModal} />
+    </>
+  );
+};
+
+export default ExplorationPopulationGrid;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/Filters.tsx
new file mode 100644
index 0000000..e887d17
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/Filters.tsx
@@ -0,0 +1,85 @@
+import Button from '@strata/tempo/lib/button';
+import Checkbox from '@strata/tempo/lib/checkbox';
+import Drawer from '@strata/tempo/lib/drawer';
+import Form from '@strata/tempo/lib/form';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import Spacing from '@strata/tempo/lib/spacing';
+import React, { useCallback, useEffect } from 'react';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+import { IExplorationFilters, initialFilters } from './data/IExplorationFilters';
+
+interface IFiltersProps {
+  filters: IExplorationFilters;
+  isVisible: boolean;
+  onApply: (filters: IExplorationFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const { currentConfiguration } = useConfigurations();
+
+  const [form] = Form.useForm<IExplorationFilters>();
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      if (currentConfiguration == null) {
+        return;
+      }
+      handleClearFilters();
+    };
+
+    loadFiltersOptions();
+  }, [currentConfiguration, handleClearFilters]);
+
+  const handleApplyFilters = () => {
+    const filters: IExplorationFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Display' name='viewVisible'>
+          <RadioGroup
+            options={[
+              { value: true, label: 'Visible Opportunities' },
+              { value: false, label: 'Hidden Opportunities' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Initiatives' name='excludeInitiatives' valuePropName='checked'>
+          <Checkbox>Exclude Opportunities with Initiatives</Checkbox>
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/Opportunities.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/Opportunities.tsx
new file mode 100644
index 0000000..93a3b79
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/Opportunities.tsx
@@ -0,0 +1,89 @@
+import Button from '@strata/tempo/lib/button/Button';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import React, { useEffect, useState } from 'react';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import OpportunitiesGrid from '../../shared/opportunities/OpportunitiesGrid';
+import { IOpportunity } from '../../shared/opportunities/data';
+import ExplorationOpportunityModal from './ExplorationOpportunityModal';
+import Filters from './Filters';
+import { IExplorationFilters, initialFilters, numberOfFilters } from './data/IExplorationFilters';
+import { opportunityService } from './data/opportunityservice';
+import { IExplorationOpportunity } from './data/IExplorationOpportunity';
+
+const Opportunities: React.FC = () => {
+  const [filters, setFilters] = useState<IExplorationFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+
+  const [explorationModalVisible, setExplorationModalVisible] = useState(false);
+
+  useEffect(() => {
+    document.title = 'Exploration Opportunities';
+  }, []);
+
+  useEffect(() => {
+    if (currentConfiguration == null) {
+      return;
+    }
+    setFilters(initialFilters);
+    setCurrentConfigurationGuid(currentConfiguration.configurationGuid);
+  }, [currentConfiguration]);
+
+  const handleApplyFilters = (newFilters: IExplorationFilters) => {
+    setFiltersVisible(false);
+    setFilters({ ...filters, ...newFilters });
+  };
+
+  const handleSearch = (searchValue: string) => {
+    setFilters((filters) => {
+      return { ...filters, opportunitySearch: searchValue };
+    });
+  };
+
+  const getOpportunityUrl = (opportunity: IOpportunity) => {
+    return `/exploration-opportunity/${opportunity.opportunityGuid}`;
+  };
+
+  const addOpportunityButton = (
+    <Button type='primary' icon={<PlusIcon />} onClick={() => setExplorationModalVisible(true)}>
+      Opportunity
+    </Button>
+  );
+
+  return (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />
+      <OpportunitiesGrid
+        configurationGuid={currentConfigurationGuid}
+        getOpportunityUrl={getOpportunityUrl}
+        filters={filters}
+        opportunityService={opportunityService}
+        identifiedSavingsIndex={2}
+        numOfSelectedFilters={numberOfFilters(filters)}
+        searchPlaceholderText='Search'
+        onFilter={() => setFiltersVisible(true)}
+        onSearch={handleSearch}
+        customAction={addOpportunityButton}
+      >
+        <DataGrid.Column field='name' header='Name' sortable width={160} />
+        <DataGrid.EmptyColumn />
+      </OpportunitiesGrid>
+
+      <ExplorationOpportunityModal
+        isVisible={explorationModalVisible}
+        explorationOpportunity={undefined}
+        onOk={async (opportunity: IExplorationOpportunity) => {
+          setExplorationModalVisible(false);
+          await opportunityService.createOpportunity(opportunity);
+        }}
+        onCancel={() => {
+          setExplorationModalVisible(false);
+        }}
+      />
+    </>
+  );
+};
+
+export default Opportunities;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/IExplorationFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/IExplorationFilters.ts
new file mode 100644
index 0000000..f1bc038
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/IExplorationFilters.ts
@@ -0,0 +1,16 @@
+import { IOpportunityFilters } from '../../../shared/opportunities/data';
+
+export type IExplorationFilters = IOpportunityFilters;
+
+export const initialFilters: IExplorationFilters = {
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+export const numberOfFilters = (filters: IExplorationFilters): number => {
+  let filtersCount = 0;
+  if (filters.viewVisible === false) filtersCount++;
+  if (filters.excludeInitiatives === true) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/IExplorationOpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/IExplorationOpportunity.ts
new file mode 100644
index 0000000..dbbbb14
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/IExplorationOpportunity.ts
@@ -0,0 +1,33 @@
+import { IInitiativeStatuses } from '../../../shared/data/IInitiativeStatuses';
+import { IOpportunity } from '../../../shared/opportunities/data';
+
+export interface IExplorationOpportunity extends IOpportunity {
+  opportunityId: number;
+  name: string;
+  description: string;
+  analyticsWorkbookId: number;
+  initiativeStatus?: IInitiativeStatuses;
+}
+
+export const newExplorationOpportunity = (configurationGuid: string, data: Partial<IExplorationOpportunity> = {}): IExplorationOpportunity => {
+  return {
+    ...{
+      name: '',
+      opportunityKey: '',
+      opportunityId: 0,
+      configurationGuid: configurationGuid,
+      opportunityGuid: '00000000-0000-0000-0000-000000000000',
+      initiativeGuid: '00000000-0000-0000-0000-000000000000',
+      description: '',
+      analyticsWorkbookId: 0,
+      identifiedSavings: 0,
+      initiativeStatus: undefined,
+      hasInitiative: false,
+      isHidden: false,
+      note: '',
+      sourceOpportunity: '',
+      sourceOpportunityId: -1
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/IExplorationPopulation.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/IExplorationPopulation.ts
new file mode 100644
index 0000000..cc4fc1b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/IExplorationPopulation.ts
@@ -0,0 +1,56 @@
+import { IFilterChipItem } from '../../../shared/components/FilterBar/data/IFilterChipItem';
+import IExclusionCriteria, { newExclusionCriteria } from '../../data/IExclusionCriteria';
+
+export interface IExplorationPopulation {
+  explorationPopulationId: number;
+  name: string;
+  associatedOpportunitiesCount?: number | null;
+  associatedInitiativesCount?: number | null;
+  caseTypeFamilyId: number;
+  costDriver: string;
+  losExclusionType: number;
+  losExclusionValue: number;
+  costExclusionType: number;
+  costExclusionValue: number;
+  filtersJSON: string;
+  totalEncounters: number;
+  totalVariation: number;
+  codeType: number;
+  manuallyExcludedEncounterIds: number[];
+  manuallyIncludedEncounterIds: number[];
+  mappingEncounterIds: number[];
+  opportunitiesCount: number;
+}
+
+export interface IExplorationPopulationModal {
+  explorationPopulationId: number;
+  name: string;
+  costDriver: string;
+  exclusionCriteria: IExclusionCriteria;
+  filters: IFilterChipItem[];
+  hasManuallyChangeEncounters: boolean;
+  associatedOpportunities: IExplorationPopulationStrategicOpportunityData[];
+  associatedInitiatives: IExplorationPopulationStrategicOpportunityData[];
+}
+
+export const getDefaultExplorationPopulationModal = (): IExplorationPopulationModal => {
+  return {
+    explorationPopulationId: 0,
+    name: '',
+    costDriver: '',
+    exclusionCriteria: newExclusionCriteria(),
+    filters: [],
+    hasManuallyChangeEncounters: false,
+    associatedOpportunities: [],
+    associatedInitiatives: []
+  };
+};
+
+export interface IOutlierExclusions {
+  title: string;
+}
+
+export interface IExplorationPopulationStrategicOpportunityData {
+  opportunityId: number;
+  name: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/IExplorationPopulationGridData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/IExplorationPopulationGridData.ts
new file mode 100644
index 0000000..f734a88
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/IExplorationPopulationGridData.ts
@@ -0,0 +1,23 @@
+export interface IExplorationPopulationGridData {
+  explorationPopulationId: number;
+  name: string;
+  totalEncounters: number;
+  totalVariation: number;
+  startDischargeDate: Date;
+  endDischargeDate: Date;
+  associatedOpportunitiesCount: number;
+  associatedInitiativesCount: number;
+  isAddingOpportunity: boolean;
+  opportunities: IExplorationPopulationOpportunityData[];
+}
+
+export interface IExplorationPopulationOpportunityData {
+  opportunityId: number;
+  opportunityGuid: string;
+  costDriver: string;
+  configurationGuid: string;
+  baselineStartDate: Date | undefined;
+  baselineEndDate: Date | undefined;
+  trackingStartDate: Date | undefined;
+  trackingEndDate: Date | undefined;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/opportunityservice.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/opportunityservice.ts
new file mode 100644
index 0000000..c68ba0f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/opportunityservice.ts
@@ -0,0 +1,65 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IInitiativeStatuses } from '../../../shared/data/IInitiativeStatuses';
+import { IOpportunity, IOpportunityFilters, IOpportunityService } from '../../../shared/opportunities/data';
+import { IPagedApiResponse, IPagingOptions, ISortOptions } from '../../../shared/paging';
+import { IExplorationOpportunity } from './IExplorationOpportunity';
+
+const { httpDelete, httpDownloadAndDisplayFile, httpGet, httpPost, httpPut } = getSecureService(`${appConfig.apiUrl}v1/`);
+const controller = 'exploration-opportunities';
+
+export const opportunityService: IOpportunityService = {
+  getFlexibleExplorationEnabled: async (): Promise<boolean> => {
+    return httpGet<boolean>(`${controller}/enabled`, {});
+  },
+  createOpportunity: (opportunity: IExplorationOpportunity) => {
+    return httpPost<void>(`${controller}/create`, opportunity);
+  },
+  getById(opportunityGuid: string | number): Promise<IExplorationOpportunity> {
+    return httpGet<IExplorationOpportunity>(`${controller}/${opportunityGuid}`);
+  },
+  checkWorkbook: async (opportunityGuid: string | number): Promise<void> => {
+    return httpPut(`${controller}/${opportunityGuid}/check-workbook`, {});
+  },
+  update(opportunityGuid: string | number, opportunity: IExplorationOpportunity): Promise<IExplorationOpportunity> {
+    return httpPut(`${controller}/${opportunityGuid}/update`, opportunity);
+  },
+  setStatus(opportunityGuid: string | number, status: IInitiativeStatuses): Promise<IExplorationOpportunity> {
+    return httpPut(`${controller}/${opportunityGuid}/set-status`, status);
+  },
+  delete(opportunityGuid: string | number): Promise<void> {
+    return httpDelete(`${controller}/${opportunityGuid}`);
+  },
+  getOpportunities: function (configurationGuid: string, pagingOptions: IPagingOptions, filters: IOpportunityFilters): Promise<IPagedApiResponse<IOpportunity>> {
+    return httpPost<IPagedApiResponse<IExplorationOpportunity>>(`${controller}`, {
+      pagingOptions,
+      filters: {
+        ...filters,
+        configurationGuid
+      }
+    });
+  },
+  export: async (configurationGuid: string, sortOptions: ISortOptions, filters: IOpportunityFilters): Promise<void> => {
+    const date = new Date();
+    const fileName = 'Exploration_CI_Opportunities_' + date.toISOString().split('T')[0];
+    httpDownloadAndDisplayFile(
+      `${controller}/export`,
+      {
+        method: 'post',
+        body: JSON.stringify({
+          sortOptions,
+          filters: {
+            ...filters,
+            configurationGuid
+          }
+        })
+      },
+      fileName
+    );
+  },
+  setHidden: async (opportunityGuid: string, isHidden: boolean): Promise<void> => {
+    await httpPut(`${controller}/${opportunityGuid}/set-hidden`, isHidden);
+  },
+  setNote: async (opportunityGuid: string, note: string): Promise<void> => {
+    return httpPut(`${controller}/${opportunityGuid}/set-note`, note);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/populationService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/populationService.ts
new file mode 100644
index 0000000..2abe718
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/exploration/opportunities/data/populationService.ts
@@ -0,0 +1,50 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import dayjs from 'dayjs';
+import { IExplorationPopulation, IExplorationPopulationModal } from './IExplorationPopulation';
+import { IExplorationPopulationGridData, IExplorationPopulationOpportunityData } from './IExplorationPopulationGridData';
+
+const { httpPost, httpGet, httpPut, httpDelete } = getSecureService(`${appConfig.apiUrl}v1/`);
+const controller = 'exploration-populations';
+
+export const populationService = {
+  savePopulation(population: IExplorationPopulation): Promise<boolean> {
+    return httpPost<boolean>(`${controller}`, population);
+  },
+  updatePopulation(population: IExplorationPopulation): Promise<boolean> {
+    return httpPut<boolean>(`${controller}/${population.explorationPopulationId}`, population);
+  },
+  getPopulations(): Promise<IExplorationPopulationGridData[]> {
+    return httpGet<IExplorationPopulationGridData[]>(`${controller}`);
+  },
+  getPopulationData(populationId: number): Promise<IExplorationPopulation> {
+    return httpGet<IExplorationPopulation>(`${controller}/${populationId}`);
+  },
+  updatePopulationName(populationId: number, name: string): Promise<boolean> {
+    return httpPut<boolean>(`${controller}/${populationId}/update-population-name`, name);
+  },
+  getPopulationDetails(populationId: number): Promise<IExplorationPopulationModal> {
+    return httpGet<IExplorationPopulationModal>(`${controller}/${populationId}/details`).then((result) => {
+      const dateRange = result.filters.find((fil) => fil.label === 'Discharge Date');
+      if (dateRange?.dateRange) {
+        dateRange.dateRange[0] = dayjs(dateRange.dateRange[0] as unknown as string);
+        dateRange.dateRange[1] = dayjs(dateRange.dateRange[1] as unknown as string);
+      }
+      return result;
+    });
+  },
+  deletePopulation(populationId: number): Promise<boolean> {
+    return httpDelete(`${controller}/${populationId}`);
+  },
+  duplicatePopulation(populationId: number, name: string): Promise<IExplorationPopulationGridData> {
+    return httpPost<IExplorationPopulationGridData>(`${controller}/${populationId}/duplicate`, name);
+  },
+  isNameUnique(name: string): Promise<boolean> {
+    return httpPost(`${controller}/is-name-unique`, name);
+  },
+  createPopulationOpportunity(populationId: number): Promise<IExplorationPopulationOpportunityData> {
+    return httpPost<IExplorationPopulationOpportunityData>(`${controller}/${populationId}/opportunities`, {});
+  },
+  getDischargeDates(populationId: number): Promise<any> {
+    return httpGet(`${controller}/${populationId}/discharge-dates`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/FreeForm.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/FreeForm.tsx
new file mode 100644
index 0000000..25b6126
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/FreeForm.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import Opportunities from './opportunities/Opportunities';
+import OpportunitiesHeader from '../shared/opportunities/OpportunitiesHeader';
+
+const FreeForm: React.FC = () => {
+  return (
+    <>
+      <OpportunitiesHeader headerTitle='Free Form Opportunities' helpId='1310' />
+      <Opportunities />
+    </>
+  );
+};
+
+export default FreeForm;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/FreeFormDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/FreeFormDetail.tsx
new file mode 100644
index 0000000..dddeb8f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/FreeFormDetail.tsx
@@ -0,0 +1,75 @@
+import Form from '@strata/tempo/lib/form/Form';
+import Input from '@strata/tempo/lib/input/Input';
+import RadioGroup from '@strata/tempo/lib/radiogroup/RadioGroup';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import React, { useEffect, useState } from 'react';
+import { RegEx } from '../../shared/validation/RegEx';
+import { FinancialImprovementTypes, MetricTypes } from '../opportunities/data/IFreeFormOpportunity';
+
+export interface IFreeFormDetailProps {
+  metricType?: MetricTypes;
+  handleMetricTypeChange?: (metricType: MetricTypes) => void;
+}
+
+const FreeFormDetail: React.FC<IFreeFormDetailProps> = (props: IFreeFormDetailProps) => {
+  const { metricType, handleMetricTypeChange } = props;
+  const [isFinancial, setFinancial] = useState<boolean>(false);
+  const [selectedMetric, setSelectedMetric] = useState<MetricTypes>();
+
+  useEffect(() => {
+    if (metricType) {
+      setSelectedMetric(metricType);
+      setFinancial(metricType === MetricTypes.Financial || metricType.toString() === MetricTypes[MetricTypes.Financial]);
+    }
+  }, [metricType]);
+
+  const handleMetricChange = (metricType: MetricTypes) => {
+    setSelectedMetric(metricType);
+    setFinancial(metricType === MetricTypes.Financial || metricType.toString() === MetricTypes[MetricTypes.Financial]);
+    if (handleMetricTypeChange) {
+      handleMetricTypeChange(metricType);
+    }
+  };
+
+  return (
+    <>
+      <Spacing padding={16} column>
+        <Form.Item label='Financial Improvement Type' name='improvementType' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: FinancialImprovementTypes.Cost, label: 'Cost Reduction' },
+              { value: FinancialImprovementTypes.Revenue, label: 'Revenue Growth' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Metric Type' name='metricType' rules={[{ required: true }]}>
+          <RadioGroup
+            onChange={(selected) => handleMetricChange(selected.target.value)}
+            options={[
+              { value: MetricTypes.Financial, label: 'Financial Metric' },
+              { value: MetricTypes.Operational, label: 'Operational Metric' },
+              { value: MetricTypes.FinancialPerUnit, label: 'Financial per Unit Metric' }
+            ]}
+          />
+        </Form.Item>
+        {!isFinancial && (
+          <>
+            <Form.Item
+              label='Metric Definition Numerator'
+              name='metricNumerator'
+              extra='This will get divided by the Metric Definition Denominator'
+              rules={[{ required: true, whitespace: false, pattern: RegEx.JazzRestrictedCharacters }]}
+            >
+              <Input placeholder={selectedMetric === MetricTypes.Operational || selectedMetric?.toString() === MetricTypes[MetricTypes.Operational] ? 'e.g. Imaging Procedures' : 'e.g. Pharmacy'} />
+            </Form.Item>
+            <Form.Item label='Metric Definition Denominator' name='metricDenominator' rules={[{ required: true, whitespace: false, pattern: RegEx.JazzRestrictedCharacters }]}>
+              <Input placeholder='e.g. Patient Days' />
+            </Form.Item>
+          </>
+        )}
+      </Spacing>
+    </>
+  );
+};
+
+export default FreeFormDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/FreeFormInitiative.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/FreeFormInitiative.tsx
new file mode 100644
index 0000000..1381e7b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/FreeFormInitiative.tsx
@@ -0,0 +1,128 @@
+import Wizard from '@strata/tempo/lib/wizard/Wizard';
+import React, { useEffect } from 'react';
+import { useHistory } from 'react-router';
+import { clientOpportunityLinkService } from '../../network/opportunities/data/clientOppportunityLinkService';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import CreateInitiative from '../../shared/initiatives/CreateInitiative';
+import { IInitiative } from '../../shared/initiatives/data/IInitiative';
+import { IInitiativeProps } from '../../shared/initiatives/data/IInitiativeProps';
+import { nameValidationService } from '../../shared/opportunities/data/nameValidationService';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { MetricTypes } from '../opportunities/data/IFreeFormOpportunity';
+import { opportunityService } from '../opportunities/data/opportunityService';
+import FreeFormDetail from './FreeFormDetail';
+import { IFreeFormInitiative, newFreeFormInitiative } from './data/IFreeFormInitiative';
+import { cleanUpFreeFormInitiativeDto } from './data/IFreeFormInitiativeDto';
+import { freeFormInitiativeService } from './data/freeFormInitiativeService';
+
+const FreeFormInitiative: React.FC = () => {
+  const [initiative, setInitiative] = React.useState<IInitiative>();
+  const [isLoading, setLoading] = React.useState<boolean>(false);
+  const [isEditing, setEditing] = React.useState<boolean>(true);
+  const [metricType, setMetricType] = React.useState<MetricTypes>(MetricTypes.Financial);
+  const { currentConfiguration } = useConfigurations();
+  const { userSetting } = React.useContext(UserSettingContext);
+
+  const history = useHistory();
+
+  const { networkOpportunityId, networkOpportunityName, opportunityGuid } = history.location.state as IInitiativeProps;
+
+  useEffect(() => {
+    const loadData = async () => {
+      const initiative = newFreeFormInitiative(currentConfiguration);
+      if (networkOpportunityName) {
+        initiative.name = networkOpportunityName;
+      }
+      setMetricType(initiative.metricType);
+      setInitiative(initiative);
+      setEditing(false);
+    };
+    const loadInitiative = async (opportunityGuid: string) => {
+      if (opportunityService.getInitiativeInfo) {
+        const initiative = await opportunityService.getInitiativeInfo(opportunityGuid);
+        if (initiative) {
+          const updates = newFreeFormInitiative(currentConfiguration, initiative);
+          setInitiative(updates);
+          setMetricType((updates as IFreeFormInitiative).metricType);
+          setEditing(true);
+        } else {
+          const newInitiative = newFreeFormInitiative(currentConfiguration);
+          if (networkOpportunityName) {
+            newInitiative.name = networkOpportunityName;
+          }
+          setMetricType(newInitiative.metricType);
+          setInitiative(newInitiative);
+        }
+      }
+    };
+    setLoading(true);
+    if (currentConfiguration && !initiative && !opportunityGuid) {
+      loadData();
+    } else if (currentConfiguration && !initiative && opportunityGuid) {
+      loadInitiative(opportunityGuid);
+    }
+    setLoading(false);
+  }, [currentConfiguration, networkOpportunityName, opportunityGuid, initiative, userSetting.configurationGuid]);
+
+  const nameIsValid = (name: string): Promise<boolean> => {
+    return nameValidationService.nameIsValid(userSetting.configurationGuid, OpportunityTypes.FreeForm, name, opportunityGuid);
+  };
+
+  const pageIsValid = (currentStep: number, detailValues: IFreeFormInitiative): boolean => {
+    if (currentStep === 1) {
+      if (detailValues.metricType !== MetricTypes.Financial && ((detailValues.metricDenominator ?? '') === '' || (detailValues.metricNumerator ?? '') === '')) {
+        return false;
+      }
+    }
+    return true;
+  };
+
+  const createOpportunity = async (detailValues: IFreeFormInitiative): Promise<void> => {
+    const cleanup = cleanUpFreeFormInitiativeDto({ ...initiative, ...detailValues });
+    setLoading(true);
+    try {
+      let opportunityguid = '';
+      if (opportunityGuid) {
+        await freeFormInitiativeService.update(cleanup);
+        opportunityguid = opportunityGuid;
+      } else {
+        opportunityguid = await freeFormInitiativeService.create(cleanup);
+
+        // save network opp if applicable
+        if (networkOpportunityId) {
+          await clientOpportunityLinkService.addClientOpportunityLink(networkOpportunityId, opportunityguid);
+        }
+      }
+      history.push(`/free-form-opportunity/${opportunityguid}`);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleMetricTypeChange = (metricType: MetricTypes) => {
+    setMetricType(metricType);
+  };
+
+  return (
+    <>
+      <CreateInitiative
+        opportunityType='Free Form'
+        helpId='1462'
+        newInitiative={initiative}
+        nameIsValid={nameIsValid}
+        pageIsValid={pageIsValid}
+        createOpportunity={createOpportunity}
+        isEditing={isEditing}
+        isLoading={isLoading}
+      >
+        <Wizard.Step key='1' title='FreeForm Opportunity'>
+          <FreeFormDetail metricType={metricType} handleMetricTypeChange={handleMetricTypeChange} />
+        </Wizard.Step>
+        <></>
+      </CreateInitiative>
+    </>
+  );
+};
+
+export default FreeFormInitiative;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/data/IFreeFormInitiative.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/data/IFreeFormInitiative.ts
new file mode 100644
index 0000000..db5b765
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/data/IFreeFormInitiative.ts
@@ -0,0 +1,36 @@
+import { IConfiguration } from '../../../shared/configuration/IConfiguration';
+import { IOrgDefinedInitiative, newOrgDefinedInitiative } from '../../../shared/initiatives/data/IOrgDefinedInitiative';
+import { FinancialImprovementTypes, MetricTypes } from '../../opportunities/data/IFreeFormOpportunity';
+
+export interface IFreeFormInitiative extends IOrgDefinedInitiative {
+  improvementType: FinancialImprovementTypes;
+  metricType: MetricTypes;
+  metricTypeValue: string;
+  metricNumerator?: string;
+  metricDenominator?: string;
+}
+
+export const newFreeFormInitiative = (configuration: IConfiguration | undefined, data: Partial<IFreeFormInitiative> = {}): IFreeFormInitiative => {
+  const initiative = newOrgDefinedInitiative(configuration, data) as IFreeFormInitiative;
+  initiative.costDriver = 'Free Form';
+  initiative.improvementType = FinancialImprovementTypes.Cost;
+  initiative.metricType = MetricTypes.Financial;
+
+  const newInitiative = {
+    ...initiative,
+    ...data
+  };
+
+  switch (newInitiative.metricType) {
+    case MetricTypes.Financial:
+      newInitiative.metricTypeValue = 'Financial';
+      break;
+    case MetricTypes.Operational:
+      newInitiative.metricTypeValue = 'Operational';
+      break;
+    case MetricTypes.FinancialPerUnit:
+      newInitiative.metricTypeValue = 'Financial Per Unit';
+      break;
+  }
+  return newInitiative;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/data/IFreeFormInitiativeDto.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/data/IFreeFormInitiativeDto.ts
new file mode 100644
index 0000000..1cc44d7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/data/IFreeFormInitiativeDto.ts
@@ -0,0 +1,23 @@
+import { IOrgDefinedInitiativeDto, cleanUpOrgDefinedInitiativeDto, newOrgDefinedInitiativeDto } from '../../../shared/initiatives/data/IOrgDefinedInitiativeDto';
+import { FinancialImprovementTypes, MetricTypes } from '../../opportunities/data/IFreeFormOpportunity';
+import { IFreeFormInitiative } from './IFreeFormInitiative';
+
+export interface IFreeFormInitiativeDto extends IOrgDefinedInitiativeDto {
+  improvementType: FinancialImprovementTypes;
+  metricType: MetricTypes;
+  metricTypeValue: string;
+  metricNumerator?: string;
+  metricDenominator?: string;
+}
+
+export const newFreeFormInitiativeDto = (data: Partial<IFreeFormInitiativeDto> = {}): IFreeFormInitiativeDto => {
+  const initiative = newOrgDefinedInitiativeDto(data) as IFreeFormInitiativeDto;
+  if (initiative.metricType) {
+    initiative.costDriver = initiative.metricType === MetricTypes.Financial ? 'Financial Free Form' : 'Free Form';
+  }
+  return initiative;
+};
+
+export const cleanUpFreeFormInitiativeDto = (data: Partial<IFreeFormInitiative> = {}): IFreeFormInitiativeDto => {
+  return newFreeFormInitiativeDto({ ...data, ...cleanUpOrgDefinedInitiativeDto({ ...data }) });
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/data/freeFormInitiativeService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/data/freeFormInitiativeService.ts
new file mode 100644
index 0000000..a10aa8f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/initiatives/data/freeFormInitiativeService.ts
@@ -0,0 +1,15 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import { getSecureService } from '@strata/core/lib/http/getSecureService';
+import { IInitiativeDto } from '../../../shared/initiatives/data/IInitiativeDto';
+
+const { httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'initiatives';
+
+export const freeFormInitiativeService = {
+  create: function (initiativeInfo: IInitiativeDto): Promise<string> {
+    return httpPost(`${url}/create-free-form`, initiativeInfo);
+  },
+  update: function (initiativeInfo: IInitiativeDto): Promise<IInitiativeDto> {
+    return httpPost(`${url}/update-free-form`, initiativeInfo);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/Filters.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/Filters.test.tsx
new file mode 100644
index 0000000..e14d022
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/Filters.test.tsx
@@ -0,0 +1,92 @@
+import React from 'react';
+import { render, screen, fireEvent } from '../../test-utils/testUtils';
+import { opportunityService } from './data/opportunityService';
+import Filters from './Filters';
+import { IFreeFormFilterOptions, newFilterOptions } from './data/IFreeFormFilterOptions';
+import { IFreeFormFilters } from './data/IFreeFormFilters';
+import { dropDownTestUtils } from '@strata/test-utils/lib';
+
+const mockFilterOptions: IFreeFormFilterOptions = newFilterOptions({
+  metricTypes: [
+    { text: 'Metric Type 1', id: '1' },
+    { text: 'Metric Type 2', id: '2' }
+  ],
+  financialImprovementTypes: [{ text: 'Financial Improvement 1', id: '1' }]
+});
+
+const mockInitialFilters: IFreeFormFilters = {
+  identifiedSavings: undefined,
+  metricTypes: [],
+  financialImprovementTypes: [],
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+test('Filters default to empty', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const financialImprovementTypesDropdown = dropDownTestUtils.getDropDown('Type');
+  const metricTypesDropdown = dropDownTestUtils.getDropDown('Metric Type');
+
+  // verify default value is set correctly
+  expect(dropDownTestUtils.getSelectedOption(financialImprovementTypesDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(metricTypesDropdown)).toEqual('');
+});
+
+test('Filters clear', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const financialImprovementTypesDropdown = dropDownTestUtils.getDropDown('Type');
+  const metricTypesDropdown = dropDownTestUtils.getDropDown('Metric Type');
+  const identifiedSavingsInput = screen.getByRole('spinbutton', { name: 'Identified Savings Minimum' });
+
+  // verify default value is set correctly
+  await dropDownTestUtils.selectOption(financialImprovementTypesDropdown, mockFilterOptions.financialImprovementTypes[0].text);
+  for (const txt of mockFilterOptions.metricTypes) {
+    await dropDownTestUtils.selectOption(metricTypesDropdown, txt.text);
+  }
+  fireEvent.change(identifiedSavingsInput, { target: { value: 123 } });
+
+  expect(dropDownTestUtils.getSelectedOption(financialImprovementTypesDropdown)).toEqual(mockFilterOptions.financialImprovementTypes[0].text);
+  const label = `All ${mockFilterOptions.metricTypes.length} selected`;
+  expect(dropDownTestUtils.getSelectedOption(metricTypesDropdown)).toEqual(label);
+  expect(identifiedSavingsInput).toHaveValue('123');
+
+  const clearButton = screen.getByRole('button', { name: 'Clear Filters' });
+  fireEvent.click(clearButton);
+
+  expect(dropDownTestUtils.getSelectedOption(financialImprovementTypesDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(metricTypesDropdown)).toEqual('');
+  expect(identifiedSavingsInput).not.toHaveValue();
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/Filters.tsx
new file mode 100644
index 0000000..75e05ec
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/Filters.tsx
@@ -0,0 +1,106 @@
+import React, { useCallback } from 'react';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import Drawer from '@strata/tempo/lib/drawer';
+import DropDown from '@strata/tempo/lib/dropdown';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing';
+import Checkbox from '@strata/tempo/lib/checkbox';
+import { initialFilters, IFreeFormFilters } from './data/IFreeFormFilters';
+import { useEffect, useState } from 'react';
+import { opportunityService } from './data/opportunityService';
+import { IListMember } from '../../shared/data/IListMember';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+
+interface IFiltersProps {
+  filters: IFreeFormFilters;
+  isVisible: boolean;
+  onApply: (filters: IFreeFormFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const [metricTypes, setmetricTypes] = useState<IListMember[]>();
+  const [financialImprovementTypes, setfinancialImprovementTypes] = useState<IListMember[]>();
+
+  const { currentConfiguration } = useConfigurations();
+
+  const [form] = Form.useForm<IFreeFormFilters>();
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      if (currentConfiguration == null) {
+        return;
+      }
+      const { financialImprovementTypes, metricTypes } = await opportunityService.getFilterOptions(currentConfiguration.configurationGuid);
+
+      setmetricTypes(metricTypes);
+      setfinancialImprovementTypes(financialImprovementTypes);
+      handleClearFilters();
+    };
+
+    loadFiltersOptions();
+  }, [currentConfiguration, handleClearFilters]);
+
+  const handleApplyFilters = () => {
+    const filters: IFreeFormFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Identified Savings Minimum' name='identifiedSavings'>
+          <InputNumber format='currency' placeholder='' precision={0} />
+        </Form.Item>
+        <Form.Item label='Type' name='financialImprovementTypes'>
+          <DropDown multiSelect items={financialImprovementTypes} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Metric Type' name='metricTypes'>
+          <DropDown multiSelect items={metricTypes} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Display' name='viewVisible'>
+          <RadioGroup
+            options={[
+              { value: true, label: 'Visible Opportunities' },
+              { value: false, label: 'Hidden Opportunities' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Initiatives' name='excludeInitiatives' valuePropName='checked'>
+          <Checkbox>Exclude Opportunities with Initiatives</Checkbox>
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FinancialFreeFormCalculator.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FinancialFreeFormCalculator.tsx
new file mode 100644
index 0000000..4320ce1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FinancialFreeFormCalculator.tsx
@@ -0,0 +1,96 @@
+import Button from '@strata/tempo/lib/button';
+import Card from '@strata/tempo/lib/card';
+import Form from '@strata/tempo/lib/form';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import Spacing from '@strata/tempo/lib/spacing';
+import Text from '@strata/tempo/lib/text';
+import React, { useState } from 'react';
+
+export interface IFinancialFreeFormCalculatorProps {
+  financialImprovementType: string;
+  applyMonthlySpend: (value: number, isBaseline: boolean) => void;
+  applyPercentChange: (value: number) => void;
+  applyFinancialSavings: () => void;
+}
+
+enum CalculationType {
+  MonthlySpend,
+  PercentChange
+}
+
+interface IFinancialFreeFormCalculatorModel {
+  type: CalculationType;
+  baselineSpend: number;
+  targetSpend: number;
+  percentChange: number;
+}
+
+const FinancialFreeFormCalculator: React.FC<IFinancialFreeFormCalculatorProps> = (props: IFinancialFreeFormCalculatorProps) => {
+  const { financialImprovementType, applyMonthlySpend, applyPercentChange, applyFinancialSavings } = props;
+  const [calculationType, setCalculationType] = useState<CalculationType>(CalculationType.MonthlySpend);
+  const [form] = Form.useForm<IFinancialFreeFormCalculatorModel>();
+
+  const handleFinish = (values: any) => {
+    switch (calculationType) {
+      case CalculationType.MonthlySpend:
+        if (values.baselineSpend !== undefined) {
+          applyMonthlySpend(values.baselineSpend, true);
+        }
+        if (values.targetSpend !== undefined) {
+          applyMonthlySpend(values.targetSpend, false);
+        }
+        break;
+      case CalculationType.PercentChange:
+        if (values.percentChange !== undefined) {
+          applyPercentChange(values.percentChange);
+        }
+        break;
+    }
+    applyFinancialSavings();
+    form.resetFields();
+  };
+
+  return (
+    <>
+      <Card title='Opportunity Calculator'>
+        <Spacing column itemSpacing={8} padding='0 0 16px 0' width='100%'>
+          <Text size='normal' strong>
+            Calculated By
+          </Text>
+          <RadioGroup
+            defaultValue={CalculationType.MonthlySpend}
+            onChange={(event) => setCalculationType(event.target.value)}
+            options={[
+              { value: CalculationType.MonthlySpend, label: `Monthly Baseline and Target ${financialImprovementType}` },
+              { value: CalculationType.PercentChange, label: 'Percent Change' }
+            ]}
+          />
+        </Spacing>
+        <Form form={form} onFinish={handleFinish}>
+          {calculationType === CalculationType.MonthlySpend ? (
+            <>
+              <Form.Item label={`Monthly Baseline ${financialImprovementType} (All Months)`} name='baselineSpend'>
+                <InputNumber format='currency' />
+              </Form.Item>
+              <Form.Item label={`Monthly Target ${financialImprovementType} (All Months)`} name='targetSpend'>
+                <InputNumber format='currency' />
+              </Form.Item>
+            </>
+          ) : (
+            <>
+              <Form.Item label='Percent Change (All Months)' name='percentChange'>
+                <InputNumber format='percent' />
+              </Form.Item>
+            </>
+          )}
+          <Form.Item>
+            <Button onClick={() => form.submit()}>Calculate</Button>
+          </Form.Item>
+        </Form>
+      </Card>
+    </>
+  );
+};
+
+export default FinancialFreeFormCalculator;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FinancialFreeFormGrid.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FinancialFreeFormGrid.tsx
new file mode 100644
index 0000000..268bada
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FinancialFreeFormGrid.tsx
@@ -0,0 +1,108 @@
+import { DataGrid, ICellEditorArgs, IDataGridTotalCellMetaData, ITotalRowCalculation } from '@strata/tempo/lib';
+import debounce from 'lodash/debounce';
+import React, { useState, useEffect, useMemo } from 'react';
+import { FinancialImprovementTypes } from './data/IFreeFormOpportunity';
+import { IFreeFormOpportunityDetailRowData } from './data/IFreeFormOpportunityDetailModel';
+
+export interface IFinancialFreeFormGridProps {
+  data?: IFreeFormOpportunityDetailRowData[];
+  numerator: string;
+  denominator: string;
+  baselineStartDate?: Date;
+  financialImprovementType: FinancialImprovementTypes;
+  isLocked: boolean;
+  onCellValueChange: (data?: IFreeFormOpportunityDetailRowData, index?: number) => void;
+}
+
+const FinancialFreeFormGrid: React.FC<IFinancialFreeFormGridProps> = (props: IFinancialFreeFormGridProps) => {
+  const { data, numerator, denominator, financialImprovementType, isLocked, onCellValueChange } = props;
+  const [baselineTotal, setBaselineTotal] = useState<number>(0);
+  const [targetTotal, setTargetTotal] = useState<number>(0);
+  const [editedCellArgs, setEditedCellArgs] = useState<ICellEditorArgs>();
+
+  const calculateSavings = (baseline: number | string, target: number | string) => {
+    if (typeof baseline === 'string' || typeof target === 'string' || isNaN(baseline) || isNaN(target)) {
+      return 0;
+    }
+    switch (financialImprovementType.toString()) {
+      case FinancialImprovementTypes[FinancialImprovementTypes.Cost]:
+        return baseline - target;
+      case FinancialImprovementTypes[FinancialImprovementTypes.Revenue]:
+        return target - baseline;
+      default:
+        return 0;
+    }
+  };
+
+  const buildTotalRowCalculations = (): ITotalRowCalculation[] => {
+    return [
+      { field: 'upper', calculationType: 'sum' },
+      { field: 'lower', calculationType: 'sum' },
+      {
+        field: 'savings',
+        calculationType: 'custom',
+        customCalculation: (fieldValues: any[], allData: any[]) => customCalculation(allData, calculateSavings)
+      }
+    ];
+  };
+
+  const customCalculation = (allData: any[], func: (baseline: number, target: number) => number) => {
+    let baseline = 0;
+    let target = 0;
+
+    allData.forEach((row) => {
+      baseline += typeof row.upper === 'string' || isNaN(row.upper) ? 0 : row.upper;
+      target += typeof row.lower === 'string' || isNaN(row.lower) ? 0 : row.lower;
+    });
+
+    setBaselineTotal(baseline);
+    setTargetTotal(target);
+    return func(baseline, target);
+  };
+
+  const buildTotalRowCellsMetaData = (): IDataGridTotalCellMetaData[] => {
+    return [
+      { field: 'upper', textColor: baselineTotal >= 0 ? 'success' : 'error' },
+      { field: 'lower', textColor: targetTotal >= 0 ? 'success' : 'error' },
+      { field: 'savings', textColor: calculateSavings(baselineTotal, targetTotal) >= 0 ? 'success' : 'error' }
+    ];
+  };
+
+  const onCellEditWithDebounce = useMemo(
+    () =>
+      debounce((args: ICellEditorArgs) => {
+        setEditedCellArgs(args);
+      }, 2000),
+    []
+  );
+  useEffect(() => {
+    if (editedCellArgs) {
+      onCellValueChange(editedCellArgs.row, editedCellArgs.rowIndex);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editedCellArgs]);
+  useEffect(() => {
+    return () => {
+      onCellEditWithDebounce.cancel();
+    };
+  }, [onCellEditWithDebounce]);
+
+  return (
+    <>
+      <DataGrid dataKey='id' rows={12} value={data} onCellEdit={onCellEditWithDebounce} totalRowCalculations={buildTotalRowCalculations()} totalRowCellsMetaData={buildTotalRowCellsMetaData()}>
+        <DataGrid.Column field='month' header='' width={60} />
+        <DataGrid.NumberColumn format='currency' formatOptions={{ nullValue: '0' }} field='upper' header={numerator} validationRules={[{ type: 'number' }]} editable={!isLocked} width={60} />
+        <DataGrid.NumberColumn format='currency' formatOptions={{ nullValue: '0' }} field='lower' header={denominator} validationRules={[{ type: 'number' }]} editable={!isLocked} width={60} />
+        <DataGrid.NumberColumn
+          format='currency'
+          field='savings'
+          header={financialImprovementType.toString() === FinancialImprovementTypes[FinancialImprovementTypes.Revenue] ? 'Goal Increase' : 'Goal Savings'}
+          customCellValue={(args) => calculateSavings(args.row.upper, args.row.lower)}
+          width={60}
+        />
+      </DataGrid>
+    </>
+  );
+};
+
+export default FinancialFreeFormGrid;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormCalculator.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormCalculator.tsx
new file mode 100644
index 0000000..2c4c061
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormCalculator.tsx
@@ -0,0 +1,140 @@
+import intlService from '@strata/intl/lib';
+import Button from '@strata/tempo/lib/button';
+import Card from '@strata/tempo/lib/card';
+import Form from '@strata/tempo/lib/form';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import Spacing from '@strata/tempo/lib/spacing';
+import Text from '@strata/tempo/lib/text';
+import React, { useState, useEffect } from 'react';
+import { IFreeFormCalculatorModel, newFreeFormCalculatorModel } from './data/IFreeFormCalculatorModel';
+import { FinancialImprovementTypes, MetricTypes } from './data/IFreeFormOpportunity';
+import { IFreeFormOpportunityDetailModel } from './data/IFreeFormOpportunityDetailModel';
+
+export interface IFreeFormCalculatorProps {
+  opportunityDetailData?: IFreeFormOpportunityDetailModel;
+  baselineRate: number;
+  applySavingsPerUnit: (value: number) => void;
+  applyGoalRate: (value: number) => void;
+  applyPercentChange: (value: number) => void;
+  applySavingsAndGoals: (goalRate: number, percentChange: number, savingsPerUnit: number) => void;
+}
+
+enum CalculationType {
+  MonthlySpendOrGoal,
+  PercentChange
+}
+
+const FreeFormCalculator: React.FC<IFreeFormCalculatorProps> = (props: IFreeFormCalculatorProps) => {
+  const { opportunityDetailData, baselineRate, applySavingsPerUnit, applyGoalRate, applyPercentChange, applySavingsAndGoals } = props;
+  const [financialImprovementType, setFinancialImprovementType] = useState<FinancialImprovementTypes>(FinancialImprovementTypes.Cost);
+  const [metricType, setMetricType] = useState<MetricTypes>(MetricTypes.Operational);
+  const [calculationType, setCalculationType] = useState<CalculationType>(CalculationType.MonthlySpendOrGoal);
+  const [modelData, setModelData] = useState<IFreeFormCalculatorModel>(newFreeFormCalculatorModel());
+  const [form] = Form.useForm<IFreeFormCalculatorModel>();
+
+  useEffect(() => {
+    if (opportunityDetailData === undefined) {
+      return;
+    }
+    setFinancialImprovementType(opportunityDetailData.financialImprovementType);
+    setMetricType(opportunityDetailData.metricType);
+  }, [opportunityDetailData]);
+
+  const improvementLabel = () => {
+    if (financialImprovementType.toString() === FinancialImprovementTypes[FinancialImprovementTypes.Cost]) {
+      if (metricType.toString() === MetricTypes[MetricTypes.FinancialPerUnit]) {
+        return 'Goal Spend per Unit';
+      }
+      return 'Savings per Unit';
+    } else {
+      if (metricType.toString() === MetricTypes[MetricTypes.FinancialPerUnit]) {
+        return 'Goal Revenue per Unit';
+      }
+      return 'Revenue Increase per Unit';
+    }
+  };
+
+  const handleFinish = (values: any) => {
+    if (values.savingsPerUnit) {
+      if (values.goalRate || values.percentChange) {
+        applySavingsAndGoals(values.goalRate, values.percentChange, values.savingsPerUnit);
+      } else {
+        applySavingsPerUnit(values.savingsPerUnit);
+      }
+    } else if (values.goalRate) {
+      applyGoalRate(values.goalRate);
+    } else if (values.percentChange) {
+      applyPercentChange(values.percentChange);
+    }
+
+    setModelData(newFreeFormCalculatorModel());
+    form.resetFields();
+  };
+
+  return (
+    <>
+      <Card title='Opportunity Calculator'>
+        <Spacing column itemSpacing={8} padding='0 0 16px 0' width='100%'>
+          <Text size='normal' strong>
+            Calculated By
+          </Text>
+          <RadioGroup
+            defaultValue={CalculationType.MonthlySpendOrGoal}
+            onChange={(event) => setCalculationType(event.target.value)}
+            options={[
+              { value: CalculationType.MonthlySpendOrGoal, label: 'Goal Rate' },
+              { value: CalculationType.PercentChange, label: 'Percent Change' }
+            ]}
+          />
+          {metricType.toString() === MetricTypes[MetricTypes.Operational] ? (
+            <>
+              <Text size='normal' strong>
+                Baseline Rate
+              </Text>
+              <Text size='normal'>{intlService.formatNumber(baselineRate, 'decimal')}</Text>
+            </>
+          ) : (
+            <>
+              {financialImprovementType === FinancialImprovementTypes.Cost ? (
+                <Text size='normal' strong>
+                  Baseline Spend per Unit
+                </Text>
+              ) : (
+                <Text size='normal' strong>
+                  Baseline Revenue per Unit
+                </Text>
+              )}
+              <Text size='normal'>{intlService.formatNumber(baselineRate, 'currencyDecimal')}</Text>
+            </>
+          )}
+        </Spacing>
+        <Form form={form} onFinish={handleFinish} initialValues={modelData}>
+          {calculationType === CalculationType.MonthlySpendOrGoal ? (
+            <Form.Item label='Goal Rate' name='goalRate'>
+              <InputNumber format='number' />
+            </Form.Item>
+          ) : (
+            <>
+              <Form.Item label='Percent Change (All Months)' name='percentChange'>
+                <InputNumber format='percent' />
+              </Form.Item>
+            </>
+          )}
+          {metricType.toString() === MetricTypes[MetricTypes.Operational] ? (
+            <Form.Item label={improvementLabel()} name='savingsPerUnit'>
+              <InputNumber format='currency' />
+            </Form.Item>
+          ) : (
+            <></>
+          )}
+          <Form.Item>
+            <Button onClick={() => form.submit()}>Calculate</Button>
+          </Form.Item>
+        </Form>
+      </Card>
+    </>
+  );
+};
+
+export default FreeFormCalculator;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormDetailCard.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormDetailCard.tsx
new file mode 100644
index 0000000..8a1e2fd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormDetailCard.tsx
@@ -0,0 +1,36 @@
+import intlService from '@strata/intl/lib';
+import Card from '@strata/tempo/lib/card';
+import Spacing from '@strata/tempo/lib/spacing';
+import Text from '@strata/tempo/lib/text';
+import React from 'react';
+
+export interface IFreeFormDetailCardProps {
+  baselineStartDate?: Date;
+  baselineEndDate?: Date;
+}
+
+const FreeFormDetailCard: React.FC<IFreeFormDetailCardProps> = (props: IFreeFormDetailCardProps) => {
+  const { baselineStartDate, baselineEndDate } = props;
+
+  const getFormattedDate = (): string => {
+    if (!baselineStartDate || !baselineEndDate) {
+      return '';
+    }
+    return `${intlService.formatDate(baselineStartDate, 'date')}\xa0to\xa0${intlService.formatDate(baselineEndDate, 'date')}`;
+  };
+
+  return (
+    <>
+      <Card title='Opportunity Details'>
+        <Spacing column itemSpacing={16} width={250}>
+          <Text size='normal' strong>
+            Baseline Period
+          </Text>
+          <Text>{getFormattedDate()}</Text>
+        </Spacing>
+      </Card>
+    </>
+  );
+};
+
+export default FreeFormDetailCard;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormGrid.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormGrid.tsx
new file mode 100644
index 0000000..72b2d06
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormGrid.tsx
@@ -0,0 +1,164 @@
+import { NumberFormat } from '@strata/intl/lib';
+import { DataGrid, ICellEditorArgs, IDataGridTotalCellMetaData, ITotalRowCalculation } from '@strata/tempo/lib';
+import debounce from 'lodash/debounce';
+import React, { useEffect, useState, useMemo } from 'react';
+import { FinancialImprovementTypes, MetricTypes } from './data/IFreeFormOpportunity';
+import { IFreeFormOpportunityDetailModel, IFreeFormOpportunityDetailRowData } from './data/IFreeFormOpportunityDetailModel';
+
+export interface IFreeFormGridProps {
+  opportunityDetailData?: IFreeFormOpportunityDetailModel;
+  isLocked: boolean;
+  onCellValueChange: (data?: IFreeFormOpportunityDetailRowData, index?: number) => void;
+  calculateReduction: (upper: number, lower: number, goalRate: number) => number;
+}
+
+const FreeFormGrid: React.FC<IFreeFormGridProps> = (props: IFreeFormGridProps) => {
+  const { opportunityDetailData: opportunityDetail, isLocked, onCellValueChange, calculateReduction } = props;
+  const [numerator, setNumerator] = useState<string>('Baseline');
+  const [denominator, setDenominator] = useState<string>('Target');
+  const [data, setData] = useState<IFreeFormOpportunityDetailRowData[]>([]);
+  const [metricType, setMetricType] = useState<MetricTypes>(MetricTypes.Operational);
+  const [savingsPerUnit, setSavingsPerUnit] = useState<number>(0);
+  const [goalRate, setGoalRate] = useState<number>(0);
+  const [baselineTotal, setBaselineTotal] = useState<number>(0);
+  const [targetTotal, setTargetTotal] = useState<number>(0);
+  const [editedCellArgs, setEditedCellArgs] = useState<ICellEditorArgs>();
+  const perMonthHeader: string = opportunityDetail?.financialImprovementType.toString() === FinancialImprovementTypes[FinancialImprovementTypes.Revenue] ? 'Increase per Month' : 'Reduction per Month';
+  const goalHeader: string = opportunityDetail?.financialImprovementType.toString() === FinancialImprovementTypes[FinancialImprovementTypes.Revenue] ? 'Goal Increase' : 'Goal Savings';
+  const editableCellFormat: NumberFormat =
+    opportunityDetail?.financialImprovementType.toString() === FinancialImprovementTypes[FinancialImprovementTypes.Revenue]
+      ? 'number'
+      : metricType.toString() === MetricTypes[MetricTypes.Financial]
+      ? 'number'
+      : 'decimal';
+  const gridCellFormat = metricType === MetricTypes.FinancialPerUnit ? 'currencyDecimal' : 'decimal';
+
+  useEffect(() => {
+    if (opportunityDetail === undefined) {
+      return;
+    }
+    setNumerator(opportunityDetail.numerator);
+    setDenominator(opportunityDetail.denominator);
+    setData(opportunityDetail.rowData);
+    if (opportunityDetail.metricType.toString() === MetricTypes[MetricTypes.Financial]) {
+      setMetricType(MetricTypes.Financial);
+    } else if (opportunityDetail.metricType.toString() === MetricTypes[MetricTypes.FinancialPerUnit]) {
+      setMetricType(MetricTypes.FinancialPerUnit);
+    }
+    setSavingsPerUnit(opportunityDetail.savingsPerUnit);
+    setGoalRate(opportunityDetail?.goalRate ?? 0);
+  }, [opportunityDetail]);
+
+  const calculateSavings = (row: IFreeFormOpportunityDetailRowData) => {
+    const reductionPerMonth = reductionCalculation(row.upper, row.lower);
+    return reductionPerMonth * savingsPerUnit;
+  };
+
+  const calculateRedultionWithValidations = (upper: number | string, lower: number | string) => {
+    return typeof upper === 'string' || typeof lower === 'string' ? 0 : calculateReduction(upper, lower, goalRate);
+  };
+
+  const reductionCalculation = (upper: number | string, lower: number | string) => {
+    return calculateRedultionWithValidations(upper, lower);
+  };
+
+  const monthlyReductionCalculation = (upper: number | string, lower: number | string) => {
+    return calculateRedultionWithValidations(upper, lower) / 12;
+  };
+
+  const calculateSavingsValue = (upper: number | string, lower: number | string) => {
+    return calculateRedultionWithValidations(upper, lower) * savingsPerUnit;
+  };
+
+  const getRate = (upper: number | string, lower: number | string) => {
+    return typeof upper === 'string' || typeof lower === 'string' || lower === 0 ? 0 : upper / lower;
+  };
+
+  const buildTotalRowCalculations = (): ITotalRowCalculation[] => {
+    return [
+      { field: 'upper', calculationType: 'sum' },
+      { field: 'lower', calculationType: 'sum' },
+      {
+        field: 'baselineRate',
+        calculationType: 'custom',
+        customCalculation: (fieldValues: any[], allData: any[]) => customCalculation(allData, getRate)
+      },
+      {
+        field: 'monthlyChange',
+        calculationType: 'custom',
+        customCalculation: (fieldValues: any[], allData: any[]) => customCalculation(allData, monthlyReductionCalculation)
+      },
+      {
+        field: 'monthlySavings',
+        calculationType: 'custom',
+        customCalculation: (fieldValues: any[], allData: any[]) => customCalculation(allData, calculateSavingsValue)
+      }
+    ];
+  };
+
+  const customCalculation = (allData: any[], func: (baseline: number, target: number) => number) => {
+    let baseline = 0;
+    let target = 0;
+
+    allData.forEach((row) => {
+      baseline += typeof row.upper === 'string' || isNaN(row.upper) ? 0 : row.upper;
+      target += typeof row.lower === 'string' || isNaN(row.lower) ? 0 : row.lower;
+    });
+
+    setBaselineTotal(baseline);
+    setTargetTotal(target);
+    return func(baseline, target);
+  };
+
+  const buildTotalRowCellsMetaData = (): IDataGridTotalCellMetaData[] => {
+    return [
+      { field: 'upper', textColor: baselineTotal >= 0 ? 'success' : 'error' },
+      { field: 'lower', textColor: targetTotal >= 0 ? 'success' : 'error' },
+      { field: 'baselineRate', textColor: getRate(baselineTotal, targetTotal) >= 0 ? 'success' : 'error' },
+      { field: 'monthlyChange', textColor: calculateReduction(baselineTotal, targetTotal, goalRate) >= 0 ? 'success' : 'error' },
+      { field: 'monthlySavings', textColor: calculateSavingsValue(baselineTotal, targetTotal) >= 0 ? 'success' : 'error' }
+    ];
+  };
+
+  const onCellEditWithDebounce = useMemo(
+    () =>
+      debounce((args: ICellEditorArgs) => {
+        setEditedCellArgs(args);
+      }, 2000),
+    []
+  );
+  useEffect(() => {
+    if (editedCellArgs) {
+      onCellValueChange(editedCellArgs.row, editedCellArgs.rowIndex);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editedCellArgs]);
+  useEffect(() => {
+    return () => {
+      onCellEditWithDebounce.cancel();
+    };
+  }, [onCellEditWithDebounce]);
+
+  return (
+    <>
+      <DataGrid dataKey='id' rows={12} value={data} onCellEdit={onCellEditWithDebounce} totalRowCalculations={buildTotalRowCalculations()} totalRowCellsMetaData={buildTotalRowCellsMetaData()}>
+        <DataGrid.Column field='month' header='' width={60} />
+        <DataGrid.NumberColumn format={editableCellFormat} formatOptions={{ nullValue: '0' }} field='upper' header={numerator} validationRules={[{ type: 'number' }]} editable={!isLocked} width={60} />
+        <DataGrid.NumberColumn
+          format={editableCellFormat}
+          formatOptions={{ nullValue: '0' }}
+          field='lower'
+          header={denominator}
+          validationRules={[{ type: 'number' }]}
+          editable={!isLocked}
+          width={60}
+        />
+        <DataGrid.NumberColumn format={gridCellFormat} field='baselineRate' header='Baseline Rate' width={60} hidden={isLocked} customCellValue={(args) => getRate(args.row.upper, args.row.lower)} />
+        <DataGrid.NumberColumn format={gridCellFormat} field='monthlyChange' header={perMonthHeader} width={60} customCellValue={(args) => reductionCalculation(args.row.upper, args.row.lower)} />
+        <DataGrid.NumberColumn format={'currencyDecimal'} field='monthlySavings' header={goalHeader} width={60} customCellValue={(args) => calculateSavings(args.row)} />
+      </DataGrid>
+    </>
+  );
+};
+
+export default FreeFormGrid;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormMetricGroup.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormMetricGroup.tsx
new file mode 100644
index 0000000..b305d05
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormMetricGroup.tsx
@@ -0,0 +1,173 @@
+import MetricGroup, { IMetricItem } from '@strata/tempo/lib/metricgroup';
+import React from 'react';
+import { FinancialImprovementTypes, MetricTypes } from './data/IFreeFormOpportunity';
+
+export interface IFreeFormMetricGroupProps {
+  financialImprovementType: FinancialImprovementTypes;
+  metricType: MetricTypes;
+  savings: number;
+  savingsPerUnit: number;
+  baselineRate: number;
+  goalRate: number;
+}
+
+const FreeFormMetricGroup: React.FC<IFreeFormMetricGroupProps> = (props: IFreeFormMetricGroupProps) => {
+  const { financialImprovementType, metricType, savings, savingsPerUnit, baselineRate, goalRate } = props;
+  const improvementLabel = financialImprovementType.toString() === FinancialImprovementTypes[FinancialImprovementTypes.Cost] ? 'Savings' : 'Revenue Increase';
+
+  const metricItemValues = (): IMetricItem[] => {
+    let rateMetricGroup: IMetricItem = {
+      key: 'rate'
+    };
+
+    switch (metricType.toString()) {
+      case MetricTypes[MetricTypes.Operational]:
+        rateMetricGroup = {
+          key: 'rate',
+          label: 'Rate',
+          values: [
+            {
+              key: 'savingsPerUnit',
+              label: `${improvementLabel} Per Unit`,
+              value: savingsPerUnit,
+              format: 'currencyDecimal',
+              formatOptions: {
+                nullValue: '-'
+              }
+            },
+            {
+              key: 'baseline',
+              label: 'Baseline Rate',
+              value: baselineRate,
+              format: 'decimal',
+              formatOptions: {
+                nullValue: '-'
+              }
+            },
+            {
+              key: 'goal',
+              label: '12-Month Goal Rate',
+              value: goalRate,
+              format: 'decimal',
+              formatOptions: {
+                nullValue: '-'
+              }
+            }
+          ]
+        };
+        break;
+      case MetricTypes[MetricTypes.FinancialPerUnit]:
+        rateMetricGroup = {
+          key: 'rate',
+          label: 'Rate',
+          values: [
+            {
+              key: 'baseline',
+              label: 'Baseline Rate',
+              value: baselineRate,
+              format: 'currencyDecimal',
+              formatOptions: {
+                nullValue: '-'
+              }
+            },
+            {
+              key: 'goal',
+              label: '12-Month Goal Rate',
+              value: goalRate,
+              format: 'currencyDecimal',
+              formatOptions: {
+                nullValue: '-'
+              }
+            }
+          ]
+        };
+        break;
+      case MetricTypes[MetricTypes.Financial]:
+        rateMetricGroup = {
+          key: 'rate',
+          label: 'Rate',
+          values: [
+            {
+              key: 'baseline',
+              label: 'Baseline Monthly Amount',
+              value: baselineRate,
+              format: 'currencyDecimal',
+              formatOptions: {
+                nullValue: '-'
+              }
+            },
+            {
+              key: 'goal',
+              label: '12-Month Goal Amount',
+              value: goalRate,
+              format: 'currencyDecimal',
+              formatOptions: {
+                nullValue: '-'
+              }
+            }
+          ]
+        };
+        break;
+      default:
+        rateMetricGroup = {
+          key: 'rate',
+          label: 'Rate',
+          values: [
+            {
+              key: 'savingsPerUnit',
+              label: `${improvementLabel} Per Unit`,
+              value: savingsPerUnit,
+              format: 'currencyDecimal',
+              formatOptions: {
+                nullValue: '-'
+              }
+            },
+            {
+              key: 'baseline',
+              label: 'Baseline Amount',
+              value: baselineRate,
+              format: 'currencyDecimal',
+              formatOptions: {
+                nullValue: '-'
+              }
+            },
+            {
+              key: 'goal',
+              label: '12-Month Goal Amount',
+              value: goalRate,
+              format: 'currencyDecimal',
+              formatOptions: {
+                nullValue: '-'
+              }
+            }
+          ]
+        };
+        break;
+    }
+
+    const metricGroupItems: IMetricItem[] = [
+      {
+        key: 'savings',
+        label: `${improvementLabel}`,
+        values: [
+          {
+            key: 'savings-potential',
+            label: `${improvementLabel} Potential`,
+            value: savings,
+            format: 'currencyDecimal',
+            formatOptions: {
+              nullValue: '-'
+            }
+          }
+        ]
+      },
+      rateMetricGroup
+    ];
+
+    return metricGroupItems;
+  };
+
+  return <MetricGroup key='freeFormMetrics' items={metricItemValues()} />;
+};
+
+export default FreeFormMetricGroup;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormOpportunityDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormOpportunityDetail.tsx
new file mode 100644
index 0000000..0e8d9a6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/FreeFormOpportunityDetail.tsx
@@ -0,0 +1,541 @@
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import Button from '@strata/tempo/lib/button';
+import Card from '@strata/tempo/lib/card';
+import Divider from '@strata/tempo/lib/divider';
+import LayoutGrid from '@strata/tempo/lib/layoutgrid';
+import { usePageLoader } from '@strata/tempo/lib/pageloader/usePageLoader';
+import useToast from '@strata/tempo/lib/toast/useToast';
+import React, { useEffect, useState } from 'react';
+import { useHistory, useParams } from 'react-router';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import InitiativeCreateModal from '../../shared/initiatives/InitiativeCreateModal';
+import { IInitiative, getGuid, getInitiative, newInitiative } from '../../shared/initiatives/data/IInitiative';
+import { initiativeService } from '../../shared/initiatives/data/initiativeService';
+import OpportunityDetailHeader from '../../shared/opportunities/OpportunityDetailHeader';
+import { securityService } from '../../shared/security/data/securityService';
+import { newFreeFormInitiative } from '../initiatives/data/IFreeFormInitiative';
+import { cleanUpFreeFormInitiativeDto } from '../initiatives/data/IFreeFormInitiativeDto';
+import { freeFormInitiativeService } from '../initiatives/data/freeFormInitiativeService';
+import FinancialFreeFormCalculator from './FinancialFreeFormCalculator';
+import FinancialFreeFormGrid from './FinancialFreeFormGrid';
+import FreeFormCalculator from './FreeFormCalculator';
+import FreeFormDetailCard from './FreeFormDetailCard';
+import FreeFormGrid from './FreeFormGrid';
+import FreeFormMetricGroup from './FreeFormMetricGroup';
+import { FinancialImprovementTypes, MetricTypes } from './data/IFreeFormOpportunity';
+import { IFreeFormOpportunityDetailModel, IFreeFormOpportunityDetailRowData } from './data/IFreeFormOpportunityDetailModel';
+import { opportunityService } from './data/opportunityService';
+
+const FreeFormOpportunityDetail: React.FC = () => {
+  const { opportunityGuid } = useParams<{ opportunityGuid: string }>();
+  const [opportunityId, setOpportunityId] = useState<number>(0);
+  const [initiativeData, setInitiativeData] = useState<IInitiative>(newInitiative);
+  const [hasInitiative, setHasInitiative] = useState<boolean>(false);
+  const [opportunityDetailData, setOpportunityDetailData] = useState<IFreeFormOpportunityDetailModel>();
+  const [baselineRate, setBaselineRate] = useState<number>(0);
+  const [goalSavings, setGoalSavings] = useState<number>(0);
+  const [isFinancial, setIsFinancial] = useState<boolean>(true);
+  const [isRevenue, setIsRevenue] = useState<boolean>(true);
+  const [isReadable, setIsReadable] = useState(true);
+  const [isEditable, setIsEditable] = useState(false);
+  const [isFinalized, setIsFinalized] = useState(false);
+  const [isLocked, setIsLocked] = useState(true);
+  const [isSecurityEditable, setIsSecurityEditable] = useState(false);
+  const [initiativeModalVisible, setInitiativeModalVisible] = useState(false);
+  const [startMonth, setStartMonth] = useState<string>('');
+  const [endMonth, setEndMonth] = useState<string>('');
+  const jazzUrl = useJazzUrlWithVersion();
+
+  const { setLoading } = usePageLoader();
+  const toast = useToast();
+  const history = useHistory();
+  const { currentConfiguration } = useConfigurations();
+
+  useEffect(() => {
+    // prevent users w/o read access page access
+    if (!isReadable) {
+      history.push('/');
+    }
+  }, [isReadable]);
+
+  useEffect(() => {
+    const setUserPermissions = async () => {
+      setIsReadable(await securityService.getGeneralAccessPermissions());
+      const userPermissions = await securityService.getUserPermissions(opportunityGuid);
+      setIsSecurityEditable(userPermissions.canSecure);
+      setIsEditable(userPermissions.canWrite);
+    };
+
+    const fetchData = async () => {
+      setLoading(true);
+      const opportunityDetail = await opportunityService.getById(opportunityGuid);
+      document.title = opportunityDetail.name;
+      setOpportunityDetailData(opportunityDetail);
+      setGoalSavings(opportunityDetail.savings);
+      setOpportunityId(opportunityDetail.opportunityId);
+      setIsFinancial(opportunityDetail.metricType.toString() === MetricTypes[MetricTypes.Financial]);
+      setIsRevenue(opportunityDetail.financialImprovementType.toString() === FinancialImprovementTypes[FinancialImprovementTypes.Revenue]);
+      const baselineRate = calculateBaselineRate(opportunityDetail.rowData);
+      setBaselineRate(baselineRate);
+      if (opportunityService.getInitiativeInfo) {
+        const info = await opportunityService.getInitiativeInfo(opportunityGuid);
+        setInitiativeData(info);
+        setHasInitiative((info && info.initiativeGuid !== undefined && info.initiativeGuid !== '00000000-0000-0000-0000-000000000000') ?? false);
+        setIsFinalized((info && info.isFinalized) ?? false);
+        setStartMonth(info.startMonth ?? currentConfiguration?.orgDefinedTrackingStartDate);
+        setEndMonth(info.endMonth ?? currentConfiguration?.orgDefinedTrackingEndDate);
+        setIsLocked(info.isLocked);
+      } else {
+        setIsLocked(false);
+      }
+      setLoading(false);
+    };
+
+    setUserPermissions();
+    fetchData();
+  }, [opportunityGuid]);
+
+  const getRowDataAverage = (rowData: IFreeFormOpportunityDetailRowData[], isBaseline: boolean) => {
+    if (!rowData) {
+      return 0;
+    }
+
+    const cleanRowData = getCleanRowData(rowData);
+    const total = isBaseline ? cleanRowData.reduce((sum, row) => sum + row.upper, 0) : cleanRowData.reduce((sum, row) => sum + row.lower, 0);
+    return total / 12;
+  };
+
+  const calculateSavings = (rowData: IFreeFormOpportunityDetailRowData[], goalRate: number, savingsPerUnit: number) => {
+    if (!opportunityDetailData) {
+      return 0;
+    }
+    const cleanRowData = getCleanRowData(rowData);
+    if (isFinancial) {
+      if (isRevenue) {
+        return cleanRowData.reduce((sum, row) => sum + (row.lower - row.upper), 0);
+      }
+      return cleanRowData.reduce((sum, row) => sum + (row.upper - row.lower), 0);
+    }
+    return cleanRowData.reduce((sum, row) => sum + calculatePerUnitSavings(row, goalRate, savingsPerUnit), 0);
+  };
+
+  const calculateReductionPerMonthValue = (upper: number, lower: number, goalRate: number) => {
+    if (!opportunityDetailData) {
+      return 0;
+    }
+    const baselineRateValue = lower === 0 ? 0 : upper / lower;
+    return isRevenue ? (goalRate - baselineRateValue) * lower : (baselineRateValue - goalRate) * lower;
+  };
+
+  const calculatePerUnitSavings = (row: IFreeFormOpportunityDetailRowData, goalRate: number, savingsPerUnit: number) => {
+    if (!opportunityDetailData) {
+      return 0;
+    }
+    const reductionPerMonth = calculateReductionPerMonthValue(row.upper, row.lower, goalRate);
+    return reductionPerMonth * savingsPerUnit;
+  };
+
+  const calculateBaselineRate = (rowData: IFreeFormOpportunityDetailRowData[]) => {
+    const upperTotal = rowData.reduce((sum, row) => sum + row.upper, 0);
+    const lowerTotal = rowData.reduce((sum, row) => sum + row.lower, 0);
+    return calculateRate(upperTotal, lowerTotal);
+  };
+
+  const calculateRate = (upper: number, lower: number) => {
+    return lower === 0 ? 0 : upper / lower;
+  };
+
+  const updateBaselineRate = () => {
+    if (!opportunityDetailData) {
+      return;
+    }
+    if (!isFinancial) {
+      const baselineRate = calculateBaselineRate(opportunityDetailData.rowData);
+      setBaselineRate(baselineRate);
+    }
+  };
+
+  const getCleanRowData = (rowData: IFreeFormOpportunityDetailRowData[]): IFreeFormOpportunityDetailRowData[] => {
+    if (!opportunityDetailData) {
+      return rowData;
+    }
+    const cleanRowData = rowData.flatMap((row) => {
+      row.upper = typeof row.upper === 'string' || isNaN(row.upper) ? 0 : row.upper;
+      row.lower = typeof row.lower === 'string' || isNaN(row.lower) ? 0 : row.lower;
+      return row;
+    });
+    return cleanRowData;
+  };
+
+  const setRowData = async (data?: IFreeFormOpportunityDetailRowData, index?: number) => {
+    if (!opportunityDetailData) {
+      return;
+    }
+
+    const cleanRowData = getCleanRowData(opportunityDetailData.rowData);
+
+    const savings = calculateSavings(cleanRowData, opportunityDetailData.goalRate, opportunityDetailData.savingsPerUnit);
+    const updatedOpportunityDetail = { ...opportunityDetailData, ...{ rowData: cleanRowData, savings } };
+
+    await opportunityService.setGoals(updatedOpportunityDetail, opportunityDetailData.rowData);
+
+    setOpportunityDetailData(updatedOpportunityDetail);
+    setGoalSavings(savings);
+    updateBaselineRate();
+  };
+
+  const applyFinancialMonthlySpend = async (value: number, isBaseline: boolean) => {
+    if (!opportunityDetailData) {
+      return;
+    }
+
+    const rowData = getCleanRowData(opportunityDetailData.rowData);
+    if (isBaseline) {
+      rowData.forEach((row) => {
+        row.upper = value;
+      });
+    } else {
+      rowData.forEach((row) => {
+        row.lower = value;
+      });
+    }
+    await setMonthValues(rowData);
+  };
+
+  const setSavingsPerUnit = async (value: number) => {
+    if (!opportunityDetailData) {
+      return;
+    }
+
+    const cleanRowData = getCleanRowData(opportunityDetailData.rowData);
+    const savings = calculateSavings(cleanRowData, opportunityDetailData.goalRate, value);
+    const updatedOpportunityDetail = { ...opportunityDetailData, ...{ rowData: cleanRowData, savingsPerUnit: value, savings } };
+    await opportunityService.setGoals(updatedOpportunityDetail, opportunityDetailData.rowData);
+    setOpportunityDetailData(updatedOpportunityDetail);
+    setGoalSavings(savings);
+  };
+
+  const setMonthValues = async (rowData: IFreeFormOpportunityDetailRowData[]) => {
+    if (!opportunityDetailData) {
+      return;
+    }
+
+    const cleanRowData = getCleanRowData(rowData);
+    const updatedOpportunityDetail = { ...opportunityDetailData, ...{ rowData: cleanRowData } };
+    setOpportunityDetailData(updatedOpportunityDetail);
+    updateBaselineRate();
+  };
+
+  const applyFinancialSavings = async () => {
+    if (!opportunityDetailData) {
+      return;
+    }
+
+    const cleanRowData = getCleanRowData(opportunityDetailData.rowData);
+    const savings = calculateSavings(cleanRowData, opportunityDetailData.goalRate, opportunityDetailData.savingsPerUnit);
+    const updatedOpportunityDetail = { ...opportunityDetailData, ...{ rowData: cleanRowData, savings } };
+    await opportunityService.setGoals(updatedOpportunityDetail, cleanRowData);
+    setGoalSavings(savings);
+  };
+
+  const applyGoalRate = async (value: number) => {
+    if (!opportunityDetailData) {
+      return;
+    }
+
+    const cleanRowData = getCleanRowData(opportunityDetailData.rowData);
+    const newGoalRate = parseFloat(value.toFixed(2));
+    const savings = calculateSavings(cleanRowData, newGoalRate, opportunityDetailData.savingsPerUnit);
+    const updatedOpportunityDetail = { ...opportunityDetailData, ...{ rowData: cleanRowData, goalRate: newGoalRate, savings } };
+    await opportunityService.setGoals(updatedOpportunityDetail, cleanRowData);
+    setGoalSavings(savings);
+    setOpportunityDetailData(updatedOpportunityDetail);
+  };
+
+  const applyPercentChange = async (value: number) => {
+    if (!opportunityDetailData) {
+      return;
+    }
+
+    let newGoalRate = 0;
+
+    switch (opportunityDetailData.financialImprovementType.toString()) {
+      case FinancialImprovementTypes[FinancialImprovementTypes.Cost]:
+        newGoalRate = baselineRate - baselineRate * value;
+        break;
+      case FinancialImprovementTypes[FinancialImprovementTypes.Revenue]:
+        newGoalRate = baselineRate + baselineRate * value;
+        break;
+    }
+
+    const cleanRowData = getCleanRowData(opportunityDetailData.rowData);
+    newGoalRate = parseFloat(newGoalRate.toFixed(2));
+    const savings = calculateSavings(cleanRowData, newGoalRate, opportunityDetailData.savingsPerUnit);
+    const updatedOpportunityDetail = { ...opportunityDetailData, ...{ rowData: cleanRowData, changeRate: value, goalRate: newGoalRate, savings } };
+    await opportunityService.setGoals(updatedOpportunityDetail, cleanRowData);
+    setGoalSavings(savings);
+    setOpportunityDetailData(updatedOpportunityDetail);
+  };
+
+  const applySavingsPerUnitAndGoals = async (goalRate: number, percentChange: number, savingsPerUnit: number) => {
+    if (!opportunityDetailData) {
+      return;
+    }
+
+    let newGoalRate: number;
+    let newChangeRate: number;
+
+    if (goalRate) {
+      newGoalRate = parseFloat(goalRate.toFixed(2));
+      newChangeRate = opportunityDetailData.changeRate;
+    } else {
+      newGoalRate = isRevenue ? baselineRate + baselineRate * percentChange : baselineRate - baselineRate * percentChange;
+      newChangeRate = percentChange;
+    }
+
+    const cleanRowData = getCleanRowData(opportunityDetailData.rowData);
+    const savings = calculateSavings(cleanRowData, newGoalRate, savingsPerUnit);
+    const updatedOpportunityDetail = { ...opportunityDetailData, ...{ rowData: cleanRowData, savingsPerUnit, savings, changeRate: newChangeRate, goalRate: newGoalRate } };
+    await opportunityService.setGoals(updatedOpportunityDetail, cleanRowData);
+    setOpportunityDetailData(updatedOpportunityDetail);
+    setGoalSavings(savings);
+  };
+
+  const applyFinancialPercentChange = async (value: number) => {
+    if (!opportunityDetailData) {
+      return;
+    }
+
+    const rowData = opportunityDetailData.rowData;
+    rowData.forEach((row) => {
+      switch (opportunityDetailData.financialImprovementType.toString()) {
+        case FinancialImprovementTypes[FinancialImprovementTypes.Cost]:
+          row.lower = row.upper - row.upper * value;
+          break;
+        case FinancialImprovementTypes[FinancialImprovementTypes.Revenue]:
+          row.lower = row.upper + row.upper * value;
+          break;
+      }
+    });
+
+    const cleanRowData = getCleanRowData(opportunityDetailData.rowData);
+    const savings = calculateSavings(cleanRowData, opportunityDetailData.goalRate, opportunityDetailData.savingsPerUnit);
+    const updatedOpportunityDetail = { ...opportunityDetailData, ...{ rowData: cleanRowData, savings: savings } };
+    await opportunityService.setGoals(updatedOpportunityDetail, cleanRowData);
+    setGoalSavings(savings);
+    setOpportunityDetailData(updatedOpportunityDetail);
+  };
+
+  const handleHideOrShow = () => {
+    const updateHidden = async () => {
+      if (opportunityDetailData === undefined) {
+        return;
+      }
+      await opportunityService.setHidden(opportunityGuid, !opportunityDetailData.isHidden);
+      setOpportunityDetailData({ ...opportunityDetailData, ...{ isHidden: !opportunityDetailData.isHidden } });
+    };
+    updateHidden();
+  };
+
+  const handleDelete = (callback: () => void, failed: (err: any) => void) => {
+    opportunityService.delete(opportunityGuid, callback, failed);
+  };
+
+  const getInitiativeUrl = (initiativeGuid: string): string => {
+    return `${jazzUrl}CCI/FreeForm/${isFinancial ? 'Financial' : ''}InitiativeViewer.aspx?id=${initiativeGuid}`;
+  };
+
+  const getInitiativeInfo = async () => {
+    if (!hasInitiative) {
+      setInitiativeModalVisible(true);
+    } else {
+      window.location.assign(getInitiativeUrl(initiativeData.initiativeGuid));
+    }
+  };
+
+  const finalizeInitiative = async () => {
+    try {
+      toast.show({
+        key: initiativeData.initiativeGuid,
+        toastType: 'loading',
+        message: `Finalizing initiative.`,
+        duration: 0
+      });
+
+      if (opportunityDetailData) {
+        await setRowData();
+      }
+      await initiativeService.finalize(initiativeData.initiativeGuid, async function () {
+        toast.show({
+          key: initiativeData.initiativeGuid,
+          toastType: 'success',
+          message: `Initiative has been finalized and tracking has been run.`
+        });
+        // refresh initiative info now that tracking has been run
+        if (opportunityService.getInitiativeInfo) {
+          const info = await opportunityService.getInitiativeInfo(opportunityGuid);
+          setInitiativeData(info);
+          setHasInitiative(info.trackingStart !== '');
+          setIsLocked(true);
+        }
+      });
+    } catch (error) {
+      if (error instanceof Response) {
+        // Handles exceptions or unhandled validation from server
+        toast.show({
+          key: initiativeData.initiativeGuid,
+          message: `An error occurred while finalizing the initiative.`,
+          toastType: 'error'
+        });
+      }
+    }
+  };
+
+  const handleInitiativeClose = async () => {
+    setInitiativeModalVisible(false);
+  };
+
+  const handleInitiativeOk = async (initiative: IInitiative) => {
+    setInitiativeModalVisible(false);
+
+    const data = newFreeFormInitiative(currentConfiguration, cleanUpFreeFormInitiativeDto({ ...initiative }));
+    data.configurationGuid = currentConfiguration?.configurationGuid;
+    data.costDriver = isFinancial ? 'Financial Free Form' : 'Free Form';
+
+    const newInitiative = await freeFormInitiativeService.update(data);
+    if (getGuid(newInitiative.initiativeGuid) === undefined) {
+      toast.show({ toastType: 'error', duration: 0, message: 'Failed to save initiative' });
+      return;
+    }
+    if (opportunityService.getInitiativeInfo) {
+      const info = await opportunityService.getInitiativeInfo(opportunityGuid);
+      setInitiativeData(info);
+    }
+    setHasInitiative(true);
+    toast.show({
+      key: newInitiative.initiativeGuid,
+      toastType: 'success',
+      duration: 0,
+      message: (
+        <>
+          <Button
+            onClick={() => {
+              window.location.assign(getInitiativeUrl(newInitiative.initiativeGuid));
+            }}
+            type='link'
+          >
+            {initiative.name}
+          </Button>{' '}
+          is created.
+        </>
+      )
+    });
+  };
+
+  const metricGroup = (
+    <>
+      <FreeFormMetricGroup
+        financialImprovementType={opportunityDetailData?.financialImprovementType ?? FinancialImprovementTypes.Cost}
+        metricType={opportunityDetailData?.metricType ?? MetricTypes.Operational}
+        savings={goalSavings}
+        savingsPerUnit={opportunityDetailData?.savingsPerUnit ?? 0}
+        baselineRate={isFinancial ? getRowDataAverage(opportunityDetailData ? opportunityDetailData.rowData : [], true) : baselineRate}
+        goalRate={isFinancial ? getRowDataAverage(opportunityDetailData ? opportunityDetailData.rowData : [], false) : opportunityDetailData?.goalRate ?? 0}
+      />
+      <Divider margin={0} extended={false}></Divider>
+    </>
+  );
+
+  const opportunityCalculator = isLocked ? (
+    <></>
+  ) : isFinancial ? (
+    <FinancialFreeFormCalculator
+      financialImprovementType={opportunityDetailData && opportunityDetailData.financialImprovementType.toString() === FinancialImprovementTypes[FinancialImprovementTypes.Cost] ? 'Cost' : 'Revenue'}
+      applyMonthlySpend={applyFinancialMonthlySpend}
+      applyPercentChange={applyFinancialPercentChange}
+      applyFinancialSavings={applyFinancialSavings}
+    />
+  ) : (
+    <FreeFormCalculator
+      opportunityDetailData={opportunityDetailData}
+      baselineRate={baselineRate}
+      applySavingsPerUnit={setSavingsPerUnit}
+      applyGoalRate={applyGoalRate}
+      applyPercentChange={applyPercentChange}
+      applySavingsAndGoals={applySavingsPerUnitAndGoals}
+    />
+  );
+
+  return (
+    <>
+      <OpportunityDetailHeader
+        title={`Opportunity ${opportunityDetailData?.opportunityKey} • ${opportunityDetailData?.name} (${opportunityDetailData?.financialImprovementType.toString()})`}
+        breadcrumbHref='/free-form/opportunities'
+        breadcrumbText='Identify Opportunities'
+        opportunityType={OpportunityTypes.FreeForm}
+        opportunityId={opportunityId ?? 0}
+        opportunityGuid={opportunityGuid}
+        initiativeGuid={initiativeData.initiativeGuid}
+        sourceOpportunityId={opportunityDetailData?.sourceOpportunityId ?? -1}
+        hasInitiative={hasInitiative}
+        isEditable={isEditable}
+        isHidden={opportunityDetailData?.isHidden}
+        isLocked={isLocked || isFinalized}
+        isSecurityEditable={isSecurityEditable}
+        helpId={'1355'}
+        handleHideOrShow={handleHideOrShow}
+        handleDelete={handleDelete}
+        editInitiative={(opportunityGuid: string) => history.push(`/initiatives/edit/free-form`, { opportunityGuid: opportunityGuid })}
+        getInitiativeInfo={getInitiativeInfo}
+        finalizeInitiative={finalizeInitiative}
+      />
+      {metricGroup}
+      <Divider margin={0} extended={false}></Divider>
+      <LayoutGrid>
+        <LayoutGrid.Row>
+          <LayoutGrid.Column span={isFinancial ? 4 : 3}>
+            {opportunityCalculator}
+            <FreeFormDetailCard baselineStartDate={opportunityDetailData?.baselineStartDate} baselineEndDate={opportunityDetailData?.baselineEndDate} />
+          </LayoutGrid.Column>
+          <LayoutGrid.Column span={isFinancial ? 8 : 9}>
+            <Card removeBodyPadding>
+              {isFinancial ? (
+                <FinancialFreeFormGrid
+                  data={opportunityDetailData?.rowData}
+                  numerator={opportunityDetailData?.numerator ?? 'Baseline'}
+                  denominator={opportunityDetailData?.denominator ?? 'Target'}
+                  baselineStartDate={opportunityDetailData?.baselineStartDate}
+                  financialImprovementType={opportunityDetailData?.financialImprovementType ?? FinancialImprovementTypes.Cost}
+                  isLocked={isLocked || !isEditable || isFinalized}
+                  onCellValueChange={setRowData}
+                />
+              ) : (
+                <FreeFormGrid
+                  opportunityDetailData={opportunityDetailData}
+                  isLocked={isLocked || !isEditable || isFinalized}
+                  onCellValueChange={setRowData}
+                  calculateReduction={calculateReductionPerMonthValue}
+                />
+              )}
+            </Card>
+          </LayoutGrid.Column>
+        </LayoutGrid.Row>
+      </LayoutGrid>
+      {initiativeModalVisible && (
+        <InitiativeCreateModal
+          isVisible={initiativeModalVisible}
+          trackingStart={startMonth}
+          trackingEnd={endMonth}
+          opportunityType={OpportunityTypes.FreeForm}
+          initiative={getInitiative(newFreeFormInitiative(currentConfiguration), opportunityGuid, opportunityDetailData?.name ?? '')}
+          helpId='1355'
+          onCancel={handleInitiativeClose}
+          onOK={handleInitiativeOk}
+        />
+      )}
+    </>
+  );
+};
+
+export default FreeFormOpportunityDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/Opportunities.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/Opportunities.test.tsx
new file mode 100644
index 0000000..f7cafe8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/Opportunities.test.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import { render, screen, within } from '../../test-utils/testUtils';
+import { FinancialImprovementTypes, IFreeFormOpportunity, newFreeFormOpportunity } from './data/IFreeFormOpportunity';
+import { opportunityService } from './data/opportunityService';
+import { IPagedApiResponse } from '../../shared/paging/IPagedApiResponse';
+import Opportunities from './Opportunities';
+
+const mockOpportunities: IFreeFormOpportunity[] = [
+  newFreeFormOpportunity({
+    opportunityKey: 'FF - 1',
+    name: 'opportunity first',
+    improvementType: FinancialImprovementTypes.Cost,
+    metricTypeValue: 'Operational',
+    identifiedSavings: 100
+  }),
+  newFreeFormOpportunity({
+    opportunityKey: 'FF - 2',
+    name: 'opportunity second',
+    improvementType: FinancialImprovementTypes.Revenue,
+    metricTypeValue: 'Financial per Unit',
+    identifiedSavings: 200
+  })
+];
+
+const mockPagedOpportunities: IPagedApiResponse<IFreeFormOpportunity> = {
+  data: mockOpportunities,
+  pagingInfo: {
+    pageNumber: 1,
+    resultsPerPage: 25,
+    totalNumberOfResults: 2,
+    totalPages: 1
+  }
+};
+
+test('All opportunities are shown', async () => {
+  jest.spyOn(opportunityService, 'getOpportunities').mockImplementation(() => Promise.resolve(mockPagedOpportunities));
+
+  // render component
+  render(<Opportunities />);
+
+  // wait for grid to load
+  const cell = await screen.findByRole('cell', { name: mockPagedOpportunities.data[0].opportunityKey });
+
+  // get rows
+  const tableBody = cell?.parentElement?.parentElement as HTMLElement;
+  const rows = within(tableBody).getAllByRole('row');
+
+  // verify data shows in grid
+  mockPagedOpportunities.data.forEach((opportunity, index) => {
+    const row = rows[index];
+    within(row).getByText(opportunity.opportunityKey);
+    within(row).getByText(opportunity.name);
+    within(row).getByText(opportunity.improvementType);
+    within(row).getByText(opportunity.metricTypeValue);
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/Opportunities.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/Opportunities.tsx
new file mode 100644
index 0000000..a763490
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/Opportunities.tsx
@@ -0,0 +1,92 @@
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import Button from '@strata/tempo/lib/button/Button';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import OpportunitiesGrid from '../../shared/opportunities/OpportunitiesGrid';
+import { IOpportunity } from '../../shared/opportunities/data';
+import Filters from './Filters';
+import { IFreeFormFilters, initialFilters, numberOfFilters } from './data/IFreeFormFilters';
+import { IFreeFormOpportunity, MetricTypes } from './data/IFreeFormOpportunity';
+import { opportunityService } from './data/opportunityService';
+
+const Opportunities: React.FC = () => {
+  const [filters, setFilters] = useState<IFreeFormFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+  const jazzUrl = useJazzUrlWithVersion();
+
+  const history = useHistory();
+
+  useEffect(() => {
+    document.title = 'Free Form';
+  }, []);
+
+  useEffect(() => {
+    if (currentConfiguration == null) {
+      return;
+    }
+    setFilters(initialFilters);
+    setCurrentConfigurationGuid(currentConfiguration.configurationGuid);
+  }, [currentConfiguration]);
+
+  const handleApplyFilters = (newFilters: IFreeFormFilters) => {
+    setFiltersVisible(false);
+    setFilters({ ...filters, ...newFilters });
+  };
+
+  const handleSearch = (searchValue: string) => {
+    setFilters((filters) => {
+      return { ...filters, opportunitySearch: searchValue };
+    });
+  };
+
+  const getOpportunityUrl = (opportunity: IOpportunity) => {
+    const metricType = (opportunity as IFreeFormOpportunity).metricType;
+    return getFreeFormOpportunityUrl(metricType, opportunity.opportunityGuid);
+  };
+
+  const getFreeFormOpportunityUrl = (type: MetricTypes, opportunityGuid: string) => {
+    return `/free-form-opportunity/${opportunityGuid}`;
+  };
+
+  const getInitiativeUrl = (opportunity: IOpportunity) => {
+    const metricType = (opportunity as IFreeFormOpportunity).metricType;
+    const isFinancial = metricType.toString() === MetricTypes[MetricTypes.Financial];
+    return `${jazzUrl}CCI/FreeForm/${isFinancial ? 'Financial' : ''}InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+  };
+
+  const buildOpportunityButton = (
+    <Button type='primary' icon={<PlusIcon />} onClick={() => history.push(`/initiatives/create/free-form`, { networkOpportunityId: undefined, networkOpportunityName: undefined })}>
+      Opportunity
+    </Button>
+  );
+
+  return (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />
+      <OpportunitiesGrid
+        configurationGuid={currentConfigurationGuid}
+        getOpportunityUrl={getOpportunityUrl}
+        getInitiativeUrl={getInitiativeUrl}
+        filters={filters}
+        opportunityService={opportunityService}
+        identifiedSavingsIndex={2}
+        numOfSelectedFilters={numberOfFilters(filters)}
+        searchPlaceholderText='Search'
+        onFilter={() => setFiltersVisible(true)}
+        onSearch={handleSearch}
+        customAction={buildOpportunityButton}
+      >
+        <DataGrid.Column field='name' header='Name' sortable width={160} />
+        <DataGrid.Column field='improvementType' header='Type' sortable width={160} />
+        <DataGrid.Column field='metricTypeValue' header='Metric Type' sortable width={160} />
+      </OpportunitiesGrid>
+    </>
+  );
+};
+
+export default Opportunities;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormCalculatorModel.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormCalculatorModel.ts
new file mode 100644
index 0000000..31ebd3c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormCalculatorModel.ts
@@ -0,0 +1,16 @@
+export interface IFreeFormCalculatorModel {
+  savingsPerUnit?: number;
+  goalRate?: number;
+  percentChange?: number;
+}
+
+export const newFreeFormCalculatorModel = (data: Partial<IFreeFormCalculatorModel> = {}): IFreeFormCalculatorModel => {
+  return {
+    ...{
+      savingsPerUnit: undefined,
+      goalRate: undefined,
+      percentChange: undefined
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormFilterOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormFilterOptions.ts
new file mode 100644
index 0000000..f1d19a1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormFilterOptions.ts
@@ -0,0 +1,16 @@
+import { IListMember } from '../../../shared/data/IListMember';
+
+export interface IFreeFormFilterOptions {
+  financialImprovementTypes: IListMember[];
+  metricTypes: IListMember[];
+}
+
+export const newFilterOptions = (data: Partial<IFreeFormFilterOptions> = {}): IFreeFormFilterOptions => {
+  return {
+    ...{
+      financialImprovementTypes: [],
+      metricTypes: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormFilters.ts
new file mode 100644
index 0000000..ecaeeb5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormFilters.ts
@@ -0,0 +1,25 @@
+import { IOpportunityFilters } from '../../../shared/opportunities/data';
+
+export interface IFreeFormFilters extends IOpportunityFilters {
+  financialImprovementTypes: string[];
+  metricTypes: string[];
+}
+
+export const initialFilters: IFreeFormFilters = {
+  identifiedSavings: undefined,
+  financialImprovementTypes: [],
+  metricTypes: [],
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+export const numberOfFilters = (filters: IFreeFormFilters): number => {
+  let filtersCount = 0;
+  if (filters.identifiedSavings != null) filtersCount++;
+  if (filters.financialImprovementTypes.length > 0) filtersCount++;
+  if (filters.metricTypes.length > 0) filtersCount++;
+  if (filters.viewVisible === false) filtersCount++;
+  if (filters.excludeInitiatives === true) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormOpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormOpportunity.ts
new file mode 100644
index 0000000..a40e4d7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormOpportunity.ts
@@ -0,0 +1,42 @@
+import { IOpportunity } from '../../../shared/opportunities/data/IOpportunity';
+
+export interface IFreeFormOpportunity extends IOpportunity {
+  name: string;
+  improvementType: FinancialImprovementTypes;
+  metricType: MetricTypes;
+  metricTypeValue: string;
+}
+
+export enum FinancialImprovementTypes {
+  Cost = 0,
+  Revenue = 1
+}
+
+export enum MetricTypes {
+  Operational = 0,
+  FinancialPerUnit = 1,
+  Financial = 2
+}
+
+export const newFreeFormOpportunity = (data: Partial<IFreeFormOpportunity> = {}): IFreeFormOpportunity => {
+  return {
+    ...{
+      name: '',
+      opportunityKey: '',
+      opportunityId: 0,
+      opportunityGuid: '',
+      identifiedSavings: 0,
+      improvementType: FinancialImprovementTypes.Cost,
+      metricType: MetricTypes.Financial,
+      metricTypeValue: 'Operational',
+      hasInitiative: false,
+      note: '',
+      isHidden: false,
+      initiativeGuid: '',
+      configurationGuid: '',
+      sourceOpportunity: '',
+      sourceOpportunityId: -1
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormOpportunityDetailModel.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormOpportunityDetailModel.ts
new file mode 100644
index 0000000..b6bd895
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormOpportunityDetailModel.ts
@@ -0,0 +1,29 @@
+import { IOpportunity } from '../../../shared/opportunities/data';
+import { FinancialImprovementTypes, MetricTypes } from './IFreeFormOpportunity';
+
+export interface IFreeFormOpportunityDetailModel extends IOpportunity {
+  configurationGuid: string;
+  name: string;
+  numerator: string;
+  denominator: string;
+  savings: number;
+  savingsPerUnit: number;
+  goalRate: number;
+  changeRate: number;
+  baselineStartDate: Date;
+  baselineEndDate: Date;
+  trackingStartDate: Date;
+  trackingEndDate: Date;
+  financialImprovementType: FinancialImprovementTypes;
+  metricType: MetricTypes;
+  rowData: IFreeFormOpportunityDetailRowData[];
+  sourceOpportunity: string;
+  sourceOpportunityId: number;
+}
+
+export interface IFreeFormOpportunityDetailRowData {
+  key: string;
+  month: string;
+  upper: number;
+  lower: number;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormOpportunitySaveModel.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormOpportunitySaveModel.ts
new file mode 100644
index 0000000..fa58ce4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/IFreeFormOpportunitySaveModel.ts
@@ -0,0 +1,26 @@
+import { FinancialImprovementTypes, MetricTypes } from './IFreeFormOpportunity';
+
+export interface IFreeFormOpportunitySaveModel {
+  opportunityGuid: string;
+  improvementType: FinancialImprovementTypes;
+  metricType: MetricTypes;
+  name: string;
+  metricNumerator?: string;
+  metricDenominator?: string;
+  configurationGuid: string;
+}
+
+export const newFreeFormOpportunitySaveModel = (configurationGuid: string, data: Partial<IFreeFormOpportunitySaveModel> = {}): IFreeFormOpportunitySaveModel => {
+  return {
+    ...{
+      opportunityGuid: '',
+      improvementType: FinancialImprovementTypes.Cost,
+      metricType: MetricTypes.Financial,
+      name: '',
+      metricNumerator: '',
+      metricDenominator: '',
+      configurationGuid: configurationGuid
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/opportunityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/opportunityService.ts
new file mode 100644
index 0000000..cabad6b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/free-form/opportunities/data/opportunityService.ts
@@ -0,0 +1,81 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IOpportunityJobResults } from '../../../shared/hangfire/IOpportunityJobResults';
+import { IOpportunityFilters, IOpportunityService } from '../../../shared/opportunities/data';
+import { IPagedApiResponse, IPagingOptions, ISortOptions } from '../../../shared/paging';
+import { IFreeFormInitiative } from '../../initiatives/data/IFreeFormInitiative';
+import { IFreeFormFilterOptions } from './IFreeFormFilterOptions';
+import { IFreeFormOpportunity } from './IFreeFormOpportunity';
+import { IFreeFormOpportunityDetailModel, IFreeFormOpportunityDetailRowData } from './IFreeFormOpportunityDetailModel';
+import { IFreeFormOpportunitySaveModel } from './IFreeFormOpportunitySaveModel';
+
+const { httpGet, httpPost, httpPut, httpDelete, httpDownloadAndDisplayFile } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'free-form-opportunities';
+
+export const opportunityService: IOpportunityService = {
+  getOpportunities: async (configurationGuid: string, pagingOptions: IPagingOptions, filters: IOpportunityFilters): Promise<IPagedApiResponse<IFreeFormOpportunity>> => {
+    return httpPost<IPagedApiResponse<IFreeFormOpportunity>>(`${url}`, {
+      pagingOptions,
+      filters: {
+        ...filters,
+        configurationGuid
+      }
+    });
+  },
+
+  getOpportunity: async (opportunityGuid: string): Promise<IFreeFormOpportunity> => {
+    return httpGet<IFreeFormOpportunity>(`${url}/${opportunityGuid}`);
+  },
+
+  export: async (configurationGuid: string, sortOptions: ISortOptions, filters: IOpportunityFilters): Promise<void> => {
+    const date = new Date();
+    const fileName = 'FF_CI_Opportunities_' + date.toISOString().split('T')[0];
+    httpDownloadAndDisplayFile(
+      `${url}/export`,
+      {
+        method: 'post',
+        body: JSON.stringify({
+          sortOptions,
+          filters: {
+            ...filters,
+            configurationGuid
+          }
+        })
+      },
+      fileName
+    );
+  },
+
+  getFilterOptions: (configurationGuid: string): Promise<IFreeFormFilterOptions> => {
+    return httpGet<IFreeFormFilterOptions>(`${url}/${configurationGuid}/filter-options`);
+  },
+
+  setHidden: async (opportunityGuid: string, isHidden: boolean): Promise<void> => {
+    await httpPut(`${url}/${opportunityGuid}/set-hidden`, isHidden);
+  },
+
+  setNote: async (opportunityGuid: string, note: string): Promise<void> => {
+    await httpPut(`${url}/${opportunityGuid}/set-note`, note);
+  },
+
+  createOpportunity: async (opportunity: IFreeFormOpportunitySaveModel, callback: () => IOpportunityJobResults): Promise<IOpportunityJobResults> => {
+    return httpPost<IOpportunityJobResults>(`${url}/create`, opportunity).then(callback);
+  },
+
+  getById(opportunityGuid: string): Promise<IFreeFormOpportunityDetailModel> {
+    return httpGet<IFreeFormOpportunityDetailModel>(`${url}/${opportunityGuid}`);
+  },
+
+  setGoals: async (opportunityDetail: IFreeFormOpportunityDetailModel, monthValues: IFreeFormOpportunityDetailRowData[]): Promise<void> => {
+    return httpPost(`${url}/${opportunityDetail.opportunityGuid}/set-goals`, { opportunityDetail, monthValues });
+  },
+
+  getInitiativeInfo: async (opportunityGuid: string): Promise<IFreeFormInitiative> => {
+    return httpGet<IFreeFormInitiative>(`${url}/${opportunityGuid}/initiative`);
+  },
+
+  delete: async (opportunityGuid: string, callback: () => void, failed: (err: any) => void): Promise<void> => {
+    httpDelete(`${url}/${opportunityGuid}/delete`)
+      .then(callback)
+      .catch((e) => failed(e));
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/GeneralLedger.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/GeneralLedger.tsx
new file mode 100644
index 0000000..2f8862c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/GeneralLedger.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import Opportunities from './opportunities/Opportunities';
+import OpportunitiesHeader from '../shared/opportunities/OpportunitiesHeader';
+
+const GeneralLedger: React.FC = () => {
+  return (
+    <>
+      <OpportunitiesHeader headerTitle='General Ledger Opportunities' helpId='1313' />
+      <Opportunities />
+    </>
+  );
+};
+
+export default GeneralLedger;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/GeneralLedgerDetailsModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/GeneralLedgerDetailsModal.tsx
new file mode 100644
index 0000000..a69c450
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/GeneralLedgerDetailsModal.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import Modal from '@strata/tempo/lib/modal';
+import TreeGrid from '@strata/tempo/lib/treegrid';
+import { AccountType } from '../opportunities/data/IGLOpportunity';
+import { ConvertDetailData } from './data/SharedDetailData';
+import { IDepartmentDetail } from '../details/data/IDepartmentDetail';
+
+export interface IGeneralLedgerDetailsModalProps {
+  isVisible: boolean;
+  onClose: () => void;
+  glType: AccountType;
+  data: IDepartmentDetail[];
+}
+
+const GeneralLedgerDetailsModal: React.FC<IGeneralLedgerDetailsModalProps> = (props: IGeneralLedgerDetailsModalProps) => {
+  const { isVisible, onClose, glType, data } = props;
+
+  const handleModalClose = async () => {
+    onClose();
+  };
+
+  const accountType = AccountType[glType];
+
+  const gridData = data.map((d) => {
+    return ConvertDetailData(d);
+  });
+
+  return (
+    <Modal width='large' title={`Department and ${accountType} Account Details`} visible={isVisible} onCancel={handleModalClose} removeBodyPadding footer={null}>
+      <TreeGrid sortField='name' sortOrder={1} value={gridData} paginator rows={10}>
+        <TreeGrid.Column expander field='name' header='Departments' sortable width={688} />
+        <TreeGrid.NumberColumn format='currency' field='amount' header={`Total ${accountType}`} sortable width={136} />
+      </TreeGrid>
+    </Modal>
+  );
+};
+
+export default GeneralLedgerDetailsModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/GeneralLedgerStatisticModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/GeneralLedgerStatisticModal.tsx
new file mode 100644
index 0000000..919eadf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/GeneralLedgerStatisticModal.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import Modal from '@strata/tempo/lib/modal';
+import TreeGrid from '@strata/tempo/lib/treegrid';
+import { IDepartmentDetail } from '../details/data/IDepartmentDetail';
+import { ConvertDetailData } from './data/SharedDetailData';
+
+export interface IGeneralLedgerStatisticModalProps {
+  isVisible: boolean;
+  onClose: () => void;
+  data: IDepartmentDetail[];
+}
+
+const GeneralLedgerStatisticModal: React.FC<IGeneralLedgerStatisticModalProps> = (props: IGeneralLedgerStatisticModalProps) => {
+  const { isVisible, onClose, data } = props;
+
+  const handleModalClose = async () => {
+    onClose();
+  };
+
+  const gridData = data.map((d) => {
+    return ConvertDetailData(d);
+  });
+
+  return (
+    <Modal width='large' title={`Department and Statistic Account Details`} visible={isVisible} onCancel={handleModalClose} removeBodyPadding footer={null}>
+      <TreeGrid sortField='name' sortOrder={1} value={gridData} paginator rows={10}>
+        <TreeGrid.Column expander field='name' header='Departments' sortable width={688} />
+        <TreeGrid.NumberColumn format='decimal' field='amount' header={`Total Units`} sortable width={136} />
+      </TreeGrid>
+    </Modal>
+  );
+};
+
+export default GeneralLedgerStatisticModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/IAccountDetail.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/IAccountDetail.ts
new file mode 100644
index 0000000..3e85c82
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/IAccountDetail.ts
@@ -0,0 +1,5 @@
+export interface IAccountDetail {
+  accountId: number;
+  name: string;
+  amount: number;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/IDepartmentDetail.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/IDepartmentDetail.ts
new file mode 100644
index 0000000..62cbf1d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/IDepartmentDetail.ts
@@ -0,0 +1,8 @@
+import { IAccountDetail } from './IAccountDetail';
+
+export interface IDepartmentDetail {
+  departmentId: number;
+  name: string;
+  amount: number;
+  accountDetails: IAccountDetail[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/IGLDepartmentAccountData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/IGLDepartmentAccountData.ts
new file mode 100644
index 0000000..df4ac67
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/IGLDepartmentAccountData.ts
@@ -0,0 +1,4 @@
+export interface IGLDepartmentAccountData {
+  departments: [];
+  accounts: [];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/IGLDetail.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/IGLDetail.ts
new file mode 100644
index 0000000..a6636ef
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/IGLDetail.ts
@@ -0,0 +1,11 @@
+import { IDepartmentDetail } from './IDepartmentDetail';
+
+export interface IGLDetail {
+  total: number;
+  departmentDetails: IDepartmentDetail[];
+}
+
+export const initialDetail: IGLDetail = {
+  total: 0,
+  departmentDetails: []
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/SharedDetailData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/SharedDetailData.ts
new file mode 100644
index 0000000..213e904
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/details/data/SharedDetailData.ts
@@ -0,0 +1,18 @@
+import { IDepartmentDetail } from '../data/IDepartmentDetail';
+
+interface IDetail {
+  name: string;
+  amount: number;
+}
+
+interface IDetailsData {
+  key: string;
+  data: IDetail;
+  children: IDetail[];
+}
+
+export const ConvertDetailData = (departmentDetail: IDepartmentDetail): IDetailsData => {
+  const detail: IDetail = { name: departmentDetail.name, amount: departmentDetail.amount };
+  const detailData: IDetailsData = { key: departmentDetail.departmentId.toString(), data: detail, children: departmentDetail.accountDetails };
+  return detailData;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/CreateGeneralLedgerInitiative.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/CreateGeneralLedgerInitiative.tsx
new file mode 100644
index 0000000..3ed058e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/CreateGeneralLedgerInitiative.tsx
@@ -0,0 +1,145 @@
+import { useJazzUrlWithVersion } from '@strata/core/lib/auth/useJazzUrlWithVersion';
+import Wizard from '@strata/tempo/lib/wizard/Wizard';
+import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
+import { clientOpportunityLinkService } from '../../network/opportunities/data/clientOppportunityLinkService';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import ShowCreateErrorMessage from '../../shared/components/ShowCreateErrorMessage';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import CreateInitiative from '../../shared/initiatives/CreateInitiative';
+import { IInitiative } from '../../shared/initiatives/data/IInitiative';
+import { IInitiativeProps } from '../../shared/initiatives/data/IInitiativeProps';
+import { initiativeService as dfltInitiativeService } from '../../shared/initiatives/data/initiativeService';
+import { nameValidationService } from '../../shared/opportunities/data/nameValidationService';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { AccountType, OpportunityLevel } from '../opportunities/data/IGLOpportunity';
+import GeneralLedgerDetail from './GeneralLedgerDetail';
+import { IGeneralLedgerInitiative, newGeneralLedgerInitiative } from './data/IGeneralLedgerInitiative';
+import { cleanUpGeneralLedgerInitiative } from './data/IGeneralLedgerInitiativeDto';
+import { initiativeService } from './data/initiativeService';
+import { OpportunityCreateResponse } from '../../shared/initiatives/data/OpportunityCreateResponse';
+
+const CreateGeneralLedgerInitiative: React.FC = () => {
+  const [initiative, setInitiative] = useState<IInitiative>();
+  const [isLoading, setLoading] = useState<boolean>(false);
+  const [error, setError] = useState<unknown>(null);
+  const [hasStatistic, setHasStatistic] = useState<boolean>(false);
+  const [accountType, setAccountType] = useState<AccountType>(AccountType.Revenue);
+  const [opportunityLevel, setOpportunityLevel] = useState<OpportunityLevel>(OpportunityLevel.Overall);
+  const jazzUrl = useJazzUrlWithVersion();
+  const { currentConfiguration } = useConfigurations();
+  const { userSetting } = React.useContext(UserSettingContext);
+  const history = useHistory();
+  const { networkOpportunityId, networkOpportunityName } = history.location.state as IInitiativeProps;
+
+  useEffect(() => {
+    if (!initiative && currentConfiguration) {
+      const initiative = newGeneralLedgerInitiative(currentConfiguration);
+      setHasStatistic(initiative.hasStatistic);
+      setAccountType(initiative.gLOpportunityType);
+      setOpportunityLevel(initiative.goalLevel);
+      if (networkOpportunityName) {
+        initiative.name = networkOpportunityName;
+      }
+      setInitiative(initiative);
+    }
+  }, [currentConfiguration, initiative, networkOpportunityName]);
+
+  const nameIsValid = (name: string): Promise<boolean> => {
+    return nameValidationService.nameIsValid(userSetting.configurationGuid, OpportunityTypes.GeneralLedger, name);
+  };
+
+  const pageIsValid = (currentStep: number, detailValues: IGeneralLedgerInitiative): boolean => {
+    if (!detailValues.departments || detailValues.departments.length === 0) {
+      return false;
+    }
+    if (detailValues.gLOpportunityType === AccountType.Revenue && (!detailValues.revenueAccounts || detailValues.revenueAccounts.length === 0)) {
+      return false;
+    }
+    if (detailValues.gLOpportunityType === AccountType.Expense && (!detailValues.expenseAccounts || detailValues.expenseAccounts.length === 0)) {
+      return false;
+    }
+    if (detailValues.gLOpportunityType === AccountType.Margin && (!detailValues.revenueAccounts || detailValues.revenueAccounts.length === 0)) {
+      return false;
+    }
+    if (detailValues.gLOpportunityType === AccountType.Margin && (!detailValues.expenseAccounts || detailValues.expenseAccounts.length === 0)) {
+      return false;
+    }
+    if (detailValues.hasStatistic && (!detailValues.statisticDepartments || detailValues.statisticDepartments.length === 0)) {
+      return false;
+    }
+    if (detailValues.hasStatistic && (!detailValues.statisticAccounts || detailValues.statisticAccounts.length === 0)) {
+      return false;
+    }
+    return true;
+  };
+
+  const createOpportunity = async (detailValues: IGeneralLedgerInitiative): Promise<void> => {
+    const cleanup = cleanUpGeneralLedgerInitiative({ ...initiative, ...detailValues });
+
+    setLoading(true);
+    try {
+      const response: OpportunityCreateResponse = await initiativeService.create(cleanup);
+      await gotoOpportunityPage(response.value);
+    } catch (createError) {
+      console.error('❌ Error creating General Ledger Opportunity:', createError);
+      try {
+        const retrievedOpportunityGuid = await dfltInitiativeService.getOpportunityGuidByName(cleanup.configurationGuid, OpportunityTypes.GeneralLedger, cleanup.name);
+        await gotoOpportunityPage(retrievedOpportunityGuid);
+      } catch (retrievalError) {
+        setError(retrievalError);
+      }
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const gotoOpportunityPage = async (opportunityGuid: string) => {
+    // save network opp if applicable
+    if (networkOpportunityId) {
+      await clientOpportunityLinkService.addClientOpportunityLink(networkOpportunityId, opportunityGuid);
+    }
+    window.location.assign(`${jazzUrl}CCI/GeneralLedger/OpportunityViewer.aspx?opportunityGuid=${opportunityGuid}`);
+  };
+
+  const handleHasStatisticChange = (hasStatistic: boolean) => {
+    setHasStatistic(hasStatistic);
+  };
+
+  const handleOpportunityTypeChange = (accountType: AccountType) => {
+    setAccountType(accountType);
+  };
+
+  const handleOpportunityLevelChange = (opportunityLevel: OpportunityLevel) => {
+    setOpportunityLevel(opportunityLevel);
+  };
+
+  return (
+    <>
+      <CreateInitiative
+        opportunityType='General Ledger'
+        helpId='1353'
+        newInitiative={initiative}
+        nameIsValid={nameIsValid}
+        pageIsValid={pageIsValid}
+        createOpportunity={createOpportunity}
+        isLoading={isLoading}
+      >
+        <Wizard.Step key='1' title='General Ledger Opportunity'>
+          <GeneralLedgerDetail
+            hasStatisticValues={hasStatistic}
+            handleHasStatisticChanged={handleHasStatisticChange}
+            glOpportunityType={accountType}
+            handleOpportunityTypeChanged={handleOpportunityTypeChange}
+            glOpportunityLevel={opportunityLevel}
+            handleOpportunityLevelChanged={handleOpportunityLevelChange}
+          />
+        </Wizard.Step>
+        <></>
+      </CreateInitiative>
+      {error && <ShowCreateErrorMessage error={error} />}
+    </>
+  );
+};
+
+export default CreateGeneralLedgerInitiative;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/GeneralLedgerDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/GeneralLedgerDetail.tsx
new file mode 100644
index 0000000..5ae7fc6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/GeneralLedgerDetail.tsx
@@ -0,0 +1,323 @@
+import intlService from '@strata/intl/lib';
+import { ScoreMemberPicker } from '@strata/score/lib/ScoreMemberPicker';
+import Button from '@strata/tempo/lib/button/Button';
+import Divider from '@strata/tempo/lib/divider/Divider';
+import Form from '@strata/tempo/lib/form/Form';
+import RadioGroup from '@strata/tempo/lib/radiogroup/RadioGroup';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text';
+import React, { useEffect, useState } from 'react';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import GeneralLedgerDetailsModal from '../details/GeneralLedgerDetailsModal';
+import GeneralLedgerStatisticModal from '../details/GeneralLedgerStatisticModal';
+import { IGLDetail, initialDetail } from '../details/data/IGLDetail';
+import { AccountType, OpportunityLevel } from '../opportunities/data/IGLOpportunity';
+import { opportunityService } from '../opportunities/data/opportunityService';
+
+export interface IGeneralLedgerDetailProps {
+  hasStatisticValues: boolean;
+  handleHasStatisticChanged: (hasStatistic: boolean) => void;
+  glOpportunityType: AccountType;
+  handleOpportunityTypeChanged: (accountType: AccountType) => void;
+  glOpportunityLevel: OpportunityLevel;
+  handleOpportunityLevelChanged: (opportunityLevel: OpportunityLevel) => void;
+}
+
+const GeneralLedgerDetail: React.FC<IGeneralLedgerDetailProps> = (props: IGeneralLedgerDetailProps) => {
+  const { hasStatisticValues, handleHasStatisticChanged, glOpportunityType, handleOpportunityTypeChanged, glOpportunityLevel, handleOpportunityLevelChanged } = props;
+  const [accountType, setAccountType] = useState<AccountType>(AccountType.Revenue);
+  const [hasStatistic, setHasStatistic] = useState<boolean>(false);
+  const [showRevenueDetails, setShowRevenueDetails] = useState<boolean>(false);
+  const [showExpenseDetails, setShowExpenseDetails] = useState<boolean>(false);
+  const [showStatisticDetails, setShowStatisticDetails] = useState<boolean>(false);
+  const [revenueDetail, setRevenueDetail] = useState<IGLDetail>(initialDetail);
+  const [expenseDetail, setExpenseDetail] = useState<IGLDetail>(initialDetail);
+  const [statisticDetail, setStatisticDetail] = useState<IGLDetail>(initialDetail);
+  const { userSetting } = React.useContext(UserSettingContext);
+  const [departmentSelections, setDepartmentSelections] = useState<[]>([]);
+  const [revenueAccountSelections, setRevenueAccountSelections] = useState<[]>([]);
+  const [expenseAccountSelections, setExpenseAccountSelections] = useState<[]>([]);
+  const [statisticDepartmentSelections, setStatisticDepartmentSelections] = useState<[]>([]);
+  const [statisticAccountSelections, setStatisticAccountSelections] = useState<[]>([]);
+
+  useEffect(() => {
+    if (hasStatisticValues) {
+      setHasStatistic(hasStatisticValues);
+    }
+    if (glOpportunityType) {
+      setAccountType(glOpportunityType);
+    }
+  }, [hasStatisticValues, glOpportunityType, glOpportunityLevel]);
+
+  useEffect(() => {
+    const updateDepartmentDetails = async () => {
+      if (departmentSelections.length > 0) {
+        if (revenueAccountSelections.length > 0) {
+          const revenueData = { accounts: revenueAccountSelections, departments: departmentSelections };
+          const revenueResults = await opportunityService.getDepartmentData(userSetting.configurationGuid, revenueData);
+          setRevenueDetail(revenueResults);
+        }
+        if (expenseAccountSelections.length > 0) {
+          const expenseData = { accounts: expenseAccountSelections, departments: departmentSelections };
+          const expenseResults = await opportunityService.getDepartmentData(userSetting.configurationGuid, expenseData);
+          setExpenseDetail(expenseResults);
+        }
+      }
+    };
+
+    updateDepartmentDetails();
+  }, [departmentSelections, revenueAccountSelections, expenseAccountSelections, accountType, userSetting.configurationGuid]);
+
+  useEffect(() => {
+    const updateStatisticDetails = async () => {
+      const statisticData = { departments: statisticDepartmentSelections, accounts: statisticAccountSelections };
+      if (statisticData.accounts?.length > 0 && statisticData.departments?.length > 0) {
+        const statisticResults = await opportunityService.getStatisticData(userSetting.configurationGuid, statisticData);
+        setStatisticDetail(statisticResults);
+      }
+    };
+    updateStatisticDetails();
+  }, [statisticDepartmentSelections, statisticAccountSelections, userSetting.configurationGuid]);
+
+  const handleAccountTypeChange = (e: AccountType) => {
+    setAccountType(e);
+    if (handleOpportunityTypeChanged) handleOpportunityTypeChanged(e);
+  };
+
+  const handleOpportunityLevelChange = (e: OpportunityLevel) => {
+    if (handleOpportunityLevelChanged) handleOpportunityLevelChanged(e);
+  };
+
+  const handleHasStatisticChange = (e: boolean) => {
+    setHasStatistic(e);
+    if (handleHasStatisticChanged) handleHasStatisticChanged(e);
+  };
+
+  const getAccountLabel = () => {
+    if (accountType !== AccountType.Margin) {
+      return AccountType[accountType].toUpperCase();
+    }
+    return '';
+  };
+
+  let opportunityDetails = <></>;
+  const revenueDetails = (
+    <Form.Item>
+      <Spacing column hAlign='left'>
+        <Text size='large' strong>
+          {intlService.formatNumber(revenueDetail.total, 'currencyDecimal')}
+        </Text>
+        <Button type='link' onClick={() => setShowRevenueDetails(true)}>
+          View Revenue Details
+        </Button>
+      </Spacing>
+    </Form.Item>
+  );
+  const expenseDetails = (
+    <Form.Item>
+      <Spacing column hAlign='left'>
+        <Text size='large' strong>
+          {intlService.formatNumber(expenseDetail.total, 'currencyDecimal')}
+        </Text>
+        <Button type='link' onClick={() => setShowExpenseDetails(true)}>
+          View Expense Details
+        </Button>
+      </Spacing>
+    </Form.Item>
+  );
+
+  switch (accountType) {
+    case AccountType.Margin: {
+      opportunityDetails = (
+        <Spacing>
+          {revenueDetails}
+          {expenseDetails}
+        </Spacing>
+      );
+      break;
+    }
+    case AccountType.Revenue: {
+      opportunityDetails = revenueDetails;
+      break;
+    }
+    case AccountType.Expense: {
+      opportunityDetails = expenseDetails;
+      break;
+    }
+  }
+
+  return (
+    <>
+      <Spacing padding={16} column>
+        <Form.Item label='Type' name='gLOpportunityType' rules={[{ required: true }]}>
+          <RadioGroup
+            onChange={(e) => handleAccountTypeChange(e.target.value)}
+            options={[
+              { value: AccountType.Revenue, label: 'Revenue' },
+              { value: AccountType.Expense, label: 'Expense' },
+              { value: AccountType.Margin, label: 'Margin' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Opportunity Level' name='goalLevel' rules={[{ required: true }]}>
+          <RadioGroup
+            onChange={(e) => handleOpportunityLevelChange(e.target.value)}
+            options={[
+              { value: OpportunityLevel.Overall, label: 'Overall Opportunity' },
+              { value: OpportunityLevel.DepartmentLevel, label: 'Department Level Opportunity' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Seasonality' name='isSeasonal' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: true, label: 'With Seasonality' },
+              { value: false, label: 'Without Seasonality' }
+            ]}
+          />
+        </Form.Item>
+
+        <Divider extended={false}></Divider>
+
+        <Spacing column itemSpacing={16}>
+          <Text color='secondary' strong={true}>
+            DEPARTMENTS AND {getAccountLabel()} ACCOUNTS
+          </Text>
+          {opportunityDetails}
+        </Spacing>
+
+        <Spacing>
+          <Form.Item label='Departments' name='departments' rules={[{ required: true }]}>
+            <ScoreMemberPicker
+              dimensionGuidOrGlobalId='Department'
+              showHierarchyDropdown={true}
+              modalTitle='Select Departments'
+              selectionMode='multiple'
+              okText='Select'
+              onChange={(values) => setDepartmentSelections(values as [])}
+            />
+          </Form.Item>
+        </Spacing>
+
+        {accountType === AccountType.Revenue && (
+          <Spacing>
+            <Form.Item label='Accounts' name='revenueAccounts' rules={[{ required: true }]}>
+              <ScoreMemberPicker
+                dimensionGuidOrGlobalId='Account'
+                showHierarchyDropdown={true}
+                modalTitle='Select Accounts'
+                selectionMode='multiple'
+                okText='Select'
+                onChange={(values) => setRevenueAccountSelections(values as [])}
+              />
+            </Form.Item>
+          </Spacing>
+        )}
+        {accountType === AccountType.Expense && (
+          <Spacing>
+            <Form.Item label='Accounts' name='expenseAccounts' rules={[{ required: true }]}>
+              <ScoreMemberPicker
+                dimensionGuidOrGlobalId='Account'
+                showHierarchyDropdown={true}
+                modalTitle='Select Accounts'
+                selectionMode='multiple'
+                okText='Select'
+                onChange={(values) => setExpenseAccountSelections(values as [])}
+              />
+            </Form.Item>
+          </Spacing>
+        )}
+        {accountType === AccountType.Margin && (
+          <Spacing column>
+            <Spacing>
+              <Form.Item label='Revenue Accounts' name='revenueAccounts' rules={[{ required: true }]}>
+                <ScoreMemberPicker
+                  dimensionGuidOrGlobalId='Account'
+                  showHierarchyDropdown={true}
+                  modalTitle='Select Revenue Accounts'
+                  selectionMode='multiple'
+                  okText='Select'
+                  onChange={(values) => setRevenueAccountSelections(values as [])}
+                />
+              </Form.Item>
+            </Spacing>
+
+            <Spacing>
+              <Form.Item label='Expense Accounts' name='expenseAccounts' rules={[{ required: true }]}>
+                <ScoreMemberPicker
+                  dimensionGuidOrGlobalId='Account'
+                  showHierarchyDropdown={true}
+                  modalTitle='Select Expense Accounts'
+                  selectionMode='multiple'
+                  okText='Select'
+                  onChange={(values) => setExpenseAccountSelections(values as [])}
+                />
+              </Form.Item>
+            </Spacing>
+          </Spacing>
+        )}
+
+        <Divider extended={false}></Divider>
+
+        <Spacing column itemSpacing={16}>
+          <Text color='secondary' strong={true}>
+            DEPARTMENTS AND STATISTIC ACCOUNTS
+          </Text>
+          <Form.Item label='Do you want to use a Statistic data source?' name='hasStatistic' rules={[{ required: true }]}>
+            <RadioGroup
+              onChange={(e) => handleHasStatisticChange(e.target.value)}
+              options={[
+                { value: false, label: 'No' },
+                { value: true, label: 'Yes' }
+              ]}
+            />
+          </Form.Item>
+
+          {hasStatistic && (
+            <Spacing column>
+              <Form.Item>
+                <Spacing column hAlign='left'>
+                  <Text size='large' strong>
+                    {intlService.formatNumber(statisticDetail.total, 'decimal')}
+                  </Text>
+                  <Button type='link' onClick={() => setShowStatisticDetails(true)}>
+                    View Statistic Details
+                  </Button>
+                </Spacing>
+              </Form.Item>
+              <Spacing>
+                <Form.Item label='Departments' name='statisticDepartments' rules={[{ required: true }]}>
+                  <ScoreMemberPicker
+                    dimensionGuidOrGlobalId='Department'
+                    showHierarchyDropdown={true}
+                    modalTitle='Select Departments'
+                    selectionMode='multiple'
+                    okText='Select'
+                    onChange={(values) => setStatisticDepartmentSelections(values as [])}
+                  ></ScoreMemberPicker>
+                </Form.Item>
+              </Spacing>
+              <Spacing>
+                <Form.Item label='Accounts' name='statisticAccounts' rules={[{ required: true }]}>
+                  <ScoreMemberPicker
+                    dimensionGuidOrGlobalId='Account'
+                    showHierarchyDropdown={true}
+                    modalTitle='Select Accounts'
+                    selectionMode='multiple'
+                    okText='Select'
+                    onChange={(values) => setStatisticAccountSelections(values as [])}
+                  ></ScoreMemberPicker>
+                </Form.Item>
+              </Spacing>
+            </Spacing>
+          )}
+        </Spacing>
+      </Spacing>
+      <GeneralLedgerDetailsModal data={revenueDetail.departmentDetails} isVisible={showRevenueDetails} glType={AccountType.Revenue} onClose={() => setShowRevenueDetails(false)} />
+      <GeneralLedgerDetailsModal data={expenseDetail.departmentDetails} isVisible={showExpenseDetails} glType={AccountType.Expense} onClose={() => setShowExpenseDetails(false)} />
+      <GeneralLedgerStatisticModal data={statisticDetail.departmentDetails} isVisible={showStatisticDetails} onClose={() => setShowStatisticDetails(false)} />
+    </>
+  );
+};
+
+export default GeneralLedgerDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/data/IGeneralLedgerInitiative.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/data/IGeneralLedgerInitiative.ts
new file mode 100644
index 0000000..a38e021
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/data/IGeneralLedgerInitiative.ts
@@ -0,0 +1,33 @@
+import { IOrgDefinedInitiative, newOrgDefinedInitiative } from '../../../shared/initiatives/data/IOrgDefinedInitiative';
+import { IConfiguration } from '../../../shared/configuration/IConfiguration';
+import { AccountType, OpportunityLevel } from '../../opportunities/data/IGLOpportunity';
+
+export interface IGeneralLedgerInitiative extends IOrgDefinedInitiative {
+  gLOpportunityType: AccountType;
+  goalLevel: OpportunityLevel;
+  departments: [];
+  revenueAccounts: [];
+  expenseAccounts: [];
+  statisticAccounts: [];
+  statisticDepartments: [];
+  hasStatistic: boolean;
+  isSeasonal: boolean;
+}
+
+export const newGeneralLedgerInitiative = (configuration: IConfiguration | undefined, data: Partial<IGeneralLedgerInitiative> = {}): IGeneralLedgerInitiative => {
+  const initiative = newOrgDefinedInitiative(configuration, data) as IGeneralLedgerInitiative;
+  initiative.costDriver = 'General Ledger';
+  initiative.gLOpportunityType = AccountType.Revenue;
+  initiative.goalLevel = OpportunityLevel.Overall;
+  initiative.hasStatistic = false;
+  initiative.revenueAccounts = [];
+  initiative.expenseAccounts = [];
+  initiative.statisticAccounts = [];
+  initiative.statisticDepartments = [];
+  initiative.isSeasonal = false;
+
+  return {
+    ...initiative,
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/data/IGeneralLedgerInitiativeDto.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/data/IGeneralLedgerInitiativeDto.ts
new file mode 100644
index 0000000..414deaa
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/data/IGeneralLedgerInitiativeDto.ts
@@ -0,0 +1,24 @@
+import { IOrgDefinedInitiativeDto, cleanUpOrgDefinedInitiativeDto, newOrgDefinedInitiativeDto } from '../../../shared/initiatives/data/IOrgDefinedInitiativeDto';
+import { AccountType, OpportunityLevel } from '../../opportunities/data/IGLOpportunity';
+import { IGeneralLedgerInitiative } from './IGeneralLedgerInitiative';
+
+export interface IGeneralLedgerInitiativeDto extends IOrgDefinedInitiativeDto {
+  gLOpportunityType: AccountType;
+  goalLevel: OpportunityLevel;
+  departments: [];
+  revenueAccounts: [];
+  expenseAccounts: [];
+  statisticAccounts: [];
+  statisticDepartments: [];
+  hasStatistic: boolean;
+  isSeasonal: boolean;
+}
+
+export const newGeneralLedgerInitiativeDto = (data: Partial<IGeneralLedgerInitiativeDto> = {}): IGeneralLedgerInitiativeDto => {
+  const initiative = newOrgDefinedInitiativeDto(data) as IGeneralLedgerInitiativeDto;
+  return initiative;
+};
+
+export const cleanUpGeneralLedgerInitiative = (data: Partial<IGeneralLedgerInitiative>): IGeneralLedgerInitiativeDto => {
+  return newGeneralLedgerInitiativeDto({ ...data, ...cleanUpOrgDefinedInitiativeDto({ ...data }) });
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/data/initiativeService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/data/initiativeService.ts
new file mode 100644
index 0000000..c382676
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/initiatives/data/initiativeService.ts
@@ -0,0 +1,13 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import { getSecureService } from '@strata/core/lib/http/getSecureService';
+import { IInitiativeDto } from '../../../shared/initiatives/data/IInitiativeDto';
+import { OpportunityCreateResponse } from '../../../shared/initiatives/data/OpportunityCreateResponse';
+
+const { httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'initiatives';
+
+export const initiativeService = {
+  create: function (initiativeInfo: IInitiativeDto): Promise<OpportunityCreateResponse> {
+    return httpPost(`${url}/create-general-ledger`, initiativeInfo);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/Filters.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/Filters.test.tsx
new file mode 100644
index 0000000..b6e5b10
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/Filters.test.tsx
@@ -0,0 +1,103 @@
+import React from 'react';
+import { render, screen, fireEvent } from '../../test-utils/testUtils';
+import { opportunityService } from './data/opportunityService';
+import Filters from './Filters';
+import { IGLFilterOptions, newFilterOptions } from './data/IGLFilterOptions';
+import { IGLFilters } from './data/IGLFilters';
+import { dropDownTestUtils } from '@strata/test-utils/lib';
+import { SeasonalityType } from '../../shared/data/SeasonalityType';
+
+const mockFilterOptions: IGLFilterOptions = newFilterOptions({
+  types: [
+    { text: 'Revenue', id: 'Revenue' },
+    { text: 'Expense', id: 'Expense' },
+    { text: 'Margin', id: 'Margin' }
+  ],
+  levels: [
+    { text: 'Overall', id: 'Overall' },
+    { text: 'Department', id: 'Department' }
+  ]
+});
+
+const mockInitialFilters: IGLFilters = {
+  identifiedSavings: undefined,
+  types: [],
+  levels: [],
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: '',
+  seasonality: SeasonalityType.With
+};
+
+test('Filters default to empty', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const typeDropdown = dropDownTestUtils.getDropDown('Type');
+  const levelDropdown = dropDownTestUtils.getDropDown('Level');
+
+  // verify default value is set correctly
+  expect(dropDownTestUtils.getSelectedOption(typeDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(levelDropdown)).toEqual('');
+});
+
+test('Filters clear', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const typeDropdown = dropDownTestUtils.getDropDown('Type');
+  const levelDropdown = dropDownTestUtils.getDropDown('Level');
+  const identifiedSavingsInput = screen.getByRole('spinbutton', { name: 'Identified Savings Minimum' });
+
+  // verify default value is set correctly
+  for (const txt of mockFilterOptions.types) {
+    await dropDownTestUtils.selectOption(typeDropdown, txt.text);
+  }
+  for (const txt of mockFilterOptions.levels) {
+    await dropDownTestUtils.selectOption(levelDropdown, txt.text);
+  }
+  fireEvent.change(identifiedSavingsInput, { target: { value: 123 } });
+
+  const typeLabel = `All ${mockFilterOptions.types.length} selected`;
+  expect(dropDownTestUtils.getSelectedOption(typeDropdown)).toEqual(typeLabel);
+
+  const levelLabel = `All ${mockFilterOptions.levels.length} selected`;
+  expect(dropDownTestUtils.getSelectedOption(levelDropdown)).toEqual(levelLabel);
+
+  expect(identifiedSavingsInput).toHaveValue('123');
+
+  const clearButton = screen.getByRole('button', { name: 'Clear Filters' });
+  fireEvent.click(clearButton);
+
+  expect(dropDownTestUtils.getSelectedOption(typeDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(levelDropdown)).toEqual('');
+  expect(identifiedSavingsInput).not.toHaveValue();
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/Filters.tsx
new file mode 100644
index 0000000..e156a71
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/Filters.tsx
@@ -0,0 +1,115 @@
+import React, { useCallback } from 'react';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import Drawer from '@strata/tempo/lib/drawer';
+import DropDown from '@strata/tempo/lib/dropdown';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing';
+import Checkbox from '@strata/tempo/lib/checkbox';
+import { initialFilters, IGLFilters } from './data/IGLFilters';
+import { useEffect, useState } from 'react';
+import { opportunityService } from './data/opportunityService';
+import { IListMember } from '../../shared/data/IListMember';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+import { SeasonalityType } from '../../shared/data/SeasonalityType';
+
+interface IFiltersProps {
+  filters: IGLFilters;
+  isVisible: boolean;
+  onApply: (filters: IGLFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const [types, setTypes] = useState<IListMember[]>();
+  const [levels, setLevels] = useState<IListMember[]>();
+  const { currentConfiguration } = useConfigurations();
+
+  const [form] = Form.useForm<IGLFilters>();
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      if (currentConfiguration == null) {
+        return;
+      }
+      const { types, levels } = await opportunityService.getFilterOptions(currentConfiguration.configurationGuid);
+
+      setTypes(types);
+      setLevels(levels);
+      handleClearFilters();
+    };
+
+    loadFiltersOptions();
+  }, [currentConfiguration, handleClearFilters]);
+
+  const handleApplyFilters = () => {
+    const filters: IGLFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Identified Savings Minimum' name='identifiedSavings'>
+          <InputNumber format='currency' placeholder='' precision={0} />
+        </Form.Item>
+        <Form.Item label='Type' name='types'>
+          <DropDown multiSelect items={types} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Level' name='levels'>
+          <DropDown multiSelect items={levels} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Seasonality' name='seasonality'>
+          <RadioGroup
+            options={[
+              { value: SeasonalityType.WithAndWithout, label: 'With & Without Seasonality' },
+              { value: SeasonalityType.With, label: 'With Seasonality' },
+              { value: SeasonalityType.Without, label: 'Without Seasonality' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Display' name='viewVisible'>
+          <RadioGroup
+            options={[
+              { value: true, label: 'Visible Opportunities' },
+              { value: false, label: 'Hidden Opportunities' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Initiatives' name='excludeInitiatives' valuePropName='checked'>
+          <Checkbox>Exclude Opportunities with Initiatives</Checkbox>
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/GeneralLedgerOpportunityModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/GeneralLedgerOpportunityModal.tsx
new file mode 100644
index 0000000..f6c3c6f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/GeneralLedgerOpportunityModal.tsx
@@ -0,0 +1,418 @@
+/* eslint-disable prettier/prettier */
+import React, { useEffect, useState } from 'react';
+import Modal from '@strata/tempo/lib/modal';
+import Form from '@strata/tempo/lib/form/Form';
+import Input from '@strata/tempo/lib/input/Input';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import InputTextArea from '@strata/tempo/lib/inputtextarea/InputTextArea';
+import RadioGroup from '@strata/tempo/lib/radiogroup/RadioGroup';
+import { AccountType, OpportunityLevel } from './data/IGLOpportunity';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import Divider from '@strata/tempo/lib/divider/Divider';
+import Text from '@strata/tempo/lib/text';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Link from '@strata/tempo/lib/link/Link';
+import Button from '@strata/tempo/lib/button/Button';
+import { useHelpCenter } from '@strata/core/lib/help/useHelpCenter';
+import { RegEx } from '../../shared/validation/RegEx';
+import { opportunityService } from './data/opportunityService';
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import { usersService } from '../../shared/users/usersService';
+import { IUser } from '../../shared/users/IUser';
+import { IGeneralLedgerOpportunitySaveModel, newGeneralLedgerOpportunitySaveModel } from './data/IGeneralLedgerOpportunitySaveModel';
+import { ScoreMemberPicker } from '@strata/score/lib/ScoreMemberPicker';
+import GeneralLedgerDetailsModal from '../details/GeneralLedgerDetailsModal';
+import GeneralLedgerStatisticModal from '../details/GeneralLedgerStatisticModal';
+import { IGLDetail, initialDetail } from '../details/data/IGLDetail';
+import intlService from '@strata/intl/lib';
+import { nameIsDuplicate, nameValidationService } from '../../shared/opportunities/data/nameValidationService';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import useToast from '@strata/tempo/lib/toast';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+
+export interface IGeneralLedgerOpportunityModalProps {
+  isVisible: boolean;
+  onCancel?: () => void;
+}
+
+const GeneralLedgerOpportunityModal: React.FC<IGeneralLedgerOpportunityModalProps> = (props: IGeneralLedgerOpportunityModalProps) => {
+  const { isVisible, onCancel } = props;
+  const [form] = Form.useForm<IGeneralLedgerOpportunitySaveModel>();
+  const [owners, setOwners] = useState<IUser[]>([]);
+  const { userSetting } = React.useContext(UserSettingContext);
+  const [opportunity, setOpportunity] = useState<IGeneralLedgerOpportunitySaveModel>(newGeneralLedgerOpportunitySaveModel(''));
+  const [saving, setSaving] = React.useState(false);
+  const [showRevenueDetails, setShowRevenueDetails] = useState<boolean>(false);
+  const [showExpenseDetails, setShowExpenseDetails] = useState<boolean>(false);
+  const [showStatisticDetails, setShowStatisticDetails] = useState<boolean>(false);
+  const [revenueDetail, setRevenueDetail] = useState<IGLDetail>(initialDetail);
+  const [expenseDetail, setExpenseDetail] = useState<IGLDetail>(initialDetail);
+  const [statisticDetail, setStatisticDetail] = useState<IGLDetail>(initialDetail);
+  const helpCenter = useHelpCenter();
+  const toast = useToast();
+  const jazzUrl = useJazzUrlWithVersion();
+
+  useEffect(() => {
+    const loadData = async () => {
+      setOpportunity(newGeneralLedgerOpportunitySaveModel(userSetting.configurationGuid));
+    };
+    if (userSetting.configurationGuid !== '') {
+      loadData();
+    }
+  }, [userSetting.configurationGuid]);
+
+  useEffect(() => {
+    const loadData = async () => {
+      setOwners(await usersService.getOwners());
+    };
+    if (isVisible) {
+      loadData();
+    }
+  }, [isVisible]);
+
+  const getAccountLabel = () => {
+    if (opportunity.gLOpportunityType !== AccountType.Margin) {
+      return AccountType[opportunity.gLOpportunityType].toUpperCase();
+    }
+    return '';
+  };
+
+  const getGeneralLedgerOpportunityUrl = (opportunityGuid: string) => {
+    return `${jazzUrl}CCI/GeneralLedger/OpportunityViewer.aspx?opportunityGuid=${opportunityGuid}`;
+  };
+
+  // close modal
+  const handleModalClose = async () => {
+    if (onCancel) {
+      onCancel();
+    }
+    resetForm();
+  };
+
+  // reset opportunity, reset form
+  const resetForm = async () => {
+    const newOpportunity = newGeneralLedgerOpportunitySaveModel(userSetting.configurationGuid);
+    setOpportunity(newOpportunity);
+    setRevenueDetail(initialDetail);
+    setExpenseDetail(initialDetail);
+    setStatisticDetail(initialDetail);
+    form.setFieldsValue(newOpportunity);
+  };
+
+  const handleFinishFailed = (fields: any) => {
+    return;
+  };
+
+  // update opportunity with form values
+  const handleValuesChanged = (changedValues: any) => {
+    updateDepartmentDetails();
+    updateStatisticDetails();
+    const mergedOpportunity = { ...opportunity, ...changedValues } as IGeneralLedgerOpportunitySaveModel;
+    // Changing Type or Opportunity Level should clear/reset all selections below them in the modal
+    if (changedValues.accountType != null || changedValues.goalLevel != null) {
+      const initialOpportunity = newGeneralLedgerOpportunitySaveModel(userSetting.configurationGuid);
+      mergedOpportunity.departments = initialOpportunity.departments;
+      mergedOpportunity.expenseAccounts = initialOpportunity.expenseAccounts;
+      mergedOpportunity.revenueAccounts = initialOpportunity.revenueAccounts;
+      mergedOpportunity.hasStatistic = initialOpportunity.hasStatistic;
+      mergedOpportunity.statisticDepartments = initialOpportunity.statisticAccounts;
+      mergedOpportunity.statisticAccounts = initialOpportunity.statisticAccounts;
+    }
+
+    setOpportunity(mergedOpportunity);
+    form.setFieldsValue(mergedOpportunity);
+  };
+
+  // Save form, clear fields
+  const handleFormFinish = (values: any) => {
+    setOwnerName(values.ownerGuid, owners, opportunity);
+    handleOpportunitySave({ ...opportunity, ...values });
+  };
+
+  const setOwnerName = (name: string, owners: IUser[], opportunity: IGeneralLedgerOpportunitySaveModel) => {
+    const selectedOwnerId = name;
+    const selectedOwnerName = owners.find((owner) => owner.userGuid === selectedOwnerId)?.fullName;
+    opportunity.ownerName = selectedOwnerName ?? '';
+  };
+
+  const handleOpportunitySave = async (saveOpportunity: IGeneralLedgerOpportunitySaveModel) => {
+    setSaving(true);
+    try {
+      toast.show({
+        key: saveOpportunity.name,
+        toastType: 'loading',
+        message: `Creating ${saveOpportunity.name} Opportunity`,
+        duration: 2
+      });
+
+      await opportunityService.createOpportunity(saveOpportunity, function (newOpportunityGuid: string) {
+        toast.show({
+          key: saveOpportunity.name,
+          toastType: 'success',
+          duration: 0,
+          message: (
+            <>
+              <Link href={getGeneralLedgerOpportunityUrl(newOpportunityGuid)}>{saveOpportunity.name}</Link>
+              &nbsp;Opportunity Created
+            </>
+          )
+        });
+        handleModalClose();
+      });
+    } catch (error) {
+      if (error instanceof Response) {
+        // Handles exceptions or unhandled validation from server
+        toast.show({
+          key: saveOpportunity.name,
+          message: `${saveOpportunity.name} Opportunity was not created. Try again and contact us if the issue continues.`,
+          toastType: 'error'
+        });
+        handleModalClose();
+      }
+    }
+    setSaving(false);
+  };
+
+  const updateDepartmentDetails = async () => {
+    const departments = form.getFieldValue('departments');
+    if (departments.length === 0) return;
+    const revenueData = { departments: departments, accounts: form.getFieldValue('revenueAccounts') };
+    const expenseData = { departments: departments, accounts: form.getFieldValue('expenseAccounts') };
+    if (revenueData.accounts?.length > 0 && revenueData.departments?.length > 0) {
+      const revenueResults = await opportunityService.getDepartmentData(userSetting.configurationGuid, revenueData);
+      setRevenueDetail(revenueResults);
+    }
+    if (expenseData.accounts?.length > 0 && expenseData.departments?.length > 0) {
+      const expenseResults = await opportunityService.getDepartmentData(userSetting.configurationGuid, expenseData);
+      setExpenseDetail(expenseResults);
+    }
+  };
+  const updateStatisticDetails = async () => {
+    const departments = form.getFieldValue('statisticDepartments');
+    if (departments.length === 0) return;
+    const statisticData = { departments: departments, accounts: form.getFieldValue('statisticAccounts') };
+    if (statisticData.accounts?.length > 0 && statisticData.departments?.length > 0) {
+      const statisticResults = await opportunityService.getStatisticData(userSetting.configurationGuid, statisticData);
+      setStatisticDetail(statisticResults);
+    }
+  };
+
+  let opportunityDetails = <></>;
+  const revenueDetails = (
+    <Form.Item>
+      <Spacing column hAlign='left'>
+        <Text size='large' strong>
+          {intlService.formatNumber(revenueDetail.total, 'currencyDecimal')}
+        </Text>
+        <Button type='link' onClick={() => setShowRevenueDetails(true)}>
+          View Revenue Details
+        </Button>
+      </Spacing>
+    </Form.Item>
+  );
+  const expenseDetails = (
+    <Form.Item>
+      <Spacing column hAlign='left'>
+        <Text size='large' strong>
+          {intlService.formatNumber(expenseDetail.total, 'currencyDecimal')}
+        </Text>
+        <Button type='link' onClick={() => setShowExpenseDetails(true)}>
+          View Expense Details
+        </Button>
+      </Spacing>
+    </Form.Item>
+  );
+
+  switch (opportunity.gLOpportunityType) {
+    case AccountType.Margin: {
+      opportunityDetails = (
+        <Spacing>
+          {revenueDetails}
+          {expenseDetails}
+        </Spacing>
+      );
+      break;
+    }
+    case AccountType.Revenue: {
+      opportunityDetails = revenueDetails;
+      break;
+    }
+    case AccountType.Expense: {
+      opportunityDetails = expenseDetails;
+      break;
+    }
+  }
+
+  const validateName = (name: string) => {
+    return nameValidationService.nameIsValid(userSetting.configurationGuid, OpportunityTypes.GeneralLedger, name);
+  };
+
+  return (
+    <Modal
+      loading={saving}
+      title='Build General Ledger Opportunity'
+      visible={isVisible}
+      onCancel={handleModalClose}
+      footer={
+        <>
+          <Spacing hAlign='space-between'>
+            <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1319')}></Button>
+            <Spacing>
+              <Button onClick={handleModalClose}>Cancel</Button>
+              <Button type='primary' onClick={() => form.submit()}>
+                Add
+              </Button>
+            </Spacing>
+          </Spacing>
+        </>
+      }
+    >
+      <Form form={form} initialValues={opportunity} onValuesChange={handleValuesChanged} onFinish={handleFormFinish} onFinishFailed={handleFinishFailed}>
+        <Spacing column itemSpacing={16}>
+          <Text color='secondary' strong={true}>
+            GENERAL INFORMATION
+          </Text>
+          <Form.Item
+            label='Name'
+            name='name'
+            rules={[
+              { required: true, whitespace: false, max: 200, pattern: RegEx.JazzRestrictedCharacters },
+              () => ({
+                async validator(_, value) {
+                  if (!value || (await validateName(value))) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(nameIsDuplicate);
+                }
+              })
+            ]}
+          >
+            <Input />
+          </Form.Item>
+        </Spacing>
+        <Form.Item label='Owner' name='ownerGuid' rules={[{ required: true }]}>
+          <DropDown placeholder='Select Owner' items={owners} itemTextField='fullName' itemValueField='userGuid'></DropDown>
+        </Form.Item>
+        <Form.Item label='Notes' name='note'>
+          <InputTextArea />
+        </Form.Item>
+        <Form.Item label='Type' name='gLOpportunityType' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: AccountType.Revenue, label: 'Revenue' },
+              { value: AccountType.Expense, label: 'Expense' },
+              { value: AccountType.Margin, label: 'Margin' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Opportunity Level' name='goalLevel' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: OpportunityLevel.Overall, label: 'Overall Opportunity' },
+              { value: OpportunityLevel.DepartmentLevel, label: 'Department Level Opportunity' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Seasonality' name='isSeasonal' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: true, label: 'With Seasonality' },
+              { value: false, label: 'Without Seasonality' }
+            ]}
+          />
+        </Form.Item>
+
+        <Divider extended={false}></Divider>
+
+        <Spacing column itemSpacing={16}>
+          <Text color='secondary' strong={true}>
+            DEPARTMENTS AND {getAccountLabel()} ACCOUNTS
+          </Text>
+          {opportunityDetails}
+        </Spacing>
+
+        <Spacing>
+          <Form.Item label='Departments' name='departments' rules={[{ required: true }]}>
+            <ScoreMemberPicker dimensionGuidOrGlobalId='Department' showHierarchyDropdown={true} modalTitle='Select Departments' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+          </Form.Item>
+        </Spacing>
+
+        {opportunity.gLOpportunityType === AccountType.Revenue && (
+          <Spacing>
+            <Form.Item label='Accounts' name='revenueAccounts' rules={[{ required: true }]}>
+              <ScoreMemberPicker dimensionGuidOrGlobalId='Account' showHierarchyDropdown={true} modalTitle='Select Accounts' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+            </Form.Item>
+          </Spacing>
+        )}
+        {opportunity.gLOpportunityType === AccountType.Expense && (
+          <Spacing>
+            <Form.Item label='Accounts' name='expenseAccounts' rules={[{ required: true }]}>
+              <ScoreMemberPicker dimensionGuidOrGlobalId='Account' showHierarchyDropdown={true} modalTitle='Select Accounts' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+            </Form.Item>
+          </Spacing>
+        )}
+        {opportunity.gLOpportunityType === AccountType.Margin && (
+          <Spacing column>
+            <Spacing>
+              <Form.Item label='Revenue Accounts' name='revenueAccounts' rules={[{ required: true }]}>
+                <ScoreMemberPicker dimensionGuidOrGlobalId='Account' showHierarchyDropdown={true} modalTitle='Select Revenue Accounts' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+              </Form.Item>
+            </Spacing>
+
+            <Spacing>
+              <Form.Item label='Expense Accounts' name='expenseAccounts' rules={[{ required: true }]}>
+                <ScoreMemberPicker dimensionGuidOrGlobalId='Account' showHierarchyDropdown={true} modalTitle='Select Expense Accounts' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+              </Form.Item>
+            </Spacing>
+          </Spacing>
+        )}
+
+        <Divider extended={false}></Divider>
+
+        <Spacing column itemSpacing={16}>
+          <Text color='secondary' strong={true}>
+            DEPARTMENTS AND STATISTIC ACCOUNTS
+          </Text>
+          <Form.Item label='Do you want to use a Statistic data source?' name='hasStatistic' rules={[{ required: true }]}>
+            <RadioGroup
+              options={[
+                { value: false, label: 'No' },
+                { value: true, label: 'Yes' }
+              ]}
+            />
+          </Form.Item>
+
+          {opportunity.hasStatistic && (
+            <Spacing column>
+              <Form.Item>
+                <Spacing column hAlign='left'>
+                  <Text size='large' strong>
+                    {intlService.formatNumber(statisticDetail.total, 'decimal')}
+                  </Text>
+                  <Button type='link' onClick={() => setShowStatisticDetails(true)}>
+                    View Statistic Details
+                  </Button>
+                </Spacing>
+              </Form.Item>
+              <Spacing>
+                <Form.Item label='Departments' name='statisticDepartments' rules={[{ required: true }]}>
+                  <ScoreMemberPicker dimensionGuidOrGlobalId='Department' showHierarchyDropdown={true} modalTitle='Select Departments' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+                </Form.Item>
+              </Spacing>
+              <Spacing>
+                <Form.Item label='Accounts' name='statisticAccounts' rules={[{ required: true }]}>
+                  <ScoreMemberPicker dimensionGuidOrGlobalId='Account' showHierarchyDropdown={true} modalTitle='Select Accounts' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+                </Form.Item>
+              </Spacing>
+            </Spacing>
+          )}
+        </Spacing>
+      </Form>
+      <GeneralLedgerDetailsModal data={revenueDetail.departmentDetails} isVisible={showRevenueDetails} glType={AccountType.Revenue} onClose={() => setShowRevenueDetails(false)} />
+      <GeneralLedgerDetailsModal data={expenseDetail.departmentDetails} isVisible={showExpenseDetails} glType={AccountType.Expense} onClose={() => setShowExpenseDetails(false)} />
+      <GeneralLedgerStatisticModal data={statisticDetail.departmentDetails} isVisible={showStatisticDetails} onClose={() => setShowStatisticDetails(false)} />
+    </Modal>
+  );
+};
+
+export default GeneralLedgerOpportunityModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/Opportunities.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/Opportunities.test.tsx
new file mode 100644
index 0000000..a38b2de
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/Opportunities.test.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import { render, screen, within } from '../../test-utils/testUtils';
+import { IGLOpportunity, newGLOpportunity } from './data/IGLOpportunity';
+import { opportunityService } from './data/opportunityService';
+import { IPagedApiResponse } from '../../shared/paging/IPagedApiResponse';
+import Opportunities from './Opportunities';
+
+const mockOpportunities: IGLOpportunity[] = [
+  newGLOpportunity({
+    opportunityKey: 'GL - 1',
+    name: 'General Ledger 1',
+    identifiedSavings: 100,
+    type: 'Revenue',
+    level: 'Overall',
+    isSeasonal: true
+  }),
+  newGLOpportunity({
+    opportunityKey: 'GL - 2',
+    name: 'General Ledger 2',
+    identifiedSavings: 200,
+    type: 'Expense',
+    level: 'Department',
+    isSeasonal: true
+  })
+];
+
+const mockPagedOpportunities: IPagedApiResponse<IGLOpportunity> = {
+  data: mockOpportunities,
+  pagingInfo: {
+    pageNumber: 1,
+    resultsPerPage: 25,
+    totalNumberOfResults: 2,
+    totalPages: 1
+  }
+};
+
+test('All opportunities are shown', async () => {
+  jest.spyOn(opportunityService, 'getOpportunities').mockImplementation(() => Promise.resolve(mockPagedOpportunities));
+
+  // render component
+  render(<Opportunities />);
+
+  // wait for grid to load
+  const cell = await screen.findByRole('cell', { name: mockPagedOpportunities.data[0].opportunityKey });
+
+  // get rows
+  const tableBody = cell?.parentElement?.parentElement as HTMLElement;
+  const rows = within(tableBody).getAllByRole('row');
+
+  // verify data shows in grid
+  mockPagedOpportunities.data.forEach((opportunity, index) => {
+    const row = rows[index];
+    within(row).getByText(opportunity.opportunityKey);
+    within(row).getByText(opportunity.name);
+    within(row).getByText(opportunity.type);
+    within(row).getByText(opportunity.level);
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/Opportunities.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/Opportunities.tsx
new file mode 100644
index 0000000..f7b748b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/Opportunities.tsx
@@ -0,0 +1,84 @@
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import Button from '@strata/tempo/lib/button/Button';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import OpportunitiesGrid from '../../shared/opportunities/OpportunitiesGrid';
+import { IOpportunity } from '../../shared/opportunities/data';
+import Filters from './Filters';
+import { IGLFilters, initialFilters, numberOfFilters } from './data/IGLFilters';
+import { opportunityService } from './data/opportunityService';
+
+const Opportunities: React.FC = () => {
+  const [filters, setFilters] = useState<IGLFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+  const jazzUrl = useJazzUrlWithVersion();
+  const history = useHistory();
+
+  useEffect(() => {
+    document.title = 'General Ledger';
+  }, []);
+
+  useEffect(() => {
+    if (currentConfiguration == null) {
+      return;
+    }
+    setFilters(initialFilters);
+    setCurrentConfigurationGuid(currentConfiguration.configurationGuid);
+  }, [currentConfiguration]);
+
+  const handleApplyFilters = (newFilters: IGLFilters) => {
+    setFiltersVisible(false);
+    setFilters({ ...filters, ...newFilters });
+  };
+
+  const handleSearch = (searchValue: string) => {
+    setFilters((filters) => {
+      return { ...filters, opportunitySearch: searchValue };
+    });
+  };
+
+  const getOpportunityUrl = (opportunity: IOpportunity) => {
+    return `${jazzUrl}CCI/GeneralLedger/OpportunityViewer.aspx?opportunityGuid=${opportunity.opportunityGuid}`;
+  };
+
+  const getInitiativeUrl = (opportunity: IOpportunity) => {
+    return `${jazzUrl}CCI/GeneralLedger/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+  };
+
+  const buildOpportunityButton = (
+    <Button type='primary' icon={<PlusIcon />} onClick={() => history.push(`/initiatives/create/general-ledger`, { networkOpportunityId: undefined, networkOpportunityName: undefined })}>
+      Opportunity
+    </Button>
+  );
+
+  return (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />
+      <OpportunitiesGrid
+        configurationGuid={currentConfigurationGuid}
+        getOpportunityUrl={getOpportunityUrl}
+        getInitiativeUrl={getInitiativeUrl}
+        filters={filters}
+        opportunityService={opportunityService}
+        identifiedSavingsIndex={2}
+        numOfSelectedFilters={numberOfFilters(filters)}
+        searchPlaceholderText='Search'
+        onFilter={() => setFiltersVisible(true)}
+        onSearch={handleSearch}
+        customAction={buildOpportunityButton}
+      >
+        <DataGrid.Column field='name' header='Name' sortable width={160} />
+        <DataGrid.Column field='type' header='Type' sortable width={120} />
+        <DataGrid.Column field='level' header='Level' sortable width={120} />
+        <DataGrid.Column field='isSeasonal' header='Seasonality' sortable width={104} customCellValue={(args) => (args.rowData[args.field] ? 'With' : 'Without')} />
+      </OpportunitiesGrid>
+    </>
+  );
+};
+
+export default Opportunities;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/IGLFilterOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/IGLFilterOptions.ts
new file mode 100644
index 0000000..006ce78
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/IGLFilterOptions.ts
@@ -0,0 +1,16 @@
+import { IListMember } from '../../../shared/data/IListMember';
+
+export interface IGLFilterOptions {
+  types: IListMember[];
+  levels: IListMember[];
+}
+
+export const newFilterOptions = (data: Partial<IGLFilterOptions> = {}): IGLFilterOptions => {
+  return {
+    ...{
+      types: [],
+      levels: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/IGLFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/IGLFilters.ts
new file mode 100644
index 0000000..dca6ed0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/IGLFilters.ts
@@ -0,0 +1,29 @@
+import { SeasonalityType } from '../../../shared/data/SeasonalityType';
+import { IOpportunityFilters } from '../../../shared/opportunities/data';
+
+export interface IGLFilters extends IOpportunityFilters {
+  types: string[];
+  levels: string[];
+  seasonality: SeasonalityType;
+}
+
+export const initialFilters: IGLFilters = {
+  identifiedSavings: undefined,
+  types: [],
+  levels: [],
+  seasonality: SeasonalityType.WithAndWithout,
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+export const numberOfFilters = (filters: IGLFilters): number => {
+  let filtersCount = 0;
+  if (filters.identifiedSavings != null) filtersCount++;
+  if (filters.types.length > 0) filtersCount++;
+  if (filters.levels.length > 0) filtersCount++;
+  if (filters.seasonality !== SeasonalityType.WithAndWithout) filtersCount++;
+  if (filters.viewVisible === false) filtersCount++;
+  if (filters.excludeInitiatives === true) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/IGLOpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/IGLOpportunity.ts
new file mode 100644
index 0000000..82d606a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/IGLOpportunity.ts
@@ -0,0 +1,41 @@
+import { IOpportunity } from '../../../shared/opportunities/data/IOpportunity';
+
+export interface IGLOpportunity extends IOpportunity {
+  name: string;
+  type: string;
+  level: string;
+  isSeasonal: boolean;
+}
+
+export enum AccountType {
+  Revenue = 0,
+  Expense = 1,
+  Margin = 2
+}
+
+export enum OpportunityLevel {
+  Overall = 0,
+  DepartmentLevel = 1
+}
+
+export const newGLOpportunity = (data: Partial<IGLOpportunity> = {}): IGLOpportunity => {
+  return {
+    ...{
+      name: '',
+      opportunityKey: '',
+      opportunityId: 0,
+      opportunityGuid: '',
+      identifiedSavings: 0,
+      type: '',
+      level: '',
+      hasInitiative: false,
+      note: '',
+      isSeasonal: false,
+      isHidden: false,
+      initiativeGuid: '',
+      sourceOpportunity: '',
+      sourceOpportunityId: -1
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/IGeneralLedgerOpportunitySaveModel.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/IGeneralLedgerOpportunitySaveModel.ts
new file mode 100644
index 0000000..c844a62
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/IGeneralLedgerOpportunitySaveModel.ts
@@ -0,0 +1,40 @@
+import { AccountType, OpportunityLevel } from './IGLOpportunity';
+
+export interface IGeneralLedgerOpportunitySaveModel {
+  configurationGuid: string;
+  name: string;
+  note: string;
+  gLOpportunityType: AccountType;
+  goalLevel: OpportunityLevel;
+  ownerGuid: string;
+  ownerName: string;
+  departments: [];
+  revenueAccounts: [];
+  expenseAccounts: [];
+  statisticAccounts: [];
+  statisticDepartments: [];
+  hasStatistic: boolean;
+  isSeasonal: boolean;
+}
+
+export const newGeneralLedgerOpportunitySaveModel = (configurationGuid: string, data: Partial<IGeneralLedgerOpportunitySaveModel> = {}): IGeneralLedgerOpportunitySaveModel => {
+  return {
+    ...{
+      opportunityGuid: '',
+      name: '',
+      ownerGuid: '',
+      ownerName: '',
+      note: '',
+      configurationGuid: configurationGuid,
+      gLOpportunityType: AccountType.Revenue,
+      goalLevel: OpportunityLevel.Overall,
+      hasStatistic: false,
+      departments: [],
+      revenueAccounts: [],
+      expenseAccounts: [],
+      statisticAccounts: [],
+      statisticDepartments: [],
+      isSeasonal: true
+    }
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/opportunityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/opportunityService.ts
new file mode 100644
index 0000000..3d50d4e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/general-ledger/opportunities/data/opportunityService.ts
@@ -0,0 +1,77 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IOpportunityJobResults } from '../../../shared/hangfire/IOpportunityJobResults';
+import { IOpportunityFilters, IOpportunityService } from '../../../shared/opportunities/data';
+import { IPagedApiResponse, IPagingOptions, ISortOptions } from '../../../shared/paging';
+import { IGLDepartmentAccountData } from './../../details/data/IGLDepartmentAccountData';
+import { IGLDetail } from './../../details/data/IGLDetail';
+import { IGLFilterOptions } from './IGLFilterOptions';
+import { IGLOpportunity } from './IGLOpportunity';
+import { IGeneralLedgerOpportunitySaveModel } from './IGeneralLedgerOpportunitySaveModel';
+
+const { httpGet, httpPost, httpPut, httpDelete, httpDownloadAndDisplayFile } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'general-ledger-opportunities';
+
+export const opportunityService: IOpportunityService = {
+  getOpportunities: async (configurationGuid: string, pagingOptions: IPagingOptions, filters: IOpportunityFilters): Promise<IPagedApiResponse<IGLOpportunity>> => {
+    return httpPost<IPagedApiResponse<IGLOpportunity>>(`general-ledger-opportunities`, {
+      pagingOptions,
+      filters: {
+        ...filters,
+        configurationGuid
+      }
+    });
+  },
+
+  getOpportunity: async (opportunityGuid: string): Promise<IGLOpportunity> => {
+    return httpGet<IGLOpportunity>(`${url}/${opportunityGuid}`);
+  },
+
+  export: async (configurationGuid: string, sortOptions: ISortOptions, filters: IOpportunityFilters): Promise<void> => {
+    const date = new Date();
+    const fileName = 'GL_CI_Opportunities_' + date.toISOString().split('T')[0];
+    httpDownloadAndDisplayFile(
+      'general-ledger-opportunities/export',
+      {
+        method: 'post',
+        body: JSON.stringify({
+          sortOptions,
+          filters: {
+            ...filters,
+            configurationGuid
+          }
+        })
+      },
+      fileName
+    );
+  },
+
+  getFilterOptions: (configurationGuid: string): Promise<IGLFilterOptions> => {
+    return httpGet<IGLFilterOptions>(`general-ledger-opportunities/${configurationGuid}/filter-options`);
+  },
+
+  setHidden: async (opportunityGuid: string, isHidden: boolean): Promise<void> => {
+    await httpPut(`general-ledger-opportunities/${opportunityGuid}/set-hidden`, isHidden);
+  },
+
+  setNote: async (opportunityGuid: string, note: string): Promise<void> => {
+    await httpPut(`general-ledger-opportunities/${opportunityGuid}/set-note`, note);
+  },
+
+  createOpportunity: async (opportunity: IGeneralLedgerOpportunitySaveModel, callback: () => IOpportunityJobResults): Promise<IOpportunityJobResults> => {
+    return httpPost<IOpportunityJobResults>(`general-ledger-opportunities/create`, opportunity).then(callback);
+  },
+
+  getDepartmentData: async (configurationGuid: string, departmentAccountData: IGLDepartmentAccountData): Promise<IGLDetail> => {
+    return httpPost<IGLDetail>(`general-ledger-details/${configurationGuid}/department-data`, departmentAccountData);
+  },
+
+  getStatisticData: async (configurationGuid: string, departmentAccountData: IGLDepartmentAccountData): Promise<IGLDetail> => {
+    return httpPost<IGLDetail>(`general-ledger-details/${configurationGuid}/statistic-data`, departmentAccountData);
+  },
+
+  delete: async (opportunityGuid: string, callback: () => void, failed: (err: any) => void): Promise<void> => {
+    httpDelete(`${url}/${opportunityGuid}/delete`)
+      .then(callback)
+      .catch((e) => failed(e));
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadFiles.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadFiles.tsx
new file mode 100644
index 0000000..aa7e0e2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadFiles.tsx
@@ -0,0 +1,134 @@
+import { useOidcSession } from '@strata/core/lib/auth/useOidcSession';
+import Button from '@strata/tempo/lib/button/Button';
+import Header from '@strata/tempo/lib/header/Header';
+import Link from '@strata/tempo/lib/link/Link';
+import { useModal } from '@strata/tempo/lib/modal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Tabs from '@strata/tempo/lib/tabs';
+import useToast from '@strata/tempo/lib/toast';
+import React, { useEffect, useState } from 'react';
+import { deviceIdentifierService } from './data/deviceIdentifierService';
+import { hangfireService } from '../shared/hangfire/hangfireService';
+import UploadGMDNCategories from './UploadGMDNCategories';
+import UploadGMDNTermCategories from './UploadGMDNTermCategories';
+import UploadGMDNTerms from './UploadGMDNTerms';
+import UploadGUDIDDevices from './UploadGUDIDDevices';
+import UploadGUDIDTerms from './UploadGUDIDTerms';
+import UploadGUDIDIdentifiers from './UploadGUDIDIdentifiers';
+import { appConfig } from '@strata/core/lib/config/appConfig';
+
+const UploadFiles: React.FC = () => {
+  const [accessGudid, setAccessGudid] = useState<string>('');
+  const [datadog, setDatadog] = useState<string>('');
+  const [isClearing, setIsClearing] = useState<boolean>(false);
+  const toast = useToast();
+  const modal = useModal();
+  const session = useOidcSession();
+
+  useEffect(() => {
+    const getAccessGudid = async () => {
+      const url = await hangfireService.getAccessGudidUrl();
+      setAccessGudid(url);
+    };
+    if (accessGudid === '') {
+      getAccessGudid();
+    }
+  }, [accessGudid]);
+
+  useEffect(() => {
+    const getDatadog = async () => {
+      const url = await hangfireService.getDatadogUrl();
+      setDatadog(url);
+    };
+    if (datadog === '') {
+      getDatadog();
+    }
+  }, [datadog]);
+
+  const toastShowJobInfo = (jobId: string, jobName: string) => {
+    try {
+      const hangfireUrl = appConfig['hangfireUrl'];
+      const href = hangfireUrl + '/jobs/details/' + jobId;
+      toast.show({
+        duration: 30,
+        toastType: 'info',
+        message: (
+          <Link href={href} newTab>
+            Hangfire {jobName} Job Started
+          </Link>
+        )
+      });
+    } catch {
+      toast.show({
+        duration: 30,
+        toastType: 'info',
+        message: `Hangfire ${jobName} Job Started`
+      });
+    }
+  };
+
+  const handleClearDeviceIdentifiers = async () => {
+    modal.confirm({
+      title: 'Clear DimDeviceIdentifier?',
+      content: 'This will clear DimDeviceIdentifier for Non-CI clients.',
+      okText: 'Clear',
+      cancelText: 'Cancel',
+      confirmType: 'danger',
+      async onOk() {
+        setIsClearing(true);
+        try {
+          const id = await deviceIdentifierService.clearDeviceIdentifiers();
+          toastShowJobInfo(id, 'Clear Device Identifiers');
+        } catch (error) {
+          toast.show({
+            toastType: 'error',
+            message: 'Failed to clear device identifiers',
+            duration: 5
+          });
+          console.error('Failed to clear device identifiers:', error);
+        } finally {
+          setIsClearing(false);
+        }
+      }
+    });
+  };
+
+  return (
+    <>
+      <Header
+        title='GMDN File Upload Portal'
+        extra={
+          <>
+            <Spacing itemSpacing={16} vAlign='center'>
+              <Button onClick={handleClearDeviceIdentifiers} disabled={isClearing}>
+                Clear DimDeviceIdentifier (Non-CI clients)
+              </Button>
+              <Link href={datadog} newTab>
+                Datadog
+              </Link>
+              <Link href={accessGudid} newTab>
+                Access GUDID downloads
+              </Link>
+            </Spacing>
+          </>
+        }
+      />
+      {session.isStrata ? (
+        <Tabs
+          items={[
+            { key: 'gudidTerms', label: 'GUDID Terms', children: <UploadGUDIDTerms /> },
+            { key: 'gudidDevices', label: 'GUDID Devices', children: <UploadGUDIDDevices /> },
+            { key: 'gudidIdentifiers', label: 'GUDID Identifiers', children: <UploadGUDIDIdentifiers /> },
+            { key: 'terms', label: 'GMDN Terms', children: <UploadGMDNTerms /> },
+            { key: 'termCategories', label: 'GMDN Term Categories', children: <UploadGMDNTermCategories /> },
+            { key: 'categories', label: 'GMDN Categories', children: <UploadGMDNCategories /> }
+          ]}
+        />
+      ) : (
+        ''
+      )}
+    </>
+  );
+};
+
+export default UploadFiles;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGMDN.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGMDN.tsx
new file mode 100644
index 0000000..874e87c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGMDN.tsx
@@ -0,0 +1,56 @@
+import { useOidcSession } from '@strata/core/lib/auth';
+import { ActionBar, Spacing, UploadButton, useToast } from '@strata/tempo/lib';
+import Text from '@strata/tempo/lib/text';
+import { UploadChangeParam } from '@strata/tempo/lib/uploadbutton';
+import React from 'react';
+import notificationHub from '../shared/notification/NotificationHub';
+import gmdnFileType from './data/gmdnFileType';
+import { gmdnFileUploadService } from './data/gmdnFileUploadService';
+
+export interface IUploadGMDNProps {
+  fileType: gmdnFileType;
+  fileName: string;
+}
+
+const UploadGMDN: React.FC<IUploadGMDNProps> = (props: IUploadGMDNProps) => {
+  const { fileType, fileName } = props;
+  const hub = notificationHub.useConnection();
+  const toast = useToast();
+  const session = useOidcSession();
+
+  const handleGMDNUpload = async (info: UploadChangeParam, type: gmdnFileType) => {
+    toast.show({
+      key: session.userName + info.file.name,
+      toastType: 'info',
+      message: `Uploading file: ${info.file.name} to server.`,
+      duration: 0
+    });
+
+    notificationHub.register(
+      hub,
+      async () => {
+        await gmdnFileUploadService.uploadGmdnFile(type, info.file as unknown as File);
+      },
+      session.userName + info.file.name
+    );
+  };
+
+  return (
+    <ActionBar
+      filters={
+        <>
+          <Spacing column>
+            <Spacing itemSpacing={16} vAlign='center'>
+              <UploadButton buttonText={`Upload (xml)`} onChange={(info) => handleGMDNUpload(info, fileType)} accept='.xml' />
+              <Text color='secondary' size='small'>
+                These uploads seed the database directly. These files are from GMDN ({fileName}.xml)
+              </Text>
+            </Spacing>
+          </Spacing>
+        </>
+      }
+    />
+  );
+};
+
+export default UploadGMDN;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGMDNCategories.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGMDNCategories.tsx
new file mode 100644
index 0000000..9f51d18
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGMDNCategories.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import UploadGMDN from './UploadGMDN';
+import gmdnFileType from './data/gmdnFileType';
+
+const UploadGMDNCategories: React.FC = () => {
+  return <UploadGMDN fileType={gmdnFileType.category} fileName='gmdnCategory' />;
+};
+
+export default UploadGMDNCategories;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGMDNTermCategories.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGMDNTermCategories.tsx
new file mode 100644
index 0000000..1b17e16
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGMDNTermCategories.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import UploadGMDN from './UploadGMDN';
+import gmdnFileType from './data/gmdnFileType';
+
+const UploadGMDNTermCategories: React.FC = () => {
+  return <UploadGMDN fileType={gmdnFileType.termCategory} fileName='gmdn_categoryTermLink' />;
+};
+
+export default UploadGMDNTermCategories;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGMDNTerms.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGMDNTerms.tsx
new file mode 100644
index 0000000..b4cd279
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGMDNTerms.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import UploadGMDN from './UploadGMDN';
+import gmdnFileType from './data/gmdnFileType';
+
+const UploadGMDNTerms: React.FC = () => {
+  return <UploadGMDN fileType={gmdnFileType.term} fileName='gmdnData' />;
+};
+
+export default UploadGMDNTerms;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGUDID.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGUDID.tsx
new file mode 100644
index 0000000..8fa15d8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGUDID.tsx
@@ -0,0 +1,84 @@
+import { useOidcSession } from '@strata/core/lib/auth';
+import ActionBar from '@strata/tempo/lib/actionbar';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import Link from '@strata/tempo/lib/link';
+import Spacing from '@strata/tempo/lib/spacing';
+import useToast from '@strata/tempo/lib/toast';
+import UploadButton, { UploadChangeParam } from '@strata/tempo/lib/uploadbutton';
+import React, { useEffect, useState } from 'react';
+import notificationHub from '../shared/notification/NotificationHub';
+import { dataGroup } from './data/dataGroup';
+import { gudidService } from './data/gudidService';
+
+export interface IUploadGUDIDProps {
+  dataGroup: dataGroup;
+  fileName: string;
+}
+
+const UploadGUDID: React.FC<IUploadGUDIDProps> = (props: IUploadGUDIDProps) => {
+  const { dataGroup } = props;
+  const hub = notificationHub.useConnection();
+  const toast = useToast();
+  const session = useOidcSession();
+
+  const [jobId, setJobId] = useState<string>('');
+
+  useEffect(() => {
+    if (jobId === '') {
+      return;
+    }
+    toast.show({
+      duration: 0,
+      toastType: 'info',
+      message: (
+        <>
+          <Link href={jobId} newTab>
+            Job
+          </Link>
+          &nbsp;Started
+        </>
+      )
+    });
+  }, [jobId, toast]);
+
+  const handleSeeding = async (info: UploadChangeParam, DataGroup: dataGroup) => {
+    toast.show({
+      key: session.userName + info.file.name,
+      toastType: 'info',
+      message: `Seeding file: ${info.file.name} to server.`,
+      duration: 30
+    });
+
+    notificationHub.register(
+      hub,
+      async () => {
+        if (dataGroup === 2) {
+          const id = await gudidService.seedgudid(dataGroup, info.file as unknown as File);
+          setJobId(id);
+        } else {
+          await gudidService.seedgudid(dataGroup, info.file as unknown as File);
+        }
+      },
+      session.userName + info.file.name
+    );
+  };
+
+  return (
+    <>
+      <ActionBar
+        filters={
+          <Spacing column>
+            <Spacing itemSpacing={16} vAlign='center'>
+              <UploadButton buttonText='Seed Data' onChange={(info) => handleSeeding(info, dataGroup)} multiple accept='.csv, .txt' />
+            </Spacing>
+          </Spacing>
+        }
+      />
+      <DataGrid>
+        <DataGrid.Column header='Files' field='file' sortable width={160} />
+      </DataGrid>
+    </>
+  );
+};
+
+export default UploadGUDID;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGUDIDDevices.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGUDIDDevices.tsx
new file mode 100644
index 0000000..02ed6d9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGUDIDDevices.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import UploadGUDID from './UploadGUDID';
+import { dataGroup } from './data/dataGroup';
+
+const UploadGUDIDDevices: React.FC = () => {
+  return <UploadGUDID dataGroup={dataGroup.devices} fileName='device' />;
+};
+
+export default UploadGUDIDDevices;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGUDIDIdentifiers.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGUDIDIdentifiers.tsx
new file mode 100644
index 0000000..30a267c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGUDIDIdentifiers.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import UploadGUDID from './UploadGUDID';
+import { dataGroup } from './data/dataGroup';
+
+const UploadGUDIDIdentifiers: React.FC = () => {
+  return <UploadGUDID dataGroup={dataGroup.identifiers} fileName='identifiers' />;
+};
+
+export default UploadGUDIDIdentifiers;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGUDIDTerms.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGUDIDTerms.tsx
new file mode 100644
index 0000000..bad2679
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/UploadGUDIDTerms.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import UploadGUDID from './UploadGUDID';
+import { dataGroup } from './data/dataGroup';
+
+const UploadGUDIDTerms: React.FC = () => {
+  return <UploadGUDID dataGroup={dataGroup.terms} fileName='gmdnTerms' />;
+};
+
+export default UploadGUDIDTerms;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/dataGroup.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/dataGroup.ts
new file mode 100644
index 0000000..f4e23ae
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/dataGroup.ts
@@ -0,0 +1,7 @@
+export enum dataGroup {
+  terms,
+  devices,
+  identifiers
+}
+
+export default dataGroup;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/deviceIdentifierService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/deviceIdentifierService.ts
new file mode 100644
index 0000000..7b3b1a2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/deviceIdentifierService.ts
@@ -0,0 +1,10 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+
+const { httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = `device-identifiers`;
+
+export const deviceIdentifierService = {
+  clearDeviceIdentifiers: (): Promise<string> => {
+    return httpPost(`${url}/clear-device-identifiers`, undefined);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/gmdnFileType.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/gmdnFileType.ts
new file mode 100644
index 0000000..b86911e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/gmdnFileType.ts
@@ -0,0 +1,7 @@
+export enum gmdnFileType {
+  term,
+  termCategory,
+  category
+}
+
+export default gmdnFileType;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/gmdnFileUploadService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/gmdnFileUploadService.ts
new file mode 100644
index 0000000..74c3add
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/gmdnFileUploadService.ts
@@ -0,0 +1,13 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import gmdnFileType from './gmdnFileType';
+
+const { httpUpload } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = `gmdnfile-upload`;
+
+export const gmdnFileUploadService = {
+  uploadGmdnFile: (fileType: gmdnFileType, file: File): Promise<boolean> => {
+    const formData = new FormData();
+    formData.append('file', file);
+    return httpUpload(`${url}/${fileType}/upload-gmdnfile`, formData);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/gudidService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/gudidService.ts
new file mode 100644
index 0000000..727db87
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/gmdn/data/gudidService.ts
@@ -0,0 +1,13 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { dataGroup } from '../../gmdn/data/dataGroup';
+
+const { httpUpload } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = `gudid-file`;
+
+export const gudidService = {
+  seedgudid: (isTerms: dataGroup, file: File): Promise<string> => {
+    const formData = new FormData();
+    formData.append('file', file);
+    return httpUpload(`${url}/${isTerms as number}/seed-gudid`, formData);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/index.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/index.tsx
new file mode 100644
index 0000000..f1cd4c9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/index.tsx
@@ -0,0 +1,15 @@
+import 'react-app-polyfill/ie11';
+import 'react-app-polyfill/stable';
+
+import React from 'react';
+import ReactDOM from 'react-dom';
+import './index.scss';
+import App from './App';
+import * as serviceWorker from './serviceWorker';
+
+ReactDOM.render(<App />, document.getElementById('root'));
+
+// If you want your app to work offline and load faster, you can change
+// unregister() to register() below. Note this comes with some pitfalls.
+// Learn more about service workers: https://bit.ly/CRA-PWA
+serviceWorker.unregister();
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/Filters.tsx
new file mode 100644
index 0000000..31c6d72
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/Filters.tsx
@@ -0,0 +1,153 @@
+import Button from '@strata/tempo/lib/button';
+import Drawer from '@strata/tempo/lib/drawer';
+import DropDown from '@strata/tempo/lib/dropdown';
+import Form from '@strata/tempo/lib/form';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import Spacing from '@strata/tempo/lib/spacing';
+import React, { useCallback, useEffect, useState } from 'react';
+import { useConfigurations } from '../shared/configuration/ConfigurationContext';
+import { convertNullOrEmptyStrToUndefined } from '../shared/utilities';
+import { INameItem } from './data/IInitiativeFilterOptions';
+import { IInitiativeFilters, InitiativeStatus, initialFilters } from './data/IInitiativeFilters';
+import { IInitiativeRollupValue } from './data/IInitiativeRollupValue';
+import { IUserProfile } from './data/IUserProfile';
+import { initiativeRollupColumnService } from './data/initiativeRollupColumnService';
+import { initiativeService } from './data/initiativeService';
+
+interface IFiltersProps {
+  filters: IInitiativeFilters;
+  isVisible: boolean;
+  onApply: (filters: IInitiativeFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const { currentConfiguration } = useConfigurations();
+  const [costDrivers, setCostDrivers] = useState<INameItem[]>();
+  const [costLeaders, setCostLeaders] = useState<IUserProfile[]>();
+  const [owners, setOwners] = useState<IUserProfile[]>();
+  const [executiveSponsors, setExecutiveSponsors] = useState<IUserProfile[]>();
+  const [workstreams, setWorkstreams] = useState<INameItem[]>();
+  const [rollupColumnHeaders, setRollupColumnHeaders] = useState<string[]>(['', '', '']);
+  const [rollup1ColumnValues, setRollup1ColumnValues] = useState<IInitiativeRollupValue[]>([]);
+  const [rollup2ColumnValues, setRollup2ColumnValues] = useState<IInitiativeRollupValue[]>([]);
+  const [rollup3ColumnValues, setRollup3ColumnValues] = useState<IInitiativeRollupValue[]>([]);
+  const [form] = Form.useForm<IInitiativeFilters>();
+
+  const handleInitializeFilters = useCallback(
+    (filters: IInitiativeFilters) => {
+      form.setFieldsValue(filters);
+    },
+    [form]
+  );
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      if (currentConfiguration == null) {
+        return;
+      }
+      const { costDrivers, costLeaders, owners, executiveSponsors, workstreams } = await initiativeService.getFilterOptions(currentConfiguration.configurationGuid);
+
+      setCostDrivers(costDrivers);
+      setCostLeaders(costLeaders);
+      setOwners(owners);
+      setExecutiveSponsors(executiveSponsors);
+      setWorkstreams(workstreams);
+      handleInitializeFilters(props.filters);
+    };
+    const loadRollupColumns = async () => {
+      const columns = await initiativeRollupColumnService.getColumns();
+      const rollupColumnHeaders = { ...['', '', ''], ...columns.map((h) => h.name) };
+      setRollupColumnHeaders(rollupColumnHeaders);
+      const rollupColumnValues = columns.map((h) => h.initiativeRollupValues);
+      setRollup1ColumnValues(rollupColumnValues.length > 0 ? rollupColumnValues[0] : []);
+      setRollup2ColumnValues(rollupColumnValues.length > 1 ? rollupColumnValues[1] : []);
+      setRollup3ColumnValues(rollupColumnValues.length > 2 ? rollupColumnValues[2] : []);
+    };
+
+    loadFiltersOptions();
+    loadRollupColumns();
+  }, [currentConfiguration, handleInitializeFilters, props.filters]);
+
+  const handleApplyFilters = () => {
+    const filters: IInitiativeFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={() => handleInitializeFilters(initialFilters)}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Status' name='status'>
+          <RadioGroup
+            options={[
+              { value: InitiativeStatus.Both, label: 'Both' },
+              { value: InitiativeStatus.Draft, label: 'Draft' },
+              { value: InitiativeStatus.Tracking, label: 'Final' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Cost Driver' name='costDrivers'>
+          <DropDown multiSelect items={costDrivers} allowClear itemTextField='name' itemValueField='name'></DropDown>
+        </Form.Item>
+        <Form.Item label='Cost Leader' name='costLeaders'>
+          <DropDown multiSelect items={costLeaders} allowClear itemTextField='nameFull' itemValueField='userGuid'></DropDown>
+        </Form.Item>
+        <Form.Item label='Owner' name='owners'>
+          <DropDown multiSelect items={owners} allowClear itemTextField='nameFull' itemValueField='userGuid'></DropDown>
+        </Form.Item>
+        <Form.Item label='Executive Sponsor' name='executiveSponsors'>
+          <DropDown multiSelect items={executiveSponsors} allowClear itemTextField='nameFull' itemValueField='userGuid'></DropDown>
+        </Form.Item>
+        <Form.Item label='Workstream' name='workstreams'>
+          <DropDown multiSelect items={workstreams} allowClear itemTextField='name' itemValueField='name'></DropDown>
+        </Form.Item>
+        {rollupColumnHeaders[0] !== '' ? (
+          <Form.Item label={rollupColumnHeaders[0]} name='rollupColumn1Values'>
+            <DropDown multiSelect items={rollup1ColumnValues} allowClear itemTextField='value' itemValueField='initiativeRollupValueId'></DropDown>
+          </Form.Item>
+        ) : (
+          <></>
+        )}
+        {rollupColumnHeaders[1] !== `` ? (
+          <Form.Item label={rollupColumnHeaders[1]} name='rollupColumn2Values'>
+            <DropDown multiSelect items={rollup2ColumnValues} allowClear itemTextField='value' itemValueField='initiativeRollupValueId'></DropDown>
+          </Form.Item>
+        ) : (
+          <></>
+        )}
+        {rollupColumnHeaders[2] !== `` ? (
+          <Form.Item label={rollupColumnHeaders[2]} name='rollupColumn3Values'>
+            <DropDown multiSelect items={rollup3ColumnValues} allowClear itemTextField='value' itemValueField='initiativeRollupValueId'></DropDown>
+          </Form.Item>
+        ) : (
+          <></>
+        )}
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/Initiative.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/Initiative.tsx
new file mode 100644
index 0000000..8998654
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/Initiative.tsx
@@ -0,0 +1,28 @@
+import React, { useEffect, useState } from 'react';
+import Initiatives from './Initiatives';
+import { IInitiativeFilters, initialFilters } from './data/IInitiativeFilters';
+import { initiativeService } from './data/initiativeService';
+
+const Initiative: React.FC = () => {
+  const [userFilters, setUserFilters] = useState<IInitiativeFilters>(initialFilters);
+  const [initiatilized, setInitialized] = useState<boolean>(false);
+
+  useEffect(() => {
+    const loadUserFilters = async () => {
+      const filters = await initiativeService.getFilterSettings();
+      setUserFilters(filters);
+    };
+    if (!initiatilized) {
+      setInitialized(true);
+      loadUserFilters();
+    }
+  }, [initiatilized]);
+
+  return (
+    <>
+      <Initiatives userFilters={userFilters} />
+    </>
+  );
+};
+
+export default Initiative;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/Initiatives.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/Initiatives.tsx
new file mode 100644
index 0000000..7538586
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/Initiatives.tsx
@@ -0,0 +1,780 @@
+import { useHelpCenter, useJazzUrlWithVersion } from '@strata/core/lib';
+import { logger } from '@strata/logging/lib';
+import { ICellArgs, LayoutGrid, Popover, Tooltip } from '@strata/tempo/lib';
+import ActionBar from '@strata/tempo/lib/actionbar';
+import Button from '@strata/tempo/lib/button';
+import ButtonMenu from '@strata/tempo/lib/buttonmenu';
+import DropDown, { DropDownValue } from '@strata/tempo/lib/dropdown';
+import Header from '@strata/tempo/lib/header';
+import FilterIcon from '@strata/tempo/lib/icon/FilterIcon';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import Input from '@strata/tempo/lib/input';
+import Link from '@strata/tempo/lib/link';
+import Spacing from '@strata/tempo/lib/spacing';
+import Text from '@strata/tempo/lib/text';
+import useToast from '@strata/tempo/lib/toast';
+import TreeGrid from '@strata/tempo/lib/treegrid';
+import dayjs from 'dayjs';
+import debounce from 'lodash.debounce';
+import sumBy from 'lodash/sumBy';
+import React, { useContext, useEffect, useMemo, useState } from 'react';
+import { useLocation } from 'react-router';
+import { OpportunityTypes } from '../opportunities/opportunities/data/IAllOpportunity';
+import { useConfigurations } from '../shared/configuration/ConfigurationContext';
+import ConfigurationDropdown from '../shared/configuration/ConfigurationDropdown';
+import CreateInitiativeButtonMenu from '../shared/initiatives/CreateInitiativeButtonMenu';
+import { ISortOptions } from '../shared/paging';
+import { securityService } from '../shared/security/data/securityService';
+import Filters from './Filters';
+import ManageColumns from './ManageColumns';
+import { IInitiativeDetail, defaultInitiativeDetail } from './data/IInitiativeDetail';
+import { IMappedColumn } from '../shared/components/IMappedColumn';
+import { IInitiativeFilters, InitiativeGroupByCategory, InitiativeStatus, numberOfFilters } from './data/IInitiativeFilters';
+import { IInitiativeRollupValue } from './data/IInitiativeRollupValue';
+import { IInitiativeTreeGridModel } from './data/IInitiativeTreeGridModel';
+import { initiativeDetailColumnService } from './data/initiativeDetailColumnService';
+import { initiativeRollupColumnService } from './data/initiativeRollupColumnService';
+import { initiativeService } from './data/initiativeService';
+import UserSettingContext from '../shared/userSetting/UserSettingContext';
+import { HEADER_HEIGHT } from '../shared/constants';
+
+export interface IInitiativeGridProps {
+  userFilters: IInitiativeFilters;
+}
+
+const initialSortOptions = {
+  sortField: 'name',
+  sortOrder: 1
+};
+
+const Initiatives: React.FC<IInitiativeGridProps> = (props: IInitiativeGridProps) => {
+  const { userFilters } = props;
+  const location = useLocation();
+  const queryParams = new URLSearchParams(location.search);
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+  const [hasStatusFilter] = useState<string>(queryParams.get('status') ?? '');
+  const [ownerFilter] = useState<string>(queryParams.get('owner') ?? '');
+  const [executiveSponsorFilter] = useState<string>(queryParams.get('exec') ?? '');
+  const [treeGridData, setTreeGridData] = useState<IInitiativeTreeGridModel[]>();
+  const [treeGridKeysData, setTreeGridKeysData] = useState<string[]>();
+  const [loading, setLoading] = useState(false);
+  const [sortOptions, setSortOptions] = useState<ISortOptions>(initialSortOptions);
+  const [filters, setFilters] = useState<IInitiativeFilters>(userFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const [manageColumnsVisible, setManageColumnsVisible] = useState(false);
+  const [columnList, setColumnList] = useState<IMappedColumn[]>([]);
+  const [numOfSelectedFilters, setNumOfSelectedFilters] = useState(0);
+  const [rollupColumnHeaders, setRollupColumnHeaders] = useState<string[]>(['', '', '']);
+  const [rollup1ColumnValues, setRollup1ColumnValues] = useState<IInitiativeRollupValue[]>([]);
+  const [rollup2ColumnValues, setRollup2ColumnValues] = useState<IInitiativeRollupValue[]>([]);
+  const [rollup3ColumnValues, setRollup3ColumnValues] = useState<IInitiativeRollupValue[]>([]);
+  const [groupByOptions, setGroupByOptions] = useState<any>([]);
+
+  const helpCenter = useHelpCenter();
+  const jazzUrl = useJazzUrlWithVersion();
+  const toast = useToast();
+  const [hasGeneralAccessPermission, setHasGeneralAccessPermission] = useState(false);
+  const { isAdmin } = useContext(UserSettingContext);
+
+  useEffect(() => {
+    const loadColumnList = async () => {
+      const columns = await initiativeDetailColumnService.getColumnList();
+      setColumnList(columns);
+    };
+
+    if (hasStatusFilter === '0') {
+      userFilters.status = InitiativeStatus.Draft;
+    } else if (hasStatusFilter === '2') {
+      userFilters.status = InitiativeStatus.Tracking;
+    }
+    switch (userFilters.groupByCategory.toString()) {
+      case InitiativeGroupByCategory[InitiativeGroupByCategory.RollupColumn1]:
+        userFilters.groupByCategory = InitiativeGroupByCategory.RollupColumn1;
+        break;
+      case InitiativeGroupByCategory[InitiativeGroupByCategory.RollupColumn2]:
+        userFilters.groupByCategory = InitiativeGroupByCategory.RollupColumn2;
+        break;
+      case InitiativeGroupByCategory[InitiativeGroupByCategory.RollupColumn3]:
+        userFilters.groupByCategory = InitiativeGroupByCategory.RollupColumn3;
+        break;
+    }
+    if (ownerFilter !== '' && !userFilters.owners.includes(ownerFilter)) {
+      userFilters.owners.push(ownerFilter);
+    }
+    if (executiveSponsorFilter !== '' && !userFilters.executiveSponsors.includes(executiveSponsorFilter)) {
+      userFilters.executiveSponsors.push(executiveSponsorFilter);
+    }
+    if (!userFilters.rollupColumn1Values) {
+      userFilters.rollupColumn1Values = [];
+    }
+    if (!userFilters.rollupColumn2Values) {
+      userFilters.rollupColumn2Values = [];
+    }
+    if (!userFilters.rollupColumn3Values) {
+      userFilters.rollupColumn3Values = [];
+    }
+    setFilters(userFilters);
+    setNumOfSelectedFilters(numberOfFilters(userFilters));
+    loadColumnList();
+    loadRollupColumns();
+  }, [executiveSponsorFilter, hasStatusFilter, ownerFilter, userFilters]);
+
+  useEffect(() => {
+    const loadData = async () => {
+      if (currentConfiguration == null) {
+        return;
+      }
+      setHasGeneralAccessPermission(await securityService.getGeneralAccessPermissions());
+      setCurrentConfigurationGuid(currentConfiguration.configurationGuid);
+      setLoading(true);
+      try {
+        const data = await initiativeService.getInitiatives(currentConfiguration.configurationGuid, filters);
+        processColumns(data);
+        setTreeGridData(data);
+        setTreeGridKeysData(data.map((item) => item.key));
+      } finally {
+        setLoading(false);
+      }
+    };
+    loadData();
+  }, [currentConfiguration, filters]);
+
+  useEffect(() => {
+    const options = [
+      { text: 'Cost Driver', value: InitiativeGroupByCategory.CostDriver },
+      { text: 'Cost Leader', value: InitiativeGroupByCategory.CostLeader },
+      { text: 'Executive Sponsor', value: InitiativeGroupByCategory.ExecutiveSponsor },
+      { text: 'Owner', value: InitiativeGroupByCategory.Owner },
+      { text: 'Status', value: InitiativeGroupByCategory.Status },
+      { text: 'Workstream', value: InitiativeGroupByCategory.Workstream }
+    ];
+    rollupColumnHeaders.forEach((rc, index) => {
+      if (rc !== '') {
+        options.push({ text: rc, value: (6 + index) as InitiativeGroupByCategory });
+      }
+    });
+    options.push({ text: 'None', value: InitiativeGroupByCategory.None });
+    setGroupByOptions(options);
+  }, [rollupColumnHeaders]);
+
+  const loadRollupColumns = async () => {
+    const columns = await initiativeRollupColumnService.getColumns();
+    const rollupColumnHeaders: string[] = [];
+    const rollupColumnValues: IInitiativeRollupValue[][] = [];
+
+    Array(3)
+      .fill('')
+      .forEach((element, index) => {
+        const item = columns.find((x) => x.initiativeRollupColumnId === index + 1);
+        rollupColumnHeaders.push(item ? item.name : '');
+        rollupColumnValues.push(item ? item.initiativeRollupValues : []);
+      });
+
+    setRollupColumnHeaders(rollupColumnHeaders);
+    setRollup1ColumnValues(rollupColumnValues[0]);
+    setRollup2ColumnValues(rollupColumnValues[1]);
+    setRollup3ColumnValues(rollupColumnValues[2]);
+
+    const filterValue = Number.isInteger(InitiativeGroupByCategory[filters.groupByCategory]) ? filters.groupByCategory.toString() : InitiativeGroupByCategory[filters.groupByCategory];
+
+    if (filterValue.startsWith('RollupColumn') && !columns.find((x) => x.initiativeRollupColumnId === parseInt(filterValue.slice(-1)))) {
+      const filter = { ...filters, groupByCategory: InitiativeGroupByCategory.Workstream };
+      setFilters(filter);
+    }
+  };
+
+  // handleSearch is internal function and does not need to be in dependency array
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const handleSearchWithDebounce = useMemo(() => debounce((value) => handleSearch(value), 500), []);
+  useEffect(() => {
+    return () => {
+      handleSearchWithDebounce.cancel();
+    };
+  }, [handleSearchWithDebounce]);
+
+  const handleSearch = (searchValue: string) => {
+    logger.log('search', searchValue);
+    setFilters((prev) => ({ ...prev, name: searchValue }));
+  };
+
+  const handleApplyFilters = (newFilters: IInitiativeFilters) => {
+    setFiltersVisible(false);
+    setFilters({ ...filters, ...newFilters });
+    setNumOfSelectedFilters(numberOfFilters(newFilters));
+  };
+
+  const handleExport = async (e: { key: React.Key }) => {
+    const exportAll = e.key === 'All';
+    const exportFilters = exportAll ? ({} as IInitiativeFilters) : filters;
+    await initiativeService.export(currentConfigurationGuid, exportAll, sortOptions, exportFilters);
+  };
+
+  const getRollupHeader = (rollupColumnId: number) => {
+    return (
+      <Popover trigger='hover' title={''} content={rollupColumnHeaders[rollupColumnId]}>
+        <Text strong ellipsis={{ rows: 2 }}>
+          {rollupColumnHeaders[rollupColumnId]}
+        </Text>
+      </Popover>
+    );
+  };
+
+  const getInitiativeUrl = (initiative: IInitiativeDetail) => {
+    const isFinancial = initiative.costDriver === 'Financial Free Form';
+    switch (initiative.opportunityType) {
+      case OpportunityTypes.ChargeCode:
+        return `${jazzUrl}CCI/ChargeCode/InitiativeViewer.aspx?id=${initiative.initiativeGuid}`;
+      case OpportunityTypes.Encounter:
+        return `${jazzUrl}CCI/Encounter/InitiativeViewer.aspx?id=${initiative.initiativeGuid}`;
+      case OpportunityTypes.UtilizationVariation:
+        return `${jazzUrl}CCI/Variation/InitiativeViewer.aspx?id=${initiative.initiativeGuid}`;
+      case OpportunityTypes.QualityVariation:
+        return `${jazzUrl}CCI/QualityVariation/InitiativeViewer.aspx?id=${initiative.initiativeGuid}`;
+      case OpportunityTypes.FreeForm:
+        return `${jazzUrl}CCI/FreeForm/${isFinancial ? 'Financial' : ''}InitiativeViewer.aspx?id=${initiative.initiativeGuid}`;
+      case OpportunityTypes.GeneralLedger:
+        return `${jazzUrl}CCI/GeneralLedger/InitiativeViewer.aspx?id=${initiative.initiativeGuid}`;
+      case OpportunityTypes.Payroll:
+        return `${jazzUrl}CCI/Payroll/InitiativeViewer.aspx?id=${initiative.initiativeGuid}`;
+      case OpportunityTypes.Exploration:
+        return `${jazzUrl}CCI/ExplorationVariation/InitiativeViewer.aspx?id=${initiative.initiativeGuid}`;
+      default:
+        return '';
+    }
+  };
+
+  const handleGroupByChange = async (selection: DropDownValue) => {
+    const groupByCategory = selection as InitiativeGroupByCategory;
+    if (filters.groupByCategory !== groupByCategory) {
+      const filter = { ...filters, groupByCategory };
+      setFilters(filter);
+    }
+  };
+
+  const handleApplyColumns = (columns: IMappedColumn[]) => {
+    setManageColumnsVisible(false);
+    loadRollupColumns();
+
+    rollupColumnHeaders.forEach((rc, idx) => {
+      if (filters.groupByCategory === idx + 5 && rc === '') {
+        const filter = { ...filters, groupByCategory: InitiativeGroupByCategory.None };
+        setFilters(filter);
+      }
+    });
+
+    initiativeDetailColumnService.setColumnList(columns);
+    setColumnList(columns);
+  };
+
+  const deleteRollupFromData = (rollupColumnId: number | undefined, initiativeRollupValueId: number | undefined) => {
+    const gridData = treeGridData;
+
+    gridData?.forEach((c) => {
+      c.children.forEach((item) => {
+        if (rollupColumnId === 1 && ((initiativeRollupValueId && item.data.initiativeRollup1Id === initiativeRollupValueId) || !initiativeRollupValueId)) item.data.initiativeRollup1Id = 0;
+        if (rollupColumnId === 2 && ((initiativeRollupValueId && item.data.initiativeRollup2Id === initiativeRollupValueId) || !initiativeRollupValueId)) item.data.initiativeRollup2Id = 0;
+        if (rollupColumnId === 3 && ((initiativeRollupValueId && item.data.initiativeRollup3Id === initiativeRollupValueId) || !initiativeRollupValueId)) item.data.initiativeRollup3Id = 0;
+      });
+    });
+  };
+
+  const processColumns = (data: IInitiativeTreeGridModel[]) => {
+    data.forEach((row) => {
+      if (row.children) {
+        row.key = `${row.key === 'Tracking' ? 'Final' : row.key} (${row.children.length} ${row.children.length === 1 ? 'Initiative' : 'Initiatives'})`;
+      }
+      if (!row.data) {
+        row.data = { ...defaultInitiativeDetail, name: row.key };
+      }
+      if (row.children && row.children.length > 0) {
+        columnList
+          .filter((col: IMappedColumn) => !col.isHidden)
+          .forEach((col) => {
+            const colName = col.name;
+            switch (colName) {
+              case '':
+                break;
+              case 'CurrentMonthGoal':
+                row.data.currentMonthGoalSum = sumBy(
+                  row.children.map((col) => col.data),
+                  'currentMonthGoal'
+                );
+                break;
+              case 'CurrentMonthActual':
+                row.data.currentMonthActualSum = sumBy(
+                  row.children.map((col) => col.data),
+                  'currentMonthActual'
+                );
+                break;
+              case 'CurrentMonthVariance':
+                row.data.currentMonthVarianceSum = sumBy(
+                  row.children.map((col) => col.data),
+                  'currentMonthVariance'
+                );
+                break;
+              case 'YTDGoal':
+                row.data.ytdGoalSum = sumBy(
+                  row.children.map((col) => col.data),
+                  'ytdGoal'
+                );
+                break;
+              case 'YTDActual':
+                row.data.ytdActualSum = sumBy(
+                  row.children.map((col) => col.data),
+                  'ytdActual'
+                );
+                break;
+              case 'YTDVariance':
+                row.data.ytdVarianceSum = sumBy(
+                  row.children.map((col) => col.data),
+                  'ytdVariance'
+                );
+                break;
+              case 'SavingsCommitted':
+                row.data.savingsCommittedSum = sumBy(
+                  row.children.map((col) => col.data),
+                  'savingsCommitted'
+                );
+                break;
+              case 'AnnualGoal':
+                row.data.annualGoalSum = sumBy(
+                  row.children.map((col) => col.data),
+                  'annualGoal'
+                );
+                break;
+            }
+          });
+      }
+    });
+    return data;
+  };
+
+  const getLeafSum = (args: ICellArgs) => {
+    switch (args.field) {
+      case '':
+        break;
+      case 'currentMonthGoal':
+        return args.row.children ? args.rowData.currentMonthGoalSum : args.rowData.currentMonthGoal;
+      case 'currentMonthActual':
+        return args.row.children ? args.rowData.currentMonthActualSum : args.rowData.currentMonthActual;
+      case 'currentMonthVariance':
+        return args.row.children ? args.rowData.currentMonthVarianceSum : args.rowData.currentMonthVariance;
+      case 'ytdGoal':
+        return args.row.children ? args.rowData.ytdGoalSum : args.rowData.ytdGoal;
+      case 'ytdActual':
+        return args.row.children ? args.rowData.ytdActualSum : args.rowData.ytdActual;
+      case 'ytdVariance':
+        return args.row.children ? args.rowData.ytdVarianceSum : args.rowData.ytdVariance;
+      case 'savingsCommitted':
+        return args.row.children ? args.rowData.savingsCommittedSum : args.rowData.savingsCommitted;
+      case 'annualGoal':
+        return args.row.children ? args.rowData.annualGoalSum : args.rowData.annualGoal;
+    }
+  };
+
+  const setInitiativeRollup = (key: string, data: IInitiativeDetail, id: number, rollupValueId: number) => {
+    const gridData = treeGridData?.slice(0);
+    const treeGridModelFound = findTreeGridDataRow(key, gridData, id, rollupValueId);
+    if (treeGridModelFound) {
+      setTreeGridData(gridData);
+      setTreeGridKeysData(gridData?.map((item) => item.key));
+      const initiativeGuid = data.initiativeGuid;
+      initiativeService.setInitiativeRollupValue(initiativeGuid, id, rollupValueId);
+      if (filters.groupByCategory === id + InitiativeGroupByCategory.Workstream) {
+        toast.show({
+          key: filters.groupByCategory.toString(),
+          message: (
+            <>
+              <Button onClick={() => window.location.reload()} type='link'>
+                Refresh
+              </Button>{' '}
+              page to update groupings.
+            </>
+          )
+        });
+      }
+    }
+  };
+
+  const findTreeGridDataRow = (key: string, children: IInitiativeTreeGridModel[] | undefined, id: number, rollupValueId: number): boolean => {
+    let treeGridModelFound = false;
+    children?.forEach((gd) => {
+      if (!treeGridModelFound) {
+        if (gd.children) {
+          treeGridModelFound = findTreeGridDataRow(key, gd.children, id, rollupValueId);
+        } else if (gd.key === key) {
+          treeGridModelFound = true;
+          switch (id) {
+            case 1:
+              gd.data.initiativeRollup1Id = rollupValueId;
+              break;
+            case 2:
+              gd.data.initiativeRollup2Id = rollupValueId;
+              break;
+            case 3:
+              gd.data.initiativeRollup3Id = rollupValueId;
+              break;
+          }
+        }
+      }
+    });
+    return treeGridModelFound;
+  };
+
+  const renderColumns = () => {
+    const columns: JSX.Element[] = [
+      <TreeGrid.Column
+        key='name'
+        expander
+        field='name'
+        header='Initiative'
+        sortable
+        width={300}
+        frozen={columnList.length > 0}
+        headerStyle={{ height: HEADER_HEIGHT }} // needed to align with non-frozen column header
+        body={(rowData) => {
+          if (!rowData.children) {
+            return (
+              <Tooltip title={rowData.data?.name ?? ''}>
+                <Link href={getInitiativeUrl(rowData.data)}>
+                  <Text strong ellipsis={{ rows: 1 }}>
+                    {rowData.data.name}
+                  </Text>
+                </Link>
+              </Tooltip>
+            );
+          }
+          return rowData.key === 'Tracking' ? (
+            'Final'
+          ) : (
+            <Tooltip title={rowData.key ?? ''}>
+              <Text strong ellipsis={{ rows: 1 }}>
+                {rowData.data.name}
+              </Text>
+            </Tooltip>
+          );
+        }}
+      />
+    ];
+    if (columnList.length === 0) {
+      return columns;
+    }
+    columnList
+      .filter((col: IMappedColumn) => !col.isHidden)
+      .forEach((col: IMappedColumn) => {
+        const result = col.name.replace(/InitiativeRollup([\d]).*/g, '$1');
+        const rollupid = parseInt(result);
+        const rollupHeader = rollupid ? rollupColumnHeaders[rollupid - 1] : '';
+        let colName = col.name;
+        if (rollupHeader === '') {
+          switch (colName) {
+            case 'InitiativeRollup1Id':
+            case 'InitiativeRollup2Id':
+            case 'InitiativeRollup3Id':
+              colName = '';
+              break;
+          }
+        }
+        switch (colName) {
+          case '':
+            break;
+          case 'SourceOpportunity':
+            columns.push(
+              <TreeGrid.Column
+                key='sourceOpportunity'
+                field='sourceOpportunity'
+                header='Source Opportunity'
+                width={154}
+                sortable
+                sortField='sourceOpportunityId'
+                body={(rowData) => {
+                  if (rowData.data && rowData.sourceOpportunityId !== -1) {
+                    return hasGeneralAccessPermission ? (
+                      <Link href={`/network-opportunity/${rowData.data.sourceOpportunityId}`}>
+                        <Text strong ellipsis={{ rows: 1 }}>
+                          {rowData.data.sourceOpportunity}
+                        </Text>
+                      </Link>
+                    ) : (
+                      <Text ellipsis={{ rows: 1 }}>{rowData.data.sourceOpportunity}</Text>
+                    );
+                  }
+                }}
+              />
+            );
+            break;
+          case 'Status':
+            columns.push(
+              <TreeGrid.Column
+                field='status'
+                header='Status'
+                headerStyle={{ height: HEADER_HEIGHT, width: 70 }}
+                sortable
+                width={70}
+                customCellValue={(cellArgs) => (!cellArgs.rowData.status ? '' : cellArgs.rowData.status === 'Tracking' ? 'Final' : 'Draft')}
+              />
+            );
+            break;
+          case 'CostDriver':
+            columns.push(
+              <TreeGrid.Column
+                field='costDriver'
+                header='Cost Driver'
+                sortable
+                width={130}
+                body={(rowData) => {
+                  return <Text ellipsis={{ rows: 1 }}>{rowData.data?.costDriver ?? ''}</Text>;
+                }}
+              />
+            );
+            break;
+          case 'CostLeader':
+            columns.push(
+              <TreeGrid.Column
+                field='costLeader'
+                header='Cost Leader'
+                sortable
+                width={120}
+                body={(rowData) => {
+                  return <Text ellipsis={{ rows: 1 }}>{rowData.data?.costLeader ?? ''}</Text>;
+                }}
+              />
+            );
+
+            break;
+          case 'Owner':
+            columns.push(
+              <TreeGrid.Column
+                field='owner'
+                header='Owner'
+                sortable
+                width={120}
+                body={(rowData) => {
+                  return <Text ellipsis={{ rows: 1 }}>{rowData.data?.owner ?? ''}</Text>;
+                }}
+              />
+            );
+            break;
+          case 'ExecutiveSponsor':
+            columns.push(
+              <TreeGrid.Column
+                field='executiveSponsor'
+                header='Executive Sponsor'
+                sortable
+                width={120}
+                body={(rowData) => {
+                  return <Text ellipsis={{ rows: 1 }}>{rowData.data?.executiveSponsor ?? ''}</Text>;
+                }}
+              />
+            );
+            break;
+          case 'Workstream':
+            columns.push(
+              <TreeGrid.Column
+                field='workstream'
+                header='Workstream'
+                sortable
+                width={110}
+                body={(rowData) => {
+                  return <Text ellipsis={{ rows: 1 }}>{rowData.data?.workstream ?? ''}</Text>;
+                }}
+              />
+            );
+            break;
+          case 'InitiativeRollup1Id':
+            columns.push(
+              <TreeGrid.Column
+                field='initiativeRollup1Id'
+                header={getRollupHeader(0)}
+                sortable
+                width={140}
+                body={(rowData) =>
+                  !rowData.children ? (
+                    <DropDown
+                      width={100}
+                      disabled={!isAdmin}
+                      itemTextField='value'
+                      itemValueField='initiativeRollupValueId'
+                      items={rollup1ColumnValues}
+                      value={rowData.data.initiativeRollup1Id}
+                      onChange={(value) => setInitiativeRollup(rowData.key, rowData.data, 1, value.valueOf() as number)}
+                    />
+                  ) : (
+                    <></>
+                  )
+                }
+              />
+            );
+            break;
+          case 'InitiativeRollup2Id':
+            columns.push(
+              <TreeGrid.Column
+                field='initiativeRollup2Id'
+                header={getRollupHeader(1)}
+                sortable
+                width={140}
+                body={(rowData) =>
+                  !rowData.children ? (
+                    <DropDown
+                      width={100}
+                      disabled={!isAdmin}
+                      itemTextField='value'
+                      itemValueField='initiativeRollupValueId'
+                      items={rollup2ColumnValues}
+                      value={rowData.data.initiativeRollup2Id}
+                      onChange={(value) => setInitiativeRollup(rowData.key, rowData.data, 2, value.valueOf() as number)}
+                    />
+                  ) : (
+                    <></>
+                  )
+                }
+              />
+            );
+            break;
+          case 'InitiativeRollup3Id':
+            columns.push(
+              <TreeGrid.Column
+                field='initiativeRollup3Id'
+                header={getRollupHeader(2)}
+                sortable
+                width={140}
+                body={(rowData) =>
+                  !rowData.children ? (
+                    <DropDown
+                      width={100}
+                      disabled={!isAdmin}
+                      itemTextField='value'
+                      itemValueField='initiativeRollupValueId'
+                      items={rollup3ColumnValues}
+                      value={rowData.data.initiativeRollup3Id}
+                      onChange={(value) => setInitiativeRollup(rowData.key, rowData.data, 3, value.valueOf() as number)}
+                    />
+                  ) : (
+                    <></>
+                  )
+                }
+              />
+            );
+            break;
+          case 'TrackingStartMonth':
+            columns.push(
+              <TreeGrid.Column
+                field='trackingStartMonth'
+                header='Tracking Start Month'
+                sortable
+                sortField='trackingStartMonth'
+                width={120}
+                customCellValue={(cellArgs) => (!cellArgs.rowData.trackingStartMonth ? '' : dayjs(cellArgs.rowData.trackingStartMonth).format('MMMM'))}
+              />
+            );
+            break;
+          case 'CurrentMonthGoal':
+            columns.push(<TreeGrid.NumberColumn field='currentMonthGoal' header='Current Month Committed' sortable width={145} format='currency' customCellValue={getLeafSum} />);
+            break;
+          case 'CurrentMonthActual':
+            columns.push(<TreeGrid.NumberColumn field='currentMonthActual' header='Current Month Actual' sortable width={145} format='currency' customCellValue={getLeafSum} />);
+            break;
+          case 'CurrentMonthVariance':
+            columns.push(<TreeGrid.NumberColumn field='currentMonthVariance' header='Current Month Variance' sortable width={145} format='currency' customCellValue={getLeafSum} />);
+            break;
+          case 'YTDGoal':
+            columns.push(<TreeGrid.NumberColumn field='ytdGoal' header='YTD Committed' sortable width={145} format='currency' customCellValue={getLeafSum} />);
+            break;
+          case 'YTDActual':
+            columns.push(<TreeGrid.NumberColumn field='ytdActual' header='YTD Actual' sortable width={145} format='currency' customCellValue={getLeafSum} />);
+            break;
+          case 'YTDVariance':
+            columns.push(<TreeGrid.NumberColumn field='ytdVariance' header='YTD Variance' sortable width={145} format='currency' customCellValue={getLeafSum} />);
+            break;
+          case 'SavingsCommitted':
+            columns.push(<TreeGrid.NumberColumn field='savingsCommitted' header='12-Month Goal Savings' sortable width={145} format='currency' customCellValue={getLeafSum} />);
+            break;
+          case 'AnnualGoal':
+            columns.push(<TreeGrid.NumberColumn field='annualGoal' header='Committed FY Savings' sortable width={145} format='currency' customCellValue={getLeafSum} />);
+            break;
+        }
+      });
+    return columns;
+  };
+
+  return (
+    <>
+      <Header
+        title={
+          <>
+            <Spacing itemSpacing={16} vAlign='center'>
+              <Text.Heading level={1}>Initiatives</Text.Heading>
+              <ConfigurationDropdown />
+            </Spacing>
+          </>
+        }
+        extra={<Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1220')} />}
+      />{' '}
+      <ActionBar
+        filters={
+          <>
+            <Input width={312} search placeholder='Search' onChange={(e) => handleSearchWithDebounce(e.target.value)} />
+            <Button type={numOfSelectedFilters > 0 ? 'primary' : 'secondary'} icon={<FilterIcon />} onClick={() => setFiltersVisible(true)}>
+              Filters{numOfSelectedFilters > 0 ? ` (${numOfSelectedFilters})` : ''}
+            </Button>
+            <Spacing margin='0 0 0 16px' vAlign='center'>
+              <Text strong>Group by</Text>
+            </Spacing>
+            <DropDown width={200} onChange={handleGroupByChange} items={groupByOptions} value={filters.groupByCategory} />
+          </>
+        }
+        actions={
+          <>
+            <ButtonMenu
+              buttonText='Export'
+              onClick={handleExport}
+              items={[
+                {
+                  key: 'All',
+                  label: 'Export All'
+                },
+                { key: 'Filtered', label: 'Export Filtered List' }
+              ]}
+            />
+            <Button onClick={() => setManageColumnsVisible(true)}>Manage Columns</Button>
+            <CreateInitiativeButtonMenu />
+          </>
+        }
+      ></ActionBar>
+      <LayoutGrid fullWidth removeMargin>
+        <TreeGrid
+          sortField={sortOptions.sortField}
+          sortOrder={sortOptions.sortOrder}
+          value={treeGridData}
+          loading={loading}
+          density='dense'
+          scrollable
+          scrollableOffset={7}
+          defaultExpandAll
+          expandedRowKeys={treeGridKeysData}
+          onSort={(e) => setSortOptions({ ...sortOptions, ...e })}
+          resizableColumns
+          totalRowCalculations={[
+            { field: 'currentMonthGoal', calculationType: 'sum' },
+            { field: 'currentMonthActual', calculationType: 'sum' },
+            { field: 'currentMonthVariance', calculationType: 'sum' },
+            { field: 'ytdGoal', calculationType: 'sum' },
+            { field: 'ytdActual', calculationType: 'sum' },
+            { field: 'ytdVariance', calculationType: 'sum' },
+            { field: 'savingsCommitted', calculationType: 'sum' },
+            { field: 'annualGoal', calculationType: 'sum' }
+          ]}
+        >
+          {renderColumns()}
+        </TreeGrid>
+      </LayoutGrid>
+      {filtersVisible && <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />}
+      {manageColumnsVisible && (
+        <ManageColumns isVisible={manageColumnsVisible} onApply={handleApplyColumns} deleteRollupFromData={deleteRollupFromData} onCancel={() => setManageColumnsVisible(false)} />
+      )}
+    </>
+  );
+};
+
+export default Initiatives;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/ManageColumns.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/ManageColumns.tsx
new file mode 100644
index 0000000..c3c69d5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/ManageColumns.tsx
@@ -0,0 +1,229 @@
+import Button from '@strata/tempo/lib/button';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import Drawer from '@strata/tempo/lib/drawer';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import EditIcon from '@strata/tempo/lib/icon/EditIcon';
+import EyeIcon from '@strata/tempo/lib/icon/EyeIcon';
+import EyeInvisibleIcon from '@strata/tempo/lib/icon/EyeInvisibleIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import useModal from '@strata/tempo/lib/modal/useModal';
+import Spacing from '@strata/tempo/lib/spacing';
+import Tooltip from '@strata/tempo/lib/tooltip';
+import React, { useContext, useEffect, useState } from 'react';
+import { MAX_ROLLUP_COLUMNS } from '../shared/constants';
+import UserSettingContext from '../shared/userSetting/UserSettingContext';
+import ManageRollupColumns from './ManageRollupColumns';
+import { IMappedColumn } from '../shared/components/IMappedColumn';
+import { IInitiativeRollupColumn } from './data/IInitiativeRollupColumn';
+import { initiativeDetailColumnService } from './data/initiativeDetailColumnService';
+import { initiativeRollupColumnService } from './data/initiativeRollupColumnService';
+
+interface IManageColumnsProps {
+  isVisible: boolean;
+  onApply: (columns: IMappedColumn[]) => void;
+  deleteRollupFromData: (rollupColumnId: number | undefined, initiativeRollupValueId: number | undefined) => void;
+  onCancel: () => void;
+}
+
+const columnsNotToBeHide = ['Status'];
+
+const ManageColumns: React.FC<IManageColumnsProps> = (props: IManageColumnsProps) => {
+  const [columns, setColumns] = useState<IMappedColumn[]>([]);
+  const [rollupColumn, setRollupColumn] = useState<IInitiativeRollupColumn>();
+  const [rollupColumns, setRollupColumns] = useState<IInitiativeRollupColumn[]>([]);
+  const [isRollupColumnDrawerVisible, setIsRollupColumnDrawerVisible] = useState<boolean>(false);
+  const [isRollupColumnDrawerLoading, setIsRollupColumnDrawerLoading] = useState<boolean>(false);
+
+  const { isAdmin } = useContext(UserSettingContext);
+  const modal = useModal();
+
+  const loadData = async () => {
+    const columns = await initiativeDetailColumnService.getColumnList();
+    setColumns(columns);
+
+    const rollupColumns = await initiativeRollupColumnService.getColumns();
+    setRollupColumns(rollupColumns);
+  };
+
+  useEffect(() => {
+    loadData();
+  }, []);
+
+  useEffect(() => {
+    loadData();
+    if (props.isVisible && isRollupColumnDrawerVisible) {
+      loadData();
+    }
+  }, [isRollupColumnDrawerVisible, props.isVisible]);
+
+  const handleResetColumns = async () => {
+    const columnDefaults = await initiativeDetailColumnService.getDefaultColumnList();
+    setColumns(columnDefaults);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+  };
+
+  const handleApplyColumns = () => {
+    if (columns.length === 0) {
+      props.onCancel();
+    }
+    props.onApply(columns);
+  };
+
+  const handleHideOrShow = async (row: IMappedColumn) => {
+    const cols = columns.slice();
+    const idx = columns.findIndex((col) => col.index === row.index);
+    cols[idx].isHidden = !row.isHidden;
+    setColumns(cols);
+  };
+
+  const handleDeleteRollupColumn = async (rollupColumnId: number) => {
+    const rollupColumn = rollupColumns.filter((x) => x.initiativeRollupColumnId === rollupColumnId)[0];
+    modal.confirm({
+      title: `Delete ${rollupColumn?.name} Column?`,
+      content: `${rollupColumn?.name} and associated rollup values will no longer appear in the Initiatve table.`,
+      confirmType: 'danger',
+      okText: 'Delete Rollup Column',
+      cancelText: 'Cancel',
+      async onOk() {
+        await initiativeRollupColumnService.delete(rollupColumnId);
+        const columns = await initiativeDetailColumnService.getColumnList();
+        setColumns(columns);
+        const rollupColumns = await initiativeRollupColumnService.getColumns();
+        setRollupColumns(rollupColumns);
+        if (isRollupColumnDrawerVisible) {
+          setIsRollupColumnDrawerVisible(false);
+        }
+        props.deleteRollupFromData(rollupColumnId, undefined);
+      }
+    });
+  };
+
+  const handleAddRollupColumn = async () => {
+    setRollupColumn(undefined);
+    setIsRollupColumnDrawerVisible(true);
+  };
+
+  const handleEditRollupColumn = async (rollupColumnId: number) => {
+    const editRollupColumn = await initiativeRollupColumnService.getById(rollupColumnId);
+    setRollupColumn(editRollupColumn);
+    setIsRollupColumnDrawerVisible(true);
+  };
+
+  const renderIsHidden = (rowData: any) => {
+    if (!rowData.isLocked && !columnsNotToBeHide.includes(rowData.name)) {
+      const tooltipTitle = rowData.isHidden ? 'Unhide Column' : 'Hide Column';
+      const btnIcon = rowData.isHidden ? <EyeInvisibleIcon /> : <EyeIcon />;
+      return (
+        <Tooltip title={tooltipTitle} placement='left'>
+          <Button type='link' icon={btnIcon} onClick={() => handleHideOrShow(rowData)} />
+        </Tooltip>
+      );
+    }
+  };
+
+  return (
+    <>
+      <Drawer
+        title='Manage Columns'
+        width={432}
+        footer={
+          <Spacing hAlign='space-between'>
+            <Button type='tertiary' onClick={handleResetColumns}>
+              Reset Columns
+            </Button>
+            <Spacing>
+              <Button onClick={handleCancel}>Cancel</Button>
+              <Button type='primary' onClick={handleApplyColumns}>
+                Save
+              </Button>
+            </Spacing>
+          </Spacing>
+        }
+        visible={props.isVisible}
+        onClose={handleCancel}
+        removeBodyPadding
+      >
+        {isAdmin && (
+          <Spacing margin={'10px 16px'}>
+            <Tooltip title={rollupColumns.length >= MAX_ROLLUP_COLUMNS ? `A maximum of ${MAX_ROLLUP_COLUMNS} rollup columns can be added.` : ''}>
+              <Button type='secondary' icon={<PlusIcon />} onClick={() => handleAddRollupColumn()} disabled={rollupColumns.length >= MAX_ROLLUP_COLUMNS}>
+                Add Rollup Column
+              </Button>
+            </Tooltip>
+          </Spacing>
+        )}
+        <DataGrid
+          value={columns}
+          density='dense'
+          onRowReorder={(e) => {
+            if (!e.value[0].isLocked) {
+              return;
+            }
+            setColumns(e.value);
+          }}
+          showRowReorderElement={(row) => !row.isLocked}
+        >
+          <DataGrid.DragDropColumn />
+          <DataGrid.RowNumber />
+          <DataGrid.Column field='heading' header='Column Name' width={144} />
+          <DataGrid.Column key='isHidden' header='' width={30} body={renderIsHidden} />
+          <DataGrid.Column
+            key='edit'
+            header=''
+            width={30}
+            body={(rowData) =>
+              !rowData.isLocked && rowData.initiativeRollupColumnId && isAdmin ? (
+                <>
+                  <Tooltip title='Edit'>
+                    <Button type='link' icon={<EditIcon />} onClick={() => handleEditRollupColumn(rowData.initiativeRollupColumnId)} />
+                  </Tooltip>
+                </>
+              ) : (
+                ''
+              )
+            }
+          />
+          <DataGrid.Column
+            key='isHidden'
+            header=''
+            width={30}
+            body={(rowData) =>
+              !rowData.isLocked && rowData.initiativeRollupColumnId && isAdmin ? (
+                <>
+                  <Tooltip title='Delete'>
+                    <Button type='link' icon={<DeleteIcon />} onClick={() => handleDeleteRollupColumn(rowData.initiativeRollupColumnId)} />
+                  </Tooltip>
+                </>
+              ) : (
+                ''
+              )
+            }
+          />
+        </DataGrid>
+      </Drawer>
+      {isRollupColumnDrawerVisible ? (
+        <ManageRollupColumns
+          rollupColumn={rollupColumn}
+          rollupColumns={rollupColumns}
+          isStrategicOpportunity={false}
+          setRollupColumns={setRollupColumns}
+          isLoading={isRollupColumnDrawerLoading}
+          setIsLoading={setIsRollupColumnDrawerLoading}
+          isVisible={isRollupColumnDrawerVisible}
+          setIsVisible={setIsRollupColumnDrawerVisible}
+          onCancel={() => setIsRollupColumnDrawerVisible(false)}
+          deleteRollupFromData={props.deleteRollupFromData}
+          // eslint-disable-next-line @typescript-eslint/no-empty-function
+          onAfterSave={() => {}}
+        />
+      ) : (
+        <></>
+      )}
+    </>
+  );
+};
+
+export default ManageColumns;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/ManageRollupColumns.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/ManageRollupColumns.tsx
new file mode 100644
index 0000000..91cef42
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/ManageRollupColumns.tsx
@@ -0,0 +1,208 @@
+import Button from '@strata/tempo/lib/button';
+import DataGrid, { IInvalidCell } from '@strata/tempo/lib/datagrid';
+import Divider from '@strata/tempo/lib/divider/Divider';
+import Drawer from '@strata/tempo/lib/drawer';
+import Form from '@strata/tempo/lib/form';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import Input from '@strata/tempo/lib/input/Input';
+import useModal from '@strata/tempo/lib/modal/useModal';
+import Spacing from '@strata/tempo/lib/spacing';
+import useToast from '@strata/tempo/lib/toast/useToast';
+import React, { useEffect, useState } from 'react';
+import { IInitiativeRollupColumnSaveInfo } from './data/IInitiativeRollupColumnSaveInfo';
+import { IInitiativeRollupColumnCreateInfo } from './data/IInitiativeRollupCreateInfo';
+import { IInitiativeRollupColumn } from './data/IInitiativeRollupColumn';
+import { IInitiativeRollupValue } from './data/IInitiativeRollupValue';
+import { initiativeRollupColumnService } from './data/initiativeRollupColumnService';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import { useHelpCenter } from '@strata/core/lib/help/useHelpCenter';
+
+interface IManageRollupColumnsProps {
+  rollupColumns: IInitiativeRollupColumn[];
+  rollupColumn?: IInitiativeRollupColumn;
+  isStrategicOpportunity: boolean;
+  isVisible: boolean;
+  isLoading: boolean;
+  setIsVisible: (isVisible: boolean) => void;
+  setIsLoading: (isLoading: boolean) => void;
+  setRollupColumns: (rollupColumns: IInitiativeRollupColumn[]) => void;
+  onAfterSave: () => void;
+  onCancel: () => void;
+  deleteRollupFromData: (rollupColumnId: number | undefined, initiativeRollupValueId: number | undefined) => void;
+}
+
+const ManageRollupColumns: React.FC<IManageRollupColumnsProps> = (props: IManageRollupColumnsProps) => {
+  const { rollupColumn, rollupColumns, isStrategicOpportunity, isVisible, isLoading, setIsLoading, setRollupColumns, setIsVisible, onAfterSave } = props;
+  const [rollupValues, setRollupValues] = useState<IInitiativeRollupValue[]>([]);
+  const [form] = Form.useForm<IInitiativeRollupColumn>();
+  const [invalidCells, setInvalidCells] = React.useState<IInvalidCell[]>([]);
+
+  const toast = useToast();
+  const modal = useModal();
+  const helpCenter = useHelpCenter();
+
+  useEffect(() => {
+    const loadData = async () => {
+      try {
+        setIsLoading(true);
+        if (!rollupColumn) {
+          setRollupValues([]);
+        } else {
+          form.setFieldsValue(rollupColumn);
+          setRollupValues(rollupColumn.initiativeRollupValues);
+        }
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    if (isVisible) {
+      loadData();
+    }
+  }, [form, isVisible, rollupColumn, setIsLoading]);
+
+  const handleAddRollupValue = async () => {
+    setRollupValues([...rollupValues, ...[{ value: '' }]]);
+  };
+
+  const handleDeleteRollupValue = async (rollupValue: IInitiativeRollupValue) => {
+    const index = rollupValues.indexOf(rollupValue);
+    setRollupValues([...rollupValues.slice(0, index), ...rollupValues.slice(index + 1)]);
+    props.deleteRollupFromData(rollupValue.initiativeRollupColumnId, rollupValue.initiativeRollupValueId);
+  };
+
+  const handleSaveRollupColumn = async () => {
+    setIsLoading(true);
+    if (invalidCells.length > 0) {
+      setIsLoading(false);
+      modal.alert({
+        title: 'Changes not saved',
+        content: 'Add values to highlighted cells.',
+        alertType: 'error'
+      });
+      return;
+    } else {
+      try {
+        if (rollupColumn) {
+          // edit
+          const deletes = rollupColumn.initiativeRollupValues.filter((item) => !rollupValues.includes(item));
+          const updates = rollupValues.filter((item) => !deletes.includes(item));
+          const rollupColumnSaveInfo: IInitiativeRollupColumnSaveInfo = {
+            name: await form.getFieldValue('name'),
+            updates: updates,
+            deletes: deletes
+          };
+
+          await initiativeRollupColumnService.update(rollupColumn.initiativeRollupColumnId, rollupColumnSaveInfo);
+        } else {
+          // create
+          const rollupColumnCreateInfo: IInitiativeRollupColumnCreateInfo = {
+            name: await form.getFieldValue('name'),
+            values: rollupValues.map((rv) => {
+              return rv.value;
+            })
+          };
+          const newRollup = await initiativeRollupColumnService.create(rollupColumnCreateInfo);
+          setRollupColumns([...rollupColumns, { ...newRollup }]);
+        }
+        onAfterSave();
+        setIsVisible(false);
+      } finally {
+        setIsLoading(false);
+      }
+      toast.show({
+        toastType: 'success',
+        message: 'Changes saved'
+      });
+    }
+  };
+
+  return (
+    <>
+      <Drawer
+        title={`${rollupColumn ? 'Edit' : 'Add'} Rollup${isStrategicOpportunity ? '' : ' Column'}`}
+        width={385}
+        removeBodyPadding
+        visible={isVisible}
+        loading={isLoading}
+        onClose={() => setIsVisible(false)}
+        footer={
+          <Spacing hAlign='space-between'>
+            <Spacing>
+              <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1901')} />
+            </Spacing>
+            <Spacing>
+              <Button onClick={() => setIsVisible(false)}>Cancel</Button>
+              <Button type='primary' onClick={() => form.submit()}>
+                Save
+              </Button>
+            </Spacing>
+          </Spacing>
+        }
+      >
+        <Form form={form} preserve={false} onFinish={handleSaveRollupColumn}>
+          <Spacing margin={'16px 16px 0px 16px'}>
+            <Form.Item
+              label='Rollup Name'
+              name='name'
+              rules={[
+                { required: true, whitespace: false, max: 100 },
+                () => ({
+                  async validator(_, value) {
+                    if (!value) {
+                      return Promise.resolve();
+                    }
+                    if (!(await initiativeRollupColumnService.nameIsValid(rollupColumn?.initiativeRollupColumnId ?? 0, value))) {
+                      return Promise.reject('Rollup name already exists.');
+                    }
+                    return Promise.resolve();
+                  }
+                })
+              ]}
+            >
+              <Input width={320} />
+            </Form.Item>
+          </Spacing>
+        </Form>
+        <Divider margin={0} extended />
+        <Spacing margin={16}>
+          <Button type='secondary' icon={<PlusIcon />} onClick={() => handleAddRollupValue()}>
+            Add Rollup Value
+          </Button>
+        </Spacing>
+        <Divider margin={0} extended />
+        <DataGrid value={rollupValues} validationMode='all-cells' dataKey='value' onValidationChange={(invalidCells) => setInvalidCells(invalidCells)}>
+          <DataGrid.RowNumber />
+          <DataGrid.Column
+            field='value'
+            header='Rollup Value'
+            editable
+            width={200}
+            validationRules={[
+              {
+                required: true,
+                whitespace: false
+              },
+              {
+                message: 'Enter a value'
+              }
+            ]}
+          />
+          <DataGrid.Column
+            width={100}
+            body={(rowData) => (
+              <>
+                <Button type='link' icon={<DeleteIcon />} onClick={() => handleDeleteRollupValue(rowData)}>
+                  Delete
+                </Button>
+              </>
+            )}
+          ></DataGrid.Column>
+        </DataGrid>
+      </Drawer>
+    </>
+  );
+};
+
+export default ManageRollupColumns;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeDetail.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeDetail.ts
new file mode 100644
index 0000000..ea0a405
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeDetail.ts
@@ -0,0 +1,69 @@
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+
+export interface IInitiativeDetail {
+  initiativeGuid: string;
+  opportunityType: OpportunityTypes;
+  name: string;
+  status: string;
+  costDriver: string;
+  costLeader: string;
+  owner: string;
+  executiveSponsor: string;
+  workstream: string;
+  trackingStartMonth: Date | undefined;
+  currentMonthGoal: number;
+  currentMonthGoalSum: number;
+  currentMonthActual: number;
+  currentMonthActualSum: number;
+  currentMonthVariance: number;
+  currentMonthVarianceSum: number;
+  ytdGoal: number;
+  ytdGoalSum: number;
+  ytdActual: number;
+  ytdActualSum: number;
+  ytdVariance: number;
+  ytdVarianceSum: number;
+  savingsCommitted: number;
+  savingsCommittedSum: number;
+  annualGoal: number;
+  annualGoalSum: number;
+  sourceOpportunity: string;
+  sourceOpportunityId: number;
+  initiativeRollup1Id: number;
+  initiativeRollup2Id: number;
+  initiativeRollup3Id: number;
+}
+
+export const defaultInitiativeDetail: IInitiativeDetail = {
+  initiativeGuid: '00000000-0000-0000-0000-000000000000',
+  opportunityType: 0,
+  name: '',
+  status: '',
+  costDriver: '',
+  costLeader: '',
+  owner: '',
+  executiveSponsor: '',
+  workstream: '',
+  trackingStartMonth: undefined,
+  currentMonthGoal: 0,
+  currentMonthGoalSum: 0,
+  currentMonthActual: 0,
+  currentMonthActualSum: 0,
+  currentMonthVariance: 0,
+  currentMonthVarianceSum: 0,
+  ytdGoal: 0,
+  ytdGoalSum: 0,
+  ytdActual: 0,
+  ytdActualSum: 0,
+  ytdVariance: 0,
+  ytdVarianceSum: 0,
+  savingsCommitted: 0,
+  savingsCommittedSum: 0,
+  annualGoal: 0,
+  annualGoalSum: 0,
+  sourceOpportunity: '',
+  sourceOpportunityId: 0,
+  initiativeRollup1Id: 0,
+  initiativeRollup2Id: 0,
+  initiativeRollup3Id: 0
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeFilterOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeFilterOptions.ts
new file mode 100644
index 0000000..a4cf414
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeFilterOptions.ts
@@ -0,0 +1,35 @@
+import { IInitiativeRollupValue } from './IInitiativeRollupValue';
+import { IUserProfile } from './IUserProfile';
+
+export interface INameItem {
+  name: string;
+}
+
+export interface IInitiativeFilterOptions {
+  configurationGuid: string;
+  costDrivers: INameItem[];
+  costLeaders: IUserProfile[];
+  owners: IUserProfile[];
+  executiveSponsors: IUserProfile[];
+  workstreams: INameItem[];
+  rollupColumn1Values: IInitiativeRollupValue[];
+  rollupColumn2Values: IInitiativeRollupValue[];
+  rollupColumn3Values: IInitiativeRollupValue[];
+}
+
+export const newFilterOptions = (data: Partial<IInitiativeFilterOptions> = {}): IInitiativeFilterOptions => {
+  return {
+    ...{
+      configurationGuid: '',
+      costDrivers: [],
+      costLeaders: [],
+      owners: [],
+      executiveSponsors: [],
+      workstreams: [],
+      rollupColumn1Values: [],
+      rollupColumn2Values: [],
+      rollupColumn3Values: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeFilters.ts
new file mode 100644
index 0000000..d474c86
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeFilters.ts
@@ -0,0 +1,60 @@
+export enum InitiativeStatus {
+  Both = -1,
+  Draft = 0,
+  Tracking = 1
+}
+
+export enum InitiativeGroupByCategory {
+  CostDriver,
+  CostLeader,
+  ExecutiveSponsor,
+  Owner,
+  Status,
+  Workstream,
+  RollupColumn1,
+  RollupColumn2,
+  RollupColumn3,
+  None
+}
+
+export interface IInitiativeFilters {
+  name: string | undefined;
+  status: InitiativeStatus;
+  costDrivers: [];
+  costLeaders: [];
+  owners: string[];
+  executiveSponsors: string[];
+  workstreams: [];
+  rollupColumn1Values: [];
+  rollupColumn2Values: [];
+  rollupColumn3Values: [];
+  groupByCategory: InitiativeGroupByCategory;
+}
+
+export const initialFilters: IInitiativeFilters = {
+  name: undefined,
+  status: InitiativeStatus.Both,
+  costDrivers: [],
+  costLeaders: [],
+  owners: [],
+  executiveSponsors: [],
+  workstreams: [],
+  rollupColumn1Values: [],
+  rollupColumn2Values: [],
+  rollupColumn3Values: [],
+  groupByCategory: InitiativeGroupByCategory.Workstream
+};
+
+export const numberOfFilters = (filters: IInitiativeFilters): number => {
+  let filtersCount = 0;
+  if (filters.status !== undefined && filters.status !== InitiativeStatus.Both) filtersCount++;
+  if (filters.costDrivers.length > 0) filtersCount++;
+  if (filters.costLeaders.length > 0) filtersCount++;
+  if (filters.owners.length > 0) filtersCount++;
+  if (filters.executiveSponsors.length > 0) filtersCount++;
+  if (filters.workstreams.length > 0) filtersCount++;
+  if (filters.rollupColumn1Values && filters.rollupColumn1Values.length > 0) filtersCount++;
+  if (filters.rollupColumn2Values && filters.rollupColumn2Values.length > 0) filtersCount++;
+  if (filters.rollupColumn3Values && filters.rollupColumn3Values.length > 0) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeRollupColumn.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeRollupColumn.ts
new file mode 100644
index 0000000..9a3feb5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeRollupColumn.ts
@@ -0,0 +1,7 @@
+import { IInitiativeRollupValue } from './IInitiativeRollupValue';
+
+export interface IInitiativeRollupColumn {
+  initiativeRollupColumnId: number;
+  name: string;
+  initiativeRollupValues: IInitiativeRollupValue[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeRollupColumnSaveInfo.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeRollupColumnSaveInfo.ts
new file mode 100644
index 0000000..8883811
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeRollupColumnSaveInfo.ts
@@ -0,0 +1,7 @@
+import { IInitiativeRollupValue } from './IInitiativeRollupValue';
+
+export interface IInitiativeRollupColumnSaveInfo {
+  name: string;
+  updates: IInitiativeRollupValue[];
+  deletes: IInitiativeRollupValue[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeRollupCreateInfo.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeRollupCreateInfo.ts
new file mode 100644
index 0000000..bb0190f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeRollupCreateInfo.ts
@@ -0,0 +1,4 @@
+export interface IInitiativeRollupColumnCreateInfo {
+  name: string;
+  values: string[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeRollupValue.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeRollupValue.ts
new file mode 100644
index 0000000..ac0d272
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeRollupValue.ts
@@ -0,0 +1,5 @@
+export interface IInitiativeRollupValue {
+  initiativeRollupValueId?: number;
+  initiativeRollupColumnId?: number;
+  value: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeTreeGridModel.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeTreeGridModel.ts
new file mode 100644
index 0000000..f96648b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IInitiativeTreeGridModel.ts
@@ -0,0 +1,7 @@
+import { IInitiativeDetail } from './IInitiativeDetail';
+
+export interface IInitiativeTreeGridModel {
+  key: string;
+  data: IInitiativeDetail;
+  children: IInitiativeTreeGridModel[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IUserProfile.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IUserProfile.ts
new file mode 100644
index 0000000..328cadd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/IUserProfile.ts
@@ -0,0 +1,4 @@
+export interface IUserProfile {
+  userGuid: string;
+  nameFull: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/initiativeDetailColumnService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/initiativeDetailColumnService.ts
new file mode 100644
index 0000000..199be8d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/initiativeDetailColumnService.ts
@@ -0,0 +1,20 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IMappedColumn } from '../../shared/components/IMappedColumn';
+
+const { httpGet, httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const initiativeDetailColumnService = {
+  getColumnList: (): Promise<IMappedColumn[]> => {
+    return httpGet<IMappedColumn[]>(`initiative-detail-columns/column-list`);
+  },
+
+  getDefaultColumnList: (): Promise<IMappedColumn[]> => {
+    return httpGet<IMappedColumn[]>(`initiative-detail-columns/default-column-list`);
+  },
+
+  setColumnList: (columns: IMappedColumn[]) => {
+    httpPost<IMappedColumn[]>(`initiative-detail-columns/set-column-list`, {
+      columns
+    });
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/initiativeRollupColumnService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/initiativeRollupColumnService.ts
new file mode 100644
index 0000000..71e5529
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/initiativeRollupColumnService.ts
@@ -0,0 +1,35 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IInitiativeRollupColumnSaveInfo } from './IInitiativeRollupColumnSaveInfo';
+import { IInitiativeRollupColumnCreateInfo } from './IInitiativeRollupCreateInfo';
+import { IInitiativeRollupColumn } from './IInitiativeRollupColumn';
+import { IInitiativeRollupValue } from './IInitiativeRollupValue';
+
+const { httpGet, httpPost, httpPut, httpDelete } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'initiative-rollup-columns';
+
+export const initiativeRollupColumnService = {
+  getById: (rollupColumnId: number): Promise<IInitiativeRollupColumn> => {
+    return httpGet<IInitiativeRollupColumn>(`${url}/${rollupColumnId}`);
+  },
+  getColumns: (): Promise<IInitiativeRollupColumn[]> => {
+    return httpGet<IInitiativeRollupColumn[]>(`${url}`);
+  },
+  getByRollupValuesById: (rollupColumnId: number): Promise<IInitiativeRollupValue[]> => {
+    return httpGet<IInitiativeRollupValue[]>(`${url}/${rollupColumnId}/values`);
+  },
+  create: function (initiativeRollupColumnId: IInitiativeRollupColumnCreateInfo): Promise<IInitiativeRollupColumn> {
+    return httpPost(`${url}`, initiativeRollupColumnId);
+  },
+  update: function (rollupColumnId: number, initiativeRollupColumn: IInitiativeRollupColumnSaveInfo): Promise<IInitiativeRollupColumn> {
+    return httpPut(`${url}/${rollupColumnId}`, initiativeRollupColumn);
+  },
+  addValue: function (rollupColumnId: number, value: string): Promise<IInitiativeRollupValue> {
+    return httpPut(`${url}/${rollupColumnId}/add-rollup-value/`, value);
+  },
+  nameIsValid: async (rollupColumnId: number, name: string) => {
+    return await httpPost<boolean>(`${url}/is-name-valid/${rollupColumnId}`, name);
+  },
+  delete: async (rollupColumnId: number) => {
+    return await httpDelete(`${url}/${rollupColumnId}`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/initiativeService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/initiativeService.ts
new file mode 100644
index 0000000..c60112f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/initiatives/data/initiativeService.ts
@@ -0,0 +1,55 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IInitiativeDto } from '../../shared/initiatives/data/IInitiativeDto';
+import { ISortOptions } from '../../shared/paging';
+import { IInitiativeDetail } from '../data/IInitiativeDetail';
+import { IInitiativeFilterOptions } from './IInitiativeFilterOptions';
+import { IInitiativeFilters } from './IInitiativeFilters';
+import { IInitiativeTreeGridModel } from './IInitiativeTreeGridModel';
+
+const { httpGet, httpPost, httpDownloadAndDisplayFile, httpPut } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const initiativeService = {
+  getInitiatives: async (configurationGuid: string, filters: IInitiativeFilters): Promise<IInitiativeTreeGridModel[]> => {
+    return httpPost<IInitiativeTreeGridModel[]>(`initiatives`, {
+      ...filters,
+      configurationGuid
+    });
+  },
+
+  getById: (initiativeGuid: string): Promise<IInitiativeDetail> => {
+    return httpGet<IInitiativeDetail>(`initiatives/${initiativeGuid}`);
+  },
+
+  export: async (configurationGuid: string, exportAll: boolean, sortOptions: ISortOptions, filters: IInitiativeFilters): Promise<void> => {
+    const date = new Date();
+    const fileName = 'Initiatives_' + date.toISOString().split('T')[0];
+    const body = JSON.stringify({
+      sortOptions,
+      filters: {
+        ...filters,
+        configurationGuid
+      }
+    });
+    httpDownloadAndDisplayFile(`initiatives/export?exportAll=${exportAll}`, { method: 'post', body: body }, fileName);
+  },
+
+  getFilterSettings: (): Promise<IInitiativeFilters> => {
+    return httpGet<IInitiativeFilters>(`initiatives/filter-settings`);
+  },
+
+  getFilterOptions: (configurationGuid: string): Promise<IInitiativeFilterOptions> => {
+    return httpGet<IInitiativeFilterOptions>(`initiatives/${configurationGuid}/filter-options`);
+  },
+
+  setRampupInfo: (initiativeInfo: IInitiativeDto) => {
+    httpPut(`initiatives/set-rampup-info`, initiativeInfo);
+  },
+
+  setInitiativeRollupValue: (initiativeGuid: string, id: number, value: number) => {
+    return httpPut(`initiatives/set-initiative-rollup-value`, {
+      initiativeGuid: initiativeGuid,
+      rollupId: id,
+      rollupValueId: value
+    });
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/Network.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/Network.tsx
new file mode 100644
index 0000000..9e1e9d9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/Network.tsx
@@ -0,0 +1,49 @@
+import React, { useEffect, useState } from 'react';
+import Tabs from '@strata/tempo/lib/tabs';
+import OpportunitiesHeader from '../shared/opportunities/OpportunitiesHeader';
+import OpportunityManager from './opportunities/OpportunityManager';
+import { useOidcSession } from '@strata/core/lib';
+import Opportunities from './opportunities/Opportunities';
+
+export interface INetworkOpportunitySummaryProps {
+  selectedTab: string;
+}
+
+const Network: React.FC = () => {
+  const [selectedTab, setSelectedTab] = useState('opportunities');
+
+  useEffect(() => {
+    document.title = 'Network';
+  }, []);
+
+  const session = useOidcSession();
+
+  const handleTabChange = (tabKey: string) => {
+    if (selectedTab === tabKey) {
+      return;
+    }
+    setSelectedTab(tabKey);
+  };
+
+  const manageTabs = session.isStrata ? (
+    <Tabs
+      defaultActiveKey={selectedTab}
+      onChange={(activeKey: string) => handleTabChange(activeKey)}
+      items={[
+        { key: 'opportunities', label: 'Published Opportunities', children: <Opportunities selectedTab={selectedTab} /> },
+        { key: 'manage', label: 'Manage', children: <OpportunityManager selectedTab={selectedTab} /> }
+      ]}
+    />
+  ) : (
+    <Opportunities selectedTab={selectedTab} />
+  );
+
+  return (
+    <>
+      <OpportunitiesHeader headerTitle='Network Opportunities' helpId='1407' />
+      {manageTabs}
+    </>
+  );
+};
+
+export default Network;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/ClientNetworkOpportunityModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/ClientNetworkOpportunityModal.tsx
new file mode 100644
index 0000000..025b807
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/ClientNetworkOpportunityModal.tsx
@@ -0,0 +1,64 @@
+import Form from '@strata/tempo/lib/form';
+import Input from '@strata/tempo/lib/input';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import InputTextArea from '@strata/tempo/lib/inputtextarea';
+import Modal from '@strata/tempo/lib/modal';
+import React, { useEffect, useState } from 'react';
+import { IClientNetworkOpportunity } from './data/IClientNetworkOpportunity';
+
+export interface IClientNetworkOpportunityModalProps {
+  isVisible: boolean;
+  onCancel: () => void;
+  onFinish: (values: IClientNetworkOpportunity) => void;
+  clientNetworkOpportunity?: IClientNetworkOpportunity;
+  isCreator: boolean;
+}
+
+const ClientNetworkOpportunityModal: React.FC<IClientNetworkOpportunityModalProps> = (props: IClientNetworkOpportunityModalProps) => {
+  const { isVisible, onCancel, onFinish, clientNetworkOpportunity, isCreator } = props;
+  const [form] = Form.useForm<IClientNetworkOpportunity>();
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  useEffect(() => {
+    setIsLoading(false);
+  }, [isVisible]);
+
+  const handleModalClose = async () => {
+    if (onCancel) {
+      onCancel();
+    }
+  };
+
+  const handleFinishBase = async () => {
+    try {
+      setIsLoading(true);
+      const values = await form.validateFields();
+      onFinish(values);
+    } catch {
+      // let UI show form field error
+    }
+  };
+
+  return (
+    <>
+      <Modal title={'Edit Opportunity Details'} visible={isVisible} loading={isLoading} onOk={() => form.submit()} onCancel={handleModalClose}>
+        <Form form={form} preserve={false} onFinish={handleFinishBase}>
+          <Form.Item label='Name' name='name' initialValue={clientNetworkOpportunity?.name} rules={[{ required: true, whitespace: true }]}>
+            <Input disabled={!isCreator} />
+          </Form.Item>
+          <Form.Item label='Description' name='description' initialValue={clientNetworkOpportunity?.description}>
+            <InputTextArea disabled={!isCreator} />
+          </Form.Item>
+          <Form.Item label='Identified Savings' name='identifiedSavings' initialValue={clientNetworkOpportunity?.identifiedSavings} rules={[{ required: true }, { type: 'number', min: 1 }]}>
+            <InputNumber />
+          </Form.Item>
+          <Form.Item label='Identified Savings Description' name='identifiedSavingsDescription' initialValue={clientNetworkOpportunity?.identifiedSavingsDescription}>
+            <InputTextArea />
+          </Form.Item>
+        </Form>
+      </Modal>
+    </>
+  );
+};
+
+export default ClientNetworkOpportunityModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/Filters.tsx
new file mode 100644
index 0000000..e94b9b7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/Filters.tsx
@@ -0,0 +1,89 @@
+import { DropDown } from '@strata/tempo/lib';
+import Button from '@strata/tempo/lib/button';
+import Drawer from '@strata/tempo/lib/drawer';
+import Form from '@strata/tempo/lib/form';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing';
+import React, { useCallback, useEffect } from 'react';
+import { IInitiativeStatuses } from '../../shared/data/IInitiativeStatuses';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+import { INetworkOpportunityFilters, initialFilters } from './data/INetworkOpportunityFilters';
+
+interface IFiltersProps {
+  filters: INetworkOpportunityFilters;
+  isVisible: boolean;
+  showStatusFilter: boolean;
+  onApply: (filters: INetworkOpportunityFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const [form] = Form.useForm<INetworkOpportunityFilters>();
+  const { showStatusFilter } = props;
+
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      handleClearFilters();
+    };
+
+    loadFiltersOptions();
+  }, [handleClearFilters]);
+
+  const handleApplyFilters = () => {
+    const filters: INetworkOpportunityFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Identified Savings Minimum' name='identifiedSavings'>
+          <InputNumber format='currency' placeholder='' precision={0} />
+        </Form.Item>
+        {showStatusFilter && (
+          <Form.Item label='Status' name='initiativeStatus'>
+            <DropDown
+              allowClear
+              itemTextField='text'
+              itemValueField='value'
+              items={[
+                { text: 'Completed', value: IInitiativeStatuses.Completed },
+                { text: 'In Process', value: IInitiativeStatuses.InProcess },
+                { text: 'On Hold', value: IInitiativeStatuses.OnHold }
+              ]}
+            ></DropDown>
+          </Form.Item>
+        )}
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/NetworkOpportunityDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/NetworkOpportunityDetail.tsx
new file mode 100644
index 0000000..f51d25e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/NetworkOpportunityDetail.tsx
@@ -0,0 +1,395 @@
+import { useHelpCenter, useJazzUrlWithVersion, useOidcSession } from '@strata/core/lib';
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import { ButtonMenu, IMenuItem, Tag, useModal, usePageLoader, useToast } from '@strata/tempo/lib';
+import Button from '@strata/tempo/lib/button';
+import Divider from '@strata/tempo/lib/divider';
+import DropDown from '@strata/tempo/lib/dropdown';
+import Header from '@strata/tempo/lib/header';
+import CheckIcon from '@strata/tempo/lib/icon/CheckIcon';
+import DesktopIcon from '@strata/tempo/lib/icon/DesktopIcon';
+import EditIcon from '@strata/tempo/lib/icon/EditIcon';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import MetricGroup, { IMetricItem } from '@strata/tempo/lib/metricgroup';
+import Spacing from '@strata/tempo/lib/spacing';
+import React, { useEffect, useState } from 'react';
+import { useParams } from 'react-router';
+import { InitiativeStatus } from '../../initiatives/data/IInitiativeFilters';
+import { initiativeService } from '../../initiatives/data/initiativeService';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import CommentsDrawer from '../../shared/comments/CommentsDrawer';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { IInitiativeStatuses } from '../../shared/data/IInitiativeStatuses';
+import CreateInitiativeButtonMenu from '../../shared/initiatives/CreateInitiativeButtonMenu';
+import ClientNetworkOpportunityModal from './ClientNetworkOpportunityModal';
+import { IClientNetworkOpportunity, IClientNetworkOpportunityLink } from './data/IClientNetworkOpportunity';
+import { clientOpportunityService } from './data/clientOpportunityService';
+
+export interface INetworkOpportunityDetailProps {
+  isCreator: boolean;
+}
+
+const NetworkOpportunityDetail: React.FC<INetworkOpportunityDetailProps> = (props: INetworkOpportunityDetailProps) => {
+  const { opportunityId } = useParams<{ opportunityId: string }>();
+  const [opportunityDetailData, setOpportunityDetailData] = useState<IClientNetworkOpportunity>();
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+  const [clientNetworkOpportunityModalVisible, setClientNetworkOpportunityModalVisible] = useState(false);
+  const [showComments, setShowComments] = useState<boolean>(false);
+  const [presentationMode, setPresentationMode] = useState<boolean>(false);
+
+  const modal = useModal();
+  const jazzUrl = useJazzUrlWithVersion();
+  const toast = useToast();
+  const session = useOidcSession();
+  const { setLoading } = usePageLoader();
+  const helpCenter = useHelpCenter();
+
+  useEffect(() => {
+    const fetchData = async () => {
+      const opportunityDetail = await clientOpportunityService.getOpportunity(opportunityId);
+      setOpportunityDetailData(opportunityDetail);
+    };
+    fetchData();
+  }, [opportunityId]);
+
+  useEffect(() => {
+    setCurrentConfigurationGuid(currentConfiguration?.configurationGuid ?? '');
+  }, [currentConfiguration]);
+
+  const metrics: IMetricItem[] = [
+    {
+      key: 'identified-savings',
+      label: 'IDENTIFIED SAVINGS',
+      values: [
+        {
+          key: 'identifiedsavings',
+          label: opportunityDetailData?.identifiedSavingsDescription,
+          value: opportunityDetailData?.identifiedSavings,
+          format: 'currency'
+        }
+      ]
+    }
+  ];
+
+  const handlePublish = async () => {
+    if (!opportunityDetailData) {
+      return;
+    }
+
+    // verify identified savings
+    if (opportunityDetailData.identifiedSavings === 0) {
+      toast.show({
+        key: opportunityDetailData.name,
+        toastType: 'error',
+        message: 'Unable to publish, opportunity needs to be configured with Identified Savings.',
+        duration: 0
+      });
+      return;
+    }
+
+    // confirm publish
+    modal.confirm({
+      title: `Publish ${opportunityDetailData.name}?`,
+      content: 'Publishing will make this opportunity viewable to clients with access to this database.',
+      okText: `Publish`,
+      async onOk() {
+        toast.show({
+          key: opportunityDetailData.name,
+          duration: 300,
+          message: `Publishing ${opportunityDetailData.name}.`,
+          toastType: 'info'
+        });
+
+        // save
+        const result = await clientOpportunityService.publish(opportunityDetailData.networkOpportunityId, true);
+        if (result) {
+          toast.show({
+            key: opportunityDetailData.name,
+            duration: 300,
+            message: `${opportunityDetailData.name} was successfully published and opportunity details are now viewable in the client database.`,
+            toastType: 'success'
+          });
+          setOpportunityDetailData({ ...opportunityDetailData, ...{ isPublished: true } });
+        } else {
+          toast.show({
+            key: opportunityDetailData.name,
+            duration: 300,
+            message: `An error occurred while publishing ${opportunityDetailData.name}.`,
+            toastType: 'error'
+          });
+        }
+      }
+    });
+  };
+
+  const handleUnpublish = async () => {
+    if (!opportunityDetailData) {
+      return;
+    }
+
+    // confirm unpublish
+    modal.confirm({
+      title: `Unpublish ${opportunityDetailData.name}?`,
+      content: 'Unpublishing will remove this opportunity from the clients view with access to this database.',
+      okText: `Unpublish`,
+      async onOk() {
+        toast.show({
+          key: opportunityDetailData.name,
+          duration: 300,
+          message: `Unpublishing ${opportunityDetailData.name}.`,
+          toastType: 'info'
+        });
+
+        // save
+        const result = await clientOpportunityService.publish(opportunityDetailData.networkOpportunityId, false);
+        if (result) {
+          toast.show({
+            key: opportunityDetailData.name,
+            duration: 300,
+            message: `${opportunityDetailData.name} was successfully unpublished and opportunity details are no longer viewable in the client database.`,
+            toastType: 'success'
+          });
+          setOpportunityDetailData({ ...opportunityDetailData, ...{ isPublished: false } });
+        } else {
+          toast.show({
+            key: opportunityDetailData.name,
+            duration: 300,
+            message: `An error occurred while unpublishing ${opportunityDetailData.name}.`,
+            toastType: 'error'
+          });
+        }
+      }
+    });
+  };
+
+  const handleOpportunityRevertToTemplate = () => {
+    if (!opportunityDetailData) {
+      return;
+    }
+    modal.confirm({
+      title: 'Revert to Template will unpublish Opportunity',
+      content: `Revert to Template will unpublish ${opportunityDetailData.name} and remove the opportunity from the client's view with access to this database.`,
+      okText: 'Revert to Template',
+      cancelText: 'Cancel',
+      async onOk() {
+        setLoading(true);
+        try {
+          const success = await clientOpportunityService.revertWorkbookToTemplate(opportunityDetailData.networkOpportunityId);
+          if (success) {
+            const opportunityDetail = await clientOpportunityService.getOpportunity(opportunityId);
+            setOpportunityDetailData(opportunityDetail);
+          } else {
+            toast.show({
+              key: opportunityDetailData.name,
+              duration: 300,
+              message: `An error occurred while reverting the workbook. Please ensure the template exists and contact us if the issue continues.`,
+              toastType: 'error'
+            });
+          }
+        } catch (e) {
+          let msg = 'An unknown error occurred. Try again and contact us if the issue continues.';
+          if (e instanceof Response) {
+            const errObj = await (e as Response).json();
+            if (errObj.message) {
+              msg = errObj.message;
+            }
+          }
+          modal.alert({
+            title: 'Error',
+            alertType: 'error',
+            content: msg
+          });
+        } finally {
+          setLoading(false);
+        }
+      }
+    });
+  };
+
+  const addComment = async () => {
+    setShowComments(true);
+  };
+
+  const redirectToInitiativeViewer = async (opportunityLink: IClientNetworkOpportunityLink) => {
+    const initiativeGuid = opportunityLink.initiativeGuid;
+    const initiative = await initiativeService.getById(initiativeGuid);
+    switch (initiative.costDriver) {
+      case 'Charge Code':
+        window.location.assign(`${jazzUrl}CCI/ChargeCode/InitiativeViewer.aspx?id=${initiative.initiativeGuid}`);
+        break;
+      case 'Encounter':
+        window.location.assign(`${jazzUrl}CCI/Encounter/InitiativeViewer.aspx?id=${initiative.initiativeGuid}`);
+        break;
+      case 'Free Form':
+        window.location.assign(`${jazzUrl}CCI/FreeForm/InitiativeViewer.aspx?id=${initiative.initiativeGuid}`);
+        break;
+      case 'Financial Free Form':
+        window.location.assign(`${jazzUrl}CCI/FreeForm/FinancialInitiativeViewer.aspx?id=${initiative.initiativeGuid}`);
+        break;
+      case 'General Ledger':
+        window.location.assign(`${jazzUrl}CCI/GeneralLedger/InitiativeViewer.aspx?id=${initiative.initiativeGuid}`);
+        break;
+      case 'Payroll':
+        window.location.assign(`${jazzUrl}CCI/Payroll/InitiativeViewer.aspx?id=${initiative.initiativeGuid}`);
+        break;
+    }
+  };
+
+  const opportunityLinkButton = (links: IClientNetworkOpportunityLink[]): IMenuItem[] => {
+    const items: IMenuItem[] = [];
+    let key = 0;
+    links
+      .filter((link) => {
+        return link.configurationGuid === currentConfigurationGuid && link.initiativeGuid !== '00000000-0000-0000-0000-000000000000';
+      })
+      .forEach((link) => {
+        key += 1;
+        let label = link.opportunity ?? link.initiative ?? '';
+        if (label === '' && link.initiative !== '') {
+          label = link.costDriver;
+        }
+        items.push(
+          ...[
+            {
+              key: key,
+              label: label,
+              onClick: () => {
+                redirectToInitiativeViewer(link);
+              }
+            }
+          ]
+        );
+      });
+    return items;
+  };
+
+  const headerExtra = (
+    <Spacing>
+      {session.isStrata ? (
+        <>
+          {opportunityDetailData?.isPublished ? (
+            <Button type='secondary' onClick={() => handleUnpublish()}>
+              Unpublish
+            </Button>
+          ) : (
+            <Button type='secondary' onClick={() => handlePublish()}>
+              Publish
+            </Button>
+          )}
+
+          <Button type='secondary' onClick={() => handleOpportunityRevertToTemplate()}>
+            Revert to Template
+          </Button>
+        </>
+      ) : (
+        ''
+      )}
+      <Button type='secondary' onClick={() => addComment()} disabled={!opportunityDetailData}>
+        Add Comment
+      </Button>
+      <Button type='secondary' icon={presentationMode ? <CheckIcon /> : <DesktopIcon />} onClick={() => setPresentationMode(!presentationMode)} disabled={!opportunityDetailData}>
+        {presentationMode ? 'Exit' : 'Present'}
+      </Button>
+      {opportunityDetailData?.opportunities &&
+      opportunityDetailData.opportunities.find((opp) => opp.configurationGuid === currentConfigurationGuid && opp.initiativeGuid !== '00000000-0000-0000-0000-000000000000') ? (
+        <ButtonMenu buttonText='View Initiative' type='secondary' items={opportunityLinkButton(opportunityDetailData?.opportunities)} />
+      ) : (
+        <></>
+      )}
+      <CreateInitiativeButtonMenu networkOpportunityId={opportunityDetailData?.networkOpportunityId} networkOpportunityName={opportunityDetailData?.name} />
+      <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1593')} />
+    </Spacing>
+  );
+
+  const handleClientNetworkOpportunityEdit = async (values: IClientNetworkOpportunity) => {
+    const updatedOpportunity = { ...opportunityDetailData, ...values };
+    setOpportunityDetailData(updatedOpportunity);
+
+    await clientOpportunityService.save(opportunityId, updatedOpportunity);
+    setClientNetworkOpportunityModalVisible(false);
+  };
+
+  const handleStatusChange = async (status: number) => {
+    if (opportunityDetailData) {
+      opportunityDetailData.initiativeStatus = status;
+      setOpportunityDetailData({ ...opportunityDetailData, ...{ initiativeStatus: status } });
+      clientOpportunityService.updateInitiativeStatus(opportunityDetailData.networkOpportunityId, status);
+    }
+  };
+
+  return (
+    <>
+      <Header title={`${opportunityDetailData?.name}`} breadcrumbHref='/network/opportunities' breadcrumbText='Manage Network Opportunities' extra={headerExtra} />
+      {!presentationMode && (
+        <>
+          <Spacing hAlign='space-between' background='white'>
+            <Spacing padding='0 0 0 0'>
+              <Spacing>
+                <MetricGroup items={metrics} />
+              </Spacing>
+              <Spacing vAlign='top' itemSpacing={24} padding={'24px 0px 24px 0px'}>
+                <Divider vertical />
+                <Spacing itemSpacing={8} padding={'0 0 8px 0'} column>
+                  <Tag color='secondary'>STATUS</Tag>
+                  <DropDown
+                    width={120}
+                    value={opportunityDetailData?.initiativeStatus}
+                    onChange={(e) => handleStatusChange(e as InitiativeStatus)}
+                    items={[
+                      { text: 'On Hold', value: IInitiativeStatuses[IInitiativeStatuses.OnHold] },
+                      { text: 'In Process', value: IInitiativeStatuses[IInitiativeStatuses.InProcess] },
+                      { text: 'Completed', value: IInitiativeStatuses[IInitiativeStatuses.Completed] }
+                    ]}
+                  />
+                </Spacing>
+              </Spacing>
+            </Spacing>
+            <Spacing vAlign='top' padding={'32px 32px 32px 0'}>
+              <Button
+                type='link'
+                icon={<EditIcon />}
+                onClick={() => {
+                  setClientNetworkOpportunityModalVisible(true);
+                }}
+              />
+            </Spacing>
+          </Spacing>
+          <Divider margin={0} />
+        </>
+      )}
+      {opportunityDetailData?.analyticsWorkbookId ? (
+        <Spacing column>
+          <iframe
+            title='Workbook'
+            key={`${opportunityDetailData?.analyticsWorkbookId}`}
+            src={`${appConfig.analyticsUrl}workbooks/${opportunityDetailData?.analyticsWorkbookId}?p=1&embedded=1&presentation=${presentationMode ? 1 : 0}`}
+            height={1500}
+            style={{ overflow: 'hidden', borderWidth: '0px' }}
+          />
+        </Spacing>
+      ) : (
+        <></>
+      )}
+      <ClientNetworkOpportunityModal
+        isVisible={clientNetworkOpportunityModalVisible}
+        onFinish={handleClientNetworkOpportunityEdit}
+        onCancel={() => setClientNetworkOpportunityModalVisible(false)}
+        clientNetworkOpportunity={opportunityDetailData}
+        isCreator={props.isCreator}
+      ></ClientNetworkOpportunityModal>
+      <CommentsDrawer
+        isVisible={showComments}
+        isGlobal={false}
+        isEditable={true}
+        opportunityType={OpportunityTypes.Network}
+        opportunityId={opportunityId}
+        onOk={async (comment: string) => {
+          setShowComments(false);
+        }}
+        onCancel={() => setShowComments(false)}
+      />
+    </>
+  );
+};
+
+export default NetworkOpportunityDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/Opportunities.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/Opportunities.tsx
new file mode 100644
index 0000000..2a4ee21
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/Opportunities.tsx
@@ -0,0 +1,151 @@
+import { useOidcSession } from '@strata/core/lib/auth';
+import ActionBar from '@strata/tempo/lib/actionbar';
+import Button from '@strata/tempo/lib/button';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import CheckCircleIcon from '@strata/tempo/lib/icon/CheckCircleIcon';
+import FilterIcon from '@strata/tempo/lib/icon/FilterIcon';
+import Input from '@strata/tempo/lib/input';
+import Link from '@strata/tempo/lib/link';
+import Tooltip from '@strata/tempo/lib/tooltip/Tooltip';
+import debounce from 'lodash.debounce';
+import React, { useEffect, useMemo, useState } from 'react';
+import { IInitiativeStatuses } from '../../shared/data/IInitiativeStatuses';
+import notificationHub from '../../shared/notification/NotificationHub';
+import { IPagingOptions } from '../../shared/paging';
+import { INetworkOpportunitySummaryProps } from '../Network';
+import { clientOpportunityService } from './data/clientOpportunityService';
+import { INetworkOpportunityFilters, initialFilters, numberOfFilters } from './data/INetworkOpportunityFilters';
+import { INetworkOpportunitySummary } from './data/INetworkOpportunitySummary';
+import Filters from './Filters';
+
+const initialPagingOptions = {
+  sortField: 'identifiedSavings',
+  sortOrder: -1,
+  first: 0,
+  rows: 25
+};
+
+const Opportunities: React.FC<INetworkOpportunitySummaryProps> = (props: INetworkOpportunitySummaryProps) => {
+  const { selectedTab } = props;
+  const [filters, setFilters] = useState<INetworkOpportunityFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const [loading, setLoading] = React.useState(false);
+  const [opportunities, setOpportunities] = React.useState<INetworkOpportunitySummary[]>();
+  const hub = notificationHub.useConnection();
+  const session = useOidcSession();
+  const filtersSelected = numberOfFilters(filters);
+  const handleSearchWithDebounce = useMemo(() => debounce((value) => handleSearch(value), 500), []);
+  const [pagingOptions, setPagingOptions] = useState<IPagingOptions>(initialPagingOptions);
+  const [totalOpportunities, setTotalOpportunities] = useState<number>();
+
+  useEffect(() => {
+    const loadData = async (filters: INetworkOpportunityFilters) => {
+      setLoading(true);
+      try {
+        const pagedResponse = await clientOpportunityService.getOpportunities(pagingOptions, filters);
+        setTotalOpportunities(pagedResponse.pagingInfo.totalNumberOfResults);
+        setOpportunities(pagedResponse.data);
+      } finally {
+        setLoading(false);
+      }
+    };
+    loadData(filters);
+  }, [filters, pagingOptions, selectedTab]);
+
+  const handleSearch = (value: string) => {
+    setFilters((filters) => {
+      return { ...filters, opportunitySearch: value };
+    });
+  };
+
+  const handleApplyFilters = (newFilters: INetworkOpportunityFilters) => {
+    setFiltersVisible(false);
+    setFilters({ ...filters, ...newFilters });
+  };
+
+  const handleCellEdit = (rowData: INetworkOpportunitySummary) => {
+    const opportunity: INetworkOpportunitySummary = {
+      ...rowData,
+      initiativeStatus: rowData.initiativeStatus
+    };
+
+    notificationHub.register(
+      hub,
+      async () => {
+        await clientOpportunityService.updateInitiativeStatus(opportunity.networkOpportunityId, rowData.initiativeStatus);
+      },
+      session.userName + opportunity.networkOpportunityId
+    );
+  };
+
+  return (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} showStatusFilter={true} />
+      <ActionBar
+        filters={
+          <>
+            <Button type={filtersSelected > 0 ? 'primary' : 'secondary'} icon={<FilterIcon />} onClick={() => setFiltersVisible(true)}>
+              Filters{filtersSelected > 0 ? ` (${filtersSelected})` : ''}
+            </Button>
+            <Input width={312} search placeholder={'Search'} onChange={(e) => handleSearchWithDebounce(e.target.value)} />
+          </>
+        }
+      ></ActionBar>
+      <DataGrid
+        dataKey='opportunityKey'
+        loading={loading}
+        value={opportunities}
+        lazy
+        sortField={pagingOptions.sortField}
+        sortOrder={pagingOptions.sortOrder}
+        paginator
+        first={pagingOptions.first}
+        rows={pagingOptions.rows}
+        totalRecords={totalOpportunities}
+        onSort={(e) => setPagingOptions({ ...pagingOptions, ...e })}
+        onPage={(e) => setPagingOptions({ ...pagingOptions, ...e })}
+        scrollable
+        onCellEdit={(e) => handleCellEdit(e.rowData)}
+      >
+        <DataGrid.Column
+          field='opportunityKey'
+          header='Opportunity ID'
+          sortable
+          width={100}
+          body={(rowData) => <Link href={`/network-opportunity/${rowData.networkOpportunityId}`}>{rowData.opportunityKey}</Link>}
+        />
+        <DataGrid.Column field='name' header='Opportunity Name' sortable width={120} />
+        <DataGrid.Column field='description' header='Description' sortable width={240} collapseLongText />
+        <DataGrid.NumberColumn field='identifiedSavings' header='Identified Savings (last 12 months)' format='currency' sortable width={120} />
+        <DataGrid.CheckboxColumn
+          key='hasInitiative'
+          header='Initiative'
+          field='hasInitiative'
+          sortable
+          width={96}
+          body={(rowData) =>
+            rowData.hasInitiative && (
+              <Tooltip title='Created'>
+                <CheckCircleIcon />
+              </Tooltip>
+            )
+          }
+        />
+        <DataGrid.DropDownColumn
+          field='initiativeStatus'
+          header='Status'
+          filterPlaceholder='Select...'
+          width={100}
+          editable
+          items={[
+            { text: 'On Hold', value: IInitiativeStatuses[IInitiativeStatuses.OnHold] },
+            { text: 'In Process', value: IInitiativeStatuses[IInitiativeStatuses.InProcess] },
+            { text: 'Completed', value: IInitiativeStatuses[IInitiativeStatuses.Completed] }
+          ]}
+        />
+      </DataGrid>
+    </>
+  );
+};
+
+export default Opportunities;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/OpportunityManager.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/OpportunityManager.tsx
new file mode 100644
index 0000000..fa0b2dc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/OpportunityManager.tsx
@@ -0,0 +1,257 @@
+import { Input, useToast } from '@strata/tempo/lib';
+import ActionBar from '@strata/tempo/lib/actionbar';
+import Button from '@strata/tempo/lib/button';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import CheckCircleIcon from '@strata/tempo/lib/icon/CheckCircleIcon';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import FilterIcon from '@strata/tempo/lib/icon/FilterIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import Link from '@strata/tempo/lib/link';
+import { useModal } from '@strata/tempo/lib/modal';
+import Tooltip from '@strata/tempo/lib/tooltip';
+import debounce from 'lodash.debounce';
+import React, { useEffect, useMemo, useState } from 'react';
+import { IPagingOptions } from '../../shared/paging';
+import { INetworkOpportunitySummaryProps } from '../Network';
+import { clientOpportunityService } from './data/clientOpportunityService';
+import { INetworkOpportunityFilters, initialFilters, numberOfFilters } from './data/INetworkOpportunityFilters';
+import { INetworkOpportunitySummary } from './data/INetworkOpportunitySummary';
+import { opportunityService } from './data/opportunityService';
+import Filters from './Filters';
+import OpportunityModal from './OpportunityModal';
+
+const initialPagingOptions = {
+  sortField: 'identifiedSavings',
+  sortOrder: -1,
+  first: 0,
+  rows: 25
+};
+
+const OpportunityManager: React.FC<INetworkOpportunitySummaryProps> = (props: INetworkOpportunitySummaryProps) => {
+  const { selectedTab } = props;
+  const [filters, setFilters] = useState<INetworkOpportunityFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const [isCreator, setIsCreator] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [opportunities, setOpportunities] = React.useState<INetworkOpportunitySummary[] | []>();
+  const [showOpportunityModal, setShowOpportunityModal] = React.useState(false);
+  const [opportunityData, setOpportunityData] = React.useState<INetworkOpportunitySummary>();
+  const [pagingOptions, setPagingOptions] = useState<IPagingOptions>(initialPagingOptions);
+  const filtersSelected = numberOfFilters(filters);
+  const [totalOpportunities, setTotalOpportunities] = useState<number>();
+  const toast = useToast();
+  const modal = useModal();
+
+  const loadData = async () => {
+    setLoading(true);
+    try {
+      const pagedResponse = await opportunityService.getOpportunities(pagingOptions, filters);
+      setTotalOpportunities(pagedResponse.pagingInfo.totalNumberOfResults);
+      setOpportunities(pagedResponse.data);
+      const isCreator = await opportunityService.getIsCreator();
+      setIsCreator(isCreator);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    document.title = 'Network';
+    loadData();
+  }, [filters, pagingOptions, selectedTab]);
+
+  const handleCreate = async () => {
+    setOpportunityData(undefined);
+    setShowOpportunityModal(true);
+  };
+
+  const handleOpportunityModalClose = async () => {
+    setShowOpportunityModal(false);
+  };
+
+  const handleOpportunityModalFinish = async () => {
+    setShowOpportunityModal(false);
+    loadData();
+  };
+
+  const handleOpportunityIsPublishedUpdate = async (rowData: INetworkOpportunitySummary, isPublished: boolean) => {
+    if (isPublished && rowData.identifiedSavings === 0) {
+      toast.show({
+        key: rowData.name,
+        toastType: 'error',
+        message: 'Unable to publish, opportunity needs to be configured with Identified Savings.',
+        duration: 0
+      });
+      await loadData();
+      return;
+    }
+
+    modal.confirm({
+      title: isPublished ? `Publish ${rowData.name}?` : `Unpublish ${rowData.name}?`,
+      content: isPublished
+        ? 'Publishing will make this opportunity viewable to clients with access to this database.'
+        : 'Unpublishing will remove this opportunity from the clients view with access to this database.',
+      okText: isPublished ? 'Publish' : 'Unpublish',
+      cancelText: 'Cancel',
+      async onOk() {
+        toast.show({ key: rowData.name, duration: 300, message: `${isPublished ? `Publishing` : `Unpublishing`} ${rowData.name}.`, toastType: 'info' });
+        setLoading(true);
+        const result = await clientOpportunityService.publish(rowData.networkOpportunityId, isPublished);
+        loadData();
+        if (result) {
+          toast.show({
+            key: rowData.name,
+            duration: 300,
+            message: `${rowData.name} was successfully ${isPublished ? `published` : `unpublished`} and opportunity details are ${isPublished ? `now` : `no longer`} viewable in the client database.`,
+            toastType: 'success'
+          });
+        } else {
+          toast.show({ key: rowData.name, duration: 300, message: `An error occurred while ${isPublished ? `publishing` : `unpublishing`} ${rowData.name}.`, toastType: 'error' });
+        }
+        setLoading(false);
+      }
+    });
+  };
+
+  const handleSearch = (value: string) => {
+    setFilters((filters) => {
+      return { ...filters, opportunitySearch: value };
+    });
+  };
+
+  const handleSearchWithDebounce = useMemo(() => debounce((value) => handleSearch(value), 500), []);
+
+  const handleApplyFilters = (newFilters: INetworkOpportunityFilters) => {
+    setFiltersVisible(false);
+    setFilters({ ...filters, ...newFilters });
+  };
+
+  const handleDelete = (rowData: INetworkOpportunitySummary) => {
+    modal.confirm({
+      title: 'Confirm Delete?',
+      content: 'Are you sure you want to delete this opportunity and all associated client network opportunities?',
+      okText: 'Delete',
+      cancelText: 'Cancel',
+      async onOk() {
+        const success = await opportunityService.delete(rowData.networkOpportunityId);
+        if (success) {
+          toast.show({
+            key: 'DeleteStatus',
+            toastType: 'success',
+            message: `${rowData.name} has been deleted.`
+          });
+
+          await loadData();
+        } else {
+          toast.show({
+            key: 'DeleteStatus',
+            toastType: 'error',
+            message: `Error deleting ${rowData.name}.`
+          });
+        }
+      }
+    });
+  };
+
+  const actions = isCreator ? (
+    <Button type='primary' icon={<PlusIcon />} onClick={() => handleCreate()}>
+      Opportunity
+    </Button>
+  ) : (
+    <></>
+  );
+
+  return (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} showStatusFilter={false} />
+      <ActionBar
+        filters={
+          <>
+            <Button type={filtersSelected > 0 ? 'primary' : 'secondary'} icon={<FilterIcon />} onClick={() => setFiltersVisible(true)}>
+              Filters{filtersSelected > 0 ? ` (${filtersSelected})` : ''}
+            </Button>
+            <Input width={312} search placeholder={'Search'} onChange={(e) => handleSearchWithDebounce(e.target.value)} />
+          </>
+        }
+        actions={actions}
+      ></ActionBar>
+      <DataGrid
+        dataKey='opportunityKey'
+        loading={loading}
+        value={opportunities}
+        lazy
+        sortField={pagingOptions.sortField}
+        sortOrder={pagingOptions.sortOrder}
+        paginator
+        first={pagingOptions.first}
+        rows={pagingOptions.rows}
+        totalRecords={totalOpportunities}
+        onSort={(e) => setPagingOptions({ ...pagingOptions, ...e })}
+        onPage={(e) => setPagingOptions({ ...pagingOptions, ...e })}
+        scrollable
+      >
+        <DataGrid.Column
+          field='opportunityKey'
+          header='Opportunity ID'
+          sortable
+          width={100}
+          body={(rowData) => <Link href={`/network-opportunity/${rowData.networkOpportunityId}`}> {rowData.opportunityKey}</Link>}
+        />
+        <DataGrid.Column field='name' header='Opportunity Name' sortable width={120} />
+        <DataGrid.Column field='description' header='Description' sortable width={240} collapseLongText />
+        <DataGrid.NumberColumn field='identifiedSavings' header='Identified Savings (last 12 months)' format='currency' sortable width={120} />
+        <DataGrid.NumberColumn
+          field='analyticsWorkbookId'
+          header='Analytics Workbook Id'
+          body={(rowData: INetworkOpportunitySummary) => (rowData.analyticsWorkbookId !== 0 ? rowData.analyticsWorkbookId : '')}
+          sortable
+          width={160}
+        />
+        <DataGrid.CheckboxColumn
+          field='isPublished'
+          key='isPublished'
+          header='Published to Client'
+          sortable
+          width={80}
+          body={(rowData) =>
+            rowData.isPublished && (
+              <Tooltip title='Published'>
+                <CheckCircleIcon />
+              </Tooltip>
+            )
+          }
+        />
+        <DataGrid.Column
+          width={90}
+          body={(rowData: INetworkOpportunitySummary) => (
+            <Button type='link' onClick={() => handleOpportunityIsPublishedUpdate(rowData, !rowData.isPublished)}>
+              {rowData.isPublished ? 'Unpublish' : 'Publish'}
+            </Button>
+          )}
+        ></DataGrid.Column>
+        {isCreator ? (
+          <DataGrid.Column
+            width={110}
+            body={(rowData: INetworkOpportunitySummary) => (
+              <Button
+                type='link'
+                onClick={() => {
+                  setOpportunityData(rowData);
+                  setShowOpportunityModal(true);
+                }}
+              >
+                Edit Template
+              </Button>
+            )}
+          />
+        ) : (
+          <></>
+        )}
+        {isCreator ? <DataGrid.Column width={100} body={(rowData: INetworkOpportunitySummary) => <Button type='link' icon={<DeleteIcon />} onClick={() => handleDelete(rowData)} />} /> : <></>}
+      </DataGrid>
+      <OpportunityModal isVisible={showOpportunityModal} onCancel={handleOpportunityModalClose} onFinish={handleOpportunityModalFinish} opportunitySummary={opportunityData} />
+    </>
+  );
+};
+
+export default OpportunityManager;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/OpportunityModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/OpportunityModal.tsx
new file mode 100644
index 0000000..fa4e8d2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/OpportunityModal.tsx
@@ -0,0 +1,77 @@
+import Form from '@strata/tempo/lib/form';
+import Input from '@strata/tempo/lib/input';
+import InputTextArea from '@strata/tempo/lib/inputtextarea';
+import Modal from '@strata/tempo/lib/modal';
+import React, { useEffect, useState } from 'react';
+import { INetworkOpportunitySaveModel } from './data/INetworkOpportunitySaveModel';
+import { INetworkOpportunitySummary } from './data/INetworkOpportunitySummary';
+import { opportunityService } from './data/opportunityService';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import { IWorkbookTemplate, analyticsService } from '../../shared/analytics/data/analyticsService';
+
+export interface IOpportunityModalProps {
+  isVisible: boolean;
+  onCancel?: () => void;
+  onFinish: () => void;
+  opportunitySummary?: INetworkOpportunitySummary;
+}
+
+const OpportunityModal: React.FC<IOpportunityModalProps> = (props: IOpportunityModalProps) => {
+  const { isVisible, onCancel, onFinish, opportunitySummary } = props;
+  const [form] = Form.useForm();
+  const [workbookTemplates, setWorkbookTemplates] = useState<IWorkbookTemplate[]>();
+  const isEditMode = !!opportunitySummary;
+
+  useEffect(() => {
+    const getData = async () => {
+      const templates = await analyticsService.getWorkbookTemplates();
+      setWorkbookTemplates(templates);
+    };
+    getData();
+  }, []);
+
+  const handleModalClose = async () => {
+    if (onCancel) {
+      onCancel();
+    }
+  };
+
+  const handleFinishBase = async (values: any) => {
+    const newOpportunity: INetworkOpportunitySaveModel = {
+      networkOpportunityId: opportunitySummary?.networkOpportunityId || 0,
+      name: values.name,
+      description: values.description,
+      costDriver: values.costDriver,
+      isPublished: opportunitySummary?.isPublished || false,
+      workbookTemplateId: values.workbookTemplateId
+    };
+
+    if (opportunitySummary) {
+      await opportunityService.update(opportunitySummary.networkOpportunityId, newOpportunity);
+    } else {
+      await opportunityService.create(newOpportunity);
+    }
+    onFinish();
+  };
+
+  return (
+    <>
+      <Modal title={isEditMode ? 'Edit Network Opportunity' : 'Build Network Opportunity'} visible={isVisible} onOk={() => form.submit()} onCancel={handleModalClose}>
+        <Form form={form} preserve={false} onFinish={handleFinishBase}>
+          {/* Name and description are read-only in edit mode - these are set at creation */}
+          <Form.Item label='Name' name='name' initialValue={opportunitySummary?.name} rules={[{ required: true, whitespace: true }]}>
+            <Input disabled={isEditMode} />
+          </Form.Item>
+          <Form.Item label='Description' name='description' initialValue={opportunitySummary?.description}>
+            <InputTextArea disabled={isEditMode} />
+          </Form.Item>
+          <Form.Item label='Workbook Template' name='workbookTemplateId' initialValue={opportunitySummary?.workbookTemplateId} rules={[{ required: true }]}>
+            <DropDown items={workbookTemplates} itemTextField='name' itemValueField={'templateId'} showSearch></DropDown>
+          </Form.Item>
+        </Form>
+      </Modal>
+    </>
+  );
+};
+
+export default OpportunityModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/IClientNetworkOpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/IClientNetworkOpportunity.ts
new file mode 100644
index 0000000..39bf94f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/IClientNetworkOpportunity.ts
@@ -0,0 +1,28 @@
+import { IInitiativeStatuses } from '../../../shared/data/IInitiativeStatuses';
+
+export interface IClientNetworkOpportunity {
+  networkOpportunityId: number;
+  identifiedSavings: number;
+  identifiedSavingsDescription: string;
+  name: string;
+  description: string;
+  isPublished: boolean;
+  analyticsWorkbookId: number;
+  workbookTemplateId: number;
+  initiativeStatus: IInitiativeStatuses;
+  opportunities: IClientNetworkOpportunityLink[];
+}
+
+export interface IClientNetworkOpportunityLink {
+  configurationGuid: string;
+  opportunityGuid: string;
+  initiativeGuid: string;
+  opportunity: string;
+  costDriver: string;
+  initiative: string;
+}
+
+export interface IClientOpportunityLink {
+  configurationGuid: string;
+  id: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/INetworkOpportunityFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/INetworkOpportunityFilters.ts
new file mode 100644
index 0000000..43f1d2c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/INetworkOpportunityFilters.ts
@@ -0,0 +1,20 @@
+import { IInitiativeStatuses } from '../../../shared/data/IInitiativeStatuses';
+
+export interface INetworkOpportunityFilters {
+  identifiedSavings?: number;
+  opportunitySearch: string;
+  initiativeStatus?: IInitiativeStatuses;
+}
+
+export const initialFilters: INetworkOpportunityFilters = {
+  opportunitySearch: '',
+  identifiedSavings: undefined,
+  initiativeStatus: undefined
+};
+
+export const numberOfFilters = (filters: INetworkOpportunityFilters): number => {
+  let filtersCount = 0;
+  if (filters.initiativeStatus != null) filtersCount++;
+  if (filters.identifiedSavings != null && filters.identifiedSavings > 0) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/INetworkOpportunitySaveModel.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/INetworkOpportunitySaveModel.ts
new file mode 100644
index 0000000..c5352af
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/INetworkOpportunitySaveModel.ts
@@ -0,0 +1,8 @@
+export interface INetworkOpportunitySaveModel {
+  networkOpportunityId: number;
+  name: string;
+  description: string;
+  costDriver: string;
+  isPublished: boolean;
+  workbookTemplateId: number;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/INetworkOpportunitySummary.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/INetworkOpportunitySummary.ts
new file mode 100644
index 0000000..3024179
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/INetworkOpportunitySummary.ts
@@ -0,0 +1,34 @@
+import { IInitiativeStatuses } from '../../../shared/data/IInitiativeStatuses';
+
+export interface INetworkOpportunitySummary {
+  networkOpportunityId: number;
+  opportunityKey: string;
+  name: string;
+  description: string;
+  isPublished: boolean;
+  identifiedSavings: number;
+  costDriver: string;
+  analyticsWorkbookId: number;
+  initiativeStatus: IInitiativeStatuses;
+  hasInitiative: boolean;
+  workbookTemplateId: number;
+}
+
+export const newNetworkOpportunitySummary = (data: Partial<INetworkOpportunitySummary> = {}): INetworkOpportunitySummary => {
+  return {
+    ...{
+      networkOpportunityId: 0,
+      opportunityKey: '',
+      name: '',
+      description: '',
+      isPublished: false,
+      identifiedSavings: 0,
+      costDriver: '',
+      analyticsWorkbookId: 0,
+      initiativeStatus: IInitiativeStatuses.OnHold,
+      hasInitiative: false,
+      workbookTemplateId: 0
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/clientOpportunityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/clientOpportunityService.ts
new file mode 100644
index 0000000..336a4cc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/clientOpportunityService.ts
@@ -0,0 +1,48 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IInitiativeStatuses } from '../../../shared/data/IInitiativeStatuses';
+import { IPagedApiResponse, IPagingOptions } from '../../../shared/paging';
+import { IClientNetworkOpportunity } from './IClientNetworkOpportunity';
+import { INetworkOpportunityFilters } from './INetworkOpportunityFilters';
+import { INetworkOpportunitySummary } from './INetworkOpportunitySummary';
+
+const { httpDelete, httpGet, httpPost, httpPut } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'client-network-opportunities';
+
+export const clientOpportunityService = {
+  getOpportunities: async (pagingOptions: IPagingOptions, filters: INetworkOpportunityFilters): Promise<IPagedApiResponse<INetworkOpportunitySummary>> => {
+    return httpPost<IPagedApiResponse<INetworkOpportunitySummary>>(`${url}/opportunities`, {
+      pagingOptions,
+      filters: {
+        ...filters
+      }
+    });
+  },
+
+  getOpportunity: async (networkOpportunityId: string | number): Promise<IClientNetworkOpportunity> => {
+    return httpGet<IClientNetworkOpportunity>(`${url}/${networkOpportunityId}`, {});
+  },
+
+  checkWorkbook: async (networkOpportunityId: string | number): Promise<void> => {
+    return httpPut(`${url}/${networkOpportunityId}/check-workbook`, {});
+  },
+
+  save(id: string | number, dto: IClientNetworkOpportunity): Promise<void> {
+    return httpPut(`${url}/${id}`, dto);
+  },
+
+  delete(id: string | number): Promise<void> {
+    return httpDelete(`${url}/${id}`);
+  },
+
+  publish(id: string | number, isPublished: boolean): Promise<boolean> {
+    return httpPut(`${url}/${id}/publish?isPublished=${isPublished}`, undefined);
+  },
+
+  updateInitiativeStatus(id: number, status: IInitiativeStatuses): Promise<void> {
+    return httpPut(`${url}/update-initiative-status/${id}`, status);
+  },
+
+  revertWorkbookToTemplate: async (networkOpportunityId: number): Promise<boolean> => {
+    return httpPut(`${url}/${networkOpportunityId}/revert-workbook-to-template`, undefined);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/clientOppportunityLinkService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/clientOppportunityLinkService.ts
new file mode 100644
index 0000000..0fa4daf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/clientOppportunityLinkService.ts
@@ -0,0 +1,23 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+
+const { httpDelete, httpPut } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'client-network-opportunity-link';
+
+export const clientOpportunityLinkService = {
+  addClientOpportunityLink(networkOpportunityId: string | number, opportunityGuid: string) {
+    if (opportunityGuid === '00000000-0000-0000-0000-000000000000') {
+      return;
+    }
+    const dto: ICreateNetworkOpportunityLinkDto = { networkOpportunityId, opportunityGuid };
+    return httpPut(`${url}`, dto);
+  },
+
+  deleteOpportunityLink: async (opportunityGuid: string, configurationGuid: string): Promise<boolean> => {
+    return httpDelete(`${url}/${opportunityGuid}/${configurationGuid}`);
+  }
+};
+
+interface ICreateNetworkOpportunityLinkDto {
+  networkOpportunityId: string | number;
+  opportunityGuid: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/opportunityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/opportunityService.ts
new file mode 100644
index 0000000..e674ffa
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/network/opportunities/data/opportunityService.ts
@@ -0,0 +1,42 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IPagedApiResponse, IPagingOptions } from '../../../shared/paging';
+import { INetworkOpportunityFilters } from './INetworkOpportunityFilters';
+import { INetworkOpportunitySaveModel } from './INetworkOpportunitySaveModel';
+import { INetworkOpportunitySummary } from './INetworkOpportunitySummary';
+
+const { httpGet, httpPost, httpPut, httpDelete } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const opportunityService = {
+  getNetworkOpportunitiesEnabled: async (): Promise<boolean> => {
+    return httpGet<boolean>(`network-opportunities/enabled`, {});
+  },
+
+  getIsCreator: async (): Promise<boolean> => {
+    return httpGet<boolean>(`network-opportunities/is-creator`);
+  },
+
+  getOpportunities: async (pagingOptions: IPagingOptions, filters: INetworkOpportunityFilters): Promise<IPagedApiResponse<INetworkOpportunitySummary>> => {
+    return httpPost<IPagedApiResponse<INetworkOpportunitySummary>>(`network-opportunities/opportunities`, {
+      pagingOptions,
+      filters: {
+        ...filters
+      }
+    });
+  },
+
+  getAnalyticsWorkbooks: async (): Promise<string[]> => {
+    return httpGet<string[]>(`network-opportunities/workbooks`, {});
+  },
+
+  create(newOpportunity: INetworkOpportunitySaveModel): Promise<INetworkOpportunitySummary> {
+    return httpPost<INetworkOpportunitySummary>(`network-opportunities/create`, newOpportunity);
+  },
+
+  update(id: string | number, opportunity: INetworkOpportunitySaveModel): Promise<INetworkOpportunitySummary> {
+    return httpPut<INetworkOpportunitySummary>(`network-opportunities/${id}`, opportunity);
+  },
+
+  delete(id: string | number): Promise<boolean> {
+    return httpDelete<boolean>(`network-opportunities/${id}`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/AllGrid.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/AllGrid.tsx
new file mode 100644
index 0000000..a784315
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/AllGrid.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import OpportunitiesHeader from '../shared/opportunities/OpportunitiesHeader';
+import Opportunities from './opportunities/Opportunities';
+
+const AllGrid: React.FC = () => {
+  return (
+    <>
+      <OpportunitiesHeader headerTitle='All Opportunities' helpId='1300' />
+      <Opportunities />
+    </>
+  );
+};
+
+export default AllGrid;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/Filters.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/Filters.test.tsx
new file mode 100644
index 0000000..20787ab
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/Filters.test.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import { render, screen, fireEvent } from '../../test-utils/testUtils';
+import { opportunityService } from './data/opportunityService';
+import Filters from './Filters';
+import { IAllFilterOptions, newFilterOptions } from './data/IAllFilterOptions';
+import { IAllFilters } from './data/IAllFilters';
+import { dropDownTestUtils } from '@strata/test-utils/lib';
+
+const mockFilterOptions: IAllFilterOptions = newFilterOptions({
+  opportunityTypes: [
+    { text: 'Opportunity Level 1', id: '1' },
+    { text: 'Opportunity Level 2', id: '2' }
+  ]
+});
+
+const mockInitialFilters: IAllFilters = {
+  opportunityTypes: [],
+  identifiedSavings: undefined,
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+test('Filters default to empty', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const opportunityTypeDropdown = dropDownTestUtils.getDropDown('Opportunity Type');
+
+  // verify default value is set correctly
+  expect(dropDownTestUtils.getSelectedOption(opportunityTypeDropdown)).toEqual('');
+});
+
+test('Filters clear', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const opportunityTypeDropdown = dropDownTestUtils.getDropDown('Opportunity Type');
+  const identifiedSavingsInput = screen.getByRole('spinbutton', { name: 'Identified Savings Minimum' });
+
+  // verify default value is set correctly
+  for (const txt of mockFilterOptions.opportunityTypes) {
+    await dropDownTestUtils.selectOption(opportunityTypeDropdown, txt.text);
+  }
+  fireEvent.change(identifiedSavingsInput, { target: { value: 123 } });
+
+  const label = `All ${mockFilterOptions.opportunityTypes.length} selected`;
+  expect(dropDownTestUtils.getSelectedOption(opportunityTypeDropdown)).toEqual(label);
+  expect(identifiedSavingsInput).toHaveValue('123');
+
+  const clearButton = screen.getByRole('button', { name: 'Clear Filters' });
+  fireEvent.click(clearButton);
+
+  expect(dropDownTestUtils.getSelectedOption(opportunityTypeDropdown)).toEqual('');
+  expect(identifiedSavingsInput).not.toHaveValue();
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/Filters.tsx
new file mode 100644
index 0000000..8eff8f9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/Filters.tsx
@@ -0,0 +1,100 @@
+import React, { useCallback } from 'react';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import Drawer from '@strata/tempo/lib/drawer';
+import DropDown from '@strata/tempo/lib/dropdown';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing';
+import Checkbox from '@strata/tempo/lib/checkbox';
+import { initialFilters, IAllFilters } from './data/IAllFilters';
+import { useEffect, useState } from 'react';
+import { opportunityService } from './data/opportunityService';
+import { IListMember } from '../../shared/data/IListMember';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+
+interface IFiltersProps {
+  filters: IAllFilters;
+  isVisible: boolean;
+  onApply: (filters: IAllFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const [opportunityTypes, setOpportunityTypes] = useState<IListMember[]>();
+  const { currentConfiguration } = useConfigurations();
+
+  const [form] = Form.useForm<IAllFilters>();
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      if (currentConfiguration == null) {
+        return;
+      }
+      const { opportunityTypes } = await opportunityService.getFilterOptions(currentConfiguration.configurationGuid);
+
+      setOpportunityTypes(opportunityTypes);
+      handleClearFilters();
+    };
+
+    loadFiltersOptions();
+  }, [currentConfiguration, handleClearFilters]);
+
+  const handleApplyFilters = () => {
+    const filters: IAllFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Opportunity Type' name='opportunityTypes'>
+          <DropDown multiSelect items={opportunityTypes} allowClear itemTextField='text' itemValueField='id' placeholder='None Selected' />
+        </Form.Item>
+        <Form.Item label='Identified Savings Minimum' name='identifiedSavings'>
+          <InputNumber format='currency' placeholder='' precision={0} />
+        </Form.Item>
+        <Form.Item label='Display' name='viewVisible'>
+          <RadioGroup
+            options={[
+              { value: true, label: 'Visible Opportunities' },
+              { value: false, label: 'Hidden Opportunities' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Initiatives' name='excludeInitiatives' valuePropName='checked'>
+          <Checkbox>Exclude Opportunities with Initiatives</Checkbox>
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/Opportunities.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/Opportunities.test.tsx
new file mode 100644
index 0000000..7e6bfd3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/Opportunities.test.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { screen, within } from '../../test-utils/testUtils';
+import { IAllOpportunity, newAllOpportunity } from './data/IAllOpportunity';
+import { opportunityService } from './data/opportunityService';
+import { IPagedApiResponse } from '../../shared/paging/IPagedApiResponse';
+
+const mockOpportunities: IAllOpportunity[] = [
+  newAllOpportunity({
+    opportunityKey: 'UV - 1',
+    name: 'UV 1',
+    identifiedSavings: 100,
+    opportunityType: 0,
+    opportunityTypeName: 'Utilization Variation'
+  }),
+  newAllOpportunity({
+    opportunityKey: 'EN - 2',
+    name: 'Encounter 2',
+    identifiedSavings: 200,
+    opportunityType: 8,
+    opportunityTypeName: 'Encounter'
+  })
+];
+
+const mockPagedOpportunities: IPagedApiResponse<IAllOpportunity> = {
+  data: mockOpportunities,
+  pagingInfo: {
+    pageNumber: 1,
+    resultsPerPage: 25,
+    totalNumberOfResults: 2,
+    totalPages: 1
+  }
+};
+
+test.skip('All opportunities are shown', async () => {
+  jest.spyOn(opportunityService, 'getOpportunities').mockImplementation(() => Promise.resolve(mockPagedOpportunities));
+
+  // render component
+  // render(<Opportunities />);
+
+  // wait for grid to load
+  const cell = await screen.findByRole('cell', { name: mockPagedOpportunities.data[0].opportunityKey });
+
+  // get rows
+  const tableBody = cell?.parentElement?.parentElement as HTMLElement;
+  const rows = within(tableBody).getAllByRole('row');
+
+  // verify data shows in grid
+  mockPagedOpportunities.data.forEach((opportunity, index) => {
+    const row = rows[index];
+    within(row).getByText(opportunity.opportunityKey);
+    within(row).getByText(opportunity.opportunityTypeName);
+    within(row).getByText(opportunity.name);
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/Opportunities.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/Opportunities.tsx
new file mode 100644
index 0000000..c8be531
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/Opportunities.tsx
@@ -0,0 +1,214 @@
+import { useJazzUrlWithVersion, useOidcSession } from '@strata/core/lib';
+import { usePageLoader } from '@strata/tempo/lib';
+import ButtonMenu, { IButtonMenuClickEvent } from '@strata/tempo/lib/buttonmenu';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import { IMenuItem } from '@strata/tempo/lib/menu/Menu';
+import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
+import ExplorationOpportunityModal from '../../exploration/opportunities/ExplorationOpportunityModal';
+import { IExplorationOpportunity } from '../../exploration/opportunities/data/IExplorationOpportunity';
+import { opportunityService as explorationOpportunityService } from '../../exploration/opportunities/data/opportunityservice';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { BuildOpportunityTypes } from '../../shared/data/BuildOpportunityType';
+import OpportunitiesGrid from '../../shared/opportunities/OpportunitiesGrid';
+import { IOpportunity } from '../../shared/opportunities/data';
+import Filters from './Filters';
+import { IAllFilters, initialFilters, numberOfFilters } from './data/IAllFilters';
+import { IAllOpportunity, OpportunityTypes } from './data/IAllOpportunity';
+import { opportunityService } from './data/opportunityService';
+import { opportunityService as encounterOpportunityService } from '../../encounter/opportunities/data/opportunityService';
+import { opportunityService as payrollOpportunityService } from '../../payroll/opportunities/data/opportunityService';
+
+const Opportunities: React.FC = () => {
+  const [filters, setFilters] = useState<IAllFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+  const jazzUrl = useJazzUrlWithVersion();
+  const history = useHistory();
+  const session = useOidcSession();
+  const { setLoading } = usePageLoader();
+
+  const [explorationModalVisible, setExplorationModalVisible] = useState(false);
+  const [isEncounterTempoPageEnabled, setIsEncounterTempoPageEnabled] = useState(false);
+  const [isPayrollTempoPageEnabled, setIsPayrollTempoPageEnabled] = useState(false);
+  const [chargeCodeBeta, setChargeCodeBeta] = useState(false);
+  const [flexibleExploration, setFlexibleExporation] = useState(false);
+
+  useEffect(() => {
+    setLoading(true);
+    const checkForBeta = async () => {
+      const isChargeCodeBeta = await opportunityService.chargeCodeBeta();
+      setChargeCodeBeta(isChargeCodeBeta || session.isStrata);
+    };
+    const checkForFlexibleExploration = async () => {
+      const hasFlexibleExploration = await opportunityService.getFlexibleExplorationEnabled();
+      setFlexibleExporation(hasFlexibleExploration);
+    };
+    const checkOpportunitiesTempoPageEnabled = async () => {
+      const isEncounterTempoPageEnabled = await encounterOpportunityService.isOpportunityTempoPageEnabled();
+      setIsEncounterTempoPageEnabled(isEncounterTempoPageEnabled);
+      const isPayrollTempoPageEnabled = await payrollOpportunityService.isOpportunityTempoPageEnabled();
+      setIsPayrollTempoPageEnabled(isPayrollTempoPageEnabled);
+    };
+    document.title = 'All Opportunities';
+    Promise.all([checkForBeta(), checkForFlexibleExploration(), checkOpportunitiesTempoPageEnabled()]).finally(() => setLoading(false));
+  }, [session.isStrata, setLoading]);
+
+  useEffect(() => {
+    if (currentConfiguration == null) {
+      return;
+    }
+    setFilters(initialFilters);
+    setCurrentConfigurationGuid(currentConfiguration.configurationGuid);
+  }, [currentConfiguration]);
+
+  const handleApplyFilters = (newFilters: IAllFilters) => {
+    setFiltersVisible(false);
+    setFilters({ ...filters, ...newFilters });
+  };
+
+  const handleSearch = (searchValue: string) => {
+    setFilters((filters) => {
+      return { ...filters, opportunitySearch: searchValue };
+    });
+  };
+
+  const getOpportunityUrl = (opp: IOpportunity) => {
+    const opportunity = opp as IAllOpportunity;
+    const isLOS = opportunity.costDriver === 'LOS';
+    switch (opportunity.opportunityType) {
+      case OpportunityTypes.Network:
+        // eslint-disable-next-line no-case-declarations
+        const opportunityId = opportunity.opportunityId;
+        return `network-opportunity/${opportunityId}`;
+      case OpportunityTypes.ChargeCode:
+        return `/charge-code-opportunity/${opportunity.opportunityGuid}`;
+      case OpportunityTypes.Encounter:
+        return isEncounterTempoPageEnabled ? `/encounter-opportunity/${opportunity.opportunityGuid}` : `${jazzUrl}CCI/Encounter/OpportunityViewer.aspx?opportunityGuid=${opportunity.opportunityGuid}`;
+      case OpportunityTypes.UtilizationVariation:
+      case OpportunityTypes.Exploration:
+        // eslint-disable-next-line no-case-declarations
+        const opportunityVariationType = opportunity.opportunityKey.substring(0, 2);
+        return `${jazzUrl}CCI/${opportunityVariationType === 'UV' ? 'Variation' : 'ExplorationVariation'}/${isLOS ? 'Los' : ''}OpportunityViewer.aspx?opportunityGuid=${opportunity.opportunityGuid}`;
+      case OpportunityTypes.QualityVariation:
+        return `${jazzUrl}CCI/QualityVariation/OpportunityViewer.aspx?opportunityGuid=${opportunity.opportunityGuid}`;
+      case OpportunityTypes.FreeForm:
+        return `/free-form-opportunity/${opportunity.opportunityGuid}`;
+      case OpportunityTypes.GeneralLedger:
+        return `${jazzUrl}CCI/GeneralLedger/OpportunityViewer.aspx?opportunityGuid=${opportunity.opportunityGuid}`;
+      case OpportunityTypes.Payroll:
+        return isPayrollTempoPageEnabled ? `/payroll-opportunity/${opportunity.opportunityGuid}` : `${jazzUrl}CCI/Payroll/OpportunityViewer.aspx?opportunityGuid=${opportunity.opportunityGuid}`;
+      default:
+        return '';
+    }
+  };
+
+  const getInitiativeUrl = (opp: IOpportunity) => {
+    const opportunity = opp as IAllOpportunity;
+    const isFinancial = opportunity.costDriver === 'Financial Free Form';
+    switch (opportunity.opportunityType) {
+      case OpportunityTypes.ChargeCode:
+        return `${jazzUrl}CCI/ChargeCode/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+      case OpportunityTypes.Encounter:
+        return `${jazzUrl}CCI/Encounter/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+      case OpportunityTypes.UtilizationVariation:
+        return `${jazzUrl}CCI/Variation/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+      case OpportunityTypes.QualityVariation:
+        return `${jazzUrl}CCI/QualityVariation/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+      case OpportunityTypes.FreeForm:
+        return `${jazzUrl}CCI/FreeForm/${isFinancial ? 'Financial' : ''}InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+      case OpportunityTypes.GeneralLedger:
+        return `${jazzUrl}CCI/GeneralLedger/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+      case OpportunityTypes.Payroll:
+        return `${jazzUrl}CCI/Payroll/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+      case OpportunityTypes.Exploration:
+        return `${jazzUrl}CCI/ExplorationVariation/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+      default:
+        return '';
+    }
+  };
+
+  const handleBuildOpportunity = (selection: IButtonMenuClickEvent) => {
+    const opportunityType = +selection.key;
+    switch (opportunityType) {
+      case BuildOpportunityTypes.ChargeCode:
+        history.push('/initiatives/create/charge-code', {
+          networkOpportunityId: undefined,
+          networkOpportunityName: undefined
+        });
+        break;
+      case BuildOpportunityTypes.Encounter:
+        history.push(`/initiatives/create/encounter`, { networkOpportunityId: undefined, networkOpportunityName: undefined });
+        break;
+      case BuildOpportunityTypes.Exploration:
+        setExplorationModalVisible(true);
+        break;
+      case BuildOpportunityTypes.FreeForm:
+        history.push(`/initiatives/create/free-form`, { networkOpportunityId: undefined, networkOpportunityName: undefined });
+        break;
+      case BuildOpportunityTypes.GeneralLedger:
+        history.push(`/initiatives/create/general-ledger`, { networkOpportunityId: undefined, networkOpportunityName: undefined });
+        break;
+      case BuildOpportunityTypes.Payroll:
+        history.push(`/initiatives/create/payroll`, { networkOpportunityId: undefined, networkOpportunityName: undefined });
+        break;
+    }
+  };
+
+  const opportunityButtonMenuItems = (): IMenuItem[] => {
+    const items: IMenuItem[] = [];
+    if (chargeCodeBeta) {
+      items.push({ key: BuildOpportunityTypes.ChargeCode.toString(), label: 'Charge Code' });
+    }
+    items.push(...[{ key: BuildOpportunityTypes.Encounter.toString(), label: 'Encounter' }]);
+    if (flexibleExploration) {
+      items.push({ key: BuildOpportunityTypes.Exploration.toString(), label: 'Exploration' });
+    }
+    items.push(
+      ...[
+        { key: BuildOpportunityTypes.FreeForm.toString(), label: 'Free Form' },
+        { key: BuildOpportunityTypes.GeneralLedger.toString(), label: 'General Ledger' },
+        { key: BuildOpportunityTypes.Payroll.toString(), label: 'Payroll' }
+      ]
+    );
+    return items;
+  };
+
+  const addOpportunityButton = <ButtonMenu icon={<PlusIcon />} type='primary' buttonText='Opportunity' onClick={(selected) => handleBuildOpportunity(selected)} items={opportunityButtonMenuItems()} />;
+
+  return (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />
+      <OpportunitiesGrid
+        configurationGuid={currentConfigurationGuid}
+        getOpportunityUrl={getOpportunityUrl}
+        getInitiativeUrl={getInitiativeUrl}
+        filters={filters}
+        opportunityService={opportunityService}
+        identifiedSavingsIndex={3}
+        numOfSelectedFilters={numberOfFilters(filters)}
+        searchPlaceholderText='Search'
+        onFilter={() => setFiltersVisible(true)}
+        onSearch={handleSearch}
+        customAction={addOpportunityButton}
+      >
+        <DataGrid.Column field='opportunityTypeName' header='Type' sortable width={200} />
+        <DataGrid.Column field='name' header='Name' sortable width={320} collapseLongText />
+      </OpportunitiesGrid>
+
+      <ExplorationOpportunityModal
+        isVisible={explorationModalVisible}
+        explorationOpportunity={undefined}
+        onOk={async (opportunity: IExplorationOpportunity) => {
+          setExplorationModalVisible(false);
+          await explorationOpportunityService.createOpportunity(opportunity);
+        }}
+        onCancel={() => setExplorationModalVisible(false)}
+      />
+    </>
+  );
+};
+
+export default Opportunities;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/data/IAllFilterOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/data/IAllFilterOptions.ts
new file mode 100644
index 0000000..55df296
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/data/IAllFilterOptions.ts
@@ -0,0 +1,14 @@
+import { IListMember } from '../../../shared/data/IListMember';
+
+export interface IAllFilterOptions {
+  opportunityTypes: IListMember[];
+}
+
+export const newFilterOptions = (data: Partial<IAllFilterOptions> = {}): IAllFilterOptions => {
+  return {
+    ...{
+      opportunityTypes: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/data/IAllFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/data/IAllFilters.ts
new file mode 100644
index 0000000..706639b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/data/IAllFilters.ts
@@ -0,0 +1,22 @@
+import { IOpportunityFilters } from '../../../shared/opportunities/data';
+
+export interface IAllFilters extends IOpportunityFilters {
+  opportunityTypes: string[];
+}
+
+export const initialFilters: IAllFilters = {
+  identifiedSavings: undefined,
+  opportunityTypes: [],
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+export const numberOfFilters = (filters: IAllFilters): number => {
+  let filtersCount = 0;
+  if (filters.identifiedSavings != null) filtersCount++;
+  if (filters.opportunityTypes.length > 0) filtersCount++;
+  if (filters.viewVisible === false) filtersCount++;
+  if (filters.excludeInitiatives === true) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/data/IAllOpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/data/IAllOpportunity.ts
new file mode 100644
index 0000000..8633bb8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/data/IAllOpportunity.ts
@@ -0,0 +1,59 @@
+import { IOpportunity } from '../../../shared/opportunities/data/IOpportunity';
+
+export interface IAllOpportunity extends IOpportunity {
+  opportunityType: OpportunityTypes;
+  opportunityTypeName: string;
+  name: string;
+  costDriver: string;
+}
+
+// Info: sync with backend
+export enum OpportunityTypes {
+  UtilizationVariation,
+  QualityVariation = 2,
+  ClinicalGrowth = 4,
+  FreeForm,
+  GeneralLedger,
+  Payroll,
+  Encounter,
+  ChargeCode,
+  Network,
+  Exploration,
+  Blank,
+  StrategicOpportunityChargeCode
+}
+
+// helper for getting pretty string values for enum
+export enum OpportunityTypesDisplayString {
+  'Utilization Variation' = OpportunityTypes.UtilizationVariation,
+  'Quality Variation' = OpportunityTypes.QualityVariation,
+  'Free Form' = OpportunityTypes.FreeForm,
+  'General Ledger' = OpportunityTypes.GeneralLedger,
+  'Payroll' = OpportunityTypes.Payroll,
+  'Encounter' = OpportunityTypes.Encounter,
+  'Charge Code' = OpportunityTypes.ChargeCode,
+  'Network' = OpportunityTypes.Network,
+  'Exploration' = OpportunityTypes.Exploration
+}
+
+export const newAllOpportunity = (data: Partial<IAllOpportunity> = {}): IAllOpportunity => {
+  return {
+    ...{
+      opportunityKey: '',
+      opportunityId: 0,
+      opportunityGuid: '',
+      opportunityType: OpportunityTypes.UtilizationVariation,
+      opportunityTypeName: '',
+      name: '',
+      costDriver: '',
+      identifiedSavings: 0,
+      hasInitiative: false,
+      note: '',
+      isHidden: false,
+      initiativeGuid: '',
+      sourceOpportunity: '',
+      sourceOpportunityId: -1
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/data/opportunityService.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/data/opportunityService.tsx
new file mode 100644
index 0000000..0b3acc4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/opportunities/opportunities/data/opportunityService.tsx
@@ -0,0 +1,58 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IOpportunityFilters, IOpportunityService } from '../../../shared/opportunities/data';
+import { IPagedApiResponse, IPagingOptions, ISortOptions } from '../../../shared/paging';
+import { IAllFilterOptions } from './IAllFilterOptions';
+import { IAllOpportunity } from './IAllOpportunity';
+
+const { httpGet, httpPost, httpPut, httpDownloadAndDisplayFile } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const opportunityService: IOpportunityService = {
+  getFlexibleExplorationEnabled: async (): Promise<boolean> => {
+    return httpGet<boolean>(`exploration-opportunities/enabled`, {});
+  },
+
+  getOpportunities: async (configurationGuid: string, pagingOptions: IPagingOptions, filters: IOpportunityFilters): Promise<IPagedApiResponse<IAllOpportunity>> => {
+    return httpPost<IPagedApiResponse<IAllOpportunity>>(`all-opportunities`, {
+      pagingOptions,
+      filters: {
+        ...filters,
+        configurationGuid
+      }
+    });
+  },
+
+  export: async (configurationGuid: string, sortOptions: ISortOptions, filters: IOpportunityFilters): Promise<void> => {
+    const date = new Date();
+    const fileName = 'All_CI_Opportunities_' + date.toISOString().split('T')[0];
+    httpDownloadAndDisplayFile(
+      'all-opportunities/export',
+      {
+        method: 'post',
+        body: JSON.stringify({
+          sortOptions,
+          filters: {
+            ...filters,
+            configurationGuid
+          }
+        })
+      },
+      fileName
+    );
+  },
+
+  getFilterOptions: (configurationGuid: string): Promise<IAllFilterOptions> => {
+    return httpGet<IAllFilterOptions>(`all-opportunities/${configurationGuid}/filter-options`);
+  },
+
+  setHidden: async (opportunityGuid: string, isHidden: boolean): Promise<void> => {
+    await httpPut(`all-opportunities/${opportunityGuid}/set-hidden`, isHidden);
+  },
+
+  setNote: async (opportunityGuid: string, note: string): Promise<void> => {
+    await httpPut(`all-opportunities/${opportunityGuid}/set-note`, note);
+  },
+
+  chargeCodeBeta: async (): Promise<boolean> => {
+    return httpGet(`charge-code-opportunities/opportunity-create-enabled`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/Payroll.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/Payroll.tsx
new file mode 100644
index 0000000..e6f9b61
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/Payroll.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import Opportunities from './opportunities/Opportunities';
+import OpportunitiesHeader from '../shared/opportunities/OpportunitiesHeader';
+
+const Payroll: React.FC = () => {
+  return (
+    <>
+      <OpportunitiesHeader headerTitle='Payroll Opportunities' helpId='1314' />
+      <Opportunities />
+    </>
+  );
+};
+
+export default Payroll;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/CreatePayrollInitiative.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/CreatePayrollInitiative.tsx
new file mode 100644
index 0000000..d4391ca
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/CreatePayrollInitiative.tsx
@@ -0,0 +1,113 @@
+import { useJazzUrlWithVersion } from '@strata/core/lib/auth/useJazzUrlWithVersion';
+import Wizard from '@strata/tempo/lib/wizard/Wizard';
+import React, { useEffect } from 'react';
+import { useHistory } from 'react-router';
+import { clientOpportunityLinkService } from '../../network/opportunities/data/clientOppportunityLinkService';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import ShowCreateErrorMessage from '../../shared/components/ShowCreateErrorMessage';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import CreateInitiative from '../../shared/initiatives/CreateInitiative';
+import { IInitiative } from '../../shared/initiatives/data/IInitiative';
+import { IInitiativeProps } from '../../shared/initiatives/data/IInitiativeProps';
+import { initiativeService as dfltInitiativeService } from '../../shared/initiatives/data/initiativeService';
+import { nameValidationService } from '../../shared/opportunities/data/nameValidationService';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { opportunityService } from '../opportunities/data/opportunityService';
+import PayrollDetail from './PayrollDetail';
+import { IPayrollInitiative, newPayrollInitiative } from './data/IPayrollInitiative';
+import { cleanUpPayrollInitiative } from './data/IPayrollInitiativeDto';
+import { initiativeService } from './data/initiativeService';
+import { OpportunityCreateResponse } from '../../shared/initiatives/data/OpportunityCreateResponse';
+
+const CreatePayrollInitiative: React.FC = () => {
+  const [initiative, setInitiative] = React.useState<IInitiative>();
+  const [isLoading, setLoading] = React.useState<boolean>(false);
+  const [error, setError] = React.useState<unknown>(null);
+  const jazzUrl = useJazzUrlWithVersion();
+  const { currentConfiguration } = useConfigurations();
+  const { userSetting } = React.useContext(UserSettingContext);
+  const history = useHistory();
+  const { networkOpportunityId, networkOpportunityName } = history.location.state as IInitiativeProps;
+
+  useEffect(() => {
+    if (!initiative && currentConfiguration) {
+      const initiative = newPayrollInitiative(currentConfiguration);
+      if (networkOpportunityName) {
+        initiative.name = networkOpportunityName;
+      }
+      setInitiative(initiative);
+    }
+  }, [currentConfiguration, initiative, networkOpportunityName]);
+
+  const nameIsValid = (name: string): Promise<boolean> => {
+    return nameValidationService.nameIsValid(userSetting.configurationGuid, OpportunityTypes.Payroll, name);
+  };
+
+  const pageIsValid = (currentStep: number, detailValues: IPayrollInitiative): boolean => {
+    if (
+      !detailValues.departments ||
+      detailValues.departments.length === 0 ||
+      !detailValues.jobCodes ||
+      detailValues.jobCodes.length === 0 ||
+      !detailValues.payCodes ||
+      detailValues.payCodes.length === 0
+    ) {
+      return false;
+    }
+    return true;
+  };
+
+  const createOpportunity = async (detailValues: IPayrollInitiative): Promise<void> => {
+    const cleanup = cleanUpPayrollInitiative({ ...initiative, ...detailValues });
+
+    setLoading(true);
+    try {
+      const response: OpportunityCreateResponse = await initiativeService.create(cleanup);
+      await gotoOpportunityPage(response.value);
+    } catch (createError) {
+      console.error('❌ Error creating Payroll Opportunity:', createError);
+      try {
+        const retrievedOpportunityGuid: string = await dfltInitiativeService.getOpportunityGuidByName(cleanup.configurationGuid, OpportunityTypes.Payroll, cleanup.name);
+        await gotoOpportunityPage(retrievedOpportunityGuid);
+      } catch (retrievalError) {
+        setError(retrievalError);
+      }
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const gotoOpportunityPage = async (opportunityGuid: string) => {
+    if (networkOpportunityId) {
+      await clientOpportunityLinkService.addClientOpportunityLink(networkOpportunityId, opportunityGuid);
+    }
+    const isTempoPageEnabled = await opportunityService.isOpportunityTempoPageEnabled();
+    if (isTempoPageEnabled) {
+      history.push(`/payroll-opportunity/${opportunityGuid}`);
+    } else {
+      window.location.assign(`${jazzUrl}CCI/Payroll/OpportunityViewer.aspx?opportunityGuid=${opportunityGuid}`);
+    }
+  };
+
+  return (
+    <>
+      <CreateInitiative
+        opportunityType='Payroll'
+        helpId='1509'
+        newInitiative={initiative}
+        nameIsValid={nameIsValid}
+        pageIsValid={pageIsValid}
+        createOpportunity={createOpportunity}
+        isLoading={isLoading}
+      >
+        <Wizard.Step key='1' title='Payroll Opportunity'>
+          <PayrollDetail />
+        </Wizard.Step>
+        <></>
+      </CreateInitiative>
+      {error && <ShowCreateErrorMessage error={error} />}
+    </>
+  );
+};
+
+export default CreatePayrollInitiative;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/PayrollDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/PayrollDetail.tsx
new file mode 100644
index 0000000..a7f311a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/PayrollDetail.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import Form from '@strata/tempo/lib/form/Form';
+import RadioGroup from '@strata/tempo/lib/radiogroup/RadioGroup';
+import Text from '@strata/tempo/lib/text/Text';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import ScoreMemberPicker from '@strata/score/lib/ScoreMemberPicker/ScoreMemberPicker';
+import { PayrollGoalType } from '../opportunities/data/IPROpportunity';
+import Divider from '@strata/tempo/lib/divider/Divider';
+
+const PayrollDetail: React.FC = () => {
+  return (
+    <>
+      <Spacing padding={16} column>
+        <Form.Item label='Type' name='payrollGoal' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: PayrollGoalType.Both, label: 'Both' },
+              { value: PayrollGoalType.Variable, label: 'Variable' },
+              { value: PayrollGoalType.Fixed, label: 'Fixed' }
+            ]}
+          />
+        </Form.Item>
+        <Divider extended={false}></Divider>
+        <Spacing column itemSpacing={16} padding='0 0 16px 0'>
+          <Text color='secondary' strong={true}>
+            SET UP
+          </Text>
+        </Spacing>
+        <Spacing>
+          <Form.Item label='Departments' name='departments' rules={[{ required: true }]}>
+            <ScoreMemberPicker dimensionGuidOrGlobalId='Department' showHierarchyDropdown={false} modalTitle='Departments' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+          </Form.Item>
+        </Spacing>
+        <Spacing>
+          <Form.Item label='Job Codes' name='jobCodes' rules={[{ required: true }]}>
+            <ScoreMemberPicker dimensionGuidOrGlobalId='job code' showHierarchyDropdown={false} modalTitle='Job Codes' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+          </Form.Item>
+        </Spacing>
+        <Spacing>
+          <Form.Item label='Pay Codes' name='payCodes' rules={[{ required: true }]}>
+            <ScoreMemberPicker dimensionGuidOrGlobalId='pay code group' showHierarchyDropdown={false} modalTitle='Pay Codes' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+          </Form.Item>
+        </Spacing>
+      </Spacing>
+    </>
+  );
+};
+
+export default PayrollDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/data/IPayrollInitiative.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/data/IPayrollInitiative.ts
new file mode 100644
index 0000000..8c6c619
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/data/IPayrollInitiative.ts
@@ -0,0 +1,24 @@
+import { IOrgDefinedInitiative, newOrgDefinedInitiative } from '../../../shared/initiatives/data/IOrgDefinedInitiative';
+import { IConfiguration } from '../../../shared/configuration/IConfiguration';
+import { PayrollGoalType } from '../../opportunities/data/IPROpportunity';
+
+export interface IPayrollInitiative extends IOrgDefinedInitiative {
+  payrollGoal: PayrollGoalType;
+  departments: [];
+  jobCodes: [];
+  payCodes: [];
+}
+
+export const newPayrollInitiative = (configuration: IConfiguration | undefined, data: Partial<IPayrollInitiative> = {}): IPayrollInitiative => {
+  const initiative = newOrgDefinedInitiative(configuration, data) as IPayrollInitiative;
+  initiative.costDriver = 'Payroll';
+  initiative.payrollGoal = PayrollGoalType.Both;
+  initiative.departments = [];
+  initiative.jobCodes = [];
+  initiative.payCodes = [];
+
+  return {
+    ...initiative,
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/data/IPayrollInitiativeDto.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/data/IPayrollInitiativeDto.ts
new file mode 100644
index 0000000..4cbd1b3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/data/IPayrollInitiativeDto.ts
@@ -0,0 +1,19 @@
+import { IOrgDefinedInitiativeDto, cleanUpOrgDefinedInitiativeDto, newOrgDefinedInitiativeDto } from '../../../shared/initiatives/data/IOrgDefinedInitiativeDto';
+import { PayrollGoalType } from '../../opportunities/data/IPROpportunity';
+import { IPayrollInitiative } from './IPayrollInitiative';
+
+export interface IPayrollInitiativeDto extends IOrgDefinedInitiativeDto {
+  payrollGoal: PayrollGoalType;
+  departments: [];
+  jobCodes: [];
+  payCodes: [];
+}
+
+export const newPayrollInitiativeDto = (data: Partial<IPayrollInitiativeDto> = {}): IPayrollInitiativeDto => {
+  const initiative = newOrgDefinedInitiativeDto(data) as IPayrollInitiativeDto;
+  return initiative;
+};
+
+export const cleanUpPayrollInitiative = (data: Partial<IPayrollInitiative>): IPayrollInitiativeDto => {
+  return newPayrollInitiativeDto({ ...data, ...cleanUpOrgDefinedInitiativeDto({ ...data }) });
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/data/initiativeService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/data/initiativeService.ts
new file mode 100644
index 0000000..4c3ad67
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/initiatives/data/initiativeService.ts
@@ -0,0 +1,13 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import { getSecureService } from '@strata/core/lib/http/getSecureService';
+import { IInitiativeDto } from '../../../shared/initiatives/data/IInitiativeDto';
+import { OpportunityCreateResponse } from '../../../shared/initiatives/data/OpportunityCreateResponse';
+
+const { httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'initiatives';
+
+export const initiativeService = {
+  create: function (initiativeInfo: IInitiativeDto): Promise<OpportunityCreateResponse> {
+    return httpPost(`${url}/create-payroll`, initiativeInfo);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/Filters.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/Filters.test.tsx
new file mode 100644
index 0000000..3e46e03
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/Filters.test.tsx
@@ -0,0 +1,87 @@
+import React from 'react';
+import { render, screen, fireEvent } from '../../test-utils/testUtils';
+import { opportunityService } from './data/opportunityService';
+import Filters from './Filters';
+import { IPRFilterOptions, newFilterOptions } from './data/IPRFilterOptions';
+import { IPRFilters } from './data/IPRFilters';
+import { dropDownTestUtils } from '@strata/test-utils/lib';
+
+const mockFilterOptions: IPRFilterOptions = newFilterOptions({
+  payrollGoalTypes: [
+    { text: 'Both', id: 'Both' },
+    { text: 'Fixed', id: 'Fixed' },
+    { text: 'Variable', id: 'Variable' }
+  ]
+});
+
+const mockInitialFilters: IPRFilters = {
+  identifiedSavings: undefined,
+  payrollGoalTypes: [],
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+test('Filters default to empty', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const variabilityDropdown = dropDownTestUtils.getDropDown('Variability');
+
+  // verify default value is set correctly
+  expect(dropDownTestUtils.getSelectedOption(variabilityDropdown)).toEqual('');
+});
+
+test('Filters clear', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const variabilityDropdown = dropDownTestUtils.getDropDown('Variability');
+  const identifiedSavingsInput = screen.getByRole('spinbutton', { name: 'Identified Savings Minimum' });
+
+  // verify default value is set correctly
+  for (const txt of mockFilterOptions.payrollGoalTypes) {
+    await dropDownTestUtils.selectOption(variabilityDropdown, txt.text);
+  }
+
+  fireEvent.change(identifiedSavingsInput, { target: { value: 123 } });
+
+  const typeLabel = `All ${mockFilterOptions.payrollGoalTypes.length} selected`;
+  expect(dropDownTestUtils.getSelectedOption(variabilityDropdown)).toEqual(typeLabel);
+
+  expect(identifiedSavingsInput).toHaveValue('123');
+
+  const clearButton = screen.getByRole('button', { name: 'Clear Filters' });
+  fireEvent.click(clearButton);
+
+  expect(dropDownTestUtils.getSelectedOption(variabilityDropdown)).toEqual('');
+  expect(identifiedSavingsInput).not.toHaveValue();
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/Filters.tsx
new file mode 100644
index 0000000..278f2a3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/Filters.tsx
@@ -0,0 +1,100 @@
+import React, { useCallback } from 'react';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import Drawer from '@strata/tempo/lib/drawer';
+import DropDown from '@strata/tempo/lib/dropdown';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing';
+import Checkbox from '@strata/tempo/lib/checkbox';
+import { initialFilters, IPRFilters } from './data/IPRFilters';
+import { useEffect, useState } from 'react';
+import { opportunityService } from './data/opportunityService';
+import { IListMember } from '../../shared/data/IListMember';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+
+interface IFiltersProps {
+  filters: IPRFilters;
+  isVisible: boolean;
+  onApply: (filters: IPRFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const [payrollGoalTypes, setPayrollGoalTypes] = useState<IListMember[]>();
+  const { currentConfiguration } = useConfigurations();
+
+  const [form] = Form.useForm<IPRFilters>();
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      if (currentConfiguration == null) {
+        return;
+      }
+      const { payrollGoalTypes } = await opportunityService.getFilterOptions(currentConfiguration.configurationGuid);
+
+      setPayrollGoalTypes(payrollGoalTypes);
+      handleClearFilters();
+    };
+
+    loadFiltersOptions();
+  }, [currentConfiguration, handleClearFilters]);
+
+  const handleApplyFilters = () => {
+    const filters: IPRFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Identified Savings Minimum' name='identifiedSavings'>
+          <InputNumber format='currency' placeholder='' precision={0} />
+        </Form.Item>
+        <Form.Item label='Variability' name='payrollGoalTypes'>
+          <DropDown multiSelect items={payrollGoalTypes} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Display' name='viewVisible'>
+          <RadioGroup
+            options={[
+              { value: true, label: 'Visible Opportunities' },
+              { value: false, label: 'Hidden Opportunities' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Initiatives' name='excludeInitiatives' valuePropName='checked'>
+          <Checkbox>Exclude Opportunities with Initiatives</Checkbox>
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/Opportunities.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/Opportunities.test.tsx
new file mode 100644
index 0000000..63320cc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/Opportunities.test.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import { render, screen, within } from '../../test-utils/testUtils';
+import { IPROpportunity, newPROpportunity } from './data/IPROpportunity';
+import { opportunityService } from './data/opportunityService';
+import { IPagedApiResponse } from '../../shared/paging/IPagedApiResponse';
+import Opportunities from './Opportunities';
+
+const mockOpportunities: IPROpportunity[] = [
+  newPROpportunity({
+    opportunityKey: 'PR - 1',
+    name: 'Payroll 1',
+    identifiedSavings: 100,
+    payrollGoal: 'Both'
+  }),
+  newPROpportunity({
+    opportunityKey: 'PR - 2',
+    name: 'Payroll 2',
+    identifiedSavings: 200,
+    payrollGoal: 'Fixed'
+  })
+];
+
+const mockPagedOpportunities: IPagedApiResponse<IPROpportunity> = {
+  data: mockOpportunities,
+  pagingInfo: {
+    pageNumber: 1,
+    resultsPerPage: 25,
+    totalNumberOfResults: 2,
+    totalPages: 1
+  }
+};
+
+test('All opportunities are shown', async () => {
+  jest.spyOn(opportunityService, 'getOpportunities').mockImplementation(() => Promise.resolve(mockPagedOpportunities));
+
+  // render component
+  render(<Opportunities />);
+
+  // wait for grid to load
+  const cell = await screen.findByRole('cell', { name: mockPagedOpportunities.data[0].opportunityKey });
+
+  // get rows
+  const tableBody = cell?.parentElement?.parentElement as HTMLElement;
+  const rows = within(tableBody).getAllByRole('row');
+
+  // verify data shows in grid
+  mockPagedOpportunities.data.forEach((opportunity, index) => {
+    const row = rows[index];
+    within(row).getByText(opportunity.opportunityKey);
+    within(row).getByText(opportunity.name);
+    within(row).getByText(opportunity.payrollGoal);
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/Opportunities.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/Opportunities.tsx
new file mode 100644
index 0000000..84aab97
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/Opportunities.tsx
@@ -0,0 +1,92 @@
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import { usePageLoader } from '@strata/tempo/lib';
+import Button from '@strata/tempo/lib/button/Button';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import OpportunitiesGrid from '../../shared/opportunities/OpportunitiesGrid';
+import { IOpportunity } from '../../shared/opportunities/data';
+import Filters from './Filters';
+import { IPRFilters, initialFilters, numberOfFilters } from './data/IPRFilters';
+import { opportunityService } from './data/opportunityService';
+
+const Opportunities: React.FC = () => {
+  const [filters, setFilters] = useState<IPRFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const [isTempoOpportunityPageEnabled, setIsTempoOpportunityPageEnabled] = useState<boolean | undefined>();
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+  const jazzUrl = useJazzUrlWithVersion();
+  const history = useHistory();
+  const { setLoading } = usePageLoader();
+
+  useEffect(() => {
+    document.title = 'Payroll';
+    setLoading(true);
+    opportunityService
+      .isOpportunityTempoPageEnabled()
+      .then((result: boolean) => {
+        setIsTempoOpportunityPageEnabled(result);
+      })
+      .finally(setLoading(false));
+  }, [setLoading]);
+
+  useEffect(() => {
+    if (currentConfiguration == null) {
+      return;
+    }
+    setFilters(initialFilters);
+    setCurrentConfigurationGuid(currentConfiguration.configurationGuid);
+  }, [currentConfiguration]);
+
+  const handleApplyFilters = (newFilters: IPRFilters) => {
+    setFiltersVisible(false);
+    setFilters({ ...filters, ...newFilters });
+  };
+
+  const handleSearch = (searchValue: string) => {
+    setFilters((filters) => {
+      return { ...filters, opportunitySearch: searchValue };
+    });
+  };
+
+  const getOpportunityUrl = (opportunity: IOpportunity) => {
+    return isTempoOpportunityPageEnabled ? `/payroll-opportunity/${opportunity.opportunityGuid}` : `${jazzUrl}CCI/Payroll/OpportunityViewer.aspx?opportunityGuid=${opportunity.opportunityGuid}`;
+  };
+
+  const getInitiativeUrl = (opportunity: IOpportunity) => {
+    return `${jazzUrl}CCI/Payroll/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+  };
+
+  const buildOpportunityButton = (
+    <Button type='primary' icon={<PlusIcon />} onClick={() => history.push(`/initiatives/create/payroll`, { networkOpportunityId: undefined, networkOpportunityName: undefined })}>
+      Opportunity
+    </Button>
+  );
+
+  return isTempoOpportunityPageEnabled === undefined ? null : (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />
+      <OpportunitiesGrid
+        configurationGuid={currentConfigurationGuid}
+        getOpportunityUrl={getOpportunityUrl}
+        getInitiativeUrl={getInitiativeUrl}
+        filters={filters}
+        opportunityService={opportunityService}
+        identifiedSavingsIndex={2}
+        numOfSelectedFilters={numberOfFilters(filters)}
+        searchPlaceholderText='Search'
+        onFilter={() => setFiltersVisible(true)}
+        onSearch={handleSearch}
+        customAction={buildOpportunityButton}
+      >
+        <DataGrid.Column field='name' header='Name' sortable width={160} />
+        <DataGrid.Column field='payrollGoal' header='Variability' sortable width={120} />
+      </OpportunitiesGrid>
+    </>
+  );
+};
+
+export default Opportunities;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/PayrollOpportunityDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/PayrollOpportunityDetail.tsx
new file mode 100644
index 0000000..7c1d8b2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/PayrollOpportunityDetail.tsx
@@ -0,0 +1,91 @@
+import { usePageLoader } from '@strata/tempo/lib';
+import React, { useEffect, useState } from 'react';
+import { useHistory, useParams } from 'react-router';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { IInitiative, newInitiative } from '../../shared/initiatives/data/IInitiative';
+import OpportunityDetailHeader from '../../shared/opportunities/OpportunityDetailHeader';
+import { IPayrollOpportunity } from './data/IPayrollOpportunity';
+import { opportunityService } from './data/opportunityService';
+
+const PayrollOpportunityDetail: React.FC = () => {
+  const { opportunityGuid } = useParams<{ opportunityGuid: string }>();
+  const [opportunityId, setOpportunityId] = useState<number>(0);
+  const [opportunityDetailData, setOpportunityDetailData] = useState<IPayrollOpportunity>();
+  const [hasInitiative, setHasInitiative] = useState<boolean>(false);
+  const [isLocked, setIsLocked] = useState<boolean>(true);
+  const [isEditable] = useState(true);
+  const [isSecurityEditable] = useState(true);
+
+  const [initiativeData, setInitiativeData] = useState<IInitiative>(newInitiative);
+
+  const { setLoading } = usePageLoader();
+  const history = useHistory();
+
+  useEffect(() => {
+    const fetchData = async () => {
+      setLoading(true);
+      const opportunityDetail = await opportunityService.getById(opportunityGuid);
+      setOpportunityDetailData(opportunityDetail);
+      setOpportunityId(opportunityDetail.OpportunityId);
+      if (opportunityService.getInitiativeInfo) {
+        const info = await opportunityService.getInitiativeInfo(opportunityGuid);
+        setInitiativeData(info);
+        setHasInitiative(info.trackingStart !== null && info.trackingStart !== '');
+        setIsLocked(info.isLocked);
+      }
+      setLoading(false);
+    };
+
+    try {
+      if (opportunityGuid && opportunityGuid !== '00000000-0000-0000-0000-000000000000') {
+        fetchData();
+      }
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  const handleHideOrShow = () => {
+    //in the next user stories
+  };
+
+  const handleDelete = async (callback: () => void, failed: (err: any) => void) => {
+    opportunityService.delete(opportunityGuid, callback, failed);
+  };
+
+  const getInitiativeInfo = async () => {
+    //in the next user stories
+  };
+
+  const finalizeInitiative = async () => {
+    //in the next user stories
+  };
+
+  return (
+    <>
+      <OpportunityDetailHeader
+        title={`Opportunity ${opportunityDetailData?.opportunityKey} • ${opportunityDetailData?.name}`}
+        breadcrumbHref={'/payroll/opportunities'}
+        breadcrumbText={'Identify Opportunities'}
+        opportunityType={OpportunityTypes.Payroll}
+        opportunityId={opportunityId ?? 0}
+        opportunityGuid={opportunityGuid}
+        initiativeGuid={initiativeData.initiativeGuid}
+        sourceOpportunityId={opportunityDetailData?.sourceOpportunityId ?? -1}
+        hasInitiative={hasInitiative}
+        isEditable={isEditable}
+        isHidden={opportunityDetailData?.isHidden}
+        isLocked={isLocked}
+        isSecurityEditable={isSecurityEditable}
+        helpId={'1398'}
+        handleHideOrShow={handleHideOrShow}
+        handleDelete={handleDelete}
+        editInitiative={(opportunityGuid: string) => history.push(`/initiatives/edit/payroll`, { opportunityGuid: opportunityGuid })}
+        getInitiativeInfo={getInitiativeInfo}
+        finalizeInitiative={finalizeInitiative}
+      />
+    </>
+  );
+};
+
+export default PayrollOpportunityDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/PayrollOpportunityModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/PayrollOpportunityModal.tsx
new file mode 100644
index 0000000..52404e0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/PayrollOpportunityModal.tsx
@@ -0,0 +1,219 @@
+import React, { useEffect, useState } from 'react';
+import Modal from '@strata/tempo/lib/modal';
+import { IPayrollOpportunitySaveModel, newPayrollOpportunitySaveModel } from './data/IPayrollOpportunitySaveModel';
+import Form from '@strata/tempo/lib/form/Form';
+import Input from '@strata/tempo/lib/input/Input';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import InputTextArea from '@strata/tempo/lib/inputtextarea/InputTextArea';
+import RadioGroup from '@strata/tempo/lib/radiogroup/RadioGroup';
+import { PayrollGoalType } from './data/IPROpportunity';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { usersService } from '../../shared/users/usersService';
+import Divider from '@strata/tempo/lib/divider/Divider';
+import Text from '@strata/tempo/lib/text';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import { ScoreMemberPicker } from '@strata/score/lib/ScoreMemberPicker';
+import { IUser } from '../../shared/users/IUser';
+import Button from '@strata/tempo/lib/button/Button';
+import { useHelpCenter } from '@strata/core/lib/help/useHelpCenter';
+import Link from '@strata/tempo/lib/link/Link';
+import { opportunityService } from './data/opportunityService';
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import { nameIsDuplicate, nameValidationService } from '../../shared/opportunities/data/nameValidationService';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { RegEx } from '../../shared/validation/RegEx';
+import useToast from '@strata/tempo/lib/toast';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+
+export interface IPayrollOpportunityModalProps {
+  isVisible: boolean;
+  onCancel?: () => void;
+}
+
+const PayrollOpportunityModal: React.FC<IPayrollOpportunityModalProps> = (props: IPayrollOpportunityModalProps) => {
+  const { isVisible, onCancel } = props;
+  const [form] = Form.useForm<IPayrollOpportunitySaveModel>();
+  const [owners, setOwners] = useState<IUser[]>([]);
+  const { userSetting } = React.useContext(UserSettingContext);
+  const [opportunity, setOpportunity] = useState<IPayrollOpportunitySaveModel>(newPayrollOpportunitySaveModel(''));
+  const helpCenter = useHelpCenter();
+  const toast = useToast();
+  const [saving, setSaving] = React.useState(false);
+  const jazzUrl = useJazzUrlWithVersion();
+
+  useEffect(() => {
+    const loadData = async () => {
+      owners.length === 0 && setOwners(await usersService.getOwners());
+      setOpportunity(newPayrollOpportunitySaveModel(userSetting.configurationGuid));
+    };
+    if (userSetting.configurationGuid !== '') loadData();
+  }, [owners.length, userSetting.configurationGuid]);
+
+  const getPayrollOpportunityUrl = (opportunityGuid: string) => {
+    return `${jazzUrl}CCI/Payroll/OpportunityViewer.aspx?opportunityGuid=${opportunityGuid}`;
+  };
+
+  // close modal
+  const handleModalClose = async () => {
+    if (onCancel) {
+      onCancel();
+    }
+    resetForm();
+  };
+
+  // reset opportunity, reset form
+  const resetForm = async () => {
+    const newOpportunity = newPayrollOpportunitySaveModel(userSetting.configurationGuid);
+    setOpportunity(newOpportunity);
+    form.setFieldsValue(newOpportunity);
+  };
+
+  const setOwnerName = (name: string, owners: IUser[], opportunity: IPayrollOpportunitySaveModel) => {
+    const selectedOwnerGuid = name;
+    const selectedOwnerName = owners.find((owner) => owner.userGuid === selectedOwnerGuid)?.fullName;
+    opportunity.ownerName = selectedOwnerName ?? '';
+  };
+
+  // update opportunity with form values
+  const handleValuesChanged = (changedValues: any) => {
+    const mergedOpportunity = { ...opportunity, ...changedValues };
+    setOpportunity(mergedOpportunity);
+    form.setFieldsValue(mergedOpportunity);
+  };
+
+  const handleFinishFailed = (fields: any) => {
+    return;
+  };
+
+  const handleFormFinish = (values: any) => {
+    setOwnerName(values.ownerGuid, owners, opportunity);
+    handleOpportunitySave({ ...opportunity, ...values });
+  };
+
+  const handleOpportunitySave = async (saveOpportunity: IPayrollOpportunitySaveModel) => {
+    setSaving(true);
+    try {
+      toast.show({
+        key: saveOpportunity.name,
+        toastType: 'loading',
+        message: `Creating ${saveOpportunity.name} Opportunity`,
+        duration: 2
+      });
+
+      await opportunityService.createOpportunity(saveOpportunity, function (newOpportunityGuid: string) {
+        toast.show({
+          key: saveOpportunity.name,
+          toastType: 'success',
+          duration: 0,
+          message: (
+            <>
+              <Link href={getPayrollOpportunityUrl(newOpportunityGuid)}>{saveOpportunity.name}</Link>
+              &nbsp;Opportunity Created
+            </>
+          )
+        });
+        handleModalClose();
+      });
+    } catch (error) {
+      if (error instanceof Response) {
+        // Handles exceptions or unhandled validation from server
+        toast.show({
+          key: saveOpportunity.name,
+          message: `${saveOpportunity.name} Opportunity was not created. Try again and contact us if the issue continues.`,
+          toastType: 'error'
+        });
+        handleModalClose();
+      }
+    }
+    setSaving(false);
+  };
+
+  const validateName = (name: string) => {
+    return nameValidationService.nameIsValid(userSetting.configurationGuid, OpportunityTypes.Payroll, name);
+  };
+
+  return (
+    <Modal
+      loading={saving}
+      title='Build Payroll Opportunity'
+      visible={isVisible}
+      onCancel={handleModalClose}
+      footer={
+        <>
+          <Spacing hAlign='space-between'>
+            <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1320')}></Button>
+            <Spacing>
+              <Button onClick={handleModalClose}>Cancel</Button>
+              <Button type='primary' onClick={() => form.submit()}>
+                Add
+              </Button>
+            </Spacing>
+          </Spacing>
+        </>
+      }
+    >
+      <Form form={form} initialValues={opportunity} onValuesChange={handleValuesChanged} onFinish={handleFormFinish} onFinishFailed={handleFinishFailed}>
+        <Spacing column itemSpacing={16}>
+          <Text color='secondary' strong={true}>
+            GENERAL INFORMATION
+          </Text>
+          <Form.Item
+            label='Name'
+            name='name'
+            rules={[
+              { required: true, whitespace: false, max: 200, pattern: RegEx.JazzRestrictedCharacters },
+              () => ({
+                async validator(_, value) {
+                  if (!value || (await validateName(value))) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(nameIsDuplicate);
+                }
+              })
+            ]}
+          >
+            <Input />
+          </Form.Item>
+        </Spacing>
+        <Form.Item label='Owner' name='ownerGuid' rules={[{ required: true }]}>
+          <DropDown placeholder='Owner' items={owners} itemTextField='fullName' itemValueField='userGuid'></DropDown>
+        </Form.Item>
+        <Form.Item label='Notes' name='note'>
+          <InputTextArea />
+        </Form.Item>
+        <Form.Item label='Type' name='payrollGoal' rules={[{ required: true }]}>
+          <RadioGroup
+            options={[
+              { value: PayrollGoalType.Both, label: 'Both' },
+              { value: PayrollGoalType.Variable, label: 'Variable' },
+              { value: PayrollGoalType.Fixed, label: 'Fixed' }
+            ]}
+          />
+        </Form.Item>
+        <Divider extended={false}></Divider>
+        <Spacing column itemSpacing={16} padding='0 0 16px 0'>
+          <Text color='secondary' strong={true}>
+            SET UP
+          </Text>
+        </Spacing>
+        <Spacing>
+          <Form.Item label='Departments' name='departments' rules={[{ required: true }]}>
+            <ScoreMemberPicker dimensionGuidOrGlobalId='Department' showHierarchyDropdown={false} modalTitle='Departments' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+          </Form.Item>
+        </Spacing>
+        <Spacing>
+          <Form.Item label='Job Codes' name='jobCodes' rules={[{ required: true }]}>
+            <ScoreMemberPicker dimensionGuidOrGlobalId='job code' showHierarchyDropdown={false} modalTitle='Job Codes' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+          </Form.Item>
+        </Spacing>
+        <Spacing>
+          <Form.Item label='Pay Codes' name='payCodes' rules={[{ required: true }]}>
+            <ScoreMemberPicker dimensionGuidOrGlobalId='pay code group' showHierarchyDropdown={false} modalTitle='Pay Codes' selectionMode='multiple' okText='Select'></ScoreMemberPicker>
+          </Form.Item>
+        </Spacing>
+      </Form>
+    </Modal>
+  );
+};
+
+export default PayrollOpportunityModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPRFilterOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPRFilterOptions.ts
new file mode 100644
index 0000000..ee03695
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPRFilterOptions.ts
@@ -0,0 +1,14 @@
+import { IListMember } from '../../../shared/data/IListMember';
+
+export interface IPRFilterOptions {
+  payrollGoalTypes: IListMember[];
+}
+
+export const newFilterOptions = (data: Partial<IPRFilterOptions> = {}): IPRFilterOptions => {
+  return {
+    ...{
+      payrollGoalTypes: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPRFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPRFilters.ts
new file mode 100644
index 0000000..9d04654
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPRFilters.ts
@@ -0,0 +1,22 @@
+import { IOpportunityFilters } from '../../../shared/opportunities/data';
+
+export interface IPRFilters extends IOpportunityFilters {
+  payrollGoalTypes: string[];
+}
+
+export const initialFilters: IPRFilters = {
+  identifiedSavings: undefined,
+  payrollGoalTypes: [],
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+export const numberOfFilters = (filters: IPRFilters): number => {
+  let filtersCount = 0;
+  if (filters.identifiedSavings != null) filtersCount++;
+  if (filters.payrollGoalTypes.length > 0) filtersCount++;
+  if (filters.viewVisible === false) filtersCount++;
+  if (filters.excludeInitiatives === true) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPROpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPROpportunity.ts
new file mode 100644
index 0000000..f685e7c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPROpportunity.ts
@@ -0,0 +1,32 @@
+import { IOpportunity } from '../../../shared/opportunities/data/IOpportunity';
+
+export interface IPROpportunity extends IOpportunity {
+  name: string;
+  payrollGoal: string;
+}
+
+export enum PayrollGoalType {
+  Variable = 0,
+  Fixed = 1,
+  Both = 2
+}
+
+export const newPROpportunity = (data: Partial<IPROpportunity> = {}): IPROpportunity => {
+  return {
+    ...{
+      name: '',
+      opportunityKey: '',
+      opportunityId: 0,
+      opportunityGuid: '',
+      identifiedSavings: 0,
+      payrollGoal: '',
+      hasInitiative: false,
+      note: '',
+      isHidden: false,
+      initiativeGuid: '',
+      sourceOpportunity: '',
+      sourceOpportunityId: -1
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPayrollOpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPayrollOpportunity.ts
new file mode 100644
index 0000000..93bf332
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPayrollOpportunity.ts
@@ -0,0 +1,7 @@
+import { IOpportunity } from '../../../shared/opportunities/data/IOpportunity';
+
+export interface IPayrollOpportunity extends IOpportunity {
+  name: string;
+  payrollGoal: string;
+  opportunityID: number;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPayrollOpportunitySaveModel.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPayrollOpportunitySaveModel.ts
new file mode 100644
index 0000000..5877e52
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/IPayrollOpportunitySaveModel.ts
@@ -0,0 +1,31 @@
+import { PayrollGoalType } from './IPROpportunity';
+
+export interface IPayrollOpportunitySaveModel {
+  opportunityGuid: string;
+  configurationGuid: string;
+  name: string;
+  ownerGuid: string;
+  ownerName: string;
+  note: string;
+  payrollGoal: PayrollGoalType;
+  departments: [];
+  jobCodes: [];
+  payCodes: [];
+}
+
+export const newPayrollOpportunitySaveModel = (configurationGuid: string, data: Partial<IPayrollOpportunitySaveModel> = {}): IPayrollOpportunitySaveModel => {
+  return {
+    ...{
+      opportunityGuid: '',
+      configurationGuid: configurationGuid,
+      name: '',
+      ownerGuid: '',
+      ownerName: '',
+      note: '',
+      payrollGoal: PayrollGoalType.Both,
+      departments: [],
+      jobCodes: [],
+      payCodes: []
+    }
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/opportunityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/opportunityService.ts
new file mode 100644
index 0000000..6ddc852
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/payroll/opportunities/data/opportunityService.ts
@@ -0,0 +1,81 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IOpportunityJobResults } from '../../../shared/hangfire/IOpportunityJobResults';
+import { IOpportunityFilters, IOpportunityService } from '../../../shared/opportunities/data';
+import { IPagedApiResponse, IPagingOptions, ISortOptions } from '../../../shared/paging';
+import { IPRFilterOptions } from './IPRFilterOptions';
+import { IPROpportunity } from './IPROpportunity';
+import { IPayrollOpportunitySaveModel } from './IPayrollOpportunitySaveModel';
+import { IPayrollOpportunity } from './IPayrollOpportunity';
+import { IInitiative } from '../../../shared/initiatives/data/IInitiative';
+
+const { httpGet, httpPost, httpPut, httpDelete, httpDownloadAndDisplayFile } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'payroll-opportunities';
+
+export const opportunityService: IOpportunityService = {
+  getOpportunities: async (configurationGuid: string, pagingOptions: IPagingOptions, filters: IOpportunityFilters): Promise<IPagedApiResponse<IPROpportunity>> => {
+    return httpPost<IPagedApiResponse<IPROpportunity>>(`payroll-opportunities`, {
+      pagingOptions,
+      filters: {
+        ...filters,
+        configurationGuid
+      }
+    });
+  },
+
+  getOpportunity: async (opportunityGuid: string): Promise<IPROpportunity> => {
+    return httpGet<IPROpportunity>(`${url}/${opportunityGuid}`);
+  },
+
+  export: async (configurationGuid: string, sortOptions: ISortOptions, filters: IOpportunityFilters): Promise<void> => {
+    const date = new Date();
+    const fileName = 'PR_CI_Opportunities_' + date.toISOString().split('T')[0];
+    httpDownloadAndDisplayFile(
+      'payroll-opportunities/export',
+      {
+        method: 'post',
+        body: JSON.stringify({
+          sortOptions,
+          filters: {
+            ...filters,
+            configurationGuid
+          }
+        })
+      },
+      fileName
+    );
+  },
+
+  createOpportunity: async (opportunity: IPayrollOpportunitySaveModel, callback: () => IOpportunityJobResults): Promise<IOpportunityJobResults> => {
+    return httpPost<IOpportunityJobResults>('payroll-opportunities/create', opportunity).then(callback);
+  },
+
+  getFilterOptions: (configurationGuid: string): Promise<IPRFilterOptions> => {
+    return httpGet<IPRFilterOptions>(`payroll-opportunities/${configurationGuid}/filter-options`);
+  },
+
+  setHidden: async (opportunityGuid: string, isHidden: boolean): Promise<void> => {
+    await httpPut(`payroll-opportunities/${opportunityGuid}/set-hidden`, isHidden);
+  },
+
+  setNote: async (opportunityGuid: string, note: string): Promise<void> => {
+    await httpPut(`payroll-opportunities/${opportunityGuid}/set-note`, note);
+  },
+
+  getById: async (opportunityGuid: string | number): Promise<IPayrollOpportunity> => {
+    return httpGet<IPayrollOpportunity>(`${url}/${opportunityGuid}`);
+  },
+
+  getInitiativeInfo: async (opporturnityGuid: string): Promise<IInitiative> => {
+    return httpGet(`${url}/${opporturnityGuid}/initiative-info`);
+  },
+
+  isOpportunityTempoPageEnabled: async (): Promise<boolean> => {
+    return httpGet(`${url}/tempo-page-enabled`);
+  },
+
+  delete: async (opportunityGuid: string, callback: () => void, failed: (err: any) => void): Promise<void> => {
+    httpDelete(`${url}/${opportunityGuid}/delete`)
+      .then(callback)
+      .catch((e) => failed(e));
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/QualityVariation.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/QualityVariation.tsx
new file mode 100644
index 0000000..7d77dfb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/QualityVariation.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import Tabs from '@strata/tempo/lib/tabs';
+import { useConfigurations } from '../shared/configuration/ConfigurationContext';
+import OpportunitiesHeader from '../shared/opportunities/OpportunitiesHeader';
+import Opportunities from './opportunities/Opportunities';
+import Breakdowns from './breakdowns/Breakdowns';
+import Events from './events/Events';
+
+const QualityVariation: React.FC = () => {
+  const { currentConfiguration } = useConfigurations();
+
+  return (
+    <>
+      <OpportunitiesHeader headerTitle='Quality Variation Opportunities' helpId='1315' />
+      <Tabs
+        defaultActiveKey='opportunities'
+        items={[
+          { key: 'opportunities', label: 'Opportunities', children: <Opportunities /> },
+          { key: 'events', label: 'Quality Variation Events', children: <Events /> },
+          { key: 'breakdowns', label: currentConfiguration?.qviOpportunityBreakdownNamePlural, children: <Breakdowns /> }
+        ]}
+      />
+    </>
+  );
+};
+
+export default QualityVariation;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/Breakdowns.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/Breakdowns.test.tsx
new file mode 100644
index 0000000..2577d3d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/Breakdowns.test.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import { render, screen, within } from '../../test-utils/testUtils';
+import { IQVIBreakdown, newQVIBreakdown } from './data/IQVIBreakdown';
+import { qviBreakdownService } from './data/qviBreakdownService';
+import { IPagedApiResponse } from '../../shared/paging/IPagedApiResponse';
+import Breakdowns from './Breakdowns';
+
+const mockBreakdowns: IQVIBreakdown[] = [
+  newQVIBreakdown({
+    breakdownId: 1,
+    breakdownName: 'Breakdown 1',
+    identifiedSavingsTotal: 100,
+    opportunitiesCount: 100,
+    qviCasesTotal: 1000,
+    qviRate: 50.0
+  }),
+  newQVIBreakdown({
+    breakdownId: 2,
+    breakdownName: 'Breakdown 2',
+    identifiedSavingsTotal: 200,
+    opportunitiesCount: 200,
+    qviCasesTotal: 2000,
+    qviRate: 20.0
+  })
+];
+
+const mockPageBreakdowns: IPagedApiResponse<IQVIBreakdown> = {
+  data: mockBreakdowns,
+  pagingInfo: {
+    pageNumber: 1,
+    resultsPerPage: 20,
+    totalNumberOfResults: 2,
+    totalPages: 1
+  }
+};
+
+test('All Breakdowns are shown', async () => {
+  jest.spyOn(qviBreakdownService, 'getQVIBreakdowns').mockReturnValue(Promise.resolve(mockPageBreakdowns));
+
+  // render component
+  render(<Breakdowns />);
+
+  // wait for grid to load
+  const cell = await screen.findByRole('cell', { name: mockPageBreakdowns.data[0].breakdownName });
+
+  // get rows
+  const tableBody = cell?.parentElement?.parentElement as HTMLElement;
+  const rows = within(tableBody).getAllByRole('row');
+
+  // verify elements appear in grid sorted by identified savings total descending
+  mockPageBreakdowns.data.forEach((breakdown, index) => {
+    const row = rows[index];
+    within(row).getByText(breakdown.breakdownName);
+    within(row).getByText(breakdown.identifiedSavingsTotal);
+    within(row).getByText(breakdown.opportunitiesCount);
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/Breakdowns.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/Breakdowns.tsx
new file mode 100644
index 0000000..8909f1d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/Breakdowns.tsx
@@ -0,0 +1,112 @@
+import React from 'react';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import Link from '@strata/tempo/lib/link';
+import Button from '@strata/tempo/lib/button';
+import ActionBar from '@strata/tempo/lib/actionbar';
+import { useEffect, useState } from 'react';
+import { qviBreakdownService } from './data/qviBreakdownService';
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import Filters from './Filters';
+import { initialFilters, IQVIBreakdownFilters, numberOfFilters } from './data/IQVIBreakdownFilters';
+import { IQVIBreakdown } from './data/IQVIBreakdown';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { IPagingOptions } from '../../shared/paging';
+import FilterIcon from '@strata/tempo/lib/icon/FilterIcon';
+
+const initialPagingOptions = {
+  sortField: 'identifiedSavingsTotal',
+  sortOrder: -1,
+  first: 0,
+  rows: 25
+};
+
+const Breakdowns: React.FC = () => {
+  const [lazyData, setLazyData] = useState<IQVIBreakdown[] | []>();
+  const [loading, setLoading] = useState(false);
+  const [pagingOptions, setPagingOptions] = useState<IPagingOptions>(initialPagingOptions);
+  const [totalQVIBreakdowns, setTotalQVIBreakdowns] = useState<number>();
+
+  const { currentConfiguration } = useConfigurations();
+  const currentConfigurationGuid = currentConfiguration?.configurationGuid ?? '';
+
+  const [filters, setFilters] = useState<IQVIBreakdownFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+
+  const jazzUrl = useJazzUrlWithVersion();
+
+  useEffect(() => {
+    document.title = 'Quality Variation';
+  }, []);
+
+  useEffect(() => {
+    const loadData = async () => {
+      setLoading(true);
+      try {
+        const pagedResponse = await qviBreakdownService.getQVIBreakdowns(currentConfigurationGuid, pagingOptions, filters);
+        setTotalQVIBreakdowns(pagedResponse.pagingInfo.totalNumberOfResults);
+        setLazyData(pagedResponse.data);
+      } finally {
+        setLoading(false);
+      }
+    };
+    if (currentConfigurationGuid !== '') {
+      loadData();
+    }
+  }, [currentConfigurationGuid, filters, pagingOptions]);
+
+  useEffect(() => {
+    setFilters(initialFilters);
+  }, [currentConfigurationGuid]);
+
+  const handleApplyFilters = (newFilters: IQVIBreakdownFilters) => {
+    setFiltersVisible(false);
+    setFilters((filters) => {
+      return { ...filters, ...newFilters };
+    });
+    setPagingOptions({ ...pagingOptions, first: 0 });
+  };
+  const filtersSelected = numberOfFilters(filters);
+  return (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />
+      <ActionBar
+        filters={
+          <>
+            <Button type={filtersSelected > 0 ? 'primary' : 'secondary'} icon={<FilterIcon />} onClick={() => setFiltersVisible(true)}>
+              Filters{filtersSelected > 0 ? ` (${filtersSelected})` : ''}
+            </Button>
+          </>
+        }
+      ></ActionBar>
+      <DataGrid
+        scrollable
+        loading={loading}
+        value={lazyData}
+        lazy
+        sortField={pagingOptions.sortField}
+        sortOrder={pagingOptions.sortOrder}
+        paginator
+        first={pagingOptions.first}
+        totalRecords={totalQVIBreakdowns}
+        onSort={(e) => setPagingOptions({ ...pagingOptions, ...e })}
+        onPage={(e) => setPagingOptions({ ...pagingOptions, ...e })}
+        dataKey='opportunityKey'
+      >
+        <DataGrid.Column
+          header={currentConfiguration?.qviOpportunityBreakdownName}
+          field='breakdownName'
+          sortable
+          width={360}
+          body={(rowData) => <Link href={jazzUrl + 'CCI/QualityVariation/QVIOpportunityComparison.aspx?breakdownID=' + rowData.breakdownId}>{rowData.breakdownName}</Link>}
+        />
+        <DataGrid.NumberColumn field='identifiedSavingsTotal' header='Identified Variation' format='currency' sortable width={144} />
+        <DataGrid.NumberColumn field='opportunitiesCount' header='Opportunities' sortable width={120} />
+        <DataGrid.NumberColumn field='qviCasesTotal' header='Quality Variation Cases' sortable width={184} />
+        <DataGrid.NumberColumn field='qviRate' header='Quality Variation Rate' format='percentDecimal' sortable width={184} />
+        <DataGrid.EmptyColumn />
+      </DataGrid>
+    </>
+  );
+};
+
+export default Breakdowns;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/Filters.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/Filters.test.tsx
new file mode 100644
index 0000000..3e648e2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/Filters.test.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import { render, screen, fireEvent } from '../../test-utils/testUtils';
+import { qviBreakdownService } from './data/qviBreakdownService';
+import Filters from './Filters';
+import { IQVIBreakdownFilterOptions, newFilterOptions } from './data/IQVIBreakdownFilterOptions';
+import { IQVIBreakdownFilters } from './data/IQVIBreakdownFilters';
+import { dropDownTestUtils } from '@strata/test-utils/lib';
+
+const mockFilterOptions: IQVIBreakdownFilterOptions = newFilterOptions({
+  breakdowns: [{ text: 'Test Breakdown', id: '1' }]
+});
+
+const mockInitialFilters: IQVIBreakdownFilters = {
+  identifiedSavings: undefined,
+  breakdownIds: [],
+  qualityVariationCases: undefined
+};
+
+test('Filters default to empty', async () => {
+  jest.spyOn(qviBreakdownService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const breakdownDropdown = dropDownTestUtils.getDropDown('Entity');
+
+  // verify default value is set correctly
+  expect(dropDownTestUtils.getSelectedOption(breakdownDropdown)).toEqual('');
+});
+
+test('Filters clear', async () => {
+  jest.spyOn(qviBreakdownService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const breakdownDropdown = dropDownTestUtils.getDropDown('Entity');
+  const identifiedSavingsInput = screen.getByRole('spinbutton', { name: 'Identified Savings Minimum' });
+  const qualityVariationCasesInput = screen.getByRole('spinbutton', { name: 'Quality Variation Cases Minimum' });
+
+  // verify default value is set correctly
+  await dropDownTestUtils.selectOption(breakdownDropdown, mockFilterOptions.breakdowns[0].text);
+  fireEvent.change(identifiedSavingsInput, { target: { value: 123 } });
+  fireEvent.change(qualityVariationCasesInput, { target: { value: 124 } });
+
+  expect(dropDownTestUtils.getSelectedOption(breakdownDropdown)).toEqual(mockFilterOptions.breakdowns[0].text);
+  expect(identifiedSavingsInput).toHaveValue('123');
+  expect(qualityVariationCasesInput).toHaveValue('124');
+
+  const clearButton = screen.getByRole('button', { name: 'Clear Filters' });
+  fireEvent.click(clearButton);
+
+  expect(dropDownTestUtils.getSelectedOption(breakdownDropdown)).toEqual('');
+  expect(identifiedSavingsInput).not.toHaveValue();
+  expect(qualityVariationCasesInput).not.toHaveValue();
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/Filters.tsx
new file mode 100644
index 0000000..c2aaae6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/Filters.tsx
@@ -0,0 +1,89 @@
+import React, { useCallback } from 'react';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import Drawer from '@strata/tempo/lib/drawer';
+import DropDown from '@strata/tempo/lib/dropdown';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing';
+import { initialFilters, IQVIBreakdownFilters } from './data/IQVIBreakdownFilters';
+import { useEffect, useState } from 'react';
+import { qviBreakdownService } from './data/qviBreakdownService';
+import { IListMember } from '../../shared/data/IListMember';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+
+interface IFiltersProps {
+  filters: IQVIBreakdownFilters;
+  isVisible: boolean;
+  onApply: (filters: IQVIBreakdownFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const [breakdowns, setBreakdowns] = useState<IListMember[]>();
+  const { currentConfiguration } = useConfigurations();
+
+  const [form] = Form.useForm<IQVIBreakdownFilters>();
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      if (currentConfiguration == null) {
+        return;
+      }
+      const { breakdowns } = await qviBreakdownService.getFilterOptions(currentConfiguration.configurationGuid);
+      setBreakdowns(breakdowns);
+      handleClearFilters();
+    };
+
+    loadFiltersOptions();
+  }, [currentConfiguration, handleClearFilters]);
+
+  const handleApplyFilters = () => {
+    const filters: IQVIBreakdownFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label={currentConfiguration?.qviOpportunityBreakdownName} name='breakdownIds'>
+          <DropDown multiSelect items={breakdowns} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Identified Savings Minimum' name='identifiedSavings'>
+          <InputNumber format='currency' placeholder='' precision={0} />
+        </Form.Item>
+        <Form.Item label='Quality Variation Cases Minimum' name='qualityVariationCases'>
+          <InputNumber format='number' placeholder='0' precision={0} />
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/data/IQVIBreakdown.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/data/IQVIBreakdown.ts
new file mode 100644
index 0000000..e1f88bc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/data/IQVIBreakdown.ts
@@ -0,0 +1,24 @@
+export interface IQVIBreakdown {
+  breakdownName: string;
+  breakdownId: number;
+  identifiedSavingsTotal: number;
+  qviCasesTotal: number;
+  qviRate: number;
+  opportunitiesCount: number;
+  configurationGuid: string;
+}
+
+export const newQVIBreakdown = (data: Partial<IQVIBreakdown> = {}): IQVIBreakdown => {
+  return {
+    ...{
+      breakdownName: '',
+      breakdownId: 0,
+      identifiedSavingsTotal: 0,
+      qviCasesTotal: 0,
+      qviRate: 0,
+      opportunitiesCount: 0,
+      configurationGuid: ''
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/data/IQVIBreakdownFilterOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/data/IQVIBreakdownFilterOptions.ts
new file mode 100644
index 0000000..84ea6ad
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/data/IQVIBreakdownFilterOptions.ts
@@ -0,0 +1,14 @@
+import { IListMember } from '../../../shared/data/IListMember';
+
+export interface IQVIBreakdownFilterOptions {
+  breakdowns: IListMember[];
+}
+
+export const newFilterOptions = (data: Partial<IQVIBreakdownFilterOptions> = {}): IQVIBreakdownFilterOptions => {
+  return {
+    ...{
+      breakdowns: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/data/IQVIBreakdownFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/data/IQVIBreakdownFilters.ts
new file mode 100644
index 0000000..e99772e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/data/IQVIBreakdownFilters.ts
@@ -0,0 +1,17 @@
+export interface IQVIBreakdownFilters {
+  breakdownIds: string[];
+  identifiedSavings?: number;
+  qualityVariationCases?: number;
+}
+export const initialFilters: IQVIBreakdownFilters = {
+  identifiedSavings: undefined,
+  qualityVariationCases: undefined,
+  breakdownIds: []
+};
+export const numberOfFilters = (filters: IQVIBreakdownFilters): number => {
+  let filtersCount = 0;
+  if (filters.breakdownIds.length > 0) filtersCount++;
+  if (filters.identifiedSavings != null && filters.identifiedSavings > 0) filtersCount++;
+  if (filters.qualityVariationCases != null && filters.qualityVariationCases > 0) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/data/qviBreakdownService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/data/qviBreakdownService.ts
new file mode 100644
index 0000000..0c5468d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/breakdowns/data/qviBreakdownService.ts
@@ -0,0 +1,21 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IPagedApiResponse } from '../../../shared/paging/IPagedApiResponse';
+import { IQVIBreakdown } from './IQVIBreakdown';
+import { IQVIBreakdownFilterOptions } from './IQVIBreakdownFilterOptions';
+import { IPagingOptions } from '../../../shared/paging';
+import { IQVIBreakdownFilters } from './IQVIBreakdownFilters';
+
+const { httpGet, httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const qviBreakdownService = {
+  getQVIBreakdowns: async (configurationGuid: string, pagingOptions: IPagingOptions, filters: IQVIBreakdownFilters): Promise<IPagedApiResponse<IQVIBreakdown>> => {
+    return httpPost<IPagedApiResponse<IQVIBreakdown>>(`quality-variation-item-breakdowns`, {
+      pagingOptions,
+      filters: { ...filters, configurationGuid }
+    });
+  },
+
+  getFilterOptions: (configurationGuid: string): Promise<IQVIBreakdownFilterOptions> => {
+    return httpGet<IQVIBreakdownFilterOptions>(`quality-variation-item-breakdowns/${configurationGuid}/filter-options`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/Events.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/Events.test.tsx
new file mode 100644
index 0000000..d3a8633
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/Events.test.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import { IPagedApiResponse } from '../../shared/paging';
+import { render, screen, within } from '../../test-utils/testUtils';
+import { eventService } from './data/qviEventService';
+import { IQVIEvent, newQVIEvent } from './data/IQVIEvent';
+import Events from './Events';
+
+const mockEvents: IQVIEvent[] = [
+  newQVIEvent({
+    qualityVariationEventId: 10,
+    qualityVariationEventName: 'Event 1',
+    identifiedSavingsTotal: 20,
+    casesTotal: 30,
+    qviCasesTotal: 40,
+    qviPatientDaysTotal: 50,
+    qviCostToal: 60,
+    qviNetRevenueTotal: 70,
+    opportunities: 80,
+    qviRate: 0.01
+  }),
+  newQVIEvent({
+    qualityVariationEventId: 20,
+    qualityVariationEventName: 'Event 2',
+    identifiedSavingsTotal: 30,
+    casesTotal: 40,
+    qviCasesTotal: 50,
+    qviPatientDaysTotal: 60,
+    qviCostToal: 70,
+    qviNetRevenueTotal: 80,
+    opportunities: 90,
+    qviRate: 0.02
+  })
+];
+
+const mockPagedEvents: IPagedApiResponse<IQVIEvent> = {
+  data: mockEvents,
+  pagingInfo: {
+    pageNumber: 1,
+    resultsPerPage: 20,
+    totalNumberOfResults: 2,
+    totalPages: 1
+  }
+};
+
+test('All events are shown', async () => {
+  jest.spyOn(eventService, 'getQualityVariationItemEvents').mockReturnValue(Promise.resolve(mockPagedEvents));
+
+  // render component
+  render(<Events />, null);
+
+  // wait for grid to load
+  const cell = await screen.findByRole('cell', { name: mockPagedEvents.data[0].qualityVariationEventName });
+
+  // get rows
+  const tableBody = cell?.parentElement?.parentElement as HTMLElement;
+  const rows = within(tableBody).getAllByRole('row');
+
+  mockPagedEvents.data.forEach((event, index) => {
+    const row = rows[index];
+    within(row).getByText(event.qualityVariationEventName);
+    within(row).getByText('$' + event.identifiedSavingsTotal);
+    within(row).getByText(event.opportunities);
+    within(row).getByText(event.qviCasesTotal);
+    within(row).getByText((event.qviRate * 100).toFixed(2) + '%');
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/Events.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/Events.tsx
new file mode 100644
index 0000000..2f03ec2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/Events.tsx
@@ -0,0 +1,114 @@
+import React, { useEffect, useState } from 'react';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import { IPagingOptions } from '../../shared/paging';
+import { IQVIEvent } from './data/IQVIEvent';
+import { IQVIEventFilters, numberOfFilters, initialFilters } from './data/IQVIEventFillters';
+import Filters from './Filters';
+import { eventService } from './data/qviEventService';
+import Link from '@strata/tempo/lib/link';
+import { useJazzUrlWithVersion } from '@strata/core/lib/';
+import ActionBar from '@strata/tempo/lib/actionbar';
+import Button from '@strata/tempo/lib/button';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import FilterIcon from '@strata/tempo/lib/icon/FilterIcon';
+
+const initialPagingOptions = {
+  sortField: 'identifiedSavingsTotal',
+  sortOrder: -1,
+  first: 0,
+  rows: 25
+};
+
+const Events: React.FC = () => {
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+  const [filters, setFilters] = useState<IQVIEventFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const [pagingOptions, setPagingOptions] = useState<IPagingOptions>(initialPagingOptions);
+  const [lazyData, setLazyData] = useState<IQVIEvent[] | []>();
+  const [loading, setLoading] = useState(false);
+  const [totalEvents, setTotalEvents] = useState<number>();
+  const jazzUrl = useJazzUrlWithVersion();
+
+  useEffect(() => {
+    const loadData = async () => {
+      if (currentConfigurationGuid === '') {
+        return;
+      }
+      setLoading(true);
+      try {
+        const pagedResponse = await eventService.getQualityVariationItemEvents(currentConfigurationGuid, pagingOptions, filters);
+        setTotalEvents(pagedResponse.pagingInfo.totalNumberOfResults);
+        setLazyData(pagedResponse.data);
+      } finally {
+        setLoading(false);
+      }
+    };
+    loadData();
+  }, [filters, pagingOptions, currentConfigurationGuid]);
+
+  useEffect(() => {
+    if (currentConfiguration == null) {
+      return;
+    }
+    setFilters(initialFilters);
+    setCurrentConfigurationGuid(currentConfiguration.configurationGuid);
+  }, [currentConfiguration]);
+
+  const handleApplyFilters = (newFilters: IQVIEventFilters) => {
+    setFiltersVisible(false);
+    setFilters((filters) => {
+      return { ...filters, ...newFilters };
+    });
+    setPagingOptions({ ...pagingOptions, first: 0 });
+  };
+
+  const filtersSelected = numberOfFilters(filters);
+
+  return (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />
+      <ActionBar
+        filters={
+          <>
+            <Button type={filtersSelected > 0 ? 'primary' : 'secondary'} icon={<FilterIcon />} onClick={() => setFiltersVisible(true)}>
+              Filters{filtersSelected > 0 ? ` (${filtersSelected})` : ''}
+            </Button>
+          </>
+        }
+      ></ActionBar>
+      <DataGrid
+        scrollable
+        loading={loading}
+        value={lazyData}
+        lazy
+        sortField={pagingOptions.sortField}
+        sortOrder={pagingOptions.sortOrder}
+        paginator
+        first={pagingOptions.first}
+        totalRecords={totalEvents}
+        onSort={(e) => setPagingOptions({ ...pagingOptions, ...e })}
+        onPage={(e) => setPagingOptions({ ...pagingOptions, ...e })}
+        dataKey='qualityVariationEventId'
+      >
+        <DataGrid.Column
+          key='qualityVariationEventName'
+          field='qualityVariationEventName'
+          header='Quality Variation Event'
+          sortable
+          width={300}
+          body={(rowData) => (
+            <Link href={jazzUrl + 'CCI/QualityVariation/OpportunityComparison.aspx?qualityVariationEventID=' + rowData.qualityVariationEventId}>{rowData.qualityVariationEventName}</Link>
+          )}
+        />
+        <DataGrid.NumberColumn key='identifiedSavingsTotal' field='identifiedSavingsTotal' header='Identified Variation' format='currency' sortable width={144} />
+        <DataGrid.NumberColumn key='opportunities' field='opportunities' header='Opportunities' sortable width={120} />
+        <DataGrid.NumberColumn key='qviCasesTotal' field='qviCasesTotal' header='Quality Variation Cases' sortable width={184} />
+        <DataGrid.NumberColumn field='qviRate' header='Quality Variation Rate' format='percentDecimal' sortable width={184} />
+        <DataGrid.EmptyColumn />
+      </DataGrid>
+    </>
+  );
+};
+
+export default Events;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/Filters.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/Filters.test.tsx
new file mode 100644
index 0000000..bfa56c4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/Filters.test.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import { render, screen, fireEvent } from '../../test-utils/testUtils';
+import { eventService } from './data/qviEventService';
+import Filters from './Filters';
+import { IQVIEventFilterOptions, newFilterOptions } from './data/IQVIEventFilterOptions';
+import { IQVIEventFilters } from './data/IQVIEventFillters';
+import { dropDownTestUtils } from '@strata/test-utils/lib';
+
+const mockFilterOptions: IQVIEventFilterOptions = newFilterOptions({
+  qualityVariationEvents: [{ text: 'Test Quality Variation Event', id: '1' }]
+});
+
+const mockInitialFilters: IQVIEventFilters = {
+  qualityVariationEventIds: [],
+  identifiedSavings: undefined,
+  qviCases: undefined
+};
+
+test('Filters default to empty', async () => {
+  jest.spyOn(eventService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const qualityVariationEventDropdown = dropDownTestUtils.getDropDown('Quality Variation Event');
+
+  // verify default value is set correctly
+  expect(dropDownTestUtils.getSelectedOption(qualityVariationEventDropdown)).toEqual('');
+});
+
+test('Filters clear', async () => {
+  jest.spyOn(eventService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const qualityVariationEventDropdown = dropDownTestUtils.getDropDown('Quality Variation Event');
+  const identifiedSavingsInput = screen.getByRole('spinbutton', { name: 'Identified Savings Minimum' });
+  const qualityVariationCasesInput = screen.getByRole('spinbutton', { name: 'Quality Variation Case Minimum' });
+
+  // verify default value is set correctly
+  await dropDownTestUtils.selectOption(qualityVariationEventDropdown, mockFilterOptions.qualityVariationEvents[0].text);
+  fireEvent.change(identifiedSavingsInput, { target: { value: 123 } });
+  fireEvent.change(qualityVariationCasesInput, { target: { value: 124 } });
+
+  expect(dropDownTestUtils.getSelectedOption(qualityVariationEventDropdown)).toEqual(mockFilterOptions.qualityVariationEvents[0].text);
+  expect(identifiedSavingsInput).toHaveValue('123');
+  expect(qualityVariationCasesInput).toHaveValue('124');
+
+  const clearButton = screen.getByRole('button', { name: 'Clear Filters' });
+  fireEvent.click(clearButton);
+
+  expect(dropDownTestUtils.getSelectedOption(qualityVariationEventDropdown)).toEqual('');
+  expect(identifiedSavingsInput).not.toHaveValue();
+  expect(qualityVariationCasesInput).not.toHaveValue();
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/Filters.tsx
new file mode 100644
index 0000000..366b599
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/Filters.tsx
@@ -0,0 +1,86 @@
+import React, { useCallback } from 'react';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import Drawer from '@strata/tempo/lib/drawer';
+import DropDown from '@strata/tempo/lib/dropdown';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing';
+import { initialFilters, IQVIEventFilters } from './data/IQVIEventFillters';
+import { useEffect, useState } from 'react';
+import { eventService } from './data/qviEventService';
+import { IListMember } from '../../shared/data/IListMember';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+
+interface IFiltersProps {
+  filters: IQVIEventFilters;
+  isVisible: boolean;
+  onApply: (filters: IQVIEventFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const [qualityVariationEvents, setQualityVariationEvents] = useState<IListMember[]>();
+
+  const { userSetting } = React.useContext(UserSettingContext);
+
+  const [form] = Form.useForm<IQVIEventFilters>();
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      const { qualityVariationEvents } = await eventService.getFilterOptions(userSetting.configurationGuid);
+      setQualityVariationEvents(qualityVariationEvents);
+      handleClearFilters();
+    };
+    if (userSetting.configurationGuid !== '') loadFiltersOptions();
+  }, [handleClearFilters, userSetting]);
+
+  const handleApplyFilters = () => {
+    const filters: IQVIEventFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Quality Variation Event' name='qualityVariationEventIds'>
+          <DropDown multiSelect items={qualityVariationEvents} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Identified Savings Minimum' name='identifiedSavings'>
+          <InputNumber format='currency' placeholder='' precision={0} />
+        </Form.Item>
+        <Form.Item label='Quality Variation Case Minimum' name='qviCases'>
+          <InputNumber placeholder='0' precision={0} />
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/data/IQVIEvent.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/data/IQVIEvent.ts
new file mode 100644
index 0000000..ba9fd41
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/data/IQVIEvent.ts
@@ -0,0 +1,32 @@
+export interface IQVIEvent {
+  qualityVariationEventId: number;
+  qualityVariationEventName: string;
+  identifiedSavingsTotal: number;
+  casesTotal: number;
+  qviCasesTotal: number;
+  qviPatientDaysTotal: number;
+  qviCostToal: number;
+  qviNetRevenueTotal: number;
+  configurationGuid: string;
+  opportunities: number;
+  qviRate: number;
+}
+
+export const newQVIEvent = (data: Partial<IQVIEvent> = {}): IQVIEvent => {
+  return {
+    ...{
+      qualityVariationEventId: 0,
+      qualityVariationEventName: '',
+      identifiedSavingsTotal: 0,
+      casesTotal: 0,
+      qviCasesTotal: 0,
+      qviPatientDaysTotal: 0,
+      qviCostToal: 0,
+      qviNetRevenueTotal: 0,
+      configurationGuid: '',
+      opportunities: 0,
+      qviRate: 0
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/data/IQVIEventFillters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/data/IQVIEventFillters.ts
new file mode 100644
index 0000000..1b8afd5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/data/IQVIEventFillters.ts
@@ -0,0 +1,19 @@
+export interface IQVIEventFilters {
+  qualityVariationEventIds: string[];
+  identifiedSavings?: number;
+  qviCases?: number;
+}
+
+export const initialFilters: IQVIEventFilters = {
+  qualityVariationEventIds: [],
+  identifiedSavings: undefined,
+  qviCases: undefined
+};
+
+export const numberOfFilters = (filters: IQVIEventFilters): number => {
+  let filtersCount = 0;
+  if (filters.qualityVariationEventIds.length > 0) filtersCount++;
+  if (filters.identifiedSavings != null && filters.identifiedSavings > 0) filtersCount++;
+  if (filters.qviCases != null && filters.qviCases > 0) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/data/IQVIEventFilterOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/data/IQVIEventFilterOptions.ts
new file mode 100644
index 0000000..a3e1092
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/data/IQVIEventFilterOptions.ts
@@ -0,0 +1,14 @@
+import { IListMember } from '../../../shared/data/IListMember';
+
+export interface IQVIEventFilterOptions {
+  qualityVariationEvents: IListMember[];
+}
+
+export const newFilterOptions = (data: Partial<IQVIEventFilterOptions> = {}): IQVIEventFilterOptions => {
+  return {
+    ...{
+      qualityVariationEvents: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/data/qviEventService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/data/qviEventService.ts
new file mode 100644
index 0000000..6cf55ac
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/events/data/qviEventService.ts
@@ -0,0 +1,23 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IPagingOptions, IPagedApiResponse } from '../../../shared/paging';
+import { IQVIEvent } from './IQVIEvent';
+import { IQVIEventFilterOptions } from './IQVIEventFilterOptions';
+import { IQVIEventFilters } from './IQVIEventFillters';
+
+const { httpGet, httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const eventService = {
+  getQualityVariationItemEvents: async (configurationGuid: string, pagingOptions: IPagingOptions, filters: IQVIEventFilters): Promise<IPagedApiResponse<IQVIEvent>> => {
+    return httpPost<IPagedApiResponse<IQVIEvent>>(`quality-variation-item-events`, {
+      pagingOptions,
+      filters: {
+        ...filters,
+        configurationGuid
+      }
+    });
+  },
+
+  getFilterOptions: (configurationGuid: string): Promise<IQVIEventFilterOptions> => {
+    return httpGet<IQVIEventFilterOptions>(`quality-variation-item-events/${configurationGuid}/filter-options`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/Filters.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/Filters.test.tsx
new file mode 100644
index 0000000..74da09c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/Filters.test.tsx
@@ -0,0 +1,91 @@
+import React from 'react';
+import { render, screen, fireEvent } from '../../test-utils/testUtils';
+import { opportunityService } from './data/opportunityService';
+import Filters from './Filters';
+import { IQVIFilterOptions, newFilterOptions } from './data/IQVIFilterOptions';
+import { IQVIFilters } from './data/IQVIFilters';
+import { dropDownTestUtils } from '@strata/test-utils/lib';
+
+const mockFilterOptions: IQVIFilterOptions = newFilterOptions({
+  breakdowns: [{ text: 'Service Line 1', id: '1' }],
+  qualityVariationEvents: [{ text: 'Test Quality Variation Event', id: '1' }]
+});
+
+const mockInitialFilters: IQVIFilters = {
+  identifiedSavings: undefined,
+  qviCases: undefined,
+  qualityVariationEventIds: [],
+  breakdownIds: [],
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+test('Filters default to empty', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const breakdownDropdown = dropDownTestUtils.getDropDown('Entity');
+  const qualityVariationEventDropdown = dropDownTestUtils.getDropDown('Quality Variation Event');
+
+  // verify default value is set correctly
+  expect(dropDownTestUtils.getSelectedOption(breakdownDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(qualityVariationEventDropdown)).toEqual('');
+});
+
+test('Filters clear', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const breakdownDropdown = dropDownTestUtils.getDropDown('Entity');
+  const qualityVariationEventDropdown = dropDownTestUtils.getDropDown('Quality Variation Event');
+  const identifiedSavingsInput = screen.getByRole('spinbutton', { name: 'Identified Savings Minimum' });
+  const qviCasesInput = screen.getByRole('spinbutton', { name: 'Quality Variation Case Minimum' });
+
+  // verify default value is set correctly
+  await dropDownTestUtils.selectOption(breakdownDropdown, mockFilterOptions.breakdowns[0].text);
+  await dropDownTestUtils.selectOption(qualityVariationEventDropdown, mockFilterOptions.qualityVariationEvents[0].text);
+  fireEvent.change(identifiedSavingsInput, { target: { value: 123 } });
+  fireEvent.change(qviCasesInput, { target: { value: 123 } });
+
+  expect(dropDownTestUtils.getSelectedOption(breakdownDropdown)).toEqual(mockFilterOptions.breakdowns[0].text);
+  expect(dropDownTestUtils.getSelectedOption(qualityVariationEventDropdown)).toEqual(mockFilterOptions.qualityVariationEvents[0].text);
+  expect(identifiedSavingsInput).toHaveValue('123');
+  expect(qviCasesInput).toHaveValue('123');
+
+  const clearButton = screen.getByRole('button', { name: 'Clear Filters' });
+  fireEvent.click(clearButton);
+
+  expect(dropDownTestUtils.getSelectedOption(breakdownDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(qualityVariationEventDropdown)).toEqual('');
+  expect(identifiedSavingsInput).not.toHaveValue();
+  expect(qviCasesInput).not.toHaveValue();
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/Filters.tsx
new file mode 100644
index 0000000..54a0c3e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/Filters.tsx
@@ -0,0 +1,109 @@
+import React, { useCallback } from 'react';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import Drawer from '@strata/tempo/lib/drawer';
+import DropDown from '@strata/tempo/lib/dropdown';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing';
+import Checkbox from '@strata/tempo/lib/checkbox';
+import { initialFilters, IQVIFilters } from './data/IQVIFilters';
+import { useEffect, useState } from 'react';
+import { opportunityService } from './data/opportunityService';
+import { IListMember } from '../../shared/data/IListMember';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+
+interface IFiltersProps {
+  filters: IQVIFilters;
+  isVisible: boolean;
+  onApply: (filters: IQVIFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const [breakdowns, setbreakdowns] = useState<IListMember[]>();
+  const [qualityVariationEvents, setQualityVariationEvents] = useState<IListMember[]>();
+
+  const { currentConfiguration } = useConfigurations();
+
+  const [form] = Form.useForm<IQVIFilters>();
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      if (currentConfiguration == null) {
+        return;
+      }
+      const { breakdowns, qualityVariationEvents } = await opportunityService.getFilterOptions(currentConfiguration.configurationGuid);
+
+      setbreakdowns(breakdowns);
+      setQualityVariationEvents(qualityVariationEvents);
+      handleClearFilters();
+    };
+
+    loadFiltersOptions();
+  }, [currentConfiguration, handleClearFilters]);
+
+  const handleApplyFilters = () => {
+    const filters: IQVIFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Identified Savings Minimum' name='identifiedSavings'>
+          <InputNumber format='currency' placeholder='' precision={0} />
+        </Form.Item>
+        <Form.Item label='Quality Variation Case Minimum' name='qviCases'>
+          <InputNumber placeholder='0' precision={0} />
+        </Form.Item>
+        <Form.Item label='Quality Variation Event' name='qualityVariationEventIds'>
+          <DropDown multiSelect items={qualityVariationEvents} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label={currentConfiguration?.qviOpportunityBreakdownName} name='breakdownIds'>
+          <DropDown multiSelect items={breakdowns} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Display' name='viewVisible'>
+          <RadioGroup
+            options={[
+              { value: true, label: 'Visible Opportunities' },
+              { value: false, label: 'Hidden Opportunities' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Initiatives' name='excludeInitiatives' valuePropName='checked'>
+          <Checkbox>Exclude Opportunities with Initiatives</Checkbox>
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/Opportunities.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/Opportunities.test.tsx
new file mode 100644
index 0000000..e41be90
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/Opportunities.test.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import { render, screen, within } from '../../test-utils/testUtils';
+import { IQVIOpportunity, newQVIOpportunity } from './data/IQVIOpportunity';
+import { opportunityService } from './data/opportunityService';
+import { IPagedApiResponse } from '../../shared/paging/IPagedApiResponse';
+import Opportunities from './Opportunities';
+
+const mockOpportunities: IQVIOpportunity[] = [
+  newQVIOpportunity({
+    opportunityKey: 'QV - 1',
+    identifiedSavings: 100,
+    breakdownName: 'Service Line 1',
+    qualityVariationEventName: 'Quality Variation Event 1'
+  }),
+  newQVIOpportunity({
+    opportunityKey: 'QV - 2',
+    identifiedSavings: 200,
+    breakdownName: 'Service Line 2',
+    qualityVariationEventName: 'Quality Variation Event 2'
+  })
+];
+
+const mockPagedOpportunities: IPagedApiResponse<IQVIOpportunity> = {
+  data: mockOpportunities,
+  pagingInfo: {
+    pageNumber: 1,
+    resultsPerPage: 25,
+    totalNumberOfResults: 2,
+    totalPages: 1
+  }
+};
+
+test('All opportunities are shown', async () => {
+  jest.spyOn(opportunityService, 'getOpportunities').mockReturnValue(Promise.resolve(mockPagedOpportunities));
+
+  // render component
+  render(<Opportunities />, null);
+
+  // wait for grid to load
+  const cell = await screen.findByRole('cell', { name: mockPagedOpportunities.data[0].opportunityKey });
+
+  // get rows
+  const tableBody = cell?.parentElement?.parentElement as HTMLElement;
+  const rows = within(tableBody).getAllByRole('row');
+
+  mockPagedOpportunities.data.forEach((opportunity, index) => {
+    const row = rows[index];
+    within(row).getByText(opportunity.opportunityKey);
+    within(row).getByText(opportunity.breakdownName);
+    within(row).getByText(opportunity.qualityVariationEventName);
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/Opportunities.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/Opportunities.tsx
new file mode 100644
index 0000000..8e7588a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/Opportunities.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import { useEffect, useState } from 'react';
+import { opportunityService } from './data/opportunityService';
+import Filters from './Filters';
+import { IQVIFilters, numberOfFilters, initialFilters } from './data/IQVIFilters';
+import { useJazzUrlWithVersion } from '@strata/core/lib/';
+import OpportunitiesGrid from '../../shared/opportunities/OpportunitiesGrid';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { IOpportunity } from '../../shared/opportunities/data';
+
+const Opportunities: React.FC = () => {
+  const [filters, setFilters] = useState<IQVIFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+
+  const jazzUrl = useJazzUrlWithVersion();
+
+  useEffect(() => {
+    document.title = 'Quality Variation';
+  }, []);
+
+  useEffect(() => {
+    if (currentConfiguration == null) {
+      return;
+    }
+    setFilters(initialFilters);
+    setCurrentConfigurationGuid(currentConfiguration.configurationGuid);
+  }, [currentConfiguration]);
+
+  const handleApplyFilters = (newFilters: IQVIFilters) => {
+    setFiltersVisible(false);
+    setFilters({ ...filters, ...newFilters });
+  };
+
+  const handleSearch = (searchValue: string) => {
+    setFilters((filters) => {
+      return { ...filters, opportunitySearch: searchValue };
+    });
+  };
+
+  const getOpportunityUrl = (opportunity: IOpportunity) => {
+    return `${jazzUrl}CCI/QualityVariation/OpportunityViewer.aspx?opportunityGuid=${opportunity.opportunityGuid}`;
+  };
+
+  const getInitiativeUrl = (opportunity: IOpportunity) => {
+    return `${jazzUrl}CCI/QualityVariation/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+  };
+
+  return (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />
+      <OpportunitiesGrid
+        configurationGuid={currentConfigurationGuid}
+        getOpportunityUrl={getOpportunityUrl}
+        getInitiativeUrl={getInitiativeUrl}
+        filters={filters}
+        opportunityService={opportunityService}
+        numOfSelectedFilters={numberOfFilters(filters)}
+        searchPlaceholderText='Search'
+        hasSourceOpportunities={false}
+        onFilter={() => setFiltersVisible(true)}
+        onSearch={handleSearch}
+      >
+        <DataGrid.NumberColumn key='qviCases' field='qviCases' header='Quality Variation Cases' sortable width={182} />
+        <DataGrid.NumberColumn key='qviRate' field='qviRate' header='Quality Variation Rate' format='percentDecimal' sortable width={182} />
+        <DataGrid.Column key='qualityVariationEventName' field='qualityVariationEventName' header='Quality Variation Event' sortable width={180} />
+        <DataGrid.Column key='breakdownName' field='breakdownName' header={currentConfiguration?.qviOpportunityBreakdownName} sortable width={160} />
+      </OpportunitiesGrid>
+    </>
+  );
+};
+
+export default Opportunities;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/data/IQVIFilterOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/data/IQVIFilterOptions.ts
new file mode 100644
index 0000000..742a7e8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/data/IQVIFilterOptions.ts
@@ -0,0 +1,16 @@
+import { IListMember } from '../../../shared/data/IListMember';
+
+export interface IQVIFilterOptions {
+  breakdowns: IListMember[];
+  qualityVariationEvents: IListMember[];
+}
+
+export const newFilterOptions = (data: Partial<IQVIFilterOptions> = {}): IQVIFilterOptions => {
+  return {
+    ...{
+      breakdowns: [],
+      qualityVariationEvents: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/data/IQVIFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/data/IQVIFilters.ts
new file mode 100644
index 0000000..c546773
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/data/IQVIFilters.ts
@@ -0,0 +1,29 @@
+import { IOpportunityFilters } from '../../../shared/opportunities/data';
+
+export interface IQVIFilters extends IOpportunityFilters {
+  identifiedSavings?: number;
+  qviCases?: number;
+  breakdownIds: string[];
+  qualityVariationEventIds: string[];
+}
+
+export const initialFilters: IQVIFilters = {
+  identifiedSavings: undefined,
+  qviCases: undefined,
+  breakdownIds: [],
+  qualityVariationEventIds: [],
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+export const numberOfFilters = (filters: IQVIFilters): number => {
+  let filtersCount = 0;
+  if (filters.identifiedSavings != null && filters.identifiedSavings > 0) filtersCount++;
+  if (filters.qviCases != null && filters.qviCases > 0) filtersCount++;
+  if (filters.breakdownIds.length > 0) filtersCount++;
+  if (filters.qualityVariationEventIds.length > 0) filtersCount++;
+  if (filters.viewVisible === false) filtersCount++;
+  if (filters.excludeInitiatives === true) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/data/IQVIOpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/data/IQVIOpportunity.ts
new file mode 100644
index 0000000..ec59698
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/data/IQVIOpportunity.ts
@@ -0,0 +1,30 @@
+import { IOpportunity } from '../../../shared/opportunities/data';
+
+export interface IQVIOpportunity extends IOpportunity {
+  qviCases: number;
+  qualityVariationEventName: string;
+  breakdownName: string;
+  qviRate: number;
+}
+
+export const newQVIOpportunity = (data: Partial<IQVIOpportunity> = {}): IQVIOpportunity => {
+  return {
+    ...{
+      opportunityKey: '',
+      opportunityId: 0,
+      opportunityGuid: '',
+      identifiedSavings: 0,
+      qviCases: 0,
+      qviRate: 0,
+      qualityVariationEventName: '',
+      breakdownName: '',
+      hasInitiative: false,
+      note: '',
+      isHidden: false,
+      initiativeGuid: '',
+      sourceOpportunity: '',
+      sourceOpportunityId: -1
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/data/opportunityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/data/opportunityService.ts
new file mode 100644
index 0000000..32129a4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/quality-variation/opportunities/data/opportunityService.ts
@@ -0,0 +1,50 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IQVIOpportunity } from './IQVIOpportunity';
+import { IQVIFilterOptions } from './IQVIFilterOptions';
+import { IOpportunityService, IOpportunityFilters } from '../../../shared/opportunities/data';
+import { IPagingOptions, IPagedApiResponse, ISortOptions } from '../../../shared/paging';
+
+const { httpGet, httpPost, httpPut, httpDownloadAndDisplayFile } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const opportunityService: IOpportunityService = {
+  getOpportunities: async (configurationGuid: string, pagingOptions: IPagingOptions, filters: IOpportunityFilters): Promise<IPagedApiResponse<IQVIOpportunity>> => {
+    return httpPost<IPagedApiResponse<IQVIOpportunity>>(`quality-variation-item-opportunities`, {
+      pagingOptions,
+      filters: {
+        ...filters,
+        configurationGuid
+      }
+    });
+  },
+
+  export: async (configurationGuid: string, sortOptions: ISortOptions, filters: IOpportunityFilters): Promise<void> => {
+    const date = new Date();
+    const fileName = 'QV_CI_Opportunities_' + date.toISOString().split('T')[0];
+    httpDownloadAndDisplayFile(
+      'quality-variation-item-opportunities/export',
+      {
+        method: 'post',
+        body: JSON.stringify({
+          sortOptions,
+          filters: {
+            ...filters,
+            configurationGuid
+          }
+        })
+      },
+      fileName
+    );
+  },
+
+  getFilterOptions: (configurationGuid: string): Promise<IQVIFilterOptions> => {
+    return httpGet<IQVIFilterOptions>(`quality-variation-item-opportunities/${configurationGuid}/filter-options`);
+  },
+
+  setHidden: async (opportunityGuid: string, isHidden: boolean): Promise<void> => {
+    await httpPut(`quality-variation-item-opportunities/${opportunityGuid}/set-hidden`, isHidden);
+  },
+
+  setNote: async (opportunityGuid: string, note: string): Promise<void> => {
+    await httpPut(`quality-variation-item-opportunities/${opportunityGuid}/set-note`, note);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/react-app-env.d.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/react-app-env.d.ts
new file mode 100644
index 0000000..6431bc5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/react-app-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="react-scripts" />
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/serviceWorker.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/serviceWorker.ts
new file mode 100644
index 0000000..b7b471e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/serviceWorker.ts
@@ -0,0 +1,127 @@
+// This optional code is used to register a service worker.
+// register() is not called by default.
+
+// This lets the app load faster on subsequent visits in production, and gives
+// it offline capabilities. However, it also means that developers (and users)
+// will only see deployed updates on subsequent visits to a page, after all the
+// existing tabs open on the page have been closed, since previously cached
+// resources are updated in the background.
+
+// To learn more about the benefits of this model and instructions on how to
+// opt-in, read https://bit.ly/CRA-PWA
+
+const isLocalhost = Boolean(
+  window.location.hostname === 'localhost' ||
+    // [::1] is the IPv6 localhost address.
+    window.location.hostname === '[::1]' ||
+    // 127.0.0.1/8 is considered localhost for IPv4.
+    window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/)
+);
+
+type Config = {
+  onSuccess?: (registration: ServiceWorkerRegistration) => void;
+  onUpdate?: (registration: ServiceWorkerRegistration) => void;
+};
+
+export function register(config?: Config) {
+  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+    // The URL constructor is available in all browsers that support SW.
+    const publicUrl = new URL((process as { env: { [key: string]: string } }).env.PUBLIC_URL, window.location.href);
+    if (publicUrl.origin !== window.location.origin) {
+      // Our service worker won't work if PUBLIC_URL is on a different origin
+      // from what our page is served on. This might happen if a CDN is used to
+      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
+      return;
+    }
+
+    window.addEventListener('load', () => {
+      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+
+      if (isLocalhost) {
+        // This is running on localhost. Let's check if a service worker still exists or not.
+        checkValidServiceWorker(swUrl, config);
+
+        // Add some additional logging to localhost, pointing developers to the
+        // service worker/PWA documentation.
+        navigator.serviceWorker.ready.then(() => {
+          console.log('This web app is being served cache-first by a service worker. To learn more, visit https://bit.ly/CRA-PWA');
+        });
+      } else {
+        // Is not localhost. Just register service worker
+        registerValidSW(swUrl, config);
+      }
+    });
+  }
+}
+
+function registerValidSW(swUrl: string, config?: Config) {
+  navigator.serviceWorker
+    .register(swUrl)
+    .then((registration) => {
+      registration.onupdatefound = () => {
+        const installingWorker = registration.installing;
+        if (installingWorker == null) {
+          return;
+        }
+        installingWorker.onstatechange = () => {
+          if (installingWorker.state === 'installed') {
+            if (navigator.serviceWorker.controller) {
+              // At this point, the updated precached content has been fetched,
+              // but the previous service worker will still serve the older
+              // content until all client tabs are closed.
+              console.log('New content is available and will be used when all tabs for this page are closed. See https://bit.ly/CRA-PWA.');
+
+              // Execute callback
+              if (config && config.onUpdate) {
+                config.onUpdate(registration);
+              }
+            } else {
+              // At this point, everything has been precached.
+              // It's the perfect time to display a
+              // "Content is cached for offline use." message.
+              console.log('Content is cached for offline use.');
+
+              // Execute callback
+              if (config && config.onSuccess) {
+                config.onSuccess(registration);
+              }
+            }
+          }
+        };
+      };
+    })
+    .catch((error) => {
+      console.error('❌ Error during service worker registration:', error);
+    });
+}
+
+function checkValidServiceWorker(swUrl: string, config?: Config) {
+  // Check if the service worker can be found. If it can't reload the page.
+  fetch(swUrl)
+    .then((response) => {
+      // Ensure service worker exists, and that we really are getting a JS file.
+      const contentType = response.headers.get('content-type');
+      if (response.status === 404 || (contentType != null && contentType.indexOf('javascript') === -1)) {
+        // No service worker found. Probably a different app. Reload the page.
+        navigator.serviceWorker.ready.then((registration) => {
+          registration.unregister().then(() => {
+            window.location.reload();
+          });
+        });
+      } else {
+        // Service worker found. Proceed as normal.
+        registerValidSW(swUrl, config);
+      }
+    })
+    .catch(() => {
+      console.log('No internet connection found. App is running in offline mode.');
+    });
+}
+
+export function unregister() {
+  if ('serviceWorker' in navigator) {
+    navigator.serviceWorker.ready.then((registration) => {
+      registration.unregister();
+    });
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/setupTests.js b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/setupTests.js
new file mode 100644
index 0000000..55c0dec
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/setupTests.js
@@ -0,0 +1,44 @@
+// react-testing-library renders your components to document.body,
+// this adds jest-dom's custom assertions
+import '@testing-library/jest-dom';
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import React from 'react';
+// global imports for mocking
+import { useOidcSession } from '@strata/core/lib/auth/useOidcSession';
+import { useJazzUrlWithVersion } from '@strata/core/lib/auth/useJazzUrlWithVersion';
+
+// global mocks
+jest.mock('@strata/core/lib/auth/useOidcSession');
+jest.mock('@strata/core/lib/auth/useJazzUrlWithVersion');
+
+useOidcSession.mockReturnValue({});
+useJazzUrlWithVersion.mockReturnValue('');
+
+// Fix TypeError: window.matchMedia is not a function
+global.matchMedia =
+  global.matchMedia ||
+  function () {
+    return {
+      matches: false,
+      addListener: jest.fn(),
+      removeListener: jest.fn()
+    };
+  };
+
+// fix console log
+global.React = React;
+global.console = {
+  // for debugging
+  log: console.log,
+  // to catch errors
+  error: console.error,
+  warn: jest.fn(),
+  info: jest.fn(),
+  debug: jest.fn()
+};
+
+window['config'] = {
+  API_URL: 'https://localhost:8443',
+  ENV: 'local',
+  identityServerUrl: 'https://test.com/'
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/IMenuItemOpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/IMenuItemOpportunity.ts
new file mode 100644
index 0000000..203e987
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/IMenuItemOpportunity.ts
@@ -0,0 +1,6 @@
+import { IMenuItem } from '@strata/tempo/lib/menu';
+
+export interface IMenuItemOpportunity extends IMenuItem {
+  opportunityRoute: string;
+  showMenuInRoute: boolean;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/Navigation.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/Navigation.tsx
new file mode 100644
index 0000000..69d4961
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/Navigation.tsx
@@ -0,0 +1,295 @@
+import { useHelpCenter, useJazzUrlWithVersion } from '@strata/core/lib';
+import { Navbar } from '@strata/navbar/lib';
+import Button from '@strata/tempo/lib/button/Button';
+import Divider from '@strata/tempo/lib/divider';
+import ErrorBoundary from '@strata/tempo/lib/errorboundary';
+import Header from '@strata/tempo/lib/header';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import Layout from '@strata/tempo/lib/layout';
+import LayoutGrid from '@strata/tempo/lib/layoutgrid/LayoutGrid';
+import Menu from '@strata/tempo/lib/menu';
+import { useModal } from '@strata/tempo/lib/modal';
+import Spacing from '@strata/tempo/lib/spacing';
+import Tabs, { ITab } from '@strata/tempo/lib/tabs/Tabs';
+import React, { useContext, useEffect, useState } from 'react';
+import { Redirect, Route, Switch, useLocation, useRouteMatch } from 'react-router-dom';
+import ChargeCodeGrid from '../charge-code/ChargeCode';
+import Initiative from '../charge-code/initiatives/Initiative';
+import ChargeCodeOpportunityDetail from '../charge-code/opportunities/ChargeCodeOpportunityDetail';
+import PeerGroupTab from '../configuration/tabs/PeerGroupTab';
+import RollupTab from '../configuration/tabs/RollupTab';
+import EncounterGrid from '../encounter/Encounter';
+import EncounterInitiative from '../encounter/initiatives/EncounterInitiative';
+import EncounterOpportunityDetail from '../encounter/opportunities/EncounterOpportunityDetail';
+import Exploration from '../exploration/Exploration';
+import ExplorationDetail from '../exploration/ExplorationDetail';
+import ExplorationInformation from '../exploration/ExplorationInformation';
+import ExplorationOpportunityDetail from '../exploration/opportunities/ExplorationOpportunityDetail';
+import ExplorationPopulation from '../exploration/opportunities/ExplorationPopulation';
+import FreeFormGrid from '../free-form/FreeForm';
+import FreeFormInitiative from '../free-form/initiatives/FreeFormInitiative';
+import FreeFormOpportunityDetail from '../free-form/opportunities/FreeFormOpportunityDetail';
+import GeneralLedgerGrid from '../general-ledger/GeneralLedger';
+import CreateGeneralLedgerInitiative from '../general-ledger/initiatives/CreateGeneralLedgerInitiative';
+import UploadFiles from '../gmdn/UploadFiles';
+import InitiativeGrid from '../initiatives/Initiative';
+import Network from '../network/Network';
+import NetworkOpportunityDetail, { INetworkOpportunityDetailProps } from '../network/opportunities/NetworkOpportunityDetail';
+import AllGrid from '../opportunities/AllGrid';
+import { StrategicOpportunityTypes } from '../opportunities/opportunities/data/IAllOpportunity';
+import PayrollGrid from '../payroll/Payroll';
+import CreatePayrollInitiative from '../payroll/initiatives/CreatePayrollInitiative';
+import PayrollOpportunityDetail from '../payroll/opportunities/PayrollOpportunityDetail';
+import QualityVariation from '../quality-variation/QualityVariation';
+import UserSettingContext from '../shared/userSetting/UserSettingContext';
+import StrategicOpportunityDetailPage from '../strategic-opportunities/detail/StrategicOpportunityDetailPage';
+import StrategicTracker from '../strategic-opportunities/detail/summary/StrategicTracker';
+import { IStrategicOpportunityProps, StrategicOpportunity, StrategicOpportunityChargeCode } from '../strategic-opportunities/wizard/StrategicOpportunity';
+import StrategicOpportunityPerformanceCalculations, { IPerformanceEngineCalculationProps } from '../strategic-opportunities/wizard/StrategicOpportunityPerformanceCalculations';
+import UtilizationVariation from '../utilization-variation/UtilizationVariation';
+import { IMenuItemOpportunity } from './IMenuItemOpportunity';
+import ClientWarehouses from './clientWarehouses/ClientWarehouses';
+import ConfigurationDropdown from './configuration/ConfigurationDropdown';
+import { useFeatureFlags } from './featureFlag/FeatureFlagContext';
+import CreateInitiative from './initiatives/CreateInitiative';
+
+const chargeCode = 'Charge Code';
+const network = 'Network';
+const exploration = 'Exploration';
+const opportunitiesPath = '/opportunities';
+
+const menuItems: IMenuItemOpportunity[] = [
+  { key: opportunitiesPath, href: opportunitiesPath, label: 'All', opportunityRoute: '', showMenuInRoute: true },
+  { key: '/charge-code/opportunities', href: '/charge-code/opportunities', label: chargeCode, opportunityRoute: 'charge-code-opportunity', showMenuInRoute: false },
+  { key: '/encounter/opportunities', href: '/encounter/opportunities', label: 'Encounter', opportunityRoute: 'encounter-opportunity', showMenuInRoute: false },
+  { key: '/explorectf', href: '/explorectf', label: exploration, opportunityRoute: 'explorectf', showMenuInRoute: false, hidden: true },
+  { key: '/configuration', href: '/configuration', label: 'Configuration', opportunityRoute: 'configuration', showMenuInRoute: false, hidden: true },
+  { key: '/exploration-populations', href: '/exploration-populations', label: 'Exploration Population Management', opportunityRoute: 'exploration-populations', showMenuInRoute: false, hidden: true },
+  { key: '/free-form/opportunities', href: '/free-form/opportunities', label: 'Free Form', opportunityRoute: 'free-form-opportunity', showMenuInRoute: false },
+  { key: '/general-ledger/opportunities', href: '/general-ledger/opportunities', label: 'General Ledger', opportunityRoute: '', showMenuInRoute: true },
+  { key: '/payroll/opportunities', href: '/payroll/opportunities', label: 'Payroll', opportunityRoute: 'payroll-opportunity', showMenuInRoute: false },
+  { key: '/quality-variation/opportunities', href: '/quality-variation/opportunities', label: 'Quality Variation', opportunityRoute: '', showMenuInRoute: true },
+  { key: '/strategic-tracker', href: '/strategic-tracker', label: 'Strategic Tracker', opportunityRoute: 'strategic-tracker', showMenuInRoute: false, hidden: true },
+  { key: '/utilization-variation/opportunities', href: '/utilization-variation/opportunities', label: 'Utilization Variation', opportunityRoute: '', showMenuInRoute: true },
+  { key: '/network/opportunities', href: '/network/opportunities', label: network, opportunityRoute: '', showMenuInRoute: true }
+];
+
+const notDisplayedMenuItem = ['initiatives', 'strategic-opportunities', 'strategic-opportunity'];
+
+const Navigation: React.FC = () => {
+  const [chargeCodeBeta, setChargeCodeBeta] = React.useState(false);
+  const [networkIsEnabled, setNetworkIsEnabled] = React.useState(false);
+  const [flexibleExplorationEnabled, setFlexibleExplorationEnabled] = React.useState(false);
+  const [strategicOpportunityEnabled, setStrategicOpportunityEnabled] = useState<boolean>(false);
+  const [benchmarkingEnabled, setBenchmarkingEnabled] = useState<boolean>(false);
+  const [configurationLoading, setConfigurationLoading] = useState<boolean>(false);
+
+  const featureFlags = useFeatureFlags();
+  const location = useLocation();
+  const jazzUrl = useJazzUrlWithVersion();
+  const helpCenter = useHelpCenter();
+  const modal = useModal();
+  const userSettings = useContext(UserSettingContext);
+  const { url } = useRouteMatch();
+
+  const defaultKey = opportunitiesPath;
+  let activeKey = location.pathname;
+  if (location.pathname === '/') {
+    activeKey = defaultKey;
+  }
+  const showMenu = !menuItems.some((item) => (location.pathname.includes(item.opportunityRoute) || notDisplayedMenuItem.some((path) => location.pathname.includes(path))) && !item.showMenuInRoute);
+
+  useEffect(() => {
+    if (!featureFlags.loading) {
+      setChargeCodeBeta(featureFlags.isEnabled('chargecodebeta'));
+      setNetworkIsEnabled(featureFlags.isEnabled('networkopportunitiesenabled'));
+      setFlexibleExplorationEnabled(featureFlags.isEnabled('ciflexibleexplorationenabled'));
+
+      if (isPeerGroupsOrRollupsConfigurationPage(location) && !userSettings.loading) {
+        if (userSettings.isAdmin) {
+          const stratOppEnabled = featureFlags.isEnabled('strategicopportunityforchargecode');
+          setStrategicOpportunityEnabled(stratOppEnabled);
+          const benchmarkFFEnabled = featureFlags.isEnabled('cibenchmarkingenabled');
+          setBenchmarkingEnabled(benchmarkFFEnabled);
+        } else {
+          modal.alert({
+            title: 'You do not have access to this page.',
+            content: 'If you believe this is a mistake, please contact your administrator.',
+            alertType: 'error',
+            onClose() {
+              window.location.href = jazzUrl + 'Home.aspx';
+            }
+          });
+        }
+      }
+    }
+  }, [featureFlags, userSettings, jazzUrl, location]);
+
+  const getMenuItems = () => {
+    let items = menuItems;
+    if (!chargeCodeBeta) {
+      items = items.filter((item) => item.label !== chargeCode);
+    }
+    if (!flexibleExplorationEnabled) {
+      items = items.filter((item) => item.label !== exploration);
+    }
+    if (!networkIsEnabled) {
+      items = items.filter((item) => item.label !== network);
+    }
+    return items;
+  };
+
+  const isPeerGroupsOrRollupsConfigurationPage = (location: any): boolean => {
+    if (location?.pathname) {
+      const pageKey = location.pathname.replace(url, '');
+      return pageKey === 'configuration/peergroups' || pageKey === 'configuration/rollups';
+    }
+    return false;
+  };
+
+  const getConfigurationTabs = (): ITab[] => {
+    const items: ITab[] = [];
+    if (benchmarkingEnabled) {
+      items.push({ key: 'peergroups', label: 'Peer Groups', href: url + 'configuration/peergroups', children: <PeerGroupTab setLoading={setConfigurationLoading} /> });
+    }
+    if (strategicOpportunityEnabled) {
+      items.push({ key: 'rollups', label: 'Rollups', href: url + 'configuration/rollups', children: <RollupTab /> });
+    }
+    return items;
+  };
+
+  const getActiveUrlKey = (): string | undefined => {
+    const splitUrl = location.pathname.split('/');
+    const activeUrlKey = splitUrl[splitUrl.length - 1];
+    if (activeUrlKey === 'peergroups') {
+      return 'peergroups';
+    } else if (activeUrlKey === 'rollups') {
+      return 'rollups';
+    }
+    return undefined;
+  };
+
+  return (
+    <Layout>
+      <Layout.Nav>
+        <Navbar hasTutorial />
+      </Layout.Nav>
+      <Layout>
+        {showMenu && (
+          <Layout.Sider collapsible>
+            <Header data-testid='header' title='Continuous Improvement'></Header>
+            <Spacing margin='12px 24px 24px 24px' hAlign='left'>
+              <ConfigurationDropdown />
+            </Spacing>
+            <Divider margin={0} extended={false}></Divider>
+            <Menu
+              selectedKeys={[activeKey]}
+              items={[
+                {
+                  label: 'Opportunities',
+                  key: 'opportunities',
+                  type: 'group',
+                  children: getMenuItems()
+                }
+              ]}
+            />
+          </Layout.Sider>
+        )}
+        {isPeerGroupsOrRollupsConfigurationPage(location) && (
+          <>
+            <Header
+              title='Continuous Improvement Configuration'
+              breadcrumbText='System Center'
+              breadcrumbHref={`${jazzUrl}SystemCenter/SystemCenter.aspx`}
+              subtitle='Configure data points to display on the Continuous Improvement pages.'
+              extra={<Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage('1899')} />}
+            ></Header>
+            <LayoutGrid removeMargin fullWidth loading={configurationLoading}>
+              <Tabs activeKey={getActiveUrlKey()} items={getConfigurationTabs()} />
+            </LayoutGrid>
+          </>
+        )}
+        <Layout.Content>
+          <ErrorBoundary key={`${activeKey}-errorboundary`}>
+            <Switch>
+              <Route path={['/initiatives']} exact component={InitiativeGrid} key='/initiatives'></Route>
+              <Route path={['/initiatives/create/encounter']} exact component={EncounterInitiative} key='/initiatives/create/encounter'></Route>
+              <Route path={['/initiatives/edit/encounter']} exact component={EncounterInitiative} key='/initiatives/edit/encounter'></Route>
+              <Route path={['/initiatives/create/free-form']} exact component={FreeFormInitiative} key='/initiatives/create/free-form'></Route>
+              <Route path={['/initiatives/edit/free-form']} exact component={FreeFormInitiative} key='/initiatives/edit/free-form'></Route>
+              <Route path={['/initiatives/create/general-ledger']} exact component={CreateGeneralLedgerInitiative} key='/initiatives/create/general-ledger'></Route>
+              <Route path={['/initiatives/create/payroll']} exact component={CreatePayrollInitiative} key='/initiatives/create/payrolll'></Route>
+              <Route path={['/initiatives/create']} exact component={CreateInitiative} key='/initiatives/create'></Route>
+              <Route path={['/initiatives/create/charge-code']} exact component={Initiative} key='/initiatives/create/charge-code'></Route>
+              <Route path={['/initiatives/edit/charge-code']} exact component={Initiative} key='/initiatives/edit/charge-code'></Route>
+              <Route path={['/strategic-opportunities/create/charge-code']} exact component={StrategicOpportunityChargeCode} key='/strategic-opportunities/create/charge-code'></Route>
+              <Route
+                path={['/strategic-opportunities/edit/charge-code/:strategicOpportunityId']}
+                exact
+                component={StrategicOpportunityChargeCode}
+                key='/strategic-opportunities/edit/charge-code'
+              ></Route>
+              <Route
+                path={['/strategic-opportunities/create/encounter']}
+                exact
+                component={(props: IStrategicOpportunityProps) => StrategicOpportunity({ ...props, opportunityType: StrategicOpportunityTypes.Encounter })}
+                key='/strategic-opportunities/create/encounter'
+              ></Route>
+              <Route
+                path={['/strategic-opportunities/create/general-ledger']}
+                exact
+                component={(props: IStrategicOpportunityProps) => StrategicOpportunity({ ...props, opportunityType: StrategicOpportunityTypes.GeneralLedger })}
+                key='/strategic-opportunities/create/general-ledger'
+              ></Route>
+              <Route
+                path={['/strategic-opportunities/edit/general-ledger/:strategicOpportunityId']}
+                exact
+                component={(props: IStrategicOpportunityProps) => StrategicOpportunity({ ...props, opportunityType: StrategicOpportunityTypes.GeneralLedger })}
+                key='/strategic-opportunities/edit/general-ledger'
+              ></Route>
+              <Route
+                path={['/strategic-opportunities/engine-calculations']}
+                exact
+                component={(props: IPerformanceEngineCalculationProps) => StrategicOpportunityPerformanceCalculations({ ...props })}
+                key='strategicOpportunityCalculations'
+              />
+              <Route path={['/', opportunitiesPath]} exact component={AllGrid} key={opportunitiesPath}></Route>
+              <Route path={'/exploration-opportunity/:opportunityGuid'} exact component={ExplorationOpportunityDetail} key='explorationOpportunityDetail' />
+              <Route path={'/charge-code-opportunity/:opportunityGuid'} exact component={ChargeCodeOpportunityDetail} key='chargeCodeOpportunityDetail' />
+              <Route
+                path={['/strategic-opportunity/:opportunityId', '/strategic-tracker/opportunity/:opportunityId']}
+                exact
+                component={StrategicOpportunityDetailPage}
+                key='strategicOpportunityDetail'
+              />
+              <Route path={'/strategic-tracker'} exact render={() => <Redirect to={`/strategic-tracker/opportunities`}></Redirect>} key='strategic-tracker'></Route>
+              <Route path={`/strategic-tracker/opportunities`} key='/strategic-tracker/opportunities' component={StrategicTracker} />
+              <Route path={`/strategic-tracker/initiatives`} key='/strategic-tracker/initiatives' component={StrategicTracker} />
+              <Route path={'/payroll-opportunity/:opportunityGuid'} exact component={PayrollOpportunityDetail} key='payrollOpportunityDetail' />
+              <Route path='/charge-code/opportunities' exact component={ChargeCodeGrid} key='/charge-code/opportunities'></Route>
+              <Route path='/encounter/opportunities' exact component={EncounterGrid} key='/encounter/opportunities'></Route>
+              <Route path='/explorectf' exact component={Exploration} key='/explorectf'></Route>
+              <Route path='/explorectf/:caseTypeFamilyId/costdriver/:costDriver' exact component={ExplorationDetail} key='/explorectfDetail'></Route>
+              <Route path='/explorectf/:caseTypeFamilyId/costdriver/:costDriver/:column/:columnId' exact component={ExplorationInformation} key='/explorectfInformation'></Route>
+              <Route path='/exploration-populations' exact component={ExplorationPopulation} key='/exploration-populations'></Route>
+              <Route path='/exploration-populations/:explorationPopulationId' exact component={ExplorationDetail} key='/exploration-populations-edit'></Route>
+              <Route path='/free-form/opportunities' exact component={FreeFormGrid} key='free-form/opportunities'></Route>
+              <Route path={'/free-form-opportunity/:opportunityGuid'} exact component={FreeFormOpportunityDetail} key='freeFormOpportunityDetail' />
+              <Route path={'/encounter-opportunity/:opportunityGuid'} exact component={EncounterOpportunityDetail} key='encounterOpportunityDetail' />
+              <Route path='/general-ledger/opportunities' exact component={GeneralLedgerGrid} key='/general-ledger/opportunities'></Route>
+              <Route path='/payroll/opportunities' exact component={PayrollGrid} key='/payroll/opportunities'></Route>
+              <Route path='/quality-variation/opportunities' exact component={QualityVariation} key='/quality-variation/opportunities'></Route>
+              <Route path='/utilization-variation/opportunities' exact component={UtilizationVariation} key='/utilization-variation/opportunities'></Route>
+              <Route path='/network/opportunities' exact component={Network} key='/network/opportunities'></Route>
+              <Route path={'/network-opportunity/:opportunityId'} exact component={(props: INetworkOpportunityDetailProps) => NetworkOpportunityDetail({ ...props })} key='networkOpportunityDetail' />
+              <Route path='/gmdn/upload' exact component={UploadFiles} key='/gmdn/upload'></Route>
+              <Route path='/client-warehouses' exact component={ClientWarehouses} key='/client-warehouses'></Route>
+            </Switch>
+          </ErrorBoundary>
+        </Layout.Content>
+      </Layout>
+    </Layout>
+  );
+};
+
+export default Navigation;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/ReportsModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/ReportsModal.tsx
new file mode 100644
index 0000000..76d77f0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/ReportsModal.tsx
@@ -0,0 +1,54 @@
+import React, { useEffect, useState } from 'react';
+import Modal from '@strata/tempo/lib/modal';
+import { reportService } from './opportunities/data/reportService';
+import Tree, { ITreeNode, ITreeSelectInfo } from '@strata/tempo/lib/tree';
+
+export interface IReportsModalProps {
+  isVisible: boolean;
+  onAdd?: (reportGUID: string) => void;
+  onClose?: () => void;
+}
+
+const ReportsModal: React.FC<IReportsModalProps> = (props: IReportsModalProps) => {
+  const { isVisible, onAdd, onClose } = props;
+  const [loading, setLoading] = useState(false);
+  const [folders, setFolders] = useState<ITreeNode>();
+  const [topKey, setTopKey] = useState<string>('');
+
+  useEffect(() => {
+    const loadList = async () => {
+      setLoading(true);
+      try {
+        const folders = await reportService.folderHierarchy();
+        setFolders(folders);
+        const key = folders.key;
+        setTopKey(key as string);
+      } finally {
+        setLoading(false);
+      }
+    };
+    if (isVisible) {
+      loadList();
+    }
+  }, [isVisible]);
+
+  const handleSelect = (selectedKeys: any, info: ITreeSelectInfo) => {
+    if (info.node.children === null && onAdd) {
+      onAdd(info.node.key as string);
+    }
+  };
+
+  const handleCancel = () => {
+    if (onClose) {
+      onClose();
+    }
+  };
+
+  return (
+    <Modal title='Reports' footer={null} visible={isVisible} onCancel={handleCancel} loading={loading}>
+      <Tree treeData={folders?.children} height={400} onSelect={handleSelect} defaultExpandedKeys={[topKey]} />
+    </Modal>
+  );
+};
+
+export default ReportsModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/YearMonthStruct.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/YearMonthStruct.tsx
new file mode 100644
index 0000000..c76f1bf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/YearMonthStruct.tsx
@@ -0,0 +1,33 @@
+export class YearMonthStruct {
+  year: number;
+  month: number;
+
+  constructor(yearOrDate: number | Date, month?: number) {
+    if (yearOrDate instanceof Date) {
+      this.year = yearOrDate.getFullYear();
+      this.month = yearOrDate.getMonth() + 1;
+    } else {
+      this.year = yearOrDate;
+      this.month = month!;
+    }
+  }
+
+  static compare(a: YearMonthStruct, b: YearMonthStruct): number {
+    if (a.year !== b.year) {
+      return a.year - b.year;
+    }
+    return a.month - b.month;
+  }
+
+  isAfter(other: YearMonthStruct): boolean {
+    return YearMonthStruct.compare(this, other) > 0;
+  }
+
+  isBefore(other: YearMonthStruct): boolean {
+    return YearMonthStruct.compare(this, other) < 0;
+  }
+
+  isEqual(other: YearMonthStruct): boolean {
+    return this.year === other.year && this.month === other.month;
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/analytics/data/analyticsService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/analytics/data/analyticsService.ts
new file mode 100644
index 0000000..c096e40
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/analytics/data/analyticsService.ts
@@ -0,0 +1,31 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+
+const { httpDelete, httpGet } = getSecureService(`${appConfig['analyticsApi']}v1/`);
+
+export interface IWorkbook {
+  workbookId: number;
+  name: string;
+}
+
+export interface IWorkbookTemplate {
+  templateId: number;
+  name: string;
+}
+
+export const analyticsService = {
+  getWorkbooks: async (): Promise<IWorkbook[]> => {
+    return httpGet(`workbooks`);
+  },
+
+  getWorkbook: async (workbookId: number): Promise<IWorkbook | undefined> => {
+    return httpGet(`workbooks/${workbookId}`);
+  },
+
+  deleteWorkbook: async (workbookId: number): Promise<void> => {
+    return httpDelete(`workbooks/${workbookId}`);
+  },
+
+  getWorkbookTemplates: async (): Promise<IWorkbookTemplate[]> => {
+    return httpGet('templates');
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/clientWarehouses/ClientWarehouses.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/clientWarehouses/ClientWarehouses.tsx
new file mode 100644
index 0000000..b544b3a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/clientWarehouses/ClientWarehouses.tsx
@@ -0,0 +1,130 @@
+import { useOidcSession } from '@strata/core/lib/auth/useOidcSession';
+import ActionBar from '@strata/tempo/lib/actionbar/ActionBar';
+import Button from '@strata/tempo/lib/button/Button';
+import DataGrid from '@strata/tempo/lib/datagrid/DataGrid';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import Form from '@strata/tempo/lib/form/Form';
+import Header from '@strata/tempo/lib/header';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import useModal from '@strata/tempo/lib/modal/useModal';
+import { usePageLoader } from '@strata/tempo/lib/pageloader/usePageLoader';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Tooltip from '@strata/tempo/lib/tooltip/Tooltip';
+import React, { useEffect, useState } from 'react';
+import { IDatabase } from '../databases/IDatabase';
+import { databaseService } from '../databases/databaseService';
+import { IClientWarehouse, newClientWarehouse } from './IClientWarehouse';
+import { clientWarehouseService } from './clientWarehouseService';
+
+const ClientWarehouses: React.FC = () => {
+  const [addModalVisible, setAddModalVisible] = useState<boolean>(false);
+  const [clientWarehouses, setClientWarehouses] = useState<IClientWarehouse[]>([]);
+  const [clientDatabases, setClientDatabases] = useState<IDatabase[]>();
+  const [form] = Form.useForm<IClientWarehouse>();
+  const { setLoading } = usePageLoader();
+  const session = useOidcSession();
+  const modal = useModal();
+
+  const loadData = async () => {
+    const warehouses = await clientWarehouseService.get();
+    setClientWarehouses(warehouses);
+    const databases = await databaseService.get();
+    setClientDatabases(
+      databases.map((d) => {
+        return { ...d, databaseName: d.orgPin + ' - ' + d.databaseName };
+      })
+    );
+  };
+
+  useEffect(() => {
+    loadData();
+  }, []);
+
+  const handleSave = async () => {
+    try {
+      const values = await form.validateFields();
+      setAddModalVisible(false);
+      const clientDb = clientDatabases?.find((db) => db.databaseGuid === values.databaseGuid);
+      if (clientDb) {
+        await clientWarehouseService.create(newClientWarehouse({ databaseGuid: values.databaseGuid, clientName: clientDb.databaseName, warehouseSize: values.warehouseSize }));
+      }
+      loadData();
+    } catch {
+      // invalid fields so let form show validation errors
+    }
+  };
+
+  const handleDelete = async (data: IClientWarehouse) => {
+    modal.confirm({
+      title: `Delete ${data.clientName}?`,
+      okText: 'Delete',
+      confirmType: 'danger',
+      async onOk() {
+        setLoading(true);
+        await clientWarehouseService.delete(data.databaseGuid);
+        loadData();
+        setLoading(false);
+      }
+    });
+  };
+
+  return (
+    <>
+      {session.isStrata ? (
+        <Spacing column>
+          <Header title={'Client Warehouses'} />
+          <ActionBar
+            filters={<></>}
+            actions={
+              <Button type='primary' icon={<PlusIcon />} onClick={() => setAddModalVisible(true)}>
+                Client Warehouse
+              </Button>
+            }
+          ></ActionBar>
+
+          <Modal title='Add Client Warehouse' visible={addModalVisible} onCancel={() => setAddModalVisible(false)} onOk={handleSave}>
+            <Form form={form} onFinish={handleSave} preserve={false}>
+              <Form.Item label='Clients' name='databaseGuid' rules={[{ required: true }]}>
+                <DropDown items={clientDatabases} allowClear showSearch itemTextField='databaseName' itemValueField='databaseGuid'></DropDown>
+              </Form.Item>
+              <Form.Item label='Warehouse Size' name='warehouseSize' rules={[{ required: true }]}>
+                <DropDown
+                  itemTextField='text'
+                  itemValueField='value'
+                  items={[
+                    { text: 'S', value: 1 },
+                    { text: 'M', value: 2 },
+                    { text: 'L', value: 3 },
+                    { text: 'XL', value: 4 }
+                  ]}
+                ></DropDown>
+              </Form.Item>
+            </Form>
+          </Modal>
+
+          <DataGrid dataKey='id' sortField='name' value={clientWarehouses} paginator rows={20}>
+            <DataGrid.RowNumber />
+            <DataGrid.Column field='clientName' header='Clients' sortable width={300} />
+            <DataGrid.Column field='warehouseSize' header='Warehouse Size' sortable width={150} />
+            <DataGrid.EmptyColumn />
+            <DataGrid.Column
+              align='right'
+              width={100}
+              body={(rowData) => (
+                <Tooltip title='Delete'>
+                  <Button type='link' icon={<DeleteIcon />} onClick={() => handleDelete(rowData)} />
+                </Tooltip>
+              )}
+            />
+          </DataGrid>
+        </Spacing>
+      ) : (
+        ''
+      )}
+    </>
+  );
+};
+
+export default ClientWarehouses;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/clientWarehouses/IClientWarehouse.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/clientWarehouses/IClientWarehouse.ts
new file mode 100644
index 0000000..41da07d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/clientWarehouses/IClientWarehouse.ts
@@ -0,0 +1,23 @@
+export interface IClientWarehouse {
+  id: number;
+  databaseGuid: string;
+  clientName: string;
+  warehouseSize: WarehouseSize;
+}
+
+export enum WarehouseSize {
+  S = 1,
+  M = 2,
+  L = 3,
+  XL = 4
+}
+
+export const newClientWarehouse = (data: Partial<IClientWarehouse> = {}): IClientWarehouse => ({
+  ...{
+    id: 0,
+    databaseGuid: data.databaseGuid ?? '',
+    clientName: data.clientName ?? '',
+    warehouseSize: data.warehouseSize ?? WarehouseSize.S
+  },
+  ...data
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/clientWarehouses/clientWarehouseService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/clientWarehouses/clientWarehouseService.ts
new file mode 100644
index 0000000..9fe35a3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/clientWarehouses/clientWarehouseService.ts
@@ -0,0 +1,21 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import { getSecureService } from '@strata/core/lib/http/getSecureService';
+import { IClientWarehouse } from './IClientWarehouse';
+
+const { httpPost, httpGet, httpDelete } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'client-warehouses';
+
+export const clientWarehouseService = {
+  get: function (): Promise<IClientWarehouse[]> {
+    return httpGet(`${url}`);
+  },
+  create: function (clientWarehouse: IClientWarehouse): Promise<number> {
+    return httpPost(`${url}`, clientWarehouse);
+  },
+  exists: function (databaseGuid: string): Promise<number> {
+    return httpPost(`${url}/${databaseGuid}/exists`, {});
+  },
+  delete: async function (databaseGuid: string) {
+    return await httpDelete(`${url}/${databaseGuid}`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/comments/CommentsDrawer.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/comments/CommentsDrawer.tsx
new file mode 100644
index 0000000..2b2d594
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/comments/CommentsDrawer.tsx
@@ -0,0 +1,132 @@
+import intlService from '@strata/intl/lib/IntlService';
+import Button from '@strata/tempo/lib/button/Button';
+import Drawer from '@strata/tempo/lib/drawer/Drawer';
+import Form from '@strata/tempo/lib/form';
+import InputTextArea from '@strata/tempo/lib/inputtextarea';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text';
+import Timeline, { ITimelineItem } from '@strata/tempo/lib/timeline';
+import { isEmpty } from 'lodash';
+import React, { useEffect } from 'react';
+import { RegEx } from '../validation/RegEx';
+import { IComment } from './data/IComment';
+import { commentService } from './data/commentService';
+
+interface ICommentsDrawerProps {
+  isVisible: boolean;
+  isGlobal: boolean;
+  isEditable: boolean;
+  opportunityType: number;
+  opportunityId: number | string;
+  onAddRefresh?: boolean;
+  onOk?: (comment: string) => void;
+  onCancel: () => void;
+}
+
+const CommentsDrawer: React.FC<ICommentsDrawerProps> = (props: ICommentsDrawerProps) => {
+  const { isVisible, isGlobal, isEditable, opportunityType, opportunityId, onAddRefresh, onOk, onCancel } = props;
+  const [comments, setComments] = React.useState<ITimelineItem[]>([]);
+  const [isAddButtonDisabled, setDisableButton] = React.useState<boolean>(true);
+  const [form] = Form.useForm();
+
+  useEffect(() => {
+    if (!isVisible) {
+      return;
+    }
+
+    getComments();
+  }, [isGlobal, isVisible, opportunityId, opportunityType]);
+
+  const getComments = async () => {
+    const comments = await commentService.getComments(opportunityType, opportunityId, isGlobal);
+    const timeline: ITimelineItem[] = [];
+    if (comments.length === 0) {
+      timeline.push({ ...{ date: 'NO COMMENTS ADDED', events: [] } });
+    } else {
+      comments.forEach((comment) => {
+        timeline.push(newTimeline(comment));
+      });
+    }
+    setComments(timeline);
+  };
+
+  const newTimeline = (data: Partial<IComment> = {}): ITimelineItem => {
+    return {
+      ...{
+        date: intlService.formatDate(data?.commentDate ?? '01-01-2020', 'dateLong'),
+        events: [
+          <Text size='small' key='author'>
+            {data.author}
+          </Text>,
+          <Text size='large' key='commentText'>
+            {data.commentText}
+          </Text>
+        ]
+      },
+      ...data
+    };
+  };
+
+  const isCommentInputEmpty = async (target: any) => {
+    setDisableButton(isEmpty(target.comment) ? true : false);
+  };
+
+  const handleFinish = async () => {
+    const comment = await form.getFieldValue('comment');
+    onOk && onOk(comment);
+    if (onAddRefresh) {
+      form.resetFields();
+    }
+    setDisableButton(true);
+    await commentService.addComment(opportunityType, opportunityId, isGlobal, comment);
+    await getComments();
+  };
+
+  const handleCancel = () => {
+    form.resetFields();
+    setDisableButton(true);
+    onCancel();
+  };
+
+  const handleAdd = () => {
+    form.submit();
+  };
+
+  return (
+    <Drawer
+      title='Comments'
+      width={450}
+      visible={isVisible}
+      footer={
+        isEditable && (
+          <Spacing hAlign='space-between'>
+            <Spacing />
+            <Spacing>
+              <Button onClick={handleCancel}>Cancel</Button>
+              <Button type='primary' disabled={isAddButtonDisabled} onClick={handleAdd}>
+                Add Comment
+              </Button>
+            </Spacing>
+          </Spacing>
+        )
+      }
+      onClose={handleCancel}
+    >
+      <Spacing column>
+        <Spacing column style={{ overflowY: 'auto' }} height='calc(100vh - 275px)'>
+          {/* Spacing tag below is to fix the top text cutting issue */}
+          <Spacing padding={3}></Spacing>
+          <Timeline items={comments} />
+        </Spacing>
+        <Spacing height={12} />
+        <Form form={form} preserve={false} onFinish={handleFinish} onValuesChange={isCommentInputEmpty}>
+          <Form.Item label='Comment' name='comment' style={{ marginBottom: '0px' }} rules={[{ required: true, whitespace: false, pattern: RegEx.CommentsDrawerRestrictedCharacters }]}>
+            <InputTextArea disabled={!isEditable} placeholder='New Comment' width={400} autoFocus />
+          </Form.Item>
+        </Form>
+      </Spacing>
+    </Drawer>
+  );
+};
+
+export default CommentsDrawer;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/comments/CommentsModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/comments/CommentsModal.tsx
new file mode 100644
index 0000000..8857fdd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/comments/CommentsModal.tsx
@@ -0,0 +1,84 @@
+import React, { useEffect } from 'react';
+import Form from '@strata/tempo/lib/form';
+import Modal from '@strata/tempo/lib/modal';
+import Text from '@strata/tempo/lib/text';
+import InputTextArea from '@strata/tempo/lib/inputtextarea';
+import Timeline, { ITimelineItem } from '@strata/tempo/lib/timeline';
+import { commentService } from './data/commentService';
+import { IComment } from './data/IComment';
+import { RegEx } from '../validation/RegEx';
+import intlService from '@strata/intl/lib/IntlService';
+
+interface ICommentsModalProps {
+  isVisible: boolean;
+  isGlobal: boolean;
+  opportunityType: number;
+  opportunityId: number | string;
+  onOk: (comment: string) => void;
+  onCancel: () => void;
+}
+
+const CommentsModal: React.FC<ICommentsModalProps> = (props: ICommentsModalProps) => {
+  const { isVisible, isGlobal, opportunityType, opportunityId, onOk, onCancel } = props;
+  const [comments, setComments] = React.useState<ITimelineItem[]>([]);
+  const [form] = Form.useForm();
+
+  useEffect(() => {
+    const getComments = async () => {
+      const comments = await commentService.getComments(opportunityType, opportunityId, isGlobal);
+      const timeline: ITimelineItem[] = [];
+      comments.forEach((comment) => {
+        timeline.push(newTimeline(comment));
+      });
+      setComments(timeline);
+    };
+
+    if (!isVisible) {
+      return;
+    }
+
+    getComments();
+  }, [isGlobal, isVisible, opportunityId, opportunityType]);
+
+  const newTimeline = (data: Partial<IComment> = {}): ITimelineItem => {
+    return {
+      ...{
+        date: intlService.formatDate(data?.commentDate ?? '01-01-2020', 'dateLong'),
+        events: [
+          <Text size='small' key='author'>
+            {data.author}
+          </Text>,
+          <Text size='large' key='commentText'>
+            {data.commentText}
+          </Text>
+        ]
+      },
+      ...data
+    };
+  };
+
+  const handleOk = async () => {
+    const comment = await form.getFieldValue('comment');
+    await commentService.addComment(opportunityType, opportunityId, isGlobal, comment);
+    onOk(comment);
+  };
+
+  const handleCancel = () => {
+    form.resetFields();
+    onCancel();
+  };
+
+  return (
+    <Modal title='Add Comment' onCancel={handleCancel} onOk={() => form.submit()} visible={isVisible}>
+      <Text.Heading level={4}>Comment History</Text.Heading>
+      <Timeline items={comments} />
+      <Form form={form} preserve={false} onFinish={handleOk}>
+        <Form.Item label='Comment' name='comment' rules={[{ required: true, whitespace: false, pattern: RegEx.JazzRestrictedCharacters }]}>
+          <InputTextArea placeholder='New Comment' width={400} autoFocus />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export default CommentsModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/comments/data/IComment.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/comments/data/IComment.ts
new file mode 100644
index 0000000..8dbbacc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/comments/data/IComment.ts
@@ -0,0 +1,5 @@
+export interface IComment {
+  commentDate: string | Date;
+  commentText: string;
+  author: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/comments/data/commentService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/comments/data/commentService.ts
new file mode 100644
index 0000000..96dfa04
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/comments/data/commentService.ts
@@ -0,0 +1,26 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IComment } from './IComment';
+import dayjs from 'dayjs';
+
+const { httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const commentService = {
+  getComments: async (opportunityType: number, opportunityId: number | string, isGlobal: boolean): Promise<IComment[]> => {
+    return httpPost<IComment[]>(`comments`, {
+      isGlobal,
+      opportunityType: `${opportunityType}`,
+      opportunityId
+    });
+  },
+
+  addComment: async (opportunityType: number, opportunityId: number | string, isGlobal: boolean, comment: string) => {
+    const newComment = {
+      isGlobal,
+      opportunityType: `${opportunityType}`,
+      opportunityId,
+      comment,
+      commentDate: dayjs().format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    };
+    return httpPost<IComment[]>(`comments/create`, newComment);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/ColumnManager/BaseColumnManager.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/ColumnManager/BaseColumnManager.tsx
new file mode 100644
index 0000000..77a7a25
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/ColumnManager/BaseColumnManager.tsx
@@ -0,0 +1,246 @@
+import Button from '@strata/tempo/lib/button';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import Drawer from '@strata/tempo/lib/drawer';
+import EyeIcon from '@strata/tempo/lib/icon/EyeIcon';
+import EyeInvisibleIcon from '@strata/tempo/lib/icon/EyeInvisibleIcon';
+import Spacing from '@strata/tempo/lib/spacing';
+import Tooltip from '@strata/tempo/lib/tooltip';
+import React, { useEffect, useState } from 'react';
+import { IMappedColumn } from '../IMappedColumn';
+import { baseColumnManagerService } from './data/baseColumnManagerService';
+
+interface IHeaderTypeUpdate {
+  field: string;
+  header: string;
+}
+
+interface IBaseColumnManagerProps {
+  /** Optional title for the column management panel */
+  title?: string;
+  /** Show column management panel */
+  isVisible: boolean;
+  /** Allow user to reorder columns */
+  isSortable: boolean;
+  /** Optional Name of the column layout being managed */
+  name?: string;
+  /** Use standard service for getting and setting columns */
+  useStandardService?: boolean;
+  /** List of column names that cannot be hidden */
+  columnsNotToHide?: string[];
+  /** Optional list of headers to update */
+  headersToUpdate?: IHeaderTypeUpdate[];
+  /** Function to get the current list of columns */
+  getColumns: IMappedColumn[];
+  /** Function to get the default list of columns */
+  getDefaultColumns?: IMappedColumn[];
+  /** Optional callback to return the current default columns */
+  returnDefaultColumns?: (columns: IMappedColumn[]) => void;
+  /** Optional custom header to display above the data grid */
+  dataGridHeader?: () => React.ReactElement<any, string | React.JSXElementConstructor<any>>;
+  /** Optional extra columns to display in the data grid */
+  dataGridExtraColumns?: () => JSX.Element[];
+  /** Optional callback fired after data is loaded */
+  onLoadData?: () => void;
+  /** Callback fired when user applies column changes */
+  onApply: (columns: IMappedColumn[]) => void;
+  /** Callback fired when user cancels column management */
+  onCancel: () => void;
+}
+
+/** BaseColumnManager provides the UI component for managing a list of IMappedColumn */
+const BaseColumnManager: React.FC<IBaseColumnManagerProps> = (props: IBaseColumnManagerProps) => {
+  const {
+    title,
+    isVisible,
+    isSortable,
+    name,
+    useStandardService,
+    columnsNotToHide,
+    headersToUpdate,
+    getColumns,
+    getDefaultColumns,
+    returnDefaultColumns,
+    dataGridHeader,
+    dataGridExtraColumns,
+    onLoadData,
+    onApply,
+    onCancel
+  } = props;
+  const [defaultColumns, setDefaultColumns] = useState<IMappedColumn[]>([]);
+  const [layoutColumns, setLayoutColumns] = useState<IMappedColumn[]>([]);
+
+  const setLayoutColumnState = (columns: IMappedColumn[]) => {
+    if ((headersToUpdate?.length ?? 0) !== 0) {
+      const updatedColumns = columns.map((col) => {
+        const headerUpdate = headersToUpdate?.find((header) => header.field === col.name);
+        if (headerUpdate) {
+          col.heading = headerUpdate.header;
+        }
+        return col;
+      });
+      columns = Array.from(updatedColumns);
+    }
+    setLayoutColumns(columns);
+    if (getDefaultColumns && defaultColumns.length === 0) {
+      setDefaultColumns(getDefaultColumns);
+    }
+    if (defaultColumns.length === 0) {
+      setDefaultColumns(columns.map((col) => ({ ...col, isHidden: false })));
+    }
+  };
+
+  const loadColumns = async () => {
+    const columns = JSON.parse(JSON.stringify(getColumns));
+    setLayoutColumnState(columns);
+    onLoadData && onLoadData();
+  };
+
+  useEffect(() => {
+    if (isVisible) {
+      loadColumns();
+    }
+  }, [isVisible]);
+
+  const updateDefaultColumns = async (name: string) => {
+    const passedColumns = JSON.parse(JSON.stringify(getColumns));
+    // use standard service to get column layout
+    await baseColumnManagerService
+      .getColumnList(name)
+      .then((columns) => {
+        const mergedColumns: IMappedColumn[] = JSON.parse(JSON.stringify(columns));
+        passedColumns.forEach((col: IMappedColumn) => {
+          const match = columns.find((c: IMappedColumn) => c.name === col.name);
+          if (!match) {
+            mergedColumns.push({ ...col });
+          }
+        });
+        mergedColumns.forEach((col: IMappedColumn) => {
+          const match = passedColumns.find((c: IMappedColumn) => c.name === col.name);
+          if (!match) {
+            col.index = undefined;
+          }
+        });
+        const sortedColumns = mergedColumns.filter((col: IMappedColumn) => col.index !== undefined).sort((a: IMappedColumn, b: IMappedColumn) => (a.index ?? 0) - (b.index ?? 0));
+        setLayoutColumnState(sortedColumns);
+        if (returnDefaultColumns) {
+          returnDefaultColumns(columns);
+        }
+      })
+      .catch(() => {
+        setLayoutColumnState(passedColumns);
+      });
+  };
+
+  useEffect(() => {
+    if (useStandardService && name) {
+      updateDefaultColumns(name);
+    }
+  }, [useStandardService, name]);
+
+  const handleResetColumns = async () => {
+    if (defaultColumns.length > 0) {
+      setLayoutColumns(defaultColumns.map((col) => ({ ...col, isHidden: false })));
+    }
+  };
+
+  const handleCancel = () => {
+    onCancel();
+  };
+
+  const handleApply = async () => {
+    if (name && useStandardService) {
+      // use standard service to save column layout
+      await baseColumnManagerService.setColumnList(name, layoutColumns);
+    }
+    onApply(layoutColumns);
+  };
+
+  const handleHideOrShow = async (row: IMappedColumn) => {
+    const cols = layoutColumns.slice();
+    const idx = layoutColumns.findIndex((col) => col.index === row.index);
+    cols[idx].isHidden = !row.isHidden;
+    setLayoutColumns(cols);
+  };
+
+  const renderIsHidden = (rowData: any) => {
+    const tooltipTitle = rowData.isHidden ? 'Show Column' : 'Hide Column';
+    const btnIcon = rowData.isHidden ? <EyeInvisibleIcon /> : <EyeIcon />;
+    return !rowData.isLocked && !columnsNotToHide?.includes(rowData.name) ? (
+      <Tooltip title={tooltipTitle} placement='left'>
+        <Button type='link' icon={btnIcon} onClick={() => handleHideOrShow(rowData)} />
+      </Tooltip>
+    ) : (
+      <></>
+    );
+  };
+
+  const renderCustomHeader = (): React.ReactElement<any, string | React.JSXElementConstructor<any>> => {
+    return dataGridHeader ? dataGridHeader() : <></>;
+  };
+
+  const renderDataGrid = (): React.ReactElement<any, string | React.JSXElementConstructor<any>> => {
+    if (layoutColumns.length === 0 && defaultColumns.length > 0) {
+      setLayoutColumns(defaultColumns);
+    }
+    const dataColumns = layoutColumns;
+    const gridCols = [
+      <DataGrid.RowNumber key='rowNumber' />,
+      <DataGrid.Column key='heading' field='heading' header='Column Name' width={144} />,
+      <DataGrid.Column key='isHidden' header='' width={30} body={renderIsHidden} />
+    ];
+    if (dataGridExtraColumns) {
+      gridCols.push(...dataGridExtraColumns());
+    }
+    return isSortable ? (
+      <DataGrid
+        value={dataColumns}
+        density='dense'
+        onRowReorder={(e) => {
+          if (e.value[0].isLocked) {
+            setLayoutColumns(e.value);
+          }
+        }}
+        showRowReorderElement={(row) => !row.isLocked}
+      >
+        {gridCols}
+      </DataGrid>
+    ) : (
+      <DataGrid value={dataColumns} density='dense'>
+        {gridCols}
+      </DataGrid>
+    );
+  };
+
+  return (
+    <Drawer
+      title={title ?? 'Manage Columns'}
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          {getDefaultColumns ||
+            (returnDefaultColumns ? (
+              <Button type='tertiary' onClick={handleResetColumns} disabled={defaultColumns.length === 0 && !getDefaultColumns}>
+                Reset Columns
+              </Button>
+            ) : (
+              <>&nbsp;</>
+            ))}
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApply}>
+              Save
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={isVisible}
+      onClose={handleCancel}
+      removeBodyPadding
+    >
+      {renderCustomHeader()}
+      {renderDataGrid()}
+    </Drawer>
+  );
+};
+
+export default BaseColumnManager;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/ColumnManager/data/baseColumnManagerService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/ColumnManager/data/baseColumnManagerService.ts
new file mode 100644
index 0000000..a6b65d5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/ColumnManager/data/baseColumnManagerService.ts
@@ -0,0 +1,15 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IMappedColumn } from '../../IMappedColumn';
+
+const { httpGet, httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'mapped-columns';
+
+export const baseColumnManagerService = {
+  setColumnList: async (name: string, columns: IMappedColumn[]): Promise<void> => {
+    return await httpPost(`${url}/set-column-list`, { name, columns });
+  },
+
+  getColumnList: async (name: string): Promise<IMappedColumn[]> => {
+    return await httpGet<IMappedColumn[]>(`${url}/column-list?name=${name}`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/ContinuousImprovementExtensions.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/ContinuousImprovementExtensions.tsx
new file mode 100644
index 0000000..e29cbb7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/ContinuousImprovementExtensions.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import Tooltip from '@strata/tempo/lib/tooltip';
+import Text from '@strata/tempo/lib/text';
+import Tag from '@strata/tempo/lib/tag';
+import Spacing from '@strata/tempo/lib/spacing';
+
+const BETA_MESSAGE =
+  'This page is in Beta testing, the development stage when a feature is near completion. To ensure that this page aligns with your business needs, please share your feedback and report any issues.';
+
+export const getBetaTitle = (title: string) => {
+  return (
+    <Spacing itemSpacing={12}>
+      <Text.Heading level={1}>{title}</Text.Heading>
+      <Tooltip title={BETA_MESSAGE}>
+        <>
+          <Tag color='blue-700'>BETA</Tag>
+        </>
+      </Tooltip>
+    </Spacing>
+  );
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterBar.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterBar.tsx
new file mode 100644
index 0000000..d3140b6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterBar.tsx
@@ -0,0 +1,231 @@
+/* eslint-disable @typescript-eslint/no-empty-function */
+import Button from '@strata/tempo/lib/button/Button';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import FilterIcon from '@strata/tempo/lib/icon/FilterIcon';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import dayjs from 'dayjs';
+import React, { useEffect, useState } from 'react';
+import { peerGroupService } from '../../../configuration/tabs/data/peerGroupService';
+import RefinementOptionsDrawer from '../../../exploration/components/RefinementOptionsDrawer';
+import IExclusionCriteria, { ExclusionCriteriaType, getExclusionCriteriaNameByType, TopNField } from '../../../exploration/data/IExclusionCriteria';
+import IFilter from '../../../exploration/data/IFilter';
+import { defaultPeerGroupFilter, IPeerGroupFilters } from '../../configuration/IPeerGroupFilters';
+import { IPickerItem } from '../../data/IPickerItem';
+import { useFeatureFlags } from '../../featureFlag/FeatureFlagContext';
+import { useClientScopedSessionStorage } from '../../hooks/useClientScopedSessionStorage';
+import { ChipKey, IFilterChipItem, newFilterChipItem } from './data/IFilterChipItem';
+import FilterChip from './FilterChip';
+
+export interface IFilterBarProps {
+  filterId: string;
+  isFilterReadOnly: boolean;
+  filterChips: IFilterChipItem[];
+  excludedChips: ChipKey[];
+  hiddenChips: ChipKey[];
+  dateStart: dayjs.Dayjs;
+  dateEnd: dayjs.Dayjs;
+  exclusionCriteria: IExclusionCriteria;
+  expandableLevels?: IPickerItem[];
+  expandedLevelPos?: number;
+  setExpandedLevelPos?: (levelPos: number) => void;
+  onApply?: (drawerExclusionCriteria: IExclusionCriteria, drawerFilters: IFilter) => void;
+  onChangeEncounters?: (resolve: any) => void;
+  onPeerGroupFiltersChange?: (filters: IPeerGroupFilters) => void;
+  hideTopNFilter?: boolean;
+}
+
+const FilterBar: React.FC<IFilterBarProps> = (props) => {
+  const {
+    filterId,
+    isFilterReadOnly,
+    filterChips,
+    excludedChips,
+    hiddenChips,
+    dateStart,
+    dateEnd,
+    exclusionCriteria,
+    expandableLevels,
+    expandedLevelPos,
+    setExpandedLevelPos,
+    onApply,
+    onChangeEncounters,
+    onPeerGroupFiltersChange,
+    hideTopNFilter
+  } = props;
+  const [filterChipItems, setFilterChipItems] = useState<IFilterChipItem[]>(filterChips ?? []);
+  const [selectedPeerGroupId, setSelectedPeerGroupId] = useState<number>(0);
+  const [peerGroups, setPeerGroups] = useState<IPeerGroupFilters[]>([]);
+  const [refinementOptionsVisible, setRefinementOptionsVisible] = useState<boolean>(false);
+  const [hasBenchmarking, setHasBenchmarking] = useState<boolean>(false);
+  const [dateRange, setDateRange] = useState<[dayjs.Dayjs, dayjs.Dayjs]>([dayjs(), dayjs()]);
+
+  const [peerGroupFilters] = useClientScopedSessionStorage('peerGroupFilters', defaultPeerGroupFilter);
+
+  const featureFlags = useFeatureFlags();
+
+  useEffect(() => {
+    if (featureFlags.isEnabled && !featureFlags.loading) {
+      const isBenchmarking = featureFlags.isEnabled('cibenchmarkingenabled');
+      setHasBenchmarking(isBenchmarking);
+
+      if (isBenchmarking) {
+        peerGroupService.getGroups().then((data) => {
+          setPeerGroups(data);
+          const peerGroupId = peerGroupFilters.peerGroupId;
+          const peerGroup = data.find((item) => item.peerGroupId === peerGroupId);
+          setSelectedPeerGroupId(peerGroup ? peerGroupId : defaultPeerGroupFilter.peerGroupId);
+          onPeerGroupFiltersChange && onPeerGroupFiltersChange(peerGroup ?? defaultPeerGroupFilter);
+        });
+      }
+    }
+  }, [featureFlags, onPeerGroupFiltersChange]);
+
+  useEffect(() => {
+    setFilterChipItems(filterChips);
+    if (exclusionCriteria.losExclusionType !== ExclusionCriteriaType.None || exclusionCriteria.losExclusionValue !== 0) {
+      const losExclusionCriteriaName = getExclusionCriteriaNameByType(exclusionCriteria.losExclusionType, exclusionCriteria.losExclusionValue);
+      const losExclusionCriteriaChip = newFilterChipItem(ChipKey.LengthOfStay, 'Length of Stay');
+      losExclusionCriteriaChip.filters = [
+        {
+          id: losExclusionCriteriaName,
+          displayText: losExclusionCriteriaName
+        }
+      ];
+      setFilterChipItems((prevItems) => [...prevItems, losExclusionCriteriaChip]);
+    }
+
+    if (exclusionCriteria.costExclusionType !== ExclusionCriteriaType.None || exclusionCriteria.costExclusionValue !== 0) {
+      const costExclusionCriteriaName = getExclusionCriteriaNameByType(exclusionCriteria.costExclusionType, exclusionCriteria.costExclusionValue);
+      const costExclusionCriteriaChip = newFilterChipItem(ChipKey.VariableDirectCost, 'Variable Direct Cost');
+      costExclusionCriteriaChip.filters = [
+        {
+          id: costExclusionCriteriaName,
+          displayText: costExclusionCriteriaName
+        }
+      ];
+      setFilterChipItems((prevItems) => [...prevItems, costExclusionCriteriaChip]);
+    }
+
+    if (exclusionCriteria.topN && exclusionCriteria.topNField) {
+      const topNFieldLabels: Record<TopNField, string> = {
+        [TopNField.EncounterVolume]: 'Encounter Volume',
+        [TopNField.CostOeRatio]: 'O/E Variable Direct Cost',
+        [TopNField.IdentifiedVariation]: 'Cost Driver Identified Variation'
+      };
+      const topNDisplayText = `Top ${exclusionCriteria.topN} (${topNFieldLabels[exclusionCriteria.topNField]})`;
+      const topNChip = newFilterChipItem(ChipKey.TopN, 'Top N');
+      topNChip.filters = [{ id: topNDisplayText, displayText: topNDisplayText }];
+      setFilterChipItems((prevItems) => [...prevItems, topNChip]);
+    }
+  }, [refinementOptionsVisible, exclusionCriteria, filterChips]);
+
+  useEffect(() => {
+    let startDate = dateStart;
+    let endDate = dateEnd;
+    if (typeof dateStart === 'string') {
+      startDate = dayjs(dateStart);
+    }
+    if (typeof dateEnd === 'string') {
+      endDate = dayjs(dateEnd);
+    }
+    setDateRange([startDate, endDate]);
+  }, [dateStart, dateEnd, refinementOptionsVisible]);
+
+  const handleChipClick = (chipId: React.Key) => {
+    setRefinementOptionsVisible(true);
+  };
+
+  const changePeerGroup = (peerGroupId: number) => {
+    setSelectedPeerGroupId(peerGroupId);
+    // Always pass a new object to trigger parent reload, even if peerGroupId is unchanged
+    const selectedPeerGroup = [defaultPeerGroupFilter, ...peerGroups].find((item) => item.peerGroupId === peerGroupId);
+    const nextPeerGroup = selectedPeerGroup ?? defaultPeerGroupFilter;
+    onPeerGroupFiltersChange && onPeerGroupFiltersChange({ ...nextPeerGroup });
+
+    // O/E Variable Direct Cost requires a peer group. Clear the Top N filter if it was set to O/E
+    // and the user deselected the peer group, since the option will no longer be available.
+    if (peerGroupId === defaultPeerGroupFilter.peerGroupId && exclusionCriteria.topNField === TopNField.CostOeRatio) {
+      onApply && onApply({ ...exclusionCriteria, topNField: null, topN: null }, { filterChipItems: filterChips });
+    }
+  };
+
+  return (
+    <>
+      <div
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          minHeight: '60px',
+          padding: '8px 24px',
+          backgroundColor: '#fff',
+          borderBottom: '1px solid #ddd',
+          whiteSpace: 'nowrap',
+          overflowX: 'auto'
+        }}
+      >
+        <Spacing width={'100%'}>
+          <Spacing hAlign='left' width={'100%'} itemSpacing={8}>
+            <Button
+              disabled={isFilterReadOnly}
+              onClick={() => {
+                setRefinementOptionsVisible(true);
+              }}
+              icon={<FilterIcon />}
+            >
+              Refinement Options
+            </Button>
+            <FilterChip
+              filters={filterChipItems ?? ([] as IFilterChipItem[])}
+              activeFilterId={''}
+              disabledChips={isFilterReadOnly ? filterChipItems.map((item) => item.key) : excludedChips}
+              hiddenChips={hiddenChips}
+              dateStart={dateRange[0]}
+              dateEnd={dateRange[1]}
+              onChipClick={handleChipClick}
+              onChipDelete={() => {}}
+              onOpenChange={() => {}}
+              onFilterChange={() => {}}
+              isReadOnly
+            />
+          </Spacing>
+          <Spacing itemSpacing={12} vAlign='center'>
+            {expandableLevels && <DropDown width={160} items={expandableLevels} value={expandedLevelPos} onChange={(value) => setExpandedLevelPos && setExpandedLevelPos(value as number)} />}
+            {hasBenchmarking && peerGroups.length > 0 && (
+              <Spacing itemSpacing={8} vAlign='center' hAlign='space-between'>
+                <Text strong>Peer Group Selection</Text>
+                <DropDown
+                  value={selectedPeerGroupId}
+                  items={[defaultPeerGroupFilter, ...peerGroups]?.map((item) => {
+                    return { value: item.peerGroupId, text: item.name };
+                  })}
+                  width={200}
+                  onChange={(value) => changePeerGroup(value as number)}
+                />
+              </Spacing>
+            )}
+          </Spacing>
+        </Spacing>
+      </div>
+      <RefinementOptionsDrawer
+        isVisible={refinementOptionsVisible}
+        filterId={filterId}
+        filterChips={filterChips}
+        excludedChips={excludedChips}
+        hiddenChips={hiddenChips}
+        dateRange={dateRange}
+        exclusionCriteria={exclusionCriteria}
+        hasBenchmarking={hasBenchmarking && selectedPeerGroupId !== 0}
+        onClose={() => {
+          setRefinementOptionsVisible(false);
+        }}
+        onApply={onApply}
+        setDateRange={setDateRange}
+        onChangeEncounters={onChangeEncounters}
+        hideTopNFilter={hideTopNFilter}
+      ></RefinementOptionsDrawer>
+    </>
+  );
+};
+
+export default FilterBar;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChip.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChip.tsx
new file mode 100644
index 0000000..35f7ae5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChip.tsx
@@ -0,0 +1,414 @@
+import { ScoreMemberTreeModal } from '@strata/score/lib/ScoreMemberTreeModal';
+import Button from '@strata/tempo/lib/button/Button';
+import Chip from '@strata/tempo/lib/chips/Chip';
+import Chips, { IChip } from '@strata/tempo/lib/chips/Chips';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import Popover from '@strata/tempo/lib/popover';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import useToast from '@strata/tempo/lib/toast/useToast';
+import { ITreeNode } from '@strata/tempo/lib/tree/Tree';
+import dayjs from 'dayjs';
+import React, { useEffect, useState } from 'react';
+import { ChipKey, ChipType, IFilterChipItem, OperatorType } from './data/IFilterChipItem';
+import FilterChipBooleanModal from './FilterChipBooleanModal';
+import FilterChipCostComponentModal from './FilterChipCostComponentModal';
+import FilterChipCostDriverModal from './FilterChipCostDriverModal';
+import FilterChipPopover from './FilterChipPopover';
+import FilterChipRomSoiModal from './FilterChipRomSoiModal';
+import FilterChipSphCriteriaModal from './FilterChipSphCriteriaModal';
+import FilterChipSupplyModal from './FilterChipSupplyModal';
+
+export interface IFilterChipProps {
+  filters: IFilterChipItem[];
+  activeFilterId?: React.Key;
+  disabledChips: ChipKey[];
+  hiddenChips: ChipKey[];
+  dateStart: dayjs.Dayjs;
+  dateEnd: dayjs.Dayjs;
+  isReadOnly: boolean;
+  onChipDelete: (chipId: React.Key) => void;
+  onChipClick: (chipId: React.Key) => void;
+  onOpenChange: (isOpen: boolean) => void;
+  onFilterChange: (filters: IFilterChipItem) => void;
+}
+
+const FilterChip: React.FC<IFilterChipProps> = (props: IFilterChipProps) => {
+  const { filters, activeFilterId, disabledChips, hiddenChips, dateStart, dateEnd, isReadOnly, onChipDelete, onChipClick, onOpenChange, onFilterChange } = props;
+
+  const [activeFilter, setActiveFilter] = useState<IFilterChipItem>({} as IFilterChipItem);
+  const [isModalVisible, setIsModalVisible] = useState<boolean>(false);
+  const [selectedNodes, setSelectedNodes] = useState<ITreeNode[]>();
+
+  const toast = useToast();
+
+  useEffect(() => {
+    if (activeFilterId) {
+      clearChip();
+      const activeFilter = filters.find((f) => f.key === activeFilterId);
+      setActiveFilter(activeFilter ?? ({} as IFilterChipItem));
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [activeFilterId, filters]);
+
+  // #region Chip Management
+
+  const handleChipDelete = (chipId: React.Key) => {
+    const onDelete = () => {
+      const filter = filters.find((f) => f.key === chipId);
+      if (filter) {
+        filter.filters = [];
+        setActiveFilter(filter);
+      }
+      clearChip();
+      onChipDelete(chipId);
+    };
+
+    onDelete();
+  };
+
+  const handleChipClick = (chipId: React.Key) => {
+    const filter = filters.find((f) => f.key === chipId);
+    if (filter) {
+      setActiveFilter(filter);
+      setSelectedNodes(filter.filters.map((node) => ({ key: node.id, title: node.displayText } as ITreeNode)) ?? []);
+    }
+    onChipClick(chipId);
+  };
+
+  const handleChipClear = () => {
+    const filterOperator = OperatorType.In as OperatorType;
+    const newFilter = { ...activeFilter, filters: [], operator: filterOperator, isSelected: undefined };
+    setSelectedNodes(undefined);
+    setActiveFilter(newFilter);
+  };
+
+  const handleSearchClick = (chipId: React.Key, isCleared: boolean) => {
+    let filter = activeFilter;
+    if (!activeFilter || activeFilter.key !== chipId) {
+      filter = filters.find((f) => f.key === chipId) ?? ({} as IFilterChipItem);
+      setActiveFilter(filter);
+    }
+    if (isCleared) {
+      setSelectedNodes(undefined);
+    } else {
+      setSelectedNodes(
+        filter.filters
+          ? filter.filters.map(
+              (c) =>
+                ({
+                  key: c.id,
+                  title: c.displayText
+                } as ITreeNode)
+            )
+          : undefined
+      );
+    }
+
+    setIsModalVisible(true);
+  };
+
+  // #endregion
+
+  // #region Popover Select/Apply methods
+  const handleValuesSelect = (nodesSelected: ITreeNode[] | undefined) => {
+    if (!nodesSelected || nodesSelected.length === 0) {
+      toast.show({ message: activeFilter.chipType === ChipType.boolean ? 'Select a value.' : 'Select at least one value.', toastType: 'info' });
+      return false;
+    }
+
+    const newFilter = {
+      ...activeFilter,
+      filters: nodesSelected.map((n) => ({ id: n.key, displayText: n.title })),
+      isSelected: activeFilter.chipType === ChipType.boolean ? nodesSelected.findIndex((n) => n.title === 'Yes') !== -1 : undefined
+    };
+
+    setSelectedNodes(
+      newFilter.filters
+        ? newFilter.filters.map(
+            (c) =>
+              ({
+                key: c.id,
+                title: c.displayText
+              } as ITreeNode)
+          )
+        : []
+    );
+    setActiveFilter(newFilter);
+    setIsModalVisible(false);
+  };
+
+  const handleApply = () => {
+    if (!activeFilter.filters || activeFilter.filters.length === 0) {
+      toast.show({ message: activeFilter.chipType === ChipType.boolean ? 'Select a value.' : 'Select at least one value.', toastType: 'info' });
+      return;
+    }
+
+    handleClose();
+
+    onFilterChange(activeFilter);
+  };
+
+  const handleModalClose = () => {
+    setIsModalVisible(false);
+    setSelectedNodes(undefined);
+  };
+
+  const handleTreeClose = () => {
+    setIsModalVisible(false);
+    setSelectedNodes(undefined);
+  };
+
+  // #endregion
+
+  const handleActiveFilterChange = (newFilter: IFilterChipItem) => {
+    setSelectedNodes(
+      newFilter.filters
+        ? newFilter.filters.map(
+            (c) =>
+              ({
+                key: c.id,
+                title: c.displayText
+              } as ITreeNode)
+          )
+        : undefined
+    );
+    setActiveFilter(newFilter);
+  };
+
+  const handleClose = () => {
+    clearChip();
+    onOpenChange(false);
+  };
+
+  const clearChip = async () => {
+    setSelectedNodes(undefined);
+    setActiveFilter({} as IFilterChipItem);
+  };
+
+  const handleOpenChange = (open: boolean, filter: IFilterChipItem) => {
+    if (open) {
+      setSelectedNodes(
+        filter.filters
+          ? filter.filters.map(
+              (c) =>
+                ({
+                  key: c.id,
+                  title: c.displayText
+                } as ITreeNode)
+            )
+          : undefined
+      );
+    }
+    onOpenChange(open);
+  };
+
+  const renderChipName = (filter: IFilterChipItem) => {
+    const amountOfShownValues = 1;
+    const filterValues = filter.filters;
+    if (!filterValues || filterValues.length === 0) {
+      return <Text strong>{filter.label}</Text>;
+    }
+    if (filter.chipType === ChipType.boolean) {
+      return (
+        <>
+          <Text strong>{filter.label}</Text>
+          {filter.operator === OperatorType.In ? ': ' : ': not in '}
+          {filterValues.map((f) => f.displayText).join(', ')}
+        </>
+      );
+    } else {
+      return (
+        <>
+          <Text strong>{filter.label}</Text>
+          <Text>
+            {filter.operator === OperatorType.In ? ': ' : ': not in '}
+            {filterValues.length <= amountOfShownValues ? filterValues.map((f) => f.displayText) : `${filterValues[0].displayText}, +${filterValues.length - amountOfShownValues}`}
+          </Text>
+        </>
+      );
+    }
+  };
+
+  const renderChipTooltip = (filter: IFilterChipItem) => {
+    const amountOfShownValues = 5;
+    const firstNElements = filter.filters.slice(0, amountOfShownValues);
+    return (
+      <>
+        <Text color='white' strong>
+          {filter.label}
+        </Text>
+        <Text color='white'>
+          {' : '}
+          {firstNElements &&
+            firstNElements.length !== 0 &&
+            firstNElements.map((item) => (
+              <div key={item.displayText}>
+                {item.displayText}
+                {firstNElements.lastIndexOf(item) !== firstNElements.length - 1 ? ', ' : ''}
+              </div>
+            ))}
+          {filter.filters.length > amountOfShownValues && <div key=''>+ {filter.filters.length - amountOfShownValues} more</div>}
+        </Text>
+      </>
+    );
+  };
+
+  const getSelectedKeys = () => selectedNodes?.map((node) => node.key);
+
+  const getFilterChipModal = (chipType: ChipType) => {
+    switch (chipType) {
+      case ChipType.sphCriteria:
+        return (
+          <FilterChipSphCriteriaModal
+            chipKey={activeFilter.key}
+            defaultCheckedKeys={getSelectedKeys()}
+            defaultSelectedKeys={getSelectedKeys()}
+            onCancel={handleTreeClose}
+            onOk={handleValuesSelect}
+            title={activeFilter.label}
+            visible={isModalVisible && activeFilter.chipType === ChipType.sphCriteria}
+          />
+        );
+      case ChipType.boolean:
+        return (
+          <FilterChipBooleanModal
+            defaultCheckedKeys={getSelectedKeys()}
+            defaultSelectedKeys={getSelectedKeys()}
+            onCancel={handleTreeClose}
+            onOk={handleValuesSelect}
+            title={activeFilter.label}
+            visible={isModalVisible && activeFilter.chipType === ChipType.boolean}
+          />
+        );
+      case ChipType.special:
+        return (
+          <FilterChipRomSoiModal
+            defaultCheckedKeys={getSelectedKeys()}
+            defaultSelectedKeys={getSelectedKeys()}
+            onCancel={handleTreeClose}
+            onOk={handleValuesSelect}
+            title={activeFilter.label}
+            visible={isModalVisible && activeFilter.chipType === ChipType.special}
+          />
+        );
+      case ChipType.costDriver:
+        return (
+          <FilterChipCostDriverModal
+            defaultCheckedKeys={getSelectedKeys()}
+            defaultSelectedKeys={getSelectedKeys()}
+            onCancel={handleTreeClose}
+            onOk={handleValuesSelect}
+            title={activeFilter.label}
+            visible={isModalVisible && activeFilter.chipType === ChipType.costDriver}
+          />
+        );
+      case ChipType.supply:
+        return (
+          <FilterChipSupplyModal
+            defaultCheckedKeys={getSelectedKeys()}
+            defaultSelectedKeys={getSelectedKeys()}
+            onCancel={handleTreeClose}
+            onOk={handleValuesSelect}
+            title={activeFilter.label}
+            visible={isModalVisible && activeFilter.chipType === ChipType.supply}
+          />
+        );
+      case ChipType.costComponent:
+        return (
+          <FilterChipCostComponentModal
+            defaultCheckedKeys={getSelectedKeys()}
+            defaultSelectedKeys={getSelectedKeys()}
+            onCancel={handleTreeClose}
+            onOk={handleValuesSelect}
+            title={activeFilter.label}
+            visible={isModalVisible && activeFilter.chipType === ChipType.costComponent}
+          />
+        );
+      case ChipType.dateRange:
+      default:
+        return <></>;
+    }
+  };
+
+  return (
+    <>
+      <Chips onDelete={(chip: IChip) => handleChipDelete(chip.id)}>
+        {filters.map((filter) =>
+          hiddenChips.includes(filter.key) ? (
+            <></>
+          ) : (
+            <Popover
+              key={filter.key}
+              title={
+                <Spacing>
+                  <Spacing width={'80%'}>
+                    <Text.Heading level={3}>{filter.label}</Text.Heading>
+                  </Spacing>
+                  {filter.chipType !== ChipType.dateRange ? (
+                    <Spacing width={'20%'} hAlign='right'>
+                      <Button onClick={() => handleChipDelete(filter.key)} type='link' icon={<DeleteIcon />}>
+                        Delete
+                      </Button>
+                    </Spacing>
+                  ) : (
+                    <></>
+                  )}
+                </Spacing>
+              }
+              trigger='click'
+              open={filter.key === activeFilterId && !isModalVisible}
+              onOpenChange={(open: boolean) => handleOpenChange(open, filter)}
+              content={
+                <FilterChipPopover
+                  activeFilter={activeFilter}
+                  dateStart={dateStart}
+                  dateEnd={dateEnd}
+                  onActiveFilterChange={handleActiveFilterChange}
+                  onChipClear={handleChipClear}
+                  onSearch={(chipId, isCleared) => handleSearchClick(filter.key, isCleared)}
+                  onClose={handleClose}
+                  onApply={handleApply}
+                />
+              }
+            >
+              <Chip
+                id={filter.key}
+                disabled={disabledChips.includes(filter.key)}
+                tooltip={renderChipTooltip(filter)}
+                name={renderChipName(filter)}
+                active={filter.key === activeFilterId}
+                onDelete={
+                  filter.chipType !== ChipType.dateRange && !isReadOnly && !filter.isReadOnly // exclude readOnly benchmark chips
+                    ? handleChipDelete
+                    : undefined
+                }
+                onClick={handleChipClick}
+              />
+            </Popover>
+          )
+        )}
+      </Chips>
+      {activeFilter.chipType === ChipType.scoreMember ? (
+        <ScoreMemberTreeModal
+          key={`score-member-${isModalVisible}`} // reset modal state when opening different filter
+          checkStrictly={true}
+          defaultCheckedKeys={getSelectedKeys()}
+          defaultSelectedKeys={getSelectedKeys()}
+          dimensionGuidOrGlobalId={activeFilter.globalId}
+          height={300}
+          onCancel={handleModalClose}
+          onOk={handleValuesSelect}
+          selectionMode='multiple'
+          hierarchyGuid={activeFilter.hierarchy}
+          title={activeFilter.label}
+          visible={isModalVisible && activeFilter.chipType === ChipType.scoreMember}
+        />
+      ) : (
+        getFilterChipModal(activeFilter.chipType)
+      )}
+    </>
+  );
+};
+
+export default FilterChip;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipBooleanModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipBooleanModal.tsx
new file mode 100644
index 0000000..027e2c3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipBooleanModal.tsx
@@ -0,0 +1,28 @@
+import { ITreeNode } from '@strata/tempo/lib/tree/Tree';
+import React from 'react';
+import FilterChipPickerTreeBase, { IFilterChipPickerTreeBaseProps } from './FilterChipPickerTreeBase';
+
+const FilterChipBooleanModal: React.FC<IFilterChipPickerTreeBaseProps> = ({ title, visible, defaultCheckedKeys, defaultSelectedKeys, onCancel, onOk }: IFilterChipPickerTreeBaseProps) => {
+  const handleCancel = (e: React.MouseEvent<HTMLElement | MouseEvent>) => onCancel(e);
+
+  const handleOk = (selectedNodes: ITreeNode[] | undefined) => onOk(selectedNodes);
+
+  return (
+    <FilterChipPickerTreeBase
+      title={title}
+      visible={visible}
+      defaultCheckedKeys={defaultCheckedKeys}
+      defaultSelectedKeys={defaultSelectedKeys}
+      height={300}
+      selectionMode='single'
+      options={[
+        { key: '0', title: 'No' },
+        { key: '1', title: 'Yes' }
+      ]}
+      onCancel={handleCancel}
+      onOk={handleOk}
+    />
+  );
+};
+
+export default FilterChipBooleanModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipCostComponentModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipCostComponentModal.tsx
new file mode 100644
index 0000000..5f2ec44
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipCostComponentModal.tsx
@@ -0,0 +1,42 @@
+import React, { useEffect, useState } from 'react';
+import FilterChipPickerTreeBase, { IFilterChipPickerTreeBaseProps } from './FilterChipPickerTreeBase';
+import { ITreeNode } from '@strata/tempo/lib/tree/Tree';
+import { filterService } from './data/filterService';
+import { usePageLoader } from '@strata/tempo/lib/pageloader';
+
+const FilterChipCostComponentModal: React.FC<IFilterChipPickerTreeBaseProps> = ({ title, visible, defaultCheckedKeys, defaultSelectedKeys, onCancel, onOk }: IFilterChipPickerTreeBaseProps) => {
+  const handleCancel = (e: React.MouseEvent<HTMLElement | MouseEvent>) => onCancel(e);
+  const handleOk = (selectedNodes: ITreeNode[] | undefined) => onOk(selectedNodes);
+  const [costComponentFilters, setCostComponentFilters] = useState<ITreeNode[]>();
+  const { setLoading } = usePageLoader();
+
+  useEffect(() => {
+    const loadData = async () => {
+      setLoading(true);
+      try {
+        const costComponentFilter = await filterService.getCostComponentFilters();
+        setCostComponentFilters(costComponentFilter);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    loadData();
+  }, [setLoading]);
+
+  return (
+    <FilterChipPickerTreeBase
+      title={title}
+      visible={visible}
+      defaultCheckedKeys={defaultCheckedKeys}
+      defaultSelectedKeys={defaultSelectedKeys}
+      height={300}
+      selectionMode='multiple'
+      options={costComponentFilters}
+      onCancel={handleCancel}
+      onOk={handleOk}
+    />
+  );
+};
+
+export default FilterChipCostComponentModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipCostDriverModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipCostDriverModal.tsx
new file mode 100644
index 0000000..061dc3d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipCostDriverModal.tsx
@@ -0,0 +1,42 @@
+import React, { useEffect, useState } from 'react';
+import FilterChipPickerTreeBase, { IFilterChipPickerTreeBaseProps } from './FilterChipPickerTreeBase';
+import { ITreeNode } from '@strata/tempo/lib/tree/Tree';
+import { filterService } from './data/filterService';
+import { usePageLoader } from '@strata/tempo/lib/pageloader';
+
+const FilterChipCostDriverModal: React.FC<IFilterChipPickerTreeBaseProps> = ({ title, visible, defaultCheckedKeys, defaultSelectedKeys, onCancel, onOk }: IFilterChipPickerTreeBaseProps) => {
+  const handleCancel = (e: React.MouseEvent<HTMLElement | MouseEvent>) => onCancel(e);
+  const handleOk = (selectedNodes: ITreeNode[] | undefined) => onOk(selectedNodes);
+  const [costDriverFilters, setcostDriverFilters] = useState<ITreeNode[]>();
+  const { setLoading } = usePageLoader();
+
+  useEffect(() => {
+    const loadData = async () => {
+      setLoading(true);
+      try {
+        const costDriverFilters = await filterService.getCostDriverFilters();
+        setcostDriverFilters(costDriverFilters);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    loadData();
+  }, [setLoading]);
+
+  return (
+    <FilterChipPickerTreeBase
+      title={title}
+      visible={visible}
+      defaultCheckedKeys={defaultCheckedKeys}
+      defaultSelectedKeys={defaultSelectedKeys}
+      height={300}
+      selectionMode='multiple'
+      options={costDriverFilters}
+      onCancel={handleCancel}
+      onOk={handleOk}
+    />
+  );
+};
+
+export default FilterChipCostDriverModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipPickerBase.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipPickerBase.tsx
new file mode 100644
index 0000000..bfb7961
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipPickerBase.tsx
@@ -0,0 +1,146 @@
+import ButtonMenu, { IButtonMenuClickEvent } from '@strata/tempo/lib/buttonmenu/ButtonMenu';
+import BorderIcon from '@strata/tempo/lib/icon/BorderIcon';
+import Input from '@strata/tempo/lib/input/Input';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Tree, { ITreeCheckedKeys, ITreeCheckInfo, ITreeNode, ITreeSelectInfo, Key } from '@strata/tempo/lib/tree/Tree';
+import React, { useEffect, useState } from 'react';
+
+export interface IFilterChipPickerTreeBaseProps {
+  title: string;
+  visible: boolean;
+  defaultCheckedKeys?: Key[];
+  defaultSelectedKeys?: Key[];
+  height?: string | number;
+  selectionMode?: 'multiple' | 'single';
+  options?: ITreeNode[];
+  onCancel: (e: React.MouseEvent<HTMLElement | MouseEvent>) => void;
+  onOk: (treeNodes: ITreeNode[] | undefined) => void;
+}
+
+const FilterChipPickerTreeBase: React.FC<IFilterChipPickerTreeBaseProps> = ({
+  title,
+  visible,
+  defaultCheckedKeys,
+  defaultSelectedKeys,
+  height,
+  selectionMode,
+  options,
+  onCancel,
+  onOk
+}: IFilterChipPickerTreeBaseProps) => {
+  const [pickerData, setPickerData] = useState<ITreeNode[]>([]);
+  const [treeData, setTreeData] = useState<ITreeNode[]>([]);
+  const [checkedKeys, setCheckedKeys] = useState<Key[]>(defaultCheckedKeys ?? []);
+  const [selectedKeys, setSelectedKeys] = useState<Key[]>(defaultCheckedKeys ?? []);
+  const [selectedNodes, setSelectedNodes] = useState<ITreeNode[]>();
+
+  useEffect(() => {
+    const initializePickerList = async () => {
+      if (options) {
+        setSelectedNodes(options.filter((d) => defaultSelectedKeys?.find((k) => k === d.key) !== undefined));
+        setPickerData(options);
+        setTreeData(options);
+      }
+    };
+    if (visible) {
+      initializePickerList();
+    }
+  }, [defaultSelectedKeys, options, visible]);
+
+  const handleCheck = (checkedKeys: Key[] | ITreeCheckedKeys, info: ITreeCheckInfo) => {
+    // get unchecked nodes within active picker view (could be filtered by search)
+    const uncheckedNodes = treeData.filter((node) => !info.checkedNodes.includes(node));
+
+    // filter unchecked nodes from current saved selections
+    let currentSelectedNodes = selectedNodes?.filter((node) => !uncheckedNodes.includes(node)) ?? [];
+
+    // add new selections (take distinct to avoid duplicates)
+    currentSelectedNodes = Array.from(new Set([...currentSelectedNodes, ...info.checkedNodes]));
+    const currentSelectedKeys = currentSelectedNodes.map((node) => node.key);
+
+    // set updated selections
+    setSelectedNodes(currentSelectedNodes);
+    setSelectedKeys(currentSelectedKeys);
+    setCheckedKeys(currentSelectedKeys);
+  };
+
+  const handleSelect = (selectedKeys: Key[], info: ITreeSelectInfo) => {
+    setSelectedNodes([info.node]);
+    setSelectedKeys([info.node].map((node) => node.key));
+  };
+
+  const handleView = (e: IButtonMenuClickEvent) => {
+    if (e.key === '1') {
+      setTreeData(selectedNodes?.slice() ?? []);
+    } else {
+      setTreeData(pickerData);
+    }
+  };
+
+  const handleSearch = (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (e.target.value !== '') {
+      const nodes = pickerData.filter((node) => node.title?.toString().toLocaleLowerCase().includes(e.target.value.toLocaleLowerCase()));
+      setTreeData(nodes);
+    } else {
+      setTreeData(pickerData);
+    }
+  };
+
+  const handleSelectAll = (e: IButtonMenuClickEvent) => {
+    if (e.key === '0') {
+      setSelectedNodes(pickerData.slice());
+      setSelectedKeys(pickerData.map((node) => node.key));
+      setCheckedKeys(pickerData.map((node) => node.key));
+    } else {
+      setCheckedKeys([]);
+      setSelectedKeys([]);
+      setSelectedNodes([]);
+    }
+  };
+
+  const handleCancel = (e: React.MouseEvent<HTMLElement | MouseEvent>) => onCancel(e);
+
+  const handleOk = () => onOk(selectedNodes);
+
+  return (
+    <Modal title={title} visible={visible} onCancel={handleCancel} onOk={handleOk} okText='Save'>
+      <Spacing margin='0 0 16px 0' itemSpacing={12}>
+        {(selectionMode ?? 'multiple') === 'multiple' ? (
+          <ButtonMenu
+            icon={<BorderIcon />}
+            items={[
+              { key: 0, label: 'Select All Results' },
+              { key: 1, label: 'Clear All' }
+            ]}
+            onClick={handleSelectAll}
+          />
+        ) : (
+          <></>
+        )}
+        <Input search onChange={handleSearch} />
+        <ButtonMenu
+          buttonText='View'
+          items={[
+            { key: 0, label: 'All' },
+            { key: 1, label: 'Selected' }
+          ]}
+          onClick={handleView}
+        />
+      </Spacing>
+      <Tree
+        treeData={treeData}
+        selectionMode={selectionMode ?? 'multiple'}
+        height={height ?? 300}
+        defaultCheckedKeys={defaultCheckedKeys}
+        defaultSelectedKeys={defaultSelectedKeys}
+        selectedKeys={selectedKeys}
+        checkedKeys={checkedKeys}
+        onSelect={handleSelect}
+        onCheck={handleCheck}
+      />
+    </Modal>
+  );
+};
+
+export default FilterChipPickerTreeBase;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipPickerTreeBase.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipPickerTreeBase.tsx
new file mode 100644
index 0000000..6913170
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipPickerTreeBase.tsx
@@ -0,0 +1,157 @@
+import ButtonMenu, { IButtonMenuClickEvent } from '@strata/tempo/lib/buttonmenu/ButtonMenu';
+import BorderIcon from '@strata/tempo/lib/icon/BorderIcon';
+import Input from '@strata/tempo/lib/input/Input';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Tree, { ITreeCheckedKeys, ITreeCheckInfo, ITreeNode, ITreeSelectInfo, Key } from '@strata/tempo/lib/tree/Tree';
+import React, { useEffect, useState } from 'react';
+
+export interface IFilterChipPickerTreeBaseProps {
+  title: string;
+  visible: boolean;
+  defaultCheckedKeys?: Key[];
+  defaultSelectedKeys?: Key[];
+  height?: string | number;
+  selectionMode?: 'multiple' | 'single';
+  options?: ITreeNode[];
+  onCancel: (e: React.MouseEvent<HTMLElement | MouseEvent>) => void;
+  onOk: (treeNodes: ITreeNode[] | undefined) => void;
+}
+
+const FilterChipPickerTreeBase: React.FC<IFilterChipPickerTreeBaseProps> = ({
+  title,
+  visible,
+  defaultCheckedKeys,
+  defaultSelectedKeys,
+  height,
+  selectionMode,
+  options,
+  onCancel,
+  onOk
+}: IFilterChipPickerTreeBaseProps) => {
+  const [pickerData, setPickerData] = useState<ITreeNode[]>([]);
+  const [treeData, setTreeData] = useState<ITreeNode[]>([]);
+  const [checkedKeys, setCheckedKeys] = useState<Key[]>(defaultCheckedKeys ?? []);
+  const [selectedKeys, setSelectedKeys] = useState<Key[]>(defaultSelectedKeys ?? []);
+  const [selectedNodes, setSelectedNodes] = useState<ITreeNode[]>();
+
+  // Reset checkedKeys and selectedKeys when defaultCheckedKeys/defaultSelectedKeys change
+  useEffect(() => {
+    setCheckedKeys(defaultCheckedKeys ?? []);
+    setSelectedKeys(defaultSelectedKeys ?? []);
+  }, [defaultCheckedKeys, defaultSelectedKeys]);
+
+  useEffect(() => {
+    const initializePickerList = async () => {
+      if (options) {
+        setSelectedNodes(options.filter((d) => defaultSelectedKeys?.find((k) => k === d.key) !== undefined));
+        setPickerData(options);
+        setTreeData(options);
+      }
+    };
+    if (visible) {
+      initializePickerList();
+    }
+  }, [defaultSelectedKeys, options, visible]);
+
+  const handleCheck = (checkedKeys: Key[] | ITreeCheckedKeys, info: ITreeCheckInfo) => {
+    // get unchecked nodes within active picker view (could be filtered by search)
+    const uncheckedNodes = treeData.filter((node) => !info.checkedNodes.includes(node));
+    treeData.forEach((data) => {
+      data.children?.forEach((ch) => {
+        if (!info.checkedNodes.includes(ch)) uncheckedNodes.push(ch);
+      });
+    });
+    // filter unchecked nodes from current saved selections
+    let currentSelectedNodes = selectedNodes?.filter((node) => !uncheckedNodes.includes(node)) ?? [];
+
+    // add new selections (take distinct to avoid duplicates)
+    currentSelectedNodes = Array.from(new Set([...currentSelectedNodes, ...info.checkedNodes]));
+    const currentSelectedKeys = currentSelectedNodes.map((node) => node.key);
+
+    // set updated selections
+    setSelectedNodes(currentSelectedNodes);
+    setSelectedKeys(currentSelectedKeys);
+    setCheckedKeys(currentSelectedKeys);
+  };
+
+  const handleSelect = (selectedKeys: Key[], info: ITreeSelectInfo) => {
+    setSelectedNodes([info.node]);
+    setSelectedKeys([info.node].map((node) => node.key));
+  };
+
+  const handleView = (e: IButtonMenuClickEvent) => {
+    if (e.key === '1') {
+      setTreeData(selectedNodes?.slice() ?? []);
+    } else {
+      setTreeData(pickerData);
+    }
+  };
+
+  const handleSearch = (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (e.target.value !== '') {
+      const nodes = pickerData.filter((node) => node.title?.toString().toLocaleLowerCase().includes(e.target.value.toLocaleLowerCase()));
+      setTreeData(nodes);
+    } else {
+      setTreeData(pickerData);
+    }
+  };
+
+  const handleSelectAll = (e: IButtonMenuClickEvent) => {
+    if (e.key === '0') {
+      setSelectedNodes(pickerData.slice());
+      setSelectedKeys(pickerData.map((node) => node.key));
+      setCheckedKeys(pickerData.map((node) => node.key));
+    } else {
+      setCheckedKeys([]);
+      setSelectedKeys([]);
+      setSelectedNodes([]);
+    }
+  };
+
+  const handleCancel = (e: React.MouseEvent<HTMLElement | MouseEvent>) => onCancel(e);
+
+  const handleOk = () => onOk(selectedNodes);
+
+  return (
+    <Modal title={title} visible={visible} onCancel={handleCancel} onOk={handleOk} okText='Save'>
+      <Spacing margin='0 0 16px 0' itemSpacing={12}>
+        {(selectionMode ?? 'multiple') === 'multiple' ? (
+          <ButtonMenu
+            icon={<BorderIcon />}
+            items={[
+              { key: 0, label: 'Select All Results' },
+              { key: 1, label: 'Clear All' }
+            ]}
+            onClick={handleSelectAll}
+          />
+        ) : (
+          <></>
+        )}
+        <Input search onChange={handleSearch} />
+        <ButtonMenu
+          buttonText='View'
+          items={[
+            { key: 0, label: 'All' },
+            { key: 1, label: 'Selected' }
+          ]}
+          onClick={handleView}
+        />
+      </Spacing>
+      <Tree
+        treeData={treeData}
+        checkStrictly
+        selectionMode={selectionMode ?? 'multiple'}
+        height={height ?? 300}
+        defaultCheckedKeys={defaultCheckedKeys}
+        defaultSelectedKeys={defaultSelectedKeys}
+        selectedKeys={selectedKeys}
+        checkedKeys={checkedKeys}
+        onSelect={handleSelect}
+        onCheck={handleCheck}
+      />
+    </Modal>
+  );
+};
+
+export default FilterChipPickerTreeBase;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipPopover.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipPopover.tsx
new file mode 100644
index 0000000..48b1337
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipPopover.tsx
@@ -0,0 +1,160 @@
+import intlService from '@strata/intl/lib';
+import Button from '@strata/tempo/lib/button/Button';
+import DatePicker from '@strata/tempo/lib/datepicker/DatePicker';
+import { RangeValue } from '@strata/tempo/lib/datepicker/RangePicker';
+import DropDown, { DropDownValue } from '@strata/tempo/lib/dropdown/DropDown';
+import SearchIcon from '@strata/tempo/lib/icon/SearchIcon';
+import Input from '@strata/tempo/lib/input/Input';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import useToast from '@strata/tempo/lib/toast/useToast';
+import dayjs from 'dayjs';
+import React, { useEffect, useState } from 'react';
+import { ChipKey, ChipType, IFilterChipItem, OperatorType } from './data/IFilterChipItem';
+import { DATE_FORMAT } from '../../constants';
+
+export interface IFilterChipPopoverProps {
+  activeFilter: IFilterChipItem;
+  dateStart: dayjs.Dayjs;
+  dateEnd: dayjs.Dayjs;
+  onActiveFilterChange: (filter: IFilterChipItem) => void;
+  onChipClear: () => void;
+  onSearch: (chipId: React.Key, isCleared: boolean) => void;
+  onClose: () => void;
+  onApply: () => void;
+}
+
+const FilterChipPopover: React.FC<IFilterChipPopoverProps> = (props) => {
+  const { activeFilter, dateStart, dateEnd, onActiveFilterChange, onChipClear, onSearch, onClose, onApply } = props;
+  const [dateRange, setDateRange] = useState<RangeValue>();
+  const [isCleared, setIsCleared] = useState<boolean>(false);
+
+  const toast = useToast();
+
+  useEffect(() => {
+    const initialize = () => {
+      if (activeFilter.chipType === ChipType.dateRange && activeFilter.dateRange && activeFilter.dateRange.length === 2) {
+        let startDate;
+        let endDate;
+        if (typeof activeFilter.dateRange[0] === 'string') {
+          startDate = dayjs(dayjs(activeFilter.dateRange[0]).format(DATE_FORMAT));
+        } else {
+          startDate = dayjs(activeFilter.dateRange[0].format(DATE_FORMAT));
+        }
+        if (typeof activeFilter.dateRange[1] === 'string') {
+          endDate = dayjs(dayjs(activeFilter.dateRange[1]).format(DATE_FORMAT));
+        } else {
+          endDate = dayjs(activeFilter.dateRange[1].format(DATE_FORMAT));
+        }
+        setDateRange([startDate, endDate] as RangeValue);
+      }
+    };
+    if (activeFilter) {
+      initialize();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [activeFilter]);
+
+  const canShowOperators = (type: ChipType) => {
+    if ([ChipType.boolean, ChipType.costDriver, ChipType.dateRange, ChipType.sphCriteria].includes(type)) {
+      return false;
+    }
+    return true;
+  };
+  const showOperators = canShowOperators(activeFilter.chipType);
+  const filterNodes = activeFilter.filters ?? [];
+
+  const filterOperators = [
+    { text: 'In', value: OperatorType.In },
+    { text: 'Not In', value: OperatorType.NotIn }
+  ];
+
+  const inputValue = filterNodes.length <= 2 ? filterNodes.map((f) => f.displayText).join(', ') : `${filterNodes[0].displayText}, ${filterNodes[1].displayText}, +${filterNodes.length - 2}`;
+
+  const handleOperatorChange = (value: DropDownValue) => {
+    const newValue = value as OperatorType;
+
+    const newFilter = { ...activeFilter, operator: newValue };
+
+    onActiveFilterChange(newFilter);
+  };
+
+  const handleActiveFilterChange = (start: dayjs.Dayjs, end: dayjs.Dayjs) => {
+    const value = [start, end];
+    const newFilter = {
+      ...activeFilter,
+      filters: [
+        {
+          id: `${ChipKey.DischargeDate}`,
+          displayText: `${intlService.formatDate(value[0].toDate(), 'dateLong')} - ${intlService.formatDate(value[1].toDate(), 'dateLong')}`
+        }
+      ],
+      dateRange: [value[0], value[1]]
+    };
+    onActiveFilterChange(newFilter);
+    setDateRange(value as RangeValue);
+  };
+
+  const handleDischargeDateChange = (value: RangeValue) => {
+    if (!value || value.length < 2 || !value[0] || !value[1]) {
+      toast.show({ message: 'Select a valid date range.', toastType: 'info' });
+      return;
+    }
+    handleActiveFilterChange(value[0], value[1]);
+  };
+
+  const handleClearClick = () => {
+    setIsCleared(true);
+    if (activeFilter.chipType === ChipType.dateRange) {
+      handleActiveFilterChange(dateStart, dateEnd);
+    } else {
+      onChipClear();
+    }
+  };
+
+  const handleApply = () => {
+    setIsCleared(false);
+    onApply();
+  };
+
+  return (
+    <Spacing width={430} height={120} itemSpacing={8} column>
+      <Spacing itemSpacing={8} margin={'20px 0px 0px 0px'}>
+        <Spacing width={showOperators ? '20%' : '10%'} vAlign='center'>
+          {showOperators ? <DropDown items={filterOperators} defaultValue={'in'} value={activeFilter.operator} onChange={handleOperatorChange} /> : <Text strong>In</Text>}
+        </Spacing>
+        {activeFilter.chipType !== ChipType.dateRange ? (
+          <>
+            <Spacing width={showOperators ? '70%' : '80%'}>
+              <Input value={inputValue} disabled placeholder='Search to add values' />
+            </Spacing>
+            <Spacing>
+              <Button onClick={() => onSearch(activeFilter.key, isCleared)} icon={<SearchIcon />} />
+            </Spacing>
+          </>
+        ) : (
+          <div key={dateRange?.[0]?.valueOf() ?? 0}>
+            <Spacing margin='0 0 16px 0' itemSpacing={12}>
+              <DatePicker.RangePicker value={dateRange} disabledDate={(d) => !d?.isBefore(dayjs().add(-1, 'day'))} onChange={handleDischargeDateChange} />
+            </Spacing>
+          </div>
+        )}
+      </Spacing>
+      <Spacing height={'100%'} vAlign='bottom'>
+        <Spacing width={'20%'} padding={'0px 0px 5px 0px'}>
+          <Button onClick={handleClearClick} type='link'>
+            Clear
+          </Button>
+        </Spacing>
+        <Spacing width={'80%'} hAlign='right'>
+          <Button onClick={onClose}>Cancel</Button>
+          <Button onClick={handleApply} type='primary'>
+            Apply
+          </Button>
+        </Spacing>
+      </Spacing>
+    </Spacing>
+  );
+};
+
+export default FilterChipPopover;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipRomSoiModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipRomSoiModal.tsx
new file mode 100644
index 0000000..df0dcc1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipRomSoiModal.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import FilterChipPickerTreeBase, { IFilterChipPickerTreeBaseProps } from './FilterChipPickerTreeBase';
+import { ITreeNode } from '@strata/tempo/lib/tree/Tree';
+
+const FilterChipRomSoiModal: React.FC<IFilterChipPickerTreeBaseProps> = ({ title, visible, defaultCheckedKeys, defaultSelectedKeys, onCancel, onOk }: IFilterChipPickerTreeBaseProps) => {
+  const handleCancel = (e: React.MouseEvent<HTMLElement | MouseEvent>) => onCancel(e);
+
+  const handleOk = (selectedNodes: ITreeNode[] | undefined) => onOk(selectedNodes);
+
+  return (
+    <FilterChipPickerTreeBase
+      title={title}
+      visible={visible}
+      defaultCheckedKeys={defaultCheckedKeys}
+      defaultSelectedKeys={defaultSelectedKeys}
+      height={300}
+      selectionMode='multiple'
+      options={[
+        { key: '0', title: '0' },
+        { key: '1', title: '1' },
+        { key: '2', title: '2' },
+        { key: '3', title: '3' },
+        { key: '4', title: '4' }
+      ]}
+      onCancel={handleCancel}
+      onOk={handleOk}
+    />
+  );
+};
+
+export default FilterChipRomSoiModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipSphCriteriaModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipSphCriteriaModal.tsx
new file mode 100644
index 0000000..cad7599
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipSphCriteriaModal.tsx
@@ -0,0 +1,68 @@
+import React, { useEffect, useState } from 'react';
+import FilterChipPickerTreeBase, { IFilterChipPickerTreeBaseProps } from './FilterChipPickerTreeBase';
+import { ITreeNode } from '@strata/tempo/lib/tree/Tree';
+import { filterService } from './data/filterService';
+import { usePageLoader } from '@strata/tempo/lib/pageloader';
+import { ChipKey } from './data/IFilterChipItem';
+
+export interface IFilterChipSphCriteriaModalProps extends IFilterChipPickerTreeBaseProps {
+  chipKey: ChipKey; // The SPH criteria chip key (e.g., SPHAdmitType, SPHDischargeStatus, etc.)
+}
+
+const FilterChipSphCriteriaModal: React.FC<IFilterChipSphCriteriaModalProps> = ({
+  title,
+  visible,
+  defaultCheckedKeys,
+  defaultSelectedKeys,
+  onCancel,
+  onOk,
+  chipKey
+}: IFilterChipSphCriteriaModalProps) => {
+  const handleCancel = (e: React.MouseEvent<HTMLElement | MouseEvent>) => onCancel(e);
+  const handleOk = (selectedNodes: ITreeNode[] | undefined) => onOk(selectedNodes);
+  const [sphCriteriaFilters, setSphCriteriaFilters] = useState<ITreeNode[]>();
+  const { setLoading } = usePageLoader();
+
+  // Check if this is the boolean filter
+  const isBooleanFilter = chipKey === ChipKey.SPHIsNewBorn;
+
+  useEffect(() => {
+    if (!visible) return;
+
+    if (isBooleanFilter) {
+      // For boolean provide Yes/No tree data
+      setSphCriteriaFilters([
+        { key: 'true', title: 'Yes' },
+        { key: 'false', title: 'No' }
+      ]);
+    } else {
+      // For other SPH criteria, load from service
+      const loadData = async () => {
+        setLoading(true);
+        try {
+          const options = await filterService.getSphCriteriaFilters(chipKey);
+          setSphCriteriaFilters(options);
+        } finally {
+          setLoading(false);
+        }
+      };
+      loadData();
+    }
+  }, [chipKey, visible, setLoading, isBooleanFilter]);
+
+  return (
+    <FilterChipPickerTreeBase
+      title={title}
+      visible={visible}
+      defaultCheckedKeys={defaultCheckedKeys}
+      defaultSelectedKeys={defaultSelectedKeys}
+      height={300}
+      selectionMode={isBooleanFilter ? 'single' : 'multiple'}
+      options={sphCriteriaFilters}
+      onCancel={handleCancel}
+      onOk={handleOk}
+    />
+  );
+};
+
+export default FilterChipSphCriteriaModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipSupplyModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipSupplyModal.tsx
new file mode 100644
index 0000000..b2ec642
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterChipSupplyModal.tsx
@@ -0,0 +1,42 @@
+import React, { useEffect, useState } from 'react';
+import FilterChipPickerTreeBase, { IFilterChipPickerTreeBaseProps } from './FilterChipPickerTreeBase';
+import { ITreeNode } from '@strata/tempo/lib/tree/Tree';
+import { filterService } from './data/filterService';
+import { usePageLoader } from '@strata/tempo/lib/pageloader';
+
+const FilterChipSupplyModal: React.FC<IFilterChipPickerTreeBaseProps> = ({ title, visible, defaultCheckedKeys, defaultSelectedKeys, onCancel, onOk }: IFilterChipPickerTreeBaseProps) => {
+  const handleCancel = (e: React.MouseEvent<HTMLElement | MouseEvent>) => onCancel(e);
+  const handleOk = (selectedNodes: ITreeNode[] | undefined) => onOk(selectedNodes);
+  const [supplyFilters, setSupplyFilters] = useState<ITreeNode[]>();
+  const { setLoading } = usePageLoader();
+
+  useEffect(() => {
+    const loadData = async () => {
+      setLoading(true);
+      try {
+        const supplyFilters = await filterService.getSupplyFilters();
+        setSupplyFilters(supplyFilters);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    loadData();
+  }, [setLoading]);
+
+  return (
+    <FilterChipPickerTreeBase
+      title={title}
+      visible={visible}
+      defaultCheckedKeys={defaultCheckedKeys}
+      defaultSelectedKeys={defaultSelectedKeys}
+      height={300}
+      selectionMode='multiple'
+      options={supplyFilters}
+      onCancel={handleCancel}
+      onOk={handleOk}
+    />
+  );
+};
+
+export default FilterChipSupplyModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterTree.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterTree.tsx
new file mode 100644
index 0000000..cf7039b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/FilterTree.tsx
@@ -0,0 +1,112 @@
+import { DRAWER_BODY_PADDING, DRAWER_FOOTER_HEIGHT } from '@strata/tempo/lib/drawer';
+import Input from '@strata/tempo/lib/input/Input';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Tree, { ITreeNode, ITreeSelectInfo, Key } from '@strata/tempo/lib/tree/Tree';
+import React, { useEffect, useState } from 'react';
+import { useSystemSettings } from '../../systemSettings/SystemSettingsContext';
+import { ChipKey, defaultFilterBarItemsExcluded, IFilterChipItem } from './data/IFilterChipItem';
+import { benchmarks } from './data/benchmarks';
+
+export interface IFilterTreeProps {
+  isVisible: boolean;
+  selectedKeys: Key[];
+  excludedChips: ChipKey[];
+  treeHeight?: number;
+  windowHeight?: number;
+  includeMeasureFilters?: boolean;
+  hasBenchmarking?: boolean;
+  onSelect: (selectedKeys: Key[], node: ITreeNode) => void;
+  /** Optional override list of filter chip items (e.g. custom SPH criteria). When provided, excludedChips is ignored for this list. */
+  customItems?: IFilterChipItem[];
+}
+
+const FilterTree: React.FC<IFilterTreeProps> = (props) => {
+  const { isVisible, selectedKeys, excludedChips, treeHeight, windowHeight, includeMeasureFilters, hasBenchmarking, onSelect, customItems } = props;
+  const { systemSettings } = useSystemSettings();
+  const isUsingAprDrg = systemSettings?.flexibleExplorationInpatientCTF ?? false;
+
+  const [loading, setLoading] = useState<boolean>(false);
+  const [treeData, setTreeData] = React.useState<ITreeNode[]>([]);
+  const [filteredRows, setFilteredRows] = useState<ITreeNode[]>([]);
+  const [searchInput, setSearchInput] = useState('');
+  const [calculateHeight, setCalculateHeight] = React.useState<number>(0);
+  const treeRef = React.useRef<HTMLInputElement>(null);
+
+  /** Append asterisk to benchmarking items if benchmarking is enabled */
+  const getDisplayTitle = (label: string): string => {
+    const originalLabel = label.replace(/[*\s]+$/, '');
+    return originalLabel + (hasBenchmarking && benchmarks.includes(originalLabel) ? ' *' : '');
+  };
+
+  const mapTreeData = (data: IFilterChipItem[]): ITreeNode[] => {
+    return data.map((item) => {
+      return { key: ChipKey[item.key], title: getDisplayTitle(item.label) } as ITreeNode;
+    });
+  };
+
+  useEffect(() => {
+    const fetchTreeData = () => {
+      setLoading(true);
+      try {
+        const sourceItems: IFilterChipItem[] = customItems ? customItems : defaultFilterBarItemsExcluded(excludedChips, includeMeasureFilters, isUsingAprDrg);
+
+        setTreeData(sourceItems.map((df: IFilterChipItem) => ({ key: ChipKey[df.key], title: df.label })));
+        setFilteredRows(mapTreeData(sourceItems));
+      } finally {
+        setLoading(false);
+      }
+    };
+    if (isVisible) {
+      fetchTreeData();
+      setTimeout(() => calculateTreeHeight(), 50);
+      onSelect([], {} as ITreeNode);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isVisible]);
+
+  useEffect(() => {
+    const filterData = async () => {
+      const searchString = searchInput.toLowerCase();
+      if (searchString.trim() === '') {
+        const sourceItems: IFilterChipItem[] = customItems ? customItems : defaultFilterBarItemsExcluded(excludedChips, includeMeasureFilters, isUsingAprDrg);
+        setFilteredRows(mapTreeData(sourceItems));
+      } else {
+        const filteredRows = treeData.filter((r) => {
+          return (
+            getDisplayTitle(r.title?.valueOf().toString() ?? '')
+              .toLowerCase()
+              .indexOf(searchString) > -1
+          );
+        });
+        setFilteredRows(filteredRows);
+      }
+    };
+    filterData();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [searchInput]);
+
+  const calculateTreeHeight = () => {
+    if (treeRef.current) {
+      const height = windowHeight ? windowHeight : 0;
+
+      setCalculateHeight(height - treeRef.current.getBoundingClientRect().y - DRAWER_FOOTER_HEIGHT - DRAWER_BODY_PADDING);
+    } else {
+      setCalculateHeight(0);
+    }
+  };
+
+  const handleSelect = (selectedKeys: Key[], info: ITreeSelectInfo) => {
+    onSelect(selectedKeys, info.node);
+  };
+
+  return (
+    <div ref={treeRef}>
+      <Spacing margin='0 0 16px 0' itemSpacing={12}>
+        <Input search onChange={(e) => setSearchInput(e.target.value)} debounce />
+      </Spacing>
+      <Tree loading={loading} selectedKeys={selectedKeys} treeData={filteredRows} height={treeHeight ?? calculateHeight} onSelect={handleSelect} />
+    </div>
+  );
+};
+
+export default FilterTree;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/data/IFilterChipItem.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/data/IFilterChipItem.ts
new file mode 100644
index 0000000..792582a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/data/IFilterChipItem.ts
@@ -0,0 +1,223 @@
+import intlService from '@strata/intl/lib';
+import { RangeValue } from '@strata/tempo/lib/datepicker/RangePicker';
+import dayjs from 'dayjs';
+
+export enum ChipKey {
+  'AdmitSourceID',
+  'AdmitTypeID',
+  'AgeCohortID',
+  'AprDrgID',
+  'CaseTypeFamilyID',
+  'CostDriver',
+  'DischargeStatusId',
+  'EntityID',
+  'EncounterID',
+  'GenderID',
+  'ICD10DXPrimaryDiagID',
+  'ICD10PXPrimaryID',
+  'InsurancePlan1ID',
+  'IsGreaterThanZeroCharges',
+  'LocationID',
+  'Mortality',
+  'MSDRGID',
+  'NewBornFlagID',
+  'PatientTypeID',
+  'PrimaryCPTID',
+  'PrimaryPhysicianID',
+  'PrimaryQVIID',
+  'RiskOfMortality',
+  'SeverityOfIllness',
+  'SourceSystemID',
+  'DischargeDate',
+  'BilledCPT',
+  'ChargeCode',
+  'CostComponent',
+  'Supply',
+  'UBRevenueCode',
+  'Department',
+  'VariableDirectCost',
+  'LengthOfStay',
+  'MSDRGRollupID',
+  'SPHAdmitType',
+  'SPHDischargeStatus',
+  'SPHPatientType',
+  'SPHGender',
+  'SPHIsNewBorn',
+  'SPHAgeRollup',
+  'TopN'
+}
+
+export enum ChipType {
+  'scoreMember',
+  'boolean',
+  'special',
+  'costDriver',
+  'dateRange',
+  'supply',
+  'costComponent',
+  'sphCriteria'
+}
+
+export enum OperatorType {
+  'In',
+  'NotIn'
+}
+
+export interface IFilterChipItem {
+  key: ChipKey;
+  label: string;
+  globalId: string;
+  operator: OperatorType;
+  chipType: ChipType;
+  filters: any[];
+  isSelected?: boolean;
+  defaultItems?: any[];
+  hierarchy?: string;
+  dateRange?: dayjs.Dayjs[];
+  isReadOnly?: boolean;
+}
+
+export const newFilterChipItem = (key: ChipKey, label: string, globalId?: string, chipType?: ChipType, defaultItems?: any[], dateRange?: dayjs.Dayjs[], hierarchy?: string): IFilterChipItem => {
+  return {
+    key: key,
+    label: label,
+    globalId: globalId ?? label,
+    operator: OperatorType.In,
+    chipType: chipType ?? ChipType.scoreMember,
+    filters: [],
+    isSelected: undefined,
+    defaultItems: defaultItems,
+    dateRange: dateRange,
+    hierarchy: hierarchy
+  };
+};
+
+export const newDateRangeChipItem = (dateRange: RangeValue): IFilterChipItem | undefined => {
+  const bar = defaultFilterBarItems().find((fbi) => fbi.key === ChipKey.DischargeDate);
+  return dateRangeChipItem(bar, dateRange);
+};
+
+export const dateRangeChipItem = (barItem: IFilterChipItem | undefined, dateRange: RangeValue): IFilterChipItem | undefined => {
+  if (barItem && dateRange && dateRange.length === 2 && dateRange[0] && dateRange[1]) {
+    barItem.filters = [
+      { id: dateRange[0]?.valueOf().toString(), displayText: `${intlService.formatDate(dateRange[0].toDate(), 'dateLong')} - ${intlService.formatDate(dateRange[1].toDate(), 'dateLong')}` }
+    ];
+    barItem.dateRange = [dateRange[0], dateRange[1]];
+    return barItem;
+  }
+  return barItem;
+};
+
+export const defaultFilterBarItems = (isUsingAprDrg?: boolean): IFilterChipItem[] => {
+  const items = [
+    newFilterChipItem(ChipKey.AdmitSourceID, 'Admit Source'),
+    newFilterChipItem(ChipKey.AdmitTypeID, 'Admit Type'),
+    newFilterChipItem(ChipKey.AgeCohortID, 'Age Cohort'),
+    newFilterChipItem(ChipKey.CaseTypeFamilyID, 'Case Type Family'),
+    newFilterChipItem(ChipKey.CostDriver, 'Cost Driver', undefined, ChipType.costDriver),
+    newFilterChipItem(ChipKey.DischargeDate, 'Discharge Date', undefined, ChipType.dateRange),
+    newFilterChipItem(ChipKey.DischargeStatusId, 'Discharge Status'),
+    newFilterChipItem(ChipKey.EntityID, 'DS Entity', 'DSS Entity'),
+    newFilterChipItem(ChipKey.EncounterID, 'Encounter Record Number', 'Patient Encounter'),
+    newFilterChipItem(ChipKey.GenderID, 'Gender'),
+    newFilterChipItem(ChipKey.ICD10DXPrimaryDiagID, 'Primary ICD10DX', 'ICD10 DX Primary'),
+    newFilterChipItem(ChipKey.ICD10PXPrimaryID, 'Primary ICD10PX', 'ICD10 PX Primary'),
+    newFilterChipItem(ChipKey.InsurancePlan1ID, 'Insurance Plan', 'Insurance Plan 1'),
+    newFilterChipItem(ChipKey.IsGreaterThanZeroCharges, 'Is Greater Than Zero Charges', undefined, ChipType.boolean),
+    newFilterChipItem(ChipKey.LocationID, 'Location'),
+    newFilterChipItem(ChipKey.Mortality, 'Mortality', undefined, ChipType.boolean),
+    newFilterChipItem(ChipKey.NewBornFlagID, 'New Born', 'New Born Flag'),
+    newFilterChipItem(ChipKey.PatientTypeID, 'Patient Type', 'Patient Type Rollup'),
+    newFilterChipItem(ChipKey.PrimaryCPTID, 'Primary CPT'),
+    newFilterChipItem(ChipKey.PrimaryPhysicianID, 'Primary Physician', 'Physician Primary'),
+    newFilterChipItem(ChipKey.PrimaryQVIID, 'Primary QVI', 'Primary QVI', undefined, undefined, undefined, '098988a7-0e9d-4e51-bcea-8797c1b89cff'),
+    newFilterChipItem(ChipKey.SourceSystemID, 'Source System')
+  ];
+
+  if (isUsingAprDrg) {
+    items.push(newFilterChipItem(ChipKey.AprDrgID, 'APR DRG'));
+  } else {
+    items.push(newFilterChipItem(ChipKey.MSDRGRollupID, 'MSDRG', 'MS DRG Rollup'));
+  }
+
+  return items.sort((a, b) => a.label.localeCompare(b.label));
+};
+
+export const additionalFiltersForMeasures = (): IFilterChipItem[] => {
+  return [
+    newFilterChipItem(ChipKey.BilledCPT, 'Billed CPT'),
+    newFilterChipItem(ChipKey.ChargeCode, 'Charge Code', undefined, undefined, undefined, undefined, '1f7bd500-a966-457d-9b47-a6944b02841b'),
+    newFilterChipItem(ChipKey.Department, 'Department'),
+    newFilterChipItem(ChipKey.Supply, 'Supply', 'DSS Supply', ChipType.supply),
+    newFilterChipItem(ChipKey.UBRevenueCode, 'UB Revenue Code')
+  ];
+};
+
+export const sphCriteriaFilterItems = (): IFilterChipItem[] => {
+  return [
+    newFilterChipItem(ChipKey.SPHAdmitType, 'SPH Admit Type', '', ChipType.sphCriteria),
+    newFilterChipItem(ChipKey.SPHAgeRollup, 'SPH Age Rollup', '', ChipType.sphCriteria),
+    newFilterChipItem(ChipKey.SPHDischargeStatus, 'SPH Discharge Status', '', ChipType.sphCriteria),
+    newFilterChipItem(ChipKey.SPHGender, 'SPH Gender', '', ChipType.sphCriteria),
+    newFilterChipItem(ChipKey.SPHIsNewBorn, 'SPH Newborn', '', ChipType.sphCriteria),
+    newFilterChipItem(ChipKey.SPHPatientType, 'SPH Patient Type', '', ChipType.sphCriteria)
+  ];
+};
+
+// Filters that affect both Population and Benchmarking Criteria are dual filters
+export const isDualFilterChip = (filterChip: IFilterChipItem): boolean => {
+  const benchmarkChipKeys = [ChipKey.AprDrgID, ChipKey.CaseTypeFamilyID, ChipKey.CostDriver, ChipKey.ICD10DXPrimaryDiagID, ChipKey.ICD10PXPrimaryID, ChipKey.MSDRGRollupID, ChipKey.PrimaryCPTID];
+
+  return benchmarkChipKeys.includes(filterChip.key) && filterChip.operator === OperatorType.In;
+};
+
+export const defaultFilterBarItemsExcluded = (excludedItems: ChipKey[], includeFiltersForMeasures = false, isUsingAprDrg?: boolean): IFilterChipItem[] => {
+  let allList = defaultFilterBarItems(isUsingAprDrg);
+
+  if (includeFiltersForMeasures) {
+    allList = [...allList, ...additionalFiltersForMeasures()].sort((a, b) => a.label.localeCompare(b.label));
+  }
+
+  return allList.filter((item) => !excludedItems.includes(item.key));
+};
+
+export const parseFiltersFromJson = (filters: any): IFilterChipItem[] => {
+  let filtersObj: any[] = [];
+  if (filters) {
+    try {
+      filtersObj = JSON.parse(filters);
+    } catch (e) {
+      filtersObj = [];
+    }
+  }
+  const filterChipItems: IFilterChipItem[] = filtersObj.map(
+    (filterChip: {
+      key: ChipKey;
+      label: any;
+      globalId: any;
+      operator: OperatorType;
+      chipType: ChipType;
+      filters: any[];
+      isSelected: boolean;
+      defaultItems: any[];
+      hierarchy: string;
+      dateRange: dayjs.Dayjs[];
+    }): IFilterChipItem => {
+      return {
+        key: filterChip.key as ChipKey,
+        label: filterChip.label,
+        globalId: filterChip.globalId,
+        operator: filterChip.operator as OperatorType,
+        chipType: filterChip.chipType as ChipType,
+        filters: filterChip.filters.map((filter): any => {
+          return { id: filter.id, displayText: filter.displayText };
+        }),
+        isSelected: filterChip.isSelected,
+        defaultItems: filterChip.defaultItems,
+        hierarchy: filterChip.hierarchy,
+        dateRange: filterChip.dateRange
+      };
+    }
+  );
+  return filterChipItems;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/data/benchmarks.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/data/benchmarks.ts
new file mode 100644
index 0000000..7bf2c2f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/data/benchmarks.ts
@@ -0,0 +1 @@
+export const benchmarks = ['APR DRG', 'Case Type Family', 'Cost Driver', 'Primary ICD10DX', 'Primary ICD10PX', 'MSDRG', 'Primary CPT'];
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/data/filterService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/data/filterService.ts
new file mode 100644
index 0000000..2937c18
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FilterBar/data/filterService.ts
@@ -0,0 +1,22 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import { getSecureService } from '@strata/core/lib/http/getSecureService';
+import { ITreeNode } from '@strata/tempo/lib/tree';
+import { ChipKey } from './IFilterChipItem';
+
+const { httpGet } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'filters';
+
+export const filterService = {
+  getCostDriverFilters: async (): Promise<ITreeNode[]> => {
+    return httpGet<ITreeNode[]>(`${url}/cost-driver-filters`);
+  },
+  getSupplyFilters: async (): Promise<ITreeNode[]> => {
+    return httpGet<ITreeNode[]>(`${url}/supply-filters`);
+  },
+  getCostComponentFilters: async (): Promise<ITreeNode[]> => {
+    return httpGet<ITreeNode[]>(`${url}/cost-component-filters`);
+  },
+  getSphCriteriaFilters: async (chipKey: ChipKey): Promise<ITreeNode[]> => {
+    return httpGet<ITreeNode[]>(`${url}/sph-criteria-filters/${chipKey}`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FiltersList.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FiltersList.tsx
new file mode 100644
index 0000000..db32d59
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/FiltersList.tsx
@@ -0,0 +1,56 @@
+import React, { useEffect, useState } from 'react';
+import Button from '@strata/tempo/lib/button/Button';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text';
+import FilterChip from './FilterBar/FilterChip';
+import dayjs from 'dayjs';
+import { IFilterChipItem } from './FilterBar/data/IFilterChipItem';
+
+interface FiltersListProps {
+  filters: IFilterChipItem[];
+  padding?: string;
+}
+
+const FiltersList: React.FC<FiltersListProps> = ({ filters, padding }) => {
+  const [hasMoreFilters, setHasMoreFilters] = useState<boolean>(false);
+
+  useEffect(() => {
+    setHasMoreFilters(filters.length > 3);
+  }, [filters]);
+
+  if (filters.length === 0) {
+    return null;
+  }
+
+  return (
+    <Spacing column padding={padding}>
+      <Spacing padding='0 0 4px 0'>
+        <Text.Heading level={4} strong>
+          Filters
+        </Text.Heading>
+      </Spacing>
+      <FilterChip
+        filters={filters.slice(0, hasMoreFilters ? 3 : filters.length)}
+        activeFilterId={undefined}
+        disabledChips={[]}
+        hiddenChips={[]}
+        dateStart={dayjs()}
+        dateEnd={dayjs()}
+        onChipClick={() => ({})}
+        onChipDelete={() => ({})}
+        onOpenChange={() => ({})}
+        onFilterChange={() => ({})}
+        isReadOnly={true}
+      />
+      {filters.length > 3 && (
+        <Spacing padding='4px 0 0 0'>
+          <Button type='link' onClick={() => setHasMoreFilters(!hasMoreFilters)}>
+            {hasMoreFilters ? `+ ${filters.length - 3} more` : 'show less'}
+          </Button>
+        </Spacing>
+      )}
+    </Spacing>
+  );
+};
+
+export default FiltersList;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/IMappedColumn.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/IMappedColumn.ts
new file mode 100644
index 0000000..ed0d00e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/IMappedColumn.ts
@@ -0,0 +1,8 @@
+export interface IMappedColumn {
+  index?: number;
+  name: string;
+  heading: string;
+  isLocked: boolean;
+  isHidden: boolean;
+  initiativeRollupColumnId: number;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/PickerModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/PickerModal.tsx
new file mode 100644
index 0000000..8ef0cf0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/PickerModal.tsx
@@ -0,0 +1,125 @@
+import DataGrid from '@strata/tempo/lib/datagrid/DataGrid';
+import Input from '@strata/tempo/lib/input/Input';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Toggle from '@strata/tempo/lib/toggle/Toggle';
+import React, { useEffect, useState } from 'react';
+import { IPickerItem } from '../data/IPickerItem';
+import useModal from '@strata/tempo/lib/modal/useModal';
+
+export interface IPickerModalProps {
+  title: string;
+  items: IPickerItem[];
+  selectedItems: IPickerItem[];
+  isVisible: boolean;
+  maxSelections?: number;
+  maxSelectionExceededMessage?: string;
+  onCancel: () => void;
+  onSave: (values: IPickerItem[]) => void;
+}
+
+export const PickerModal: React.FC<IPickerModalProps> = (props: IPickerModalProps) => {
+  const { title, items, selectedItems, isVisible, maxSelections, maxSelectionExceededMessage, onCancel, onSave } = props;
+  const [filteredRows, setFilteredRows] = useState<IPickerItem[] | null>(null);
+  const [searchInput, setSearchInput] = useState('');
+  const [toggle, setToggle] = useState<'all' | 'selected'>('all');
+  const [selectedData, setSelectedData] = useState<IPickerItem[]>([]);
+  const modal = useModal();
+
+  useEffect(() => {
+    if (!isVisible) return;
+    setFilteredRows(null);
+    setSelectedData(selectedItems);
+  }, [isVisible, items, selectedItems]);
+
+  const handleSave = () => {
+    // validate
+    if (maxSelections && selectedData.length > maxSelections) {
+      modal.alert({
+        title: 'Cannot add selections',
+        content: maxSelectionExceededMessage ?? 'Unable to add selections, please try again.',
+        alertType: 'info'
+      });
+      return;
+    }
+
+    onSave(selectedData);
+  };
+
+  const handleSearch = (searchString: string) => {
+    if (searchString === '') {
+      setFilteredRows(null);
+    } else {
+      setFilteredRows(items.filter((r) => r.text.toString().toLowerCase().indexOf(searchString) > -1));
+    }
+  };
+
+  const filterData = (searchInput: string) => {
+    setSearchInput(searchInput);
+    filterToggleData(searchInput, toggle);
+  };
+
+  const toggleView = (value: 'all' | 'selected') => {
+    setToggle(value);
+    filterToggleData(searchInput, value);
+  };
+
+  const filterToggleData = (searchInput: string, toggle: 'all' | 'selected') => {
+    const search = searchInput.toLowerCase().trim();
+    if (search === '') {
+      if (toggle === 'selected') {
+        setFilteredRows(selectedData);
+      } else {
+        setFilteredRows(null);
+      }
+    } else {
+      if (toggle === 'selected') {
+        let updatedRows = selectedData;
+        if (search !== '') updatedRows = updatedRows.filter((c) => c.text.toLowerCase().indexOf(search) > -1);
+        setFilteredRows(updatedRows);
+      } else {
+        handleSearch(search);
+      }
+    }
+  };
+
+  return (
+    <Modal removeBodyPadding title={title} visible={isVisible} zIndex={2000} onCancel={onCancel} onOk={handleSave}>
+      <Spacing column>
+        <Spacing itemSpacing={8} padding={'16px'}>
+          <Input width={240} search onChange={(e) => filterData(e.target.value)} />
+          <Toggle
+            defaultValue={'all'}
+            onChange={(selected) => toggleView(selected.target.value)}
+            items={[
+              { value: 'all', name: 'All' },
+              { value: 'selected', name: 'Selected' }
+            ]}
+          />
+        </Spacing>
+        <DataGrid
+          emptyMessage=''
+          dataKey='value'
+          paginator={items.length > 100}
+          rows={100}
+          sortOrder={1}
+          scrollable
+          scrollHeight={'300px'}
+          value={filteredRows ?? items}
+          density={'minimal'}
+          selection={selectedData}
+          hideSelectAll
+          onSelectionChange={(e) => {
+            setSelectedData(e.value as IPickerItem[]);
+          }}
+        >
+          <DataGrid.SelectionColumn selectionMode={'multiple'} />
+          <DataGrid.Column field='text' sortable width={300} />
+          <DataGrid.EmptyColumn />
+        </DataGrid>
+      </Spacing>
+    </Modal>
+  );
+};
+
+export default PickerModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/ShowCreateErrorMessage.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/ShowCreateErrorMessage.tsx
new file mode 100644
index 0000000..bfcb444
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/components/ShowCreateErrorMessage.tsx
@@ -0,0 +1,39 @@
+import React, { useEffect } from 'react';
+import { useModal } from '@strata/tempo/lib/modal';
+
+export interface ShowCreateErrorMessageProps {
+  error: unknown;
+  title?: string;
+}
+
+const ShowCreateErrorMessage: React.FC<ShowCreateErrorMessageProps> = ({ error, title = 'Failed to Create Opportunity' }) => {
+  const modal = useModal();
+
+  useEffect(() => {
+    if (error) {
+      // Log the error for diagnostics
+      console.error('❌ Failed to retrieve opportunity by name:', error);
+      let errorMessage = '';
+      if (typeof error === 'string') {
+        errorMessage = error;
+      } else if (error instanceof Error) {
+        errorMessage = error.message;
+      } else if ((error as any)?.response?.data) {
+        errorMessage = JSON.stringify((error as any).response.data);
+      } else if ((error as any)?.message) {
+        errorMessage = (error as any).message;
+      } else {
+        errorMessage = String(error);
+      }
+      modal.alert({
+        title,
+        content: `An error occurred: ${errorMessage}. Try editing the wizard again and contact us if the issue continues.`,
+        alertType: 'error'
+      });
+    }
+  }, [error, modal, title]);
+
+  return null;
+};
+
+export default ShowCreateErrorMessage;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/ConfigurationContext.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/ConfigurationContext.tsx
new file mode 100644
index 0000000..2abef88
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/ConfigurationContext.tsx
@@ -0,0 +1,57 @@
+import React, { useEffect, useState, ReactNode } from 'react';
+import { IConfiguration } from './IConfiguration';
+import { configurationService } from './configurationService';
+import { useUserSetting } from '../userSetting';
+
+export interface IConfigurationsContext {
+  configurations: IConfiguration[];
+  currentConfiguration?: IConfiguration;
+  loading: boolean;
+}
+
+export interface IConfigurationsContextProps {
+  children: ReactNode;
+}
+
+const initialState: IConfigurationsContext = {
+  configurations: [],
+  currentConfiguration: undefined,
+  loading: false
+};
+
+const ConfigurationsContext = React.createContext<IConfigurationsContext>(initialState);
+
+export const ConfigurationsProvider: React.FC<IConfigurationsContextProps> = (props: IConfigurationsContextProps) => {
+  const [contextData, setContextData] = useState<IConfigurationsContext>(initialState);
+  const { userSetting } = useUserSetting();
+
+  useEffect(() => {
+    const fetchData = async () => {
+      try {
+        setContextData((prev: IConfigurationsContext) => ({ ...prev, loading: true }));
+
+        await configurationService
+          .getConfigurations()
+          .then((response) => {
+            const _configurations = response;
+            setContextData((prev: IConfigurationsContext) => ({ ...prev, configurations: _configurations }));
+          })
+          .catch((error) => console.log(error));
+      } finally {
+        setContextData((prev: IConfigurationsContext) => ({ ...prev, loading: false }));
+      }
+    };
+    fetchData();
+  }, []);
+
+  useEffect(() => {
+    const _currentConfiguration = contextData.configurations?.find((x: IConfiguration) => x.configurationGuid === userSetting.configurationGuid);
+    setContextData((prev: IConfigurationsContext) => ({ ...prev, currentConfiguration: _currentConfiguration }));
+  }, [userSetting.configurationGuid, contextData.configurations]);
+
+  return <ConfigurationsContext.Provider value={contextData}>{props.children}</ConfigurationsContext.Provider>;
+};
+
+export const useConfigurations = (): IConfigurationsContext => React.useContext(ConfigurationsContext);
+
+export default ConfigurationsContext;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/ConfigurationDropdown.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/ConfigurationDropdown.tsx
new file mode 100644
index 0000000..2782b44
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/ConfigurationDropdown.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import UserSettingContext from '../userSetting/UserSettingContext';
+import ButtonMenu, { IButtonMenuClickEvent } from '@strata/tempo/lib/buttonmenu';
+import { useConfigurations } from './ConfigurationContext';
+import { menuItem } from './IConfiguration';
+
+const ConfigurationDropdown: React.FC = () => {
+  const { setUserSetting } = React.useContext(UserSettingContext);
+  const { configurations, currentConfiguration } = useConfigurations();
+
+  const handleConfigurationClick = async (e: IButtonMenuClickEvent) => {
+    const targetKey = e.key as string;
+    setUserSetting({ configurationGuid: targetKey });
+  };
+
+  const selectedConfiguration = configurations.find((configuration) => configuration.configurationGuid === currentConfiguration?.configurationGuid);
+
+  return configurations === null ? (
+    <></>
+  ) : (
+    <ButtonMenu
+      buttonText={selectedConfiguration?.name}
+      selectedKeys={[selectedConfiguration?.configurationGuid ?? '']}
+      onClick={handleConfigurationClick}
+      type='link'
+      items={configurations.map((configuration) => menuItem(configuration))}
+    />
+  );
+};
+
+export default ConfigurationDropdown;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IConfiguration.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IConfiguration.ts
new file mode 100644
index 0000000..aa8ff9e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IConfiguration.ts
@@ -0,0 +1,45 @@
+import { IMenuItem } from '@strata/tempo/lib/menu';
+
+export interface IConfiguration {
+  configurationGuid: string;
+  name: string;
+  configuredEntityIds: [];
+  serviceLineDimensionGuid: string;
+  qviOpportunityBreakdownName: string;
+  qviOpportunityBreakdownNamePlural: string;
+  orgDefinedTrackingStartDate: Date;
+  orgDefinedTrackingEndDate: Date;
+  lastFiscalYearStartDate: Date;
+  lastFiscalYearEndDate: Date;
+  isUsingCustomEntityDimension: boolean;
+  qualityVariationIsUsingAPRDRG: boolean;
+}
+
+export interface IDimensionMember {
+  id: number;
+  name: string;
+}
+
+export const menuItem = (data: Partial<IConfiguration> = {}): IMenuItem => {
+  return { ...{ key: data.configurationGuid as string, label: data.name } };
+};
+
+export const newConfiguration = (data: Partial<IConfiguration> = {}): IConfiguration => {
+  return {
+    ...{
+      configurationGuid: '',
+      name: '-',
+      configuredEntityIds: [],
+      serviceLineDimensionGuid: '',
+      qviOpportunityBreakdownName: '',
+      qviOpportunityBreakdownNamePlural: '',
+      orgDefinedTrackingStartDate: new Date(),
+      orgDefinedTrackingEndDate: new Date(),
+      lastFiscalYearStartDate: new Date(),
+      lastFiscalYearEndDate: new Date(),
+      isUsingCustomEntityDimension: false,
+      qualityVariationIsUsingAPRDRG: false
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IDimensionMember.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IDimensionMember.ts
new file mode 100644
index 0000000..61e67fe
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IDimensionMember.ts
@@ -0,0 +1,4 @@
+export interface IDimensionMember {
+  id: number;
+  name: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IEntityInfo.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IEntityInfo.ts
new file mode 100644
index 0000000..d8cf08e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IEntityInfo.ts
@@ -0,0 +1,17 @@
+export interface IEntityInfo {
+  entityTitle: string;
+  entityLabel: string;
+  entityText: string;
+  departmentRollupGlobalId: string;
+  hierarchicalGuid: string;
+}
+
+export const newEntityInfo = (data: Partial<IEntityInfo> = {}): IEntityInfo => {
+  return {
+    entityTitle: '',
+    entityLabel: '',
+    entityText: '',
+    departmentRollupGlobalId: '',
+    hierarchicalGuid: ''
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IPeerGroupFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IPeerGroupFilters.ts
new file mode 100644
index 0000000..82035e1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IPeerGroupFilters.ts
@@ -0,0 +1,21 @@
+export interface IPeerGroupFilters {
+  peerGroupId: number;
+  name: string;
+  entityTypes: number[];
+  censusRegions: number[];
+  operatingExpenses: number[];
+  amcTypes: number[];
+  bedSize: number[];
+  urbanRural: number[];
+}
+
+export const defaultPeerGroupFilter: IPeerGroupFilters = {
+  peerGroupId: 0,
+  name: 'None Selected',
+  entityTypes: [],
+  censusRegions: [],
+  operatingExpenses: [],
+  amcTypes: [],
+  bedSize: [],
+  urbanRural: []
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IServiceLineInfo.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IServiceLineInfo.ts
new file mode 100644
index 0000000..92f186c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/IServiceLineInfo.ts
@@ -0,0 +1,17 @@
+export interface IServiceLineInfo {
+  serviceLineGlobalId: string;
+  serviceLineDimensionGuid: string;
+  serviceLineTitle: string;
+  serviceLineName: string;
+  serviceLineHierarchicalGuid: string;
+}
+
+export const newServiceLineInfo = (data: Partial<IServiceLineInfo> = {}): IServiceLineInfo => {
+  return {
+    serviceLineGlobalId: '',
+    serviceLineDimensionGuid: '',
+    serviceLineTitle: '',
+    serviceLineName: '',
+    serviceLineHierarchicalGuid: ''
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/configurationService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/configurationService.ts
new file mode 100644
index 0000000..5ee9513
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/configuration/configurationService.ts
@@ -0,0 +1,25 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IConfiguration } from './IConfiguration';
+import { IDimensionMember } from './IDimensionMember';
+import { IEntityInfo } from './IEntityInfo';
+import { IServiceLineInfo } from './IServiceLineInfo';
+
+const { httpGet } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const configurationService = {
+  getConfigurations: async (): Promise<IConfiguration[]> => {
+    return httpGet<IConfiguration[]>(`configurations`);
+  },
+
+  getEntities: async (configurationGuid: string): Promise<IDimensionMember[]> => {
+    return httpGet<IDimensionMember[]>(`configurations/${configurationGuid}/configuration-entities`);
+  },
+
+  getEntityInfo: async (configurationGuid: string): Promise<IEntityInfo> => {
+    return httpGet<IEntityInfo>(`configurations/${configurationGuid}/configuration-entity-info`);
+  },
+
+  getServiceLineInfo: async (configurationGuid: string): Promise<IServiceLineInfo> => {
+    return httpGet<IServiceLineInfo>(`configurations/${configurationGuid}/configuration-service-line-info`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/constants.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/constants.tsx
new file mode 100644
index 0000000..6a161a9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/constants.tsx
@@ -0,0 +1,14 @@
+export const TREE_DATA_LEVEL_SEPARATOR = ' | ';
+export const KEY_SEPARATOR = '|';
+export const HEADER_HEIGHT = 55.53;
+export const DATE_FORMAT = 'YYYY-MM-DD';
+export const MAX_ROLLUP_COLUMNS = 3;
+export const MAX_PEER_GROUP = 5;
+
+export const enum CodeType {
+  MSDRG = 0,
+  APRDRG = 1,
+  PatientPopulation = 2,
+  CPT = 3,
+  ExplorationPopulation = 4
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/BuildOpportunityType.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/BuildOpportunityType.ts
new file mode 100644
index 0000000..08cf9a2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/BuildOpportunityType.ts
@@ -0,0 +1,8 @@
+export enum BuildOpportunityTypes {
+  FreeForm,
+  GeneralLedger,
+  Payroll,
+  Encounter,
+  ChargeCode,
+  Exploration
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/DateString.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/DateString.ts
new file mode 100644
index 0000000..cc70af9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/DateString.ts
@@ -0,0 +1,5 @@
+export type DateString = string; // m|yyyy or mm|yyyy
+export const DATE_NUMBER_FORMAT = 'YYYYMMDD';
+export const DATE_YYYYMM_FORMAT = 'YYYYMM';
+export const DATE_STRING_FORMAT = 'MM|YYYY';
+export const FRIENDLY_DATE_FORMAT = 'MMMM YYYY';
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/Dictionary.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/Dictionary.ts
new file mode 100644
index 0000000..73f5c29
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/Dictionary.ts
@@ -0,0 +1,12 @@
+export interface DicStrNum {
+  [key: string]: number;
+}
+export interface DicNumStr {
+  [key: number]: string;
+}
+export interface DicNumNum {
+  [key: number]: number;
+}
+export interface DicStrStr {
+  [key: string]: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IInitiativeStatuses.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IInitiativeStatuses.ts
new file mode 100644
index 0000000..6501200
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IInitiativeStatuses.ts
@@ -0,0 +1,5 @@
+export enum IInitiativeStatuses {
+  OnHold,
+  InProcess,
+  Completed
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IKeyTextItem.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IKeyTextItem.ts
new file mode 100644
index 0000000..d6c2283
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IKeyTextItem.ts
@@ -0,0 +1,18 @@
+export interface IKeyNameItem {
+  key: number;
+  name: string;
+}
+
+export interface IKeyLabelItem {
+  key: number;
+  label: string;
+}
+
+export interface IValueLabelItem {
+  value: number;
+  label: string;
+}
+
+export interface IListItem {
+  title: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IListMember.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IListMember.ts
new file mode 100644
index 0000000..3228867
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IListMember.ts
@@ -0,0 +1,4 @@
+export interface IListMember {
+  id: string;
+  text: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IPickerItem.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IPickerItem.tsx
new file mode 100644
index 0000000..5694245
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IPickerItem.tsx
@@ -0,0 +1,4 @@
+export interface IPickerItem {
+  value: number;
+  text: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IResponseBody.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IResponseBody.ts
new file mode 100644
index 0000000..24a94fd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/IResponseBody.ts
@@ -0,0 +1,3 @@
+export interface IResponseBody {
+  message: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/ITrackingMonth.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/ITrackingMonth.ts
new file mode 100644
index 0000000..9425dab
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/ITrackingMonth.ts
@@ -0,0 +1,7 @@
+export interface ITrackingMonth {
+  abbreviation: string;
+  sortOrder: number;
+  isAfterEffectiveDate: boolean;
+  isBeforeEffectiveDate: boolean;
+  isCurrentMonth: boolean;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/SeasonalityType.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/SeasonalityType.ts
new file mode 100644
index 0000000..7b64e2c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/SeasonalityType.ts
@@ -0,0 +1,5 @@
+export enum SeasonalityType {
+  WithAndWithout = -1,
+  Without = 0,
+  With = 1
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/pickerItemsService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/pickerItemsService.ts
new file mode 100644
index 0000000..d646b87
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/data/pickerItemsService.ts
@@ -0,0 +1,11 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IPickerItem } from './IPickerItem';
+
+const { httpGet } = getSecureService(`${appConfig.apiUrl}v1/`);
+const controller = 'picker-items';
+
+export const pickerItemsService = {
+  getExplorations(): Promise<IPickerItem[]> {
+    return httpGet<IPickerItem[]>(`${controller}/explorations`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/databases/IDatabase.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/databases/IDatabase.tsx
new file mode 100644
index 0000000..e2b9bf7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/databases/IDatabase.tsx
@@ -0,0 +1,6 @@
+export interface IDatabase {
+  databaseGuid: string;
+  strataId: number;
+  databaseName: string;
+  orgPin: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/databases/databaseService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/databases/databaseService.ts
new file mode 100644
index 0000000..e5cac34
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/databases/databaseService.ts
@@ -0,0 +1,11 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import { getSecureService } from '@strata/core/lib/http/getSecureService';
+import { IDatabase } from './IDatabase';
+
+const { httpGet } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const databaseService = {
+  get: function (): Promise<IDatabase[]> {
+    return httpGet(`databases`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/error/utils.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/error/utils.tsx
new file mode 100644
index 0000000..ae4d9a1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/error/utils.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import { stringFormatByVar } from '../utilities';
+
+export interface IErrorData {
+  message: string;
+  logGuid: string | undefined;
+}
+
+const defaultErrorMessage: { [key: number]: string } = {
+  403: 'You do not have permission to view data in the selected data source. Contact your administrator to request access.',
+  404: 'The item you requested has moved or no longer exists.',
+  500: 'Try again. If the problem continues, contact Strata Support at support@stratadecision.com and provide this ID: {logGuid}'
+};
+
+export const getErrorData = async (error: any, msgData: { [key: number]: string | undefined }, useServerMsg = false, includeLogId = true): Promise<IErrorData | undefined> => {
+  let errorData: IErrorData | undefined;
+  if (msgData && error instanceof Response) {
+    const responseError = error as Response;
+    if (responseError.status in msgData) {
+      let _message: string | undefined;
+      let _logId: string | undefined;
+      if (useServerMsg || includeLogId) {
+        const responseErrorData = (await (error as Response).json()) as IErrorData;
+        if (useServerMsg) _message = responseErrorData.message;
+        if (includeLogId) _logId = responseErrorData.logGuid;
+      }
+      if (!_message) _message = msgData[responseError.status];
+      if (!_message && responseError.status in defaultErrorMessage) {
+        _message = _logId ? stringFormatByVar(defaultErrorMessage[responseError.status], { logGuid: _logId }) : defaultErrorMessage[responseError.status];
+      }
+
+      if (_message) errorData = { message: _message, logGuid: _logId };
+    }
+  }
+
+  return errorData;
+};
+
+export const getErrorMessage = (errorData: IErrorData | undefined, includeLogGuid = false): React.ReactNode | undefined => {
+  if (!errorData) return undefined;
+  return includeLogGuid && errorData.logGuid ? (
+    <>
+      {errorData.message}
+      <br />
+      {`Log Id: ${errorData.logGuid}`}
+    </>
+  ) : (
+    errorData.message
+  );
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/featureFlag/FeatureFlagContext.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/featureFlag/FeatureFlagContext.tsx
new file mode 100644
index 0000000..f52bf90
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/featureFlag/FeatureFlagContext.tsx
@@ -0,0 +1,47 @@
+import React, { useEffect, useState, ReactNode } from 'react';
+import { settingsService } from '../settingsService';
+import { IFeatureFlag } from './IFeatureFlag';
+
+export interface IFeatureFlagContext {
+  featureFlags?: IFeatureFlag;
+  isEnabled: (key: keyof IFeatureFlag) => boolean;
+  loading: boolean;
+}
+
+export interface IFeatureFlagContextProps {
+  children: ReactNode;
+}
+
+const initialState: IFeatureFlagContext = {
+  featureFlags: undefined,
+  isEnabled: (key: keyof IFeatureFlag) => false,
+  loading: true
+};
+
+const FeatureFlagContext = React.createContext<IFeatureFlagContext>(initialState);
+
+export const FeatureFlagProvider: React.FC<IFeatureFlagContextProps> = (props: IFeatureFlagContextProps) => {
+  const [featureFlags, setFeatureFlags] = useState<IFeatureFlag>();
+  const [loading, setLoading] = useState<boolean>(true);
+
+  const IsEnabled = (key: keyof IFeatureFlag): boolean => (featureFlags ? featureFlags[key] : false);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      setLoading(true);
+      try {
+        const _featureFlags = await settingsService.getFeatureFlags();
+        setFeatureFlags(_featureFlags);
+      } finally {
+        setLoading(false);
+      }
+    };
+    fetchData();
+  }, []);
+
+  return <FeatureFlagContext.Provider value={{ featureFlags, loading, isEnabled: IsEnabled }}>{props.children}</FeatureFlagContext.Provider>;
+};
+
+export const useFeatureFlags = (): IFeatureFlagContext => React.useContext(FeatureFlagContext);
+
+export default FeatureFlagContext;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/featureFlag/IFeatureFlag.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/featureFlag/IFeatureFlag.ts
new file mode 100644
index 0000000..27945d0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/featureFlag/IFeatureFlag.ts
@@ -0,0 +1,15 @@
+export interface IFeatureFlag {
+  chargecodebeta: boolean;
+  cibenchmarkingenabled: boolean;
+  ciflexibleexplorationenabled: boolean;
+  ciflexibleexplorationpage3enabled: boolean;
+  ciopportunityworkbooks: boolean;
+  ciexplorationpopulationstrategicopportunitywizard: boolean;
+  enableencounteropportunityintempo: boolean;
+  enablepayrollopportunityintempo: boolean;
+  networkopportunitiesenabled: boolean;
+  strategicopportunityforchargecode: boolean;
+  strategicopportunityforencounter: boolean;
+  cibenchmarkinginsightscodelevelenhancement: boolean;
+  cistrategicopportunitygl: boolean;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hangfire/IJobInfo.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hangfire/IJobInfo.ts
new file mode 100644
index 0000000..c908b81
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hangfire/IJobInfo.ts
@@ -0,0 +1,10 @@
+import { IJobState } from './IJobState';
+
+export interface IJobInfo {
+  namespace: string;
+  type: string;
+  method: string;
+  arguments: [];
+  createdAt: Date;
+  state: IJobState;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hangfire/IJobState.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hangfire/IJobState.ts
new file mode 100644
index 0000000..ce89c93
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hangfire/IJobState.ts
@@ -0,0 +1,5 @@
+export interface IJobState {
+  name: string;
+  reason: string;
+  data: unknown;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hangfire/IOpportunityJobResults.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hangfire/IOpportunityJobResults.ts
new file mode 100644
index 0000000..ae9e673
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hangfire/IOpportunityJobResults.ts
@@ -0,0 +1,4 @@
+export interface IOpportunityJobResults {
+  jobId: string;
+  opportunityGuid: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hangfire/hangfireService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hangfire/hangfireService.ts
new file mode 100644
index 0000000..353d647
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hangfire/hangfireService.ts
@@ -0,0 +1,22 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IJobInfo } from './IJobInfo';
+
+const { httpGet } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = `hangfire`;
+export interface ISeedFile {
+  file: string;
+}
+
+export const hangfireService = {
+  jobStatus: async (jobid: string): Promise<IJobInfo> => {
+    return httpGet(`hangfire/${jobid}/job-status`);
+  },
+
+  getAccessGudidUrl: (): Promise<string> => {
+    return httpGet(`${url}/access-gudid-url`);
+  },
+
+  getDatadogUrl: (): Promise<string> => {
+    return httpGet(`${url}/datadog-url`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hooks/useClientScopedSessionStorage.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hooks/useClientScopedSessionStorage.ts
new file mode 100644
index 0000000..2e38c77
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/hooks/useClientScopedSessionStorage.ts
@@ -0,0 +1,35 @@
+import { useOidcSession } from '@strata/core/lib/auth';
+import { useSessionStorage } from 'usehooks-ts';
+
+/**
+ * Custom hook that wraps useSessionStorage with automatic client-specific namespacing.
+ * This ensures session storage values don't carry over when switching databases/clients.
+ *
+ * @param key - The storage key (will be automatically suffixed with database GUID)
+ * @param defaultValue - The default value if no stored value exists
+ * @returns Tuple of [value, setValue, removeValue] matching useSessionStorage API
+ *
+ * @example
+ * const [filters, setFilters] = useClientScopedSessionStorage('summaryFilters', defaultFilter);
+ * // Internally stores as: 'summaryFilters_abc123-database-guid-...'
+ */
+export function useClientScopedSessionStorage<T>(key: string, defaultValue: T): [T, (value: T) => void, () => void] {
+  const session = useOidcSession();
+
+  // Create namespaced key with database GUID suffix from session
+  // Use a unique invalid key if no database GUID to prevent unscoped storage access
+  const namespacedKey = session.databaseGuid ? `${key}_${session.databaseGuid}` : `__invalid_no_db_guid__${key}`;
+
+  const [value, setValue, removeValue] = useSessionStorage<T>(namespacedKey, defaultValue);
+
+  // Gracefully handle missing database GUID - log warning and disable session storage
+  if (!session.databaseGuid) {
+    console.warn(`useClientScopedSessionStorage: No database GUID available. Session storage will not be used for key: "${key}"`);
+    const noop = () => {
+      // Intentionally empty - no-op function when database GUID is unavailable
+    };
+    return [defaultValue, noop, noop];
+  }
+
+  return [value, setValue, removeValue];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/CommittedSavingsDrawer.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/CommittedSavingsDrawer.tsx
new file mode 100644
index 0000000..f06a2b8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/CommittedSavingsDrawer.tsx
@@ -0,0 +1,170 @@
+import { InputNumber, Spacing, Text } from '@strata/tempo/lib';
+import Button from '@strata/tempo/lib/button';
+import Drawer from '@strata/tempo/lib/drawer';
+import Form from '@strata/tempo/lib/form';
+import React, { useEffect, useState } from 'react';
+import { IInitiativeDto } from './data/IInitiativeDto';
+import { IInitiativeInfo, newInitiativeInfo } from './data/IInitiativeInfo';
+import { initiativeService } from './data/initiativeService';
+
+export interface ICommittedSavingsProps {
+  initiativeGuid: string;
+  isVisible: boolean;
+  isEditable: boolean;
+  onClose: () => void;
+  onSubmit: (initiative: IInitiativeDto) => void;
+  onCancel: () => void;
+}
+
+const CommittedSavingsDrawer: React.FC<ICommittedSavingsProps> = (props: ICommittedSavingsProps) => {
+  const { initiativeGuid, isVisible, isEditable, onClose, onSubmit, onCancel } = props;
+  const [initiativeInfo, setInitiativeInfo] = useState<IInitiativeInfo>(newInitiativeInfo);
+  const [loading, setLoading] = useState(false);
+  const [committedSavingsForm] = Form.useForm();
+
+  useEffect(() => {
+    const fetchData = async () => {
+      setLoading(true);
+      try {
+        const info = await initiativeService.getInitiativeInfo(initiativeGuid);
+        setInitiativeInfo(info);
+        committedSavingsForm.setFieldsValue(info);
+      } finally {
+        setLoading(false);
+      }
+    };
+    fetchData();
+  }, [isVisible, initiativeGuid]);
+
+  const updateInitiative = async (initiative: IInitiativeDto) => {
+    setLoading(true);
+    await initiativeService.setRampupInfo(initiative);
+    setLoading(false);
+  };
+
+  const handleCommittedSavingsFormSubmit = (values: any) => {
+    const formValues = committedSavingsForm.getFieldsValue();
+    const initiative: IInitiativeDto = { ...initiativeInfo, ...formValues };
+    updateInitiative(initiative);
+    onSubmit(initiative);
+  };
+
+  const handleCommittedSavingsFormCancel = () => {
+    committedSavingsForm.resetFields();
+    onCancel();
+  };
+
+  return (
+    <Drawer
+      title='Committed Savings'
+      footer={
+        isEditable && (
+          <>
+            <Button onClick={handleCommittedSavingsFormCancel}>Cancel</Button>
+            <Button type='primary' onClick={() => committedSavingsForm.submit()}>
+              Save
+            </Button>
+          </>
+        )
+      }
+      visible={isVisible}
+      loading={loading}
+      onClose={() => onClose()}
+    >
+      <Form maxWidth='100%' form={committedSavingsForm} initialValues={initiativeInfo} onFinish={handleCommittedSavingsFormSubmit}>
+        <Spacing padding={'0px 0px 20px 0px'}>
+          <Text size='large' strong>
+            Ramp up to Goal Revenue (Percentage)
+          </Text>
+        </Spacing>
+        <Form.ItemSpacing>
+          <Form.Item label={initiativeInfo.trackingMonths[0]?.abbreviation} name='savingsRampUp01' rules={[{ required: true }, { type: 'number', min: 0, max: 100 }]}>
+            <InputNumber format='number' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[0]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[1]?.abbreviation} name='savingsRampUp02' rules={[{ required: true }, { type: 'number', min: 0, max: 100 }]}>
+            <InputNumber format='number' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[1]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[2]?.abbreviation} name='savingsRampUp03' rules={[{ required: true }, { type: 'number', min: 0, max: 100 }]}>
+            <InputNumber format='number' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[2]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[3]?.abbreviation} name='savingsRampUp04' rules={[{ required: true }, { type: 'number', min: 0, max: 100 }]}>
+            <InputNumber format='number' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[3]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[4]?.abbreviation} name='savingsRampUp05' rules={[{ required: true }, { type: 'number', min: 0, max: 100 }]}>
+            <InputNumber format='number' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[4]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[5]?.abbreviation} name='savingsRampUp06' rules={[{ required: true }, { type: 'number', min: 0, max: 100 }]}>
+            <InputNumber format='number' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[5]?.isAfterEffectiveDate} />
+          </Form.Item>
+        </Form.ItemSpacing>
+        <Form.ItemSpacing>
+          <Form.Item label={initiativeInfo.trackingMonths[6]?.abbreviation} name='savingsRampUp07' rules={[{ required: true }, { type: 'number', min: 0, max: 100 }]}>
+            <InputNumber format='number' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[6]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[7]?.abbreviation} name='savingsRampUp08' rules={[{ required: true }, { type: 'number', min: 0, max: 100 }]}>
+            <InputNumber format='number' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[7]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[8]?.abbreviation} name='savingsRampUp09' rules={[{ required: true }, { type: 'number', min: 0, max: 100 }]}>
+            <InputNumber format='number' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[8]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[9]?.abbreviation} name='savingsRampUp10' rules={[{ required: true }, { type: 'number', min: 0, max: 100 }]}>
+            <InputNumber format='number' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[9]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[10]?.abbreviation} name='savingsRampUp11' rules={[{ required: true }, { type: 'number', min: 0, max: 100 }]}>
+            <InputNumber format='number' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[10]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[11]?.abbreviation} name='savingsRampUp12' rules={[{ required: true }, { type: 'number', min: 0, max: 100 }]}>
+            <InputNumber format='number' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[11]?.isAfterEffectiveDate} />
+          </Form.Item>
+        </Form.ItemSpacing>
+        <Spacing padding={'20px 0px 20px 0px'}>
+          <Text size='large' strong>
+            Cost of Improvement (Dollars)
+          </Text>
+        </Spacing>
+        <Form.ItemSpacing>
+          <Form.Item label={initiativeInfo.trackingMonths[0]?.abbreviation} name='coI01' rules={[{ required: true }, { type: 'number', min: 0 }]}>
+            <InputNumber format='currency' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[0]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[1]?.abbreviation} name='coI02' rules={[{ required: true }, { type: 'number', min: 0 }]}>
+            <InputNumber format='currency' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[1]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[2]?.abbreviation} name='coI03' rules={[{ required: true }, { type: 'number', min: 0 }]}>
+            <InputNumber format='currency' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[2]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[3]?.abbreviation} name='coI04' rules={[{ required: true }, { type: 'number', min: 0 }]}>
+            <InputNumber format='currency' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[3]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[4]?.abbreviation} name='coI05' rules={[{ required: true }, { type: 'number', min: 0 }]}>
+            <InputNumber format='currency' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[4]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[5]?.abbreviation} name='coI06' rules={[{ required: true }, { type: 'number', min: 0 }]}>
+            <InputNumber format='currency' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[5]?.isAfterEffectiveDate} />
+          </Form.Item>
+        </Form.ItemSpacing>
+        <Form.ItemSpacing>
+          <Form.Item label={initiativeInfo.trackingMonths[6]?.abbreviation} name='coI07' rules={[{ required: true }, { type: 'number', min: 0 }]}>
+            <InputNumber format='currency' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[6]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[7]?.abbreviation} name='coI08' rules={[{ required: true }, { type: 'number', min: 0 }]}>
+            <InputNumber format='currency' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[7]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[8]?.abbreviation} name='coI09' rules={[{ required: true }, { type: 'number', min: 0 }]}>
+            <InputNumber format='currency' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[8]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[9]?.abbreviation} name='coI10' rules={[{ required: true }, { type: 'number', min: 0 }]}>
+            <InputNumber format='currency' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[9]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[10]?.abbreviation} name='coI11' rules={[{ required: true }, { type: 'number', min: 0 }]}>
+            <InputNumber format='currency' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[10]?.isAfterEffectiveDate} />
+          </Form.Item>
+          <Form.Item label={initiativeInfo.trackingMonths[11]?.abbreviation} name='coI12' rules={[{ required: true }, { type: 'number', min: 0 }]}>
+            <InputNumber format='currency' precision={0} disabled={!isEditable || !initiativeInfo.trackingMonths[11]?.isAfterEffectiveDate} />
+          </Form.Item>
+        </Form.ItemSpacing>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default CommittedSavingsDrawer;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/CreateInitiative.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/CreateInitiative.tsx
new file mode 100644
index 0000000..3c7b81a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/CreateInitiative.tsx
@@ -0,0 +1,190 @@
+import { useHelpCenter } from '@strata/core/lib';
+import Button from '@strata/tempo/lib/button';
+import Form, { FormInstance } from '@strata/tempo/lib/form';
+import Header from '@strata/tempo/lib/header/Header';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import Wizard from '@strata/tempo/lib/wizard';
+import dayjs from 'dayjs';
+import isBetween from 'dayjs/plugin/isBetween';
+import React, { useEffect } from 'react';
+import { useHistory } from 'react-router';
+import { useConfigurations } from '../configuration/ConfigurationContext';
+import { usersService } from '../users/usersService';
+import { toDateStr } from '../utilities';
+import InitiativeDetail from './InitiativeDetail';
+import InitiativeMilestones from './InitiativeMilestones';
+import InitiativeRoles from './InitiativeRoles';
+import { IInitiative } from './data/IInitiative';
+import { IUserProfile } from './data/IUserProfile';
+import { IWorkstream } from './data/IWorkstream';
+import { initiativeService } from './data/initiativeService';
+import { RegEx } from '../validation/RegEx';
+
+export interface ICreateInitiativeProps {
+  newInitiative?: IInitiative;
+  opportunityType?: string;
+  helpId?: string;
+  nameIsValid?: (name: string) => Promise<boolean>;
+  pageIsValid?: (currentStep: number, detailValues: any) => boolean;
+  createOpportunity?: (detailValues: any) => Promise<void>;
+  isEditing?: boolean;
+  isLoading?: boolean;
+  onFormValuesChanged?: (
+    form: FormInstance<any>,
+    changedValues: {
+      [name: string]: any;
+    }
+  ) => void;
+  /** Custom column configuration */
+  children?: React.ReactElement[];
+}
+
+const CreateInitiative: React.FC<ICreateInitiativeProps> = (props: ICreateInitiativeProps) => {
+  const { newInitiative, opportunityType, helpId, nameIsValid, pageIsValid, createOpportunity, onFormValuesChanged: onFormValuesChange, isEditing, isLoading, children } = props;
+  const [stepNumber, setStepNumber] = React.useState(0);
+  const [loading, setLoading] = React.useState(false);
+  const [details] = Form.useForm();
+  const [milestoneIdx, setMilestoneIdx] = React.useState<number>(0);
+  const [initiative, setInitiative] = React.useState<IInitiative>();
+  const [owners, setOwners] = React.useState<IUserProfile[]>([]);
+  const [costLeaders, setCostLeaders] = React.useState<IUserProfile[]>([]);
+  const [executiveSponsors, setExecutiveSponsors] = React.useState<IUserProfile[]>([]);
+  const [workstreams, setWorkstreams] = React.useState<IWorkstream[]>([]);
+  const { currentConfiguration } = useConfigurations();
+  const history = useHistory();
+
+  dayjs.extend(isBetween);
+  const helpCenter = useHelpCenter();
+
+  useEffect(() => {
+    const loadDropdownData = async () => {
+      const owners = await usersService.getOwners();
+      const costLeaders = await usersService.getCostLeaders();
+      const execSponsors = await usersService.getExecutiveSponsors();
+      const workstreams = await initiativeService.getWorkstreams();
+      setOwners(owners);
+      setCostLeaders(costLeaders);
+      setExecutiveSponsors(execSponsors);
+      setWorkstreams(workstreams);
+    };
+    const fetchInitiative = async () => {
+      setLoading(true);
+      try {
+        setInitiative(newInitiative);
+        details.setFieldsValue(newInitiative);
+      } finally {
+        setLoading(false);
+      }
+    };
+    if (newInitiative && !initiative) {
+      fetchInitiative();
+    }
+    loadDropdownData();
+  }, [newInitiative, initiative, details]);
+
+  useEffect(() => {
+    if (isLoading !== undefined) {
+      setLoading(isLoading);
+    }
+  }, [isLoading]);
+
+  const handleChange = async (currentStep: number, newStep: number) => {
+    details.submit();
+    const detailValues = details.getFieldsValue();
+    const changedInitiative = { ...initiative, ...detailValues };
+    if (newStep < currentStep) {
+      setStepNumber(newStep);
+      return;
+    }
+    if (currentStep === 0) {
+      if (
+        detailValues.name.trim() === '' ||
+        !RegEx.JazzRestrictedCharacters.test(detailValues.name) ||
+        (nameIsValid ? !(await nameIsValid(detailValues.name)) : false) ||
+        !detailValues.startTracking
+      ) {
+        return;
+      }
+      // if trackingStart changed, update startTracking
+      if (detailValues.startTracking != null) {
+        const startTrackingDate: dayjs.Dayjs = dayjs(detailValues.startTracking);
+        changedInitiative.trackingStart = toDateStr(startTrackingDate);
+      }
+    } else if (currentStep === 2) {
+      if (
+        detailValues.costLeader === '' ||
+        detailValues.costLeader === undefined ||
+        detailValues.executiveSponsor === '' ||
+        detailValues.executiveSponsor === undefined ||
+        detailValues.owner === '' ||
+        detailValues.owner === undefined
+      ) {
+        return;
+      }
+    } else if (pageIsValid && !pageIsValid(currentStep, detailValues)) {
+      return;
+    }
+    setInitiative(changedInitiative);
+    setStepNumber(newStep);
+  };
+
+  const handleCancel = () => {
+    history.goBack();
+  };
+
+  const handleSave = async () => {
+    details.submit();
+    const detailValues = details.getFieldsValue();
+    const data = { ...initiative, ...detailValues };
+    if (createOpportunity) {
+      await createOpportunity(data);
+    }
+    setInitiative(data);
+  };
+
+  const wizardSteps = () => {
+    const startMonth = dayjs(currentConfiguration?.orgDefinedTrackingStartDate);
+    const endMonth = dayjs(currentConfiguration?.orgDefinedTrackingEndDate);
+    const steps: JSX.Element[] = [
+      <Wizard.Step key='0' title='Initiative Details'>
+        <InitiativeDetail startMonth={startMonth} endMonth={endMonth} workstreams={workstreams} nameIsValid={nameIsValid} />
+      </Wizard.Step>
+    ];
+    if (children) {
+      steps.push(...children.slice(0, 1));
+    }
+    steps.push(
+      <Wizard.Step key='2' title='Key Stakeholders'>
+        <InitiativeRoles owners={owners} costLeaders={costLeaders} stakeholders={owners} executiveSponsors={executiveSponsors} />
+      </Wizard.Step>
+    );
+    steps.push(
+      <Wizard.Step key='3' title='Milestones'>
+        <InitiativeMilestones startMonth={startMonth} endMonth={endMonth} milestoneIdx={milestoneIdx} setMilestoneIdx={setMilestoneIdx} />
+      </Wizard.Step>
+    );
+    return steps;
+  };
+
+  const handleValuesChange = (changeValues: { [name: string]: any }) => {
+    if (onFormValuesChange) {
+      onFormValuesChange(details, changeValues);
+    }
+  };
+
+  return (
+    <>
+      <Header
+        title={`${isEditing ? `Edit ${initiative?.name ?? ''}` : `Create ${opportunityType ?? ''}`}  Opportunity and Initiative`}
+        extra={<Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage(helpId ?? '0')} />}
+      />
+      <Form form={details} layout='vertical' initialValues={initiative} maxWidth={800} onValuesChange={handleValuesChange}>
+        <Wizard currentStep={stepNumber} submitButtonText='Save' onSubmit={handleSave} onChange={handleChange} onCancel={handleCancel} loading={loading}>
+          {wizardSteps()}
+        </Wizard>
+      </Form>
+    </>
+  );
+};
+
+export default CreateInitiative;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/CreateInitiativeButtonMenu.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/CreateInitiativeButtonMenu.tsx
new file mode 100644
index 0000000..ac72b6b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/CreateInitiativeButtonMenu.tsx
@@ -0,0 +1,62 @@
+import { useOidcSession } from '@strata/core/lib';
+import ButtonMenu from '@strata/tempo/lib/buttonmenu';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import { IMenuItem } from '@strata/tempo/lib/menu/Menu';
+import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
+import { opportunityService } from '../../opportunities/opportunities/data/opportunityService';
+import { IInitiativeProps } from './data/IInitiativeProps';
+
+const CreateInitiativeButtonMenu: React.FC<IInitiativeProps> = (props: IInitiativeProps) => {
+  const [chargeCodeBeta, setChargeCodeBeta] = useState(false);
+  const history = useHistory();
+  const session = useOidcSession();
+
+  useEffect(() => {
+    const checkForBeta = async () => {
+      const isChargeCodeBeta = await opportunityService.chargeCodeBeta();
+      setChargeCodeBeta(isChargeCodeBeta || session.isStrata);
+    };
+    checkForBeta();
+  }, [session.isStrata]);
+
+  return (
+    <>
+      <ButtonMenu
+        icon={<PlusIcon />}
+        type='primary'
+        buttonText='Initiative'
+        items={[
+          {
+            hidden: !chargeCodeBeta,
+            key: 'ChargeCode',
+            label: 'Charge Code',
+            onClick: () => history.push('/initiatives/create/charge-code', props)
+          } as IMenuItem,
+          {
+            key: 'Encounter',
+            label: 'Encounter',
+            onClick: () => history.push('/initiatives/create/encounter', props)
+          } as IMenuItem,
+          {
+            key: 'FreeForm',
+            label: 'Free Form',
+            onClick: () => history.push('/initiatives/create/free-form', props)
+          } as IMenuItem,
+          {
+            key: 'GL',
+            label: 'General Ledger',
+            onClick: () => history.push(`/initiatives/create/general-ledger`, props)
+          } as IMenuItem,
+          {
+            key: 'Payroll',
+            label: 'Payroll',
+            onClick: () => history.push(`/initiatives/create/payroll`, props)
+          } as IMenuItem
+        ]}
+      />
+    </>
+  );
+};
+
+export default CreateInitiativeButtonMenu;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/CriteriaScoringDrawer.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/CriteriaScoringDrawer.tsx
new file mode 100644
index 0000000..4ef28da
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/CriteriaScoringDrawer.tsx
@@ -0,0 +1,84 @@
+import React, { useEffect, useState } from 'react';
+import { initiativeService } from './data/initiativeService';
+import Button from '@strata/tempo/lib/button';
+import { DropDown } from '@strata/tempo/lib';
+import Drawer from '@strata/tempo/lib/drawer';
+import Form from '@strata/tempo/lib/form';
+import { IInitiativeCriteriaDto } from './data/IInitiativeCriteriaDto';
+import { IInitiativeScoresDto, removeUndefined, removeZeroes } from './data/IInitiativeScoresDto';
+
+export interface ICriteriaScoringProps {
+  initiativeGuid: string;
+  isVisible: boolean;
+  isEditable: boolean;
+  onSubmit: () => void;
+  onCancel: () => void;
+}
+
+const CriteriaScoringDrawer: React.FC<ICriteriaScoringProps> = (props: ICriteriaScoringProps) => {
+  const { initiativeGuid, isVisible, isEditable, onSubmit, onCancel } = props;
+  const [loading, setLoading] = useState(false);
+  const [criteriaScoringForm] = Form.useForm();
+  const [criteria, setCriteria] = useState<IInitiativeCriteriaDto[]>();
+  const [scores, setScores] = useState<IInitiativeScoresDto>();
+
+  useEffect(() => {
+    const fetchData = async () => {
+      setLoading(true);
+      setCriteria(await initiativeService.getCriteria());
+      let initiativeScores = await initiativeService.getScores(initiativeGuid);
+      initiativeScores = removeZeroes(initiativeScores);
+      setScores(initiativeScores);
+      setLoading(false);
+    };
+    fetchData();
+  }, [isVisible, initiativeGuid]);
+
+  const handleCriteriaScoringFormSubmit = async () => {
+    const formValues = criteriaScoringForm.getFieldsValue();
+    let initiativeScores: IInitiativeScoresDto = { ...scores, ...formValues, initiativeGUID: initiativeGuid };
+    initiativeScores = removeUndefined(initiativeScores);
+    setLoading(true);
+    await initiativeService.setScores(initiativeScores);
+    setLoading(false);
+    onSubmit();
+  };
+
+  const handleCriteriaScoringFormCancel = () => {
+    criteriaScoringForm.resetFields();
+    onCancel();
+  };
+
+  return (
+    <Drawer
+      title='Criteria Scoring'
+      footer={
+        isEditable && (
+          <>
+            <Button onClick={handleCriteriaScoringFormCancel}>Cancel</Button>
+            <Button type='primary' onClick={() => criteriaScoringForm.submit()}>
+              Save
+            </Button>
+          </>
+        )
+      }
+      visible={isVisible}
+      loading={loading}
+      onClose={() => handleCriteriaScoringFormCancel()}
+    >
+      <Form maxWidth='100%' form={criteriaScoringForm} initialValues={scores} onFinish={handleCriteriaScoringFormSubmit}>
+        {criteria?.map((c) => {
+          return (
+            <Form.ItemSpacing key={c.initiativeCriteriaGuid}>
+              <Form.Item label={c.name} name={c.initiativeDataField?.toLowerCase()} initialValue=''>
+                <DropDown items={c.options} disabled={!isEditable} />
+              </Form.Item>
+            </Form.ItemSpacing>
+          );
+        })}
+      </Form>
+    </Drawer>
+  );
+};
+
+export default CriteriaScoringDrawer;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeCreateModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeCreateModal.tsx
new file mode 100644
index 0000000..7e7dea8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeCreateModal.tsx
@@ -0,0 +1,195 @@
+import { useHelpCenter } from '@strata/core/lib';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import Modal from '@strata/tempo/lib/modal';
+import Spacing from '@strata/tempo/lib/spacing';
+import Wizard from '@strata/tempo/lib/wizard';
+import dayjs from 'dayjs';
+import isBetween from 'dayjs/plugin/isBetween';
+import React, { useEffect } from 'react';
+import { IUserProfile } from '../../shared/initiatives/data/IUserProfile';
+import { IWorkstream } from '../../shared/initiatives/data/IWorkstream';
+import { initiativeService } from '../../shared/initiatives/data/initiativeService';
+import { usersService } from '../../shared/users/usersService';
+import InitiativeDetail from './InitiativeDetail';
+import InitiativeMilestones from './InitiativeMilestones';
+import InitiativeRoles from './InitiativeRoles';
+import { IInitiative, newInitiative } from './data/IInitiative';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { nameValidationService } from '../opportunities/data/nameValidationService';
+import { useConfigurations } from '../configuration/ConfigurationContext';
+
+export interface IInitiativeCreateModalProps {
+  isVisible: boolean;
+  initiative: IInitiative;
+  trackingStart: string;
+  trackingEnd: string;
+  helpId: string;
+  opportunityType: OpportunityTypes;
+  onCancel?: () => void;
+  onOK?: (initiativeInfo: IInitiative) => void;
+}
+
+const InitiativeCreateModal: React.FC<IInitiativeCreateModalProps> = (props: IInitiativeCreateModalProps) => {
+  const { isVisible, initiative, trackingStart, trackingEnd, helpId, opportunityType, onCancel, onOK } = props;
+  const { currentConfiguration } = useConfigurations();
+
+  const [owners, setOwners] = React.useState<IUserProfile[]>([]);
+  const [costLeaders, setCostLeaders] = React.useState<IUserProfile[]>([]);
+  const [executiveSponsors, setExecutiveSponsors] = React.useState<IUserProfile[]>([]);
+  const [workstreams, setWorkstreams] = React.useState<IWorkstream[]>([]);
+  const [stepNumber, setStepNumber] = React.useState(0);
+  const [startMonth, setStartMonth] = React.useState(dayjs(''));
+  const [endMonth, setEndMonth] = React.useState(dayjs(''));
+  const [isLocked, setIsLocked] = React.useState<boolean>(false);
+  const [loading, setLoading] = React.useState(false);
+  const [details] = Form.useForm();
+  const [milestoneIdx, setMilestoneIdx] = React.useState<number>(0);
+  const [formData, setFormData] = React.useState<IInitiative>(newInitiative);
+
+  dayjs.extend(isBetween);
+  const helpCenter = useHelpCenter();
+
+  useEffect(() => {
+    const fetchData = async () => {
+      setLoading(true);
+      if (initiative) {
+        setFormData({ ...formData, ...initiative });
+        setIsLocked(initiative.isLocked);
+        details.setFieldsValue(initiative);
+      }
+      setLoading(false);
+    };
+    const loadDropdownItems = async () => {
+      const owners = await usersService.getOwners();
+      const costLeaders = await usersService.getCostLeaders();
+      const execSponsors = await usersService.getExecutiveSponsors();
+      const workstreams = await initiativeService.getWorkstreams();
+      setOwners(owners);
+      setCostLeaders(costLeaders);
+      setExecutiveSponsors(execSponsors);
+      setWorkstreams(workstreams);
+    };
+    setStartMonth(dayjs(trackingStart));
+    setEndMonth(dayjs(trackingEnd));
+    if ((initiative?.name ?? '') !== '') {
+      fetchData();
+    }
+    loadDropdownItems();
+  }, [initiative, trackingEnd, trackingStart]);
+
+  const handleModalClose = async () => {
+    if (onCancel) {
+      onCancel();
+    }
+    resetForm();
+  };
+
+  const resetForm = async () => {
+    details.setFieldsValue(newInitiative);
+    setStepNumber(0);
+    setMilestoneIdx(0);
+  };
+
+  const handleChange = async (currentStep: number, newStep: number) => {
+    details.submit();
+    const detailValues = details.getFieldsValue();
+
+    if (newStep < currentStep) {
+      setStepNumber(newStep);
+      return;
+    } else {
+      switch (currentStep) {
+        case 0:
+          if (detailValues.name?.trim() === '' || !(await nameIsValid(detailValues.name)) || !detailValues.startTracking) {
+            return;
+          }
+          break;
+        case 1:
+          if (
+            detailValues.costLeader === '' ||
+            detailValues.costLeader === undefined ||
+            detailValues.executiveSponsor === '' ||
+            detailValues.executiveSponsor === undefined ||
+            detailValues.owner === '' ||
+            detailValues.owner === undefined
+          ) {
+            return;
+          }
+          break;
+      }
+    }
+    setFormData({ ...formData, ...detailValues });
+    setStepNumber(newStep);
+  };
+
+  const handleCancel = () => {
+    details.resetFields();
+    if (onCancel) {
+      onCancel();
+    }
+  };
+
+  const handleSave = async () => {
+    details.submit();
+    const detailValues = details.getFieldsValue();
+    const data = { ...formData, ...detailValues };
+    setFormData(data);
+    if (data && onOK) {
+      onOK(data);
+      resetForm();
+    }
+  };
+
+  const nameIsValid = async (name: string): Promise<boolean> => {
+    return await nameValidationService.nameIsValid(currentConfiguration?.configurationGuid ?? '', opportunityType, name, initiative.opportunityGuid);
+  };
+
+  const wizardSteps = () => {
+    const steps: JSX.Element[] = [
+      <Wizard.Step key='0' title='Initiative Details'>
+        <InitiativeDetail isLocked={isLocked} startMonth={startMonth} endMonth={endMonth} workstreams={workstreams} nameIsValid={nameIsValid} />
+      </Wizard.Step>
+    ];
+    steps.push(
+      <Wizard.Step key='1' title='Key Stakeholders'>
+        <InitiativeRoles owners={owners} costLeaders={costLeaders} executiveSponsors={executiveSponsors} stakeholders={owners} isLocked={isLocked} />
+      </Wizard.Step>
+    );
+    steps.push(
+      <Wizard.Step key='2' title='Milestones'>
+        <InitiativeMilestones startMonth={startMonth} endMonth={endMonth} milestoneIdx={milestoneIdx} setMilestoneIdx={setMilestoneIdx} />
+      </Wizard.Step>
+    );
+    return steps;
+  };
+
+  return (
+    <>
+      <Modal title='Create Initiative' width='large' maskClosable={false} footer={null} onCancel={handleModalClose} visible={isVisible} removeBodyPadding bodyBorder='top'>
+        <Form form={details} layout='vertical' initialValues={formData} maxWidth={'100%'}>
+          <Wizard
+            currentStep={stepNumber}
+            submitButtonText='Save'
+            onSubmit={handleSave}
+            onChange={handleChange}
+            onCancel={handleCancel}
+            loading={loading}
+            footerExtra={
+              <>
+                <Spacing hAlign='space-between'>
+                  <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage(helpId)}></Button>
+                </Spacing>
+              </>
+            }
+          >
+            {wizardSteps()}
+          </Wizard>
+        </Form>
+      </Modal>
+    </>
+  );
+};
+
+export default InitiativeCreateModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeDetail.tsx
new file mode 100644
index 0000000..704abcc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeDetail.tsx
@@ -0,0 +1,127 @@
+import Button from '@strata/tempo/lib/button/Button';
+import DatePicker from '@strata/tempo/lib/datepicker';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import Form from '@strata/tempo/lib/form';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import Input from '@strata/tempo/lib/input';
+import InputTextArea from '@strata/tempo/lib/inputtextarea/InputTextArea';
+import Spacing from '@strata/tempo/lib/spacing';
+import dayjs from 'dayjs';
+import isBetween from 'dayjs/plugin/isBetween';
+import React, { useEffect, useState } from 'react';
+import { IInitiativeRollupValue } from '../../initiatives/data/IInitiativeRollupValue';
+import { initiativeRollupColumnService } from '../../initiatives/data/initiativeRollupColumnService';
+import { nameIsDuplicate } from '../opportunities/data/nameValidationService';
+import { RegEx } from '../validation/RegEx';
+import InitiativeRollupDropdown from './InitiativeRollupDropdown';
+import WorkstreamModal from './WorkstreamModal';
+import { IWorkstream } from './data/IWorkstream';
+
+export interface IInitiativeDetailProps {
+  isLocked?: boolean;
+  effectiveDate?: dayjs.Dayjs;
+  startMonth: dayjs.Dayjs;
+  endMonth: dayjs.Dayjs;
+  workstreams: IWorkstream[];
+  nameIsValid?: (name: string) => Promise<boolean>;
+}
+
+const InitiativeDetail: React.FC<IInitiativeDetailProps> = (props: IInitiativeDetailProps) => {
+  const { isLocked, effectiveDate, startMonth, endMonth, workstreams, nameIsValid } = props;
+  const [newWorkstreamVisible, setNewWorkstreamVisible] = useState<boolean>(false);
+  const [rollupColumnHeaders, setRollupColumnHeaders] = useState<string[]>(['', '', '']);
+  const [rollup1ColumnValues, setRollup1ColumnValues] = useState<IInitiativeRollupValue[]>([]);
+  const [rollup2ColumnValues, setRollup2ColumnValues] = useState<IInitiativeRollupValue[]>([]);
+  const [rollup3ColumnValues, setRollup3ColumnValues] = useState<IInitiativeRollupValue[]>([]);
+  dayjs.extend(isBetween);
+
+  useEffect(() => {
+    const loadRollupColumns = async () => {
+      const columns = await initiativeRollupColumnService.getColumns();
+      const rollupColumnHeaders = new Array(3).fill('');
+      const rollupColumnValues = new Array(3);
+
+      columns.forEach((item) => {
+        rollupColumnHeaders[item.initiativeRollupColumnId - 1] = item.name;
+        rollupColumnValues[item.initiativeRollupColumnId - 1] = item.initiativeRollupValues;
+      });
+
+      setRollupColumnHeaders(rollupColumnHeaders);
+      setRollup1ColumnValues(rollupColumnValues.length > 0 ? rollupColumnValues[0] : []);
+      setRollup2ColumnValues(rollupColumnValues.length > 1 ? rollupColumnValues[1] : []);
+      setRollup3ColumnValues(rollupColumnValues.length > 2 ? rollupColumnValues[2] : []);
+    };
+    loadRollupColumns();
+  }, []);
+
+  const handleWorkstreamClose = () => {
+    setNewWorkstreamVisible(false);
+  };
+
+  const handleWorkstreamOk = (workstream: string) => {
+    if (!workstreams.includes({ workstream: workstream })) {
+      workstreams?.push({ workstream: workstream });
+    }
+    setNewWorkstreamVisible(false);
+  };
+
+  return (
+    <>
+      <Spacing padding={16} column>
+        <Form.Item
+          label='Name'
+          name='name'
+          rules={[
+            { required: true, whitespace: true, max: 200 },
+            { pattern: RegEx.JazzRestrictedCharacters },
+            () => ({
+              async validator(_, value) {
+                if (!value) {
+                  return Promise.resolve();
+                }
+                if (!nameIsValid || (await nameIsValid(value))) {
+                  return Promise.resolve();
+                }
+                return Promise.reject(nameIsDuplicate);
+              }
+            })
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item label='Tracking Start Month' name='startTracking' rules={[{ required: true }]}>
+          <DatePicker.MonthPicker
+            width={200}
+            defaultPickerValue={effectiveDate ?? startMonth}
+            disabledDate={(d) => !d?.isBetween(startMonth, endMonth, undefined, '[]')}
+            disabled={isLocked ?? false}
+          />
+        </Form.Item>
+        <Form.Item label='Goal Statement' name='goalStatement' rules={[{ required: false }]}>
+          <Input />
+        </Form.Item>
+        <Form.Item label='Workstream' name='workstream' rules={[{ required: false }]}>
+          <DropDown
+            items={workstreams}
+            itemTextField='workstream'
+            itemValueField='workstream'
+            extra={
+              <Button type='link' icon={<PlusIcon />} onClick={() => setNewWorkstreamVisible(true)}>
+                Workstream
+              </Button>
+            }
+          />
+        </Form.Item>
+        <Form.Item label='Planned Improvements' name='plannedImprovements' rules={[{ required: false }]}>
+          <InputTextArea />
+        </Form.Item>
+        <InitiativeRollupDropdown columnId={1} label={rollupColumnHeaders[0]} name='initiativeRollup1Id' rollupColumnValues={rollup1ColumnValues} />
+        <InitiativeRollupDropdown columnId={2} label={rollupColumnHeaders[1]} name='initiativeRollup2Id' rollupColumnValues={rollup2ColumnValues} />
+        <InitiativeRollupDropdown columnId={3} label={rollupColumnHeaders[2]} name='initiativeRollup3Id' rollupColumnValues={rollup3ColumnValues} />
+      </Spacing>
+      <WorkstreamModal isVisible={newWorkstreamVisible} workstreams={workstreams} onOk={handleWorkstreamOk} onCancel={handleWorkstreamClose} />
+    </>
+  );
+};
+
+export default InitiativeDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeMilestones.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeMilestones.tsx
new file mode 100644
index 0000000..e991631
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeMilestones.tsx
@@ -0,0 +1,122 @@
+import Button from '@strata/tempo/lib/button/Button';
+import DatePicker from '@strata/tempo/lib/datepicker/DatePicker';
+import Form from '@strata/tempo/lib/form/Form';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import Input from '@strata/tempo/lib/input/Input';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import dayjs from 'dayjs';
+import isBetween from 'dayjs/plugin/isBetween';
+import React from 'react';
+
+export interface IInitiativeMilestonesProps {
+  startMonth: dayjs.Dayjs;
+  endMonth: dayjs.Dayjs;
+  milestoneIdx: number;
+  setMilestoneIdx: (idx: number) => void;
+}
+
+export const InitiativeMilestones: React.FC<IInitiativeMilestonesProps> = (props: IInitiativeMilestonesProps) => {
+  const { startMonth, endMonth, milestoneIdx, setMilestoneIdx } = props;
+
+  dayjs.extend(isBetween);
+
+  return (
+    <>
+      <Spacing padding={16} column>
+        <Spacing itemSpacing={24}>
+          <Form.Item label='Milestone Name' name='milestone1' rules={[{ required: false }]}>
+            <Input />
+          </Form.Item>
+          <Form.Item label='Due Date' name='dateDue1' rules={[{ required: false }]}>
+            <DatePicker width={200} defaultPickerValue={startMonth} disabledDate={(d) => !d?.isBetween(startMonth, endMonth, undefined, '[]')} />
+          </Form.Item>
+        </Spacing>
+        <Spacing itemSpacing={24}>
+          <Form.Item label='Milestone Name' name='milestone2' rules={[{ required: false }]}>
+            <Input />
+          </Form.Item>
+          <Form.Item label='Due Date' name='dateDue2' rules={[{ required: false }]}>
+            <DatePicker width={200} defaultPickerValue={startMonth} disabledDate={(d) => !d?.isBetween(startMonth, endMonth, undefined, '[]')} />
+          </Form.Item>
+        </Spacing>
+        <Spacing itemSpacing={24}>
+          <Form.Item label='Milestone Name' name='milestone3' rules={[{ required: false }]}>
+            <Input />
+          </Form.Item>
+          <Form.Item label='Due Date' name='dateDue3' rules={[{ required: false }]}>
+            <DatePicker width={200} defaultPickerValue={startMonth} disabledDate={(d) => !d?.isBetween(startMonth, endMonth, undefined, '[]')} />
+          </Form.Item>
+        </Spacing>
+        <Spacing itemSpacing={24}>
+          <Form.Item label='Milestone Name' name='milestone4' rules={[{ required: false }]}>
+            <Input />
+          </Form.Item>
+          <Form.Item label='Due Date' name='dateDue4' rules={[{ required: false }]}>
+            <DatePicker width={200} defaultPickerValue={startMonth} disabledDate={(d) => !d?.isBetween(startMonth, endMonth, undefined, '[]')} />
+          </Form.Item>
+        </Spacing>
+        <Spacing itemSpacing={24}>
+          <Form.Item label='Milestone Name' name='milestone5' rules={[{ required: false }]}>
+            <Input />
+          </Form.Item>
+          <Form.Item label='Due Date' name='dateDue5' rules={[{ required: false }]}>
+            <DatePicker width={200} defaultPickerValue={startMonth} disabledDate={(d) => !d?.isBetween(startMonth, endMonth, undefined, '[]')} />
+          </Form.Item>
+        </Spacing>
+        {milestoneIdx >= 1 && (
+          <Spacing itemSpacing={24}>
+            <Form.Item label='Milestone Name' name='milestone6' rules={[{ required: false }]}>
+              <Input />
+            </Form.Item>
+            <Form.Item label='Due Date' name='dateDue6' rules={[{ required: false }]}>
+              <DatePicker width={200} defaultPickerValue={startMonth} disabledDate={(d) => !d?.isBetween(startMonth, endMonth, undefined, '[]')} />
+            </Form.Item>
+          </Spacing>
+        )}
+        {milestoneIdx >= 2 && (
+          <Spacing itemSpacing={24}>
+            <Form.Item label='Milestone Name' name='milestone7' rules={[{ required: false }]}>
+              <Input />
+            </Form.Item>
+            <Form.Item label='Due Date' name='dateDue7' rules={[{ required: false }]}>
+              <DatePicker width={200} defaultPickerValue={startMonth} disabledDate={(d) => !d?.isBetween(startMonth, endMonth, undefined, '[]')} />
+            </Form.Item>
+          </Spacing>
+        )}
+        {milestoneIdx >= 3 && (
+          <Spacing itemSpacing={24}>
+            <Form.Item label='Milestone Name' name='milestone8' rules={[{ required: false }]}>
+              <Input />
+            </Form.Item>
+            <Form.Item label='Due Date' name='dateDue8' rules={[{ required: false }]}>
+              <DatePicker width={200} defaultPickerValue={startMonth} disabledDate={(d) => !d?.isBetween(startMonth, endMonth, undefined, '[]')} />
+            </Form.Item>
+          </Spacing>
+        )}
+        {milestoneIdx >= 4 && (
+          <Spacing itemSpacing={24}>
+            <Form.Item label='Milestone Name' name='milestone9' rules={[{ required: false }]}>
+              <Input />
+            </Form.Item>
+            <Form.Item label='Due Date' name='dateDue9' rules={[{ required: false }]}>
+              <DatePicker width={200} defaultPickerValue={startMonth} disabledDate={(d) => !d?.isBetween(startMonth, endMonth, undefined, '[]')} />
+            </Form.Item>
+          </Spacing>
+        )}
+        {milestoneIdx >= 5 && (
+          <Spacing itemSpacing={24}>
+            <Form.Item label='Milestone Name' name='milestone10' rules={[{ required: false }]}>
+              <Input />
+            </Form.Item>
+            <Form.Item label='Due Date' name='dateDue10' rules={[{ required: false }]}>
+              <DatePicker width={200} defaultPickerValue={startMonth} disabledDate={(d) => !d?.isBetween(startMonth, endMonth, undefined, '[]')} />
+            </Form.Item>
+          </Spacing>
+        )}
+        {milestoneIdx < 5 && <Button type='secondary' icon={<PlusIcon />} onClick={() => setMilestoneIdx(milestoneIdx + 1)} />}
+      </Spacing>
+    </>
+  );
+};
+
+export default InitiativeMilestones;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeRoles.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeRoles.tsx
new file mode 100644
index 0000000..c0be8fd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeRoles.tsx
@@ -0,0 +1,43 @@
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import Form from '@strata/tempo/lib/form/Form';
+import InputTextArea from '@strata/tempo/lib/inputtextarea/InputTextArea';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import React from 'react';
+import { IUserProfile } from './data/IUserProfile';
+
+export interface IInitiativeRolesProps {
+  owners: IUserProfile[];
+  costLeaders: IUserProfile[];
+  executiveSponsors: IUserProfile[];
+  stakeholders: IUserProfile[];
+  isLocked?: boolean;
+  isStrategicOpportunity?: boolean;
+}
+
+const InitiativeRoles: React.FC<IInitiativeRolesProps> = (props: IInitiativeRolesProps) => {
+  const { owners, costLeaders, executiveSponsors, stakeholders, isLocked, isStrategicOpportunity = false } = props;
+
+  return (
+    <>
+      <Spacing padding={16} column>
+        <Form.Item label='Cost Leader' name='costLeader' rules={[{ required: !isStrategicOpportunity }]}>
+          <DropDown items={costLeaders} itemTextField='fullName' itemValueField='userGuid' showSearch disabled={isLocked ?? false} />
+        </Form.Item>
+        <Form.Item label='Owner' name='owner' rules={[{ required: !isStrategicOpportunity }]}>
+          <DropDown items={owners} itemTextField='fullName' itemValueField='userGuid' showSearch disabled={isLocked ?? false} />
+        </Form.Item>
+        <Form.Item label='Executive Sponsor' name='executiveSponsor' rules={[{ required: !isStrategicOpportunity }]}>
+          <DropDown items={executiveSponsors} itemTextField='fullName' itemValueField='userGuid' showSearch disabled={isLocked ?? false} />
+        </Form.Item>
+        <Form.Item label='Stakeholders' name='stakeholders' rules={[{ required: false }]}>
+          <DropDown multiSelect={true} items={stakeholders} itemTextField='fullName' itemValueField='userGuid' showSearch disabled={(isLocked ?? false) && isStrategicOpportunity} />
+        </Form.Item>
+        <Form.Item label='Team Member(s)' name='teamMembers' rules={[{ required: false, max: 4000 }]}>
+          <InputTextArea width={400} disabled={(isLocked ?? false) && isStrategicOpportunity} />
+        </Form.Item>
+      </Spacing>
+    </>
+  );
+};
+
+export default InitiativeRoles;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeRollupDropdown.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeRollupDropdown.tsx
new file mode 100644
index 0000000..9597a29
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/InitiativeRollupDropdown.tsx
@@ -0,0 +1,72 @@
+import Button from '@strata/tempo/lib/button/Button';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import Form from '@strata/tempo/lib/form/Form';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import React, { useContext, useEffect, useState } from 'react';
+import { initiativeRollupColumnService } from '../../initiatives/data/initiativeRollupColumnService';
+import UserSettingContext from '../userSetting/UserSettingContext';
+import RollupValueModal from './RollupValueModal';
+
+export interface InitiativeRollupDropdownProps {
+  columnId: number;
+  label: string;
+  name: string;
+  rollupColumnValues: any[];
+}
+
+const InitiativeRollupDropdown: React.FC<InitiativeRollupDropdownProps> = (props: InitiativeRollupDropdownProps) => {
+  const { columnId, label, name, rollupColumnValues } = props;
+  const [rollupValues, setRollupValues] = useState<any[]>([]);
+  const [newRollupValueVisible, setNewRollupValueVisible] = useState<boolean>(false);
+
+  const { isAdmin } = useContext(UserSettingContext);
+
+  useEffect(() => {
+    setRollupValues(rollupColumnValues);
+  }, [rollupColumnValues]);
+
+  const handleRollupValueOk = async (columnId: number, value: string) => {
+    if (!rollupValues.find((v) => v.value === value)) {
+      const newValue = await initiativeRollupColumnService.addValue(columnId, value);
+      rollupColumnValues.push(newValue);
+      switch (columnId) {
+        case 1:
+          setRollupValues(rollupValues);
+          break;
+        case 2:
+          setRollupValues(rollupValues);
+          break;
+        case 3:
+          setRollupValues(rollupValues);
+          break;
+      }
+    }
+    setNewRollupValueVisible(false);
+  };
+
+  return (
+    <>
+      {label !== '' ? (
+        <Form.Item label={label} name={name}>
+          <DropDown
+            items={rollupValues}
+            itemTextField='value'
+            itemValueField='initiativeRollupValueId'
+            extra={
+              isAdmin ? (
+                <Button type='link' icon={<PlusIcon />} onClick={() => setNewRollupValueVisible(true)}>
+                  Add Rollup Value
+                </Button>
+              ) : null
+            }
+          />
+        </Form.Item>
+      ) : (
+        <></>
+      )}
+      <RollupValueModal isVisible={newRollupValueVisible} rollupValues={rollupValues} onOk={handleRollupValueOk} onCancel={() => setNewRollupValueVisible(false)} header={label} columnId={columnId} />
+    </>
+  );
+};
+
+export default InitiativeRollupDropdown;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/RollupValueModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/RollupValueModal.tsx
new file mode 100644
index 0000000..87f38ac
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/RollupValueModal.tsx
@@ -0,0 +1,55 @@
+import Form from '@strata/tempo/lib/form';
+import Input from '@strata/tempo/lib/input';
+import Modal from '@strata/tempo/lib/modal';
+import React from 'react';
+
+interface IRollupValueModalProps {
+  header: string;
+  columnId: number;
+  isVisible: boolean;
+  rollupValues: any[];
+  onOk: (columnId: number, value: string) => void;
+  onCancel: () => void;
+}
+
+const RollupValueModal: React.FC<IRollupValueModalProps> = (props: IRollupValueModalProps) => {
+  const { header, columnId, isVisible, rollupValues, onOk, onCancel } = props;
+  const [form] = Form.useForm();
+
+  const handleOk = async () => {
+    try {
+      const rollup = await form.validateFields();
+      const rollupValue = rollup.RollupValue.toLowerCase();
+      if (rollupValues.some((x) => x.value.toLowerCase() === rollupValue)) {
+        form.setFields([
+          {
+            name: 'RollupValue',
+            errors: ['Rollup name already exists.']
+          }
+        ]);
+      } else {
+        onOk(columnId, rollup.RollupValue);
+        form.resetFields();
+      }
+    } catch {
+      // intentionally left blank
+    }
+  };
+
+  const handleCancel = () => {
+    form.resetFields();
+    onCancel();
+  };
+
+  return (
+    <Modal title={`Add ${header} Value`} onCancel={handleCancel} onOk={handleOk} visible={isVisible}>
+      <Form form={form}>
+        <Form.Item label={header} rules={[{ required: true, whitespace: true }]} name='RollupValue'>
+          <Input placeholder={`new ${header} Value`} autoFocus />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export default RollupValueModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/WorkstreamModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/WorkstreamModal.tsx
new file mode 100644
index 0000000..76ba603
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/WorkstreamModal.tsx
@@ -0,0 +1,54 @@
+import Form from '@strata/tempo/lib/form';
+import Input from '@strata/tempo/lib/input';
+import Modal from '@strata/tempo/lib/modal';
+import React from 'react';
+import { IWorkstream } from './data/IWorkstream';
+
+interface IWorkstreamModalProps {
+  isVisible: boolean;
+  workstreams: IWorkstream[];
+  onOk: (note: string) => void;
+  onCancel: () => void;
+}
+
+const WorkstreamModal: React.FC<IWorkstreamModalProps> = (props: IWorkstreamModalProps) => {
+  const { isVisible, workstreams, onOk, onCancel } = props;
+  const [form] = Form.useForm();
+
+  const handleOk = async () => {
+    try {
+      const workstream = await form.validateFields();
+      const workstreamValue = workstream.workstream.toLowerCase();
+      if (workstreams.some((x) => x.workstream.toLowerCase() === workstreamValue)) {
+        form.setFields([
+          {
+            name: 'workstream',
+            errors: ['Workstream name already exists.']
+          }
+        ]);
+      } else {
+        onOk(workstream.workstream);
+        form.resetFields();
+      }
+    } catch {
+      // intentionally left blank
+    }
+  };
+
+  const handleCancel = () => {
+    form.resetFields();
+    onCancel();
+  };
+
+  return (
+    <Modal title='Add Workstream' onCancel={handleCancel} onOk={handleOk} visible={isVisible}>
+      <Form form={form}>
+        <Form.Item label='Workstream' rules={[{ required: true, whitespace: true }]} name='workstream'>
+          <Input placeholder='new workstream' autoFocus />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export default WorkstreamModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiative.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiative.ts
new file mode 100644
index 0000000..6fa860d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiative.ts
@@ -0,0 +1,211 @@
+import dayjs from 'dayjs';
+import { DATE_NUMBER_FORMAT } from '../../data/DateString';
+import { ITrackingMonth } from '../../data/ITrackingMonth';
+import { IInitiativeDto } from './IInitiativeDto';
+
+export interface IInitiative extends IInitiativeDto {
+  startTracking: dayjs.Dayjs;
+  endTracking: dayjs.Dayjs;
+  trackingMonths: ITrackingMonth[];
+  dateDue1: dayjs.Dayjs | null;
+  dateDue2: dayjs.Dayjs | null;
+  dateDue3: dayjs.Dayjs | null;
+  dateDue4: dayjs.Dayjs | null;
+  dateDue5: dayjs.Dayjs | null;
+  dateDue6: dayjs.Dayjs | null;
+  dateDue7: dayjs.Dayjs | null;
+  dateDue8: dayjs.Dayjs | null;
+  dateDue9: dayjs.Dayjs | null;
+  dateDue10: dayjs.Dayjs | null;
+}
+
+export const newInitiative = (data: Partial<IInitiative> = {}): IInitiative => {
+  return {
+    ...{
+      name: '',
+      opportunityGuid: '00000000-0000-0000-0000-000000000000',
+      configurationGuid: '',
+      initiativeGuid: '00000000-0000-0000-0000-000000000000',
+      costDriver: '',
+      isFinalized: false,
+      isLocked: false,
+      trackingStart: '',
+      startTracking: dayjs(''),
+      endTracking: dayjs(''),
+      trackingMonths: [],
+      startMonth: '',
+      endMonth: '',
+      goalStatement: '',
+      workstream: '',
+      plannedImprovements: '',
+      costLeader: '',
+      owner: '',
+      executiveSponsor: '',
+      stakeholders: [],
+      teamMembers: '',
+      milestone1: '',
+      milestone2: '',
+      milestone3: '',
+      milestone4: '',
+      milestone5: '',
+      milestone6: '',
+      milestone7: '',
+      milestone8: '',
+      milestone9: '',
+      milestone10: '',
+      dueDate1: '',
+      dueDate2: '',
+      dueDate3: '',
+      dueDate4: '',
+      dueDate5: '',
+      dueDate6: '',
+      dueDate7: '',
+      dueDate8: '',
+      dueDate9: '',
+      dueDate10: '',
+      dateDue1: null,
+      dateDue2: null,
+      dateDue3: null,
+      dateDue4: null,
+      dateDue5: null,
+      dateDue6: null,
+      dateDue7: null,
+      dateDue8: null,
+      dateDue9: null,
+      dateDue10: null,
+      savingsRampUp01: 100,
+      savingsRampUp02: 100,
+      savingsRampUp03: 100,
+      savingsRampUp04: 100,
+      savingsRampUp05: 100,
+      savingsRampUp06: 100,
+      savingsRampUp07: 100,
+      savingsRampUp08: 100,
+      savingsRampUp09: 100,
+      savingsRampUp10: 100,
+      savingsRampUp11: 100,
+      savingsRampUp12: 100,
+      coI01: 0,
+      coI02: 0,
+      coI03: 0,
+      coI04: 0,
+      coI05: 0,
+      coI06: 0,
+      coI07: 0,
+      coI08: 0,
+      coI09: 0,
+      coI10: 0,
+      coI11: 0,
+      coI12: 0,
+      score01: 0,
+      score02: 0,
+      score03: 0,
+      score04: 0,
+      score05: 0,
+      score06: 0,
+      score07: 0,
+      score08: 0,
+      score09: 0,
+      score10: 0,
+      initiativeRollup1Id: 0,
+      initiativeRollup2Id: 0,
+      initiativeRollup3Id: 0
+    },
+    ...data
+  };
+};
+
+export const cleanUpInitiative = (data: Partial<IInitiative> = {}): IInitiative => {
+  return newInitiative({
+    ...data,
+    ...{
+      startTracking: getMoment(data.trackingStart),
+      costLeader: getGuid(data.costLeader),
+      executiveSponsor: getGuid(data.executiveSponsor),
+      owner: getGuid(data.owner),
+      dateDue1: getMoment(data.dueDate1),
+      dateDue2: getMoment(data.dueDate2),
+      dateDue3: getMoment(data.dueDate3),
+      dateDue4: getMoment(data.dueDate4),
+      dateDue5: getMoment(data.dueDate5),
+      dateDue6: getMoment(data.dueDate6),
+      dateDue7: getMoment(data.dueDate7),
+      dateDue8: getMoment(data.dueDate8),
+      dateDue9: getMoment(data.dueDate9),
+      dateDue10: getMoment(data.dueDate10)
+    }
+  });
+};
+
+export const getInitiative = (initiativeData: IInitiative, opportunityGuid: string, name: string): IInitiative => {
+  const initiative = newInitiative({ ...initiativeData });
+  initiative.opportunityGuid = opportunityGuid;
+  // Doing this because the DatePicker doesn't handle being an initial value setting
+  if (initiative) {
+    const data = newInitiative({
+      ...{
+        opportunityGuid: initiative.opportunityGuid,
+        name: name ?? initiative.name,
+        trackingStart: initiative.trackingStart,
+        startTracking: getMoment(initiative.trackingStart),
+        goalStatement: initiative.goalStatement,
+        workstream: initiative.workstream,
+        plannedImprovements: initiative.plannedImprovements,
+        costLeader: getGuid(initiative.costLeader),
+        executiveSponsor: getGuid(initiative.executiveSponsor),
+        owner: getGuid(initiative.owner),
+        stakeholders: initiative.stakeholders,
+        teamMembers: initiative.teamMembers,
+        milestone1: initiative.milestone1,
+        milestone2: initiative.milestone2,
+        milestone3: initiative.milestone3,
+        milestone4: initiative.milestone4,
+        milestone5: initiative.milestone5,
+        milestone6: initiative.milestone6,
+        milestone7: initiative.milestone7,
+        milestone8: initiative.milestone8,
+        milestone9: initiative.milestone9,
+        milestone10: initiative.milestone10,
+        dueDate1: initiative.dueDate1,
+        dueDate2: initiative.dueDate2,
+        dueDate3: initiative.dueDate3,
+        dueDate4: initiative.dueDate4,
+        dueDate5: initiative.dueDate5,
+        dueDate6: initiative.dueDate6,
+        dueDate7: initiative.dueDate7,
+        dueDate8: initiative.dueDate8,
+        dueDate9: initiative.dueDate9,
+        dueDate10: initiative.dueDate10,
+        dateDue1: getMoment(initiative.dueDate1),
+        dateDue2: getMoment(initiative.dueDate2),
+        dateDue3: getMoment(initiative.dueDate3),
+        dateDue4: getMoment(initiative.dueDate4),
+        dateDue5: getMoment(initiative.dueDate5),
+        dateDue6: getMoment(initiative.dueDate6),
+        dateDue7: getMoment(initiative.dueDate7),
+        dateDue8: getMoment(initiative.dueDate8),
+        dateDue9: getMoment(initiative.dueDate9),
+        dateDue10: getMoment(initiative.dueDate10)
+      }
+    });
+    if (initiative.dueDate1 === '00010101' || initiative.dueDate1 === '') {
+      initiative.dateDue1 = dayjs('');
+    }
+    return data;
+  }
+  return newInitiative({ ...{ name: name, opportunityGuid: opportunityGuid } });
+};
+
+export const getMoment = (dueDate?: string): dayjs.Dayjs | undefined => {
+  if (dueDate) {
+    return dueDate === '' || dueDate === '00010101' ? undefined : dayjs(dueDate, DATE_NUMBER_FORMAT);
+  }
+  return undefined;
+};
+
+export const getGuid = (guid?: string): string | undefined => {
+  if (guid) {
+    return guid === '00000000-0000-0000-0000-000000000000' ? undefined : guid;
+  }
+  return undefined;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeCriteriaDto.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeCriteriaDto.ts
new file mode 100644
index 0000000..7bf6860
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeCriteriaDto.ts
@@ -0,0 +1,8 @@
+export interface IInitiativeCriteriaDto {
+  initiativeCriteriaGuid: string;
+  name: string;
+  initiativeDataField: string;
+  options: DropdownItem[];
+}
+
+type DropdownItem = { text: string; value: number };
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeDto.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeDto.ts
new file mode 100644
index 0000000..bf54f56
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeDto.ts
@@ -0,0 +1,197 @@
+import dayjs from 'dayjs';
+import { IInitiative, newInitiative } from './IInitiative';
+import { toDateStr } from '../../utilities';
+
+export interface IInitiativeDto {
+  name: string;
+  opportunityGuid: string;
+  initiativeGuid: string;
+  costDriver: string;
+  isFinalized: boolean;
+  isLocked: boolean;
+  trackingStart: string;
+  startMonth: string;
+  endMonth: string;
+  goalStatement: string;
+  workstream: string;
+  plannedImprovements: string;
+  costLeader: string;
+  owner: string;
+  executiveSponsor: string;
+  stakeholders: string[];
+  teamMembers: string;
+  milestone1: string;
+  milestone2: string;
+  milestone3: string;
+  milestone4: string;
+  milestone5: string;
+  milestone6: string;
+  milestone7: string;
+  milestone8: string;
+  milestone9: string;
+  milestone10: string;
+  dueDate1: string;
+  dueDate2: string;
+  dueDate3: string;
+  dueDate4: string;
+  dueDate5: string;
+  dueDate6: string;
+  dueDate7: string;
+  dueDate8: string;
+  dueDate9: string;
+  dueDate10: string;
+  savingsRampUp01: number;
+  savingsRampUp02: number;
+  savingsRampUp03: number;
+  savingsRampUp04: number;
+  savingsRampUp05: number;
+  savingsRampUp06: number;
+  savingsRampUp07: number;
+  savingsRampUp08: number;
+  savingsRampUp09: number;
+  savingsRampUp10: number;
+  savingsRampUp11: number;
+  savingsRampUp12: number;
+  coI01: number;
+  coI02: number;
+  coI03: number;
+  coI04: number;
+  coI05: number;
+  coI06: number;
+  coI07: number;
+  coI08: number;
+  coI09: number;
+  coI10: number;
+  coI11: number;
+  coI12: number;
+  score01: number;
+  score02: number;
+  score03: number;
+  score04: number;
+  score05: number;
+  score06: number;
+  score07: number;
+  score08: number;
+  score09: number;
+  score10: number;
+  initiativeRollup1Id: number;
+  initiativeRollup2Id: number;
+  initiativeRollup3Id: number;
+}
+
+export const cleanUpInitiative = (data: Partial<IInitiative>): IInitiativeDto => {
+  const initiative = newInitiative({ ...data });
+  initiative.trackingStart = dayjs(data.startTracking ?? '').format('YYYYMMDD');
+  initiative.goalStatement = data.goalStatement ?? '';
+  initiative.workstream = data.workstream ?? '';
+  initiative.plannedImprovements = data.plannedImprovements ?? '';
+  initiative.stakeholders = data.stakeholders ?? [];
+  initiative.teamMembers = data.teamMembers ?? '';
+  initiative.milestone1 = data.milestone1 ?? '';
+  initiative.milestone2 = data.milestone2 ?? '';
+  initiative.milestone3 = data.milestone3 ?? '';
+  initiative.milestone4 = data.milestone4 ?? '';
+  initiative.milestone5 = data.milestone5 ?? '';
+  initiative.milestone6 = data.milestone6 ?? '';
+  initiative.milestone7 = data.milestone7 ?? '';
+  initiative.milestone8 = data.milestone8 ?? '';
+  initiative.milestone9 = data.milestone9 ?? '';
+  initiative.milestone10 = data.milestone10 ?? '';
+  initiative.dueDate1 = toDateStr(initiative.dateDue1);
+  initiative.dueDate2 = toDateStr(initiative.dateDue2);
+  initiative.dueDate3 = toDateStr(initiative.dateDue3);
+  initiative.dueDate4 = toDateStr(initiative.dateDue4);
+  initiative.dueDate5 = toDateStr(initiative.dateDue5);
+  initiative.dueDate6 = toDateStr(initiative.dateDue6);
+  initiative.dueDate7 = toDateStr(initiative.dateDue7);
+  initiative.dueDate8 = toDateStr(initiative.dateDue8);
+  initiative.dueDate9 = toDateStr(initiative.dateDue9);
+  initiative.dueDate10 = toDateStr(initiative.dateDue10);
+  initiative.initiativeRollup1Id = data.initiativeRollup1Id ?? 0;
+  initiative.initiativeRollup2Id = data.initiativeRollup2Id ?? 0;
+  initiative.initiativeRollup3Id = data.initiativeRollup3Id ?? 0;
+  return initiative;
+};
+
+export const newInitiativeDto = (data: Partial<IInitiativeDto> = {}): IInitiativeDto => {
+  const initiative = {
+    ...{
+      name: '',
+      opportunityGuid: '00000000-0000-0000-0000-000000000000',
+      initiativeGuid: '00000000-0000-0000-0000-000000000000',
+      costDriver: '',
+      isFinalized: false,
+      isLocked: false,
+      trackingStart: '',
+      startMonth: '',
+      endMonth: '',
+      goalStatement: '',
+      workstream: '',
+      plannedImprovements: '',
+      costLeader: '',
+      owner: '',
+      executiveSponsor: '',
+      stakeholders: [],
+      teamMembers: '',
+      milestone1: '',
+      milestone2: '',
+      milestone3: '',
+      milestone4: '',
+      milestone5: '',
+      milestone6: '',
+      milestone7: '',
+      milestone8: '',
+      milestone9: '',
+      milestone10: '',
+      dueDate1: '',
+      dueDate2: '',
+      dueDate3: '',
+      dueDate4: '',
+      dueDate5: '',
+      dueDate6: '',
+      dueDate7: '',
+      dueDate8: '',
+      dueDate9: '',
+      dueDate10: '',
+      savingsRampUp01: 100,
+      savingsRampUp02: 100,
+      savingsRampUp03: 100,
+      savingsRampUp04: 100,
+      savingsRampUp05: 100,
+      savingsRampUp06: 100,
+      savingsRampUp07: 100,
+      savingsRampUp08: 100,
+      savingsRampUp09: 100,
+      savingsRampUp10: 100,
+      savingsRampUp11: 100,
+      savingsRampUp12: 100,
+      coI01: 0,
+      coI02: 0,
+      coI03: 0,
+      coI04: 0,
+      coI05: 0,
+      coI06: 0,
+      coI07: 0,
+      coI08: 0,
+      coI09: 0,
+      coI10: 0,
+      coI11: 0,
+      coI12: 0,
+      score01: 0,
+      score02: 0,
+      score03: 0,
+      score04: 0,
+      score05: 0,
+      score06: 0,
+      score07: 0,
+      score08: 0,
+      score09: 0,
+      score10: 0,
+      initiativeRollup1Id: 0,
+      initiativeRollup2Id: 0,
+      initiativeRollup3Id: 0
+    },
+    ...data
+  };
+  return initiative;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeInfo.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeInfo.ts
new file mode 100644
index 0000000..f17e5ca
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeInfo.ts
@@ -0,0 +1,89 @@
+import { ITrackingMonth } from '../../data/ITrackingMonth';
+import { IInitiativeDto } from './IInitiativeDto';
+
+export interface IInitiativeInfo extends IInitiativeDto {
+  trackingMonths: ITrackingMonth[];
+}
+
+export const newInitiativeInfo = (data: Partial<IInitiativeInfo> = {}): IInitiativeInfo => {
+  return {
+    ...{
+      name: '',
+      opportunityGuid: '00000000-0000-0000-0000-000000000000',
+      initiativeGuid: '00000000-0000-0000-0000-000000000000',
+      costDriver: '',
+      isFinalized: false,
+      isLocked: false,
+      trackingStart: '',
+      startMonth: '',
+      endMonth: '',
+      goalStatement: '',
+      workstream: '',
+      plannedImprovements: '',
+      costLeader: '',
+      owner: '',
+      executiveSponsor: '',
+      stakeholders: [],
+      teamMembers: '',
+      milestone1: '',
+      milestone2: '',
+      milestone3: '',
+      milestone4: '',
+      milestone5: '',
+      milestone6: '',
+      milestone7: '',
+      milestone8: '',
+      milestone9: '',
+      milestone10: '',
+      dueDate1: '',
+      dueDate2: '',
+      dueDate3: '',
+      dueDate4: '',
+      dueDate5: '',
+      dueDate6: '',
+      dueDate7: '',
+      dueDate8: '',
+      dueDate9: '',
+      dueDate10: '',
+      savingsRampUp01: 100,
+      savingsRampUp02: 100,
+      savingsRampUp03: 100,
+      savingsRampUp04: 100,
+      savingsRampUp05: 100,
+      savingsRampUp06: 100,
+      savingsRampUp07: 100,
+      savingsRampUp08: 100,
+      savingsRampUp09: 100,
+      savingsRampUp10: 100,
+      savingsRampUp11: 100,
+      savingsRampUp12: 100,
+      coI01: 0,
+      coI02: 0,
+      coI03: 0,
+      coI04: 0,
+      coI05: 0,
+      coI06: 0,
+      coI07: 0,
+      coI08: 0,
+      coI09: 0,
+      coI10: 0,
+      coI11: 0,
+      coI12: 0,
+      score01: 0,
+      score02: 0,
+      score03: 0,
+      score04: 0,
+      score05: 0,
+      score06: 0,
+      score07: 0,
+      score08: 0,
+      score09: 0,
+      score10: 0,
+      initiativeRollup1Id: 0,
+      initiativeRollup2Id: 0,
+      initiativeRollup3Id: 0,
+      trackingMonths: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeProps.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeProps.ts
new file mode 100644
index 0000000..46a2fce
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeProps.ts
@@ -0,0 +1,5 @@
+export interface IInitiativeProps {
+  opportunityGuid?: string;
+  networkOpportunityId?: number;
+  networkOpportunityName?: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeScoresDto.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeScoresDto.ts
new file mode 100644
index 0000000..15afe85
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IInitiativeScoresDto.ts
@@ -0,0 +1,40 @@
+export interface IInitiativeScoresDto {
+  initiativeGUID: string;
+  score01?: number;
+  score02?: number;
+  score03?: number;
+  score04?: number;
+  score05?: number;
+  score07?: number;
+  score08?: number;
+  score09?: number;
+  score10?: number;
+}
+
+export const removeZeroes = (scores: IInitiativeScoresDto) => {
+  scores.score01 === 0 && (scores.score01 = undefined);
+  scores.score02 === 0 && (scores.score02 = undefined);
+  scores.score03 === 0 && (scores.score03 = undefined);
+  scores.score04 === 0 && (scores.score04 = undefined);
+  scores.score05 === 0 && (scores.score05 = undefined);
+  scores.score07 === 0 && (scores.score07 = undefined);
+  scores.score08 === 0 && (scores.score08 = undefined);
+  scores.score09 === 0 && (scores.score09 = undefined);
+  scores.score10 === 0 && (scores.score10 = undefined);
+
+  return scores;
+};
+
+export const removeUndefined = (scores: IInitiativeScoresDto) => {
+  !scores.score01 && (scores.score01 = 0);
+  !scores.score02 && (scores.score02 = 0);
+  !scores.score03 && (scores.score03 = 0);
+  !scores.score04 && (scores.score04 = 0);
+  !scores.score05 && (scores.score05 = 0);
+  !scores.score07 && (scores.score07 = 0);
+  !scores.score08 && (scores.score08 = 0);
+  !scores.score09 && (scores.score09 = 0);
+  !scores.score10 && (scores.score10 = 0);
+
+  return scores;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IOrgDefinedInitiative.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IOrgDefinedInitiative.ts
new file mode 100644
index 0000000..5ab6701
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IOrgDefinedInitiative.ts
@@ -0,0 +1,33 @@
+import dayjs from 'dayjs';
+import { IConfiguration } from '../../configuration/IConfiguration';
+import { getMoment } from '../../utilities';
+import { IInitiative, cleanUpInitiative } from './IInitiative';
+
+export interface IOrgDefinedInitiative extends IInitiative {
+  configurationGuid?: string;
+}
+
+export const newOrgDefinedInitiative = (configuration: IConfiguration | undefined, data: Partial<IOrgDefinedInitiative> = {}): IOrgDefinedInitiative => {
+  const initiative = cleanUpInitiative(data) as IOrgDefinedInitiative;
+  if (configuration) {
+    const trackingStart = dayjs(data.trackingStart ?? configuration?.orgDefinedTrackingStartDate);
+    const trackingEnd = dayjs(configuration?.orgDefinedTrackingEndDate);
+    const startMonth = trackingStart.format('YYYY-MM-DD');
+    const endMonth = trackingEnd.format('YYYY-MM-DD');
+    initiative.startMonth = data.startMonth ?? startMonth;
+    initiative.endMonth = data.endMonth ?? endMonth;
+    initiative.trackingStart = data.trackingStart ?? startMonth;
+    initiative.startTracking = data.startTracking ?? trackingStart;
+    initiative.endTracking = data.endTracking ?? trackingEnd;
+    if (data.configurationGuid === '') {
+      initiative.configurationGuid = configuration?.configurationGuid ?? '';
+    } else {
+      initiative.configurationGuid = data.configurationGuid ?? configuration?.configurationGuid ?? '';
+    }
+  }
+  return initiative;
+};
+
+export const cleanUpOrgDefinedInitiative = (data: Partial<IOrgDefinedInitiative> = {}): IOrgDefinedInitiative => {
+  return newOrgDefinedInitiative(undefined, { ...data, ...{ startTracking: getMoment(data.trackingStart) } });
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IOrgDefinedInitiativeDto.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IOrgDefinedInitiativeDto.ts
new file mode 100644
index 0000000..642bfd4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IOrgDefinedInitiativeDto.ts
@@ -0,0 +1,15 @@
+import { IInitiativeDto, cleanUpInitiative, newInitiativeDto } from './IInitiativeDto';
+import { IOrgDefinedInitiative } from './IOrgDefinedInitiative';
+
+export interface IOrgDefinedInitiativeDto extends IInitiativeDto {
+  configurationGuid?: string;
+}
+
+export const newOrgDefinedInitiativeDto = (data: Partial<IOrgDefinedInitiativeDto> = {}): IOrgDefinedInitiativeDto => {
+  const initiative = newInitiativeDto(data) as IOrgDefinedInitiativeDto;
+  return initiative;
+};
+
+export const cleanUpOrgDefinedInitiativeDto = (data: Partial<IOrgDefinedInitiative>): IOrgDefinedInitiativeDto => {
+  return newOrgDefinedInitiativeDto({ ...data, ...cleanUpInitiative({ ...data }) });
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IUserProfile.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IUserProfile.ts
new file mode 100644
index 0000000..6cf9861
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IUserProfile.ts
@@ -0,0 +1,4 @@
+export interface IUserProfile {
+  userGuid: string;
+  fullName: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IWorkstream.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IWorkstream.ts
new file mode 100644
index 0000000..4ba3567
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/IWorkstream.ts
@@ -0,0 +1,12 @@
+export interface IWorkstream {
+  workstream: string;
+}
+
+export const newWorkstream = (data: Partial<IWorkstream> = {}): IWorkstream => {
+  return {
+    ...{
+      workstream: ''
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/OpportunityCreateResponse.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/OpportunityCreateResponse.ts
new file mode 100644
index 0000000..cc96de4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/OpportunityCreateResponse.ts
@@ -0,0 +1,3 @@
+export interface OpportunityCreateResponse {
+  value: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/initiativeService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/initiativeService.ts
new file mode 100644
index 0000000..243b191
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/initiatives/data/initiativeService.ts
@@ -0,0 +1,54 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import { getSecureService } from '@strata/core/lib/http/getSecureService';
+import { IInitiative } from './IInitiative';
+import { IInitiativeCriteriaDto } from './IInitiativeCriteriaDto';
+import { IInitiativeDto } from './IInitiativeDto';
+import { IInitiativeInfo } from './IInitiativeInfo';
+import { IInitiativeScoresDto } from './IInitiativeScoresDto';
+import { IWorkstream } from './IWorkstream';
+
+const { httpGet, httpPut } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'initiatives';
+
+export const initiativeService = {
+  getInitiative: function (initiativeGuid: string): Promise<IInitiative> {
+    return httpGet<IInitiative>(`${url}/${initiativeGuid}`);
+  },
+
+  getWorkstreams: function (): Promise<IWorkstream[]> {
+    return httpGet(`${url}/workstreams`);
+  },
+
+  getCriteria: function (): Promise<IInitiativeCriteriaDto[]> {
+    return httpGet(`${url}/criteria`);
+  },
+
+  getScores: function (initiativeGuid: string): Promise<IInitiativeScoresDto> {
+    return httpGet(`${url}/scores/${initiativeGuid}`);
+  },
+
+  setScores(scores: IInitiativeScoresDto): Promise<boolean> {
+    return httpPut(`${url}/set-scores`, scores);
+  },
+
+  setRampupInfo: (initiativeInfo: IInitiativeDto) => {
+    httpPut(`${url}/set-rampup-info`, initiativeInfo);
+  },
+
+  getInitiativeInfo: (initiativeGuid: string): Promise<IInitiativeInfo> => {
+    return httpGet<IInitiativeInfo>(`${url}/${initiativeGuid}/initiative-info`);
+  },
+
+  finalize: async (initiativeGuid: string, callback: () => void): Promise<void> => {
+    return httpGet<void>(`${url}/${initiativeGuid}/finalize`).then(callback);
+  },
+
+  getOpportunityGuidByName: async (configurationGuid: string | undefined, opportunityType: number, name: string): Promise<string> => {
+    if (!configurationGuid) {
+      return Promise.reject('Configuration GUID is undefined');
+    }
+    return httpGet<string>(
+      `${url}/opportunity-guid-by-name?configurationGuid=${encodeURIComponent(configurationGuid)}&opportunityType=${encodeURIComponent(opportunityType)}&name=${encodeURIComponent(name)}`
+    );
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/notification/NotificationHub.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/notification/NotificationHub.ts
new file mode 100644
index 0000000..9ce2b1e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/notification/NotificationHub.ts
@@ -0,0 +1,13 @@
+import { createHubContext, IConnectionStatus } from '@strata/signalr/lib';
+
+const hubContext = createHubContext('NotificationHub');
+
+const hub = {
+  ...hubContext,
+  register: (connection: IConnectionStatus, successHandler: () => void, group: string): void => {
+    connection.connection?.send('register', group).then(() => {
+      successHandler();
+    });
+  }
+};
+export default hub;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/notification/NotificationNotifier.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/notification/NotificationNotifier.tsx
new file mode 100644
index 0000000..0c23846
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/notification/NotificationNotifier.tsx
@@ -0,0 +1,201 @@
+import { useJazzUrlWithVersion } from '@strata/core/lib/auth/useJazzUrlWithVersion';
+import intlService from '@strata/intl/lib';
+import { useHubEvent } from '@strata/signalr/lib';
+import Button from '@strata/tempo/lib/button';
+import useToast from '@strata/tempo/lib/toast';
+import React from 'react';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { getOpportunityLinkName } from '../utilities';
+import notificationHub from './NotificationHub';
+
+export const hubEvents = {
+  SendOpportunityCreate: 'SendOpportunityCreate',
+  SendInitiativeCreate: 'SendInitiativeCreate',
+  SendOpportunityDetails: 'SendOpportunityDetails',
+  SendOpportunityCreateError: 'SendOpportunityCreateError',
+  SendOpportunityCreateErrorDuplicateName: 'SendOpportunityCreateErrorDuplicateName',
+  SendOpportunityUpdate: 'SendOpportunityUpdate',
+  SendOpportunityUpdateDetails: 'SendOpportunityUpdateDetails',
+  SendOpportunityUpdateError: 'SendOpportunityUpdateError',
+  SendUploadFileStart: 'SendUploadFileStart',
+  SendUploadFileFinish: 'SendUploadFileFinish',
+  SendUploadFileError: 'SendUploadFileError',
+  SendInitiativeStatusChangeSuccess: 'SendInitiativeStatusChangeSuccess',
+  SendInitiativeStatusChangeError: 'SendInitiativeStatusChangeError',
+  SendInitiativeCreateSuccess: 'SendInitiativeCreateSuccess',
+  SendInitiativeFinalizeStart: 'SendInitiativeFinalizeStart',
+  SendInitiativeFinalizeSuccess: 'SendInitiativeFinalizeSuccess',
+  SendInitiativeFinalizeError: 'SendInitiativeFinalizeError',
+  SendPatientPopulationCaseTypeCreateSuccess: 'SendPatientPopulationCaseTypeCreateSuccess',
+  SendPatientPopulationCaseTypeAlreadyExist: 'SendPatientPopulationCaseTypeAlreadyExist',
+  SendPatientPopulationCaseTypeCreateError: 'SendPatientPopulationCaseTypeCreateError',
+  SendExplorationOpportunityCreateSuccess: 'SendExplorationOpportunityCreateSuccess',
+  SendExplorationOpportunityCreateError: 'SendExplorationOpportunityCreateError',
+  SendNetworkOpportunityPublish: 'SendNetworkOpportunityPublish',
+  SendNetworkOpportunityPublishSuccess: 'SendNetworkOpportunityPublishSuccess',
+  SendNetworkOpportunityPublishError: 'SendNetworkOpportunityPublishError',
+  SendOpportunityCreateUpdateSuccess: 'SendOpportunityCreateUpdateSuccess',
+  SendStrategicInitiativeTrackerSuccess: 'SendStrategicInitiativeTrackerSuccess',
+  SendStrategicInitiativeTrackerError: 'SendStrategicInitiativeTrackerError'
+};
+
+const NotificationNotifier: React.FC = ({ children }) => {
+  const hub = notificationHub.useConnection();
+  const jazzUrl = useJazzUrlWithVersion();
+  const toast = useToast();
+
+  useHubEvent(hub, hubEvents.SendOpportunityCreate, (opportunityName: string) => {
+    toast.show({ key: opportunityName, duration: 300, message: `Creating ${opportunityName}.`, toastType: 'info' });
+  });
+
+  useHubEvent(hub, hubEvents.SendInitiativeCreate, (opportunityName: string) => {
+    toast.show({ key: opportunityName, duration: 300, message: `Creating ${opportunityName} initiative.`, toastType: 'info' });
+  });
+
+  useHubEvent(hub, hubEvents.SendOpportunityDetails, (opportunityName: string, progress: number) => {
+    toast.show({
+      key: opportunityName,
+      duration: 300,
+      message: `Creating ${opportunityName} details${progress > 0 ? ' ' + intlService.formatNumber(progress, 'percent', undefined) : ''}.`,
+      toastType: 'info'
+    });
+  });
+
+  useHubEvent(hub, hubEvents.SendExplorationOpportunityCreateSuccess, (key: string, opportunityName: string, opportunityGuid: string) => {
+    toast.show({
+      key: key,
+      message: (
+        <>
+          <Button type='link' onClick={() => window.location.assign(`/continuousimprovement/exploration-opportunity/${opportunityGuid}`)}>
+            {opportunityName}
+          </Button>
+          &nbsp;saved.
+        </>
+      ),
+      toastType: 'success'
+    });
+  });
+
+  useHubEvent(hub, hubEvents.SendExplorationOpportunityCreateError, (key: string, opportunityName: string) => {
+    toast.show({ key: key, message: `${opportunityName} failed to save.`, toastType: 'error' });
+  });
+
+  useHubEvent(hub, hubEvents.SendNetworkOpportunityPublish, (opportunityName: string, isPublished: boolean) => {
+    toast.show({ key: opportunityName, duration: 300, message: `${isPublished ? `Publishing` : `Unpublishing`} ${opportunityName}.`, toastType: 'info' });
+  });
+
+  useHubEvent(hub, hubEvents.SendNetworkOpportunityPublishSuccess, (opportunityName: string, isPublished: boolean) => {
+    toast.show({
+      key: opportunityName,
+      duration: 300,
+      message: `${opportunityName} was successfully ${isPublished ? `published` : `unpublished`} and opportunity details are ${isPublished ? `now` : `no longer`} viewable in the client database.`,
+      toastType: 'success'
+    });
+  });
+
+  useHubEvent(hub, hubEvents.SendNetworkOpportunityPublishError, (opportunityName: string, isPublished: boolean) => {
+    toast.show({ key: opportunityName, duration: 300, message: `An error occurred while ${isPublished ? `publishing` : `unpublishing`} ${opportunityName}.`, toastType: 'error' });
+  });
+
+  useHubEvent(hub, hubEvents.SendOpportunityCreateError, (opportunityName: string, optionalMessage: string) => {
+    toast.show({ key: opportunityName, duration: 0, message: `${opportunityName} failed to save. ${optionalMessage}`, toastType: 'error' });
+  });
+
+  useHubEvent(hub, hubEvents.SendOpportunityUpdate, (opportunityName: string) => {
+    toast.show({ key: opportunityName, duration: 300, message: `Updating ${opportunityName}.`, toastType: 'info' });
+  });
+
+  useHubEvent(hub, hubEvents.SendOpportunityUpdateDetails, (opportunityName: string, progress: number) => {
+    toast.show({
+      key: opportunityName,
+      duration: 300,
+      message: `Updating ${opportunityName} details${progress > 0 ? ' ' + intlService.formatNumber(progress, 'percent', undefined) : ''}.`,
+      toastType: 'info'
+    });
+  });
+
+  useHubEvent(hub, hubEvents.SendInitiativeCreateSuccess, (opportunityGuid: string, opportunityName: string) => {
+    if (window.location.pathname === `/continuousimprovement/charge-code-opportunity/${opportunityGuid}`) {
+      window.location.reload();
+    } else {
+      window.location.assign(`/continuousimprovement/charge-code-opportunity/${opportunityGuid}`);
+    }
+  });
+
+  useHubEvent(hub, hubEvents.SendOpportunityCreateUpdateSuccess, (opportunityGuid: string, isTempoPage: boolean, opportunityName: string, isUpdate: boolean, opportunityType: OpportunityTypes) => {
+    const opportunityLinkName = getOpportunityLinkName(opportunityType);
+    toast.show({
+      key: opportunityName,
+      toastType: 'success',
+      duration: 0,
+      message: (
+        <>
+          <Button type='link' onClick={() => window.location.assign(`/continuousimprovement/${opportunityLinkName}-opportunity/${opportunityGuid}`)}>
+            {opportunityName}
+          </Button>
+          &nbsp;Opportunity {isUpdate ? 'Updated' : 'Created'}
+        </>
+      )
+    });
+
+    if (window.location.pathname === `/continuousimprovement/${opportunityLinkName}-opportunity/${opportunityGuid}`) {
+      window.location.reload();
+    } else {
+      isTempoPage
+        ? window.location.assign(`/continuousimprovement/${opportunityLinkName}-opportunity/${opportunityGuid}`)
+        : window.location.assign(`${jazzUrl}CCI/Encounter/OpportunityViewer.aspx?opportunityGuid=${opportunityGuid}`);
+    }
+  });
+
+  useHubEvent(hub, hubEvents.SendOpportunityUpdateError, (opportunityName: string, optionalMessage: string) => {
+    toast.show({ key: opportunityName, duration: 0, message: `${opportunityName} failed to update. ${optionalMessage}`, toastType: 'error' });
+  });
+
+  useHubEvent(hub, hubEvents.SendUploadFileStart, (userName: string, filename: string) => {
+    toast.show({ key: userName + filename, duration: 0, message: `Uploading file: ${filename} to Database has started.`, toastType: 'info' });
+  });
+
+  useHubEvent(hub, hubEvents.SendUploadFileFinish, (userName: string, filename: string) => {
+    toast.show({ key: userName + filename, message: `Uploading ${filename} has finished.`, toastType: 'success' });
+  });
+
+  useHubEvent(hub, hubEvents.SendUploadFileError, (userName: string, filename: string) => {
+    toast.show({ key: userName + filename, duration: 0, message: `An error occurred uploading file: ${filename}.`, toastType: 'error' });
+  });
+
+  useHubEvent(hub, hubEvents.SendInitiativeStatusChangeSuccess, (key: string) => {
+    toast.show({ key: key, message: `Status changed successfully.`, toastType: 'success' });
+  });
+
+  useHubEvent(hub, hubEvents.SendInitiativeStatusChangeError, (key: string) => {
+    toast.show({ key: key, duration: 0, message: `Failed updating to status.`, toastType: 'error' });
+  });
+
+  useHubEvent(hub, hubEvents.SendInitiativeFinalizeStart, (key: string) => {
+    toast.show({ key: key, message: `Finalizing initiative...`, toastType: 'info' });
+  });
+
+  useHubEvent(hub, hubEvents.SendInitiativeFinalizeSuccess, (key: string) => {
+    toast.show({ key: key, message: `Initiative has been finalized and tracking has been run.`, toastType: 'success' });
+  });
+
+  useHubEvent(hub, hubEvents.SendInitiativeFinalizeError, (key: string, optionalMessage: string) => {
+    toast.show({ key: key, message: `An error occurred while finalizing the initiative. ${optionalMessage}`, toastType: 'error' });
+  });
+
+  useHubEvent(hub, hubEvents.SendPatientPopulationCaseTypeCreateSuccess, (key: string, count: string) => {
+    toast.show({ key: key, message: `${count} patient population case types added.`, toastType: 'success' });
+  });
+
+  useHubEvent(hub, hubEvents.SendPatientPopulationCaseTypeAlreadyExist, (key: string, count: string) => {
+    toast.show({ key: key, duration: 0, message: `${count} case type(s) have already been added.`, toastType: 'error' });
+  });
+
+  useHubEvent(hub, hubEvents.SendPatientPopulationCaseTypeCreateError, (key: string) => {
+    toast.show({ key: key, duration: 0, message: `An error occurred saving patient population case type(s).`, toastType: 'error' });
+  });
+
+  return <>{children}</>;
+};
+
+export default NotificationNotifier;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/NotesModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/NotesModal.tsx
new file mode 100644
index 0000000..34a0f93
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/NotesModal.tsx
@@ -0,0 +1,56 @@
+import React, { useEffect } from 'react';
+import Form from '@strata/tempo/lib/form';
+import Modal from '@strata/tempo/lib/modal';
+import InputTextArea from '@strata/tempo/lib/inputtextarea';
+import { IOpportunity } from './data/IOpportunity';
+
+interface INotesModalProps {
+  opportunity: IOpportunity | null;
+  isVisible: boolean;
+  onSave: (note: string) => void;
+  onCancel: () => void;
+}
+
+const NotesModal: React.FC<INotesModalProps> = (props: INotesModalProps) => {
+  const { opportunity, isVisible, onSave, onCancel } = props;
+  const [form] = Form.useForm();
+
+  useEffect(() => {
+    if (opportunity) {
+      form.setFieldsValue({ note: opportunity.note });
+    }
+  }, [form, opportunity]);
+
+  const handleOk = async () => {
+    try {
+      const newNote = await form.validateFields();
+      onSave(newNote.note);
+    } catch {
+      // intentionally left blank
+    }
+  };
+
+  const handleCancel = () => {
+    form.resetFields();
+    if (opportunity) {
+      form.setFieldsValue({ note: opportunity.note });
+    }
+    onCancel();
+  };
+
+  if (opportunity) {
+    return (
+      <Modal title={opportunity.opportunityKey + ' - Notes'} visible={isVisible} onCancel={handleCancel} onOk={handleOk}>
+        <Form form={form}>
+          <Form.Item name='note'>
+            <InputTextArea placeholder='Type something...' maxLength={2000} rows={6} autoFocus />
+          </Form.Item>
+        </Form>
+      </Modal>
+    );
+  } else {
+    return null;
+  }
+};
+
+export default NotesModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunitiesGrid.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunitiesGrid.tsx
new file mode 100644
index 0000000..fbd1315
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunitiesGrid.tsx
@@ -0,0 +1,353 @@
+import { logger } from '@strata/logging/lib';
+import ActionBar from '@strata/tempo/lib/actionbar';
+import Button from '@strata/tempo/lib/button';
+import ButtonMenu from '@strata/tempo/lib/buttonmenu';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import CheckCircleIcon from '@strata/tempo/lib/icon/CheckCircleIcon';
+import EditIcon from '@strata/tempo/lib/icon/EditIcon';
+import EyeIcon from '@strata/tempo/lib/icon/EyeIcon';
+import EyeInvisibleIcon from '@strata/tempo/lib/icon/EyeInvisibleIcon';
+import FilterIcon from '@strata/tempo/lib/icon/FilterIcon';
+import MessageIcon from '@strata/tempo/lib/icon/MessageIcon';
+import Input from '@strata/tempo/lib/input';
+import Link from '@strata/tempo/lib/link/Link';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import useToast from '@strata/tempo/lib/toast';
+import Tooltip from '@strata/tempo/lib/tooltip';
+import debounce from 'lodash/debounce';
+import React, { useEffect, useMemo, useState } from 'react';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { commentService } from '../comments/data/commentService';
+import { IPagingOptions } from '../paging';
+import { securityService } from '../security/data/securityService';
+import NotesModal from './NotesModal';
+import { IOpportunity, IOpportunityFilters, IOpportunityService } from './data';
+
+const TOAST_KEY = 'opportuntiyShowHide';
+
+export interface IOpportunitiesGridProps {
+  getOpportunityUrl: (opportunity: IOpportunity) => string;
+  getInitiativeUrl?: (opportunity: IOpportunity) => string;
+  configurationGuid: string;
+  opportunityService: IOpportunityService;
+  filters: IOpportunityFilters;
+  numOfSelectedFilters: number;
+  identifiedSavingsIndex?: number;
+  searchPlaceholderText: string;
+  hasSourceOpportunities?: boolean;
+
+  onSearch: (search: string) => void;
+  onFilter: () => void;
+  customAction?: React.ReactElement;
+
+  /** Custom column configuration */
+  children?: React.ReactElement[];
+}
+
+const initialPagingOptions = {
+  sortField: 'identifiedSavings',
+  sortOrder: -1,
+  first: 0,
+  rows: 25
+};
+
+const OpportunitiesGrid: React.FC<IOpportunitiesGridProps> = (props: IOpportunitiesGridProps) => {
+  const {
+    configurationGuid,
+    opportunityService,
+    filters,
+    getOpportunityUrl,
+    getInitiativeUrl,
+    numOfSelectedFilters,
+    searchPlaceholderText,
+    onSearch,
+    onFilter,
+    identifiedSavingsIndex = 1,
+    hasSourceOpportunities = true,
+    customAction: customActions
+  } = props;
+  const [lazyData, setLazyData] = useState<IOpportunity[] | []>();
+  const [loading, setLoading] = useState(false);
+  const [pagingOptions, setPagingOptions] = useState<IPagingOptions>(initialPagingOptions);
+  const [totalOpportunities, setTotalOpportunities] = useState<number>();
+  const [refreshCounter, setRefreshCounter] = useState<number>(0);
+  const [notesOpportunity, setNotesOpportunity] = useState<IOpportunity | null>(null);
+  const [notesModalVisible, setNotesModalVisible] = useState<boolean>(false);
+  const [hasGeneralAccess, setGeneralAccess] = useState<boolean>(false);
+  const toast = useToast();
+
+  useEffect(() => {
+    const loadData = async () => {
+      if (configurationGuid === '') {
+        return;
+      }
+      setLoading(true);
+      try {
+        const hasGeneralAccess = await securityService.getGeneralAccessPermissions();
+        setGeneralAccess(hasGeneralAccess);
+        const pagedResponse = await opportunityService.getOpportunities(configurationGuid, pagingOptions, filters);
+        setTotalOpportunities(pagedResponse.pagingInfo.totalNumberOfResults);
+        setLazyData(pagedResponse.data);
+      } finally {
+        setLoading(false);
+      }
+    };
+    loadData();
+  }, [opportunityService, pagingOptions, filters, configurationGuid, refreshCounter]);
+
+  const handleSearch = (searchValue: string) => {
+    logger.log('search', searchValue);
+    onSearch(searchValue);
+  };
+
+  // handleSearch is internal function and does not need to be in dependency array
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const handleSearchWithDebounce = useMemo(() => debounce((value) => handleSearch(value), 500), []);
+
+  const handleSaveNotes = async (note: string) => {
+    if (notesOpportunity == null) {
+      return;
+    }
+
+    try {
+      const regex = /^(CC|EN|EX|FF|NET) - ([\d]*)$/gim;
+      if (regex.test(notesOpportunity.opportunityKey)) {
+        const prefix = notesOpportunity.opportunityKey.replace(regex, '$1');
+        const opportunityId = notesOpportunity.opportunityId;
+        let opportunityType = OpportunityTypes.Exploration;
+        switch (prefix) {
+          case 'CC':
+            opportunityType = OpportunityTypes.ChargeCode;
+            break;
+          case 'EN':
+            opportunityType = OpportunityTypes.Encounter;
+            break;
+          case 'EX':
+            opportunityType = OpportunityTypes.Exploration;
+            break;
+          case 'FF':
+            opportunityType = OpportunityTypes.FreeForm;
+            break;
+          case 'NET':
+            opportunityType = OpportunityTypes.Network;
+            break;
+        }
+        await commentService.addComment(opportunityType, opportunityId, false, note);
+      }
+      await opportunityService.setNote(notesOpportunity.opportunityGuid, note);
+      notesOpportunity.note = note;
+      refreshData(notesOpportunity);
+    } finally {
+      setNotesOpportunity(null);
+    }
+  };
+
+  const handleHideOrShow = async (opp: IOpportunity) => {
+    await opportunityService.setHidden(opp.opportunityGuid, !opp.isHidden);
+    opp.isHidden = !opp.isHidden;
+    refreshData(opp);
+
+    const shouldShowToast = opp.isHidden === filters.viewVisible;
+
+    if (shouldShowToast) {
+      const hiddenMsg = opp.isHidden ? 'hidden' : 'visible';
+      toast.show({
+        key: TOAST_KEY,
+        duration: null,
+        toastType: 'info',
+        message: (
+          <>
+            <Button onClick={handleHideOrShowRefresh} type='link'>
+              Refresh
+            </Button>{' '}
+            page to remove {hiddenMsg} opportunities.
+          </>
+        )
+      });
+    }
+  };
+
+  const handleHideOrShowRefresh = () => {
+    setRefreshCounter((counter) => counter + 1);
+    const hiddenMsg = filters.viewVisible ? 'Hidden' : 'Visible';
+    toast.show({
+      key: TOAST_KEY,
+      duration: 10,
+      toastType: 'success',
+      message: `${hiddenMsg} opportunities removed. View them by changing the display in the filter menu.`
+    });
+  };
+
+  const handleExport = async (e: { key: React.Key }) => {
+    const exportFilters = e.key === 'All' ? ({ viewVisible: undefined } as IOpportunityFilters) : filters;
+    await opportunityService.export(configurationGuid, pagingOptions, exportFilters);
+  };
+
+  const refreshData = (opp: IOpportunity) => {
+    if (lazyData === undefined) return;
+    lazyData.map((item: IOpportunity) => {
+      if (item.opportunityGuid === opp.opportunityGuid) {
+        return opp;
+      }
+      return item;
+    });
+    setLazyData([...lazyData]);
+  };
+
+  const renderCustomActionComponents = () => {
+    return customActions;
+  };
+
+  const renderColumns = () => {
+    // check user permissions to view opportunity if the opp type is enforcing security
+    const regex = new RegExp('^(CC|FF)');
+    const columns: JSX.Element[] = [
+      <DataGrid.Column
+        key='oppId'
+        header='ID'
+        field='opportunityKey'
+        sortable
+        width={160}
+        body={(rowData) =>
+          regex.test(rowData.opportunityKey) ? (
+            hasGeneralAccess ? (
+              <Link href={getOpportunityUrl(rowData)}>{rowData.opportunityKey}</Link>
+            ) : (
+              <Text>{rowData.opportunityKey}</Text>
+            )
+          ) : (
+            <Link href={getOpportunityUrl(rowData)}>{rowData.opportunityKey}</Link>
+          )
+        }
+      />
+    ];
+    const identifiedSavingsColumn = <DataGrid.NumberColumn key='identifiedSavings' field='identifiedSavings' header='Identified Variation' format='currency' sortable width={144} />;
+
+    if (props.children) {
+      columns.push(...props.children);
+      columns.splice(identifiedSavingsIndex, 0, identifiedSavingsColumn);
+    } else {
+      columns.push(identifiedSavingsColumn);
+    }
+
+    columns.push(
+      <DataGrid.CheckboxColumn
+        key='initiativeGuid'
+        header='Initiative'
+        field='initiativeGuid'
+        sortable
+        width={96}
+        body={(rowData) =>
+          rowData.hasInitiative && (
+            <Tooltip title='Created'>
+              <CheckCircleIcon />
+            </Tooltip>
+          )
+        }
+      />
+    );
+    if (hasSourceOpportunities && hasGeneralAccess) {
+      columns.push(
+        <DataGrid.Column
+          key='sourceOpportunity'
+          field='sourceOpportunity'
+          header='Source Opportunity'
+          width={154}
+          body={(rowData) => (rowData.sourceOpportunityId > 0 ? <Link href={`/network-opportunity/${rowData.sourceOpportunityId}`}>{rowData.sourceOpportunity}</Link> : '')}
+        />
+      );
+    }
+    columns.push(<DataGrid.EmptyColumn key='empty' />);
+    columns.push(
+      <DataGrid.Column
+        key='actions'
+        align='left'
+        width={200}
+        body={(rowData) => (
+          <>
+            <Spacing vAlign='center' hAlign='right' itemSpacing={8}>
+              {rowData.hasInitiative && getInitiativeUrl && (
+                <Tooltip title={rowData.hasInitiative ? 'View Initiative' : ''} placement='left'>
+                  <Link href={getInitiativeUrl(rowData)}>View Initiative</Link>
+                </Tooltip>
+              )}
+              <Tooltip title={rowData.note !== '' ? 'View Note' : 'Add Note'} placement='left'>
+                <Button
+                  type='link'
+                  icon={rowData.note !== '' ? <MessageIcon /> : <EditIcon />}
+                  onClick={() => {
+                    setNotesOpportunity(rowData);
+                    setNotesModalVisible(true);
+                  }}
+                />
+              </Tooltip>
+              <Tooltip title={rowData.isHidden ? 'Unhide Opportunity' : 'Hide Opportunity'} placement='left'>
+                <Button type='link' icon={rowData.isHidden ? <EyeInvisibleIcon /> : <EyeIcon />} onClick={() => handleHideOrShow(rowData)} />
+              </Tooltip>
+            </Spacing>
+          </>
+        )}
+      />
+    );
+
+    return columns;
+  };
+
+  return (
+    <>
+      <NotesModal
+        opportunity={notesOpportunity}
+        isVisible={notesModalVisible}
+        onSave={handleSaveNotes}
+        onCancel={() => {
+          setNotesOpportunity(null);
+          setNotesModalVisible(false);
+        }}
+      />
+      <ActionBar
+        filters={
+          <>
+            <Button type={numOfSelectedFilters > 0 ? 'primary' : 'secondary'} icon={<FilterIcon />} onClick={onFilter}>
+              Filters{numOfSelectedFilters > 0 ? ` (${numOfSelectedFilters})` : ''}
+            </Button>
+            <Input width={312} search placeholder={searchPlaceholderText} onChange={(e) => handleSearchWithDebounce(e.target.value)} />
+          </>
+        }
+        actions={
+          <>
+            <ButtonMenu
+              buttonText='Export'
+              onClick={handleExport}
+              items={[
+                { key: 'All', label: 'Export All' },
+                { key: 'Filtered', label: 'Export Filtered List' }
+              ]}
+            />
+            {renderCustomActionComponents()}
+          </>
+        }
+      ></ActionBar>
+      <DataGrid
+        scrollable
+        loading={loading}
+        value={lazyData}
+        lazy
+        sortField={pagingOptions.sortField}
+        sortOrder={pagingOptions.sortOrder}
+        paginator
+        rows={pagingOptions.rows}
+        first={pagingOptions.first}
+        totalRecords={totalOpportunities}
+        onSort={(e) => setPagingOptions({ ...pagingOptions, ...e })}
+        onPage={(e) => setPagingOptions({ ...pagingOptions, ...e })}
+        dataKey='opportunityKey'
+        scrollableOffset={1}
+      >
+        {renderColumns()}
+      </DataGrid>
+    </>
+  );
+};
+
+export default OpportunitiesGrid;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunitiesHeader.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunitiesHeader.tsx
new file mode 100644
index 0000000..0ce89a5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunitiesHeader.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import Header from '@strata/tempo/lib/header';
+import Button from '@strata/tempo/lib/button';
+import { useHelpCenter } from '@strata/core/lib';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+
+interface IOpportunitiesHeaderProps {
+  headerTitle: string;
+  helpId: string;
+}
+
+const OpportunitiesHeader: React.FC<IOpportunitiesHeaderProps> = (props: IOpportunitiesHeaderProps) => {
+  const { headerTitle, helpId } = props;
+  const helpCenter = useHelpCenter();
+
+  const extras = (
+    <>
+      <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage(helpId)} />
+    </>
+  );
+  return <Header title={headerTitle} extra={extras}></Header>;
+};
+
+export default OpportunitiesHeader;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunityDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunityDetail.tsx
new file mode 100644
index 0000000..1d0f73c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunityDetail.tsx
@@ -0,0 +1,105 @@
+import React from 'react';
+import MetricGroup from '@strata/tempo/lib/metricgroup';
+
+export interface IOpportunityDetailProps {
+  totalCases: number;
+  costPerCase: number;
+  totalCost: number;
+  goalTotalCost: number;
+  goalCostPerCase: number;
+  improvementTotalCost: number;
+  improvementCostPerCase: number;
+}
+
+const OpportunityDetail: React.FC<IOpportunityDetailProps> = (props: IOpportunityDetailProps) => {
+  const { totalCases, costPerCase, totalCost, goalTotalCost, goalCostPerCase, improvementTotalCost, improvementCostPerCase } = props;
+
+  return (
+    <MetricGroup
+      items={[
+        {
+          key: 'number-of-cases',
+          label: 'Number of Cases',
+          values: [
+            {
+              key: 'baseline',
+              label: 'Baseline',
+              value: totalCases,
+              formatOptions: {
+                nullValue: '-'
+              }
+            }
+          ]
+        },
+        {
+          key: 'cost-per-case',
+          label: 'Cost per Case',
+          values: [
+            {
+              key: 'baseline',
+              label: 'Baseline',
+              value: costPerCase,
+              format: 'currency',
+              formatOptions: {
+                nullValue: '-'
+              }
+            },
+            {
+              key: 'goal',
+              label: 'Goal',
+              value: goalCostPerCase,
+              format: 'currency',
+              formatOptions: {
+                nullValue: '-'
+              }
+            },
+            {
+              key: 'improvement',
+              label: 'Improvement',
+              value: improvementCostPerCase,
+              format: 'currency',
+              formatOptions: {
+                nullValue: '-'
+              }
+            }
+          ]
+        },
+        {
+          key: 'total-cost',
+          label: 'Total Cost',
+          values: [
+            {
+              key: 'baseline',
+              label: 'Baseline',
+              value: totalCost,
+              format: 'currency',
+              formatOptions: {
+                nullValue: '-'
+              }
+            },
+            {
+              key: 'goal',
+              label: 'Goal',
+              value: goalTotalCost,
+              format: 'currency',
+              formatOptions: {
+                nullValue: '-'
+              }
+            },
+            {
+              key: 'improvement',
+              label: 'Improvement',
+              value: improvementTotalCost,
+              format: 'currency',
+              formatOptions: {
+                nullValue: '-'
+              }
+            }
+          ]
+        }
+      ]}
+    />
+  );
+};
+
+export default OpportunityDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunityDetailHeader.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunityDetailHeader.tsx
new file mode 100644
index 0000000..275348d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunityDetailHeader.tsx
@@ -0,0 +1,324 @@
+import { useHelpCenter } from '@strata/core/lib';
+import Button from '@strata/tempo/lib/button/Button';
+import ButtonMenu from '@strata/tempo/lib/buttonmenu/ButtonMenu';
+import Header from '@strata/tempo/lib/header/Header';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import useModal from '@strata/tempo/lib/modal/useModal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import useToast from '@strata/tempo/lib/toast';
+import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
+import { opportunityService as chargeCodeOpportunityService } from '../../charge-code/opportunities/data/opportunityService';
+import { opportunityService as encounterOpportunityService } from '../../encounter/opportunities/data/opportunityService';
+import { opportunityService as freeFormOpportunityService } from '../../free-form/opportunities/data/opportunityService';
+import { clientOpportunityLinkService } from '../../network/opportunities/data/clientOppportunityLinkService';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import CommentsDrawer from '../comments/CommentsDrawer';
+import { useConfigurations } from '../configuration/ConfigurationContext';
+import CommittedSavingsDrawer from '../initiatives/CommittedSavingsDrawer';
+import CriteriaScoringDrawer from '../initiatives/CriteriaScoringDrawer';
+import SimpleSecurityModal from '../security/SimpleSecurityModal';
+import { ISecurityDisplay } from '../security/data/ISecurityDisplay';
+import { securityService } from '../security/data/securityService';
+import OpportunityWorkbooksButtonMenu from './OpportunityWorkbooksButtonMenu';
+import { opportunityWorkbookService } from './data/opportunityWorkbookService';
+
+interface IOpportunityDetailHeaderProps {
+  title: string;
+  breadcrumbHref: string;
+  breadcrumbText: string;
+  opportunityType: OpportunityTypes;
+  opportunityId: number;
+  opportunityGuid: string;
+  initiativeGuid?: string;
+  sourceOpportunityId: number;
+  hasInitiative: boolean;
+  isEditable: boolean;
+  isHidden?: boolean;
+  isLocked: boolean;
+  isSecurityEditable: boolean;
+  helpId: string;
+  handleHideOrShow: () => void;
+  handleDelete: (callback: () => void, failed: (err: any) => void) => void;
+  editInitiative?: (opportunityGuid: string) => void;
+  getInitiativeInfo: () => void;
+  finalizeInitiative: () => void;
+}
+const OpportunityDetailHeader: React.FC<IOpportunityDetailHeaderProps> = (props: IOpportunityDetailHeaderProps) => {
+  const {
+    title,
+    breadcrumbHref,
+    breadcrumbText,
+    opportunityType,
+    opportunityId,
+    opportunityGuid,
+    initiativeGuid,
+    sourceOpportunityId,
+    hasInitiative,
+    isEditable,
+    isHidden,
+    isLocked,
+    isSecurityEditable,
+    helpId,
+    handleDelete,
+    handleHideOrShow,
+    editInitiative,
+    getInitiativeInfo,
+    finalizeInitiative
+  } = props;
+  const [isSecurityVisible, setIsSecurityVisible] = useState(false);
+  const [isCommittedSavingsDrawerVisible, setIsCommittedSavingsDrawerVisible] = useState(false);
+  const [isCriteriaScoringDrawerVisible, setIsCriteriaScoringDrawerVisible] = useState(false);
+  const [opportunityPage, setOpportunityPage] = useState('');
+  const [showComments, setShowComments] = useState<boolean>(false);
+  const [canAddWorkbooks, setCanAddWorkbooks] = useState(false);
+  const history = useHistory();
+  const sourceOpportunityButton = sourceOpportunityId !== -1 ? <Button onClick={() => history.push(`/network-opportunity/${sourceOpportunityId}`)}>Source Opportunity</Button> : <></>;
+  const helpCenter = useHelpCenter();
+  const toast = useToast();
+  const modal = useModal();
+  const { currentConfiguration } = useConfigurations();
+
+  useEffect(() => {
+    const fetchData = async () => {
+      const isWorkbookFeatureEnabled = await opportunityWorkbookService.getOpportunityWorkbooksEnabled();
+      setCanAddWorkbooks(isWorkbookFeatureEnabled);
+    };
+    fetchData();
+  }, []);
+
+  useEffect(() => {
+    switch (opportunityType) {
+      case OpportunityTypes.ChargeCode:
+        setOpportunityPage('/charge-code');
+        break;
+      case OpportunityTypes.Encounter:
+        setOpportunityPage('/encounter');
+        break;
+      case OpportunityTypes.FreeForm:
+        setOpportunityPage('/free-form');
+        break;
+      default:
+        setOpportunityPage('');
+        break;
+    }
+  }, [opportunityType]);
+
+  const handleAddSecurity = async (securities: ISecurityDisplay[]) => {
+    if (!opportunityGuid) {
+      return;
+    }
+    const success = await securityService.setSimpleSecurities(opportunityGuid, securities);
+    if (success) {
+      toast.show({
+        key: 'SecuritySuccess',
+        toastType: 'success',
+        message: 'Securities for this opportunity have been updated.'
+      });
+    } else {
+      toast.show({
+        key: 'SecurityError',
+        toastType: 'error',
+        message: 'There was a problem updating securities for this opportunity.'
+      });
+    }
+    setIsSecurityVisible(false);
+  };
+
+  const onDelete = async () => {
+    if (!opportunityGuid) {
+      return;
+    }
+    modal.confirm({
+      title: `Permanently discard ${title}?`,
+      content: `This will permanently delete the opportunity ${title}?`,
+      okText: 'Delete',
+      cancelText: 'Cancel',
+      async onOk() {
+        handleDelete(
+          async () => {
+            await clientOpportunityLinkService.deleteOpportunityLink(opportunityGuid, currentConfiguration?.configurationGuid ?? '');
+            window.location.replace(`/continuousimprovement${opportunityPage}/opportunities`);
+          },
+          async (err: any) => {
+            toast.show({
+              key: title ?? '',
+              toastType: 'error',
+              message: `Unable to delete ${title ?? ''}`,
+              duration: 0
+            });
+          }
+        );
+      }
+    });
+  };
+
+  const commentsButton =
+    opportunityId && opportunityGuid ? (
+      <Button type='secondary' onClick={() => setShowComments(true)}>
+        Comments
+      </Button>
+    ) : (
+      <></>
+    );
+
+  const workbooksButton = canAddWorkbooks ? (
+    <OpportunityWorkbooksButtonMenu
+      isLocked={isLocked}
+      opportunityGuid={opportunityGuid}
+      opportunityType={opportunityType}
+      isStrategicOpportunity={false}
+      isOpportunity={false}
+    ></OpportunityWorkbooksButtonMenu>
+  ) : (
+    <></>
+  );
+
+  const toolsButton =
+    isEditable || isSecurityEditable ? (
+      <ButtonMenu
+        type='secondary'
+        buttonText='Tools'
+        items={[
+          { key: 'isHidden', label: `${isHidden ? 'Unhide' : 'Hide'} Opportunity`, hidden: !isEditable, onClick: handleHideOrShow },
+          { key: 'security', label: 'Edit Security', hidden: !isSecurityEditable, onClick: () => setIsSecurityVisible(true) },
+          { key: 'delete', label: 'Delete Opportunity', hidden: !isEditable || isLocked, onClick: onDelete }
+        ]}
+      />
+    ) : (
+      <></>
+    );
+
+  const editButton =
+    opportunityGuid && initiativeGuid && hasInitiative ? (
+      <ButtonMenu
+        type='secondary'
+        buttonText={isEditable ? 'Edit' : 'View'}
+        items={[
+          { key: 'editInitiative', label: `Initiative`, onClick: () => editInitiative && editInitiative(opportunityGuid), hidden: !editInitiative || !isEditable },
+          { key: 'committedSavings', label: `Committed Savings`, onClick: () => setIsCommittedSavingsDrawerVisible(true), hidden: !initiativeGuid },
+          { key: 'criteriaScoring', label: `Criteria Scoring`, onClick: () => setIsCriteriaScoringDrawerVisible(true), hidden: !initiativeGuid }
+        ]}
+      />
+    ) : (
+      <></>
+    );
+
+  const viewTrackButton = hasInitiative ? (
+    isLocked ? (
+      <Button type='primary' onClick={getInitiativeInfo}>
+        Track Initiative
+      </Button>
+    ) : isEditable ? (
+      <Button type='primary' onClick={finalizeInitiative}>
+        Finalize Initiative
+      </Button>
+    ) : (
+      <></>
+    )
+  ) : isEditable ? (
+    <Button type='primary' onClick={getInitiativeInfo}>
+      Create Initiative
+    </Button>
+  ) : (
+    <></>
+  );
+
+  const commentsDrawer =
+    opportunityId && opportunityGuid ? (
+      <CommentsDrawer
+        isVisible={showComments}
+        isGlobal={false}
+        isEditable={isEditable}
+        opportunityType={opportunityType}
+        opportunityId={opportunityId}
+        onOk={async (comment: string) => {
+          switch (opportunityType) {
+            case OpportunityTypes.ChargeCode:
+              await chargeCodeOpportunityService.setNote(opportunityGuid, comment);
+              break;
+            case OpportunityTypes.Encounter:
+              await encounterOpportunityService.setNote(opportunityGuid, comment);
+              break;
+            case OpportunityTypes.FreeForm:
+              await freeFormOpportunityService.setNote(opportunityGuid, comment);
+              break;
+            default:
+              break;
+          }
+          setShowComments(false);
+        }}
+        onCancel={() => setShowComments(false)}
+      />
+    ) : (
+      <></>
+    );
+
+  const committedSavingsDrawer =
+    initiativeGuid && hasInitiative ? (
+      <CommittedSavingsDrawer
+        initiativeGuid={initiativeGuid}
+        isVisible={isCommittedSavingsDrawerVisible}
+        isEditable={isEditable}
+        onClose={() => setIsCommittedSavingsDrawerVisible(false)}
+        onSubmit={() => setIsCommittedSavingsDrawerVisible(false)}
+        onCancel={() => setIsCommittedSavingsDrawerVisible(false)}
+      />
+    ) : (
+      <></>
+    );
+
+  const criteriaScoringDrawer =
+    initiativeGuid && hasInitiative ? (
+      <CriteriaScoringDrawer
+        isVisible={isCriteriaScoringDrawerVisible}
+        initiativeGuid={initiativeGuid}
+        isEditable={isEditable}
+        onSubmit={() => setIsCriteriaScoringDrawerVisible(false)}
+        onCancel={() => setIsCriteriaScoringDrawerVisible(false)}
+      ></CriteriaScoringDrawer>
+    ) : (
+      <></>
+    );
+
+  const securityModal = opportunityGuid ? (
+    <SimpleSecurityModal
+      isVisible={isSecurityVisible}
+      lootId={opportunityGuid}
+      onModalClose={() => setIsSecurityVisible(false)}
+      onModalOk={(securities: ISecurityDisplay[]) => handleAddSecurity(securities)}
+      getSecurity={securityService.getSecurity}
+    />
+  ) : (
+    <></>
+  );
+
+  return (
+    <>
+      <Header
+        title={title}
+        breadcrumbHref={breadcrumbHref}
+        breadcrumbText={breadcrumbText}
+        extra={
+          <>
+            <Spacing>
+              {sourceOpportunityButton}
+              {commentsButton}
+              {workbooksButton}
+              {toolsButton}
+              {editButton}
+              {viewTrackButton}
+              <Button type='tertiary' icon={<InfoCircleIcon />} onClick={() => helpCenter.openHelpPage(helpId)} />
+            </Spacing>
+          </>
+        }
+      />
+      {commentsDrawer}
+      {committedSavingsDrawer}
+      {criteriaScoringDrawer}
+      {securityModal}
+    </>
+  );
+};
+
+export default OpportunityDetailHeader;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunityDetailsCard.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunityDetailsCard.tsx
new file mode 100644
index 0000000..12d835b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunityDetailsCard.tsx
@@ -0,0 +1,87 @@
+import React from 'react';
+import Card from '@strata/tempo/lib/card';
+import Button from '@strata/tempo/lib/button';
+import Spacing from '@strata/tempo/lib/spacing';
+import Text from '@strata/tempo/lib/text';
+import intlService from '@strata/intl/lib';
+import { EncounterGroup } from './data/EncounterGroup';
+import { IOpportunityDetails } from './data/IOpportunity';
+
+export interface OpportunityDetailsCardProps {
+  isVisible: boolean;
+  opportunity?: IOpportunityDetails;
+  isEditButtonVisible: boolean;
+  onEdit: () => void;
+}
+
+const OpportunityDetailsCard: React.FC<OpportunityDetailsCardProps> = (props: OpportunityDetailsCardProps) => {
+  const { isVisible, opportunity, isEditButtonVisible, onEdit } = props;
+
+  const formatDates = (baseline: boolean): string => {
+    if (!opportunity) {
+      return '';
+    }
+    if (baseline) {
+      return `${intlService.formatDate(opportunity.baselineStartDate, 'date')}\xa0to\xa0${intlService.formatDate(opportunity.baselineEndDate, 'date')}`;
+    } else {
+      return `${intlService.formatDate(opportunity.trackingStartDate, 'date')}\xa0to\xa0${intlService.formatDate(opportunity.trackingEndDate, 'date')}`;
+    }
+  };
+
+  return (
+    <>
+      {isVisible && (
+        <Card title='Opportunity Details' extra={isEditButtonVisible ? <Button onClick={onEdit}>Edit Opportunity</Button> : undefined}>
+          <Spacing itemSpacing={8}>
+            <Spacing column itemSpacing={16} width={250}>
+              {opportunity?.encounterGroups ? (
+                <Spacing column itemSpacing={8}>
+                  <Text size='normal' strong>
+                    {opportunity?.encounterGroup === EncounterGroup.PatientPopulation ? <>Patient Population</> : <>Case Type</>}
+                  </Text>
+                  <Text ellipsis={{ rows: 1, expandable: true }}>{opportunity?.encounterGroups?.join(', ')}</Text>
+                </Spacing>
+              ) : (
+                <></>
+              )}
+              {opportunity?.chargeCodes ? (
+                <Spacing column itemSpacing={8}>
+                  <Text size='normal' strong>
+                    Charge Code
+                  </Text>
+                  <Text ellipsis={{ rows: 3, expandable: true }}>{opportunity?.chargeCodes.join(', ')}</Text>
+                </Spacing>
+              ) : (
+                <></>
+              )}
+            </Spacing>
+            <Spacing hAlign='right'>
+              <Spacing column itemSpacing={16}>
+                <Spacing column itemSpacing={8}>
+                  <Text size='normal' strong>
+                    Baseline Period
+                  </Text>
+                  <Text>{formatDates(true)}</Text>
+                </Spacing>
+                <Spacing column itemSpacing={8}>
+                  <Text size='normal' strong>
+                    Goal Period
+                  </Text>
+                  <Text>{formatDates(false)}</Text>
+                </Spacing>
+                <Spacing column itemSpacing={8}>
+                  <Text size='normal' strong>
+                    Seasonality
+                  </Text>
+                  <Text>{opportunity?.isSeasonal ? 'With\xa0Seasonality' : 'Without\xa0Seasonality'}</Text>
+                </Spacing>
+              </Spacing>
+            </Spacing>
+          </Spacing>
+        </Card>
+      )}
+    </>
+  );
+};
+
+export default OpportunityDetailsCard;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunityWorkbooksButtonMenu.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunityWorkbooksButtonMenu.tsx
new file mode 100644
index 0000000..f29fff0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/OpportunityWorkbooksButtonMenu.tsx
@@ -0,0 +1,267 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import Button from '@strata/tempo/lib/button/Button';
+import ButtonMenu from '@strata/tempo/lib/buttonmenu/ButtonMenu';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import SettingIcon from '@strata/tempo/lib/icon/SettingIcon';
+import { IMenuItem } from '@strata/tempo/lib/menu';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import Tooltip from '@strata/tempo/lib/tooltip/Tooltip';
+import TreeGrid from '@strata/tempo/lib/treegrid/TreeGrid';
+import React, { useEffect, useState } from 'react';
+import { OpportunityTypes, OpportunityTypesDisplayString } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { IWorkbook, analyticsService } from '../analytics/data/analyticsService';
+import PickerModal from '../components/PickerModal';
+import { IPickerItem } from '../data/IPickerItem';
+import { IGeneralOpportunityWorkbook, IOpportunityWorkbook, IStrategicOpportunityWorkbook } from './data/IOpportunityWorkbook';
+import { opportunityWorkbookService } from './data/opportunityWorkbookService';
+import { opportunityTypeWorkbookService } from './data/opportunityTypeWorkbookService';
+import { IOpportunityTypeWorkbook } from './data/IOpportunityTypeWorkbook';
+
+interface IOpportunityWorkbooksButtonMenuProps {
+  opportunityGuid: string;
+  opportunityType: OpportunityTypes;
+  isLocked: boolean;
+  isStrategicOpportunity: boolean;
+  isOpportunity: boolean;
+}
+
+const OpportunityWorkbooksButtonMenu: React.FC<IOpportunityWorkbooksButtonMenuProps> = (props: IOpportunityWorkbooksButtonMenuProps) => {
+  const { opportunityType, opportunityGuid, isLocked, isStrategicOpportunity = false, isOpportunity = true } = props;
+  const [opportunityWorkbooks, setOpportunityWorkbooks] = useState<IGeneralOpportunityWorkbook[]>([]);
+  const [opportunityTypeWorkbooks, setOpportunityTypeWorkbooks] = useState<IOpportunityTypeWorkbook[]>([]);
+  const [workbooks, setWorkbooks] = useState<IWorkbook[]>([]);
+  const [isManageWorkbookModalVisible, setIsManageWorkbookModalVisible] = useState(false);
+  const [isAddWorkBookPickerVisible, setIsAddWorkBookPickerVisible] = useState(false);
+  const [isOpportunitySpecific, setIsOpportunitySpecific] = useState(false);
+  const maxWorkbooks = 15;
+  const titleSingular = isStrategicOpportunity ? 'Attachment' : 'Workbook';
+  const titlePlural = isStrategicOpportunity ? 'Attachments' : 'Workbooks';
+
+  useEffect(() => {
+    const fetchData = async () => {
+      if (!isStrategicOpportunity) {
+        setOpportunityWorkbooks(await opportunityWorkbookService.getOpportunityWorkbooks(opportunityGuid));
+      } else {
+        setOpportunityWorkbooks(await opportunityWorkbookService.getStrategicOpportunityWorkbooks(opportunityGuid));
+      }
+      const oppTypeWorkbooks = await opportunityTypeWorkbookService.getOpportunityTypeWorkbooks(opportunityType);
+      setOpportunityTypeWorkbooks(oppTypeWorkbooks);
+      const workbooks = await analyticsService.getWorkbooks();
+      setWorkbooks(workbooks);
+    };
+    fetchData();
+  }, [opportunityGuid, opportunityType, isStrategicOpportunity]);
+
+  const handleOpenWorkbookPopup = (workbookId: number) => {
+    const url = `${appConfig.analyticsUrl}workbooks/${workbookId}`;
+    window.open(url, '_blank', 'popup=yes');
+  };
+
+  const handleShowWorkbookPicker = (isOpportunitySpecific: boolean) => {
+    setIsOpportunitySpecific(isOpportunitySpecific);
+    setIsAddWorkBookPickerVisible(true);
+  };
+
+  const handleAddWorkbooks = (values: IPickerItem[]) => {
+    setIsAddWorkBookPickerVisible(false);
+    if (isOpportunitySpecific) {
+      const newOpportunityWorkbooks = values.map((x) => ({ opportunityGuid: opportunityGuid, workbookId: x.value, name: x.text } as IOpportunityWorkbook));
+      if (!isStrategicOpportunity) {
+        opportunityWorkbookService.createOpportunityWorkbooks(newOpportunityWorkbooks);
+      } else {
+        opportunityWorkbookService.createStrategicOpportunityWorkbooks(
+          newOpportunityWorkbooks.map((opp) => ({ opportunityId: opportunityGuid, workbookId: opp.workbookId, name: opp.name } as IStrategicOpportunityWorkbook))
+        );
+      }
+      setOpportunityWorkbooks([...opportunityWorkbooks, ...newOpportunityWorkbooks]);
+    } else {
+      const newOpportunityTypeWorkbooks = values.map((x) => ({ opportunityType: opportunityType, workbookId: x.value, name: x.text } as IOpportunityTypeWorkbook));
+      opportunityTypeWorkbookService.createOpportunityTypeWorkbooks(newOpportunityTypeWorkbooks);
+      setOpportunityTypeWorkbooks([...opportunityTypeWorkbooks, ...newOpportunityTypeWorkbooks]);
+    }
+  };
+
+  const handleDeleteOpportunityWorkbook = (wb: IGeneralOpportunityWorkbook) => {
+    if (!isStrategicOpportunity) {
+      opportunityWorkbookService.deleteOpportunityWorkbooks(opportunityGuid, wb.workbookId);
+    } else {
+      opportunityWorkbookService.deleteStrategicOpportunityWorkbooks(opportunityGuid, wb.workbookId);
+    }
+    setOpportunityWorkbooks(opportunityWorkbooks.filter((x) => x.workbookId !== wb.workbookId));
+  };
+
+  const handleDeleteOpportunityTypeWorkbook = (wb: IOpportunityTypeWorkbook) => {
+    opportunityTypeWorkbookService.deleteOpportunityTypeWorkbooks(wb.opportunityType, wb.workbookId);
+    setOpportunityTypeWorkbooks(opportunityTypeWorkbooks.filter((x) => x.workbookId !== wb.workbookId));
+  };
+
+  const getWorkbookItems = () => {
+    const opportunityWorkbookItems = [
+      {
+        key: '',
+        type: 'group',
+        label: (
+          <Text color={'secondary'} size='small'>
+            {`${isOpportunity ? 'Opportunity' : 'Initiative'} ${titlePlural}`.toLocaleUpperCase()}
+          </Text>
+        ),
+        children: opportunityWorkbooks
+          .sort((a, b) => a.name.localeCompare(b.name))
+          .map((item: IGeneralOpportunityWorkbook) => {
+            return {
+              key: item.workbookId,
+              label: item.name,
+              onClick() {
+                handleOpenWorkbookPopup(item.workbookId);
+              }
+            } as IMenuItem;
+          })
+      },
+      { key: '', type: 'divider' }
+    ] as IMenuItem[];
+
+    const opportunityTypeWorkbookItems = [
+      {
+        key: '',
+        type: 'group',
+        label: (
+          <Text color={'secondary'} size='small'>
+            {`${OpportunityTypesDisplayString[opportunityType]} ${titlePlural}`.toLocaleUpperCase()}
+          </Text>
+        ),
+        children: opportunityTypeWorkbooks
+          .sort((a, b) => a.name.localeCompare(b.name))
+          .map((item: IOpportunityTypeWorkbook) => {
+            return {
+              key: item.workbookId,
+              label: item.name,
+              onClick() {
+                handleOpenWorkbookPopup(item.workbookId);
+              }
+            } as IMenuItem;
+          })
+      },
+      { key: '', type: 'divider' }
+    ] as IMenuItem[];
+
+    const manageButtonItem = [{ key: 'manage', icon: <SettingIcon />, label: `Manage ${titlePlural}`, hidden: isLocked, onClick: () => setIsManageWorkbookModalVisible(true) }];
+
+    let items = [] as IMenuItem[];
+    if (opportunityWorkbooks.length > 0) {
+      items = opportunityWorkbookItems;
+    }
+    if (opportunityTypeWorkbooks.length > 0) {
+      items = [...items, ...opportunityTypeWorkbookItems];
+    }
+    items = [...items, ...manageButtonItem];
+
+    return items as IMenuItem[];
+  };
+
+  const getManageWorkbookitems = () => {
+    const opportunityWorkbookItems = {
+      key: 'opportunity-specific-workbooks',
+      data: {
+        name: `${isOpportunity ? 'Opportunity' : 'Initiative'} ${titlePlural}`
+      },
+      children: opportunityWorkbooks.sort((a, b) => a.name.localeCompare(b.name))
+    };
+
+    const opportunityTypeWorkbookItems = {
+      key: 'opportunity-type-workbooks',
+      data: {
+        name: `${OpportunityTypesDisplayString[opportunityType]} ${titlePlural}`
+      },
+      children: opportunityTypeWorkbooks.sort((a, b) => a.name.localeCompare(b.name))
+    };
+
+    let items: any[] = [];
+    if (opportunityWorkbooks.length > 0) {
+      items = [...items, opportunityWorkbookItems];
+    }
+    if (opportunityTypeWorkbooks.length > 0) {
+      items = [...items, opportunityTypeWorkbookItems];
+    }
+
+    return items;
+  };
+
+  return (
+    <>
+      <ButtonMenu type='secondary' buttonText={titlePlural} items={getWorkbookItems()}></ButtonMenu>
+      <Modal
+        title={`Manage  ${titlePlural}`}
+        width='normal'
+        visible={isManageWorkbookModalVisible}
+        onCancel={() => setIsManageWorkbookModalVisible(false)}
+        removeBodyPadding
+        bodyBorder={['top', 'bottom']}
+        footer={null}
+      >
+        <Spacing style={{ margin: 8 }}>
+          <ButtonMenu
+            buttonText={`Add ${titleSingular}`}
+            type='primary'
+            icon={<PlusIcon />}
+            disabled={opportunityWorkbooks?.length + opportunityTypeWorkbooks?.length >= maxWorkbooks}
+            tooltip={opportunityWorkbooks?.length + opportunityTypeWorkbooks?.length >= maxWorkbooks ? `You can add a maximum of ${maxWorkbooks} ${titleSingular.toLowerCase()} shortcuts` : ''}
+            items={[
+              { key: '1', label: isOpportunity ? 'Opportunity' : 'Initiative', onClick: () => handleShowWorkbookPicker(true) },
+              { key: '2', label: `${OpportunityTypesDisplayString[opportunityType]}`, onClick: () => handleShowWorkbookPicker(false) }
+            ]}
+          />
+        </Spacing>
+        <TreeGrid sortField='name' sortOrder={0} defaultExpandAll value={getManageWorkbookitems()}>
+          <TreeGrid.Column expander field='name' width={140} />
+          <TreeGrid.Column
+            align='right'
+            width={100}
+            body={(rowData) =>
+              rowData.children === undefined ? (
+                <Tooltip title='Delete'>
+                  <Button
+                    type='link'
+                    icon={<DeleteIcon />}
+                    onClick={() =>
+                      rowData.opportunityGuid !== undefined || rowData.opportunityId !== undefined ? handleDeleteOpportunityWorkbook(rowData) : handleDeleteOpportunityTypeWorkbook(rowData)
+                    }
+                  >
+                    Delete
+                  </Button>
+                </Tooltip>
+              ) : (
+                ''
+              )
+            }
+          />
+        </TreeGrid>
+      </Modal>
+      {isAddWorkBookPickerVisible && (
+        <PickerModal
+          title={`Add ${titleSingular}`}
+          items={workbooks
+            .filter(function (item) {
+              // filter workbooks already added
+              return opportunityWorkbooks.map((x) => x.workbookId).indexOf(item.workbookId) === -1 && opportunityTypeWorkbooks.map((x) => x.workbookId).indexOf(item.workbookId) === -1;
+            })
+            .map((item: IWorkbook) => {
+              return {
+                text: item.name,
+                value: item.workbookId
+              } as IPickerItem;
+            })}
+          maxSelections={maxWorkbooks - (opportunityWorkbooks.length + opportunityTypeWorkbooks.length)} // max - current count
+          maxSelectionExceededMessage={`You can add a maximum of ${maxWorkbooks} ${titleSingular.toLowerCase()} shortcuts. Please remove selections and try again.`}
+          selectedItems={[]}
+          isVisible={isAddWorkBookPickerVisible}
+          onCancel={() => setIsAddWorkBookPickerVisible(false)}
+          onSave={(values) => handleAddWorkbooks(values)}
+        ></PickerModal>
+      )}
+    </>
+  );
+};
+export default OpportunityWorkbooksButtonMenu;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/EncounterGroup.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/EncounterGroup.ts
new file mode 100644
index 0000000..c22eae6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/EncounterGroup.ts
@@ -0,0 +1,5 @@
+export enum EncounterGroup {
+  CaseType = 0,
+  PatientPopulation = 1,
+  FlexibleExplorationPatientPopulation = 2
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunity.ts
new file mode 100644
index 0000000..ffe7b59
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunity.ts
@@ -0,0 +1,25 @@
+import { EncounterGroup } from './EncounterGroup';
+
+export interface IOpportunity {
+  opportunityKey: string;
+  opportunityId: number;
+  opportunityGuid: string;
+  identifiedSavings: number;
+  hasInitiative: boolean;
+  note: string;
+  isHidden: boolean;
+  initiativeGuid: string;
+  sourceOpportunity: string;
+  sourceOpportunityId: number;
+}
+
+export interface IOpportunityDetails extends IOpportunity {
+  baselineStartDate: Date;
+  baselineEndDate: Date;
+  trackingStartDate: Date;
+  trackingEndDate: Date;
+  isSeasonal: boolean;
+  encounterGroup: EncounterGroup;
+  chargeCodes: string[] | undefined;
+  encounterGroups: string[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunityFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunityFilters.ts
new file mode 100644
index 0000000..c4fb0d9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunityFilters.ts
@@ -0,0 +1,6 @@
+export interface IOpportunityFilters {
+  identifiedSavings?: number;
+  viewVisible?: boolean;
+  excludeInitiatives: boolean;
+  opportunitySearch: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunityService.ts
new file mode 100644
index 0000000..a8754cd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunityService.ts
@@ -0,0 +1,14 @@
+import { IOpportunityFilters, IOpportunity } from './';
+import { IPagingOptions, IPagedApiResponse, ISortOptions } from '../../paging';
+import { IInitiative } from '../../initiatives/data/IInitiative';
+
+export interface IOpportunityService {
+  getOpportunities: (configurationGuid: string, pagingOptions: IPagingOptions, filters: IOpportunityFilters) => Promise<IPagedApiResponse<IOpportunity>>;
+  export: (configurationGuid: string, sortOptions: ISortOptions, filters: IOpportunityFilters) => Promise<void>;
+  setHidden: (opportunityGuid: string, isHidden: boolean) => Promise<void>;
+  setNote: (opportunityGuid: string, note: string) => Promise<void>;
+  getInitiativeInfo?: (opporturnityGuid: string) => Promise<IInitiative>;
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [key: string]: any;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunityTypeWorkbook.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunityTypeWorkbook.ts
new file mode 100644
index 0000000..22db910
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunityTypeWorkbook.ts
@@ -0,0 +1,5 @@
+export interface IOpportunityTypeWorkbook {
+  opportunityType: number;
+  workbookId: number;
+  name: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunityWorkbook.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunityWorkbook.ts
new file mode 100644
index 0000000..aa8ee4d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IOpportunityWorkbook.ts
@@ -0,0 +1,14 @@
+export interface IOpportunityWorkbook extends IGeneralOpportunityWorkbook {
+  opportunityGuid: string;
+  workbookId: number;
+  name: string;
+}
+
+export interface IStrategicOpportunityWorkbook extends IGeneralOpportunityWorkbook {
+  opportunityId: string;
+}
+
+export interface IGeneralOpportunityWorkbook {
+  workbookId: number;
+  name: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IScoreFieldInfo.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IScoreFieldInfo.ts
new file mode 100644
index 0000000..1ad1e86
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/IScoreFieldInfo.ts
@@ -0,0 +1,10 @@
+import { IHierarchyFilter } from '@strata/score/lib/data';
+
+export interface IScoreFieldInfo {
+  dimensionName: string;
+  dimensionGuidOrGlobalId: string;
+  modalTitle: string;
+  label?: string;
+  hierarchyGuid?: string;
+  filters?: IHierarchyFilter[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/OpportunityLevelTypes.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/OpportunityLevelTypes.ts
new file mode 100644
index 0000000..22f5bb7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/OpportunityLevelTypes.ts
@@ -0,0 +1,7 @@
+export enum OpportunityLevelTypes {
+  Organization = 0,
+  Entity = 1,
+  ServiceLine = 2,
+  Specialty = 3,
+  Provider = 4
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/clientNetworkOpportunityLinkService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/clientNetworkOpportunityLinkService.ts
new file mode 100644
index 0000000..6ccb443
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/clientNetworkOpportunityLinkService.ts
@@ -0,0 +1,12 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+const { httpDelete } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'client-network-opportunity-link';
+
+export const clientNetworkOpportunityLinkService = {
+  deleteOpportunityLink: (opportunityGuid: string): Promise<boolean> => {
+    return httpDelete(`${url}/${opportunityGuid}`);
+  },
+  deleteInitiativeLink: (initiativeGuid: string): Promise<boolean> => {
+    return httpDelete(`${url}/${initiativeGuid}/delete-initiative-link`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/index.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/index.ts
new file mode 100644
index 0000000..1de12dc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/index.ts
@@ -0,0 +1,3 @@
+export * from './IOpportunity';
+export * from './IOpportunityFilters';
+export * from './IOpportunityService';
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/nameValidationService.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/nameValidationService.tsx
new file mode 100644
index 0000000..f08d4a7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/nameValidationService.tsx
@@ -0,0 +1,15 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { OpportunityTypes } from '../../../opportunities/opportunities/data/IAllOpportunity';
+const { httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const nameValidationService = {
+  nameIsValid: (configurationGuid: string, opportunityType: OpportunityTypes, name: string, opportunityGuid?: string): Promise<boolean> => {
+    return httpPost<boolean>(`all-opportunities/is-name-valid`, {
+      configurationGuid,
+      opportunityType,
+      name,
+      opportunityGuid
+    });
+  }
+};
+export const nameIsDuplicate = 'An opportunity with that name already exists';
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/opportunityTypeWorkbookService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/opportunityTypeWorkbookService.ts
new file mode 100644
index 0000000..bcd889c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/opportunityTypeWorkbookService.ts
@@ -0,0 +1,17 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IOpportunityTypeWorkbook } from './IOpportunityTypeWorkbook';
+
+const { httpGet, httpPost, httpDelete } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'opportunity-type-workbooks';
+
+export const opportunityTypeWorkbookService = {
+  getOpportunityTypeWorkbooks: (opportunityType: number): Promise<IOpportunityTypeWorkbook[]> => {
+    return httpGet(`${url}/${opportunityType}`);
+  },
+  createOpportunityTypeWorkbooks: (opportunityWorkbooks: IOpportunityTypeWorkbook[]): Promise<IOpportunityTypeWorkbook[]> => {
+    return httpPost(`${url}`, opportunityWorkbooks);
+  },
+  deleteOpportunityTypeWorkbooks: (opportunityType: number, workbookId: number) => {
+    return httpDelete(`${url}/${opportunityType}/workbook/${workbookId}`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/opportunityWorkbookService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/opportunityWorkbookService.ts
new file mode 100644
index 0000000..2b0614d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/opportunityWorkbookService.ts
@@ -0,0 +1,29 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IOpportunityWorkbook, IStrategicOpportunityWorkbook } from './IOpportunityWorkbook';
+
+const { httpGet, httpPost, httpDelete } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'opportunity-workbooks';
+
+export const opportunityWorkbookService = {
+  getOpportunityWorkbooks: (opportunityGuid: string): Promise<IOpportunityWorkbook[]> => {
+    return httpGet(`${url}/${opportunityGuid}`);
+  },
+  createOpportunityWorkbooks: (opportunityWorkbooks: IOpportunityWorkbook[]): Promise<IOpportunityWorkbook[]> => {
+    return httpPost(`${url}`, opportunityWorkbooks);
+  },
+  deleteOpportunityWorkbooks: (opportunityGuid: string, workbookId: number) => {
+    return httpDelete(`${url}/${opportunityGuid}/workbook/${workbookId}`);
+  },
+  getStrategicOpportunityWorkbooks: (opportunityId: string): Promise<IStrategicOpportunityWorkbook[]> => {
+    return httpGet(`${url}/strategic/${opportunityId}`);
+  },
+  createStrategicOpportunityWorkbooks: (opportunityWorkbooks: IStrategicOpportunityWorkbook[]): Promise<IStrategicOpportunityWorkbook[]> => {
+    return httpPost(`${url}/strategic`, opportunityWorkbooks);
+  },
+  deleteStrategicOpportunityWorkbooks: (opportunityId: string, workbookId: number) => {
+    return httpDelete(`${url}/strategic/${opportunityId}/workbook/${workbookId}`);
+  },
+  getOpportunityWorkbooksEnabled(): Promise<boolean> {
+    return httpGet(`${url}/opportunity-workbooks-enabled`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/reportService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/reportService.ts
new file mode 100644
index 0000000..68d2818
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/opportunities/data/reportService.ts
@@ -0,0 +1,60 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { ITreeNode } from '@strata/tempo/lib/tree';
+const { httpGet, httpDelete, httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export interface IReport {
+  reportGUID: string;
+  name: string;
+  isOpportunityReport: boolean;
+}
+
+export const reportService = {
+  opportunityReports: (opportunityGuid: string): Promise<IReport[]> => {
+    return httpGet(`report/${opportunityGuid}/by-opportunity`);
+  },
+  moduleReports: (module: number): Promise<IReport[]> => {
+    return httpGet(`report/${module}/by-module`);
+  },
+  getReports: (opportunityGuid: string, sourceOfSavings: number): Promise<IReport[]> => {
+    return httpPost<IReport[]>(`report/reports`, {
+      opportunityGuid,
+      sourceOfSavings
+    });
+  },
+  reports: (): Promise<IReport[]> => {
+    return httpGet(`report/reports`);
+  },
+  addOpportunityReport: (opportunityGuid: string, reportGuid: string): Promise<IReport[]> => {
+    return httpPost(`report/add-by-opportunity`, {
+      reportGuid,
+      opportunityGuid
+    });
+  },
+  addModuleReport: (sourceOfSavings: number, reportGuid: string): Promise<IReport[]> => {
+    return httpPost(`report/add-by-module`, {
+      reportGuid,
+      sourceOfSavings
+    });
+  },
+  deleteOpportunityReport: (opportunityGuid: string, reportGuid: string): Promise<IReport[]> => {
+    return httpDelete(`report/remove-by-opportunity`, {
+      method: 'post',
+      body: JSON.stringify({
+        reportGuid,
+        opportunityGuid
+      })
+    });
+  },
+  deleteModuleReport: (sourceOfSavings: number, reportGuid: string): Promise<IReport[]> => {
+    return httpDelete(`report/remove-by-module`, {
+      method: 'post',
+      body: JSON.stringify({
+        reportGuid,
+        sourceOfSavings
+      })
+    });
+  },
+  folderHierarchy: (): Promise<ITreeNode> => {
+    return httpGet(`report/folders`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/IPagedApiResponse.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/IPagedApiResponse.ts
new file mode 100644
index 0000000..9e73f46
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/IPagedApiResponse.ts
@@ -0,0 +1,6 @@
+import { IPagingInfo } from './IPagingInfo';
+
+export interface IPagedApiResponse<T> {
+  data: T[];
+  pagingInfo: IPagingInfo;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/IPagingInfo.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/IPagingInfo.ts
new file mode 100644
index 0000000..f25f8b0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/IPagingInfo.ts
@@ -0,0 +1,6 @@
+export interface IPagingInfo {
+  pageNumber: number;
+  resultsPerPage: number;
+  totalNumberOfResults: number;
+  totalPages: number;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/IPagingOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/IPagingOptions.ts
new file mode 100644
index 0000000..d1d2ece
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/IPagingOptions.ts
@@ -0,0 +1,6 @@
+import { ISortOptions } from './ISortOptions';
+
+export interface IPagingOptions extends ISortOptions {
+  first: number;
+  rows: number;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/ISortOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/ISortOptions.ts
new file mode 100644
index 0000000..3a027f9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/ISortOptions.ts
@@ -0,0 +1,4 @@
+export interface ISortOptions {
+  sortField: string;
+  sortOrder: number;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/index.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/index.ts
new file mode 100644
index 0000000..dc10565
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/paging/index.ts
@@ -0,0 +1,4 @@
+export * from './IPagedApiResponse';
+export * from './IPagingInfo';
+export * from './IPagingOptions';
+export * from './ISortOptions';
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/picker/CustomPickerModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/picker/CustomPickerModal.tsx
new file mode 100644
index 0000000..2ec83bb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/picker/CustomPickerModal.tsx
@@ -0,0 +1,79 @@
+import Input from '@strata/tempo/lib/input/Input';
+import Modal from '@strata/tempo/lib/modal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Tree, { ITreeNode, ITreeSelectInfo, Key } from '@strata/tempo/lib/tree/Tree';
+import { debounce } from 'lodash';
+import React, { useCallback, useEffect, useMemo } from 'react';
+import { includesCaseInsensitive } from '../../shared/utilities';
+
+export interface ICustomPickerModalProps {
+  isVisible: boolean;
+  title: string;
+  elements: ITreeNode[];
+  selectedElements: Key[];
+  onApply: (elements: Key[]) => void;
+  closeModal: () => void;
+}
+
+const CustomPickerModal: React.FC<ICustomPickerModalProps> = (props: ICustomPickerModalProps) => {
+  const { isVisible, title, elements, selectedElements, onApply, closeModal } = props;
+  const [gridElements, setGridElements] = React.useState<ITreeNode[]>([]);
+  const [gridSelectedElements, setGridSelectedElements] = React.useState<Key[]>([]);
+  const [searchInput, setSearchInput] = React.useState<string>('');
+
+  useEffect(() => {
+    if (isVisible) {
+      setGridElements(elements);
+      setGridSelectedElements(selectedElements);
+    }
+  }, [isVisible, elements, selectedElements, setGridSelectedElements]);
+
+  const handleSearch = useCallback(
+    (value: string) => {
+      setGridElements([...elements.filter((e) => e.title && includesCaseInsensitive(e.title?.toString(), value))]);
+    },
+    [elements]
+  );
+
+  const handleUserSearchWithDebounce = useMemo(() => debounce(handleSearch, 500), [handleSearch]);
+
+  useEffect(() => {
+    return () => {
+      handleUserSearchWithDebounce.cancel();
+    };
+  }, [handleUserSearchWithDebounce]);
+
+  const handleSave = () => {
+    onApply(gridSelectedElements);
+    setSearchInput('');
+    closeModal();
+  };
+
+  const handleClose = () => {
+    setGridSelectedElements(gridSelectedElements);
+    setSearchInput('');
+    closeModal();
+  };
+
+  const handleSelect = (selectedKeys: Key[], info: ITreeSelectInfo) => {
+    setGridSelectedElements(selectedKeys);
+  };
+
+  return (
+    <Modal title={title} visible={isVisible} onCancel={handleClose} onOk={handleSave} okText={'Select'}>
+      <Spacing hAlign='space-between' margin={12}>
+        <Input
+          value={searchInput}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+            setSearchInput(e.target.value);
+            handleUserSearchWithDebounce(e.target.value);
+          }}
+          search
+        />
+      </Spacing>
+      <Tree treeData={gridElements} showIcon height={400} selectedKeys={gridSelectedElements} onSelect={handleSelect} />
+    </Modal>
+  );
+};
+
+export default CustomPickerModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/IdentityTree.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/IdentityTree.tsx
new file mode 100644
index 0000000..d367357
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/IdentityTree.tsx
@@ -0,0 +1,58 @@
+import React, { useEffect } from 'react';
+import { IIdentity } from './data/IIdentity';
+import { securityService } from './data/securityService';
+import Tree, { ITreeNode, ITreeSelectInfo, Key } from '@strata/tempo/lib/tree/Tree';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Input from '@strata/tempo/lib/input/Input';
+
+export interface IIdentityTreeProps {
+  isVisible: boolean;
+  onAdd?: (treeNodes: IIdentity | undefined) => void;
+  onCancel: () => void;
+}
+
+const IdentityTree: React.FC<IIdentityTreeProps> = (props: IIdentityTreeProps) => {
+  const { onAdd, onCancel, isVisible } = props;
+  const [identities, setIdentities] = React.useState<ITreeNode[]>();
+  const [allIdentities, setAllIdentities] = React.useState<ITreeNode[]>();
+  const [selection, setSelection] = React.useState<ITreeNode>();
+
+  useEffect(() => {
+    const fetchData = async () => {
+      const allIdentities = await securityService.getIdentities();
+      setAllIdentities(allIdentities);
+      setIdentities(allIdentities);
+    };
+    fetchData();
+  }, [isVisible]);
+
+  const handleSelect = async (selectedKeys: Key[], info: ITreeSelectInfo) => {
+    setSelection(info.node);
+  };
+
+  const handleOk = () => {
+    if (selection && onAdd) {
+      const identity: IIdentity = { identityGuid: selection.key.toLocaleString(), identityName: selection.title?.toLocaleString() ?? '' };
+      onAdd(identity);
+    }
+  };
+
+  const handleSearch = async (searchText: string) => {
+    const searchedIdentities = allIdentities?.filter(function (identity: ITreeNode) {
+      return identity.title?.toString().toLowerCase().includes(searchText);
+    });
+    setIdentities(searchedIdentities);
+  };
+
+  return (
+    <Modal title='Add Identity' visible={isVisible} onCancel={onCancel} onOk={handleOk} okText='Select'>
+      <Spacing margin='0 0 16px 0'>
+        <Input search onChange={(e) => handleSearch(e.target.value)} />
+      </Spacing>
+      <Tree treeData={identities} height={400} defaultExpandAll={true} onSelect={handleSelect} />
+    </Modal>
+  );
+};
+
+export default IdentityTree;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/SimpleSecurityModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/SimpleSecurityModal.tsx
new file mode 100644
index 0000000..53c1ab5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/SimpleSecurityModal.tsx
@@ -0,0 +1,97 @@
+import React, { useEffect } from 'react';
+import Button from '@strata/tempo/lib/button';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import Modal from '@strata/tempo/lib/modal';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import Tooltip from '@strata/tempo/lib/tooltip';
+import { ISecurityDisplay } from './data/ISecurityDisplay';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import IdentityTree from './IdentityTree';
+import { IIdentity } from './data/IIdentity';
+import Spacing from '@strata/tempo/lib/spacing';
+
+export interface ISimpleSecurityModalProps {
+  isVisible: boolean;
+  lootId: string;
+  onModalClose: () => void;
+  onModalOk: (securities: ISecurityDisplay[]) => Promise<void>;
+  getSecurity: (lootId: string) => Promise<ISecurityDisplay[]>;
+}
+
+const SimpleSecurityModal: React.FC<ISimpleSecurityModalProps> = (props: ISimpleSecurityModalProps) => {
+  const { isVisible, lootId, onModalClose, onModalOk, getSecurity } = props;
+  const [loading, setLoading] = React.useState(false);
+  const [securities, setSecurities] = React.useState<ISecurityDisplay[]>([]);
+  const [identityTreeVisible, setIdentityTreeVisible] = React.useState(false);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      setLoading(true);
+      const simpleSecurities = await getSecurity(lootId);
+      setSecurities(simpleSecurities);
+      setLoading(false);
+    };
+    fetchData();
+  }, [lootId]);
+
+  const handleAddSecurity = async (identity: IIdentity | undefined) => {
+    if (identity) {
+      //check for duplicates
+      if (!securities.find((security) => security.identityName === identity.identityName)) {
+        setSecurities([...securities, { lootId: lootId, identityName: identity.identityName, identityGuid: identity.identityGuid, canRead: false, canWrite: false, canSecure: false }]);
+      }
+      setIdentityTreeVisible(false);
+    }
+  };
+
+  const handleDelete = async (rowData: ISecurityDisplay) => {
+    const newSecurities = securities.filter(function (security: ISecurityDisplay) {
+      return security !== rowData;
+    });
+    setSecurities(newSecurities);
+  };
+
+  const handleOk = async () => {
+    setLoading(true);
+    await onModalOk(securities);
+    setLoading(false);
+  };
+
+  const handleCancel = async () => {
+    const simpleSecurities = await getSecurity(lootId);
+    setSecurities(simpleSecurities);
+    onModalClose();
+  };
+
+  return (
+    <>
+      <Modal title='Security' width='normal' onCancel={handleCancel} onOk={handleOk} visible={isVisible} removeBodyPadding bodyBorder='top'>
+        <DataGrid value={securities} loading={loading} density='dense' border='bottom'>
+          <DataGrid.Column field='identityName' header='Identity' sortable width={150} />
+          <DataGrid.CheckboxColumn field='canRead' header='View' editable width={60} />
+          <DataGrid.CheckboxColumn field='canWrite' header='Modify' editable width={60} />
+          <DataGrid.CheckboxColumn field='canSecure' header='Edit Security' editable width={100} />
+          <DataGrid.EmptyColumn />
+          <DataGrid.Column
+            key='actions'
+            align='right'
+            width={60}
+            body={(rowData) => (
+              <Tooltip title='Delete' placement='left'>
+                <Button type='link' icon={<DeleteIcon />} onClick={() => handleDelete(rowData)} />
+              </Tooltip>
+            )}
+          />
+        </DataGrid>
+        <Spacing padding={'16px 0px 0px 16px'}>
+          <Button type='link' icon={<PlusIcon />} onClick={() => setIdentityTreeVisible(true)}>
+            Add Identity
+          </Button>
+        </Spacing>
+        <IdentityTree isVisible={identityTreeVisible} onCancel={() => setIdentityTreeVisible(false)} onAdd={handleAddSecurity} />
+      </Modal>
+    </>
+  );
+};
+
+export default SimpleSecurityModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/data/IIdentity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/data/IIdentity.ts
new file mode 100644
index 0000000..b14bdc6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/data/IIdentity.ts
@@ -0,0 +1,4 @@
+export interface IIdentity {
+  identityGuid: string;
+  identityName: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/data/ISecurityDisplay.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/data/ISecurityDisplay.ts
new file mode 100644
index 0000000..bf91aa3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/data/ISecurityDisplay.ts
@@ -0,0 +1,8 @@
+export interface ISecurityDisplay {
+  lootId: string;
+  identityName: string;
+  identityGuid: string;
+  canRead: boolean;
+  canWrite: boolean;
+  canSecure: boolean;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/data/IUserPermissions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/data/IUserPermissions.ts
new file mode 100644
index 0000000..7a842e6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/data/IUserPermissions.ts
@@ -0,0 +1,5 @@
+export interface IUserPermission {
+  readonly canRead: boolean;
+  readonly canWrite: boolean;
+  readonly canSecure: boolean;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/data/securityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/data/securityService.ts
new file mode 100644
index 0000000..c8550aa
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/security/data/securityService.ts
@@ -0,0 +1,26 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import { getSecureService } from '@strata/core/lib/http/getSecureService';
+import { ITreeNode } from '@strata/tempo/lib/tree';
+import { ISecurityDisplay } from './ISecurityDisplay';
+import { IUserPermission } from './IUserPermissions';
+
+const { httpGet, httpPut } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'security';
+
+export const securityService = {
+  getSecurity: async (lootId: string): Promise<ISecurityDisplay[]> => {
+    return httpGet(`${url}/${lootId}/simple-securities`);
+  },
+  getGeneralAccessPermissions: async (): Promise<boolean> => {
+    return httpGet(`${url}/general-access-permission`);
+  },
+  getUserPermissions: async (lootId: string): Promise<IUserPermission> => {
+    return httpGet(`${url}/${lootId}`);
+  },
+  getIdentities: async (): Promise<ITreeNode[]> => {
+    return httpGet(`${url}/identities`);
+  },
+  setSimpleSecurities: async (lootId: string, permissionSettings: ISecurityDisplay[]): Promise<boolean> => {
+    return httpPut(`${url}/${lootId}/set-simple-securities`, permissionSettings);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/settingsService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/settingsService.ts
new file mode 100644
index 0000000..56d6f10
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/settingsService.ts
@@ -0,0 +1,26 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IFeatureFlag } from './featureFlag/IFeatureFlag';
+import { IPerformanceEngineCalculationData } from '../strategic-opportunities/data/IPerformanceEngineCalculationData';
+
+const { httpGet, httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const settingsService = {
+  getChargeCodeLimit: async (): Promise<number> => {
+    return httpGet<number>(`settings/charge-code-limit`);
+  },
+  getOpportunityLevelLimit: async (): Promise<number> => {
+    return httpGet<number>(`settings/opportunity-level-limit`);
+  },
+  getFeatureFlags: async (): Promise<IFeatureFlag> => {
+    return httpGet<IFeatureFlag>(`settings/feature-flags`);
+  },
+  getSystemSettings: async (systemSettingsList: string[]): Promise<Map<string, string>> => {
+    const settings = await httpPost<Map<string, string>>(`settings/system-settings`, systemSettingsList);
+    return new Map<string, string>(Object.entries(settings));
+  },
+  getPerformanceEngineCalculations: async (): Promise<IPerformanceEngineCalculationData> => {
+    const calcs = await httpGet<IPerformanceEngineCalculationData>(`settings/performance-engine-calculations/`);
+    console.log('CALCULATIONS', calcs);
+    return calcs;
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/store/StoreTreeData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/store/StoreTreeData.ts
new file mode 100644
index 0000000..738670e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/store/StoreTreeData.ts
@@ -0,0 +1,350 @@
+import cloneDeep from 'lodash/cloneDeep';
+import { DicStrNum, DicStrStr } from '../data/Dictionary';
+import { compareValueByProp, getValueByProp, groupMapBy, setValueByProp, sortTreeDataRecursive, StringOrNumber } from '../utilities';
+
+export interface ChangeGridData<T> {
+  node: TreeNode<T>;
+  colName: string;
+  newVal: number;
+  oldVal: number;
+  options: { [field: string]: any };
+}
+
+export interface DimensionsData {
+  [key: string]: DicStrStr;
+}
+
+export class TreeNode<T> {
+  key: string;
+  keys: StringOrNumber[];
+  levelPos: number;
+  levelId: number;
+  groupKeyId: StringOrNumber;
+  label: string;
+  data?: T;
+  rawData?: T;
+  children: TreeNode<T>[];
+
+  constructor() {
+    this.key = '';
+    this.keys = [];
+    this.levelPos = 0;
+    this.levelId = 0;
+    this.groupKeyId = 0;
+    this.label = '';
+    this.children = [];
+  }
+}
+
+export function getFlatTreeData<T>(root: TreeNode<T>): TreeNode<T>[] {
+  function getFlatData(node: TreeNode<T>) {
+    if (node.children && node.children.length) {
+      treeData.push(...node.children);
+
+      for (const child of node.children) {
+        getFlatData(child);
+      }
+    }
+  }
+  const treeData: TreeNode<T>[] = [];
+  getFlatData(root);
+  return treeData;
+}
+
+export interface RowConfig {
+  dimension: string;
+  levelId: number;
+  groupKey: string;
+  sortOrderKey: string;
+}
+
+export interface StoreConfig {
+  rowsConfig: RowConfig[];
+  dataKeyProp: string | null;
+}
+
+// TD: TypeData, source data type
+// TTD: TypeTreeData, data for TreeGrid
+export class StoreTreeData<TD, TTD> {
+  protected rootLabel: string;
+
+  data: TD[];
+  initialData: TD[];
+  root: TreeNode<TTD>;
+  dimensionsData: DimensionsData;
+  partialTreeData: { [key: string]: Partial<TTD> };
+
+  dimensions: string[];
+  groupKeys: string[];
+  dataKeyProp: string | null;
+  levelIds: number[];
+  sortOrderProperties: string[];
+  levelCount: number;
+  defaultNodeData: TTD;
+
+  constructor(defaultNodeData: TTD) {
+    this.dimensions = [];
+    this.groupKeys = [];
+    this.dataKeyProp = null;
+    this.levelIds = [];
+    this.sortOrderProperties = [];
+    this.levelCount = 0;
+
+    this.defaultNodeData = defaultNodeData;
+    this.data = [];
+    this.initialData = [];
+    this.dimensionsData = {};
+    this.partialTreeData = {};
+    this.root = new TreeNode<TTD>();
+    this.rootLabel = 'TOTAL';
+  }
+
+  protected assignTreeData(
+    arr: TD[],
+    treeNode: TreeNode<TTD>,
+    columnsName: string[] | null,
+    includeMeasures: string[] | null = null,
+    changeData: ChangeGridData<TTD> | null = null,
+    isRegroup = false,
+    isAddNew = false
+  ) {
+    return;
+  }
+
+  protected assignAdditionalPropertiesRoot(arr: TD[], treeNode: TreeNode<TTD>) {
+    return;
+  }
+
+  protected assignAdditionalProperties(arr: TD[], treeNode: TreeNode<TTD>, levelIndex: number) {
+    return;
+  }
+
+  protected updateData(arr: TD[], node: TreeNode<TTD>, colName: string, newVal: number, oldVal: number, changeData: ChangeGridData<TTD> | null = null): DicStrNum {
+    return {};
+  }
+  protected updateTreeData(node: TreeNode<TTD>, deltaDic: DicStrNum, changeData: ChangeGridData<TTD> | null = null) {
+    return;
+  }
+
+  public setStoreConfig(storeConfig: StoreConfig): void {
+    this.dimensions = storeConfig.rowsConfig.map((x) => x.dimension);
+    this.groupKeys = storeConfig.rowsConfig.map((x) => x.groupKey);
+    this.levelIds = storeConfig.rowsConfig.map((x) => x.levelId);
+    this.sortOrderProperties = storeConfig.rowsConfig.map((x) => x.sortOrderKey);
+    this.levelCount = storeConfig.rowsConfig.length;
+    this.dataKeyProp = storeConfig.dataKeyProp;
+  }
+
+  public loadData(data: TD[], dimensionsData: DimensionsData, partialTreeData: { [key: string]: Partial<TTD> } = {}): void {
+    this.data = data;
+    this.initialData = [...data];
+    this.dimensionsData = dimensionsData;
+    this.partialTreeData = partialTreeData;
+    this._groupData(data);
+    sortTreeDataRecursive(this.root.children, 'sortOrder');
+  }
+
+  public filterData(filterFunction: (value: TD, index: number, array: TD[]) => boolean): void {
+    this.data = this.initialData.filter(filterFunction);
+    this._groupData(this.data);
+    sortTreeDataRecursive(this.root.children, 'sortOrder');
+  }
+
+  public loadSourceData(data: TD[]): void {
+    this.data = data;
+    this.recalcTreeData();
+  }
+
+  public appendData(dataToAdd: TD[]): void {
+    this.data = [...this.data, ...dataToAdd];
+    this._groupData(this.data, true, true);
+    sortTreeDataRecursive(this.root.children, 'sortOrder');
+  }
+
+  public onChange(changeData: ChangeGridData<TTD>): Promise<DicStrNum> {
+    return new Promise((resolve, reject) => {
+      if (!changeData.newVal && changeData.newVal !== 0) changeData.newVal = 0;
+
+      const { node, colName, newVal, oldVal } = changeData;
+      const keys = node.keys;
+      const data = this._filterData(this.data, keys);
+      if (!data.length) return resolve({});
+
+      const deltaDic = this.updateData(data, node, colName, newVal, oldVal, changeData);
+
+      const columnsName = [colName];
+      const deltaKeys = Object.keys(deltaDic);
+      if (deltaKeys.length) {
+        for (const key of deltaKeys) {
+          if (!columnsName.includes(key)) columnsName.push(key);
+        }
+      }
+
+      if (!keys.length) {
+        this.recalcTreeData(columnsName);
+        return resolve(deltaDic);
+      }
+
+      let currNode: TreeNode<TTD> = this.root;
+      this.updateTreeData(this.root, deltaDic, changeData);
+      let ind = 0;
+      for (; ind < keys.length - 1; ind++) {
+        if (currNode && ind < this.groupKeys.length && ind < keys.length) {
+          const _currNode = currNode.children.find((x) => compareValueByProp(x.data, this.groupKeys[ind], keys[ind]));
+          if (_currNode) {
+            this.updateTreeData(_currNode, deltaDic, changeData);
+            currNode = _currNode;
+          }
+        }
+      }
+
+      if (currNode.children) {
+        const _currNode = currNode.children.find((x) => compareValueByProp(x.data, this.groupKeys[ind], keys[ind]));
+        if (_currNode) {
+          this.assignTreeData(data, _currNode, columnsName, null, changeData);
+          this._updateTreeDataOneLevel(data, _currNode, columnsName, keys.length);
+          currNode = _currNode;
+        }
+      }
+
+      return resolve(deltaDic);
+    });
+  }
+
+  public recalc(keys: string[], columnsName: string[] | null = null, deltaDic: DicStrNum): void {
+    if (!keys.length) {
+      this.recalcTreeData(columnsName);
+      return;
+    }
+    const data = this._filterData(this.data, keys);
+
+    let currNode = this.root;
+    this.updateTreeData(currNode, deltaDic);
+    let ind = 0;
+    for (; ind < keys.length - 1; ind++) {
+      const _currNode = currNode.children.find((x) => compareValueByProp(x.data, this.groupKeys[ind], keys[ind]));
+      if (_currNode) {
+        this.updateTreeData(_currNode, deltaDic);
+        currNode = _currNode;
+      }
+    }
+
+    if (currNode.children) {
+      const _currNode = currNode.children.find((x) => compareValueByProp(x.data, this.groupKeys[ind], keys[ind]));
+      if (_currNode) {
+        this.assignTreeData(data, _currNode, columnsName);
+        this._updateTreeDataOneLevel(data, _currNode, columnsName, keys.length);
+        currNode = _currNode;
+      }
+    }
+  }
+
+  public recalcTreeData(columnsName: string[] | null = null): void {
+    this.assignTreeData(this.data, this.root, columnsName);
+    this._updateTreeDataOneLevel(this.data, this.root, columnsName, this.root.levelId);
+  }
+
+  public findNode(keys: string[]): TreeNode<TTD> | undefined {
+    let currNode = this.root;
+    for (let ind = 0; ind < keys.length; ind++) {
+      const _currNode = currNode.children.find((x) => compareValueByProp(x.data, this.groupKeys[ind], keys[ind]));
+      if (!_currNode) return;
+      currNode = _currNode;
+    }
+    return currNode;
+  }
+
+  public findDataByArrKeys<TKeyValue>(arrKeys: TKeyValue[][]): TD[] {
+    const res = this.data.filter((x) => arrKeys.some((keys) => keys.every((val, ind) => compareValueByProp(x, this.groupKeys[ind], val))));
+    return res;
+  }
+
+  protected _getLabel(rec: TD, levelInd: number): string {
+    const key = this.dimensions[levelInd];
+    if (this.dimensionsData) {
+      const data = this.dimensionsData[key];
+      const keyVal = getValueByProp<TD, number>(rec, this.groupKeys[levelInd]);
+      if (data && keyVal !== undefined) {
+        const labelText = data[keyVal];
+        if (labelText) return labelText;
+      }
+    }
+    return 'Not found';
+  }
+
+  private _grouppOneLevel(data: TD[], keys: StringOrNumber[], levelInd: number, isRegroup: boolean, isAddNew: boolean): TreeNode<TTD>[] | undefined {
+    if (levelInd >= this.groupKeys.length) return;
+
+    const arr: TreeNode<TTD>[] = [];
+    const gKey = this.groupKeys[levelInd];
+    const groups = groupMapBy(data, gKey);
+    groups.forEach((val, key) => {
+      const node = new TreeNode<TTD>();
+      node.levelPos = levelInd + 1;
+      node.levelId = this.levelIds[levelInd];
+      node.keys = [...keys, key];
+      node.key = node.keys.join('|');
+      node.data = cloneDeep(this.defaultNodeData);
+      node.rawData = cloneDeep(this.defaultNodeData);
+      this._fillKeyValues(node);
+      this.assignTreeData(val, node, null, null, null, isRegroup, isAddNew);
+      this.assignAdditionalProperties(val, node, levelInd);
+      if (val.length) {
+        node.groupKeyId = getValueByProp<TD, number>(val[0], this.groupKeys[levelInd]) || 0;
+        node.label = this._getLabel(val[0], levelInd);
+      }
+      node.children = this._grouppOneLevel(val, node.keys, levelInd + 1, isRegroup, isAddNew) || [];
+      arr.push(node);
+    });
+    return arr;
+  }
+
+  private _groupData(data: TD[], isRegroup = false, isAddNew = false): void {
+    const root = new TreeNode<TTD>();
+    root.data = cloneDeep(this.defaultNodeData);
+    root.rawData = cloneDeep(this.defaultNodeData);
+    root.key = 'root';
+    root.levelPos = 0;
+    root.levelId = 0;
+    root.keys = [];
+    // Info: we don't need assign keys for root node, and key for root will be ''
+    //this._fillKeyValues(root);
+    this.assignTreeData(data, root, null, null, null, isRegroup, isAddNew);
+    this.assignAdditionalPropertiesRoot(data, root);
+    root.children = this._grouppOneLevel(data, root.keys, 0, isRegroup, isAddNew) || [];
+
+    this.root = root;
+  }
+
+  private _filterData(data: TD[], keys: StringOrNumber[]): TD[] {
+    const res = data.filter((x) => keys.every((val, ind) => compareValueByProp(x, this.groupKeys[ind], val)));
+    return res;
+  }
+
+  private _updateTreeDataOneLevel(data: TD[], treeNode: TreeNode<TTD>, columnsName: string[] | null, levelInd: number, changeData: ChangeGridData<TTD> | null = null): void {
+    if (levelInd >= this.groupKeys.length) return;
+
+    const gKey = this.groupKeys[levelInd];
+    const groups = groupMapBy(data, gKey);
+    groups.forEach((value, key) => {
+      const _currNode = treeNode.children.find((x) => compareValueByProp(x.data, gKey, key));
+      if (_currNode) {
+        this.assignTreeData(value, _currNode, columnsName, null, changeData);
+        this._updateTreeDataOneLevel(value, _currNode, columnsName, levelInd + 1, changeData);
+      }
+    });
+  }
+
+  private _fillKeyValues(treeNode: TreeNode<TTD>): void {
+    for (let i = 0; i < treeNode.keys.length; i++) {
+      if (treeNode.data) {
+        setValueByProp(treeNode.data, this.groupKeys[i], treeNode.keys[i]);
+        setValueByProp(treeNode.rawData, this.groupKeys[i], treeNode.keys[i]);
+      }
+    }
+    if (this.dataKeyProp) {
+      setValueByProp(treeNode.data, this.dataKeyProp, treeNode.key);
+      setValueByProp(treeNode.rawData, this.dataKeyProp, treeNode.key);
+    }
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/systemSettings/ISystemSettings.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/systemSettings/ISystemSettings.ts
new file mode 100644
index 0000000..e168688
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/systemSettings/ISystemSettings.ts
@@ -0,0 +1,3 @@
+export interface ISystemSettings {
+  flexibleExplorationInpatientCTF: boolean;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/systemSettings/SystemSettingsContext.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/systemSettings/SystemSettingsContext.tsx
new file mode 100644
index 0000000..6584b75
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/systemSettings/SystemSettingsContext.tsx
@@ -0,0 +1,53 @@
+import React, { useEffect, useState, ReactNode } from 'react';
+import { settingsService } from '../settingsService';
+import { ISystemSettings } from './ISystemSettings';
+
+export interface ISystemSettingsContext {
+  systemSettings?: ISystemSettings;
+  loading: boolean;
+}
+
+export interface ISystemSettingsContextProps {
+  children: ReactNode;
+}
+
+const initialState: ISystemSettingsContext = {
+  systemSettings: {
+    flexibleExplorationInpatientCTF: false
+  },
+  loading: true
+};
+
+//array of system settings names that need to be retrieved
+const settingsList = ['Flexible Exploration Inpatient Case Type Family'];
+
+const SystemSettingsContext = React.createContext<ISystemSettingsContext>(initialState);
+
+export const SystemSettingsProvider: React.FC<ISystemSettingsContextProps> = (props: ISystemSettingsContextProps) => {
+  const [systemSettings, setSystemSettings] = useState<ISystemSettings>();
+  const [loading, setLoading] = useState<boolean>(false);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      setLoading(true);
+      try {
+        const settings = await settingsService.getSystemSettings(settingsList);
+
+        const _systemSettings: ISystemSettings = {
+          flexibleExplorationInpatientCTF: Boolean(Number(settings.get(settingsList[0]) ?? 0))
+        };
+
+        setSystemSettings(_systemSettings);
+      } finally {
+        setLoading(false);
+      }
+    };
+    fetchData();
+  }, []);
+
+  return <SystemSettingsContext.Provider value={{ systemSettings, loading }}>{props.children}</SystemSettingsContext.Provider>;
+};
+
+export const useSystemSettings = (): ISystemSettingsContext => React.useContext(SystemSettingsContext);
+
+export default SystemSettingsContext;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/userSetting/IUserSetting.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/userSetting/IUserSetting.ts
new file mode 100644
index 0000000..0a3a50d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/userSetting/IUserSetting.ts
@@ -0,0 +1,14 @@
+export interface IUserSetting {
+  userGuid: string;
+  configurationGuid: string;
+}
+
+export const newUserSetting = (data: Partial<IUserSetting> = {}): IUserSetting => {
+  return {
+    ...{
+      userGuid: '',
+      configurationGuid: ''
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/userSetting/UserSettingContext.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/userSetting/UserSettingContext.tsx
new file mode 100644
index 0000000..42ffa4b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/userSetting/UserSettingContext.tsx
@@ -0,0 +1,68 @@
+import * as core from '@strata/core/lib';
+import React, { ReactNode, useEffect, useState } from 'react';
+import { IUserSetting, newUserSetting } from './IUserSetting';
+import { userSettingService } from './userSettingService';
+
+interface IUserSettingsContext {
+  isAdmin: boolean;
+  userSetting: IUserSetting;
+  loading: boolean;
+  setUserSetting: (userSetting: Partial<IUserSetting>) => void;
+}
+
+interface IUserSettingContextProps {
+  children: ReactNode;
+}
+
+const UserSettingContext = React.createContext<IUserSettingsContext>({
+  isAdmin: false,
+  userSetting: newUserSetting(),
+  loading: true,
+  setUserSetting: async () => {
+    return userSettingService.setUserSetting(newUserSetting());
+  }
+});
+
+export const UserSettingsProvider: React.FC<IUserSettingContextProps> = (props: IUserSettingContextProps) => {
+  const [userSetting, setUserSetting] = useState<IUserSetting>(newUserSetting());
+  const [isAdmin, setIsAdmin] = useState<boolean>(false);
+  const [loading, setLoading] = useState<boolean>(true);
+
+  const session = core.useOidcSession();
+
+  useEffect(() => {
+    const fetchData = async () => {
+      setLoading(true);
+      try {
+        setUserSetting(await userSettingService.getUserSetting(session.userGuid));
+        setIsAdmin(session.isStrata || session.roles.includes('CI - System Administrator'));
+      } finally {
+        setLoading(false);
+      }
+    };
+    fetchData();
+  }, [session.userGuid]);
+
+  const updateUserSetting = async (setting: Partial<IUserSetting>) => {
+    setUserSetting(await userSettingService.setUserSetting({ ...userSetting, ...setting }));
+  };
+
+  return (
+    <>
+      <UserSettingContext.Provider
+        value={{
+          userSetting: userSetting,
+          setUserSetting: updateUserSetting,
+          isAdmin: isAdmin,
+          loading: loading
+        }}
+      >
+        {props.children}
+      </UserSettingContext.Provider>
+    </>
+  );
+};
+
+export const useUserSetting = (): IUserSettingsContext => React.useContext(UserSettingContext);
+
+export default UserSettingContext;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/userSetting/index.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/userSetting/index.ts
new file mode 100644
index 0000000..588c6ef
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/userSetting/index.ts
@@ -0,0 +1,3 @@
+export * from './IUserSetting';
+export * from './UserSettingContext';
+export * from './userSettingService';
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/userSetting/userSettingService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/userSetting/userSettingService.ts
new file mode 100644
index 0000000..2d3ace7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/userSetting/userSettingService.ts
@@ -0,0 +1,14 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IUserSetting } from './IUserSetting';
+
+const { httpGet, httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const userSettingService = {
+  getUserSetting: async (userGuid: string): Promise<IUserSetting> => {
+    return httpGet<IUserSetting>(`user-settings/${userGuid}`);
+  },
+
+  setUserSetting: async (userSetting: IUserSetting): Promise<IUserSetting> => {
+    return httpPost<IUserSetting>(`user-settings`, userSetting);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/users/IUser.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/users/IUser.ts
new file mode 100644
index 0000000..22b457b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/users/IUser.ts
@@ -0,0 +1,6 @@
+export interface IUser {
+  userGuid: string;
+  firstName: string;
+  lastName: string;
+  fullName: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/users/usersService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/users/usersService.ts
new file mode 100644
index 0000000..99e6695
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/users/usersService.ts
@@ -0,0 +1,26 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IUser } from './IUser';
+
+const { httpGet } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'users';
+
+export const usersService = {
+  getUsers: async (): Promise<IUser[]> => {
+    return httpGet<IUser[]>(`${url}/users`);
+  },
+  getOwners: async (): Promise<IUser[]> => {
+    return httpGet<IUser[]>(`${url}/owners`);
+  },
+  getExecutiveSponsors: async (): Promise<IUser[]> => {
+    return httpGet<IUser[]>(`${url}/executive-sponsors`);
+  },
+  getCostLeaders: async (): Promise<IUser[]> => {
+    return httpGet<IUser[]>(`${url}/cost-leaders`);
+  },
+  getAllCIUsers: async (): Promise<IUser[]> => {
+    return httpGet<IUser[]>(`${url}/all-ci-users`);
+  },
+  getJazzUsers: async (): Promise<IUser[]> => {
+    return httpGet<IUser[]>(`${url}/jazz-users`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/utilities.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/utilities.ts
new file mode 100644
index 0000000..6624773
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/utilities.ts
@@ -0,0 +1,281 @@
+import { sum as lodashSum } from 'lodash';
+import dayjs from 'dayjs';
+import { useEffect, useLayoutEffect, useRef } from 'react';
+import { OpportunityTypes } from '../opportunities/opportunities/data/IAllOpportunity';
+import { DATE_FORMAT } from './constants';
+import { DATE_NUMBER_FORMAT } from './data/DateString';
+import { IValidationMessage } from './validation/IValidationMessage';
+import { RegEx } from './validation/RegEx';
+import { DicStrNum } from './data/Dictionary';
+
+export type StringOrNumber = string | number;
+
+// eslint-disable-next-line
+export function convertNullOrEmptyStrToUndefined(obj: any): any {
+  if (obj === null || obj === '') return undefined;
+  if (typeof obj === 'object') {
+    for (const k in obj) {
+      obj[k] = convertNullOrEmptyStrToUndefined(obj[k]);
+    }
+  }
+  return obj;
+}
+
+export function splitCamelCase(camelCaseString: string): string {
+  return camelCaseString.replace(/([a-z0-9])([A-Z])/g, '$1 $2');
+}
+
+export function toDateString(date: string): string {
+  return date === undefined || date === 'Invalid Date' || date === '' ? '' : dayjs(date).format(DATE_NUMBER_FORMAT);
+}
+
+export function toDateStr(date: dayjs.Dayjs | null | undefined): string {
+  return dayjs(date ?? '').format(DATE_NUMBER_FORMAT);
+}
+
+export function toDateOnlyStr(date: Date | null | undefined): string | null {
+  return date ? dayjs(date).format(DATE_FORMAT) : null;
+}
+
+export const getMoment = (dueDate?: string): dayjs.Dayjs | undefined => {
+  if (dueDate) {
+    return dueDate === '' || dueDate === '00010101' ? undefined : dayjs(dueDate, DATE_NUMBER_FORMAT);
+  }
+  return undefined;
+};
+
+export const getGuid = (guid?: string): string | undefined => {
+  if (guid) {
+    return guid === '00000000-0000-0000-0000-000000000000' ? undefined : guid;
+  }
+  return undefined;
+};
+
+export function useInterval(callback: () => void, delay: number | null) {
+  const savedCallback = useRef(callback);
+  // Remember the latest callback
+  useLayoutEffect(() => {
+    savedCallback.current = callback;
+  }, [callback]);
+
+  // Set up the interval
+  useEffect(() => {
+    if (!delay && delay !== 0) {
+      return;
+    }
+    const id = setInterval(() => savedCallback.current(), delay);
+    return () => clearInterval(id);
+  }, [callback, delay]);
+}
+
+export function validateOpportunityName(name: string): IValidationMessage {
+  if (name === '') {
+    return { isValid: false, validationMessage: 'Required' };
+  } else {
+    if (RegEx.JazzRestrictedCharacters.test(name) === false) {
+      return { isValid: false, validationMessage: 'Cannot contain the following characters: , ; \' ` : \\ * | ? " & % $ ! = [ ] { } ~ # ^ _' };
+    } else if (name != null && name.length > 200) {
+      return { isValid: false, validationMessage: 'Name cannot be greater than 200 characters' };
+    } else {
+      return { isValid: true, validationMessage: '' };
+    }
+  }
+}
+
+export function adjustDatetimeToDateString(obj: any): any {
+  for (const key in obj) {
+    if (dayjs.isDayjs(obj[key])) {
+      obj[key] = obj[key].format(DATE_FORMAT);
+    }
+  }
+  return obj;
+}
+
+export const zeroGuid = '00000000-0000-0000-0000-000000000000';
+export const explorationPopulationIdAttributeGuid = '5B54F9A3-662F-4EF8-967A-16235EE3F6F8';
+
+export const getOpportunityLinkName = (opportunityType: OpportunityTypes): string => {
+  switch (opportunityType) {
+    case OpportunityTypes.ChargeCode:
+      return 'charge-code';
+    case OpportunityTypes.Encounter:
+      return 'encounter';
+    case OpportunityTypes.FreeForm:
+      return 'free-form';
+    case OpportunityTypes.Payroll:
+      return 'payroll';
+    case OpportunityTypes.Exploration:
+      return 'exploration';
+    case OpportunityTypes.GeneralLedger:
+      return 'general-ledger';
+    default:
+      return '';
+  }
+};
+
+export function stringFormat(val: string, ...args: string[]): string {
+  return val.replace(/{([0-9]+)}/g, function (match, index) {
+    return typeof args[index] == 'undefined' ? match : args[index];
+  });
+}
+
+export function stringFormatByVar(val: string, scope: { [key: string]: string }) {
+  const reg = new RegExp('{([^{}]+)}', 'g');
+  let match: RegExpExecArray | null;
+  while ((match = reg.exec(val)) !== null) {
+    val = val.replace(match[0], scope[match[1]]);
+  }
+  return val;
+}
+export const includesCaseInsensitive = (str: string, searchString: string) => new RegExp(searchString, 'i').test(str);
+
+// TODO: Is it need to new utils file?
+export function groupBy<T>(data: T[], getKey: (item: T) => string): { [key: string]: T[] } {
+  const defaultVal: { [key: string]: T[] } = {};
+  return data.reduce((group, item: T) => {
+    const key = getKey(item);
+    if (!group[key]) group[key] = [];
+    group[key].push(item);
+    return group;
+  }, defaultVal);
+}
+export function groupByProps<T>(data: T[], props: string[]): { [key: string]: T[] } {
+  return groupBy<T>(data, (item: T) => {
+    return getKeyValue<T>(item, props);
+  });
+}
+export function getKeyValue<T>(item: T, props: string[]): string {
+  const _item = item as { [key: string]: any };
+  const keys = props.map((prop) => _item[prop]);
+  return keys.join(';');
+}
+
+export function groupMapBy<T>(data: T[], prop: string): Map<StringOrNumber, T[]> {
+  const map = new Map<StringOrNumber, T[]>();
+  for (const item of data) {
+    const key = getValueByProp<T, StringOrNumber>(item, prop);
+    if (key !== undefined) {
+      if (!map.has(key)) map.set(key, []);
+      const collection = map.get(key) as T[];
+      collection.push(item);
+    }
+  }
+  return map;
+}
+
+export const sortTreeDataRecursive = (dtos: any[], property: string) => {
+  if (dtos.length === 0) return;
+
+  dtos.sort((first, second) => {
+    if (first.data && first.data[property] < second.data[property]) return -1;
+    if (first.data && first.data[property] > second.data[property]) return 1;
+
+    return 0;
+  });
+
+  dtos.forEach((el) => {
+    if (el.children && el.children.length) sortTreeDataRecursive(el.children, property);
+  });
+};
+
+export function getSum<T>(data: T[], propertyName: string): number {
+  const sum = data.reduce((sum, currentObject) => sum + (getValueByProp<T, number>(currentObject, propertyName) || 0), 0);
+  return sum;
+}
+
+export function getValueByProp<T, TV>(obj: T, prop: string): TV | undefined {
+  if (obj) {
+    const _obj = obj as { [key: string]: TV };
+    return _obj[prop];
+  }
+  return;
+}
+
+export function setValueByProp<T, TV>(obj: T, prop: string, val: TV) {
+  if (obj) {
+    const _obj = obj as { [key: string]: TV };
+    _obj[prop] = val;
+  }
+}
+
+export function compareValueByProp<T, TV>(obj: T, prop: string, val: TV): boolean {
+  const _val = getValueByProp<T, TV>(obj, prop);
+  return _val === val;
+}
+
+export function isArraysEqual<T>(a1: T[], a2: T[]): boolean {
+  if (a1.length !== a2.length) return false;
+  for (let i = 0; i < a1.length; i++) {
+    if (a1[i] !== a2[i]) return false;
+  }
+  return true;
+}
+
+export function getFixedNumber(val: number | undefined, fractionDigits?: number) {
+  if (!val) return 0;
+  if (fractionDigits === undefined) return val;
+  return parseFloat(val.toFixed(fractionDigits).replace(/^-([.0]*)$/, '$1'));
+}
+
+export function getSplitEqualValues(newVal: number, length: number): number[] {
+  if (length <= 0) return [];
+  const itemValue = newVal / length;
+  const arr: number[] = new Array<number>(length).fill(itemValue);
+  arr[length - 1] = newVal - itemValue * (length - 1);
+  return arr;
+}
+
+export function getSplitWeightValues(newVal: number, vals: number[]): number[] {
+  if (vals.every((x) => x === 0)) return getSplitEqualValues(newVal, vals.length);
+
+  const oldVal = lodashSum(vals);
+  const factor = oldVal ? newVal / oldVal : 0;
+  let sum = 0;
+  let notZeroInd = 0;
+  for (let i = 0; i < vals.length; i++) {
+    if (vals[i] === 0) continue;
+    vals[i] = vals[i] * factor;
+    sum += vals[i];
+    notZeroInd = i;
+  }
+  vals[notZeroInd] += newVal - sum;
+  return vals;
+}
+
+export function stringToEnumValue<T extends Record<string, string>>(enumObj: T, str: string): T[keyof T] | undefined {
+  if (Object.values(enumObj).includes(str)) {
+    return enumObj[str as keyof T] as T[keyof T];
+  }
+  return undefined;
+}
+
+export function correctEnumStringValue<T>(obj: T, propsEnumMap: { [key: string]: Record<string, string> }) {
+  for (const prop in propsEnumMap) {
+    const value = getValueByProp<T, string>(obj, prop);
+    if (value && typeof value === 'string') {
+      const enumValue = stringToEnumValue(propsEnumMap[prop], value);
+      if (enumValue !== undefined) {
+        setValueByProp(obj, prop, enumValue);
+      }
+    }
+  }
+}
+
+export function correctDateTimeToDateOnlyStr<T>(obj: T, keys: string[]): T {
+  for (const key of keys) {
+    const value = getValueByProp<T, Date>(obj, key);
+    if (value instanceof Date) {
+      setValueByProp(obj, key, toDateOnlyStr(value));
+    }
+  }
+  return obj;
+}
+
+export function extendPartialObj<T>(objIn: DicStrNum, objOut: { [key: string]: Partial<T> }, property: string): void {
+  for (const key of Object.keys(objIn)) {
+    if (!(key in objOut)) {
+      objOut[key] = {} as Partial<T>;
+    }
+    setValueByProp(objOut[key], property, objIn[key]);
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/validation/IValidationMessage.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/validation/IValidationMessage.ts
new file mode 100644
index 0000000..2df1fec
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/validation/IValidationMessage.ts
@@ -0,0 +1,4 @@
+export interface IValidationMessage {
+  isValid: boolean;
+  validationMessage: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/validation/RegEx.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/validation/RegEx.ts
new file mode 100644
index 0000000..38e0526
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/shared/validation/RegEx.ts
@@ -0,0 +1,5 @@
+export const RegEx = {
+  // Spaces have been omitted use Form.Item's rules={ whitespace: false }
+  JazzRestrictedCharacters: new RegExp(/^[^,;'`:\\*|?"&%$!=[\]{}~#^_]+$/),
+  CommentsDrawerRestrictedCharacters: new RegExp(/^[^,;`:\\*|?"&$!=[\]{}~#^_]+$/) // allow % and ' symbols in comments drawer
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/StrategicOpportunityRampUpToGoalDrawer.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/StrategicOpportunityRampUpToGoalDrawer.tsx
new file mode 100644
index 0000000..5308998
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/StrategicOpportunityRampUpToGoalDrawer.tsx
@@ -0,0 +1,124 @@
+import Button from '@strata/tempo/lib/button/Button';
+import Drawer from '@strata/tempo/lib/drawer/Drawer';
+import Form from '@strata/tempo/lib/form/Form';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import React, { useEffect } from 'react';
+import { IStrategicOpportunityRampUp } from './data/IStrategicOpportunityRampUp';
+import { strategicOpportunityService } from './data/strategicOpportunityService';
+
+interface RampUpToGoalDrawerProps {
+  visible: boolean;
+  months: number;
+  isEditable: boolean;
+  opportunityId: number;
+  onOk: () => void;
+  onClose: () => void;
+}
+
+interface RampUpFormData {
+  [key: string]: number;
+}
+
+const StrategicOpportunityRampUpToGoalDrawer: React.FC<RampUpToGoalDrawerProps> = ({ visible, months, opportunityId, isEditable, onOk, onClose }) => {
+  const [formData, setFormData] = React.useState<RampUpFormData>();
+  const [hasChanges, setHasChanges] = React.useState<boolean>(false);
+  const [loading, setLoading] = React.useState<boolean>(false);
+  const [form] = Form.useForm();
+
+  useEffect(() => {
+    if (visible) {
+      const fetchData = async () => {
+        setLoading(true);
+
+        const getRampUps = async () => {
+          const data: RampUpFormData = {};
+          const rampUps = await strategicOpportunityService.getRampUps(opportunityId);
+          for (let i = 1; i <= months; i++) {
+            const found = rampUps.find((ru) => ru.monthNumber === i);
+            data[`month${i}`] = found ? found.percentage : 1;
+          }
+          setFormData(data);
+          form.setFieldsValue(data);
+        };
+        getRampUps().finally(() => {
+          setLoading(false);
+        });
+      };
+      fetchData();
+    }
+  }, [visible, opportunityId, months, form]);
+
+  const getRows = () => {
+    const rows = [];
+    for (let i = 1; i <= months; i += 3) {
+      rows.push(
+        <Form.ItemSpacing>
+          {[0, 1, 2].map((j) => {
+            const monthIdx = i + j;
+            if (monthIdx > months) return <Form.Item key={monthIdx} />;
+            return (
+              <Form.Item
+                key={`month${monthIdx}`}
+                label={`Month ${monthIdx}`}
+                name={`month${monthIdx}`}
+                rules={[{ required: true }, { type: 'number', min: 0, max: 1, message: `Month ${monthIdx} must be between 0% and 100%` }]}
+              >
+                <InputNumber format='percent' precision={0} disabled={!isEditable} />
+              </Form.Item>
+            );
+          })}
+        </Form.ItemSpacing>
+      );
+    }
+
+    return rows;
+  };
+
+  const handleClose = () => {
+    setHasChanges(false);
+    onClose();
+  };
+
+  const handleFinish = (values: RampUpFormData) => {
+    const rampUps: IStrategicOpportunityRampUp[] = [];
+    setFormData(values);
+    Object.keys(values).forEach((key) => {
+      rampUps.push({ opportunityId: opportunityId, monthNumber: parseInt(key.replace('month', '')), percentage: values[key] });
+    });
+    const saveRampUps = async () => {
+      setLoading(true);
+      try {
+        const result = await strategicOpportunityService.saveRampUps(opportunityId, rampUps);
+        if (result) onOk();
+      } finally {
+        setHasChanges(false);
+        setLoading(false);
+      }
+    };
+    saveRampUps();
+  };
+
+  return (
+    <Drawer
+      visible={visible}
+      title='Ramp Up to Goal'
+      loading={loading}
+      onClose={handleClose}
+      width={500}
+      footer={
+        <>
+          <Button onClick={() => handleClose()}>Cancel</Button>
+          <Button type='primary' disabled={!hasChanges || !isEditable} onClick={() => form.submit()}>
+            Save
+          </Button>
+        </>
+      }
+    >
+      <Form form={form} onFinish={handleFinish} initialValues={formData} onValuesChange={() => setHasChanges(true)}>
+        {getRows()}
+      </Form>
+    </Drawer>
+  );
+};
+
+export default StrategicOpportunityRampUpToGoalDrawer;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/BaselineType.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/BaselineType.ts
new file mode 100644
index 0000000..5b95d5a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/BaselineType.ts
@@ -0,0 +1,39 @@
+import { IKeyNameItem } from '../../shared/data/IKeyTextItem';
+
+// Info: sync with backend
+export enum BaselineType {
+  MonthRange = 1,
+  FlatBudget,
+  Custom,
+  Override
+}
+
+export const BaselineTypeData: IKeyNameItem[] = [
+  { key: BaselineType.MonthRange, name: 'Month Range' },
+  { key: BaselineType.FlatBudget, name: 'Flat Budget' },
+  { key: BaselineType.Custom, name: 'Custom' },
+  { key: BaselineType.Override, name: 'Override' }
+];
+
+// Info: sync with backend
+export enum BaselineDistribution {
+  Average = 1,
+  Monthly
+}
+
+export const BaselineDistributionData: IKeyNameItem[] = [
+  { key: BaselineDistribution.Average, name: 'Period Average' },
+  { key: BaselineDistribution.Monthly, name: 'Monthly Values' }
+];
+
+export const getBaselineDistributionEnumValue = (baselineDistribution: string): BaselineDistribution => {
+  let baselineDistributionEnumValue: BaselineDistribution;
+  switch (baselineDistribution) {
+    case 'PeriodAverage':
+      return (baselineDistributionEnumValue = BaselineDistribution.Average);
+    case 'MonthlyValues':
+      return (baselineDistributionEnumValue = BaselineDistribution.Monthly);
+    default:
+      return (baselineDistributionEnumValue = BaselineDistribution.Average);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/DesiredResult.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/DesiredResult.ts
new file mode 100644
index 0000000..b1f397f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/DesiredResult.ts
@@ -0,0 +1,18 @@
+import { IKeyNameItem } from '../../shared/data/IKeyTextItem';
+
+// Info: sync with backend
+export const enum DesiredResult {
+  Increase = 1,
+  Decrease,
+  Steady
+}
+
+export function getDesiredResultEnumValue(value: string): DesiredResult {
+  return parseInt(value, 10) as DesiredResult;
+}
+
+export const DesiredResultData: IKeyNameItem[] = [
+  { key: DesiredResult.Increase, name: 'Increase' },
+  { key: DesiredResult.Decrease, name: 'Decrease' },
+  { key: DesiredResult.Steady, name: 'Steady' }
+];
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/GLAccountType.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/GLAccountType.ts
new file mode 100644
index 0000000..721d598
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/GLAccountType.ts
@@ -0,0 +1,14 @@
+import { IKeyNameItem } from '../../shared/data/IKeyTextItem';
+
+// Info: sync with backend GLAccountType enum
+export enum GLAccountType {
+  Revenue = 0,
+  Expense = 1,
+  Margin = 2
+}
+
+export const glAccountTypeData: IKeyNameItem[] = [
+  { key: GLAccountType.Revenue, name: 'Revenue' },
+  { key: GLAccountType.Expense, name: 'Expense' },
+  { key: GLAccountType.Margin, name: 'Margin' }
+];
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IChargeCodeCustomPickerModel.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IChargeCodeCustomPickerModel.ts
new file mode 100644
index 0000000..0a7f29d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IChargeCodeCustomPickerModel.ts
@@ -0,0 +1,6 @@
+export interface IChargeCodeCustomPickerModel {
+  chargeCodeId: number;
+  name: string;
+  costDriver: string;
+  rollup: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IPerformanceEngineCalculationData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IPerformanceEngineCalculationData.ts
new file mode 100644
index 0000000..0c5dc3b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IPerformanceEngineCalculationData.ts
@@ -0,0 +1,46 @@
+export interface IPerformanceEngineCalculationData {
+  // inputs
+  entity: string;
+  caseTypeEntity: string;
+  serviceLineID: number;
+  physicianGroupingAffiliationId: number;
+  primaryPhysician: string;
+  chargeCodeRollup: string;
+  costDriver: string;
+  baselineStartDate: string;
+  baselineEndDate: string;
+
+  // numbers fed into calcs
+  totalVolume: number;
+  totalGrossCharges: number;
+  totalVariableDirectCost: number;
+  totalVariableCost: number;
+
+  // calculated results
+  goalUnitVariance: number;
+  actualUnitVariance: number;
+  committedUnits: number;
+  committedStats: number;
+  baselineAverage: number;
+}
+
+export const DefaultPerformanceEngineCalculationData: IPerformanceEngineCalculationData = {
+  entity: 'n/a',
+  caseTypeEntity: 'n/a',
+  serviceLineID: -1,
+  physicianGroupingAffiliationId: -1,
+  primaryPhysician: 'n/a',
+  chargeCodeRollup: 'n/a',
+  costDriver: 'n/a',
+  baselineStartDate: new Date().toDateString(),
+  baselineEndDate: new Date().toDateString(),
+  totalVolume: -1,
+  totalGrossCharges: -1,
+  totalVariableDirectCost: -1,
+  totalVariableCost: -1,
+  goalUnitVariance: -1,
+  actualUnitVariance: -1,
+  committedUnits: -1,
+  committedStats: -1,
+  baselineAverage: -1
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicInitiativeListItem.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicInitiativeListItem.ts
new file mode 100644
index 0000000..2bfe1be
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicInitiativeListItem.ts
@@ -0,0 +1,26 @@
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { RunTrackingStatus } from './RunTrackingStatus';
+
+export interface IStrategicInitiativeListItem {
+  opportunityId: number;
+  opportunityKey: string;
+  name: string;
+  opportunityType: OpportunityTypes;
+  opportunityTypeName: string;
+  rollup1: string;
+  rollup2: string;
+  rollup3: string;
+  population: string;
+  additionalFilters: string;
+  baselinePeriod: string;
+  trackingPeriod: string;
+  totalCommitted: number;
+  progressToDateActual: number;
+  progressToDateCommitted: number;
+  progressToDateVariance: number;
+  statusName: string;
+  onTrack: boolean;
+  lastRunTrackingDate: Date | null;
+  lastRunTrackingStatus: RunTrackingStatus;
+  baselineStartDate: Date;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityChargeCodeData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityChargeCodeData.ts
new file mode 100644
index 0000000..1649a98
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityChargeCodeData.ts
@@ -0,0 +1,14 @@
+import { IStrategicOpportunityData, defaultStrategicOpportunityData } from './IStrategicOpportunityData';
+
+export interface IStrategicOpportunityChargeCodeData extends IStrategicOpportunityData {
+  patientPopulationHPath: string;
+  explorationPopulationId: number;
+  chargeCodeHPath: string;
+}
+
+export const defaultStrategicOpportunityChargeCodeData: IStrategicOpportunityChargeCodeData = {
+  ...defaultStrategicOpportunityData,
+  patientPopulationHPath: '',
+  explorationPopulationId: 0,
+  chargeCodeHPath: ''
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityData.ts
new file mode 100644
index 0000000..705602a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityData.ts
@@ -0,0 +1,61 @@
+import dayjs from 'dayjs';
+import { StrategicOpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { EncounterGroup } from '../../shared/opportunities/data/EncounterGroup';
+import { OpportunityLevelTypes } from '../../shared/opportunities/data/OpportunityLevelTypes';
+import { defaultStrategicOpportunityLayout, IStrategicOpportunityLayout } from '../detail/data/IStrategicOpportunityLayout';
+import { BaselineDistribution, BaselineType } from './BaselineType';
+import { DefaultStrategicOpportunityMeasureData, IStrategicOpportunityMeasureData } from './IStrategicOpportunityMeasureData';
+
+export interface IStrategicOpportunityData {
+  opportunityId: number;
+  opportunityKey: string;
+
+  name: string;
+  opportunityType: StrategicOpportunityTypes;
+  opportunityFiltersJSON: string;
+  layout: IStrategicOpportunityLayout;
+
+  rollup1Id: number;
+  rollup2Id: number;
+  rollup3Id: number;
+
+  baselineType: BaselineType;
+  baselineDistribution: BaselineDistribution;
+
+  baselineStartDate: dayjs.Dayjs;
+  baselineEndDate: dayjs.Dayjs;
+  estimatedTrackingDuration: number;
+
+  measures: IStrategicOpportunityMeasureData[];
+  workbookIds: number[];
+
+  encounterGroup: EncounterGroup;
+  opportunityLevel: OpportunityLevelTypes;
+}
+
+export const defaultStrategicOpportunityData: IStrategicOpportunityData = {
+  opportunityId: 0,
+  opportunityKey: '',
+
+  name: '',
+  opportunityType: 0,
+  opportunityFiltersJSON: '',
+  layout: defaultStrategicOpportunityLayout,
+
+  rollup1Id: 0,
+  rollup2Id: 0,
+  rollup3Id: 0,
+
+  baselineType: BaselineType.Custom,
+  baselineDistribution: BaselineDistribution.Average,
+
+  baselineStartDate: dayjs(new Date()),
+  baselineEndDate: dayjs(new Date()),
+  estimatedTrackingDuration: 12,
+
+  measures: [DefaultStrategicOpportunityMeasureData],
+  workbookIds: [],
+
+  encounterGroup: EncounterGroup.PatientPopulation,
+  opportunityLevel: OpportunityLevelTypes.Organization
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityEditData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityEditData.ts
new file mode 100644
index 0000000..94757ba
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityEditData.ts
@@ -0,0 +1,37 @@
+import { IWorkbook } from '../../shared/analytics/data/analyticsService';
+import { BaselineDistribution } from './BaselineType';
+import { GLAccountType } from './GLAccountType';
+import { IChargeCodeCustomPickerModel } from './IChargeCodeCustomPickerModel';
+import { IStrategicOpportunityMeasureData } from './IStrategicOpportunityMeasureData';
+
+export interface IStrategicOpportunityEditData {
+  name: string;
+  rollup1Id: number;
+  rollup2Id: number;
+  rollup3Id: number;
+  filters: string;
+  baselineStartDate: string;
+  baselineEndDate: string;
+  baselineDistribution: BaselineDistribution;
+  estimatedTrackingDuration: number;
+  measures: IStrategicOpportunityMeasureData[];
+  workbooks: IWorkbook[];
+}
+
+export interface IStrategicOpportunityChargeCodeEditData extends IStrategicOpportunityEditData {
+  encounterGroupName: string;
+  patientPopulationHPath: string;
+  explorationPopulationId: string;
+  chargeCodeHPath: string[];
+  chargeCodes: IChargeCodeCustomPickerModel[];
+  populationMembers: any[];
+}
+
+export interface IStrategicOpportunityGLEditData extends IStrategicOpportunityEditData {
+  accountType: GLAccountType;
+  departmentHPath: string;
+  revenueAccountHPath: string;
+  expenseAccountHPath: string;
+  statisticAccountHPath: string;
+  hasStatistic: boolean;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityGLData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityGLData.ts
new file mode 100644
index 0000000..f57bfeb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityGLData.ts
@@ -0,0 +1,21 @@
+import { GLAccountType } from './GLAccountType';
+import { IStrategicOpportunityData, defaultStrategicOpportunityData } from './IStrategicOpportunityData';
+
+export interface IStrategicOpportunityGLData extends IStrategicOpportunityData {
+  accountType: GLAccountType;
+  departmentHPath: string;
+  revenueAccountHPath: string;
+  expenseAccountHPath: string;
+  statisticAccountHPath: string;
+  hasStatistic: boolean;
+}
+
+export const defaultStrategicOpportunityGLData: IStrategicOpportunityGLData = {
+  ...defaultStrategicOpportunityData,
+  accountType: GLAccountType.Expense,
+  departmentHPath: '',
+  revenueAccountHPath: '',
+  expenseAccountHPath: '',
+  statisticAccountHPath: '',
+  hasStatistic: false
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityListItem.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityListItem.ts
new file mode 100644
index 0000000..26f5440
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityListItem.ts
@@ -0,0 +1,20 @@
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+
+export interface IStrategicOpportunityListItem {
+  opportunityId: number;
+  opportunityKey: string;
+  name: string;
+  opportunityType: OpportunityTypes;
+  opportunityTypeName: string;
+  rollup1: string;
+  rollup2: string;
+  rollup3: string;
+  population: string;
+  additionalFilters: string;
+  baselinePeriod: string;
+  estimatedTrackDurationMonths: number;
+  totalImprovement: number;
+  estimatedGoal: number;
+  statusName: string;
+  baselineStartDate: Date;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityMeasureData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityMeasureData.ts
new file mode 100644
index 0000000..8d90c29
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityMeasureData.ts
@@ -0,0 +1,34 @@
+export interface IStrategicOpportunityMeasureData {
+  measureId: number;
+  measureType: number;
+  measureName: string;
+  desiredResult: number;
+  acceptableThreshold: number;
+  averageValue: number;
+  filtersJSON: string;
+  measureGroup: number;
+}
+
+export interface IStrategicOpportunityMeasureDetail {
+  measureId: number;
+  yearId: number;
+  monthId: number;
+  value: number;
+}
+
+export enum MeasureGroup {
+  System = 0,
+  Primary,
+  Secondary
+}
+
+export const DefaultStrategicOpportunityMeasureData: IStrategicOpportunityMeasureData = {
+  measureId: 0,
+  measureType: 0,
+  measureName: 'Primary Measure',
+  desiredResult: 0,
+  acceptableThreshold: 0,
+  averageValue: 0,
+  filtersJSON: '',
+  measureGroup: MeasureGroup.Secondary
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityRampUp.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityRampUp.ts
new file mode 100644
index 0000000..25cd3f7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityRampUp.ts
@@ -0,0 +1,5 @@
+export interface IStrategicOpportunityRampUp {
+  opportunityId: number;
+  monthNumber: number;
+  percentage: number;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityService.ts
new file mode 100644
index 0000000..db3f7d0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/IStrategicOpportunityService.ts
@@ -0,0 +1,29 @@
+import {
+  IStrategicOpportunityDrawerDetails,
+  IStrategicOpportunityGeneralInfo
+} from '../detail/data/IStrategicOpportunityDetail';
+import { IStrategicOpportunityLayout } from '../detail/data/IStrategicOpportunityLayout';
+import { IStrategicInitiativeListItem } from './IStrategicInitiativeListItem';
+import { IStrategicOpportunityListItem } from './IStrategicOpportunityListItem';
+import { IStrategicOpportunityMeasureData, IStrategicOpportunityMeasureDetail } from './IStrategicOpportunityMeasureData';
+import { IStrategicOpportunityRampUp } from './IStrategicOpportunityRampUp';
+
+export interface IStrategicOpportunityService {
+  getOpportunities: () => Promise<IStrategicOpportunityListItem[]>;
+  getOpportunityGeneralInfo: (opportunityId: number) => Promise<IStrategicOpportunityGeneralInfo>;
+  nameIsValid: (name: string) => Promise<boolean>;
+  getOpportunityDrawerDetails: (opportunityId: number) => Promise<IStrategicOpportunityDrawerDetails>;
+  getLayout: (opportunityId: number) => Promise<IStrategicOpportunityLayout>;
+  saveLayout: (opportunityId: number, layout: IStrategicOpportunityLayout) => Promise<boolean>;
+  updateStatus: (opportunityId: number, status: number, trackingStartDate: string, trackingEndDate: string) => Promise<boolean>;
+  getRampUps: (opportunityId: number) => Promise<IStrategicOpportunityRampUp[]>;
+  saveRampUps: (opportunityId: number, rampUps: IStrategicOpportunityRampUp[]) => Promise<boolean>;
+  getInitiatives: () => Promise<IStrategicInitiativeListItem[]>;
+  updateInitiative: (opportunityId: number, name: string, trackingStartDate: string, trackingEndDate: string) => Promise<boolean>;
+  updateRoles: (opportunityId: number, costLeaderGuid: string, ownerGuid: string, executiveSponsorGuid: string, stakeholders: string[], teamMembers: string) => Promise<boolean>;
+  runTrackingTask: (opportunityId: number) => Promise<boolean>;
+  completeInitiative: (opportunityId: number, isThresholdMonitoring: boolean, acceptableThreshold: number) => Promise<boolean>;
+  getPrimaryMeasure: (opportunityId: number) => Promise<IStrategicOpportunityMeasureData>;
+  copyStrategicOpportunity: (opportunityId: number, name: string) => Promise<number>;
+  getMeasureDetails: (measureId: number) => Promise<IStrategicOpportunityMeasureDetail[]>;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/MeasureType.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/MeasureType.ts
new file mode 100644
index 0000000..265d912
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/MeasureType.ts
@@ -0,0 +1,201 @@
+import { IKeyNameItem } from '../../shared/data/IKeyTextItem';
+import { DesiredResult } from './DesiredResult';
+
+// Info: sync with backend
+export const enum MeasureType {
+  UnitsOfService = 1,
+  UnitsOfServicePerCase,
+  DirectVariableCost,
+  DirectVariableCostPerCase,
+  DirectVariableCostPerUnit,
+  TotalDirectCost,
+  TotalDirectCostPerCase,
+  TotalDirectCostPerUnit,
+  TotalCharges,
+  TotalChargesPerCase,
+  TotalChargesPerUnit,
+  EncountersCases,
+  AcquisitionSupplyCost,
+  AcquisitionSupplyCostPerCase,
+  AcquisitionSupplyCostPerUnit,
+  AverageLengthOfStay,
+  Days,
+  TotalMargin,
+  MarginPerCase,
+  ContributionMargin,
+  ContributionMarginPerCase,
+  DirectMargin,
+  DirectMarginPerCase,
+  VariableMargin,
+  VariableMarginPerCase,
+
+  // GL measure types (sync with backend, values 28-37)
+  GLExpense = 28,
+  GLRevenue,
+  GLVolume,
+  GLExpensePerUnit,
+  GLRevenuePerUnit,
+  GLExpensePerAdjDischarge,
+  GLRevenuePerAdjDischarge,
+  GLMargin,
+  GLMarginPerUnit,
+  GLMarginPerAdjDischarge
+}
+
+export const measureTypeData: IKeyNameItem[] = [
+  { key: MeasureType.UnitsOfService, name: 'Units of Service' },
+  { key: MeasureType.UnitsOfServicePerCase, name: 'Units of Service per Case' },
+  { key: MeasureType.DirectVariableCost, name: 'Direct Variable Cost' },
+  {
+    key: MeasureType.DirectVariableCostPerCase,
+    name: 'Direct Variable Cost per Case'
+  },
+  {
+    key: MeasureType.DirectVariableCostPerUnit,
+    name: 'Direct Variable Cost per Unit'
+  },
+  { key: MeasureType.TotalDirectCost, name: 'Total Direct Cost' },
+  {
+    key: MeasureType.TotalDirectCostPerCase,
+    name: 'Total Direct Cost per Case'
+  },
+  {
+    key: MeasureType.TotalDirectCostPerUnit,
+    name: 'Total Direct Cost per Unit'
+  },
+  { key: MeasureType.TotalCharges, name: 'Total Charges' },
+  { key: MeasureType.TotalChargesPerCase, name: 'Total Charges per case' },
+  { key: MeasureType.TotalChargesPerUnit, name: 'Total Charges per unit' },
+  { key: MeasureType.EncountersCases, name: 'Encounters (Cases)' },
+  { key: MeasureType.AcquisitionSupplyCost, name: 'Acquisition supply cost' },
+  {
+    key: MeasureType.AcquisitionSupplyCostPerCase,
+    name: 'Acquisition supply cost per case'
+  },
+  {
+    key: MeasureType.AcquisitionSupplyCostPerUnit,
+    name: 'Acquisition supply cost per unit'
+  },
+  { key: MeasureType.AverageLengthOfStay, name: 'Average Length of Stay' },
+  { key: MeasureType.Days, name: 'Days' },
+  { key: MeasureType.TotalMargin, name: 'Total Margin' },
+  { key: MeasureType.MarginPerCase, name: 'Margin per Case' },
+  { key: MeasureType.ContributionMargin, name: 'Contribution Margin' },
+  {
+    key: MeasureType.ContributionMarginPerCase,
+    name: 'Contribution Margin Per Case'
+  },
+  { key: MeasureType.DirectMargin, name: 'Direct Margin' },
+  { key: MeasureType.DirectMarginPerCase, name: 'Direct Margin Per Case' },
+  { key: MeasureType.VariableMargin, name: 'Variable Margin' },
+  { key: MeasureType.VariableMarginPerCase, name: 'Variable Margin Per Case' }
+];
+
+export const enum SystemMeasureType {
+  CommittedCost = 26,
+  ActualCost
+}
+
+export const glMeasureTypeData: IKeyNameItem[] = [
+  { key: MeasureType.GLExpense, name: 'Expense' },
+  { key: MeasureType.GLRevenue, name: 'Revenue' },
+  { key: MeasureType.GLVolume, name: 'Volume' },
+  { key: MeasureType.GLExpensePerUnit, name: 'Expense per Unit' },
+  { key: MeasureType.GLRevenuePerUnit, name: 'Revenue per Unit' },
+  {
+    key: MeasureType.GLExpensePerAdjDischarge,
+    name: 'Expense per Adjusted Discharge'
+  },
+  {
+    key: MeasureType.GLRevenuePerAdjDischarge,
+    name: 'Revenue per Adjusted Discharge'
+  },
+  { key: MeasureType.GLMargin, name: 'Margin' },
+  { key: MeasureType.GLMarginPerUnit, name: 'Margin per Unit' },
+  {
+    key: MeasureType.GLMarginPerAdjDischarge,
+    name: 'Margin per Adjusted Discharge'
+  }
+];
+
+export const glMeasureList: MeasureType[] = [
+  MeasureType.GLExpense,
+  MeasureType.GLRevenue,
+  MeasureType.GLVolume,
+  MeasureType.GLExpensePerUnit,
+  MeasureType.GLRevenuePerUnit,
+  MeasureType.GLExpensePerAdjDischarge,
+  MeasureType.GLRevenuePerAdjDischarge,
+  MeasureType.GLMargin,
+  MeasureType.GLMarginPerUnit,
+  MeasureType.GLMarginPerAdjDischarge
+];
+
+export const primaryMeasureList: MeasureType[] = [
+  MeasureType.UnitsOfService,
+  MeasureType.UnitsOfServicePerCase,
+  MeasureType.DirectVariableCost,
+  MeasureType.DirectVariableCostPerCase,
+  MeasureType.DirectVariableCostPerUnit,
+  MeasureType.TotalDirectCost,
+  MeasureType.TotalDirectCostPerCase,
+  MeasureType.TotalDirectCostPerUnit,
+  MeasureType.TotalCharges,
+  MeasureType.TotalChargesPerCase,
+  MeasureType.TotalChargesPerUnit,
+  MeasureType.EncountersCases,
+  MeasureType.AcquisitionSupplyCost,
+  MeasureType.AcquisitionSupplyCostPerCase,
+  MeasureType.AcquisitionSupplyCostPerUnit
+];
+
+export const mapMeasureTypeToDesiredResult: {
+  [key in MeasureType]: DesiredResult;
+} = {
+  [MeasureType.UnitsOfService]: DesiredResult.Decrease,
+  [MeasureType.UnitsOfServicePerCase]: DesiredResult.Decrease,
+  [MeasureType.DirectVariableCost]: DesiredResult.Decrease,
+  [MeasureType.DirectVariableCostPerCase]: DesiredResult.Decrease,
+  [MeasureType.DirectVariableCostPerUnit]: DesiredResult.Decrease,
+  [MeasureType.TotalDirectCost]: DesiredResult.Decrease,
+  [MeasureType.TotalDirectCostPerCase]: DesiredResult.Decrease,
+  [MeasureType.TotalDirectCostPerUnit]: DesiredResult.Decrease,
+  [MeasureType.TotalCharges]: DesiredResult.Increase,
+  [MeasureType.TotalChargesPerCase]: DesiredResult.Increase,
+  [MeasureType.TotalChargesPerUnit]: DesiredResult.Increase,
+  [MeasureType.EncountersCases]: DesiredResult.Increase,
+  [MeasureType.AcquisitionSupplyCost]: DesiredResult.Decrease,
+  [MeasureType.AcquisitionSupplyCostPerCase]: DesiredResult.Decrease,
+  [MeasureType.AcquisitionSupplyCostPerUnit]: DesiredResult.Decrease,
+  [MeasureType.AverageLengthOfStay]: DesiredResult.Decrease,
+  [MeasureType.Days]: DesiredResult.Decrease,
+  [MeasureType.TotalMargin]: DesiredResult.Increase,
+  [MeasureType.MarginPerCase]: DesiredResult.Increase,
+  [MeasureType.ContributionMargin]: DesiredResult.Increase,
+  [MeasureType.ContributionMarginPerCase]: DesiredResult.Increase,
+  [MeasureType.DirectMargin]: DesiredResult.Increase,
+  [MeasureType.DirectMarginPerCase]: DesiredResult.Increase,
+  [MeasureType.VariableMargin]: DesiredResult.Increase,
+  [MeasureType.VariableMarginPerCase]: DesiredResult.Increase,
+  [MeasureType.GLExpense]: DesiredResult.Decrease,
+  [MeasureType.GLRevenue]: DesiredResult.Increase,
+  [MeasureType.GLVolume]: DesiredResult.Increase,
+  [MeasureType.GLExpensePerUnit]: DesiredResult.Decrease,
+  [MeasureType.GLRevenuePerUnit]: DesiredResult.Increase,
+  [MeasureType.GLExpensePerAdjDischarge]: DesiredResult.Decrease,
+  [MeasureType.GLRevenuePerAdjDischarge]: DesiredResult.Increase,
+  [MeasureType.GLMargin]: DesiredResult.Increase,
+  [MeasureType.GLMarginPerUnit]: DesiredResult.Increase,
+  [MeasureType.GLMarginPerAdjDischarge]: DesiredResult.Increase
+};
+
+export const isGLPerMeasureType = (measureType: number): boolean =>
+  measureType === MeasureType.GLExpensePerUnit ||
+  measureType === MeasureType.GLRevenuePerUnit ||
+  measureType === MeasureType.GLExpensePerAdjDischarge ||
+  measureType === MeasureType.GLRevenuePerAdjDischarge ||
+  measureType === MeasureType.GLMarginPerUnit ||
+  measureType === MeasureType.GLMarginPerAdjDischarge;
+
+export const getDesiredResultByMeasureType = (measureType?: number): DesiredResult =>
+  measureType !== undefined && measureType in mapMeasureTypeToDesiredResult ? mapMeasureTypeToDesiredResult[measureType as MeasureType] : DesiredResult.Decrease;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/RunTrackingStatus.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/RunTrackingStatus.ts
new file mode 100644
index 0000000..f0fe6e5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/RunTrackingStatus.ts
@@ -0,0 +1,6 @@
+// Enum to represent the status of run tracking. Should be synced with the backend RunTrackingStatus enum
+export enum RunTrackingStatus {
+  None,
+  Success,
+  Failed
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/StrategicOpportunityStatus.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/StrategicOpportunityStatus.ts
new file mode 100644
index 0000000..8733673
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/StrategicOpportunityStatus.ts
@@ -0,0 +1,13 @@
+export enum StrategicOpportunityStatus {
+  NewOpportunity,
+  InValidation,
+  PendingApproval,
+  NewInitiative,
+  Tracking,
+  Complete,
+  CompleteMonitoring
+}
+
+export const isStrategicOpportunityComplete = (status: StrategicOpportunityStatus): boolean => {
+  return status === StrategicOpportunityStatus.Complete || status === StrategicOpportunityStatus.CompleteMonitoring;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/store/StrategicInitiativeDetailStoreTreeData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/store/StrategicInitiativeDetailStoreTreeData.ts
new file mode 100644
index 0000000..77f0c76
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/store/StrategicInitiativeDetailStoreTreeData.ts
@@ -0,0 +1,250 @@
+import { DicStrNum } from '../../../shared/data/Dictionary';
+import { ChangeGridData, DimensionsData, StoreTreeData, TreeNode } from '../../../shared/store/StoreTreeData';
+import { getFixedNumber, getSum, getValueByProp, setValueByProp } from '../../../shared/utilities';
+import { IStrategicInitiativeDetailGridItem } from '../../detail/data/IStrategicInitiativeDetail';
+import { IStrategicInitiativeDetail, IStrategicOpportunityDetailGrouped } from '../../detail/data/IStrategicOpportunityDetail';
+import {
+  getStrategicInitiativeDetailFieldsBySection,
+  getStrategicInitiativeDetailSectionsByFields,
+  StrategicInitiativeDetailField,
+  StrategicInitiativeDetailFieldSection
+} from '../../detail/data/StrategicInitiativeDetailDimension';
+
+export const configRoundDataInfo: { [key in StrategicInitiativeDetailField]?: number } = {
+  [StrategicInitiativeDetailField.MonthActualMonth]: 0,
+  [StrategicInitiativeDetailField.MonthCommittedMonth]: 0,
+  [StrategicInitiativeDetailField.MonthCostPerEncounter]: 0,
+  [StrategicInitiativeDetailField.MonthCostPerUnit]: 0,
+  [StrategicInitiativeDetailField.MonthEncounters]: 0,
+  [StrategicInitiativeDetailField.MonthUnits]: 0,
+  [StrategicInitiativeDetailField.MonthUnitsPerEncounter]: 2,
+  [StrategicInitiativeDetailField.MonthVarianceMonth]: 0,
+  [StrategicInitiativeDetailField.TrackingActualTracking]: 0,
+  [StrategicInitiativeDetailField.TrackingCommittedTracking]: 0,
+  [StrategicInitiativeDetailField.TrackingCostPerEncounter]: 0,
+  [StrategicInitiativeDetailField.TrackingCostPerUnit]: 0,
+  [StrategicInitiativeDetailField.TrackingEncounters]: 0,
+  [StrategicInitiativeDetailField.TrackingUnits]: 0,
+  [StrategicInitiativeDetailField.TrackingUnitsPerEncounter]: 2,
+  [StrategicInitiativeDetailField.TrackingVarianceTracking]: 0
+};
+
+export class StrategicInitiativeDetailStoreTreeData extends StoreTreeData<IStrategicInitiativeDetail, IStrategicInitiativeDetailGridItem> {
+  readonly roundDataInfo: DicStrNum;
+
+  constructor(defaultNodeData: IStrategicInitiativeDetailGridItem) {
+    super(defaultNodeData);
+    this.roundDataInfo = configRoundDataInfo;
+    this.rootLabel = 'SYSTEM';
+  }
+
+  public loadData(data: IStrategicInitiativeDetail[], dimensionsData: DimensionsData, partialTreeData: { [key: string]: Partial<IStrategicInitiativeDetailGridItem> }): void {
+    this._assignAdditionalProps(data);
+    super.loadData(data, dimensionsData, partialTreeData);
+  }
+
+  public appendData(data: IStrategicInitiativeDetail[]): void {
+    this._assignAdditionalProps(data);
+    super.appendData(data);
+  }
+
+  public updateMonthData(monthData: IStrategicOpportunityDetailGrouped[]): void {
+    for (const item of this.initialData) {
+      const monthDataItem = monthData.find((x) => x.key === item.key);
+      if (monthDataItem) {
+        item.monthUnits = monthDataItem.units;
+        item.monthCost = monthDataItem.cost;
+        item.monthGoalUnits = monthDataItem.goalUnits;
+        item.monthGoalCost = monthDataItem.goalCost;
+      } else {
+        item.monthUnits = 0;
+        item.monthCost = 0;
+        item.monthGoalUnits = 0;
+        item.monthGoalCost = 0;
+      }
+    }
+    super.loadData(this.initialData, this.dimensionsData, this.partialTreeData);
+  }
+
+  public getSaveData(): IStrategicInitiativeDetail[] {
+    return this.data.filter((x) => x.isDirty);
+  }
+
+  public validateSourceData(): string[] {
+    const invalidData: string[] = [];
+    // Info: code for other Save
+    return invalidData;
+  }
+
+  protected assignTreeData(
+    data: IStrategicInitiativeDetail[],
+    treeNode: TreeNode<IStrategicInitiativeDetailGridItem>,
+    columnsName: string[] | null,
+    includeMeasures: string[] | null = null,
+    changeData: ChangeGridData<IStrategicInitiativeDetailGridItem> | null = null,
+    isRegroup = false
+  ) {
+    const nodeData = treeNode.data;
+    const nodeRawData = treeNode.rawData;
+    const levelID = treeNode.levelId;
+
+    if (!columnsName) {
+      if (levelID) {
+        // Info: code for other properties
+      }
+    }
+
+    if (nodeData && nodeRawData && data.length) {
+      let sections: StrategicInitiativeDetailFieldSection[] | null = null;
+      if (columnsName) {
+        sections = getStrategicInitiativeDetailSectionsByFields(columnsName);
+      }
+      this._calcValuesByData(nodeRawData, data, sections);
+      this._assignNodeData(nodeData, nodeRawData, sections, true);
+    }
+  }
+
+  protected updateData(
+    arr: IStrategicInitiativeDetail[],
+    node: TreeNode<IStrategicInitiativeDetailGridItem>,
+    colName: string,
+    newVal: number,
+    oldVal: number,
+    changeData: ChangeGridData<IStrategicInitiativeDetailGridItem> | null = null
+  ): DicStrNum {
+    const deltaDic: DicStrNum = {};
+    return deltaDic;
+  }
+
+  protected updateTreeData(node: TreeNode<IStrategicInitiativeDetailGridItem>, deltaDic: DicStrNum, changeData: ChangeGridData<IStrategicInitiativeDetailGridItem> | null = null) {
+    const nodeData = node.data;
+    const nodeRawData = node.rawData;
+
+    if (!nodeData || !nodeRawData) return;
+  }
+
+  protected assignAdditionalPropertiesRoot(arr: IStrategicInitiativeDetail[], treeNode: TreeNode<IStrategicInitiativeDetailGridItem>) {
+    if (treeNode.data) {
+      treeNode.data.label = this.rootLabel;
+    }
+  }
+
+  protected assignAdditionalProperties(arr: IStrategicInitiativeDetail[], treeNode: TreeNode<IStrategicInitiativeDetailGridItem>, levelIndex: number) {
+    if (arr.length && treeNode.data) {
+      const groupedEl = arr[0];
+      treeNode.data.label = this._getLabel(groupedEl, levelIndex);
+      treeNode.data.sortOrder = getValueByProp<IStrategicInitiativeDetailGridItem, any>(treeNode.data, this.sortOrderProperties[levelIndex]) || 0;
+    }
+  }
+
+  private _assignAdditionalProps(data: IStrategicInitiativeDetail[]): void {
+    data.forEach((x) => {
+      // Info: code for additional properties
+    });
+  }
+
+  private _assignNodeData(
+    nodeData: IStrategicInitiativeDetailGridItem,
+    nodeRawData: IStrategicInitiativeDetailGridItem,
+    sections: StrategicInitiativeDetailFieldSection[] | null = null,
+    withRounding = false
+  ) {
+    const keys = sections ? sections.reduce((arr: string[], section) => arr.concat(getStrategicInitiativeDetailFieldsBySection(section)), []) : Object.values(StrategicInitiativeDetailField);
+    keys.forEach((key) => {
+      setValueByProp(nodeData, key, getValueByProp<IStrategicInitiativeDetailGridItem, number>(nodeRawData, key));
+    });
+    withRounding && this._roundValues(nodeData, keys);
+  }
+
+  private _roundValues(nodeData: IStrategicInitiativeDetailGridItem, keys: string[] = []) {
+    let items = Object.entries(this.roundDataInfo);
+    if (keys.length) {
+      items = items.filter(([key]) => keys.includes(key));
+    }
+    items.forEach(([key, value]) => {
+      const val = getFixedNumber(getValueByProp<IStrategicInitiativeDetailGridItem, number>(nodeData, key), value);
+      setValueByProp(nodeData, key, val);
+    });
+  }
+
+  private _calcValuesByData(nodeData: IStrategicInitiativeDetailGridItem, data: IStrategicInitiativeDetail[], sections: StrategicInitiativeDetailFieldSection[] | null = null) {
+    if (!sections) sections = Object.values(StrategicInitiativeDetailFieldSection);
+
+    for (const section of sections) {
+      switch (section) {
+        case StrategicInitiativeDetailFieldSection.TotalEncounters: {
+          const partialData = this.partialTreeData[nodeData.key];
+          if (partialData) {
+            this._calcValues(nodeData, partialData.monthEncounters ?? 0, partialData.trackingEncounters ?? 0, section);
+          }
+          break;
+        }
+        case StrategicInitiativeDetailFieldSection.TotalUnits: // Units
+        case StrategicInitiativeDetailFieldSection.UnitsPerEncounter: // Units / Encounters
+          this._calcValues(nodeData, getSum(data, 'monthUnits'), getSum(data, 'units'), section);
+          break;
+        case StrategicInitiativeDetailFieldSection.CostPerEncounter: // Cost / Encounter
+        case StrategicInitiativeDetailFieldSection.CostPerUnit: // Cost / Unit
+          this._calcValues(nodeData, getSum(data, 'monthCost'), getSum(data, 'cost'), section);
+          break;
+        case StrategicInitiativeDetailFieldSection.TotalCommittedCost: // Committed Cost
+          this._calcValues(nodeData, getSum(data, 'monthGoalCost'), getSum(data, 'goalCost'), section);
+          break;
+        case StrategicInitiativeDetailFieldSection.TotalActualCost: // Actual Cost
+          this._calcValues(nodeData, getSum(data, 'monthCost'), getSum(data, 'cost'), section);
+          break;
+        case StrategicInitiativeDetailFieldSection.TotalVariance: // Actual - Committed
+          this._calcValues(nodeData, 0, 0, section);
+          break;
+        case StrategicInitiativeDetailFieldSection.Progress: // Progress - On/Off Track
+          this._calcValues(nodeData, 0, 0, section);
+          break;
+        default:
+          break;
+      }
+    }
+  }
+
+  private _calcValues(nodeData: IStrategicInitiativeDetailGridItem, monthValue: number, trackingValue: number, section: StrategicInitiativeDetailFieldSection) {
+    switch (section) {
+      case StrategicInitiativeDetailFieldSection.TotalEncounters:
+        nodeData.monthEncounters = monthValue;
+        nodeData.trackingEncounters = trackingValue;
+        break;
+      case StrategicInitiativeDetailFieldSection.TotalUnits:
+        nodeData.monthUnits = monthValue;
+        nodeData.trackingUnits = trackingValue;
+        break;
+      case StrategicInitiativeDetailFieldSection.UnitsPerEncounter:
+        nodeData.monthUnitsPerEncounter = nodeData.monthEncounters ? monthValue / nodeData.monthEncounters : 0;
+        nodeData.trackingUnitsPerEncounter = nodeData.trackingEncounters ? trackingValue / nodeData.trackingEncounters : 0;
+        break;
+      case StrategicInitiativeDetailFieldSection.CostPerEncounter:
+        nodeData.monthCostPerEncounter = nodeData.monthEncounters ? monthValue / nodeData.monthEncounters : 0;
+        nodeData.trackingCostPerEncounter = nodeData.trackingEncounters ? trackingValue / nodeData.trackingEncounters : 0;
+        break;
+      case StrategicInitiativeDetailFieldSection.CostPerUnit:
+        nodeData.monthCostPerUnit = nodeData.monthUnits ? monthValue / nodeData.monthUnits : 0;
+        nodeData.trackingCostPerUnit = nodeData.trackingUnits ? trackingValue / nodeData.trackingUnits : 0;
+        break;
+      case StrategicInitiativeDetailFieldSection.TotalCommittedCost:
+        nodeData.monthCommittedMonth = monthValue;
+        nodeData.trackingCommittedTracking = trackingValue;
+        break;
+      case StrategicInitiativeDetailFieldSection.TotalActualCost:
+        nodeData.monthActualMonth = monthValue;
+        nodeData.trackingActualTracking = trackingValue;
+        break;
+      case StrategicInitiativeDetailFieldSection.TotalVariance:
+        nodeData.monthVarianceMonth = nodeData.monthActualMonth - nodeData.monthCommittedMonth;
+        nodeData.trackingVarianceTracking = nodeData.trackingActualTracking - nodeData.trackingCommittedTracking;
+        break;
+      case StrategicInitiativeDetailFieldSection.Progress:
+        nodeData.isMonthProgressMonth = nodeData.monthVarianceMonth <= 0;
+        nodeData.isTrackingProgressTracking = nodeData.trackingVarianceTracking <= 0;
+        break;
+      default:
+        break;
+    }
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/store/StrategicOpportunityDetailStoreTreeData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/store/StrategicOpportunityDetailStoreTreeData.ts
new file mode 100644
index 0000000..4d859f4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/store/StrategicOpportunityDetailStoreTreeData.ts
@@ -0,0 +1,457 @@
+import { DicStrNum } from '../../../shared/data/Dictionary';
+import { ChangeGridData, DimensionsData, RowConfig, StoreTreeData, TreeNode } from '../../../shared/store/StoreTreeData';
+import { getFixedNumber, getSplitEqualValues, getSplitWeightValues, getSum, getValueByProp, setValueByProp } from '../../../shared/utilities';
+import { IStrategicOpportunityDetail, IStrategicOpportunityDetailGridItem } from '../../detail/data/IStrategicOpportunityDetail';
+import {
+  StrategicOpportunityDetailDimension,
+  StrategicOpportunityDetailDimensionId,
+  StrategicOpportunityDetailField,
+  StrategicOpportunityDetailFieldSection,
+  getStrategicOpportunityDetailFieldsBySection,
+  getStrategicOpportunityDetailSectionsByFields
+} from '../../detail/data/StrategicOpportunityDetailDimension';
+
+export const configRoundDataInfo: { [key in StrategicOpportunityDetailField]?: number } = {
+  [StrategicOpportunityDetailField.EncountersMonth]: 0,
+  [StrategicOpportunityDetailField.UnitsMonth]: 0,
+  [StrategicOpportunityDetailField.CostMonth]: 0,
+
+  [StrategicOpportunityDetailField.GoalUnitsMonth]: 0,
+  [StrategicOpportunityDetailField.GoalCostMonth]: 0,
+
+  [StrategicOpportunityDetailField.UnitsPerEncounter]: 2,
+  [StrategicOpportunityDetailField.CostPerEncounter]: 2,
+  [StrategicOpportunityDetailField.CostPerUnit]: 2,
+
+  [StrategicOpportunityDetailField.GoalUnitsPerEncounter]: 2,
+  [StrategicOpportunityDetailField.GoalCostPerEncounter]: 2,
+  [StrategicOpportunityDetailField.GoalCostPerUnit]: 2,
+
+  [StrategicOpportunityDetailField.TotalImprovement]: 0
+};
+
+export const dimensionsRowConfig: RowConfig[] = [
+  {
+    dimension: StrategicOpportunityDetailDimension.Entity,
+    levelId: StrategicOpportunityDetailDimensionId.Entity,
+    groupKey: 'entityId',
+    sortOrderKey: 'label'
+  },
+  {
+    dimension: StrategicOpportunityDetailDimension.CaseTypeFamily,
+    levelId: StrategicOpportunityDetailDimensionId.CaseTypeFamily,
+    groupKey: 'caseTypeFamilyId',
+    sortOrderKey: 'label'
+  },
+  {
+    dimension: StrategicOpportunityDetailDimension.PrimaryServiceLine,
+    levelId: StrategicOpportunityDetailDimensionId.PrimaryServiceLine,
+    groupKey: 'primaryServiceLineId',
+    sortOrderKey: 'label'
+  },
+  {
+    dimension: StrategicOpportunityDetailDimension.CostDriver,
+    levelId: StrategicOpportunityDetailDimensionId.CostDriver,
+    groupKey: 'costDriver',
+    sortOrderKey: 'label'
+  },
+  {
+    dimension: StrategicOpportunityDetailDimension.Physician,
+    levelId: StrategicOpportunityDetailDimensionId.Physician,
+    groupKey: 'primaryPhysicianId',
+    sortOrderKey: 'label'
+  },
+  {
+    dimension: StrategicOpportunityDetailDimension.PhysicianSpecialty,
+    levelId: StrategicOpportunityDetailDimensionId.PhysicianSpecialty,
+    groupKey: 'physicianSpecialtyId',
+    sortOrderKey: 'label'
+  },
+  {
+    dimension: StrategicOpportunityDetailDimension.Department,
+    levelId: StrategicOpportunityDetailDimensionId.Department,
+    groupKey: 'departmentId',
+    sortOrderKey: 'label'
+  },
+  {
+    dimension: StrategicOpportunityDetailDimension.ChargeCode,
+    levelId: StrategicOpportunityDetailDimensionId.ChargeCode,
+    groupKey: 'chargeCodeId',
+    sortOrderKey: 'label'
+  }
+];
+
+export function getStrategicOpportunityDetailRowConfigsByDimensions(dimensions: StrategicOpportunityDetailDimension[]): RowConfig[] {
+  const rowsConfig: RowConfig[] = [];
+  for (const dimension of dimensions) {
+    const rowConfig = dimensionsRowConfig.find((y) => y.dimension === dimension);
+    rowConfig && rowsConfig.push(rowConfig);
+  }
+  return rowsConfig;
+}
+
+export class StrategicOpportunityDetailStoreTreeData extends StoreTreeData<IStrategicOpportunityDetail, IStrategicOpportunityDetailGridItem> {
+  readonly roundDataInfo: DicStrNum;
+
+  monthCount = 12;
+  estimatedMonthCount = 12;
+  monthCountMultiplier = 1;
+
+  constructor(defaultNodeData: IStrategicOpportunityDetailGridItem) {
+    super(defaultNodeData);
+    this.roundDataInfo = configRoundDataInfo;
+    this.rootLabel = 'SYSTEM';
+  }
+
+  public loadData(
+    data: IStrategicOpportunityDetail[],
+    dimensionsData: DimensionsData,
+    partialTreeData: { [key: string]: Partial<IStrategicOpportunityDetailGridItem> },
+    monthCount = 12,
+    estimatedMonthCount = 12
+  ): void {
+    this.monthCount = monthCount;
+    this.estimatedMonthCount = estimatedMonthCount;
+    this.monthCountMultiplier = this.estimatedMonthCount / this.monthCount;
+    this._assignAdditionalProps(data);
+    super.loadData(data, dimensionsData, partialTreeData);
+  }
+
+  public appendData(data: IStrategicOpportunityDetail[]): void {
+    this._assignAdditionalProps(data);
+    super.appendData(data);
+  }
+
+  public getSaveData(): IStrategicOpportunityDetail[] {
+    return this.data.filter((x) => x.isDirty);
+  }
+
+  public validateSourceData(): string[] {
+    const invalidData: string[] = [];
+    // Info: code for other Save
+    return invalidData;
+  }
+
+  protected assignTreeData(
+    data: IStrategicOpportunityDetail[],
+    treeNode: TreeNode<IStrategicOpportunityDetailGridItem>,
+    columnsName: string[] | null,
+    includeMeasures: string[] | null = null,
+    changeData: ChangeGridData<IStrategicOpportunityDetailGridItem> | null = null,
+    isRegroup = false
+  ) {
+    const nodeData = treeNode.data;
+    const nodeRawData = treeNode.rawData;
+    const levelID = treeNode.levelId;
+
+    if (!columnsName) {
+      if (levelID) {
+        // Info: code for other properties
+      }
+    }
+
+    if (nodeData && nodeRawData && data.length) {
+      let sections: StrategicOpportunityDetailFieldSection[] | null = null;
+      if (columnsName) {
+        sections = getStrategicOpportunityDetailSectionsByFields(columnsName);
+      }
+      this._calcValuesByData(nodeRawData, data, sections);
+      this._assignNodeData(nodeData, nodeRawData, sections, true);
+    }
+  }
+
+  protected updateData(
+    arr: IStrategicOpportunityDetail[],
+    node: TreeNode<IStrategicOpportunityDetailGridItem>,
+    colName: string,
+    newVal: number,
+    oldVal: number,
+    changeData: ChangeGridData<IStrategicOpportunityDetailGridItem> | null = null
+  ): DicStrNum {
+    let deltaDic: DicStrNum = {};
+    if (node.rawData && changeData) {
+      const filteredArr = arr.filter((x) => !x.isBaseline);
+      if (colName === StrategicOpportunityDetailField.GoalUnitsMonth) {
+        const newValUnits = newVal * this.estimatedMonthCount;
+        const newValCost = newValUnits * node.rawData.goalCostPerUnit;
+        deltaDic = {
+          ...this._updateDataByUnits(filteredArr, newValUnits, node.rawData.goalUnits),
+          ...this._updateDataByCost(filteredArr, newValCost, node.rawData.goalCost),
+          [StrategicOpportunityDetailField.TotalImprovement]: 0
+        };
+      } else if (colName === StrategicOpportunityDetailField.GoalUnitsPerEncounter) {
+        const newValUnits = newVal * node.rawData.encounters * this.monthCountMultiplier;
+        const newValCost = newValUnits * node.rawData.goalCostPerUnit;
+        deltaDic = {
+          ...this._updateDataByUnits(filteredArr, newValUnits, node.rawData.goalUnits),
+          ...this._updateDataByCost(filteredArr, newValCost, node.rawData.goalCost),
+          [StrategicOpportunityDetailField.TotalImprovement]: 0
+        };
+      } else if (colName === StrategicOpportunityDetailField.GoalCostPerEncounter) {
+        const newValCost = newVal * node.rawData.encounters * this.monthCountMultiplier;
+        if (changeData.options?.adjustmentData?.applyTo === StrategicOpportunityDetailField.GoalUnitsPerEncounter) {
+          if (node.rawData.goalCostPerUnit !== 0) {
+            const newValUnits = newValCost / node.rawData.goalCostPerUnit;
+            deltaDic = {
+              ...this._updateDataByUnits(filteredArr, newValUnits, node.rawData.goalUnits),
+              ...this._updateDataByCost(filteredArr, newValCost, node.rawData.goalCost),
+              [StrategicOpportunityDetailField.TotalImprovement]: 0
+            };
+          }
+        } else {
+          deltaDic = this._updateDataByCost(filteredArr, newValCost, node.rawData.goalCost);
+        }
+      } else if (colName === StrategicOpportunityDetailField.GoalCostPerUnit) {
+        const newValCost = newVal * node.rawData.goalUnits;
+        deltaDic = {
+          ...this._updateDataByCost(filteredArr, newValCost, node.rawData.goalCost),
+          [StrategicOpportunityDetailField.TotalImprovement]: 0
+        };
+      }
+    }
+
+    return deltaDic;
+  }
+
+  protected updateTreeData(node: TreeNode<IStrategicOpportunityDetailGridItem>, deltaDic: DicStrNum, changeData: ChangeGridData<IStrategicOpportunityDetailGridItem> | null = null) {
+    const nodeData = node.data;
+    const nodeRawData = node.rawData;
+
+    if (!nodeData || !nodeRawData) return;
+
+    for (const [key, val] of Object.entries(deltaDic)) {
+      if (key === StrategicOpportunityDetailField.GoalUnits) {
+        this._calcValues(nodeRawData, nodeRawData.goalUnits + val, StrategicOpportunityDetailFieldSection.GoalUnits);
+        this._assignNodeData(nodeData, nodeRawData, [StrategicOpportunityDetailFieldSection.GoalUnits], true);
+      } else if (key === StrategicOpportunityDetailField.GoalCost) {
+        this._calcValues(nodeRawData, nodeRawData.goalCost + val, StrategicOpportunityDetailFieldSection.GoalCost);
+        this._assignNodeData(nodeData, nodeRawData, [StrategicOpportunityDetailFieldSection.GoalCost], true);
+      } else if (key === StrategicOpportunityDetailField.TotalImprovement) {
+        this._calcValues(nodeRawData, val, StrategicOpportunityDetailFieldSection.Total);
+        this._assignNodeData(nodeData, nodeRawData, [StrategicOpportunityDetailFieldSection.Total], true);
+      }
+    }
+  }
+
+  protected assignAdditionalPropertiesRoot(arr: IStrategicOpportunityDetail[], treeNode: TreeNode<IStrategicOpportunityDetailGridItem>) {
+    if (treeNode.data) {
+      treeNode.data.label = this.rootLabel;
+    }
+  }
+
+  protected assignAdditionalProperties(arr: IStrategicOpportunityDetail[], treeNode: TreeNode<IStrategicOpportunityDetailGridItem>, levelIndex: number) {
+    if (arr.length && treeNode.data) {
+      const groupedEl = arr[0];
+      treeNode.data.label = this._getLabel(groupedEl, levelIndex);
+      treeNode.data.sortOrder = getValueByProp<IStrategicOpportunityDetailGridItem, any>(treeNode.data, this.sortOrderProperties[levelIndex]) || 0;
+    }
+  }
+
+  private _assignAdditionalProps(data: IStrategicOpportunityDetail[]): void {
+    data.forEach((x) => {
+      // Info: code for additional properties
+    });
+  }
+
+  private _assignNodeData(
+    nodeData: IStrategicOpportunityDetailGridItem,
+    nodeRawData: IStrategicOpportunityDetailGridItem,
+    sections: StrategicOpportunityDetailFieldSection[] | null = null,
+    withRounding = false
+  ) {
+    const keys = sections ? sections.reduce((arr: string[], section) => arr.concat(getStrategicOpportunityDetailFieldsBySection(section)), []) : Object.values(StrategicOpportunityDetailField);
+    keys.forEach((key) => {
+      setValueByProp(nodeData, key, getValueByProp<IStrategicOpportunityDetailGridItem, number>(nodeRawData, key));
+    });
+    withRounding && this._roundValues(nodeData, keys);
+  }
+
+  private _roundValues(nodeData: IStrategicOpportunityDetailGridItem, keys: string[] = []) {
+    let items = Object.entries(this.roundDataInfo);
+    if (keys.length) {
+      items = items.filter(([key]) => keys.includes(key));
+    }
+    items.forEach(([key, value]) => {
+      const val = getFixedNumber(getValueByProp<IStrategicOpportunityDetailGridItem, number>(nodeData, key), value);
+      setValueByProp(nodeData, key, val);
+    });
+  }
+
+  private _calcValuesByData(nodeData: IStrategicOpportunityDetailGridItem, data: IStrategicOpportunityDetail[], sections: StrategicOpportunityDetailFieldSection[] | null = null) {
+    if (!sections) sections = Object.values(StrategicOpportunityDetailFieldSection);
+    for (const section of sections) {
+      switch (section) {
+        case StrategicOpportunityDetailFieldSection.Encounters: {
+          const partialData = this.partialTreeData[nodeData.key];
+          if (partialData) {
+            this._calcValues(nodeData, partialData.encounters ?? 0, section);
+          }
+          break;
+        }
+        case StrategicOpportunityDetailFieldSection.Units:
+          this._calcValues(
+            nodeData,
+            getSum(
+              data.filter((x) => x.isBaseline),
+              'units'
+            ),
+            section
+          );
+          break;
+        case StrategicOpportunityDetailFieldSection.Cost:
+          this._calcValues(
+            nodeData,
+            getSum(
+              data.filter((x) => x.isBaseline),
+              'cost'
+            ),
+            section
+          );
+          break;
+        case StrategicOpportunityDetailFieldSection.GoalUnits:
+          this._calcValues(
+            nodeData,
+            getSum(
+              data.filter((x) => !x.isBaseline),
+              'goalUnits'
+            ),
+            section
+          );
+          break;
+        case StrategicOpportunityDetailFieldSection.GoalCost:
+          this._calcValues(
+            nodeData,
+            getSum(
+              data.filter((x) => !x.isBaseline),
+              'goalCost'
+            ),
+            section
+          );
+          break;
+        case StrategicOpportunityDetailFieldSection.Total:
+          this._calcValues(nodeData, 0, section);
+          break;
+        default:
+          break;
+      }
+    }
+  }
+
+  private _calcValues(nodeData: IStrategicOpportunityDetailGridItem, value: number, section: StrategicOpportunityDetailFieldSection) {
+    switch (section) {
+      case StrategicOpportunityDetailFieldSection.Encounters:
+        nodeData.encounters = value;
+        nodeData.encountersMonth = nodeData.encounters / this.monthCount;
+        break;
+      case StrategicOpportunityDetailFieldSection.Units:
+        nodeData.units = value;
+        nodeData.unitsMonth = nodeData.units / this.monthCount;
+        nodeData.unitsPerEncounter = nodeData.encounters ? nodeData.units / nodeData.encounters : 0;
+        break;
+      case StrategicOpportunityDetailFieldSection.Cost:
+        nodeData.cost = value;
+        nodeData.costMonth = nodeData.cost / this.monthCount;
+        nodeData.costPerEncounter = nodeData.encounters ? nodeData.cost / nodeData.encounters : 0;
+        nodeData.costPerUnit = nodeData.units ? nodeData.cost / nodeData.units : 0;
+        break;
+      case StrategicOpportunityDetailFieldSection.GoalUnits:
+        nodeData.goalUnits = value;
+        nodeData.goalUnitsMonth = nodeData.goalUnits / this.estimatedMonthCount;
+        nodeData.goalUnitsPerEncounter = nodeData.encounters ? nodeData.goalUnits / (nodeData.encounters * this.monthCountMultiplier) : 0;
+        break;
+      case StrategicOpportunityDetailFieldSection.GoalCost:
+        nodeData.goalCost = value;
+        nodeData.goalCostMonth = nodeData.goalCost / this.estimatedMonthCount;
+        nodeData.goalCostPerEncounter = nodeData.encounters ? nodeData.goalCost / (nodeData.encounters * this.monthCountMultiplier) : 0;
+        nodeData.goalCostPerUnit = nodeData.goalUnits ? nodeData.goalCost / nodeData.goalUnits : 0;
+        break;
+      case StrategicOpportunityDetailFieldSection.Total:
+        nodeData.totalImprovement = (nodeData.costMonth - nodeData.goalCostMonth) * this.estimatedMonthCount;
+        break;
+      default:
+        break;
+    }
+  }
+
+  private _updateDataByUnits(arr: IStrategicOpportunityDetail[], newVal: number, oldVal: number): DicStrNum {
+    const deltaDic: DicStrNum = {};
+
+    function _setEqualValue(_arr: IStrategicOpportunityDetail[]) {
+      const splitValues = getSplitEqualValues(newVal, _arr.length);
+      for (let i = 0; i < _arr.length; i++) {
+        _arr[i].goalUnits = splitValues[i];
+        _arr[i].isDirty = true;
+      }
+    }
+
+    function _setWeightValue(_arr: IStrategicOpportunityDetail[]) {
+      const splitValues = getSplitWeightValues(
+        newVal,
+        _arr.map((x) => x.goalUnits)
+      );
+      for (let i = 0; i < _arr.length; i++) {
+        _arr[i].goalUnits = splitValues[i];
+        _arr[i].isDirty = true;
+      }
+    }
+
+    if (newVal < 0) newVal = 0;
+    if (oldVal < 0) oldVal = 0;
+    if (newVal !== oldVal) {
+      if (newVal === 0) {
+        arr.forEach((x) => {
+          x.goalUnits = 0;
+          x.isDirty = true;
+        });
+      } else if (oldVal === 0) {
+        _setEqualValue(arr);
+      } else {
+        _setWeightValue(arr);
+      }
+      deltaDic[StrategicOpportunityDetailField.GoalUnits] = newVal - oldVal;
+    }
+
+    return deltaDic;
+  }
+
+  private _updateDataByCost(arr: IStrategicOpportunityDetail[], newVal: number, oldVal: number): DicStrNum {
+    const deltaDic: DicStrNum = {};
+
+    function _setEqualValue(_arr: IStrategicOpportunityDetail[]) {
+      const splitValues = getSplitEqualValues(newVal, _arr.length);
+      for (let i = 0; i < _arr.length; i++) {
+        _arr[i].goalCost = splitValues[i];
+        _arr[i].isDirty = true;
+      }
+    }
+
+    function _setWeightValue(_arr: IStrategicOpportunityDetail[]) {
+      const splitValues = getSplitWeightValues(
+        newVal,
+        _arr.map((x) => x.goalCost)
+      );
+      for (let i = 0; i < _arr.length; i++) {
+        _arr[i].goalCost = splitValues[i];
+        _arr[i].isDirty = true;
+      }
+    }
+
+    if (newVal < 0) newVal = 0;
+    if (oldVal < 0) oldVal = 0;
+    if (newVal !== oldVal) {
+      if (newVal === 0) {
+        arr.forEach((x) => {
+          x.goalCost = 0;
+          x.isDirty = true;
+        });
+      } else if (oldVal === 0) {
+        _setEqualValue(arr);
+      } else {
+        _setWeightValue(arr);
+      }
+      deltaDic[StrategicOpportunityDetailField.GoalCost] = newVal - oldVal;
+    }
+
+    return deltaDic;
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/strategicApiRoutes.test.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/strategicApiRoutes.test.ts
new file mode 100644
index 0000000..5fbf802
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/strategicApiRoutes.test.ts
@@ -0,0 +1,93 @@
+/**
+ * Validates that every route called by strategic opportunity frontend services
+ * exists in the committed swagger.json generated from the backend API.
+ *
+ * If this test fails after a backend change, regenerate swagger.json:
+ *   npm run generate-swagger
+ */
+import swaggerSpec from '../../../swagger.json';
+
+type HttpMethod = 'get' | 'post' | 'put' | 'delete';
+
+interface ExpectedRoute {
+  method: HttpMethod;
+  /** Full path as it appears in OpenAPI spec, e.g. /api/v1/strategic-opportunity */
+  path: string;
+  /** Human-readable label for the test name */
+  service: string;
+}
+
+const BASE = '/api/v1';
+
+/** Collapses all {paramName} segments to {param} so parameter naming differences don't cause false failures */
+const normalize = (path: string) => path.replace(/\{[^}]+\}/g, '{param}');
+
+const specRoutes = new Set(
+  Object.entries(swaggerSpec.paths as Record<string, Record<string, unknown>>).flatMap(
+    ([path, methods]) =>
+      Object.keys(methods).map((method) => `${method}:${normalize(path)}`)
+  )
+);
+
+const expectedRoutes: ExpectedRoute[] = [
+  // strategicOpportunityService
+  { method: 'get',  path: `${BASE}/strategic-opportunity`,                                  service: 'strategicOpportunityService.getOpportunities' },
+  { method: 'get',  path: `${BASE}/strategic-opportunity/{opportunityId}/general-info`,     service: 'strategicOpportunityService.getOpportunityGeneralInfo' },
+  { method: 'post', path: `${BASE}/strategic-opportunity/is-name-valid`,                    service: 'strategicOpportunityService.nameIsValid' },
+  { method: 'get',  path: `${BASE}/strategic-opportunity/{opportunityId}`,                  service: 'strategicOpportunityService.getOpportunityDrawerDetails' },
+  { method: 'get',  path: `${BASE}/strategic-opportunity/{opportunityId}/layout`,           service: 'strategicOpportunityService.getLayout' },
+  { method: 'put',  path: `${BASE}/strategic-opportunity/{opportunityId}/update-layout`,    service: 'strategicOpportunityService.saveLayout' },
+  { method: 'put',  path: `${BASE}/strategic-opportunity/{opportunityId}/set-status`,       service: 'strategicOpportunityService.updateStatus' },
+  { method: 'get',  path: `${BASE}/strategic-opportunity/initiatives`,                      service: 'strategicOpportunityService.getInitiatives' },
+  { method: 'put',  path: `${BASE}/strategic-opportunity/{opportunityId}/update-initiative`,service: 'strategicOpportunityService.updateInitiative' },
+  { method: 'put',  path: `${BASE}/strategic-opportunity/{opportunityId}/update-roles`,     service: 'strategicOpportunityService.updateRoles' },
+  { method: 'get',  path: `${BASE}/strategic-opportunity/{opportunityId}/ramp-ups`,         service: 'strategicOpportunityService.getRampUps' },
+  { method: 'put',  path: `${BASE}/strategic-opportunity/{opportunityId}/ramp-ups`,         service: 'strategicOpportunityService.saveRampUps' },
+  { method: 'get',  path: `${BASE}/strategic-opportunity/{opportunityId}/run-tracking-task`,service: 'strategicOpportunityService.runTrackingTask' },
+  { method: 'put',  path: `${BASE}/strategic-opportunity/{opportunityId}/complete-initiative`, service: 'strategicOpportunityService.completeInitiative' },
+  { method: 'get',  path: `${BASE}/strategic-opportunity/{opportunityId}/primary-measure`,  service: 'strategicOpportunityService.getPrimaryMeasure' },
+  { method: 'post', path: `${BASE}/strategic-opportunity/{opportunityId}/copy`,             service: 'strategicOpportunityService.copyStrategicOpportunity' },
+  { method: 'get',  path: `${BASE}/strategic-opportunity/{measureId}/measure-details`,      service: 'strategicOpportunityService.getMeasureDetails' },
+  { method: 'post', path: `${BASE}/strategic-charge-code/{opportunityId}/export-opportunity`, service: 'strategicChargeCodeService.exportOpportunity' },
+
+  // strategicChargeCodeService
+  { method: 'get',    path: `${BASE}/strategic-charge-code/{opportunityId}/opportunity-charge-code`, service: 'strategicChargeCodeService.getOpportunityChargeCode' },
+  { method: 'post',   path: `${BASE}/strategic-charge-code`,                                         service: 'strategicChargeCodeService.createOpportunityChargeCode' },
+  { method: 'put',    path: `${BASE}/strategic-charge-code/{opportunityId}`,                         service: 'strategicChargeCodeService.updateOpportunityChargeCode' },
+  { method: 'delete', path: `${BASE}/strategic-charge-code/{opportunityId}`,                         service: 'strategicChargeCodeService.deleteChargeCodeOpportunity' },
+  { method: 'post',   path: `${BASE}/strategic-charge-code/{opportunityId}/goal-detail`,             service: 'strategicChargeCodeService.getOpportunityRawDetailData (goal)' },
+  { method: 'post',   path: `${BASE}/strategic-charge-code/{opportunityId}/tracking-detail`,         service: 'strategicChargeCodeService.getOpportunityRawDetailData (tracking)' },
+  { method: 'put',    path: `${BASE}/strategic-charge-code/{opportunityId}/details`,                 service: 'strategicChargeCodeService.updateOpportunityDetailsData' },
+  { method: 'post',   path: `${BASE}/strategic-charge-code/{opportunityId}/export`,                  service: 'strategicChargeCodeService.exportInitiative' },
+
+  // strategicGLService
+  { method: 'get',    path: `${BASE}/strategic-general-ledger/{opportunityId}/opportunity-gl`, service: 'strategicGLService.getOpportunityGL' },
+  { method: 'post',   path: `${BASE}/strategic-general-ledger`,                                service: 'strategicGLService.createOpportunityGL' },
+  { method: 'put',    path: `${BASE}/strategic-general-ledger/{opportunityId}`,                service: 'strategicGLService.updateOpportunityGL' },
+  { method: 'delete', path: `${BASE}/strategic-general-ledger/{opportunityId}`,                service: 'strategicGLService.deleteGLOpportunity' },
+  { method: 'post',   path: `${BASE}/strategic-general-ledger/{opportunityId}/detail`,         service: 'strategicGLService.getOpportunityGLDetailData (goal)' },
+  { method: 'post',   path: `${BASE}/strategic-general-ledger/{opportunityId}/tracking-detail`,service: 'strategicGLService.getOpportunityGLDetailData (tracking)' },
+  { method: 'put',    path: `${BASE}/strategic-general-ledger/{opportunityId}/details`,        service: 'strategicGLService.updateOpportunityGLDetailsData' },
+
+  // strategicOpportunitySecurityService
+  { method: 'get', path: `${BASE}/strategic-opportunity-security/{lootId}/simple-securities`,     service: 'strategicOpportunitySecurityService.getSecurity' },
+  { method: 'get', path: `${BASE}/strategic-opportunity-security/{lootId}`,                       service: 'strategicOpportunitySecurityService.getUserPermissions' },
+  { method: 'put', path: `${BASE}/strategic-opportunity-security/{lootId}/set-simple-securities`, service: 'strategicOpportunitySecurityService.setSimpleSecurities' },
+];
+
+describe('Strategic opportunity frontend routes exist in backend OpenAPI spec', () => {
+  const isPlaceholder = Object.keys(swaggerSpec.paths as Record<string, unknown>).length === 0;
+
+  if (isPlaceholder) {
+    it('swagger.json has not been generated yet — run `npm run generate-swagger`', () => {
+      expect(isPlaceholder).toBe(false);
+    });
+    return;
+  }
+
+  expectedRoutes.forEach(({ method, path, service }) => {
+    it(`${method.toUpperCase()} ${path}  [${service}]`, () => {
+      expect(specRoutes.has(`${method}:${normalize(path)}`)).toBe(true);
+    });
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/strategicOpportunitySecurityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/strategicOpportunitySecurityService.ts
new file mode 100644
index 0000000..027988a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/strategicOpportunitySecurityService.ts
@@ -0,0 +1,19 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import { getSecureService } from '@strata/core/lib/http/getSecureService';
+import { ISecurityDisplay } from '../../shared/security/data/ISecurityDisplay';
+import { IUserPermission } from '../../shared/security/data/IUserPermissions';
+
+const { httpGet, httpPut } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'strategic-opportunity-security';
+
+export const strategicOpportunitySecurityService = {
+  getSecurity: async (lootId: number): Promise<ISecurityDisplay[]> => {
+    return httpGet(`${url}/${lootId}/simple-securities`);
+  },
+  getUserPermissions: async (lootId: number): Promise<IUserPermission> => {
+    return httpGet(`${url}/${lootId}`);
+  },
+  setSimpleSecurities: async (lootId: number, permissionSettings: ISecurityDisplay[]): Promise<boolean> => {
+    return httpPut(`${url}/${lootId}/set-simple-securities`, permissionSettings);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/strategicOpportunityService.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/strategicOpportunityService.tsx
new file mode 100644
index 0000000..438bb3e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/data/strategicOpportunityService.tsx
@@ -0,0 +1,65 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IStrategicOpportunityDrawerDetails, IStrategicOpportunityGeneralInfo } from '../detail/data/IStrategicOpportunityDetail';
+import { IStrategicOpportunityLayout } from '../detail/data/IStrategicOpportunityLayout';
+import { IStrategicInitiativeListItem } from './IStrategicInitiativeListItem';
+import { IStrategicOpportunityListItem } from './IStrategicOpportunityListItem';
+import { IStrategicOpportunityMeasureData, IStrategicOpportunityMeasureDetail } from './IStrategicOpportunityMeasureData';
+import { IStrategicOpportunityRampUp } from './IStrategicOpportunityRampUp';
+import { IStrategicOpportunityService } from './IStrategicOpportunityService';
+
+const { httpPost, httpGet, httpPut } = getSecureService(`${appConfig.apiUrl}v1/`);
+const url = 'strategic-opportunity';
+
+export const strategicOpportunityService: IStrategicOpportunityService = {
+  getOpportunities: async (): Promise<IStrategicOpportunityListItem[]> => {
+    return httpGet<IStrategicOpportunityListItem[]>(`${url}`);
+  },
+  getOpportunityGeneralInfo: async (opportunityId: number): Promise<IStrategicOpportunityGeneralInfo> => {
+    return httpGet<IStrategicOpportunityGeneralInfo>(`${url}/${opportunityId}/general-info`);
+  },
+  nameIsValid: async (name: string): Promise<boolean> => {
+    return httpPost<boolean>(`${url}/is-name-valid`, name);
+  },
+  getOpportunityDrawerDetails: async (opportunityId: number): Promise<IStrategicOpportunityDrawerDetails> => {
+    return httpGet<IStrategicOpportunityDrawerDetails>(`${url}/${opportunityId}`);
+  },
+  getLayout: async (opportunityId: number): Promise<IStrategicOpportunityLayout> => {
+    return httpGet<IStrategicOpportunityLayout>(`${url}/${opportunityId}/layout`);
+  },
+  saveLayout: async (opportunityId: number, layout: IStrategicOpportunityLayout): Promise<boolean> => {
+    return httpPut(`${url}/${opportunityId}/update-layout`, layout);
+  },
+  updateStatus: async (opportunityId: number, status: number, trackingStartDate: string, trackingEndDate: string): Promise<boolean> => {
+    return httpPut(`${url}/${opportunityId}/set-status`, { status, trackingStartDate, trackingEndDate });
+  },
+  getInitiatives: async (): Promise<IStrategicInitiativeListItem[]> => {
+    return httpGet<IStrategicInitiativeListItem[]>(`${url}/initiatives`);
+  },
+  updateInitiative: async (opportunityId: number, name: string, trackingStartDate: string, trackingEndDate: string): Promise<boolean> => {
+    return httpPut(`${url}/${opportunityId}/update-initiative`, { name, trackingStartDate, trackingEndDate });
+  },
+  updateRoles: async (opportunityId: number, costLeaderGuid: string, ownerGuid: string, executiveSponsorGuid: string, stakeholders: string[], teamMembers: string): Promise<boolean> => {
+    return httpPut(`${url}/${opportunityId}/update-roles`, { costLeaderGuid, ownerGuid, executiveSponsorGuid, stakeholders, teamMembers });
+  },
+  getRampUps: async (opportunityId: number): Promise<IStrategicOpportunityRampUp[]> => {
+    return httpGet<IStrategicOpportunityRampUp[]>(`${url}/${opportunityId}/ramp-ups`);
+  },
+  saveRampUps: async (opportunityId: number, rampUps: IStrategicOpportunityRampUp[]): Promise<boolean> => {
+    return httpPut(`${url}/${opportunityId}/ramp-ups`, rampUps);
+  },
+  runTrackingTask: async (opportunityId: number): Promise<boolean> => {
+    return httpGet(`${url}/${opportunityId}/run-tracking-task`);
+  },
+  completeInitiative: async (opportunityId: number, isThresholdMonitoring: boolean, acceptableThreshold: number): Promise<boolean> => {
+    return httpPut(`${url}/${opportunityId}/complete-initiative`, { isThresholdMonitoring, acceptableThreshold });
+  },
+  getPrimaryMeasure: async (opportunityId: number): Promise<IStrategicOpportunityMeasureData> => {
+    return httpGet<IStrategicOpportunityMeasureData>(`${url}/${opportunityId}/primary-measure`);
+  },
+  copyStrategicOpportunity: async (opportunityId: number, name: string): Promise<number> => {
+    return httpPost<number>(`${url}/${opportunityId}/copy`, name);
+  },
+  getMeasureDetails: async (measureId: number): Promise<IStrategicOpportunityMeasureDetail[]> => {
+    return httpGet<IStrategicOpportunityMeasureDetail[]>(`${url}/${measureId}/measure-details`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/ConvertToInitiativeModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/ConvertToInitiativeModal.tsx
new file mode 100644
index 0000000..de978eb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/ConvertToInitiativeModal.tsx
@@ -0,0 +1,93 @@
+import React, { useState } from 'react';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import DatePicker from '@strata/tempo/lib/datepicker/DatePicker';
+import Form from '@strata/tempo/lib/form/Form';
+import Button from '@strata/tempo/lib/button/Button';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import { RangeValue } from '@strata/tempo/lib/datepicker/RangePicker';
+import dayjs from 'dayjs';
+import { StrategicOpportunityStatus } from '../data/StrategicOpportunityStatus';
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+import { DATE_FORMAT } from '../../shared/constants';
+import useToast from '@strata/tempo/lib/toast/useToast';
+
+interface IConvertToInitiativeModalProps {
+  isVisible: boolean;
+  initialRange: RangeValue;
+  opportunityId: number;
+  disabledDate: dayjs.Dayjs;
+  onSuccess: (status: StrategicOpportunityStatus, trackingStartDate: string, trackingEndDate: string) => void;
+  closeModal: () => void;
+}
+
+const ConvertToInitiativeModal: React.FC<IConvertToInitiativeModalProps> = ({ isVisible, initialRange, opportunityId, disabledDate, onSuccess, closeModal }) => {
+  const [loading, setLoading] = useState<boolean>(false);
+  const [form] = Form.useForm();
+  const toast = useToast();
+
+  const onModalClose = () => {
+    form.resetFields();
+    closeModal();
+  };
+
+  const handleConvert = () => {
+    form
+      .validateFields()
+      .then(async (values) => {
+        if (values.dateRange?.[0] && values.dateRange?.[1]) {
+          setLoading(true);
+          try {
+            const trackingEndDate = dayjs(values.dateRange[1]).endOf('month').format(DATE_FORMAT);
+            const result = await strategicOpportunityService.updateStatus(opportunityId, StrategicOpportunityStatus.NewInitiative, dayjs(values.dateRange[0]).format(DATE_FORMAT), trackingEndDate);
+            if (result) {
+              onSuccess(StrategicOpportunityStatus.NewInitiative, dayjs(values.dateRange[0]).format(DATE_FORMAT), trackingEndDate);
+            }
+          } catch (error) {
+            toast.show({
+              key: 'The status update failed',
+              toastType: 'error',
+              message: `Unable to convert the Opportunity to Initiative`,
+              duration: 0
+            });
+          } finally {
+            setLoading(false);
+            onModalClose();
+          }
+        }
+      })
+      .catch((error) => {
+        // Handle validation errors
+      });
+  };
+
+  return (
+    <Modal
+      title='Convert To Initiative'
+      visible={isVisible}
+      onCancel={onModalClose}
+      loading={loading}
+      footer={
+        <Spacing hAlign='right' itemSpacing={8}>
+          <Button onClick={onModalClose}>Cancel</Button>
+          <Button type='primary' onClick={handleConvert}>
+            Convert
+          </Button>
+        </Spacing>
+      }
+    >
+      <Form form={form} initialValues={{ dateRange: initialRange }} layout='vertical'>
+        <Spacing column>
+          <Text>Tracking period affects ramp-up calculations. After converting to an initiative, confirm the ramp-up period matches the selected tracking period.</Text>
+          <Spacing margin={'16px 0px 0px 0px'}>
+            <Form.Item name='dateRange' label='Select Tracking Period' rules={[{ required: true, message: 'Please select tracking period' }]}>
+              <DatePicker.RangePicker defaultValue={initialRange} picker='month' width={400} disabledDate={(d) => d?.isBefore(disabledDate, 'month') ?? true} />
+            </Form.Item>
+          </Spacing>
+        </Spacing>
+      </Form>
+    </Modal>
+  );
+};
+
+export default ConvertToInitiativeModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicCompleteInitiativeModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicCompleteInitiativeModal.tsx
new file mode 100644
index 0000000..1cf234f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicCompleteInitiativeModal.tsx
@@ -0,0 +1,177 @@
+import Banner from '@strata/tempo/lib/banner/Banner';
+import Button from '@strata/tempo/lib/button/Button';
+import Form from '@strata/tempo/lib/form/Form';
+import Input from '@strata/tempo/lib/input/Input';
+import InputNumber from '@strata/tempo/lib/inputnumber/InputNumber';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import RadioGroup from '@strata/tempo/lib/radiogroup/RadioGroup';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text';
+import useToast from '@strata/tempo/lib/toast';
+import React, { useEffect } from 'react';
+import { zeroGuid } from '../../shared/utilities';
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+import { StrategicOpportunityStatus } from '../data/StrategicOpportunityStatus';
+import { IStrategicOpportunityGeneralInfo } from './data/IStrategicOpportunityDetail';
+
+interface IStrategicCompleteInitiativeModalProps {
+  opportunityData: IStrategicOpportunityGeneralInfo;
+  visible: boolean;
+  setVisible: (visible: boolean) => void;
+  setOpportunityData: (data: IStrategicOpportunityGeneralInfo) => void;
+  openInitiativeDetailsDrawer: () => void;
+}
+
+const StrategicCompleteInitiativeModal: React.FC<IStrategicCompleteInitiativeModalProps> = ({ opportunityData, visible, setVisible, setOpportunityData, openInitiativeDetailsDrawer }) => {
+  const [loading, setLoading] = React.useState<boolean>(false);
+  const [completeMonitoring, setCompleteMonitoring] = React.useState<boolean>(false);
+  const [acceptableThresholdValid, setAcceptableThresholdValid] = React.useState<boolean>(false);
+
+  const toast = useToast();
+  const [form] = Form.useForm();
+
+  const initiativeEndInFuture = React.useMemo(() => {
+    const trackingEndYear = new Date(opportunityData?.trackingEndDate)?.getFullYear();
+    const trackingEndMonth = new Date(opportunityData?.trackingEndDate)?.getMonth() + 1;
+    const currentYear = new Date().getFullYear();
+    const currentMonth = new Date().getMonth() + 1;
+    return trackingEndYear > currentYear || (trackingEndYear === currentYear && trackingEndMonth > currentMonth);
+  }, [opportunityData?.trackingEndDate]);
+
+  useEffect(() => {
+    if (form.getFieldValue('completeInitiativeGroup') === undefined && form.getFieldValue('measureName') === undefined) {
+      setLoading(true);
+      strategicOpportunityService
+        .getPrimaryMeasure(opportunityData.opportunityId)
+        .then((data) => {
+          form.setFieldsValue({ completeInitiativeGroup: 1, measureName: data.measureName, acceptableThreshold: data.acceptableThreshold });
+        })
+        .catch(() => {
+          toast.show({
+            key: `Opportunity - ${opportunityData.opportunityId}`,
+            toastType: 'error',
+            message: `Unable to load primary measure for Opportunity with ID ${opportunityData.opportunityId}`
+          });
+        })
+        .finally(() => {
+          setLoading(false);
+        });
+    }
+  }, [setLoading, opportunityData.opportunityId, form]);
+
+  const handleCompleteInitiativeModal = async () => {
+    try {
+      setLoading(true);
+      const result = await strategicOpportunityService.completeInitiative(opportunityData.opportunityId, completeMonitoring, form.getFieldValue('acceptableThreshold') || 0);
+      if (result) {
+        setOpportunityData({ ...opportunityData, status: completeMonitoring ? StrategicOpportunityStatus.CompleteMonitoring : StrategicOpportunityStatus.Complete });
+
+        if (completeMonitoring) {
+          strategicOpportunityService.getOpportunityGeneralInfo(opportunityData.opportunityId).then((data) => setOpportunityData(data));
+        }
+      }
+      toast.show({
+        key: `Opportunity - ${opportunityData.opportunityId}`,
+        toastType: 'success',
+        message: `Strategic initiative marked complete${completeMonitoring ? ' with primary measure monitoring.' : '.'}`
+      });
+    } catch {
+      toast.show({ key: `Opportunity - ${opportunityData.opportunityId}`, toastType: 'error', message: `The initiative was not completed. Try again and contact us if the issue continues.` });
+    } finally {
+      setLoading(false);
+      setVisible(false);
+    }
+  };
+
+  const validateAcceptableThreshold = (value: number) => {
+    if (value >= 0 && value <= 1) {
+      setAcceptableThresholdValid(true);
+    } else {
+      setAcceptableThresholdValid(false);
+    }
+  };
+
+  const openInitiativeDetails = () => {
+    setVisible(false);
+    openInitiativeDetailsDrawer();
+  };
+
+  return (
+    <Modal
+      title='Complete Initiative'
+      visible={visible}
+      loading={loading}
+      onCancel={() => setVisible(false)}
+      footer={
+        <Spacing hAlign='right'>
+          <Button onClick={() => setVisible(false)}>Cancel</Button>
+          <Button
+            type='primary'
+            disabled={
+              completeMonitoring &&
+              (!acceptableThresholdValid ||
+                opportunityData.ownerGuid === zeroGuid ||
+                opportunityData.ownerGuid === undefined ||
+                opportunityData.executiveSponsorGuid === zeroGuid ||
+                opportunityData.executiveSponsorGuid === undefined)
+            }
+            onClick={handleCompleteInitiativeModal}
+          >
+            Complete
+          </Button>
+        </Spacing>
+      }
+    >
+      <Form form={form} hideOptionalLabels maxWidth='100%' onValuesChange={() => validateAcceptableThreshold(form.getFieldValue('acceptableThreshold'))}>
+        {initiativeEndInFuture && (
+          <Banner type='info' size='small'>
+            <Spacing itemSpacing={4} padding={'6px 0'}>
+              <Text strong>Note: </Text>
+              <Text>This initiative has an end date in the future.</Text>
+            </Spacing>
+            <Text>
+              Review and update the Initiative End Date in
+              <Button type='link' onClick={openInitiativeDetails}>
+                Initiative Details
+              </Button>
+              . When you update the end date, the system recalculates the committed totals and progress to date values.
+            </Text>
+          </Banner>
+        )}
+        <Text strong>How would you like to complete this Initiative?</Text>
+        <Spacing padding={8}>
+          <Form.Item name='completeInitiativeGroup' noStyle>
+            <RadioGroup
+              onChange={(value) => setCompleteMonitoring(value.target.value === 1 ? false : true)}
+              defaultValue={1}
+              options={[
+                { value: 1, label: 'Complete only' },
+                { value: 2, label: 'Complete with threshold monitoring' }
+              ]}
+            />
+          </Form.Item>
+        </Spacing>
+        {completeMonitoring && (
+          <Spacing column itemSpacing={8} padding={'0 16px 0 32px'}>
+            <Text color='secondary' size='small'>
+              Both Owner and Executive Sponsor need to be configured in order to receive notifications. A notification will be sent when {form.getFieldValue('measureName')} goes above or below the set
+              threshold. You can update this option later under Initiative Details.
+            </Text>
+            <Form.Item label='Primary Measure Name' name='measureName'>
+              <Input readOnly />
+            </Form.Item>
+            <Form.Item
+              label='Notify me when the Threshold is (+ / -)'
+              name='acceptableThreshold'
+              rules={[{ required: true }, { type: 'number', min: 0, max: 1, message: 'Acceptable Threshold must be between 0% and 100%' }]}
+            >
+              <InputNumber format='percent' precision={2} />
+            </Form.Item>
+          </Spacing>
+        )}
+      </Form>
+    </Modal>
+  );
+};
+
+export default StrategicCompleteInitiativeModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicDetailsNotifications.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicDetailsNotifications.tsx
new file mode 100644
index 0000000..5609559
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicDetailsNotifications.tsx
@@ -0,0 +1,107 @@
+import Form from '@strata/tempo/lib/form/Form';
+import Input from '@strata/tempo/lib/input/Input';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Switch from '@strata/tempo/lib/switch';
+import useToast from '@strata/tempo/lib/toast';
+import React, { useEffect } from 'react';
+import { zeroGuid } from '../../shared/utilities';
+import { DefaultStrategicOpportunityMeasureData, IStrategicOpportunityMeasureData } from '../data/IStrategicOpportunityMeasureData';
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+import { StrategicOpportunityStatus } from '../data/StrategicOpportunityStatus';
+import { IStrategicOpportunityGeneralInfo } from './data/IStrategicOpportunityDetail';
+
+interface IStrategicDetailsNotificationsProps {
+  opportunityId: number;
+  opportunityData: IStrategicOpportunityGeneralInfo;
+  isEditable: boolean;
+  formRef: React.RefObject<{ submit: () => void; resetFields: () => void }>;
+  setHasChanges: (hasChanges: boolean) => void;
+  setLoading: (loading: boolean) => void;
+  onFormSubmit: (values: any) => void;
+}
+
+const StrategicDetailsNotifications: React.FC<IStrategicDetailsNotificationsProps> = ({ opportunityId, opportunityData, isEditable, formRef, setHasChanges, setLoading, onFormSubmit }) => {
+  const [monitorInitiative, setMonitorInitiative] = React.useState<boolean>(false);
+  const [primaryMeasure, setPrimaryMeasure] = React.useState<IStrategicOpportunityMeasureData>(DefaultStrategicOpportunityMeasureData);
+  const [form] = Form.useForm();
+  const toast = useToast();
+
+  useEffect(() => {
+    setLoading(true);
+    strategicOpportunityService
+      .getPrimaryMeasure(opportunityId)
+      .then((measure) => {
+        setPrimaryMeasure(measure);
+        if (opportunityData.status === StrategicOpportunityStatus.CompleteMonitoring) {
+          setMonitorInitiative(true);
+        } else {
+          setMonitorInitiative(false);
+        }
+        form.setFieldsValue({
+          monitorInitiative: opportunityData.status === StrategicOpportunityStatus.CompleteMonitoring,
+          measureName: measure.measureName,
+          acceptableThreshold: measure.acceptableThreshold
+        });
+      })
+      .catch(() => {
+        toast.show({
+          key: `Opportunity - ${opportunityId}`,
+          toastType: 'error',
+          message: `Unable to load primary measure for Opportunity with ID ${opportunityId}`
+        });
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  }, [setLoading, opportunityId, opportunityData, form]);
+
+  // Expose form.submit to parent through ref
+  React.useImperativeHandle(formRef, () => ({
+    submit: () => form.submit(),
+    resetFields: () => form.resetFields()
+  }));
+
+  const handleFinish = (values: any) => {
+    if (onFormSubmit) {
+      onFormSubmit(values);
+    }
+    if (setHasChanges) setHasChanges(false);
+  };
+
+  return (
+    <Form
+      form={form}
+      maxWidth='90%'
+      hideOptionalLabels
+      initialValues={{ monitorInitiative: monitorInitiative, measureName: primaryMeasure.measureName, acceptableThreshold: primaryMeasure.acceptableThreshold }}
+      onFinish={handleFinish}
+      onValuesChange={() => {
+        if (setHasChanges && opportunityData.ownerGuid !== zeroGuid && opportunityData.executiveSponsorGuid !== zeroGuid) setHasChanges(true);
+      }}
+    >
+      <Spacing column itemSpacing={8} padding='16px'>
+        <Form.Item label='Would you like to monitor this Initiative?' name='monitorInitiative'>
+          <Switch defaultChecked={monitorInitiative} labelText={monitorInitiative ? 'Yes' : 'No'} disabled={!isEditable} onClick={(e) => setMonitorInitiative(e)} />
+        </Form.Item>
+        {monitorInitiative && (
+          <Spacing padding='16px 0 0 0' column itemSpacing={0}>
+            <Form.Item label='Primary Measure Name' name='measureName'>
+              <Input readOnly />
+            </Form.Item>
+            <Form.Item
+              label='Notify me when the Threshold is (+ / -)'
+              name='acceptableThreshold'
+              rules={[{ required: true }, { type: 'number', min: 0, max: 1, message: 'Acceptable Threshold must be between 0% and 100%' }]}
+              extra={`A notification will be sent when ${primaryMeasure.measureName} goes above or below the set threshold`}
+            >
+              <InputNumber width={370} format='percent' precision={2} disabled={!isEditable} />
+            </Form.Item>
+          </Spacing>
+        )}
+      </Spacing>
+    </Form>
+  );
+};
+
+export default StrategicDetailsNotifications;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicDetailsRoles.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicDetailsRoles.tsx
new file mode 100644
index 0000000..74f4b42
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicDetailsRoles.tsx
@@ -0,0 +1,78 @@
+import Form from '@strata/tempo/lib/form/Form';
+import React, { useEffect } from 'react';
+import InitiativeRoles from '../../shared/initiatives/InitiativeRoles';
+import { IUserProfile } from '../../shared/initiatives/data/IUserProfile';
+import { usersService } from '../../shared/users/usersService';
+import { getGuid, zeroGuid } from '../../shared/utilities';
+import { IStrategicOpportunityGeneralInfo } from './data/IStrategicOpportunityDetail';
+
+interface IStrategicDetailsRolesProps {
+  isEditable: boolean;
+  opportunityData: IStrategicOpportunityGeneralInfo | undefined;
+  formRef: React.RefObject<{ submit: () => void; resetFields: () => void }>;
+  setLoading: (loading: boolean) => void;
+  setHasChanges: (hasChanges: boolean) => void;
+  onFormSubmit: (values: any) => void;
+}
+
+const addEmptyUser: IUserProfile = { userGuid: zeroGuid, fullName: ' ' };
+
+const StrategicDetailsRoles: React.FC<IStrategicDetailsRolesProps> = ({ isEditable, opportunityData, formRef, setHasChanges, setLoading, onFormSubmit }) => {
+  const [owners, setOwners] = React.useState<IUserProfile[]>([]);
+  const [costLeaders, setCostLeaders] = React.useState<IUserProfile[]>([]);
+  const [executiveSponsors, setExecutiveSponsors] = React.useState<IUserProfile[]>([]);
+  const [stakeholders, setStakeholders] = React.useState<IUserProfile[]>([]);
+  const [form] = Form.useForm();
+
+  useEffect(() => {
+    const loadDropdownItems = () => {
+      setLoading(true);
+      Promise.all([usersService.getOwners(), usersService.getCostLeaders(), usersService.getExecutiveSponsors(), usersService.getAllCIUsers()])
+        .then((res) => {
+          setOwners([addEmptyUser, ...res[0]]);
+          setCostLeaders([addEmptyUser, ...res[1]]);
+          setExecutiveSponsors([addEmptyUser, ...res[2]]);
+          setStakeholders(res[3]);
+        })
+        .finally(() => {
+          setLoading(false);
+        });
+    };
+    loadDropdownItems();
+  }, [setLoading]);
+
+  // Expose form.submit to parent through ref
+  React.useImperativeHandle(formRef, () => ({
+    submit: () => form.submit(),
+    resetFields: () => form.resetFields()
+  }));
+
+  const handleFinish = (values: any) => {
+    if (onFormSubmit) {
+      onFormSubmit(values);
+    }
+    if (setHasChanges) setHasChanges(false);
+  };
+
+  return (
+    <Form
+      form={form}
+      initialValues={{
+        costLeader: getGuid(opportunityData?.costLeaderGuid),
+        owner: getGuid(opportunityData?.ownerGuid),
+        executiveSponsor: getGuid(opportunityData?.executiveSponsorGuid),
+        stakeholders: opportunityData?.stakeholders,
+        teamMembers: opportunityData?.teamMembers
+      }}
+      layout='vertical'
+      onFinish={handleFinish}
+      onValuesChange={() => {
+        if (setHasChanges) setHasChanges(true);
+      }}
+    >
+      <InitiativeRoles owners={owners} costLeaders={costLeaders} executiveSponsors={executiveSponsors} stakeholders={stakeholders} isLocked={!isEditable} isStrategicOpportunity />
+    </Form>
+  );
+};
+
+export default StrategicDetailsRoles;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeCopyButton.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeCopyButton.tsx
new file mode 100644
index 0000000..42e0a02
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeCopyButton.tsx
@@ -0,0 +1,114 @@
+import Button from '@strata/tempo/lib/button/Button';
+import Form from '@strata/tempo/lib/form/Form';
+import Input from '@strata/tempo/lib/input/Input';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import Popover from '@strata/tempo/lib/popover/Popover';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import useToast from '@strata/tempo/lib/toast';
+import React from 'react';
+import { useHistory } from 'react-router';
+import { nameIsDuplicate } from '../../shared/opportunities/data/nameValidationService';
+import { RegEx } from '../../shared/validation/RegEx';
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+
+interface IStrategicInitiativeCopyButtonProps {
+  opportunityId: number;
+  opportunityName: string;
+  isDisabled: boolean;
+}
+
+const StrategicInitiativeCopyButton: React.FC<IStrategicInitiativeCopyButtonProps> = ({ opportunityId, opportunityName, isDisabled }) => {
+  const [loading, setLoading] = React.useState<boolean>(false);
+  const [copyModalVisible, setCopyModalVisible] = React.useState(false);
+
+  const toast = useToast();
+  const history = useHistory();
+  const [form] = Form.useForm();
+
+  const handleFinish = async () => {
+    let copiedOpportunityId = 0;
+    try {
+      setLoading(true);
+      copiedOpportunityId = await strategicOpportunityService.copyStrategicOpportunity(opportunityId, form.getFieldValue('name'));
+      toast.show({
+        key: `Opportunity - ${opportunityId}`,
+        toastType: 'success',
+        message: `Strategic opportunity copied.`
+      });
+    } catch {
+      toast.show({
+        key: `Opportunity - ${opportunityId}`,
+        toastType: 'error',
+        message: `Unable to copy Opportunity with ID ${opportunityId}`,
+        duration: 0
+      });
+    } finally {
+      setLoading(false);
+      if (copiedOpportunityId > 0) {
+        history.push(`/strategic-opportunity/${copiedOpportunityId}`);
+      }
+    }
+  };
+
+  const handleCancel = () => {
+    form.resetFields();
+    setCopyModalVisible(false);
+  };
+
+  const getCopyText = () => {
+    return (
+      <Text>
+        Click <Text strong>Copy</Text> to create a new opportunity using attachments, roles, and definition filters from the original opportunity
+      </Text>
+    );
+  };
+
+  return (
+    <>
+      <Popover title='' trigger='hover' content={getCopyText()}>
+        <Button type='primary' disabled={isDisabled} onClick={() => setCopyModalVisible(true)}>
+          Copy
+        </Button>
+      </Popover>
+      {copyModalVisible && (
+        <Modal title='Copy' visible={copyModalVisible} loading={loading} onCancel={handleCancel} footer={null}>
+          <Spacing column padding='0 0 0 8px'>
+            <Spacing padding='0 0 8px 0'>{getCopyText()}</Spacing>
+            <Form form={form} initialValues={{ name: `Copy ${opportunityName}` }} onFinish={handleFinish}>
+              <Form.Item
+                label='Name'
+                name='name'
+                rules={[
+                  { required: true, whitespace: true, max: 200 },
+                  { pattern: RegEx.JazzRestrictedCharacters },
+                  () => ({
+                    async validator(_, value) {
+                      if (!value) {
+                        return Promise.reject();
+                      }
+                      if (!(await strategicOpportunityService.nameIsValid(value))) {
+                        return Promise.reject(nameIsDuplicate);
+                      }
+                      return Promise.resolve();
+                    }
+                  })
+                ]}
+              >
+                <Input />
+              </Form.Item>
+              <Form.Item>
+                <Button onClick={handleCancel}>Cancel</Button>
+                <Button type='primary' htmlType='submit'>
+                  Copy
+                </Button>
+              </Form.Item>
+            </Form>
+          </Spacing>
+        </Modal>
+      )}
+    </>
+  );
+};
+
+export default StrategicInitiativeCopyButton;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeDetailGrid.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeDetailGrid.tsx
new file mode 100644
index 0000000..757ebf9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeDetailGrid.tsx
@@ -0,0 +1,353 @@
+import Button from '@strata/tempo/lib/button/Button';
+import Card from '@strata/tempo/lib/card/Card';
+import { DataHeaderCell, DataHeaderGroup, DataHeaderRow } from '@strata/tempo/lib/dataheader';
+import Divider from '@strata/tempo/lib/divider/Divider';
+import DownloadIcon from '@strata/tempo/lib/icon/DownloadIcon';
+import LoadingIcon from '@strata/tempo/lib/icon/LoadingIcon';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Tag from '@strata/tempo/lib/tag/Tag';
+import Text from '@strata/tempo/lib/text/Text';
+import Toggle from '@strata/tempo/lib/toggle/Toggle';
+import TreeGrid from '@strata/tempo/lib/treegrid';
+import React, { useEffect, useState } from 'react';
+import { TreeNode } from '../../shared/store/StoreTreeData';
+import { StrategicOpportunityStatus } from '../data/StrategicOpportunityStatus';
+import { IStrategicInitiativeDetailGridItem } from './data/IStrategicInitiativeDetail';
+import { getStrategicInitiativeDetailColumnHeader, StrategicInitiativeDetailFieldSection } from './data/StrategicInitiativeDetailDimension';
+import { getAllKeys, getFormatedNumericCell, InitiativeProgressToggleStatus } from './StrategicOpportunityDetailPage';
+
+export interface IStrategicInitiativeDetailGridProps {
+  root: TreeNode<IStrategicInitiativeDetailGridItem> | undefined;
+  showRootRow: boolean;
+  columns: StrategicInitiativeDetailFieldSection[];
+  currentMonthDate: Date;
+  progressMonths: number;
+  status: StrategicOpportunityStatus;
+  loading: boolean;
+  isExporting: boolean;
+  toggle: InitiativeProgressToggleStatus;
+  onToggleChange: (value: InitiativeProgressToggleStatus) => void;
+  exportInitiative: () => void;
+}
+
+const columnWidth = 105;
+const labelColumnWidth = 300;
+
+function getColumnsData(
+  columns: StrategicInitiativeDetailFieldSection[],
+  progressMonths: number,
+  currentMonthDate: Date,
+  status: StrategicOpportunityStatus
+): { columnElements: React.ReactElement[]; headerGroup: React.ReactElement } {
+  const monthColumns: React.ReactElement[] = [];
+  const trackingColumns: React.ReactElement[] = [];
+
+  const monthUnitHeaders: React.ReactElement[] = [];
+  const monthCostHeaders: React.ReactElement[] = [];
+  const trackingUnitHeaders: React.ReactElement[] = [];
+  const trackingCostHeaders: React.ReactElement[] = [];
+
+  columns.forEach((col) => {
+    switch (col) {
+      case StrategicInitiativeDetailFieldSection.TotalEncounters:
+        monthColumns.push(
+          <TreeGrid.NumberColumn key={'monthEncounters'} field={'monthEncounters'} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'number')} />
+        );
+        monthUnitHeaders.push(<DataHeaderCell key={'monthEncounters'} field={'monthEncounters'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />);
+        trackingColumns.push(
+          <TreeGrid.NumberColumn key={'trackingEncounters'} field={'trackingEncounters'} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'number')} />
+        );
+        trackingUnitHeaders.push(<DataHeaderCell key={'trackingEncounters'} field={'trackingEncounters'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicInitiativeDetailFieldSection.TotalUnits:
+        monthColumns.push(<TreeGrid.NumberColumn key={'monthUnits'} field={'monthUnits'} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'number')} />);
+        monthUnitHeaders.push(<DataHeaderCell key={'monthUnits'} field={'monthUnits'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />);
+        trackingColumns.push(<TreeGrid.NumberColumn key={'trackingUnits'} field={'trackingUnits'} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'number')} />);
+        trackingUnitHeaders.push(<DataHeaderCell key={'trackingUnits'} field={'trackingUnits'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicInitiativeDetailFieldSection.UnitsPerEncounter:
+        monthColumns.push(<TreeGrid.NumberColumn key={'monthUnitsPerEncounter'} field={'monthUnitsPerEncounter'} width={columnWidth} format='decimal' />);
+        monthUnitHeaders.push(
+          <DataHeaderCell key={'monthUnitsPerEncounter'} field={'monthUnitsPerEncounter'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />
+        );
+        trackingColumns.push(<TreeGrid.NumberColumn key={'trackingUnitsPerEncounter'} field={'trackingUnitsPerEncounter'} width={columnWidth} format='decimal' />);
+        trackingUnitHeaders.push(
+          <DataHeaderCell key={'trackingUnitsPerEncounter'} field={'trackingUnitsPerEncounter'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />
+        );
+        break;
+      case StrategicInitiativeDetailFieldSection.CostPerEncounter:
+        monthColumns.push(
+          <TreeGrid.NumberColumn key={'monthCostPerEncounter'} field={'monthCostPerEncounter'} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')} />
+        );
+        monthCostHeaders.push(
+          <DataHeaderCell key={'monthCostPerEncounter'} field={'monthCostPerEncounter'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />
+        );
+        trackingColumns.push(
+          <TreeGrid.NumberColumn
+            key={'trackingCostPerEncounter'}
+            field={'trackingCostPerEncounter'}
+            width={columnWidth}
+            body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')}
+          />
+        );
+        trackingCostHeaders.push(
+          <DataHeaderCell key={'trackingCostPerEncounter'} field={'trackingCostPerEncounter'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />
+        );
+        break;
+      case StrategicInitiativeDetailFieldSection.CostPerUnit:
+        monthColumns.push(
+          <TreeGrid.NumberColumn key={'monthCostPerUnit'} field={'monthCostPerUnit'} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')} />
+        );
+        monthCostHeaders.push(<DataHeaderCell key={'monthCostPerUnit'} field={'monthCostPerUnit'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />);
+        trackingColumns.push(
+          <TreeGrid.NumberColumn key={'trackingCostPerUnit'} field={'trackingCostPerUnit'} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')} />
+        );
+        trackingCostHeaders.push(<DataHeaderCell key={'trackingCostPerUnit'} field={'trackingCostPerUnit'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicInitiativeDetailFieldSection.TotalCommittedCost:
+        monthColumns.push(
+          <TreeGrid.NumberColumn key={'monthCommittedMonth'} field={'monthCommittedMonth'} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')} />
+        );
+        monthCostHeaders.push(<DataHeaderCell key={'monthCommittedMonth'} field={'monthCommittedMonth'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />);
+        trackingColumns.push(
+          <TreeGrid.NumberColumn
+            key={'trackingCommittedTracking'}
+            field={'trackingCommittedTracking'}
+            width={columnWidth}
+            body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')}
+          />
+        );
+        trackingCostHeaders.push(
+          <DataHeaderCell key={'trackingCommittedTracking'} field={'trackingCommittedTracking'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />
+        );
+        break;
+      case StrategicInitiativeDetailFieldSection.TotalActualCost:
+        monthColumns.push(
+          <TreeGrid.NumberColumn key={'monthActualMonth'} field={'monthActualMonth'} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')} />
+        );
+        monthCostHeaders.push(<DataHeaderCell key={'monthActualMonth'} field={'monthActualMonth'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />);
+        trackingColumns.push(
+          <TreeGrid.NumberColumn key={'trackingActualTracking'} field={'trackingActualTracking'} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')} />
+        );
+        trackingCostHeaders.push(
+          <DataHeaderCell key={'trackingActualTracking'} field={'trackingActualTracking'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />
+        );
+        break;
+      case StrategicInitiativeDetailFieldSection.TotalVariance:
+        monthColumns.push(
+          <TreeGrid.NumberColumn key={'monthVarianceMonth'} field={'monthVarianceMonth'} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')} />
+        );
+        monthCostHeaders.push(<DataHeaderCell key={'monthVarianceMonth'} field={'monthVarianceMonth'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />);
+        trackingColumns.push(
+          <TreeGrid.NumberColumn
+            key={'trackingVarianceTracking'}
+            field={'trackingVarianceTracking'}
+            width={columnWidth}
+            body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')}
+          />
+        );
+        trackingCostHeaders.push(
+          <DataHeaderCell key={'trackingVarianceTracking'} field={'trackingVarianceTracking'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='right' />
+        );
+        break;
+      case StrategicInitiativeDetailFieldSection.Progress:
+        monthColumns.push(
+          <TreeGrid.Column
+            key={'isMonthProgressMonth'}
+            field={'isMonthProgressMonth'}
+            width={columnWidth}
+            style={{ paddingRight: '4px' }} // reduce right padding (4px instead of 8px) to prevent cutting off the right edge of red tag with "Off Track" text
+            body={(rowData) => getInitiativeProgressCell(rowData.data.isMonthProgressMonth, status)}
+          />
+        );
+        monthCostHeaders.push(<DataHeaderCell key={'isMonthProgressMonth'} field={'isMonthProgressMonth'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='center' />);
+        trackingColumns.push(
+          <TreeGrid.Column
+            key={'isTrackingProgressTracking'}
+            field={'isTrackingProgressTracking'}
+            width={columnWidth}
+            style={{ paddingRight: '4px' }} // reduce right padding (4px instead of 8px) to prevent cutting off the right edge of red tag with "Off Track" text
+            body={(rowData) => getInitiativeProgressCell(rowData.data.isTrackingProgressTracking, status)}
+          />
+        );
+        trackingCostHeaders.push(
+          <DataHeaderCell key={'isTrackingProgressTracking'} field={'isTrackingProgressTracking'} width={columnWidth} header={getStrategicInitiativeDetailColumnHeader(col)} align='center' />
+        );
+        break;
+      default:
+        break;
+    }
+  });
+
+  const topHeaders: React.ReactElement[] = [<DataHeaderCell key='label' width={labelColumnWidth}></DataHeaderCell>];
+  const middleHeaders: React.ReactElement[] = [<DataHeaderCell key='label' width={labelColumnWidth}></DataHeaderCell>];
+  const bottomHeaders: React.ReactElement[] = [<DataHeaderCell key='label' width={labelColumnWidth}></DataHeaderCell>];
+  const columnElements: React.ReactElement[] = [<TreeGrid.Column key='label' field='label' width={labelColumnWidth} expander />];
+
+  if (monthUnitHeaders.length || monthCostHeaders.length) {
+    topHeaders.push(
+      <DataHeaderCell
+        key='month'
+        width={columnWidth * (monthUnitHeaders.length + monthCostHeaders.length)}
+        colSpan={monthUnitHeaders.length + monthCostHeaders.length}
+        align='center'
+        header={currentMonthDate.toLocaleString('en-us', { month: 'short', year: 'numeric' })}
+      ></DataHeaderCell>
+    );
+    if (monthUnitHeaders.length) {
+      middleHeaders.push(<DataHeaderCell key='monthUnit' width={columnWidth * monthUnitHeaders.length} colSpan={monthUnitHeaders.length}></DataHeaderCell>);
+      bottomHeaders.push(...monthUnitHeaders);
+    }
+    if (monthCostHeaders.length) {
+      middleHeaders.push(
+        <DataHeaderCell key='monthCost' width={columnWidth * monthCostHeaders.length} colSpan={monthCostHeaders.length} align='center' header='Variable Direct Cost'></DataHeaderCell>
+      );
+      bottomHeaders.push(...monthCostHeaders);
+    }
+    columnElements.push(...monthColumns);
+  }
+  if ((monthUnitHeaders.length || monthCostHeaders.length) && (trackingUnitHeaders.length || trackingCostHeaders.length)) {
+    topHeaders.push(<DataHeaderCell key='top-header-gap' isGap></DataHeaderCell>);
+    middleHeaders.push(<DataHeaderCell key='middle-header-gap' isGap></DataHeaderCell>);
+    bottomHeaders.push(<DataHeaderCell key='bottom-header-gap' isGap></DataHeaderCell>);
+    columnElements.push(<TreeGrid.GapColumn key='data-gap'></TreeGrid.GapColumn>);
+  }
+  if (trackingUnitHeaders.length || trackingCostHeaders.length) {
+    topHeaders.push(
+      <DataHeaderCell
+        key='tracking'
+        width={columnWidth * (trackingUnitHeaders.length + trackingCostHeaders.length)}
+        colSpan={trackingUnitHeaders.length + trackingCostHeaders.length}
+        align='center'
+        header={`Progress to Date (${progressMonths} months)`}
+      ></DataHeaderCell>
+    );
+    if (trackingUnitHeaders.length) {
+      middleHeaders.push(<DataHeaderCell key='trackingUnit' width={columnWidth * trackingUnitHeaders.length} colSpan={trackingUnitHeaders.length}></DataHeaderCell>);
+      bottomHeaders.push(...trackingUnitHeaders);
+    }
+    if (trackingCostHeaders.length) {
+      middleHeaders.push(
+        <DataHeaderCell key='trackingCost' width={columnWidth * trackingCostHeaders.length} colSpan={trackingCostHeaders.length} align='center' header='Variable Direct Cost'></DataHeaderCell>
+      );
+      bottomHeaders.push(...trackingCostHeaders);
+    }
+    columnElements.push(...trackingColumns);
+  }
+
+  const headerRows: React.ReactElement[] = [];
+  if (topHeaders.length > 1) {
+    headerRows.push(<DataHeaderRow key='top'>{topHeaders}</DataHeaderRow>);
+  }
+  if (middleHeaders.length > 1) {
+    headerRows.push(<DataHeaderRow key='middle'>{middleHeaders}</DataHeaderRow>);
+  }
+  headerRows.push(<DataHeaderRow key='bottom'>{bottomHeaders}</DataHeaderRow>);
+
+  const headerGroupItem = <DataHeaderGroup>{headerRows}</DataHeaderGroup>;
+  return { columnElements, headerGroup: headerGroupItem };
+}
+
+const getInitiativeProgressCell = (progress: boolean, status: StrategicOpportunityStatus) => {
+  return (
+    <Spacing hAlign='center'>
+      {status === StrategicOpportunityStatus.NewInitiative ? (
+        <Tag>-</Tag>
+      ) : (
+        <Tag type='pill' color={progress ? 'success' : 'error'}>
+          {progress ? InitiativeProgressToggleStatus.OnTrack : InitiativeProgressToggleStatus.OffTrack}
+        </Tag>
+      )}
+    </Spacing>
+  );
+};
+
+export const StrategicInitiativeDetailGrid: React.FC<IStrategicInitiativeDetailGridProps> = ({
+  root,
+  showRootRow,
+  columns,
+  currentMonthDate,
+  progressMonths,
+  status,
+  loading,
+  isExporting,
+  toggle,
+  onToggleChange,
+  exportInitiative
+}) => {
+  const gridData = root ? (showRootRow ? [root] : root.children) : [];
+  const [headerGroup, setHeaderGroup] = React.useState<React.ReactElement>();
+  const [columnElements, setColumnElements] = React.useState<React.ReactElement[]>([]);
+  const [expandedKeys, setExpandedKeys] = useState<string[]>([]);
+  const [progressToggleVisible, setProgressToggleVisible] = React.useState<boolean>(false);
+
+  useEffect(() => {
+    if (columns.length) {
+      setProgressToggleVisible(columns.includes(StrategicInitiativeDetailFieldSection.Progress));
+      const { columnElements, headerGroup } = getColumnsData(columns, progressMonths, currentMonthDate, status);
+      setColumnElements(columnElements);
+      setHeaderGroup(headerGroup);
+    }
+  }, [columns, progressMonths, currentMonthDate, status]);
+
+  useEffect(() => {
+    switch (toggle) {
+      case InitiativeProgressToggleStatus.OnTrack:
+      case InitiativeProgressToggleStatus.OffTrack:
+        setExpandedKeys(getAllKeys(root ? (showRootRow ? [root] : root.children) : []));
+        break;
+      case InitiativeProgressToggleStatus.All:
+        setExpandedKeys([]);
+        break;
+    }
+  }, [toggle, root, showRootRow]);
+
+  return columnElements.length && headerGroup ? (
+    <Spacing margin={'0 24px'}>
+      <Card
+        removeBodyPadding
+        title={<Text.Heading level={4}>Tracking Details</Text.Heading>}
+        extra={
+          <Spacing>
+            {progressToggleVisible && (
+              <>
+                <Toggle
+                  defaultValue={InitiativeProgressToggleStatus.All}
+                  value={toggle}
+                  onChange={(value) => onToggleChange(value.target.value)}
+                  items={[
+                    { value: InitiativeProgressToggleStatus.All, name: 'All' },
+                    { value: InitiativeProgressToggleStatus.OnTrack, name: InitiativeProgressToggleStatus.OnTrack },
+                    { value: InitiativeProgressToggleStatus.OffTrack, name: InitiativeProgressToggleStatus.OffTrack }
+                  ]}
+                />
+                <Divider vertical margin={16} />
+              </>
+            )}
+            <Button
+              type='secondary'
+              onClick={() => {
+                setExpandedKeys(getAllKeys(gridData ?? []));
+              }}
+            >
+              Expand All
+            </Button>
+            <Button type='secondary' onClick={() => setExpandedKeys([])}>
+              Collapse All
+            </Button>
+            <Divider vertical margin={16} />
+            <Button icon={isExporting ? <LoadingIcon /> : <DownloadIcon />} onClick={exportInitiative}>
+              Export
+            </Button>
+          </Spacing>
+        }
+      >
+        <TreeGrid scrollHeight='400px' scrollable value={gridData} loading={loading} columnHeaderGroup={headerGroup} expandedRowKeys={expandedKeys} onRowToggle={setExpandedKeys}>
+          {columnElements}
+        </TreeGrid>
+      </Card>
+    </Spacing>
+  ) : (
+    <></>
+  );
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeDetailsGeneralInfo.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeDetailsGeneralInfo.tsx
new file mode 100644
index 0000000..50298ff
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeDetailsGeneralInfo.tsx
@@ -0,0 +1,232 @@
+import Button from '@strata/tempo/lib/button/Button';
+import DatePicker from '@strata/tempo/lib/datepicker/DatePicker';
+import Divider from '@strata/tempo/lib/divider/Divider';
+import Form from '@strata/tempo/lib/form/Form';
+import Input from '@strata/tempo/lib/input/Input';
+import List from '@strata/tempo/lib/list/List';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text';
+import dayjs from 'dayjs';
+import { debounce } from 'lodash';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useHistory } from 'react-router';
+import { IFilterChipItem } from '../../shared/components/FilterBar/data/IFilterChipItem';
+import { IListItem } from '../../shared/data/IKeyTextItem';
+import FiltersList from '../../shared/components/FiltersList';
+import StrategicOpportunityPopulationList from './StrategicOpportunityPopulationList';
+import { nameIsDuplicate } from '../../shared/opportunities/data/nameValidationService';
+import { RegEx } from '../../shared/validation/RegEx';
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+import { IStrategicOpportunityDrawerDetails } from './data/IStrategicOpportunityDetail';
+
+interface IStrategicInitiativeDetailsGeneralInfoProps {
+  opportunityId: number;
+  opportunityDrawerDetails: IStrategicOpportunityDrawerDetails;
+  isOpportunity: boolean;
+  populationsList: IListItem[];
+  chargeCodeList: IListItem[];
+  opportunityDrawerFilters: IFilterChipItem[];
+  isEditable: boolean;
+  disabledDate?: dayjs.Dayjs;
+  name?: string;
+  formRef?: React.RefObject<{ submit: () => void; resetFields: () => void }>;
+  setHasChanges?: (hasChanges: boolean) => void;
+  onFormSubmit?: (values: any) => void;
+  openRampUpDrawer?: () => void;
+}
+
+const initiativePadding = '0 0 16px 16px';
+
+const StrategicInitiativeDetailsGeneralInfo: React.FC<IStrategicInitiativeDetailsGeneralInfoProps> = ({
+  opportunityId,
+  opportunityDrawerDetails,
+  isOpportunity,
+  populationsList,
+  chargeCodeList,
+  opportunityDrawerFilters,
+  isEditable,
+  disabledDate,
+  name,
+  formRef,
+  setHasChanges,
+  onFormSubmit,
+  openRampUpDrawer
+}) => {
+  const [chargeCodesModalVisible, setChargeCodesModalVisible] = useState<boolean>(false);
+  const [searchChargeCodeModalInput, setSearchChargeCodeModalInput] = React.useState<string>('');
+  const [chargeCodeModalList, setChargeCodeModalList] = useState<IListItem[]>([]);
+  const [form] = Form.useForm();
+  const history = useHistory();
+
+  // Expose form.submit to parent through ref
+  React.useImperativeHandle(formRef, () => ({
+    submit: () => form.submit(),
+    resetFields: () => form.resetFields()
+  }));
+
+  useEffect(() => {
+    if (opportunityDrawerDetails) {
+      form.setFieldsValue({
+        trackingPeriod: [dayjs(opportunityDrawerDetails.trackingStartDate), dayjs(opportunityDrawerDetails.trackingEndDate)]
+      });
+    }
+  }, [opportunityDrawerDetails, form]);
+
+  useEffect(() => {
+    setChargeCodeModalList(chargeCodeList);
+  }, [chargeCodeList]);
+
+  const handleSearch = useCallback(
+    (search: any) => {
+      const filteredChargeCodes = chargeCodeList.filter((x) => x.title.toLowerCase().includes(search.toLowerCase()));
+      setChargeCodeModalList(filteredChargeCodes);
+    },
+    [chargeCodeList]
+  );
+
+  const handleUserSearchWithDebounce = useMemo(() => debounce(handleSearch, 500), [handleSearch]);
+
+  const handleCancelChargeCodesModal = () => {
+    setChargeCodesModalVisible(false);
+    setSearchChargeCodeModalInput('');
+    setChargeCodeModalList(chargeCodeList);
+  };
+
+  const handleFinish = (values: any) => {
+    if (onFormSubmit) {
+      onFormSubmit(values);
+    }
+    if (setHasChanges) setHasChanges(false);
+  };
+
+  const navigateToEditStrategicOpportunityMode = () => {
+    history.push(`/strategic-opportunities/edit/charge-code/${opportunityId}`);
+  };
+
+  const onRampUpClick = () => {
+    if (openRampUpDrawer) {
+      openRampUpDrawer();
+    }
+  };
+
+  return (
+    <>
+      <Form
+        form={form}
+        initialValues={{
+          name: name,
+          trackingPeriod: [
+            opportunityDrawerDetails?.trackingStartDate ? dayjs(opportunityDrawerDetails.trackingStartDate) : null,
+            opportunityDrawerDetails?.trackingEndDate ? dayjs(opportunityDrawerDetails.trackingEndDate) : null
+          ]
+        }}
+        layout='vertical'
+        onFinish={handleFinish}
+        onValuesChange={() => {
+          if (setHasChanges) setHasChanges(true);
+        }}
+      >
+        {isOpportunity ? null : (
+          <Spacing column padding='16px 16px 0 16px'>
+            <Form.Item
+              label={
+                <Text.Heading level={4} strong>
+                  Initiative Name
+                </Text.Heading>
+              }
+              name='name'
+              rules={[
+                { required: true, whitespace: true, max: 200 },
+                { pattern: RegEx.JazzRestrictedCharacters },
+                () => ({
+                  async validator(_, value) {
+                    if (!value || value?.trim() === name?.trim()) {
+                      return Promise.resolve();
+                    }
+                    if (await strategicOpportunityService.nameIsValid(value)) {
+                      return Promise.resolve();
+                    }
+                    return Promise.reject(nameIsDuplicate);
+                  }
+                })
+              ]}
+            >
+              <Input disabled={!isEditable} />
+            </Form.Item>
+          </Spacing>
+        )}
+        <StrategicOpportunityPopulationList populationsList={populationsList} populationName={opportunityDrawerDetails?.populationName} padding={initiativePadding} />
+        <Spacing column padding={initiativePadding}>
+          <Text.Heading level={4} strong>
+            Baseline Period
+          </Text.Heading>
+          <Spacing padding='4px 0 0 0'>
+            <Text>{opportunityDrawerDetails?.baselinePeriod}</Text>
+          </Spacing>
+        </Spacing>
+        {isOpportunity ? (
+          <Spacing column padding={initiativePadding}>
+            <Text.Heading level={4} strong>
+              Estimated Tracking Duration (Months)
+            </Text.Heading>
+            <Spacing padding='4px 0 0 0'>
+              <Text>{opportunityDrawerDetails?.estimatedTrackingDuration}</Text>
+            </Spacing>
+          </Spacing>
+        ) : null}
+        {isOpportunity ? null : (
+          <Spacing column padding='0 0 0 16px'>
+            <Text.Heading level={4} strong>
+              Tracking Period
+            </Text.Heading>
+            <Text>
+              Tracking period affects ramp-up calculations. After updating dates, review the ramp-up period to confirm it matches the selected tracking period.{' '}
+              <Button type='link' onClick={onRampUpClick}>
+                Review ramp-up details
+              </Button>
+            </Text>
+            <Spacing padding='6px 0 0 0'>
+              <Form.Item name='trackingPeriod' rules={[{ required: true }]}>
+                <DatePicker.RangePicker picker='month' width={300} disabledDate={(d) => d?.isBefore(disabledDate, 'month') ?? true} disabled={[!isEditable, !isEditable]} />
+              </Form.Item>
+            </Spacing>
+          </Spacing>
+        )}
+        <Spacing column padding={initiativePadding}>
+          <Text.Heading level={4} strong>
+            Charge Codes
+          </Text.Heading>
+          <List dataSource={chargeCodeList.slice(0, 3)} renderItem={(item) => <List.Item>{item.title}</List.Item>} />
+          <Spacing>
+            {chargeCodeList.length > 3 && (
+              <Button type='link' onClick={() => setChargeCodesModalVisible(true)}>
+                + {chargeCodeList.length - 3} more
+              </Button>
+            )}
+          </Spacing>
+        </Spacing>
+        <FiltersList filters={opportunityDrawerFilters} padding={initiativePadding} />
+      </Form>
+      <Modal title='Charge Codes' visible={chargeCodesModalVisible} onCancel={handleCancelChargeCodesModal} footer={null}>
+        <Spacing itemSpacing={8}>
+          <Input
+            value={searchChargeCodeModalInput}
+            width={320}
+            search
+            onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+              setSearchChargeCodeModalInput(e.target.value);
+              handleUserSearchWithDebounce(e.target.value);
+            }}
+          />
+          {isOpportunity ? <Button onClick={navigateToEditStrategicOpportunityMode}>Edit Charge Codes</Button> : null}
+        </Spacing>
+        <Spacing padding='8px 0 0 0' />
+        <List height={400} dataSource={chargeCodeModalList} renderItem={(item) => <List.Item>{item.title}</List.Item>} />
+        <Divider />
+      </Modal>
+    </>
+  );
+};
+
+export default StrategicInitiativeDetailsGeneralInfo;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeGraphLine.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeGraphLine.tsx
new file mode 100644
index 0000000..c95a9a1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeGraphLine.tsx
@@ -0,0 +1,138 @@
+import { formatNumber } from '@strata/intl/lib';
+import Button from '@strata/tempo/lib/button/Button';
+import Card from '@strata/tempo/lib/card/Card';
+import ExpandIcon from '@strata/tempo/lib/icon/ExpandIcon';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import Chart from 'chart.js';
+import dayjs from 'dayjs';
+import React from 'react';
+import { Line } from 'react-chartjs-2';
+import { YearMonthStruct } from '../../shared/YearMonthStruct';
+import { IStrategicOpportunityMeasureDetail } from '../data/IStrategicOpportunityMeasureData';
+
+const getMonthsBetween = (start: Date | string, end: Date | string): string[] => {
+  const startMonth = dayjs(start).startOf('month');
+  const endMonth = dayjs(end).startOf('month');
+  const months: string[] = [];
+  let cursor = startMonth;
+  while (cursor.isBefore(endMonth) || cursor.isSame(endMonth)) {
+    months.push(cursor.format('MMM YYYY'));
+    cursor = cursor.add(1, 'month');
+  }
+  return months;
+};
+
+export const filterAndSortData = (data: IStrategicOpportunityMeasureDetail[], startDate: Date, endDate: Date) => {
+  return data
+    .filter((item) => {
+      return (
+        new YearMonthStruct(item.yearId, item.monthId).isAfter(new YearMonthStruct(dayjs(startDate).subtract(1, 'month').toDate())) &&
+        new YearMonthStruct(item.yearId, item.monthId).isBefore(new YearMonthStruct(dayjs(endDate).add(1, 'month').toDate()))
+      );
+    })
+    .sort((a, b) => {
+      const aDate = new YearMonthStruct(a.yearId, a.monthId);
+      const bDate = new YearMonthStruct(b.yearId, b.monthId);
+      return YearMonthStruct.compare(aDate, bDate);
+    });
+};
+
+interface IStrategicInitiativeGraphLineProps {
+  chartKey: string;
+  startDate: Date;
+  endDate: Date;
+  currentMonth: Date;
+  title: React.ReactNode | string;
+  modalTitle: React.ReactNode | string;
+  getDatasets: (largeShow: boolean, labelsCount: number) => Chart.ChartDataSets[];
+  options: Chart.ChartOptions;
+  loading: boolean;
+}
+
+const StrategicInitiativeGraphLine: React.FC<IStrategicInitiativeGraphLineProps> = ({ chartKey, startDate, endDate, currentMonth, title, modalTitle, getDatasets, options, loading }) => {
+  const [showModal, setShowModal] = React.useState<boolean>(false);
+  const VERTICAL_LINE_MONTH = dayjs(currentMonth).format('MMM YYYY');
+
+  const getLineGraph = (largeShow: boolean) => {
+    return (
+      <Line
+        key={chartKey}
+        height={largeShow ? 280 : 0}
+        width={largeShow ? 400 : 0}
+        data={{
+          labels: labels,
+          datasets: getDatasets(largeShow, labels.length)
+        }}
+        options={
+          {
+            ...options,
+            responsive: true,
+            layout: {
+              padding: { top: 24 }
+            },
+            scales: {
+              xAxes: [
+                {
+                  gridLines: {
+                    display: false
+                  }
+                }
+              ],
+              yAxes: [
+                {
+                  gridLines: {
+                    drawBorder: false,
+                    drawTicks: false
+                  },
+                  ticks: {
+                    suggestedMax: 10,
+                    beginAtZero: false,
+                    callback: (value: number) => formatNumber(value, 'number')
+                  }
+                }
+              ]
+            },
+            customVerticalLineMonth: VERTICAL_LINE_MONTH
+          } as any
+        }
+        plugins={[
+          {
+            afterDatasetsDraw: (chart: any) => {
+              const labels: string[] = chart?.data?.labels || [];
+              const liveMonth = chart?.config?.options?.customVerticalLineMonth as string;
+              const index = labels.indexOf(liveMonth);
+              const xScale = chart?.scales?.['x-axis-0'];
+              if (!xScale || index === -1) return;
+
+              const x = xScale.getPixelForTick(index);
+              const { top, bottom } = chart.chartArea;
+              const ctx = chart.ctx;
+              ctx.save();
+              ctx.beginPath();
+              ctx.setLineDash([6, 4]);
+              ctx.strokeStyle = 'red';
+              ctx.lineWidth = 2;
+              ctx.moveTo(x, top);
+              ctx.lineTo(x, bottom);
+              ctx.stroke();
+              ctx.restore();
+            }
+          }
+        ]}
+      />
+    );
+  };
+
+  const labels = getMonthsBetween(startDate, endDate);
+
+  return (
+    <Card title={title} loading={loading} height={300} removeBodyPadding extra={<Button onClick={() => setShowModal(true)} icon={<ExpandIcon />} />}>
+      {getLineGraph(false)}
+      <Modal width='extraLarge' visible={showModal} footer={null} onCancel={() => setShowModal(false)} title={modalTitle}>
+        {getLineGraph(true)}
+      </Modal>
+    </Card>
+  );
+};
+
+export default StrategicInitiativeGraphLine;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeMeasureGraphLine.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeMeasureGraphLine.tsx
new file mode 100644
index 0000000..3ebd70f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeMeasureGraphLine.tsx
@@ -0,0 +1,203 @@
+import { defaultChartColors } from '@strata/charts/lib/chartDefaults';
+import { formatNumber } from '@strata/intl/lib';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import Chart from 'chart.js';
+import React, { useEffect, useMemo } from 'react';
+import { DesiredResult, DesiredResultData } from '../data/DesiredResult';
+import { DefaultStrategicOpportunityMeasureData, IStrategicOpportunityMeasureData, IStrategicOpportunityMeasureDetail, MeasureGroup } from '../data/IStrategicOpportunityMeasureData';
+import { MeasureType } from '../data/MeasureType';
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+import { StrategicOpportunityStatus } from '../data/StrategicOpportunityStatus';
+import { IStrategicOpportunityGeneralInfo } from './data/IStrategicOpportunityDetail';
+import StrategicInitiativeGraphLine, { filterAndSortData } from './StrategicInitiativeGraphLine';
+
+interface IStrategicInitiativeMeasureGraphLineProps {
+  opportunity: IStrategicOpportunityGeneralInfo;
+  currentMonth: Date;
+  isRunTracking: boolean;
+}
+
+const StrategicInitiativeMeasureGraphLine: React.FC<IStrategicInitiativeMeasureGraphLineProps> = ({ opportunity, currentMonth, isRunTracking }) => {
+  const [selectedMeasure, setSelectedMeasure] = React.useState<IStrategicOpportunityMeasureData>(DefaultStrategicOpportunityMeasureData);
+  const [useTodayDate, setUseTodayDate] = React.useState<boolean>(false);
+  const [loading, setLoading] = React.useState<boolean>(false);
+  const [measureDetails, setMeasureDetails] = React.useState<IStrategicOpportunityMeasureDetail[]>([]);
+
+  useEffect(() => {
+    if (opportunity.measures && opportunity.measures.length > 0) {
+      const primaryMeasure = opportunity.measures.find((m) => m.measureGroup === MeasureGroup.Primary);
+      primaryMeasure && setSelectedMeasure(primaryMeasure);
+    }
+  }, [opportunity.measures]);
+
+  useEffect(() => {
+    if (selectedMeasure.measureId) {
+      getDetailData(selectedMeasure.measureId);
+    }
+  }, [selectedMeasure, opportunity.status]);
+
+  useEffect(() => {
+    isRunTracking && setMeasureDetails([]);
+  }, [isRunTracking]);
+
+  const getMeasures = useMemo(() => {
+    const measures = opportunity.measures.filter((item) => item.measureGroup !== MeasureGroup.System);
+
+    return (
+      <Spacing itemSpacing={16} vAlign='center'>
+        <DropDown
+          size='dense'
+          width={150}
+          value={selectedMeasure.measureId}
+          items={measures.map((item) => ({ text: item.measureName, value: item.measureId }))}
+          onChange={(e) => updateSelectedMeasure(e as number)}
+        />
+        <Spacing itemSpacing={4}>
+          <Text strong>Desired result: </Text>
+          <Text>{DesiredResultData.find((item) => item.key === selectedMeasure.desiredResult)?.name}</Text>
+        </Spacing>
+      </Spacing>
+    );
+  }, [selectedMeasure, opportunity.measures]);
+
+  const updateSelectedMeasure = (measureId: number) => {
+    const measure = opportunity.measures.find((m) => m.measureId === measureId);
+    measure && setSelectedMeasure(measure);
+  };
+
+  const getDetailData = (measureId: number) => {
+    const useToday = opportunity.status === StrategicOpportunityStatus.CompleteMonitoring && selectedMeasure?.measureGroup === MeasureGroup.Primary;
+    setUseTodayDate(useToday);
+
+    if (opportunity.status === StrategicOpportunityStatus.NewInitiative) {
+      setMeasureDetails([]);
+    } else {
+      setLoading(true);
+      strategicOpportunityService
+        .getMeasureDetails(measureId)
+        .then((data) => {
+          const sorted = filterAndSortData(data, opportunity.trackingStartDate, useToday ? new Date() : opportunity.trackingEndDate);
+          setMeasureDetails(sorted);
+        })
+        .finally(() => setLoading(false));
+    }
+  };
+
+  const getDatasets = (largeShow: boolean, labelsCount: number): Chart.ChartDataSets[] => {
+    return [
+      {
+        label: 'Measure',
+        data: measureDetails.map((detail) => detail.value),
+        backgroundColor: defaultChartColors[0],
+        borderColor: defaultChartColors[0],
+        pointRadius: largeShow || labelsCount === 1 ? 3 : 0,
+        fill: false
+      },
+      {
+        label: 'Min',
+        data: Array(labelsCount).fill(selectedMeasure.averageValue * (1 - selectedMeasure.acceptableThreshold)),
+        backgroundColor: defaultChartColors[3],
+        borderColor: defaultChartColors[3],
+        pointRadius: 0,
+        hidden: selectedMeasure.desiredResult !== DesiredResult.Steady,
+        fill: false
+      },
+      {
+        label: 'Max',
+        data: Array(labelsCount).fill(selectedMeasure.averageValue * (1 + selectedMeasure.acceptableThreshold)),
+        backgroundColor: defaultChartColors[3],
+        borderColor: defaultChartColors[3],
+        hidden: selectedMeasure.desiredResult !== DesiredResult.Steady,
+        pointRadius: 0,
+        fill: false
+      }
+    ];
+  };
+
+  const options: Chart.ChartOptions = {
+    legend: {
+      labels: {
+        generateLabels: (chart: Chart): Chart.ChartLegendLabelItem[] => {
+          const meta0Hidden = chart.getDatasetMeta(0)?.hidden === true;
+          const meta1Hidden = chart.getDatasetMeta(1)?.hidden === true;
+          const meta2Hidden = chart.getDatasetMeta(2)?.hidden === true;
+          const thresholdsHidden = meta1Hidden && meta2Hidden;
+
+          const measureLabel: Chart.ChartLegendLabelItem = {
+            text: selectedMeasure.measureName,
+            strokeStyle: defaultChartColors[0],
+            fillStyle: defaultChartColors[0],
+            lineWidth: 3,
+            pointStyle: 'line' as Chart.PointStyle,
+            hidden: meta0Hidden,
+            datasetIndex: 0
+          };
+
+          const acceptableThresholdLabel: Chart.ChartLegendLabelItem = {
+            text: 'Acceptable threshold',
+            strokeStyle: defaultChartColors[3],
+            fillStyle: defaultChartColors[3],
+            pointStyle: 'line' as Chart.PointStyle,
+            lineWidth: 3,
+            hidden: thresholdsHidden,
+            datasetIndex: 1
+          };
+
+          return selectedMeasure.desiredResult === DesiredResult.Steady ? [measureLabel, acceptableThresholdLabel] : [measureLabel];
+        },
+        usePointStyle: true,
+        boxWidth: 16
+      },
+      onClick: function (this: any, e: any, legendItem: any) {
+        const ci = this.chart;
+        if (!ci) return;
+        const index = legendItem.datasetIndex;
+
+        if (index === 0) {
+          const meta0 = ci.getDatasetMeta(0);
+          const currentlyHidden = meta0.hidden === true;
+          meta0.hidden = currentlyHidden ? null : true;
+        } else if (index === 1) {
+          const metas = [ci.getDatasetMeta(1), ci.getDatasetMeta(2)];
+          const allHidden = metas.every((m) => m.hidden === true);
+          metas.forEach((m) => {
+            m.hidden = allHidden ? null : true;
+          });
+        }
+        ci.update();
+      }
+    },
+    tooltips: {
+      mode: 'index',
+      intersect: false,
+      position: 'nearest',
+      filter: (tooltipItem: any) => tooltipItem.datasetIndex === 0,
+      callbacks: {
+        label: (tooltipItem: any, data: any) => {
+          const showAsNumber = [MeasureType.UnitsOfService, MeasureType.UnitsOfServicePerCase, MeasureType.EncountersCases, MeasureType.AverageLengthOfStay, MeasureType.Days].includes(
+            selectedMeasure.measureType
+          );
+          return formatNumber(tooltipItem.value, showAsNumber ? 'number' : 'currency');
+        }
+      }
+    }
+  };
+
+  return (
+    <StrategicInitiativeGraphLine
+      currentMonth={useTodayDate ? new Date() : currentMonth}
+      startDate={opportunity.trackingStartDate}
+      endDate={useTodayDate ? new Date() : opportunity.trackingEndDate}
+      loading={loading}
+      title={getMeasures}
+      modalTitle={<Text.Heading level={3}>{selectedMeasure.measureName}</Text.Heading>}
+      chartKey={`${opportunity.lastRunTrackingDate}-${selectedMeasure.measureId}`}
+      getDatasets={getDatasets}
+      options={options}
+    />
+  );
+};
+
+export default StrategicInitiativeMeasureGraphLine;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeMonthProgressBar.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeMonthProgressBar.tsx
new file mode 100644
index 0000000..6945fc4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeMonthProgressBar.tsx
@@ -0,0 +1,86 @@
+import { formatNumber } from '@strata/intl/lib';
+import Card from '@strata/tempo/lib/card/Card';
+import dayjs from 'dayjs';
+import React from 'react';
+import { Bar } from 'react-chartjs-2';
+
+interface IStrategicInitiativeMonthProgressBarProps {
+  actualValue: number;
+  committedValue: number;
+  currentMonth: Date;
+}
+
+const StrategicInitiativeMonthProgressBar: React.FC<IStrategicInitiativeMonthProgressBarProps> = ({ actualValue, committedValue, currentMonth }) => {
+  return (
+    <Card title={dayjs(currentMonth).format('MMMM, YYYY')} height={300} removeBodyPadding>
+      <Bar
+        key={`${actualValue}-${committedValue}`}
+        data={{
+          labels: [''],
+          datasets: [
+            {
+              label: 'Actual Cost',
+              data: [actualValue],
+              backgroundColor: ['#00A1B5'],
+              categoryPercentage: 0.5,
+              barPercentage: 1
+            },
+            {
+              label: 'Committed Cost',
+              data: [committedValue],
+              backgroundColor: ['#004D40'],
+              categoryPercentage: 0.5,
+              barPercentage: 1
+            }
+          ]
+        }}
+        options={{
+          maintainAspectRatio: false,
+          legend: {
+            labels: {
+              padding: 16
+            }
+          },
+          layout: {
+            padding: { top: 24, bottom: 0 }
+          },
+          scales: {
+            xAxes: [
+              {
+                display: false,
+                gridLines: {
+                  display: false
+                }
+              }
+            ],
+            yAxes: [
+              {
+                gridLines: {
+                  drawBorder: false,
+                  drawTicks: false
+                },
+                ticks: {
+                  beginAtZero: true,
+                  suggestedMax: 10,
+                  callback: (value: any) => formatNumber(value, 'number')
+                }
+              }
+            ]
+          },
+          tooltips: {
+            mode: 'dataset',
+            intersect: false,
+            callbacks: {
+              label: (tooltipItem: any, data: any) => {
+                const datasetLabel = data?.datasets?.[tooltipItem.datasetIndex]?.label || '';
+                return `${datasetLabel}: ${formatNumber(tooltipItem.value, 'currency')}`;
+              }
+            }
+          }
+        }}
+      />
+    </Card>
+  );
+};
+
+export default StrategicInitiativeMonthProgressBar;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeProgressGraphLine.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeProgressGraphLine.tsx
new file mode 100644
index 0000000..2e1e117
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicInitiativeProgressGraphLine.tsx
@@ -0,0 +1,142 @@
+import { defaultChartColors } from '@strata/charts/lib/chartDefaults';
+import { formatNumber } from '@strata/intl/lib';
+import Chart from 'chart.js';
+import dayjs from 'dayjs';
+import React, { useEffect } from 'react';
+import { IStrategicOpportunityMeasureDetail, MeasureGroup } from '../data/IStrategicOpportunityMeasureData';
+import { SystemMeasureType } from '../data/MeasureType';
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+import { StrategicOpportunityStatus } from '../data/StrategicOpportunityStatus';
+import { IStrategicOpportunityGeneralInfo } from './data/IStrategicOpportunityDetail';
+import StrategicInitiativeGraphLine, { filterAndSortData } from './StrategicInitiativeGraphLine';
+
+interface IStrategicInitiativeProgressGraphLineProps {
+  opportunity: IStrategicOpportunityGeneralInfo;
+  currentMonth: Date;
+  isRunTracking: boolean;
+}
+
+const StrategicInitiativeProgressGraphLine: React.FC<IStrategicInitiativeProgressGraphLineProps> = ({ opportunity, currentMonth, isRunTracking }) => {
+  const [committedValues, setCommittedValues] = React.useState<IStrategicOpportunityMeasureDetail[]>([]);
+  const [actualValues, setActualValues] = React.useState<IStrategicOpportunityMeasureDetail[]>([]);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      if (opportunity.measures) {
+        const systemMeasures = opportunity.measures.filter((m) => m.measureGroup === MeasureGroup.System);
+        const committedMeasure = systemMeasures.find((m) => m.measureType === SystemMeasureType.CommittedCost);
+        const actualMeasure = systemMeasures.find((m) => m.measureType === SystemMeasureType.ActualCost);
+
+        committedMeasure && setCommittedValues(await getMeasureDetails(committedMeasure.measureId, opportunity.trackingEndDate));
+
+        if (opportunity.status !== StrategicOpportunityStatus.NewInitiative && opportunity.lastRunTrackingDate) {
+          const isRunTrackingEarlierTrackingEnd = dayjs(opportunity.lastRunTrackingDate).isBefore(opportunity.trackingEndDate);
+          actualMeasure && setActualValues(await getMeasureDetails(actualMeasure.measureId, new Date(isRunTrackingEarlierTrackingEnd ? opportunity.lastRunTrackingDate : opportunity.trackingEndDate)));
+        } else {
+          setActualValues(Array(dayjs(new Date()).endOf('month').diff(dayjs(opportunity.trackingStartDate), 'month') + 1).fill({ value: 0 }));
+        }
+      }
+    };
+
+    if (isRunTracking) {
+      setCommittedValues([]);
+      setActualValues([]);
+    } else {
+      fetchData();
+    }
+  }, [isRunTracking]);
+
+  const getMeasureDetails = async (measureId: number, endDate: Date) => {
+    const data = await strategicOpportunityService.getMeasureDetails(measureId);
+    return filterAndSortData(data, opportunity.trackingStartDate, endDate);
+  };
+
+  const getDatasets = (largeShow: boolean, labelsCount: number): Chart.ChartDataSets[] => {
+    return [
+      {
+        label: 'Actual Cost Improvement',
+        data: actualValues.map((detail) => detail.value),
+        backgroundColor: defaultChartColors[0],
+        borderColor: defaultChartColors[0],
+        pointRadius: largeShow || labelsCount === 1 ? 3 : 0,
+        fill: false
+      },
+      {
+        label: 'Committed Cost Improvement',
+        data: committedValues.map((detail) => detail.value),
+        backgroundColor: '#004D40',
+        borderColor: '#004D40',
+        pointRadius: largeShow || labelsCount === 1 ? 3 : 0,
+        fill: false
+      }
+    ];
+  };
+
+  const options: Chart.ChartOptions = {
+    legend: {
+      labels: {
+        generateLabels: (chart: Chart): Chart.ChartLegendLabelItem[] => {
+          const actualHidden = chart.getDatasetMeta(0)?.hidden === true;
+          const committedHidden = chart.getDatasetMeta(1)?.hidden === true;
+
+          const committedLabel: Chart.ChartLegendLabelItem = {
+            text: 'Committed Cost Improvement',
+            strokeStyle: '#004D40',
+            fillStyle: '#004D40',
+            lineWidth: 3,
+            pointStyle: 'line' as Chart.PointStyle,
+            hidden: committedHidden,
+            datasetIndex: 1
+          };
+
+          const actualLabel: Chart.ChartLegendLabelItem = {
+            text: 'Actual Cost Improvement',
+            strokeStyle: defaultChartColors[0],
+            fillStyle: defaultChartColors[0],
+            lineWidth: 3,
+            pointStyle: 'line' as Chart.PointStyle,
+            hidden: actualHidden,
+            datasetIndex: 0
+          };
+
+          return [actualLabel, committedLabel];
+        },
+        usePointStyle: true,
+        boxWidth: 16
+      },
+      onClick: function (this: any, e: any, legendItem: any) {
+        const ci = this.chart;
+        if (!ci) return;
+
+        const index = legendItem.datasetIndex;
+        const meta = ci.getDatasetMeta(index);
+        const currentlyHidden = meta.hidden === true;
+        meta.hidden = currentlyHidden ? null : true;
+        ci.update();
+      }
+    },
+    tooltips: {
+      callbacks: {
+        label: (tooltipItem: any, data: any) => {
+          return `${tooltipItem.datasetIndex === 0 ? 'Actual Cost' : 'Committed Cost'}: ${formatNumber(tooltipItem.value, 'currency')}`;
+        }
+      }
+    }
+  };
+
+  return (
+    <StrategicInitiativeGraphLine
+      chartKey={opportunity.lastRunTrackingDate?.toString()}
+      currentMonth={currentMonth}
+      startDate={opportunity.trackingStartDate}
+      endDate={opportunity.trackingEndDate}
+      title='Progress to Date'
+      modalTitle='Progress to Date'
+      getDatasets={getDatasets}
+      loading={false}
+      options={options}
+    />
+  );
+};
+
+export default StrategicInitiativeProgressGraphLine;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityColumnLayout.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityColumnLayout.tsx
new file mode 100644
index 0000000..54aaee7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityColumnLayout.tsx
@@ -0,0 +1,55 @@
+import Button from '@strata/tempo/lib/button/Button';
+import DataGrid from '@strata/tempo/lib/datagrid/DataGrid';
+import EyeIcon from '@strata/tempo/lib/icon/EyeIcon';
+import EyeInvisibleIcon from '@strata/tempo/lib/icon/EyeInvisibleIcon';
+import Tooltip from '@strata/tempo/lib/tooltip/Tooltip';
+import React from 'react';
+import { columnInitiativeLayoutList, columnOpportunityLayoutList } from './data/IStrategicOpportunityLayout';
+import { StrategicOpportunityDetailField } from './data/StrategicOpportunityDetailDimension';
+
+export interface IStrategicOpportunityColumnLayoutProps {
+  columns: string[];
+  isOpportunity: boolean;
+  updateColumns: (columns: string[]) => void;
+}
+
+const columnsNotToBeHide = [StrategicOpportunityDetailField.EncountersMonth.toString()];
+
+const StrategicOpportunityColumnLayout: React.FC<IStrategicOpportunityColumnLayoutProps> = (props: IStrategicOpportunityColumnLayoutProps) => {
+  const { columns, isOpportunity, updateColumns } = props;
+
+  const handleHideOrShow = async (row: any) => {
+    let cols = [...columns];
+
+    if (columns.includes(row.name)) {
+      cols = cols.filter((item) => item !== row.name);
+    } else {
+      cols.push(row.name);
+    }
+
+    updateColumns(cols);
+  };
+
+  const renderIsHidden = (rowData: any) => {
+    if (!columnsNotToBeHide.includes(rowData.name)) {
+      const isShown = columns.includes(rowData.name);
+      const tooltipTitle = isShown ? 'Hide Column' : 'Show Column';
+      const btnIcon = !isShown ? <EyeInvisibleIcon /> : <EyeIcon />;
+      return (
+        <Tooltip title={tooltipTitle} placement='left'>
+          <Button type='link' icon={btnIcon} onClick={() => handleHideOrShow(rowData)} />
+        </Tooltip>
+      );
+    }
+  };
+
+  return (
+    <DataGrid value={isOpportunity ? columnOpportunityLayoutList : columnInitiativeLayoutList}>
+      <DataGrid.RowNumber />
+      <DataGrid.Column field='header' header='Column Name' width={300} />
+      <DataGrid.Column key='isHidden' header='' width={50} body={renderIsHidden} />
+    </DataGrid>
+  );
+};
+
+export default StrategicOpportunityColumnLayout;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityDetailGrid.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityDetailGrid.tsx
new file mode 100644
index 0000000..4af06da
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityDetailGrid.tsx
@@ -0,0 +1,312 @@
+import { formatNumber } from '@strata/intl/lib';
+import NumberFormat from '@strata/intl/lib/number/number-format';
+import { DataHeaderCell, DataHeaderGroup, DataHeaderRow } from '@strata/tempo/lib/dataheader';
+import InputNumber from '@strata/tempo/lib/inputnumber/InputNumber';
+import Popover from '@strata/tempo/lib/popover/Popover';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import TreeGrid from '@strata/tempo/lib/treegrid';
+import React, { useEffect } from 'react';
+import { ChangeGridData, TreeNode } from '../../shared/store/StoreTreeData';
+import { getValueByProp } from '../../shared/utilities';
+import { AdjustmentData, AdjustmentType, getNewValue } from './data/AdjustmentType';
+import { IStrategicOpportunityDetailGridItem } from './data/IStrategicOpportunityDetail';
+import { getStrategicOpportunityDetailColumnHeader, StrategicOpportunityDetailField } from './data/StrategicOpportunityDetailDimension';
+import { getFormatedNumericCell } from './StrategicOpportunityDetailPage';
+import StrategicOpportunityEditOverlay from './StrategicOpportunityEditOverlay';
+
+export interface IStrategicOpportunityDetailGridProps {
+  root: TreeNode<IStrategicOpportunityDetailGridItem> | undefined;
+  isEditable: boolean;
+  showRootRow: boolean;
+  columns: StrategicOpportunityDetailField[];
+  levelsCount: number;
+  trackingDuration: number;
+  loading: boolean;
+  expandedKeys: any[];
+  onChange: (changeData: ChangeGridData<IStrategicOpportunityDetailGridItem>) => void;
+  setExpandedKeys: (expandedKeys: any[]) => void;
+}
+
+interface EditableCellProps {
+  rowData: any;
+  openPopoverKey?: string;
+  column: any;
+  format: NumberFormat;
+  setOpenPopoverKey?: (title: string) => void;
+  onEditCell: (adjustmentData: AdjustmentData) => void;
+}
+
+const EditableCell: React.FC<EditableCellProps> = ({ rowData, column, format, openPopoverKey: openPopoverTitle, onEditCell }) => {
+  return (
+    rowData.data && (
+      <InputNumber
+        onFocus={(e) => openPopoverTitle && e.target.blur()}
+        value={formatNumber(rowData.rawData[column.field], format === 'number' ? 'currencyNoSymbol' : 'currencyNoSymbolDecimal', { zeroValue: '-' }) as any}
+        format={format === 'currencyDecimal' ? 'currency' : 'number'}
+        precision={format === 'number' ? 0 : 2}
+        onChange={(value: number | string | undefined | null) => {
+          if (!openPopoverTitle) onEditCell({ type: AdjustmentType.Value, value: Number(value), applyTo: undefined });
+        }}
+      />
+    )
+  );
+};
+const EditableCellWithPopover: React.FC<EditableCellProps> = ({ rowData, column, format, openPopoverKey, setOpenPopoverKey, onEditCell }) => {
+  const title = `${rowData.data.label} ${getPopoverTitle(column.field)}`;
+  const popoverKey = `popover-${rowData.data.key}-${column.field}`;
+
+  return (
+    rowData.data && (
+      <Popover
+        title={
+          <Spacing width={260}>
+            <Text strong>{title}</Text>
+          </Spacing>
+        }
+        open={openPopoverKey === popoverKey}
+        onOpenChange={(isOpen) => {
+          if (!openPopoverKey && setOpenPopoverKey) {
+            setOpenPopoverKey(popoverKey);
+          }
+        }}
+        content={
+          <StrategicOpportunityEditOverlay
+            rowData={rowData}
+            column={column.field}
+            format={format}
+            closeOverlay={() => setOpenPopoverKey && setOpenPopoverKey('')}
+            applyOverlay={(values: { [name: string]: any }) => {
+              onEditCell({ type: values.adjustmentType, value: values.adjustmentValue, applyTo: values['reflectChangesIn'] || undefined });
+            }}
+          />
+        }
+      >
+        <InputNumber
+          onFocus={(e) => e.target.blur()}
+          value={formatNumber(rowData.rawData[column.field], format === 'number' ? 'currencyNoSymbol' : 'currencyNoSymbolDecimal', { zeroValue: '-' }) as any}
+          format={format === 'currencyDecimal' ? 'currency' : 'number'}
+          precision={format === 'number' ? 0 : 2}
+        />
+      </Popover>
+    )
+  );
+};
+
+function getPopoverTitle(columnKey: string): string {
+  switch (columnKey) {
+    case StrategicOpportunityDetailField.GoalUnitsMonth:
+      return 'Average Units';
+    case StrategicOpportunityDetailField.GoalUnitsPerEncounter:
+      return 'Units per Encounter';
+    case StrategicOpportunityDetailField.GoalCostPerEncounter:
+      return 'VDC per Encounter';
+    case StrategicOpportunityDetailField.GoalCostPerUnit:
+      return 'VDC per Unit';
+    default:
+      return '';
+  }
+}
+
+const labelColumnWidth = 200;
+const columnWidth = 80;
+
+function getColumnsData(
+  columns: StrategicOpportunityDetailField[],
+  levelsCount: number,
+  trackingDuration: number,
+  isEditable: boolean,
+  openPopoverKey: string,
+  onChange: (changeData: ChangeGridData<IStrategicOpportunityDetailGridItem>) => void,
+  setOpenPopoverKey: React.Dispatch<React.SetStateAction<string>>
+): { columnElements: React.ReactElement[]; headerGroup: React.ReactElement } {
+  const baselineColumns: React.ReactElement[] = [];
+  const goalColumns: React.ReactElement[] = [];
+  const totalColumns: React.ReactElement[] = [];
+
+  const baselineUnitHeaders: React.ReactElement[] = [];
+  const baselineCostHeaders: React.ReactElement[] = [];
+  const goalUnitHeaders: React.ReactElement[] = [];
+  const goalCostHeaders: React.ReactElement[] = [];
+  const totalHeaders: React.ReactElement[] = [];
+
+  const getEditCell = (rowData: any, column: any, format: NumberFormat) => {
+    const onEditCell = (adjustmentData: AdjustmentData) => {
+      const oldVal = getValueByProp<IStrategicOpportunityDetailGridItem, number>(rowData.data, column.field) || 0;
+      const newVal = getNewValue(oldVal, adjustmentData);
+      onChange({
+        node: rowData,
+        colName: column.field,
+        newVal: newVal,
+        oldVal: oldVal,
+        options: { adjustmentData }
+      });
+    };
+    if (!isEditable) return <Spacing hAlign='right'>{formatNumber(rowData.data[column.field], format, { zeroValue: '-' }) as any}</Spacing>;
+    else if (rowData.levelPos === levelsCount) return <EditableCell rowData={rowData} column={column} format={format} openPopoverKey={openPopoverKey} onEditCell={onEditCell} />;
+    else return <EditableCellWithPopover rowData={rowData} column={column} format={format} openPopoverKey={openPopoverKey} onEditCell={onEditCell} setOpenPopoverKey={setOpenPopoverKey} />;
+  };
+
+  columns.forEach((col) => {
+    switch (col) {
+      case StrategicOpportunityDetailField.EncountersMonth:
+        baselineColumns.push(<TreeGrid.NumberColumn key={col} field={col} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'number')} />);
+        baselineUnitHeaders.push(<DataHeaderCell key={col} field={col} width={columnWidth} header={getStrategicOpportunityDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicOpportunityDetailField.UnitsMonth:
+        baselineColumns.push(<TreeGrid.NumberColumn key={col} field={col} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'number')} />);
+        baselineUnitHeaders.push(<DataHeaderCell key={col} field={col} width={columnWidth} header={getStrategicOpportunityDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicOpportunityDetailField.UnitsPerEncounter:
+        baselineColumns.push(<TreeGrid.NumberColumn key={col} field={col} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'decimal')} />);
+        baselineUnitHeaders.push(<DataHeaderCell key={col} field={col} width={columnWidth} header={getStrategicOpportunityDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicOpportunityDetailField.CostPerEncounter:
+        baselineColumns.push(<TreeGrid.NumberColumn key={col} field={col} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currencyDecimal')} />);
+        baselineCostHeaders.push(<DataHeaderCell key={col} field={col} width={columnWidth} header={getStrategicOpportunityDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicOpportunityDetailField.CostPerUnit:
+        baselineColumns.push(<TreeGrid.NumberColumn key={col} field={col} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currencyDecimal')} />);
+        baselineCostHeaders.push(<DataHeaderCell key={col} field={col} width={columnWidth} header={getStrategicOpportunityDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicOpportunityDetailField.CostMonth:
+        baselineColumns.push(<TreeGrid.NumberColumn key={col} field={col} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')} />);
+        baselineCostHeaders.push(<DataHeaderCell key={col} field={col} width={columnWidth} header={getStrategicOpportunityDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicOpportunityDetailField.GoalUnitsMonth:
+        goalColumns.push(<TreeGrid.Column key={col} field={col} width={columnWidth} body={(rowData, column) => getEditCell(rowData, column, 'number')} />);
+        goalUnitHeaders.push(<DataHeaderCell key={col} field={col} width={columnWidth} header={getStrategicOpportunityDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicOpportunityDetailField.GoalUnitsPerEncounter:
+        goalColumns.push(<TreeGrid.Column key={col} field={col} width={columnWidth} body={(rowData, column) => getEditCell(rowData, column, 'decimal')} />);
+        goalUnitHeaders.push(<DataHeaderCell key={col} field={col} width={columnWidth} header={getStrategicOpportunityDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicOpportunityDetailField.GoalCostPerEncounter:
+        goalColumns.push(<TreeGrid.Column key={col} field={col} width={columnWidth} body={(rowData, column) => getEditCell(rowData, column, 'currencyDecimal')} />);
+        goalCostHeaders.push(<DataHeaderCell key={col} field={col} width={columnWidth} header={getStrategicOpportunityDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicOpportunityDetailField.GoalCostPerUnit:
+        goalColumns.push(<TreeGrid.Column key={col} field={col} width={columnWidth} body={(rowData, column) => getEditCell(rowData, column, 'currencyDecimal')} />);
+        goalCostHeaders.push(<DataHeaderCell key={col} field={col} width={columnWidth} header={getStrategicOpportunityDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicOpportunityDetailField.GoalCostMonth:
+        goalColumns.push(<TreeGrid.NumberColumn key={col} field={col} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')} />);
+        goalCostHeaders.push(<DataHeaderCell key={col} field={col} width={columnWidth} header={getStrategicOpportunityDetailColumnHeader(col)} align='right' />);
+        break;
+      case StrategicOpportunityDetailField.TotalImprovement:
+        totalColumns.push(<TreeGrid.NumberColumn key={col} field={col} width={columnWidth} body={(rowData, column) => getFormatedNumericCell(rowData, column, 'currency')} />);
+        totalHeaders.push(<DataHeaderCell key={col} field={col} width={columnWidth} header={`${getStrategicOpportunityDetailColumnHeader(col)} for ${trackingDuration} months`} align='right' />);
+        break;
+      default:
+        break;
+    }
+  });
+
+  const topHeaders: React.ReactElement[] = [<DataHeaderCell key='label' width={labelColumnWidth}></DataHeaderCell>];
+  const middleHeaders: React.ReactElement[] = [<DataHeaderCell key='label' width={labelColumnWidth}></DataHeaderCell>];
+  const bottomHeaders: React.ReactElement[] = [<DataHeaderCell key='label' width={labelColumnWidth}></DataHeaderCell>];
+  const columnElements: React.ReactElement[] = [<TreeGrid.Column key='label' field='label' width={labelColumnWidth} expander />];
+
+  if (baselineUnitHeaders.length || baselineCostHeaders.length) {
+    topHeaders.push(
+      <DataHeaderCell
+        key='baseline'
+        width={columnWidth * (baselineUnitHeaders.length + baselineCostHeaders.length)}
+        colSpan={baselineUnitHeaders.length + baselineCostHeaders.length}
+        align='center'
+        header={`Monthly Baseline`}
+      ></DataHeaderCell>
+    );
+    if (baselineUnitHeaders.length) {
+      middleHeaders.push(<DataHeaderCell key='baselineUnit' width={columnWidth * baselineUnitHeaders.length} colSpan={baselineUnitHeaders.length}></DataHeaderCell>);
+      bottomHeaders.push(...baselineUnitHeaders);
+    }
+    if (baselineCostHeaders.length) {
+      middleHeaders.push(
+        <DataHeaderCell key='baselineCost' width={columnWidth * baselineCostHeaders.length} colSpan={baselineCostHeaders.length} align='center' header='Variable Direct Cost'></DataHeaderCell>
+      );
+      bottomHeaders.push(...baselineCostHeaders);
+    }
+    columnElements.push(...baselineColumns);
+  }
+  if ((baselineUnitHeaders.length || baselineCostHeaders.length) && (goalUnitHeaders.length || goalCostHeaders.length)) {
+    topHeaders.push(<DataHeaderCell key='top-header-gap' isGap></DataHeaderCell>);
+    middleHeaders.push(<DataHeaderCell key='middle-header-gap' isGap></DataHeaderCell>);
+    bottomHeaders.push(<DataHeaderCell key='bottom-header-gap' isGap></DataHeaderCell>);
+    columnElements.push(<TreeGrid.GapColumn key='data-gap'></TreeGrid.GapColumn>);
+  }
+  if (goalUnitHeaders.length || goalCostHeaders.length) {
+    topHeaders.push(
+      <DataHeaderCell
+        key='goal'
+        width={columnWidth * (goalUnitHeaders.length + goalCostHeaders.length)}
+        colSpan={goalUnitHeaders.length + goalCostHeaders.length}
+        align='center'
+        header={`Monthly Goal`}
+      ></DataHeaderCell>
+    );
+    if (goalUnitHeaders.length) {
+      middleHeaders.push(<DataHeaderCell key='goalUnit' width={columnWidth * goalUnitHeaders.length} colSpan={goalUnitHeaders.length}></DataHeaderCell>);
+      bottomHeaders.push(...goalUnitHeaders);
+    }
+    if (goalCostHeaders.length) {
+      middleHeaders.push(<DataHeaderCell key='goalCost' width={columnWidth * goalCostHeaders.length} colSpan={goalCostHeaders.length} align='center' header='Variable Direct Cost'></DataHeaderCell>);
+      bottomHeaders.push(...goalCostHeaders);
+    }
+    columnElements.push(...goalColumns);
+  }
+  if (totalHeaders.length) {
+    topHeaders.push(<DataHeaderCell key='total' width={columnWidth} colSpan={totalHeaders.length}></DataHeaderCell>);
+    middleHeaders.push(<DataHeaderCell key='total' width={columnWidth} colSpan={totalHeaders.length}></DataHeaderCell>);
+    bottomHeaders.push(...totalHeaders);
+    columnElements.push(...totalColumns);
+  }
+
+  const headerRows: React.ReactElement[] = [];
+  if (topHeaders.length > 1) {
+    headerRows.push(<DataHeaderRow key='top'>{topHeaders}</DataHeaderRow>);
+  }
+  if (middleHeaders.length > 1) {
+    headerRows.push(<DataHeaderRow key='middle'>{middleHeaders}</DataHeaderRow>);
+  }
+  headerRows.push(<DataHeaderRow key='bottom'>{bottomHeaders}</DataHeaderRow>);
+
+  const headerGroup = <DataHeaderGroup>{headerRows}</DataHeaderGroup>;
+
+  return { columnElements, headerGroup };
+}
+
+export const StrategicOpportunityDetailGrid: React.FC<IStrategicOpportunityDetailGridProps> = ({
+  root,
+  isEditable,
+  showRootRow,
+  columns,
+  levelsCount,
+  trackingDuration,
+  loading,
+  expandedKeys,
+  onChange,
+  setExpandedKeys
+}) => {
+  const gridData = root ? (showRootRow ? [root] : root.children) : [];
+  const [headerGroup, setHeaderGroup] = React.useState<React.ReactElement>();
+  const [columnElements, setColumnElements] = React.useState<React.ReactElement[]>([]);
+  const [openPopoverKey, setOpenPopoverKey] = React.useState<string>('');
+
+  // TODO: investigate how to optimize render columns based dependencies
+  useEffect(() => {
+    if (columns.length && trackingDuration) {
+      const { columnElements, headerGroup } = getColumnsData(columns, levelsCount, trackingDuration, isEditable, openPopoverKey, onChange, setOpenPopoverKey);
+      setColumnElements(columnElements);
+      setHeaderGroup(headerGroup);
+    }
+  }, [columns, levelsCount, trackingDuration, isEditable, onChange, openPopoverKey]);
+
+  return columnElements.length && headerGroup ? (
+    <TreeGrid scrollable scrollableOffset={56} value={gridData} loading={loading} columnHeaderGroup={headerGroup} expandedRowKeys={expandedKeys} onRowToggle={setExpandedKeys}>
+      {columnElements}
+    </TreeGrid>
+  ) : (
+    <></>
+  );
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityDetailPage.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityDetailPage.tsx
new file mode 100644
index 0000000..218cd01
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityDetailPage.tsx
@@ -0,0 +1,1026 @@
+import intlService from '@strata/intl/lib';
+import NumberFormat from '@strata/intl/lib/number/number-format';
+import { useHubEvent } from '@strata/signalr/lib';
+import { ActionBar, ButtonMenu, DatePicker, FixedActionBar, IMenuItem, LayoutGrid, MetricGroup, RangeValue, RouteConfirm, Spacing, useModal, usePageLoader, useToast } from '@strata/tempo/lib';
+import Button from '@strata/tempo/lib/button/Button';
+import DataCell from '@strata/tempo/lib/datacell/DataCell';
+import Header from '@strata/tempo/lib/header';
+import CheckCircleIcon from '@strata/tempo/lib/icon/CheckCircleIcon';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import WarningIcon from '@strata/tempo/lib/icon/WarningIcon';
+import Text from '@strata/tempo/lib/text';
+import dayjs from 'dayjs';
+import { debounce } from 'lodash';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import ReactDOM from 'react-dom';
+import { useHistory, useParams } from 'react-router';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import CommentsDrawer from '../../shared/comments/CommentsDrawer';
+import { DicStrNum } from '../../shared/data/Dictionary';
+import notificationHub from '../../shared/notification/NotificationHub';
+import { hubEvents } from '../../shared/notification/NotificationNotifier';
+import OpportunityWorkbooksButtonMenu from '../../shared/opportunities/OpportunityWorkbooksButtonMenu';
+import { ISecurityDisplay } from '../../shared/security/data/ISecurityDisplay';
+import SimpleSecurityModal from '../../shared/security/SimpleSecurityModal';
+import { ChangeGridData, TreeNode } from '../../shared/store/StoreTreeData';
+import { extendPartialObj, isArraysEqual } from '../../shared/utilities';
+import { RunTrackingStatus } from '../data/RunTrackingStatus';
+import { StrategicInitiativeDetailStoreTreeData } from '../data/store/StrategicInitiativeDetailStoreTreeData';
+import { getStrategicOpportunityDetailRowConfigsByDimensions, StrategicOpportunityDetailStoreTreeData } from '../data/store/StrategicOpportunityDetailStoreTreeData';
+import { strategicOpportunitySecurityService } from '../data/strategicOpportunitySecurityService';
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+import { isStrategicOpportunityComplete, StrategicOpportunityStatus } from '../data/StrategicOpportunityStatus';
+import { deleteStrategicOpportunity } from '../opportunities/deleteOpportunity';
+import StrategicOpportunityRampUpToGoalDrawer from '../StrategicOpportunityRampUpToGoalDrawer';
+import ConvertToInitiativeModal from './ConvertToInitiativeModal';
+import { ChargeCodeAdjustmentDetails } from './data/AdjustmentType';
+import { DefaultStrategicInitiativeDetailGridItem, IStrategicInitiativeDetailGridItem } from './data/IStrategicInitiativeDetail';
+import {
+  DefaultStrategicOpportunityDetailGridItem,
+  DefaultStrategicOpportunityGeneralInfo,
+  DefaultStrategicOpportunityGetDetailData,
+  IStrategicInitiativeDetail,
+  IStrategicInitiativeDetailData,
+  IStrategicOpportunityDetail,
+  IStrategicOpportunityDetailData,
+  IStrategicOpportunityDetailGridItem,
+  IStrategicOpportunityGeneralInfo,
+  TabKeys
+} from './data/IStrategicOpportunityDetail';
+import { defaultStrategicInitiativeLayout, defaultStrategicOpportunityLayout, IStrategicOpportunityLayout } from './data/IStrategicOpportunityLayout';
+import { getStrategicInitiativeDetailColumnsByString, StrategicInitiativeDetailFieldSection } from './data/StrategicInitiativeDetailDimension';
+import {
+  getStrategicOpportunityDetailColumnsByString,
+  getStrategicOpportunityDetailDimensionsByString,
+  StrategicOpportunityDetailDimension,
+  strategicOpportunityDetailDimensionTotal,
+  StrategicOpportunityDetailField
+} from './data/StrategicOpportunityDetailDimension';
+import StrategicInitiativeCopyButton from './StrategicInitiativeCopyButton';
+import { StrategicInitiativeDetailGrid } from './StrategicInitiativeDetailGrid';
+import StrategicInitiativeMeasureGraphLine from './StrategicInitiativeMeasureGraphLine';
+import StrategicInitiativeMonthProgressBar from './StrategicInitiativeMonthProgressBar';
+import StrategicInitiativeProgressGraphLine from './StrategicInitiativeProgressGraphLine';
+import { StrategicOpportunityDetailGrid } from './StrategicOpportunityDetailGrid';
+import StrategicOpportunityDetailsDrawer from './StrategicOpportunityDetailsDrawer';
+import StrategicOpportunityGridLayoutDrawer from './StrategicOpportunityGridLayoutDrawer';
+import StrategicOpportunityTrackingButton from './StrategicOpportunityTrackingButton';
+
+export const getAllKeys = (node: TreeNode<IStrategicOpportunityDetailGridItem | IStrategicInitiativeDetailGridItem>[]): string[] => {
+  return node.flatMap((n) => [n.key, ...(n.children.length > 0 ? getAllKeys(n.children) : [])]);
+};
+
+const getIsOpportunity = (opportunity: IStrategicOpportunityGeneralInfo | undefined): boolean => {
+  if (opportunity) {
+    return opportunity.status < StrategicOpportunityStatus.NewInitiative;
+  }
+  return true;
+};
+
+export const getFormatedNumericCell = (rowData: any, column: any, format: NumberFormat): JSX.Element => {
+  return <DataCell>{intlService.formatNumber(rowData.rawData[column.field], format, { zeroValue: '-' })}</DataCell>;
+};
+
+export enum InitiativeProgressToggleStatus {
+  All = 'All',
+  OnTrack = 'On Track',
+  OffTrack = 'Off Track'
+}
+
+const formatInitiativeStatus = (value: StrategicOpportunityStatus): string => {
+  const status = StrategicOpportunityStatus[value];
+  if (value === StrategicOpportunityStatus.NewInitiative) {
+    return 'New';
+  }
+  if (value === StrategicOpportunityStatus.CompleteMonitoring) {
+    return 'Complete';
+  }
+  return status;
+};
+
+const getInitiativeTrackStatus = (initiativeGridData: IStrategicInitiativeDetailGridItem): string => {
+  if (initiativeGridData?.trackingActualTracking > initiativeGridData?.trackingCommittedTracking) {
+    return InitiativeProgressToggleStatus.OffTrack;
+  }
+  return InitiativeProgressToggleStatus.OnTrack;
+};
+
+function getDetailDataForOpportunity(opportunityId: number, dimensions: StrategicOpportunityDetailDimension[]): Promise<IStrategicOpportunityDetailData> {
+  return strategicOpportunityService.getOpportunityDetailData(opportunityId, false, { ...DefaultStrategicOpportunityGetDetailData, dimensions, dateStart: null, dateEnd: null }).then((res) => {
+    const partialTreeData: { [key: string]: Partial<IStrategicOpportunityDetailGridItem> } = {};
+    extendPartialObj(res.encounterData, partialTreeData, 'encounters');
+    return {
+      data: res.data,
+      dimensionsData: res.dimensionsData,
+      partialTreeData
+    };
+  });
+}
+
+function getDetailDataForInitiative(opportunityId: number, dimensions: StrategicOpportunityDetailDimension[], currentMonthDate?: Date): Promise<IStrategicInitiativeDetailData> {
+  if (!currentMonthDate) currentMonthDate = dayjs().endOf('month').toDate();
+  return Promise.all([
+    strategicOpportunityService.getOpportunityDetailData(opportunityId, true, {
+      ...DefaultStrategicOpportunityGetDetailData,
+      dimensions,
+      dateStart: null,
+      dateEnd: currentMonthDate
+    }),
+    strategicOpportunityService.getOpportunityRawDetailData(opportunityId, true, {
+      ...DefaultStrategicOpportunityGetDetailData,
+      dimensions,
+      dateStart: currentMonthDate,
+      dateEnd: currentMonthDate
+    })
+  ]).then((res) => {
+    const monthByKey = new Map(res[1].data.map((x) => [x.key, x]));
+    const newData: IStrategicInitiativeDetail[] = res[0].data.map((item) => {
+      const newItem: IStrategicInitiativeDetail = {
+        ...item,
+        monthUnits: 0,
+        monthCost: 0,
+        monthGoalUnits: 0,
+        monthGoalCost: 0
+      };
+      const monthEl = monthByKey.get(item.key);
+      if (monthEl) {
+        newItem.monthUnits = monthEl.units;
+        newItem.monthCost = monthEl.cost;
+        newItem.monthGoalUnits = monthEl.goalUnits;
+        newItem.monthGoalCost = monthEl.goalCost;
+      }
+      return newItem;
+    });
+    const partialTreeData: { [key: string]: Partial<IStrategicInitiativeDetailGridItem> } = {};
+    extendPartialObj(res[0].encounterData, partialTreeData, 'trackingEncounters');
+    extendPartialObj(res[1].encounterData, partialTreeData, 'monthEncounters');
+    return {
+      data: newData,
+      dimensionsData: res[0].dimensionsData,
+      partialTreeData
+    };
+  });
+}
+
+const StrategicOpportunityDetailPage: React.FC = () => {
+  const { opportunityId: strOpportunityId } = useParams<{ opportunityId: string }>();
+  const { setLoading } = usePageLoader();
+  const [opportunityId] = useState<number>(() => {
+    const parsed = parseInt(strOpportunityId ?? '', 10);
+    return isNaN(parsed) ? 0 : parsed;
+  });
+  const [loadingGrid, setLoadingGrid] = useState<boolean>(false);
+  const [isDataChanged, setIsDataChanged] = useState<boolean>(false);
+  const [opportunityData, setOpportunityData] = useState<IStrategicOpportunityGeneralInfo>();
+  const [storeRoot, setStoreRoot] = useState<TreeNode<IStrategicOpportunityDetailGridItem> | TreeNode<IStrategicInitiativeDetailGridItem>>();
+  const [initialInitiativeStoreRootData, setInitialInitiativeStoreRootData] = useState<IStrategicInitiativeDetailGridItem>(DefaultStrategicInitiativeDetailGridItem);
+  const [showRootRow, setShowRootRow] = useState<boolean>(false);
+  const [showComments, setShowComments] = useState<boolean>(false);
+  const [currentMonthDate, setCurrentMonthDate] = useState<Date>(new Date());
+  const [showConvertToInitiativeModal, setShowConvertToInitiativeModal] = useState<boolean>(false);
+  const [isSecurityVisible, setIsSecurityVisible] = useState<boolean>(false);
+  const [layout, setLayout] = useState<IStrategicOpportunityLayout>();
+  const [gridColumns, setGridColumns] = useState<StrategicOpportunityDetailField[] | StrategicInitiativeDetailFieldSection[]>([]);
+  const [adjustments, setAdjustments] = useState<ChargeCodeAdjustmentDetails[]>([]);
+  const [isEditGridLayout, setIsEditGridLayout] = useState<boolean>(false);
+  const [isRampUpDrawerVisible, setIsRampUpDrawerVisible] = useState<boolean>(false);
+  const [isReadable, setIsReadable] = useState<boolean>(true);
+  const [isDisabled, setIsDisabled] = useState<boolean>(true);
+  const [isExporting, setIsExporting] = useState<boolean>(false);
+  const [isRunTracking, setIsRunTracking] = useState<boolean>(false);
+  const [isSecurityEditable, setIsSecurityEditable] = useState<boolean>(false);
+  const [allGridKeys, setAllGridKeys] = useState<string[]>([]);
+  const [expandedKeys, setExpandedKeys] = useState<string[]>([]);
+  const [opportunityDetailsDrawer, setOpportunityDetailsDrawer] = React.useState(false);
+  const [opportunityDetailsDrawerTab, setOpportunityDetailsDrawerTab] = React.useState<string>(TabKeys.General);
+  const [initiativeProgressToggle, setInitiativeProgressToggle] = React.useState<InitiativeProgressToggleStatus>(InitiativeProgressToggleStatus.All);
+
+  const toast = useToast();
+  const modal = useModal();
+  const history = useHistory();
+  const hub = notificationHub.useConnection();
+
+  useHubEvent(hub, hubEvents.SendStrategicInitiativeTrackerSuccess, async (key: string, trackingStatus: RunTrackingStatus, trackingDate: Date) => {
+    if (key === opportunityId.toString()) {
+      toast.show({ key: key, message: `Strategic initiative updated.`, toastType: 'success' });
+      await refreshPageData(true, trackingStatus, trackingDate);
+      setIsRunTracking(false);
+    }
+  });
+
+  useHubEvent(hub, hubEvents.SendStrategicInitiativeTrackerError, async (key: string, trackingStatus?: RunTrackingStatus, trackingDate?: Date) => {
+    if (key === opportunityId.toString()) {
+      toast.show({ key: key, duration: 0, message: `Strategic initiative update failed. Check the data, make corrections as needed. If the failure continues, contact Support.`, toastType: 'error' });
+      if (trackingStatus && trackingDate) await refreshPageData(false, trackingStatus, trackingDate);
+      setIsRunTracking(false);
+    }
+  });
+
+  const isOpportunity = useMemo(() => {
+    if (opportunityData === undefined) return undefined;
+    return opportunityData.status < StrategicOpportunityStatus.NewInitiative;
+  }, [opportunityData]);
+
+  const storeTreeData = useMemo(() => {
+    if (isOpportunity === undefined) return undefined;
+    return isOpportunity
+      ? new StrategicOpportunityDetailStoreTreeData(DefaultStrategicOpportunityDetailGridItem)
+      : new StrategicInitiativeDetailStoreTreeData(DefaultStrategicInitiativeDetailGridItem);
+  }, [isOpportunity]);
+
+  const opportunityKeyName = useMemo(() => {
+    if (opportunityData === undefined) return '';
+    return `${opportunityData.opportunityId} • ${opportunityData.name}`;
+  }, [opportunityData]);
+
+  useEffect(() => {
+    setLoading(isOpportunity === undefined);
+  }, [isOpportunity, setLoading]);
+
+  useEffect(() => {
+    // prevent users w/o read access page access
+    if (!isReadable) {
+      history.push('/');
+    }
+  }, [isReadable, history]);
+
+  const fetchData = useCallback(
+    async (_opportunityId: number) => {
+      if (!_opportunityId) return;
+
+      setLoading(true);
+
+      Promise.all([
+        strategicOpportunityService.getOpportunityGeneralInfo(_opportunityId),
+        strategicOpportunityService.getLayout(_opportunityId),
+        strategicOpportunitySecurityService.getUserPermissions(_opportunityId)
+      ])
+        .then((res) => {
+          // Because if React 17 and async method we will have multiple re-renders.
+          // Without unstable_batchedUpdates, these would cause multiple re-renders
+          ReactDOM.unstable_batchedUpdates(() => {
+            const smallInfo = res[0];
+            setOpportunityData(smallInfo);
+            setCurrentMonthDate(smallInfo.lastRunTrackingDate ? new Date(smallInfo.lastRunTrackingDate) : new Date());
+
+            const _layout = res[1];
+            const isOpp = getIsOpportunity(smallInfo);
+            setLayout(Object.keys(_layout).length > 0 ? _layout : isOpp ? defaultStrategicOpportunityLayout : defaultStrategicInitiativeLayout);
+
+            const securityInfo = res[2];
+            setIsReadable(securityInfo.canRead);
+            setIsDisabled(!securityInfo.canWrite);
+            setIsSecurityEditable(securityInfo.canSecure);
+          });
+        })
+        .finally(() => {
+          setLoading(false);
+        });
+    },
+    [setLoading]
+  );
+
+  useEffect(() => {
+    opportunityId && fetchData(opportunityId);
+  }, [opportunityId, setLoading, fetchData]);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      if (!(isOpportunity !== undefined && opportunityData && layout?.rows && storeTreeData)) return;
+
+      setLoadingGrid(true);
+
+      const dimensions = getStrategicOpportunityDetailDimensionsByString(layout.rows);
+
+      if (isOpportunity) {
+        getDetailDataForOpportunity(opportunityData.opportunityId, dimensions)
+          .then((detailData) => {
+            const store = storeTreeData as StrategicOpportunityDetailStoreTreeData;
+
+            const rowsConfig = getStrategicOpportunityDetailRowConfigsByDimensions(dimensions);
+            store.setStoreConfig({ rowsConfig, dataKeyProp: 'key' });
+            store.loadData(detailData.data, detailData.dimensionsData, detailData.partialTreeData, opportunityData.baselineDuration, opportunityData.estimatedTrackingDuration);
+
+            ReactDOM.unstable_batchedUpdates(() => {
+              setStoreRoot(store.root);
+              setShowRootRow(layout.rows.includes(strategicOpportunityDetailDimensionTotal) || false);
+              setAllGridKeys(getAllKeys([store.root as TreeNode<IStrategicOpportunityDetailGridItem>]));
+              setExpandedKeys([]);
+            });
+          })
+          .finally(() => {
+            setLoadingGrid(false);
+          });
+      } else {
+        getDetailDataForInitiative(opportunityData.opportunityId, dimensions, currentMonthDate)
+          .then((detailData) => {
+            const store = storeTreeData as StrategicInitiativeDetailStoreTreeData;
+
+            const rowsConfig = getStrategicOpportunityDetailRowConfigsByDimensions(dimensions);
+            store.setStoreConfig({ rowsConfig, dataKeyProp: 'key' });
+            store.loadData(detailData.data, detailData.dimensionsData, detailData.partialTreeData);
+
+            ReactDOM.unstable_batchedUpdates(() => {
+              setInitialInitiativeStoreRootData(store.root.data ?? DefaultStrategicInitiativeDetailGridItem);
+              setStoreRoot(store.root as TreeNode<IStrategicInitiativeDetailGridItem>);
+              setShowRootRow(layout.rows.includes(strategicOpportunityDetailDimensionTotal) || false);
+              setInitiativeProgressToggle(InitiativeProgressToggleStatus.All);
+            });
+          })
+          .finally(() => {
+            setLoadingGrid(false);
+          });
+      }
+    };
+
+    fetchData();
+    // TODO: we need to optimize this by separating opportunity and initiative status in the dependency array, currently any change in opportunityData will trigger this useEffect which causes performance issue when tracking because of the frequent change of opportunityData during tracking
+  }, [isOpportunity, opportunityData, storeTreeData, layout, currentMonthDate, setLoadingGrid]);
+
+  useEffect(() => {
+    if (!(layout?.columns && isOpportunity !== undefined)) return;
+    const _gridColumns = isOpportunity ? getStrategicOpportunityDetailColumnsByString(layout.columns) : getStrategicInitiativeDetailColumnsByString(layout.columns);
+    setGridColumns(_gridColumns);
+  }, [layout?.columns, isOpportunity]);
+
+  const onChangeDebounce = useMemo(
+    () =>
+      debounce((changeData: ChangeGridData<IStrategicOpportunityDetailGridItem>) => {
+        if (storeTreeData as StrategicOpportunityDetailStoreTreeData) {
+          (storeTreeData as StrategicOpportunityDetailStoreTreeData)
+            .onChange(changeData as ChangeGridData<IStrategicOpportunityDetailGridItem>)
+            .then((deltaDic: DicStrNum) => {
+              ReactDOM.unstable_batchedUpdates(() => {
+                setAdjustments((prev) => [
+                  ...prev,
+                  {
+                    unitsValue: deltaDic[StrategicOpportunityDetailField.GoalUnits] != null && changeData.node.data?.goalUnits != null ? changeData.node.data?.goalUnits : null,
+                    costsValue: deltaDic[StrategicOpportunityDetailField.GoalCost] != null && changeData.node.data?.goalCost != null ? changeData.node.data?.goalCost : null,
+                    nodeKey: changeData.node.key
+                  }
+                ]);
+                setIsDataChanged(true);
+                setStoreRoot({ ...(storeTreeData as StrategicOpportunityDetailStoreTreeData).root });
+              });
+            })
+            .catch(() => {
+              toast.show({
+                key: 'UpdateError',
+                toastType: 'error',
+                message: 'There was a problem updating the data. Please try again.',
+                duration: 0
+              });
+            });
+        }
+      }, 1000),
+    [storeTreeData, toast]
+  );
+
+  useEffect(() => {
+    return () => {
+      onChangeDebounce.cancel();
+    };
+  }, [onChangeDebounce]);
+
+  const showDiscardChanges = useCallback(
+    (handleOk: () => void) => {
+      modal.confirmChanges({
+        title: 'Discard your unsaved changes?',
+        onOk() {
+          handleOk();
+        }
+      });
+    },
+    [modal]
+  );
+
+  const onInitiativeProgressToggleChange = useCallback(
+    (value: InitiativeProgressToggleStatus) => {
+      if (storeTreeData) {
+        switch (value) {
+          case InitiativeProgressToggleStatus.OnTrack:
+            storeTreeData.filterData((x: IStrategicOpportunityDetail) => x.cost - x.goalCost <= 0);
+            break;
+          case InitiativeProgressToggleStatus.OffTrack:
+            storeTreeData.filterData((x: IStrategicOpportunityDetail) => x.cost - x.goalCost > 0);
+            break;
+          case InitiativeProgressToggleStatus.All:
+            storeTreeData.filterData(() => true);
+            break;
+        }
+        setInitiativeProgressToggle(value);
+        setStoreRoot({ ...storeTreeData.root });
+      }
+    },
+    [storeTreeData]
+  );
+
+  const refreshPageData = async (needGridRefresh: boolean, trackingStatus: RunTrackingStatus, trackingDate: Date) => {
+    if (needGridRefresh) {
+      return strategicOpportunityService.getOpportunityGeneralInfo(opportunityId).then((res) => {
+        setOpportunityData(res);
+      });
+    } else {
+      return Promise.resolve().then(() => {
+        setOpportunityData((previousOpportunityData) => {
+          if (!previousOpportunityData) {
+            return previousOpportunityData;
+          }
+
+          return {
+            ...previousOpportunityData,
+            lastRunTrackingStatus: trackingStatus,
+            lastRunTrackingDate: trackingDate
+          };
+        });
+      });
+    }
+  };
+
+  if (opportunityData === undefined || isOpportunity === undefined || storeTreeData === undefined || layout === undefined || gridColumns === undefined) {
+    return null;
+  }
+
+  const refreshData = async () => {
+    if (isOpportunity !== undefined && opportunityData && layout.rows && storeTreeData) {
+      setLoadingGrid(true);
+
+      const dimensions = getStrategicOpportunityDetailDimensionsByString(layout.rows);
+
+      if (isOpportunity) {
+        return getDetailDataForOpportunity(opportunityData.opportunityId, dimensions)
+          .then((detailData) => {
+            const store = storeTreeData as StrategicOpportunityDetailStoreTreeData;
+            store.loadData(detailData.data, detailData.dimensionsData, detailData.partialTreeData, opportunityData.baselineDuration, opportunityData.estimatedTrackingDuration);
+            ReactDOM.unstable_batchedUpdates(() => {
+              setStoreRoot({ ...store.root });
+              setAllGridKeys(getAllKeys([store.root as TreeNode<IStrategicOpportunityDetailGridItem>]));
+              setExpandedKeys([]);
+            });
+          })
+          .finally(() => {
+            setLoadingGrid(false);
+          });
+      } else {
+        return getDetailDataForInitiative(opportunityData.opportunityId, dimensions, currentMonthDate)
+          .then((detailData) => {
+            const store = storeTreeData as StrategicInitiativeDetailStoreTreeData;
+            store.loadData(detailData.data, detailData.dimensionsData, detailData.partialTreeData);
+            ReactDOM.unstable_batchedUpdates(() => {
+              setInitialInitiativeStoreRootData(store.root.data ?? DefaultStrategicInitiativeDetailGridItem);
+              setInitiativeProgressToggle(InitiativeProgressToggleStatus.All);
+            });
+          })
+          .finally(() => {
+            setLoadingGrid(false);
+          });
+      }
+    }
+  };
+
+  // TODO: Need to refactor this method to separate methods for setting opportunity and initiative status
+  const setStatus = async (status: StrategicOpportunityStatus, trackingStartDate?: string, trackingEndDate?: string) => {
+    if (opportunityData) {
+      const _isOpportunity = status < StrategicOpportunityStatus.NewInitiative;
+      const _layout = { columns: _isOpportunity ? defaultStrategicOpportunityLayout.columns : defaultStrategicInitiativeLayout.columns, rows: layout.rows || [] };
+      setOpportunityData(undefined);
+      await strategicOpportunityService.saveLayout(opportunityId, _layout);
+      await fetchData(opportunityId);
+    }
+  };
+
+  const updateCurrentMonthDate = (date: Date) => {
+    setCurrentMonthDate(date);
+  };
+
+  const exportInitiative = async () => {
+    const dimensions = getStrategicOpportunityDetailDimensionsByString(layout.rows);
+    setIsExporting(true);
+
+    return strategicOpportunityService
+      .exportInitiative(opportunityId, {
+        ...DefaultStrategicOpportunityGetDetailData,
+        dimensions,
+        dateStart: null,
+        dateEnd: currentMonthDate
+      })
+      .finally(() => {
+        setIsExporting(false);
+      });
+  };
+
+  const updateLayout = async (_layout: IStrategicOpportunityLayout) => {
+    if (!layout) return Promise.resolve();
+    const isColumnsEqual = isArraysEqual(layout.columns, _layout.columns);
+    const isRowsEqual = isArraysEqual(layout.rows, _layout.rows);
+    if (isColumnsEqual && isRowsEqual) return Promise.resolve();
+
+    if (isColumnsEqual) _layout.columns = layout.columns;
+    if (isRowsEqual) _layout.rows = layout.rows;
+
+    return strategicOpportunityService.saveLayout(opportunityId, _layout).then(() => {
+      setLayout(_layout);
+    });
+  };
+
+  const onDelete = async () => {
+    deleteStrategicOpportunity(opportunityId, opportunityKeyName, isOpportunity, setLoading, toast, modal);
+  };
+
+  const handleAddSecurity = async (securities: ISecurityDisplay[]) => {
+    if (!opportunityId) {
+      return;
+    }
+    const success = await strategicOpportunitySecurityService.setSimpleSecurities(opportunityId, securities);
+    if (success) {
+      toast.show({
+        key: 'SecuritySuccess',
+        toastType: 'success',
+        message: 'Securities for this opportunity have been updated.'
+      });
+    } else {
+      toast.show({
+        key: 'SecurityError',
+        toastType: 'error',
+        message: 'There was a problem updating securities for this opportunity.',
+        duration: 0
+      });
+    }
+    setIsSecurityVisible(false);
+  };
+
+  const clearChanges = async () => {
+    try {
+      setLoadingGrid(true);
+      await refreshData();
+      setIsDataChanged(false);
+    } finally {
+      setLoadingGrid(false);
+      setAdjustments([]);
+    }
+  };
+
+  const handleCancel = (cb?: () => void) => {
+    if (isDataChanged) {
+      showDiscardChanges(async () => {
+        await clearChanges();
+        cb && cb();
+      });
+    } else {
+      cb && cb();
+    }
+  };
+
+  const handleSave = async () => {
+    if (storeTreeData && adjustments.length > 0) {
+      setLoadingGrid(true);
+      try {
+        await strategicOpportunityService.updateOpportunityDetailsData(opportunityId, adjustments, layout.rows);
+        await refreshData();
+        setIsDataChanged(false);
+        toast.show({
+          key: `Opportunity ${opportunityKeyName}`,
+          toastType: 'success',
+          message: `Opportunity ${opportunityKeyName} has been updated.`
+        });
+      } catch {
+        toast.show({
+          key: `Opportunity ${opportunityKeyName}`,
+          toastType: 'error',
+          message: `Unable to update Opportunity ${opportunityKeyName}`,
+          duration: 0
+        });
+      } finally {
+        setAdjustments([]);
+        setLoadingGrid(false);
+      }
+    }
+  };
+
+  const getInitialRange = (): RangeValue => {
+    let trackingStartDate = dayjs().startOf('month');
+    const baselineEndDate = dayjs(opportunityData?.baselineEndDate).startOf('month');
+    if (baselineEndDate.isAfter(trackingStartDate)) {
+      trackingStartDate = baselineEndDate;
+    }
+
+    return [trackingStartDate, trackingStartDate.add((opportunityData?.estimatedTrackingDuration ?? 0) - 1, 'month').endOf('month')];
+  };
+
+  const getOptionItems = (): IMenuItem[] => {
+    const menuItems: IMenuItem[] = [];
+    if (isOpportunity) {
+      menuItems.push({
+        key: 'editOpportunity',
+        label: 'Edit Opportunity',
+        hidden: isDisabled,
+        onClick: navigateToEditStrategicOpportunityMode
+      });
+    }
+    menuItems.push({
+      key: 'editGridLayout',
+      label: 'Edit Grid Layout',
+      onClick: () => {
+        handleCancel(() => setIsEditGridLayout(true));
+      }
+    });
+    menuItems.push({
+      key: 'opportunityDetails',
+      label: `${isOpportunity ? 'Opportunity' : 'Initiative'} Details`,
+      hidden: isDisabled && isOpportunity,
+      onClick: () => openDrawer(TabKeys.General)
+    });
+    menuItems.push({
+      key: 'editRampUpToGoal',
+      label: 'Edit Ramp Up to Goal',
+      onClick: () => setIsRampUpDrawerVisible(true)
+    });
+    menuItems.push({
+      key: 'editSecurity',
+      label: 'Edit Security',
+      hidden: !isSecurityEditable,
+      onClick: () => setIsSecurityVisible(true)
+    });
+    menuItems.push({ key: 'div', type: 'divider', hidden: isDisabled });
+    menuItems.push({
+      key: 'delete',
+      hidden: isDisabled,
+      label: (
+        <Button type='link' danger icon={<DeleteIcon />}>
+          Delete
+        </Button>
+      ),
+      onClick: onDelete
+    });
+
+    return menuItems;
+  };
+
+  const openDrawer = (tab: TabKeys) => {
+    setOpportunityDetailsDrawer(true);
+    setOpportunityDetailsDrawerTab(tab);
+  };
+
+  const handleCancelOpportunityDetailsDrawer = () => {
+    setOpportunityDetailsDrawer(false);
+  };
+
+  const navigateToEditStrategicOpportunityMode = () => {
+    history.push(`/strategic-opportunities/edit/charge-code/${opportunityId}`);
+  };
+  const updateInitiativeGeneralInfo = (newName: string, trackingStartDate?: string, trackingEndDate?: string) => {
+    // setOpportunityKeyName(opportunityData ? `${opportunityData.opportunityId} • ${newName}` : '');
+    if (opportunityData) {
+      const updated: Partial<IStrategicOpportunityGeneralInfo> = { name: newName };
+      if (trackingStartDate) updated.trackingStartDate = new Date(trackingStartDate);
+      if (trackingEndDate) updated.trackingEndDate = new Date(trackingEndDate);
+      setOpportunityData({ ...opportunityData, ...updated });
+    }
+  };
+
+  const updateRoles = (costLeaderGuid: string, ownerGuid: string, executiveSponsorGuid: string, stakeholders: string[], teamMembers: string) => {
+    if (opportunityData) {
+      const updated: Partial<IStrategicOpportunityGeneralInfo> = {
+        costLeaderGuid: costLeaderGuid,
+        ownerGuid: ownerGuid,
+        executiveSponsorGuid: executiveSponsorGuid,
+        stakeholders: stakeholders,
+        teamMembers: teamMembers
+      };
+      setOpportunityData({ ...opportunityData, ...updated });
+    }
+  };
+
+  const getRampUpDrawerMonths = (): number => {
+    if (!opportunityData) return 0;
+    const monthsNumber = isOpportunity ? opportunityData.estimatedTrackingDuration : dayjs(opportunityData.trackingEndDate).diff(dayjs(opportunityData.trackingStartDate), 'month') + 1;
+    return monthsNumber > 12 ? 12 : monthsNumber;
+  };
+
+  const getInitiativeStatusContent = (): React.ReactNode => {
+    if (opportunityData?.status === StrategicOpportunityStatus.Tracking && opportunityData.lastRunTrackingStatus !== RunTrackingStatus.None) {
+      const isSuccess = opportunityData.lastRunTrackingStatus === RunTrackingStatus.Success;
+      return (
+        <>
+          {isSuccess ? <CheckCircleIcon color='success' /> : <WarningIcon color='error' />}
+          {isSuccess ? ' Last run: ' : ' Error: '}
+          {dayjs(opportunityData.lastRunTrackingDate).format('M/D/YYYY hh:mm A')}
+        </>
+      );
+    } else if (opportunityData && isStrategicOpportunityComplete(opportunityData.status)) {
+      const monitoringText = opportunityData.status === StrategicOpportunityStatus.Complete ? 'Not monitoring ' : 'Threshold monitoring ';
+      return (
+        <Text>
+          {monitoringText}
+          <Button type='link' onClick={() => openDrawer(TabKeys.Notifications)}>
+            Update
+          </Button>
+        </Text>
+      );
+    } else {
+      return <></>;
+    }
+  };
+
+  const commentsDrawer = opportunityId ? (
+    <CommentsDrawer
+      isVisible={showComments}
+      isGlobal={false}
+      isEditable={!isDisabled}
+      opportunityType={OpportunityTypes.StrategicOpportunityChargeCode}
+      opportunityId={opportunityId}
+      onAddRefresh={true}
+      onCancel={() => setShowComments(false)}
+    />
+  ) : (
+    <></>
+  );
+
+  const commentsButton = opportunityId ? (
+    <Button type='secondary' onClick={() => setShowComments(true)}>
+      Comments
+    </Button>
+  ) : (
+    <></>
+  );
+
+  const convertToInitiativeButton =
+    opportunityId && isOpportunity ? (
+      <Button type='primary' disabled={isDisabled || isDataChanged} onClick={() => setShowConvertToInitiativeModal(true)}>
+        Convert To Initiative
+      </Button>
+    ) : isStrategicOpportunityComplete(opportunityData?.status ?? 0) ? (
+      <StrategicInitiativeCopyButton opportunityId={opportunityId} opportunityName={opportunityData?.name ?? ''} isDisabled={isDisabled} />
+    ) : (
+      <Spacing margin='0 0 0 8px'>
+        <StrategicOpportunityTrackingButton
+          updateStatus={setStatus}
+          startRunTracking={() => setIsRunTracking(true)}
+          openInitiativeDetailsDrawer={() => openDrawer(TabKeys.General)}
+          opportunityData={opportunityData ?? DefaultStrategicOpportunityGeneralInfo}
+          disabled={isDisabled}
+          setOpportunityData={setOpportunityData}
+        />
+      </Spacing>
+    );
+
+  const headerButtons = (
+    <>
+      {commentsButton}
+      <OpportunityWorkbooksButtonMenu isLocked={false} opportunityGuid={opportunityId.toString()} opportunityType={OpportunityTypes.ChargeCode} isStrategicOpportunity isOpportunity={isOpportunity} />
+      <ButtonMenu type='secondary' buttonText='Options' items={getOptionItems()} />
+      {convertToInitiativeButton}
+    </>
+  );
+
+  return (
+    <>
+      <RouteConfirm showPrompt={isDataChanged} title='Discard your unsaved changes?' okText='Discard Changes' cancelText='Keep Changes' />
+      <Header
+        title={`${isOpportunity ? 'Opportunity' : ''} CC${opportunityKeyName ? ' - ' + opportunityKeyName : ''}`}
+        breadcrumbHref={isOpportunity ? '/strategic-tracker/opportunities' : '/strategic-tracker/initiatives'}
+        breadcrumbText={isOpportunity ? 'Identify Opportunities' : 'Back to Initiatives'}
+        extra={
+          !isOpportunity && (
+            <Spacing height='100%' vAlign='bottom'>
+              {headerButtons}
+            </Spacing>
+          )
+        }
+      />
+      {isOpportunity ? (
+        <ActionBar
+          filters={
+            <>
+              <Button
+                type='secondary'
+                onClick={() => {
+                  setExpandedKeys(allGridKeys);
+                }}
+              >
+                Expand All
+              </Button>
+              <Button
+                type='secondary'
+                onClick={() => {
+                  setExpandedKeys([]);
+                }}
+              >
+                Collapse All
+              </Button>
+            </>
+          }
+          actions={<Spacing itemSpacing={8}>{headerButtons}</Spacing>}
+        />
+      ) : (
+        <Spacing background='white' border='bottom' padding={0} margin={0}>
+          <MetricGroup
+            items={[
+              {
+                key: 'initiativeStatus',
+                label: 'INITIATIVE STATUS',
+                values: [
+                  {
+                    key: 'target',
+                    label: getInitiativeStatusContent(),
+                    value: formatInitiativeStatus(opportunityData?.status || 0)
+                  }
+                ]
+              },
+              {
+                key: 'totalCommitted',
+                label: 'TOTAL',
+                values: [
+                  {
+                    key: 'totalCommittedValue',
+                    label: <Text>Committed Cost</Text>,
+                    value: opportunityData?.totalCommittedCost,
+                    format: 'currency'
+                  }
+                ]
+              },
+              {
+                key: 'totalProgress',
+                label: `TOTAL PROGRESS TO DATE (${dayjs(opportunityData?.trackingStartDate).format('M/D/YYYY')} - ${dayjs(opportunityData?.trackingEndDate).format('M/D/YYYY')})`,
+                values: [
+                  (() => {
+                    const initiativeTrackStatus = opportunityData.status === StrategicOpportunityStatus.NewInitiative ? null : getInitiativeTrackStatus(initialInitiativeStoreRootData);
+                    return {
+                      key: 'progress',
+                      label: <Text>Progress</Text>,
+                      value: initiativeTrackStatus,
+                      color: initiativeTrackStatus === null ? 'black' : initiativeTrackStatus === InitiativeProgressToggleStatus.OnTrack ? 'success' : 'error',
+                      formatOptions: {
+                        nullValue: '-'
+                      }
+                    };
+                  })(),
+                  {
+                    key: 'committed',
+                    label: <Text>Committed Cost</Text>,
+                    value: initialInitiativeStoreRootData.trackingCommittedTracking || 0,
+                    format: 'currency'
+                  },
+                  {
+                    key: 'actual',
+                    label: <Text>Actual Cost</Text>,
+                    value: initialInitiativeStoreRootData.trackingActualTracking || 0,
+                    format: 'currency'
+                  },
+                  (() => {
+                    const variance = initialInitiativeStoreRootData.trackingVarianceTracking ?? 0;
+                    return {
+                      key: 'variance',
+                      label: <Text>Variance</Text>,
+                      value: variance || 0,
+                      format: 'currency',
+                      color: variance < 0 ? 'error' : 'success'
+                    };
+                  })()
+                ]
+              },
+              {
+                key: 'currentlyViewing',
+                label: 'CURRENTLY VIEWING',
+                values: [
+                  {
+                    key: 'currentDate',
+                    label: <Text>Displays tracked month only</Text>,
+                    value: (
+                      <DatePicker.MonthPicker
+                        width={250}
+                        disabledDate={(current) => {
+                          if (!current) return false;
+                          return dayjs(current).isBefore(dayjs(opportunityData?.trackingStartDate).startOf('month')) || dayjs(current).isAfter(dayjs(opportunityData?.trackingEndDate).endOf('month'));
+                        }}
+                        allowClear={false}
+                        onChange={(date) => date && updateCurrentMonthDate(date.toDate())}
+                        value={dayjs(currentMonthDate)}
+                      />
+                    )
+                  }
+                ]
+              }
+            ]}
+          />
+        </Spacing>
+      )}
+      {!isOpportunity && opportunityData && (
+        <Spacing padding={0} margin={'24px 0 0 0'}>
+          <LayoutGrid loading={loadingGrid} removeMargin>
+            <LayoutGrid.Row stretchContent>
+              <LayoutGrid.Column span={4}>
+                <StrategicInitiativeMonthProgressBar
+                  currentMonth={currentMonthDate}
+                  actualValue={initialInitiativeStoreRootData.monthActualMonth || 0}
+                  committedValue={initialInitiativeStoreRootData.monthCommittedMonth || 0}
+                />
+              </LayoutGrid.Column>
+              <LayoutGrid.Column span={4}>
+                <StrategicInitiativeProgressGraphLine currentMonth={currentMonthDate} opportunity={opportunityData} isRunTracking={isRunTracking} />
+              </LayoutGrid.Column>
+              <LayoutGrid.Column span={4}>
+                <StrategicInitiativeMeasureGraphLine currentMonth={currentMonthDate} opportunity={opportunityData} isRunTracking={isRunTracking} />
+              </LayoutGrid.Column>
+            </LayoutGrid.Row>
+          </LayoutGrid>
+        </Spacing>
+      )}
+      {isOpportunity ? (
+        <StrategicOpportunityDetailGrid
+          root={storeRoot as TreeNode<IStrategicOpportunityDetailGridItem>}
+          isEditable={!isDisabled}
+          showRootRow={showRootRow}
+          columns={gridColumns as StrategicOpportunityDetailField[]}
+          levelsCount={storeTreeData?.levelCount || 0}
+          trackingDuration={opportunityData?.estimatedTrackingDuration || 12}
+          loading={loadingGrid}
+          expandedKeys={expandedKeys}
+          onChange={(changeData: ChangeGridData<IStrategicOpportunityDetailGridItem>) => {
+            onChangeDebounce(changeData);
+          }}
+          setExpandedKeys={(expKeys: any[]) => {
+            setExpandedKeys(expKeys);
+          }}
+        />
+      ) : (
+        <StrategicInitiativeDetailGrid
+          root={storeRoot as TreeNode<IStrategicInitiativeDetailGridItem>}
+          showRootRow={showRootRow}
+          columns={gridColumns as StrategicInitiativeDetailFieldSection[]}
+          currentMonthDate={currentMonthDate}
+          progressMonths={dayjs(currentMonthDate).endOf('month').diff(dayjs(opportunityData?.trackingStartDate).startOf('month'), 'month') + 1}
+          status={opportunityData.status}
+          loading={loadingGrid}
+          isExporting={isExporting}
+          toggle={initiativeProgressToggle}
+          onToggleChange={onInitiativeProgressToggleChange}
+          exportInitiative={exportInitiative}
+        />
+      )}
+
+      {isOpportunity && (
+        <FixedActionBar
+          rightContent={
+            <>
+              <Button onClick={() => handleCancel()} disabled={!isDataChanged}>
+                Cancel
+              </Button>
+              <Button type='primary' onClick={handleSave} disabled={!isDataChanged}>
+                Save
+              </Button>
+            </>
+          }
+        />
+      )}
+      {commentsDrawer}
+      {layout && (
+        <StrategicOpportunityGridLayoutDrawer visible={isEditGridLayout} layout={layout} isOpportunity={isOpportunity} saveLayout={updateLayout} closeDrawer={() => setIsEditGridLayout(false)} />
+      )}
+      <StrategicOpportunityRampUpToGoalDrawer
+        isEditable={!isDisabled && !isStrategicOpportunityComplete(opportunityData?.status ?? 0)}
+        visible={isRampUpDrawerVisible}
+        opportunityId={opportunityId}
+        months={getRampUpDrawerMonths()}
+        onClose={() => setIsRampUpDrawerVisible(false)}
+      />
+      <SimpleSecurityModal
+        isVisible={isSecurityVisible}
+        lootId={opportunityId.toString()}
+        onModalClose={() => setIsSecurityVisible(false)}
+        onModalOk={(securities: ISecurityDisplay[]) => handleAddSecurity(securities)}
+        getSecurity={(strOpportunityId: string) => strategicOpportunitySecurityService.getSecurity(Number(strOpportunityId))}
+      />
+      <ConvertToInitiativeModal
+        isVisible={showConvertToInitiativeModal}
+        initialRange={getInitialRange()}
+        opportunityId={opportunityId}
+        disabledDate={dayjs(opportunityData?.baselineEndDate).startOf('month')}
+        onSuccess={setStatus}
+        closeModal={() => setShowConvertToInitiativeModal(false)}
+      />
+      {opportunityDetailsDrawer && (
+        <StrategicOpportunityDetailsDrawer
+          opportunityId={opportunityId}
+          opportunityData={opportunityData ?? DefaultStrategicOpportunityGeneralInfo}
+          isOpportunity={isOpportunity}
+          name={opportunityData?.name || ''}
+          isEditable={!isDisabled}
+          disabledDate={dayjs(opportunityData?.baselineEndDate).startOf('month')}
+          visible={opportunityDetailsDrawer}
+          initTab={opportunityDetailsDrawerTab}
+          setLoading={setLoading}
+          onClose={handleCancelOpportunityDetailsDrawer}
+          onGeneralTabSuccess={updateInitiativeGeneralInfo}
+          onRolesTabSuccess={updateRoles}
+          openRampUpDrawer={() => setIsRampUpDrawerVisible(true)}
+          navigateToEditOpportunityMode={navigateToEditStrategicOpportunityMode}
+          setOpportunityData={setOpportunityData}
+          startRunTracking={() => setIsRunTracking(true)}
+        />
+      )}
+    </>
+  );
+};
+
+export default StrategicOpportunityDetailPage;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityDetailsDrawer.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityDetailsDrawer.tsx
new file mode 100644
index 0000000..461ee19
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityDetailsDrawer.tsx
@@ -0,0 +1,345 @@
+import Button from '@strata/tempo/lib/button/Button';
+import Divider from '@strata/tempo/lib/divider/Divider';
+import Drawer from '@strata/tempo/lib/drawer/Drawer';
+import EditIcon from '@strata/tempo/lib/icon/EditIcon';
+import useModal from '@strata/tempo/lib/modal/useModal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Tabs, { ITab } from '@strata/tempo/lib/tabs/Tabs';
+import useToast from '@strata/tempo/lib/toast/useToast';
+import dayjs from 'dayjs';
+import React, { useEffect, useState } from 'react';
+import { IFilterChipItem, parseFiltersFromJson } from '../../shared/components/FilterBar/data/IFilterChipItem';
+import { DATE_FORMAT } from '../../shared/constants';
+import { IListItem } from '../../shared/data/IKeyTextItem';
+import notificationHub from '../../shared/notification/NotificationHub';
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+import { isStrategicOpportunityComplete, StrategicOpportunityStatus } from '../data/StrategicOpportunityStatus';
+import { DefaultStrategicOpportunityDrawerDetails, IStrategicOpportunityDrawerDetails, IStrategicOpportunityGeneralInfo, TabKeys } from './data/IStrategicOpportunityDetail';
+import StrategicDetailsNotifications from './StrategicDetailsNotifications';
+import StrategicDetailsRoles from './StrategicDetailsRoles';
+import StrategicInitiativeDetailsGeneralInfo from './StrategicInitiativeDetailsGeneralInfo';
+
+interface IStrategicOpportunityDetailsDrawerProps {
+  opportunityId: number;
+  opportunityData: IStrategicOpportunityGeneralInfo;
+  isOpportunity: boolean;
+  name: string;
+  isEditable: boolean;
+  visible: boolean;
+  disabledDate: dayjs.Dayjs;
+  initTab: string;
+  onClose: () => void;
+  setOpportunityData: (data: IStrategicOpportunityGeneralInfo) => void;
+  setLoading: (loading: boolean) => void;
+  onGeneralTabSuccess: (newName: string, trackingStartDate: string, trackingEndDate: string) => void;
+  onRolesTabSuccess?: (costLeaderGuid: string, ownerGuid: string, executiveSponsorGuid: string, stakeholders: string[], teamMembers: string) => void;
+  navigateToEditOpportunityMode?: () => void;
+  openRampUpDrawer: () => void;
+  startRunTracking: () => void;
+}
+
+const StrategicOpportunityDetailsDrawer: React.FC<IStrategicOpportunityDetailsDrawerProps> = ({
+  opportunityId,
+  opportunityData,
+  isOpportunity,
+  name,
+  isEditable,
+  visible,
+  disabledDate,
+  initTab,
+  onClose,
+  setOpportunityData,
+  onGeneralTabSuccess,
+  onRolesTabSuccess,
+  navigateToEditOpportunityMode,
+  openRampUpDrawer,
+  startRunTracking
+}) => {
+  const [selectedTab, setSelectedTab] = React.useState<string>(initTab);
+  const [loading, setLoading] = useState<boolean>(false);
+  const [opportunityDetails, setOpportunityDetails] = useState<IStrategicOpportunityDrawerDetails>(DefaultStrategicOpportunityDrawerDetails);
+  const [populationsList, setPopulationsList] = useState<IListItem[]>([]);
+  const [chargeCodeList, setChargeCodeList] = useState<IListItem[]>([]);
+  const [opportunityDrawerFilters, setOpportunityDrawerFilters] = useState<IFilterChipItem[]>([]);
+  const [hasChanges, setHasChanges] = React.useState<boolean>(false);
+  const formRef = React.useRef<{ submit: () => void; resetFields: () => void }>(null);
+  const modal = useModal();
+  const toast = useToast();
+  const hub = notificationHub.useConnection();
+
+  useEffect(() => {
+    const loadGeneralTabData = () => {
+      setLoading(true);
+      strategicOpportunityService
+        .getOpportunityDrawerDetails(opportunityId)
+        .then((drawerDetail) => {
+          setOpportunityDetails(drawerDetail);
+
+          // populations
+          const populations: IListItem[] = drawerDetail.populations.map((x) => ({ title: x }));
+          setPopulationsList(populations ?? []);
+
+          // charge codes
+          const chargeCodes = Object.values(drawerDetail.chargeCodes);
+          const chargeCodesList: IListItem[] = chargeCodes.map((chargeCode) => ({ title: chargeCode }));
+          setChargeCodeList(chargeCodesList);
+
+          // filters
+          const filterChipItems = parseFiltersFromJson(drawerDetail.filters);
+          setOpportunityDrawerFilters(filterChipItems);
+        })
+        .finally(() => {
+          setLoading(false);
+        });
+    };
+
+    if (selectedTab === TabKeys.General && chargeCodeList.length === 0) {
+      loadGeneralTabData();
+    }
+  }, [selectedTab, chargeCodeList.length, opportunityId]);
+
+  const handleClose = () => {
+    setPopulationsList([]);
+    setOpportunityDrawerFilters([]);
+    setChargeCodeList([]);
+    setHasChanges(false);
+    setSelectedTab(TabKeys.General);
+    onClose();
+  };
+
+  const saveInitiative = async (values: any) => {
+    const trackingEndDate = values.trackingPeriod?.[1] ? dayjs(values.trackingPeriod[1]).endOf('month').format(DATE_FORMAT) : '';
+    const result = await strategicOpportunityService.updateInitiative(
+      opportunityId,
+      values.name,
+      values.trackingPeriod?.[0] ? dayjs(values.trackingPeriod[0]).format(DATE_FORMAT) : '',
+      trackingEndDate
+    );
+
+    if (result) {
+      toast.show({
+        key: `Opportunity - ${opportunityId}`,
+        toastType: 'success',
+        message: opportunityData.status === StrategicOpportunityStatus.NewInitiative ? 'Strategic initiative updated.' : 'Strategic initiative tracking started.'
+      });
+      onGeneralTabSuccess(values.name, dayjs(values.trackingPeriod[0]).format(DATE_FORMAT), trackingEndDate);
+    } else {
+      toast.show({
+        key: `Opportunity - ${opportunityId}`,
+        toastType: 'error',
+        message: 'The initiative was not updated. Try again and contact us if the issue continues.',
+        duration: 0
+      });
+    }
+  };
+
+  const handleGeneralFormSubmit = async (values: any) => {
+    setLoading(true);
+    try {
+      opportunityData.status === StrategicOpportunityStatus.NewInitiative
+        ? await saveInitiative(values)
+        : notificationHub.register(
+            hub,
+            async () => {
+              startRunTracking();
+              await saveInitiative(values);
+            },
+            opportunityData.opportunityId.toString()
+          );
+    } catch (error) {
+      toast.show({
+        key: `Opportunity - ${opportunityId}`,
+        toastType: 'error',
+        message: `Unable to update the Initiative`,
+        duration: 0
+      });
+    } finally {
+      setLoading(false);
+      handleClose();
+    }
+  };
+
+  const handleRolesFormSubmit = async (values: any) => {
+    setLoading(true);
+    try {
+      const result = await strategicOpportunityService.updateRoles(opportunityId, values.costLeader, values.owner, values.executiveSponsor, values.stakeholders, values.teamMembers);
+      if (result) {
+        onRolesTabSuccess && onRolesTabSuccess(values.costLeader, values.owner, values.executiveSponsor, values.stakeholders, values.teamMembers);
+      } else {
+        toast.show({ key: `Opportunity - ${opportunityId}`, toastType: 'error', message: 'The opportunity was not updated. Try again and contact us if the issue continues.', duration: 0 });
+      }
+    } catch (error) {
+      toast.show({ key: `Opportunity - ${opportunityId}`, toastType: 'error', message: `Unable to update the Opportunity`, duration: 0 });
+    } finally {
+      setLoading(false);
+      handleClose();
+    }
+  };
+
+  const handleNotificationsFormSubmit = async (values: any) => {
+    setLoading(true);
+    try {
+      const result = await strategicOpportunityService.completeInitiative(opportunityId, values.monitorInitiative, values.acceptableThreshold ?? 0);
+      if (result) {
+        setOpportunityData({ ...opportunityData, status: values.monitorInitiative ? StrategicOpportunityStatus.CompleteMonitoring : StrategicOpportunityStatus.Complete });
+      }
+      toast.show({
+        key: `Opportunity - ${opportunityData.opportunityId}`,
+        toastType: 'success',
+        message: `Strategic initiative marked complete${values.monitorInitiative ? ' with primary measure monitoring.' : '.'}`
+      });
+    } catch (error) {
+      toast.show({
+        key: `Opportunity - ${opportunityId}`,
+        toastType: 'error',
+        message: `Unable to update the initiative notifications`
+      });
+    } finally {
+      setLoading(false);
+      handleClose();
+    }
+  };
+
+  const getTabs = () => {
+    const tabs: ITab[] = [
+      {
+        key: TabKeys.General,
+        label: 'General',
+        children: isOpportunity ? (
+          <>
+            <Spacing padding='16px 0 0 16px'>
+              <Button type='link' icon={<EditIcon />} onClick={() => navigateToEditOpportunityMode && navigateToEditOpportunityMode()}>
+                Edit Opportunity
+              </Button>
+            </Spacing>
+            <Divider extended={false} />
+            <StrategicInitiativeDetailsGeneralInfo
+              opportunityId={opportunityId}
+              opportunityDrawerDetails={opportunityDetails}
+              isOpportunity={isOpportunity}
+              populationsList={populationsList}
+              chargeCodeList={chargeCodeList}
+              opportunityDrawerFilters={opportunityDrawerFilters}
+              isEditable={isEditable && !isStrategicOpportunityComplete(opportunityData.status)}
+            />
+          </>
+        ) : (
+          <StrategicInitiativeDetailsGeneralInfo
+            opportunityId={opportunityId}
+            opportunityDrawerDetails={opportunityDetails}
+            isOpportunity={isOpportunity}
+            name={name}
+            populationsList={populationsList}
+            chargeCodeList={chargeCodeList}
+            opportunityDrawerFilters={opportunityDrawerFilters}
+            disabledDate={disabledDate}
+            isEditable={isEditable && !isStrategicOpportunityComplete(opportunityData.status)}
+            formRef={formRef}
+            setHasChanges={setHasChanges}
+            onFormSubmit={handleGeneralFormSubmit}
+            openRampUpDrawer={onRampUpClick}
+          />
+        )
+      },
+      {
+        key: TabKeys.Roles,
+        label: 'Roles',
+        children: (
+          <StrategicDetailsRoles
+            isEditable={isEditable && !isStrategicOpportunityComplete(opportunityData.status)}
+            opportunityData={opportunityData}
+            formRef={formRef}
+            setHasChanges={setHasChanges}
+            onFormSubmit={handleRolesFormSubmit}
+            setLoading={setLoading}
+          />
+        )
+      }
+    ];
+    if (!isOpportunity && isStrategicOpportunityComplete(opportunityData.status)) {
+      tabs.push({
+        key: TabKeys.Notifications,
+        label: 'Notifications',
+        children: (
+          <StrategicDetailsNotifications
+            opportunityId={opportunityId}
+            opportunityData={opportunityData}
+            isEditable={isEditable}
+            formRef={formRef}
+            setHasChanges={setHasChanges}
+            setLoading={setLoading}
+            onFormSubmit={handleNotificationsFormSubmit}
+          />
+        )
+      } as ITab);
+    }
+    return tabs;
+  };
+
+  const onRampUpClick = () => {
+    if (hasChanges)
+      modal.confirmChanges({
+        title: 'Discard your unsaved changes?',
+        content: 'Leaving this tab will discard all unsaved changes.',
+        okText: 'Continue',
+        cancelText: 'Cancel',
+        onOk() {
+          onClose();
+          openRampUpDrawer();
+        }
+      });
+    else {
+      onClose();
+      openRampUpDrawer();
+    }
+  };
+
+  const handleTabChange = (tabKey: string) => {
+    if (selectedTab === tabKey) {
+      return;
+    }
+    if (hasChanges)
+      modal.confirmChanges({
+        title: 'Discard your unsaved changes?',
+        content: 'Leaving this tab will discard all unsaved changes.',
+        okText: 'Continue',
+        cancelText: 'Cancel',
+        onOk() {
+          setSelectedTab(tabKey);
+          formRef.current?.resetFields();
+          setHasChanges(false);
+        }
+      });
+    else {
+      setSelectedTab(tabKey);
+      setHasChanges(false);
+    }
+  };
+
+  return (
+    <Drawer
+      title={`${isOpportunity ? 'Opportunity' : 'Initiative'} Details`}
+      width={450}
+      visible={visible}
+      onClose={handleClose}
+      loading={loading}
+      removeBodyPadding
+      footer={
+        selectedTab === TabKeys.Roles || !isOpportunity ? (
+          <>
+            <Button onClick={handleClose}>Cancel</Button>
+            <Button type='primary' disabled={!hasChanges || !isEditable} onClick={() => formRef.current?.submit()}>
+              Save
+            </Button>
+          </>
+        ) : (
+          <></>
+        )
+      }
+    >
+      <Tabs loading={loading} activeKey={selectedTab} onChange={(activeKey: string) => handleTabChange(activeKey)} items={getTabs()} />
+    </Drawer>
+  );
+};
+
+export default StrategicOpportunityDetailsDrawer;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityEditOverlay.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityEditOverlay.tsx
new file mode 100644
index 0000000..92b7675
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityEditOverlay.tsx
@@ -0,0 +1,155 @@
+import intlService from '@strata/intl/lib';
+import NumberFormat from '@strata/intl/lib/number/number-format';
+import Button from '@strata/tempo/lib/button/Button';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import Form from '@strata/tempo/lib/form/Form';
+import InputNumber from '@strata/tempo/lib/inputnumber/InputNumber';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import React, { useEffect, useState } from 'react';
+import { getValueByProp } from '../../shared/utilities';
+import { AdjustmentType, adjustmentTypeName } from './data/AdjustmentType';
+import { IStrategicOpportunityDetailGridItem } from './data/IStrategicOpportunityDetail';
+import { StrategicOpportunityDetailField } from './data/StrategicOpportunityDetailDimension';
+
+export interface IStrategicOpportunityEditOverlayProps {
+  column: string;
+  rowData: any;
+  format: NumberFormat;
+  closeOverlay: () => void;
+  applyOverlay: (values: { [name: string]: any }) => void;
+}
+
+const AdjustmentTypeItems = Object.entries(adjustmentTypeName).map(([key, value]) => {
+  return { value: Number(key), text: value };
+});
+
+const valueMax = 1000000000;
+const percentMax = 1000;
+
+const StrategicOpportunityEditOverlay: React.FC<IStrategicOpportunityEditOverlayProps> = (props: IStrategicOpportunityEditOverlayProps) => {
+  const { rowData, column, format, closeOverlay, applyOverlay } = props;
+  const [adjType, setAdjType] = useState<AdjustmentType>(AdjustmentType.Value);
+  const [adjValue, setAdjValue] = useState<number>();
+  const [goalValue, setGoalValue] = useState<number>(0);
+
+  const [form] = Form.useForm();
+
+  const data = rowData.rawData;
+  const oldGoalValue = getValueByProp<IStrategicOpportunityDetailGridItem, number>(data, column) || 0;
+  const baselineValue = getValueByProp<IStrategicOpportunityDetailGridItem, number>(data, column.replace('Goal', 'Baseline')) || 0;
+
+  const errorValidationMessage =
+    'Adjustment must be between ' +
+    (adjType === AdjustmentType.Value ? `0 and ${valueMax}` : adjType === AdjustmentType.Percentage ? `${-percentMax * 100} and ${percentMax * 100}` : `-${valueMax} and ${valueMax}`);
+
+  const focusOnAdjustmentInput = () => {
+    form.focusField('adjustmentValue');
+  };
+
+  useEffect(() => {
+    focusOnAdjustmentInput();
+  }, []);
+
+  const handleChangeValues = (changedValues: any) => {
+    if (changedValues.adjustmentType) {
+      let value = adjValue;
+
+      if (adjType === AdjustmentType.Percentage) {
+        value = (adjValue || 0) * 100;
+        form.setFieldValue('adjustmentValue', value);
+      } else if (changedValues.adjustmentType === AdjustmentType.Percentage) {
+        value = (adjValue || 0) / 100;
+        form.setFieldValue('adjustmentValue', value);
+      }
+
+      updateGoalValue(value || 0, changedValues.adjustmentType);
+      setAdjType(changedValues.adjustmentType);
+      setAdjValue(value);
+      form.validateFields();
+    } else if (changedValues.adjustmentValue !== undefined) {
+      updateGoalValue(changedValues.adjustmentValue, adjType);
+      setAdjValue(changedValues.adjustmentValue);
+    }
+  };
+
+  const updateGoalValue = (adjustmentValue: number, adjustmentType: AdjustmentType) => {
+    if (adjustmentType === AdjustmentType.Increment) {
+      setGoalValue(oldGoalValue + adjustmentValue);
+    } else if (adjustmentType === AdjustmentType.Percentage) {
+      setGoalValue(oldGoalValue + oldGoalValue * adjustmentValue);
+    } else {
+      setGoalValue(adjustmentValue);
+    }
+  };
+
+  const saveOverlayData = (values: { [name: string]: any }) => {
+    applyOverlay(values);
+    closeOverlay();
+  };
+
+  return (
+    <Spacing width={260}>
+      <Form
+        form={form}
+        initialValues={{ adjustmentType: adjType, adjustmentValue: adjValue, reflectChangesIn: StrategicOpportunityDetailField.GoalUnitsPerEncounter }}
+        onValuesChange={handleChangeValues}
+        onFinish={saveOverlayData}
+      >
+        <Spacing itemSpacing={24}>
+          <Spacing column>
+            <Text strong>Baseline</Text>
+            <Text>{intlService.formatNumber(baselineValue, format)}</Text>
+          </Spacing>
+          <Spacing column>
+            <Text strong>Current Value</Text>
+            <Text>{intlService.formatNumber(oldGoalValue, format)}</Text>
+          </Spacing>
+        </Spacing>
+        <Spacing margin={'12px 0'}>
+          <Form.Item label='Adjustment Type' name='adjustmentType' style={{ marginBottom: 0 }} rules={[{ required: true }]}>
+            <DropDown width={115} items={AdjustmentTypeItems} />
+          </Form.Item>
+          <Form.Item
+            label='Adjustment'
+            name='adjustmentValue'
+            style={{ marginBottom: 0 }}
+            rules={[
+              { required: true },
+              {
+                type: 'number',
+                max: adjType === AdjustmentType.Percentage ? percentMax : valueMax,
+                min: adjType === AdjustmentType.Value ? 0 : adjType === AdjustmentType.Percentage ? -percentMax : -valueMax,
+                message: errorValidationMessage
+              }
+            ]}
+          >
+            <InputNumber width={115} precision={2} format={adjType === AdjustmentType.Percentage ? 'percent' : format.includes('currency') ? 'currency' : 'number'} />
+          </Form.Item>
+        </Spacing>
+        {column === StrategicOpportunityDetailField.GoalCostPerEncounter && (
+          <Form.Item label='Change to be reflected in' name='reflectChangesIn' style={{ marginBottom: 12 }} rules={[{ required: true }]}>
+            <DropDown
+              items={[
+                { text: 'Units per Encounter', value: StrategicOpportunityDetailField.GoalUnitsPerEncounter },
+                { text: 'Cost per Unit', value: StrategicOpportunityDetailField.GoalCostPerUnit }
+              ]}
+            />
+          </Form.Item>
+        )}
+        <Spacing column>
+          <Text strong>Goal</Text>
+          <Text>{intlService.formatNumber(goalValue, format)}</Text>
+        </Spacing>
+        <Spacing hAlign='right'>
+          <Button onClick={closeOverlay}>Cancel</Button>
+          <Button type='primary' htmlType='submit'>
+            Apply
+          </Button>
+        </Spacing>
+      </Form>
+    </Spacing>
+  );
+};
+
+export default StrategicOpportunityEditOverlay;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityGridLayoutDrawer.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityGridLayoutDrawer.tsx
new file mode 100644
index 0000000..051a7bc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityGridLayoutDrawer.tsx
@@ -0,0 +1,89 @@
+import Button from '@strata/tempo/lib/button/Button';
+import Drawer from '@strata/tempo/lib/drawer/Drawer';
+import Tabs from '@strata/tempo/lib/tabs/Tabs';
+import React, { useEffect, useState } from 'react';
+import StrategicOpportunityColumnLayout from './StrategicOpportunityColumnLayout';
+import StrategicOpportunityRowLayout from './StrategicOpportunityRowLayout';
+import { columnInitiativeLayoutList, columnOpportunityLayoutList, defaultStrategicOpportunityLayout, IStrategicOpportunityLayout } from './data/IStrategicOpportunityLayout';
+
+export interface IStrategicOpportunityGridLayoutDrawerProps {
+  visible: boolean;
+  layout: IStrategicOpportunityLayout;
+  isOpportunity: boolean;
+  saveLayout: (layout: IStrategicOpportunityLayout) => Promise<void>;
+  closeDrawer: () => void;
+}
+
+const StrategicOpportunityGridLayoutDrawer: React.FC<IStrategicOpportunityGridLayoutDrawerProps> = (props: IStrategicOpportunityGridLayoutDrawerProps) => {
+  const { visible, isOpportunity, closeDrawer, saveLayout, layout } = props;
+
+  const [layoutSetting, setLayoutSetting] = useState<IStrategicOpportunityLayout>(defaultStrategicOpportunityLayout);
+  const [loading, setLoading] = useState<boolean>(false);
+  const [isDiffer, setIsDiffer] = useState<boolean>(false);
+
+  useEffect(() => {
+    if (visible) {
+      setLayoutSetting(layout);
+      setIsDiffer(false);
+    }
+  }, [visible, layout]);
+
+  const updateLayoutSetting = (_layoutSetting: IStrategicOpportunityLayout) => {
+    const _isDiffer = JSON.stringify(_layoutSetting) !== JSON.stringify(layout);
+    setIsDiffer(_isDiffer);
+    setLayoutSetting(_layoutSetting);
+  };
+
+  const saveLayoutSetting = () => {
+    let setting = layoutSetting;
+    const orderMap = new Map((isOpportunity ? columnOpportunityLayoutList : columnInitiativeLayoutList).map((item, index) => [item.name, index]));
+    const sorted = setting.columns.sort((a, b) => (orderMap.get(a) ?? 0) - (orderMap.get(b) ?? 0));
+    setting = { ...setting, columns: sorted };
+
+    setLoading(true);
+    saveLayout(setting)
+      .then(() => closeDrawer())
+      .finally(() => setLoading(false));
+  };
+
+  return (
+    <Drawer
+      loading={loading}
+      removeBodyPadding
+      visible={visible}
+      title='Edit Grid Layout'
+      onClose={closeDrawer}
+      footer={
+        <>
+          <Button onClick={() => closeDrawer()}>Cancel</Button>
+          <Button type='primary' disabled={!isDiffer} onClick={() => saveLayoutSetting()}>
+            Save
+          </Button>
+        </>
+      }
+    >
+      <Tabs
+        items={[
+          {
+            key: 'rowLayout',
+            label: 'Row Layout',
+            children: <StrategicOpportunityRowLayout rows={layoutSetting.rows} updateRows={(rows) => updateLayoutSetting({ ...layoutSetting, rows: rows })} />
+          },
+          {
+            key: 'columnLayout',
+            label: 'Column Layout',
+            children: (
+              <StrategicOpportunityColumnLayout
+                columns={layoutSetting.columns}
+                isOpportunity={isOpportunity}
+                updateColumns={(columns) => updateLayoutSetting({ ...layoutSetting, columns: columns })}
+              />
+            )
+          }
+        ]}
+      ></Tabs>
+    </Drawer>
+  );
+};
+
+export default StrategicOpportunityGridLayoutDrawer;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityPopulationList.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityPopulationList.tsx
new file mode 100644
index 0000000..4a5a4f3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityPopulationList.tsx
@@ -0,0 +1,40 @@
+import Button from '@strata/tempo/lib/button/Button';
+import List from '@strata/tempo/lib/list/List';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text';
+import React, { useState, useEffect } from 'react';
+import { IListItem } from '../../shared/data/IKeyTextItem';
+
+interface IStrategicOpportunityPopulationListProps {
+  populationsList: IListItem[];
+  populationName?: string;
+  padding?: string;
+}
+
+const StrategicOpportunityPopulationList: React.FC<IStrategicOpportunityPopulationListProps> = ({ populationsList, populationName, padding = '0 0 16px 0' }) => {
+  const [hasMorePopulations, setHasMorePopulations] = useState<boolean>(false);
+
+  useEffect(() => {
+    setHasMorePopulations(populationsList.length > 3);
+  }, [populationsList]);
+
+  return (
+    <Spacing column padding={padding}>
+      <Spacing>
+        <Text.Heading level={4} strong>
+          {populationName}
+        </Text.Heading>
+      </Spacing>
+      <List dataSource={hasMorePopulations ? populationsList.slice(0, 3) : populationsList} renderItem={(item) => <List.Item>{item.title}</List.Item>} />
+      {populationsList.length > 3 && (
+        <Spacing>
+          <Button type='link' onClick={() => setHasMorePopulations(!hasMorePopulations)}>
+            {hasMorePopulations ? `+ ${populationsList.length - 3} more` : 'show less'}
+          </Button>
+        </Spacing>
+      )}
+    </Spacing>
+  );
+};
+
+export default StrategicOpportunityPopulationList;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityRowLayout.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityRowLayout.tsx
new file mode 100644
index 0000000..23cfbdf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityRowLayout.tsx
@@ -0,0 +1,96 @@
+import Button from '@strata/tempo/lib/button/Button';
+import CheckboxGroup from '@strata/tempo/lib/checkboxgroup/CheckboxGroup';
+import DataGrid from '@strata/tempo/lib/datagrid/DataGrid';
+import EditIcon from '@strata/tempo/lib/icon/EditIcon';
+import Modal from '@strata/tempo/lib/modal/Modal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import React, { useState } from 'react';
+import { IKeyNameItem } from '../../shared/data/IKeyTextItem';
+import { rowLayoutList } from './data/IStrategicOpportunityLayout';
+import { StrategicOpportunityDetailDimension, strategicOpportunityDetailDimensionTotal } from './data/StrategicOpportunityDetailDimension';
+
+export interface IStrategicOpportunityRowLayoutProps {
+  rows: string[];
+  updateRows: (columns: string[]) => void;
+}
+
+const columnsNotToBeDeleted = [StrategicOpportunityDetailDimension.ChargeCode.toString()];
+const maxSelectedItemsCount = 4;
+
+const StrategicOpportunityRowLayout: React.FC<IStrategicOpportunityRowLayoutProps> = (props: IStrategicOpportunityRowLayoutProps) => {
+  const { rows, updateRows } = props;
+  const [visibleSelectRowModal, setVisibleSelectRowModal] = useState<boolean>(false);
+  const [editSelectedRows, setEditSelectedRows] = useState<string[]>(rows);
+  const gridData = rows.map((item) => {
+    return { name: item, header: rowLayoutList.find((r) => r.name === item)?.header };
+  });
+
+  const setSelectedRows = () => {
+    updateRows(editSelectedRows);
+    setVisibleSelectRowModal(false);
+  };
+
+  const openSelectRowModal = () => {
+    setEditSelectedRows(rows);
+    setVisibleSelectRowModal(true);
+  };
+
+  return (
+    <>
+      <Spacing padding={16}>
+        <Button type='link' icon={<EditIcon />} onClick={openSelectRowModal}>
+          Select Row
+        </Button>
+      </Spacing>
+      <DataGrid
+        border={'top'}
+        value={gridData}
+        onRowReorder={(e) => {
+          const hasTotalRow = e.value.find((item: IKeyNameItem) => item.name === strategicOpportunityDetailDimensionTotal);
+          const isTotalRowFirst = e.value[0].name === strategicOpportunityDetailDimensionTotal;
+
+          if (hasTotalRow && !isTotalRowFirst) return;
+
+          updateRows([...e.value.map((item: any) => item.name)]);
+        }}
+        showRowReorderElement={(row) => row.name !== strategicOpportunityDetailDimensionTotal}
+      >
+        <DataGrid.RowNumber />
+        <DataGrid.DragDropColumn />
+        <DataGrid.Column field='header' header='Row' width={380} />
+        <DataGrid.Column
+          key='isHidden'
+          header=''
+          width={100}
+          body={(rowData) =>
+            !columnsNotToBeDeleted.includes(rowData.name) && (
+              <Button type='link' onClick={() => updateRows(rows.filter((item) => item !== rowData.name))}>
+                Remove
+              </Button>
+            )
+          }
+        />
+      </DataGrid>
+      <Modal removeBodyPadding title='Select Rows' visible={visibleSelectRowModal} okText='Select' onOk={setSelectedRows} onCancel={() => setVisibleSelectRowModal(false)}>
+        <Spacing padding={'8px 16px'} background='gray-100' border={'bottom'}>
+          {editSelectedRows.length} rows selected (maximum {maxSelectedItemsCount})
+        </Spacing>
+        <Spacing padding={16}>
+          <CheckboxGroup
+            value={editSelectedRows}
+            onChange={(values) => setEditSelectedRows(values as string[])}
+            options={rowLayoutList.map((item) => {
+              return {
+                value: item.name,
+                label: item.header,
+                disabled: columnsNotToBeDeleted.includes(item.name) || (editSelectedRows.length >= maxSelectedItemsCount && !editSelectedRows.includes(item.name))
+              };
+            })}
+          />
+        </Spacing>
+      </Modal>
+    </>
+  );
+};
+
+export default StrategicOpportunityRowLayout;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityTrackingButton.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityTrackingButton.tsx
new file mode 100644
index 0000000..229a88c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/StrategicOpportunityTrackingButton.tsx
@@ -0,0 +1,132 @@
+import { IMenuItem } from '@strata/tempo/lib/menu/Menu';
+import useModal from '@strata/tempo/lib/modal/useModal';
+import SplitButton from '@strata/tempo/lib/splitbutton/SplitButton';
+import useToast from '@strata/tempo/lib/toast/useToast';
+import dayjs from 'dayjs';
+import React, { useEffect } from 'react';
+import { DATE_FORMAT } from '../../shared/constants';
+import notificationHub from '../../shared/notification/NotificationHub';
+import { RunTrackingStatus } from '../data/RunTrackingStatus';
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+import { StrategicOpportunityStatus } from '../data/StrategicOpportunityStatus';
+import { IStrategicOpportunityGeneralInfo } from './data/IStrategicOpportunityDetail';
+import StrategicCompleteInitiativeModal from './StrategicCompleteInitiativeModal';
+
+interface ITrackingButtonProps {
+  opportunityData: IStrategicOpportunityGeneralInfo;
+  disabled: boolean;
+  updateStatus: (status: StrategicOpportunityStatus) => Promise<void>;
+  setOpportunityData: (data: IStrategicOpportunityGeneralInfo) => void;
+  openInitiativeDetailsDrawer: () => void;
+  startRunTracking: () => void;
+}
+
+const COMPLETE_INITIATIVE_KEY = '2';
+
+const StrategicOpportunityTrackingButton: React.FC<ITrackingButtonProps> = ({ opportunityData, disabled, setOpportunityData, updateStatus, openInitiativeDetailsDrawer, startRunTracking }) => {
+  const [splitButtonTitle, setSplitButtonTitle] = React.useState<string>('Start Tracking');
+  const [splitButtonItems, setSplitButtonItems] = React.useState<IMenuItem[]>([]);
+  const [completeInitiativeModalVisible, setCompleteInitiativeModalVisible] = React.useState<boolean>(false);
+
+  const toast = useToast();
+  const modal = useModal();
+  const hub = notificationHub.useConnection();
+
+  useEffect(() => {
+    const splitButtonItems: IMenuItem[] = [];
+    if (opportunityData.status === StrategicOpportunityStatus.Tracking) {
+      setSplitButtonTitle('Complete Initiative');
+    } else {
+      splitButtonItems.push({ key: COMPLETE_INITIATIVE_KEY, label: 'Complete Initiative', onClick: () => setCompleteInitiativeModalVisible(true) });
+    }
+    splitButtonItems.push({
+      key: '1',
+      label: 'Revert to Opportunity',
+      onClick: revertToOpportunity
+    });
+    setSplitButtonItems(splitButtonItems);
+  }, [opportunityData.status]);
+
+  const revertToOpportunity = async () => {
+    modal.confirm({
+      title: `Revert to Opportunity?`,
+      content: 'Stop tracking, and return the initiative to Opportunity (New). Existing goals are retained, but review Ramp-Up to align with the Estimated Tracking Duration.',
+      okText: 'Revert',
+      cancelText: 'Cancel',
+      confirmType: 'danger',
+      async onOk() {
+        try {
+          const result = await strategicOpportunityService.updateStatus(
+            opportunityData.opportunityId,
+            StrategicOpportunityStatus.NewOpportunity,
+            dayjs().format(DATE_FORMAT),
+            dayjs().format(DATE_FORMAT)
+          );
+          if (result) {
+            await updateStatus(StrategicOpportunityStatus.NewOpportunity);
+          }
+        } catch (error) {
+          toast.show({
+            key: 'The status update failed',
+            toastType: 'error',
+            message: `Unable to convert the Initiative to Opportunity`,
+            duration: 0
+          });
+        }
+      }
+    });
+  };
+
+  const handleRunTracking = async () => {
+    try {
+      notificationHub.register(
+        hub,
+        async () => {
+          startRunTracking();
+          await strategicOpportunityService.runTrackingTask(opportunityData.opportunityId);
+          setSplitButtonItems((prev) => prev.filter((item) => item.key !== COMPLETE_INITIATIVE_KEY));
+          setSplitButtonTitle('Complete Initiative');
+          setOpportunityData({ ...opportunityData, status: StrategicOpportunityStatus.Tracking });
+        },
+        opportunityData.opportunityId.toString()
+      );
+
+      toast.show({
+        key: `Opportunity - ${opportunityData.opportunityId}`,
+        toastType: 'success',
+        message: `Strategic initiative tracking started.`
+      });
+    } catch {
+      toast.show({
+        key: `Opportunity - ${opportunityData.opportunityId}`,
+        toastType: 'error',
+        message: `Unable to run tracking task for Opportunity.`
+      });
+    }
+  };
+
+  const handleClick = () => {
+    if (opportunityData.status === StrategicOpportunityStatus.NewInitiative) {
+      handleRunTracking();
+    } else if (opportunityData.status === StrategicOpportunityStatus.Tracking) {
+      setCompleteInitiativeModalVisible(true);
+    }
+  };
+
+  return (
+    <>
+      <SplitButton type='primary' buttonText={splitButtonTitle} disabled={disabled} onClick={handleClick} items={splitButtonItems} />
+      {completeInitiativeModalVisible && (
+        <StrategicCompleteInitiativeModal
+          opportunityData={opportunityData}
+          setVisible={setCompleteInitiativeModalVisible}
+          setOpportunityData={setOpportunityData}
+          openInitiativeDetailsDrawer={openInitiativeDetailsDrawer}
+          visible={completeInitiativeModalVisible}
+        />
+      )}
+    </>
+  );
+};
+
+export default StrategicOpportunityTrackingButton;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/AdjustmentType.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/AdjustmentType.ts
new file mode 100644
index 0000000..b927024
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/AdjustmentType.ts
@@ -0,0 +1,33 @@
+export enum AdjustmentType {
+  Percentage = 1,
+  Increment,
+  Value
+}
+
+export const adjustmentTypeName = {
+  [AdjustmentType.Percentage]: 'Percentage',
+  [AdjustmentType.Increment]: 'Increment',
+  [AdjustmentType.Value]: 'Value'
+};
+
+export interface AdjustmentData {
+  type: AdjustmentType;
+  value: number;
+  applyTo: string | undefined;
+}
+
+export interface ChargeCodeAdjustmentDetails {
+  nodeKey: string;
+  unitsValue: number | null;
+  costsValue: number | null;
+}
+
+export function getNewValue(currentValue: number, adjustmentData: AdjustmentData): number {
+  if (adjustmentData.type === AdjustmentType.Increment) {
+    return currentValue + adjustmentData.value;
+  } else if (adjustmentData.type === AdjustmentType.Percentage) {
+    return currentValue * (1 + adjustmentData.value);
+  } else {
+    return adjustmentData.value;
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/IStrategicInitiativeDetail.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/IStrategicInitiativeDetail.ts
new file mode 100644
index 0000000..828c8c0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/IStrategicInitiativeDetail.ts
@@ -0,0 +1,59 @@
+import { DefaultStrategicOpportunityDetail, IStrategicOpportunityDetailCommon } from './IStrategicOpportunityDetail';
+
+export interface IStrategicInitiativeDetailGridItem extends IStrategicOpportunityDetailCommon {
+  levelId: number;
+  key: string;
+  label: string;
+  sortOrder: any;
+
+  monthEncounters: number;
+  monthUnits: number;
+  monthUnitsPerEncounter: number;
+
+  monthCostPerEncounter: number;
+  monthCostPerUnit: number;
+
+  monthCommittedMonth: number;
+  monthActualMonth: number;
+  monthVarianceMonth: number;
+  isMonthProgressMonth: boolean;
+
+  trackingEncounters: number;
+  trackingUnits: number;
+  trackingUnitsPerEncounter: number;
+
+  trackingCostPerEncounter: number;
+  trackingCostPerUnit: number;
+
+  trackingCommittedTracking: number;
+  trackingActualTracking: number;
+  trackingVarianceTracking: number;
+  isTrackingProgressTracking: boolean;
+}
+
+export const DefaultStrategicInitiativeDetailGridItem: IStrategicInitiativeDetailGridItem = {
+  ...DefaultStrategicOpportunityDetail,
+  levelId: 0,
+  key: '',
+  label: '',
+  sortOrder: 0,
+
+  monthEncounters: 0,
+  monthCostPerEncounter: 0,
+  monthCostPerUnit: 0,
+  monthUnits: 0,
+  monthUnitsPerEncounter: 0,
+  monthCommittedMonth: 0,
+  monthActualMonth: 0,
+  monthVarianceMonth: 0,
+  isMonthProgressMonth: true,
+  trackingEncounters: 0,
+  trackingUnits: 0,
+  trackingUnitsPerEncounter: 0,
+  trackingCostPerUnit: 0,
+  trackingCostPerEncounter: 0,
+  trackingCommittedTracking: 0,
+  trackingActualTracking: 0,
+  trackingVarianceTracking: 0,
+  isTrackingProgressTracking: true
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/IStrategicOpportunityDetail.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/IStrategicOpportunityDetail.ts
new file mode 100644
index 0000000..7ded91d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/IStrategicOpportunityDetail.ts
@@ -0,0 +1,285 @@
+import { KEY_SEPARATOR } from '../../../shared/constants';
+import { DicStrNum, DicStrStr } from '../../../shared/data/Dictionary';
+import { DimensionsData } from '../../../shared/store/StoreTreeData';
+import { IStrategicOpportunityMeasureData } from '../../data/IStrategicOpportunityMeasureData';
+import { RunTrackingStatus } from '../../data/RunTrackingStatus';
+import { IStrategicInitiativeDetailGridItem } from './IStrategicInitiativeDetail';
+import { StrategicOpportunityDetailDimension } from './StrategicOpportunityDetailDimension';
+
+export interface IStrategicOpportunityDetailCommon {
+  rowId: number;
+  key: string;
+  isBaseline: boolean;
+  entityId: number;
+  caseTypeFamilyId: number;
+  primaryServiceLineId: number;
+  primaryPhysicianId: number;
+  physicianSpecialtyId: number;
+  departmentId: number;
+  chargeCodeId: number;
+  costDriver: string;
+
+  units: number;
+  cost: number;
+
+  goalUnits: number;
+  goalCost: number;
+}
+
+export interface IStrategicOpportunityDetail extends IStrategicOpportunityDetailCommon {
+  isDirty: boolean;
+}
+
+export interface IStrategicInitiativeDetail extends IStrategicOpportunityDetail {
+  monthUnits: number;
+  monthCost: number;
+
+  monthGoalUnits: number;
+  monthGoalCost: number;
+}
+
+export interface IStrategicOpportunityDetailGridItem extends IStrategicOpportunityDetailCommon {
+  levelId: number;
+  label: string;
+  sortOrder: any;
+
+  encounters: number;
+  encountersMonth: number;
+
+  unitsMonth: number;
+  costMonth: number;
+
+  goalUnitsMonth: number;
+  goalCostMonth: number;
+
+  unitsPerEncounter: number;
+  costPerEncounter: number;
+  costPerUnit: number;
+
+  goalUnitsPerEncounter: number;
+  goalCostPerEncounter: number;
+  goalCostPerUnit: number;
+
+  totalImprovement: number;
+}
+
+export interface IStrategicOpportunityDetailGrouped {
+  key: string;
+  isBaseline: boolean;
+
+  units: number;
+  cost: number;
+
+  goalUnits: number;
+  goalCost: number;
+}
+
+export interface IStrategicOpportunityGeneralInfo extends IStrategicRoles {
+  opportunityId: number;
+  name: string;
+  estimatedTrackingDuration: number;
+  trackingStartDate: Date;
+  trackingEndDate: Date;
+  baselineDuration: number;
+  baselineEndDate: Date;
+  lastRunTrackingDate: Date;
+  lastRunTrackingStatus: RunTrackingStatus;
+  totalCommittedCost: number;
+  status: number;
+  measures: IStrategicOpportunityMeasureData[];
+}
+
+export interface IStrategicRoles {
+  costLeaderGuid: string;
+  ownerGuid: string;
+  executiveSponsorGuid: string;
+  stakeholders: string[];
+  teamMembers: string;
+}
+
+export interface IStrategicOpportunityDetailRawData {
+  data: IStrategicOpportunityDetail[];
+  dimensionsData: DimensionsData;
+  encounterData: DicStrNum;
+}
+
+export interface IStrategicOpportunityDetailData {
+  data: IStrategicOpportunityDetail[];
+  dimensionsData: DimensionsData;
+  partialTreeData: { [key: string]: Partial<IStrategicOpportunityDetailGridItem> };
+}
+
+export interface IStrategicInitiativeDetailData {
+  data: IStrategicInitiativeDetail[];
+  dimensionsData: DimensionsData;
+  partialTreeData: { [key: string]: Partial<IStrategicInitiativeDetailGridItem> };
+}
+
+export interface IStrategicOpportunityDetailGroupedData {
+  data: IStrategicOpportunityDetailGrouped[];
+  dimensionsData: DimensionsData;
+  encounterData: DicStrNum;
+}
+
+export interface IStrategicOpportunityDrawerDetails {
+  populationName: string;
+  populations: string[];
+  chargeCodes: DicStrStr;
+  filters: string;
+  baselinePeriod: string;
+  trackingStartDate: Date;
+  trackingEndDate: Date;
+  estimatedTrackingDuration: number;
+}
+
+export interface IStrategicOpportunityDetailGoalValues {
+  rowId: number;
+  goalUnits: number;
+  goalCost: number;
+}
+
+export interface IStrategicOpportunityGetDetailData {
+  dimensions: StrategicOpportunityDetailDimension[];
+  dateStart: Date | null;
+  dateEnd: Date | null;
+}
+
+export const DefaultStrategicOpportunityDetail: IStrategicOpportunityDetail = {
+  rowId: 0,
+  key: '',
+  isBaseline: false,
+  entityId: 0,
+  caseTypeFamilyId: 0,
+  primaryServiceLineId: 0,
+  primaryPhysicianId: 0,
+  physicianSpecialtyId: 0,
+  departmentId: 0,
+  chargeCodeId: 0,
+  costDriver: '',
+
+  units: 0,
+  cost: 0,
+  goalUnits: 0,
+  goalCost: 0,
+
+  isDirty: false
+};
+
+export const DefaultStrategicOpportunityDetailGridItem: IStrategicOpportunityDetailGridItem = {
+  ...DefaultStrategicOpportunityDetail,
+  levelId: 0,
+  label: '',
+  sortOrder: 0,
+
+  encounters: 0,
+  encountersMonth: 0,
+
+  unitsMonth: 0,
+  costMonth: 0,
+  goalUnitsMonth: 0,
+  goalCostMonth: 0,
+
+  unitsPerEncounter: 0,
+  costPerEncounter: 0,
+  costPerUnit: 0,
+
+  goalUnitsPerEncounter: 0,
+  goalCostPerEncounter: 0,
+  goalCostPerUnit: 0,
+
+  totalImprovement: 0
+};
+
+export const DefaultStrategicOpportunityDrawerDetails: IStrategicOpportunityDrawerDetails = {
+  populationName: '',
+  populations: [],
+  chargeCodes: {},
+  filters: '',
+  baselinePeriod: '',
+  trackingStartDate: new Date(),
+  trackingEndDate: new Date(),
+  estimatedTrackingDuration: 0
+};
+
+export const DefaultStrategicOpportunityGeneralInfo: IStrategicOpportunityGeneralInfo = {
+  opportunityId: 0,
+  name: '',
+  estimatedTrackingDuration: 1,
+  trackingStartDate: new Date(),
+  trackingEndDate: new Date(),
+  baselineDuration: 12,
+  baselineEndDate: new Date(),
+  lastRunTrackingDate: new Date(),
+  lastRunTrackingStatus: RunTrackingStatus.None,
+  totalCommittedCost: 0,
+  status: 0,
+  costLeaderGuid: '',
+  ownerGuid: '',
+  executiveSponsorGuid: '',
+  stakeholders: [],
+  measures: [],
+  teamMembers: ''
+};
+
+export const DefaultStrategicOpportunityGetDetailData: IStrategicOpportunityGetDetailData = {
+  dimensions: [],
+  dateStart: null,
+  dateEnd: null
+};
+
+export const getKey: (x: IStrategicOpportunityDetail) => string = (x) =>
+  [x.entityId, x.caseTypeFamilyId, x.primaryServiceLineId, x.primaryPhysicianId, x.physicianSpecialtyId, x.departmentId, x.costDriver, x.chargeCodeId].join(KEY_SEPARATOR);
+
+export enum TabKeys {
+  General = 'general',
+  Roles = 'roles',
+  Notifications = 'notifications'
+}
+
+export function getDetailFromGroupedDetail(groupedDetail: IStrategicOpportunityDetailGrouped, dimensions: StrategicOpportunityDetailDimension[]): IStrategicOpportunityDetail {
+  const result = {
+    ...DefaultStrategicOpportunityDetail,
+    key: groupedDetail.key,
+    isBaseline: groupedDetail.isBaseline,
+    units: groupedDetail.units,
+    cost: groupedDetail.cost,
+    goalUnits: groupedDetail.goalUnits,
+    goalCost: groupedDetail.goalCost
+  };
+
+  const keys = groupedDetail.key.split(KEY_SEPARATOR);
+  for (let i = 0; i < Math.min(dimensions.length, keys.length); i++) {
+    let keyNumber = 0;
+    if (dimensions[i] !== StrategicOpportunityDetailDimension.CostDriver) {
+      keyNumber = parseInt(keys[i]);
+      if (isNaN(keyNumber)) continue;
+    }
+    switch (dimensions[i]) {
+      case StrategicOpportunityDetailDimension.CostDriver:
+        result.costDriver = keys[i];
+        break;
+      case StrategicOpportunityDetailDimension.ChargeCode:
+        result.chargeCodeId = keyNumber;
+        break;
+      case StrategicOpportunityDetailDimension.Department:
+        result.departmentId = keyNumber;
+        break;
+      case StrategicOpportunityDetailDimension.PhysicianSpecialty:
+        result.physicianSpecialtyId = keyNumber;
+        break;
+      case StrategicOpportunityDetailDimension.Physician:
+        result.primaryPhysicianId = keyNumber;
+        break;
+      case StrategicOpportunityDetailDimension.PrimaryServiceLine:
+        result.primaryServiceLineId = keyNumber;
+        break;
+      case StrategicOpportunityDetailDimension.CaseTypeFamily:
+        result.caseTypeFamilyId = keyNumber;
+        break;
+      case StrategicOpportunityDetailDimension.Entity:
+        result.entityId = keyNumber;
+        break;
+    }
+  }
+  return result;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/IStrategicOpportunityLayout.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/IStrategicOpportunityLayout.ts
new file mode 100644
index 0000000..c5a8b11
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/IStrategicOpportunityLayout.ts
@@ -0,0 +1,32 @@
+import { StrategicInitiativeDetailFieldSection, strategicInitiativeLayoutColumnHeader } from './StrategicInitiativeDetailDimension';
+import {
+  strategicOpportunityDetailColumnName,
+  StrategicOpportunityDetailDimension,
+  strategicOpportunityDetailDimensionName,
+  strategicOpportunityDetailDimensionTotal,
+  StrategicOpportunityDetailField
+} from './StrategicOpportunityDetailDimension';
+
+export interface IStrategicOpportunityLayout {
+  rows: string[];
+  columns: string[];
+}
+export const defaultStrategicOpportunityLayout: IStrategicOpportunityLayout = {
+  rows: [strategicOpportunityDetailDimensionTotal, StrategicOpportunityDetailDimension.Entity, StrategicOpportunityDetailDimension.ChargeCode],
+  columns: [...Object.values(StrategicOpportunityDetailField)]
+};
+
+export const defaultStrategicInitiativeLayout: IStrategicOpportunityLayout = {
+  rows: [strategicOpportunityDetailDimensionTotal, StrategicOpportunityDetailDimension.Entity, StrategicOpportunityDetailDimension.ChargeCode],
+  columns: [
+    StrategicInitiativeDetailFieldSection.TotalCommittedCost,
+    StrategicInitiativeDetailFieldSection.TotalActualCost,
+    StrategicInitiativeDetailFieldSection.TotalVariance,
+    StrategicInitiativeDetailFieldSection.Progress
+  ]
+};
+
+export const rowLayoutList = [...Object.entries(strategicOpportunityDetailDimensionName).map((el) => ({ name: el[0], header: el[1] }))];
+
+export const columnOpportunityLayoutList = [...Object.entries(strategicOpportunityDetailColumnName).map((el) => ({ name: el[0], header: el[1] }))];
+export const columnInitiativeLayoutList = [...Object.entries(strategicInitiativeLayoutColumnHeader).map((el) => ({ name: el[0], header: el[1] }))];
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/StrategicInitiativeDetailDimension.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/StrategicInitiativeDetailDimension.ts
new file mode 100644
index 0000000..b15a59e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/StrategicInitiativeDetailDimension.ts
@@ -0,0 +1,103 @@
+export enum StrategicInitiativeDetailFieldSection {
+  TotalEncounters = 'totalEncounters',
+  TotalUnits = 'totalUnits',
+  UnitsPerEncounter = 'unitsPerEncounter',
+  CostPerEncounter = 'costPerEncounter',
+  CostPerUnit = 'costPerUnit',
+  TotalCommittedCost = 'totalCommittedCost',
+  TotalActualCost = 'totalActualCost',
+  TotalVariance = 'totalVariance',
+  Progress = 'progress'
+}
+
+export enum StrategicInitiativeDetailField {
+  MonthEncounters = 'monthEncounters',
+  MonthCostPerEncounter = 'monthCostPerEncounter',
+  MonthCostPerUnit = 'monthCostPerUnit',
+  MonthUnits = 'monthUnits',
+  MonthUnitsPerEncounter = 'monthUnitsPerEncounter',
+  MonthCommittedMonth = 'monthCommittedMonth',
+  MonthActualMonth = 'monthActualMonth',
+  MonthVarianceMonth = 'monthVarianceMonth',
+  IsMonthProgressMonth = 'isMonthProgressMonth',
+  TrackingEncounters = 'trackingEncounters',
+  TrackingUnits = 'trackingUnits',
+  TrackingUnitsPerEncounter = 'trackingUnitsPerEncounter',
+  TrackingCostPerUnit = 'trackingCostPerUnit',
+  TrackingCostPerEncounter = 'trackingCostPerEncounter',
+  TrackingCommittedTracking = 'trackingCommittedTracking',
+  TrackingActualTracking = 'trackingActualTracking',
+  TrackingVarianceTracking = 'trackingVarianceTracking',
+  IsTrackingProgressTracking = 'isTrackingProgressTracking'
+}
+
+export const strategicInitiativeDetailGridColumnHeader = {
+  [StrategicInitiativeDetailFieldSection.TotalEncounters]: 'Total Encounters',
+  [StrategicInitiativeDetailFieldSection.TotalUnits]: 'Total Units',
+  [StrategicInitiativeDetailFieldSection.UnitsPerEncounter]: 'Units per Encounter',
+  [StrategicInitiativeDetailFieldSection.CostPerEncounter]: 'Per Encounter',
+  [StrategicInitiativeDetailFieldSection.CostPerUnit]: 'Per Unit',
+  [StrategicInitiativeDetailFieldSection.TotalCommittedCost]: 'Total Committed',
+  [StrategicInitiativeDetailFieldSection.TotalActualCost]: 'Total Actual',
+  [StrategicInitiativeDetailFieldSection.TotalVariance]: 'Total Variance',
+  [StrategicInitiativeDetailFieldSection.Progress]: 'Progress'
+};
+
+export const strategicInitiativeLayoutColumnHeader = {
+  [StrategicInitiativeDetailFieldSection.TotalEncounters]: 'Total Encounters',
+  [StrategicInitiativeDetailFieldSection.TotalUnits]: 'Total Units',
+  [StrategicInitiativeDetailFieldSection.UnitsPerEncounter]: 'Units per Encounter',
+  [StrategicInitiativeDetailFieldSection.CostPerEncounter]: 'Cost per Encounter',
+  [StrategicInitiativeDetailFieldSection.CostPerUnit]: 'Cost per Unit',
+  [StrategicInitiativeDetailFieldSection.TotalCommittedCost]: 'Total Committed Cost',
+  [StrategicInitiativeDetailFieldSection.TotalActualCost]: 'Total Actual Cost',
+  [StrategicInitiativeDetailFieldSection.TotalVariance]: 'Total Variance',
+  [StrategicInitiativeDetailFieldSection.Progress]: 'Progress'
+};
+
+export const StrategicInitiativeDetailMapSectionFields = {
+  [StrategicInitiativeDetailFieldSection.TotalEncounters]: [StrategicInitiativeDetailField.MonthEncounters, StrategicInitiativeDetailField.TrackingEncounters],
+  [StrategicInitiativeDetailFieldSection.TotalUnits]: [StrategicInitiativeDetailField.MonthUnits, StrategicInitiativeDetailField.TrackingUnits],
+  [StrategicInitiativeDetailFieldSection.CostPerEncounter]: [StrategicInitiativeDetailField.MonthCostPerEncounter, StrategicInitiativeDetailField.TrackingCostPerEncounter],
+  [StrategicInitiativeDetailFieldSection.CostPerUnit]: [StrategicInitiativeDetailField.MonthCostPerUnit, StrategicInitiativeDetailField.TrackingCostPerUnit],
+  [StrategicInitiativeDetailFieldSection.TotalActualCost]: [StrategicInitiativeDetailField.MonthActualMonth, StrategicInitiativeDetailField.TrackingActualTracking],
+  [StrategicInitiativeDetailFieldSection.TotalCommittedCost]: [StrategicInitiativeDetailField.MonthCommittedMonth, StrategicInitiativeDetailField.TrackingCommittedTracking],
+  [StrategicInitiativeDetailFieldSection.TotalVariance]: [StrategicInitiativeDetailField.MonthVarianceMonth, StrategicInitiativeDetailField.TrackingVarianceTracking],
+  [StrategicInitiativeDetailFieldSection.UnitsPerEncounter]: [StrategicInitiativeDetailField.MonthUnitsPerEncounter, StrategicInitiativeDetailField.TrackingUnitsPerEncounter],
+  [StrategicInitiativeDetailFieldSection.Progress]: [StrategicInitiativeDetailField.IsMonthProgressMonth, StrategicInitiativeDetailField.IsTrackingProgressTracking]
+};
+
+export function getStrategicInitiativeDetailColumnHeader(column: StrategicInitiativeDetailFieldSection): string {
+  if (column in strategicInitiativeDetailGridColumnHeader) return strategicInitiativeDetailGridColumnHeader[column as keyof typeof strategicInitiativeDetailGridColumnHeader];
+  else return '';
+}
+
+export function getStrategicInitiativeDetailColumnsByString(strColumns: string[]): StrategicInitiativeDetailFieldSection[] {
+  const columns: StrategicInitiativeDetailFieldSection[] = [];
+  for (const strColumn of Object.values(StrategicInitiativeDetailFieldSection)) {
+    if (strColumns.includes(strColumn)) {
+      const column = getStrategicInitiativeDetailColumnByString(strColumn);
+      column && columns.push(column);
+    }
+  }
+  return columns;
+}
+
+export function getStrategicInitiativeDetailSectionsByFields(fields: string[]): StrategicInitiativeDetailFieldSection[] {
+  const sections: StrategicInitiativeDetailFieldSection[] = [];
+  for (const [key, val] of Object.entries(StrategicInitiativeDetailMapSectionFields)) {
+    if (val.some((x) => fields.includes(x))) {
+      sections.push(key as StrategicInitiativeDetailFieldSection);
+    }
+  }
+  return sections;
+}
+
+export function getStrategicInitiativeDetailFieldsBySection(section: StrategicInitiativeDetailFieldSection): StrategicInitiativeDetailField[] {
+  if (section in StrategicInitiativeDetailMapSectionFields) return StrategicInitiativeDetailMapSectionFields[section];
+  else return [];
+}
+
+export function getStrategicInitiativeDetailColumnByString(strColumn: string): StrategicInitiativeDetailFieldSection | undefined {
+  return Object.values(StrategicInitiativeDetailFieldSection).includes(strColumn as StrategicInitiativeDetailFieldSection) ? (strColumn as StrategicInitiativeDetailFieldSection) : undefined;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/StrategicOpportunityDetailDimension.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/StrategicOpportunityDetailDimension.ts
new file mode 100644
index 0000000..31d2961
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/data/StrategicOpportunityDetailDimension.ts
@@ -0,0 +1,233 @@
+export enum StrategicOpportunityDetailDimension {
+  Entity = 'entity',
+  CaseTypeFamily = 'caseTypeFamily',
+  PrimaryServiceLine = 'primaryServiceLine',
+  CostDriver = 'costDriver',
+  Physician = 'physician',
+  PhysicianSpecialty = 'physicianSpecialty',
+  Department = 'department',
+  ChargeCode = 'chargeCode'
+}
+
+export const strategicOpportunityDetailDimensionTotal = 'system';
+
+export enum StrategicOpportunityDetailDimensionId {
+  Total = 0,
+  Entity = 1,
+  CaseTypeFamily = 2,
+  PrimaryServiceLine = 3,
+  CostDriver = 4,
+  Physician = 5,
+  PhysicianSpecialty = 6,
+  Department = 7,
+  ChargeCode = 8
+}
+
+export const strategicOpportunityDetailDimensionName = {
+  [strategicOpportunityDetailDimensionTotal]: 'Overall System',
+  [StrategicOpportunityDetailDimension.Entity]: 'Entity',
+  [StrategicOpportunityDetailDimension.CaseTypeFamily]: 'Case Type Family',
+  [StrategicOpportunityDetailDimension.PrimaryServiceLine]: 'Primary Service Line',
+  [StrategicOpportunityDetailDimension.CostDriver]: 'Cost Driver',
+  [StrategicOpportunityDetailDimension.Physician]: 'Physician',
+  [StrategicOpportunityDetailDimension.PhysicianSpecialty]: 'Physician Specialty',
+  [StrategicOpportunityDetailDimension.Department]: 'Charge Code Department',
+  [StrategicOpportunityDetailDimension.ChargeCode]: 'Charge Code'
+};
+
+export enum StrategicOpportunityDetailField {
+  Encounters = 'encounters',
+  EncountersMonth = 'encountersMonth',
+  UnitsMonth = 'unitsMonth',
+  UnitsPerEncounter = 'unitsPerEncounter',
+  CostPerEncounter = 'costPerEncounter',
+  CostPerUnit = 'costPerUnit',
+  CostMonth = 'costMonth',
+  GoalUnitsMonth = 'goalUnitsMonth',
+  GoalUnitsPerEncounter = 'goalUnitsPerEncounter',
+  GoalCostPerEncounter = 'goalCostPerEncounter',
+  GoalCostPerUnit = 'goalCostPerUnit',
+  GoalCostMonth = 'goalCostMonth',
+  Units = 'units',
+  Cost = 'cost',
+  GoalUnits = 'goalUnits',
+  GoalCost = 'goalCost',
+  TotalImprovement = 'totalImprovement'
+}
+
+export enum StrategicOpportunityDetailFieldSection {
+  Encounters = 'Encounters',
+  Units = 'Units',
+  Cost = 'Cost',
+  GoalUnits = 'GoalUnits',
+  GoalCost = 'GoalCost',
+  Total = 'Total'
+}
+
+export const StrategicOpportunityDetailMapSectionFields = {
+  [StrategicOpportunityDetailFieldSection.Encounters]: [StrategicOpportunityDetailField.Encounters, StrategicOpportunityDetailField.EncountersMonth],
+  [StrategicOpportunityDetailFieldSection.Units]: [StrategicOpportunityDetailField.Units, StrategicOpportunityDetailField.UnitsMonth, StrategicOpportunityDetailField.UnitsPerEncounter],
+  [StrategicOpportunityDetailFieldSection.Cost]: [
+    StrategicOpportunityDetailField.Cost,
+    StrategicOpportunityDetailField.CostMonth,
+    StrategicOpportunityDetailField.CostPerEncounter,
+    StrategicOpportunityDetailField.CostPerUnit
+  ],
+  [StrategicOpportunityDetailFieldSection.GoalUnits]: [
+    StrategicOpportunityDetailField.GoalUnits,
+    StrategicOpportunityDetailField.GoalUnitsMonth,
+    StrategicOpportunityDetailField.GoalUnitsPerEncounter
+  ],
+  [StrategicOpportunityDetailFieldSection.GoalCost]: [
+    StrategicOpportunityDetailField.GoalCost,
+    StrategicOpportunityDetailField.GoalCostMonth,
+    StrategicOpportunityDetailField.GoalCostPerEncounter,
+    StrategicOpportunityDetailField.GoalCostPerUnit
+  ],
+  [StrategicOpportunityDetailFieldSection.Total]: [StrategicOpportunityDetailField.TotalImprovement]
+};
+
+export const StrategicOpportunityDetailMapFieldSection = {
+  [StrategicOpportunityDetailField.Encounters]: StrategicOpportunityDetailFieldSection.Encounters,
+  [StrategicOpportunityDetailField.EncountersMonth]: StrategicOpportunityDetailFieldSection.Encounters,
+  [StrategicOpportunityDetailField.Units]: StrategicOpportunityDetailFieldSection.Units,
+  [StrategicOpportunityDetailField.UnitsMonth]: StrategicOpportunityDetailFieldSection.Units,
+  [StrategicOpportunityDetailField.UnitsPerEncounter]: StrategicOpportunityDetailFieldSection.Units,
+  [StrategicOpportunityDetailField.Cost]: StrategicOpportunityDetailFieldSection.Cost,
+  [StrategicOpportunityDetailField.CostMonth]: StrategicOpportunityDetailFieldSection.Cost,
+  [StrategicOpportunityDetailField.CostPerEncounter]: StrategicOpportunityDetailFieldSection.Cost,
+  [StrategicOpportunityDetailField.CostPerUnit]: StrategicOpportunityDetailFieldSection.Cost,
+  [StrategicOpportunityDetailField.GoalUnits]: StrategicOpportunityDetailFieldSection.GoalUnits,
+  [StrategicOpportunityDetailField.GoalUnitsMonth]: StrategicOpportunityDetailFieldSection.GoalUnits,
+  [StrategicOpportunityDetailField.GoalUnitsPerEncounter]: StrategicOpportunityDetailFieldSection.GoalUnits,
+  [StrategicOpportunityDetailField.GoalCost]: StrategicOpportunityDetailFieldSection.GoalCost,
+  [StrategicOpportunityDetailField.GoalCostMonth]: StrategicOpportunityDetailFieldSection.GoalCost,
+  [StrategicOpportunityDetailField.GoalCostPerEncounter]: StrategicOpportunityDetailFieldSection.GoalCost,
+  [StrategicOpportunityDetailField.GoalCostPerUnit]: StrategicOpportunityDetailFieldSection.GoalCost,
+  [StrategicOpportunityDetailField.TotalImprovement]: StrategicOpportunityDetailFieldSection.Total
+};
+
+export function getStrategicOpportunityDetailFieldsBySection(section: StrategicOpportunityDetailFieldSection): StrategicOpportunityDetailField[] {
+  if (section in StrategicOpportunityDetailMapSectionFields) return StrategicOpportunityDetailMapSectionFields[section];
+  else return [];
+}
+
+// Info; important: Units always should go first in deltaDic because Cost columns depends on Units
+export function getStrategicOpportunityDetailSectionsByFields(fields: string[]): StrategicOpportunityDetailFieldSection[] {
+  const sections: StrategicOpportunityDetailFieldSection[] = [];
+  for (const [key, val] of Object.entries(StrategicOpportunityDetailMapSectionFields)) {
+    if (val.some((x) => fields.includes(x))) {
+      sections.push(key as StrategicOpportunityDetailFieldSection);
+    }
+  }
+  return sections;
+}
+
+export const strategicOpportunityDetailColumnName = {
+  [StrategicOpportunityDetailField.EncountersMonth]: 'Baseline Average Encounters',
+  [StrategicOpportunityDetailField.UnitsMonth]: 'Baseline Average Units',
+  [StrategicOpportunityDetailField.UnitsPerEncounter]: 'Baseline Units per Encounter',
+  [StrategicOpportunityDetailField.CostPerEncounter]: 'Baseline Cost per Encounter',
+  [StrategicOpportunityDetailField.CostPerUnit]: 'Baseline Cost per Unit',
+  [StrategicOpportunityDetailField.CostMonth]: 'Baseline Total Cost',
+  [StrategicOpportunityDetailField.GoalUnitsMonth]: 'Goal Average Units',
+  [StrategicOpportunityDetailField.GoalUnitsPerEncounter]: 'Goal Units per Encounter',
+  [StrategicOpportunityDetailField.GoalCostPerEncounter]: 'Goal Cost per Encounter',
+  [StrategicOpportunityDetailField.GoalCostPerUnit]: 'Goal Cost per Unit',
+  [StrategicOpportunityDetailField.GoalCostMonth]: 'Goal Total Cost',
+  [StrategicOpportunityDetailField.TotalImprovement]: 'Total Improvement'
+};
+
+export const strategicOpportunityDetailColumnHeader = {
+  [StrategicOpportunityDetailField.EncountersMonth]: 'Average Encounters',
+  [StrategicOpportunityDetailField.UnitsMonth]: 'Average Units',
+  [StrategicOpportunityDetailField.UnitsPerEncounter]: 'Units per Encounter',
+  [StrategicOpportunityDetailField.CostPerEncounter]: 'Per Encounter',
+  [StrategicOpportunityDetailField.CostPerUnit]: 'Per Unit',
+  [StrategicOpportunityDetailField.CostMonth]: 'Total',
+  [StrategicOpportunityDetailField.GoalUnitsMonth]: 'Average Units',
+  [StrategicOpportunityDetailField.GoalUnitsPerEncounter]: 'Units per Encounter',
+  [StrategicOpportunityDetailField.GoalCostPerEncounter]: 'Per Encounter',
+  [StrategicOpportunityDetailField.GoalCostPerUnit]: 'Per Unit',
+  [StrategicOpportunityDetailField.GoalCostMonth]: 'Total',
+  [StrategicOpportunityDetailField.TotalImprovement]: 'Total Improvement'
+};
+
+export function getStrategicOpportunityDetailDimensionByString(strDimension: string): StrategicOpportunityDetailDimension | undefined {
+  switch (strDimension) {
+    case StrategicOpportunityDetailDimension.Entity:
+      return StrategicOpportunityDetailDimension.Entity;
+    case StrategicOpportunityDetailDimension.CaseTypeFamily:
+      return StrategicOpportunityDetailDimension.CaseTypeFamily;
+    case StrategicOpportunityDetailDimension.PrimaryServiceLine:
+      return StrategicOpportunityDetailDimension.PrimaryServiceLine;
+    case StrategicOpportunityDetailDimension.CostDriver:
+      return StrategicOpportunityDetailDimension.CostDriver;
+    case StrategicOpportunityDetailDimension.Physician:
+      return StrategicOpportunityDetailDimension.Physician;
+    case StrategicOpportunityDetailDimension.PhysicianSpecialty:
+      return StrategicOpportunityDetailDimension.PhysicianSpecialty;
+    case StrategicOpportunityDetailDimension.Department:
+      return StrategicOpportunityDetailDimension.Department;
+    case StrategicOpportunityDetailDimension.ChargeCode:
+      return StrategicOpportunityDetailDimension.ChargeCode;
+    default:
+      return;
+  }
+}
+
+export function getStrategicOpportunityDetailDimensionsByString(strDimensions: string[]): StrategicOpportunityDetailDimension[] {
+  const dimensions: StrategicOpportunityDetailDimension[] = [];
+  for (const strDimension of strDimensions) {
+    const dimension = getStrategicOpportunityDetailDimensionByString(strDimension);
+    dimension && dimensions.push(dimension);
+  }
+  return dimensions;
+}
+
+export function getStrategicOpportunityDetailColumnByString(strColumn: string): StrategicOpportunityDetailField | undefined {
+  switch (strColumn) {
+    case StrategicOpportunityDetailField.EncountersMonth:
+      return StrategicOpportunityDetailField.EncountersMonth;
+    case StrategicOpportunityDetailField.UnitsMonth:
+      return StrategicOpportunityDetailField.UnitsMonth;
+    case StrategicOpportunityDetailField.UnitsPerEncounter:
+      return StrategicOpportunityDetailField.UnitsPerEncounter;
+    case StrategicOpportunityDetailField.CostPerEncounter:
+      return StrategicOpportunityDetailField.CostPerEncounter;
+    case StrategicOpportunityDetailField.CostPerUnit:
+      return StrategicOpportunityDetailField.CostPerUnit;
+    case StrategicOpportunityDetailField.CostMonth:
+      return StrategicOpportunityDetailField.CostMonth;
+    case StrategicOpportunityDetailField.GoalUnitsMonth:
+      return StrategicOpportunityDetailField.GoalUnitsMonth;
+    case StrategicOpportunityDetailField.GoalUnitsPerEncounter:
+      return StrategicOpportunityDetailField.GoalUnitsPerEncounter;
+    case StrategicOpportunityDetailField.GoalCostPerEncounter:
+      return StrategicOpportunityDetailField.GoalCostPerEncounter;
+    case StrategicOpportunityDetailField.GoalCostPerUnit:
+      return StrategicOpportunityDetailField.GoalCostPerUnit;
+    case StrategicOpportunityDetailField.GoalCostMonth:
+      return StrategicOpportunityDetailField.GoalCostMonth;
+    case StrategicOpportunityDetailField.TotalImprovement:
+      return StrategicOpportunityDetailField.TotalImprovement;
+    default:
+      return;
+  }
+}
+
+export function getStrategicOpportunityDetailColumnsByString(strColumns: string[]): StrategicOpportunityDetailField[] {
+  const columns: StrategicOpportunityDetailField[] = [];
+  for (const strColumn of Object.values(StrategicOpportunityDetailField)) {
+    if (strColumns.includes(strColumn)) {
+      const column = getStrategicOpportunityDetailColumnByString(strColumn);
+      column && columns.push(column);
+    }
+  }
+  return columns;
+}
+
+export function getStrategicOpportunityDetailColumnHeader(column: StrategicOpportunityDetailField): string {
+  if (column in strategicOpportunityDetailColumnHeader) return strategicOpportunityDetailColumnHeader[column as keyof typeof strategicOpportunityDetailColumnHeader];
+  else return '';
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/summary/StrategicTracker.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/summary/StrategicTracker.tsx
new file mode 100644
index 0000000..c54a3f2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/detail/summary/StrategicTracker.tsx
@@ -0,0 +1,48 @@
+import Header from '@strata/tempo/lib/header/Header';
+import Tabs from '@strata/tempo/lib/tabs/Tabs';
+import React, { useEffect, useState } from 'react';
+import { useLocation } from 'react-router';
+import { IInitiativeRollupColumn } from '../../../initiatives/data/IInitiativeRollupColumn';
+import { initiativeRollupColumnService } from '../../../initiatives/data/initiativeRollupColumnService';
+import { getBetaTitle } from '../../../shared/components/ContinuousImprovementExtensions';
+import StrategicItems from '../../opportunities/StrategicItems';
+
+const StrategicTracker: React.FC = () => {
+  const [rollupColumns, setRollupColumns] = useState<IInitiativeRollupColumn[]>([]);
+  const location = useLocation();
+
+  useEffect(() => {
+    const loadRollups = async () => {
+      const columns = await initiativeRollupColumnService.getColumns();
+      setRollupColumns(columns);
+    };
+
+    loadRollups();
+  }, []);
+
+  const getActiveTab = (): string => {
+    const splitLocation = location.pathname.split('/');
+    let currentLocation = splitLocation[splitLocation.length - 1];
+
+    if (currentLocation !== 'initiatives') {
+      currentLocation = 'opportunities';
+    }
+
+    return currentLocation;
+  };
+
+  return (
+    <>
+      <Header title={getBetaTitle('Strategic Tracker')} />
+      <Tabs
+        activeKey={getActiveTab()}
+        items={[
+          { key: 'opportunities', href: `opportunities`, label: 'Opportunities', children: <StrategicItems isOpportunity={true} rollupColumns={rollupColumns} /> },
+          { key: 'initiatives', href: `initiatives`, label: 'Initiatives', children: <StrategicItems isOpportunity={false} rollupColumns={rollupColumns} /> }
+        ]}
+      />
+    </>
+  );
+};
+
+export default StrategicTracker;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/opportunities/StrategicItems.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/opportunities/StrategicItems.tsx
new file mode 100644
index 0000000..30b11ac
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/opportunities/StrategicItems.tsx
@@ -0,0 +1,195 @@
+import ActionBar from '@strata/tempo/lib/actionbar/ActionBar';
+import Button from '@strata/tempo/lib/button/Button';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import CheckCircleIcon from '@strata/tempo/lib/icon/CheckCircleIcon';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import EditIcon from '@strata/tempo/lib/icon/EditIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import WarningIcon from '@strata/tempo/lib/icon/WarningIcon';
+import Input from '@strata/tempo/lib/input/Input';
+import Link from '@strata/tempo/lib/link';
+import useModal from '@strata/tempo/lib/modal/useModal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import useToast from '@strata/tempo/lib/toast/useToast';
+import Tooltip from '@strata/tempo/lib/tooltip/Tooltip';
+import dayjs from 'dayjs';
+import debounce from 'lodash/debounce';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useHistory } from 'react-router';
+import { IInitiativeRollupColumn } from '../../initiatives/data/IInitiativeRollupColumn';
+import { IOpportunity } from '../../shared/opportunities/data';
+import { includesCaseInsensitive } from '../../shared/utilities';
+import { IStrategicInitiativeListItem } from '../data/IStrategicInitiativeListItem';
+import { IStrategicOpportunityListItem } from '../data/IStrategicOpportunityListItem';
+import { RunTrackingStatus } from '../data/RunTrackingStatus';
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+import { deleteStrategicOpportunity } from './deleteOpportunity';
+
+export interface IStrategicItemsProps {
+  isOpportunity: boolean;
+  rollupColumns: IInitiativeRollupColumn[];
+}
+
+const StrategicItems: React.FC<IStrategicItemsProps> = ({ isOpportunity, rollupColumns }) => {
+  const [items, setItems] = useState<(IStrategicOpportunityListItem | IStrategicInitiativeListItem)[]>([]);
+  const [gridData, setGridData] = useState<(IStrategicOpportunityListItem | IStrategicInitiativeListItem)[]>([]);
+  const [loading, setLoading] = useState(false);
+  const history = useHistory();
+  const toast = useToast();
+  const modal = useModal();
+
+  useEffect(() => {
+    const loadData = async () => {
+      setLoading(true);
+      try {
+        const data = isOpportunity ? await strategicOpportunityService.getOpportunities() : await strategicOpportunityService.getInitiatives();
+        setItems([...data]);
+        setGridData([...data]);
+      } finally {
+        setLoading(false);
+      }
+    };
+    document.title = 'Strategic Opportunities';
+    loadData();
+  }, []);
+
+  const getOpportunityUrl = (opportunity: IOpportunity) => {
+    return `/strategic-opportunity/${opportunity.opportunityId}`;
+  };
+
+  const handleSearch = useCallback(
+    (value: string) => {
+      if (!items) return;
+      setGridData(
+        items.filter(
+          (e: IStrategicOpportunityListItem | IStrategicInitiativeListItem) =>
+            (e.name && includesCaseInsensitive(e.name?.toString(), value)) ||
+            (e.opportunityId && includesCaseInsensitive(e.opportunityId?.toString(), value)) ||
+            (e.opportunityTypeName && includesCaseInsensitive(e.opportunityTypeName?.toString(), value)) ||
+            (e.rollup1 && includesCaseInsensitive(e.rollup1?.toString(), value)) ||
+            (e.rollup2 && includesCaseInsensitive(e.rollup2?.toString(), value)) ||
+            (e.rollup3 && includesCaseInsensitive(e.rollup3?.toString(), value)) ||
+            (e.population && includesCaseInsensitive(e.population?.toString(), value))
+        )
+      );
+    },
+    [items]
+  );
+
+  const handleSearchWithDebounce = useMemo(() => debounce((value) => handleSearch(value), 500), [handleSearch]);
+  const opportunityColumns: any = [
+    <DataGrid.NumberColumn field='estimatedTrackDurationMonths' key='estimatedTrackDurationMonths' header='Estimated Track Duration (Months)' sortable width={100} />,
+    <DataGrid.NumberColumn field='totalImprovement' key='totalImprovement' header='Total Improvement' format='currency' sortable width={110} />,
+    <DataGrid.NumberColumn field='estimatedGoal' key='estimatedGoal' header='Estimated Goal' format='currency' sortable width={100} />,
+    <DataGrid.Column field='statusName' key='statusName' header='Status' sortable width={120} />
+  ];
+  const initiativeColumns: any = [
+    <DataGrid.Column field='trackingPeriod' key='trackingPeriod' header='Tracking Period' sortField='trackingPeriod' sortable width={100} />,
+    <DataGrid.NumberColumn field='totalCommitted' key='totalCommitted' header='Total Committed' format='number' sortable width={100} />,
+    <DataGrid.NumberColumn field='progressToDateCommitted' key='progressToDateCommitted' header='Progress To Date Committed' format='number' sortable width={100} />,
+    <DataGrid.NumberColumn field='progressToDateActual' key='progressToDateActual' header='Progress To Date Actual' format='number' sortable width={110} />,
+    <DataGrid.NumberColumn field='progressToDateVariance' key='progressToDateVariance' header='Progress To Date Variance' format='number' sortable width={100} />,
+    <DataGrid.Column field='statusName' key='statusName' header='Status' sortable width={120} />,
+    <DataGrid.Column
+      field='lastRunTrackingDate'
+      key='lastRunTrackingDate'
+      header='Last Refresh Date'
+      sortable
+      width={160}
+      body={(rowData) =>
+        rowData.lastRunTrackingDate && rowData.lastRunTrackingStatus !== RunTrackingStatus.None ? (
+          <Spacing itemSpacing={4}>
+            {rowData.lastRunTrackingStatus === RunTrackingStatus.Success ? <CheckCircleIcon color='success' /> : <WarningIcon color='error' />}
+            <Text>{dayjs(rowData.lastRunTrackingDate).format('M/D/YYYY hh:mm A')}</Text>
+          </Spacing>
+        ) : (
+          ''
+        )
+      }
+    />,
+    <DataGrid.Column
+      field='onTrack'
+      key='onTrack'
+      header='Progress'
+      sortable
+      width={120}
+      body={(rowData) => {
+        return rowData.statusName === 'New' ? <Text>-</Text> : rowData.onTrack ? <Text color='success'>On track</Text> : <Text color='error'>Off track</Text>;
+      }}
+    />
+  ];
+
+  useEffect(() => {
+    return () => {
+      handleSearchWithDebounce.cancel();
+    };
+  }, [handleSearchWithDebounce]);
+
+  const getRollupHeader = (index: number) => {
+    const rollup = rollupColumns.find((item) => item.initiativeRollupColumnId === index);
+    if (rollup) return rollup.name;
+
+    return `Rollup ${index}`;
+  };
+
+  return (
+    <>
+      <ActionBar
+        filters={
+          <>
+            <Input width={312} search placeholder={'Search'} onChange={(e) => handleSearchWithDebounce(e.target.value)} />
+          </>
+        }
+        actions={
+          isOpportunity && (
+            <Button type='primary' icon={<PlusIcon />} onClick={() => history.push('/strategic-opportunities/create/charge-code')}>
+              Add Opportunity
+            </Button>
+          )
+        }
+      ></ActionBar>
+      <DataGrid scrollable loading={loading} value={gridData} sortField={'opportunityId'} sortOrder={1} paginator dataKey='opportunityId' scrollableOffset={1}>
+        <DataGrid.Column field='opportunityId' header='ID' sortable width={65} body={(rowData) => <Link href={getOpportunityUrl(rowData)}>{rowData.opportunityId}</Link>} />
+        <DataGrid.Column field='name' header='Name' sortable width={200} collapseLongText />
+        <DataGrid.Column field='opportunityTypeName' header='Opportunity Type' sortable width={120} />
+        <DataGrid.Column field='rollup1' header={getRollupHeader(1)} sortable width={140} collapseLongText />
+        <DataGrid.Column field='rollup2' header={getRollupHeader(2)} sortable width={140} collapseLongText />
+        <DataGrid.Column field='rollup3' header={getRollupHeader(3)} sortable width={140} collapseLongText />
+        <DataGrid.Column field='encounterGroupName' header='Encounter Group' sortable width={120} />
+        <DataGrid.Column field='population' header='Population' sortable width={180} collapseLongText />
+        <DataGrid.Column field='additionalFilters' header='Additional Filters' sortable width={100} collapseLongText />
+        <DataGrid.Column field='baselinePeriod' header='Baseline Period' sortField='baselineStartDate' sortable width={100} />
+        {isOpportunity ? opportunityColumns.map((col: JSX.Element) => col) : initiativeColumns.map((col: JSX.Element) => col)}
+        <DataGrid.Column
+          key='edit'
+          header=''
+          width={30}
+          body={(rowData) => (
+            <Tooltip title='Edit'>
+              <Link href={getOpportunityUrl(rowData)}>
+                <EditIcon />
+              </Link>
+            </Tooltip>
+          )}
+        />
+        <DataGrid.Column
+          key='delete'
+          header=''
+          width={30}
+          body={(rowData) => (
+            <Tooltip title='Delete'>
+              <Button
+                type='link'
+                icon={<DeleteIcon />}
+                onClick={() => deleteStrategicOpportunity(rowData.opportunityId, `${rowData.opportunityId} • ${rowData.name}`, isOpportunity, setLoading, toast, modal)}
+              />
+            </Tooltip>
+          )}
+        />
+      </DataGrid>
+    </>
+  );
+};
+
+export default StrategicItems;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/opportunities/deleteOpportunity.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/opportunities/deleteOpportunity.tsx
new file mode 100644
index 0000000..321060b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/opportunities/deleteOpportunity.tsx
@@ -0,0 +1,36 @@
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+
+export const deleteStrategicOpportunity = async (opportunityId: number, opportunityKeyName: string, isOpportunity: boolean, setLoading: (load: boolean) => void, toast: any, modal: any) => {
+  const labelText = isOpportunity ? 'Opportunity' : 'Initiative';
+
+  if (!opportunityId) {
+    return;
+  }
+  const deleteOpportunity = async () => {
+    try {
+      setLoading(true);
+      await strategicOpportunityService.deleteChargeCodeOpportunity(opportunityId).then((res) => {
+        window.location.replace(`/continuousimprovement/strategic-tracker/${isOpportunity ? 'opportunities' : 'initiatives'}`);
+      });
+    } catch {
+      toast.show({
+        key: `${labelText} ${opportunityKeyName}`,
+        toastType: 'error',
+        message: `Unable to delete ${labelText} ${opportunityKeyName}`,
+        duration: 0
+      });
+    } finally {
+      setLoading(false);
+    }
+  };
+  modal.confirm({
+    title: `Delete this ${labelText}?`,
+    content: `This action permanently deletes ${labelText} ${opportunityKeyName}. You cannot undo this action.`,
+    okText: 'Delete',
+    cancelText: `Keep ${labelText}`,
+    confirmType: 'danger',
+    onOk() {
+      deleteOpportunity();
+    }
+  });
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/ChargeCodeCustomPickerModal.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/ChargeCodeCustomPickerModal.tsx
new file mode 100644
index 0000000..b4f285b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/ChargeCodeCustomPickerModal.tsx
@@ -0,0 +1,116 @@
+import DataGrid from '@strata/tempo/lib/datagrid/DataGrid';
+import Input from '@strata/tempo/lib/input/Input';
+import Modal from '@strata/tempo/lib/modal';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Toggle from '@strata/tempo/lib/toggle/Toggle';
+import { debounce } from 'lodash';
+import React, { useCallback, useEffect, useMemo } from 'react';
+import { IChargeCodeCustomPickerModel } from '../data/IChargeCodeCustomPickerModel';
+import { includesCaseInsensitive } from '../../shared/utilities';
+
+export interface IChargeCodeCustomPickerModalProps {
+  isVisible: boolean;
+  chargeCodes: IChargeCodeCustomPickerModel[];
+  selectedChargeCodes: IChargeCodeCustomPickerModel[];
+  onApply: (primaryChargeCodes: IChargeCodeCustomPickerModel[]) => void;
+  closeModal: () => void;
+}
+
+const TOGGLE_ALL_ID = 1;
+
+const ChargeCodeCustomPickerModal: React.FC<IChargeCodeCustomPickerModalProps> = (props: IChargeCodeCustomPickerModalProps) => {
+  const { isVisible, chargeCodes, selectedChargeCodes, onApply, closeModal } = props;
+  const [gridChargeCodes, setGridChargeCodes] = React.useState<IChargeCodeCustomPickerModel[]>([]);
+  const [gridSelectedChargeCodes, setGridSelectedChargeCodes] = React.useState<IChargeCodeCustomPickerModel[]>([]);
+  const [toggleValue, setToggleValue] = React.useState<number>(TOGGLE_ALL_ID);
+  const [searchInput, setSearchInput] = React.useState<string>('');
+
+  useEffect(() => {
+    if (isVisible) {
+      setGridChargeCodes(chargeCodes);
+      setGridSelectedChargeCodes(selectedChargeCodes);
+    }
+  }, [isVisible, chargeCodes, selectedChargeCodes, setGridSelectedChargeCodes]);
+
+  const handleSearch = useCallback(
+    async (value: string) => {
+      setGridChargeCodes([...chargeCodes.filter((cc) => includesCaseInsensitive(cc.costDriver, value) || includesCaseInsensitive(cc.name, value) || includesCaseInsensitive(cc.rollup, value))]);
+    },
+    [chargeCodes]
+  );
+
+  const handleUserSearchWithDebounce = useMemo(() => debounce(handleSearch, 500), [handleSearch]);
+
+  useEffect(() => {
+    return () => {
+      handleUserSearchWithDebounce.cancel();
+    };
+  }, [handleUserSearchWithDebounce]);
+
+  const resetModalValues = () => {
+    setSearchInput('');
+    setToggleValue(TOGGLE_ALL_ID);
+  };
+
+  const handleSave = async () => {
+    onApply(gridSelectedChargeCodes);
+    resetModalValues();
+    closeModal();
+  };
+
+  const handleClose = async () => {
+    setGridSelectedChargeCodes(selectedChargeCodes);
+    resetModalValues();
+    closeModal();
+  };
+
+  const onSelectionChange = (e: any) => {
+    setGridSelectedChargeCodes(e.value);
+  };
+
+  const onToggleChange = (selected: any) => {
+    setToggleValue(selected.target.value);
+    if (selected.target.value === TOGGLE_ALL_ID) {
+      setGridChargeCodes([
+        ...chargeCodes.filter((cc) => includesCaseInsensitive(cc.costDriver, searchInput) || includesCaseInsensitive(cc.name, searchInput) || includesCaseInsensitive(cc.rollup, searchInput))
+      ]);
+    } else {
+      setGridChargeCodes([
+        ...selectedChargeCodes.filter((cc) => includesCaseInsensitive(cc.costDriver, searchInput) || includesCaseInsensitive(cc.name, searchInput) || includesCaseInsensitive(cc.rollup, searchInput))
+      ]);
+    }
+  };
+
+  return (
+    <Modal title='Charge Codes' visible={isVisible} onCancel={handleClose} onOk={handleSave} okText={'Select'} width='large' okButtonProps={{ disabled: !gridSelectedChargeCodes?.length }}>
+      <Spacing hAlign='space-between' itemSpacing={8}>
+        <Input
+          value={searchInput}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+            setSearchInput(e.target.value);
+            handleUserSearchWithDebounce(e.target.value);
+          }}
+          search
+        />
+        <Toggle
+          defaultValue={TOGGLE_ALL_ID}
+          value={toggleValue}
+          onChange={onToggleChange}
+          items={[
+            { value: TOGGLE_ALL_ID, name: 'All' },
+            { value: 2, name: 'Selected' }
+          ]}
+        />
+      </Spacing>
+
+      <DataGrid dataKey='chargeCodeId' sortField='name' sortOrder={1} value={gridChargeCodes} selection={gridSelectedChargeCodes} onSelectionChange={onSelectionChange} scrollable scrollHeight='50vh'>
+        <DataGrid.SelectionColumn selectionMode={'multiple'} />
+        <DataGrid.Column field='name' header='Charge Code' sortable width={200} />
+        <DataGrid.Column field='rollup' header='Rollup' sortable width={200} />
+        <DataGrid.Column field='costDriver' header='Cost Driver' sortable width={200} />
+      </DataGrid>
+    </Modal>
+  );
+};
+
+export default ChargeCodeCustomPickerModal;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunity.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunity.tsx
new file mode 100644
index 0000000..90af5e3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunity.tsx
@@ -0,0 +1,671 @@
+import Form from '@strata/tempo/lib/form/Form';
+import Header from '@strata/tempo/lib/header/Header';
+import useModal from '@strata/tempo/lib/modal/useModal';
+import useToast from '@strata/tempo/lib/toast';
+import Wizard from '@strata/tempo/lib/wizard/Wizard';
+import dayjs from 'dayjs';
+import { cloneDeep, isEqual } from 'lodash';
+import React, { useEffect } from 'react';
+import { useHistory, useLocation } from 'react-router';
+import ChargeCodeUploadModal from '../../charge-code/opportunities/ChargeCodeUploadModal';
+import { opportunityService } from '../../charge-code/opportunities/data/opportunityService';
+import { populationService } from '../../exploration/opportunities/data/populationService';
+import { IInitiativeRollupColumn } from '../../initiatives/data/IInitiativeRollupColumn';
+import { initiativeRollupColumnService } from '../../initiatives/data/initiativeRollupColumnService';
+import { OpportunityTypes, OpportunityTypesDisplayString } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { analyticsService, IWorkbook } from '../../shared/analytics/data/analyticsService';
+import { IFilterChipItem, parseFiltersFromJson } from '../../shared/components/FilterBar/data/IFilterChipItem';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { IPickerItem } from '../../shared/data/IPickerItem';
+import { pickerItemsService } from '../../shared/data/pickerItemsService';
+import { EncounterGroup } from '../../shared/opportunities/data/EncounterGroup';
+import { nameIsDuplicate } from '../../shared/opportunities/data/nameValidationService';
+import { adjustDatetimeToDateString, zeroGuid } from '../../shared/utilities';
+import { RegEx } from '../../shared/validation/RegEx';
+import { BaselineDistribution, BaselineType } from '../data/BaselineType';
+import { DesiredResult } from '../data/DesiredResult';
+import { IChargeCodeCustomPickerModel } from '../data/IChargeCodeCustomPickerModel';
+import { defaultStrategicOpportunityChargeCodeData, IStrategicOpportunityChargeCodeData } from '../data/IStrategicOpportunityChargeCodeData';
+import { DefaultStrategicOpportunityMeasureData, IStrategicOpportunityMeasureData, MeasureGroup } from '../data/IStrategicOpportunityMeasureData';
+import { getDesiredResultByMeasureType } from '../data/MeasureType';
+import { strategicOpportunityService } from '../data/strategicOpportunityService';
+import StrategicOpportunityDefine from './StrategicOpportunityDefine';
+import StrategicOpportunityDefineAdditional from './StrategicOpportunityDefineAdditional';
+import StrategicOpportunityDefineTimeframe from './StrategicOpportunityDefineTimeframe';
+import StrategicOpportunityDetail from './StrategicOpportunityDetail';
+import StrategicOpportunityExternalLinks from './StrategicOpportunityExternalLinks';
+
+export interface IStrategicOpportunityProps {
+  opportunityType: OpportunityTypes;
+}
+
+const opportunityInitial: IStrategicOpportunityChargeCodeData = {
+  ...defaultStrategicOpportunityChargeCodeData,
+  opportunityType: OpportunityTypes.StrategicOpportunityChargeCode
+};
+
+export const StrategicOpportunityChargeCode: React.FC = () => {
+  return <StrategicOpportunity opportunityType={OpportunityTypes.StrategicOpportunityChargeCode} />;
+};
+
+const StrategicOpportunity: React.FC<IStrategicOpportunityProps> = (props: IStrategicOpportunityProps) => {
+  const { opportunityType } = props;
+  const { currentConfiguration } = useConfigurations();
+
+  const [stepNumber, setStepNumber] = React.useState(0);
+  const [uploadModalVisible, setUploadModalVisible] = React.useState<boolean>(false);
+  const [opportunity, setOpportunity] = React.useState<IStrategicOpportunityChargeCodeData>({
+    ...opportunityInitial,
+    opportunityType: opportunityType
+  });
+  const [strategicOpportunityId, setStrategicOpportunityId] = React.useState<number>(0);
+  const [primaryMeasures, setPrimaryMeasures] = React.useState<IStrategicOpportunityMeasureData>(DefaultStrategicOpportunityMeasureData);
+  const [workbooks, setWorkbooks] = React.useState<IWorkbook[]>([]);
+  const [opportunityFilters, setOpportunityFilters] = React.useState<IFilterChipItem[]>([]);
+  const [opportunityInitialFilters, setOpportunityInitialFilters] = React.useState<IFilterChipItem[]>([]);
+  const [chargeCodeMembers, setChargeCodeMembers] = React.useState<IChargeCodeCustomPickerModel[]>([]);
+  const [selectedChargeCodes, setSelectedChargeCodes] = React.useState<IChargeCodeCustomPickerModel[]>([]);
+  const [selectedChargeCodesInitial, setSelectedChargeCodesInitial] = React.useState<IChargeCodeCustomPickerModel[]>([]);
+  const [baselinePeriodInitial, setBaselinePeriodInitial] = React.useState<dayjs.Dayjs[]>();
+  const [expPopulationMembers, setExpPopulationMembers] = React.useState<IPickerItem[]>([]);
+  const [selectedExpPopulations, setSelectedExpPopulations] = React.useState<IPickerItem[]>([]);
+  const [patientPopulationsInitial, setPatientPopulationsInitial] = React.useState<string[]>(['']);
+  const [expPopulationsInitial, setExpPopulationsInitial] = React.useState<string>('0');
+  const [rollupColumns, setRollupColumns] = React.useState<IInitiativeRollupColumn[]>([]);
+  const [isEditMode, setIsEditMode] = React.useState<boolean>(false);
+  const [isLoadingData, setIsLoadingData] = React.useState<boolean>(false);
+  const [loading, setLoading] = React.useState(false);
+  const [isPrePopulated, setIsPrePopulated] = React.useState(false);
+  const [expPopCostDriver, setExpPopCostDriver] = React.useState<string[]>([]);
+  const [form] = Form.useForm();
+  const history = useHistory();
+  const toast = useToast();
+  const modal = useModal();
+  const location = useLocation();
+
+  useEffect(() => {
+    if (location.pathname.includes('edit')) {
+      loadEditData();
+    }
+  }, []);
+
+  useEffect(() => {
+    const loadData = async () => {
+      setLoading(true);
+      try {
+        const rollupColumns = await initiativeRollupColumnService.getColumns();
+        setRollupColumns(rollupColumns);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    loadData();
+  }, []);
+
+  useEffect(() => {
+    if (currentConfiguration) {
+      setTimeframeData();
+      analyticsService.getWorkbooks().then((res) => {
+        setWorkbooks(res);
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [currentConfiguration]);
+
+  // Info: no sense to set initial data from getOpportunity request for opportunityInitial, cause
+  // most of the fields need to call additional functions for validation data for correct setup
+  const loadEditData = async () => {
+    setIsEditMode(true);
+    setIsLoadingData(true);
+    const strategicOpportunityId = location.pathname.split('/').at(-1) ?? '0';
+    setStrategicOpportunityId(Number.parseInt(strategicOpportunityId));
+    try {
+      await strategicOpportunityService.getOpportunity(strategicOpportunityId).then((data) => {
+        // Opportunity Details step
+        form.setFieldValue('name', data.name);
+        setOpportunity((prev) => ({ ...prev, name: data.name }));
+
+        if (data.rollup1Id > 0) form.setFieldValue('rollup1Id', data.rollup1Id);
+        if (data.rollup2Id > 0) form.setFieldValue('rollup2Id', data.rollup2Id);
+        if (data.rollup3Id > 0) form.setFieldValue('rollup3Id', data.rollup3Id);
+
+        // Define Opportunity step
+        form.setFieldValue('encounterGroup', data.encounterGroupName === 'Patient Population' ? EncounterGroup.PatientPopulation : EncounterGroup.FlexibleExplorationPatientPopulation);
+        form.setFieldValue('chargeCodes', data.chargeCodeHPath);
+
+        const primaryMeasure = data.measures.find((measure) => measure.measureGroup === MeasureGroup.Primary) ?? DefaultStrategicOpportunityMeasureData;
+        form.setFieldValue('measureType', primaryMeasure.measureType);
+        form.setFieldValue('desiredResult', primaryMeasure.desiredResult);
+        form.setFieldValue('acceptableThreshold', primaryMeasure.acceptableThreshold);
+
+        if (data.encounterGroupName === 'Patient Population') {
+          setOpportunity((prev) => ({ ...prev, patientPopulationHPath: data.patientPopulationHPath }));
+          setOpportunity((prev) => ({ ...prev, encounterGroup: EncounterGroup.PatientPopulation }));
+          form.setFieldValue('encounterGroups', data.patientPopulationHPath.split(','));
+          setPatientPopulationsInitial(data.patientPopulationHPath.split(','));
+        } else {
+          opportunityInitial.explorationPopulationId = Number.parseInt(data.explorationPopulationId);
+          const populations = data.populationMembers.map((x) => ({ value: x.id, text: x.name } as IPickerItem));
+          form.setFieldValue('encounterGroups', populations[0]);
+          setOpportunity((prev) => ({ ...prev, encounterGroup: EncounterGroup.FlexibleExplorationPatientPopulation }));
+          setExpPopulationsInitial(data.explorationPopulationId);
+          setSelectedExpPopulations(populations);
+          setExplorationPopulations(populations);
+        }
+
+        setPrimaryMeasureChargeCodes(data.chargeCodes);
+        const primaryMeasureFiltersJson = data.measures.find((measure) => measure.measureGroup === MeasureGroup.Primary)?.filtersJSON;
+        const primaryMeasureChargeCodeIds = primaryMeasureFiltersJson ? JSON.parse(primaryMeasureFiltersJson).map(Number) : [];
+        const primaryMeasureChargeCodeIdSet = new Set(primaryMeasureChargeCodeIds);
+        setSelectedChargeCodes(data.chargeCodes.filter((cc) => primaryMeasureChargeCodeIdSet.has(cc.chargeCodeId)));
+        setSelectedChargeCodesInitial(cloneDeep(data.chargeCodes));
+        setChargeCodeMembers(data.chargeCodes);
+        const filterChipItems = parseFiltersFromJson(data.filters);
+        setOpportunityFilters(filterChipItems);
+        setOpportunityInitialFilters(cloneDeep(filterChipItems));
+
+        setPrimaryMeasures(primaryMeasure);
+
+        // Define Additional Measures step
+        const secondaryMeasure = data.measures.filter((measure) => measure.measureGroup === MeasureGroup.Secondary).sort((a, b) => a.measureId - b.measureId);
+        secondaryMeasure.forEach((measure) => ({ ...measure, desiredResult: measure.desiredResult, filtersJSON: parseFiltersFromJson(measure.filtersJSON) }));
+        form.setFieldValue('secondaryMeasures', secondaryMeasure);
+        const secondaryMeasureToUpdate = form.getFieldValue('secondaryMeasures');
+        secondaryMeasureToUpdate.forEach((measure: any) => {
+          measure.filters = parseFiltersFromJson(measure.filtersJSON);
+        });
+        form.setFieldValue(`secondaryMeasures`, secondaryMeasureToUpdate);
+
+        // Define Timeframe step
+        form.setFieldValue('baselinePeriod', [dayjs(data.baselineStartDate), dayjs(data.baselineEndDate)]);
+        setBaselinePeriodInitial(cloneDeep([dayjs(data.baselineStartDate), dayjs(data.baselineEndDate)]));
+        form.setFieldValue('baselineDistribution', data.baselineDistribution);
+        form.setFieldValue('estimatedTrackingDuration', data.estimatedTrackingDuration);
+
+        // Attach Files step
+        form.setFieldValue('workbooks', data.workbooks);
+      });
+    } finally {
+      setIsLoadingData(false);
+    }
+  };
+
+  const setTimeframeData = (startDate: Date | undefined = undefined, endDate: Date | undefined = undefined) => {
+    if (currentConfiguration) {
+      const dateStart = startDate ? dayjs(startDate) : dayjs(currentConfiguration.lastFiscalYearStartDate);
+      const dateEnd = endDate ? dayjs(endDate) : dayjs(currentConfiguration.lastFiscalYearEndDate);
+
+      setOpportunity((prev) => ({ ...prev, baselineType: BaselineType.MonthRange, baselineStartDate: dateStart, baselineEndDate: dateEnd, baselineDistribution: BaselineDistribution.Average }));
+
+      form.setFieldValue('baselinePeriod', [dateStart, dateEnd]);
+      form.setFieldValue('baselineDistribution', BaselineDistribution.Average);
+    }
+  };
+
+  // TODO: investigate better solution for getting form item value in step component
+  const getMeasureItem = (index: number): IStrategicOpportunityMeasureData | undefined => {
+    const measures = form.getFieldValue('secondaryMeasures');
+    return measures && measures.length && measures.length > index ? measures[index] : undefined;
+  };
+
+  const validateAndUpdateMeasureName = (index: number | null, revertValue: boolean): boolean => {
+    let isUpdated = false;
+
+    if (index !== null) {
+      const list = form.getFieldValue('secondaryMeasures');
+      const editName = list[index].editMeasureName.trim();
+
+      if (!revertValue && editName && list[index].editMeasureName.length <= 100) {
+        list[index].measureName = editName;
+        isUpdated = true;
+      } else if (revertValue) {
+        list[index].editMeasureName = list[index].measureName;
+        isUpdated = true;
+      }
+
+      if (isUpdated) {
+        form.setFieldValue(`secondaryMeasures`, list);
+      }
+    } else {
+      const editName = form.getFieldValue('editMeasureName');
+      const name = form.getFieldValue('measureName');
+      const trimEditName = editName?.trim();
+
+      if (!revertValue && trimEditName && editName.length <= 100) {
+        form.setFieldValue(`measureName`, trimEditName);
+        setPrimaryMeasures((prevOpp) => ({ ...prevOpp, measureName: trimEditName }));
+        isUpdated = true;
+      } else if (revertValue) {
+        form.setFieldValue(`editMeasureName`, name);
+        isUpdated = true;
+      }
+    }
+
+    return isUpdated;
+  };
+
+  const updateFiltersForSecondaryMeasure = (index: number, value: any) => {
+    const list = form.getFieldValue('secondaryMeasures');
+    list[index].filters = value;
+    form.setFieldValue(`secondaryMeasures`, list);
+  };
+
+  const setPrimaryMeasureChargeCodes = (primaryChargeCodes: IChargeCodeCustomPickerModel[]) => {
+    form.setFieldValue('primaryChargeCodes', primaryChargeCodes);
+    setSelectedChargeCodes(primaryChargeCodes);
+  };
+
+  const setExplorationPopulations = (expPopulations: IPickerItem[]) => {
+    form.setFieldValue('encounterGroups', expPopulations[0]?.value);
+    setSelectedExpPopulations(expPopulations);
+  };
+
+  const handleFormValuesChanged = (changedValues: any) => {
+    if (changedValues.encounterGroup != null) {
+      if (changedValues.encounterGroup === EncounterGroup.PatientPopulation) {
+        setTimeframeData();
+      }
+
+      setOpportunity({ ...opportunity, encounterGroup: changedValues.encounterGroup });
+
+      form.resetFields(['encounterGroups']);
+      form.setFieldValue('encounterGroups', changedValues.encounterGroups);
+    }
+
+    if (changedValues.measureType != null) {
+      const desiredResult = getDesiredResultByMeasureType(changedValues.measureType);
+      setPrimaryMeasures((prevOpp) => ({ ...prevOpp, desiredResult: desiredResult }));
+      form.setFieldValue('desiredResult', desiredResult);
+      form.setFieldValue('acceptableThreshold', 0);
+
+      form.validateFields({ dirty: true, recursive: true });
+    }
+
+    if (changedValues.desiredResult != null) {
+      setPrimaryMeasures((prevOpp) => ({ ...prevOpp, desiredResult: changedValues.desiredResult }));
+      form.setFieldValue('acceptableThreshold', 0);
+    }
+
+    if (changedValues.secondaryMeasures != null) {
+      const list = form.getFieldValue('secondaryMeasures');
+
+      changedValues.secondaryMeasures.forEach((item: IStrategicOpportunityMeasureData, ind: number) => {
+        if ((item.desiredResult && !item.acceptableThreshold) || changedValues.secondaryMeasures[ind].acceptableThreshold === '') {
+          list[ind].acceptableThreshold = 0;
+        }
+      });
+
+      form.setFieldValue(`secondaryMeasures`, list);
+      form.validateFields({ dirty: true, recursive: true });
+    }
+    if (changedValues.chargeCodes != null) {
+      loadChargeCodePickerModels(changedValues.chargeCodes);
+    }
+  };
+
+  const loadChargeCodePickerModels = (chargeCodeHPaths: string[]) => {
+    setLoading(true);
+    opportunityService
+      .getChargeCodePickerModels(chargeCodeHPaths)
+      .then((items: IChargeCodeCustomPickerModel[]) => {
+        setChargeCodeMembers(items);
+        setPrimaryMeasureChargeCodes(items);
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  };
+
+  const loadExpPopulationPickerModels = async () => {
+    setLoading(true);
+    try {
+      const items = await pickerItemsService.getExplorations();
+      setExpPopulationMembers(items);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleChange = async (currentStep: number, newStep: number) => {
+    form.submit();
+    const detailValues = form.getFieldsValue();
+
+    if (newStep < currentStep) {
+      setStepNumber(newStep);
+      return;
+    }
+    if (currentStep === 0) {
+      const oppName = detailValues?.name?.trim();
+
+      if (!oppName || !RegEx.JazzRestrictedCharacters.test(oppName)) {
+        return;
+      } else if ((!isEditMode || opportunity.name !== form.getFieldValue('name')) && !(await strategicOpportunityService.nameIsValid(oppName))) {
+        form.setFields([
+          {
+            name: 'name',
+            errors: [nameIsDuplicate]
+          }
+        ]);
+        return;
+      }
+    } else if (currentStep === 1) {
+      if (
+        !detailValues.encounterGroup ||
+        !detailValues.encounterGroups ||
+        detailValues.encounterGroups?.length === 0 ||
+        !detailValues.chargeCodes?.length ||
+        !detailValues.primaryChargeCodes ||
+        detailValues.measureType === undefined ||
+        !detailValues.desiredResult ||
+        (detailValues.desiredResult === DesiredResult.Steady && (detailValues.acceptableThreshold < 0 || detailValues.acceptableThreshold > 1))
+      ) {
+        return;
+      }
+    } else if (currentStep === 2) {
+      if (
+        detailValues.secondaryMeasures &&
+        detailValues.secondaryMeasures.find(
+          (item: any) => item.measureType === undefined || !item.desiredResult || (item.desiredResult === DesiredResult.Steady && (item.acceptableThreshold < 0 || item.acceptableThreshold > 1))
+        )
+      ) {
+        return;
+      }
+    } else if (currentStep === 3) {
+      if (
+        detailValues.baselineType === undefined ||
+        detailValues.baselinePeriod === undefined ||
+        detailValues.baselineDistribution === undefined ||
+        detailValues.estimatedTrackingDuration < 1 ||
+        detailValues.estimatedTrackingDuration > 99
+      ) {
+        return;
+      }
+    }
+
+    updateOpportunity(detailValues);
+    setStepNumber(newStep);
+  };
+
+  const updateOpportunity = (updatedValues: any): IStrategicOpportunityChargeCodeData => {
+    const updatedStepValues: Partial<IStrategicOpportunityChargeCodeData> = {};
+
+    if (stepNumber === 0) {
+      updatedStepValues.name = updatedValues?.name?.trim();
+      updatedStepValues.rollup1Id = updatedValues.rollup1Id;
+      updatedStepValues.rollup2Id = updatedValues.rollup2Id;
+      updatedStepValues.rollup3Id = updatedValues.rollup3Id;
+    } else if (stepNumber === 1) {
+      if (updatedValues.encounterGroup === EncounterGroup.PatientPopulation) {
+        // Info: is it OK to store multiple values as csv HPath?
+        updatedStepValues.patientPopulationHPath = updatedValues.encounterGroups.join(',');
+        updatedStepValues.explorationPopulationId = 0;
+      } else if (updatedValues.encounterGroup === EncounterGroup.FlexibleExplorationPatientPopulation) {
+        updatedStepValues.patientPopulationHPath = '';
+        // Info: is it OK to store multiple values as csv HPath?
+        updatedStepValues.explorationPopulationId = updatedValues.encounterGroups.toString(); // here we have a single choice, so we have only one element in there
+        populationService.getDischargeDates(updatedValues.encounterGroups).then((value) => {
+          setTimeframeData(value.item1, value.item2);
+        });
+      }
+
+      // Info: is it OK to store multiple values as csv of HPath?
+      updatedStepValues.chargeCodeHPath = updatedValues.chargeCodes.join(',');
+      updatedStepValues.opportunityFiltersJSON = JSON.stringify(opportunityFilters);
+
+      const primaryChargeCodeIds = updatedValues.primaryChargeCodes.map((cc: IChargeCodeCustomPickerModel) => cc.chargeCodeId);
+      const selectedChargeCodeIds = new Set(selectedChargeCodes.map((scc) => scc.chargeCodeId));
+      const selectedPrimaryChargeCodesIds = primaryChargeCodeIds.filter((cc: number) => selectedChargeCodeIds.has(cc));
+
+      setPrimaryMeasures((prevOpp) => ({
+        ...prevOpp,
+        measureType: updatedValues.measureType,
+        desiredResult: updatedValues.desiredResult,
+        acceptableThreshold: updatedValues.acceptableThreshold || 0,
+        filtersJSON: JSON.stringify(selectedPrimaryChargeCodesIds),
+        measureGroup: MeasureGroup.Primary
+      }));
+
+      updatedStepValues.measures = [primaryMeasures];
+    } else if (stepNumber === 2) {
+      const secondaryMeasures =
+        updatedValues.secondaryMeasures?.map((x: any) => ({
+          measureType: x.measureType,
+          measureName: x.measureName,
+          desiredResult: x.desiredResult,
+          acceptableThreshold: x.acceptableThreshold || 0,
+          filtersJSON: JSON.stringify(x.filters),
+          measureGroup: MeasureGroup.Secondary
+        })) || [];
+      const dataMeasures = [primaryMeasures, ...secondaryMeasures];
+      updatedStepValues.measures = dataMeasures ? dataMeasures : [];
+    } else if (stepNumber === 3) {
+      updatedStepValues.baselineStartDate = updatedValues.baselinePeriod[0];
+      updatedStepValues.baselineEndDate = updatedValues.baselinePeriod[1];
+      updatedStepValues.baselineDistribution = updatedValues.baselineDistribution;
+      updatedStepValues.estimatedTrackingDuration = updatedValues.estimatedTrackingDuration;
+    } else if (stepNumber === 4) {
+      updatedStepValues.workbookIds = updatedValues.workbooks ? updatedValues.workbooks.map((x: { workbookId: number }) => x.workbookId) : [];
+    }
+    const opp = { ...opportunity, ...updatedStepValues, opportunityId: strategicOpportunityId };
+    setOpportunity(opp);
+    return opp;
+  };
+
+  const handleCancel = () => {
+    history.goBack();
+  };
+
+  const handleUpdateWorkbookLinks = (workbooks: IWorkbook[]) => {
+    form.setFieldValue('workbooks', workbooks);
+  };
+
+  const handleChargeCodesUploaded = (chargeCodes: string[]) => {
+    form.setFieldsValue({ chargeCodes: chargeCodes });
+    loadChargeCodePickerModels(chargeCodes);
+    setUploadModalVisible(false);
+  };
+
+  const getStrategicOpportunityData = () => {
+    const detailValues = form.getFieldsValue();
+    const opp = updateOpportunity(detailValues);
+    const data = adjustDatetimeToDateString(opp);
+    return data;
+  };
+
+  const handleUpdateStrategicOpportunity = async (shouldPopulateOpportunityDetails: boolean) => {
+    const data = getStrategicOpportunityData();
+    await strategicOpportunityService.updateOpportunityChargeCode(strategicOpportunityId, data, shouldPopulateOpportunityDetails);
+    window.location.assign(`/continuousimprovement/strategic-opportunity/${strategicOpportunityId}`);
+
+    toast.show({
+      key: `Opportunity ${opportunity.name}`,
+      toastType: 'success',
+      message: `Opportunity ${opportunity.name} has been updated.`
+    });
+  };
+
+  const handleSubmit = async () => {
+    setLoading(true);
+
+    try {
+      if (isEditMode) {
+        const shouldPopulateOpportunityDetails =
+          !isEqual(opportunityFilters, opportunityInitialFilters) ||
+          !isEqual(chargeCodeMembers, selectedChargeCodesInitial) ||
+          !isEqual(form.getFieldValue('baselinePeriod'), baselinePeriodInitial) ||
+          !isEqual(opportunity.patientPopulationHPath.split(',').sort(), patientPopulationsInitial.sort()) ||
+          !isEqual(opportunity.explorationPopulationId.toString(), expPopulationsInitial.toString());
+        if (shouldPopulateOpportunityDetails) {
+          modal.confirm({
+            title: 'Changing opportunity details resets goals',
+            content: 'Updating filters or the baseline period, or baseline distribution resets your saved goals. Click Cancel to keep your goals.',
+            okText: 'Continue',
+            cancelText: 'Cancel',
+            async onOk() {
+              await handleUpdateStrategicOpportunity(shouldPopulateOpportunityDetails);
+            }
+          });
+        } else {
+          await handleUpdateStrategicOpportunity(false);
+        }
+      } else {
+        const data = getStrategicOpportunityData();
+        const opportunityId = await strategicOpportunityService.createOpportunityChargeCode(data);
+        window.location.assign(`/continuousimprovement/strategic-opportunity/${opportunityId}`);
+      }
+    } catch {
+      toast.show({
+        key: opportunity.name,
+        message: `${opportunity.name} Opportunity was not saved. Try again and contact us if the issue continues.`,
+        toastType: 'error'
+      });
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const wizardSteps = () => {
+    const steps: JSX.Element[] = [
+      <Wizard.Step key='0' title='Opportunity Details'>
+        <StrategicOpportunityDetail rollupColumns={rollupColumns} />
+      </Wizard.Step>
+    ];
+
+    steps.push(
+      <Wizard.Step key='1' title='Define Opportunity'>
+        <StrategicOpportunityDefine
+          encounterGroup={opportunity.encounterGroup}
+          desiredResult={primaryMeasures.desiredResult}
+          measureName={primaryMeasures.measureName}
+          hasChargeCodes={form.getFieldValue('chargeCodes')?.length}
+          chargeCodeMembers={chargeCodeMembers}
+          selectedChargeCodes={selectedChargeCodes}
+          expPopulationMembers={expPopulationMembers}
+          selectedExpPopulations={selectedExpPopulations}
+          setExplorationPopulations={setExplorationPopulations}
+          setPrimaryMeasureChargeCodes={setPrimaryMeasureChargeCodes}
+          loadExpPopulationPickerModels={loadExpPopulationPickerModels}
+          setUploadModalVisible={setUploadModalVisible}
+          setLoading={setLoading}
+          validateAndUpdateMeasureName={validateAndUpdateMeasureName}
+          filters={opportunityFilters}
+          updateFilters={(value) => setOpportunityFilters(value)}
+          isPrePopulated={isPrePopulated}
+          expPopCostDriver={expPopCostDriver}
+        />
+      </Wizard.Step>
+    );
+    steps.push(
+      <Wizard.Step key='2' title='Define Additional Measures'>
+        <StrategicOpportunityDefineAdditional
+          getMeasureItem={getMeasureItem}
+          updateFiltersForSecondaryMeasure={updateFiltersForSecondaryMeasure}
+          validateAndUpdateMeasureName={validateAndUpdateMeasureName}
+        />
+      </Wizard.Step>
+    );
+    steps.push(
+      <Wizard.Step key='3' title='Define Timeframe'>
+        <StrategicOpportunityDefineTimeframe
+          isExplorationPopulation={opportunity.encounterGroup === EncounterGroup.FlexibleExplorationPatientPopulation}
+          baselineStartDate={opportunity.baselineStartDate}
+          baselineEndDate={opportunity.baselineEndDate}
+        />
+      </Wizard.Step>
+    );
+    steps.push(
+      <Wizard.Step key='4' title='Attach Files'>
+        <StrategicOpportunityExternalLinks workbooks={workbooks} selectedWorkbooks={form.getFieldValue('workbooks')} updateWorkbookLinks={handleUpdateWorkbookLinks} />
+      </Wizard.Step>
+    );
+    return steps;
+  };
+
+  // Prefill from query params if present and call loadEditData for charge code wizard
+  useEffect(() => {
+    const params = new URLSearchParams(location.search);
+    const explorationPopulationId = params.get('explorationPopulationId');
+
+    if (explorationPopulationId === null) {
+      return;
+    }
+
+    const fetchData = async () => {
+      try {
+        setLoading(true);
+        if (location.pathname.includes('/strategic-opportunities/create/charge-code') && !isEditMode) {
+          const data = await populationService.getPopulationDetails(Number(explorationPopulationId));
+          const name = data.name;
+          const expPopCostDriver = (data.costDriver?.split(',') ?? [])
+            .map((s) => s.trim())
+            .filter(Boolean)
+            .map((s) => `CC|CCRU|${s}`);
+          const opportunityType = OpportunityTypes.StrategicOpportunityChargeCode;
+
+          let baselineStart: dayjs.Dayjs;
+          let baselineEnd: dayjs.Dayjs;
+
+          const dateRangeFilter = data.filters.find((fil) => fil.label === 'Discharge Date');
+
+          if (dateRangeFilter && dateRangeFilter.dateRange) {
+            baselineStart = dateRangeFilter.dateRange[0];
+            baselineEnd = dateRangeFilter.dateRange[1];
+            form.setFieldValue('baselinePeriod', [baselineStart, baselineEnd]);
+            setBaselinePeriodInitial(cloneDeep([baselineStart, baselineEnd]));
+          }
+
+          loadChargeCodePickerModels(expPopCostDriver);
+          setOpportunity((prev) => ({
+            ...prev,
+            ...(explorationPopulationId ? { explorationPopulationId: Number(explorationPopulationId) } : {}),
+            ...(name ? { name } : {}),
+            opportunityType: opportunityType,
+            encounterGroup: EncounterGroup.FlexibleExplorationPatientPopulation,
+            ...(baselineStart ? { baselineStartDate: baselineStart } : {}),
+            ...(baselineEnd ? { baselineEndDate: baselineEnd } : {})
+          }));
+          setExpPopCostDriver(expPopCostDriver ?? []);
+          form.setFieldValue('name', name);
+          form.setFieldValue('opportunityType', OpportunityTypesDisplayString[OpportunityTypes.ChargeCode]);
+          form.setFieldValue('encounterGroup', EncounterGroup.FlexibleExplorationPatientPopulation);
+          setIsPrePopulated(true); // This disables the ability to change Encounter Group
+
+          const populations: IPickerItem[] = [{ value: Number(explorationPopulationId) || 0, text: name || '' }];
+          setExpPopulationsInitial(explorationPopulationId ?? '0');
+          setExplorationPopulations(populations);
+        }
+      } finally {
+        setLoading(false);
+      }
+    };
+    fetchData();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return (
+    <>
+      <Header title={`${isEditMode ? 'Edit' : 'Create'} Strategic Opportunity`} />
+      <Form
+        form={form}
+        layout='vertical'
+        maxWidth={stepNumber !== 0 ? '100%' : 800}
+        initialValues={{ ...opportunityInitial, measureType: undefined, desiredResult: undefined, editMeasureName: 'Primary Measure' }}
+        onValuesChange={handleFormValuesChanged}
+      >
+        <Wizard currentStep={stepNumber} submitButtonText='Save' loading={isLoadingData ? isLoadingData : loading} onChange={handleChange} onSubmit={handleSubmit} onCancel={handleCancel}>
+          {wizardSteps()}
+        </Wizard>
+      </Form>
+      <ChargeCodeUploadModal
+        isVisible={uploadModalVisible}
+        opportunityGuid={zeroGuid}
+        chargeCodes={form.getFieldValue('chargeCodes') || []}
+        onCancel={() => setUploadModalVisible(false)}
+        onOk={handleChargeCodesUploaded}
+      />
+    </>
+  );
+};
+
+export default StrategicOpportunity;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityDefine.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityDefine.tsx
new file mode 100644
index 0000000..97bb7b6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityDefine.tsx
@@ -0,0 +1,270 @@
+import ScoreMemberPicker from '@strata/score/lib/ScoreMemberPicker/ScoreMemberPicker';
+import Button from '@strata/tempo/lib/button/Button';
+import Card from '@strata/tempo/lib/card/Card';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import Form from '@strata/tempo/lib/form/Form';
+import UploadIcon from '@strata/tempo/lib/icon/UploadIcon';
+import InputNumber from '@strata/tempo/lib/inputnumber/InputNumber';
+import PickerBase from '@strata/tempo/lib/pickerbase/PickerBase';
+import RadioGroup from '@strata/tempo/lib/radiogroup/RadioGroup';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import { ITreeNode, Key } from '@strata/tempo/lib/tree/Tree';
+import React, { useMemo, useState } from 'react';
+import { useLocation } from 'react-router-dom';
+import { ChipKey, IFilterChipItem } from '../../shared/components/FilterBar/data/IFilterChipItem';
+import { IPickerItem } from '../../shared/data/IPickerItem';
+import { EncounterGroup } from '../../shared/opportunities/data/EncounterGroup';
+import { IScoreFieldInfo } from '../../shared/opportunities/data/IScoreFieldInfo';
+import CustomPickerModal from '../../shared/picker/CustomPickerModal';
+import { explorationPopulationIdAttributeGuid, splitCamelCase } from '../../shared/utilities';
+import { DesiredResult, DesiredResultData } from '../data/DesiredResult';
+import { IChargeCodeCustomPickerModel } from '../data/IChargeCodeCustomPickerModel';
+import { measureTypeData, primaryMeasureList } from '../data/MeasureType';
+import ChargeCodeCustomPickerModal from './ChargeCodeCustomPickerModal';
+import StrategicFilterBar from './StrategicOpportunityFilters';
+import StrategicOpportunityRenameMeasure from './StrategicOpportunityRenameMeasure';
+
+export interface IStrategicOpportunityDefineProps {
+  encounterGroup: EncounterGroup;
+  desiredResult: DesiredResult;
+  measureName: string;
+  filters: IFilterChipItem[];
+  hasChargeCodes: boolean;
+  chargeCodeMembers: IChargeCodeCustomPickerModel[];
+  selectedChargeCodes: IChargeCodeCustomPickerModel[];
+  expPopulationMembers: IPickerItem[];
+  selectedExpPopulations: IPickerItem[];
+  setExplorationPopulations: (selectedChargeCodes: IPickerItem[]) => void;
+  setPrimaryMeasureChargeCodes: (selectedChargeCodes: IChargeCodeCustomPickerModel[]) => void;
+  setUploadModalVisible: (value: boolean) => void;
+  loadExpPopulationPickerModels: () => Promise<void>;
+  setLoading: (value: boolean) => void;
+  updateFilters: (value: IFilterChipItem[]) => void;
+  validateAndUpdateMeasureName: (index: number | null, revertValue: boolean) => boolean;
+  isPrePopulated: boolean;
+  expPopCostDriver: string[];
+}
+
+const StrategicOpportunityDefine: React.FC<IStrategicOpportunityDefineProps> = (props: IStrategicOpportunityDefineProps) => {
+  const {
+    filters,
+    desiredResult,
+    hasChargeCodes,
+    measureName,
+    chargeCodeMembers,
+    selectedChargeCodes,
+    expPopulationMembers,
+    selectedExpPopulations,
+    setExplorationPopulations,
+    setPrimaryMeasureChargeCodes,
+    setUploadModalVisible,
+    loadExpPopulationPickerModels,
+    updateFilters,
+    validateAndUpdateMeasureName,
+    isPrePopulated,
+    expPopCostDriver
+  } = props;
+  const [encounterGroup, setEncounterGroup] = useState<EncounterGroup>(props.encounterGroup);
+  const [primaryMeasurePickerVisible, setPrimaryMeasurePickerVisible] = useState<boolean>(false);
+  const [explorationPopulationPickerVisible, setExplorationPopulationPickerVisible] = useState<boolean>(false);
+
+  const location = useLocation();
+
+  const primaryMeasureItems = useMemo((): IPickerItem[] => measureTypeData.filter((x) => primaryMeasureList.includes(x.key)).map((x) => ({ value: x.key, text: x.name })), []);
+  const desiredResultItems = useMemo((): IPickerItem[] => DesiredResultData.map((x) => ({ value: x.key, text: x.name })), []);
+  const isExplorationPopulationMode = useMemo((): boolean => location.search.includes('explorationPopulationId'), [location.search]);
+
+  const onPrimaryMeasurePickerClick = () => {
+    setPrimaryMeasurePickerVisible(!primaryMeasurePickerVisible);
+  };
+
+  const onPickerSave = (values: Key[]) => {
+    setExplorationPopulations(expPopulationMembers.filter((e) => values.includes(e.value)));
+  };
+
+  const onExplorationModalOpen = async () => {
+    if (!expPopulationMembers?.length) {
+      await loadExpPopulationPickerModels();
+    }
+    setExplorationPopulationPickerVisible(true);
+  };
+
+  const getEncounterGroupFieldInfo = (): IScoreFieldInfo => {
+    if (encounterGroup === EncounterGroup.PatientPopulation) {
+      return {
+        dimensionName: 'Patient Populations',
+        dimensionGuidOrGlobalId: 'Clinical Indicator',
+        modalTitle: 'Patient Populations'
+      };
+    } else {
+      return {
+        dimensionName: 'Case Type',
+        dimensionGuidOrGlobalId: 'Case Type',
+        filters: [{ op: 'NotEquals', attributeGuid: explorationPopulationIdAttributeGuid, value: 0 }],
+        modalTitle: 'Exploration Patient Populations'
+      };
+    }
+  };
+
+  const encounterGroupFieldInfo = getEncounterGroupFieldInfo();
+  const chargeCodeLabel = (
+    <Spacing hAlign='space-between' width={400}>
+      <Text size='normal' strong>
+        {`Charge Codes`}
+      </Text>
+      {!isPrePopulated ? (
+        <Button icon={<UploadIcon />} type='link' onClick={() => setUploadModalVisible(true)}>
+          Upload
+        </Button>
+      ) : null}
+    </Spacing>
+  );
+
+  return (
+    <Spacing padding={16} column>
+      <Card title='Opportunity Definition'>
+        <Form.Item label='Encounter Group' name='encounterGroup' rules={[{ required: true }]}>
+          <RadioGroup
+            onChange={(e) => {
+              setExplorationPopulations([]);
+              setEncounterGroup(e.target.value as EncounterGroup);
+            }}
+            options={[
+              { value: EncounterGroup.PatientPopulation, label: 'Patient Population', disabled: isPrePopulated },
+              { value: EncounterGroup.FlexibleExplorationPatientPopulation, label: 'Exploration Patient Population', disabled: isPrePopulated }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item
+          label={encounterGroupFieldInfo.modalTitle}
+          name='encounterGroups'
+          rules={[
+            { required: true },
+            () => ({
+              async validator(_, value) {
+                if (!value) {
+                  return Promise.reject(new Error());
+                }
+                if (value.length > 20) {
+                  return Promise.reject(new Error(`You have exceeded the maximum of 20 ${splitCamelCase(EncounterGroup[encounterGroup])} selections.`));
+                }
+                return Promise.resolve();
+              }
+            })
+          ]}
+        >
+          {encounterGroup === EncounterGroup.PatientPopulation ? (
+            <ScoreMemberPicker
+              dimensionGuidOrGlobalId={encounterGroupFieldInfo.dimensionGuidOrGlobalId}
+              hierarchyGuid={encounterGroupFieldInfo.hierarchyGuid}
+              showHierarchyDropdown={false}
+              filters={encounterGroupFieldInfo.filters ?? []}
+              modalTitle={encounterGroupFieldInfo.modalTitle}
+              pickerWidth={400}
+              selectionMode='multiple'
+              okText='Select'
+            ></ScoreMemberPicker>
+          ) : (
+            <>
+              <CustomPickerModal
+                elements={expPopulationMembers?.map((e) => {
+                  return { key: e.value, title: e.text } as ITreeNode;
+                })}
+                title='Exploration Patient Populations'
+                selectedElements={selectedExpPopulations.map((e) => e.value)}
+                isVisible={isPrePopulated ? false : explorationPopulationPickerVisible}
+                closeModal={() => setExplorationPopulationPickerVisible(false)}
+                onApply={onPickerSave}
+              />
+              {!isPrePopulated ? (
+                <PickerBase items={selectedExpPopulations} itemTextField={'text'} width={400} onEdit={() => onExplorationModalOpen()} />
+              ) : (
+                <Text>{selectedExpPopulations.map((item) => item.text).join(', ')}</Text>
+              )}
+            </>
+          )}
+        </Form.Item>
+        <Form.Item
+          label={chargeCodeLabel}
+          name='chargeCodes'
+          initialValue={isPrePopulated ? expPopCostDriver : null}
+          rules={[
+            { required: true },
+            () => ({
+              async validator(_, value) {
+                if (!value) {
+                  return Promise.reject(new Error());
+                }
+                return Promise.resolve();
+              }
+            })
+          ]}
+        >
+          {!isPrePopulated ? (
+            <ScoreMemberPicker
+              dimensionGuidOrGlobalId={'Charge Code'}
+              showHierarchyDropdown={false}
+              hierarchyGuid={'1f7bd500-a966-457d-9b47-a6944b02841b'}
+              modalTitle={'Charge Codes'}
+              pickerWidth={400}
+              selectionMode='multiple'
+              okText='Select'
+            ></ScoreMemberPicker>
+          ) : (
+            <Text>
+              {expPopCostDriver
+                .map((item) => item.split('|')[2])
+                .filter(Boolean)
+                .join(', ')}
+            </Text>
+          )}
+        </Form.Item>
+        <Text strong>Filters (optional)</Text>
+        <Spacing column hAlign='left' padding={'0 0 24px 0'}>
+          <StrategicFilterBar
+            filterChipsProp={filters || []}
+            excludedChips={[ChipKey.DischargeDate, ChipKey.CostDriver, ChipKey.ChargeCode, ChipKey.CostComponent]}
+            filterId={'primaryMeasureFilter'}
+            onFiltersChange={(filterId, filter) => {
+              updateFilters(filter);
+            }}
+          />
+        </Spacing>
+      </Card>
+      <Card title={<StrategicOpportunityRenameMeasure index={null} measureName={measureName} disabled={!hasChargeCodes} validateAndUpdateMeasureName={validateAndUpdateMeasureName} />}>
+        <Spacing width='fit-content' itemSpacing={12}>
+          <Form.Item label='Charge Codes' name='primaryChargeCodes' rules={[{ required: true }]}>
+            <ChargeCodeCustomPickerModal
+              isVisible={primaryMeasurePickerVisible}
+              chargeCodes={chargeCodeMembers}
+              selectedChargeCodes={selectedChargeCodes}
+              closeModal={() => setPrimaryMeasurePickerVisible(false)}
+              onApply={setPrimaryMeasureChargeCodes}
+            />
+            <Button type='link' disabled={!chargeCodeMembers?.length} onClick={onPrimaryMeasurePickerClick}>
+              {`${!selectedChargeCodes?.length ? '0' : selectedChargeCodes?.length} selected`}
+            </Button>
+          </Form.Item>
+          <Form.Item label='Type' name='measureType' rules={[{ required: isExplorationPopulationMode ? true : hasChargeCodes }]}>
+            <DropDown placeholder='Primary Measure' disabled={isExplorationPopulationMode ? false : !hasChargeCodes} items={primaryMeasureItems} width={300} />
+          </Form.Item>
+          <Form.Item label='Desired Result' name='desiredResult' rules={[{ required: isExplorationPopulationMode ? true : hasChargeCodes }]}>
+            <DropDown placeholder='Desired Result' disabled={isExplorationPopulationMode ? false : !hasChargeCodes} width={300} items={desiredResultItems} />
+          </Form.Item>
+          {desiredResult === DesiredResult.Steady && (
+            <Form.Item
+              label='Acceptable Threshold (+ / -)'
+              name='acceptableThreshold'
+              rules={[{ required: hasChargeCodes }, { type: 'number', min: 0, max: 1, message: 'Acceptable Threshold must be between 0% and 100%' }]}
+            >
+              <InputNumber width={300} disabled={!hasChargeCodes} format='percent' precision={2} />
+            </Form.Item>
+          )}
+        </Spacing>
+      </Card>
+    </Spacing>
+  );
+};
+
+export default StrategicOpportunityDefine;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityDefineAdditional.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityDefineAdditional.tsx
new file mode 100644
index 0000000..faddc27
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityDefineAdditional.tsx
@@ -0,0 +1,117 @@
+import ActionBar from '@strata/tempo/lib/actionbar/ActionBar';
+import Button from '@strata/tempo/lib/button/Button';
+import ButtonMenu from '@strata/tempo/lib/buttonmenu/ButtonMenu';
+import Card from '@strata/tempo/lib/card/Card';
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import Empty from '@strata/tempo/lib/empty/Empty';
+import Form from '@strata/tempo/lib/form/Form';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import InputNumber from '@strata/tempo/lib/inputnumber/InputNumber';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import React, { useMemo } from 'react';
+import { ChipKey } from '../../shared/components/FilterBar/data/IFilterChipItem';
+import { IKeyLabelItem } from '../../shared/data/IKeyTextItem';
+import { IPickerItem } from '../../shared/data/IPickerItem';
+import { DesiredResult, DesiredResultData } from '../data/DesiredResult';
+import { getDesiredResultByMeasureType, measureTypeData } from '../data/MeasureType';
+import StrategicFilterBar from './StrategicOpportunityFilters';
+import StrategicOpportunityRenameMeasure from './StrategicOpportunityRenameMeasure';
+
+export interface IStrategicOpportunityDefineAdditionalProps {
+  getMeasureItem: (index: number) => any;
+  validateAndUpdateMeasureName: (index: number | null, revertValue: boolean) => boolean;
+  updateFiltersForSecondaryMeasure: (index: number, value: any) => void;
+}
+
+const StrategicOpportunityDefineAdditional: React.FC<IStrategicOpportunityDefineAdditionalProps> = (props: IStrategicOpportunityDefineAdditionalProps) => {
+  const { getMeasureItem, validateAndUpdateMeasureName, updateFiltersForSecondaryMeasure } = props;
+
+  const secondaryMeasureItems = useMemo((): IKeyLabelItem[] => measureTypeData.map((x) => ({ key: x.key, label: x.name })), []);
+  const desiredResultItems = useMemo((): IPickerItem[] => DesiredResultData.map((x) => ({ value: x.key, text: x.name })), []);
+
+  return (
+    <Form.List name='secondaryMeasures'>
+      {(fields, { add, remove }) => (
+        <>
+          <ActionBar
+            actions={
+              <ButtonMenu
+                icon={<PlusIcon />}
+                disabled={fields.length >= 3}
+                buttonText='Add Additional Measure'
+                onClick={(e) => {
+                  const _key = Number(e.key);
+                  const measureItem = measureTypeData.find((x) => x.key === _key);
+                  const measureName = measureItem ? measureItem.name : '';
+                  const desiredResult = getDesiredResultByMeasureType(measureItem?.key);
+                  add({ measureType: _key, editMeasureName: measureName, measureName: measureName, desiredResult: desiredResult, filters: [] });
+                }}
+                items={secondaryMeasureItems}
+              />
+            }
+          />
+          {!fields.length && (
+            <Spacing column padding={24}>
+              <Card>
+                <Empty title={'No Additional Measures Added'} />
+                <Spacing hAlign='center' style={{ fontStyle: 'italic' }}>
+                  <Text color='secondary'>Optional</Text>
+                </Spacing>
+              </Card>
+            </Spacing>
+          )}
+          <Spacing column padding={16}>
+            {fields.map(({ key, name, ...restField }, index) => {
+              const measureItem = getMeasureItem(index);
+              return measureItem ? (
+                <Card
+                  title={<StrategicOpportunityRenameMeasure index={index} measureName={measureItem.measureName} disabled={false} validateAndUpdateMeasureName={validateAndUpdateMeasureName} />}
+                  extra={
+                    <Button onClick={() => remove(name)}>
+                      <DeleteIcon />
+                    </Button>
+                  }
+                >
+                  <Spacing padding={'0 0 12px 0'}>
+                    <Spacing style={{ minWidth: 250 }}>
+                      <Form.Item label='Measure Type' name={[name, 'measureType']} rules={[{ required: true }]}>
+                        <Text>{measureTypeData.find((item) => item.key === measureItem.measureType)?.name}</Text>
+                      </Form.Item>
+                    </Spacing>
+                    <Form.Item label='Desired Result' name={[name, 'desiredResult']} rules={[{ required: true }]}>
+                      <DropDown placeholder='Desired Result' width={400} items={desiredResultItems} />
+                    </Form.Item>
+                    {measureItem.desiredResult === DesiredResult.Steady && (
+                      <Form.Item
+                        label='Acceptable Threshold (+ / -)'
+                        name={[name, 'acceptableThreshold']}
+                        rules={[{ required: true }, { type: 'number', min: 0, max: 1, message: 'Acceptable Threshold must be between 0% and 100%' }]}
+                      >
+                        <InputNumber width={400} format='percent' precision={2} />
+                      </Form.Item>
+                    )}
+                  </Spacing>
+                  <Text strong>Filters</Text>
+                  <StrategicFilterBar
+                    filterChipsProp={measureItem.filters ?? []}
+                    excludedChips={[ChipKey.DischargeDate, ChipKey.CostDriver]}
+                    filterId={`${index}`}
+                    onFiltersChange={(filterId, filters) => {
+                      updateFiltersForSecondaryMeasure(index, filters);
+                    }}
+                  />
+                </Card>
+              ) : (
+                <></>
+              );
+            })}
+          </Spacing>
+        </>
+      )}
+    </Form.List>
+  );
+};
+
+export default StrategicOpportunityDefineAdditional;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityDefineTimeframe.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityDefineTimeframe.tsx
new file mode 100644
index 0000000..97272ff
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityDefineTimeframe.tsx
@@ -0,0 +1,63 @@
+import Card from '@strata/tempo/lib/card/Card';
+import DatePicker from '@strata/tempo/lib/datepicker/DatePicker';
+import Form from '@strata/tempo/lib/form/Form';
+import InfoCircleIcon from '@strata/tempo/lib/icon/InfoCircleIcon';
+import InputNumber from '@strata/tempo/lib/inputnumber/InputNumber';
+import RadioGroup from '@strata/tempo/lib/radiogroup/RadioGroup';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+import Tooltip from '@strata/tempo/lib/tooltip/Tooltip';
+import dayjs, { Dayjs } from 'dayjs';
+import React, { useMemo } from 'react';
+import { IValueLabelItem } from '../../shared/data/IKeyTextItem';
+import { BaselineDistributionData, BaselineType, BaselineTypeData } from '../data/BaselineType';
+
+export interface IStrategicOpportunityDefineTimeframeProps {
+  isExplorationPopulation: boolean;
+  baselineStartDate: Dayjs;
+  baselineEndDate: Dayjs;
+}
+
+const StrategicOpportunityDefineTimeframe: React.FC<IStrategicOpportunityDefineTimeframeProps> = (props: IStrategicOpportunityDefineTimeframeProps) => {
+  const { isExplorationPopulation, baselineStartDate, baselineEndDate } = props;
+  const monthRangeText = useMemo((): string => BaselineTypeData.find((x) => x.key === BaselineType.MonthRange)?.name || '', []);
+  const baselineDistributionItems = useMemo((): IValueLabelItem[] => BaselineDistributionData.map((x) => ({ value: x.key, label: x.name })), []);
+
+  return (
+    <Spacing padding={16} column>
+      <Card>
+        <Form.Item label='Baseline Type' name='baselineType' rules={[{ required: true }]}>
+          <Text>{monthRangeText}</Text>
+        </Form.Item>
+        <Form.Item label='Baseline Period' name='baselinePeriod' rules={[{ required: true }]} extra='If less than 12 months baseline period will be annualized'>
+          {isExplorationPopulation ? (
+            <Tooltip title='Baseline period is set by the discharge dates from the selected exploration population. To change it, edit the population in Exploration Population Management.'>
+              <DatePicker.RangePicker value={[baselineStartDate, baselineEndDate]} disabled={[isExplorationPopulation, isExplorationPopulation]} width={400} />
+            </Tooltip>
+          ) : (
+            <DatePicker.RangePicker width={400} disabledDate={(d) => !d?.isBefore(dayjs().add(-1, 'day'))} />
+          )}
+        </Form.Item>
+        <Form.Item label='Baseline Distribution' name='baselineDistribution' rules={[{ required: true }]}>
+          <RadioGroup options={baselineDistributionItems} />
+        </Form.Item>
+        <Form.Item
+          label={
+            <>
+              Estimated Tracking Duration (Months)
+              <Tooltip title='This will be used in the Total Improvement calculation during Goal Setting'>
+                <InfoCircleIcon style={{ paddingLeft: '4px' }} color='blue-500' />
+              </Tooltip>
+            </>
+          }
+          name='estimatedTrackingDuration'
+          rules={[{ required: true }, { type: 'number', min: 1, max: 99, message: 'Estimated Tracking Duration must be between 1 and 99' }]}
+        >
+          <InputNumber width={260} />
+        </Form.Item>
+      </Card>
+    </Spacing>
+  );
+};
+
+export default StrategicOpportunityDefineTimeframe;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityDetail.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityDetail.tsx
new file mode 100644
index 0000000..0c0c058
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityDetail.tsx
@@ -0,0 +1,61 @@
+import DropDown from '@strata/tempo/lib/dropdown/DropDown';
+import Form from '@strata/tempo/lib/form/Form';
+import Input from '@strata/tempo/lib/input/Input';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import React, { useMemo } from 'react';
+import { IInitiativeRollupColumn } from '../../initiatives/data/IInitiativeRollupColumn';
+import { OpportunityTypes } from '../../opportunities/opportunities/data/IAllOpportunity';
+import { IPickerItem } from '../../shared/data/IPickerItem';
+import { RegEx } from '../../shared/validation/RegEx';
+
+export interface IStrategicOpportunitDetailyProps {
+  rollupColumns: IInitiativeRollupColumn[];
+}
+
+enum StrategicOpportunityTypesDisplayString {
+  'Charge Code' = OpportunityTypes.StrategicOpportunityChargeCode
+}
+
+const StrategicOpportunityDetail: React.FC<IStrategicOpportunitDetailyProps> = (props: IStrategicOpportunitDetailyProps) => {
+  const { rollupColumns } = props;
+  const opportunityTypeItems = useMemo((): IPickerItem[] => {
+    const items: IPickerItem[] = [];
+
+    for (const key in StrategicOpportunityTypesDisplayString) {
+      if (!isNaN(Number(key))) {
+        continue;
+      }
+      items.push({ value: +StrategicOpportunityTypesDisplayString[key], text: key });
+    }
+
+    return items;
+  }, []);
+
+  const rollupItems = useMemo(
+    (): JSX.Element[] =>
+      rollupColumns.map((rollupColumn) => (
+        <Form.Item key={rollupColumn.initiativeRollupColumnId} label={rollupColumn.name} name={`rollup${rollupColumn.initiativeRollupColumnId}Id`}>
+          <DropDown
+            items={rollupColumn.initiativeRollupValues.map((c) => {
+              return { value: c.initiativeRollupValueId, text: c.value };
+            })}
+          />
+        </Form.Item>
+      )),
+    [rollupColumns]
+  );
+
+  return (
+    <Spacing padding={16} column>
+      <Form.Item label='Name' name='name' rules={[{ required: true, whitespace: true, max: 200 }, { pattern: RegEx.JazzRestrictedCharacters }]}>
+        <Input />
+      </Form.Item>
+      <Form.Item label='Opportunity Type' name='opportunityType' rules={[{ required: true }]}>
+        <DropDown disabled items={opportunityTypeItems} />
+      </Form.Item>
+      {rollupItems}
+    </Spacing>
+  );
+};
+
+export default StrategicOpportunityDetail;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityExternalLinks.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityExternalLinks.tsx
new file mode 100644
index 0000000..5893d50
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityExternalLinks.tsx
@@ -0,0 +1,119 @@
+import { appConfig } from '@strata/core/lib/config/appConfig';
+import Button from '@strata/tempo/lib/button/Button';
+import Card from '@strata/tempo/lib/card/Card';
+import DataGrid from '@strata/tempo/lib/datagrid/DataGrid';
+import Form from '@strata/tempo/lib/form/Form';
+import DeleteIcon from '@strata/tempo/lib/icon/DeleteIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Tooltip from '@strata/tempo/lib/tooltip/Tooltip';
+import React, { useState } from 'react';
+import { IWorkbook } from '../../shared/analytics/data/analyticsService';
+import PickerModal from '../../shared/components/PickerModal';
+import { IPickerItem } from '../../shared/data/IPickerItem';
+
+export interface IOpportunityExternalLinksProps {
+  workbooks: IWorkbook[];
+  selectedWorkbooks: IWorkbook[];
+  updateWorkbookLinks: (workbooks: IWorkbook[]) => void;
+}
+
+const StrategicOpportunityExternalLinks: React.FC<IOpportunityExternalLinksProps> = (props: IOpportunityExternalLinksProps) => {
+  const { workbooks, selectedWorkbooks, updateWorkbookLinks } = props;
+
+  const [isAddWorkBookPickerVisible, setIsAddWorkBookPickerVisible] = useState<boolean>(false);
+  const [workbookLinks, setWorkbookLinks] = useState<IPickerItem[]>(
+    selectedWorkbooks
+      ? selectedWorkbooks.map((item) => {
+          return { value: item.workbookId, text: item.name };
+        })
+      : []
+  );
+  const maxWorkbooks = 15;
+  const maxWorkbooksMessage = `You can add a maximum of ${maxWorkbooks} workbook shortcuts.`;
+
+  const handleWorkbookSave = (values: IPickerItem[]) => {
+    const wb = [...workbookLinks, ...values];
+
+    setWorkbookLinks(wb);
+    setIsAddWorkBookPickerVisible(false);
+    updateWorkbookLinks(
+      wb.map((item) => {
+        return { workbookId: item.value, name: item.text };
+      })
+    );
+  };
+
+  const handleDeleteWorkbook = (workbookId: number) => {
+    const wb = workbookLinks.filter((item) => item.value !== workbookId);
+
+    setWorkbookLinks(wb);
+    updateWorkbookLinks(
+      wb.map((item) => {
+        return { workbookId: item.value, name: item.text };
+      })
+    );
+  };
+
+  const handleOpenWorkbookPopup = (workbookId: number) => {
+    const url = `${appConfig.analyticsUrl}workbooks/${workbookId}`;
+    window.open(url, '_blank', 'popup=yes');
+  };
+
+  const maxWorkbooklength = () => workbookLinks.length === maxWorkbooks;
+
+  return (
+    <Form.Item name='workbooks'>
+      <Spacing padding={16}>
+        <Card
+          title='Workbooks'
+          type='normal'
+          removeBodyPadding
+          extra={
+            <Tooltip title={maxWorkbooklength() ? maxWorkbooksMessage : ''}>
+              <Button icon={<PlusIcon />} disabled={maxWorkbooklength()} onClick={(e) => setIsAddWorkBookPickerVisible(true)}>
+                Add Workbook Link
+              </Button>
+            </Tooltip>
+          }
+        >
+          <DataGrid dataKey='value' sortField='name' sortOrder={1} value={workbookLinks} emptyMessage='No Workbooks Added'>
+            <DataGrid.Column
+              field='text'
+              header='Name'
+              sortable
+              width={1100}
+              body={(rowData) => (
+                <Button type='link' onClick={() => handleOpenWorkbookPopup(rowData.value)}>
+                  {rowData.text}
+                </Button>
+              )}
+            />
+            <DataGrid.Column align='right' width={50} body={(rowData) => <Button type='link' icon={<DeleteIcon />} onClick={() => handleDeleteWorkbook(rowData.value)} />} />
+          </DataGrid>
+        </Card>
+      </Spacing>
+      {isAddWorkBookPickerVisible && (
+        <PickerModal
+          title={'Add Workbook'}
+          items={workbooks
+            .filter((item) => !workbookLinks.find((wb) => wb.value === item.workbookId))
+            .map((item: IWorkbook) => {
+              return {
+                text: item.name,
+                value: item.workbookId
+              } as IPickerItem;
+            })}
+          maxSelections={maxWorkbooks - workbookLinks.length}
+          maxSelectionExceededMessage={`${maxWorkbooksMessage} Please remove selections and try again.`}
+          selectedItems={[]}
+          isVisible={isAddWorkBookPickerVisible}
+          onCancel={() => setIsAddWorkBookPickerVisible(false)}
+          onSave={handleWorkbookSave}
+        ></PickerModal>
+      )}
+    </Form.Item>
+  );
+};
+
+export default StrategicOpportunityExternalLinks;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityFilters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityFilters.tsx
new file mode 100644
index 0000000..7ba01d8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityFilters.tsx
@@ -0,0 +1,148 @@
+import Button from '@strata/tempo/lib/button/Button';
+import Popover from '@strata/tempo/lib/popover/Popover';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import useToast from '@strata/tempo/lib/toast/useToast';
+import { ITreeNode, Key } from '@strata/tempo/lib/tree/Tree';
+import dayjs from 'dayjs';
+import React, { useEffect, useState } from 'react';
+import { ChipKey, defaultFilterBarItemsExcluded, IFilterChipItem, OperatorType } from '../../shared/components/FilterBar/data/IFilterChipItem';
+import FilterTree from '../../shared/components/FilterBar/FilterTree';
+import FilterChip from '../../shared/components/FilterBar/FilterChip';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+
+export interface IStrategicFilterBarProps {
+  filterId: string;
+  filterChipsProp: IFilterChipItem[];
+  excludedChips: ChipKey[];
+  onFiltersChange: (filterId: string, filters: IFilterChipItem[]) => void;
+}
+
+const StrategicFilterBar: React.FC<IStrategicFilterBarProps> = (props) => {
+  const { filterId, filterChipsProp, excludedChips, onFiltersChange } = props;
+  const [filters] = useState<IFilterChipItem[]>(() => defaultFilterBarItemsExcluded(excludedChips, true));
+  const [filterChips, setFilterChips] = useState<IFilterChipItem[]>([]);
+  const [activeFilterId, setActiveFilterId] = useState<React.Key>('');
+
+  const [isFilterPopoverVisible, setIsFilterPopoverVisible] = React.useState<boolean>(false);
+  const [selectedKeys, setSelectedKeys] = React.useState<Key[]>([]);
+  const [selectedNode, setSelectedNode] = useState<ITreeNode>({} as ITreeNode);
+
+  const toast = useToast();
+
+  useEffect(() => {
+    setFilterChips(filterChipsProp);
+  }, [filterChipsProp]);
+
+  const handleSelect = (selectedKeys: Key[], node: ITreeNode) => {
+    setSelectedKeys(selectedKeys);
+    setSelectedNode(node);
+  };
+
+  const handleClose = () => {
+    setSelectedNode({} as ITreeNode);
+    setSelectedKeys([]);
+    setIsFilterPopoverVisible(false);
+  };
+
+  const handleOpenChange = (isOpen: boolean) => (isOpen ? setIsFilterPopoverVisible(isOpen) : handleClose());
+
+  const handleAddFilter = () => {
+    if (filterChips?.some((cf) => ChipKey[cf.key] === (selectedNode.key as string))) {
+      toast.show({ toastType: 'info', message: 'This item already exists as a filter' });
+      return;
+    }
+
+    setIsFilterPopoverVisible(false);
+    const filter = filters.find((cf) => ChipKey[cf.key] === (selectedNode.key as string));
+    if (filter) {
+      const newFilter = Object.assign({}, filter);
+      let newFilters = [] as IFilterChipItem[];
+      if (filterChips) {
+        newFilters = [...filterChips];
+      }
+      newFilters.push(newFilter);
+
+      setFilterChips(newFilters);
+      setActiveFilterId(filter.key);
+    }
+  };
+
+  const handleChipDelete = (chipId: React.Key) => {
+    const filterChipItems = filterChipsProp?.filter((x) => x.key !== chipId && ChipKey[x.key] !== chipId);
+    setFilterChips(filterChipItems.filter((item) => !excludedChips.includes(item.key)));
+    onFiltersChange(filterId, filterChipItems);
+    setActiveFilterId('');
+  };
+
+  const handleChipClick = (chipId: React.Key) => {
+    setActiveFilterId(chipId === activeFilterId ? '' : chipId);
+  };
+
+  const handleChipOpenChange = (isOpen: boolean) => {
+    if (!isOpen) setActiveFilterId('');
+  };
+
+  const handleFilterChange = (filter: IFilterChipItem) => {
+    const filterItems = [...filterChipsProp];
+
+    filterChips?.forEach((item) => {
+      if (!filterChipsProp.find((chip) => chip.key === item.key)) {
+        filterItems.push(item);
+      }
+    });
+
+    const newFilters = [...(filterItems ?? [])];
+    const index = newFilters.findIndex((f) => f.key === filter.key);
+    if (index < 0) {
+      return;
+    }
+    newFilters[index].operator = filter.operator ?? OperatorType.In;
+    newFilters[index].filters = filter.filters;
+    newFilters[index].isSelected = filter.isSelected;
+    newFilters[index].dateRange = filter.dateRange;
+    setFilterChips(newFilters.filter((item) => !excludedChips.includes(item.key)));
+    onFiltersChange(filterId, newFilters);
+  };
+
+  return (
+    <>
+      <Spacing hAlign='left' width={'100%'} padding={'8px 0'}>
+        <FilterChip
+          filters={filterChips}
+          activeFilterId={activeFilterId}
+          disabledChips={excludedChips}
+          hiddenChips={[]}
+          dateStart={dayjs()}
+          dateEnd={dayjs()}
+          onChipClick={handleChipClick}
+          onChipDelete={handleChipDelete}
+          onOpenChange={handleChipOpenChange}
+          onFilterChange={handleFilterChange}
+          isReadOnly={false}
+        />
+      </Spacing>
+      <Popover
+        title=' '
+        open={isFilterPopoverVisible}
+        onOpenChange={handleOpenChange}
+        content={
+          <Spacing width={380} height={400} itemSpacing={8} column>
+            <FilterTree includeMeasureFilters excludedChips={excludedChips} selectedKeys={selectedKeys} isVisible={isFilterPopoverVisible} treeHeight={310} onSelect={handleSelect} />
+            <Spacing height={'100%'} vAlign='bottom' hAlign='right'>
+              <Button onClick={handleClose}>Cancel</Button>
+              <Button disabled={selectedKeys.length === 0} onClick={handleAddFilter} type='primary'>
+                Add
+              </Button>
+            </Spacing>
+          </Spacing>
+        }
+      >
+        <Button type='link' disabled={filters.length === 0} icon={<PlusIcon />}>
+          Add Filter
+        </Button>
+      </Popover>
+    </>
+  );
+};
+
+export default StrategicFilterBar;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityPerformanceCalculations.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityPerformanceCalculations.tsx
new file mode 100644
index 0000000..3f07bb1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityPerformanceCalculations.tsx
@@ -0,0 +1,210 @@
+import { useOidcSession } from '@strata/core/lib';
+import MetricGroup from '@strata/tempo/lib/metricgroup';
+import React, { useEffect, useState } from 'react';
+import { settingsService } from '../../shared/settingsService';
+import { DefaultPerformanceEngineCalculationData, IPerformanceEngineCalculationData } from '../data/IPerformanceEngineCalculationData';
+
+export interface IPerformanceEngineCalculationProps {
+  entity: string;
+  caseTypeEntity: string;
+  serviceLineID: number;
+  physicianGroupingAffiliationId: number;
+  primaryPhysician: string;
+  chargeCodeRollup: string;
+  costDriver: string;
+  baselineStartDate: string;
+  baselineEndDate: string;
+  totalVolume: number;
+  totalGrossCharges: number;
+  totalVariableDirectCost: number;
+  totalVariableCost: number;
+}
+
+const StrategicOpportunityPerformanceCalculations: React.FC<IPerformanceEngineCalculationProps> = (props: IPerformanceEngineCalculationProps) => {
+  const session = useOidcSession();
+  const [calculationData, setCalculationData] = useState<IPerformanceEngineCalculationData>({ ...DefaultPerformanceEngineCalculationData, ...props });
+  useEffect(() => {
+    const fetchData = async () => {
+      const calculations = await settingsService.getPerformanceEngineCalculations();
+      setCalculationData(calculations);
+    };
+    fetchData();
+  }, []);
+
+  return (
+    <>
+      {session.isStrata ? (
+        <MetricGroup
+          items={[
+            {
+              key: 'dimensions',
+              label: 'Dimensions',
+              values: [
+                {
+                  key: 'entity',
+                  label: 'Entity',
+                  value: calculationData.entity,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'case-type-entity',
+                  label: 'Case Type Entity',
+                  value: calculationData.caseTypeEntity,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'service-line-id',
+                  label: 'Service Line ID',
+                  value: calculationData.serviceLineID,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'physician-grouping-affiliation-id',
+                  label: 'Physician Grouping Affliation ID',
+                  value: calculationData.physicianGroupingAffiliationId,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'primary-physician',
+                  label: 'Primary Physician',
+                  value: calculationData.primaryPhysician,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'charge-code-rollup',
+                  label: 'Charge Code Rollup',
+                  value: calculationData.chargeCodeRollup,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'cost-driver',
+                  label: 'Cost Driver',
+                  value: calculationData.costDriver,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'baseline-start-date',
+                  label: 'Baseline Start Date',
+                  value: calculationData.baselineStartDate,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'baseline-end-date',
+                  label: 'Baseline End Date',
+                  value: calculationData.baselineEndDate,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                }
+              ]
+            },
+            {
+              key: 'metric',
+              label: 'Metrics',
+              values: [
+                {
+                  key: 'total-volume',
+                  label: 'Total Volume',
+                  value: calculationData.totalVolume,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'total-gross-charges',
+                  label: 'Total Gross Charges',
+                  value: calculationData.totalGrossCharges,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'total-variable-direct-cost',
+                  label: 'Total Variable Direct Cost',
+                  value: calculationData.totalVariableDirectCost,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'total-variable-cost',
+                  label: 'Total Variable Cost',
+                  value: calculationData.totalVariableCost,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                }
+              ]
+            },
+            {
+              key: 'performance-engine-output',
+              label: 'Performance Engine Output',
+              values: [
+                {
+                  key: 'goal-unit-variance',
+                  label: 'Goal Unit Variance',
+                  value: calculationData.goalUnitVariance,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'actual-unit-variance',
+                  label: 'Actual Unit Variance',
+                  value: calculationData.actualUnitVariance,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'committed-units',
+                  label: 'Committed Units',
+                  value: calculationData.committedUnits,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'committed-stats',
+                  label: 'Committed Stats',
+                  value: calculationData.committedStats,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                },
+                {
+                  key: 'baseline-average',
+                  label: 'Baseline Average',
+                  value: calculationData.baselineAverage,
+                  formatOptions: {
+                    nullValue: '-'
+                  }
+                }
+              ]
+            }
+          ]}
+        />
+      ) : (
+        ''
+      )}
+    </>
+  );
+};
+
+export default StrategicOpportunityPerformanceCalculations;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityRenameMeasure.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityRenameMeasure.tsx
new file mode 100644
index 0000000..f14f846
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/strategic-opportunities/wizard/StrategicOpportunityRenameMeasure.tsx
@@ -0,0 +1,63 @@
+import React, { useState } from 'react';
+import Button from '@strata/tempo/lib/button/Button';
+import Form from '@strata/tempo/lib/form/Form';
+import EditIcon from '@strata/tempo/lib/icon/EditIcon';
+import Input from '@strata/tempo/lib/input/Input';
+import Popover from '@strata/tempo/lib/popover/Popover';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import Text from '@strata/tempo/lib/text/Text';
+
+export interface IStrategicOpportunityRenameMeasureProps {
+  measureName: string;
+  index: number | null;
+  disabled: boolean;
+  validateAndUpdateMeasureName: (index: number | null, revertValue: boolean) => boolean;
+}
+
+const StrategicOpportunityRenameMeasure: React.FC<IStrategicOpportunityRenameMeasureProps> = (props: IStrategicOpportunityRenameMeasureProps) => {
+  const { measureName, index, disabled, validateAndUpdateMeasureName } = props;
+  const [isOpen, setIsOpen] = useState<boolean>(false);
+
+  return (
+    <Spacing itemSpacing={8}>
+      <Text.Heading level={3}>{measureName}</Text.Heading>
+
+      <Popover
+        title=''
+        open={isOpen}
+        onOpenChange={(open) => setIsOpen(open && !disabled ? open : false)}
+        content={
+          <Spacing column>
+            <Form.Item name={index !== null ? [index, 'editMeasureName'] : 'editMeasureName'} rules={[{ required: true }, { max: 100, message: 'Name must be less than 100 characters' }]}>
+              <Input width={250} />
+            </Form.Item>
+            <Spacing hAlign='right'>
+              <Button
+                onClick={() => {
+                  validateAndUpdateMeasureName(index, true);
+                  setIsOpen(false);
+                }}
+              >
+                Cancel
+              </Button>
+              <Button
+                type='primary'
+                onClick={() => {
+                  if (validateAndUpdateMeasureName(index, false)) {
+                    setIsOpen(false);
+                  }
+                }}
+              >
+                Save
+              </Button>
+            </Spacing>
+          </Spacing>
+        }
+      >
+        <Button type='link' icon={<EditIcon />} />
+      </Popover>
+    </Spacing>
+  );
+};
+
+export default StrategicOpportunityRenameMeasure;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/test-utils/testUtils.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/test-utils/testUtils.tsx
new file mode 100644
index 0000000..5dfb527
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/test-utils/testUtils.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import { render, RenderResult } from '@testing-library/react';
+import UserSettingsContext from '../shared/userSetting/UserSettingContext';
+import ConfigurationsContext from '../shared/configuration/ConfigurationContext';
+import { MemoryRouter } from 'react-router-dom';
+import { IConfiguration } from '../shared/configuration/IConfiguration';
+
+interface ITestWrapperProps {
+  children: React.ReactNode;
+}
+
+const configuration: IConfiguration = {
+  configurationGuid: 'cf6cf1ab-96c5-47b3-acbf-25fddfc45216',
+  name: 'FY 2021',
+  serviceLineDimensionGuid: '',
+  configuredEntityIds: [],
+  qviOpportunityBreakdownName: 'Entity',
+  qviOpportunityBreakdownNamePlural: 'Entities',
+  orgDefinedTrackingStartDate: new Date(),
+  orgDefinedTrackingEndDate: new Date(),
+  lastFiscalYearStartDate: new Date(),
+  lastFiscalYearEndDate: new Date(),
+  isUsingCustomEntityDimension: false,
+  qualityVariationIsUsingAPRDRG: false
+};
+
+const TestWrapper = (props: ITestWrapperProps) => {
+  return (
+    <MemoryRouter>
+      <UserSettingsContext.Provider
+        value={{
+          isAdmin: true,
+          loading: false,
+          userSetting: {
+            configurationGuid: 'cf6cf1ab-96c5-47b3-acbf-25fddfc45216',
+            userGuid: 'cf6cf1ab-96c5-47b3-acbf-25fddfc45216'
+          },
+          setUserSetting: (userSetting) => {
+            return null;
+          }
+        }}
+      >
+        <ConfigurationsContext.Provider
+          value={{
+            configurations: [configuration],
+            currentConfiguration: configuration,
+            loading: false
+          }}
+        >
+          {props.children}
+        </ConfigurationsContext.Provider>
+      </UserSettingsContext.Provider>
+    </MemoryRouter>
+  );
+};
+
+const customRender = (ui: React.ReactElement, options?: any): RenderResult => render(ui, { wrapper: TestWrapper, ...options });
+
+// re-export everything
+export * from '@testing-library/react';
+
+// override render method
+export { customRender as render };
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/user-example/ExampleUser.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/user-example/ExampleUser.tsx
new file mode 100644
index 0000000..fc00ce7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/user-example/ExampleUser.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import { IExampleUserData } from './data/IExampleUserData';
+import { useEffect, useState } from 'react';
+import { exampleUserService } from './data/exampleUserService';
+
+const ExampleUser: React.FC = () => {
+  const [exampleUserData, setExampleUserData] = useState<IExampleUserData[] | []>();
+
+  useEffect(() => {
+    // runs once when component mounts
+    const fetchData = async () => {
+      setExampleUserData(await exampleUserService.getUsers());
+    };
+    fetchData();
+  }, []);
+
+  return (
+    <>
+      <DataGrid key='UserGrid' value={exampleUserData} sortOrder={1} sortField='firstName'>
+        <DataGrid.RowNumber key='numberRow'></DataGrid.RowNumber>
+        <DataGrid.Column key='firstName' header='First Name' filter field='firstName' sortable width={200} />
+        <DataGrid.Column key='lastName' header='Last Name' filter field='lastName' sortable width={200} />
+        <DataGrid.Column key='userGuid' header='User Guid' filter field='userGuid' sortable width={300} />
+        <DataGrid.EmptyColumn />
+      </DataGrid>
+    </>
+  );
+};
+
+export default ExampleUser;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/user-example/data/IExampleUserData.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/user-example/data/IExampleUserData.ts
new file mode 100644
index 0000000..7cf2029
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/user-example/data/IExampleUserData.ts
@@ -0,0 +1,5 @@
+export interface IExampleUserData {
+  firstName: string;
+  lastName: string;
+  userGuid: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/user-example/data/exampleUserService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/user-example/data/exampleUserService.ts
new file mode 100644
index 0000000..6835df1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/user-example/data/exampleUserService.ts
@@ -0,0 +1,10 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IExampleUserData } from './IExampleUserData';
+
+const { httpGet } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const exampleUserService = {
+  getUsers: (): Promise<IExampleUserData[]> => {
+    return httpGet<IExampleUserData[]>(`Users`);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/UtilizationVariation.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/UtilizationVariation.tsx
new file mode 100644
index 0000000..b35546f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/UtilizationVariation.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import Tabs from '@strata/tempo/lib/tabs';
+import Opportunities from './opportunities/Opportunities';
+import CaseTypes from './case-types/CaseTypes';
+import OpportunitiesHeader from './../shared/opportunities/OpportunitiesHeader';
+
+const UtilizationVariation: React.FC = () => {
+  return (
+    <>
+      <OpportunitiesHeader headerTitle='Utilization Variation Opportunities' helpId='1318' />
+      <Tabs
+        defaultActiveKey='opportunities'
+        items={[
+          { key: 'opportunities', label: 'Opportunities', children: <Opportunities /> },
+          { key: 'case-types', label: 'Case Types', children: <CaseTypes /> }
+        ]}
+      />
+    </>
+  );
+};
+
+export default UtilizationVariation;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/CaseTypes.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/CaseTypes.test.tsx
new file mode 100644
index 0000000..d19a02c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/CaseTypes.test.tsx
@@ -0,0 +1,56 @@
+import { screen, within } from '../../test-utils/testUtils';
+import { IVariationCaseType, newUtilizationVariationCaseType } from './data/IVariationCaseType';
+import { variationCaseTypeService } from './data/variationCaseTypeService';
+import { IPagedApiResponse } from '../../shared/paging/IPagedApiResponse';
+
+const mockCaseTypes: IVariationCaseType[] = [
+  newUtilizationVariationCaseType({
+    caseTypeId: 1,
+    caseTypeName: 'Case Type 1',
+    identifiedSavingsTotal: 100,
+    serviceLineName: 'Service Line 1',
+    opportunitiesCount: 100
+  }),
+  newUtilizationVariationCaseType({
+    caseTypeId: 2,
+    caseTypeName: 'Case Type 2',
+    identifiedSavingsTotal: 200,
+    serviceLineName: 'Service Line 2',
+    opportunitiesCount: 200
+  })
+];
+
+const mockPageCaseTypes: IPagedApiResponse<IVariationCaseType> = {
+  data: mockCaseTypes,
+  pagingInfo: {
+    pageNumber: 1,
+    resultsPerPage: 20,
+    totalNumberOfResults: 2,
+    totalPages: 1
+  }
+};
+
+test.skip('All case types are shown', async () => {
+  test('All case types are shown', async () => {
+    jest.spyOn(variationCaseTypeService, 'getVariationCaseTypes').mockImplementation(() => Promise.resolve(mockPageCaseTypes));
+
+    // render component
+    //render(<CaseTypes />);
+
+    // wait for grid to load
+    const cell = await screen.findByRole('cell', { name: mockPageCaseTypes.data[0].caseTypeName });
+
+    // get rows
+    const tableBody = cell?.parentElement?.parentElement as HTMLElement;
+    const rows = within(tableBody).getAllByRole('row');
+
+    // verify users appear in grid sorted by firstName
+    mockPageCaseTypes.data.forEach((opportunity, index) => {
+      const row = rows[index];
+      within(row).getByText(opportunity.caseTypeName);
+      within(row).getByText(opportunity.identifiedSavingsTotal);
+      within(row).getByText(opportunity.serviceLineName);
+      within(row).getByText(opportunity.opportunitiesCount);
+    });
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/CaseTypes.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/CaseTypes.tsx
new file mode 100644
index 0000000..1ff06ec
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/CaseTypes.tsx
@@ -0,0 +1,185 @@
+import React, { useEffect, useState } from 'react';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import Link from '@strata/tempo/lib/link';
+import Button from '@strata/tempo/lib/button';
+import ActionBar from '@strata/tempo/lib/actionbar';
+import Text from '@strata/tempo/lib/text';
+import { variationCaseTypeService } from '../case-types/data/variationCaseTypeService';
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import Filters from './Filters';
+import { initialFilters, IVariationCaseTypeFilters, numberOfFilters } from './data/IVariationCaseTypeFilters';
+import { IVariationCaseType } from './data/IVariationCaseType';
+import { IPagingOptions } from '../../shared/paging';
+import FilterIcon from '@strata/tempo/lib/icon/FilterIcon';
+import PlusIcon from '@strata/tempo/lib/icon/PlusIcon';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+import { ScoreMemberTreeModal } from '@strata/score/lib/ScoreMemberTreeModal';
+import { ITreeNode } from '@strata/tempo/lib/tree/Tree';
+import notificationHub from '../../shared/notification/NotificationHub';
+import { useOidcSession } from '@strata/core/lib/auth';
+import { CodeType } from '../../shared/constants';
+import Popover from '@strata/tempo/lib/popover/Popover';
+import Spacing from '@strata/tempo/lib/spacing/Spacing';
+import CheckCircleIcon from '@strata/tempo/lib/icon/CheckCircleIcon';
+
+const initialPagingOptions = {
+  sortField: 'identifiedSavingsTotal',
+  sortOrder: -1,
+  first: 0,
+  rows: 25
+};
+
+const CaseTypes: React.FC = () => {
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+  const [lazyData, setLazyData] = useState<IVariationCaseType[] | []>();
+  const [loading, setLoading] = useState(false);
+  const [pagingOptions, setPagingOptions] = useState<IPagingOptions>(initialPagingOptions);
+  const [totalVariationCaseTypes, setTotalVariationCaseTypes] = useState<number>();
+  const [filters, setFilters] = useState<IVariationCaseTypeFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const [patientPopulationModalVisible, setPatientPopulationModalVisible] = useState(false);
+
+  const hub = notificationHub.useConnection();
+  const jazzUrl = useJazzUrlWithVersion();
+  const session = useOidcSession();
+
+  useEffect(() => {
+    document.title = 'Utilization Variation';
+  }, []);
+
+  useEffect(() => {
+    const loadData = async () => {
+      setLoading(true);
+      try {
+        const pagedResponse = await variationCaseTypeService.getVariationCaseTypes(currentConfigurationGuid, pagingOptions, filters);
+        setTotalVariationCaseTypes(pagedResponse.pagingInfo.totalNumberOfResults);
+        setLazyData(pagedResponse.data);
+      } finally {
+        setLoading(false);
+      }
+    };
+    loadData();
+  }, [pagingOptions, filters, currentConfigurationGuid]);
+
+  useEffect(() => {
+    if (currentConfiguration == null) {
+      return;
+    }
+    setFilters(initialFilters);
+    setCurrentConfigurationGuid(currentConfiguration.configurationGuid);
+  }, [currentConfiguration]);
+
+  const handleApplyFilters = (newFilters: IVariationCaseTypeFilters) => {
+    setFiltersVisible(false);
+    setFilters((filters) => {
+      return { ...filters, ...newFilters };
+    });
+    setPagingOptions({ ...pagingOptions, first: 0 });
+  };
+
+  const filtersSelected = numberOfFilters(filters);
+
+  const handleSave = (treeNodes: ITreeNode[] | undefined) => {
+    setPatientPopulationModalVisible(false);
+    const keys = treeNodes?.map((x) => x.key.toString()) ?? [];
+
+    notificationHub.register(
+      hub,
+      async () => {
+        await variationCaseTypeService.addPatientPopulationCaseTypes(currentConfiguration?.configurationGuid ?? '', keys);
+      },
+      session.userName
+    );
+  };
+
+  const getExplorationColumnBody = (rowData: any) => {
+    if (rowData.caseTypeCategory === CodeType.ExplorationPopulation) {
+      return (
+        <Popover
+          title=''
+          trigger='hover'
+          content={
+            <Spacing width={300}>
+              <Text>
+                Flexible Exploration populations are limited to one opportunity per population per fiscal year. Therefore, clicking on a flexible exploration opportunity will take you to its
+                Opportunity page instead of the Provider Comparison page.
+              </Text>
+            </Spacing>
+          }
+        >
+          <CheckCircleIcon color='blue-500' />
+        </Popover>
+      );
+    } else {
+      return <></>;
+    }
+  };
+
+  const getCaseTypeColumnBody = (rowData: any) => {
+    let link: string;
+    if (rowData.caseTypeCategory === CodeType.ExplorationPopulation) {
+      const opportunityPage = rowData.costDriver === 'LOS' ? 'LOSOpportunityViewer' : 'OpportunityViewer';
+      link = `CCI/ExplorationVariation/${opportunityPage}.aspx?opportunityGuid=${rowData.associatedOpportunityGuid}`;
+    } else {
+      link = 'CCI/Variation/PhysicianComparison.aspx?casetypeid=' + rowData.caseTypeId;
+    }
+    return <Link href={jazzUrl + link}>{rowData.caseTypeName}</Link>;
+  };
+
+  return (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />
+      <ActionBar
+        filters={
+          <>
+            <Button type={filtersSelected > 0 ? 'primary' : 'secondary'} icon={<FilterIcon />} onClick={() => setFiltersVisible(true)}>
+              Filters{filtersSelected > 0 ? ` (${filtersSelected})` : ''}
+            </Button>
+          </>
+        }
+        actions={
+          <Button type='primary' icon={<PlusIcon />} onClick={() => setPatientPopulationModalVisible(true)}>
+            Add Patient Population Case Type
+          </Button>
+        }
+      ></ActionBar>
+      <DataGrid
+        scrollable
+        loading={loading}
+        value={lazyData}
+        lazy
+        sortField={pagingOptions.sortField}
+        sortOrder={pagingOptions.sortOrder}
+        paginator
+        first={pagingOptions.first}
+        totalRecords={totalVariationCaseTypes}
+        onSort={(e) => setPagingOptions({ ...pagingOptions, ...e })}
+        onPage={(e) => setPagingOptions({ ...pagingOptions, ...e })}
+        dataKey='opportunityKey'
+      >
+        <DataGrid.Column header='Case Type' field='caseTypeName' sortable width={360} body={getCaseTypeColumnBody} />
+        <DataGrid.NumberColumn field='identifiedSavingsTotal' header='Identified Variation' format='currency' sortable width={144} />
+        <DataGrid.NumberColumn field='opportunitiesCount' header='Opportunities' sortable width={120} />
+        <DataGrid.Column field='serviceLineName' header='Service Line' sortable width={160} />
+        <DataGrid.GapColumn />
+        <DataGrid.Column header='Flexible Exploration Patient Population' field='explorationPopulation' align='center' width={150} body={getExplorationColumnBody} />
+        <DataGrid.EmptyColumn />
+      </DataGrid>
+      <ScoreMemberTreeModal
+        checkStrictly={true}
+        dimensionGuidOrGlobalId='Clinical Indicator'
+        height={300}
+        onCancel={() => setPatientPopulationModalVisible(false)}
+        onOk={handleSave}
+        selectionMode='multiple'
+        showHierarchyDropdown={false}
+        title={'Select Patient Pop Case Types'}
+        visible={patientPopulationModalVisible}
+        okText='Select'
+      ></ScoreMemberTreeModal>
+    </>
+  );
+};
+
+export default CaseTypes;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/Filters.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/Filters.test.tsx
new file mode 100644
index 0000000..5171305
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/Filters.test.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import { render, screen, fireEvent } from '../../test-utils/testUtils';
+import { variationCaseTypeService } from './data/variationCaseTypeService';
+import Filters from './Filters';
+import { IVariationCaseTypeFilterOptions, newFilterOptions } from './data/IVariationCaseTypeFilterOptions';
+import { IVariationCaseTypeFilters } from './data/IVariationCaseTypeFilters';
+import { dropDownTestUtils } from '@strata/test-utils/lib';
+
+const mockFilterOptions: IVariationCaseTypeFilterOptions = newFilterOptions({
+  caseTypes: [{ text: 'Test Case Type', id: 'f4174146-81b4-4990-a24e-3629d63f25d9' }],
+  serviceLines: [{ text: 'Test Service Line', id: '1' }]
+});
+
+const mockInitialFilters: IVariationCaseTypeFilters = {
+  identifiedSavings: undefined,
+  caseTypeGuids: [],
+  serviceLineIds: []
+};
+
+test('Filters default to empty', async () => {
+  jest.spyOn(variationCaseTypeService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const caseTypeDropdown = dropDownTestUtils.getDropDown('Case Type');
+  const serviceLineDropdown = dropDownTestUtils.getDropDown('Service Line');
+
+  // verify default value is set correctly
+  expect(dropDownTestUtils.getSelectedOption(caseTypeDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(serviceLineDropdown)).toEqual('');
+});
+
+test('Filters clear', async () => {
+  jest.spyOn(variationCaseTypeService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const caseTypeDropdown = dropDownTestUtils.getDropDown('Case Type');
+  const serviceLineDropdown = dropDownTestUtils.getDropDown('Service Line');
+  const identifiedSavingsInput = screen.getByRole('spinbutton', { name: 'Identified Savings Minimum' });
+
+  // verify default value is set correctly
+  await dropDownTestUtils.selectOption(caseTypeDropdown, mockFilterOptions.caseTypes[0].text);
+  await dropDownTestUtils.selectOption(serviceLineDropdown, mockFilterOptions.serviceLines[0].text);
+  fireEvent.change(identifiedSavingsInput, { target: { value: 123 } });
+
+  expect(dropDownTestUtils.getSelectedOption(caseTypeDropdown)).toEqual(mockFilterOptions.caseTypes[0].text);
+  expect(dropDownTestUtils.getSelectedOption(serviceLineDropdown)).toEqual(mockFilterOptions.serviceLines[0].text);
+  expect(identifiedSavingsInput).toHaveValue('123');
+
+  const clearButton = screen.getByRole('button', { name: 'Clear Filters' });
+  fireEvent.click(clearButton);
+
+  expect(dropDownTestUtils.getSelectedOption(caseTypeDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(serviceLineDropdown)).toEqual('');
+  expect(identifiedSavingsInput).not.toHaveValue();
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/Filters.tsx
new file mode 100644
index 0000000..353de1a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/Filters.tsx
@@ -0,0 +1,94 @@
+import React, { useCallback } from 'react';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import Drawer from '@strata/tempo/lib/drawer';
+import DropDown from '@strata/tempo/lib/dropdown';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing';
+import { initialFilters, IVariationCaseTypeFilters } from './data/IVariationCaseTypeFilters';
+import { useEffect, useState } from 'react';
+import { variationCaseTypeService } from './data/variationCaseTypeService';
+import { IListMember } from '../../shared/data/IListMember';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import {} from '../opportunities/data/IVariationFilters';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+
+interface IFiltersProps {
+  filters: IVariationCaseTypeFilters;
+  isVisible: boolean;
+  onApply: (filters: IVariationCaseTypeFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const [caseTypes, setCaseTypes] = useState<IListMember[]>();
+  const [serviceLines, setServiceLines] = useState<IListMember[]>();
+
+  const { userSetting } = React.useContext(UserSettingContext);
+
+  const [form] = Form.useForm<IVariationCaseTypeFilters>();
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      const { caseTypes, serviceLines } = await variationCaseTypeService.getFilterOptions(userSetting.configurationGuid);
+
+      serviceLines.forEach((item) => {
+        if (item.id === '0') item.text = ' ';
+      });
+
+      setCaseTypes(caseTypes);
+      setServiceLines(serviceLines);
+      handleClearFilters();
+    };
+    if (userSetting.configurationGuid !== '') loadFiltersOptions();
+  }, [handleClearFilters, userSetting]);
+
+  const handleApplyFilters = () => {
+    const filters: IVariationCaseTypeFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Case Type' name='caseTypeGuids'>
+          <DropDown multiSelect items={caseTypes} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Identified Savings Minimum' name='identifiedSavings'>
+          <InputNumber format='currency' placeholder='' precision={0} />
+        </Form.Item>
+        <Form.Item label='Service Line' name='serviceLineIds'>
+          <DropDown multiSelect items={serviceLines} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/data/IVariationCaseType.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/data/IVariationCaseType.ts
new file mode 100644
index 0000000..c3f1e9f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/data/IVariationCaseType.ts
@@ -0,0 +1,28 @@
+export interface IVariationCaseType {
+  caseTypeName: string;
+  caseTypeId: number;
+  serviceLineName: string;
+  identifiedSavingsTotal: number;
+  opportunitiesCount: number;
+  configurationGuid: string;
+  caseTypeCategory: number;
+  costDriver: string;
+  associatedOpportunityGuid: string;
+}
+
+export const newUtilizationVariationCaseType = (data: Partial<IVariationCaseType> = {}): IVariationCaseType => {
+  return {
+    ...{
+      caseTypeName: '',
+      caseTypeId: 0,
+      serviceLineName: '',
+      identifiedSavingsTotal: 0,
+      opportunitiesCount: 0,
+      configurationGuid: '',
+      caseTypeCategory: 0,
+      costDriver: '',
+      associatedOpportunityGuid: ''
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/data/IVariationCaseTypeFilterOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/data/IVariationCaseTypeFilterOptions.ts
new file mode 100644
index 0000000..f10c64d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/data/IVariationCaseTypeFilterOptions.ts
@@ -0,0 +1,16 @@
+import { IListMember } from '../../../shared/data/IListMember';
+
+export interface IVariationCaseTypeFilterOptions {
+  caseTypes: IListMember[];
+  serviceLines: IListMember[];
+}
+
+export const newFilterOptions = (data: Partial<IVariationCaseTypeFilterOptions> = {}): IVariationCaseTypeFilterOptions => {
+  return {
+    ...{
+      caseTypes: [],
+      serviceLines: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/data/IVariationCaseTypeFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/data/IVariationCaseTypeFilters.ts
new file mode 100644
index 0000000..33fff68
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/data/IVariationCaseTypeFilters.ts
@@ -0,0 +1,19 @@
+export interface IVariationCaseTypeFilters {
+  identifiedSavings?: number;
+  caseTypeGuids: string[];
+  serviceLineIds: string[];
+}
+
+export const initialFilters = {
+  identifiedSavings: undefined,
+  caseTypeGuids: [],
+  serviceLineIds: []
+};
+
+export const numberOfFilters = (filters: IVariationCaseTypeFilters): number => {
+  let filtersCount = 0;
+  if (filters.identifiedSavings != null && filters.identifiedSavings > 0) filtersCount++;
+  if (filters.caseTypeGuids.length > 0) filtersCount++;
+  if (filters.serviceLineIds.length > 0) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/data/variationCaseTypeService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/data/variationCaseTypeService.ts
new file mode 100644
index 0000000..9f6e368
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/case-types/data/variationCaseTypeService.ts
@@ -0,0 +1,25 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IPagedApiResponse } from '../../../shared/paging/IPagedApiResponse';
+import { IVariationCaseType } from './IVariationCaseType';
+import { IVariationCaseTypeFilterOptions } from './IVariationCaseTypeFilterOptions';
+import { IPagingOptions } from '../../../shared/paging';
+import { IVariationCaseTypeFilters } from './IVariationCaseTypeFilters';
+
+const { httpGet, httpPost } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const variationCaseTypeService = {
+  getVariationCaseTypes: async (configurationGuid: string, pagingOptions: IPagingOptions, filters: IVariationCaseTypeFilters): Promise<IPagedApiResponse<IVariationCaseType>> => {
+    return httpPost<IPagedApiResponse<IVariationCaseType>>(`variation-case-types`, {
+      pagingOptions,
+      filters: { ...filters, configurationGuid }
+    });
+  },
+
+  getFilterOptions: (configurationGuid: string): Promise<IVariationCaseTypeFilterOptions> => {
+    return httpGet<IVariationCaseTypeFilterOptions>(`variation-case-types/${configurationGuid}/filter-options`);
+  },
+
+  addPatientPopulationCaseTypes: (configurationGuid: string, patientPopulations: string[]): Promise<boolean> => {
+    return httpPost<boolean>(`variation-case-types/${configurationGuid}/add-patient-population-case-types`, patientPopulations);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/Filters.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/Filters.test.tsx
new file mode 100644
index 0000000..3894a4f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/Filters.test.tsx
@@ -0,0 +1,102 @@
+import React from 'react';
+import { render, screen, fireEvent } from '../../test-utils/testUtils';
+import { opportunityService } from './data/opportunityService';
+import Filters from './Filters';
+import { IVariationFilterOptions, newFilterOptions } from './data/IVariationFilterOptions';
+import { IVariationFilters } from './data/IVariationFilters';
+import { dropDownTestUtils } from '@strata/test-utils/lib';
+
+const mockFilterOptions: IVariationFilterOptions = newFilterOptions({
+  caseTypes: [{ text: 'Test Case Type', id: 'f4174146-81b4-4990-a24e-3629d63f25d9' }],
+  costDrivers: [{ text: 'Test Cost Driver', id: 'Cost Driver' }],
+  entities: [{ text: 'Test Entity', id: '1' }],
+  serviceLines: [{ text: 'Test Service Line', id: '1' }]
+});
+
+const mockInitialFilters: IVariationFilters = {
+  identifiedSavings: undefined,
+  caseTypeGuids: [],
+  costDrivers: [],
+  entityIds: [],
+  serviceLineIds: [],
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+test('Filters default to empty', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const caseTypeDropdown = dropDownTestUtils.getDropDown('Case Type');
+  const costDriverDropdown = dropDownTestUtils.getDropDown('Cost Driver');
+  const entityDropdown = dropDownTestUtils.getDropDown('Entity');
+  const serviceLineDropdown = dropDownTestUtils.getDropDown('Service Line');
+
+  // verify default value is set correctly
+  expect(dropDownTestUtils.getSelectedOption(caseTypeDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(costDriverDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(entityDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(serviceLineDropdown)).toEqual('');
+});
+
+test('Filters clear', async () => {
+  jest.spyOn(opportunityService, 'getFilterOptions').mockImplementation(() => Promise.resolve(mockFilterOptions));
+
+  // render component
+  render(
+    <Filters
+      filters={mockInitialFilters}
+      isVisible={true}
+      onApply={() => {
+        return;
+      }}
+      onCancel={() => {
+        return;
+      }}
+    />
+  );
+
+  // verify combo boxes appear with nothing selected
+  const caseTypeDropdown = dropDownTestUtils.getDropDown('Case Type');
+  const costDriverDropdown = dropDownTestUtils.getDropDown('Cost Driver');
+  const entityDropdown = dropDownTestUtils.getDropDown('Entity');
+  const serviceLineDropdown = dropDownTestUtils.getDropDown('Service Line');
+  const identifiedSavingsInput = screen.getByRole('spinbutton', { name: 'Identified Savings Minimum' });
+
+  // verify default value is set correctly
+  await dropDownTestUtils.selectOption(caseTypeDropdown, mockFilterOptions.caseTypes[0].text);
+  await dropDownTestUtils.selectOption(costDriverDropdown, mockFilterOptions.costDrivers[0].text);
+  await dropDownTestUtils.selectOption(entityDropdown, mockFilterOptions.entities[0].text);
+  await dropDownTestUtils.selectOption(serviceLineDropdown, mockFilterOptions.serviceLines[0].text);
+  fireEvent.change(identifiedSavingsInput, { target: { value: 123 } });
+
+  expect(dropDownTestUtils.getSelectedOption(caseTypeDropdown)).toEqual(mockFilterOptions.caseTypes[0].text);
+  expect(dropDownTestUtils.getSelectedOption(costDriverDropdown)).toEqual(mockFilterOptions.costDrivers[0].text);
+  expect(dropDownTestUtils.getSelectedOption(entityDropdown)).toEqual(mockFilterOptions.entities[0].text);
+  expect(dropDownTestUtils.getSelectedOption(serviceLineDropdown)).toEqual(mockFilterOptions.serviceLines[0].text);
+  expect(identifiedSavingsInput).toHaveValue('123');
+
+  const clearButton = screen.getByRole('button', { name: 'Clear Filters' });
+  fireEvent.click(clearButton);
+
+  expect(dropDownTestUtils.getSelectedOption(caseTypeDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(costDriverDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(entityDropdown)).toEqual('');
+  expect(dropDownTestUtils.getSelectedOption(serviceLineDropdown)).toEqual('');
+  expect(identifiedSavingsInput).not.toHaveValue();
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/Filters.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/Filters.tsx
new file mode 100644
index 0000000..f6fcc6a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/Filters.tsx
@@ -0,0 +1,112 @@
+import React, { useCallback } from 'react';
+import Button from '@strata/tempo/lib/button';
+import Form from '@strata/tempo/lib/form';
+import Drawer from '@strata/tempo/lib/drawer';
+import DropDown from '@strata/tempo/lib/dropdown';
+import RadioGroup from '@strata/tempo/lib/radiogroup';
+import InputNumber from '@strata/tempo/lib/inputnumber';
+import Spacing from '@strata/tempo/lib/spacing';
+import Checkbox from '@strata/tempo/lib/checkbox';
+import { initialFilters, IVariationFilters } from './data/IVariationFilters';
+import { useEffect, useState } from 'react';
+import { opportunityService } from './data/opportunityService';
+import { IListMember } from '../../shared/data/IListMember';
+import UserSettingContext from '../../shared/userSetting/UserSettingContext';
+import { convertNullOrEmptyStrToUndefined } from '../../shared/utilities';
+
+interface IFiltersProps {
+  filters: IVariationFilters;
+  isVisible: boolean;
+  onApply: (filters: IVariationFilters) => void;
+  onCancel: () => void;
+}
+
+const Filters: React.FC<IFiltersProps> = (props: IFiltersProps) => {
+  const [caseTypes, setCaseTypes] = useState<IListMember[]>();
+  const [costDrivers, setCostDrivers] = useState<IListMember[]>();
+  const [entities, setEntities] = useState<IListMember[]>();
+  const [serviceLines, setServiceLines] = useState<IListMember[]>();
+
+  const { userSetting } = React.useContext(UserSettingContext);
+
+  const [form] = Form.useForm<IVariationFilters>();
+  const handleClearFilters = useCallback(() => {
+    form.setFieldsValue(initialFilters);
+  }, [form]);
+
+  useEffect(() => {
+    const loadFiltersOptions = async () => {
+      const { caseTypes, costDrivers, entities, serviceLines } = await opportunityService.getFilterOptions(userSetting.configurationGuid);
+
+      setCaseTypes(caseTypes);
+      setCostDrivers(costDrivers);
+      setEntities(entities);
+      setServiceLines(serviceLines);
+      handleClearFilters();
+    };
+    if (userSetting.configurationGuid !== '') loadFiltersOptions();
+  }, [handleClearFilters, userSetting]);
+
+  const handleApplyFilters = () => {
+    const filters: IVariationFilters = convertNullOrEmptyStrToUndefined(form.getFieldsValue());
+    props.onApply(filters);
+  };
+
+  const handleCancel = () => {
+    props.onCancel();
+    form.setFieldsValue(props.filters);
+  };
+
+  return (
+    <Drawer
+      title='Filters'
+      width={432}
+      footer={
+        <Spacing hAlign='space-between'>
+          <Button type='tertiary' onClick={handleClearFilters}>
+            Clear Filters
+          </Button>
+          <Spacing>
+            <Button onClick={handleCancel}>Cancel</Button>
+            <Button type='primary' onClick={handleApplyFilters}>
+              Apply
+            </Button>
+          </Spacing>
+        </Spacing>
+      }
+      visible={props.isVisible}
+      onClose={handleCancel}
+    >
+      <Form form={form} maxWidth='100%' initialValues={props.filters} hideOptionalLabels>
+        <Form.Item label='Identified Savings Minimum' name='identifiedSavings'>
+          <InputNumber format='currency' placeholder='' precision={0} />
+        </Form.Item>
+        <Form.Item label='Case Type' name='caseTypeGuids'>
+          <DropDown multiSelect items={caseTypes} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Cost Driver' name='costDrivers'>
+          <DropDown multiSelect items={costDrivers} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Entity' name='entityIds'>
+          <DropDown multiSelect items={entities} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Service Line' name='serviceLineIds'>
+          <DropDown multiSelect items={serviceLines} allowClear itemTextField='text' itemValueField='id'></DropDown>
+        </Form.Item>
+        <Form.Item label='Display' name='viewVisible'>
+          <RadioGroup
+            options={[
+              { value: true, label: 'Visible Opportunities' },
+              { value: false, label: 'Hidden Opportunities' }
+            ]}
+          />
+        </Form.Item>
+        <Form.Item label='Initiatives' name='excludeInitiatives' valuePropName='checked'>
+          <Checkbox>Exclude Opportunities with Initiatives</Checkbox>
+        </Form.Item>
+      </Form>
+    </Drawer>
+  );
+};
+
+export default Filters;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/Opportunities.test.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/Opportunities.test.tsx
new file mode 100644
index 0000000..6262771
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/Opportunities.test.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import { render, screen, within } from '../../test-utils/testUtils';
+import { IVariationOpportunity, newUtilizationVariationOpportunity } from './data/IVariationOpportunity';
+import { opportunityService } from './data/opportunityService';
+import { IPagedApiResponse } from '../../shared/paging/IPagedApiResponse';
+import Opportunities from './Opportunities';
+
+const mockOpportunities: IVariationOpportunity[] = [
+  newUtilizationVariationOpportunity({
+    opportunityKey: 'UV - 1',
+    caseTypeName: 'Case Type 1',
+    costDriver: 'Cost Driver 1',
+    entityName: 'Entity 1',
+    identifiedSavings: 100,
+    serviceLineName: 'Service Line 1'
+  }),
+  newUtilizationVariationOpportunity({
+    opportunityKey: 'UV - 2',
+    caseTypeName: 'Case Type 2',
+    costDriver: 'Cost Driver 2',
+    entityName: 'Entity 2',
+    identifiedSavings: 200,
+    serviceLineName: 'Service Line 2'
+  })
+];
+
+const mockPagedOpportunities: IPagedApiResponse<IVariationOpportunity> = {
+  data: mockOpportunities,
+  pagingInfo: {
+    pageNumber: 1,
+    resultsPerPage: 25,
+    totalNumberOfResults: 2,
+    totalPages: 1
+  }
+};
+
+test('All opportunities are shown', async () => {
+  jest.spyOn(opportunityService, 'getOpportunities').mockImplementation(() => Promise.resolve(mockPagedOpportunities));
+
+  // render component
+  render(<Opportunities />);
+
+  // wait for grid to load
+  const cell = await screen.findByRole('cell', { name: mockPagedOpportunities.data[0].caseTypeName });
+
+  // get rows
+  const tableBody = cell?.parentElement?.parentElement as HTMLElement;
+  const rows = within(tableBody).getAllByRole('row');
+
+  // verify users appear in grid sorted by firstName
+  mockPagedOpportunities.data.forEach((opportunity, index) => {
+    const row = rows[index];
+    within(row).getByText(opportunity.opportunityKey);
+    within(row).getByText(opportunity.caseTypeName);
+    within(row).getByText(opportunity.entityName);
+    within(row).getByText(opportunity.serviceLineName);
+    within(row).getByText(opportunity.costDriver);
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/Opportunities.tsx b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/Opportunities.tsx
new file mode 100644
index 0000000..d909d52
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/Opportunities.tsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import { useEffect, useState } from 'react';
+import { opportunityService } from './data/opportunityService';
+import Filters from './Filters';
+import { IVariationFilters, numberOfFilters, initialFilters } from './data/IVariationFilters';
+import { useJazzUrlWithVersion } from '@strata/core/lib';
+import OpportunitiesGrid from '../../shared/opportunities/OpportunitiesGrid';
+import { IVariationOpportunity } from './data/IVariationOpportunity';
+import DataGrid from '@strata/tempo/lib/datagrid';
+import { IOpportunity } from '../../shared/opportunities/data';
+import { useConfigurations } from '../../shared/configuration/ConfigurationContext';
+
+const Opportunities: React.FC = () => {
+  const { currentConfiguration } = useConfigurations();
+  const [currentConfigurationGuid, setCurrentConfigurationGuid] = useState(currentConfiguration?.configurationGuid ?? '');
+
+  const [filters, setFilters] = useState<IVariationFilters>(initialFilters);
+  const [filtersVisible, setFiltersVisible] = useState(false);
+  const jazzUrl = useJazzUrlWithVersion();
+
+  useEffect(() => {
+    document.title = 'Utilization Variation';
+  }, []);
+
+  useEffect(() => {
+    if (currentConfiguration == null) {
+      return;
+    }
+    setFilters(initialFilters);
+    setCurrentConfigurationGuid(currentConfiguration.configurationGuid);
+  }, [currentConfiguration]);
+
+  const handleApplyFilters = (newFilters: IVariationFilters) => {
+    setFiltersVisible(false);
+    setFilters({ ...filters, ...newFilters });
+  };
+
+  const handleSearch = (searchValue: string) => {
+    setFilters((filters) => {
+      return { ...filters, opportunitySearch: searchValue };
+    });
+  };
+
+  const getOpportunityUrl = (opportunity: IOpportunity) => {
+    const isLOS = (opportunity as IVariationOpportunity).costDriver === 'LOS';
+    const opportunityVariationType = (opportunity as IVariationOpportunity).opportunityKey.substring(0, 2);
+    return `${jazzUrl}CCI/${opportunityVariationType === 'UV' ? 'Variation' : 'ExplorationVariation'}/${isLOS ? 'Los' : ''}OpportunityViewer.aspx?opportunityGuid=${opportunity.opportunityGuid}`;
+  };
+
+  const getInitiativeUrl = (opportunity: IOpportunity) => {
+    const opportunityVariationType = (opportunity as IVariationOpportunity).opportunityKey.substring(0, 2);
+    return `${jazzUrl}CCI/${opportunityVariationType === 'UV' ? 'Variation' : 'ExplorationVariation'}/InitiativeViewer.aspx?id=${opportunity.initiativeGuid}`;
+  };
+
+  return (
+    <>
+      <Filters filters={filters} isVisible={filtersVisible} onApply={handleApplyFilters} onCancel={() => setFiltersVisible(false)} />
+      <OpportunitiesGrid
+        configurationGuid={currentConfigurationGuid}
+        getOpportunityUrl={getOpportunityUrl}
+        getInitiativeUrl={getInitiativeUrl}
+        filters={filters}
+        opportunityService={opportunityService}
+        numOfSelectedFilters={numberOfFilters(filters)}
+        searchPlaceholderText='Search'
+        hasSourceOpportunities={false}
+        onFilter={() => setFiltersVisible(true)}
+        onSearch={handleSearch}
+        identifiedSavingsIndex={2}
+      >
+        <DataGrid.NumberColumn field='variationPerCase' header='Variation Per Case' format='currency' sortable width={100} />
+        <DataGrid.NumberColumn field='cases' header='Cases' sortable width={96} />
+        <DataGrid.Column field='caseTypeName' header='Case Type' sortable width={240} />
+        <DataGrid.Column field='costDriver' header='Cost Driver' sortable width={160} />
+        <DataGrid.Column field='entityName' header='Entity' sortable width={184} collapseLongText />
+        <DataGrid.Column field='serviceLineName' header='Service Line' sortable width={160} />
+      </OpportunitiesGrid>
+    </>
+  );
+};
+
+export default Opportunities;
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/data/IVariationFilterOptions.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/data/IVariationFilterOptions.ts
new file mode 100644
index 0000000..65e6652
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/data/IVariationFilterOptions.ts
@@ -0,0 +1,20 @@
+import { IListMember } from '../../../shared/data/IListMember';
+
+export interface IVariationFilterOptions {
+  caseTypes: IListMember[];
+  costDrivers: IListMember[];
+  entities: IListMember[];
+  serviceLines: IListMember[];
+}
+
+export const newFilterOptions = (data: Partial<IVariationFilterOptions> = {}): IVariationFilterOptions => {
+  return {
+    ...{
+      caseTypes: [],
+      costDrivers: [],
+      entities: [],
+      serviceLines: []
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/data/IVariationFilters.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/data/IVariationFilters.ts
new file mode 100644
index 0000000..efc2abc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/data/IVariationFilters.ts
@@ -0,0 +1,31 @@
+import { IOpportunityFilters } from '../../../shared/opportunities/data';
+
+export interface IVariationFilters extends IOpportunityFilters {
+  caseTypeGuids: string[];
+  costDrivers: string[];
+  entityIds: string[];
+  serviceLineIds: string[];
+}
+
+export const initialFilters: IVariationFilters = {
+  identifiedSavings: undefined,
+  caseTypeGuids: [],
+  costDrivers: [],
+  entityIds: [],
+  serviceLineIds: [],
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+export const numberOfFilters = (filters: IVariationFilters): number => {
+  let filtersCount = 0;
+  if (filters.identifiedSavings != null && filters.identifiedSavings > 0) filtersCount++;
+  if (filters.caseTypeGuids.length > 0) filtersCount++;
+  if (filters.costDrivers.length > 0) filtersCount++;
+  if (filters.entityIds.length > 0) filtersCount++;
+  if (filters.serviceLineIds.length > 0) filtersCount++;
+  if (filters.viewVisible === false) filtersCount++;
+  if (filters.excludeInitiatives === true) filtersCount++;
+  return filtersCount;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/data/IVariationOpportunity.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/data/IVariationOpportunity.ts
new file mode 100644
index 0000000..c278c4c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/data/IVariationOpportunity.ts
@@ -0,0 +1,34 @@
+import { IOpportunity } from '../../../shared/opportunities/data/IOpportunity';
+
+export interface IVariationOpportunity extends IOpportunity {
+  cases: number;
+  caseTypeName: string;
+  costDriver: string;
+  entityName: string;
+  serviceLineName: string;
+  variationPerCase: number;
+}
+
+export const newUtilizationVariationOpportunity = (data: Partial<IVariationOpportunity> = {}): IVariationOpportunity => {
+  return {
+    ...{
+      opportunityKey: '',
+      opportunityId: 0,
+      opportunityGuid: '',
+      identifiedSavings: 0,
+      cases: 0,
+      variationPerCase: 0,
+      caseTypeName: '',
+      costDriver: '',
+      entityName: '',
+      serviceLineName: '',
+      hasInitiative: false,
+      note: '',
+      isHidden: false,
+      initiativeGuid: '',
+      sourceOpportunity: '',
+      sourceOpportunityId: -1
+    },
+    ...data
+  };
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/data/opportunityService.ts b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/data/opportunityService.ts
new file mode 100644
index 0000000..f564158
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/src/utilization-variation/opportunities/data/opportunityService.ts
@@ -0,0 +1,50 @@
+import { appConfig, getSecureService } from '@strata/core/lib';
+import { IVariationOpportunity } from './IVariationOpportunity';
+import { IVariationFilterOptions } from './IVariationFilterOptions';
+import { IPagingOptions, IPagedApiResponse, ISortOptions } from '../../../shared/paging';
+import { IOpportunityFilters, IOpportunityService } from '../../../shared/opportunities/data';
+
+const { httpGet, httpPost, httpPut, httpDownloadAndDisplayFile } = getSecureService(`${appConfig.apiUrl}v1/`);
+
+export const opportunityService: IOpportunityService = {
+  getOpportunities: async (configurationGuid: string, pagingOptions: IPagingOptions, filters: IOpportunityFilters): Promise<IPagedApiResponse<IVariationOpportunity>> => {
+    return httpPost<IPagedApiResponse<IVariationOpportunity>>(`variation-opportunities`, {
+      pagingOptions,
+      filters: {
+        ...filters,
+        configurationGuid
+      }
+    });
+  },
+
+  export: async (configurationGuid: string, sortOptions: ISortOptions, filters: IOpportunityFilters): Promise<void> => {
+    const date = new Date();
+    const fileName = 'UV_CI_Opportunities_' + date.toISOString().split('T')[0];
+    httpDownloadAndDisplayFile(
+      'variation-opportunities/export',
+      {
+        method: 'post',
+        body: JSON.stringify({
+          sortOptions,
+          filters: {
+            ...filters,
+            configurationGuid
+          }
+        })
+      },
+      fileName
+    );
+  },
+
+  getFilterOptions: (configurationGuid: string): Promise<IVariationFilterOptions> => {
+    return httpGet<IVariationFilterOptions>(`variation-opportunities/${configurationGuid}/filter-options`);
+  },
+
+  setHidden: async (opportunityGuid: string, isHidden: boolean): Promise<void> => {
+    await httpPut(`variation-opportunities/${opportunityGuid}/set-hidden`, isHidden);
+  },
+
+  setNote: async (opportunityGuid: string, note: string): Promise<void> => {
+    await httpPut(`variation-opportunities/${opportunityGuid}/set-note`, note);
+  }
+};
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/swagger.json b/src/Strata.ContinuousImprovement.Web/continuousimprovement/swagger.json
new file mode 100644
index 0000000..3080301
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/swagger.json
@@ -0,0 +1,24967 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "dotnet-swagger",
+    "description": "",
+    "version": "v1"
+  },
+  "paths": {
+    "/api/v1/all-opportunities": {
+      "post": {
+        "tags": [
+          "AllOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/AllOpportunityLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/AllOpportunityLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AllOpportunityPagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/all-opportunities/is-name-valid": {
+      "post": {
+        "tags": [
+          "AllOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ValidateName"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ValidateName"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/all-opportunities/export": {
+      "post": {
+        "tags": [
+          "AllOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/AllOpportunityExportOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/AllOpportunityExportOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/api/v1/all-opportunities/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "AllOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AllFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/all-opportunities/{opportunityGuid}/set-hidden": {
+      "put": {
+        "tags": [
+          "AllOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "boolean"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "boolean"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/all-opportunities/{opportunityGuid}/set-note": {
+      "put": {
+        "tags": [
+          "AllOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/background-client-job/{jobId}/status": {
+      "get": {
+        "tags": [
+          "BackgroundClientJob"
+        ],
+        "parameters": [
+          {
+            "name": "jobId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-initiatives/create": {
+      "post": {
+        "tags": [
+          "ChargeCodeInitiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/{opportunityGuid}/update-opportunity": {
+      "put": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CCOpportunitySaveModel"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/CCOpportunitySaveModel"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/validate-charge-codes": {
+      "post": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ValidateChargeCodeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ValidateChargeCodeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/charge-code-members": {
+      "post": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ChargeCodePickerModel"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/validate-opportunity-levels": {
+      "post": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/OpportunityLevelSelectionInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/OpportunityLevelSelectionInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/{id}/delete": {
+      "delete": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/{opportunityGuid}": {
+      "get": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CCOpportunityDto"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/{opportunityGuid}/edit-model": {
+      "get": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CCOpportunitySaveModel"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/{opportunityGuid}/update-goal-total-units-of-service": {
+      "put": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GoalSetDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/GoalSetDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/{opportunityGuid}/update-goal-cost-per-unit": {
+      "put": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GoalSetDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/GoalSetDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/{opportunityGuid}/update-goals": {
+      "put": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/ChargeCodeOpportunityDetailChanges"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/ChargeCodeOpportunityDetailChanges"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/{opportunityGuid}/export": {
+      "post": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChargeCodeItems"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChargeCodeItems"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "202": {
+            "description": "Accepted"
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/opportunity-create-enabled": {
+      "get": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/{opportunityGuid}/initiative-info": {
+      "get": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeInfo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/refresh": {
+      "post": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RefreshData"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/RefreshData"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/opportunity-metric-cohort-data": {
+      "post": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/OpportunityMetricCohortOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/OpportunityMetricCohortOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/OpportunityMetricCohortData"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/{opportunityGuid}/set-hidden": {
+      "put": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "boolean"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "boolean"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunities/{opportunityGuid}/set-note": {
+      "put": {
+        "tags": [
+          "ChargeCodeOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunity-details/create": {
+      "post": {
+        "tags": [
+          "ChargeCodeOpportunityDetails"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChargeCodeDetailInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChargeCodeDetailInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        },
+        "deprecated": true
+      }
+    },
+    "/api/v1/charge-code-opportunity-details/refresh-baseline-details": {
+      "post": {
+        "tags": [
+          "ChargeCodeOpportunityDetails"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChargeCodeOpportunityJobRequestInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChargeCodeOpportunityJobRequestInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opportunity-details/refresh-tracking-details": {
+      "post": {
+        "tags": [
+          "ChargeCodeOpportunityDetails"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChargeCodeOpportunityJobRequestInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChargeCodeOpportunityJobRequestInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opps": {
+      "post": {
+        "tags": [
+          "ChargeCodeOpps"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CCOpportunityLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/CCOpportunityLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CCOpportunityPagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opps/export": {
+      "post": {
+        "tags": [
+          "ChargeCodeOpps"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CCOpportunityExportOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/CCOpportunityExportOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opps/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "ChargeCodeOpps"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CCFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opps/{opportunityGuid}/set-hidden": {
+      "put": {
+        "tags": [
+          "ChargeCodeOpps"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "boolean"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "boolean"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/charge-code-opps/{opportunityGuid}/set-note": {
+      "put": {
+        "tags": [
+          "ChargeCodeOpps"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/client-network-opportunities/opportunities": {
+      "post": {
+        "tags": [
+          "ClientNetworkOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NetworkOpportunityLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/NetworkOpportunityLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NetworkOpportunitySummaryPagedApiResponse"
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "No Content"
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-network-opportunities/{networkOpportunityId}": {
+      "get": {
+        "tags": [
+          "ClientNetworkOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "networkOpportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ClientNetworkOpportunityDto"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "No Content"
+          },
+          "500": {
+            "description": "Internal Server Error"
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ClientNetworkOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "networkOpportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ClientNetworkOpportunityDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ClientNetworkOpportunityDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ClientNetworkOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "networkOpportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-network-opportunities/{networkOpportunityId}/publish": {
+      "put": {
+        "tags": [
+          "ClientNetworkOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "networkOpportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "isPublished",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-network-opportunities/update-initiative-status/{networkOpportunityId}": {
+      "put": {
+        "tags": [
+          "ClientNetworkOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "networkOpportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeStatuses"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeStatuses"
+              }
+            }
+          }
+        },
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-network-opportunities/{networkOpportunityId}/revert-workbook-to-template": {
+      "put": {
+        "tags": [
+          "ClientNetworkOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "networkOpportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-network-opportunity-link": {
+      "put": {
+        "tags": [
+          "ClientNetworkOpportunityLink"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateNetworkOpportunityLinkDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateNetworkOpportunityLinkDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ClientNetworkOpportunityResultDto"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "ClientNetworkOpportunityLink"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RolloverOpportunityDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/RolloverOpportunityDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ClientNetworkOpportunityResultDto"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-network-opportunity-link/delete-opportunity-link": {
+      "delete": {
+        "tags": [
+          "ClientNetworkOpportunityLink"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ClientNetworkOpportunityLinkDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ClientNetworkOpportunityLinkDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-network-opportunity-link/{opportunityGuid}/{configurationGuid}": {
+      "delete": {
+        "tags": [
+          "ClientNetworkOpportunityLink"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-network-opportunity-link/delete-initiative-link": {
+      "delete": {
+        "tags": [
+          "ClientNetworkOpportunityLink"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ClientNetworkOpportunityLinkDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ClientNetworkOpportunityLinkDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-network-opportunity-link/{initiativeGuid}/delete-initiative-link": {
+      "delete": {
+        "tags": [
+          "ClientNetworkOpportunityLink"
+        ],
+        "parameters": [
+          {
+            "name": "initiativeGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-opportunity-type-workbooks/{opportunityType}": {
+      "get": {
+        "tags": [
+          "ClientOpportunityTypeWorkbooks"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityType",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/OpportunityTypeWorkbookClientInfo"
+                  }
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-opportunity-type-workbooks": {
+      "post": {
+        "tags": [
+          "ClientOpportunityTypeWorkbooks"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/OpportunityTypeWorkbook"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/OpportunityTypeWorkbook"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/OpportunityTypeWorkbook"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-opportunity-type-workbooks/{opportunityType}/workbooks/{workbookId}": {
+      "delete": {
+        "tags": [
+          "ClientOpportunityTypeWorkbooks"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityType",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "workbookId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-opportunity-workbooks/workbooks": {
+      "get": {
+        "tags": [
+          "ClientOpportunityWorkbooks"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/WorkbookClientInfo"
+                  }
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-opportunity-workbooks/{opportunityGuid}": {
+      "get": {
+        "tags": [
+          "ClientOpportunityWorkbooks"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/OpportunityWorkbookClientInfo"
+                  }
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-opportunity-workbooks": {
+      "post": {
+        "tags": [
+          "ClientOpportunityWorkbooks"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/OpportunityWorkbook"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/OpportunityWorkbook"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/OpportunityWorkbook"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-opportunity-workbooks/{opportunityGuid}/workbooks/{workbookId}": {
+      "delete": {
+        "tags": [
+          "ClientOpportunityWorkbooks"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          {
+            "name": "workbookId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-warehouses": {
+      "get": {
+        "tags": [
+          "ClientWarehouses"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ClientWarehouse"
+                  }
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "No Content"
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "ClientWarehouses"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ClientWarehouse"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ClientWarehouse"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/client-warehouses/{databaseGuid}": {
+      "delete": {
+        "tags": [
+          "ClientWarehouses"
+        ],
+        "parameters": [
+          {
+            "name": "databaseGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          }
+        }
+      }
+    },
+    "/api/v1/comments": {
+      "post": {
+        "tags": [
+          "Comments"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CommentOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/CommentOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Comment"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/comments/create": {
+      "post": {
+        "tags": [
+          "Comments"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NewComment"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/NewComment"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Comment"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/configurations": {
+      "get": {
+        "tags": [
+          "Configurations"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Configuration"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/configurations/{configurationGuid}/configuration-entities": {
+      "get": {
+        "tags": [
+          "Configurations"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Member"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/configurations/{configurationGuid}/configuration-entity-info": {
+      "get": {
+        "tags": [
+          "Configurations"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EntityInfo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/configurations/{configurationGuid}/configuration-service-line-info": {
+      "get": {
+        "tags": [
+          "Configurations"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceLineInfo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/databases": {
+      "get": {
+        "tags": [
+          "Databases"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Database"
+                  }
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "No Content"
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/device-identifiers/clear-device-identifiers": {
+      "post": {
+        "tags": [
+          "DeviceIdentifiers"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Internal Server Error"
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities": {
+      "post": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ENOpportunityLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ENOpportunityLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ENOpportunityPagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/create": {
+      "post": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ENOpportunityDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ENOpportunityDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OpportunityJobResultsDto"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/{id}/delete": {
+      "delete": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/export": {
+      "post": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ENOpportunityExportOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ENOpportunityExportOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/{opportunityGuid}": {
+      "get": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ENOpportunityDto"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/{opportunityGuid}/update-goals": {
+      "put": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/ENOpportunityRowDataChanges"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/ENOpportunityRowDataChanges"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/{opportunityGuid}/edit-model": {
+      "get": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ENOpportunitySaveModel"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/{opportunityGuid}/initiative-info": {
+      "get": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeInfo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ENFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/tempo-page-enabled": {
+      "get": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/{opportunityGuid}/update-opportunity": {
+      "put": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ENOpportunityDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ENOpportunityDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/opportunity-metric-cohort-data": {
+      "post": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/OpportunityMetricCohortOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/OpportunityMetricCohortOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/OpportunityMetricCohortData"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/{opportunityGuid}/set-hidden": {
+      "put": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "boolean"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "boolean"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/encounter-opportunities/{opportunityGuid}/set-note": {
+      "put": {
+        "tags": [
+          "EncounterOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/encounters": {
+      "post": {
+        "tags": [
+          "Encounters"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EncounterQueryInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/EncounterQueryInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/IJazzEncounterInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounters/cost-info": {
+      "post": {
+        "tags": [
+          "Encounters"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EncounterCostQueryInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/EncounterCostQueryInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EncounterCostInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounters/department-unit-of-service-info": {
+      "post": {
+        "tags": [
+          "Encounters"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DepartmentEncounterUnitOfServiceQueryInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/DepartmentEncounterUnitOfServiceQueryInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/DepartmentEncounterUnitOfService"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounters/unit-of-service-info": {
+      "post": {
+        "tags": [
+          "Encounters"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EncounterUnitOfServiceQueryInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/EncounterUnitOfServiceQueryInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EncounterUnitOfService"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounters/encounter-charge-info": {
+      "post": {
+        "tags": [
+          "Encounters"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EncounterChargeQueryInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/EncounterChargeQueryInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EncounterChargeInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounters/variation-encounter-charge-info": {
+      "post": {
+        "tags": [
+          "Encounters"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/VariationEncounterChargeQueryInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/VariationEncounterChargeQueryInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/VariationEncounterChargeInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/encounters/los-opportunity-info": {
+      "post": {
+        "tags": [
+          "Encounters"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/LOSOpportunityQueryInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/LOSOpportunityQueryInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/LOSOpportunityInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration/case-type-family-summary": {
+      "post": {
+        "tags": [
+          "Exploration"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ExplorationInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ExplorationInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/CaseTypeFamilySummaryData"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration/case-type-family-cost-driver-info": {
+      "post": {
+        "tags": [
+          "Exploration"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ExplorationCostDriverInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ExplorationCostDriverInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/CaseTypeFamilySummaryData"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration/case-type-family-details": {
+      "post": {
+        "tags": [
+          "Exploration"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ExplorationDetailInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ExplorationDetailInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CaseTypeFamilyDetailInfo"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration/case-type-family-summary-heatmap": {
+      "post": {
+        "tags": [
+          "Exploration"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ExplorationInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ExplorationInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/HeatMapData"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration/flexible-exploration-information-page": {
+      "get": {
+        "tags": [
+          "Exploration"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-opportunities/enabled": {
+      "get": {
+        "tags": [
+          "ExplorationOpportunities"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-opportunities": {
+      "post": {
+        "tags": [
+          "ExplorationOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EXOpportunityLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/EXOpportunityLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EXOpportunityPagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-opportunities/{opportunityGuid}": {
+      "get": {
+        "tags": [
+          "ExplorationOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EXOpportunity"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "No Content"
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ExplorationOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-opportunities/{opportunityGuid}/check-workbook": {
+      "put": {
+        "tags": [
+          "ExplorationOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "204": {
+            "description": "No Content"
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-opportunities/create": {
+      "post": {
+        "tags": [
+          "ExplorationOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EXOpportunityDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/EXOpportunityDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EXOpportunity"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-opportunities/export": {
+      "post": {
+        "tags": [
+          "ExplorationOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EXOpportunityExportOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/EXOpportunityExportOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-opportunities/{opportunityGuid}/update": {
+      "put": {
+        "tags": [
+          "ExplorationOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EXOpportunity"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/EXOpportunity"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EXOpportunity"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-opportunities/{opportunityGuid}/set-status": {
+      "put": {
+        "tags": [
+          "ExplorationOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeStatuses"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeStatuses"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EXOpportunity"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-opportunities/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "ExplorationOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EXFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-opportunities/{opportunityGuid}/set-hidden": {
+      "put": {
+        "tags": [
+          "ExplorationOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "boolean"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "boolean"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-opportunities/{opportunityGuid}/set-note": {
+      "put": {
+        "tags": [
+          "ExplorationOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-populations/is-name-unique": {
+      "post": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-populations": {
+      "post": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ExplorationPopulationDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ExplorationPopulationDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ExplorationPopulationDataDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-populations/{populationId}/discharge-dates": {
+      "get": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "parameters": [
+          {
+            "name": "populationId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DateTimeDateTimeTuple"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-populations/{populationId}": {
+      "put": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "parameters": [
+          {
+            "name": "populationId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ExplorationPopulationDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ExplorationPopulationDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "parameters": [
+          {
+            "name": "populationId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ExplorationPopulationDto"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "parameters": [
+          {
+            "name": "populationId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-populations/{populationId}/update-population-name": {
+      "put": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "parameters": [
+          {
+            "name": "populationId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-populations/{populationId}/details": {
+      "get": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "parameters": [
+          {
+            "name": "populationId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ExplorationPopulationDetailsDto"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-populations/info/{populationId}": {
+      "get": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "parameters": [
+          {
+            "name": "populationId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/IExplorationPopulationInfo"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-populations/{populationId}/encounters": {
+      "get": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "parameters": [
+          {
+            "name": "populationId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          },
+          {
+            "name": "configurationGuid",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/IJazzExplorationEncounterInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-populations/{populationId}/duplicate": {
+      "post": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "parameters": [
+          {
+            "name": "populationId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ExplorationPopulationDataDto"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/exploration-populations/{populationId}/opportunities": {
+      "post": {
+        "tags": [
+          "ExplorationPopulations"
+        ],
+        "parameters": [
+          {
+            "name": "populationId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ExplorationPopulationOpportunityDto"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/filters/cost-driver-filters": {
+      "get": {
+        "tags": [
+          "Filters"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/FilterListItem"
+                  }
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/filters/supply-filters": {
+      "get": {
+        "tags": [
+          "Filters"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/FilterListItem"
+                  }
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/filters/cost-component-filters": {
+      "get": {
+        "tags": [
+          "Filters"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/FilterListItem"
+                  }
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/filters/sph-criteria-filters/{chipKey}": {
+      "get": {
+        "tags": [
+          "Filters"
+        ],
+        "parameters": [
+          {
+            "name": "chipKey",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "$ref": "#/components/schemas/ChipKey"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/FilterListItem"
+                  }
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/free-form-opportunities": {
+      "post": {
+        "tags": [
+          "FreeFormOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/FFOpportunityLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/FFOpportunityLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FFOpportunityPagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/free-form-opportunities/{opportunityGuid}": {
+      "get": {
+        "tags": [
+          "FreeFormOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FFOpportunityDetailModel"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/free-form-opportunities/create": {
+      "post": {
+        "tags": [
+          "FreeFormOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/FFOpportunityDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/FFOpportunityDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/free-form-opportunities/{id}/delete": {
+      "delete": {
+        "tags": [
+          "FreeFormOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/free-form-opportunities/{opportunityGuid}/initiative": {
+      "get": {
+        "tags": [
+          "FreeFormOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FreeFormInitiativeDto"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/free-form-opportunities/{opportunityGuid}/set-goals": {
+      "post": {
+        "tags": [
+          "FreeFormOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/FFOpportunityMonthValuesDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/FFOpportunityMonthValuesDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/free-form-opportunities/export": {
+      "post": {
+        "tags": [
+          "FreeFormOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/FFOpportunityExportOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/FFOpportunityExportOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/api/v1/free-form-opportunities/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "FreeFormOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FFFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/free-form-opportunities/{opportunityGuid}/set-hidden": {
+      "put": {
+        "tags": [
+          "FreeFormOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "boolean"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "boolean"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/free-form-opportunities/{opportunityGuid}/set-note": {
+      "put": {
+        "tags": [
+          "FreeFormOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/general-ledger-details/{configurationGuid}/department-data": {
+      "post": {
+        "tags": [
+          "GeneralLedgerDetails"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GLDepartmentAccountData"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/GLDepartmentAccountData"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GLDetail"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/general-ledger-details/{configurationGuid}/statistic-data": {
+      "post": {
+        "tags": [
+          "GeneralLedgerDetails"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GLDepartmentAccountData"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/GLDepartmentAccountData"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GLDetail"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/general-ledger-opportunities": {
+      "post": {
+        "tags": [
+          "GeneralLedgerOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GLOpportunityLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/GLOpportunityLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GLOpportunityPagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/general-ledger-opportunities/export": {
+      "post": {
+        "tags": [
+          "GeneralLedgerOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GLOpportunityExportOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/GLOpportunityExportOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/api/v1/general-ledger-opportunities/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "GeneralLedgerOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GLFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/general-ledger-opportunities/create": {
+      "post": {
+        "tags": [
+          "GeneralLedgerOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GLOpportunitySaveModel"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/GLOpportunitySaveModel"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/general-ledger-opportunities/{id}/delete": {
+      "delete": {
+        "tags": [
+          "GeneralLedgerOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/general-ledger-opportunities/{opportunityGuid}/set-hidden": {
+      "put": {
+        "tags": [
+          "GeneralLedgerOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "boolean"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "boolean"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/general-ledger-opportunities/{opportunityGuid}/set-note": {
+      "put": {
+        "tags": [
+          "GeneralLedgerOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/gmdnfile-upload/{fileType}/upload-gmdnfile": {
+      "post": {
+        "tags": [
+          "GMDNFileUpload"
+        ],
+        "parameters": [
+          {
+            "name": "fileType",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "$ref": "#/components/schemas/GMDNFileType"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "file": {
+                    "type": "string",
+                    "format": "binary"
+                  }
+                }
+              },
+              "encoding": {
+                "file": {
+                  "style": "form"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/gudid-file/{dataGroup}/seed-gudid": {
+      "post": {
+        "tags": [
+          "GudidFile"
+        ],
+        "parameters": [
+          {
+            "name": "dataGroup",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "$ref": "#/components/schemas/DataGroupGudId"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "file": {
+                    "type": "string",
+                    "format": "binary"
+                  }
+                }
+              },
+              "encoding": {
+                "file": {
+                  "style": "form"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "415": {
+            "description": "Unsupported Media Type",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/gudid-file/datadog-url": {
+      "get": {
+        "tags": [
+          "GudidFile"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/hangfire/{jobId}/job-status": {
+      "get": {
+        "tags": [
+          "Hangfire"
+        ],
+        "parameters": [
+          {
+            "name": "jobId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/JobInfoDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/hangfire/datadog-url": {
+      "get": {
+        "tags": [
+          "Hangfire"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/hangfire/access-gudid-url": {
+      "get": {
+        "tags": [
+          "Hangfire"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiative-detail-columns/column-list": {
+      "get": {
+        "tags": [
+          "InitiativeDetailColumns"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/InitiativeDetailColumn"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiative-detail-columns/default-column-list": {
+      "get": {
+        "tags": [
+          "InitiativeDetailColumns"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/InitiativeDetailColumn"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiative-detail-columns/set-column-list": {
+      "post": {
+        "tags": [
+          "InitiativeDetailColumns"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeDetailColumnSaveInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeDetailColumnSaveInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/initiative-rollup-columns": {
+      "get": {
+        "tags": [
+          "InitiativeRollupColumns"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/InitiativeRollupColumn"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "InitiativeRollupColumns"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeRollupColumnCreateInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeRollupColumnCreateInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeRollupColumn"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiative-rollup-columns/{initiativeRollupColumnId}": {
+      "get": {
+        "tags": [
+          "InitiativeRollupColumns"
+        ],
+        "parameters": [
+          {
+            "name": "initiativeRollupColumnId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeRollupColumn"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "InitiativeRollupColumns"
+        ],
+        "parameters": [
+          {
+            "name": "initiativeRollupColumnId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeRollupColumnSaveInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeRollupColumnSaveInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeRollupColumn"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "InitiativeRollupColumns"
+        ],
+        "parameters": [
+          {
+            "name": "initiativeRollupColumnId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiative-rollup-columns/is-name-valid/{initiativeRollupColumnId}": {
+      "post": {
+        "tags": [
+          "InitiativeRollupColumns"
+        ],
+        "parameters": [
+          {
+            "name": "initiativeRollupColumnId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiative-rollup-columns/{initiativeRollupColumnId}/values": {
+      "get": {
+        "tags": [
+          "InitiativeRollupColumns"
+        ],
+        "parameters": [
+          {
+            "name": "initiativeRollupColumnId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/InitiativeRollupValue"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiative-rollup-columns/{initiativeRollupColumnId}/add-rollup-value": {
+      "put": {
+        "tags": [
+          "InitiativeRollupColumns"
+        ],
+        "parameters": [
+          {
+            "name": "initiativeRollupColumnId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeRollupValue"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives": {
+      "post": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeFilters"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeFilters"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/InitiativeDetailTreeGridModel"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/{initiativeGuid}": {
+      "get": {
+        "tags": [
+          "Initiatives"
+        ],
+        "parameters": [
+          {
+            "name": "initiativeGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeDetail"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/{initiativeGuid}/initiative-info": {
+      "get": {
+        "tags": [
+          "Initiatives"
+        ],
+        "parameters": [
+          {
+            "name": "initiativeGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeInfo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/export": {
+      "post": {
+        "tags": [
+          "Initiatives"
+        ],
+        "parameters": [
+          {
+            "name": "exportAll",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeExportOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeExportOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "202": {
+            "description": "Accepted"
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/workstreams": {
+      "get": {
+        "tags": [
+          "Initiatives"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/WorkstreamDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "Initiatives"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/filter-settings": {
+      "get": {
+        "tags": [
+          "Initiatives"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeFilters"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/set-filter-settings": {
+      "post": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeFilters"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeFilters"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeFilters"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/set-rampup-info": {
+      "put": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/set-initiative-rollup-value": {
+      "put": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeRollupValueInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeRollupValueInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/create-charge-code": {
+      "post": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CCInitiativeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/CCInitiativeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/update-charge-code": {
+      "post": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CCInitiativeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/CCInitiativeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/create-encounter": {
+      "post": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EncounterInitiativeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/EncounterInitiativeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/update-encounter": {
+      "post": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EncounterInitiativeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/EncounterInitiativeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EncounterInitiativeDto"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/create-free-form": {
+      "post": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/FreeFormInitiativeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/FreeFormInitiativeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/update-free-form": {
+      "post": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/FreeFormInitiativeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/FreeFormInitiativeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FreeFormInitiativeDto"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/{initiativeGuid}/finalize": {
+      "get": {
+        "tags": [
+          "Initiatives"
+        ],
+        "parameters": [
+          {
+            "name": "initiativeGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/create-general-ledger": {
+      "post": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GeneralLedgerInitiativeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/GeneralLedgerInitiativeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/create-payroll": {
+      "post": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PayrollInitiativeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/PayrollInitiativeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/criteria": {
+      "get": {
+        "tags": [
+          "Initiatives"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/InitiativeCriteriaDto"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/scores/{initiativeGuid}": {
+      "get": {
+        "tags": [
+          "Initiatives"
+        ],
+        "parameters": [
+          {
+            "name": "initiativeGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeScoresDto"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/set-scores": {
+      "put": {
+        "tags": [
+          "Initiatives"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeScoresDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitiativeScoresDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/initiatives/opportunity-guid-by-name": {
+      "get": {
+        "tags": [
+          "Initiatives"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          {
+            "name": "opportunityType",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "name",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/mapped-columns/column-list": {
+      "get": {
+        "tags": [
+          "MappedColumns"
+        ],
+        "parameters": [
+          {
+            "name": "name",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/MappedColumn"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/mapped-columns/set-column-list": {
+      "post": {
+        "tags": [
+          "MappedColumns"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ColumnListRequest"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ColumnListRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "204": {
+            "description": "No Content"
+          }
+        }
+      }
+    },
+    "/api/v1/network-opportunities/enabled": {
+      "get": {
+        "tags": [
+          "NetworkOpportunities"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/network-opportunities/is-creator": {
+      "get": {
+        "tags": [
+          "NetworkOpportunities"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/network-opportunities/opportunities": {
+      "post": {
+        "tags": [
+          "NetworkOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NetworkOpportunityLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/NetworkOpportunityLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NetworkOpportunitySummaryPagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/network-opportunities/create": {
+      "post": {
+        "tags": [
+          "NetworkOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NetworkOpportunitySaveModel"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/NetworkOpportunitySaveModel"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NetworkOpportunity"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/network-opportunities/{networkOpportunityId}": {
+      "put": {
+        "tags": [
+          "NetworkOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "networkOpportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/NetworkOpportunitySaveModel"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/NetworkOpportunitySaveModel"
+              }
+            }
+          }
+        },
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "NetworkOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "networkOpportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-savings/non-qvi/case-type-families": {
+      "get": {
+        "tags": [
+          "NonQviSavings"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          {
+            "name": "isBaseline",
+            "in": "query",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NonQviCaseTypeFamilyInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-savings/non-qvi/drg-types": {
+      "get": {
+        "tags": [
+          "NonQviSavings"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          {
+            "name": "isBaseline",
+            "in": "query",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/NonQviDrgTypeInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/opportunity-type-workbooks/{opportunityType}": {
+      "get": {
+        "tags": [
+          "OpportunityTypeWorkbooks"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityType",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/OpportunityTypeWorkbook"
+                  }
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/opportunity-type-workbooks": {
+      "post": {
+        "tags": [
+          "OpportunityTypeWorkbooks"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/OpportunityTypeWorkbook"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/OpportunityTypeWorkbook"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/opportunity-type-workbooks/{opportunityType}/workbook/{workbookId}": {
+      "delete": {
+        "tags": [
+          "OpportunityTypeWorkbooks"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityType",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "workbookId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/opportunity-workbooks/{opportunityGuid}": {
+      "get": {
+        "tags": [
+          "OpportunityWorkbooks"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/OpportunityWorkbook"
+                  }
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/opportunity-workbooks": {
+      "post": {
+        "tags": [
+          "OpportunityWorkbooks"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/OpportunityWorkbook"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/OpportunityWorkbook"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/opportunity-workbooks/{opportunityGuid}/workbook/{workbookId}": {
+      "delete": {
+        "tags": [
+          "OpportunityWorkbooks"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          {
+            "name": "workbookId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/opportunity-workbooks/strategic/{opportunityId}": {
+      "get": {
+        "tags": [
+          "OpportunityWorkbooks"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/StrategicOpportunityWorkbookDto"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/opportunity-workbooks/strategic": {
+      "post": {
+        "tags": [
+          "OpportunityWorkbooks"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/StrategicOpportunityWorkbook"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/StrategicOpportunityWorkbook"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/StrategicOpportunityWorkbookDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/opportunity-workbooks/strategic/{opportunityId}/workbook/{workbookId}": {
+      "delete": {
+        "tags": [
+          "OpportunityWorkbooks"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          },
+          {
+            "name": "workbookId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/opportunity-workbooks/opportunity-workbooks-enabled": {
+      "get": {
+        "tags": [
+          "OpportunityWorkbooks"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/payroll-opportunities": {
+      "post": {
+        "tags": [
+          "PayrollOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PROpportunityLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/PROpportunityLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PROpportunityPagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/payroll-opportunities/export": {
+      "post": {
+        "tags": [
+          "PayrollOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PROpportunityExportOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/PROpportunityExportOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/api/v1/payroll-opportunities/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "PayrollOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PRFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/payroll-opportunities/create": {
+      "post": {
+        "tags": [
+          "PayrollOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PROpportunitySaveModel"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/PROpportunitySaveModel"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "format": "uuid"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/payroll-opportunities/{id}/delete": {
+      "delete": {
+        "tags": [
+          "PayrollOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/payroll-opportunities/{opportunityGuid}": {
+      "get": {
+        "tags": [
+          "PayrollOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PROpportunityDto"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/payroll-opportunities/{opportunityGuid}/initiative-info": {
+      "get": {
+        "tags": [
+          "PayrollOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InitiativeInfo"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/payroll-opportunities/tempo-page-enabled": {
+      "get": {
+        "tags": [
+          "PayrollOpportunities"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/payroll-opportunities/{opportunityGuid}/set-hidden": {
+      "put": {
+        "tags": [
+          "PayrollOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "boolean"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "boolean"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/payroll-opportunities/{opportunityGuid}/set-note": {
+      "put": {
+        "tags": [
+          "PayrollOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/peer-group": {
+      "get": {
+        "tags": [
+          "PeerGroup"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PeerGroupDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "PeerGroup"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PeerGroupDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/PeerGroupDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/peer-group/{peerGroupId}": {
+      "get": {
+        "tags": [
+          "PeerGroup"
+        ],
+        "parameters": [
+          {
+            "name": "peerGroupId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PeerGroupDto"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "PeerGroup"
+        ],
+        "parameters": [
+          {
+            "name": "peerGroupId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PeerGroupDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/PeerGroupDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "PeerGroup"
+        ],
+        "parameters": [
+          {
+            "name": "peerGroupId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/peer-group/dropdown-items": {
+      "get": {
+        "tags": [
+          "PeerGroup"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PeerGroupDropdownItems"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/peer-group/is-name-valid/{peerGroupId}": {
+      "post": {
+        "tags": [
+          "PeerGroup"
+        ],
+        "parameters": [
+          {
+            "name": "peerGroupId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/picker-items/explorations": {
+      "get": {
+        "tags": [
+          "PickerItems"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PickerItem"
+                  }
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-item-breakdowns": {
+      "post": {
+        "tags": [
+          "QualityVariationItemBreakdowns"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/QVIBreakdownsLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/QVIBreakdownsLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/QVIBreakdownPagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-item-breakdowns/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "QualityVariationItemBreakdowns"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/QVIBreakdownFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-item-events": {
+      "post": {
+        "tags": [
+          "QualityVariationItemEvents"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/QVIEventsLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/QVIEventsLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/QVIEventPagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-item-events/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "QualityVariationItemEvents"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/QVIEventFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-item-opportunities": {
+      "post": {
+        "tags": [
+          "QualityVariationItemOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/QVIOpportunityLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/QVIOpportunityLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/QVIOpportunityPagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-item-opportunities/export": {
+      "post": {
+        "tags": [
+          "QualityVariationItemOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/QVIOpportunityExportOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/QVIOpportunityExportOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-item-opportunities/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "QualityVariationItemOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/QVIFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-item-opportunities/populate-qvi-metrics": {
+      "post": {
+        "tags": [
+          "QualityVariationItemOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          {
+            "name": "isBaseline",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-item-opportunities/{opportunityGuid}/set-hidden": {
+      "put": {
+        "tags": [
+          "QualityVariationItemOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "boolean"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "boolean"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-item-opportunities/{opportunityGuid}/set-note": {
+      "put": {
+        "tags": [
+          "QualityVariationItemOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-encounters": {
+      "get": {
+        "tags": [
+          "QviEncounters"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          {
+            "name": "startDate",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "date-time"
+            }
+          },
+          {
+            "name": "endDate",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "date-time"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EncounterInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-savings/line-items/case-type-families": {
+      "get": {
+        "tags": [
+          "QviLineItemSavings"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          {
+            "name": "isBaseline",
+            "in": "query",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/QviLineItemCaseTypeFamilyInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-savings/line-items/drg-types": {
+      "get": {
+        "tags": [
+          "QviLineItemSavings"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          {
+            "name": "isBaseline",
+            "in": "query",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/QviLineItemDrgTypeInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/quality-variation-savings/line-items/encounter-savings": {
+      "get": {
+        "tags": [
+          "QviLineItemSavings"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          {
+            "name": "opportunityGuid",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
+          {
+            "name": "isBaseline",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/QviLineItemEncounterSavingInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/report/{sourceOfSavings}/by-module": {
+      "get": {
+        "tags": [
+          "Report"
+        ],
+        "parameters": [
+          {
+            "name": "sourceOfSavings",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/REReport"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/report/{opportunityGuid}/by-opportunity": {
+      "get": {
+        "tags": [
+          "Report"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/REReport"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/report/reports": {
+      "post": {
+        "tags": [
+          "Report"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ReportRequest"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ReportRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/REReport"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Report"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/REReport"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/report/add-by-opportunity": {
+      "post": {
+        "tags": [
+          "Report"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ReportByOpportunity"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ReportByOpportunity"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/report/add-by-module": {
+      "post": {
+        "tags": [
+          "Report"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ReportByModule"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ReportByModule"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/report/remove-by-opportunity": {
+      "delete": {
+        "tags": [
+          "Report"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ReportByOpportunity"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ReportByOpportunity"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/report/remove-by-module": {
+      "delete": {
+        "tags": [
+          "Report"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ReportByModule"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ReportByModule"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/report/folders": {
+      "get": {
+        "tags": [
+          "Report"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FolderTree"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/report/{folderGuid}folder-reports": {
+      "get": {
+        "tags": [
+          "Report"
+        ],
+        "parameters": [
+          {
+            "name": "folderGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/REReport"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/security/general-access-permission": {
+      "get": {
+        "tags": [
+          "Security"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/security/{lootId}": {
+      "get": {
+        "tags": [
+          "Security"
+        ],
+        "parameters": [
+          {
+            "name": "lootId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Permission"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/security/identities": {
+      "get": {
+        "tags": [
+          "Security"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/IdentityNode"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/security/{lootId}/simple-securities": {
+      "get": {
+        "tags": [
+          "Security"
+        ],
+        "parameters": [
+          {
+            "name": "lootId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Permission"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/security/{lootId}/set-simple-securities": {
+      "put": {
+        "tags": [
+          "Security"
+        ],
+        "parameters": [
+          {
+            "name": "lootId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/Permission"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/Permission"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/settings/feature-flags": {
+      "get": {
+        "tags": [
+          "Settings"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "boolean"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/settings/system-settings": {
+      "post": {
+        "tags": [
+          "Settings"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/settings/opportunity-level-limit": {
+      "get": {
+        "tags": [
+          "Settings"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/settings/charge-code-limit": {
+      "get": {
+        "tags": [
+          "Settings"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/settings/performance-engine-calculations": {
+      "get": {
+        "tags": [
+          "Settings"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PerformanceEngingeCalculationData"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-charge-code/{opportunityId}/opportunity-charge-code": {
+      "get": {
+        "tags": [
+          "StrategicChargeCode"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/StrategicOpportunityChargeCodeEditData"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-charge-code": {
+      "post": {
+        "tags": [
+          "StrategicChargeCode"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityChargeCodeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityChargeCodeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int64"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-charge-code/{opportunityId}": {
+      "put": {
+        "tags": [
+          "StrategicChargeCode"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityChargeCodeUpdateDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityChargeCodeUpdateDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "StrategicChargeCode"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-charge-code/{opportunityId}/goal-detail": {
+      "post": {
+        "tags": [
+          "StrategicChargeCode"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityGetDetailData"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityGetDetailData"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/StrategicOpportunityDetailData"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-charge-code/{opportunityId}/export": {
+      "post": {
+        "tags": [
+          "StrategicChargeCode"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityGetDetailData"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityGetDetailData"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "202": {
+            "description": "Accepted"
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-charge-code/{opportunityId}/export-opportunity": {
+      "post": {
+        "tags": [
+          "StrategicChargeCode"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityGetDetailData"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityGetDetailData"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-charge-code/{opportunityId}/tracking-detail": {
+      "post": {
+        "tags": [
+          "StrategicChargeCode"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityGetDetailData"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityGetDetailData"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/StrategicOpportunityDetailData"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-charge-code/{opportunityId}/details": {
+      "put": {
+        "tags": [
+          "StrategicChargeCode"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateDetailsDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateDetailsDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-general-ledger/{opportunityId}/opportunity-gl": {
+      "get": {
+        "tags": [
+          "StrategicGeneralLedger"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/StrategicOpportunityGLEditData"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-general-ledger": {
+      "post": {
+        "tags": [
+          "StrategicGeneralLedger"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityGLDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityGLDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int64"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-general-ledger/{opportunityId}": {
+      "put": {
+        "tags": [
+          "StrategicGeneralLedger"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityGLUpdateDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityGLUpdateDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "StrategicGeneralLedger"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-general-ledger/{opportunityId}/detail": {
+      "post": {
+        "tags": [
+          "StrategicGeneralLedger"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/StrategicOpportunityGLDetailData"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-general-ledger/{opportunityId}/tracking-detail": {
+      "post": {
+        "tags": [
+          "StrategicGeneralLedger"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/StrategicOpportunityGLDetailData"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-general-ledger/{opportunityId}/details": {
+      "put": {
+        "tags": [
+          "StrategicGeneralLedger"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateGLDetailsDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateGLDetailsDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity": {
+      "get": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/StrategicOpportunityItem"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}/general-info": {
+      "get": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/StrategicOpportunityGeneralInfo"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/is-name-valid": {
+      "post": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}/layout": {
+      "get": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/StrategicOpportunityLayout"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}/update-layout": {
+      "put": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityLayout"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityLayout"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}/set-status": {
+      "put": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityUpdateStatusDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityUpdateStatusDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/initiatives": {
+      "get": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/StrategicInitiativeItem"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}/update-initiative": {
+      "put": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicInitiativeUpdateDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicInitiativeUpdateDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}/update-roles": {
+      "put": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicRolesUpdate"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicRolesUpdate"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}/ramp-ups": {
+      "put": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/StrategicOpportunityRampUpDto"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/StrategicOpportunityRampUpDto"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/StrategicOpportunityRampUpDto"
+                  }
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}/run-tracking-task": {
+      "get": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}/complete-initiative": {
+      "put": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityCompleteInitiativeData"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/StrategicOpportunityCompleteInitiativeData"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}/measures": {
+      "get": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/StrategicOpportunityMeasureDto"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}/primary-measure": {
+      "get": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/StrategicOpportunityMeasureDto"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{measureId}/measure-details": {
+      "get": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "measureId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/StrategicOpportunityMeasureDetail"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}": {
+      "get": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/StrategicOpportunityDrawerDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity/{opportunityId}/copy": {
+      "post": {
+        "tags": [
+          "StrategicOpportunity"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int64"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity-security/{lootId}": {
+      "get": {
+        "tags": [
+          "StrategicOpportunitySecurity"
+        ],
+        "parameters": [
+          {
+            "name": "lootId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RoleAssignmentView"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity-security/{lootId}/simple-securities": {
+      "get": {
+        "tags": [
+          "StrategicOpportunitySecurity"
+        ],
+        "parameters": [
+          {
+            "name": "lootId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/OpportunityRoleAssignmentView"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/strategic-opportunity-security/{lootId}/set-simple-securities": {
+      "put": {
+        "tags": [
+          "StrategicOpportunitySecurity"
+        ],
+        "parameters": [
+          {
+            "name": "lootId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/OpportunityRoleAssignmentView"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/OpportunityRoleAssignmentView"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/users/users": {
+      "get": {
+        "tags": [
+          "Users"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/CIUser"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/users/owners": {
+      "get": {
+        "tags": [
+          "Users"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/CIUser"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/users/executive-sponsors": {
+      "get": {
+        "tags": [
+          "Users"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/CIUser"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/users/cost-leaders": {
+      "get": {
+        "tags": [
+          "Users"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/CIUser"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/users/administrators": {
+      "get": {
+        "tags": [
+          "Users"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/CIUser"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/users/jazz-users": {
+      "get": {
+        "tags": [
+          "Users"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/CIUser"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/users/user-groups": {
+      "get": {
+        "tags": [
+          "Users"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/UserGroup"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/users/all-ci-users": {
+      "get": {
+        "tags": [
+          "Users"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/CIUser"
+                  }
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/users/{userGuid}/user": {
+      "get": {
+        "tags": [
+          "Users"
+        ],
+        "parameters": [
+          {
+            "name": "userGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CIUser"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/user-settings/{userGuid}": {
+      "get": {
+        "tags": [
+          "UserSettings"
+        ],
+        "parameters": [
+          {
+            "name": "userGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CciUserSetting"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/user-settings": {
+      "post": {
+        "tags": [
+          "UserSettings"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CciUserSetting"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/CciUserSetting"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CciUserSetting"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/utilization-variation/all-charge-info": {
+      "post": {
+        "tags": [
+          "UtilizationVariation"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/AllChargeQueryInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/AllChargeQueryInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/AllChargeInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/utilization-variation/charge-info": {
+      "post": {
+        "tags": [
+          "UtilizationVariation"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChargeQueryInfo"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ChargeQueryInfo"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ChargeInfo"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/variation-case-types": {
+      "post": {
+        "tags": [
+          "VariationCaseTypes"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UVCaseTypeLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UVCaseTypeLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UVCaseTypePagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/variation-case-types/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "VariationCaseTypes"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UVFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/variation-case-types/{configurationGuid}/add-patient-population-case-types": {
+      "post": {
+        "tags": [
+          "VariationCaseTypes"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/variation-opportunities": {
+      "post": {
+        "tags": [
+          "VariationOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UVOpportunityLoadOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UVOpportunityLoadOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UVOpportunityPagedApiResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/variation-opportunities/export": {
+      "post": {
+        "tags": [
+          "VariationOpportunities"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UVOpportunityExportOptions"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UVOpportunityExportOptions"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Created"
+          }
+        }
+      }
+    },
+    "/api/v1/variation-opportunities/{configurationGuid}/filter-options": {
+      "get": {
+        "tags": [
+          "VariationOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "configurationGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UVFilterOptions"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/variation-opportunities/{opportunityGuid}/set-hidden": {
+      "put": {
+        "tags": [
+          "VariationOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "boolean"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "boolean"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/v1/variation-opportunities/{opportunityGuid}/set-note": {
+      "put": {
+        "tags": [
+          "VariationOpportunities"
+        ],
+        "parameters": [
+          {
+            "name": "opportunityGuid",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "AccountDetail": {
+        "type": "object",
+        "properties": {
+          "accountId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "amount": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "AccountType": {
+        "enum": [
+          "Revenue",
+          "Expense",
+          "Margin"
+        ],
+        "type": "string"
+      },
+      "AllChargeInfo": {
+        "type": "object",
+        "properties": {
+          "rowID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "chargeCodeId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "chargeCode": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "isPatientSpecific": {
+            "type": "boolean"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "rollup": {
+            "type": "string",
+            "nullable": true
+          },
+          "isBaseline": {
+            "type": "boolean"
+          },
+          "quantity": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgVariableDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgVariableIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgFixedDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgFixedIndirectCost": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "AllChargeQueryInfo": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "chargeCodeIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "AllFilterOptions": {
+        "type": "object",
+        "properties": {
+          "opportunityTypes": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "AllFilters": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "viewVisible": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "excludeInitiatives": {
+            "type": "boolean"
+          },
+          "opportunitySearch": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityTypes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "hasFlexibleExploration": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "AllOpportunity": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "identifiedSavings": {
+            "type": "number",
+            "format": "double"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "hasInitiative": {
+            "type": "boolean",
+            "readOnly": true
+          },
+          "initiative": {
+            "type": "string",
+            "nullable": true
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityTypeName": {
+            "type": "string",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          }
+        },
+        "additionalProperties": false
+      },
+      "AllOpportunityExportOptions": {
+        "type": "object",
+        "properties": {
+          "sortOptions": {
+            "$ref": "#/components/schemas/SortOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/AllFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "AllOpportunityLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/AllFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "AllOpportunityPagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AllOpportunity"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "BaselineType": {
+        "enum": [
+          "MonthRange",
+          "FlatBudget",
+          "Custom",
+          "Override"
+        ],
+        "type": "string"
+      },
+      "BenchmarkingInsightsGranularity": {
+        "enum": [
+          "CaseTypeFamily",
+          "DrgCode",
+          "PrimaryCpt"
+        ],
+        "type": "string"
+      },
+      "CCFilterOptions": {
+        "type": "object",
+        "properties": {
+          "opportunityLevels": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "CCFilters": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "viewVisible": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "excludeInitiatives": {
+            "type": "boolean"
+          },
+          "opportunitySearch": {
+            "type": "string",
+            "nullable": true
+          },
+          "cases": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityLevels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "chargeCodeGroups": {
+            "$ref": "#/components/schemas/ChargeCodeGroup"
+          },
+          "seasonality": {
+            "$ref": "#/components/schemas/SeasonalityType"
+          }
+        },
+        "additionalProperties": false
+      },
+      "CCInitiativeDto": {
+        "type": "object",
+        "properties": {
+          "initiative": {
+            "$ref": "#/components/schemas/ChargeCodeInitiativeDto"
+          },
+          "networkOpportunityId": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "CCOpportunity": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "identifiedSavings": {
+            "type": "number",
+            "format": "double"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "hasInitiative": {
+            "type": "boolean",
+            "readOnly": true
+          },
+          "initiative": {
+            "type": "string",
+            "nullable": true
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "cases": {
+            "type": "number",
+            "format": "double"
+          },
+          "chargeCodeGroup": {
+            "$ref": "#/components/schemas/ChargeCodeGroup"
+          },
+          "chargeCodeGroupValue": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityLevel": {
+            "type": "string",
+            "nullable": true
+          },
+          "isSeasonal": {
+            "type": "boolean"
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          }
+        },
+        "additionalProperties": false
+      },
+      "CCOpportunityDetailRowData": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "totalCases": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "baselineUnitsOfServicePerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "baselineTotalUnitsOfService": {
+            "type": "number",
+            "format": "double"
+          },
+          "baselineCostPerUnit": {
+            "type": "number",
+            "format": "double"
+          },
+          "baselineCostPerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "baselineTotalCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "goalUnitsOfServicePerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "goalTotalUnitsOfService": {
+            "type": "number",
+            "format": "double"
+          },
+          "goalCostPerUnit": {
+            "type": "number",
+            "format": "double"
+          },
+          "goalCostPerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "goalTotalCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "improvement": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "CCOpportunityDetailTreeGridModel": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "nullable": true
+          },
+          "data": {
+            "$ref": "#/components/schemas/CCOpportunityDetailRowData"
+          },
+          "children": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/CCOpportunityDetailTreeGridModel"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "CCOpportunityDto": {
+        "required": [
+          "configurationGuid",
+          "encounterGroup",
+          "name",
+          "opportunityLevel"
+        ],
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "maxLength": 200,
+            "minLength": 0,
+            "type": "string"
+          },
+          "encounterGroup": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "encounterGroups": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "chargeCodes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "isSeasonal": {
+            "type": "boolean"
+          },
+          "opportunityLevel": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityLevels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "baselineStartDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "baselineEndDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "trackingStartDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "trackingEndDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "totalCases": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalCost": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "goalTotalCost": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "improvementTotalCost": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "costPerCase": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "goalCostPerCase": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "improvementCostPerCase": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "details": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ChargeCodeOpportunityDetail"
+            },
+            "nullable": true
+          },
+          "levelCases": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ChargeCodeOpportunityLevelCase"
+            },
+            "nullable": true
+          },
+          "treeGridData": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/CCOpportunityDetailTreeGridModel"
+            },
+            "nullable": true,
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "CCOpportunityExportOptions": {
+        "type": "object",
+        "properties": {
+          "sortOptions": {
+            "$ref": "#/components/schemas/SortOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/CCFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "CCOpportunityLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/CCFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "CCOpportunityPagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/CCOpportunity"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "CCOpportunitySaveModel": {
+        "required": [
+          "encounterGroup"
+        ],
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "isSeasonal": {
+            "type": "boolean"
+          },
+          "chargeCodeJson": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityLevel": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityLevelJson": {
+            "type": "string",
+            "nullable": true
+          },
+          "encounterGroup": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "isFromWizard": {
+            "type": "boolean"
+          },
+          "encounterGroups": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "chargeCodes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "opportunityLevels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "CIUser": {
+        "type": "object",
+        "properties": {
+          "userGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "username": {
+            "type": "string",
+            "nullable": true
+          },
+          "firstName": {
+            "type": "string",
+            "nullable": true
+          },
+          "lastName": {
+            "type": "string",
+            "nullable": true
+          },
+          "email": {
+            "type": "string",
+            "nullable": true
+          },
+          "isDisabled": {
+            "type": "boolean"
+          },
+          "fullName": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "CaseTypeCategories": {
+        "enum": [
+          "MSDRG",
+          "APRDRG",
+          "PatientPopulation",
+          "CPTCode",
+          "ExplorationPopulation"
+        ],
+        "type": "string"
+      },
+      "CaseTypeCategory": {
+        "enum": [
+          "MSDRG",
+          "APRDRG",
+          "PatientPopulation",
+          "CPTCode",
+          "ExplorationPopulation"
+        ],
+        "type": "string"
+      },
+      "CaseTypeDetailRowData": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "nullable": true
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "totalEncounters": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalVariationEncounters": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "identifiedVariation": {
+            "type": "number",
+            "format": "double"
+          },
+          "includedEncounterCount": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "mortalityRate": {
+            "type": "number",
+            "format": "double"
+          },
+          "medianLos": {
+            "type": "number",
+            "format": "double"
+          },
+          "averageLos": {
+            "type": "number",
+            "format": "double"
+          },
+          "medianCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "includedEncountersBelowMedian": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "includedEncountersAboveMedian": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "includedVariation": {
+            "type": "number",
+            "format": "double"
+          },
+          "excludedEncountersAboveMedian": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "excludedVariation": {
+            "type": "number",
+            "format": "double"
+          },
+          "medianGrossCharges": {
+            "type": "number",
+            "format": "double"
+          },
+          "isExcluded": {
+            "type": "boolean"
+          },
+          "dischargeStatusCode": {
+            "type": "string",
+            "nullable": true
+          },
+          "dischargeStatusDescription": {
+            "type": "string",
+            "nullable": true
+          },
+          "peerMedianALos": {
+            "type": "number",
+            "format": "double"
+          },
+          "peerMedianCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "customerBenchmarkMedianALos": {
+            "type": "number",
+            "format": "double"
+          },
+          "customerBenchmarkMedianCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "costOeRatio": {
+            "type": "number",
+            "format": "double",
+            "nullable": true,
+            "readOnly": true
+          },
+          "alosOeRatio": {
+            "type": "number",
+            "format": "double",
+            "nullable": true,
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "CaseTypeFamilyDetailData": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "nullable": true
+          },
+          "data": {
+            "$ref": "#/components/schemas/CaseTypeDetailRowData"
+          },
+          "children": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/CaseTypeFamilyDetailData"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "CaseTypeFamilyDetailInfo": {
+        "type": "object",
+        "properties": {
+          "caseTypeFamilyType": {
+            "type": "string",
+            "nullable": true
+          },
+          "caseTypeFamilyName": {
+            "type": "string",
+            "nullable": true
+          },
+          "metrics": {
+            "$ref": "#/components/schemas/CaseTypeFamilyMetric"
+          },
+          "caseTypeFamilyDetails": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/CaseTypeFamilyDetailData"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "CaseTypeFamilyMetric": {
+        "type": "object",
+        "properties": {
+          "totalEncounters": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "identifiedVariation": {
+            "type": "number",
+            "format": "double"
+          },
+          "encountersIncluded": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "variationIncluded": {
+            "type": "number",
+            "format": "double"
+          },
+          "encountersExcluded": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "variationExcluded": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "CaseTypeFamilySummaryData": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "nullable": true
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "leaf": {
+            "type": "boolean"
+          },
+          "data": {
+            "$ref": "#/components/schemas/EncounterGroupSummary"
+          },
+          "children": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/CaseTypeFamilySummaryData"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "CciUserSetting": {
+        "type": "object",
+        "properties": {
+          "userGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ChargeCodeDetailInfo": {
+        "type": "object",
+        "properties": {
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "isBaseline": {
+            "type": "boolean"
+          },
+          "isUpdate": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ChargeCodeGroup": {
+        "enum": [
+          "CaseType",
+          "PatientPopulation",
+          "Both"
+        ],
+        "type": "string"
+      },
+      "ChargeCodeInitiativeDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "trackingStart": {
+            "type": "string",
+            "nullable": true
+          },
+          "startMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "endMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "goalStatement": {
+            "type": "string",
+            "nullable": true
+          },
+          "workstream": {
+            "type": "string",
+            "nullable": true
+          },
+          "plannedImprovements": {
+            "type": "string",
+            "nullable": true
+          },
+          "isFinalized": {
+            "type": "boolean"
+          },
+          "isLocked": {
+            "type": "boolean"
+          },
+          "costLeader": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "owner": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "executiveSponsor": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "stakeholders": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "teamMembers": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone1": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone2": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone3": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone4": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone5": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone6": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone7": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone8": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone9": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone10": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate1": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate2": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate3": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate4": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate5": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate6": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate7": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate8": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate9": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate10": {
+            "type": "string",
+            "nullable": true
+          },
+          "savingsRampUp01": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp02": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp03": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp04": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp05": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp06": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp07": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp08": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp09": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp10": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp11": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp12": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI01": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI02": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI03": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI04": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI05": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI06": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI07": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI08": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI09": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI10": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI11": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI12": {
+            "type": "number",
+            "format": "double"
+          },
+          "score01": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score02": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score03": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score04": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score05": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score06": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score07": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score08": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score09": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score10": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "cases": {
+            "type": "number",
+            "format": "double"
+          },
+          "encounterGroup": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityLevel": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "encounterGroups": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "chargeCodes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "opportunityLevels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "isSeasonal": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ChargeCodeItems": {
+        "type": "object",
+        "properties": {
+          "chargeCodes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ChargeCodeOpportunityDetail": {
+        "type": "object",
+        "properties": {
+          "chargeCodeOpportunityDetailId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityGUID": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityLevelId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityLevelName": {
+            "type": "string",
+            "nullable": true
+          },
+          "chargeCodeId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "chargeCodeName": {
+            "type": "string",
+            "nullable": true
+          },
+          "totalCases": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalUnitsOfService": {
+            "type": "number",
+            "format": "double"
+          },
+          "totalCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "chargeCodeRollupName": {
+            "type": "string",
+            "nullable": true
+          },
+          "goalTotalUnitsOfService": {
+            "type": "number",
+            "format": "double"
+          },
+          "isBaseline": {
+            "type": "boolean"
+          },
+          "month": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "goalCostPerUnit": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ChargeCodeOpportunityDetailChanges": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "nullable": true
+          },
+          "goalTotalUnitsOfService": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "goalCostPerUnit": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ChargeCodeOpportunityJobRequestInfo": {
+        "type": "object",
+        "properties": {
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ChargeCodeOpportunityLevelCase": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "isBaseline": {
+            "type": "boolean"
+          },
+          "opportunityLevelId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "month": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "cases": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ChargeCodePickerModel": {
+        "type": "object",
+        "properties": {
+          "chargeCodeId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "rollup": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ChargeInfo": {
+        "type": "object",
+        "properties": {
+          "rowID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "chargeCodeId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "chargeCode": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "isPatientSpecific": {
+            "type": "boolean"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "rollup": {
+            "type": "string",
+            "nullable": true
+          },
+          "isBaseline": {
+            "type": "boolean"
+          },
+          "avgVariableDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgVariableIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgFixedDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgFixedIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "cciCostOverride": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ChargeQueryInfo": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "entityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "chargeCodeIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ChipKey": {
+        "enum": [
+          "AdmitSourceID",
+          "AdmitTypeID",
+          "AgeCohortID",
+          "AprDrgID",
+          "CaseTypeFamilyID",
+          "CostDriver",
+          "DischargeStatusId",
+          "EntityID",
+          "EncounterID",
+          "GenderID",
+          "ICD10DXPrimaryDiagID",
+          "ICD10PXPrimaryID",
+          "InsurancePlan1ID",
+          "IsGreaterThanZeroCharges",
+          "LocationID",
+          "Mortality",
+          "MSDRGID",
+          "NewBornFlagID",
+          "PatientTypeID",
+          "PrimaryCPTID",
+          "PrimaryPhysicianID",
+          "PrimaryQVIID",
+          "RiskOfMortality",
+          "SeverityOfIllness",
+          "SourceSystemID",
+          "DischargeDateID",
+          "BilledCPT",
+          "ChargeCode",
+          "CostComponent",
+          "Supply",
+          "UBRevenueCode",
+          "Department",
+          "VariableDirectCost",
+          "LengthOfStay",
+          "MSDRGRollupID",
+          "SPHAdmitType",
+          "SPHDischargeStatus",
+          "SPHPatientType",
+          "SPHGender",
+          "SPHIsNewBorn",
+          "SPHAgeRollup"
+        ],
+        "type": "string"
+      },
+      "ChipType": {
+        "enum": [
+          "ScoreMember",
+          "Boolean",
+          "Special",
+          "CostDriver",
+          "DateRange",
+          "Supply",
+          "CostComponent",
+          "SphCriteria"
+        ],
+        "type": "string"
+      },
+      "ClientNetworkOpportunity": {
+        "type": "object",
+        "properties": {
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "identifiedSavingsDescription": {
+            "type": "string",
+            "nullable": true
+          },
+          "analyticsWorkbookId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "networkOpportunityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "isPublished": {
+            "type": "boolean"
+          },
+          "initiativeStatus": {
+            "$ref": "#/components/schemas/InitiativeStatuses"
+          },
+          "networkOpportunity": {
+            "$ref": "#/components/schemas/NetworkOpportunity"
+          },
+          "opportunities": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ClientNetworkOpportunityLink"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ClientNetworkOpportunityDto": {
+        "type": "object",
+        "properties": {
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "networkOpportunityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "identifiedSavingsDescription": {
+            "type": "string",
+            "nullable": true
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "isPublished": {
+            "type": "boolean"
+          },
+          "analyticsWorkbookId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "workbookTemplateId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeStatus": {
+            "$ref": "#/components/schemas/InitiativeStatuses"
+          },
+          "opportunities": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ClientOpportunity"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ClientNetworkOpportunityLink": {
+        "type": "object",
+        "properties": {
+          "clientNetworkOpportunityLinkId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "initiative": {
+            "type": "string",
+            "nullable": true
+          },
+          "clientNetworkOpportunity": {
+            "$ref": "#/components/schemas/ClientNetworkOpportunity"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ClientNetworkOpportunityLinkDto": {
+        "type": "object",
+        "properties": {
+          "databaseGuid": {
+            "type": "string",
+            "format": "uuid",
+            "nullable": true
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "id": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ClientNetworkOpportunityResultDto": {
+        "type": "object",
+        "properties": {
+          "networkOpportunityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ClientOpportunity": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "initiative": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ClientWarehouse": {
+        "type": "object",
+        "properties": {
+          "clientWarehouseId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "databaseGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "clientName": {
+            "type": "string",
+            "nullable": true
+          },
+          "warehouseSize": {
+            "$ref": "#/components/schemas/WarehouseSize"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ColumnListRequest": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "columns": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MappedColumn"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "Comment": {
+        "type": "object",
+        "properties": {
+          "commentId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "sourceOfSavingsId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "commentText": {
+            "type": "string",
+            "nullable": true
+          },
+          "commentDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "author": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "CommentOptions": {
+        "type": "object",
+        "properties": {
+          "isGlobal": {
+            "type": "boolean"
+          },
+          "opportunityType": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          }
+        },
+        "additionalProperties": false
+      },
+      "Configuration": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "displayOrder": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "serviceLineDimensionGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "entityIdsCSV": {
+            "type": "string",
+            "nullable": true
+          },
+          "isUsingIndirectCost": {
+            "type": "boolean"
+          },
+          "departmentRollupGlobalId": {
+            "type": "string",
+            "nullable": true
+          },
+          "isUsingCustomEntityDimension": {
+            "type": "boolean",
+            "readOnly": true
+          },
+          "customEntityIdsCSV": {
+            "type": "string",
+            "nullable": true
+          },
+          "qviOpportunityBreakdown": {
+            "$ref": "#/components/schemas/QVIOpportunityBreakdowns"
+          },
+          "fiscalYearID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "variationEndDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "qualityVariationEndDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "orgDefinedEndDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "orgDefinedTrackingCurrentMonth": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "variationTrackingCurrentMonth": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "qualityVariationIsUsingAPRDRG": {
+            "type": "boolean"
+          },
+          "sourceSystemIdsCSV": {
+            "type": "string",
+            "nullable": true
+          },
+          "qualityVariationTrackingCurrentMonth": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "configuredEntityIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true,
+            "readOnly": true
+          },
+          "qviOpportunityBreakdownEnum": {
+            "type": "integer",
+            "format": "int32",
+            "readOnly": true
+          },
+          "qviOpportunityBreakdownName": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          },
+          "qviOpportunityBreakdownNamePlural": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          },
+          "fiscalMonthResolver": {
+            "$ref": "#/components/schemas/IFiscalMonthResolver"
+          },
+          "orgDefinedTrackingStartDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "orgDefinedTrackingEndDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "lastFiscalYearStartDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "lastFiscalYearEndDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "serviceLineDimension": {
+            "$ref": "#/components/schemas/ScoreDimension"
+          },
+          "serviceLineAttribute": {
+            "$ref": "#/components/schemas/ScoreAttribute"
+          }
+        },
+        "additionalProperties": false
+      },
+      "CreateNetworkOpportunityLinkDto": {
+        "type": "object",
+        "properties": {
+          "networkOpportunityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "DataGroupGudId": {
+        "enum": [
+          "Terms",
+          "Devices",
+          "Identifiers"
+        ],
+        "type": "string"
+      },
+      "Database": {
+        "type": "object",
+        "properties": {
+          "databaseName": {
+            "type": "string",
+            "nullable": true
+          },
+          "databaseGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "orgPin": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "DateTimeDateTimeTuple": {
+        "type": "object",
+        "properties": {
+          "item1": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "item2": {
+            "type": "string",
+            "format": "date-time"
+          }
+        },
+        "additionalProperties": false
+      },
+      "DepartmentDetail": {
+        "type": "object",
+        "properties": {
+          "departmentId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "amount": {
+            "type": "number",
+            "format": "double"
+          },
+          "accountDetails": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AccountDetail"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "DepartmentEncounterUnitOfService": {
+        "type": "object",
+        "properties": {
+          "departmentId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "encounterId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "entityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "uos": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "DepartmentEncounterUnitOfServiceQueryInfo": {
+        "type": "object",
+        "properties": {
+          "departmentRollupGlobalId": {
+            "type": "string",
+            "nullable": true
+          },
+          "observationUnitsDivisor": {
+            "type": "number",
+            "format": "double"
+          },
+          "encounterIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int64"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "DesiredResult": {
+        "enum": [
+          "Increase",
+          "Decrease",
+          "Steady"
+        ],
+        "type": "string"
+      },
+      "DistributionMethod": {
+        "enum": [
+          "Average",
+          "Monthly"
+        ],
+        "type": "string"
+      },
+      "ENFilterOptions": {
+        "type": "object",
+        "properties": {
+          "opportunityLevels": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ENFilters": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "viewVisible": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "excludeInitiatives": {
+            "type": "boolean"
+          },
+          "opportunitySearch": {
+            "type": "string",
+            "nullable": true
+          },
+          "cases": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityLevels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "encounterGroups": {
+            "$ref": "#/components/schemas/EncounterGroup"
+          },
+          "seasonality": {
+            "$ref": "#/components/schemas/SeasonalityType"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ENOpportunity": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "identifiedSavings": {
+            "type": "number",
+            "format": "double"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "hasInitiative": {
+            "type": "boolean",
+            "readOnly": true
+          },
+          "initiative": {
+            "type": "string",
+            "nullable": true
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "cases": {
+            "type": "number",
+            "format": "double"
+          },
+          "encounterGroup": {
+            "$ref": "#/components/schemas/EncounterGroup"
+          },
+          "encounterGroupValue": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityLevel": {
+            "type": "string",
+            "nullable": true
+          },
+          "isSeasonal": {
+            "type": "boolean"
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ENOpportunityDto": {
+        "required": [
+          "configurationGuid",
+          "encounterGroup",
+          "name",
+          "opportunityLevel"
+        ],
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "maxLength": 200,
+            "minLength": 0,
+            "type": "string"
+          },
+          "encounterGroup": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityLevel": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "opportunityLevelLabel": {
+            "type": "string",
+            "nullable": true
+          },
+          "encounterGroups": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "opportunityLevels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "encounterGroupIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "opportunityLevelIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "revenueGoal": {
+            "type": "number",
+            "format": "double"
+          },
+          "revenueImprovement": {
+            "type": "number",
+            "format": "double"
+          },
+          "costGoal": {
+            "type": "number",
+            "format": "double"
+          },
+          "costImprovement": {
+            "type": "number",
+            "format": "double"
+          },
+          "marginGoal": {
+            "type": "number",
+            "format": "double"
+          },
+          "marginImprovement": {
+            "type": "number",
+            "format": "double"
+          },
+          "baselineStartDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "baselineEndDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "trackingStartDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "trackingEndDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "gridData": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/ENOpportunityRowData"
+              },
+              "nullable": true
+            },
+            "nullable": true
+          },
+          "encounterOpportunityJSON": {
+            "type": "string",
+            "nullable": true
+          },
+          "isSeasonal": {
+            "type": "boolean"
+          },
+          "isBaseline": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ENOpportunityExportOptions": {
+        "type": "object",
+        "properties": {
+          "sortOptions": {
+            "$ref": "#/components/schemas/SortOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/ENFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ENOpportunityLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/ENFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ENOpportunityPagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ENOpportunity"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ENOpportunityRowData": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "type": "string",
+            "nullable": true
+          },
+          "levelId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "volume": {
+            "type": "number",
+            "format": "double"
+          },
+          "revenuePerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "revenueTotal": {
+            "type": "number",
+            "format": "double"
+          },
+          "costPerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "costTotal": {
+            "type": "number",
+            "format": "double"
+          },
+          "marginPerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "marginTotal": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ENOpportunityRowDataChanges": {
+        "type": "object",
+        "properties": {
+          "levelId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "volume": {
+            "type": "number",
+            "format": "double"
+          },
+          "revenuePerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "costPerCase": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ENOpportunitySaveModel": {
+        "required": [
+          "encounterGroup"
+        ],
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "isSeasonal": {
+            "type": "boolean"
+          },
+          "encounterOpportunityJSON": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityLevel": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityLevelLabel": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityLevelJson": {
+            "type": "string",
+            "nullable": true
+          },
+          "encounterGroup": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "isFromWizard": {
+            "type": "boolean"
+          },
+          "encounterGroups": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "opportunityLevels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "EXFilterOptions": {
+        "type": "object",
+        "additionalProperties": false
+      },
+      "EXFilters": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "viewVisible": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "excludeInitiatives": {
+            "type": "boolean"
+          },
+          "opportunitySearch": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "EXOpportunity": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavings": {
+            "type": "number",
+            "format": "double"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "dateCreated": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "initiativeStatus": {
+            "$ref": "#/components/schemas/InitiativeStatuses"
+          },
+          "analyticsWorkbookId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "hasInitiative": {
+            "type": "boolean"
+          },
+          "initiative": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "EXOpportunityDto": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "maxLength": 200,
+            "minLength": 0,
+            "type": "string"
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "EXOpportunityExportOptions": {
+        "type": "object",
+        "properties": {
+          "sortOptions": {
+            "$ref": "#/components/schemas/SortOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/EXFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "EXOpportunityLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/EXFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "EXOpportunityPagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/EXOpportunity"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "EncounterChargeInfo": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "encounterId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "encounterRecordNumber": {
+            "type": "string",
+            "nullable": true
+          },
+          "chargeCodeId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "charge": {
+            "type": "number",
+            "format": "double"
+          },
+          "admitDateTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "serviceDateTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "dischargeDateTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "dischargeStatusId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "dischargeStatusGroup": {
+            "type": "string",
+            "nullable": true
+          },
+          "unitType": {
+            "type": "string",
+            "nullable": true
+          },
+          "primaryPhysicianId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "uos": {
+            "type": "number",
+            "format": "double"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "chargeCode": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "manufacturer": {
+            "type": "string",
+            "nullable": true
+          },
+          "vendor": {
+            "type": "string",
+            "nullable": true
+          },
+          "rollup": {
+            "type": "string",
+            "nullable": true
+          },
+          "unitsOfService": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "patientSpecificVariableIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "patientSpecificVariableDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "patientSpecificFixedIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "patientSpecificFixedDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgVariableIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgVariableDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgFixedIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgFixedDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "physicianGroupingGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "physicianGroupingId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "physicianGroupingName": {
+            "type": "string",
+            "nullable": true
+          },
+          "isPatientSpecific": {
+            "type": "boolean"
+          },
+          "isBaseline": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "EncounterChargeQueryInfo": {
+        "type": "object",
+        "properties": {
+          "first": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rows": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "hasManufacturerClientDSS": {
+            "type": "boolean"
+          },
+          "isManufacturerInferred": {
+            "type": "boolean"
+          },
+          "hasSupplyClientDSS": {
+            "type": "boolean"
+          },
+          "isSupplyInferred": {
+            "type": "boolean"
+          },
+          "isUsingCustomEntityDimension": {
+            "type": "boolean"
+          },
+          "isBaseline": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "chargeCodeIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "EncounterCostInfo": {
+        "type": "object",
+        "properties": {
+          "encounterId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "entityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "chargeCodeId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "unitsOfService": {
+            "type": "number",
+            "format": "double"
+          },
+          "variableDirectUnitCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "variableIndirectUnitCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "fixedDirectUnitCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "fixedIndirectUnitCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "variableDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "variableIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "fixedDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "fixedIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "variableUnitCost": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "fixedUnitCost": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "totalUnitCost": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "variableCost": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "fixedCost": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "totalCost": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "EncounterCostQueryInfo": {
+        "type": "object",
+        "properties": {
+          "isPatientSpecific": {
+            "type": "boolean"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "departmentRollupGlobalId": {
+            "type": "string",
+            "nullable": true
+          },
+          "encounterIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int64"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "EncounterGroup": {
+        "enum": [
+          "CaseType",
+          "PatientPopulation",
+          "Both"
+        ],
+        "type": "string"
+      },
+      "EncounterGroupSummary": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "nullable": true
+          },
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "totalEncounters": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalVariationEncounters": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "identifiedVariation": {
+            "type": "number",
+            "format": "double"
+          },
+          "includedEncounterCount": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "mortalityRate": {
+            "type": "number",
+            "format": "double"
+          },
+          "medianLos": {
+            "type": "number",
+            "format": "double"
+          },
+          "averageLengthOfStay": {
+            "type": "number",
+            "format": "double"
+          },
+          "medianCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "includedEncountersBelowMedian": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "includedEncountersAboveMedian": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "includedVariation": {
+            "type": "number",
+            "format": "double"
+          },
+          "excludedEncountersAboveMedian": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "excludedVariation": {
+            "type": "number",
+            "format": "double"
+          },
+          "madLos": {
+            "type": "number",
+            "format": "double"
+          },
+          "madCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "iqrLos": {
+            "type": "number",
+            "format": "double"
+          },
+          "iqrCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "peerMedianALos": {
+            "type": "number",
+            "format": "double"
+          },
+          "peerMedianCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "customerBenchmarkMedianCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "customerBenchmarkALos": {
+            "type": "number",
+            "format": "double"
+          },
+          "costOeRatio": {
+            "type": "number",
+            "format": "double",
+            "nullable": true,
+            "readOnly": true
+          },
+          "alosOeRatio": {
+            "type": "number",
+            "format": "double",
+            "nullable": true,
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "EncounterInfo": {
+        "type": "object",
+        "properties": {
+          "encounterId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "encounterRecordNumber": {
+            "type": "string",
+            "nullable": true
+          },
+          "drgType": {
+            "type": "string",
+            "nullable": true
+          },
+          "variableDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "lengthOfStay": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "netRevenue": {
+            "type": "number",
+            "format": "double"
+          },
+          "caseTypeFamilyId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "entityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "entity": {
+            "type": "string",
+            "nullable": true
+          },
+          "physicianSpecialtyId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "physicianSpecialty": {
+            "type": "string",
+            "nullable": true
+          },
+          "serviceLineId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "serviceLine": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "EncounterInitiativeDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "trackingStart": {
+            "type": "string",
+            "nullable": true
+          },
+          "startMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "endMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "goalStatement": {
+            "type": "string",
+            "nullable": true
+          },
+          "workstream": {
+            "type": "string",
+            "nullable": true
+          },
+          "plannedImprovements": {
+            "type": "string",
+            "nullable": true
+          },
+          "isFinalized": {
+            "type": "boolean"
+          },
+          "isLocked": {
+            "type": "boolean"
+          },
+          "costLeader": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "owner": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "executiveSponsor": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "stakeholders": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "teamMembers": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone1": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone2": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone3": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone4": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone5": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone6": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone7": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone8": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone9": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone10": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate1": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate2": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate3": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate4": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate5": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate6": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate7": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate8": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate9": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate10": {
+            "type": "string",
+            "nullable": true
+          },
+          "savingsRampUp01": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp02": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp03": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp04": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp05": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp06": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp07": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp08": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp09": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp10": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp11": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp12": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI01": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI02": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI03": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI04": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI05": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI06": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI07": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI08": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI09": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI10": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI11": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI12": {
+            "type": "number",
+            "format": "double"
+          },
+          "score01": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score02": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score03": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score04": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score05": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score06": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score07": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score08": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score09": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score10": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "encounterGroup": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityLevel": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "encounterGroups": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "opportunityLevels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "isSeasonal": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "EncounterQueryInfo": {
+        "type": "object",
+        "properties": {
+          "caseTypeCategory": {
+            "$ref": "#/components/schemas/CaseTypeCategory"
+          },
+          "caseTypeFamilyId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "startDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "endDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "departmentRollupGlobalId": {
+            "type": "string",
+            "nullable": true
+          },
+          "serviceLineGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "entityIDs": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "observationUnitsDivisor": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "EncounterUnitOfService": {
+        "type": "object",
+        "properties": {
+          "encounterId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "uos": {
+            "type": "number",
+            "format": "double"
+          },
+          "observationUnitsOfService": {
+            "type": "number",
+            "format": "double"
+          },
+          "nonObservationUnitsOfService": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "EncounterUnitOfServiceQueryInfo": {
+        "type": "object",
+        "properties": {
+          "observationUnitsDivisor": {
+            "type": "number",
+            "format": "double"
+          },
+          "encounterIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int64"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "EntityInfo": {
+        "type": "object",
+        "properties": {
+          "entityTitle": {
+            "type": "string",
+            "nullable": true
+          },
+          "entityLabel": {
+            "type": "string",
+            "nullable": true
+          },
+          "entityText": {
+            "type": "string",
+            "nullable": true
+          },
+          "departmentRollupGlobalId": {
+            "type": "string",
+            "nullable": true
+          },
+          "hierarchicalGuid": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ExclusionCriteria": {
+        "type": "object",
+        "properties": {
+          "losExclusionType": {
+            "$ref": "#/components/schemas/ExclusionCriteriaType"
+          },
+          "losExclusionValue": {
+            "type": "number",
+            "format": "double"
+          },
+          "costExclusionType": {
+            "$ref": "#/components/schemas/ExclusionCriteriaType"
+          },
+          "costExclusionValue": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ExclusionCriteriaType": {
+        "enum": [
+          "None",
+          "Mad",
+          "Iqr"
+        ],
+        "type": "string"
+      },
+      "ExplorationCostDriverInfo": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "exclusionCriteria": {
+            "$ref": "#/components/schemas/ExclusionCriteria"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/Filter"
+          },
+          "peerGroupId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "granularity": {
+            "$ref": "#/components/schemas/BenchmarkingInsightsGranularity"
+          },
+          "caseTypeFamilyId": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ExplorationDetailInfo": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "exclusionCriteria": {
+            "$ref": "#/components/schemas/ExclusionCriteria"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/Filter"
+          },
+          "peerGroupId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "granularity": {
+            "$ref": "#/components/schemas/BenchmarkingInsightsGranularity"
+          },
+          "caseTypeFamilyId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "codeType": {
+            "$ref": "#/components/schemas/CaseTypeCategories"
+          },
+          "excludedEncounters": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int64"
+            },
+            "nullable": true
+          },
+          "includedEncounters": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int64"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ExplorationInclusionExclusion": {
+        "type": "object",
+        "properties": {
+          "explorationPopulationId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "encounterId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "isExcluded": {
+            "type": "boolean"
+          },
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "explorationPopulation": {
+            "$ref": "#/components/schemas/ExplorationPopulation"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ExplorationInfo": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "exclusionCriteria": {
+            "$ref": "#/components/schemas/ExclusionCriteria"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/Filter"
+          },
+          "peerGroupId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "granularity": {
+            "$ref": "#/components/schemas/BenchmarkingInsightsGranularity"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ExplorationPopulation": {
+        "type": "object",
+        "properties": {
+          "explorationPopulationId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "caseTypeFamilyId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "losExclusionType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "losExclusionValue": {
+            "type": "number",
+            "format": "double"
+          },
+          "costExclusionType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "costExclusionValue": {
+            "type": "number",
+            "format": "double"
+          },
+          "filtersJSON": {
+            "type": "string",
+            "nullable": true
+          },
+          "totalEncounters": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalVariation": {
+            "type": "number",
+            "format": "double"
+          },
+          "codeType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "explorationPopulationEncounters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ExplorationPopulationEncounter"
+            },
+            "nullable": true
+          },
+          "explorationInclusionExclusions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ExplorationInclusionExclusion"
+            },
+            "nullable": true
+          },
+          "filterChipItems": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterChipItem"
+            },
+            "nullable": true,
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ExplorationPopulationDataDto": {
+        "type": "object",
+        "properties": {
+          "explorationPopulationId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "totalEncounters": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalVariation": {
+            "type": "number",
+            "format": "double"
+          },
+          "startDischargeDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "endDischargeDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "associatedOpportunitiesCount": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "associatedInitiativesCount": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunities": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ExplorationPopulationOpportunityDto"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ExplorationPopulationDetailsDto": {
+        "type": "object",
+        "properties": {
+          "explorationPopulationId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "exclusionCriteria": {
+            "$ref": "#/components/schemas/ExclusionCriteria"
+          },
+          "filters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterChipItem"
+            },
+            "nullable": true
+          },
+          "hasManuallyChangeEncounters": {
+            "type": "boolean"
+          },
+          "associatedOpportunities": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ExplorationPopulationStrategicOpportunityDto"
+            },
+            "nullable": true
+          },
+          "associatedInitiatives": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ExplorationPopulationStrategicOpportunityDto"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ExplorationPopulationDto": {
+        "type": "object",
+        "properties": {
+          "explorationPopulationId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "caseTypeFamilyId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "losExclusionType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "losExclusionValue": {
+            "type": "number",
+            "format": "double"
+          },
+          "costExclusionType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "costExclusionValue": {
+            "type": "number",
+            "format": "double"
+          },
+          "filtersJSON": {
+            "type": "string",
+            "nullable": true
+          },
+          "totalEncounters": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalVariation": {
+            "type": "number",
+            "format": "double"
+          },
+          "codeType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "explorationPopulationEncounters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ExplorationPopulationEncounter"
+            },
+            "nullable": true
+          },
+          "explorationInclusionExclusions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ExplorationInclusionExclusion"
+            },
+            "nullable": true
+          },
+          "filterChipItems": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterChipItem"
+            },
+            "nullable": true,
+            "readOnly": true
+          },
+          "manuallyExcludedEncounterIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int64"
+            },
+            "nullable": true
+          },
+          "manuallyIncludedEncounterIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int64"
+            },
+            "nullable": true
+          },
+          "mappingEncounterIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int64"
+            },
+            "nullable": true
+          },
+          "opportunitiesCount": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "associatedOpportunitiesCount": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "associatedInitiativesCount": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ExplorationPopulationEncounter": {
+        "type": "object",
+        "properties": {
+          "explorationPopulationId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "encounterId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "explorationPopulation": {
+            "$ref": "#/components/schemas/ExplorationPopulation"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ExplorationPopulationOpportunityDto": {
+        "type": "object",
+        "properties": {
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "explorationPopulationId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "baselineStartDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "baselineEndDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "trackingStartDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "trackingEndDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ExplorationPopulationStrategicOpportunityDto": {
+        "type": "object",
+        "properties": {
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "FFFilterOptions": {
+        "type": "object",
+        "properties": {
+          "financialImprovementTypes": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          },
+          "metricTypes": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "FFFilters": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "viewVisible": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "excludeInitiatives": {
+            "type": "boolean"
+          },
+          "opportunitySearch": {
+            "type": "string",
+            "nullable": true
+          },
+          "financialImprovementTypes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "metricTypes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "FFOpportunity": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "identifiedSavings": {
+            "type": "number",
+            "format": "double"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "hasInitiative": {
+            "type": "boolean",
+            "readOnly": true
+          },
+          "initiative": {
+            "type": "string",
+            "nullable": true
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "improvementType": {
+            "$ref": "#/components/schemas/FinancialImprovementType"
+          },
+          "metricType": {
+            "$ref": "#/components/schemas/MetricType"
+          },
+          "metricTypeValue": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "FFOpportunityDetailModel": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "numerator": {
+            "type": "string",
+            "nullable": true
+          },
+          "denominator": {
+            "type": "string",
+            "nullable": true
+          },
+          "savings": {
+            "type": "number",
+            "format": "float"
+          },
+          "savingsPerUnit": {
+            "type": "number",
+            "format": "float"
+          },
+          "goalRate": {
+            "type": "number",
+            "format": "float"
+          },
+          "changeRate": {
+            "type": "number",
+            "format": "float"
+          },
+          "baselineStartDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "baselineEndDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "trackingStartDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "trackingEndDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "financialImprovementType": {
+            "$ref": "#/components/schemas/FinancialImprovementType"
+          },
+          "metricType": {
+            "$ref": "#/components/schemas/MetricType"
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "rowData": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FFOpportunityDetailRowData"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "FFOpportunityDetailRowData": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "nullable": true
+          },
+          "month": {
+            "type": "string",
+            "nullable": true
+          },
+          "upper": {
+            "type": "number",
+            "format": "double"
+          },
+          "lower": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "FFOpportunityDto": {
+        "required": [
+          "configurationGuid",
+          "entityId",
+          "improvementType",
+          "metricType",
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "improvementType": {
+            "$ref": "#/components/schemas/FinancialImprovementType"
+          },
+          "metricType": {
+            "$ref": "#/components/schemas/MetricType"
+          },
+          "name": {
+            "maxLength": 200,
+            "minLength": 0,
+            "type": "string"
+          },
+          "entityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "metricNumerator": {
+            "type": "string",
+            "nullable": true
+          },
+          "metricDenominator": {
+            "type": "string",
+            "nullable": true
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "FFOpportunityExportOptions": {
+        "type": "object",
+        "properties": {
+          "sortOptions": {
+            "$ref": "#/components/schemas/SortOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/FFFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "FFOpportunityLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/FFFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "FFOpportunityMonthValuesDto": {
+        "type": "object",
+        "properties": {
+          "opportunityDetail": {
+            "$ref": "#/components/schemas/FFOpportunityDetailModel"
+          },
+          "monthValues": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FFOpportunityDetailRowData"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "FFOpportunityPagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FFOpportunity"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "Filter": {
+        "type": "object",
+        "properties": {
+          "dischargeDateStart": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "dischargeDateEnd": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "filterChipItems": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterChipItem"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "FilterChipItem": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "$ref": "#/components/schemas/ChipKey"
+          },
+          "label": {
+            "type": "string",
+            "nullable": true
+          },
+          "globalId": {
+            "type": "string",
+            "nullable": true
+          },
+          "operator": {
+            "$ref": "#/components/schemas/OperatorType"
+          },
+          "chipType": {
+            "$ref": "#/components/schemas/ChipType"
+          },
+          "filters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TreeNode"
+            },
+            "nullable": true
+          },
+          "isSelected": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "dateRange": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "date-time"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "FilterListItem": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "nullable": true
+          },
+          "title": {
+            "type": "string",
+            "nullable": true
+          },
+          "children": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterListItem"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "FilterMember": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "nullable": true
+          },
+          "text": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "FinancialImprovementType": {
+        "enum": [
+          "Cost",
+          "Revenue"
+        ],
+        "type": "string"
+      },
+      "FiscalMonth": {
+        "type": "object",
+        "properties": {
+          "memberGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "fiscalMonthId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "fiscalMonthCode": {
+            "type": "string",
+            "nullable": true
+          },
+          "sortOrder": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "daysInMonth": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "ytdDaysInMonth": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "daysInLeapYearMonth": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "ytdDaysInLeapYearMonth": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "monthColumnName": {
+            "type": "string",
+            "nullable": true
+          },
+          "abbreviation": {
+            "type": "string",
+            "nullable": true
+          },
+          "isReal": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "FolderTree": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "nullable": true
+          },
+          "title": {
+            "type": "string",
+            "nullable": true
+          },
+          "children": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FolderTree"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "FreeFormInitiativeDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "trackingStart": {
+            "type": "string",
+            "nullable": true
+          },
+          "startMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "endMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "goalStatement": {
+            "type": "string",
+            "nullable": true
+          },
+          "workstream": {
+            "type": "string",
+            "nullable": true
+          },
+          "plannedImprovements": {
+            "type": "string",
+            "nullable": true
+          },
+          "isFinalized": {
+            "type": "boolean"
+          },
+          "isLocked": {
+            "type": "boolean"
+          },
+          "costLeader": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "owner": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "executiveSponsor": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "stakeholders": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "teamMembers": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone1": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone2": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone3": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone4": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone5": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone6": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone7": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone8": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone9": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone10": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate1": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate2": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate3": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate4": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate5": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate6": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate7": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate8": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate9": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate10": {
+            "type": "string",
+            "nullable": true
+          },
+          "savingsRampUp01": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp02": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp03": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp04": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp05": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp06": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp07": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp08": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp09": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp10": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp11": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp12": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI01": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI02": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI03": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI04": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI05": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI06": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI07": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI08": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI09": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI10": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI11": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI12": {
+            "type": "number",
+            "format": "double"
+          },
+          "score01": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score02": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score03": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score04": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score05": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score06": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score07": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score08": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score09": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score10": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "improvementType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "metricType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "metricNumerator": {
+            "type": "string",
+            "nullable": true
+          },
+          "metricDenominator": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "GLAccountType": {
+        "enum": [
+          "Revenue",
+          "Expense",
+          "Margin"
+        ],
+        "type": "string"
+      },
+      "GLDepartmentAccountData": {
+        "type": "object",
+        "properties": {
+          "departments": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "accounts": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "GLDetail": {
+        "type": "object",
+        "properties": {
+          "total": {
+            "type": "number",
+            "format": "double"
+          },
+          "departmentDetails": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/DepartmentDetail"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "GLFilterOptions": {
+        "type": "object",
+        "properties": {
+          "types": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          },
+          "levels": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "GLFilters": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "viewVisible": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "excludeInitiatives": {
+            "type": "boolean"
+          },
+          "opportunitySearch": {
+            "type": "string",
+            "nullable": true
+          },
+          "types": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "levels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "seasonality": {
+            "$ref": "#/components/schemas/SeasonalityType"
+          }
+        },
+        "additionalProperties": false
+      },
+      "GLOpportunity": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "identifiedSavings": {
+            "type": "number",
+            "format": "double"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "hasInitiative": {
+            "type": "boolean",
+            "readOnly": true
+          },
+          "initiative": {
+            "type": "string",
+            "nullable": true
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "type": {
+            "type": "string",
+            "nullable": true
+          },
+          "level": {
+            "type": "string",
+            "nullable": true
+          },
+          "isSeasonal": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "GLOpportunityExportOptions": {
+        "type": "object",
+        "properties": {
+          "sortOptions": {
+            "$ref": "#/components/schemas/SortOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/GLFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "GLOpportunityLevel": {
+        "enum": [
+          "Overall",
+          "Individual"
+        ],
+        "type": "string"
+      },
+      "GLOpportunityLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/GLFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "GLOpportunityPagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/GLOpportunity"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "GLOpportunitySaveModel": {
+        "required": [
+          "configurationGuid",
+          "glOpportunityType",
+          "goalLevel",
+          "name",
+          "ownerGuid",
+          "ownerName"
+        ],
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "maxLength": 200,
+            "minLength": 0,
+            "type": "string"
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "glOpportunityType": {
+            "$ref": "#/components/schemas/AccountType"
+          },
+          "goalLevel": {
+            "$ref": "#/components/schemas/GLOpportunityLevel"
+          },
+          "ownerGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "ownerName": {
+            "minLength": 1,
+            "type": "string"
+          },
+          "authorGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "authorName": {
+            "type": "string",
+            "nullable": true
+          },
+          "departments": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "revenueAccounts": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "expenseAccounts": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "statisticAccounts": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "statisticDepartments": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "hasStatistic": {
+            "type": "boolean"
+          },
+          "isSeasonal": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "GMDNFileType": {
+        "enum": [
+          "Term",
+          "TermCategory",
+          "Category"
+        ],
+        "type": "string"
+      },
+      "GeneralLedgerInitiativeDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "trackingStart": {
+            "type": "string",
+            "nullable": true
+          },
+          "startMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "endMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "goalStatement": {
+            "type": "string",
+            "nullable": true
+          },
+          "workstream": {
+            "type": "string",
+            "nullable": true
+          },
+          "plannedImprovements": {
+            "type": "string",
+            "nullable": true
+          },
+          "isFinalized": {
+            "type": "boolean"
+          },
+          "isLocked": {
+            "type": "boolean"
+          },
+          "costLeader": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "owner": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "executiveSponsor": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "stakeholders": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "teamMembers": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone1": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone2": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone3": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone4": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone5": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone6": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone7": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone8": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone9": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone10": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate1": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate2": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate3": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate4": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate5": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate6": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate7": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate8": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate9": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate10": {
+            "type": "string",
+            "nullable": true
+          },
+          "savingsRampUp01": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp02": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp03": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp04": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp05": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp06": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp07": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp08": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp09": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp10": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp11": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp12": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI01": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI02": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI03": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI04": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI05": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI06": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI07": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI08": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI09": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI10": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI11": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI12": {
+            "type": "number",
+            "format": "double"
+          },
+          "score01": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score02": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score03": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score04": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score05": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score06": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score07": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score08": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score09": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score10": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "glOpportunityType": {
+            "$ref": "#/components/schemas/AccountType"
+          },
+          "goalLevel": {
+            "$ref": "#/components/schemas/GLOpportunityLevel"
+          },
+          "departments": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "revenueAccounts": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "expenseAccounts": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "statisticAccounts": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "statisticDepartments": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "hasStatistic": {
+            "type": "boolean"
+          },
+          "isSeasonal": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "GoalSetDto": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "nullable": true
+          },
+          "goalValue": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "HeatMapData": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "customerMedianCost": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "benchmarkMedianCost": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "costOeRatio": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "customerMedianAlos": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "benchmarkMedianAlos": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "alosOeRatio": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "IExplorationPopulationInfo": {
+        "type": "object",
+        "properties": {
+          "explorationPopulationId": {
+            "type": "integer",
+            "format": "int64",
+            "readOnly": true
+          },
+          "name": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          },
+          "caseTypeFamilyId": {
+            "type": "integer",
+            "format": "int32",
+            "readOnly": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          },
+          "losExclusionType": {
+            "type": "integer",
+            "format": "int32",
+            "readOnly": true
+          },
+          "losExclusionValue": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "costExclusionType": {
+            "type": "integer",
+            "format": "int32",
+            "readOnly": true
+          },
+          "costExclusionValue": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "filtersJSON": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "IFiscalMonthResolver": {
+        "type": "object",
+        "properties": {
+          "allFiscalMonths": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FiscalMonth"
+            },
+            "nullable": true,
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "IJazzEncounterInfo": {
+        "type": "object",
+        "properties": {
+          "ageCohortID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "dischargeDateTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "encounterId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "encounterRecordNumber": {
+            "type": "string",
+            "nullable": true
+          },
+          "entityID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "isQVIEncounter": {
+            "type": "boolean"
+          },
+          "lengthOfStay": {
+            "type": "number",
+            "format": "double"
+          },
+          "physicianGroupAffiliation": {
+            "type": "string",
+            "nullable": true
+          },
+          "physicianGroupAffiliationGUID": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "physicianGroupAffiliationID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "physicianGUID": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "physicianID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "physicianName": {
+            "type": "string",
+            "nullable": true
+          },
+          "physicianSpecialty": {
+            "type": "string",
+            "nullable": true
+          },
+          "physicianSpecialtyGUID": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "physicianSpecialtyID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "serviceLineID": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "IJazzExplorationEncounterInfo": {
+        "type": "object",
+        "properties": {
+          "ageCohortID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "dischargeDateTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "encounterId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "encounterRecordNumber": {
+            "type": "string",
+            "nullable": true
+          },
+          "entityID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "isQVIEncounter": {
+            "type": "boolean"
+          },
+          "lengthOfStay": {
+            "type": "number",
+            "format": "double"
+          },
+          "physicianGroupAffiliation": {
+            "type": "string",
+            "nullable": true
+          },
+          "physicianGroupAffiliationGUID": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "physicianGroupAffiliationID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "physicianGUID": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "physicianID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "physicianName": {
+            "type": "string",
+            "nullable": true
+          },
+          "physicianSpecialty": {
+            "type": "string",
+            "nullable": true
+          },
+          "physicianSpecialtyGUID": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "physicianSpecialtyID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "serviceLineID": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "INameItem": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "IdentityNode": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "title": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeCriteriaDto": {
+        "type": "object",
+        "properties": {
+          "initiativeCriteriaGUID": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "initiativeDataField": {
+            "type": "string",
+            "nullable": true
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InitiativeCriteriaOption"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeCriteriaOption": {
+        "type": "object",
+        "properties": {
+          "value": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "text": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeDetail": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "goalStatement": {
+            "type": "string",
+            "nullable": true
+          },
+          "workstream": {
+            "type": "string",
+            "nullable": true
+          },
+          "plannedImprovements": {
+            "type": "string",
+            "nullable": true
+          },
+          "costLeader": {
+            "type": "string",
+            "nullable": true
+          },
+          "owner": {
+            "type": "string",
+            "nullable": true
+          },
+          "executiveSponsor": {
+            "type": "string",
+            "nullable": true
+          },
+          "stakeholders": {
+            "type": "string",
+            "nullable": true
+          },
+          "teamMembers": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestones": {
+            "type": "string",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "status": {
+            "$ref": "#/components/schemas/InitiativeSteps"
+          },
+          "initiativeStatus": {
+            "type": "string",
+            "nullable": true
+          },
+          "currentStep": {
+            "type": "string",
+            "nullable": true
+          },
+          "trackingStartMonth": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "currentMonth": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "currentMonthGoal": {
+            "type": "number",
+            "format": "double"
+          },
+          "currentMonthActual": {
+            "type": "number",
+            "format": "double"
+          },
+          "currentMonthVariance": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "ytdGoal": {
+            "type": "number",
+            "format": "double"
+          },
+          "ytdActual": {
+            "type": "number",
+            "format": "double"
+          },
+          "ytdVariance": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "savingsCommitted": {
+            "type": "number",
+            "format": "double"
+          },
+          "annualGoal": {
+            "type": "number",
+            "format": "double"
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "comments": {
+            "type": "string",
+            "nullable": true
+          },
+          "initiativeRollup1": {
+            "type": "string",
+            "nullable": true
+          },
+          "initiativeRollup2": {
+            "type": "string",
+            "nullable": true
+          },
+          "initiativeRollup3": {
+            "type": "string",
+            "nullable": true
+          },
+          "initiativeRollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityType": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeDetailColumn": {
+        "type": "object",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "heading": {
+            "type": "string",
+            "nullable": true
+          },
+          "isLocked": {
+            "type": "boolean"
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "initiativeRollupColumnId": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeDetailColumnSaveInfo": {
+        "type": "object",
+        "properties": {
+          "columns": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InitiativeDetailColumn"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeDetailTreeGridModel": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "nullable": true
+          },
+          "data": {
+            "$ref": "#/components/schemas/InitiativeDetail"
+          },
+          "children": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InitiativeDetailTreeGridModel"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "trackingStart": {
+            "type": "string",
+            "nullable": true
+          },
+          "startMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "endMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "goalStatement": {
+            "type": "string",
+            "nullable": true
+          },
+          "workstream": {
+            "type": "string",
+            "nullable": true
+          },
+          "plannedImprovements": {
+            "type": "string",
+            "nullable": true
+          },
+          "isFinalized": {
+            "type": "boolean"
+          },
+          "isLocked": {
+            "type": "boolean"
+          },
+          "costLeader": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "owner": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "executiveSponsor": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "stakeholders": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "teamMembers": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone1": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone2": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone3": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone4": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone5": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone6": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone7": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone8": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone9": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone10": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate1": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate2": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate3": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate4": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate5": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate6": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate7": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate8": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate9": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate10": {
+            "type": "string",
+            "nullable": true
+          },
+          "savingsRampUp01": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp02": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp03": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp04": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp05": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp06": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp07": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp08": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp09": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp10": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp11": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp12": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI01": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI02": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI03": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI04": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI05": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI06": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI07": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI08": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI09": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI10": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI11": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI12": {
+            "type": "number",
+            "format": "double"
+          },
+          "score01": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score02": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score03": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score04": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score05": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score06": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score07": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score08": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score09": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score10": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeExportOptions": {
+        "type": "object",
+        "properties": {
+          "sortOptions": {
+            "$ref": "#/components/schemas/SortOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/InitiativeFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeFilterOptions": {
+        "type": "object",
+        "properties": {
+          "costDrivers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/INameItem"
+            },
+            "nullable": true
+          },
+          "costLeaders": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UserProfile"
+            },
+            "nullable": true
+          },
+          "owners": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UserProfile"
+            },
+            "nullable": true
+          },
+          "executiveSponsors": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UserProfile"
+            },
+            "nullable": true
+          },
+          "workstreams": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/INameItem"
+            },
+            "nullable": true
+          },
+          "rollupColumn1Values": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InitiativeRollupValue"
+            },
+            "nullable": true
+          },
+          "rollupColumn2Values": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InitiativeRollupValue"
+            },
+            "nullable": true
+          },
+          "rollupColumn3Values": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InitiativeRollupValue"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeFilters": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "status": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "costDrivers": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "costLeaders": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "uuid"
+            },
+            "nullable": true
+          },
+          "owners": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "uuid"
+            },
+            "nullable": true
+          },
+          "executiveSponsors": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "uuid"
+            },
+            "nullable": true
+          },
+          "workstreams": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "rollupColumn1Values": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "rollupColumn2Values": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "rollupColumn3Values": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "groupByCategory": {
+            "$ref": "#/components/schemas/InitiativeGroupByCategory"
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeGroupByCategory": {
+        "enum": [
+          "CostDriver",
+          "CostLeader",
+          "ExecutiveSponsor",
+          "Owner",
+          "Status",
+          "Workstream",
+          "RollupColumn1",
+          "RollupColumn2",
+          "RollupColumn3",
+          "None"
+        ],
+        "type": "string"
+      },
+      "InitiativeInfo": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "trackingStart": {
+            "type": "string",
+            "nullable": true
+          },
+          "startMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "endMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "goalStatement": {
+            "type": "string",
+            "nullable": true
+          },
+          "workstream": {
+            "type": "string",
+            "nullable": true
+          },
+          "plannedImprovements": {
+            "type": "string",
+            "nullable": true
+          },
+          "isFinalized": {
+            "type": "boolean"
+          },
+          "isLocked": {
+            "type": "boolean"
+          },
+          "costLeader": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "owner": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "executiveSponsor": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "stakeholders": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "teamMembers": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone1": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone2": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone3": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone4": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone5": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone6": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone7": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone8": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone9": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone10": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate1": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate2": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate3": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate4": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate5": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate6": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate7": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate8": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate9": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate10": {
+            "type": "string",
+            "nullable": true
+          },
+          "savingsRampUp01": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp02": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp03": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp04": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp05": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp06": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp07": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp08": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp09": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp10": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp11": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp12": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI01": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI02": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI03": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI04": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI05": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI06": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI07": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI08": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI09": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI10": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI11": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI12": {
+            "type": "number",
+            "format": "double"
+          },
+          "score01": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score02": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score03": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score04": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score05": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score06": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score07": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score08": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score09": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score10": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "trackingMonths": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TrackingMonth"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeRollupColumn": {
+        "type": "object",
+        "properties": {
+          "initiativeRollupColumnId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "initiativeRollupValues": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InitiativeRollupValue"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeRollupColumnCreateInfo": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "values": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeRollupColumnSaveInfo": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "updates": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InitiativeRollupValueSaveInfo"
+            },
+            "nullable": true
+          },
+          "deletes": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InitiativeRollupValueSaveInfo"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeRollupValue": {
+        "type": "object",
+        "properties": {
+          "initiativeRollupValueId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollupColumnId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "value": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeRollupValueInfo": {
+        "type": "object",
+        "properties": {
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "rollupId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rollupValueId": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeRollupValueSaveInfo": {
+        "type": "object",
+        "properties": {
+          "initiativeRollupValueId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "value": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeScoresDto": {
+        "type": "object",
+        "properties": {
+          "initiativeGUID": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "score01": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score02": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score03": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score04": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score05": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score07": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score08": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score09": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score10": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "InitiativeStatuses": {
+        "enum": [
+          "OnHold",
+          "InProcess",
+          "Completed"
+        ],
+        "type": "string"
+      },
+      "InitiativeSteps": {
+        "enum": [
+          "Draft",
+          "ExecutiveSponsorReview",
+          "OwnerReview",
+          "CostLeaderReview",
+          "ExecutiveSponsorApproval",
+          "Tracking"
+        ],
+        "type": "string"
+      },
+      "JobInfoDto": {
+        "type": "object",
+        "properties": {
+          "namespace": {
+            "type": "string",
+            "nullable": true
+          },
+          "type": {
+            "type": "string",
+            "nullable": true
+          },
+          "method": {
+            "type": "string",
+            "nullable": true
+          },
+          "arguments": {
+            "type": "array",
+            "items": { },
+            "nullable": true
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "state": {
+            "$ref": "#/components/schemas/JobStateDto"
+          }
+        },
+        "additionalProperties": false
+      },
+      "JobStateDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "reason": {
+            "type": "string",
+            "nullable": true
+          },
+          "data": {
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "LOSOpportunityInfo": {
+        "type": "object",
+        "properties": {
+          "encounterId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "encounterRecordNumber": {
+            "type": "string",
+            "nullable": true
+          },
+          "admitDateTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "dischargeDateTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "dischargeStatusId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "primaryPhysicianId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "dischargeStatusGroup": {
+            "type": "string",
+            "nullable": true
+          },
+          "unitType": {
+            "type": "string",
+            "nullable": true
+          },
+          "uos": {
+            "type": "number",
+            "format": "double"
+          },
+          "rom": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "soi": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "physicianGroupingGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "physicianGroupingId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "physicianGroupingName": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "LOSOpportunityQueryInfo": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "observationUnitsDivisor": {
+            "type": "number",
+            "format": "double"
+          },
+          "caseTypeId": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "MappedColumn": {
+        "type": "object",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "heading": {
+            "type": "string",
+            "nullable": true
+          },
+          "isLocked": {
+            "type": "boolean"
+          },
+          "isHidden": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "MeasureGroup": {
+        "enum": [
+          "System",
+          "Primary",
+          "Secondary"
+        ],
+        "type": "string"
+      },
+      "MeasureType": {
+        "enum": [
+          "UnitsOfService",
+          "UnitsOfServicePerCase",
+          "DirectVariableCost",
+          "DirectVariableCostPerCase",
+          "DirectVariableCostPerUnit",
+          "TotalDirectCost",
+          "TotalDirectCostPerCase",
+          "TotalDirectCostPerUnit",
+          "TotalCharges",
+          "TotalChargesPerCase",
+          "TotalChargesPerUnit",
+          "EncountersCases",
+          "AcquisitionSupplyCost",
+          "AcquisitionSupplyCostPerCase",
+          "AcquisitionSupplyCostPerUnit",
+          "AverageLengthOfStay",
+          "Days",
+          "TotalMargin",
+          "MarginPerCase",
+          "ContributionMargin",
+          "ContributionMarginPerCase",
+          "DirectMargin",
+          "DirectMarginPerCase",
+          "VariableMargin",
+          "VariableMarginPerCase",
+          "CommittedCost",
+          "ActualCost",
+          "GLExpense",
+          "GLRevenue",
+          "GLVolume",
+          "GLExpensePerUnit",
+          "GLRevenuePerUnit",
+          "GLExpensePerAdjDischarge",
+          "GLRevenuePerAdjDischarge",
+          "GLMargin",
+          "GLMarginPerUnit",
+          "GLMarginPerAdjDischarge"
+        ],
+        "type": "string"
+      },
+      "Member": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "MetricType": {
+        "enum": [
+          "Operational",
+          "FinancialPerUnit",
+          "Financial"
+        ],
+        "type": "string"
+      },
+      "NetworkOpportunity": {
+        "required": [
+          "networkOpportunityId"
+        ],
+        "type": "object",
+        "properties": {
+          "networkOpportunityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "workbookTemplateId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "clientNetworkOpportunities": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ClientNetworkOpportunity"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "NetworkOpportunityFilters": {
+        "type": "object",
+        "properties": {
+          "opportunitySearch": {
+            "type": "string",
+            "nullable": true
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "initiativeStatus": {
+            "$ref": "#/components/schemas/InitiativeStatuses"
+          }
+        },
+        "additionalProperties": false
+      },
+      "NetworkOpportunityLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/NetworkOpportunityFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "NetworkOpportunitySaveModel": {
+        "type": "object",
+        "properties": {
+          "networkOpportunityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "workbookTemplateId": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "NetworkOpportunitySummary": {
+        "type": "object",
+        "properties": {
+          "networkOpportunityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "isPublished": {
+            "type": "boolean"
+          },
+          "initiativeStatus": {
+            "$ref": "#/components/schemas/InitiativeStatuses"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "analyticsWorkbookId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "hasInitiative": {
+            "type": "boolean"
+          },
+          "workbookTemplateId": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "NetworkOpportunitySummaryPagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/NetworkOpportunitySummary"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "NewComment": {
+        "type": "object",
+        "properties": {
+          "isGlobal": {
+            "type": "boolean"
+          },
+          "opportunityType": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "comment": {
+            "type": "string",
+            "nullable": true
+          },
+          "commentDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "NonQviCaseTypeFamilyInfo": {
+        "type": "object",
+        "properties": {
+          "caseTypeFamilyId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "medianVariableDirectCostPerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "caseCount": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "NonQviDrgTypeInfo": {
+        "type": "object",
+        "properties": {
+          "drgType": {
+            "type": "string",
+            "nullable": true
+          },
+          "medianVariableDirectCostPerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "caseCount": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "OperatorType": {
+        "enum": [
+          "In",
+          "NotIn"
+        ],
+        "type": "string"
+      },
+      "OpportunityJobResultsDto": {
+        "type": "object",
+        "properties": {
+          "jobId": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "OpportunityLevel": {
+        "enum": [
+          "Organization",
+          "Entity",
+          "ServiceLine",
+          "Specialty",
+          "Provider"
+        ],
+        "type": "string"
+      },
+      "OpportunityLevelSelectionInfo": {
+        "type": "object",
+        "properties": {
+          "opportunityLevel": {
+            "$ref": "#/components/schemas/OpportunityLevel"
+          },
+          "opportunityLevels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "configuration": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "OpportunityMetricBase": {
+        "type": "object",
+        "properties": {
+          "encounterGroup": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "caseTypeIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "patientPopulationIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "chargeCodeIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "opportunityLevel": {
+            "type": "string",
+            "nullable": true
+          },
+          "isBaseline": {
+            "type": "boolean"
+          },
+          "opportunityLevelIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "opportunityLevelIdAsCSV": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "OpportunityMetricCohortData": {
+        "type": "object",
+        "properties": {
+          "levelID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "month": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "volume": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "revenue": {
+            "type": "number",
+            "format": "double"
+          },
+          "cost": {
+            "type": "number",
+            "format": "double"
+          },
+          "margin": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "revenuePerCase": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "costPerCase": {
+            "type": "number",
+            "format": "double",
+            "readOnly": true
+          },
+          "isBaseline": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "OpportunityMetricCohortOptions": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "data": {
+            "$ref": "#/components/schemas/OpportunityMetricBase"
+          },
+          "innerJoin": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "OpportunityRoleAssignmentView": {
+        "type": "object",
+        "properties": {
+          "canRead": {
+            "type": "boolean"
+          },
+          "canWrite": {
+            "type": "boolean"
+          },
+          "canSecure": {
+            "type": "boolean"
+          },
+          "lootId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "identityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identityName": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "OpportunityTypeWorkbook": {
+        "type": "object",
+        "properties": {
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "workbookId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "OpportunityTypeWorkbookClientInfo": {
+        "type": "object",
+        "properties": {
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "workbookId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "OpportunityWorkbook": {
+        "type": "object",
+        "properties": {
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "workbookId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "OpportunityWorkbookClientInfo": {
+        "type": "object",
+        "properties": {
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "workbookId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PRFilterOptions": {
+        "type": "object",
+        "properties": {
+          "payrollGoalTypes": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PRFilters": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "viewVisible": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "excludeInitiatives": {
+            "type": "boolean"
+          },
+          "opportunitySearch": {
+            "type": "string",
+            "nullable": true
+          },
+          "payrollGoalTypes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PROpportunity": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "identifiedSavings": {
+            "type": "number",
+            "format": "double"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "hasInitiative": {
+            "type": "boolean",
+            "readOnly": true
+          },
+          "initiative": {
+            "type": "string",
+            "nullable": true
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "payrollGoal": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PROpportunityDto": {
+        "required": [
+          "configurationGuid",
+          "initiativeGuid",
+          "name",
+          "opportunityGuid",
+          "ownerGuid",
+          "payrollGoal"
+        ],
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "maxLength": 200,
+            "minLength": 0,
+            "type": "string"
+          },
+          "ownerGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "ownerName": {
+            "type": "string",
+            "nullable": true
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "hasInitiative": {
+            "type": "boolean"
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "payrollGoal": {
+            "$ref": "#/components/schemas/PayrollGoalType"
+          },
+          "hasAllDepartments": {
+            "type": "boolean"
+          },
+          "hasAllJobCodes": {
+            "type": "boolean"
+          },
+          "hasAllPayCodes": {
+            "type": "boolean"
+          },
+          "departments": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "jobCodes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "payCodes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PROpportunityExportOptions": {
+        "type": "object",
+        "properties": {
+          "sortOptions": {
+            "$ref": "#/components/schemas/SortOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/PRFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "PROpportunityLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/PRFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "PROpportunityPagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PROpportunity"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "PROpportunitySaveModel": {
+        "required": [
+          "configurationGuid",
+          "name",
+          "ownerGuid",
+          "payrollGoal"
+        ],
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "maxLength": 200,
+            "minLength": 0,
+            "type": "string"
+          },
+          "ownerGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "ownerName": {
+            "type": "string",
+            "nullable": true
+          },
+          "authorGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "authorName": {
+            "type": "string",
+            "nullable": true
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "payrollGoal": {
+            "$ref": "#/components/schemas/PayrollGoalType"
+          },
+          "departments": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "jobCodes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "payCodes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PagingInfo": {
+        "type": "object",
+        "properties": {
+          "pageNumber": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "resultsPerPage": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalNumberOfResults": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "totalPages": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PagingOptions": {
+        "type": "object",
+        "properties": {
+          "sortField": {
+            "type": "string",
+            "nullable": true
+          },
+          "sortOrder": {
+            "$ref": "#/components/schemas/SortOrder"
+          },
+          "first": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rows": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "PayrollGoalType": {
+        "enum": [
+          "Variable",
+          "Fixed",
+          "Both"
+        ],
+        "type": "string"
+      },
+      "PayrollInitiativeDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "trackingStart": {
+            "type": "string",
+            "nullable": true
+          },
+          "startMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "endMonth": {
+            "type": "string",
+            "nullable": true
+          },
+          "goalStatement": {
+            "type": "string",
+            "nullable": true
+          },
+          "workstream": {
+            "type": "string",
+            "nullable": true
+          },
+          "plannedImprovements": {
+            "type": "string",
+            "nullable": true
+          },
+          "isFinalized": {
+            "type": "boolean"
+          },
+          "isLocked": {
+            "type": "boolean"
+          },
+          "costLeader": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "owner": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "executiveSponsor": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "stakeholders": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "teamMembers": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone1": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone2": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone3": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone4": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone5": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone6": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone7": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone8": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone9": {
+            "type": "string",
+            "nullable": true
+          },
+          "milestone10": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate1": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate2": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate3": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate4": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate5": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate6": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate7": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate8": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate9": {
+            "type": "string",
+            "nullable": true
+          },
+          "dueDate10": {
+            "type": "string",
+            "nullable": true
+          },
+          "savingsRampUp01": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp02": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp03": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp04": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp05": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp06": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp07": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp08": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp09": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp10": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp11": {
+            "type": "number",
+            "format": "double"
+          },
+          "savingsRampUp12": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI01": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI02": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI03": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI04": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI05": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI06": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI07": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI08": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI09": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI10": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI11": {
+            "type": "number",
+            "format": "double"
+          },
+          "coI12": {
+            "type": "number",
+            "format": "double"
+          },
+          "score01": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score02": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score03": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score04": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score05": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score06": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score07": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score08": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score09": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "score10": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "initiativeRollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "payrollGoal": {
+            "$ref": "#/components/schemas/PayrollGoalType"
+          },
+          "departments": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "jobCodes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "payCodes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PeerGroupDropdownItems": {
+        "type": "object",
+        "properties": {
+          "entityTypeList": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PickerItem"
+            },
+            "nullable": true
+          },
+          "censusRegionList": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PickerItem"
+            },
+            "nullable": true
+          },
+          "operatingExpenseList": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PickerItem"
+            },
+            "nullable": true
+          },
+          "amcTypeList": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PickerItem"
+            },
+            "nullable": true
+          },
+          "bedSizeList": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PickerItem"
+            },
+            "nullable": true
+          },
+          "urbanRuralList": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PickerItem"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PeerGroupDto": {
+        "type": "object",
+        "properties": {
+          "peerGroupId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "amcTypes": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "entityTypes": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "censusRegions": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "operatingExpenses": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "bedSize": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "urbanRural": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PerformanceEngingeCalculationData": {
+        "type": "object",
+        "properties": {
+          "entity": {
+            "type": "string",
+            "nullable": true
+          },
+          "caseTypeEntity": {
+            "type": "string",
+            "nullable": true
+          },
+          "serviceLineID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "physicianGroupingAffiliationId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "primaryPhysician": {
+            "type": "string",
+            "nullable": true
+          },
+          "chargeCodeRollup": {
+            "type": "string",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "baselineStartDate": {
+            "type": "string",
+            "nullable": true
+          },
+          "baselineEndDate": {
+            "type": "string",
+            "nullable": true
+          },
+          "totalVolume": {
+            "type": "number",
+            "format": "double"
+          },
+          "totalGrossCharges": {
+            "type": "number",
+            "format": "double"
+          },
+          "totalVariableDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "totalVariableCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "goalUnitVariance": {
+            "type": "number",
+            "format": "double"
+          },
+          "actualUnitVariance": {
+            "type": "number",
+            "format": "double"
+          },
+          "committedUnits": {
+            "type": "number",
+            "format": "double"
+          },
+          "committedStats": {
+            "type": "number",
+            "format": "double"
+          },
+          "baselineAverage": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "Permission": {
+        "type": "object",
+        "properties": {
+          "lootId": {
+            "type": "string",
+            "format": "uuid",
+            "nullable": true
+          },
+          "identityGuid": {
+            "type": "string",
+            "format": "uuid",
+            "nullable": true
+          },
+          "identityName": {
+            "type": "string",
+            "nullable": true
+          },
+          "canRead": {
+            "type": "boolean"
+          },
+          "canWrite": {
+            "type": "boolean"
+          },
+          "canSecure": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "PickerItem": {
+        "type": "object",
+        "properties": {
+          "value": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "text": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PopulationMember": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ProblemDetails": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "nullable": true
+          },
+          "title": {
+            "type": "string",
+            "nullable": true
+          },
+          "status": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "detail": {
+            "type": "string",
+            "nullable": true
+          },
+          "instance": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": { }
+      },
+      "QVIBreakdown": {
+        "type": "object",
+        "properties": {
+          "breakdownId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "breakdownName": {
+            "type": "string",
+            "nullable": true
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "casesTotal": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "qviCasesTotal": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "qviRate": {
+            "type": "number",
+            "format": "double"
+          },
+          "identifiedSavingsTotal": {
+            "type": "number",
+            "format": "double"
+          },
+          "opportunitiesCount": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIBreakdownFilterOptions": {
+        "type": "object",
+        "properties": {
+          "breakdowns": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIBreakdownFilters": {
+        "type": "object",
+        "properties": {
+          "exportFiltered": {
+            "type": "boolean"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "breakdownIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "qualityVariationCases": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIBreakdownPagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QVIBreakdown"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIBreakdownsLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/QVIBreakdownFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIEvent": {
+        "type": "object",
+        "properties": {
+          "qualityVariationEventId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "qualityVariationEventName": {
+            "type": "string",
+            "nullable": true
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavingsTotal": {
+            "type": "number",
+            "format": "double"
+          },
+          "casesTotal": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "qviCasesTotal": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "qviPatientDaysTotal": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "qviCostToal": {
+            "type": "number",
+            "format": "double"
+          },
+          "qviNetRevenueTotal": {
+            "type": "number",
+            "format": "double"
+          },
+          "opportunities": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "qviRate": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIEventFilterOptions": {
+        "type": "object",
+        "properties": {
+          "qualityVariationEvents": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIEventFilters": {
+        "type": "object",
+        "properties": {
+          "exportFiltered": {
+            "type": "boolean"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "qualityVariationEventIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "qviCases": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIEventPagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QVIEvent"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIEventsLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/QVIEventFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIFilterOptions": {
+        "type": "object",
+        "properties": {
+          "breakdowns": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          },
+          "qualityVariationEvents": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIFilters": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "viewVisible": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "excludeInitiatives": {
+            "type": "boolean"
+          },
+          "opportunitySearch": {
+            "type": "string",
+            "nullable": true
+          },
+          "breakdownIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "qualityVariationEventIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "qviCases": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIOpportunity": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "identifiedSavings": {
+            "type": "number",
+            "format": "double"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "hasInitiative": {
+            "type": "boolean",
+            "readOnly": true
+          },
+          "initiative": {
+            "type": "string",
+            "nullable": true
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "qviCases": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "breakdownId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "breakdownName": {
+            "type": "string",
+            "nullable": true
+          },
+          "cases": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "qualityVariationEventId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "qualityVariationEventName": {
+            "type": "string",
+            "nullable": true
+          },
+          "qviRate": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIOpportunityBreakdowns": {
+        "enum": [
+          "Entity",
+          "ServiceLine",
+          "PhysicianSpecialty"
+        ],
+        "type": "string"
+      },
+      "QVIOpportunityExportOptions": {
+        "type": "object",
+        "properties": {
+          "sortOptions": {
+            "$ref": "#/components/schemas/SortOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/QVIFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIOpportunityLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/QVIFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QVIOpportunityPagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/QVIOpportunity"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QviLineItemCaseTypeFamilyInfo": {
+        "type": "object",
+        "properties": {
+          "qualityVariationEventId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "caseTypeFamilyId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "medianVariableDirectCostPerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "caseCount": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QviLineItemDrgTypeInfo": {
+        "type": "object",
+        "properties": {
+          "qualityVariationEventId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "drgType": {
+            "type": "string",
+            "nullable": true
+          },
+          "medianVariableDirectCostPerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "caseCount": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "QviLineItemEncounterSavingInfo": {
+        "type": "object",
+        "properties": {
+          "encounterRecordNumber": {
+            "type": "string",
+            "nullable": true
+          },
+          "savings": {
+            "type": "number",
+            "format": "double"
+          },
+          "isBaseline": {
+            "type": "boolean"
+          },
+          "physicianID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "physicianName": {
+            "type": "string",
+            "nullable": true
+          },
+          "physicianSpecialtyID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "physicianSpecialty": {
+            "type": "string",
+            "nullable": true
+          },
+          "entityID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "entity": {
+            "type": "string",
+            "nullable": true
+          },
+          "financialClassID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "payorID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "contractGroupingID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "payorGroupID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "insurancePlanID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "netRevenue": {
+            "type": "number",
+            "format": "double"
+          },
+          "lengthOfStay": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "pesVariableDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "totalCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "dischargeDateTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "caseTypeFamilyID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "variableDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "serviceLine": {
+            "type": "string",
+            "nullable": true
+          },
+          "serviceLineID": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "caseTypeFamily": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "REReport": {
+        "type": "object",
+        "properties": {
+          "reportGUID": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "folderGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "isOpportunityReport": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "RefreshData": {
+        "type": "object",
+        "properties": {
+          "databaseGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "guid": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ReportByModule": {
+        "type": "object",
+        "properties": {
+          "reportGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "sourceOfSavings": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ReportByOpportunity": {
+        "type": "object",
+        "properties": {
+          "reportGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "ReportRequest": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "sourceOfSavings": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "RoleAssignmentView": {
+        "type": "object",
+        "properties": {
+          "canRead": {
+            "type": "boolean"
+          },
+          "canWrite": {
+            "type": "boolean"
+          },
+          "canSecure": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "RolloverOpportunityDto": {
+        "type": "object",
+        "properties": {
+          "databaseGuid": {
+            "type": "string",
+            "format": "uuid",
+            "nullable": true
+          },
+          "sourceConfigurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "sourceOpportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "rolloverConfigurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "rolloverOpportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "rolloverInitiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "RunTrackingStatus": {
+        "enum": [
+          "None",
+          "Success",
+          "Failed"
+        ],
+        "type": "string"
+      },
+      "ScoreAttribute": {
+        "type": "object",
+        "properties": {
+          "attributeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "dimensionGroupGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          },
+          "sqlColumnName": {
+            "type": "string",
+            "nullable": true
+          },
+          "friendlyName": {
+            "type": "string",
+            "nullable": true
+          },
+          "isKey": {
+            "type": "boolean"
+          },
+          "columnName": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ScoreDimension": {
+        "type": "object",
+        "properties": {
+          "dimensionGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "friendlyName": {
+            "type": "string",
+            "nullable": true
+          },
+          "defaultLookupKeyGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "defaultKeyGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "globalId": {
+            "type": "string",
+            "nullable": true
+          },
+          "sqlSchemaName": {
+            "type": "string",
+            "nullable": true
+          },
+          "sqlObjectName": {
+            "type": "string",
+            "nullable": true
+          },
+          "defaultLookupKey": {
+            "$ref": "#/components/schemas/ScoreAttribute"
+          },
+          "defaultKey": {
+            "$ref": "#/components/schemas/ScoreAttribute"
+          },
+          "sqlObjectExpression": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "SeasonalityType": {
+        "enum": [
+          "Without",
+          "With",
+          "WithAndWithout"
+        ],
+        "type": "string"
+      },
+      "ServiceLineInfo": {
+        "type": "object",
+        "properties": {
+          "serviceLineGlobalId": {
+            "type": "string",
+            "nullable": true
+          },
+          "serviceLineTitle": {
+            "type": "string",
+            "nullable": true
+          },
+          "serviceLineName": {
+            "type": "string",
+            "nullable": true
+          },
+          "serviceLineDimensionGuid": {
+            "type": "string",
+            "nullable": true
+          },
+          "serviceLineHierarchicalGuid": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "SortOptions": {
+        "type": "object",
+        "properties": {
+          "sortField": {
+            "type": "string",
+            "nullable": true
+          },
+          "sortOrder": {
+            "$ref": "#/components/schemas/SortOrder"
+          }
+        },
+        "additionalProperties": false
+      },
+      "SortOrder": {
+        "enum": [
+          "Asc",
+          "Desc"
+        ],
+        "type": "string"
+      },
+      "StrategicInitiativeItem": {
+        "type": "object",
+        "properties": {
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "encounterGroupName": {
+            "type": "string",
+            "nullable": true
+          },
+          "patientPopulationHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "explorationPopulationId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "opportunityType": {
+            "$ref": "#/components/schemas/StrategicOpportunityTypes"
+          },
+          "opportunityTypeName": {
+            "type": "string",
+            "nullable": true
+          },
+          "rollup1": {
+            "type": "string",
+            "nullable": true
+          },
+          "rollup2": {
+            "type": "string",
+            "nullable": true
+          },
+          "rollup3": {
+            "type": "string",
+            "nullable": true
+          },
+          "population": {
+            "type": "string",
+            "nullable": true
+          },
+          "additionalFilters": {
+            "type": "string",
+            "nullable": true
+          },
+          "baselinePeriod": {
+            "type": "string",
+            "nullable": true
+          },
+          "statusName": {
+            "type": "string",
+            "nullable": true
+          },
+          "baselineStartDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "trackingPeriod": {
+            "type": "string",
+            "nullable": true
+          },
+          "totalCommitted": {
+            "type": "number",
+            "format": "double"
+          },
+          "progressToDateCommitted": {
+            "type": "number",
+            "format": "double"
+          },
+          "progressToDateActual": {
+            "type": "number",
+            "format": "double"
+          },
+          "progressToDateVariance": {
+            "type": "number",
+            "format": "double"
+          },
+          "lastRunTrackingDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "lastRunTrackingStatus": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "onTrack": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicInitiativeUpdateDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "trackingStartDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "trackingEndDate": {
+            "type": "string",
+            "format": "date"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunity": {
+        "type": "object",
+        "properties": {
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityType": {
+            "$ref": "#/components/schemas/StrategicOpportunityTypes"
+          },
+          "opportunityFiltersJSON": {
+            "type": "string",
+            "nullable": true
+          },
+          "layoutJSON": {
+            "type": "string",
+            "nullable": true
+          },
+          "rollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "baselineType": {
+            "$ref": "#/components/schemas/BaselineType"
+          },
+          "baselineDistribution": {
+            "$ref": "#/components/schemas/DistributionMethod"
+          },
+          "baselineStartDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "baselineEndDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "trackingStartDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "trackingEndDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "estimatedTrackingDuration": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalImprovement": {
+            "type": "number",
+            "format": "double"
+          },
+          "estimatedGoal": {
+            "type": "number",
+            "format": "double"
+          },
+          "status": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "lastRunTrackingDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "lastRunTrackingStatus": {
+            "$ref": "#/components/schemas/RunTrackingStatus"
+          },
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "ownerGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "executiveSponsorGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "costLeaderGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "teamMembers": {
+            "maxLength": 4000,
+            "type": "string",
+            "nullable": true
+          },
+          "goalStartDate": {
+            "type": "string",
+            "format": "date",
+            "readOnly": true
+          },
+          "goalEndDate": {
+            "type": "string",
+            "format": "date",
+            "readOnly": true
+          },
+          "isOpportunity": {
+            "type": "boolean",
+            "readOnly": true
+          },
+          "stakeholders": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicStakeholdersLink"
+            },
+            "nullable": true
+          },
+          "measures": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityMeasure"
+            },
+            "nullable": true
+          },
+          "workbooks": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityWorkbook"
+            },
+            "nullable": true
+          },
+          "rampUps": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityRampUp"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityChargeCodeAdjustment": {
+        "type": "object",
+        "properties": {
+          "nodeKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "unitsValue": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "costsValue": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityChargeCodeDto": {
+        "type": "object",
+        "properties": {
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityType": {
+            "$ref": "#/components/schemas/StrategicOpportunityTypes"
+          },
+          "opportunityFiltersJSON": {
+            "type": "string",
+            "nullable": true
+          },
+          "layout": {
+            "$ref": "#/components/schemas/StrategicOpportunityLayout"
+          },
+          "rollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "baselineType": {
+            "$ref": "#/components/schemas/BaselineType"
+          },
+          "baselineDistribution": {
+            "$ref": "#/components/schemas/DistributionMethod"
+          },
+          "baselineStartDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "baselineEndDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "estimatedTrackingDuration": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "measures": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityMeasureDto"
+            },
+            "nullable": true
+          },
+          "workbookIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "patientPopulationHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "explorationPopulationId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "chargeCodeHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityChargeCodeEditData": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityType": {
+            "$ref": "#/components/schemas/StrategicOpportunityTypes"
+          },
+          "rollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "filters": {
+            "type": "string",
+            "nullable": true
+          },
+          "baselineStartDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "baselineEndDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "baselineDistribution": {
+            "$ref": "#/components/schemas/DistributionMethod"
+          },
+          "estimatedTrackingDuration": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "measures": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityMeasureDto"
+            },
+            "nullable": true
+          },
+          "workbooks": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityWorkbookDto"
+            },
+            "nullable": true
+          },
+          "encounterGroupName": {
+            "type": "string",
+            "nullable": true
+          },
+          "patientPopulationHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "explorationPopulationId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "populationMembers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PopulationMember"
+            },
+            "nullable": true
+          },
+          "chargeCodeHPath": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "chargeCodes": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ChargeCodePickerModel"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityChargeCodeUpdateDto": {
+        "type": "object",
+        "properties": {
+          "opportunity": {
+            "$ref": "#/components/schemas/StrategicOpportunityChargeCodeDto"
+          },
+          "shouldPopulateOpportunityDetails": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityCompleteInitiativeData": {
+        "type": "object",
+        "properties": {
+          "isThresholdMonitoring": {
+            "type": "boolean"
+          },
+          "acceptableThreshold": {
+            "type": "number",
+            "format": "float"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityDetailData": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityDetailGrouped"
+            },
+            "nullable": true
+          },
+          "dimensionsData": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "nullable": true
+            },
+            "nullable": true
+          },
+          "encounterData": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "number",
+              "format": "float"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityDetailGrouped": {
+        "type": "object",
+        "properties": {
+          "key": {
+            "type": "string",
+            "nullable": true
+          },
+          "isBaseline": {
+            "type": "boolean"
+          },
+          "units": {
+            "type": "number",
+            "format": "double"
+          },
+          "cost": {
+            "type": "number",
+            "format": "double"
+          },
+          "goalUnits": {
+            "type": "number",
+            "format": "double"
+          },
+          "goalCost": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityDrawerDetails": {
+        "type": "object",
+        "properties": {
+          "populationName": {
+            "type": "string",
+            "nullable": true
+          },
+          "populations": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "chargeCodes": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string",
+              "nullable": true
+            },
+            "nullable": true
+          },
+          "filters": {
+            "type": "string",
+            "nullable": true
+          },
+          "baselinePeriod": {
+            "type": "string",
+            "nullable": true
+          },
+          "trackingStartDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "trackingEndDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "estimatedTrackingDuration": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityGLAdjustment": {
+        "type": "object",
+        "properties": {
+          "nodeKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "goalAmountValue": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "accountType": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityGLDetail": {
+        "type": "object",
+        "properties": {
+          "rowId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "isBaseline": {
+            "type": "boolean"
+          },
+          "fiscalYearId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "fiscalMonthId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "departmentId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "accountId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "entityId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "glRollup": {
+            "type": "string",
+            "nullable": true
+          },
+          "accountType": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "amount": {
+            "type": "number",
+            "format": "double"
+          },
+          "goalAmount": {
+            "type": "number",
+            "format": "double"
+          },
+          "distributedAmount": {
+            "type": "number",
+            "format": "double"
+          },
+          "revenueAmount": {
+            "type": "number",
+            "format": "double"
+          },
+          "expenseAmount": {
+            "type": "number",
+            "format": "double"
+          },
+          "statisticAmount": {
+            "type": "number",
+            "format": "double"
+          },
+          "goalRevenueAmount": {
+            "type": "number",
+            "format": "double"
+          },
+          "goalExpenseAmount": {
+            "type": "number",
+            "format": "double"
+          },
+          "goalStatisticAmount": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityGLDetailData": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityGLDetail"
+            },
+            "nullable": true
+          },
+          "dimensionsData": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "nullable": true
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityGLDto": {
+        "type": "object",
+        "properties": {
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityType": {
+            "$ref": "#/components/schemas/StrategicOpportunityTypes"
+          },
+          "opportunityFiltersJSON": {
+            "type": "string",
+            "nullable": true
+          },
+          "layout": {
+            "$ref": "#/components/schemas/StrategicOpportunityLayout"
+          },
+          "rollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "baselineType": {
+            "$ref": "#/components/schemas/BaselineType"
+          },
+          "baselineDistribution": {
+            "$ref": "#/components/schemas/DistributionMethod"
+          },
+          "baselineStartDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "baselineEndDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "estimatedTrackingDuration": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "measures": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityMeasureDto"
+            },
+            "nullable": true
+          },
+          "workbookIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "accountType": {
+            "$ref": "#/components/schemas/GLAccountType"
+          },
+          "departmentHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "revenueAccountHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "expenseAccountHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "statisticAccountHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "hasStatistic": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityGLEditData": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityType": {
+            "$ref": "#/components/schemas/StrategicOpportunityTypes"
+          },
+          "rollup1Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rollup2Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rollup3Id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "filters": {
+            "type": "string",
+            "nullable": true
+          },
+          "baselineStartDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "baselineEndDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "baselineDistribution": {
+            "$ref": "#/components/schemas/DistributionMethod"
+          },
+          "estimatedTrackingDuration": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "measures": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityMeasureDto"
+            },
+            "nullable": true
+          },
+          "workbooks": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityWorkbookDto"
+            },
+            "nullable": true
+          },
+          "accountType": {
+            "$ref": "#/components/schemas/GLAccountType"
+          },
+          "departmentHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "revenueAccountHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "expenseAccountHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "statisticAccountHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "hasStatistic": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityGLUpdateDto": {
+        "type": "object",
+        "properties": {
+          "opportunity": {
+            "$ref": "#/components/schemas/StrategicOpportunityGLDto"
+          },
+          "shouldPopulateOpportunityDetails": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityGeneralInfo": {
+        "type": "object",
+        "properties": {
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "opportunityType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "estimatedTrackingDuration": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "baselineDuration": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "baselineEndDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "trackingStartDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "trackingEndDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "status": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "lastRunTrackingDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "lastRunTrackingStatus": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalCommittedCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "ownerGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "executiveSponsorGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "costLeaderGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "teamMembers": {
+            "type": "string",
+            "nullable": true
+          },
+          "stakeholders": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "uuid"
+            },
+            "nullable": true
+          },
+          "measures": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityMeasureDto"
+            },
+            "nullable": true
+          },
+          "accountType": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "hasStatistic": {
+            "type": "boolean",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityGetDetailData": {
+        "type": "object",
+        "properties": {
+          "dimensions": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "dateStart": {
+            "type": "string",
+            "format": "date",
+            "nullable": true
+          },
+          "dateEnd": {
+            "type": "string",
+            "format": "date",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityItem": {
+        "type": "object",
+        "properties": {
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "encounterGroupName": {
+            "type": "string",
+            "nullable": true
+          },
+          "patientPopulationHPath": {
+            "type": "string",
+            "nullable": true
+          },
+          "explorationPopulationId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "opportunityType": {
+            "$ref": "#/components/schemas/StrategicOpportunityTypes"
+          },
+          "opportunityTypeName": {
+            "type": "string",
+            "nullable": true
+          },
+          "rollup1": {
+            "type": "string",
+            "nullable": true
+          },
+          "rollup2": {
+            "type": "string",
+            "nullable": true
+          },
+          "rollup3": {
+            "type": "string",
+            "nullable": true
+          },
+          "population": {
+            "type": "string",
+            "nullable": true
+          },
+          "additionalFilters": {
+            "type": "string",
+            "nullable": true
+          },
+          "baselinePeriod": {
+            "type": "string",
+            "nullable": true
+          },
+          "statusName": {
+            "type": "string",
+            "nullable": true
+          },
+          "baselineStartDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "estimatedTrackDurationMonths": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalImprovement": {
+            "type": "number",
+            "format": "double"
+          },
+          "estimatedGoal": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityLayout": {
+        "type": "object",
+        "properties": {
+          "rows": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "columns": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityMeasure": {
+        "type": "object",
+        "properties": {
+          "measureId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "measureType": {
+            "$ref": "#/components/schemas/MeasureType"
+          },
+          "measureName": {
+            "type": "string",
+            "nullable": true
+          },
+          "desiredResult": {
+            "$ref": "#/components/schemas/DesiredResult"
+          },
+          "acceptableThreshold": {
+            "type": "number",
+            "format": "float"
+          },
+          "filtersJSON": {
+            "type": "string",
+            "nullable": true
+          },
+          "measureGroup": {
+            "$ref": "#/components/schemas/MeasureGroup"
+          },
+          "averageValue": {
+            "type": "number",
+            "format": "double"
+          },
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunity": {
+            "$ref": "#/components/schemas/StrategicOpportunity"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityMeasureDetail": {
+        "type": "object",
+        "properties": {
+          "measureId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "yearId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "monthId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "value": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityMeasureDto": {
+        "type": "object",
+        "properties": {
+          "measureId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "measureType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "measureName": {
+            "type": "string",
+            "nullable": true
+          },
+          "desiredResult": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "acceptableThreshold": {
+            "type": "number",
+            "format": "float"
+          },
+          "filtersJSON": {
+            "type": "string",
+            "nullable": true
+          },
+          "measureGroup": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "averageValue": {
+            "type": "number",
+            "format": "double"
+          },
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityRampUp": {
+        "type": "object",
+        "properties": {
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "monthNumber": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "percentage": {
+            "type": "number",
+            "format": "double"
+          },
+          "opportunity": {
+            "$ref": "#/components/schemas/StrategicOpportunity"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityRampUpDto": {
+        "required": [
+          "monthNumber",
+          "opportunityId",
+          "percentage"
+        ],
+        "type": "object",
+        "properties": {
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "monthNumber": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "percentage": {
+            "type": "number",
+            "format": "double"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityTypes": {
+        "enum": [
+          "ChargeCode",
+          "GeneralLedger",
+          "Encounter"
+        ],
+        "type": "string"
+      },
+      "StrategicOpportunityUpdateStatusDto": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "trackingStartDate": {
+            "type": "string",
+            "format": "date"
+          },
+          "trackingEndDate": {
+            "type": "string",
+            "format": "date"
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityWorkbook": {
+        "type": "object",
+        "properties": {
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "workbookId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "opportunity": {
+            "$ref": "#/components/schemas/StrategicOpportunity"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicOpportunityWorkbookDto": {
+        "type": "object",
+        "properties": {
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "workbookId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicRolesUpdate": {
+        "type": "object",
+        "properties": {
+          "ownerGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "executiveSponsorGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "costLeaderGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "teamMembers": {
+            "type": "string",
+            "nullable": true
+          },
+          "stakeholders": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "uuid"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "StrategicStakeholdersLink": {
+        "type": "object",
+        "properties": {
+          "strategicOpportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "userGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunity": {
+            "$ref": "#/components/schemas/StrategicOpportunity"
+          }
+        },
+        "additionalProperties": false
+      },
+      "TrackingMonth": {
+        "type": "object",
+        "properties": {
+          "abbreviation": {
+            "type": "string",
+            "nullable": true
+          },
+          "isAfterEffectiveDate": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "TreeNode": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "nullable": true
+          },
+          "displayText": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "UVCaseType": {
+        "type": "object",
+        "properties": {
+          "caseTypeId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "caseTypeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "caseTypeName": {
+            "type": "string",
+            "nullable": true
+          },
+          "serviceLineId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "serviceLineName": {
+            "type": "string",
+            "nullable": true
+          },
+          "identifiedSavingsTotal": {
+            "type": "number",
+            "format": "double"
+          },
+          "opportunitiesCount": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "caseTypeCategory": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "associatedOpportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          }
+        },
+        "additionalProperties": false
+      },
+      "UVCaseTypeFilters": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavings": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "caseTypeGuids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "uuid"
+            },
+            "nullable": true
+          },
+          "serviceLineIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "UVCaseTypeLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/UVCaseTypeFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "UVCaseTypePagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UVCaseType"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "UVFilterOptions": {
+        "type": "object",
+        "properties": {
+          "caseTypes": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          },
+          "costDrivers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          },
+          "entities": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          },
+          "serviceLines": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterMember"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "UVFilters": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "identifiedSavings": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "viewVisible": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "excludeInitiatives": {
+            "type": "boolean"
+          },
+          "opportunitySearch": {
+            "type": "string",
+            "nullable": true
+          },
+          "caseTypeGuids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "uuid"
+            },
+            "nullable": true
+          },
+          "costDrivers": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "entityIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "serviceLineIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "UVOpportunity": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "identifiedSavings": {
+            "type": "number",
+            "format": "double"
+          },
+          "initiativeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "hasInitiative": {
+            "type": "boolean",
+            "readOnly": true
+          },
+          "initiative": {
+            "type": "string",
+            "nullable": true
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "note": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunity": {
+            "type": "string",
+            "nullable": true
+          },
+          "sourceOpportunityId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "caseTypeGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "caseTypeName": {
+            "type": "string",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "cases": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "entityId": {
+            "type": "string",
+            "nullable": true
+          },
+          "entityName": {
+            "type": "string",
+            "nullable": true
+          },
+          "serviceLineId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "serviceLineName": {
+            "type": "string",
+            "nullable": true
+          },
+          "variationPerCase": {
+            "type": "number",
+            "format": "double"
+          },
+          "opportunityId": {
+            "type": "integer",
+            "format": "int64"
+          }
+        },
+        "additionalProperties": false
+      },
+      "UVOpportunityExportOptions": {
+        "type": "object",
+        "properties": {
+          "sortOptions": {
+            "$ref": "#/components/schemas/SortOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/UVFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "UVOpportunityLoadOptions": {
+        "type": "object",
+        "properties": {
+          "pagingOptions": {
+            "$ref": "#/components/schemas/PagingOptions"
+          },
+          "filters": {
+            "$ref": "#/components/schemas/UVFilters"
+          }
+        },
+        "additionalProperties": false
+      },
+      "UVOpportunityPagedApiResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UVOpportunity"
+            },
+            "nullable": true
+          },
+          "pagingInfo": {
+            "$ref": "#/components/schemas/PagingInfo"
+          }
+        },
+        "additionalProperties": false
+      },
+      "UpdateDetailsDto": {
+        "type": "object",
+        "properties": {
+          "adjustments": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityChargeCodeAdjustment"
+            },
+            "nullable": true
+          },
+          "rows": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "UpdateGLDetailsDto": {
+        "type": "object",
+        "properties": {
+          "adjustments": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StrategicOpportunityGLAdjustment"
+            },
+            "nullable": true
+          },
+          "rows": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "UserGroup": {
+        "type": "object",
+        "properties": {
+          "userGroupGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "globalId": {
+            "type": "string",
+            "nullable": true
+          },
+          "category": {
+            "type": "string",
+            "nullable": true
+          },
+          "isAdmin": {
+            "type": "boolean"
+          },
+          "isHidden": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "UserProfile": {
+        "type": "object",
+        "properties": {
+          "userGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "userName": {
+            "type": "string",
+            "nullable": true
+          },
+          "nameFull": {
+            "type": "string",
+            "nullable": true
+          },
+          "nameFirst": {
+            "type": "string",
+            "nullable": true
+          },
+          "nameLast": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ValidateChargeCodeDto": {
+        "type": "object",
+        "properties": {
+          "chargeCodes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ValidateName": {
+        "type": "object",
+        "properties": {
+          "configurationGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "opportunityType": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "VariationEncounterChargeInfo": {
+        "type": "object",
+        "properties": {
+          "opportunityGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "encounterId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "encounterRecordNumber": {
+            "type": "string",
+            "nullable": true
+          },
+          "chargeCodeId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "charge": {
+            "type": "number",
+            "format": "double"
+          },
+          "admitDateTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "serviceDateTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "dischargeDateTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "dischargeStatusId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "dischargeStatusGroup": {
+            "type": "string",
+            "nullable": true
+          },
+          "unitType": {
+            "type": "string",
+            "nullable": true
+          },
+          "primaryPhysicianId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "uos": {
+            "type": "number",
+            "format": "double"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "chargeCode": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "manufacturer": {
+            "type": "string",
+            "nullable": true
+          },
+          "vendor": {
+            "type": "string",
+            "nullable": true
+          },
+          "rollup": {
+            "type": "string",
+            "nullable": true
+          },
+          "unitsOfService": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "costDriver": {
+            "type": "string",
+            "nullable": true
+          },
+          "patientSpecificVariableIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "patientSpecificVariableDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "patientSpecificFixedIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "patientSpecificFixedDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgVariableIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgVariableDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgFixedIndirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "avgFixedDirectCost": {
+            "type": "number",
+            "format": "double"
+          },
+          "physicianGroupingGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "physicianGroupingId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "physicianGroupingName": {
+            "type": "string",
+            "nullable": true
+          },
+          "isPatientSpecific": {
+            "type": "boolean"
+          },
+          "isBaseline": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "VariationEncounterChargeQueryInfo": {
+        "type": "object",
+        "properties": {
+          "first": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rows": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "hasManufacturerClientDSS": {
+            "type": "boolean"
+          },
+          "isManufacturerInferred": {
+            "type": "boolean"
+          },
+          "hasSupplyClientDSS": {
+            "type": "boolean"
+          },
+          "isSupplyInferred": {
+            "type": "boolean"
+          },
+          "isUsingCustomEntityDimension": {
+            "type": "boolean"
+          },
+          "isBaseline": {
+            "type": "boolean",
+            "nullable": true
+          },
+          "opportunityGuids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "uuid"
+            },
+            "nullable": true
+          },
+          "chargeCodeIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "WarehouseSize": {
+        "enum": [
+          "S",
+          "M",
+          "L",
+          "XL"
+        ],
+        "type": "string"
+      },
+      "WorkbookClientInfo": {
+        "type": "object",
+        "properties": {
+          "strataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "workbookId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "defaultDataSourceId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "createdDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "updatedDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "lastOpenedDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "createdByUserGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "createdByUserName": {
+            "type": "string",
+            "nullable": true
+          },
+          "updatedByUserGuid": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "updatedByUserName": {
+            "type": "string",
+            "nullable": true
+          },
+          "folderId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "isHidden": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false
+      },
+      "WorkstreamDto": {
+        "type": "object",
+        "properties": {
+          "workstream": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/continuousimprovement/tsconfig.json b/src/Strata.ContinuousImprovement.Web/continuousimprovement/tsconfig.json
new file mode 100644
index 0000000..fce63be
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/continuousimprovement/tsconfig.json
@@ -0,0 +1,29 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/auth/ApiRequestOptions.ts b/src/Strata.ContinuousImprovement.Web/e2e/auth/ApiRequestOptions.ts
new file mode 100644
index 0000000..7eaf31b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/auth/ApiRequestOptions.ts
@@ -0,0 +1,4 @@
+export type ApiRequestOptions = {
+  apiURL: string;
+  swaggerURL: string;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/auth/auth.setup.ts b/src/Strata.ContinuousImprovement.Web/e2e/auth/auth.setup.ts
new file mode 100644
index 0000000..baa41e3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/auth/auth.setup.ts
@@ -0,0 +1,138 @@
+/**
+ * @fileoverview Playwright Authentication Setup
+ * @description Automated JWT token generation and caching for all test users
+ * @version 2.0.0
+ * @since 2024-11-03
+ * @author Strata Decision Technology
+ *
+ * @module AuthSetup
+ * @requires @playwright/test
+ * @requires ./authUtils
+ *
+ * @example
+ * ```bash
+ * # Run authentication setup
+ * npx playwright test auth.setup.ts
+ *
+ * # Verify tokens are cached
+ * echo $jwt $sdtJwt $gBriggsJwt
+ * ```
+ *
+ * @overview
+ * This setup script:
+ * - Retrieves credentials for all configured test users
+ * - Generates JWT tokens via vault and identity provider
+ * - Caches tokens in environment variables for test access
+ * - Handles authentication failures gracefully
+ *
+ * @workflow
+ * 1. Iterate through all configured user types
+ * 2. For each user: retrieve password from vault
+ * 3. Authenticate with identity provider using credentials
+ * 4. Cache enhanced JWT tokens in process environment
+ * 5. Log success/failure for each authentication attempt
+ *
+ * @performance
+ * - Parallel token generation for faster setup
+ * - Efficient error handling prevents cascade failures
+ * - Token caching eliminates redundant auth requests
+ */
+
+import { test as setup } from '@playwright/test';
+import { customLogger } from '../customLogger';
+import { getAllUserTypes, getUserDisplayName, JwtTokenManager, USER_REGISTRY, UserType } from './authUtils';
+
+/**
+ * @interface UserAuthResult
+ * @description Result of authentication attempt for a user
+ */
+interface UserAuthResult {
+  /** User type that was authenticated */
+  userType: UserType;
+  /** Whether authentication was successful */
+  success: boolean;
+  /** Whether the user is a Strata Employee */
+  isStrataEmployee: boolean;
+  /** Token expiration timestamp if successful */
+  expiresAt?: number;
+  /** Error message if authentication failed */
+  error?: string;
+}
+
+setup('authenticate', async ({ request }) => {
+  customLogger.log('🔐 Starting authentication setup for all test users...');
+
+  // Get all configured user types for authentication
+  const userTypes = getAllUserTypes();
+  const authResults: UserAuthResult[] = [];
+
+  // Process each user type with proper error handling
+  for (const userType of userTypes) {
+    const userInfo = USER_REGISTRY[userType];
+    const displayName = getUserDisplayName(userType);
+
+    try {
+      customLogger.log(`📝 Authenticating user: ${displayName} (${userType})`);
+
+      // Generate JWT token using centralized token manager
+      let jwt = JwtTokenManager.getCachedToken(userType);
+      jwt = jwt ?? (await JwtTokenManager.getTokenForUser(userInfo, request));
+
+      authResults.push({
+        userType,
+        success: true,
+        isStrataEmployee: (jwt as any).profile.is_strata_employee || userType === UserType.STRATA_USER,
+        expiresAt: (jwt as any).expires_at
+      });
+
+      customLogger.log(`✅ Successfully authenticated: ${displayName}`);
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+
+      // Cache empty token to prevent undefined errors in tests
+      process.env[JwtTokenManager.getEnvVarName(userType)] = '';
+
+      authResults.push({
+        userType,
+        success: false,
+        isStrataEmployee: false,
+        error: errorMessage
+      });
+
+      customLogger.log(`❌ Failed to authenticate ${displayName}: ${errorMessage}`);
+    }
+  }
+
+  // Summary report of authentication results
+  const successCount = authResults.filter((r) => r.success).length;
+  const totalCount = authResults.length;
+
+  customLogger.log(`\n📊 Authentication Summary: ${successCount}/${totalCount} users authenticated successfully`);
+  customLogger.table(
+    authResults.map((result: any) => ({
+      Type: result.userType,
+      User: getUserDisplayName(result.userType),
+      Status: result.success ? 'Success' : 'Failure',
+      IsStrataEmployee: result.isStrataEmployee ? 'Yes' : 'No',
+      ExpiresAt: result.expiresAt ? new Date(result.expiresAt * 1000).toLocaleString() : 'N/A',
+      Error: result.error || 'N/A'
+    }))
+  );
+
+  // Log failed authentications for debugging
+  const failures = authResults.filter((r) => !r.success);
+  if (failures.length > 0) {
+    customLogger.log('\n⚠️  Authentication Failures:');
+    failures.forEach((failure) => {
+      const displayName = getUserDisplayName(failure.userType);
+      customLogger.log(`   - ${displayName}: ${failure.error}`);
+    });
+  }
+
+  // Ensure at least one user authenticated successfully for tests to proceed
+  if (successCount === 0) {
+    throw new Error('No users authenticated successfully. Tests cannot proceed without valid JWT tokens.');
+  }
+
+  customLogger.log('🎯 Authentication setup completed\n');
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/auth/authUtils.ts b/src/Strata.ContinuousImprovement.Web/e2e/auth/authUtils.ts
new file mode 100644
index 0000000..e5f84cf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/auth/authUtils.ts
@@ -0,0 +1,912 @@
+/* eslint-disable @typescript-eslint/no-namespace */
+/**
+ * @fileoverview Authentication Utilities for Playwright Test Framework
+ * @description Common utilities and factory functions for JWT token management and authenticated test contexts
+ * @version 1.0.0
+ * @since 2024-11-03
+ * @author Strata Decision Technology
+ *
+ * @module AuthenticationUtils
+ * @requires @playwright/test
+ * @requires jwt-decode
+ * @requires ./IUserInfo
+ * @requires ./ApiRequestOptions
+ *
+ * @example
+ * ```typescript
+ * import { createAuthenticatedTest, UserRegistry, JwtTokenManager } from './authUtils';
+ *
+ * // Create authenticated test for specific user
+ * const test = createAuthenticatedTest(UserRegistry.TEST_USER);
+ *
+ * // Get JWT token for user
+ * const jwt = await JwtTokenManager.getTokenForUser(UserRegistry.STRATA_USER, request);
+ * ```
+ *
+ * @overview
+ * This module provides:
+ * - Centralized user information registry
+ * - JWT token management with caching
+ * - Factory functions for authenticated test contexts
+ * - Common authentication patterns and utilities
+ * - Type-safe user configuration management
+ *
+ * @architecture
+ * Authentication Flow:
+ * 1. User credentials retrieved from vault via API key
+ * 2. JWT tokens obtained from identity provider
+ * 3. Tokens cached in process environment variables
+ * 4. Test contexts extended with authentication headers
+ * 5. Browser sessions configured with JWT tokens
+ *
+ * @performance
+ * - Token caching reduces redundant authentication requests
+ * - Lazy loading of user configurations
+ * - Efficient context reuse across test sessions
+ * - Optimized vault and identity provider interactions
+ *
+ * @security
+ * - API keys managed through environment variables
+ * - JWT tokens stored securely in process environment
+ * - Automatic token expiration handling
+ * - Secure vault integration for password retrieval
+ */
+
+import { APIRequestContext, BrowserContext, request, test as baseTest } from '@playwright/test';
+import { jwtDecode } from 'jwt-decode';
+import { customLogger } from '../customLogger';
+import { ApiRequestOptions } from './ApiRequestOptions';
+
+export * from '@playwright/test';
+
+/**
+ * @interface VaultResponse
+ * @description Response structure from Strata vault password API
+ */
+export interface VaultResponse {
+  /** Username associated with the vault entry */
+  UserName: string;
+  /** Encrypted password from vault */
+  Password: string;
+}
+
+/**
+ * @interface JwtResponse
+ * @description JWT response structure from identity provider
+ */
+export interface JwtResponse {
+  /** Bearer access token */
+  access_token: string;
+  /** Token type (typically 'Bearer') */
+  token_type?: string;
+  /** Token expiration in seconds */
+  expires_in?: number;
+  /** Refresh token for token renewal */
+  refresh_token?: string;
+}
+
+/**
+ * @interface EnhancedJwt
+ * @description Enhanced JWT token with decoded claims and expiration
+ */
+export interface EnhancedJwt extends JwtResponse {
+  /** Token expiration timestamp */
+  expires_at?: number;
+  /** Decoded JWT profile/claims */
+  profile?: any;
+}
+
+/**
+ * @interface AuthenticatedTestArgs
+ * @description Test context arguments for authenticated Playwright tests
+ */
+export interface AuthenticatedTestArgs {
+  /** Pre-configured API request context with authentication */
+  apiRequest: APIRequestContext;
+  /** JWT */
+  jwt: EnhancedJwt | string;
+  /** JWT access token for the authenticated user */
+  accessToken: string;
+}
+
+/**
+ * @enum UserType
+ * @description Available user types for test authentication
+ */
+export enum UserType {
+  /** Standard test user (CCI Cost Leader) */
+  CCI_COST_LEADER = 'cciCostLeader',
+  /** Standard test user (CCI Cost Leader) */
+  CCI_COST_LEADER_DEV_MASTER = 'cciCostLeaderDevMaster',
+  /** Strata internal user */
+  STRATA_USER = 'strataUser',
+  /** G Briggs user profile */
+  G_BRIGGS_USER = 'gBriggsUser',
+  /** UK user profile */
+  UK_USER = 'ukUser',
+  /** DSS Admin user profile */
+  DSS_ADMIN = 'dsAdmin'
+  /** Additional user types can be added here */
+}
+
+/**
+ * @constant VAULT_CONFIG
+ * @description Vault API configuration settings
+ */
+export const VAULT_CONFIG = {
+  /** Vault base URL */
+  baseUrl: 'https://vault.sdt.local/api/searchpasswords/122',
+  /** Vault API key for authentication */
+  apiKey: 'a69d2e478c3f5b395b687ecdf34a3239',
+  /** Whether to ignore HTTPS certificate errors */
+  ignoreHTTPSErrors: true
+} as const;
+
+/**
+ * @constant IDENTITY_CONFIG
+ * @description Identity provider configuration settings
+ */
+export const IDENTITY_CONFIG = {
+  /** Identity provider token endpoint */
+  tokenUrl: 'https://identity.dev.stratanetwork.net/connect/token',
+  /** OAuth client configuration */
+  client: {
+    id: 'IntegrationTest',
+    secret: 'UhAEQsGByTCrwPdHPLmaet_DmLEfcJVbZqGBxArdeRup_TPLrYKNpUNRHejjdnhd'
+  },
+  /** OAuth grant configuration */
+  grant: {
+    type: 'password',
+    scope: 'strata.api.external offline_access'
+  }
+} as const;
+
+/**
+ * Interface defining the structure of user information for testing purposes.
+ *
+ * This interface represents user data needed for authentication and authorization
+ * testing across different database contexts and user roles.
+ */
+export interface IUserInfo {
+  /** The environment variable name where the JWT token will be stored */
+  jwtEnvVar: string;
+
+  /** The vault username used for authentication */
+  vaultUserName: string;
+
+  /** The system username, may include domain prefix (e.g., 'sdt\\username') */
+  userName: string;
+
+  /** The user's full display name */
+  fullName: string;
+
+  /** The test-friendly name for this user type */
+  testName: string;
+
+  /** The GUID of the database/warehouse this user has access to */
+  database_guid: string;
+
+  /** The GUID of the default configuration */
+  configuration_guid: string;
+
+  /** Description of the user role and purpose */
+  description: string;
+}
+
+/**
+ * @constant USER_REGISTRY
+ * @description Registry of all available test users with their configurations
+ */
+export const USER_REGISTRY: Record<UserType, IUserInfo> = {
+  /**
+   * Default CCI Cost Leader configuration
+   * - Standard cost analysis and initiative management tests
+   */
+  [UserType.CCI_COST_LEADER]: {
+    jwtEnvVar: 'jwt',
+    vaultUserName: 'ccicostleader',
+    userName: 'ccicostleader',
+    fullName: 'Administrator, CCI',
+    testName: 'CCI Cost Leader',
+    database_guid: 'feb7a099-8b2a-436c-9aba-0f853c8c60c9',
+    configuration_guid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+    description: 'Default CCI Cost Leader - Standard cost analysis and initiative management tests'
+  },
+
+  /**
+   * Default CCI Cost Leader Dev Master configuration
+   * - Standard cost analysis and initiative management tests
+   */
+  [UserType.CCI_COST_LEADER_DEV_MASTER]: {
+    jwtEnvVar: 'jwtDevMaster',
+    vaultUserName: 'ccicostleader',
+    userName: 'ccicostleader',
+    fullName: 'Administrator, CCI',
+    testName: 'CCI Cost Leader Dev Master',
+    database_guid: '54409f55-5ddf-4748-8222-9ccfb04fb4f5',
+    configuration_guid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+    description: 'Default CCI Cost Leader Dev Master - Standard cost analysis and initiative management tests'
+  },
+
+  /**
+   * Strata Decision Technology (SDT) user configuration
+   * - Internal SDT operations and administrative tests
+   */
+  [UserType.STRATA_USER]: {
+    jwtEnvVar: 'sdtJwt',
+    vaultUserName: 'IDTestUser',
+    userName: 'sdt\\IDTestUser',
+    fullName: 'sdt test user',
+    testName: 'Strata User',
+    database_guid: 'feb7a099-8b2a-436c-9aba-0f853c8c60c9',
+    configuration_guid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+    description: 'SDT User - Internal SDT operations and administrative tests'
+  },
+
+  /**
+   * Gregory Briggs user configuration
+   * - User-specific workflow tests and personalized features
+   */
+  [UserType.G_BRIGGS_USER]: {
+    jwtEnvVar: 'gBriggsJwt',
+    vaultUserName: 'Briggs, Gregory',
+    userName: 'gBriggs',
+    fullName: 'Briggs, Gregory',
+    testName: 'G Briggs User',
+    database_guid: 'feb7a099-8b2a-436c-9aba-0f853c8c60c9',
+    configuration_guid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+    description: 'Gregory Briggs - User-specific workflow tests and personalized features'
+  },
+
+  /**
+   * UK CCI Cost Leader configuration
+   * - UK-specific regional tests and localization validation
+   */
+  [UserType.UK_USER]: {
+    jwtEnvVar: 'ukJwt',
+    vaultUserName: 'ccicostleader',
+    userName: 'ccicostleader',
+    fullName: 'Administrator, CCI',
+    testName: 'UK User',
+    database_guid: '952de1dd-fb05-464f-9538-1bebd158c474',
+    configuration_guid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+    description: 'UK CCI Cost Leader - UK-specific regional tests and localization validation'
+  },
+
+  /**
+   * DSS Admin user configuration
+   * - NON CI User tests validation
+   */
+  [UserType.DSS_ADMIN]: {
+    jwtEnvVar: 'dssJwt',
+    vaultUserName: 'DsAdmin',
+    userName: 'dssadmin',
+    fullName: 'Administrator, DSS',
+    testName: 'DSS Admin',
+    database_guid: 'feb7a099-8b2a-436c-9aba-0f853c8c60c9',
+    configuration_guid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+    description: 'DSS Admin - NON CI User tests validation'
+  }
+} as const;
+
+/**
+ * Type definition for user configuration objects
+ */
+export type UserConfig = (typeof USER_REGISTRY)[keyof typeof USER_REGISTRY];
+
+/**
+ * Authentication Service Configuration Constants
+ *
+ * These constants define the external service endpoints and credentials
+ * used for authentication workflows in E2E testing.
+ */
+const AUTH_CONSTANTS = {
+  /** Vault service configuration for password retrieval */
+  VAULT: {
+    BASE_URL: 'https://vault.sdt.local',
+    SEARCH_ENDPOINT: '/api/searchpasswords/122',
+    API_KEY: 'a69d2e478c3f5b395b687ecdf34a3239'
+  },
+
+  /** Identity provider configuration for JWT token acquisition */
+  IDENTITY_PROVIDER: {
+    BASE_URL: 'https://identity.dev.stratanetwork.net',
+    TOKEN_ENDPOINT: '/connect/token',
+    GRANT_TYPE: 'password',
+    SCOPE: 'strata.api.external offline_access',
+    CLIENT_ID: 'IntegrationTest',
+    CLIENT_SECRET: 'UhAEQsGByTCrwPdHPLmaet_DmLEfcJVbZqGBxArdeRup_TPLrYKNpUNRHejjdnhd'
+  },
+
+  /** Browser session storage configuration */
+  SESSION_STORAGE: {
+    OIDC_KEY: 'oidc.user:https://identity.dev.stratanetwork.net/:StrataUI'
+  }
+} as const;
+
+/**
+ * Retrieves a JWT token for a given user by fetching credentials from vault
+ * and authenticating with the identity provider.
+ *
+ * This function performs a two-step authentication process:
+ * 1. Retrieves the user's password from the vault service
+ * 2. Uses the credentials to obtain a JWT token from the identity provider
+ *
+ * @param request - Playwright API request context for making HTTP calls
+ * @param userInfo - User information containing vault username, system username, and database GUID
+ * @returns Promise resolving to JWT token data including access token, expiration, and user claims
+ *
+ * @example
+ * ```typescript
+ * const user = FindUserByVaultName('ccicostleader');
+ * const jwt = await getJwt(request, user);
+ * customLogger.log('Token expires at:', jwt.expires_at);
+ * ```
+ */
+/**
+ * Helper function to get IUserInfo from a user configuration
+ *
+ * @param config - User configuration object
+ * @returns IUserInfo object for use with getJwt
+ *
+ * @example
+ * ```typescript
+ * const userInfo = getUserInfo(USER_CONFIGS.DEFAULT);
+ * const jwt = await getJwt(request, userInfo);
+ * ```
+ */
+export const getUserInfo = (config: UserConfig): IUserInfo => {
+  return {
+    jwtEnvVar: config.jwtEnvVar,
+    vaultUserName: config.vaultUserName,
+    userName: config.userName,
+    fullName: config.fullName,
+    testName: config.testName,
+    database_guid: config.database_guid,
+    configuration_guid: config.configuration_guid,
+    description: config.description
+  };
+};
+
+/**
+ * Retrieves a JWT token for a user configuration by fetching credentials from vault
+ * and authenticating with the identity provider.
+ *
+ * @param request - Playwright API request context for making HTTP calls
+ * @param config - User configuration object containing vault name and database GUID
+ * @returns Promise resolving to JWT token data including access token, expiration, and user claims
+ *
+ * @example
+ * ```typescript
+ * const jwt = await getJwtFromConfig(request, USER_CONFIGS.DEFAULT);
+ * customLogger.log('Token expires at:', jwt.expires_at);
+ * ```
+ */
+export const getJwtFromConfig = async (request: APIRequestContext, config: UserConfig) => {
+  const userInfo = getUserInfo(config);
+  return getJwt(request, userInfo);
+};
+
+export const getJwt = async (request: APIRequestContext, userInfo: IUserInfo) => {
+  const { vaultUserName, userName } = userInfo;
+
+  // Get password from vault
+  const vaultUrl = `${AUTH_CONSTANTS.VAULT.BASE_URL}${AUTH_CONSTANTS.VAULT.SEARCH_ENDPOINT}?title=${vaultUserName}`;
+  const vaultResponse = await request.get(vaultUrl, {
+    headers: {
+      apiKey: AUTH_CONSTANTS.VAULT.API_KEY
+    },
+    ignoreHTTPSErrors: true
+  });
+  const vaultUserInfo: { Password: string } = JSON.parse((await vaultResponse.body()).toString())[0];
+
+  // Get JWT from Identity Provider
+  const tokenUrl = `${AUTH_CONSTANTS.IDENTITY_PROVIDER.BASE_URL}${AUTH_CONSTANTS.IDENTITY_PROVIDER.TOKEN_ENDPOINT}`;
+  const jwtResponse = await request.post(tokenUrl, {
+    form: {
+      database_guid: userInfo.database_guid,
+      grant_type: AUTH_CONSTANTS.IDENTITY_PROVIDER.GRANT_TYPE,
+      username: userName,
+      password: vaultUserInfo.Password,
+      scope: AUTH_CONSTANTS.IDENTITY_PROVIDER.SCOPE,
+      client_id: AUTH_CONSTANTS.IDENTITY_PROVIDER.CLIENT_ID,
+      client_secret: AUTH_CONSTANTS.IDENTITY_PROVIDER.CLIENT_SECRET
+    }
+  });
+  const jwt: { access_token: string } = JSON.parse((await jwtResponse.body()).toString());
+  const accessToken: string = jwt.access_token;
+
+  const claims = jwtDecode(accessToken);
+  const exp = claims.exp;
+  const isStrataEmployee = (claims as any)['is_strata_employee'];
+  const givenName = (claims as any)['given_name'];
+  const familyName = (claims as any)['family_name'];
+  const culture = (claims as any)['culture'];
+  const name = (claims as any)['name'];
+
+  customLogger.log(`🔐 Retrieved JWT for user '${userName}' (Vault: '${vaultUserName}')`);
+  customLogger.log(`   - Name: ${name} (Given: ${givenName}, Family: ${familyName})`);
+  customLogger.log(`   - Culture: ${culture}`);
+  customLogger.log(`   - Expires at: ${new Date((exp as number) * 1000).toISOString()} (is_strata_employee: ${isStrataEmployee})`);
+  return {
+    ...jwt,
+    expires_at: exp,
+    profile: { ...claims, preferred_username: name, database_guid: userInfo.database_guid, configuration_guid: userInfo.configuration_guid }
+  };
+};
+
+/**
+ * @constant JWT_ENV_MAPPING
+ * @description Mapping of user types to environment variable names for JWT storage
+ * @note Dynamically derived from USER_REGISTRY to avoid duplication
+ */
+export const JWT_ENV_MAPPING: Record<UserType, string> = Object.fromEntries(Object.entries(USER_REGISTRY).map(([key, value]) => [key, value.jwtEnvVar])) as Record<UserType, string>;
+
+/**
+ * @namespace VaultService
+ * @description Service for retrieving user passwords from Strata vault
+ */
+export namespace VaultService {
+  /**
+   * @function getUserNameAndPassword
+   * @description Retrieves username and password for specified user from vault
+   * @param {APIRequestContext} request - Playwright request context
+   * @param {string} vaultUserName - Vault username to look up
+   * @returns {Promise<{ userName: string; password: string }>} User password from vault
+   * @throws {Error} When vault request fails or user not found
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const password = await VaultService.getPassword(request, 'ccicostleader');
+   * ```
+   */
+  export async function getUserNameAndPassword(request: APIRequestContext, vaultUserName: string): Promise<{ userName: string; password: string }> {
+    try {
+      const vaultResponse = await request.get(`${VAULT_CONFIG.baseUrl}?title=${vaultUserName}`, {
+        headers: {
+          apiKey: VAULT_CONFIG.apiKey
+        },
+        ignoreHTTPSErrors: VAULT_CONFIG.ignoreHTTPSErrors
+      });
+
+      if (!vaultResponse.ok()) {
+        throw new Error(`Vault request failed: ${vaultResponse.status()} ${vaultResponse.statusText()}`);
+      }
+
+      const vaultData: VaultResponse[] = JSON.parse((await vaultResponse.body()).toString());
+
+      if (!vaultData || vaultData.length === 0) {
+        throw new Error(`No vault entry found for user: ${vaultUserName}`);
+      }
+
+      return { userName: vaultData[0].UserName, password: vaultData[0].Password };
+    } catch (error) {
+      throw new Error(`Failed to retrieve password for ${vaultUserName}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+}
+
+/**
+ * @namespace IdentityService
+ * @description Service for JWT token management with identity provider
+ */
+export namespace IdentityService {
+  /**
+   * @function getJwtToken
+   * @description Obtains JWT token from identity provider using user credentials
+   * @param {APIRequestContext} request - Playwright request context
+   * @param {IUserInfo} userInfo - User information for authentication
+   * @param {string} password - User password from vault
+   * @returns {Promise<JwtResponse>} JWT token response from identity provider
+   * @throws {Error} When authentication fails or token request fails
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const jwt = await IdentityService.getJwtToken(request, userInfo, password);
+   * ```
+   */
+  export async function getJwtToken(request: APIRequestContext, userInfo: IUserInfo, password: string): Promise<JwtResponse> {
+    try {
+      const jwtResponse = await request.post(IDENTITY_CONFIG.tokenUrl, {
+        form: {
+          database_guid: userInfo.database_guid,
+          grant_type: IDENTITY_CONFIG.grant.type,
+          username: userInfo.userName,
+          password: password,
+          scope: IDENTITY_CONFIG.grant.scope,
+          client_id: IDENTITY_CONFIG.client.id,
+          client_secret: IDENTITY_CONFIG.client.secret
+        }
+      });
+
+      if (!jwtResponse.ok()) {
+        throw new Error(`JWT request failed: ${jwtResponse.status()} ${jwtResponse.statusText()}`);
+      }
+
+      const jwt: JwtResponse = JSON.parse((await jwtResponse.body()).toString());
+
+      if (!jwt.access_token) {
+        throw new Error('No access token received from identity provider');
+      }
+
+      return jwt;
+    } catch (error) {
+      throw new Error(`Failed to get JWT for ${userInfo.userName}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+
+  /**
+   * @function enhanceJwtWithClaims
+   * @description Enhances JWT response with decoded claims and expiration info
+   * @param {JwtResponse} jwt - Raw JWT response from identity provider
+   * @returns {EnhancedJwt} JWT with decoded profile and expiration timestamp
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const enhancedJwt = IdentityService.enhanceJwtWithClaims(rawJwt);
+   * ```
+   */
+  export function enhanceJwtWithClaims(jwt: JwtResponse): EnhancedJwt {
+    const claims = jwtDecode(jwt.access_token);
+    const exp = claims.exp;
+
+    return {
+      ...jwt,
+      expires_at: exp,
+      profile: { ...claims }
+    };
+  }
+}
+
+/**
+ * @namespace JwtTokenManager
+ * @description High-level JWT token management with caching and user lookup
+ */
+export namespace JwtTokenManager {
+  /**
+   * @function getTokenForUser
+   * @description Retrieves complete JWT token for specified user (password lookup + authentication)
+   * @param {IUserInfo} userInfo - User information for token generation
+   * @param {APIRequestContext} request - Playwright request context
+   * @returns {Promise<EnhancedJwt>} Complete JWT token with claims and expiration
+   * @throws {Error} When password retrieval or authentication fails
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const userJwt = await JwtTokenManager.getTokenForUser(USER_REGISTRY[UserType.TEST_USER], request);
+   * ```
+   *
+   * @workflow
+   * 1. Retrieve password from vault using vaultUserName
+   * 2. Authenticate with identity provider using credentials
+   * 3. Decode JWT claims and add expiration info
+   * 4. Return enhanced JWT token object
+   */
+  export async function getTokenForUser(userInfo: IUserInfo, request: APIRequestContext): Promise<EnhancedJwt> {
+    const { userName, password } = await VaultService.getUserNameAndPassword(request, userInfo.vaultUserName);
+    userInfo.userName = userName;
+    const jwt = await IdentityService.getJwtToken(request, userInfo, password);
+    return IdentityService.enhanceJwtWithClaims(jwt);
+  }
+
+  /**
+   * @function getTokenByType
+   * @description Retrieves JWT token for user by type enum
+   * @param {UserType | Record<UserType, IUserInfo>} userType - User type enum value
+   * @param {APIRequestContext} request - Playwright request context
+   * @returns {Promise<EnhancedJwt>} Enhanced JWT token for specified user type
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const testUserJwt = await JwtTokenManager.getTokenByType(UserType.TEST_USER, request);
+   * ```
+   */
+  export async function getTokenByType(userType: UserType | Record<UserType, IUserInfo>, request: APIRequestContext): Promise<EnhancedJwt> {
+    const userInfo = USER_REGISTRY[typeof userType === 'object' ? (Object.keys(userType)[0] as UserType) : userType];
+    return await getTokenForUser(userInfo, request);
+  }
+
+  /**
+   * @function cacheToken
+   * @description Stores JWT token in process environment for later retrieval
+   * @param {UserType | Record<UserType, IUserInfo>} userType - User type for environment variable mapping
+   * @param {EnhancedJwt} jwt - JWT token to cache
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * JwtTokenManager.cacheToken(UserType.TEST_USER, jwtToken);
+   * ```
+   */
+  export function cacheToken(userType: UserType | Record<UserType, IUserInfo>, jwt: EnhancedJwt): void {
+    const envVarName = JWT_ENV_MAPPING[typeof userType === 'object' ? (Object.keys(userType)[0] as UserType) : userType];
+    process.env[envVarName] = JSON.stringify(jwt);
+  }
+
+  /**
+   * @function getCachedToken
+   * @description Retrieves cached JWT token from process environment
+   * @param {UserType | Record<UserType, IUserInfo>} userType - User type for environment variable mapping
+   * @returns {EnhancedJwt | null} Cached JWT token or null if not found
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const cachedJwt = JwtTokenManager.getCachedToken(UserType.TEST_USER);
+   * ```
+   */
+  export function getCachedToken(userType: UserType | Record<UserType, IUserInfo>): EnhancedJwt | null {
+    const envVarName = JWT_ENV_MAPPING[typeof userType === 'object' ? (Object.keys(userType)[0] as UserType) : userType];
+    const cachedJwt = process.env[envVarName];
+
+    if (!cachedJwt) {
+      return null;
+    }
+
+    try {
+      return JSON.parse(cachedJwt);
+    } catch {
+      return null;
+    }
+  }
+
+  /**
+   * @function getEnvVarName
+   * @description Gets environment variable name for specified user type
+   * @param {UserType | Record<UserType, IUserInfo>} userType - User type for environment variable lookup
+   * @returns {string} Environment variable name for JWT storage
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const envVar = JwtTokenManager.getEnvVarName(UserType.TEST_USER); // 'jwt'
+   * ```
+   */
+  export function getEnvVarName(userType: UserType | Record<UserType, IUserInfo>): string {
+    return JWT_ENV_MAPPING[typeof userType === 'object' ? (Object.keys(userType)[0] as UserType) : userType];
+  }
+}
+
+/**
+ * @namespace AuthContextFactory
+ * @description Factory functions for creating authenticated test contexts
+ */
+export namespace AuthContextFactory {
+  /**
+   * @function createApiRequestContext
+   * @description Creates authenticated API request context for specified user type
+   * @param {string} apiURL - Base API URL for requests
+   * @param {EnhancedJwt} jwt - JWT token for authentication
+   * @returns {Promise<APIRequestContext>} Configured API request context with auth headers
+   * @throws {Error} When cached JWT token not found for user type
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const apiContext = await AuthContextFactory.createApiRequestContext(UserType.TEST_USER, 'https://api.example.com/');
+   * ```
+   */
+  export async function createApiRequestContext(apiURL: string, jwt: EnhancedJwt): Promise<APIRequestContext> {
+    let accessToken = jwt ? jwt.access_token : '';
+
+    if (accessToken === '') {
+      customLogger.error(`❌ JWT not found. Ensure auth setup has run.`);
+      accessToken = 'unknown';
+    }
+
+    const apiRequestContext = await request.newContext({
+      baseURL: apiURL,
+      ignoreHTTPSErrors: true,
+      extraHTTPHeaders: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${accessToken}`,
+        ClientAppName: 'continuousimprovement-e2e-tests'
+      }
+    });
+
+    return apiRequestContext;
+  }
+
+  /**
+   * @function configureBrowserContext
+   * @description Configures browser context with JWT session storage and UI optimizations
+   * @param {BrowserContext} context - Browser context to configure
+   * @param {EnhancedJwt} jwt - JWT token for session storage
+   * @returns {Promise<void>}
+   * @throws {Error} When cached JWT token not found for user type
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * await AuthContextFactory.configureBrowserContext(browserContext, UserType.TEST_USER);
+   * ```
+   *
+   * @sideEffects
+   * - Adds JWT token to browser session storage
+   * - Injects CSS to hide WalkMe overlay elements
+   * - Configures OIDC session for Strata UI
+   */
+  export async function configureBrowserContext(context: BrowserContext, jwt: EnhancedJwt): Promise<void> {
+    const sessionJwt = JSON.stringify(jwt);
+
+    await context.addInitScript((jwt) => {
+      // Configure OIDC session storage
+      window.sessionStorage.setItem('oidc.user:https://identity.dev.stratanetwork.net/:StrataUI', jwt);
+
+      // Hide WalkMe overlay elements for cleaner test execution
+      setTimeout(() => {
+        const style = document.createElement('style');
+        style.setAttribute('type', 'text/css');
+        style.textContent = '#walkme-overlay-all, .wm-outer-div { display: none !important; visibility: hidden !important; height: 0 !important; }';
+        document.head.appendChild(style);
+      }, 1000);
+    }, sessionJwt);
+  }
+}
+
+async function getUserJwtToken(userType: UserType | Record<UserType, IUserInfo>, apiRequest: APIRequestContext): Promise<EnhancedJwt | null> {
+  const jwtEnvVar = JwtTokenManager.getEnvVarName(userType);
+  const jwt = await JwtTokenManager.getTokenByType(userType, apiRequest);
+  const expiresAt = jwt.expires_at ? new Date(jwt.expires_at * 1000).toLocaleString() : 'N/A';
+  customLogger.log(`📦 Caching JWT from env var '${jwtEnvVar}' with expiration ${expiresAt}`);
+  customLogger.log(`🔍 User Claims: ${(jwt as any).profile?.name} (${(jwt as any).profile?.preferred_username})`);
+  customLogger.log(`🆔 Database GUID: ${(jwt as any).profile?.database_guid}`);
+  JwtTokenManager.cacheToken(userType, jwt);
+  return jwt;
+}
+
+/**
+ * @function createAuthenticatedTest
+ * @description Factory function to create Playwright test with authentication for specific user type
+ * @param {UserType | Record<UserType, IUserInfo>} userType - User type for authentication context
+ * @returns {object} Extended Playwright test with authenticated API request and browser context
+ * @since 1.0.0
+ *
+ * @example
+ * ```typescript
+ * import { createAuthenticatedTest, UserType } from './authUtils';
+ *
+ * const test = createAuthenticatedTest(UserType.TEST_USER);
+ *
+ * test('authenticated test', async ({ apiRequest, jwtToken, page }) => {
+ *   customLogger.log('Using JWT:', jwtToken);
+ *   const response = await apiRequest.get('/protected-endpoint');
+ *   expect(response.ok()).toBe(true);
+ * });
+ * ```
+ *
+ * @returns Extended test object with:
+ * - `jwtToken`: JWT access token string for the authenticated user
+ * - `apiRequest`: Pre-configured API request context with Bearer token
+ * - `context`: Browser context with JWT session storage configured
+ * - All standard Playwright test fixtures and utilities
+ */
+export function createAuthenticatedTest(userType: UserType | Record<UserType, IUserInfo>) {
+  userType = getUserType(userType);
+  return baseTest.extend<AuthenticatedTestArgs & ApiRequestOptions>({
+    apiURL: ['', { option: true }],
+
+    jwt: async ({}, use) => {
+      // Create a temporary API request context just for JWT retrieval if needed
+      const tempRequest = await request.newContext({
+        ignoreHTTPSErrors: true
+      });
+      const jwt = await getUserJwtToken(userType, tempRequest);
+      await tempRequest.dispose();
+      await use(jwt ?? '');
+    },
+
+    accessToken: async ({ jwt }, use) => {
+      await use((jwt as EnhancedJwt)?.access_token ?? '');
+    },
+
+    apiRequest: async ({ apiURL, jwt }, use) => {
+      const apiRequestContext = await AuthContextFactory.createApiRequestContext(apiURL, jwt as EnhancedJwt);
+      customLogger.log(`🌐 API URL: ${apiURL}`);
+      await use(apiRequestContext);
+      await apiRequestContext.dispose();
+    },
+
+    context: async ({ context, jwt }, use) => {
+      await AuthContextFactory.configureBrowserContext(context, jwt as EnhancedJwt);
+      customLogger.log(`🌐 Configured browser context for user type: ${getUserDisplayName(userType)}`);
+      customLogger.log(`🔍 User Claims: ${(jwt as any).profile?.name} (${(jwt as any).profile?.preferred_username})`);
+      customLogger.log(`🆔 Database GUID: ${(jwt as any).profile?.database_guid}`);
+      await use(context);
+    }
+  });
+}
+
+/**
+ * @constant CONVENIENCE_EXPORTS
+ * @description Pre-configured test instances for common user types
+ */
+export const CONVENIENCE_EXPORTS = {
+  /** Standard test user (CCI Cost Leader) */
+  cciCostLeaderTestUser: createAuthenticatedTest(UserType.CCI_COST_LEADER),
+
+  /** Standard test user (CCI Cost Leader Dev Master) */
+  cciCostLeaderDevMasterTestUser: createAuthenticatedTest(UserType.CCI_COST_LEADER_DEV_MASTER),
+
+  /** Strata internal user test */
+  strataUserTest: createAuthenticatedTest(UserType.STRATA_USER),
+
+  /** G Briggs user test */
+  gBriggsTest: createAuthenticatedTest(UserType.G_BRIGGS_USER),
+
+  /** UK user test */
+  ukUserTest: createAuthenticatedTest(UserType.UK_USER),
+
+  /** DSS Admin user test */
+  dssAdminTest: createAuthenticatedTest(UserType.DSS_ADMIN)
+} as const;
+
+/**
+ * @function getUserType
+ * @description Gets user type enum value from user configuration or enum
+ * @param {UserType | Record<UserType, IUserInfo>} userType - User type enum or user config object
+ * @returns {string} User type enum value as string
+ * @since 1.0.0
+ *
+ * @example
+ * ```typescript
+ * const userType = getUserType(UserType.TEST_USER); // "TEST_USER"
+ * ```
+ */
+export function getUserType(userType: UserType | Record<UserType, IUserInfo>): UserType {
+  userType = (typeof userType === 'object' ? Object.keys(userType)[0] : userType) as UserType;
+  if (!Object.values(UserType).includes(userType)) {
+    customLogger.error(`Invalid user type: ${userType}`);
+  }
+  return userType;
+}
+
+/**
+ * @function getUserDisplayName
+ * @description Gets user-friendly display name for user type
+ * @param {UserType | Record<UserType, IUserInfo>} userType - User type enum or user config object
+ * @returns {string} Human-readable user name
+ * @since 1.0.0
+ *
+ * @example
+ * ```typescript
+ * const displayName = getUserDisplayName(UserType.TEST_USER); // "Test User"
+ * ```
+ */
+export function getUserDisplayName(userType: UserType | Record<UserType, IUserInfo>): string {
+  userType = getUserType(userType);
+  const userInfo = USER_REGISTRY[userType];
+  return userInfo?.fullName || userType;
+}
+
+/**
+ * @function getAllUserTypes
+ * @description Returns array of all available user types
+ * @returns {UserType[]} Array of user type enum values
+ * @since 1.0.0
+ *
+ * @example
+ * ```typescript
+ * const allUsers = getAllUserTypes(); // [UserType.TEST_USER, UserType.STRATA_USER, UserType.G_BRIGGS_USER]
+ * ```
+ */
+export function getAllUserTypes(): UserType[] {
+  return Object.values(UserType);
+}
+
+/**
+ * @namespace AuthUtils
+ * @description Consolidated export namespace for all authentication utilities
+ */
+export namespace AuthUtils {
+  export const UserRegistry = USER_REGISTRY;
+  export const JwtEnvMapping = JWT_ENV_MAPPING;
+  export const VaultConfig = VAULT_CONFIG;
+  export const IdentityConfig = IDENTITY_CONFIG;
+  export const ConvenienceTests = CONVENIENCE_EXPORTS;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/auth/authenticatedUsers.ts b/src/Strata.ContinuousImprovement.Web/e2e/auth/authenticatedUsers.ts
new file mode 100644
index 0000000..83c09e3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/auth/authenticatedUsers.ts
@@ -0,0 +1,160 @@
+/**
+ * @fileoverview Consolidated Authenticated Tests for All User Types
+ * @description Pre-configured Playwright tests with authentication for all supported user types
+ * @version 3.0.0
+ * @since 2024-11-03
+ * @author Strata Decision Technology
+ *
+ * @module AuthenticatedUsers
+ * @requires ./authUtils
+ *
+ * @example
+ * ```typescript
+ * // Standard test user (CCI Cost Leader)
+ * import { test, expect } from './authenticatedTest';
+ *
+ * // Strata internal user
+ * import { strataUserTest, expect } from './authenticatedTest';
+ *
+ * // G Briggs user
+ * import { gBriggsTest, expect } from './authenticatedTest';
+ *
+ * test('standard user test', async ({ apiRequest }) => {
+ *   const response = await apiRequest.get('/protected-endpoint');
+ *   expect(response.ok()).toBe(true);
+ * });
+ *
+ * strataUserTest('admin user test', async ({ apiRequest }) => {
+ *   const response = await apiRequest.get('/admin-endpoint');
+ *   expect(response.ok()).toBe(true);
+ * });
+ * ```
+ *
+ * @overview
+ * This module provides pre-configured Playwright test instances for all supported user types.
+ * Each test instance extends the base Playwright test with:
+ * - Authenticated API request context with Bearer token for specific user
+ * - Browser context configured with user-specific JWT session storage
+ * - WalkMe overlay removal for cleaner test execution
+ *
+ * @authentication
+ * All test instances require auth.setup.ts to have run successfully to populate JWT tokens.
+ * Each test uses a different UserType for authentication context:
+ * - test: UserType.TEST_USER (CCI Cost Leader)
+ * - strataUserTest: UserType.STRATA_USER (Strata Internal User)
+ * - gBriggsTest: UserType.G_BRIGGS_USER (G Briggs Profile)
+ *
+ * @compatibility
+ * Maintains full backward compatibility with existing test files.
+ * All existing import patterns will continue to work without modification.
+ */
+
+import { createAuthenticatedTest, UserType } from './authUtils';
+
+export * from './authUtils';
+export * from '@playwright/test';
+
+/**
+ * @constant cciCostLeader
+ * @description Pre-configured Playwright test with authentication for standard test user (CCI Cost Leader)
+ *
+ * @features
+ * - API request context with Bearer authentication for TEST_USER
+ * - Browser context with JWT session storage for TEST_USER
+ * - WalkMe overlay removal for UI tests
+ * - Full Playwright test API compatibility
+ *
+ * @usage
+ * This is a drop-in replacement for the standard Playwright test import.
+ * All existing tests will continue to work without modification.
+ */
+export const cciCostLeader = createAuthenticatedTest(UserType.CCI_COST_LEADER);
+
+/**
+ * @constant cciCostLeaderDevMaster
+ * @description Pre-configured Playwright test with authentication for standard test user (CCI Cost Leader)
+ *
+ * @features
+ * - API request context with Bearer authentication for TEST_USER
+ * - Browser context with JWT session storage for TEST_USER
+ * - WalkMe overlay removal for UI tests
+ * - Full Playwright test API compatibility
+ *
+ * @usage
+ * This is a drop-in replacement for the standard Playwright test import.
+ * All existing tests will continue to work without modification.
+ */
+export const cciCostLeaderDevMaster = createAuthenticatedTest(UserType.CCI_COST_LEADER_DEV_MASTER);
+
+/**
+ * @constant strataUserTest
+ * @description Pre-configured Playwright test with authentication for Strata internal user
+ *
+ * @features
+ * - API request context with Bearer authentication for STRATA_USER
+ * - Browser context with JWT session storage for STRATA_USER
+ * - WalkMe overlay removal for UI tests
+ * - Full Playwright test API compatibility
+ *
+ * @usage
+ * Import and use as a drop-in replacement for standard Playwright test when testing with Strata user privileges.
+ */
+export const strataUserTest = createAuthenticatedTest(UserType.STRATA_USER);
+
+/**
+ * @constant gBriggsTest
+ * @description Pre-configured Playwright test with authentication for G Briggs user
+ *
+ * @features
+ * - API request context with Bearer authentication for G_BRIGGS_USER
+ * - Browser context with JWT session storage for G_BRIGGS_USER
+ * - WalkMe overlay removal for UI tests
+ * - Full Playwright test API compatibility
+ *
+ * @usage
+ * Import and use as a drop-in replacement for standard Playwright test when testing with G Briggs user profile.
+ *
+ * @note
+ * G Briggs authentication may fail in some test environments.
+ * The auth setup handles this gracefully by caching empty tokens.
+ */
+export const gBriggsTest = createAuthenticatedTest(UserType.G_BRIGGS_USER);
+
+/**
+ * @constant ukUserTest
+ * @description Pre-configured Playwright test with authentication for UK user
+ * Uses CCI Cost Leader credentials (ccicostleader, 952de1dd-fb05-464f-9538-1bebd158c474)
+ * for UK-specific regional tests and localization validation.
+ *
+ * @features
+ * - API request context with Bearer authentication for UK_USER
+ * - Browser context with JWT session storage for UK_USER
+ * - WalkMe overlay removal for UI tests
+ * - Full Playwright test API compatibility
+ *
+ * @usage
+ * Import and use as a drop-in replacement for standard Playwright test when testing with UK user profile.
+ *
+ * @note
+ * UK User authentication may fail in some test environments.
+ * The auth setup handles this gracefully by caching empty tokens.
+ */
+export const ukUserTest = createAuthenticatedTest(UserType.UK_USER);
+
+/**
+ * @constant dssAdminTest
+ * @description Pre-configured Playwright test with authentication for DSS Admin user
+ * Uses DSS Admin credentials (dssadmin, feb7a099-8b2a-436c-9aba-0f853c8c60c9)
+ * for administrative and high-privilege operation tests.
+ *
+ * @features
+ * - API request context with Bearer authentication for DSS_ADMIN
+ * - Browser context with JWT session storage for DSS_ADMIN
+ * - WalkMe overlay removal for UI tests
+ * - Full Playwright test API compatibility
+ *
+ * @usage
+ * Import and use as a drop-in replacement for standard Playwright test when testing with DSS Admin user profile.
+ *
+ */
+export const dssAdminTest = createAuthenticatedTest(UserType.DSS_ADMIN);
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/components/Enumerations.ts b/src/Strata.ContinuousImprovement.Web/e2e/components/Enumerations.ts
new file mode 100644
index 0000000..b503fcc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/components/Enumerations.ts
@@ -0,0 +1,41 @@
+export enum EncounterGroup {
+  CaseType = 0,
+  PatientPopulation = 1,
+  FlexibleExplorationPatientPopulation = 2
+}
+
+export enum OpportunityLevelTypes {
+  Organization = 0,
+  Entity = 1,
+  ServiceLine = 2,
+  Specialty = 3,
+  Provider = 4
+}
+
+export enum FinancialImprovementTypes {
+  Cost = 0,
+  Revenue = 1
+}
+
+export enum MetricTypes {
+  Operational = 0,
+  FinancialPerUnit = 1,
+  Financial = 2
+}
+
+export enum AccountType {
+  Revenue = 0,
+  Expense = 1,
+  Margin = 2
+}
+
+export enum OpportunityLevel {
+  Overall = 0,
+  DepartmentLevel = 1
+}
+
+export enum PayrollGoalType {
+  Variable = 0,
+  Fixed = 1,
+  Both = 2
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/components/IColumnVisibilityStates.ts b/src/Strata.ContinuousImprovement.Web/e2e/components/IColumnVisibilityStates.ts
new file mode 100644
index 0000000..3954923
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/components/IColumnVisibilityStates.ts
@@ -0,0 +1,13 @@
+/**
+ * Interface representing the visibility states of column eye buttons in a grid layout
+ */
+export interface IColumnVisibilityStates {
+  /** Indicates if the Total Encounters eye button (visible state) is shown */
+  totalEncountersEyeButtonVisible: boolean;
+  /** Indicates if the Mortality Rate eye button (visible state) is shown */
+  mortalityRateEyeButtonVisible: boolean;
+  /** Indicates if the Total Encounters eye-invisible button is shown */
+  totalEncountersEyeInvisibleButtonVisible: boolean;
+  /** Indicates if the Mortality Rate eye-invisible button is shown */
+  mortalityRateEyeInvisibleButtonVisible: boolean;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/components/IEncounter.ts b/src/Strata.ContinuousImprovement.Web/e2e/components/IEncounter.ts
new file mode 100644
index 0000000..02618af
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/components/IEncounter.ts
@@ -0,0 +1,32 @@
+import { EncounterGroup, OpportunityLevelTypes } from './Enumerations';
+import { IInitiativeBase, ITestCase, newInitiative } from './IInitiativeBase';
+
+export interface IEncounter extends IInitiativeBase {
+  encounterGroup?: EncounterGroup;
+  opportunityLevel?: OpportunityLevelTypes | undefined;
+  encounterGroups?: [];
+  opportunityLevels?: [];
+  isSeasonal?: boolean;
+  startTracking?: Date;
+  endTracking?: Date;
+}
+
+export const newEncounter = (data: Partial<IEncounter> = {}): IEncounter => {
+  const initiative = newInitiative(data) as IEncounter;
+  initiative.costDriver = 'Encounter';
+  initiative.encounterGroup = EncounterGroup.CaseType;
+  initiative.opportunityLevel = OpportunityLevelTypes.Organization;
+  initiative.isSeasonal = false;
+
+  return {
+    ...initiative,
+    ...data
+  };
+};
+
+export interface IEncounterTestCase extends ITestCase {
+  encounterGroup: EncounterGroup;
+  opportunityLevel: OpportunityLevelTypes;
+  encounterGroups: string[];
+  opportunityLevels: string[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/components/IFreeForm.ts b/src/Strata.ContinuousImprovement.Web/e2e/components/IFreeForm.ts
new file mode 100644
index 0000000..4ab76ac
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/components/IFreeForm.ts
@@ -0,0 +1,29 @@
+import { FinancialImprovementTypes, MetricTypes } from './Enumerations';
+import { IInitiativeBase, ITestCase, newInitiative } from './IInitiativeBase';
+
+export interface IFreeForm extends IInitiativeBase {
+  entityId: number;
+  metricType: MetricTypes;
+  improvementType: FinancialImprovementTypes;
+  metricNumerator: string | undefined;
+  metricDenominator: string | undefined;
+  startTracking?: Date;
+  endTracking?: Date;
+}
+
+export const newFreeForm = (data: Partial<IFreeForm> = {}): IFreeForm => {
+  const initiative = newInitiative(data) as IFreeForm;
+  initiative.costDriver = 'Financial Free Form';
+
+  return {
+    ...initiative,
+    ...data
+  };
+};
+
+export interface IFreeFormTestCase extends ITestCase {
+  metricType: MetricTypes;
+  improvementType: FinancialImprovementTypes;
+  metricNumerator: string | undefined;
+  metricDenominator: string | undefined;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/components/IGeneralLedger.ts b/src/Strata.ContinuousImprovement.Web/e2e/components/IGeneralLedger.ts
new file mode 100644
index 0000000..1c2ee68
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/components/IGeneralLedger.ts
@@ -0,0 +1,38 @@
+import { AccountType, OpportunityLevel } from './Enumerations';
+import { IInitiativeBase, ITestCase, newInitiative } from './IInitiativeBase';
+
+export interface IGeneralLedger extends IInitiativeBase {
+  gLOpportunityType: AccountType;
+  goalLevel: OpportunityLevel;
+  departments: string[];
+  revenueAccounts: string[];
+  expenseAccounts: string[];
+  statisticAccounts: string[];
+  statisticDepartments: string[];
+  isSeasonal?: boolean;
+  hasStatistic: boolean;
+  type: string;
+  level: string;
+}
+
+export const newGeneralLedger = (data: Partial<IGeneralLedger> = {}): IGeneralLedger => {
+  const initiative = newInitiative(data) as IGeneralLedger;
+  initiative.costDriver = 'General Ledger';
+  initiative.isSeasonal = false;
+  initiative.hasStatistic = false;
+
+  return {
+    ...initiative,
+    ...data
+  };
+};
+
+export interface IGeneralLedgerTestCase extends ITestCase {
+  glOpportunityType: AccountType;
+  goalLevel: OpportunityLevel;
+  departments: string[];
+  revenueAccounts: string[];
+  expenseAccounts: string[];
+  statisticAccounts: string[];
+  statisticDepartments: string[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/components/IInitiativeBase.ts b/src/Strata.ContinuousImprovement.Web/e2e/components/IInitiativeBase.ts
new file mode 100644
index 0000000..e04eaa9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/components/IInitiativeBase.ts
@@ -0,0 +1,168 @@
+export interface IInitiativeBase {
+  configurationGuid?: string;
+  name: string;
+  opportunityGuid: string;
+  initiativeGuid: string;
+  costDriver: string;
+  isFinalized: boolean;
+  isLocked: boolean;
+  trackingStart: string;
+  startMonth: string;
+  endMonth: string;
+  goalStatement: string;
+  workstream: string;
+  plannedImprovements: string;
+  costLeader: string;
+  owner: string;
+  executiveSponsor: string;
+  stakeholders: string[];
+  teamMembers: string;
+  milestone1: string;
+  milestone2: string;
+  milestone3: string;
+  milestone4: string;
+  milestone5: string;
+  milestone6: string;
+  milestone7: string;
+  milestone8: string;
+  milestone9: string;
+  milestone10: string;
+  dueDate1: string;
+  dueDate2: string;
+  dueDate3: string;
+  dueDate4: string;
+  dueDate5: string;
+  dueDate6: string;
+  dueDate7: string;
+  dueDate8: string;
+  dueDate9: string;
+  dueDate10: string;
+  savingsRampUp01: number;
+  savingsRampUp02: number;
+  savingsRampUp03: number;
+  savingsRampUp04: number;
+  savingsRampUp05: number;
+  savingsRampUp06: number;
+  savingsRampUp07: number;
+  savingsRampUp08: number;
+  savingsRampUp09: number;
+  savingsRampUp10: number;
+  savingsRampUp11: number;
+  savingsRampUp12: number;
+  coI01: number;
+  coI02: number;
+  coI03: number;
+  coI04: number;
+  coI05: number;
+  coI06: number;
+  coI07: number;
+  coI08: number;
+  coI09: number;
+  coI10: number;
+  coI11: number;
+  coI12: number;
+  score01: number;
+  score02: number;
+  score03: number;
+  score04: number;
+  score05: number;
+  score06: number;
+  score07: number;
+  score08: number;
+  score09: number;
+  score10: number;
+  initiativeRollup1Id: number;
+  initiativeRollup2Id: number;
+  initiativeRollup3Id: number;
+}
+
+export const emptyGuid = '00000000-0000-0000-0000-000000000000';
+export const invalidDate = 'Invalid Date';
+
+export const newInitiative = (data: Partial<IInitiativeBase> = {}): IInitiativeBase => {
+  return {
+    ...{
+      name: '',
+      opportunityGuid: emptyGuid,
+      initiativeGuid: emptyGuid,
+      costDriver: '',
+      isFinalized: false,
+      isLocked: false,
+      trackingStart: '',
+      startMonth: '',
+      endMonth: '',
+      goalStatement: '',
+      workstream: '',
+      plannedImprovements: '',
+      costLeader: '',
+      owner: '',
+      executiveSponsor: '',
+      stakeholders: [],
+      teamMembers: '',
+      milestone1: '',
+      milestone2: '',
+      milestone3: '',
+      milestone4: '',
+      milestone5: '',
+      milestone6: '',
+      milestone7: '',
+      milestone8: '',
+      milestone9: '',
+      milestone10: '',
+      dueDate1: invalidDate,
+      dueDate2: invalidDate,
+      dueDate3: invalidDate,
+      dueDate4: invalidDate,
+      dueDate5: invalidDate,
+      dueDate6: invalidDate,
+      dueDate7: invalidDate,
+      dueDate8: invalidDate,
+      dueDate9: invalidDate,
+      dueDate10: invalidDate,
+      savingsRampUp01: 100,
+      savingsRampUp02: 100,
+      savingsRampUp03: 100,
+      savingsRampUp04: 100,
+      savingsRampUp05: 100,
+      savingsRampUp06: 100,
+      savingsRampUp07: 100,
+      savingsRampUp08: 100,
+      savingsRampUp09: 100,
+      savingsRampUp10: 100,
+      savingsRampUp11: 100,
+      savingsRampUp12: 100,
+      coI01: 0,
+      coI02: 0,
+      coI03: 0,
+      coI04: 0,
+      coI05: 0,
+      coI06: 0,
+      coI07: 0,
+      coI08: 0,
+      coI09: 0,
+      coI10: 0,
+      coI11: 0,
+      coI12: 0,
+      score01: 0,
+      score02: 0,
+      score03: 0,
+      score04: 0,
+      score05: 0,
+      score06: 0,
+      score07: 0,
+      score08: 0,
+      score09: 0,
+      score10: 0,
+      initiativeRollup1Id: 0,
+      initiativeRollup2Id: 0,
+      initiativeRollup3Id: 0
+    },
+    ...data
+  };
+};
+
+export interface ITestCase {
+  costDriver: string;
+  name: string;
+  mileStone1: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/components/IPayroll.ts b/src/Strata.ContinuousImprovement.Web/e2e/components/IPayroll.ts
new file mode 100644
index 0000000..6da2fda
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/components/IPayroll.ts
@@ -0,0 +1,26 @@
+import { PayrollGoalType } from './Enumerations';
+import { IInitiativeBase, ITestCase, newInitiative } from './IInitiativeBase';
+
+export interface IPayroll extends IInitiativeBase {
+  payrollGoal: PayrollGoalType;
+  departments: string[];
+  jobCodes: string[];
+  payCodes: string[];
+}
+
+export const newPayroll = (data: Partial<IPayroll> = {}): IPayroll => {
+  const initiative = newInitiative(data) as IPayroll;
+  initiative.costDriver = 'Payroll';
+
+  return {
+    ...initiative,
+    ...data
+  };
+};
+
+export interface IPayrollTestCase extends ITestCase {
+  payrollGoal: PayrollGoalType;
+  departments: string[];
+  jobCodes: string[];
+  payCodes: string[];
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/components/IRequestBase.ts b/src/Strata.ContinuousImprovement.Web/e2e/components/IRequestBase.ts
new file mode 100644
index 0000000..1bd11d0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/components/IRequestBase.ts
@@ -0,0 +1,12 @@
+import { APIRequestContext } from '@playwright/test';
+import { IInitiativeBase } from './IInitiativeBase';
+
+export interface IRequestBase {
+  apiRequest: APIRequestContext;
+  type: string;
+  opportunityGuid: string;
+}
+
+export interface IValidationRequest extends IRequestBase {
+  request: IInitiativeBase;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/components/Loader.ts b/src/Strata.ContinuousImprovement.Web/e2e/components/Loader.ts
new file mode 100644
index 0000000..235c9c9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/components/Loader.ts
@@ -0,0 +1,19 @@
+import { expect, type Page } from '@playwright/test';
+
+export class Loader {
+  readonly page: Page;
+
+  constructor(page: Page) {
+    this.page = page;
+  }
+
+  async waitForLoading() {
+    const loaders = this.page.getByRole('img', { name: 'loading' });
+    try {
+      await expect(loaders).toHaveCount(0, { timeout: 90_000 });
+    } catch {
+      // No loader appeared within timeout, proceed
+      return;
+    }
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/components/PageFilterParam.ts b/src/Strata.ContinuousImprovement.Web/e2e/components/PageFilterParam.ts
new file mode 100644
index 0000000..5a154e9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/components/PageFilterParam.ts
@@ -0,0 +1,38 @@
+import { Page } from '@playwright/test';
+import { AllOpportunitiesPage } from '../pages/AllOpportunitiesPage';
+import { ChargeCodeOpportunitiesPage } from '../pages/ChargeCodeOpportunitiesPage';
+import { EncounterOpportunitiesPage } from '../pages/EncounterOpportunitiesPage';
+import { FreeFormOpportunitiesPage } from '../pages/FreeFormOpportunitiesPage';
+
+export interface FilterParam {
+  locator: ReturnType<Page['locator']>;
+  text: ReturnType<Page['getByText']> | ReturnType<Page['getByTitle']>;
+}
+
+export interface PageFilterParam {
+  pageTest: string;
+  filters: FilterParam[];
+}
+
+export const filterParams = (page: Page, pageName: string): FilterParam[] => {
+  const pageFilters = [
+    {
+      pageTest: AllOpportunitiesPage.name,
+      filters: [{ locator: page.locator('.ant-select-selector'), text: page.getByTitle('General Ledger') }]
+    },
+    { pageTest: ChargeCodeOpportunitiesPage.name, filters: [] },
+    { pageTest: EncounterOpportunitiesPage.name, filters: [] },
+    {
+      pageTest: FreeFormOpportunitiesPage.name,
+      filters: [
+        { locator: page.locator('.ant-select-selector').first(), text: page.getByTitle('Revenue') },
+        {
+          locator: page.locator('div:nth-child(3) > .ant-row > div:nth-child(2) > .ant-form-item-control-input > .ant-form-item-control-input-content > .ant-select > .ant-select-selector'),
+          text: page.getByText('Financial Per Unit', { exact: true })
+        }
+      ]
+    }
+  ];
+  const pageFilter = pageFilters.find((pf) => pf.pageTest === pageName);
+  return pageFilter?.filters ?? [];
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/customLogger.ts b/src/Strata.ContinuousImprovement.Web/e2e/customLogger.ts
new file mode 100644
index 0000000..d3c0f25
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/customLogger.ts
@@ -0,0 +1,127 @@
+export enum LoggingLevels {
+  NONE = 0,
+  DEBUG = 1 << 1,
+  LOG = 1 << 2,
+  INFO = 1 << 3,
+  WARN = 1 << 4,
+  ERROR = 1 << 5,
+  LOG_DEBUG = DEBUG | LOG | INFO | WARN | ERROR,
+  DEBUG_LOG_INFO_WARN = DEBUG | LOG | INFO | WARN,
+  LOG_ALL = LOG | INFO | WARN | ERROR,
+  INFO_WARN_ERROR = INFO | WARN | ERROR,
+  WARN_ERROR = WARN | ERROR,
+  ERROR_ONLY = ERROR
+}
+
+/**
+ * @class CustomLogger
+ * @description Conditional logger that only outputs in local environments with configurable logging levels
+ * This logger provides environment-aware and level-aware logging:
+ * - Only logs in local environments (when CI env var is not set)
+ * - Supports configurable logging levels via LOGGING_LEVEL environment variable
+ * - Available levels: 'info' (default), 'warn', 'debug', 'error'
+ * - Errors always log regardless of environment or level
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * import { customLogger } from '../helpers/globalTestUtils';
+ *
+ * // These only appear in local environment based on LOGGING_LEVEL
+ * customLogger.log('Info message');     // Shows for 'info' or 'debug' levels
+ * customLogger.warn('Warning message'); // Shows for 'warn' or 'debug' levels
+ * customLogger.info('Info message');    // Shows for 'info' or 'debug' levels
+ * customLogger.error('Error message');  // Always appears
+ *
+ * // Set logging level via environment variable:
+ * // LOGGING_LEVEL=debug npx playwright test
+ * ```
+ */
+class CustomLogger {
+  private loggingLevel: LoggingLevels;
+
+  constructor() {
+    this.loggingLevel = (parseInt(process.env.LOGGING_LEVEL || LoggingLevels.ERROR_ONLY.toString(), 10) as any as LoggingLevels) || LoggingLevels.ERROR_ONLY;
+    if (this.loggingLevel & LoggingLevels.DEBUG_LOG_INFO_WARN) {
+      console.log(`CustomLogger initialized. loggingLevel=${this.getLoggingLevelName()}`);
+    }
+  }
+
+  private getLoggingLevelName(): string {
+    const flags: string[] = [];
+    if (this.loggingLevel & LoggingLevels.DEBUG) flags.push('DEBUG');
+    if (this.loggingLevel & LoggingLevels.LOG) flags.push('LOG');
+    if (this.loggingLevel & LoggingLevels.INFO) flags.push('INFO');
+    if (this.loggingLevel & LoggingLevels.WARN) flags.push('WARN');
+    if (this.loggingLevel & LoggingLevels.ERROR) flags.push('ERROR');
+    return flags.length > 0 ? flags.join('|') : 'NONE';
+  }
+
+  /**
+   * @method log
+   * @description Mimics console.log, only logs locally
+   * @param {...any[]} args - Arguments to log
+   * @returns {void}
+   */
+  log(...args: any[]): void {
+    if (this.loggingLevel & LoggingLevels.LOG) {
+      console.log(...args);
+    }
+  }
+
+  /**
+   * @method info
+   * @description Mimics console.info, only logs locally
+   * @param {...any[]} args - Arguments to log
+   * @returns {void}
+   */
+  info(...args: any[]): void {
+    if (this.loggingLevel & LoggingLevels.INFO) {
+      console.info(...args);
+    }
+  }
+
+  /**
+   * @method table
+   * @description Mimics console.table, only logs locally
+   * @param {any} tabularData - Data to display in table format
+   * @param {readonly string[]} [properties] - Optional properties to display
+   * @returns {void}
+   */
+  table(tabularData: any, properties?: readonly string[]): void {
+    if (this.loggingLevel & LoggingLevels.INFO) {
+      console.table(tabularData, properties);
+    }
+  }
+
+  /**
+   * @method warn
+   * @description Mimics console.warn, only logs locally
+   * @param {...any[]} args - Arguments to log
+   * @returns {void}
+   */
+  warn(...args: any[]): void {
+    if (this.loggingLevel & LoggingLevels.WARN) {
+      console.warn(...args);
+    }
+  }
+
+  /**
+   * @method error
+   * @description Mimics console.error, always logs regardless of environment
+   * @param {...any[]} args - Arguments to log
+   * @returns {void}
+   */
+  error(...args: any[]): void {
+    if (this.loggingLevel & LoggingLevels.ERROR) {
+      console.error(...args); // Always log errors
+    }
+  }
+}
+
+/**
+ * @const customLogger
+ * @description Singleton instance of CustomLogger for conditional logging in tests
+ * @since 2.0.0
+ */
+export const customLogger = new CustomLogger();
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/documentation/API_TEST_SUMMARY.md b/src/Strata.ContinuousImprovement.Web/e2e/documentation/API_TEST_SUMMARY.md
new file mode 100644
index 0000000..f0237c7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/documentation/API_TEST_SUMMARY.md
@@ -0,0 +1,30 @@
+# API Test Execution Summary
+
+**Generated:** 2026-01-27T15:33:38.100Z
+
+## Overall Statistics
+
+| Metric | Count | Percentage |
+|--------|------:|------------|
+| Total Tests | 1 | 100% |
+| ✅ Passed | 1 | 100.00% |
+| ❌ Failed | 0 | 0.00% |
+| ⏭️ Skipped | 0 | 0.00% |
+
+## Test Results by Controller
+
+### ukUser
+
+**Summary:** 1/1 passed (100.0%) | Failed: 0 | Skipped: 0
+
+| Status | Method | Endpoint | Description | Expected | Actual | Duration |
+|--------|--------|----------|-------------|----------|--------|----------|
+| ✅ | `GET` | `v1/free-form-opportunities/{opportunityGuid}` | Get free form opportunity by GUID | 200, 404 | 200 | 212ms |
+
+## Legend
+
+| Icon | Status |
+|------|--------|
+| ✅ | Test passed - endpoint responded with expected status code |
+| ❌ | Test failed - endpoint did not respond as expected |
+| ⏭️ | Test skipped - test was not executed |
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/documentation/API_VALIDATION_GUIDE.md b/src/Strata.ContinuousImprovement.Web/e2e/documentation/API_VALIDATION_GUIDE.md
new file mode 100644
index 0000000..d5b6ecc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/documentation/API_VALIDATION_GUIDE.md
@@ -0,0 +1,321 @@
+# API Server Validation Guide
+
+This document describes the API server validation system that ensures the API server is running before executing tests.
+
+## Overview
+
+The validation system provides multiple layers of API connectivity checking:
+
+1. **Global Setup** - Automatic validation before all tests
+2. **CLI Utility** - Manual validation before running tests
+3. **Test Helpers** - Per-test or per-suite validation
+4. **NPM Scripts** - Integrated validation in test workflows
+
+## Requirements
+
+For **local development**, the API server must be running at:
+- **URL**: `http://localhost:8443`
+- **API Base**: `http://localhost:8443/api/v1/`
+- **Swagger UI**: `http://localhost:8443/swagger` (if available)
+
+## Usage
+
+### 1. Automatic Validation (Recommended)
+
+The global setup automatically validates API connectivity when tests start:
+
+```bash
+# Tests will automatically check API server before starting
+npm run test-local
+```
+
+Output example:
+```
+🚀 Starting Playwright Global Setup...
+📍 Environment: Local Development
+🔍 Validating local API server connectivity...
+✅ API Server: Accessible (245ms) - API server accessible at http://localhost:8443/api/v1/ (HTTP 200)
+✅ Global Setup Complete!
+```
+
+### 2. Manual Pre-Test Validation
+
+Check API server before running tests manually:
+
+```bash
+# Check default local API server
+npm run check-api-local
+
+# Check specific URL
+npm run check-api
+
+# Check with custom timeout
+node scripts/check-api.js http://localhost:8443/api/v1/ --timeout=5000
+```
+
+### 3. In-Test Validation
+
+Use validation helpers within your test files:
+
+```typescript
+import { requireApiServer, skipIfApiUnavailable, LocalApiRequirement } from '../helpers/apiValidation';
+
+test.describe('API Integration Tests', () => {
+  // Require API server - fail tests if not available
+  test.beforeAll(requireApiServer);
+  
+  test('should fetch data', async ({ apiRequest }) => {
+    const response = await apiRequest.get('/data');
+    expect(response.ok()).toBe(true);
+  });
+});
+
+test.describe('Optional API Tests', () => {
+  // Skip individual tests if API not available
+  test('optional api test', skipIfApiUnavailable, async ({ apiRequest }) => {
+    // This test will be skipped if API server is not accessible
+    const response = await apiRequest.get('/endpoint');
+    expect(response.ok()).toBe(true);
+  });
+});
+
+test.describe('Flexible API Tests', () => {
+  test('conditional test', async ({ apiRequest }) => {
+    const apiStatus = await validateApiInTest();
+    
+    if (!apiStatus.isAccessible) {
+      console.warn('API not available, using mock data');
+      // Use mock data or alternative testing approach
+      return;
+    }
+    
+    // Proceed with live API testing
+    const response = await apiRequest.get('/data');
+    expect(response.ok()).toBe(true);
+  });
+});
+```
+
+### 4. Test Suite Validation
+
+Create reusable validation functions for test suites:
+
+```typescript
+import { createApiRequirement } from '../helpers/apiValidation';
+
+// Required API - tests fail if not available
+const requireLocalApi = createApiRequirement('http://localhost:8443/api/v1/', true);
+
+// Optional API - tests skip if not available
+const optionalRemoteApi = createApiRequirement('https://api.example.com/', false);
+
+test.describe('Critical API Tests', () => {
+  test.beforeAll(requireLocalApi); // Will fail if API not available
+  // ... tests
+});
+
+test.describe('Secondary API Tests', () => {
+  test.beforeAll(optionalRemoteApi); // Will skip if API not available  
+  // ... tests
+});
+```
+
+## Configuration
+
+### Environment Detection
+
+The validation system automatically detects the environment:
+
+```typescript
+// Local development indicators:
+// - NODE_ENV === 'development'
+// - TEST_ENV === 'local'  
+// - !process.env.CI
+// - --config=playwright.config.local.ts in arguments
+
+// Local: validates http://localhost:8443/api/v1/
+// Remote: validates https://continuousimprovement-api.dev.stratanetwork.net/api/v1/
+```
+
+### Validation Configuration
+
+Customize validation behavior:
+
+```typescript
+import { validateApiServer } from '../helpers/apiServerValidator';
+
+const result = await validateApiServer('http://localhost:8443/api/v1/', {
+  timeout: 10000,                    // Request timeout (ms)
+  ignoreHTTPSErrors: true,           // Ignore SSL certificate errors
+  expectedStatusCodes: [200, 401, 403], // Status codes indicating server is running
+  skipValidation: false              // Skip validation entirely
+});
+```
+
+## Error Handling
+
+### Validation Failures
+
+When API server validation fails, you'll see detailed error messages:
+
+```
+🚨 API Server Validation Failed
+
+Expected API server at: http://localhost:8443/api/v1/
+Error: Failed to connect to API server at http://localhost:8443/api/v1/
+Details: connect ECONNREFUSED 127.0.0.1:8443
+
+💡 To resolve this issue:
+   1. Ensure the API server is running
+   2. Check that the server is accessible at the expected URL
+   3. Verify firewall and network settings
+   4. For local development, start the API server at localhost:8443
+
+📋 Local Development Setup:
+   - API Server should be running at: http://localhost:8443
+   - Swagger UI should be accessible at: http://localhost:8443/swagger
+   - Health endpoint (if available): http://localhost:8443/api/v1/health
+```
+
+### Test Behavior
+
+Different validation approaches handle failures differently:
+
+| Method | Behavior When API Unavailable |
+|--------|-------------------------------|
+| `requireApiServer()` | ❌ **Fail** - Tests fail with error |
+| `skipIfApiUnavailable` | ⏭️ **Skip** - Tests marked as skipped |
+| `validateApiInTest()` | ℹ️ **Continue** - Returns result, test decides |
+| `createApiRequirement(url, false)` | ⏭️ **Skip** - Suite skipped |
+| `createApiRequirement(url, true)` | ❌ **Fail** - Suite fails |
+
+## NPM Scripts
+
+The following npm scripts are available:
+
+```bash
+# Check local API server
+npm run check-api-local
+
+# Check API server (generic)
+npm run check-api
+
+# Run tests with automatic API validation
+npm run test-local          # Includes pretest API check
+npm run test-report-local    # Direct test run
+```
+
+## Integration Examples
+
+### API Test Suite
+
+```typescript
+// tests/api/userService.api.spec.ts
+import { test, expect } from '@playwright/test';
+import { requireApiServer } from '../helpers/apiValidation';
+
+test.describe('User Service API Tests', () => {
+  test.beforeAll(requireApiServer);
+  
+  test('should fetch user data', async ({ apiRequest }) => {
+    const response = await apiRequest.get('/users/1');
+    expect(response.ok()).toBe(true);
+    
+    const user = await response.json();
+    expect(user).toHaveProperty('id', 1);
+  });
+});
+```
+
+### Swagger Test Suite
+
+```typescript
+// tests/swagger/swaggerApiTests.spec.ts
+import { test, expect } from '@playwright/test';
+import { LocalApiRequirement, logApiStatus } from '../helpers/apiValidation';
+
+test.describe('Swagger API Documentation Tests', () => {
+  test.beforeAll(LocalApiRequirement);
+  test.beforeEach(logApiStatus);
+  
+  test('should load Swagger UI', async ({ page }) => {
+    await page.goto('http://localhost:8443/swagger');
+    await expect(page.locator('h2')).toContainText('swagger');
+  });
+});
+```
+
+### Mixed Test Approach
+
+```typescript
+// tests/integration/flexibleTests.spec.ts
+import { test, expect } from '@playwright/test';
+import { validateApiInTest } from '../helpers/apiValidation';
+
+test.describe('Flexible Integration Tests', () => {
+  test('user workflow test', async ({ page, apiRequest }) => {
+    const apiStatus = await validateApiInTest();
+    
+    if (apiStatus.isAccessible) {
+      // Live API testing
+      console.log('✅ Using live API server');
+      const response = await apiRequest.get('/users/current');
+      expect(response.ok()).toBe(true);
+    } else {
+      // Fallback to UI-only testing
+      console.log('⚠️ API not available, testing UI only');
+      await page.goto('/login');
+      await page.fill('[name="username"]', 'testuser');
+      await page.fill('[name="password"]', 'password');
+      await page.click('button[type="submit"]');
+    }
+    
+    // Continue with shared test logic
+    await expect(page.locator('h1')).toBeVisible();
+  });
+});
+```
+
+## Troubleshooting
+
+### Common Issues
+
+1. **"API Server not accessible"**
+   - Ensure API server is running at localhost:8443
+   - Check firewall settings
+   - Verify no other services are using port 8443
+
+2. **"Timeout during validation"**
+   - API server might be slow to respond
+   - Increase timeout in validation config
+   - Check server logs for performance issues
+
+3. **"Validation skipped"**
+   - Environment detection might be incorrect
+   - Check NODE_ENV and other environment variables
+   - Explicitly configure validation if needed
+
+### Debug Commands
+
+```bash
+# Test API connectivity manually
+curl http://localhost:8443/api/v1/
+
+# Check what's running on port 8443
+netstat -tulpn | grep 8443
+
+# Test with verbose output
+node scripts/check-api.js http://localhost:8443/api/v1/ --timeout=15000
+```
+
+## Best Practices
+
+1. **Use Global Setup** - Let automatic validation handle most cases
+2. **Require for API Tests** - Use `requireApiServer()` for tests that must have API
+3. **Skip for Optional** - Use `skipIfApiUnavailable` for supplementary tests
+4. **Validate in Test** - Use `validateApiInTest()` for flexible testing approaches
+5. **Pre-Test Checks** - Run `npm run check-api-local` before development sessions
+
+---
+
+This validation system ensures reliable test execution while providing clear feedback when API connectivity issues occur.
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/documentation/API_VALIDATION_README.md b/src/Strata.ContinuousImprovement.Web/e2e/documentation/API_VALIDATION_README.md
new file mode 100644
index 0000000..3093792
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/documentation/API_VALIDATION_README.md
@@ -0,0 +1,110 @@
+# API Server Validation System
+
+## Overview
+
+The E2E test suite now includes comprehensive API server validation to ensure the API server is running before executing tests. This prevents test failures due to missing API connectivity and provides clear setup instructions.
+
+## Quick Start
+
+### For Local Development
+
+1. **Start the API Server** at `localhost:8443`
+2. **Run Tests** - validation happens automatically:
+   ```bash
+   npm run test-local
+   ```
+
+### Manual API Check
+
+Check if the API server is running before tests:
+```bash
+# Quick check
+npm run check-api-local
+
+# Detailed check with timeout
+node scripts/check-api.js http://localhost:8443/api/v1/ --timeout=5000
+```
+
+## Validation Layers
+
+### 1. Global Setup (Automatic)
+- Runs before all tests automatically
+- Validates API connectivity 
+- Provides setup instructions if API is missing
+- Allows tests to continue with warnings
+
+### 2. CLI Utility (Manual)
+- `npm run check-api-local` - Check localhost:8443
+- `node scripts/check-api.js [URL]` - Check specific URL
+- Exit code 0 = API accessible, 1 = API not accessible
+
+### 3. Test Helpers (In-Test)
+```typescript
+import { requireApiServer, skipIfApiUnavailable } from '../helpers/apiValidation';
+
+test.describe('API Tests', () => {
+  test.beforeAll(requireApiServer); // Fail if API not available
+  
+  test('optional test', skipIfApiUnavailable, async ({ apiRequest }) => {
+    // Skip if API not available
+  });
+});
+```
+
+## Expected API Configuration
+
+For local development, the API server should be accessible at:
+- **Base URL**: `http://localhost:8443`
+- **API Endpoint**: `http://localhost:8443/api/v1/`
+- **Swagger UI**: `http://localhost:8443/swagger` (if available)
+
+## Error Messages
+
+When the API server is not running, you'll see clear instructions:
+
+```
+🚨 API Server Validation Failed!
+
+💡 To resolve this issue:
+   1. Start the API server at http://localhost:8443
+   2. Verify the server is responding to requests
+   3. Check that no firewall is blocking port 8443
+   4. Ensure the API server is properly configured
+
+📋 Expected API Endpoints:
+   - Base API: http://localhost:8443/api/v1/
+   - Swagger UI: http://localhost:8443/swagger
+```
+
+## Test Behavior
+
+| Test Type | API Required? | Behavior if API Missing |
+|-----------|---------------|------------------------|
+| UI Tests | No | ✅ Continue normally |
+| API Tests | Yes | ❌ Fail with clear error |
+| Swagger Tests | Yes | ❌ Fail with clear error |
+| Optional API Tests | No | ⏭️ Skip with notice |
+
+## Files Added
+
+- `tests/helpers/apiServerValidator.ts` - Core validation logic
+- `tests/helpers/apiValidation.ts` - Test helper functions  
+- `tests/global.setup.ts` - Global setup with API validation
+- `scripts/check-api.js` - CLI utility for manual checks
+- `API_VALIDATION_GUIDE.md` - Comprehensive documentation
+
+## NPM Scripts Updated
+
+```json
+{
+  "check-api": "node scripts/check-api.js",
+  "check-api-local": "node scripts/check-api.js http://localhost:8443/api/v1/",
+  "pretest-local": "npm run check-api-local"
+}
+```
+
+The `pretest-local` script automatically validates the API before running `test-local`.
+
+---
+
+This validation system ensures reliable test execution while providing clear feedback when API connectivity issues occur. Both API and Swagger tests now require a live API connection for full functionality.
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/documentation/MISSING_SWAGGER_TESTS.md b/src/Strata.ContinuousImprovement.Web/e2e/documentation/MISSING_SWAGGER_TESTS.md
new file mode 100644
index 0000000..dce2e60
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/documentation/MISSING_SWAGGER_TESTS.md
@@ -0,0 +1,894 @@
+# Missing Swagger API Test Coverage Report
+
+**Generated**: December 9, 2025  
+**API Base URL**: https://continuousimprovement-api.dev.stratanetwork.net  
+**Swagger Version**: v1
+
+## Executive Summary
+
+This document identifies API endpoints from the Swagger specification that currently lack automated test coverage. Tests should be added to ensure comprehensive API validation.
+
+**Total Endpoints Analyzed**: ~250+  
+**Currently Tested**: ~150+  
+**Missing Tests**: ~100+
+
+---
+
+## Priority Ratings
+
+- **High**: Core CRUD operations, data retrieval, critical business logic
+- **Medium**: Secondary operations, supplementary features
+- **Low**: Admin utilities, internal housekeeping, rarely used features
+
+---
+
+## Missing Endpoint Tests by Controller
+
+### 1. ChargeCodeOpportunities ⚠️ HIGH PRIORITY
+
+#### Missing Tests:
+- `POST /api/v1/charge-code-opportunities/{opportunityGuid}/update-goals` - Update opportunity goals
+  - **Priority**: High
+  - **Description**: Update goal values for a charge code opportunity
+
+- `POST /api/v1/charge-code-opportunities/{opportunityGuid}/export` - Export opportunity details with items
+  - **Priority**: Medium
+  - **Description**: Export charge code items for an opportunity
+
+### 2. ChargeCodeOpportunityDetails ⚠️ HIGH PRIORITY
+
+#### Missing Tests:
+- `POST /api/v1/charge-code-opportunity-details/create` - Create charge code opportunity detail (DEPRECATED)
+  - **Priority**: Low
+  - **Description**: Deprecated endpoint for creating opportunity details
+
+- `POST /api/v1/charge-code-opportunity-details/refresh-baseline-details` - Refresh baseline data
+  - **Priority**: High
+  - **Description**: Refresh baseline details for opportunity tracking
+
+- `POST /api/v1/charge-code-opportunity-details/refresh-tracking-details` - Refresh tracking data
+  - **Priority**: High
+  - **Description**: Refresh tracking details for opportunity monitoring
+
+### 3. ChargeCodeOpps 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/charge-code-opps/{configurationGuid}/filter-options` - Get filter options
+  - **Priority**: High
+  - **Description**: Retrieve available filter options for charge code opportunities
+
+### 4. ClientNetworkOpportunities ⚠️ HIGH PRIORITY
+
+#### Missing Tests:
+- `POST /api/v1/client-network-opportunities/opportunities` - Load network opportunities
+  - **Priority**: High
+  - **Description**: Load network opportunities with filtering and pagination
+
+- `GET /api/v1/client-network-opportunities/{networkOpportunityId}` - Get network opportunity by ID
+  - **Priority**: High
+  - **Description**: Retrieve specific network opportunity details
+
+- `PUT /api/v1/client-network-opportunities/{networkOpportunityId}` - Update network opportunity
+  - **Priority**: High
+  - **Description**: Update an existing network opportunity
+
+- `DELETE /api/v1/client-network-opportunities/{networkOpportunityId}` - Delete network opportunity
+  - **Priority**: High
+  - **Description**: Delete a network opportunity
+
+- `PUT /api/v1/client-network-opportunities/{networkOpportunityId}/publish` - Publish network opportunity
+  - **Priority**: High
+  - **Description**: Publish or unpublish a network opportunity
+
+- `PUT /api/v1/client-network-opportunities/{networkOpportunityId}/archive` - Archive network opportunity
+  - **Priority**: Medium
+  - **Description**: Archive a network opportunity
+
+### 5. ClientNetworkOpportunityLink 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `PUT /api/v1/client-network-opportunity-link` - Link opportunities
+  - **Priority**: High
+  - **Description**: Link client opportunity to network opportunity
+
+- `POST /api/v1/client-network-opportunity-link` - Rollover opportunity
+  - **Priority**: High
+  - **Description**: Rollover opportunity to new configuration
+
+- `DELETE /api/v1/client-network-opportunity-link/{opportunityGuid}/{configurationGuid}` - Unlink opportunity
+  - **Priority**: High
+  - **Description**: Remove link between opportunity and configuration
+
+- `GET /api/v1/client-network-opportunity-link/{opportunityGuid}/linked-configurations` - Get linked configs
+  - **Priority**: Medium
+  - **Description**: Get all configurations linked to an opportunity
+
+- `DELETE /api/v1/client-network-opportunity-link/{initiativeGuid}/delete-initiative-link` - Delete initiative link
+  - **Priority**: Medium
+  - **Description**: Remove initiative link from network opportunity
+
+### 6. ClientOpportunityTypeWorkbooks 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/client-opportunity-type-workbooks/{opportunityType}` - Get workbooks by opportunity type
+  - **Priority**: Medium
+  - **Description**: Retrieve workbooks associated with opportunity type
+
+- `POST /api/v1/client-opportunity-type-workbooks` - Create/update opportunity type workbooks
+  - **Priority**: Medium
+  - **Description**: Associate workbooks with opportunity types
+
+- `DELETE /api/v1/client-opportunity-type-workbooks/{opportunityType}` - Delete workbook associations
+  - **Priority**: Low
+  - **Description**: Remove workbook associations for opportunity type
+
+### 7. ClientOpportunityWorkbooks 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/client-opportunity-workbooks/workbooks` - Get all workbooks
+  - **Priority**: Medium
+  - **Description**: Retrieve all available workbooks for opportunities
+
+### 8. ClientWarehouses 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `DELETE /api/v1/client-warehouses/{databaseGuid}` - Delete client warehouse
+  - **Priority**: Medium
+  - **Description**: Delete a client warehouse/database configuration
+
+### 9. Comments 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `POST /api/v1/comments` - Get comments
+  - **Priority**: High
+  - **Description**: Retrieve comments for an opportunity with filters
+
+- `POST /api/v1/comments/create` - Create comment
+  - **Priority**: High
+  - **Description**: Add a new comment to an opportunity
+
+### 10. Configurations 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/configurations` - Get all configurations
+  - **Priority**: High
+  - **Description**: Retrieve all available configurations
+
+- `GET /api/v1/configurations/{configurationGuid}/configuration-entities` - Get configuration entities
+  - **Priority**: Medium
+  - **Description**: Get entities associated with a configuration
+
+- `GET /api/v1/configurations/{configurationGuid}/configuration-entity-info` - Get entity info
+  - **Priority**: Medium
+  - **Description**: Get detailed entity information for configuration
+
+- `GET /api/v1/configurations/{configurationGuid}/configuration-service-line-info` - Get service line info
+  - **Priority**: Medium
+  - **Description**: Get service line information for configuration
+
+### 11. Databases 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/databases` - Get all databases
+  - **Priority**: Medium
+  - **Description**: Retrieve all available databases/data sources
+
+### 12. EncounterOpportunities 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `PUT /api/v1/encounter-opportunities/{opportunityGuid}/update-goals` - Update opportunity goals
+  - **Priority**: High
+  - **Description**: Update goal values for encounter opportunity
+
+- `GET /api/v1/encounter-opportunities/{opportunityGuid}/edit-model` - Get edit model
+  - **Priority**: Medium
+  - **Description**: Retrieve editable model for encounter opportunity
+
+- `GET /api/v1/encounter-opportunities/{opportunityGuid}/initiative-info` - Get initiative info
+  - **Priority**: Medium
+  - **Description**: Get associated initiative information
+
+- `GET /api/v1/encounter-opportunities/{configurationGuid}/filter-options` - Get filter options
+  - **Priority**: High
+  - **Description**: Retrieve available filter options
+
+- `GET /api/v1/encounter-opportunities/tempo-page-enabled` - Check if tempo page enabled
+  - **Priority**: Low
+  - **Description**: Check if tempo page feature is enabled
+
+- `PUT /api/v1/encounter-opportunities/{opportunityGuid}/update-opportunity` - Update opportunity
+  - **Priority**: High
+  - **Description**: Update encounter opportunity details
+
+- `PUT /api/v1/encounter-opportunities/{opportunityGuid}/set-hidden` - Set hidden status
+  - **Priority**: Medium
+  - **Description**: Hide or show encounter opportunity
+
+- `PUT /api/v1/encounter-opportunities/{opportunityGuid}/set-note` - Set note
+  - **Priority**: Medium
+  - **Description**: Add or update note on encounter opportunity
+
+- `POST /api/v1/encounter-opportunities/export` - Export opportunities
+  - **Priority**: Medium
+  - **Description**: Export encounter opportunities to file
+
+### 13. Encounters 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `POST /api/v1/encounters` - Query encounters
+  - **Priority**: High
+  - **Description**: Query encounter data with filters
+
+- `POST /api/v1/encounters/cost-info` - Get encounter cost info
+  - **Priority**: High
+  - **Description**: Retrieve cost information for encounters
+
+- `POST /api/v1/encounters/department-unit-of-service-info` - Get department UOS info
+  - **Priority**: Medium
+  - **Description**: Retrieve department unit of service information
+
+- `POST /api/v1/encounters/unit-of-service-info` - Get unit of service info
+  - **Priority**: Medium
+  - **Description**: Retrieve unit of service information
+
+- `POST /api/v1/encounters/encounter-charge-info` - Get charge info
+  - **Priority**: High
+  - **Description**: Retrieve charge information for encounters
+
+- `POST /api/v1/encounters/variation-encounter-charge-info` - Get variation charge info
+  - **Priority**: High
+  - **Description**: Retrieve variation charge information
+
+- `POST /api/v1/encounters/los-opportunity-info` - Get length of stay opportunity info
+  - **Priority**: High
+  - **Description**: Retrieve length of stay opportunity information
+
+### 14. Exploration 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `POST /api/v1/exploration/case-type-family-summary` - Get case type family summary
+  - **Priority**: High
+  - **Description**: Retrieve summary data for case type families
+
+- `POST /api/v1/exploration/case-type-family-cost-driver-info` - Get cost driver info
+  - **Priority**: High
+  - **Description**: Retrieve cost driver information for case type families
+
+- `POST /api/v1/exploration/case-type-family-details` - Get case type family details
+  - **Priority**: High
+  - **Description**: Retrieve detailed information for case type families
+
+- `GET /api/v1/exploration/flexible-exploration-information-page` - Check if flexible exploration enabled
+  - **Priority**: Low
+  - **Description**: Check if flexible exploration page is enabled
+
+### 15. ExplorationOpportunities 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/exploration-opportunities/enabled` - Check if enabled
+  - **Priority**: Low
+  - **Description**: Check if exploration opportunities feature is enabled
+
+- `POST /api/v1/exploration-opportunities` - Load exploration opportunities
+  - **Priority**: High
+  - **Description**: Load exploration opportunities with filters
+
+- `GET /api/v1/exploration-opportunities/{opportunityGuid}` - Get opportunity by ID
+  - **Priority**: High
+  - **Description**: Retrieve specific exploration opportunity
+
+- `DELETE /api/v1/exploration-opportunities/{opportunityGuid}` - Delete opportunity
+  - **Priority**: High
+  - **Description**: Delete an exploration opportunity
+
+- `PUT /api/v1/exploration-opportunities/{opportunityGuid}/check-workbook` - Check workbook
+  - **Priority**: Medium
+  - **Description**: Verify workbook association
+
+- `POST /api/v1/exploration-opportunities/create` - Create opportunity
+  - **Priority**: High
+  - **Description**: Create new exploration opportunity
+
+- `POST /api/v1/exploration-opportunities/export` - Export opportunities
+  - **Priority**: Medium
+  - **Description**: Export exploration opportunities
+
+- `PUT /api/v1/exploration-opportunities/{opportunityGuid}/update` - Update opportunity
+  - **Priority**: High
+  - **Description**: Update exploration opportunity
+
+- `PUT /api/v1/exploration-opportunities/{opportunityGuid}/set-status` - Set status
+  - **Priority**: High
+  - **Description**: Update opportunity status
+
+- `GET /api/v1/exploration-opportunities/{configurationGuid}/filter-options` - Get filter options
+  - **Priority**: High
+  - **Description**: Retrieve available filter options
+
+- `PUT /api/v1/exploration-opportunities/{opportunityGuid}/set-hidden` - Set hidden status
+  - **Priority**: Medium
+  - **Description**: Hide or show exploration opportunity
+
+- `PUT /api/v1/exploration-opportunities/{opportunityGuid}/set-note` - Set note
+  - **Priority**: Medium
+  - **Description**: Add or update note
+
+### 16. ExplorationPopulations 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/exploration-populations/replicate-population` - Check if replication enabled
+  - **Priority**: Low
+  - **Description**: Check if population replication feature is enabled
+
+- `POST /api/v1/exploration-populations` - Create/update population
+  - **Priority**: High
+  - **Description**: Create or update exploration population
+
+- `GET /api/v1/exploration-populations` - Get all populations
+  - **Priority**: High
+  - **Description**: Retrieve all exploration populations
+
+- `PUT /api/v1/exploration-populations/{populationId}` - Update population
+  - **Priority**: High
+  - **Description**: Update exploration population
+
+- `POST /api/v1/exploration-populations/{populationId}/opportunities` - Create opportunity from population
+  - **Priority**: High
+  - **Description**: Create opportunity from exploration population
+
+### 17. Filters 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/filters/cost-driver-filters` - Get cost driver filters
+  - **Priority**: High
+  - **Description**: Retrieve cost driver filter options
+
+- `GET /api/v1/filters/supply-filters` - Get supply filters
+  - **Priority**: High
+  - **Description**: Retrieve supply filter options
+
+- `GET /api/v1/filters/cost-component-filters` - Get cost component filters
+  - **Priority**: High
+  - **Description**: Retrieve cost component filter options
+
+- `GET /api/v1/filters/sph-criteria-filters/{chipKey}` - Get SPH criteria filters
+  - **Priority**: Medium
+  - **Description**: Retrieve SPH criteria filter options by chip key
+
+### 18. FreeFormOpportunities 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `DELETE /api/v1/free-form-opportunities/{id}/delete` - Delete opportunity
+  - **Priority**: High
+  - **Description**: Delete a free form opportunity
+
+- `PUT /api/v1/free-form-opportunities/{opportunityGuid}/update-values` - Update values
+  - **Priority**: High
+  - **Description**: Update monthly values for free form opportunity
+
+- `PUT /api/v1/free-form-opportunities/{opportunityGuid}/set-hidden` - Set hidden status
+  - **Priority**: Medium
+  - **Description**: Hide or show free form opportunity
+
+### 19. GeneralLedgerDetails 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `POST /api/v1/general-ledger-details/{configurationGuid}/department-data` - Get department data
+  - **Priority**: High
+  - **Description**: Retrieve general ledger department data
+
+- `POST /api/v1/general-ledger-details/{configurationGuid}/statistic-data` - Get statistic data
+  - **Priority**: High
+  - **Description**: Retrieve general ledger statistic data
+
+### 20. GeneralLedgerOpportunities 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `POST /api/v1/general-ledger-opportunities/export` - Export opportunities
+  - **Priority**: Medium
+  - **Description**: Export general ledger opportunities
+
+- `GET /api/v1/general-ledger-opportunities/{configurationGuid}/filter-options` - Get filter options
+  - **Priority**: High
+  - **Description**: Retrieve available filter options
+
+- `GET /api/v1/general-ledger-opportunities/{opportunityGuid}` - Get opportunity by ID
+  - **Priority**: High
+  - **Description**: Retrieve specific general ledger opportunity
+
+- `POST /api/v1/general-ledger-opportunities/create` - Create opportunity
+  - **Priority**: High
+  - **Description**: Create new general ledger opportunity
+
+- `PUT /api/v1/general-ledger-opportunities/{opportunityGuid}/update` - Update opportunity
+  - **Priority**: High
+  - **Description**: Update general ledger opportunity
+
+- `DELETE /api/v1/general-ledger-opportunities/{id}/delete` - Delete opportunity
+  - **Priority**: High
+  - **Description**: Delete a general ledger opportunity
+
+- `PUT /api/v1/general-ledger-opportunities/{opportunityGuid}/set-hidden` - Set hidden status
+  - **Priority**: Medium
+  - **Description**: Hide or show general ledger opportunity
+
+- `PUT /api/v1/general-ledger-opportunities/{opportunityGuid}/set-note` - Set note
+  - **Priority**: Medium
+  - **Description**: Add or update note
+
+### 21. GMDNFileUpload 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `POST /api/v1/gmdnfile-upload/{fileType}/upload-gmdnfile` - Upload GMDN file
+  - **Priority**: Medium
+  - **Description**: Upload GMDN (Global Medical Device Nomenclature) file
+
+### 22. GudidFile 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `POST /api/v1/gudid-file/{dataGroup}/seed-gudid` - Seed GUDID data
+  - **Priority**: Medium
+  - **Description**: Seed GUDID (Global Unique Device Identification) data
+
+- `GET /api/v1/hangfire/access-gudid-url` - Get GUDID access URL
+  - **Priority**: Low
+  - **Description**: Retrieve URL for accessing GUDID
+
+### 23. Hangfire 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/hangfire/{jobId}/job-status` - Get job status
+  - **Priority**: High
+  - **Description**: Get Hangfire background job status
+
+- `GET /api/v1/hangfire/datadog-url` - Get Datadog URL
+  - **Priority**: Low
+  - **Description**: Retrieve Datadog monitoring URL
+
+### 24. InitiativeDetailColumns 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/initiative-detail-columns/column-list` - Get column list
+  - **Priority**: Medium
+  - **Description**: Retrieve list of initiative detail columns
+
+### 25. InitiativeRollupColumns 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/initiative-rollup-columns` - Get all rollup columns
+  - **Priority**: Medium
+  - **Description**: Retrieve all initiative rollup columns
+
+- `POST /api/v1/initiative-rollup-columns` - Create rollup column
+  - **Priority**: Medium
+  - **Description**: Create new initiative rollup column
+
+- `GET /api/v1/initiative-rollup-columns/{initiativeRollupColumnId}` - Get rollup column
+  - **Priority**: Medium
+  - **Description**: Retrieve specific rollup column
+
+- `PUT /api/v1/initiative-rollup-columns/{initiativeRollupColumnId}` - Update rollup column
+  - **Priority**: Medium
+  - **Description**: Update initiative rollup column
+
+- `DELETE /api/v1/initiative-rollup-columns/{initiativeRollupColumnId}` - Delete rollup column
+  - **Priority**: Medium
+  - **Description**: Delete initiative rollup column
+
+- `POST /api/v1/initiative-rollup-columns/is-name-valid/{initiativeRollupColumnId}` - Validate name
+  - **Priority**: Low
+  - **Description**: Check if rollup column name is valid
+
+- `GET /api/v1/initiative-rollup-columns/{initiativeRollupColumnId}/values` - Get rollup values
+  - **Priority**: Medium
+  - **Description**: Retrieve values for rollup column
+
+- `POST /api/v1/initiative-rollup-columns/{initiativeRollupColumnId}/values` - Create rollup value
+  - **Priority**: Medium
+  - **Description**: Create new rollup value
+
+- `PUT /api/v1/initiative-rollup-columns/{initiativeRollupColumnId}/values/{initiativeRollupValueId}` - Update value
+  - **Priority**: Medium
+  - **Description**: Update rollup value
+
+- `DELETE /api/v1/initiative-rollup-columns/{initiativeRollupColumnId}/values/{initiativeRollupValueId}` - Delete value
+  - **Priority**: Medium
+  - **Description**: Delete rollup value
+
+### 26. Initiatives 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `PUT /api/v1/initiatives/set-rampup-info` - Set rampup information
+  - **Priority**: High
+  - **Description**: Update initiative rampup details
+
+- `POST /api/v1/initiatives/create-payroll` - Create payroll initiative
+  - **Priority**: High
+  - **Description**: Create new payroll initiative
+
+- `PUT /api/v1/initiatives/update-payroll` - Update payroll initiative
+  - **Priority**: High
+  - **Description**: Update payroll initiative
+
+- `PUT /api/v1/initiatives/update-free-form` - Update free form initiative
+  - **Priority**: High
+  - **Description**: Update free form initiative
+
+- `PUT /api/v1/initiatives/update-general-ledger` - Update GL initiative
+  - **Priority**: High
+  - **Description**: Update general ledger initiative
+
+- `GET /api/v1/initiatives/filter-settings` - Get filter settings
+  - **Priority**: Medium
+  - **Description**: Retrieve current initiative filter settings
+
+- `POST /api/v1/initiatives/set-filter-settings` - Set filter settings
+  - **Priority**: Medium
+  - **Description**: Update initiative filter settings
+
+- `GET /api/v1/initiatives/opportunity-guid-by-name` - Get opportunity GUID by name
+  - **Priority**: Low
+  - **Description**: Look up opportunity GUID by name
+
+### 27. MappedColumns 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `POST /api/v1/mapped-columns/set-column-list` - Set column list
+  - **Priority**: Medium
+  - **Description**: Update mapped column list for configuration
+
+### 28. NetworkOpportunities 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/network-opportunities/enabled` - Check if enabled
+  - **Priority**: Low
+  - **Description**: Check if network opportunities feature is enabled
+
+- `GET /api/v1/network-opportunities/is-creator` - Check if user is creator
+  - **Priority**: Low
+  - **Description**: Check if current user can create network opportunities
+
+- `POST /api/v1/network-opportunities/opportunities` - Load opportunities
+  - **Priority**: High
+  - **Description**: Load network opportunities with filters
+
+- `POST /api/v1/network-opportunities/create` - Create opportunity
+  - **Priority**: High
+  - **Description**: Create new network opportunity
+
+- `PUT /api/v1/network-opportunities/{networkOpportunityId}` - Update opportunity
+  - **Priority**: High
+  - **Description**: Update network opportunity
+
+- `DELETE /api/v1/network-opportunities/{networkOpportunityId}` - Delete opportunity
+  - **Priority**: High
+  - **Description**: Delete network opportunity
+
+### 29. OpportunityWorkbooks 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `POST /api/v1/opportunity-workbooks` - Create/update workbook association
+  - **Priority**: Medium
+  - **Description**: Associate workbooks with opportunities
+
+- `GET /api/v1/opportunity-workbooks/{opportunityGuid}` - Get workbooks for opportunity
+  - **Priority**: Medium
+  - **Description**: Retrieve workbooks associated with opportunity
+
+- `GET /api/v1/opportunity-workbooks/strategic/{opportunityId}` - Get strategic workbooks
+  - **Priority**: Medium
+  - **Description**: Retrieve workbooks for strategic opportunity
+
+- `DELETE /api/v1/opportunity-workbooks/strategic/{opportunityId}/workbook/{workbookId}` - Delete workbook
+  - **Priority**: Medium
+  - **Description**: Remove workbook association
+
+- `GET /api/v1/opportunity-workbooks/opportunity-workbooks-enabled` - Check if enabled
+  - **Priority**: Low
+  - **Description**: Check if opportunity workbooks feature is enabled
+
+### 30. PayrollOpportunities 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `POST /api/v1/payroll-opportunities/export` - Export opportunities
+  - **Priority**: Medium
+  - **Description**: Export payroll opportunities
+
+- `POST /api/v1/payroll-opportunities/create` - Create opportunity
+  - **Priority**: High
+  - **Description**: Create new payroll opportunity
+
+- `DELETE /api/v1/payroll-opportunities/{id}/delete` - Delete opportunity
+  - **Priority**: High
+  - **Description**: Delete payroll opportunity
+
+- `GET /api/v1/payroll-opportunities/{opportunityGuid}` - Get opportunity by ID
+  - **Priority**: High
+  - **Description**: Retrieve specific payroll opportunity
+
+- `PUT /api/v1/payroll-opportunities/{opportunityGuid}/update` - Update opportunity
+  - **Priority**: High
+  - **Description**: Update payroll opportunity
+
+- `GET /api/v1/payroll-opportunities/{opportunityGuid}/initiative-info` - Get initiative info
+  - **Priority**: Medium
+  - **Description**: Get associated initiative information
+
+- `GET /api/v1/payroll-opportunities/tempo-page-enabled` - Check if tempo page enabled
+  - **Priority**: Low
+  - **Description**: Check if tempo page feature is enabled
+
+- `GET /api/v1/payroll-opportunities/{configurationGuid}/filter-options` - Get filter options
+  - **Priority**: High
+  - **Description**: Retrieve available filter options
+
+- `PUT /api/v1/payroll-opportunities/{opportunityGuid}/set-hidden` - Set hidden status
+  - **Priority**: Medium
+  - **Description**: Hide or show payroll opportunity
+
+- `PUT /api/v1/payroll-opportunities/{opportunityGuid}/set-note` - Set note
+  - **Priority**: Medium
+  - **Description**: Add or update note
+
+### 31. PeerGroup 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/peer-group` - Get all peer groups
+  - **Priority**: Medium
+  - **Description**: Retrieve all peer groups
+
+- `POST /api/v1/peer-group` - Create peer group
+  - **Priority**: Medium
+  - **Description**: Create new peer group
+
+- `GET /api/v1/peer-group/{peerGroupId}` - Get peer group by ID
+  - **Priority**: Medium
+  - **Description**: Retrieve specific peer group
+
+- `PUT /api/v1/peer-group/{peerGroupId}` - Update peer group
+  - **Priority**: Medium
+  - **Description**: Update peer group
+
+- `DELETE /api/v1/peer-group/{peerGroupId}` - Delete peer group
+  - **Priority**: Medium
+  - **Description**: Delete peer group
+
+- `POST /api/v1/peer-group/is-name-valid/{peerGroupId}` - Validate name
+  - **Priority**: Low
+  - **Description**: Check if peer group name is valid
+
+### 32. QualityVariationItemOpportunities 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `PUT /api/v1/quality-variation-item-opportunities/{opportunityGuid}/set-hidden` - Set hidden status
+  - **Priority**: Medium
+  - **Description**: Hide or show quality variation item opportunity
+
+- `PUT /api/v1/quality-variation-item-opportunities/{opportunityGuid}/set-note` - Set note
+  - **Priority**: Medium
+  - **Description**: Add or update note
+
+### 33. Security 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/security/{lootId}` - Get security permissions
+  - **Priority**: High
+  - **Description**: Retrieve security permissions for resource
+
+- `GET /api/v1/security/identities` - Get identities
+  - **Priority**: Medium
+  - **Description**: Retrieve all identity information
+
+- `POST /api/v1/security/{lootId}/simple-securities` - Update simple securities
+  - **Priority**: High
+  - **Description**: Update simple security permissions
+
+### 34. StrategicOpportunity 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/strategic-opportunity` - Get all strategic opportunities
+  - **Priority**: High
+  - **Description**: Retrieve all strategic opportunities
+
+- `POST /api/v1/strategic-opportunity/charge-code` - Create charge code opportunity
+  - **Priority**: High
+  - **Description**: Create strategic charge code opportunity
+
+- `GET /api/v1/strategic-opportunity/{opportunityId}` - Get opportunity by ID
+  - **Priority**: High
+  - **Description**: Retrieve specific strategic opportunity
+
+- `PUT /api/v1/strategic-opportunity/{opportunityId}` - Update opportunity
+  - **Priority**: High
+  - **Description**: Update strategic opportunity
+
+- `DELETE /api/v1/strategic-opportunity/{opportunityId}` - Delete opportunity
+  - **Priority**: High
+  - **Description**: Delete strategic opportunity
+
+- `POST /api/v1/strategic-opportunity/is-name-valid` - Validate name
+  - **Priority**: Low
+  - **Description**: Check if opportunity name is valid
+
+- `GET /api/v1/strategic-opportunity/{opportunityId}/layout` - Get opportunity layout
+  - **Priority**: Medium
+  - **Description**: Retrieve layout information for opportunity
+
+- `PUT /api/v1/strategic-opportunity/{opportunityId}/rampup` - Update rampup
+  - **Priority**: High
+  - **Description**: Update rampup schedule
+
+- `GET /api/v1/strategic-opportunity/{opportunityId}/rampup` - Get rampup
+  - **Priority**: Medium
+  - **Description**: Retrieve rampup schedule
+
+- `PUT /api/v1/strategic-opportunity/{opportunityId}/details` - Update details
+  - **Priority**: High
+  - **Description**: Update opportunity details
+
+### 35. StrategicOpportunitySecurity 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/strategic-opportunity-security/{lootId}` - Get security permissions
+  - **Priority**: High
+  - **Description**: Retrieve security permissions for strategic opportunity
+
+- `GET /api/v1/strategic-opportunity-security/{lootId}/simple-securities` - Get simple securities
+  - **Priority**: Medium
+  - **Description**: Retrieve simple security settings
+
+- `POST /api/v1/strategic-opportunity-security/{lootId}/simple-securities` - Update securities
+  - **Priority**: High
+  - **Description**: Update simple security settings
+
+### 36. Users 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/users/all-ci-users` - Get all CI users
+  - **Priority**: High
+  - **Description**: Retrieve all Continuous Improvement users
+
+### 37. UserSettings 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/user-settings/{userGuid}` - Get user settings
+  - **Priority**: Medium
+  - **Description**: Retrieve user-specific settings
+
+- `POST /api/v1/user-settings` - Create/update user settings
+  - **Priority**: Medium
+  - **Description**: Create or update user settings
+
+### 38. UtilizationVariation 🔴 NO COVERAGE
+
+#### Missing Tests:
+- `POST /api/v1/utilization-variation/all-charge-info` - Get all charge info
+  - **Priority**: High
+  - **Description**: Retrieve all charge information for utilization variation
+
+- `POST /api/v1/utilization-variation/charge-info` - Get charge info
+  - **Priority**: High
+  - **Description**: Retrieve specific charge information
+
+### 39. VariationCaseTypes 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/variation-case-types/{configurationGuid}/filter-options` - Get filter options
+  - **Priority**: High
+  - **Description**: Retrieve available filter options
+
+### 40. VariationOpportunities 🔴 PARTIAL COVERAGE
+
+#### Missing Tests:
+- `GET /api/v1/variation-opportunities/{configurationGuid}/filter-options` - Get filter options
+  - **Priority**: High
+  - **Description**: Retrieve available filter options
+
+- `PUT /api/v1/variation-opportunities/{opportunityGuid}/set-hidden` - Set hidden status
+  - **Priority**: Medium
+  - **Description**: Hide or show variation opportunity
+
+- `PUT /api/v1/variation-opportunities/{opportunityGuid}/set-note` - Set note
+  - **Priority**: Medium
+  - **Description**: Add or update note
+
+---
+
+## Recommended Testing Priorities
+
+### Phase 1: Critical Business Operations (High Priority)
+Focus on core CRUD operations and data retrieval endpoints that are essential for daily operations:
+
+1. **Client Network Opportunities** - Complete missing CRUD operations
+2. **Encounter Opportunities** - Add update, filter, and export tests
+3. **General Ledger Opportunities** - Add CRUD and filter tests
+4. **Payroll Opportunities** - Add CRUD and filter tests
+5. **Free Form Opportunities** - Complete delete and update tests
+6. **Strategic Opportunities** - Add full CRUD coverage
+7. **Exploration Opportunities** - Add complete endpoint coverage
+8. **Network Opportunities** - Add full CRUD coverage
+
+### Phase 2: Supporting Features (Medium Priority)
+Add tests for supplementary features that enhance functionality:
+
+1. **Filters** - Cost drivers, supplies, cost components
+2. **Comments** - Get and create operations
+3. **Configurations** - Entity and service line information
+4. **Peer Groups** - Full CRUD operations
+5. **Workbooks** - Association and management
+6. **Initiative Rollup Columns** - Management operations
+7. **User Settings** - Get and update operations
+
+### Phase 3: Administrative & Utilities (Low Priority)
+Add tests for admin and housekeeping operations:
+
+1. **Security** - Permission management
+2. **GMDN File Upload** - File processing
+3. **Feature Flags** - Configuration checks
+4. **Job Status Monitoring** - Background job tracking
+
+---
+
+## Testing Strategy Recommendations
+
+### 1. Test Organization
+- Group tests by controller/feature area
+- Use descriptive test names that indicate the operation being tested
+- Include both positive and negative test cases
+
+### 2. Test Data Management
+- Use consistent test data generators
+- Implement proper cleanup after tests
+- Consider test isolation to prevent interdependencies
+
+### 3. Coverage Metrics
+- Aim for 90%+ endpoint coverage
+- Track method coverage (GET, POST, PUT, DELETE)
+- Monitor response status coverage (200, 400, 404, etc.)
+
+### 4. Continuous Integration
+- Run tests on every pull request
+- Generate coverage reports automatically
+- Block merges for critical endpoint test failures
+
+---
+
+## Appendix: Quick Reference
+
+### Endpoints by HTTP Method
+
+**GET Endpoints Missing Tests**: ~60  
+**POST Endpoints Missing Tests**: ~25  
+**PUT Endpoints Missing Tests**: ~20  
+**DELETE Endpoints Missing Tests**: ~10
+
+### Controllers with No Coverage
+- Comments
+- Configurations
+- Databases
+- ExplorationOpportunities
+- Filters
+- GeneralLedgerDetails
+- GMDNFileUpload
+- InitiativeDetailColumns
+- InitiativeRollupColumns
+- NetworkOpportunities
+- OpportunityWorkbooks
+- PeerGroup
+- StrategicOpportunitySecurity
+- UserSettings
+- UtilizationVariation
+
+### Controllers with Partial Coverage
+Most controllers have partial coverage and need additional tests for:
+- Update operations
+- Delete operations
+- Filter/search operations
+- Export functionality
+- Status management (set-hidden, set-note)
+
+---
+
+**Last Updated**: December 9, 2025  
+**Document Version**: 1.0  
+**Contact**: Development Team
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/documentation/PLAYWRIGHT_CONFIG_ARCHITECTURE.md b/src/Strata.ContinuousImprovement.Web/e2e/documentation/PLAYWRIGHT_CONFIG_ARCHITECTURE.md
new file mode 100644
index 0000000..d025536
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/documentation/PLAYWRIGHT_CONFIG_ARCHITECTURE.md
@@ -0,0 +1,242 @@
+# Playwright Configuration Architecture
+
+This document describes the deduplicated Playwright configuration system that eliminates code duplication while maintaining environment-specific configurations.
+
+## Overview
+
+The Playwright configuration has been refactored to use a shared configuration module that provides common functionality while preserving environment-specific differences. This approach eliminates ~80% of the code duplication between configuration files.
+
+## File Structure
+
+```
+e2e/
+├── playwright.config.ts                 # Remote/CI configuration (uses shared)
+├── playwright.config.local.ts           # Local development configuration (uses shared)
+├── playwright.config.smokeTest.ts       # Smoke Test development configuration (uses shared)
+├── playwright.config.shared.ts          # Shared configuration module (NEW)
+└── auth/
+    └── ApiRequestOptions.ts
+```
+
+## Architecture Components
+
+### 1. Shared Configuration Module (`playwright.config.shared.ts`)
+
+The shared module provides:
+
+- **Environment Types**: `EnvironmentType.LOCAL` and `EnvironmentType.REMOTE`
+- **Configuration Factory**: `createPlaywrightConfig()` function
+- **Project Templates**: Standardized project definitions for all browsers
+- **Environment Configs**: Pre-defined settings for each environment
+- **Utility Functions**: Helper functions for configuration generation
+
+### 2. Environment-Specific Files
+
+Both `playwright.config.ts`, `playwright.config.local.ts`, `playwright.config.smokeTest.ts` now use the shared factory:
+
+```typescript
+import { createPlaywrightConfig, EnvironmentType } from './playwright.config.shared';
+
+export default createPlaywrightConfig(EnvironmentType.REMOTE);
+// or
+export default createPlaywrightConfig(EnvironmentType.LOCAL);
+// or
+export default createPlaywrightConfig(EnvironmentType.SMOKE_TEST);
+```
+
+## Key Features
+
+### Eliminated Duplication
+
+**Before (160+ lines per file):**
+- Duplicate project definitions
+- Duplicate baseConfig objects
+- Duplicate browser configurations
+- Duplicate timeout/test directory settings
+
+**After (~15 lines per file):**
+- Single import and factory call
+- Environment-specific documentation
+- All common functionality shared
+
+### Environment Configurations
+
+| Setting | Local | Remote | Staging |
+|---------|-------|--------|
+| Base URL | `http://localhost:3000/` | `https://continuousimprovement.dev.stratanetwork.net/` | `https://app-dr.stratanetwork.com/continuousimprovement/` | 
+| API URL | `http://localhost:8443/api/v1/` | `https://continuousimprovement-api.dev.stratanetwork.net/api/v1/` | `https://continuousimprovement-api.qa.stratanetwork.net/api` | 
+| Retries | 1 | 4 (in CI) | 4 (in CI) | 
+| Web Server | Auto-start React app | None (assumes deployed) | None (assumes deployed) | 
+
+### Project Templates
+
+All browser configurations are standardized:
+
+- **auth-setup**: Authentication setup project
+- **chromium-ui**: Chrome UI tests
+- **firefox-ui**: Firefox UI tests  
+- **webkit-ui**: Safari UI tests
+- **chromium-api**: Chrome API tests
+- **chromium-swagger**: Chrome Swagger tests
+- **Microsoft Edge**: Edge UI tests
+
+## Usage Examples
+
+### Basic Usage
+
+```bash
+# Remote/CI execution (default)
+npx playwright test
+
+# Local development
+npx playwright test --config=playwright.config.local.ts
+
+# Dry-run mode (any environment)
+DRY_RUN=true npx playwright test --config=playwright.config.local.ts
+```
+
+### Custom Configuration
+
+You can still override settings by passing options to the factory:
+
+```typescript
+import { createPlaywrightConfig, EnvironmentType } from './playwright.config.shared';
+
+export default createPlaywrightConfig(EnvironmentType.LOCAL, {
+  timeout: 30_000,
+  reporter: 'json',
+  use: {
+    // Custom settings
+    headless: false
+  }
+});
+```
+
+### Adding New Environments
+
+To add a new environment (e.g., staging):
+
+1. Add to `EnvironmentType` enum:
+   ```typescript
+   export enum EnvironmentType {
+     LOCAL = 'local',
+     REMOTE = 'remote',
+     STAGING = 'staging'  // NEW
+   }
+   ```
+
+2. Add configuration to `ENVIRONMENT_CONFIGS`:
+   ```typescript
+   [EnvironmentType.STAGING]: {
+     baseURL: 'https://continuousimprovement-staging.stratanetwork.net/',
+     apiURL: 'https://continuousimprovement-api-staging.stratanetwork.net/api/v1/',
+     retries: 2
+   }
+   ```
+
+3. Create new config file:
+   ```typescript
+   // playwright.config.staging.ts
+   export default createPlaywrightConfig(EnvironmentType.STAGING);
+```
+
+## Benefits
+
+### 1. **Maintainability**
+- Single source of truth for common configurations
+- Changes propagate to all environments automatically
+- Reduced chance of configuration drift
+
+### 2. **Consistency** 
+- Identical project structures across environments
+- Standardized browser configurations
+- Consistent timeout and test directory settings
+
+### 3. **Extensibility**
+- Easy to add new environments
+- Simple to modify project templates
+- Override capability for special cases
+
+### 4. **Documentation**
+- Auto-generated environment documentation
+- Clear separation of concerns
+- Comprehensive TypeScript types
+
+## Migration Guide
+
+### Before (Duplicated Configuration)
+```typescript
+// playwright.config.ts - 160+ lines
+export default defineConfig<ApiRequestOptions>({
+  timeout: 60_000,
+  testDir: './tests',
+  // ... many duplicate settings
+  projects: [
+    { name: 'chromium-ui', /* ... */ },
+    { name: 'firefox-ui', /* ... */ },
+    // ... duplicate project definitions
+  ]
+});
+```
+
+### After (Shared Configuration)
+```typescript
+// playwright.config.ts - 15 lines
+import { createPlaywrightConfig, EnvironmentType } from './playwright.config.shared';
+
+export default createPlaywrightConfig(EnvironmentType.REMOTE);
+```
+
+## Validation
+
+To verify the configuration works correctly:
+
+```bash
+# Check configuration validation
+npx playwright test --list --config=playwright.config.ts
+npx playwright test --list --config=playwright.config.local.ts
+
+# Run tests to verify functionality
+DRY_RUN=true npx playwright test --config=playwright.config.local.ts
+```
+
+## Future Enhancements
+
+1. **Configuration Validation**: Add runtime validation of environment settings
+2. **Dynamic Environments**: Support for environment variables in configuration
+3. **Plugin System**: Extensible plugin architecture for custom project types
+4. **Performance Metrics**: Built-in performance monitoring configuration
+
+## Troubleshooting
+
+### Common Issues
+
+1. **Import Errors**: Ensure the shared module path is correct
+2. **Type Errors**: Verify ApiRequestOptions interface is properly imported
+3. **Missing Projects**: Check that all required project templates are defined
+
+### Debug Commands
+
+```bash
+# Validate configuration syntax
+npx tsc --noEmit playwright.config.ts
+
+# List all available tests
+npx playwright test --list
+
+# Show configuration details
+npx playwright show-config
+```
+
+## Support
+
+For questions or issues with the configuration system:
+
+1. Check the TypeScript compilation for errors
+2. Verify all imports are resolved correctly  
+3. Review the shared module documentation
+4. Test with dry-run mode to validate setup
+
+---
+
+*This architecture provides a scalable, maintainable foundation for Playwright test configuration management across multiple environments.*
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/documentation/PLAYWRIGHT_WORK.md b/src/Strata.ContinuousImprovement.Web/e2e/documentation/PLAYWRIGHT_WORK.md
new file mode 100644
index 0000000..10b40bb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/documentation/PLAYWRIGHT_WORK.md
@@ -0,0 +1,1618 @@
+# Playwright Architecture & Configuration Comparison
+
+**Document Purpose**: Compare Playwright E2E architecture between Continuous Improvement and RxNorm projects
+
+**Date Created**: December 16, 2025
+
+---
+
+## Executive Summary
+
+This document provides a comprehensive analysis of the Continuous Improvement E2E Playwright architecture and serves as a comparison template for the RxNorm E2E implementation. 
+
+### Key Architecture Features (Continuous Improvement)
+- **Shared Configuration Pattern**: Eliminates 80% code duplication using factory pattern
+- **Multi-Environment Support**: Local, Remote (Dev), Staging, Smoke Test configurations
+- **Advanced Authentication**: JWT-based authentication setup with multiple user support
+- **Comprehensive Test Coverage**: API, UI, Swagger, and Localization test suites
+- **Modern Tooling**: ESLint, Prettier, TypeScript with strict type checking
+
+---
+
+## 1. Configuration Architecture
+
+### 1.1 Continuous Improvement Configuration Pattern
+
+#### File Structure
+```
+e2e/
+├── playwright.config.ts              # Remote/CI config (12 lines)
+├── playwright.config.local.ts        # Local dev config (12 lines)
+├── playwright.config.smokeTest.ts    # Smoke test config (12 lines)
+├── playwright.config.staging.ts      # Staging config (12 lines)
+├── playwright.config.legacy.ts       # Legacy/backup config
+├── playwright.config.shared.ts       # Shared factory (208 lines)
+└── PLAYWRIGHT_CONFIG_ARCHITECTURE.md # Architecture documentation
+```
+
+#### Configuration Factory Pattern
+
+**Shared Module (`playwright.config.shared.ts`)**:
+- **EnvironmentType Enum**: Defines 4 environment types (LOCAL, REMOTE, SMOKE_TEST, STAGING)
+- **ENVIRONMENT_CONFIGS Object**: Environment-specific settings
+- **createPlaywrightConfig()**: Factory function for generating configurations
+- **createProjectConfigs()**: Project template generator
+- **BASE_CONFIG**: Common settings across all environments
+
+**Key Features**:
+1. **Single Source of Truth**: All common configurations centralized
+2. **Type Safety**: Full TypeScript support with `ApiRequestOptions` interface
+3. **DRY_RUN Mode**: Special mode for fast configuration validation
+4. **Console Logging**: Detailed configuration output on startup
+5. **Override Support**: Optional parameter for configuration customization
+
+#### Environment Configurations
+
+| Configuration | LOCAL | REMOTE (Dev) | STAGING/SMOKE_TEST |
+|---------------|-------|--------------|---------------------|
+| **Base URL** | `http://localhost:3000/continuousimprovement` | `https://continuousimprovement.dev.stratanetwork.net/continuousimprovement` | `https://app-dr.stratanetwork.com/continuousimprovement/` |
+| **API URL** | `https://localhost:8443/api` | `https://continuousimprovement-api.dev.stratanetwork.net/api` | `https://continuousimprovement-api.qa.stratanetwork.net/api` |
+| **Node Env** | `localhost` | `development` | `qa` |
+| **Retries** | 1 (2 in CI) | 1 (4 in CI) | 1 (4 in CI) |
+| **Web Server** | Auto-starts React app | None | None |
+| **Web Server Command** | `cd ../continuousimprovement && npm run start` | N/A | N/A |
+| **Web Server URL** | `http://localhost:3000` | N/A | N/A |
+
+#### Usage Examples
+```typescript
+// playwright.config.ts
+import { createPlaywrightConfig, EnvironmentType } from './playwright.config.shared';
+export default createPlaywrightConfig(EnvironmentType.REMOTE);
+
+// With overrides
+export default createPlaywrightConfig(EnvironmentType.LOCAL, {
+  timeout: 30_000,
+  reporter: 'json'
+});
+```
+
+**Command Line Usage**:
+```bash
+# Remote/CI (default)
+npx playwright test
+
+# Local development
+npx playwright test --config=playwright.config.local.ts
+
+# Staging
+npx playwright test --config=playwright.config.staging.ts
+
+# Dry-run mode (fast validation)
+DRY_RUN=true npx playwright test --config=playwright.config.local.ts
+```
+
+### 1.2 RxNorm Configuration Pattern
+
+#### File Structure
+```
+e2e/
+├── playwright.config.ts              # Remote/CI config (60 lines with extensive JSDoc)
+├── playwright.config.local.ts        # Local dev config (60 lines with extensive JSDoc)
+├── playwright.config.shared.ts       # Shared factory (376 lines)
+├── PLAYWRIGHT_CONFIG_ARCHITECTURE.md # Architecture documentation
+├── CONFIGURATION.md                  # Usage guide
+├── DRY_RUN_GUIDE.md                 # Dry-run documentation
+└── API_VALIDATION_GUIDE.md          # API validation documentation
+```
+
+#### Configuration Approach
+- ✅ **Uses shared configuration pattern**: Yes (similar to CI)
+- **Number of environment configurations**: 2 (LOCAL, REMOTE)
+- **Configuration file size**: 60 lines each (vs. 12 lines in CI) - includes extensive JSDoc
+- ✅ **Factory pattern implementation**: Yes - `createPlaywrightConfig()` function
+- **Shared module size**: 376 lines (vs. 208 lines in CI)
+- **Documentation files**: 4 dedicated MD files vs. 1 in CI
+
+#### Environment Configurations
+
+| Configuration | LOCAL | REMOTE (Dev) |
+|---------------|-------|-------------|
+| **Base URL** | `http://localhost:3000/` | `https://rxnorm.dev.stratanetwork.net/` |
+| **API URL** | `http://localhost:8443/api/v1/` | `https://rxnorm-api.dev.stratanetwork.net/api/v1/` |
+| **Retries** | 1 | 1 (4 in CI) |
+| **Web Server** | Auto-starts React app | None |
+| **Web Server Command** | `npm run start` | N/A |
+| **Web Server URL** | `http://localhost:3000` | N/A |
+| **Web Server Timeout** | 120 seconds | N/A |
+| **Web Server CWD** | `../rxnorm` | N/A |
+
+**Key Differences from CI**:
+- **Simpler paths**: No `/rxnorm` or `/continuousimprovement` in URLs
+- **Global setup**: Uses `global.setup.ts` (not present in CI)
+- **More extensive JSDoc**: 60-line config files vs. 12 lines
+- **Additional scripts**: `check-api.mjs` for API health checks
+- **NPM pretest hooks**: `pretest-local` runs API checks automatically
+
+---
+
+## 2. Project Structure & Test Organization
+
+### 2.1 Continuous Improvement Structure
+
+#### Project Definitions (12 total)
+
+**Setup Project**:
+- `auth-setup`: Authentication setup for all users
+
+**API Test Projects** (3 browsers):
+- `chromium-api`: Chrome API tests
+- `firefox-api`: Firefox API tests  
+- `webkit-api`: Safari API tests
+
+**Swagger Test Projects** (1 browser):
+- `chromium-swagger`: Swagger/OpenAPI endpoint tests
+
+**UI Test Projects** (4 browsers):
+- `chromium-ui`: Chrome UI tests
+- `firefox-ui`: Firefox UI tests
+- `webkit-ui`: Safari UI tests
+- `Microsoft Edge`: Edge browser UI tests
+
+**Localization Test Projects** (3 browsers - en-GB/London timezone):
+- `chromium-ui-GB`: Chrome localization tests
+- `firefox-ui-GB`: Firefox localization tests
+- `webkit-ui-GB`: Safari localization tests
+
+#### Test Directory Organization
+```
+tests/
+├── api/                          # API endpoint tests
+│   ├── client-warehouses.spec.ts
+│   ├── configurations.spec.ts
+│   ├── initiatives.spec.ts
+│   ├── opportunities-create.spec.ts
+│   ├── opportunities.spec.ts
+│   ├── security.spec.ts
+│   ├── users.spec.ts
+│   └── utilization-variation-opportunities.spec.ts
+├── swagger/                      # Swagger/OpenAPI tests (34 files)
+│   ├── all-opportunities.spec.ts
+│   ├── charge-code-opportunities.spec.ts
+│   ├── encounter-opportunities.spec.ts
+│   ├── free-form-opportunities.spec.ts
+│   ├── MISSING_SWAGGER_TESTS.md
+│   └── helpers/
+│       └── swaggerUtils.ts
+├── localization/                 # Internationalization tests
+│   ├── client-warehouse-page.spec.ts
+│   └── opportunities-pages.spec.ts
+├── ui/                          # UI/E2E tests
+└── helpers/                     # Test utilities
+    ├── globalTestUtils.ts
+    └── OpportunityPageTestConfig.ts
+```
+
+#### Base Configuration Settings
+```typescript
+{
+  timeout: 60_000,              // 60 second timeout
+  testDir: './tests',           // Root test directory
+  fullyParallel: true,          // Parallel execution enabled
+  forbidOnly: !!process.env.CI, // Prevent test.only in CI
+  workers: process.env.CI ? 1 : undefined, // Single worker in CI
+  reporter: 'html',             // HTML reporter
+  use: {
+    trace: 'on-first-retry'     // Trace on first retry only
+  }
+}
+```
+
+### 2.2 RxNorm Structure
+
+#### Project Definitions (8 total)
+
+**Setup Project**:
+- `auth-setup`: Authentication setup for all users
+
+**API Test Projects** (3 browsers):
+- `chromium-api`: Chrome API tests
+- `firefox-api`: Firefox API tests
+- `webkit-api`: Safari API tests
+
+**Swagger Test Projects** (1 browser):
+- `chromium-swagger`: Swagger/OpenAPI endpoint tests
+
+**UI Test Projects** (4 browsers):
+- `chromium-ui`: Chrome UI tests
+- `firefox-ui`: Firefox UI tests
+- `webkit-ui`: Safari UI tests
+- `Microsoft Edge`: Edge browser UI tests
+
+**No Localization Projects**: Unlike CI (which has 3 localization projects)
+
+#### Test Directory Organization
+```
+tests/
+├── api/                          # API endpoint tests (6 files)
+│   ├── apiTestSuite.api.spec.ts
+│   ├── fileService.api.spec.ts
+│   ├── ndcService.api.spec.ts
+│   ├── pharmacyService.api.spec.ts
+│   ├── rxNormService.api.spec.ts
+│   ├── README.md
+│   └── helpers/
+├── swagger/                      # Swagger/OpenAPI tests (6 files)
+│   ├── swaggerApiSecurity.spec.ts
+│   ├── swaggerFilesController.spec.ts
+│   ├── swaggerNdcController.spec.ts
+│   ├── swaggerPharmacyController.spec.ts
+│   ├── swaggerRxNormController.spec.ts
+│   ├── MISSING_SWAGGER_TESTS.md
+│   ├── README.md
+│   └── helpers/
+├── ui/                          # UI/E2E tests (3 files)
+│   ├── rxnorm-dimensions-smoke.spec.ts
+│   ├── rxnorm-page.spec.ts
+│   ├── rxnorm-smoke.spec.ts
+│   └── helpers/
+├── global.setup.ts              # Global test setup
+└── helpers/                     # Shared test utilities
+```
+
+**Key Differences from CI**:
+- **Fewer tests overall**: 15 test files vs. 44+ in CI
+- **No localization tests**: CI has dedicated localization directory
+- **Simpler UI structure**: Only 3 UI test files vs. larger suite in CI
+- **Service-oriented API tests**: Tests organized by service (file, ndc, pharmacy, rxnorm)
+- **Global setup file**: RxNorm uses `global.setup.ts`, CI doesn't
+
+#### Base Configuration Settings
+```typescript
+{
+  timeout: 60_000,              // 60 second timeout (same as CI)
+  testDir: './tests',           // Root test directory (same as CI)
+  fullyParallel: true,          // Parallel execution enabled (same as CI)
+  forbidOnly: !!process.env.CI, // Prevent test.only in CI (same as CI)
+  retries: [varies by env],     // Environment-specific
+  reporter: 'html',             // HTML reporter (same as CI)
+  globalSetup: './tests/global.setup.ts', // RxNorm has this, CI doesn't
+  use: {
+    trace: 'on-first-retry'     // Trace on first retry only (same as CI)
+  }
+}
+```
+
+---
+
+## 3. Authentication Architecture
+
+### 3.1 Continuous Improvement Authentication
+
+#### File Structure
+```
+auth/
+├── ApiRequestOptions.ts       # Type definitions (4 lines)
+├── auth.setup.ts              # Setup script (32 lines)
+├── authenticatedUsers.ts      # User credentials
+└── authUtils.ts               # Authentication utilities
+```
+
+#### ApiRequestOptions Interface
+```typescript
+export type ApiRequestOptions = {
+  apiURL: string;
+};
+```
+
+**Purpose**: Extends Playwright's test fixtures with API URL configuration
+
+#### Authentication Setup (`auth.setup.ts`)
+
+**Key Features**:
+1. **Setup Test**: Runs before all other tests
+2. **Multi-User Authentication**: Authenticates all configured users
+3. **JWT Token Storage**: Stores tokens in environment variables
+4. **Error Handling**: Graceful failure for non-critical users (e.g., Gregory Briggs)
+5. **Console Logging**: Visual feedback for authentication status
+
+**Flow**:
+```
+1. auth-setup project runs first (dependency for all other projects)
+2. Iterates through USER_CONFIGS
+3. For each user: getJwtFromConfig(request, userConfig)
+4. Stores JWT in process.env[userConfig.jwtEnvVar]
+5. Logs success (✅) or failure (❌)
+6. Only fails setup if critical user fails
+```
+
+#### User Configuration Pattern
+Based on file structure, likely includes:
+- Multiple test user accounts
+- Different permission levels
+- JWT environment variable naming convention
+- User descriptions for logging
+
+#### Project Dependencies
+All test projects depend on `auth-setup`:
+```typescript
+const apiProjects = {
+  dependencies: ['auth-setup'],
+  // ...
+};
+```
+
+### 3.2 RxNorm Authentication
+
+#### File Structure
+```
+auth/
+├── ApiRequestOptions.ts           # Type definitions (4 lines - same as CI)
+├── auth.setup.ts                  # Setup script
+├── authenticatedTest.ts           # Centralized test wrappers (NEW - all users in one file)
+├── authUtils.ts                   # Comprehensive utilities (advanced pattern)
+├── IUserInfo.ts                   # User information interface (NEW)
+└── AUTHENTICATION_ARCHITECTURE.md # 309-line documentation (NEW)
+```
+
+**Key Differences from CI**:
+- ✅ **More advanced architecture**: RxNorm has evolved architecture
+- ✅ **Centralized utilities**: `authUtils.ts` provides comprehensive framework
+- ✅ **User Registry pattern**: `USER_REGISTRY` object instead of separate user files
+- ✅ **Factory pattern**: `JwtTokenManager`, `AuthContextFactory` for token management
+- ✅ **TypeScript enum**: `UserType` enum for type-safe user selection
+- ✅ **Consolidated exports**: All authenticated tests in single file
+- ✅ **Comprehensive documentation**: 309-line architecture guide
+
+#### Authentication Approach
+- **Type**: JWT-based (same as CI)
+- **Number of test users**: 3 (TEST_USER, STRATA_USER, G_BRIGGS_USER)
+- ✅ **Setup project pattern**: Yes (`auth-setup`)
+- **User Registry**: Centralized `USER_REGISTRY` object
+
+#### Advanced Features (Not in CI)
+
+**1. User Registry Pattern**:
+```typescript
+export const USER_REGISTRY: Record<UserType, IUserInfo> = {
+  [UserType.TEST_USER]: {
+    vaultUserName: 'ccicostleader',
+    userName: 'ccicostleader',
+    fullName: 'Administrator, CCI',
+    database_guid: 'feb7a099-8b2a-436c-9aba-0f853c8c60c9'
+  },
+  [UserType.STRATA_USER]: { /* ... */ },
+  [UserType.G_BRIGGS_USER]: { /* ... */ }
+};
+```
+
+**2. JWT Token Manager**:
+```typescript
+const jwt = await JwtTokenManager.getTokenByType(UserType.TEST_USER, request);
+JwtTokenManager.cacheToken(UserType.TEST_USER, jwt);
+const cachedJwt = JwtTokenManager.getCachedToken(UserType.TEST_USER);
+```
+
+**3. Factory Functions**:
+```typescript
+const test = createAuthenticatedTest(UserType.STRATA_USER);
+const apiContext = await AuthContextFactory.createApiRequestContext(
+  UserType.TEST_USER,
+  'https://api.example.com'
+);
+```
+
+**4. Consolidated Exports**:
+```typescript
+// All in one file: authenticatedTest.ts
+export const test = createAuthenticatedTest(UserType.TEST_USER);
+export const strataUserTest = createAuthenticatedTest(UserType.STRATA_USER);
+export const gBriggsTest = createAuthenticatedTest(UserType.G_BRIGGS_USER);
+```
+
+**Architecture Evolution**: RxNorm's authentication system represents a more evolved pattern with centralized utilities, factory functions, and comprehensive documentation.
+
+---
+
+## 4. Page Object Model (POM)
+
+### 4.1 Continuous Improvement POM
+
+#### Page Objects Directory Structure
+```
+pages/
+├── AllOpportunitiesPage.ts
+├── ChargeCodeOpportunitiesPage.ts
+├── ClientWarehousePage.ts
+├── CreateEncounterOpportunityWizard.ts
+├── CreateEncounterOpportunityWizardPage.ts
+├── EncounterOpportunitiesPage.ts
+├── FreeFormOpportunitiesPage.ts
+├── GeneralLedgerOpportunitiesPage.ts
+├── PayrollOpportunitiesPage.ts
+├── QualityVariationOpportunitiesPage.ts
+├── UtilizationVariationOpportunitiesPage.ts
+└── components/
+    ├── Loader.ts
+    ├── OpportunitiesHeader.ts
+    ├── OpportunitiesMenu.ts
+    ├── OpportunitiesPage.ts
+    ├── OpportunityPageBasicTests.ts
+    ├── OpportunityPageTests.ts
+    ├── OpportunityTypePage.ts
+    ├── PageBase.ts
+    └── TestClientWarehousePages.ts
+```
+
+**Architecture Pattern**:
+- **Base Components**: `PageBase.ts` likely provides common page functionality
+- **Reusable Components**: Shared UI components (Loader, Header, Menu)
+- **Page-Specific Classes**: One class per major page/feature
+- **Test Mixins**: `OpportunityPageBasicTests.ts`, `OpportunityPageTests.ts` for reusable test logic
+- **Wizard Pattern**: Multi-step process encapsulation (`CreateEncounterOpportunityWizard`)
+
+**Component Organization**:
+- Top-level pages: Feature-specific page objects
+- `components/` subfolder: Shared/reusable components
+
+### 4.2 RxNorm POM
+
+#### Page Objects Directory Structure
+```
+pages/
+└── RxNormPage.ts           # Single main page object
+
+components/
+├── BaseGridComponent.ts                    # Base grid functionality
+├── BrandedSemanticDrugsGridComponent.ts    # Specific grid implementation
+├── DimensionsGridComponent.ts              # Specific grid implementation
+├── JazzNdcGridComponent.ts                 # Specific grid implementation
+├── Loader.ts                               # Loading component
+├── RelationshipsGridComponent.ts           # Specific grid implementation
+└── RxNormsGridComponent.ts                 # Specific grid implementation
+```
+
+**Architecture Pattern**:
+- **Minimal page objects**: Only 1 main page object (vs. 11 in CI)
+- **Component-focused**: Heavy emphasis on reusable grid components
+- **Base component**: `BaseGridComponent.ts` provides common grid functionality
+- **Specialized grids**: 5 grid components extending base functionality
+- **Shared utilities**: `Loader.ts` for loading states
+
+**Component Organization**:
+- **Top-level pages**: Single `RxNormPage.ts` for main functionality
+- **Separate components folder**: All reusable components at root level (not nested)
+- **Grid-centric**: Application focused on data grid interactions
+
+**Key Differences from CI**:
+- **Simpler structure**: 1 page object vs. 11 in CI
+- **Grid specialization**: Focus on grid components vs. diverse page types in CI
+- **Flat hierarchy**: Components at root level vs. nested `pages/components/` in CI
+- **Application domain**: RxNorm is simpler, data-focused app vs. CI's complex opportunity management
+
+**Total Count**: 1 page + 7 components = 8 total files vs. 20 in CI
+
+---
+
+## 5. Type Definitions & Interfaces
+
+### 5.1 Continuous Improvement Types
+
+#### Component Interfaces Directory
+```
+components/
+├── Enumerations.ts         # Shared enums
+├── IEncounter.ts           # Encounter data types
+├── IFreeForm.ts            # Free form data types
+├── IGeneralLedger.ts       # General ledger data types
+├── IInitiativeBase.ts      # Base initiative interface
+├── IPayroll.ts             # Payroll data types
+├── IRequestBase.ts         # Base request interface
+└── PageFilterParam.ts      # Filter parameter types
+```
+
+**Type Organization Strategy**:
+- **Domain-Driven**: Types organized by business domain (Encounter, Payroll, etc.)
+- **Interface Pattern**: Uses `I` prefix convention
+- **Base Interfaces**: `IInitiativeBase`, `IRequestBase` for inheritance
+- **Shared Types**: `Enumerations.ts` for constants, `PageFilterParam.ts` for common patterns
+
+### 5.2 RxNorm Types
+
+#### Component Interfaces Directory
+```
+components/
+└── (No separate interfaces directory)
+
+auth/
+├── ApiRequestOptions.ts    # API request type (same as CI)
+└── IUserInfo.ts            # User information interface
+```
+
+**Type Organization Strategy**:
+- **Minimal type files**: Only 2 interface files (vs. 8 in CI)
+- **Co-located types**: Types likely defined alongside implementations
+- **Authentication-focused**: Types concentrated in auth folder
+- **IUserInfo interface**: Comprehensive user information structure
+
+**IUserInfo Interface**:
+```typescript
+interface IUserInfo {
+  vaultUserName: string;
+  userName: string;
+  fullName: string;
+  database_guid: string;
+}
+```
+
+**Naming Conventions**:
+- **Interface prefix**: Uses `I` prefix (e.g., `IUserInfo`)
+- **Consistent with CI**: Same `ApiRequestOptions` type
+
+**Key Differences from CI**:
+- **Fewer dedicated type files**: 2 vs. 8 in CI
+- **No domain interfaces**: CI has `IEncounter`, `IPayroll`, etc.; RxNorm doesn't
+- **No enumerations file**: CI has dedicated `Enumerations.ts`
+- **No base interfaces**: CI has `IInitiativeBase`, `IRequestBase`; RxNorm has simpler structure
+- **Simpler domain**: RxNorm's simpler application doesn't require extensive type definitions
+
+**Type Location Pattern**: RxNorm likely uses inline types or types co-located with implementations rather than separate interface files
+
+---
+
+## 6. Code Quality & Tooling
+
+### 6.1 Continuous Improvement Tooling
+
+#### ESLint Configuration (`.eslintrc.js`)
+
+**Installed Plugins**:
+- `@typescript-eslint/eslint-plugin` & `@typescript-eslint/parser`
+- `eslint-plugin-prettier`
+- `eslint-plugin-simple-import-sort`
+- `eslint-plugin-import`
+
+**Key Rules**:
+```javascript
+{
+  parser: '@typescript-eslint/parser',
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:prettier/recommended'
+  ],
+  rules: {
+    'prettier/prettier': ['error', {
+      endOfLine: 'auto',
+      printWidth: 200,
+      tabWidth: 2,
+      singleQuote: true,
+      jsxSingleQuote: true,
+      trailingComma: 'none'
+    }],
+    'simple-import-sort/imports': 'error',
+    'simple-import-sort/exports': 'error',
+    'import/first': 'error',
+    'import/no-duplicates': 'error',
+    'no-restricted-imports': ['error', {
+      paths: [
+        {
+          name: '@strata/tempo',
+          message: "Please use import [component] from '@strata/tempo/lib/[component]' instead."
+        }
+      ]
+    }]
+  }
+}
+```
+
+**Code Quality Enforcement**:
+- Print width: 200 characters
+- Automatic import sorting
+- Restricted imports for `@strata/tempo` (must use specific paths)
+- Single quotes enforcement
+- No trailing commas
+
+#### TypeScript Configuration (`tsconfig.json`)
+
+```json
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+    "noFallthroughCasesInSwitch": true
+  }
+}
+```
+
+**TypeScript Settings**:
+- **Strict Mode**: Enabled (strict type checking)
+- **JSX Support**: React JSX transformation
+- **ES5 Target**: Broader browser compatibility
+- **ESNext Module**: Modern module syntax
+- **No Fallthrough**: Prevents switch statement errors
+
+#### Dependencies (`package.json`)
+
+**Playwright Version**: `^1.42.1`
+
+**DevDependencies**:
+- `@playwright/test`: ^1.42.1
+- `@types/node`: ^20.12.4
+- `@typescript-eslint/eslint-plugin`: ^8.9.0
+- `@typescript-eslint/parser`: ^8.9.0
+- `eslint`: ^8.57.1
+- `eslint-config-prettier`: ^9.1.0
+- `eslint-plugin-prettier`: ^5.2.1
+- `eslint-plugin-simple-import-sort`: ^12.1.1
+- `prettier`: ^3.3.3
+- `typescript`: ^4.9.5
+
+**Runtime Dependencies**:
+- `crypto`: ^1.0.1
+- `dayjs`: ^1.11.18 (date manipulation)
+- `jwt-decode`: ^4.0.0 (JWT token decoding)
+- `uuid`: ^11.1.0 (UUID generation)
+
+**NPM Scripts**:
+```json
+{
+  "test": "npx playwright test --ui",
+  "test-local": "npx playwright test --ui -c ./playwright.config.local.ts",
+  "test-report": "npx playwright test",
+  "test-report-local": "npx playwright test -c ./playwright.config.local.ts"
+}
+```
+
+### 6.2 RxNorm Tooling
+
+#### ESLint Configuration (`.eslintrc.json`)
+
+**Uses Strata Standard Config**:
+```json
+{
+  "extends": "@strata",
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": 2020,
+    "sourceType": "module",
+    "project": "./tsconfig.json"
+  },
+  "rules": {
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-duplicate-enum-values": "off",
+    "react-hooks/exhaustive-deps": "warn"
+  }
+}
+```
+
+**Key Features**:
+- ✅ **Company standard**: Uses `@strata/eslint-config` package
+- **Simplified configuration**: Extends company config vs. custom rules in CI
+- **Relaxed rules**: Disables `no-explicit-any` and `no-duplicate-enum-values`
+- **React hooks**: Warns on exhaustive-deps (not error)
+
+**Differences from CI**:
+- **Uses `.json` format** vs. `.js` in CI
+- **Extends company config** vs. custom rule definitions in CI
+- **No Prettier config in ESLint**: CI includes Prettier rules directly
+- **No import sorting rules**: CI has `simple-import-sort` plugin
+- **No import restrictions**: CI restricts `@strata/tempo` imports
+
+#### TypeScript Configuration (`tsconfig.json`)
+
+**Identical to CI**:
+```json
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "jsx": "react-jsx",
+    "noFallthroughCasesInSwitch": true
+  }
+}
+```
+
+✅ **Strict Mode**: Enabled (same as CI)
+✅ **JSX Support**: React JSX transformation (same as CI)
+✅ **ES5 Target**: Broader browser compatibility (same as CI)
+
+#### Dependencies (`package.json`)
+
+**Playwright Version**: `^1.56.1` (vs. `^1.42.1` in CI) - **14 minor versions newer**
+
+**DevDependencies Comparison**:
+
+| Package | RxNorm | CI | Difference |
+|---------|--------|----|-----------|
+| @playwright/test | ^1.56.1 | ^1.42.1 | ✅ RxNorm 14 versions newer |
+| @strata/eslint-config | ^4.0.0 | ❌ Not used | ✅ RxNorm uses company config |
+| @types/node | ^20.12.4 | ^20.12.4 | ✅ Same |
+| @typescript-eslint/eslint-plugin | ^6.21.0 | ^8.9.0 | ❌ CI 2 major versions newer |
+| @typescript-eslint/parser | ^6.21.0 | ^8.9.0 | ❌ CI 2 major versions newer |
+| cross-env | ^7.0.3 | ❌ Not used | ✅ RxNorm has cross-platform support |
+| eslint | ^8.57.1 | ^8.57.1 | ✅ Same |
+| eslint-plugin-react | ^7.33.0 | ❌ Not used | ✅ RxNorm has React support |
+| eslint-plugin-react-hooks | ^4.6.0 | ❌ Not used | ✅ RxNorm has React hooks support |
+| eslint-plugin-simple-import-sort | ^12.1.1 | ^12.1.1 | ✅ Same |
+| prettier | ^3.3.3 | ^3.3.3 | ✅ Same |
+| typescript | ^5.3.3 | ^4.9.5 | ✅ RxNorm 1 major version newer |
+
+**Runtime Dependencies** (Same as CI):
+- `dayjs`: ^1.11.18
+- `jwt-decode`: ^4.0.0
+- `uuid`: ^11.1.0
+- ❌ `crypto`: CI has, RxNorm doesn't
+
+**NPM Scripts Comparison**:
+
+| Script | RxNorm | CI |
+|--------|--------|----|
+| test | ✅ Same | ✅ Same |
+| test-local | ✅ Same | ✅ Same |
+| test-report | ✅ Same | ✅ Same |
+| test-report-local | ✅ Same | ✅ Same |
+| **test-dry-run** | ✅ Has 4 variants | ❌ Not defined |
+| **check-api** | ✅ Has 2 variants | ❌ Not defined |
+| **pretest-local** | ✅ Auto-runs API check | ❌ Not defined |
+| **lint** | ✅ Has lint scripts | ❌ Not defined |
+| **lint:fix** | ✅ Has lint scripts | ❌ Not defined |
+
+**RxNorm Additional Scripts**:
+```json
+"test-dry-run": "cross-env DRY_RUN=true npx playwright test --list",
+"test-dry-run-local": "cross-env DRY_RUN=true npx playwright test --list -c ./playwright.config.local.ts",
+"check-api": "node scripts/check-api.mjs",
+"check-api-local": "node scripts/check-api.mjs http://localhost:8443/api/v1/",
+"pretest-local": "npm run check-api-local",
+"lint": "eslint . --ext .ts,.tsx",
+"lint:fix": "eslint . --ext .ts,.tsx --fix"
+```
+
+**Key Advantages of RxNorm**:
+1. ✅ **Newer Playwright**: 14 minor versions ahead
+2. ✅ **Company ESLint config**: Uses standardized `@strata` config
+3. ✅ **Cross-platform scripts**: `cross-env` for Windows/Mac/Linux compatibility
+4. ✅ **API health checks**: Automated API availability checking
+5. ✅ **Pre-test hooks**: Validates API before running tests
+6. ✅ **Lint automation**: Dedicated lint scripts
+7. ✅ **Newer TypeScript**: 1 major version ahead (5.3.3 vs 4.9.5)
+
+---
+
+## 7. Test Coverage & Scope
+
+### 7.1 Continuous Improvement Test Coverage
+
+#### API Tests (8 files)
+- Client warehouse operations
+- Configuration management
+- Initiative CRUD operations
+- Opportunity creation workflows
+- Opportunity queries
+- Security/authorization
+- User management
+- Utilization variation analytics
+
+#### Swagger Tests (34 files)
+Comprehensive coverage including:
+- All opportunity types (Charge Code, Encounter, Free Form, General Ledger, Payroll, Quality Variation, Utilization Variation, Strategic)
+- Initiative management (Charge Code initiatives)
+- Background jobs (Client job processing)
+- Exploration & populations
+- Quality variation (item breakdowns, events, opportunities)
+- Reports, Settings, Security
+- User management
+- Picker items, Mapped columns
+- GUDID file processing
+- Hangfire integration
+- Filter operations
+
+**Documentation**: `MISSING_SWAGGER_TESTS.md` tracks incomplete coverage
+
+#### Localization Tests (2 files)
+- Client warehouse page localization
+- Opportunities pages localization
+- UK English (en-GB) / London timezone testing
+
+#### UI Tests
+[Located in `tests/ui/` - structure not detailed in exploration]
+
+**Test Type Distribution**:
+- **Swagger Tests**: ~34 files (largest category)
+- **API Tests**: 8 files
+- **Localization Tests**: 2 files
+- **UI Tests**: [Count TBD]
+
+### 7.2 RxNorm Test Coverage
+
+#### API Tests (6 files)
+- `apiTestSuite.api.spec.ts` - Comprehensive API suite
+- `fileService.api.spec.ts` - File service operations
+- `ndcService.api.spec.ts` - NDC (National Drug Code) operations
+- `pharmacyService.api.spec.ts` - Pharmacy service operations  
+- `rxNormService.api.spec.ts` - RxNorm service operations
+- `README.md` - API test documentation
+
+**Service-Oriented**: Tests organized by backend service (file, ndc, pharmacy, rxnorm)
+
+#### Swagger Tests (6 files)
+- `swaggerApiSecurity.spec.ts` - Security/authentication tests
+- `swaggerFilesController.spec.ts` - Files controller endpoint tests
+- `swaggerNdcController.spec.ts` - NDC controller endpoint tests
+- `swaggerPharmacyController.spec.ts` - Pharmacy controller endpoint tests
+- `swaggerRxNormController.spec.ts` - RxNorm controller endpoint tests
+- `MISSING_SWAGGER_TESTS.md` - Coverage tracking (same pattern as CI)
+- `README.md` - Swagger test documentation
+
+**Controller-Oriented**: Tests aligned with backend API controllers
+
+#### UI Tests (3 files)
+- `rxnorm-dimensions-smoke.spec.ts` - Dimensions smoke tests
+- `rxnorm-page.spec.ts` - Main page functionality tests
+- `rxnorm-smoke.spec.ts` - General smoke tests
+
+**Smoke Test Focus**: Emphasis on quick validation tests
+
+#### Localization Tests
+❌ **None**: No dedicated localization tests (CI has 2 files)
+
+#### Test Type Distribution
+
+| Test Type | RxNorm | CI | Difference |
+|-----------|--------|----|-----------|
+| **API Tests** | 6 files | 8 files | CI has 2 more |
+| **Swagger Tests** | 6 files | 34 files | CI has 28 more (5.7x more) |
+| **UI Tests** | 3 files | TBD | Much simpler in RxNorm |
+| **Localization Tests** | 0 files | 2 files | CI has localization |
+| **Total Test Files** | ~15 files | ~44+ files | CI has ~3x more tests |
+
+**Coverage Characteristics**:
+- **Smaller scope**: RxNorm is simpler application with fewer features
+- **Service-focused**: Clear service boundaries in test organization
+- **Smoke test emphasis**: Multiple smoke test files for quick validation
+- **Documentation**: Both have `README.md` and `MISSING_SWAGGER_TESTS.md`
+- **No i18n testing**: RxNorm doesn't test internationalization
+
+**Test Organization Quality**:
+- ✅ Clear naming conventions
+- ✅ Service/controller alignment
+- ✅ Helper directories in each test type
+- ✅ Documentation files included
+
+---
+
+## 8. Special Features & Patterns
+
+### 8.1 Continuous Improvement Features
+
+#### DRY_RUN Mode
+**Purpose**: Fast configuration validation without full test execution
+
+**Activation**:
+```bash
+DRY_RUN=true npx playwright test --config=playwright.config.local.ts
+```
+
+**Behavior**:
+- Disables web server startup
+- Sets retries to 0
+- Uses single worker
+- Reduces timeouts (5 seconds for action/navigation)
+- Optimizes for test discovery and validation
+
+#### Multi-Locale Support
+**Implementation**:
+- Separate project configurations for different locales
+- US locale (en-US / America/Chicago) for standard tests
+- UK locale (en-GB / Europe/London) for localization tests
+
+**Test Projects**:
+```typescript
+// US Locale
+use: {
+  locale: 'en-US',
+  timezoneId: 'America/Chicago'
+}
+
+// UK Locale (Localization tests)
+use: {
+  locale: 'en-GB',
+  timezoneId: 'Europe/London'
+}
+```
+
+#### Swagger API Validation
+**Dedicated Test Suite**: 34 Swagger-specific test files
+
+**Coverage Tracking**: `MISSING_SWAGGER_TESTS.md` documents gaps
+
+**Project Configuration**: Dedicated `chromium-swagger` project
+
+#### Legacy Configuration
+**File**: `playwright.config.legacy.ts`
+
+**Purpose**: Backup/reference implementation of pre-refactor configuration (100 lines)
+
+#### Documentation Culture
+**In-Repo Documentation**:
+- `PLAYWRIGHT_CONFIG_ARCHITECTURE.md` (214 lines)
+- `MISSING_SWAGGER_TESTS.md`
+- Inline JSDoc comments in configuration files
+
+**Documentation Quality**:
+- Comprehensive architecture explanations
+- Migration guides
+- Usage examples
+- Troubleshooting sections
+- Benefits analysis
+
+#### Console Output
+**Configuration Logging**: Detailed startup information
+```typescript
+console.log(`🛠  Created Playwright configuration for environment: ${envType}`);
+console.log(`🔍 Configuration details:`);
+console.table(config.projects?.map(...));
+```
+
+### 8.2 RxNorm Features
+
+#### API Health Check System
+**Unique Feature**: Automated API availability checking before test execution
+
+**Implementation**: `scripts/check-api.mjs`
+```bash
+# Check remote API
+npm run check-api
+
+# Check local API
+npm run check-api-local
+
+# Auto-runs before local tests
+npm run test-local  # Executes pretest-local hook automatically
+```
+
+**Benefits**:
+- Fails fast if API is unavailable
+- Clear error messages before test execution
+- Prevents wasted test runs
+- Integrated with npm lifecycle hooks
+
+#### Cross-Platform Script Support
+**Tool**: `cross-env` package for Windows/Mac/Linux compatibility
+
+**Usage**:
+```json
+"test-dry-run": "cross-env DRY_RUN=true npx playwright test --list"
+```
+
+**Benefit**: Scripts work identically across operating systems (important for team with mixed OS)
+
+#### Comprehensive Documentation Culture
+**Documentation Files** (4 total):
+1. `PLAYWRIGHT_CONFIG_ARCHITECTURE.md` - Configuration architecture (similar to CI)
+2. `CONFIGURATION.md` - Usage guide with quick examples
+3. `DRY_RUN_GUIDE.md` - Dedicated dry-run documentation
+4. `API_VALIDATION_GUIDE.md` - API validation documentation
+5. `auth/AUTHENTICATION_ARCHITECTURE.md` - 309-line authentication guide
+
+**Plus README files in test directories**:
+- `tests/api/README.md`
+- `tests/swagger/README.md`
+- `MISSING_SWAGGER_TESTS.md` (coverage tracking)
+
+**Total**: 8 documentation files vs. 3 in CI
+
+#### Global Setup Pattern
+**File**: `tests/global.setup.ts`
+
+**Purpose**: Global test environment setup before all tests
+
+**Configuration**:
+```typescript
+globalSetup: require.resolve('./tests/global.setup.ts')
+```
+
+**Not present in CI**: CI doesn't use global setup file
+
+#### Enhanced NPM Scripts
+**Automation Scripts** (Not in CI):
+- `test-dry-run` - List tests without executing (4 variants)
+- `check-api` - Validate API availability (2 variants)
+- `pretest-local` - Pre-test hook for local environment
+- `lint` - Code linting
+- `lint:fix` - Auto-fix linting issues
+
+#### Advanced Authentication System
+**Features** (More advanced than CI):
+- User Registry pattern
+- JWT Token Manager with caching
+- Factory functions for test/context creation
+- Consolidated authenticated test exports
+- Comprehensive 309-line documentation
+
+#### DRY_RUN Guide
+**Dedicated Documentation**: `DRY_RUN_GUIDE.md`
+
+CI mentions DRY_RUN but RxNorm has complete guide with:
+- Purpose and use cases
+- Command examples
+- Workflow integration
+- Troubleshooting
+
+#### Multi-Locale Support
+❌ **Not implemented**: RxNorm doesn't have localization tests (CI does)
+
+**Reason**: Likely application doesn't require internationalization
+
+#### Configuration Documentation Quality
+**JSDoc Comments**: Extensive documentation in config files
+- 60 lines per config file (vs. 12 in CI)
+- @fileoverview, @description, @version, @since, @author tags
+- @module, @requires documentation
+- @example usage patterns
+- @overview, @architecture, @dependencies sections
+- @performance notes
+
+**Example**:
+```typescript
+/**
+ * @fileoverview Playwright Configuration for Remote/CI Environment
+ * @description Main Playwright configuration for remote test execution
+ * @version 2.1.0
+ * @since 2024-10-15
+ * @author Strata Decision Technology
+ * 
+ * @module RemotePlaywrightConfig
+ * @requires ./playwright.config.shared
+ * 
+ * @example
+ * ```bash
+ * npx playwright test
+ * ```
+ */
+```
+
+#### Swagger/OpenAPI Validation
+**Similarity to CI**: Both projects have dedicated Swagger tests with coverage tracking
+
+**Documentation**: Both have `MISSING_SWAGGER_TESTS.md` for gap tracking
+
+#### Shared Exports Pattern
+**Unique to RxNorm**: Convenience exports in shared config
+
+```typescript
+export const SHARED_EXPORTS = {
+  localConfig: () => createPlaywrightConfig(EnvironmentType.LOCAL),
+  remoteConfig: () => createPlaywrightConfig(EnvironmentType.REMOTE),
+  baseConfig: BASE_PROJECT_CONFIG,
+  projectTemplates: PROJECT_TEMPLATES,
+  environments: ENVIRONMENT_CONFIGS
+} as const;
+```
+
+**Benefit**: Easy access to pre-configured setups
+
+#### Environment Documentation Function
+**Unique to RxNorm**: `getEnvironmentDocumentation()` function
+
+```typescript
+console.log(getEnvironmentDocumentation(EnvironmentType.LOCAL));
+```
+
+**Generates** formatted environment-specific documentation programmatically
+
+---
+
+## 9. Key Architectural Differences Summary
+
+### 9.1 Configuration Approach
+
+| Aspect | Continuous Improvement | RxNorm | Winner |
+|--------|------------------------|--------|--------|
+| **Configuration Pattern** | Shared factory pattern (208-line shared module) | Shared factory pattern (376-line shared module) | 🔵 Tie (both excellent) |
+| **Code Duplication** | ~12 lines per environment config | ~60 lines per environment config (with JSDoc) | 🟢 CI (more concise) |
+| **Environment Count** | 4 (Local, Remote, Staging, Smoke Test) | 2 (Local, Remote) | 🟢 CI (more comprehensive) |
+| **Web Server Management** | Auto-start in LOCAL mode | Auto-start in LOCAL mode with timeout | 🔵 Tie |
+| **DRY_RUN Support** | Yes (built-in) | Yes (with dedicated guide) | 🟡 RxNorm (better docs) |
+| **Override Capability** | Yes (optional parameter) | Yes (optional parameter) | 🔵 Tie |
+| **Console Logging** | Detailed with tables | Detailed with tables | 🔵 Tie |
+| **JSDoc Documentation** | Minimal inline docs | Extensive @fileoverview, @version, etc. | 🟡 RxNorm (better inline docs) |
+| **API Health Checks** | None | Automated with scripts | 🟡 RxNorm (unique feature) |
+| **Global Setup** | No | Yes (global.setup.ts) | 🟡 RxNorm |
+
+### 9.2 Test Organization
+
+| Aspect | Continuous Improvement | RxNorm | Winner |
+|--------|------------------------|--------|--------|
+| **Project Count** | 12 projects (incl. localization) | 8 projects (no localization) | 🟢 CI (more coverage) |
+| **Browser Coverage** | Chrome, Firefox, Safari, Edge | Chrome, Firefox, Safari, Edge | 🔵 Tie |
+| **API Tests** | 8 files | 6 files | 🟢 CI (more tests) |
+| **Swagger Tests** | 34 files | 6 files | 🟢 CI (5.7x more) |
+| **Localization Tests** | 2 files | 0 files | 🟢 CI (has i18n) |
+| **UI Tests** | Many files | 3 files (smoke-focused) | 🟢 CI (more coverage) |
+| **Test Helpers** | Dedicated helpers directory | Dedicated helpers directory | 🔵 Tie |
+| **Total Test Files** | ~44+ files | ~15 files | 🟢 CI (3x more) |
+| **Test Documentation** | Some README files | README in each test type | 🟡 RxNorm (better organized) |
+
+### 9.3 Authentication
+
+| Aspect | Continuous Improvement | RxNorm | Winner |
+|--------|------------------------|--------|--------|
+| **Authentication Type** | JWT-based | JWT-based | 🔵 Tie |
+| **Setup Project** | Yes (`auth-setup`) | Yes (`auth-setup`) | 🔵 Tie |
+| **Multi-User Support** | Yes (USER_CONFIGS object) | Yes (USER_REGISTRY enum pattern) | 🟡 RxNorm (better typed) |
+| **Error Handling** | Graceful for non-critical users | Graceful with error logging | 🔵 Tie |
+| **Architecture** | Standard auth utilities | Advanced: Registry + Factory + Manager | 🟡 RxNorm (more evolved) |
+| **User Type Safety** | Config-based | TypeScript enum (UserType) | 🟡 RxNorm (type-safe) |
+| **Token Management** | Basic | JwtTokenManager with caching | 🟡 RxNorm (advanced) |
+| **Factory Pattern** | No | AuthContextFactory | 🟡 RxNorm (better pattern) |
+| **Documentation** | Inline comments | 309-line architecture doc | 🟡 RxNorm (comprehensive) |
+| **Consolidated Exports** | Separate files per user | All in authenticatedTest.ts | 🟡 RxNorm (simpler imports) |
+
+### 9.4 Code Quality
+
+| Aspect | Continuous Improvement | RxNorm | Winner |
+|--------|------------------------|--------|--------|
+| **ESLint** | Custom comprehensive rules | @strata company standard | 🟡 RxNorm (company standard) |
+| **ESLint Config Format** | .eslintrc.js | .eslintrc.json | 🔵 Preference |
+| **Prettier** | Yes (200 char line width) | Via @strata config | 🔵 Tie |
+| **Import Sorting** | Automated (explicit rules) | Via @strata config | 🔵 Tie |
+| **TypeScript Strict** | Yes | Yes | 🔵 Tie |
+| **TypeScript Version** | 4.9.5 | 5.3.3 | 🟡 RxNorm (newer) |
+| **Playwright Version** | 1.42.1 | 1.56.1 | 🟡 RxNorm (14 versions newer) |
+| **Import Restrictions** | Yes (@strata/tempo) | No custom restrictions | 🟢 CI (enforces patterns) |
+| **React ESLint Plugins** | No | Yes (react, react-hooks) | 🟡 RxNorm (React-aware) |
+| **Cross-Platform Scripts** | No | Yes (cross-env) | 🟡 RxNorm (Windows/Mac/Linux) |
+| **NPM Scripts** | 4 test scripts | 13 scripts (incl. lint, check-api) | 🟡 RxNorm (more automation) |
+| **Lint Automation** | Manual | npm run lint, lint:fix | 🟡 RxNorm (dedicated scripts) |
+
+### 9.5 Documentation
+
+| Aspect | Continuous Improvement | RxNorm | Winner |
+|--------|------------------------|--------|--------|
+| **Architecture Docs** | Yes (214-line MD file) | Yes (PLAYWRIGHT_CONFIG_ARCHITECTURE.md) | 🔵 Tie |
+| **Coverage Tracking** | Yes (MISSING_SWAGGER_TESTS.md) | Yes (MISSING_SWAGGER_TESTS.md) | 🔵 Tie |
+| **Inline JSDoc** | Minimal | Extensive with @tags | 🟡 RxNorm (better inline docs) |
+| **Migration Guides** | Yes | Implied in docs | 🟢 CI (explicit guide) |
+| **Documentation Files** | 3 files | 8+ files | 🟡 RxNorm (more comprehensive) |
+| **DRY_RUN Guide** | Mentioned in architecture doc | Dedicated guide (DRY_RUN_GUIDE.md) | 🟡 RxNorm (dedicated doc) |
+| **API Validation Docs** | None | API_VALIDATION_GUIDE.md | 🟡 RxNorm (unique) |
+| **Usage Guide** | In architecture doc | Separate CONFIGURATION.md | 🟡 RxNorm (better organized) |
+| **Auth Documentation** | Inline only | 309-line AUTHENTICATION_ARCHITECTURE.md | 🟡 RxNorm (comprehensive) |
+| **Test READMEs** | Some | In each test directory | 🟡 RxNorm (consistent) |
+
+---
+
+## 10. Recommendations & Action Items
+
+### 10.1 For RxNorm Project
+
+**RxNorm already has excellent architecture! Focus on these enhancements:**
+
+1. ✅ **Expand Test Coverage** (vs. CI's 3x more tests)
+   - Add more UI test scenarios beyond smoke tests
+   - Expand Swagger test coverage (currently 6 vs. CI's 34)
+   - Consider adding localization tests if needed
+
+2. ✅ **Add More Environments**
+   - Consider adding Staging and Smoke Test environments like CI
+   - Would enable pre-production validation
+
+3. ✅ **Reduce Config File JSDoc** (optional optimization)
+   - Current 60-line config files vs. CI's 12 lines
+   - Move extensive JSDoc to separate documentation
+   - Keep config files focused on configuration
+
+4. ✅ **Consider Import Restrictions**
+   - Add import restrictions like CI's `@strata/tempo` pattern
+   - Enforce architectural boundaries
+
+**RxNorm Strengths to Maintain:**
+- ✅ Excellent API health check system
+- ✅ Cross-platform script support
+- ✅ Comprehensive documentation (8 files)
+- ✅ Advanced authentication architecture
+- ✅ Company-standard ESLint config
+- ✅ Newer dependencies (Playwright 1.56.1, TypeScript 5.3.3)
+- ✅ NPM script automation (13 scripts)
+
+### 10.2 For Continuous Improvement Project
+
+**Learn from RxNorm's innovations:**
+
+1. ✅ **Adopt API Health Check System** (from RxNorm)
+   - Implement `scripts/check-api.mjs` pattern
+   - Add `pretest-local` hook for automatic checks
+   - Fail fast if API unavailable
+   - **Estimated effort**: 2-3 hours
+
+2. ✅ **Upgrade Dependencies** (follow RxNorm's lead)
+   - Upgrade Playwright from 1.42.1 to 1.56.1 (14 versions behind)
+   - Upgrade TypeScript from 4.9.5 to 5.3.3 (1 major version behind)
+   - Upgrade @typescript-eslint from 8.9.0 to latest
+   - **Estimated effort**: 3-4 hours with testing
+
+3. ✅ **Add Cross-Platform Script Support**
+   - Install `cross-env` package
+   - Update DRY_RUN scripts to use cross-env
+   - Ensure Windows/Mac/Linux compatibility
+   - **Estimated effort**: 1 hour
+
+4. ✅ **Enhance NPM Scripts** (RxNorm has 13 vs. CI's 4)
+   - Add `test-dry-run` and variants
+   - Add `lint` and `lint:fix` scripts
+   - Add `check-api` scripts
+   - **Estimated effort**: 1 hour
+
+5. ✅ **Adopt Company ESLint Standard**
+   - Migrate to `@strata/eslint-config` like RxNorm
+   - Reduces custom rule maintenance
+   - Ensures team consistency
+   - **Estimated effort**: 2-3 hours
+
+6. ✅ **Enhance Authentication Architecture** (adopt RxNorm patterns)
+   - Implement User Registry pattern with TypeScript enum
+   - Add JwtTokenManager with caching
+   - Create AuthContextFactory
+   - Consolidate authenticated test exports
+   - Create comprehensive authentication documentation
+   - **Estimated effort**: 8-12 hours (significant refactor)
+
+7. ✅ **Expand Documentation** (RxNorm has 8 files vs. CI's 3)
+   - Create `DRY_RUN_GUIDE.md`
+   - Create `API_VALIDATION_GUIDE.md`
+   - Create `AUTHENTICATION_ARCHITECTURE.md`
+   - Create `CONFIGURATION.md` (usage guide)
+   - Add README files in each test directory
+   - **Estimated effort**: 4-6 hours
+
+8. ✅ **Add JSDoc to Config Files** (optional)
+   - Follow RxNorm's extensive JSDoc pattern
+   - Add @fileoverview, @version, @since, @author
+   - Document @dependencies and @performance
+   - **Estimated effort**: 2-3 hours
+
+9. ✅ **Complete Swagger Test Coverage** (existing item)
+   - Review `MISSING_SWAGGER_TESTS.md`
+   - Implement missing endpoint tests
+   - **Estimated effort**: Ongoing
+
+10. ✅ **Add Global Setup** (if needed)
+    - Consider if global test setup would benefit CI
+    - RxNorm uses `global.setup.ts`
+    - **Estimated effort**: 1-2 hours if applicable
+
+**CI Strengths to Maintain:**
+- ✅ Comprehensive test coverage (44+ files vs. RxNorm's 15)
+- ✅ Localization testing (unique to CI)
+- ✅ 4 environment configurations (vs. RxNorm's 2)
+- ✅ More page objects (20 vs. RxNorm's 8)
+- ✅ Import restrictions enforcement
+- ✅ More concise config files (12 lines vs. 60)
+
+**Priority Order** (High to Low Impact):
+1. 🔴 **High**: Upgrade dependencies (14 versions behind on Playwright)
+2. 🔴 **High**: Add API health checks (developer experience)
+3. 🟡 **Medium**: Cross-platform scripts (team compatibility)
+4. 🟡 **Medium**: Enhance NPM scripts (automation)
+5. 🟡 **Medium**: Expand documentation (maintainability)
+6. 🟢 **Low**: Adopt company ESLint config (standardization)
+7. 🟢 **Low**: Enhance authentication (if pain points exist)
+8. 🟢 **Low**: Add JSDoc (nice-to-have)
+
+### 10.3 Cross-Project Alignment
+
+1. **Establish Shared Standards**
+   - Common configuration patterns
+   - Shared ESLint/Prettier rules
+   - Unified authentication approach
+
+2. **Create Reusable Components**
+   - Shared utility libraries
+   - Common page object base classes
+   - Standardized test helpers
+
+3. **Documentation Templates**
+   - Architecture documentation template
+   - Test coverage tracking format
+   - Migration guide template
+
+---
+
+## 11. Migration Path (If Needed)
+
+### 11.1 From Traditional to Shared Configuration
+
+**Step 1: Create Shared Module** (1-2 hours)
+```bash
+# Create playwright.config.shared.ts
+# Implement EnvironmentType enum
+# Implement ENVIRONMENT_CONFIGS
+# Implement createPlaywrightConfig() factory
+# Implement createProjectConfigs() helper
+```
+
+**Step 2: Backup Existing Configurations** (15 minutes)
+```bash
+# Rename existing files
+mv playwright.config.ts playwright.config.legacy.ts
+mv playwright.config.local.ts playwright.config.local.legacy.ts
+```
+
+**Step 3: Create New Configurations** (30 minutes)
+```typescript
+// playwright.config.ts
+import { createPlaywrightConfig, EnvironmentType } from './playwright.config.shared';
+export default createPlaywrightConfig(EnvironmentType.REMOTE);
+
+// playwright.config.local.ts
+import { createPlaywrightConfig, EnvironmentType } from './playwright.config.shared';
+export default createPlaywrightConfig(EnvironmentType.LOCAL);
+```
+
+**Step 4: Validate** (30 minutes)
+```bash
+# List tests to verify configuration
+npx playwright test --list --config=playwright.config.ts
+npx playwright test --list --config=playwright.config.local.ts
+
+# Run dry-run tests
+DRY_RUN=true npx playwright test --config=playwright.config.local.ts
+
+# Run actual tests
+npx playwright test --config=playwright.config.local.ts --grep "@smoke"
+```
+
+**Step 5: Document** (1 hour)
+```bash
+# Create PLAYWRIGHT_CONFIG_ARCHITECTURE.md
+# Document migration
+# Update README if exists
+```
+
+**Total Time Estimate**: 3-4 hours
+
+---
+
+## 12. Conclusion
+
+### 12.1 Continuous Improvement Strengths
+
+1. **Comprehensive Test Coverage**: 44+ test files (3x more than RxNorm)
+2. **Localization Testing**: Dedicated locale support (unique to CI)
+3. **Multiple Environments**: 4 configurations vs. RxNorm's 2
+4. **Extensive Swagger Coverage**: 34 Swagger tests vs. RxNorm's 6
+5. **Concise Config Files**: 12 lines vs. RxNorm's 60 (better signal-to-noise)
+6. **Rich Page Object Model**: 20 components vs. RxNorm's 8
+7. **Import Restrictions**: Enforces architectural boundaries
+8. **Modern Architecture**: Shared factory pattern eliminates duplication
+
+**Overall Assessment**: 🟢 **CI is more comprehensive** in test coverage and complexity handling
+
+### 12.2 RxNorm Strengths (Completed Analysis)
+
+1. **🏆 Advanced Authentication**: Most evolved pattern with Registry, Factory, Manager classes
+2. **🏆 API Health Checks**: Unique automated validation system
+3. **🏆 Cross-Platform Support**: Works seamlessly on Windows/Mac/Linux
+4. **🏆 Newer Dependencies**: Playwright 1.56.1 (14 versions ahead), TypeScript 5.3.3
+5. **🏆 Company Standards**: Uses `@strata/eslint-config` for consistency
+6. **🏆 Documentation Quantity**: 8 documentation files vs. CI's 3
+7. **🏆 NPM Automation**: 13 scripts with lint, API checks, pretest hooks
+8. **🏆 Inline Documentation**: Extensive JSDoc with @tags throughout
+9. **🏆 Global Setup**: Centralized test environment setup
+10. **Better for**: Smaller teams, simpler applications, focusing on developer experience
+
+**Overall Assessment**: 🟡 **RxNorm is more polished** in tooling, automation, and documentation
+
+### 12.3 Architectural Pattern Comparison
+
+**Both projects use the same core pattern** (shared configuration factory) but differ in:
+
+| Category | Winner | Reason |
+|----------|--------|--------|
+| **Test Coverage** | 🟢 CI | 3x more tests, localization support |
+| **Documentation** | 🟡 RxNorm | 8 files vs. 3, better organization |
+| **Authentication** | 🟡 RxNorm | Advanced architecture with patterns |
+| **Tooling** | 🟡 RxNorm | Newer deps, more automation |
+| **Developer Experience** | 🟡 RxNorm | API checks, cross-platform, 13 scripts |
+| **Code Quality** | 🔵 Tie | Both excellent, different approaches |
+| **Environment Support** | 🟢 CI | 4 environments vs. 2 |
+| **Innovation** | 🟡 RxNorm | API health checks, advanced auth |
+
+**Recommendation**: 🎯 **Cross-pollinate best practices from both projects**
+- CI should adopt RxNorm's tooling and automation innovations
+- RxNorm should expand test coverage following CI's patterns
+- Both projects should standardize on shared learnings
+
+### 12.3 Next Steps
+
+1. **Complete RxNorm Analysis**
+   - Access RxNorm e2e folder
+   - Document configuration structure
+   - Compare with CI approach
+   - Identify migration opportunities
+
+2. **Create Alignment Plan**
+   - Prioritize differences
+   - Estimate migration effort
+   - Define shared standards
+   - Create implementation timeline
+
+3. **Execute Improvements**
+   - Implement quick wins
+   - Plan larger refactoring
+   - Share learnings across teams
+
+---
+
+## Appendix A: File Inventory
+
+### Continuous Improvement E2E File Count
+
+```
+Configuration Files:    7
+Authentication Files:   4
+Page Objects:          11
+Page Components:        9
+Test Files (API):       8
+Test Files (Swagger):  34
+Test Files (Local):     2
+Test Files (UI):      TBD
+Component Interfaces:   8
+Helper Files:           3
+Documentation:          3 (including this file)
+
+Total Estimated Files: 85+
+```
+
+### RxNorm E2E File Count
+
+```
+Configuration Files:    3 (playwright.config.ts, local, shared)
+Authentication Files:   6 (incl. AUTHENTICATION_ARCHITECTURE.md)
+Page Objects:           1
+Page Components:        7 (grid-focused)
+Test Files (API):       6
+Test Files (Swagger):   6
+Test Files (UI):        3
+Component Interfaces:   2 (ApiRequestOptions, IUserInfo)
+Helper Files:          ~6 (distributed across test types)
+Documentation:         8+ (4 root + auth doc + test READMEs)
+Scripts:               1 (check-api.mjs)
+
+Total Estimated Files: 48+
+```
+
+**Comparison**:
+- **CI**: ~85+ files (more comprehensive)
+- **RxNorm**: ~48+ files (more focused)
+- **Ratio**: CI has 1.8x more files
+
+---
+
+## Appendix B: Quick Reference Commands
+
+### Continuous Improvement Commands
+
+```bash
+# List all tests
+npx playwright test --list
+
+# Run all tests (remote config)
+npx playwright test
+
+# Run local tests
+npx playwright test --config=playwright.config.local.ts
+
+# Run with UI mode
+npx playwright test --ui
+npx playwright test --ui -c ./playwright.config.local.ts
+
+# Run specific project
+npx playwright test --project=chromium-api
+
+# Run specific test file
+npx playwright test tests/api/opportunities.spec.ts
+
+# Run with tag
+npx playwright test --grep @smoke
+
+# Dry-run mode
+DRY_RUN=true npx playwright test --config=playwright.config.local.ts
+
+# Generate test report
+npx playwright test
+npx playwright show-report
+
+# Debug mode
+npx playwright test --debug
+
+# Show configuration
+npx playwright show-config
+```
+
+### RxNorm Commands
+
+```bash
+# List all tests
+npx playwright test --list
+
+# Run all tests (remote config - default)
+npx playwright test
+
+# Run local tests
+npx playwright test --config=playwright.config.local.ts
+
+# Run with UI mode
+npx playwright test --ui
+npx playwright test --ui -c ./playwright.config.local.ts
+
+# Run specific project
+npx playwright test --project=chromium-api
+
+# Run specific test file
+npx playwright test tests/api/rxNormService.api.spec.ts
+
+# Run with tag
+npx playwright test --grep @smoke
+
+# Dry-run mode (RxNorm has dedicated scripts)
+npm run test-dry-run
+npm run test-dry-run-local
+npm run test-dry-run-report
+npm run test-dry-run-report-local
+
+# API health checks (unique to RxNorm)
+npm run check-api
+npm run check-api-local
+
+# Run local tests (auto-checks API first via pretest-local hook)
+npm run test-local
+
+# Linting (RxNorm has dedicated commands)
+npm run lint
+npm run lint:fix
+
+# Generate test report
+npx playwright test
+npx playwright show-report
+
+# Debug mode
+npx playwright test --debug
+
+# Show configuration
+npx playwright show-config
+```
+
+**Unique RxNorm Commands**:
+- `npm run test-dry-run*` - 4 variants for dry-run mode
+- `npm run check-api*` - API health validation
+- `npm run lint*` - Code quality commands
+
+---
+
+**Document Status**: ✅ **COMPLETE** - Both CI and RxNorm fully analyzed
+
+**Last Updated**: December 16, 2025
+
+**Analysis Completed**: December 16, 2025
+
+**Key Findings**:
+- 🟢 CI: Superior test coverage (3x more tests), localization support, 4 environments
+- 🟡 RxNorm: Superior tooling (newer deps, automation), documentation (8 files), authentication architecture
+- 🎯 Recommendation: Cross-pollinate best practices between projects
+
+**Next Review**: When either project undergoes major architectural changes
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/documentation/SWAGGER_COVERAGE_REPORT.md b/src/Strata.ContinuousImprovement.Web/e2e/documentation/SWAGGER_COVERAGE_REPORT.md
new file mode 100644
index 0000000..118eb8b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/documentation/SWAGGER_COVERAGE_REPORT.md
@@ -0,0 +1,738 @@
+# Swagger Endpoint Coverage Report
+
+**Generated:** 2026-01-27T14:54:41.115Z
+
+## Overall Coverage Summary
+
+| Metric | Count |
+|--------|------:|
+| Total Swagger Endpoints | 287 |
+| Endpoints with Mock Data | 89 |
+| Endpoints without Mock Data | 198 |
+| **Coverage Percentage** | **31.01%** |
+
+### Coverage Legend
+
+| Icon | Status |
+|------|--------|
+| 🟢 | Both mockData + apiTest |
+| 🔵 | mockData only |
+| 🟡 | apiTest only |
+| 🔴 | Missing coverage |
+
+## Coverage Heatmap
+
+Visual representation of coverage by controller:
+
+| Controller | Coverage Bar | Percentage | Endpoints |
+|------------|--------------|------------|-----------|
+| AllOpportunities | 🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨⬜⬜⬜ | 83.3% | 5/6 |
+| BackgroundClientJob | 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩 | 100.0% | 1/1 |
+| ChargeCodeInitiatives | 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩 | 100.0% | 1/1 |
+| ChargeCodeOpportunities | 🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨⬜⬜⬜⬜⬜⬜ | 70.6% | 12/17 |
+| ChargeCodeOpportunityDetails | 🟧🟧🟧🟧🟧🟧🟧🟧🟧🟧🟧🟧🟧⬜⬜⬜⬜⬜⬜⬜ | 66.7% | 2/3 |
+| ChargeCodeOpps | 🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨⬜⬜⬜⬜ | 80.0% | 4/5 |
+| ClientNetworkOpportunities | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/7 |
+| ClientNetworkOpportunityLink | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/6 |
+| ClientOpportunityTypeWorkbooks | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/3 |
+| ClientOpportunityWorkbooks | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/4 |
+| ClientWarehouses | 🟥🟥🟥🟥🟥🟥🟥⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 33.3% | 1/3 |
+| Comments | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/2 |
+| Configurations | 🟥🟥🟥🟥🟥⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 25.0% | 1/4 |
+| Databases | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/1 |
+| DeviceIdentifiers | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/1 |
+| EncounterOpportunities | 🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨⬜⬜⬜⬜ | 78.6% | 11/14 |
+| Encounters | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/7 |
+| Exploration | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/4 |
+| ExplorationOpportunities | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/12 |
+| ExplorationPopulations | 🟥🟥⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 8.3% | 1/12 |
+| Filters | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/4 |
+| FreeFormOpportunities | 🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨⬜⬜⬜⬜⬜⬜ | 70.0% | 7/10 |
+| GMDNFileUpload | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/1 |
+| GeneralLedgerDetails | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/2 |
+| GeneralLedgerOpportunities | 🟥🟥🟥⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 14.3% | 1/7 |
+| GudidFile | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/2 |
+| Hangfire | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/3 |
+| InitiativeDetailColumns | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/3 |
+| InitiativeRollupColumns | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/8 |
+| Initiatives | 🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨🟨⬜⬜⬜⬜⬜ | 73.9% | 17/23 |
+| MappedColumns | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/2 |
+| NetworkOpportunities | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/6 |
+| OpportunityTypeWorkbooks | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/3 |
+| OpportunityWorkbooks | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/7 |
+| PayrollOpportunities | 🟥🟥🟥🟥⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 20.0% | 2/10 |
+| PeerGroup | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/7 |
+| PickerItems | 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩 | 100.0% | 1/1 |
+| QualityVariationItemBreakdowns | 🟧🟧🟧🟧🟧🟧🟧🟧🟧🟧⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 50.0% | 1/2 |
+| QualityVariationItemEvents | 🟧🟧🟧🟧🟧🟧🟧🟧🟧🟧⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 50.0% | 1/2 |
+| QualityVariationItemOpportunities | 🟥🟥🟥🟥🟥🟥🟥🟥⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 40.0% | 2/5 |
+| Report | 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩 | 100.0% | 10/10 |
+| Security | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/5 |
+| Settings | 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩 | 100.0% | 5/5 |
+| StrategicOpportunity | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/22 |
+| StrategicOpportunitySecurity | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/3 |
+| UserSettings | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/2 |
+| Users | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/9 |
+| UtilizationVariation | ⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 0.0% | 0/2 |
+| VariationCaseTypes | 🟥🟥🟥🟥🟥🟥🟥⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 33.3% | 1/3 |
+| VariationOpportunities | 🟥🟥🟥🟥🟥🟥🟥🟥⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜ | 40.0% | 2/5 |
+
+**Heatmap Legend:** 🟩 ≥90% | 🟨 70-89% | 🟧 50-69% | 🟥 <50%
+
+## Endpoint Coverage by Controller
+
+### AllOpportunities
+
+**Coverage:** 5/6 (83.3%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/AllOpportunities/get_api_v1_all_opportunities_configurationGuid_filter_options) | `GET` | `/api/v1/all-opportunities/{configurationGuid}/filter-options` |
+| 2 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/AllOpportunities/post_api_v1_all_opportunities) | `POST` | `/api/v1/all-opportunities` |
+| 3 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/AllOpportunities/post_api_v1_all_opportunities_export) | `POST` | `/api/v1/all-opportunities/export` |
+| 4 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/AllOpportunities/put_api_v1_all_opportunities_opportunityGuid_set_hidden) | `PUT` | `/api/v1/all-opportunities/{opportunityGuid}/set-hidden` |
+| 5 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/AllOpportunities/put_api_v1_all_opportunities_opportunityGuid_set_note) | `PUT` | `/api/v1/all-opportunities/{opportunityGuid}/set-note` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/AllOpportunities/post_api_v1_all_opportunities_is_name_valid) | `POST` | `/api/v1/all-opportunities/is-name-valid` |
+
+### BackgroundClientJob
+
+**Coverage:** 1/1 (100.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/BackgroundClientJob/get_api_v1_background_client_job_jobId_status) | `GET` | `/api/v1/background-client-job/{jobId}/status` |
+
+### ChargeCodeInitiatives
+
+**Coverage:** 1/1 (100.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeInitiatives/post_api_v1_charge_code_initiatives_create) | `POST` | `/api/v1/charge-code-initiatives/create` |
+
+### ChargeCodeOpportunities
+
+**Coverage:** 12/17 (70.6%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/delete_api_v1_charge_code_opportunities_id_delete) | `DELETE` | `/api/v1/charge-code-opportunities/{id}/delete` |
+| 2 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/get_api_v1_charge_code_opportunities_opportunityGuid) | `GET` | `/api/v1/charge-code-opportunities/{opportunityGuid}` |
+| 3 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/get_api_v1_charge_code_opportunities_opportunityGuid_edit_model) | `GET` | `/api/v1/charge-code-opportunities/{opportunityGuid}/edit-model` |
+| 4 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/get_api_v1_charge_code_opportunities_opportunityGuid_initiative_info) | `GET` | `/api/v1/charge-code-opportunities/{opportunityGuid}/initiative-info` |
+| 5 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/get_api_v1_charge_code_opportunities_opportunity_create_enabled) | `GET` | `/api/v1/charge-code-opportunities/opportunity-create-enabled` |
+| 6 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/post_api_v1_charge_code_opportunities_charge_code_members) | `POST` | `/api/v1/charge-code-opportunities/charge-code-members` |
+| 7 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/post_api_v1_charge_code_opportunities_opportunity_metric_cohort_data) | `POST` | `/api/v1/charge-code-opportunities/opportunity-metric-cohort-data` |
+| 8 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/post_api_v1_charge_code_opportunities_refresh) | `POST` | `/api/v1/charge-code-opportunities/refresh` |
+| 9 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/post_api_v1_charge_code_opportunities_validate_opportunity_levels) | `POST` | `/api/v1/charge-code-opportunities/validate-opportunity-levels` |
+| 10 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/put_api_v1_charge_code_opportunities_opportunityGuid_set_hidden) | `PUT` | `/api/v1/charge-code-opportunities/{opportunityGuid}/set-hidden` |
+| 11 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/put_api_v1_charge_code_opportunities_opportunityGuid_update_goal_cost_per_unit) | `PUT` | `/api/v1/charge-code-opportunities/{opportunityGuid}/update-goal-cost-per-unit` |
+| 12 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/put_api_v1_charge_code_opportunities_opportunityGuid_update_opportunity) | `PUT` | `/api/v1/charge-code-opportunities/{opportunityGuid}/update-opportunity` |
+| 13 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/post_api_v1_charge_code_opportunities_opportunityGuid_export) | `POST` | `/api/v1/charge-code-opportunities/{opportunityGuid}/export` |
+| 14 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/post_api_v1_charge_code_opportunities_validate_charge_codes) | `POST` | `/api/v1/charge-code-opportunities/validate-charge-codes` |
+| 15 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/put_api_v1_charge_code_opportunities_opportunityGuid_set_note) | `PUT` | `/api/v1/charge-code-opportunities/{opportunityGuid}/set-note` |
+| 16 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/put_api_v1_charge_code_opportunities_opportunityGuid_update_goal_total_units_of_service) | `PUT` | `/api/v1/charge-code-opportunities/{opportunityGuid}/update-goal-total-units-of-service` |
+| 17 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunities/put_api_v1_charge_code_opportunities_opportunityGuid_update_goals) | `PUT` | `/api/v1/charge-code-opportunities/{opportunityGuid}/update-goals` |
+
+### ChargeCodeOpportunityDetails
+
+**Coverage:** 2/3 (66.7%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunityDetails/post_api_v1_charge_code_opportunity_details_refresh_baseline_details) | `POST` | `/api/v1/charge-code-opportunity-details/refresh-baseline-details` |
+| 2 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunityDetails/post_api_v1_charge_code_opportunity_details_refresh_tracking_details) | `POST` | `/api/v1/charge-code-opportunity-details/refresh-tracking-details` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpportunityDetails/post_api_v1_charge_code_opportunity_details_create) | `POST` | `/api/v1/charge-code-opportunity-details/create` |
+
+### ChargeCodeOpps
+
+**Coverage:** 4/5 (80.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpps/post_api_v1_charge_code_opps) | `POST` | `/api/v1/charge-code-opps` |
+| 2 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpps/post_api_v1_charge_code_opps_export) | `POST` | `/api/v1/charge-code-opps/export` |
+| 3 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpps/put_api_v1_charge_code_opps_opportunityGuid_set_hidden) | `PUT` | `/api/v1/charge-code-opps/{opportunityGuid}/set-hidden` |
+| 4 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpps/put_api_v1_charge_code_opps_opportunityGuid_set_note) | `PUT` | `/api/v1/charge-code-opps/{opportunityGuid}/set-note` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ChargeCodeOpps/get_api_v1_charge_code_opps_configurationGuid_filter_options) | `GET` | `/api/v1/charge-code-opps/{configurationGuid}/filter-options` |
+
+### ClientNetworkOpportunities
+
+**Coverage:** 0/7 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunities/delete_api_v1_client_network_opportunities_networkOpportunityId) | `DELETE` | `/api/v1/client-network-opportunities/{networkOpportunityId}` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunities/get_api_v1_client_network_opportunities_networkOpportunityId) | `GET` | `/api/v1/client-network-opportunities/{networkOpportunityId}` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunities/post_api_v1_client_network_opportunities_opportunities) | `POST` | `/api/v1/client-network-opportunities/opportunities` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunities/put_api_v1_client_network_opportunities_networkOpportunityId) | `PUT` | `/api/v1/client-network-opportunities/{networkOpportunityId}` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunities/put_api_v1_client_network_opportunities_networkOpportunityId_publish) | `PUT` | `/api/v1/client-network-opportunities/{networkOpportunityId}/publish` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunities/put_api_v1_client_network_opportunities_networkOpportunityId_revert_workbook_to_template) | `PUT` | `/api/v1/client-network-opportunities/{networkOpportunityId}/revert-workbook-to-template` |
+| 7 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunities/put_api_v1_client_network_opportunities_update_initiative_status_networkOpportunityId) | `PUT` | `/api/v1/client-network-opportunities/update-initiative-status/{networkOpportunityId}` |
+
+### ClientNetworkOpportunityLink
+
+**Coverage:** 0/6 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunityLink/delete_api_v1_client_network_opportunity_link_initiativeGuid_delete_initiative_link) | `DELETE` | `/api/v1/client-network-opportunity-link/{initiativeGuid}/delete-initiative-link` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunityLink/delete_api_v1_client_network_opportunity_link_opportunityGuid_configurationGuid) | `DELETE` | `/api/v1/client-network-opportunity-link/{opportunityGuid}/{configurationGuid}` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunityLink/delete_api_v1_client_network_opportunity_link_delete_initiative_link) | `DELETE` | `/api/v1/client-network-opportunity-link/delete-initiative-link` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunityLink/delete_api_v1_client_network_opportunity_link_delete_opportunity_link) | `DELETE` | `/api/v1/client-network-opportunity-link/delete-opportunity-link` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunityLink/post_api_v1_client_network_opportunity_link) | `POST` | `/api/v1/client-network-opportunity-link` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientNetworkOpportunityLink/put_api_v1_client_network_opportunity_link) | `PUT` | `/api/v1/client-network-opportunity-link` |
+
+### ClientOpportunityTypeWorkbooks
+
+**Coverage:** 0/3 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientOpportunityTypeWorkbooks/delete_api_v1_client_opportunity_type_workbooks_opportunityType_workbooks_workbookId) | `DELETE` | `/api/v1/client-opportunity-type-workbooks/{opportunityType}/workbooks/{workbookId}` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientOpportunityTypeWorkbooks/get_api_v1_client_opportunity_type_workbooks_opportunityType) | `GET` | `/api/v1/client-opportunity-type-workbooks/{opportunityType}` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientOpportunityTypeWorkbooks/post_api_v1_client_opportunity_type_workbooks) | `POST` | `/api/v1/client-opportunity-type-workbooks` |
+
+### ClientOpportunityWorkbooks
+
+**Coverage:** 0/4 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientOpportunityWorkbooks/delete_api_v1_client_opportunity_workbooks_opportunityGuid_workbooks_workbookId) | `DELETE` | `/api/v1/client-opportunity-workbooks/{opportunityGuid}/workbooks/{workbookId}` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientOpportunityWorkbooks/get_api_v1_client_opportunity_workbooks_opportunityGuid) | `GET` | `/api/v1/client-opportunity-workbooks/{opportunityGuid}` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientOpportunityWorkbooks/get_api_v1_client_opportunity_workbooks_workbooks) | `GET` | `/api/v1/client-opportunity-workbooks/workbooks` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientOpportunityWorkbooks/post_api_v1_client_opportunity_workbooks) | `POST` | `/api/v1/client-opportunity-workbooks` |
+
+### ClientWarehouses
+
+**Coverage:** 1/3 (33.3%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔵](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientWarehouses/get_api_v1_client_warehouses) | `GET` | `/api/v1/client-warehouses` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientWarehouses/delete_api_v1_client_warehouses_databaseGuid) | `DELETE` | `/api/v1/client-warehouses/{databaseGuid}` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ClientWarehouses/post_api_v1_client_warehouses) | `POST` | `/api/v1/client-warehouses` |
+
+### Comments
+
+**Coverage:** 0/2 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Comments/post_api_v1_comments) | `POST` | `/api/v1/comments` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Comments/post_api_v1_comments_create) | `POST` | `/api/v1/comments/create` |
+
+### Configurations
+
+**Coverage:** 1/4 (25.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔵](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Configurations/get_api_v1_configurations) | `GET` | `/api/v1/configurations` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Configurations/get_api_v1_configurations_configurationGuid_configuration_entities) | `GET` | `/api/v1/configurations/{configurationGuid}/configuration-entities` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Configurations/get_api_v1_configurations_configurationGuid_configuration_entity_info) | `GET` | `/api/v1/configurations/{configurationGuid}/configuration-entity-info` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Configurations/get_api_v1_configurations_configurationGuid_configuration_service_line_info) | `GET` | `/api/v1/configurations/{configurationGuid}/configuration-service-line-info` |
+
+### Databases
+
+**Coverage:** 0/1 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Databases/get_api_v1_databases) | `GET` | `/api/v1/databases` |
+
+### DeviceIdentifiers
+
+**Coverage:** 0/1 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/DeviceIdentifiers/post_api_v1_device_identifiers_clear_device_identifiers) | `POST` | `/api/v1/device-identifiers/clear-device-identifiers` |
+
+### EncounterOpportunities
+
+**Coverage:** 11/14 (78.6%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/get_api_v1_encounter_opportunities_configurationGuid_filter_options) | `GET` | `/api/v1/encounter-opportunities/{configurationGuid}/filter-options` |
+| 2 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/get_api_v1_encounter_opportunities_opportunityGuid) | `GET` | `/api/v1/encounter-opportunities/{opportunityGuid}` |
+| 3 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/get_api_v1_encounter_opportunities_opportunityGuid_edit_model) | `GET` | `/api/v1/encounter-opportunities/{opportunityGuid}/edit-model` |
+| 4 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/get_api_v1_encounter_opportunities_opportunityGuid_initiative_info) | `GET` | `/api/v1/encounter-opportunities/{opportunityGuid}/initiative-info` |
+| 5 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/get_api_v1_encounter_opportunities_tempo_page_enabled) | `GET` | `/api/v1/encounter-opportunities/tempo-page-enabled` |
+| 6 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/post_api_v1_encounter_opportunities) | `POST` | `/api/v1/encounter-opportunities` |
+| 7 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/post_api_v1_encounter_opportunities_create) | `POST` | `/api/v1/encounter-opportunities/create` |
+| 8 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/post_api_v1_encounter_opportunities_export) | `POST` | `/api/v1/encounter-opportunities/export` |
+| 9 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/post_api_v1_encounter_opportunities_opportunity_metric_cohort_data) | `POST` | `/api/v1/encounter-opportunities/opportunity-metric-cohort-data` |
+| 10 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/put_api_v1_encounter_opportunities_opportunityGuid_set_note) | `PUT` | `/api/v1/encounter-opportunities/{opportunityGuid}/set-note` |
+| 11 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/put_api_v1_encounter_opportunities_opportunityGuid_update_opportunity) | `PUT` | `/api/v1/encounter-opportunities/{opportunityGuid}/update-opportunity` |
+| 12 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/delete_api_v1_encounter_opportunities_id_delete) | `DELETE` | `/api/v1/encounter-opportunities/{id}/delete` |
+| 13 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/put_api_v1_encounter_opportunities_opportunityGuid_set_hidden) | `PUT` | `/api/v1/encounter-opportunities/{opportunityGuid}/set-hidden` |
+| 14 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/EncounterOpportunities/put_api_v1_encounter_opportunities_opportunityGuid_update_goals) | `PUT` | `/api/v1/encounter-opportunities/{opportunityGuid}/update-goals` |
+
+### Encounters
+
+**Coverage:** 0/7 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Encounters/post_api_v1_encounters) | `POST` | `/api/v1/encounters` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Encounters/post_api_v1_encounters_cost_info) | `POST` | `/api/v1/encounters/cost-info` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Encounters/post_api_v1_encounters_department_unit_of_service_info) | `POST` | `/api/v1/encounters/department-unit-of-service-info` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Encounters/post_api_v1_encounters_encounter_charge_info) | `POST` | `/api/v1/encounters/encounter-charge-info` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Encounters/post_api_v1_encounters_los_opportunity_info) | `POST` | `/api/v1/encounters/los-opportunity-info` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Encounters/post_api_v1_encounters_unit_of_service_info) | `POST` | `/api/v1/encounters/unit-of-service-info` |
+| 7 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Encounters/post_api_v1_encounters_variation_encounter_charge_info) | `POST` | `/api/v1/encounters/variation-encounter-charge-info` |
+
+### Exploration
+
+**Coverage:** 0/4 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Exploration/get_api_v1_exploration_flexible_exploration_information_page) | `GET` | `/api/v1/exploration/flexible-exploration-information-page` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Exploration/post_api_v1_exploration_case_type_family_cost_driver_info) | `POST` | `/api/v1/exploration/case-type-family-cost-driver-info` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Exploration/post_api_v1_exploration_case_type_family_details) | `POST` | `/api/v1/exploration/case-type-family-details` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Exploration/post_api_v1_exploration_case_type_family_summary) | `POST` | `/api/v1/exploration/case-type-family-summary` |
+
+### ExplorationOpportunities
+
+**Coverage:** 0/12 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationOpportunities/delete_api_v1_exploration_opportunities_opportunityGuid) | `DELETE` | `/api/v1/exploration-opportunities/{opportunityGuid}` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationOpportunities/get_api_v1_exploration_opportunities_configurationGuid_filter_options) | `GET` | `/api/v1/exploration-opportunities/{configurationGuid}/filter-options` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationOpportunities/get_api_v1_exploration_opportunities_opportunityGuid) | `GET` | `/api/v1/exploration-opportunities/{opportunityGuid}` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationOpportunities/get_api_v1_exploration_opportunities_enabled) | `GET` | `/api/v1/exploration-opportunities/enabled` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationOpportunities/post_api_v1_exploration_opportunities) | `POST` | `/api/v1/exploration-opportunities` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationOpportunities/post_api_v1_exploration_opportunities_create) | `POST` | `/api/v1/exploration-opportunities/create` |
+| 7 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationOpportunities/post_api_v1_exploration_opportunities_export) | `POST` | `/api/v1/exploration-opportunities/export` |
+| 8 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationOpportunities/put_api_v1_exploration_opportunities_opportunityGuid_check_workbook) | `PUT` | `/api/v1/exploration-opportunities/{opportunityGuid}/check-workbook` |
+| 9 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationOpportunities/put_api_v1_exploration_opportunities_opportunityGuid_set_hidden) | `PUT` | `/api/v1/exploration-opportunities/{opportunityGuid}/set-hidden` |
+| 10 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationOpportunities/put_api_v1_exploration_opportunities_opportunityGuid_set_note) | `PUT` | `/api/v1/exploration-opportunities/{opportunityGuid}/set-note` |
+| 11 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationOpportunities/put_api_v1_exploration_opportunities_opportunityGuid_set_status) | `PUT` | `/api/v1/exploration-opportunities/{opportunityGuid}/set-status` |
+| 12 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationOpportunities/put_api_v1_exploration_opportunities_opportunityGuid_update) | `PUT` | `/api/v1/exploration-opportunities/{opportunityGuid}/update` |
+
+### ExplorationPopulations
+
+**Coverage:** 1/12 (8.3%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔵](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationPopulations/get_api_v1_exploration_populations) | `GET` | `/api/v1/exploration-populations` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationPopulations/delete_api_v1_exploration_populations_populationId) | `DELETE` | `/api/v1/exploration-populations/{populationId}` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationPopulations/get_api_v1_exploration_populations_populationId) | `GET` | `/api/v1/exploration-populations/{populationId}` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationPopulations/get_api_v1_exploration_populations_populationId_details) | `GET` | `/api/v1/exploration-populations/{populationId}/details` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationPopulations/get_api_v1_exploration_populations_populationId_discharge_dates) | `GET` | `/api/v1/exploration-populations/{populationId}/discharge-dates` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationPopulations/get_api_v1_exploration_populations_populationId_encounters) | `GET` | `/api/v1/exploration-populations/{populationId}/encounters` |
+| 7 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationPopulations/get_api_v1_exploration_populations_info_populationId) | `GET` | `/api/v1/exploration-populations/info/{populationId}` |
+| 8 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationPopulations/get_api_v1_exploration_populations_replicate_population) | `GET` | `/api/v1/exploration-populations/replicate-population` |
+| 9 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationPopulations/post_api_v1_exploration_populations) | `POST` | `/api/v1/exploration-populations` |
+| 10 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationPopulations/post_api_v1_exploration_populations_populationId_opportunities) | `POST` | `/api/v1/exploration-populations/{populationId}/opportunities` |
+| 11 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationPopulations/post_api_v1_exploration_populations_is_name_unique) | `POST` | `/api/v1/exploration-populations/is-name-unique` |
+| 12 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/ExplorationPopulations/put_api_v1_exploration_populations_populationId) | `PUT` | `/api/v1/exploration-populations/{populationId}` |
+
+### Filters
+
+**Coverage:** 0/4 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Filters/get_api_v1_filters_cost_component_filters) | `GET` | `/api/v1/filters/cost-component-filters` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Filters/get_api_v1_filters_cost_driver_filters) | `GET` | `/api/v1/filters/cost-driver-filters` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Filters/get_api_v1_filters_sph_criteria_filters_chipKey) | `GET` | `/api/v1/filters/sph-criteria-filters/{chipKey}` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Filters/get_api_v1_filters_supply_filters) | `GET` | `/api/v1/filters/supply-filters` |
+
+### FreeFormOpportunities
+
+**Coverage:** 7/10 (70.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/FreeFormOpportunities/get_api_v1_free_form_opportunities_configurationGuid_filter_options) | `GET` | `/api/v1/free-form-opportunities/{configurationGuid}/filter-options` |
+| 2 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/FreeFormOpportunities/get_api_v1_free_form_opportunities_opportunityGuid) | `GET` | `/api/v1/free-form-opportunities/{opportunityGuid}` |
+| 3 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/FreeFormOpportunities/get_api_v1_free_form_opportunities_opportunityGuid_initiative) | `GET` | `/api/v1/free-form-opportunities/{opportunityGuid}/initiative` |
+| 4 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/FreeFormOpportunities/post_api_v1_free_form_opportunities) | `POST` | `/api/v1/free-form-opportunities` |
+| 5 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/FreeFormOpportunities/post_api_v1_free_form_opportunities_create) | `POST` | `/api/v1/free-form-opportunities/create` |
+| 6 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/FreeFormOpportunities/post_api_v1_free_form_opportunities_export) | `POST` | `/api/v1/free-form-opportunities/export` |
+| 7 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/FreeFormOpportunities/put_api_v1_free_form_opportunities_opportunityGuid_set_note) | `PUT` | `/api/v1/free-form-opportunities/{opportunityGuid}/set-note` |
+| 8 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/FreeFormOpportunities/delete_api_v1_free_form_opportunities_id_delete) | `DELETE` | `/api/v1/free-form-opportunities/{id}/delete` |
+| 9 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/FreeFormOpportunities/post_api_v1_free_form_opportunities_opportunityGuid_set_goals) | `POST` | `/api/v1/free-form-opportunities/{opportunityGuid}/set-goals` |
+| 10 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/FreeFormOpportunities/put_api_v1_free_form_opportunities_opportunityGuid_set_hidden) | `PUT` | `/api/v1/free-form-opportunities/{opportunityGuid}/set-hidden` |
+
+### GMDNFileUpload
+
+**Coverage:** 0/1 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/GMDNFileUpload/post_api_v1_gmdnfile_upload_fileType_upload_gmdnfile) | `POST` | `/api/v1/gmdnfile-upload/{fileType}/upload-gmdnfile` |
+
+### GeneralLedgerDetails
+
+**Coverage:** 0/2 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/GeneralLedgerDetails/post_api_v1_general_ledger_details_configurationGuid_department_data) | `POST` | `/api/v1/general-ledger-details/{configurationGuid}/department-data` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/GeneralLedgerDetails/post_api_v1_general_ledger_details_configurationGuid_statistic_data) | `POST` | `/api/v1/general-ledger-details/{configurationGuid}/statistic-data` |
+
+### GeneralLedgerOpportunities
+
+**Coverage:** 1/7 (14.3%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/GeneralLedgerOpportunities/post_api_v1_general_ledger_opportunities) | `POST` | `/api/v1/general-ledger-opportunities` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/GeneralLedgerOpportunities/delete_api_v1_general_ledger_opportunities_id_delete) | `DELETE` | `/api/v1/general-ledger-opportunities/{id}/delete` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/GeneralLedgerOpportunities/get_api_v1_general_ledger_opportunities_configurationGuid_filter_options) | `GET` | `/api/v1/general-ledger-opportunities/{configurationGuid}/filter-options` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/GeneralLedgerOpportunities/post_api_v1_general_ledger_opportunities_create) | `POST` | `/api/v1/general-ledger-opportunities/create` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/GeneralLedgerOpportunities/post_api_v1_general_ledger_opportunities_export) | `POST` | `/api/v1/general-ledger-opportunities/export` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/GeneralLedgerOpportunities/put_api_v1_general_ledger_opportunities_opportunityGuid_set_hidden) | `PUT` | `/api/v1/general-ledger-opportunities/{opportunityGuid}/set-hidden` |
+| 7 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/GeneralLedgerOpportunities/put_api_v1_general_ledger_opportunities_opportunityGuid_set_note) | `PUT` | `/api/v1/general-ledger-opportunities/{opportunityGuid}/set-note` |
+
+### GudidFile
+
+**Coverage:** 0/2 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/GudidFile/get_api_v1_gudid_file_datadog_url) | `GET` | `/api/v1/gudid-file/datadog-url` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/GudidFile/post_api_v1_gudid_file_dataGroup_seed_gudid) | `POST` | `/api/v1/gudid-file/{dataGroup}/seed-gudid` |
+
+### Hangfire
+
+**Coverage:** 0/3 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Hangfire/get_api_v1_hangfire_jobId_job_status) | `GET` | `/api/v1/hangfire/{jobId}/job-status` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Hangfire/get_api_v1_hangfire_access_gudid_url) | `GET` | `/api/v1/hangfire/access-gudid-url` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Hangfire/get_api_v1_hangfire_datadog_url) | `GET` | `/api/v1/hangfire/datadog-url` |
+
+### InitiativeDetailColumns
+
+**Coverage:** 0/3 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/InitiativeDetailColumns/get_api_v1_initiative_detail_columns_column_list) | `GET` | `/api/v1/initiative-detail-columns/column-list` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/InitiativeDetailColumns/get_api_v1_initiative_detail_columns_default_column_list) | `GET` | `/api/v1/initiative-detail-columns/default-column-list` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/InitiativeDetailColumns/post_api_v1_initiative_detail_columns_set_column_list) | `POST` | `/api/v1/initiative-detail-columns/set-column-list` |
+
+### InitiativeRollupColumns
+
+**Coverage:** 0/8 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/InitiativeRollupColumns/delete_api_v1_initiative_rollup_columns_initiativeRollupColumnId) | `DELETE` | `/api/v1/initiative-rollup-columns/{initiativeRollupColumnId}` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/InitiativeRollupColumns/get_api_v1_initiative_rollup_columns) | `GET` | `/api/v1/initiative-rollup-columns` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/InitiativeRollupColumns/get_api_v1_initiative_rollup_columns_initiativeRollupColumnId) | `GET` | `/api/v1/initiative-rollup-columns/{initiativeRollupColumnId}` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/InitiativeRollupColumns/get_api_v1_initiative_rollup_columns_initiativeRollupColumnId_values) | `GET` | `/api/v1/initiative-rollup-columns/{initiativeRollupColumnId}/values` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/InitiativeRollupColumns/post_api_v1_initiative_rollup_columns) | `POST` | `/api/v1/initiative-rollup-columns` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/InitiativeRollupColumns/post_api_v1_initiative_rollup_columns_is_name_valid_initiativeRollupColumnId) | `POST` | `/api/v1/initiative-rollup-columns/is-name-valid/{initiativeRollupColumnId}` |
+| 7 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/InitiativeRollupColumns/put_api_v1_initiative_rollup_columns_initiativeRollupColumnId) | `PUT` | `/api/v1/initiative-rollup-columns/{initiativeRollupColumnId}` |
+| 8 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/InitiativeRollupColumns/put_api_v1_initiative_rollup_columns_initiativeRollupColumnId_add_rollup_value) | `PUT` | `/api/v1/initiative-rollup-columns/{initiativeRollupColumnId}/add-rollup-value` |
+
+### Initiatives
+
+**Coverage:** 17/23 (73.9%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/get_api_v1_initiatives_configurationGuid_filter_options) | `GET` | `/api/v1/initiatives/{configurationGuid}/filter-options` |
+| 2 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/get_api_v1_initiatives_initiativeGuid) | `GET` | `/api/v1/initiatives/{initiativeGuid}` |
+| 3 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/get_api_v1_initiatives_initiativeGuid_finalize) | `GET` | `/api/v1/initiatives/{initiativeGuid}/finalize` |
+| 4 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/get_api_v1_initiatives_initiativeGuid_initiative_info) | `GET` | `/api/v1/initiatives/{initiativeGuid}/initiative-info` |
+| 5 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/get_api_v1_initiatives_criteria) | `GET` | `/api/v1/initiatives/criteria` |
+| 6 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/get_api_v1_initiatives_scores_initiativeGuid) | `GET` | `/api/v1/initiatives/scores/{initiativeGuid}` |
+| 7 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/get_api_v1_initiatives_workstreams) | `GET` | `/api/v1/initiatives/workstreams` |
+| 8 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/post_api_v1_initiatives) | `POST` | `/api/v1/initiatives` |
+| 9 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/post_api_v1_initiatives_create_charge_code) | `POST` | `/api/v1/initiatives/create-charge-code` |
+| 10 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/post_api_v1_initiatives_create_encounter) | `POST` | `/api/v1/initiatives/create-encounter` |
+| 11 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/post_api_v1_initiatives_create_free_form) | `POST` | `/api/v1/initiatives/create-free-form` |
+| 12 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/post_api_v1_initiatives_create_general_ledger) | `POST` | `/api/v1/initiatives/create-general-ledger` |
+| 13 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/post_api_v1_initiatives_export) | `POST` | `/api/v1/initiatives/export` |
+| 14 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/post_api_v1_initiatives_update_charge_code) | `POST` | `/api/v1/initiatives/update-charge-code` |
+| 15 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/post_api_v1_initiatives_update_encounter) | `POST` | `/api/v1/initiatives/update-encounter` |
+| 16 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/put_api_v1_initiatives_set_initiative_rollup_value) | `PUT` | `/api/v1/initiatives/set-initiative-rollup-value` |
+| 17 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/put_api_v1_initiatives_set_scores) | `PUT` | `/api/v1/initiatives/set-scores` |
+| 18 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/get_api_v1_initiatives_filter_settings) | `GET` | `/api/v1/initiatives/filter-settings` |
+| 19 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/get_api_v1_initiatives_opportunity_guid_by_name) | `GET` | `/api/v1/initiatives/opportunity-guid-by-name` |
+| 20 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/post_api_v1_initiatives_create_payroll) | `POST` | `/api/v1/initiatives/create-payroll` |
+| 21 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/post_api_v1_initiatives_set_filter_settings) | `POST` | `/api/v1/initiatives/set-filter-settings` |
+| 22 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/post_api_v1_initiatives_update_free_form) | `POST` | `/api/v1/initiatives/update-free-form` |
+| 23 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Initiatives/put_api_v1_initiatives_set_rampup_info) | `PUT` | `/api/v1/initiatives/set-rampup-info` |
+
+### MappedColumns
+
+**Coverage:** 0/2 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/MappedColumns/get_api_v1_mapped_columns_column_list) | `GET` | `/api/v1/mapped-columns/column-list` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/MappedColumns/post_api_v1_mapped_columns_set_column_list) | `POST` | `/api/v1/mapped-columns/set-column-list` |
+
+### NetworkOpportunities
+
+**Coverage:** 0/6 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/NetworkOpportunities/delete_api_v1_network_opportunities_networkOpportunityId) | `DELETE` | `/api/v1/network-opportunities/{networkOpportunityId}` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/NetworkOpportunities/get_api_v1_network_opportunities_enabled) | `GET` | `/api/v1/network-opportunities/enabled` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/NetworkOpportunities/get_api_v1_network_opportunities_is_creator) | `GET` | `/api/v1/network-opportunities/is-creator` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/NetworkOpportunities/post_api_v1_network_opportunities_create) | `POST` | `/api/v1/network-opportunities/create` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/NetworkOpportunities/post_api_v1_network_opportunities_opportunities) | `POST` | `/api/v1/network-opportunities/opportunities` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/NetworkOpportunities/put_api_v1_network_opportunities_networkOpportunityId) | `PUT` | `/api/v1/network-opportunities/{networkOpportunityId}` |
+
+### OpportunityTypeWorkbooks
+
+**Coverage:** 0/3 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/OpportunityTypeWorkbooks/delete_api_v1_opportunity_type_workbooks_opportunityType_workbook_workbookId) | `DELETE` | `/api/v1/opportunity-type-workbooks/{opportunityType}/workbook/{workbookId}` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/OpportunityTypeWorkbooks/get_api_v1_opportunity_type_workbooks_opportunityType) | `GET` | `/api/v1/opportunity-type-workbooks/{opportunityType}` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/OpportunityTypeWorkbooks/post_api_v1_opportunity_type_workbooks) | `POST` | `/api/v1/opportunity-type-workbooks` |
+
+### OpportunityWorkbooks
+
+**Coverage:** 0/7 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/OpportunityWorkbooks/delete_api_v1_opportunity_workbooks_opportunityGuid_workbook_workbookId) | `DELETE` | `/api/v1/opportunity-workbooks/{opportunityGuid}/workbook/{workbookId}` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/OpportunityWorkbooks/delete_api_v1_opportunity_workbooks_strategic_opportunityId_workbook_workbookId) | `DELETE` | `/api/v1/opportunity-workbooks/strategic/{opportunityId}/workbook/{workbookId}` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/OpportunityWorkbooks/get_api_v1_opportunity_workbooks_opportunityGuid) | `GET` | `/api/v1/opportunity-workbooks/{opportunityGuid}` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/OpportunityWorkbooks/get_api_v1_opportunity_workbooks_opportunity_workbooks_enabled) | `GET` | `/api/v1/opportunity-workbooks/opportunity-workbooks-enabled` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/OpportunityWorkbooks/get_api_v1_opportunity_workbooks_strategic_opportunityId) | `GET` | `/api/v1/opportunity-workbooks/strategic/{opportunityId}` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/OpportunityWorkbooks/post_api_v1_opportunity_workbooks) | `POST` | `/api/v1/opportunity-workbooks` |
+| 7 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/OpportunityWorkbooks/post_api_v1_opportunity_workbooks_strategic) | `POST` | `/api/v1/opportunity-workbooks/strategic` |
+
+### PayrollOpportunities
+
+**Coverage:** 2/10 (20.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔵](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PayrollOpportunities/get_api_v1_payroll_opportunities_opportunityGuid) | `GET` | `/api/v1/payroll-opportunities/{opportunityGuid}` |
+| 2 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PayrollOpportunities/post_api_v1_payroll_opportunities) | `POST` | `/api/v1/payroll-opportunities` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PayrollOpportunities/delete_api_v1_payroll_opportunities_id_delete) | `DELETE` | `/api/v1/payroll-opportunities/{id}/delete` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PayrollOpportunities/get_api_v1_payroll_opportunities_configurationGuid_filter_options) | `GET` | `/api/v1/payroll-opportunities/{configurationGuid}/filter-options` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PayrollOpportunities/get_api_v1_payroll_opportunities_opportunityGuid_initiative_info) | `GET` | `/api/v1/payroll-opportunities/{opportunityGuid}/initiative-info` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PayrollOpportunities/get_api_v1_payroll_opportunities_tempo_page_enabled) | `GET` | `/api/v1/payroll-opportunities/tempo-page-enabled` |
+| 7 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PayrollOpportunities/post_api_v1_payroll_opportunities_create) | `POST` | `/api/v1/payroll-opportunities/create` |
+| 8 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PayrollOpportunities/post_api_v1_payroll_opportunities_export) | `POST` | `/api/v1/payroll-opportunities/export` |
+| 9 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PayrollOpportunities/put_api_v1_payroll_opportunities_opportunityGuid_set_hidden) | `PUT` | `/api/v1/payroll-opportunities/{opportunityGuid}/set-hidden` |
+| 10 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PayrollOpportunities/put_api_v1_payroll_opportunities_opportunityGuid_set_note) | `PUT` | `/api/v1/payroll-opportunities/{opportunityGuid}/set-note` |
+
+### PeerGroup
+
+**Coverage:** 0/7 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PeerGroup/delete_api_v1_peer_group_peerGroupId) | `DELETE` | `/api/v1/peer-group/{peerGroupId}` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PeerGroup/get_api_v1_peer_group) | `GET` | `/api/v1/peer-group` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PeerGroup/get_api_v1_peer_group_peerGroupId) | `GET` | `/api/v1/peer-group/{peerGroupId}` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PeerGroup/get_api_v1_peer_group_dropdown_items) | `GET` | `/api/v1/peer-group/dropdown-items` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PeerGroup/post_api_v1_peer_group) | `POST` | `/api/v1/peer-group` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PeerGroup/post_api_v1_peer_group_is_name_valid_peerGroupId) | `POST` | `/api/v1/peer-group/is-name-valid/{peerGroupId}` |
+| 7 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PeerGroup/put_api_v1_peer_group_peerGroupId) | `PUT` | `/api/v1/peer-group/{peerGroupId}` |
+
+### PickerItems
+
+**Coverage:** 1/1 (100.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/PickerItems/get_api_v1_picker_items_explorations) | `GET` | `/api/v1/picker-items/explorations` |
+
+### QualityVariationItemBreakdowns
+
+**Coverage:** 1/2 (50.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/QualityVariationItemBreakdowns/post_api_v1_quality_variation_item_breakdowns) | `POST` | `/api/v1/quality-variation-item-breakdowns` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/QualityVariationItemBreakdowns/get_api_v1_quality_variation_item_breakdowns_configurationGuid_filter_options) | `GET` | `/api/v1/quality-variation-item-breakdowns/{configurationGuid}/filter-options` |
+
+### QualityVariationItemEvents
+
+**Coverage:** 1/2 (50.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/QualityVariationItemEvents/post_api_v1_quality_variation_item_events) | `POST` | `/api/v1/quality-variation-item-events` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/QualityVariationItemEvents/get_api_v1_quality_variation_item_events_configurationGuid_filter_options) | `GET` | `/api/v1/quality-variation-item-events/{configurationGuid}/filter-options` |
+
+### QualityVariationItemOpportunities
+
+**Coverage:** 2/5 (40.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/QualityVariationItemOpportunities/post_api_v1_quality_variation_item_opportunities) | `POST` | `/api/v1/quality-variation-item-opportunities` |
+| 2 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/QualityVariationItemOpportunities/post_api_v1_quality_variation_item_opportunities_export) | `POST` | `/api/v1/quality-variation-item-opportunities/export` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/QualityVariationItemOpportunities/get_api_v1_quality_variation_item_opportunities_configurationGuid_filter_options) | `GET` | `/api/v1/quality-variation-item-opportunities/{configurationGuid}/filter-options` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/QualityVariationItemOpportunities/put_api_v1_quality_variation_item_opportunities_opportunityGuid_set_hidden) | `PUT` | `/api/v1/quality-variation-item-opportunities/{opportunityGuid}/set-hidden` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/QualityVariationItemOpportunities/put_api_v1_quality_variation_item_opportunities_opportunityGuid_set_note) | `PUT` | `/api/v1/quality-variation-item-opportunities/{opportunityGuid}/set-note` |
+
+### Report
+
+**Coverage:** 10/10 (100.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Report/delete_api_v1_report_remove_by_module) | `DELETE` | `/api/v1/report/remove-by-module` |
+| 2 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Report/delete_api_v1_report_remove_by_opportunity) | `DELETE` | `/api/v1/report/remove-by-opportunity` |
+| 3 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Report/get_api_v1_report_folderGuidfolder_reports) | `GET` | `/api/v1/report/{folderGuid}folder-reports` |
+| 4 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Report/get_api_v1_report_opportunityGuid_by_opportunity) | `GET` | `/api/v1/report/{opportunityGuid}/by-opportunity` |
+| 5 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Report/get_api_v1_report_sourceOfSavings_by_module) | `GET` | `/api/v1/report/{sourceOfSavings}/by-module` |
+| 6 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Report/get_api_v1_report_folders) | `GET` | `/api/v1/report/folders` |
+| 7 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Report/get_api_v1_report_reports) | `GET` | `/api/v1/report/reports` |
+| 8 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Report/post_api_v1_report_add_by_module) | `POST` | `/api/v1/report/add-by-module` |
+| 9 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Report/post_api_v1_report_add_by_opportunity) | `POST` | `/api/v1/report/add-by-opportunity` |
+| 10 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Report/post_api_v1_report_reports) | `POST` | `/api/v1/report/reports` |
+
+### Security
+
+**Coverage:** 0/5 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Security/get_api_v1_security_lootId) | `GET` | `/api/v1/security/{lootId}` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Security/get_api_v1_security_lootId_simple_securities) | `GET` | `/api/v1/security/{lootId}/simple-securities` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Security/get_api_v1_security_general_access_permission) | `GET` | `/api/v1/security/general-access-permission` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Security/get_api_v1_security_identities) | `GET` | `/api/v1/security/identities` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Security/put_api_v1_security_lootId_set_simple_securities) | `PUT` | `/api/v1/security/{lootId}/set-simple-securities` |
+
+### Settings
+
+**Coverage:** 5/5 (100.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Settings/get_api_v1_settings_charge_code_limit) | `GET` | `/api/v1/settings/charge-code-limit` |
+| 2 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Settings/get_api_v1_settings_feature_flags) | `GET` | `/api/v1/settings/feature-flags` |
+| 3 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Settings/get_api_v1_settings_opportunity_level_limit) | `GET` | `/api/v1/settings/opportunity-level-limit` |
+| 4 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Settings/get_api_v1_settings_performance_engine_calculations) | `GET` | `/api/v1/settings/performance-engine-calculations` |
+| 5 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Settings/post_api_v1_settings_system_settings) | `POST` | `/api/v1/settings/system-settings` |
+
+### StrategicOpportunity
+
+**Coverage:** 0/22 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/delete_api_v1_strategic_opportunity_opportunityId_charge_code) | `DELETE` | `/api/v1/strategic-opportunity/{opportunityId}/charge-code` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/get_api_v1_strategic_opportunity) | `GET` | `/api/v1/strategic-opportunity` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/get_api_v1_strategic_opportunity_opportunityId) | `GET` | `/api/v1/strategic-opportunity/{opportunityId}` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/get_api_v1_strategic_opportunity_opportunityId_general_info) | `GET` | `/api/v1/strategic-opportunity/{opportunityId}/general-info` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/get_api_v1_strategic_opportunity_opportunityId_layout) | `GET` | `/api/v1/strategic-opportunity/{opportunityId}/layout` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/get_api_v1_strategic_opportunity_opportunityId_opportunity) | `GET` | `/api/v1/strategic-opportunity/{opportunityId}/opportunity` |
+| 7 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/get_api_v1_strategic_opportunity_opportunityId_primary_measure) | `GET` | `/api/v1/strategic-opportunity/{opportunityId}/primary-measure` |
+| 8 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/get_api_v1_strategic_opportunity_opportunityId_ramp_ups) | `GET` | `/api/v1/strategic-opportunity/{opportunityId}/ramp-ups` |
+| 9 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/get_api_v1_strategic_opportunity_opportunityId_run_tracking_task) | `GET` | `/api/v1/strategic-opportunity/{opportunityId}/run-tracking-task` |
+| 10 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/get_api_v1_strategic_opportunity_initiatives) | `GET` | `/api/v1/strategic-opportunity/initiatives` |
+| 11 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/post_api_v1_strategic_opportunity_opportunityId_copy) | `POST` | `/api/v1/strategic-opportunity/{opportunityId}/copy` |
+| 12 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/post_api_v1_strategic_opportunity_opportunityId_detail) | `POST` | `/api/v1/strategic-opportunity/{opportunityId}/detail` |
+| 13 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/post_api_v1_strategic_opportunity_charge_code) | `POST` | `/api/v1/strategic-opportunity/charge-code` |
+| 14 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/post_api_v1_strategic_opportunity_is_name_valid) | `POST` | `/api/v1/strategic-opportunity/is-name-valid` |
+| 15 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/put_api_v1_strategic_opportunity_opportunityId_charge_code) | `PUT` | `/api/v1/strategic-opportunity/{opportunityId}/charge-code` |
+| 16 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/put_api_v1_strategic_opportunity_opportunityId_complete_initiative) | `PUT` | `/api/v1/strategic-opportunity/{opportunityId}/complete-initiative` |
+| 17 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/put_api_v1_strategic_opportunity_opportunityId_details) | `PUT` | `/api/v1/strategic-opportunity/{opportunityId}/details` |
+| 18 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/put_api_v1_strategic_opportunity_opportunityId_ramp_ups) | `PUT` | `/api/v1/strategic-opportunity/{opportunityId}/ramp-ups` |
+| 19 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/put_api_v1_strategic_opportunity_opportunityId_set_status) | `PUT` | `/api/v1/strategic-opportunity/{opportunityId}/set-status` |
+| 20 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/put_api_v1_strategic_opportunity_opportunityId_update_initiative) | `PUT` | `/api/v1/strategic-opportunity/{opportunityId}/update-initiative` |
+| 21 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/put_api_v1_strategic_opportunity_opportunityId_update_layout) | `PUT` | `/api/v1/strategic-opportunity/{opportunityId}/update-layout` |
+| 22 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunity/put_api_v1_strategic_opportunity_opportunityId_update_roles) | `PUT` | `/api/v1/strategic-opportunity/{opportunityId}/update-roles` |
+
+### StrategicOpportunitySecurity
+
+**Coverage:** 0/3 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunitySecurity/get_api_v1_strategic_opportunity_security_lootId) | `GET` | `/api/v1/strategic-opportunity-security/{lootId}` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunitySecurity/get_api_v1_strategic_opportunity_security_lootId_simple_securities) | `GET` | `/api/v1/strategic-opportunity-security/{lootId}/simple-securities` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/StrategicOpportunitySecurity/put_api_v1_strategic_opportunity_security_lootId_set_simple_securities) | `PUT` | `/api/v1/strategic-opportunity-security/{lootId}/set-simple-securities` |
+
+### UserSettings
+
+**Coverage:** 0/2 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/UserSettings/get_api_v1_user_settings_userGuid) | `GET` | `/api/v1/user-settings/{userGuid}` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/UserSettings/post_api_v1_user_settings) | `POST` | `/api/v1/user-settings` |
+
+### Users
+
+**Coverage:** 0/9 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Users/get_api_v1_users_userGuid_user) | `GET` | `/api/v1/users/{userGuid}/user` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Users/get_api_v1_users_administrators) | `GET` | `/api/v1/users/administrators` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Users/get_api_v1_users_all_ci_users) | `GET` | `/api/v1/users/all-ci-users` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Users/get_api_v1_users_cost_leaders) | `GET` | `/api/v1/users/cost-leaders` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Users/get_api_v1_users_executive_sponsors) | `GET` | `/api/v1/users/executive-sponsors` |
+| 6 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Users/get_api_v1_users_jazz_users) | `GET` | `/api/v1/users/jazz-users` |
+| 7 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Users/get_api_v1_users_owners) | `GET` | `/api/v1/users/owners` |
+| 8 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Users/get_api_v1_users_user_groups) | `GET` | `/api/v1/users/user-groups` |
+| 9 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/Users/get_api_v1_users_users) | `GET` | `/api/v1/users/users` |
+
+### UtilizationVariation
+
+**Coverage:** 0/2 (0.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/UtilizationVariation/post_api_v1_utilization_variation_all_charge_info) | `POST` | `/api/v1/utilization-variation/all-charge-info` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/UtilizationVariation/post_api_v1_utilization_variation_charge_info) | `POST` | `/api/v1/utilization-variation/charge-info` |
+
+### VariationCaseTypes
+
+**Coverage:** 1/3 (33.3%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/VariationCaseTypes/post_api_v1_variation_case_types) | `POST` | `/api/v1/variation-case-types` |
+| 2 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/VariationCaseTypes/get_api_v1_variation_case_types_configurationGuid_filter_options) | `GET` | `/api/v1/variation-case-types/{configurationGuid}/filter-options` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/VariationCaseTypes/post_api_v1_variation_case_types_configurationGuid_add_patient_population_case_types) | `POST` | `/api/v1/variation-case-types/{configurationGuid}/add-patient-population-case-types` |
+
+### VariationOpportunities
+
+**Coverage:** 2/5 (40.0%)
+
+| # | Status | Method | Endpoint |
+|---|--------|--------|----------|
+| 1 | [🟢](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/VariationOpportunities/post_api_v1_variation_opportunities) | `POST` | `/api/v1/variation-opportunities` |
+| 2 | [🟡](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/VariationOpportunities/post_api_v1_variation_opportunities_export) | `POST` | `/api/v1/variation-opportunities/export` |
+| 3 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/VariationOpportunities/get_api_v1_variation_opportunities_configurationGuid_filter_options) | `GET` | `/api/v1/variation-opportunities/{configurationGuid}/filter-options` |
+| 4 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/VariationOpportunities/put_api_v1_variation_opportunities_opportunityGuid_set_hidden) | `PUT` | `/api/v1/variation-opportunities/{opportunityGuid}/set-hidden` |
+| 5 | [🔴](https://continuousimprovement-api.dev.stratanetwork.net/index.html#/VariationOpportunities/put_api_v1_variation_opportunities_opportunityGuid_set_note) | `PUT` | `/api/v1/variation-opportunities/{opportunityGuid}/set-note` |
+
+## Recommendations
+
+To improve coverage, add test data for missing endpoints to:
+
+**File:** `e2e/tests/swagger/helpers/mockData.ts`
+
+**Example format:**
+
+```typescript
+ControllerName: [
+  {
+    path: `/api/${Constants.DEFAULT_API_VERSION}/endpoint-path`,
+    method: 'GET',
+    queryParams: { /* params */ },
+    description: 'Description of endpoint'
+  }
+]
+```
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/documentation/SWAGGER_COVERAGE_REPORT.txt b/src/Strata.ContinuousImprovement.Web/e2e/documentation/SWAGGER_COVERAGE_REPORT.txt
new file mode 100644
index 0000000..b38ae10
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/documentation/SWAGGER_COVERAGE_REPORT.txt
@@ -0,0 +1,533 @@
+
+═══════════════════════════════════════════════════════════════════
+  📊 SWAGGER ENDPOINT COVERAGE REPORT
+═══════════════════════════════════════════════════════════════════
+
+  Generated: 2026-01-27T14:54:41.114Z
+
+───────────────────────────────────────────────────────────────────
+  📈 OVERALL COVERAGE SUMMARY
+───────────────────────────────────────────────────────────────────
+
+  Total Swagger Endpoints:       287
+  Endpoints with Mock Data:      89
+  Endpoints without Mock Data:   198
+  Coverage Percentage:           31.01%
+
+  Coverage Legend:
+  🟢 [Both]    - mockData + apiTest
+  🔵 [Mock]    - mockData only
+  🟡 [Test]    - apiTest only
+  🔴 [Missing] - No coverage
+
+───────────────────────────────────────────────────────────────────
+  📋 ENDPOINT COVERAGE BY CONTROLLER
+───────────────────────────────────────────────────────────────────
+
+  1. AllOpportunities
+     Coverage: 5/6 (83.3%)
+
+     1. 🟡 GET    /api/v1/all-opportunities/{configurationGuid}/filter-options [Test]
+     2. 🟢 POST   /api/v1/all-opportunities [Both]
+     3. 🟢 POST   /api/v1/all-opportunities/export [Both]
+     4. 🟡 PUT    /api/v1/all-opportunities/{opportunityGuid}/set-hidden [Test]
+     5. 🟡 PUT    /api/v1/all-opportunities/{opportunityGuid}/set-note [Test]
+     6. 🔴 POST   /api/v1/all-opportunities/is-name-valid [Missing]
+
+  2. BackgroundClientJob
+     Coverage: 1/1 (100.0%)
+
+     1. 🟡 GET    /api/v1/background-client-job/{jobId}/status [Test]
+
+  3. ChargeCodeInitiatives
+     Coverage: 1/1 (100.0%)
+
+     1. 🟡 POST   /api/v1/charge-code-initiatives/create [Test]
+
+  4. ChargeCodeOpportunities
+     Coverage: 12/17 (70.6%)
+
+     1. 🟡 DELETE /api/v1/charge-code-opportunities/{id}/delete [Test]
+     2. 🟢 GET    /api/v1/charge-code-opportunities/{opportunityGuid} [Both]
+     3. 🟡 GET    /api/v1/charge-code-opportunities/{opportunityGuid}/edit-model [Test]
+     4. 🟡 GET    /api/v1/charge-code-opportunities/{opportunityGuid}/initiative-info [Test]
+     5. 🟡 GET    /api/v1/charge-code-opportunities/opportunity-create-enabled [Test]
+     6. 🟡 POST   /api/v1/charge-code-opportunities/charge-code-members [Test]
+     7. 🟡 POST   /api/v1/charge-code-opportunities/opportunity-metric-cohort-data [Test]
+     8. 🟡 POST   /api/v1/charge-code-opportunities/refresh [Test]
+     9. 🟡 POST   /api/v1/charge-code-opportunities/validate-opportunity-levels [Test]
+     10. 🟡 PUT    /api/v1/charge-code-opportunities/{opportunityGuid}/set-hidden [Test]
+     11. 🟡 PUT    /api/v1/charge-code-opportunities/{opportunityGuid}/update-goal-cost-per-unit [Test]
+     12. 🟡 PUT    /api/v1/charge-code-opportunities/{opportunityGuid}/update-opportunity [Test]
+     13. 🔴 POST   /api/v1/charge-code-opportunities/{opportunityGuid}/export [Missing]
+     14. 🔴 POST   /api/v1/charge-code-opportunities/validate-charge-codes [Missing]
+     15. 🔴 PUT    /api/v1/charge-code-opportunities/{opportunityGuid}/set-note [Missing]
+     16. 🔴 PUT    /api/v1/charge-code-opportunities/{opportunityGuid}/update-goal-total-units-of-service [Missing]
+     17. 🔴 PUT    /api/v1/charge-code-opportunities/{opportunityGuid}/update-goals [Missing]
+
+  5. ChargeCodeOpportunityDetails
+     Coverage: 2/3 (66.7%)
+
+     1. 🟡 POST   /api/v1/charge-code-opportunity-details/refresh-baseline-details [Test]
+     2. 🟡 POST   /api/v1/charge-code-opportunity-details/refresh-tracking-details [Test]
+     3. 🔴 POST   /api/v1/charge-code-opportunity-details/create [Missing]
+
+  6. ChargeCodeOpps
+     Coverage: 4/5 (80.0%)
+
+     1. 🟡 POST   /api/v1/charge-code-opps [Test]
+     2. 🟡 POST   /api/v1/charge-code-opps/export [Test]
+     3. 🟡 PUT    /api/v1/charge-code-opps/{opportunityGuid}/set-hidden [Test]
+     4. 🟡 PUT    /api/v1/charge-code-opps/{opportunityGuid}/set-note [Test]
+     5. 🔴 GET    /api/v1/charge-code-opps/{configurationGuid}/filter-options [Missing]
+
+  7. ClientNetworkOpportunities
+     Coverage: 0/7 (0.0%)
+
+     1. 🔴 DELETE /api/v1/client-network-opportunities/{networkOpportunityId} [Missing]
+     2. 🔴 GET    /api/v1/client-network-opportunities/{networkOpportunityId} [Missing]
+     3. 🔴 POST   /api/v1/client-network-opportunities/opportunities [Missing]
+     4. 🔴 PUT    /api/v1/client-network-opportunities/{networkOpportunityId} [Missing]
+     5. 🔴 PUT    /api/v1/client-network-opportunities/{networkOpportunityId}/publish [Missing]
+     6. 🔴 PUT    /api/v1/client-network-opportunities/{networkOpportunityId}/revert-workbook-to-template [Missing]
+     7. 🔴 PUT    /api/v1/client-network-opportunities/update-initiative-status/{networkOpportunityId} [Missing]
+
+  8. ClientNetworkOpportunityLink
+     Coverage: 0/6 (0.0%)
+
+     1. 🔴 DELETE /api/v1/client-network-opportunity-link/{initiativeGuid}/delete-initiative-link [Missing]
+     2. 🔴 DELETE /api/v1/client-network-opportunity-link/{opportunityGuid}/{configurationGuid} [Missing]
+     3. 🔴 DELETE /api/v1/client-network-opportunity-link/delete-initiative-link [Missing]
+     4. 🔴 DELETE /api/v1/client-network-opportunity-link/delete-opportunity-link [Missing]
+     5. 🔴 POST   /api/v1/client-network-opportunity-link [Missing]
+     6. 🔴 PUT    /api/v1/client-network-opportunity-link [Missing]
+
+  9. ClientOpportunityTypeWorkbooks
+     Coverage: 0/3 (0.0%)
+
+     1. 🔴 DELETE /api/v1/client-opportunity-type-workbooks/{opportunityType}/workbooks/{workbookId} [Missing]
+     2. 🔴 GET    /api/v1/client-opportunity-type-workbooks/{opportunityType} [Missing]
+     3. 🔴 POST   /api/v1/client-opportunity-type-workbooks [Missing]
+
+  10. ClientOpportunityWorkbooks
+     Coverage: 0/4 (0.0%)
+
+     1. 🔴 DELETE /api/v1/client-opportunity-workbooks/{opportunityGuid}/workbooks/{workbookId} [Missing]
+     2. 🔴 GET    /api/v1/client-opportunity-workbooks/{opportunityGuid} [Missing]
+     3. 🔴 GET    /api/v1/client-opportunity-workbooks/workbooks [Missing]
+     4. 🔴 POST   /api/v1/client-opportunity-workbooks [Missing]
+
+  11. ClientWarehouses
+     Coverage: 1/3 (33.3%)
+
+     1. 🔵 GET    /api/v1/client-warehouses [Mock]
+     2. 🔴 DELETE /api/v1/client-warehouses/{databaseGuid} [Missing]
+     3. 🔴 POST   /api/v1/client-warehouses [Missing]
+
+  12. Comments
+     Coverage: 0/2 (0.0%)
+
+     1. 🔴 POST   /api/v1/comments [Missing]
+     2. 🔴 POST   /api/v1/comments/create [Missing]
+
+  13. Configurations
+     Coverage: 1/4 (25.0%)
+
+     1. 🔵 GET    /api/v1/configurations [Mock]
+     2. 🔴 GET    /api/v1/configurations/{configurationGuid}/configuration-entities [Missing]
+     3. 🔴 GET    /api/v1/configurations/{configurationGuid}/configuration-entity-info [Missing]
+     4. 🔴 GET    /api/v1/configurations/{configurationGuid}/configuration-service-line-info [Missing]
+
+  14. Databases
+     Coverage: 0/1 (0.0%)
+
+     1. 🔴 GET    /api/v1/databases [Missing]
+
+  15. DeviceIdentifiers
+     Coverage: 0/1 (0.0%)
+
+     1. 🔴 POST   /api/v1/device-identifiers/clear-device-identifiers [Missing]
+
+  16. EncounterOpportunities
+     Coverage: 11/14 (78.6%)
+
+     1. 🟡 GET    /api/v1/encounter-opportunities/{configurationGuid}/filter-options [Test]
+     2. 🟢 GET    /api/v1/encounter-opportunities/{opportunityGuid} [Both]
+     3. 🟡 GET    /api/v1/encounter-opportunities/{opportunityGuid}/edit-model [Test]
+     4. 🟡 GET    /api/v1/encounter-opportunities/{opportunityGuid}/initiative-info [Test]
+     5. 🟡 GET    /api/v1/encounter-opportunities/tempo-page-enabled [Test]
+     6. 🟢 POST   /api/v1/encounter-opportunities [Both]
+     7. 🟡 POST   /api/v1/encounter-opportunities/create [Test]
+     8. 🟡 POST   /api/v1/encounter-opportunities/export [Test]
+     9. 🟡 POST   /api/v1/encounter-opportunities/opportunity-metric-cohort-data [Test]
+     10. 🟡 PUT    /api/v1/encounter-opportunities/{opportunityGuid}/set-note [Test]
+     11. 🟡 PUT    /api/v1/encounter-opportunities/{opportunityGuid}/update-opportunity [Test]
+     12. 🔴 DELETE /api/v1/encounter-opportunities/{id}/delete [Missing]
+     13. 🔴 PUT    /api/v1/encounter-opportunities/{opportunityGuid}/set-hidden [Missing]
+     14. 🔴 PUT    /api/v1/encounter-opportunities/{opportunityGuid}/update-goals [Missing]
+
+  17. Encounters
+     Coverage: 0/7 (0.0%)
+
+     1. 🔴 POST   /api/v1/encounters [Missing]
+     2. 🔴 POST   /api/v1/encounters/cost-info [Missing]
+     3. 🔴 POST   /api/v1/encounters/department-unit-of-service-info [Missing]
+     4. 🔴 POST   /api/v1/encounters/encounter-charge-info [Missing]
+     5. 🔴 POST   /api/v1/encounters/los-opportunity-info [Missing]
+     6. 🔴 POST   /api/v1/encounters/unit-of-service-info [Missing]
+     7. 🔴 POST   /api/v1/encounters/variation-encounter-charge-info [Missing]
+
+  18. Exploration
+     Coverage: 0/4 (0.0%)
+
+     1. 🔴 GET    /api/v1/exploration/flexible-exploration-information-page [Missing]
+     2. 🔴 POST   /api/v1/exploration/case-type-family-cost-driver-info [Missing]
+     3. 🔴 POST   /api/v1/exploration/case-type-family-details [Missing]
+     4. 🔴 POST   /api/v1/exploration/case-type-family-summary [Missing]
+
+  19. ExplorationOpportunities
+     Coverage: 0/12 (0.0%)
+
+     1. 🔴 DELETE /api/v1/exploration-opportunities/{opportunityGuid} [Missing]
+     2. 🔴 GET    /api/v1/exploration-opportunities/{configurationGuid}/filter-options [Missing]
+     3. 🔴 GET    /api/v1/exploration-opportunities/{opportunityGuid} [Missing]
+     4. 🔴 GET    /api/v1/exploration-opportunities/enabled [Missing]
+     5. 🔴 POST   /api/v1/exploration-opportunities [Missing]
+     6. 🔴 POST   /api/v1/exploration-opportunities/create [Missing]
+     7. 🔴 POST   /api/v1/exploration-opportunities/export [Missing]
+     8. 🔴 PUT    /api/v1/exploration-opportunities/{opportunityGuid}/check-workbook [Missing]
+     9. 🔴 PUT    /api/v1/exploration-opportunities/{opportunityGuid}/set-hidden [Missing]
+     10. 🔴 PUT    /api/v1/exploration-opportunities/{opportunityGuid}/set-note [Missing]
+     11. 🔴 PUT    /api/v1/exploration-opportunities/{opportunityGuid}/set-status [Missing]
+     12. 🔴 PUT    /api/v1/exploration-opportunities/{opportunityGuid}/update [Missing]
+
+  20. ExplorationPopulations
+     Coverage: 1/12 (8.3%)
+
+     1. 🔵 GET    /api/v1/exploration-populations [Mock]
+     2. 🔴 DELETE /api/v1/exploration-populations/{populationId} [Missing]
+     3. 🔴 GET    /api/v1/exploration-populations/{populationId} [Missing]
+     4. 🔴 GET    /api/v1/exploration-populations/{populationId}/details [Missing]
+     5. 🔴 GET    /api/v1/exploration-populations/{populationId}/discharge-dates [Missing]
+     6. 🔴 GET    /api/v1/exploration-populations/{populationId}/encounters [Missing]
+     7. 🔴 GET    /api/v1/exploration-populations/info/{populationId} [Missing]
+     8. 🔴 GET    /api/v1/exploration-populations/replicate-population [Missing]
+     9. 🔴 POST   /api/v1/exploration-populations [Missing]
+     10. 🔴 POST   /api/v1/exploration-populations/{populationId}/opportunities [Missing]
+     11. 🔴 POST   /api/v1/exploration-populations/is-name-unique [Missing]
+     12. 🔴 PUT    /api/v1/exploration-populations/{populationId} [Missing]
+
+  21. Filters
+     Coverage: 0/4 (0.0%)
+
+     1. 🔴 GET    /api/v1/filters/cost-component-filters [Missing]
+     2. 🔴 GET    /api/v1/filters/cost-driver-filters [Missing]
+     3. 🔴 GET    /api/v1/filters/sph-criteria-filters/{chipKey} [Missing]
+     4. 🔴 GET    /api/v1/filters/supply-filters [Missing]
+
+  22. FreeFormOpportunities
+     Coverage: 7/10 (70.0%)
+
+     1. 🟡 GET    /api/v1/free-form-opportunities/{configurationGuid}/filter-options [Test]
+     2. 🟢 GET    /api/v1/free-form-opportunities/{opportunityGuid} [Both]
+     3. 🟡 GET    /api/v1/free-form-opportunities/{opportunityGuid}/initiative [Test]
+     4. 🟢 POST   /api/v1/free-form-opportunities [Both]
+     5. 🟡 POST   /api/v1/free-form-opportunities/create [Test]
+     6. 🟡 POST   /api/v1/free-form-opportunities/export [Test]
+     7. 🟡 PUT    /api/v1/free-form-opportunities/{opportunityGuid}/set-note [Test]
+     8. 🔴 DELETE /api/v1/free-form-opportunities/{id}/delete [Missing]
+     9. 🔴 POST   /api/v1/free-form-opportunities/{opportunityGuid}/set-goals [Missing]
+     10. 🔴 PUT    /api/v1/free-form-opportunities/{opportunityGuid}/set-hidden [Missing]
+
+  23. GMDNFileUpload
+     Coverage: 0/1 (0.0%)
+
+     1. 🔴 POST   /api/v1/gmdnfile-upload/{fileType}/upload-gmdnfile [Missing]
+
+  24. GeneralLedgerDetails
+     Coverage: 0/2 (0.0%)
+
+     1. 🔴 POST   /api/v1/general-ledger-details/{configurationGuid}/department-data [Missing]
+     2. 🔴 POST   /api/v1/general-ledger-details/{configurationGuid}/statistic-data [Missing]
+
+  25. GeneralLedgerOpportunities
+     Coverage: 1/7 (14.3%)
+
+     1. 🟢 POST   /api/v1/general-ledger-opportunities [Both]
+     2. 🔴 DELETE /api/v1/general-ledger-opportunities/{id}/delete [Missing]
+     3. 🔴 GET    /api/v1/general-ledger-opportunities/{configurationGuid}/filter-options [Missing]
+     4. 🔴 POST   /api/v1/general-ledger-opportunities/create [Missing]
+     5. 🔴 POST   /api/v1/general-ledger-opportunities/export [Missing]
+     6. 🔴 PUT    /api/v1/general-ledger-opportunities/{opportunityGuid}/set-hidden [Missing]
+     7. 🔴 PUT    /api/v1/general-ledger-opportunities/{opportunityGuid}/set-note [Missing]
+
+  26. GudidFile
+     Coverage: 0/2 (0.0%)
+
+     1. 🔴 GET    /api/v1/gudid-file/datadog-url [Missing]
+     2. 🔴 POST   /api/v1/gudid-file/{dataGroup}/seed-gudid [Missing]
+
+  27. Hangfire
+     Coverage: 0/3 (0.0%)
+
+     1. 🔴 GET    /api/v1/hangfire/{jobId}/job-status [Missing]
+     2. 🔴 GET    /api/v1/hangfire/access-gudid-url [Missing]
+     3. 🔴 GET    /api/v1/hangfire/datadog-url [Missing]
+
+  28. InitiativeDetailColumns
+     Coverage: 0/3 (0.0%)
+
+     1. 🔴 GET    /api/v1/initiative-detail-columns/column-list [Missing]
+     2. 🔴 GET    /api/v1/initiative-detail-columns/default-column-list [Missing]
+     3. 🔴 POST   /api/v1/initiative-detail-columns/set-column-list [Missing]
+
+  29. InitiativeRollupColumns
+     Coverage: 0/8 (0.0%)
+
+     1. 🔴 DELETE /api/v1/initiative-rollup-columns/{initiativeRollupColumnId} [Missing]
+     2. 🔴 GET    /api/v1/initiative-rollup-columns [Missing]
+     3. 🔴 GET    /api/v1/initiative-rollup-columns/{initiativeRollupColumnId} [Missing]
+     4. 🔴 GET    /api/v1/initiative-rollup-columns/{initiativeRollupColumnId}/values [Missing]
+     5. 🔴 POST   /api/v1/initiative-rollup-columns [Missing]
+     6. 🔴 POST   /api/v1/initiative-rollup-columns/is-name-valid/{initiativeRollupColumnId} [Missing]
+     7. 🔴 PUT    /api/v1/initiative-rollup-columns/{initiativeRollupColumnId} [Missing]
+     8. 🔴 PUT    /api/v1/initiative-rollup-columns/{initiativeRollupColumnId}/add-rollup-value [Missing]
+
+  30. Initiatives
+     Coverage: 17/23 (73.9%)
+
+     1. 🟡 GET    /api/v1/initiatives/{configurationGuid}/filter-options [Test]
+     2. 🟢 GET    /api/v1/initiatives/{initiativeGuid} [Both]
+     3. 🟡 GET    /api/v1/initiatives/{initiativeGuid}/finalize [Test]
+     4. 🟡 GET    /api/v1/initiatives/{initiativeGuid}/initiative-info [Test]
+     5. 🟡 GET    /api/v1/initiatives/criteria [Test]
+     6. 🟡 GET    /api/v1/initiatives/scores/{initiativeGuid} [Test]
+     7. 🟡 GET    /api/v1/initiatives/workstreams [Test]
+     8. 🟢 POST   /api/v1/initiatives [Both]
+     9. 🟡 POST   /api/v1/initiatives/create-charge-code [Test]
+     10. 🟡 POST   /api/v1/initiatives/create-encounter [Test]
+     11. 🟡 POST   /api/v1/initiatives/create-free-form [Test]
+     12. 🟡 POST   /api/v1/initiatives/create-general-ledger [Test]
+     13. 🟡 POST   /api/v1/initiatives/export [Test]
+     14. 🟡 POST   /api/v1/initiatives/update-charge-code [Test]
+     15. 🟡 POST   /api/v1/initiatives/update-encounter [Test]
+     16. 🟡 PUT    /api/v1/initiatives/set-initiative-rollup-value [Test]
+     17. 🟡 PUT    /api/v1/initiatives/set-scores [Test]
+     18. 🔴 GET    /api/v1/initiatives/filter-settings [Missing]
+     19. 🔴 GET    /api/v1/initiatives/opportunity-guid-by-name [Missing]
+     20. 🔴 POST   /api/v1/initiatives/create-payroll [Missing]
+     21. 🔴 POST   /api/v1/initiatives/set-filter-settings [Missing]
+     22. 🔴 POST   /api/v1/initiatives/update-free-form [Missing]
+     23. 🔴 PUT    /api/v1/initiatives/set-rampup-info [Missing]
+
+  31. MappedColumns
+     Coverage: 0/2 (0.0%)
+
+     1. 🔴 GET    /api/v1/mapped-columns/column-list [Missing]
+     2. 🔴 POST   /api/v1/mapped-columns/set-column-list [Missing]
+
+  32. NetworkOpportunities
+     Coverage: 0/6 (0.0%)
+
+     1. 🔴 DELETE /api/v1/network-opportunities/{networkOpportunityId} [Missing]
+     2. 🔴 GET    /api/v1/network-opportunities/enabled [Missing]
+     3. 🔴 GET    /api/v1/network-opportunities/is-creator [Missing]
+     4. 🔴 POST   /api/v1/network-opportunities/create [Missing]
+     5. 🔴 POST   /api/v1/network-opportunities/opportunities [Missing]
+     6. 🔴 PUT    /api/v1/network-opportunities/{networkOpportunityId} [Missing]
+
+  33. OpportunityTypeWorkbooks
+     Coverage: 0/3 (0.0%)
+
+     1. 🔴 DELETE /api/v1/opportunity-type-workbooks/{opportunityType}/workbook/{workbookId} [Missing]
+     2. 🔴 GET    /api/v1/opportunity-type-workbooks/{opportunityType} [Missing]
+     3. 🔴 POST   /api/v1/opportunity-type-workbooks [Missing]
+
+  34. OpportunityWorkbooks
+     Coverage: 0/7 (0.0%)
+
+     1. 🔴 DELETE /api/v1/opportunity-workbooks/{opportunityGuid}/workbook/{workbookId} [Missing]
+     2. 🔴 DELETE /api/v1/opportunity-workbooks/strategic/{opportunityId}/workbook/{workbookId} [Missing]
+     3. 🔴 GET    /api/v1/opportunity-workbooks/{opportunityGuid} [Missing]
+     4. 🔴 GET    /api/v1/opportunity-workbooks/opportunity-workbooks-enabled [Missing]
+     5. 🔴 GET    /api/v1/opportunity-workbooks/strategic/{opportunityId} [Missing]
+     6. 🔴 POST   /api/v1/opportunity-workbooks [Missing]
+     7. 🔴 POST   /api/v1/opportunity-workbooks/strategic [Missing]
+
+  35. PayrollOpportunities
+     Coverage: 2/10 (20.0%)
+
+     1. 🔵 GET    /api/v1/payroll-opportunities/{opportunityGuid} [Mock]
+     2. 🟢 POST   /api/v1/payroll-opportunities [Both]
+     3. 🔴 DELETE /api/v1/payroll-opportunities/{id}/delete [Missing]
+     4. 🔴 GET    /api/v1/payroll-opportunities/{configurationGuid}/filter-options [Missing]
+     5. 🔴 GET    /api/v1/payroll-opportunities/{opportunityGuid}/initiative-info [Missing]
+     6. 🔴 GET    /api/v1/payroll-opportunities/tempo-page-enabled [Missing]
+     7. 🔴 POST   /api/v1/payroll-opportunities/create [Missing]
+     8. 🔴 POST   /api/v1/payroll-opportunities/export [Missing]
+     9. 🔴 PUT    /api/v1/payroll-opportunities/{opportunityGuid}/set-hidden [Missing]
+     10. 🔴 PUT    /api/v1/payroll-opportunities/{opportunityGuid}/set-note [Missing]
+
+  36. PeerGroup
+     Coverage: 0/7 (0.0%)
+
+     1. 🔴 DELETE /api/v1/peer-group/{peerGroupId} [Missing]
+     2. 🔴 GET    /api/v1/peer-group [Missing]
+     3. 🔴 GET    /api/v1/peer-group/{peerGroupId} [Missing]
+     4. 🔴 GET    /api/v1/peer-group/dropdown-items [Missing]
+     5. 🔴 POST   /api/v1/peer-group [Missing]
+     6. 🔴 POST   /api/v1/peer-group/is-name-valid/{peerGroupId} [Missing]
+     7. 🔴 PUT    /api/v1/peer-group/{peerGroupId} [Missing]
+
+  37. PickerItems
+     Coverage: 1/1 (100.0%)
+
+     1. 🟡 GET    /api/v1/picker-items/explorations [Test]
+
+  38. QualityVariationItemBreakdowns
+     Coverage: 1/2 (50.0%)
+
+     1. 🟡 POST   /api/v1/quality-variation-item-breakdowns [Test]
+     2. 🔴 GET    /api/v1/quality-variation-item-breakdowns/{configurationGuid}/filter-options [Missing]
+
+  39. QualityVariationItemEvents
+     Coverage: 1/2 (50.0%)
+
+     1. 🟡 POST   /api/v1/quality-variation-item-events [Test]
+     2. 🔴 GET    /api/v1/quality-variation-item-events/{configurationGuid}/filter-options [Missing]
+
+  40. QualityVariationItemOpportunities
+     Coverage: 2/5 (40.0%)
+
+     1. 🟢 POST   /api/v1/quality-variation-item-opportunities [Both]
+     2. 🟡 POST   /api/v1/quality-variation-item-opportunities/export [Test]
+     3. 🔴 GET    /api/v1/quality-variation-item-opportunities/{configurationGuid}/filter-options [Missing]
+     4. 🔴 PUT    /api/v1/quality-variation-item-opportunities/{opportunityGuid}/set-hidden [Missing]
+     5. 🔴 PUT    /api/v1/quality-variation-item-opportunities/{opportunityGuid}/set-note [Missing]
+
+  41. Report
+     Coverage: 10/10 (100.0%)
+
+     1. 🟡 DELETE /api/v1/report/remove-by-module [Test]
+     2. 🟡 DELETE /api/v1/report/remove-by-opportunity [Test]
+     3. 🟡 GET    /api/v1/report/{folderGuid}folder-reports [Test]
+     4. 🟡 GET    /api/v1/report/{opportunityGuid}/by-opportunity [Test]
+     5. 🟡 GET    /api/v1/report/{sourceOfSavings}/by-module [Test]
+     6. 🟡 GET    /api/v1/report/folders [Test]
+     7. 🟡 GET    /api/v1/report/reports [Test]
+     8. 🟡 POST   /api/v1/report/add-by-module [Test]
+     9. 🟡 POST   /api/v1/report/add-by-opportunity [Test]
+     10. 🟡 POST   /api/v1/report/reports [Test]
+
+  42. Security
+     Coverage: 0/5 (0.0%)
+
+     1. 🔴 GET    /api/v1/security/{lootId} [Missing]
+     2. 🔴 GET    /api/v1/security/{lootId}/simple-securities [Missing]
+     3. 🔴 GET    /api/v1/security/general-access-permission [Missing]
+     4. 🔴 GET    /api/v1/security/identities [Missing]
+     5. 🔴 PUT    /api/v1/security/{lootId}/set-simple-securities [Missing]
+
+  43. Settings
+     Coverage: 5/5 (100.0%)
+
+     1. 🟡 GET    /api/v1/settings/charge-code-limit [Test]
+     2. 🟡 GET    /api/v1/settings/feature-flags [Test]
+     3. 🟡 GET    /api/v1/settings/opportunity-level-limit [Test]
+     4. 🟡 GET    /api/v1/settings/performance-engine-calculations [Test]
+     5. 🟡 POST   /api/v1/settings/system-settings [Test]
+
+  44. StrategicOpportunity
+     Coverage: 0/22 (0.0%)
+
+     1. 🔴 DELETE /api/v1/strategic-opportunity/{opportunityId}/charge-code [Missing]
+     2. 🔴 GET    /api/v1/strategic-opportunity [Missing]
+     3. 🔴 GET    /api/v1/strategic-opportunity/{opportunityId} [Missing]
+     4. 🔴 GET    /api/v1/strategic-opportunity/{opportunityId}/general-info [Missing]
+     5. 🔴 GET    /api/v1/strategic-opportunity/{opportunityId}/layout [Missing]
+     6. 🔴 GET    /api/v1/strategic-opportunity/{opportunityId}/opportunity [Missing]
+     7. 🔴 GET    /api/v1/strategic-opportunity/{opportunityId}/primary-measure [Missing]
+     8. 🔴 GET    /api/v1/strategic-opportunity/{opportunityId}/ramp-ups [Missing]
+     9. 🔴 GET    /api/v1/strategic-opportunity/{opportunityId}/run-tracking-task [Missing]
+     10. 🔴 GET    /api/v1/strategic-opportunity/initiatives [Missing]
+     11. 🔴 POST   /api/v1/strategic-opportunity/{opportunityId}/copy [Missing]
+     12. 🔴 POST   /api/v1/strategic-opportunity/{opportunityId}/detail [Missing]
+     13. 🔴 POST   /api/v1/strategic-opportunity/charge-code [Missing]
+     14. 🔴 POST   /api/v1/strategic-opportunity/is-name-valid [Missing]
+     15. 🔴 PUT    /api/v1/strategic-opportunity/{opportunityId}/charge-code [Missing]
+     16. 🔴 PUT    /api/v1/strategic-opportunity/{opportunityId}/complete-initiative [Missing]
+     17. 🔴 PUT    /api/v1/strategic-opportunity/{opportunityId}/details [Missing]
+     18. 🔴 PUT    /api/v1/strategic-opportunity/{opportunityId}/ramp-ups [Missing]
+     19. 🔴 PUT    /api/v1/strategic-opportunity/{opportunityId}/set-status [Missing]
+     20. 🔴 PUT    /api/v1/strategic-opportunity/{opportunityId}/update-initiative [Missing]
+     21. 🔴 PUT    /api/v1/strategic-opportunity/{opportunityId}/update-layout [Missing]
+     22. 🔴 PUT    /api/v1/strategic-opportunity/{opportunityId}/update-roles [Missing]
+
+  45. StrategicOpportunitySecurity
+     Coverage: 0/3 (0.0%)
+
+     1. 🔴 GET    /api/v1/strategic-opportunity-security/{lootId} [Missing]
+     2. 🔴 GET    /api/v1/strategic-opportunity-security/{lootId}/simple-securities [Missing]
+     3. 🔴 PUT    /api/v1/strategic-opportunity-security/{lootId}/set-simple-securities [Missing]
+
+  46. UserSettings
+     Coverage: 0/2 (0.0%)
+
+     1. 🔴 GET    /api/v1/user-settings/{userGuid} [Missing]
+     2. 🔴 POST   /api/v1/user-settings [Missing]
+
+  47. Users
+     Coverage: 0/9 (0.0%)
+
+     1. 🔴 GET    /api/v1/users/{userGuid}/user [Missing]
+     2. 🔴 GET    /api/v1/users/administrators [Missing]
+     3. 🔴 GET    /api/v1/users/all-ci-users [Missing]
+     4. 🔴 GET    /api/v1/users/cost-leaders [Missing]
+     5. 🔴 GET    /api/v1/users/executive-sponsors [Missing]
+     6. 🔴 GET    /api/v1/users/jazz-users [Missing]
+     7. 🔴 GET    /api/v1/users/owners [Missing]
+     8. 🔴 GET    /api/v1/users/user-groups [Missing]
+     9. 🔴 GET    /api/v1/users/users [Missing]
+
+  48. UtilizationVariation
+     Coverage: 0/2 (0.0%)
+
+     1. 🔴 POST   /api/v1/utilization-variation/all-charge-info [Missing]
+     2. 🔴 POST   /api/v1/utilization-variation/charge-info [Missing]
+
+  49. VariationCaseTypes
+     Coverage: 1/3 (33.3%)
+
+     1. 🟡 POST   /api/v1/variation-case-types [Test]
+     2. 🔴 GET    /api/v1/variation-case-types/{configurationGuid}/filter-options [Missing]
+     3. 🔴 POST   /api/v1/variation-case-types/{configurationGuid}/add-patient-population-case-types [Missing]
+
+  50. VariationOpportunities
+     Coverage: 2/5 (40.0%)
+
+     1. 🟢 POST   /api/v1/variation-opportunities [Both]
+     2. 🟡 POST   /api/v1/variation-opportunities/export [Test]
+     3. 🔴 GET    /api/v1/variation-opportunities/{configurationGuid}/filter-options [Missing]
+     4. 🔴 PUT    /api/v1/variation-opportunities/{opportunityGuid}/set-hidden [Missing]
+     5. 🔴 PUT    /api/v1/variation-opportunities/{opportunityGuid}/set-note [Missing]
+
+═══════════════════════════════════════════════════════════════════
+  📝 RECOMMENDATIONS
+═══════════════════════════════════════════════════════════════════
+
+  To improve coverage, add test data for missing endpoints to:
+  📁 e2e/tests/swagger/helpers/mockData.ts
+
+  Example format:
+  ```typescript
+  ControllerName: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/endpoint-path`,
+      method: 'GET',
+      queryParams: { /* params */ },
+      description: 'Description of endpoint'
+    }
+  ]
+  ```
+
+═══════════════════════════════════════════════════════════════════
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/helpers/OpportunityPageTestConfig.ts b/src/Strata.ContinuousImprovement.Web/e2e/helpers/OpportunityPageTestConfig.ts
new file mode 100644
index 0000000..9e510a8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/helpers/OpportunityPageTestConfig.ts
@@ -0,0 +1,21 @@
+import { CommonTestConfig } from './globalTestUtils';
+
+/**
+ * Configuration interface for Opportunity Page tests
+ *
+ * This interface defines the structure for configuring test parameters
+ * used across different opportunity page test scenarios, including
+ * localization tests and various test frameworks.
+ */
+export interface OpportunityPageTestConfig extends CommonTestConfig {
+  /**
+   * Indicates whether this is a localization test that should use
+   * locale-specific settings and validation
+   */
+  isLocalizationTest: boolean;
+
+  /**
+   * The configuration GUID for the test profile/user.
+   */
+  configurationGuid?: string;
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/helpers/apiServerValidator.ts b/src/Strata.ContinuousImprovement.Web/e2e/helpers/apiServerValidator.ts
new file mode 100644
index 0000000..a12bbfb
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/helpers/apiServerValidator.ts
@@ -0,0 +1,305 @@
+/**
+ * @fileoverview API Server Validation Utility
+ * @description Validates that the API server is running and accessible before running tests
+ * @version 1.0.0
+ * @since 2024-11-03
+ * @author Strata Decision Technology
+ *
+ * @module ApiServerValidator
+ * @requires @playwright/test
+ *
+ * @example
+ * ```typescript
+ * import { validateApiServer } from './helpers/apiServerValidator';
+ *
+ * // In a test file or setup
+ * test.beforeAll(async () => {
+ *   await validateApiServer('http://localhost:8443/api/v1/');
+ * });
+ * ```
+ *
+ * @overview
+ * This module provides utilities to:
+ * - Check if the API server is running at the expected URL
+ * - Validate basic connectivity and health endpoints
+ * - Provide clear error messages for setup issues
+ * - Support both local and remote API validation
+ *
+ * @requirements
+ * For local testing:
+ * - API Server must be running at http://localhost:8443
+ * - Health endpoint should be accessible at /api/v1/health (if available)
+ * - Basic connectivity test via HTTP GET request
+ */
+
+import { APIRequestContext, request } from '@playwright/test';
+
+/**
+ * @interface ApiValidationResult
+ * @description Result of API server validation check
+ */
+export interface ApiValidationResult {
+  /** Whether the API server is accessible */
+  isAccessible: boolean;
+  /** HTTP status code returned (if any) */
+  statusCode?: number;
+  /** Response time in milliseconds */
+  responseTime?: number;
+  /** Error message if validation failed */
+  error?: string;
+  /** Additional details about the validation */
+  details?: string;
+}
+
+/**
+ * @interface ValidationConfig
+ * @description Configuration options for API validation
+ */
+export interface ValidationConfig {
+  /** Timeout for validation requests in milliseconds */
+  timeout?: number;
+  /** Whether to ignore HTTPS certificate errors */
+  ignoreHTTPSErrors?: boolean;
+  /** Expected status codes that indicate the server is healthy */
+  expectedStatusCodes?: number[];
+  /** Whether to skip validation (for CI/remote environments) */
+  skipValidation?: boolean;
+}
+
+/**
+ * @constant DEFAULT_VALIDATION_CONFIG
+ * @description Default configuration for API validation
+ */
+const DEFAULT_VALIDATION_CONFIG: ValidationConfig = {
+  timeout: 10000, // 10 seconds
+  ignoreHTTPSErrors: true,
+  expectedStatusCodes: [200, 401, 403], // 200 = OK, 401/403 = Server running but auth required
+  skipValidation: false
+};
+
+/**
+ * @function validateApiServer
+ * @description Validates that the API server is running and accessible
+ * @param {string} apiUrl - The API base URL to validate
+ * @param {ValidationConfig} [config] - Optional validation configuration
+ * @returns {Promise<ApiValidationResult>} Validation result
+ *
+ * @example
+ * ```typescript
+ * const result = await validateApiServer('http://localhost:8443/api/v1/');
+ * if (!result.isAccessible) {
+ *   throw new Error(`API Server not accessible: ${result.error}`);
+ * }
+ * ```
+ */
+export async function validateApiServer(apiUrl: string, config: ValidationConfig = {}): Promise<ApiValidationResult> {
+  const validationConfig = { ...DEFAULT_VALIDATION_CONFIG, ...config };
+
+  // Skip validation if configured to do so (useful for CI environments)
+  if (validationConfig.skipValidation) {
+    return {
+      isAccessible: true,
+      details: 'Validation skipped by configuration'
+    };
+  }
+
+  const startTime = Date.now();
+  let apiRequestContext: APIRequestContext | null = null;
+
+  try {
+    // Create API request context
+    apiRequestContext = await request.newContext({
+      baseURL: apiUrl,
+      timeout: validationConfig.timeout,
+      ignoreHTTPSErrors: validationConfig.ignoreHTTPSErrors
+    });
+
+    // Try to make a basic request to the API
+    // First try a health endpoint if it exists, otherwise try the base API URL
+    const testEndpoints = [
+      '', // Base API URL
+      'health', // Common health endpoint
+      'swagger/index.html' // Swagger UI endpoint
+    ];
+
+    let lastError: string = '';
+
+    for (const endpoint of testEndpoints) {
+      try {
+        const response = await apiRequestContext.get(endpoint);
+        const responseTime = Date.now() - startTime;
+        const statusCode = response.status();
+
+        // Check if status code indicates server is running
+        if (validationConfig.expectedStatusCodes!.includes(statusCode)) {
+          return {
+            isAccessible: true,
+            statusCode,
+            responseTime,
+            details: `API server accessible at ${apiUrl}${endpoint} (HTTP ${statusCode})`
+          };
+        }
+
+        // Server responded but with unexpected status
+        if (statusCode >= 200 && statusCode < 600) {
+          return {
+            isAccessible: true,
+            statusCode,
+            responseTime,
+            details: `API server running but returned HTTP ${statusCode} for ${endpoint}`
+          };
+        }
+
+        lastError = `HTTP ${statusCode} for ${endpoint}`;
+      } catch (endpointError) {
+        lastError = `${endpoint}: ${endpointError}`;
+        continue;
+      }
+    }
+
+    // None of the endpoints were accessible
+    const responseTime = Date.now() - startTime;
+    return {
+      isAccessible: false,
+      responseTime,
+      error: `API server not accessible at ${apiUrl}`,
+      details: `Tried endpoints: ${testEndpoints.join(', ')}. Last error: ${lastError}`
+    };
+  } catch (error) {
+    const responseTime = Date.now() - startTime;
+    const errorMessage = error instanceof Error ? error.message : String(error);
+
+    return {
+      isAccessible: false,
+      responseTime,
+      error: `Failed to connect to API server at ${apiUrl}`,
+      details: errorMessage
+    };
+  } finally {
+    // Clean up API request context
+    if (apiRequestContext) {
+      await apiRequestContext.dispose();
+    }
+  }
+}
+
+/**
+ * @function validateLocalApiServer
+ * @description Convenience function to validate the local development API server
+ * @returns {Promise<ApiValidationResult>} Validation result for localhost:8443
+ *
+ * @example
+ * ```typescript
+ * const result = await validateLocalApiServer();
+ * if (!result.isAccessible) {
+ *   customLogger.warn('⚠️ Local API server not running at localhost:8443');
+ * }
+ * ```
+ */
+export async function validateLocalApiServer(): Promise<ApiValidationResult> {
+  return validateApiServer('http://localhost:8443/api/v1/', {
+    timeout: 5000, // Shorter timeout for local connections
+    expectedStatusCodes: [200, 401, 403, 404] // Include 404 as server might be running but endpoint missing
+  });
+}
+
+/**
+ * @function ensureApiServerRunning
+ * @description Validates API server and throws descriptive error if not accessible
+ * @param {string} apiUrl - The API base URL to validate
+ * @param {ValidationConfig} [config] - Optional validation configuration
+ * @throws {Error} If API server is not accessible
+ *
+ * @example
+ * ```typescript
+ * // In test setup or beforeAll
+ * await ensureApiServerRunning('http://localhost:8443/api/v1/');
+ * ```
+ */
+export async function ensureApiServerRunning(apiUrl: string, config: ValidationConfig = {}): Promise<void> {
+  const result = await validateApiServer(apiUrl, config);
+
+  if (!result.isAccessible) {
+    const errorMessage = [
+      '🚨 API Server Validation Failed',
+      '',
+      `Expected API server at: ${apiUrl}`,
+      `Error: ${result.error}`,
+      result.details ? `Details: ${result.details}` : '',
+      '',
+      '💡 To resolve this issue:',
+      '   1. Ensure the API server is running',
+      '   2. Check that the server is accessible at the expected URL',
+      '   3. Verify firewall and network settings',
+      '   4. For local development, start the API server at localhost:8443',
+      '',
+      '📋 Local Development Setup:',
+      '   - API Server should be running at: http://localhost:8443',
+      '   - Swagger UI should be accessible at: http://localhost:8443/swagger',
+      '   - Health endpoint (if available): http://localhost:8443/api/v1/health'
+    ]
+      .filter(Boolean)
+      .join('\n');
+
+    throw new Error(errorMessage);
+  }
+}
+
+/**
+ * @function createApiValidationCheck
+ * @description Creates a reusable API validation function for test suites
+ * @param {string} apiUrl - The API base URL to validate
+ * @param {ValidationConfig} [config] - Optional validation configuration
+ * @returns {Function} Validation function that can be used in test setups
+ *
+ * @example
+ * ```typescript
+ * const validateApi = createApiValidationCheck('http://localhost:8443/api/v1/');
+ *
+ * test.describe.configure({ mode: 'serial' });
+ * test.beforeAll(validateApi);
+ * ```
+ */
+export function createApiValidationCheck(apiUrl: string, config: ValidationConfig = {}) {
+  return async () => {
+    await ensureApiServerRunning(apiUrl, config);
+  };
+}
+
+/**
+ * @function isLocalEnvironment
+ * @description Determines if tests are running in local development environment
+ * @returns {boolean} True if running locally (localhost URLs detected)
+ */
+export function isLocalEnvironment(): boolean {
+  // Check various indicators of local environment
+  if (
+    process.env.NODE_ENV !== 'development' ||
+    process.env.TEST_ENV === 'remote' ||
+    process.argv.includes('--config=playwright.config.ts') ||
+    (process.env.API_URL ? process.env.API_URL.includes('https') : false)
+  ) {
+    return false;
+  }
+  return (
+    process.env.NODE_ENV === 'development' ||
+    process.env.TEST_ENV === 'local' ||
+    !process.env.CI ||
+    process.argv.includes('--config=playwright.config.local.ts') ||
+    (process.env.API_URL ? !process.env.API_URL.includes('https') : true)
+  );
+}
+
+/**
+ * @function getApiValidationSummary
+ * @description Creates a summary message for API validation results
+ * @param {ApiValidationResult} result - Validation result
+ * @returns {string} Human-readable summary
+ */
+export function getApiValidationSummary(result: ApiValidationResult): string {
+  if (result.isAccessible) {
+    return `✅ API Server: Accessible (${result.responseTime}ms)${result.details ? ` - ${result.details}` : ''}`;
+  } else {
+    return `❌ API Server: Not Accessible${result.error ? ` - ${result.error}` : ''}${result.details ? ` (${result.details})` : ''}`;
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/helpers/apiValidation.ts b/src/Strata.ContinuousImprovement.Web/e2e/helpers/apiValidation.ts
new file mode 100644
index 0000000..2a4da74
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/helpers/apiValidation.ts
@@ -0,0 +1,222 @@
+/**
+ * @fileoverview API Validation Helpers for Test Files
+ * @description Convenient functions for validating API connectivity within test files
+ * @version 1.0.0
+ * @since 2024-11-03
+ * @author Strata Decision Technology
+ *
+ * @module ApiValidationHelpers
+ * @requires ./apiServerValidator
+ *
+ * @example
+ * ```typescript
+ * import { requireApiServer, skipIfApiUnavailable } from '../helpers/apiValidation';
+ *
+ * test.describe('API Tests', () => {
+ *   test.beforeAll(requireApiServer);
+ *
+ *   test('api endpoint test', skipIfApiUnavailable, async ({ apiRequest }) => {
+ *     // Test will be skipped if API is not available
+ *   });
+ * });
+ * ```
+ */
+
+import { test } from '@playwright/test';
+import { customLogger } from '../customLogger';
+import { ApiValidationResult, getApiValidationSummary, isLocalEnvironment, validateApiServer } from './apiServerValidator';
+
+/**
+ * @function requireApiServer
+ * @description Test hook that ensures API server is running before tests execute
+ * @param {string} [apiUrl] - Optional API URL to validate (defaults to local)
+ * @throws {Error} If API server is not accessible
+ *
+ * @example
+ * ```typescript
+ * test.describe('API Integration Tests', () => {
+ *   test.beforeAll(requireApiServer);
+ *
+ *   test('should fetch data', async ({ apiRequest }) => {
+ *     const response = await apiRequest.get('/data');
+ *     expect(response.ok()).toBe(true);
+ *   });
+ * });
+ * ```
+ */
+export async function requireApiServer(apiUrl?: string): Promise<void> {
+  const targetUrl = apiUrl || (isLocalEnvironment() ? 'http://localhost:8443/api/' : '');
+
+  if (!targetUrl) {
+    customLogger.warn('⚠️ API validation skipped - no API URL configured');
+    return;
+  }
+
+  customLogger.log(`🔍 Validating API server at: ${targetUrl}`);
+
+  const result = await validateApiServer(targetUrl, {
+    timeout: isLocalEnvironment() ? 5000 : 15000
+  });
+
+  customLogger.log(getApiValidationSummary(result));
+
+  if (!result.isAccessible) {
+    const errorMessage = [
+      '🚨 API Server Required But Not Available',
+      '',
+      `Expected: ${targetUrl}`,
+      `Status: ${result.error || 'Connection failed'}`,
+      result.details ? `Details: ${result.details}` : '',
+      '',
+      isLocalEnvironment() ? '💡 Start the API server at localhost:8443 and try again' : '💡 Check remote API server status and network connectivity'
+    ]
+      .filter(Boolean)
+      .join('\n');
+
+    throw new Error(errorMessage);
+  }
+}
+
+/**
+ * @function skipIfApiUnavailable
+ * @description Test annotation that skips test if API server is not available
+ * @param {any} testInfo - Playwright test info object
+ *
+ * @example
+ * ```typescript
+ * test('api integration test', skipIfApiUnavailable, async ({ apiRequest }) => {
+ *   // This test will be skipped if API server is not accessible
+ *   const response = await apiRequest.get('/endpoint');
+ *   expect(response.ok()).toBe(true);
+ * });
+ * ```
+ */
+export async function skipIfApiUnavailable(testInfo: any): Promise<void> {
+  const apiUrl = isLocalEnvironment() ? 'http://localhost:8443/api/' : '';
+
+  if (!apiUrl) return; // Skip validation if no URL configured
+
+  try {
+    const result = await validateApiServer(apiUrl, {
+      timeout: 3000, // Quick check
+      skipValidation: false
+    });
+
+    if (!result.isAccessible) {
+      testInfo.skip('API server not available at ' + apiUrl);
+    }
+  } catch (error) {
+    testInfo.skip('API server validation failed: ' + (error instanceof Error ? error.message : String(error)));
+  }
+}
+
+/**
+ * @function createApiRequirement
+ * @description Creates a reusable API requirement function for test suites
+ * @param {string} apiUrl - The API URL to validate
+ * @param {boolean} [required=true] - Whether to fail or skip if API is unavailable
+ * @returns {Function} Function that can be used in test.beforeAll()
+ *
+ * @example
+ * ```typescript
+ * const requireLocalApi = createApiRequirement('http://localhost:8443/api/');
+ * const optionalRemoteApi = createApiRequirement('https://api.example.com/', false);
+ *
+ * test.describe('API Tests', () => {
+ *   test.beforeAll(requireLocalApi);
+ *   // Tests will fail if local API is not available
+ * });
+ *
+ * test.describe('Optional API Tests', () => {
+ *   test.beforeAll(optionalRemoteApi);
+ *   // Tests will be skipped if remote API is not available
+ * });
+ * ```
+ */
+export function createApiRequirement(apiUrl: string, required: boolean = true) {
+  return async () => {
+    try {
+      await requireApiServer(apiUrl);
+    } catch (error) {
+      if (!required) {
+        // Convert error to skip for optional APIs
+        customLogger.warn(`⚠️ Optional API not available: ${apiUrl}`);
+        customLogger.warn('   Skipping API-dependent tests');
+        test.skip(true, `Optional API server not available: ${error instanceof Error ? error.message : String(error)}`);
+      } else {
+        // Re-throw error for required APIs
+        throw error;
+      }
+    }
+  };
+}
+
+/**
+ * @function validateApiInTest
+ * @description Validates API connectivity within a test and provides result
+ * @param {string} [apiUrl] - Optional API URL to validate
+ * @returns {Promise<ApiValidationResult>} Validation result
+ *
+ * @example
+ * ```typescript
+ * test('conditional api test', async ({ apiRequest }) => {
+ *   const apiStatus = await validateApiInTest();
+ *
+ *   if (!apiStatus.isAccessible) {
+ *     customLogger.warn('API not available, testing with mock data');
+ *     // Use mock data or skip certain validations
+ *     return;
+ *   }
+ *
+ *   // Proceed with live API testing
+ *   const response = await apiRequest.get('/data');
+ *   expect(response.ok()).toBe(true);
+ * });
+ * ```
+ */
+export async function validateApiInTest(apiUrl?: string): Promise<ApiValidationResult> {
+  const targetUrl = apiUrl || (isLocalEnvironment() ? 'http://localhost:8443/api/' : '');
+
+  if (!targetUrl) {
+    return {
+      isAccessible: false,
+      error: 'No API URL configured for validation'
+    };
+  }
+
+  return await validateApiServer(targetUrl, {
+    timeout: 3000 // Quick validation for in-test checks
+  });
+}
+
+/**
+ * @function logApiStatus
+ * @description Logs current API server status for debugging
+ * @param {string} [apiUrl] - Optional API URL to check
+ *
+ * @example
+ * ```typescript
+ * test.beforeEach(async () => {
+ *   await logApiStatus(); // Helps debug connectivity issues
+ * });
+ * ```
+ */
+export async function logApiStatus(apiUrl?: string): Promise<void> {
+  const targetUrl = apiUrl || (isLocalEnvironment() ? 'http://localhost:8443/api/' : '');
+
+  if (!targetUrl) {
+    customLogger.log('ℹ️ API Status: No URL configured');
+    return;
+  }
+
+  try {
+    const result = await validateApiServer(targetUrl, { timeout: 2000 });
+    customLogger.log(`ℹ️ ${getApiValidationSummary(result)}`);
+  } catch (error) {
+    customLogger.log(`ℹ️ API Status: Validation failed - ${error instanceof Error ? error.message : String(error)}`);
+  }
+}
+
+// Export commonly used validation configurations
+export const LocalApiRequirement = createApiRequirement('http://localhost:8443/api/', true);
+export const OptionalLocalApiCheck = createApiRequirement('http://localhost:8443/api/', false);
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/helpers/commonMockData.ts b/src/Strata.ContinuousImprovement.Web/e2e/helpers/commonMockData.ts
new file mode 100644
index 0000000..9885bac
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/helpers/commonMockData.ts
@@ -0,0 +1,231 @@
+/**
+ * @fileoverview Common API Mock Data and Type Definitions
+ * @description Shared mock data and TypeScript interfaces used across multiple API testing modules
+ * @version 1.0.0
+ * @since 1.0.0
+ * @author Strata Decision Technology
+ * @created 2025-01-08
+ *
+ * @module CommonAPIMockData
+ *
+ * @example
+ * ```typescript
+ * import { mockJobId, IPagingInfo, IEndpointTestData } from './commonMockData';
+ * ```
+ */
+
+/**
+ * @section Swagger Specification Interfaces
+ * @description TypeScript interfaces for parsing and working with Swagger/OpenAPI specifications
+ */
+
+/**
+ * @interface SwaggerPath
+ * @description Swagger path definition with HTTP methods
+ * @since 1.0.0
+ */
+export interface SwaggerPath {
+  get?: SwaggerOperation;
+  post?: SwaggerOperation;
+  put?: SwaggerOperation;
+  delete?: SwaggerOperation;
+}
+
+/**
+ * @interface SwaggerOperation
+ * @description Swagger operation definition
+ * @since 1.0.0
+ */
+export interface SwaggerOperation {
+  tags?: string[];
+  operationId?: string;
+  summary?: string;
+  description?: string;
+  parameters?: SwaggerParameter[];
+  requestBody?: SwaggerRequestBody;
+  responses: Record<string, SwaggerResponse>;
+}
+
+/**
+ * @interface SwaggerParameter
+ * @description Swagger parameter definition
+ * @since 1.0.0
+ */
+export interface SwaggerParameter {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  required?: boolean;
+  schema?: {
+    type?: string;
+    format?: string;
+    $ref?: string;
+  };
+}
+
+/**
+ * @interface SwaggerRequestBody
+ * @description Swagger request body definition
+ * @since 1.0.0
+ */
+export interface SwaggerRequestBody {
+  content?: Record<string, { schema?: any }>;
+  required?: boolean;
+}
+
+/**
+ * @interface SwaggerResponse
+ * @description Swagger response definition
+ * @since 1.0.0
+ */
+export interface SwaggerResponse {
+  description: string;
+  content?: Record<string, { schema?: any }>;
+}
+
+/**
+ * @section Common Pagination Interfaces
+ * @description Shared pagination structures used across multiple API domains
+ */
+
+/**
+ * @interface IPagingInfo
+ * @description Pagination metadata returned by API responses
+ * @since 1.0.0
+ */
+export interface IPagingInfo {
+  totalNumberOfResults: number;
+  pageNumber: number;
+  pageSize: number;
+  totalNumberOfPages: number;
+}
+
+/**
+ * @interface IPagedApiResponse
+ * @description Generic paged API response structure
+ * @since 1.0.0
+ */
+export interface IPagedApiResponse<T> {
+  /** Array of result items - property name varies by API (results, data, etc.) */
+  results?: T[];
+  data?: T[];
+  /** Paging information */
+  pagingInfo: IPagingInfo;
+}
+
+/**
+ * @section Mock Constants
+ * @description Common mock data constants used across test suites
+ */
+
+/**
+ * @constant mockJobId
+ * @description Mock job ID for background job testing
+ * @since 1.0.0
+ */
+export const mockJobId = 'job-12345-abcde';
+
+/**
+ * @function createMockFile
+ * @description Factory function to create mock File objects for upload testing
+ * @param {string} [name='test-file.txt'] - Filename for the mock file
+ * @param {string} [content='mock file content'] - Content of the mock file
+ * @returns {any} Mock File object ready for upload testing (or placeholder in Node.js)
+ * @since 1.0.0
+ *
+ * @example
+ * ```typescript
+ * const testFile = createMockFile('data.txt', 'test data');
+ * // Use in file upload tests
+ * ```
+ *
+ * @testing Essential for file upload endpoint validation
+ * @browser_compatibility Creates proper File objects compatible with form data
+ * @note In Node.js environment, returns a placeholder object
+ */
+export const createMockFile = (name: string = 'test-file.txt', content: string = 'mock file content'): any => {
+  if (typeof File === 'undefined' || typeof Blob === 'undefined') {
+    // Return a placeholder for Node.js environment
+    return { name, content, type: 'text/plain', _isFilePlaceholder: true };
+  }
+  const blob = new Blob([content], { type: 'text/plain' });
+  return new File([blob], name, { type: 'text/plain' });
+};
+
+/**
+ * @section Endpoint Test Data Infrastructure
+ * @description Common interfaces and utilities for API endpoint testing
+ */
+
+/**
+ * @interface IEndpointTestData
+ * @description Test data structure for individual API endpoints
+ * @since 1.0.0
+ */
+export interface IEndpointTestData {
+  /** API endpoint path (relative to base URL) */
+  path: string;
+  /** HTTP method (GET, POST, PUT, DELETE) */
+  method: 'GET' | 'POST' | 'PUT' | 'DELETE';
+  /** Path parameters (e.g., {id: '123'}) */
+  pathParams?: Record<string, string>;
+  /** Query parameters (e.g., {page: 1, size: 25}) */
+  queryParams?: Record<string, any>;
+  /** Request body for POST/PUT operations */
+  body?: any;
+  /** Description of what the endpoint does */
+  description?: string;
+  /** Optional timeout override in milliseconds */
+  timeout?: number;
+  /** Flag to indicate if the test should be skipped */
+  isSkipped?: boolean;
+}
+
+/**
+ * @function getEndpointTestData
+ * @description Helper function to retrieve test data for a specific controller and endpoint
+ * @param {Record<string, IEndpointTestData[]>} endpointData - Dictionary of endpoint test data
+ * @param {string} controller - Controller name (e.g., 'Files', 'RxNorm')
+ * @param {string} path - Endpoint path
+ * @param {string} [method] - Optional HTTP method filter
+ * @returns {IEndpointTestData | undefined} Test data for the endpoint or undefined if not found
+ * @since 1.0.0
+ *
+ * @example
+ * ```typescript
+ * const testData = getEndpointTestData(ENDPOINT_TEST_DATA, 'Files', '/api/v1/files/upload', 'POST');
+ * if (testData) {
+ *   await apiHelper.authenticatedPost(testData.path, testData.body);
+ * }
+ * ```
+ */
+export const getEndpointTestData = (endpointData: Record<string, IEndpointTestData[]>, controller: string, path: string, method?: string): IEndpointTestData | undefined => {
+  const endpoints = endpointData[controller];
+  if (!endpoints) return undefined;
+
+  return endpoints.find((endpoint) => endpoint.path === path && (!method || endpoint.method === method));
+};
+
+/**
+ * @function getAllEndpointsByMethod
+ * @description Get all endpoints filtered by HTTP method
+ * @param {Record<string, IEndpointTestData[]>} endpointData - Dictionary of endpoint test data
+ * @param {string} method - HTTP method to filter by (GET, POST, PUT, DELETE)
+ * @returns {Array<IEndpointTestData & { controller: string }>} Array of endpoints with controller names
+ * @since 1.0.0
+ *
+ * @example
+ * ```typescript
+ * const allGetEndpoints = getAllEndpointsByMethod(ENDPOINT_TEST_DATA, 'GET');
+ * customLogger.log(`Found ${allGetEndpoints.length} GET endpoints`);
+ * ```
+ */
+export const getAllEndpointsByMethod = (endpointData: Record<string, IEndpointTestData[]>, method: 'GET' | 'POST' | 'PUT' | 'DELETE'): Array<IEndpointTestData & { controller: string }> => {
+  const results: Array<IEndpointTestData & { controller: string }> = [];
+
+  for (const [controller, endpoints] of Object.entries(endpointData)) {
+    const filtered = endpoints.filter((endpoint) => endpoint.method === method).map((endpoint) => ({ ...endpoint, controller }));
+    results.push(...filtered);
+  }
+
+  return results;
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/helpers/globalTestUtils.ts b/src/Strata.ContinuousImprovement.Web/e2e/helpers/globalTestUtils.ts
new file mode 100644
index 0000000..00aee7b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/helpers/globalTestUtils.ts
@@ -0,0 +1,2398 @@
+/**
+ * @fileoverview Common Test Utilities Module
+ * @description Shared utilities for UI, API, and Swagger testing with authentication, validation, and common patterns
+ * @version 2.0.0
+ * @since 2.0.0
+ * @author Strata Decision Technology
+ * @created 2025-11-03
+ * @modified 2025-11-03
+ *
+ * @module CommonTestUtils
+ * @requires @playwright/test
+ * @requires jwt-decode
+ *
+ * @example
+ * ```typescript
+ * import { AuthUtils, ValidationUtils, MockDataUtils } from '../helpers/testUtils';
+ *
+ * // JWT Authentication
+ * const hasAccess = AuthUtils.isStrataEmployee(jwtToken);
+ * const username = AuthUtils.getUsernameFromToken(jwtToken);
+ *
+ * // Response Validation
+ * ValidationUtils.validatePagedResponse(response, 10, testInfo);
+ * ValidationUtils.validateJobIdResponse(jobId);
+ *
+ * // Mock Data Creation
+ * const mockResponse = MockDataUtils.createPagedResponse([item1, item2]);
+ * ```
+ */
+
+import { expect, Page } from '@playwright/test';
+import { randomUUID } from 'crypto';
+import { jwtDecode } from 'jwt-decode';
+import { cciCostLeader, cciCostLeaderDevMaster, EnhancedJwt, gBriggsTest, strataUserTest, ukUserTest, USER_REGISTRY, UserType } from '../auth/authenticatedUsers';
+import { customLogger } from '../customLogger';
+import { EnvironmentType, getEnvironmentConfig } from '../playwright.config.shared';
+import { OpportunityPageTestConfig } from './OpportunityPageTestConfig';
+
+/**
+ * @section Constants
+ * @description Common constants used across all test modules
+ */
+
+/**
+ * @enum UserDisplayNames
+ * @description Standardized user type display names for consistent test configuration
+ * @since 2.0.0
+ */
+export enum UserDisplayNames {
+  /** Standard authenticated user display name */
+  StandardUser = 'Standard User',
+  /** Strata employee display name */
+  StrataUser = 'Strata User',
+  /** G Briggs user display name */
+  GBriggsUser = 'G Briggs User',
+  /** UK user display name */
+  UKUser = 'UK User'
+}
+
+/**
+ * @namespace TestNaming
+ * @description Utilities for consistent test naming and identification
+ * @since 2.0.0
+ */
+export const TestNaming = {
+  /**
+   * Creates a standardized test suite name with user type
+   * @param baseName - The base name of the test suite (e.g., "Pharmacy Service API Tests")
+   * @param userType - The user type from UserTypes constants
+   * @returns Formatted test suite name
+   */
+  createSuiteName: (baseName: string, userType?: string): string => `${baseName} (${userType || 'Unknown User'})`,
+
+  /**
+   * Checks if a user type is a Strata user
+   * @param userType - The user type to check
+   * @returns True if the user is a Strata user
+   */
+  isStrataUser: (userType: string): boolean => userType === UserDisplayNames.StrataUser,
+
+  /**
+   * Checks if a user type is a standard user
+   * @param userType - The user type to check
+   * @returns True if the user is a standard user
+   */
+  isStandardUser: (userType: string): boolean => userType === UserDisplayNames.StandardUser,
+
+  /**
+   * Checks if a user type is a G Briggs user
+   * @param userType - The user type to check
+   * @returns True if the user is a G Briggs user
+   */
+  isGBriggsUser: (userType: string): boolean => userType === UserDisplayNames.GBriggsUser
+};
+
+/**
+ * @section Type Definitions
+ * @description Common TypeScript interfaces and types used across all test modules
+ */
+
+/**
+ * @interface JwtPayload
+ * @description JWT token payload structure for authentication validation
+ * @since 2.0.0
+ */
+export interface JwtPayload {
+  /** Indicates if user is a Strata employee with elevated permissions */
+  is_strata_employee?: boolean;
+  /** User's name or display name */
+  name?: string;
+  /** User's preferred username */
+  preferred_username?: string;
+  /** Additional JWT claims and metadata */
+  [key: string]: any;
+}
+
+/**
+ * @interface PagedResponse
+ * @description Standard paged API response structure
+ * @template T - Type of items in the results array
+ * @since 2.0.0
+ */
+export interface PagedResponse<T> {
+  /** Array of result items */
+  results: T[];
+  /** Pagination metadata */
+  pagingInfo: PagingInfo;
+}
+
+/**
+ * @interface PagingInfo
+ * @description Pagination metadata structure
+ * @since 2.0.0
+ */
+export interface PagingInfo {
+  /** Total number of results across all pages */
+  totalNumberOfResults: number;
+  /** Current page number (1-based) */
+  pageNumber: number;
+  /** Number of items per page */
+  pageSize: number;
+  /** Total number of pages */
+  totalNumberOfPages: number;
+}
+
+/**
+ * @interface PagingOptions
+ * @description Pagination configuration for API requests
+ * @since 2.0.0
+ */
+export interface PagingOptions {
+  /** Page number (1-based) for pagination */
+  pageNumber: number;
+  /** Number of items per page */
+  pageSize: number;
+  /** Optional field name for sorting results */
+  sortField?: string;
+  /** Optional sort direction */
+  sortDirection?: 'asc' | 'desc';
+}
+
+/**
+ * @interface TestValidationResult
+ * @description Result of validation with flaky test support
+ * @since 2.0.0
+ */
+export interface TestValidationResult {
+  /** Whether validation passed exactly */
+  isValid: boolean;
+  /** Whether test should be marked as flaky */
+  isFlaky: boolean;
+  /** Description of validation result */
+  message?: string;
+}
+
+/**
+ * @interface CommonTestConfig
+ *
+ * @description Configuration interface for Opportunity Page tests
+ *
+ * This interface defines the structure for configuring test parameters
+ * used across different opportunity page test scenarios, including
+ * localization tests and various test frameworks.
+ * @since 2.0.0
+ */
+export interface CommonTestConfig {
+  /** User type identifier for logging and identification */
+  userType: UserType;
+
+  /**
+   * The test framework instance to use for executing the test.
+   * This can be the standard test framework or specialized ones like ukUserTest
+   * for region-specific testing scenarios.
+   */
+  testFramework: any; // The test framework (test or ukUserTest)
+
+  /**
+   * Human-readable name for the test case.
+   * Used for test identification and reporting purposes.
+   */
+  testName: string;
+}
+
+/**
+ * @interface FileUploadConfig
+ * @description Configuration for file upload operations across different test types
+ * @since 2.0.0
+ */
+export interface FileUploadConfig {
+  /** File type identifier */
+  fileType: number;
+  /** Name of the file being uploaded */
+  fileName: string;
+  /** Content of the file */
+  fileContent: string;
+  /** Optional additional headers */
+  headers?: Record<string, string>;
+}
+
+/**
+ * @namespace AuthUtils
+ * @description Common JWT authentication and authorization utilities
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * const hasAccess = AuthUtils.isStrataEmployee(jwtToken);
+ * const username = AuthUtils.getUsernameFromToken(jwtToken);
+ * const isValid = AuthUtils.validateJwtToken(jwtToken);
+ * ```
+ */
+export const AuthUtils = {
+  /**
+   * @method isStrataEmployee
+   * @description Determines if a JWT token indicates Strata employee status
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token string containing access token
+   * @returns {boolean} True if user is a Strata employee, false otherwise
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const hasAccess = AuthUtils.isStrataEmployee(jwtToken);
+   * if (hasAccess) {
+   *   // User has elevated permissions
+   * }
+   * ```
+   *
+   * @security This function validates user authorization levels
+   * @performance O(1) - Simple JWT decode and property access
+   */
+  isStrataEmployee: (jwtToken?: string | EnhancedJwt): boolean => {
+    if (!jwtToken) return false;
+
+    try {
+      if (typeof jwtToken !== 'string') {
+        return (jwtToken as EnhancedJwt).profile?.is_strata_employee === true;
+      }
+      const jwt: { access_token: string } = JSON.parse(jwtToken);
+      if (!jwt.access_token) return false;
+
+      const payload = jwtDecode<JwtPayload>(jwt.access_token);
+      return payload.is_strata_employee === true;
+    } catch (error) {
+      customLogger.error(`JWT decode error: ${error}`);
+      return false;
+    }
+  },
+
+  /**
+   * @method getUsernameFromToken
+   * @description Extracts username from JWT token for logging and identification
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token string
+   * @returns {string} Username from JWT payload, or 'Unknown' if unavailable
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const username = AuthUtils.getUsernameFromToken(jwtToken);
+   * customLogger.log(`Test running as user: ${username}`);
+   * ```
+   *
+   * @security Safe method - handles JWT decode failures gracefully
+   * @performance O(1) - Simple JWT decode and property access
+   */
+  getUsernameFromToken: (jwtToken?: string | EnhancedJwt): string => {
+    try {
+      if (!jwtToken) return 'Unknown';
+      if (typeof jwtToken !== 'string') {
+        return (jwtToken as EnhancedJwt).profile?.name || (jwtToken as EnhancedJwt).profile?.preferred_username || 'Unknown';
+      }
+      const jwt: { access_token: string } = JSON.parse(jwtToken);
+      const payload = jwtDecode<JwtPayload>(jwt.access_token);
+      return payload.name || payload.preferred_username || 'Unknown';
+    } catch {
+      return 'Unknown';
+    }
+  },
+
+  /**
+   * @method validateJwtToken
+   * @description Validates JWT token structure and accessibility
+   * @param {string | EnhancedJwt} [jwtToken] - JWT token to validate
+   * @returns {boolean} True if token is valid and decodable
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * if (AuthUtils.validateJwtToken(jwtToken)) {
+   *   // Proceed with authenticated operations
+   * }
+   * ```
+   *
+   * @validation Checks token parsing and access_token presence
+   */
+  validateJwtToken: (jwtToken?: string | EnhancedJwt): boolean => {
+    try {
+      if (!jwtToken) return false;
+      if (typeof jwtToken !== 'string') {
+        jwtDecode((jwtToken as EnhancedJwt).access_token);
+        return true;
+      } else {
+        const jwt: { access_token: string } = JSON.parse(jwtToken);
+        if (!jwt.access_token) return false;
+        jwtDecode(jwt.access_token); // Validate decodability
+        return true;
+      }
+    } catch {
+      return false;
+    }
+  },
+
+  /**
+   * @method extractAccessToken
+   * @description Safely extracts access token from JWT string
+   * @param {string | EnhancedJwt} [jwtToken] - JWT token string or object
+   * @returns {string} Access token or empty string if invalid
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const accessToken = AuthUtils.extractAccessToken(jwtToken);
+   * const headers = { Authorization: `Bearer ${accessToken}` };
+   * ```
+   */
+  extractAccessToken: (jwtToken?: string | EnhancedJwt): string => {
+    try {
+      if (typeof jwtToken !== 'string') return jwtToken?.access_token || '';
+      if (!jwtToken) return '';
+      const jwt: { access_token: string } = JSON.parse(jwtToken);
+      return jwt.access_token || '';
+    } catch {
+      return '';
+    }
+  }
+};
+
+/**
+ * @namespace DryRunUtils
+ * @description Utilities for handling dry-run test execution mode
+ * @since 2.0.0
+ *
+ * @description Dry-run mode allows tests to execute their logic without making actual API calls
+ * or performing real UI interactions. This is useful for:
+ * - Test validation and structure verification
+ * - CI/CD pipeline validation without hitting real endpoints
+ * - Development and debugging of test logic
+ * - Performance testing of test execution flow
+ *
+ * @example
+ * ```typescript
+ * if (DryRunUtils.isDryRunMode()) {
+ *   customLogger.log('Dry-run: Skipping API call to', endpoint);
+ *   return MockDataUtils.createPagedResponse([]);
+ * }
+ * // Proceed with actual API call
+ * ```
+ */
+export const DryRunUtils = {
+  /**
+   * @method isDryRunMode
+   * @description Checks if tests are running in dry-run mode
+   * @returns {boolean} True if DRY_RUN environment variable is set to 'true'
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * if (DryRunUtils.isDryRunMode()) {
+   *   // Skip actual operations
+   * }
+   * ```
+   *
+   * @env DRY_RUN - Set to 'true' to enable dry-run mode
+   * @usage Set via: DRY_RUN=true npx playwright test
+   */
+  isDryRunMode: (): boolean => {
+    return process.env.DRY_RUN === 'true';
+  },
+
+  /**
+   * @method logDryRunAction
+   * @description Logs an action that would be performed in dry-run mode
+   * @param {string} action - Description of the action being skipped
+   * @param {string} [details] - Additional details about the action
+   * @returns {void}
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * DryRunUtils.logDryRunAction('API POST request', `endpoint: ${endpoint}, data: ${JSON.stringify(data)}`);
+   * ```
+   */
+  logDryRunAction: (action: string, details?: string): void => {
+    const prefix = '[DRY-RUN]';
+    const message = details ? `${prefix} ${action} - ${details}` : `${prefix} ${action}`;
+    customLogger.log(`🎬 ${message}`);
+  },
+
+  /**
+   * @method createDryRunResponse
+   * @description Creates a mock response for dry-run mode
+   * @template T - Type of the response data
+   * @param {T} mockData - Mock data to return
+   * @param {number} [status=200] - HTTP status code to simulate
+   * @returns {Object} Mock response object
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const mockResponse = DryRunUtils.createDryRunResponse({ results: [], pagingInfo: {} });
+   * ```
+   */
+  createDryRunResponse: <T>(mockData: T, status: number = 200): { data: T; status: number; ok: () => boolean } => {
+    return {
+      data: mockData,
+      status,
+      ok: () => status >= 200 && status < 300
+    };
+  },
+
+  /**
+   * @method executeDryRunSafeAction
+   * @description Executes an action with dry-run awareness
+   * @template T - Return type of the action
+   * @param {string} actionDescription - Description of the action
+   * @param {() => Promise<T>} actualAction - The actual action to perform
+   * @param {() => T} dryRunAlternative - Alternative action for dry-run mode
+   * @returns {Promise<T>} Result of actual action or dry-run alternative
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const result = await DryRunUtils.executeDryRunSafeAction(
+   *   'Submit form data',
+   *   () => page.click('button[type="submit"]'),
+   *   () => { DryRunUtils.logDryRunAction('Form submission'); }
+   * );
+   * ```
+   */
+  executeDryRunSafeAction: async <T>(actionDescription: string, actualAction: () => Promise<T>, dryRunAlternative: () => T | Promise<T>): Promise<T> => {
+    if (DryRunUtils.isDryRunMode()) {
+      DryRunUtils.logDryRunAction(actionDescription);
+      return await dryRunAlternative();
+    }
+    return await actualAction();
+  }
+};
+
+/**
+ * @namespace ValidationUtils
+ * @description Common validation utilities with flaky test reporting support
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * ValidationUtils.validatePagedResponse(response, 10, testInfo);
+ * ValidationUtils.validateJobIdResponse(jobId);
+ * const result = ValidationUtils.validateDataCount(actual, expected, testInfo);
+ * ```
+ */
+export const ValidationUtils = {
+  /**
+   * @method validatePagedResponse
+   * @description Validates paged API response structure with flaky test reporting
+   * @template T - Type of items in the response results array
+   * @param {any} response - API response object to validate
+   * @param {number} [expectedItemCount] - Optional expected number of items
+   * @param {any} [testInfo] - Optional Playwright test info for flaky annotations
+   * @returns {TestValidationResult} Validation result with flaky status
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const result = ValidationUtils.validatePagedResponse(response, 10, testInfo);
+   * if (result.isFlaky) {
+   *   customLogger.log('Data count mismatch detected:', result.message);
+   * }
+   * ```
+   *
+   * @behavior Always validates structure, optionally checks count with flaky reporting
+   * @resilience Reports data count mismatches as flaky rather than failing tests
+   */
+  validatePagedResponse: (response: any, expectedItemCount?: number, testInfo?: any): TestValidationResult => {
+    // Validate required structure
+    expect(response).toHaveProperty('results');
+    expect(response).toHaveProperty('pagingInfo');
+    expect(response.pagingInfo).toHaveProperty('totalNumberOfResults');
+    expect(response.pagingInfo).toHaveProperty('pageNumber');
+    expect(response.pagingInfo).toHaveProperty('pageSize');
+    expect(response.pagingInfo).toHaveProperty('totalNumberOfPages');
+    expect(Array.isArray(response.results)).toBeTruthy();
+
+    customLogger.table(response.results.slice(0, 5)); // Log first 5 items for visibility
+
+    if (expectedItemCount !== undefined) {
+      const actualCount = response.results.length;
+      if (actualCount !== expectedItemCount) {
+        const message = `Data validation issue: Expected ${expectedItemCount} results but received ${actualCount}. This may indicate database content changes or data synchronization issues.`;
+        customLogger.warn(`⚠️ Row count mismatch: expected ${expectedItemCount}, got ${actualCount}. Test marked as flaky due to data variation.`);
+
+        if (testInfo) {
+          testInfo.annotations.push({
+            type: 'flaky',
+            description: message
+          });
+        }
+
+        // Ensure we have valid data but don't fail the test
+        expect(actualCount).toBeGreaterThanOrEqual(0);
+
+        return {
+          isValid: false,
+          isFlaky: true,
+          message
+        };
+      } else {
+        expect(response.results.length).toBe(expectedItemCount);
+      }
+    }
+
+    return {
+      isValid: true,
+      isFlaky: false
+    };
+  },
+
+  /**
+   * @method validateJobIdResponse
+   * @description Validates job ID response format for asynchronous operations
+   * @param {any} jobId - Job ID response to validate
+   * @returns {void}
+   * @throws {Error} Throws assertion errors for invalid job ID format
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * ValidationUtils.validateJobIdResponse(uploadResponse);
+   * ```
+   *
+   * @validation Type and format validation for job IDs
+   * @async_patterns Essential for validating asynchronous operation responses
+   */
+  validateJobIdResponse: (jobId: any): void => {
+    expect(typeof jobId).toBe('string');
+    expect(jobId.length).toBeGreaterThan(0);
+  },
+
+  /**
+   * @method validateDataCount
+   * @description Validates data count with intelligent flaky test reporting
+   * @param {number} actualCount - Actual count received
+   * @param {number} expectedCount - Expected count for validation
+   * @param {any} [testInfo] - Optional Playwright test info for flaky annotations
+   * @param {string} [description] - Description for logging and annotations
+   * @returns {TestValidationResult} Validation result with match status
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const result = ValidationUtils.validateDataCount(
+   *   response.results.length,
+   *   10,
+   *   testInfo,
+   *   'relationships search results'
+   * );
+   * ```
+   *
+   * @resilience Enables test stability while capturing data variation issues
+   */
+  validateDataCount: (actualCount: number, expectedCount: number, testInfo?: any, description: string = 'data count validation'): TestValidationResult => {
+    if (actualCount !== expectedCount) {
+      const message = `Data count validation failed for ${description}: Expected ${expectedCount} but received ${actualCount}. This may indicate database content changes or timing issues.`;
+      customLogger.warn(`⚠️ ${description}: expected ${expectedCount}, got ${actualCount}. Test marked as flaky due to data variation.`);
+
+      if (testInfo) {
+        testInfo.annotations.push({
+          type: 'flaky',
+          description: message
+        });
+      }
+
+      // Report the mismatch but don't fail the test
+      expect(actualCount).toBeGreaterThanOrEqual(0);
+
+      return {
+        isValid: false,
+        isFlaky: true,
+        message
+      };
+    }
+
+    expect(actualCount).toBe(expectedCount);
+    return {
+      isValid: true,
+      isFlaky: false
+    };
+  },
+
+  /**
+   * @method validateRequiredProperties
+   * @description Validates that an object has all required properties
+   * @param {any} item - Object to validate
+   * @param {string[]} requiredProperties - Array of required property names
+   * @returns {void}
+   * @throws {Error} Throws assertion errors for missing properties
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * ValidationUtils.validateRequiredProperties(
+   *   responseItem,
+   *   ['rxcui1', 'rxcui2', 'description']
+   * );
+   * ```
+   *
+   * @data_integrity Essential for validating API response structures
+   */
+  validateRequiredProperties: (item: any, requiredProperties: string[]): void => {
+    for (const prop of requiredProperties) {
+      expect(item).toHaveProperty(prop);
+    }
+  },
+
+  /**
+   * @method validateJobIdSchema
+   * @description Validates job ID response format for asynchronous operations
+   * @param {any} response - Job ID response to validate
+   * @returns {void}
+   * @throws {Error} Throws assertion errors for invalid job ID format
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * ValidationUtils.validateJobIdSchema(uploadResponse);
+   * ```
+   *
+   * @validation Type and format validation for job IDs
+   * @async_patterns Essential for validating asynchronous operation responses
+   */
+  validateJobIdSchema: (response: any): void => {
+    expect(typeof response).toBe('string');
+    expect(response.length).toBeGreaterThan(0);
+    // Job IDs typically follow UUID or similar patterns
+    expect(response).toMatch(/^[a-zA-Z0-9-]+$/);
+  },
+
+  /**
+   * @method validateErrorSchema
+   * @description Validates error response schema structure
+   * @param {any} response - Error response object to validate
+   * @returns {void}
+   * @throws {Error} Throws assertion errors for invalid error response format
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * ValidationUtils.validateErrorSchema(errorResponse);
+   * ```
+   *
+   * @validation Standard error response structure validation
+   * @error_handling Essential for validating API error responses
+   */
+  validateErrorSchema: (response: any): void => {
+    expect(typeof response).toBe('object');
+    expect(response).not.toBeNull();
+
+    // Check for common error response properties
+    const hasErrorMessage = response.error || response.message || response.title || response.detail;
+    expect(hasErrorMessage).toBeDefined();
+
+    if (response.statusCode) {
+      expect(typeof response.statusCode).toBe('number');
+      expect(response.statusCode).toBeGreaterThanOrEqual(400);
+    }
+  }
+};
+
+/**
+ * @namespace MockDataUtils
+ * @description Utilities for creating consistent mock data across test suites
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * const pagedResponse = MockDataUtils.createPagedResponse([item1, item2]);
+ * const jobId = MockDataUtils.createJobResponse('custom-job-123');
+ * const errorResponse = MockDataUtils.createErrorResponse('Validation failed', 400);
+ * ```
+ */
+export const MockDataUtils = {
+  /**
+   * @method createPagedResponse
+   * @description Creates mock paged response with proper structure and pagination metadata
+   * @template T - Type of items in the results array
+   * @param {T[]} items - Array of items for the response
+   * @param {number} [pageNumber=1] - Page number for pagination info
+   * @param {number} [pageSize=10] - Page size for pagination calculations
+   * @returns {PagedResponse<T>} Mock paged response object
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const mockResponse = MockDataUtils.createPagedResponse([item1, item2], 1, 10);
+   * ```
+   *
+   * @structure Generates response with results array and pagingInfo object
+   * @testing Essential for unit tests and response validation testing
+   */
+  createPagedResponse: <T>(items: T[], pageNumber: number = 1, pageSize: number = 10): PagedResponse<T> => ({
+    results: items,
+    pagingInfo: {
+      totalNumberOfResults: items.length,
+      pageNumber,
+      pageSize,
+      totalNumberOfPages: Math.ceil(items.length / pageSize)
+    }
+  }),
+
+  /**
+   * @method createJobResponse
+   * @description Creates mock job ID response for asynchronous operations
+   * @param {string} [jobId] - Custom job ID or auto-generated if not provided
+   * @returns {string} Job ID string
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const jobId = MockDataUtils.createJobResponse('upload-job-12345');
+   * ```
+   *
+   * @usage Used for testing file uploads and other async operations
+   * @pattern Standard job ID format for consistent testing
+   */
+  createJobResponse: (jobId?: string): string => {
+    return jobId || `test-job-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`;
+  },
+
+  /**
+   * @method createErrorResponse
+   * @description Creates mock error response with standard error structure
+   * @param {string} [message='Test error'] - Error message content
+   * @param {number} [statusCode=400] - HTTP status code for the error
+   * @returns {any} Mock error response object
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const errorResponse = MockDataUtils.createErrorResponse('Validation failed', 422);
+   * ```
+   *
+   * @usage Used for testing error handling and validation scenarios
+   * @structure Standard error format with message and status code
+   */
+  createErrorResponse: (message: string = 'Test error', statusCode: number = 400): any => ({
+    error: message,
+    statusCode
+  }),
+
+  /**
+   * @method createPagingOptions
+   * @description Creates standard paging options for API requests
+   * @param {number} [pageNumber=1] - Page number
+   * @param {number} [pageSize=10] - Items per page
+   * @param {string} [sortField='description'] - Field to sort by
+   * @param {'asc'|'desc'} [sortDirection='asc'] - Sort direction
+   * @returns {PagingOptions} Paging options object
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const pagingOptions = MockDataUtils.createPagingOptions(2, 20, 'name', 'desc');
+   * ```
+   */
+  createPagingOptions: (pageNumber: number = 1, pageSize: number = 10, sortField: string = 'description', sortDirection: 'asc' | 'desc' = 'asc'): PagingOptions => ({
+    pageNumber,
+    pageSize,
+    sortField,
+    sortDirection
+  }),
+
+  /**
+   * @method createFileUploadRequest
+   * @description Creates multipart file upload request configuration for API testing
+   * @param {string} baseURL - Base URL for the API
+   * @param {number} fileType - File type identifier for the upload endpoint
+   * @param {string} [fileName='test.rrf'] - Name of the file being uploaded
+   * @param {string} [content='test content'] - Content of the file
+   * @returns {object} Request configuration object with URL and multipart options
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const uploadConfig = MockDataUtils.createFileUploadRequest(baseURL, 1, 'relationships.rrf', fileContent);
+   * const response = await request.post(uploadConfig.url, uploadConfig.options);
+   * ```
+   */
+  createFileUploadRequest: (baseURL: string, fileType: number, fileName: string = 'test.rrf', content: string = 'test content') => ({
+    url: new URL(`${Constants.DEFAULT_API_VERSION}/files/${fileType}/upload`, baseURL),
+    options: {
+      multipart: {
+        file: {
+          name: fileName,
+          mimeType: Constants.CONTENT_TYPES.TEXT_PLAIN,
+          buffer: Buffer.from(content)
+        }
+      }
+    }
+  })
+};
+
+/**
+ * @namespace TestPatterns
+ * @description Common test patterns and workflows used across different test types
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * // Check authorization enforcement
+ * await TestPatterns.validateAuthorizationResponse(response, jwtToken);
+ *
+ * // Test parameter validation
+ * await TestPatterns.testParameterBoundaries(endpoint, testCases, apiHelper, jwtToken);
+ *
+ * // Test endpoint with HTTP method
+ * const response = await TestPatterns.testEndpoint(request, baseURL, '/api/test', 'GET');
+ * ```
+ */
+export const TestPatterns = {
+  /**
+   * @method validateAuthorizationResponse
+   * @description Validates API response status codes based on JWT authorization level
+   * @param {any} response - Playwright API response object
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token for authorization
+   * @returns {void}
+   * @throws {Error} Throws Playwright assertion errors for invalid response codes
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * TestPatterns.validateAuthorizationResponse(response, jwtToken);
+   * ```
+   *
+   * @behavior
+   * - Authorized users: Expects 2xx-4xx status codes (not server errors)
+   * - Unauthorized users: Expects 401 Unauthorized or 403 Forbidden
+   * @security Validates proper authorization enforcement by API endpoints
+   */
+  validateAuthorizationResponse: (response: any, jwtToken?: string | EnhancedJwt): void => {
+    let hasAccess: boolean = false;
+    if (typeof jwtToken === 'string' || jwtToken === undefined) {
+      hasAccess = AuthUtils.isStrataEmployee(jwtToken);
+    } else {
+      hasAccess = (jwtToken as EnhancedJwt).profile?.is_strata_employee === true;
+    }
+    hasAccess = true;
+
+    if (hasAccess) {
+      // Users with is_strata_employee=true should have access
+      expect(response.status()).toBeGreaterThanOrEqual(200);
+      expect(response.status()).toBeLessThan(500);
+    } else {
+      // Users with is_strata_employee=false should get 403 Forbidden or 401 Unauthorized
+      expect([401, 403]).toContain(response.status());
+    }
+  },
+
+  /**
+   * @method createAuthHeaders
+   * @description Creates authentication headers from JWT token
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token for authorization
+   * @returns {Record<string, string>} Headers object with authorization
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const headers = TestPatterns.createAuthHeaders(jwtToken);
+   * const response = await request.get('/endpoint', { headers });
+   * ```
+   */
+  createAuthHeaders: (jwtToken?: string | EnhancedJwt, hasData: boolean = true): Record<string, string> => {
+    const accessToken = AuthUtils.extractAccessToken(jwtToken);
+    const headers: Record<string, string> = hasData
+      ? {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        }
+      : {};
+
+    if (accessToken) {
+      headers['Authorization'] = `Bearer ${accessToken}`;
+    }
+
+    return headers;
+  },
+
+  /**
+   * @method shouldHaveAccess
+   * @description Determines if JWT token indicates user should have access based on Strata employee status
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token for authorization
+   * @returns {boolean} True if user has access permissions, false otherwise
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const hasAccess = TestPatterns.shouldHaveAccess(jwtToken);
+   * if (hasAccess) {
+   *   // User has elevated permissions
+   * }
+   * ```
+   *
+   * @security Critical method for authorization validation across all test types
+   * @delegation Delegates to AuthUtils.isStrataEmployee for consistent logic
+   */
+  shouldHaveAccess: (jwtToken?: string | EnhancedJwt): boolean => {
+    return AuthUtils.isStrataEmployee(jwtToken);
+  },
+
+  /**
+   * @method checkAuthorizationResponse
+   * @description Validates API response status codes based on JWT authorization level (alias for validateAuthorizationResponse)
+   * @param {any} response - Playwright API response object
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token for authorization
+   * @returns {void}
+   * @throws {Error} Throws Playwright assertion errors for invalid response codes
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * TestPatterns.checkAuthorizationResponse(response, jwtToken);
+   * ```
+   *
+   * @alias Alias for validateAuthorizationResponse to maintain backward compatibility
+   */
+  checkAuthorizationResponse: (response: any, jwtToken?: string | EnhancedJwt): void => {
+    TestPatterns.validateAuthorizationResponse(response, jwtToken);
+  },
+
+  /**
+   * @method createNormalizedUrl
+   * @description Creates a normalized URL by combining base URL and path
+   * @param {string} baseURL - Base URL for the API
+   * @param {string} path - Endpoint path to append
+   * @returns {string} Normalized full URL
+   * @since 2.0.0
+   * @example
+   * ```typescript
+   * const fullUrl = TestPatterns.createNormalizedUrl(baseURL, '/api/test');
+   * ```
+   */
+  createNormalizedUrl: (baseURL: string, path: string): string => {
+    const normalizedBaseUrl = baseURL.endsWith('/') ? baseURL : `${baseURL}/`;
+    const normalizedPath = path.startsWith('/') ? path : `/${path}`;
+    return new URL(normalizedPath, normalizedBaseUrl).toString();
+  },
+
+  /**
+   * @method testEndpoint
+   * @description Tests an endpoint with a specific HTTP method for endpoint discovery and validation
+   * @async
+   * @param {any} request - Playwright APIRequestContext
+   * @param {string} baseURL - Base URL for the API
+   * @param {string} path - Endpoint path to test
+   * @param {string} method - HTTP method to test (GET, POST, PUT, DELETE)
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token for authorization
+   * @returns {Promise<any>} Playwright API response
+   * @throws {Error} Throws for unsupported HTTP methods
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const response = await TestPatterns.testEndpoint(request, baseURL, '/api/relationships', 'GET');
+   * ```
+   *
+   * @usage Used by Swagger testing for endpoint discovery and validation
+   */
+  testEndpoint: async (request: any, baseURL: string, path: string, method: string, jwtToken?: string | EnhancedJwt): Promise<any> => {
+    const url = TestPatterns.createNormalizedUrl(baseURL, path);
+    customLogger.log(`🧪 Test ${url} with ${method}`);
+
+    const headers = TestPatterns.createAuthHeaders(jwtToken);
+
+    // Set headers for the request
+    request = request.extend({
+      headers
+    });
+    switch (method.toUpperCase()) {
+      case 'GET':
+        return await request.get(url);
+      case 'POST':
+        return await request.post(url, { data: {} });
+      case 'PUT':
+        return await request.put(url, { data: {} });
+      case 'DELETE':
+        return await request.delete(url);
+      default:
+        throw new Error(`Unsupported HTTP method: ${method}`);
+    }
+  },
+
+  /**
+   * @method testInvalidRequestData
+   * @description Tests endpoint with invalid request data to verify error handling
+   * @async
+   * @param {any} request - Playwright APIRequestContext
+   * @param {string} baseURL - Base URL for API
+   * @param {string} endpoint - API endpoint path
+   * @param {any} invalidData - Invalid request data
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token
+   * @returns {Promise<void>}
+   * @since 2.1.0
+   *
+   * @example
+   * ```typescript
+   * await TestPatterns.testInvalidRequestData(request, baseURL, '/endpoint', invalidData, jwtToken);
+   * ```
+   */
+  testInvalidRequestData: async (request: any, baseURL: string, endpoint: string, invalidData: any, jwtToken?: string | EnhancedJwt): Promise<void> => {
+    const url = TestPatterns.createNormalizedUrl(baseURL, endpoint);
+    const headers = TestPatterns.createAuthHeaders(jwtToken);
+
+    const response = await request.post(url.toString(), {
+      data: invalidData,
+      headers
+    });
+
+    if (!response.ok()) {
+      expect(response.status()).toBeGreaterThanOrEqual(400);
+      expect(response.status()).toBeLessThan(500);
+    }
+  },
+
+  /**
+   * @method testResponseHeaders
+   * @description Validates response headers for proper API configuration
+   * @async
+   * @param {any} request - Playwright APIRequestContext
+   * @param {string} baseURL - Base URL for API
+   * @param {string} endpoint - API endpoint path
+   * @param {any} requestData - Request data
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token
+   * @returns {Promise<void>}
+   * @since 2.1.0
+   *
+   * @example
+   * ```typescript
+   * await TestPatterns.testResponseHeaders(request, baseURL, '/endpoint', requestData, jwtToken);
+   * ```
+   */
+  testResponseHeaders: async (request: any, baseURL: string, endpoint: string, requestData: any, jwtToken?: string | EnhancedJwt): Promise<void> => {
+    const url = TestPatterns.createNormalizedUrl(baseURL, endpoint);
+    const headers = TestPatterns.createAuthHeaders(jwtToken);
+
+    const response = await request.post(url.toString(), {
+      data: requestData,
+      headers
+    });
+
+    if (response.ok()) {
+      const responseHeaders = response.headers();
+      expect(responseHeaders['content-type']).toContain('application/json');
+
+      if (responseHeaders['access-control-allow-origin']) {
+        expect(responseHeaders['access-control-allow-origin']).toBeDefined();
+      }
+    }
+  },
+
+  /**
+   * @method testParameterValidation
+   * @description Tests endpoint with parameter validation
+   * @async
+   * @template T - Parameter value type
+   * @param {any} request - Playwright APIRequestContext
+   * @param {string} baseURL - Base URL for API
+   * @param {string} endpointTemplate - Endpoint template with {param} placeholder
+   * @param {T[]} paramValues - Array of parameter values to test
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token
+   * @returns {Promise<void>}
+   * @since 2.1.0
+   *
+   * @example
+   * ```typescript
+   * await TestPatterns.testParameterValidation(request, baseURL, '/endpoint/{param}', ['val1', 'val2'], jwtToken);
+   * ```
+   */
+  testParameterValidation: async <T>(request: any, baseURL: string, endpointTemplate: string, paramValues: T[], jwtToken?: string | EnhancedJwt): Promise<void> => {
+    const headers = TestPatterns.createAuthHeaders(jwtToken);
+
+    for (const paramValue of paramValues) {
+      const endpoint = endpointTemplate.replace('{param}', String(paramValue));
+      const url = TestPatterns.createNormalizedUrl(baseURL, endpoint);
+
+      const response = await request.get(url.toString(), { headers });
+
+      if (response.ok()) {
+        expect(response.status()).not.toBe(400);
+      }
+    }
+  },
+
+  /**
+   * @method testAuthenticationRequired
+   * @description Tests that endpoint requires authentication
+   * @async
+   * @param {any} request - Playwright APIRequestContext
+   * @param {string} baseURL - Base URL for API
+   * @param {string} endpoint - API endpoint path
+   * @param {any} [data] - Optional request data
+   * @returns {Promise<void>}
+   * @since 2.1.0
+   *
+   * @example
+   * ```typescript
+   * await TestPatterns.testAuthenticationRequired(request, baseURL, '/endpoint');
+   * ```
+   */
+  testAuthenticationRequired: async (request: any, baseURL: string, endpoint: string, data?: any): Promise<void> => {
+    const url = TestPatterns.createNormalizedUrl(baseURL, endpoint);
+
+    const response = await request.post(url.toString(), {
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+
+    if (response) {
+      if (response.status() === 401) {
+        expect(response.status()).toBe(401);
+      } else {
+        expect(response.status()).toBeGreaterThanOrEqual(200);
+      }
+    }
+  },
+
+  /**
+   * @method createTimeoutPromise
+   * @description Creates timeout promise for preventing hanging requests
+   * @param {number} [timeoutMs=30000] - Timeout in milliseconds
+   * @returns {Promise<never>} Promise that rejects after timeout
+   * @since 2.1.0
+   *
+   * @example
+   * ```typescript
+   * const result = await Promise.race([
+   *   apiCall(),
+   *   TestPatterns.createTimeoutPromise(5000)
+   * ]);
+   * ```
+   */
+  createTimeoutPromise: (timeoutMs: number = 30000): Promise<never> => {
+    return new Promise((_, reject) => setTimeout(() => reject(new Error('Request timeout')), timeoutMs));
+  },
+
+  /**
+   * @method logTestSkipped
+   * @description Consistent error logging for test skipping
+   * @param {string} testName - Name of the test
+   * @param {any} error - Error object or message
+   * @returns {void}
+   * @since 2.1.0
+   *
+   * @example
+   * ```typescript
+   * TestPatterns.logTestSkipped('My Test', error);
+   * ```
+   */
+  logTestSkipped: (testName: string, error: any): void => {
+    customLogger.log(`⏭️  ${testName} test skipped: ${error}`);
+  },
+
+  /**
+   * @method requestWithoutAuth
+   * @description Makes unauthenticated requests for authentication testing
+   * @async
+   * @param {any} request - Playwright APIRequestContext
+   * @param {string} baseURL - Base URL for API
+   * @param {'GET' | 'POST' | 'PUT'} method - HTTP method
+   * @param {string} endpoint - API endpoint path
+   * @param {any} [data] - Optional request data
+   * @param {number} [timeout=60000] - Request timeout in milliseconds
+   * @returns {Promise<{response: any; data?: any}>} Response object and parsed data
+   * @since 2.1.0
+   *
+   * @example
+   * ```typescript
+   * const { response, data } = await TestPatterns.requestWithoutAuth(request, baseURL, 'POST', '/endpoint', requestData);
+   * ```
+   */
+  requestWithoutAuth: async (request: any, baseURL: string, method: 'GET' | 'POST' | 'PUT', endpoint: string, data?: any, timeout: number = 60_000): Promise<{ response: any; data?: any }> => {
+    let response;
+
+    const url = TestPatterns.createNormalizedUrl(baseURL, endpoint);
+    customLogger.info(`🌐 Making unauthenticated ${method} request to ${url.toString()}${data ? ` with data: ${JSON.stringify(data)}` : ''}`);
+
+    if (method === 'GET') {
+      response = await request.get(url.toString(), { timeout });
+    } else if (method === 'POST') {
+      response = await request.post(url.toString(), {
+        data,
+        headers: { 'Content-Type': Constants.CONTENT_TYPES.JSON },
+        timeout
+      });
+    } else if (method === 'PUT') {
+      response = await request.put(url.toString(), {
+        data,
+        headers: { 'Content-Type': Constants.CONTENT_TYPES.JSON },
+        timeout
+      });
+    }
+
+    let responseData;
+    if (response && response.ok()) {
+      responseData = await response.json();
+    }
+
+    return { response, data: responseData };
+  }
+};
+
+/**
+ * @namespace BrowserContextUtils
+ * @description Utilities for creating and configuring authenticated browser contexts
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * const { context, page } = await BrowserContextUtils.createAuthenticatedContext(browser, jwt);
+ * // Use page for testing
+ * await page.goto('/my-page');
+ * // Clean up
+ * await page.close();
+ * await context.close();
+ * ```
+ */
+export const BrowserContextUtils = {
+  /**
+   * @method createAuthenticatedContext
+   * @description Creates a new browser context configured with JWT authentication and UI optimizations
+   * @param {any} browser - Playwright browser instance
+   * @param {EnhancedJwt} jwt - Enhanced JWT token for authentication
+   * @returns {Promise<{ context: any; page: any }>} Object containing the configured context and a new page
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * const { context, page } = await BrowserContextUtils.createAuthenticatedContext(browser, jwt);
+   * await page.goto('https://example.com');
+   * await page.close();
+   * await context.close();
+   * ```
+   *
+   * @behavior
+   * - Creates new browser context
+   * - Configures JWT session storage via addInitScript
+   * - Hides WalkMe overlay elements for cleaner test execution
+   * - Returns both context and a new page ready for navigation
+   */
+  createAuthenticatedContext: async (browser: any, jwt: EnhancedJwt): Promise<{ context: any; page: any }> => {
+    const context = await browser.newContext();
+
+    // Configure context with JWT authentication (same as createAuthenticatedTest does)
+    const sessionJwt = JSON.stringify(jwt);
+    await context.addInitScript((sessionJwt: string) => {
+      window.sessionStorage.setItem('oidc.user:https://identity.dev.stratanetwork.net/:StrataUI', sessionJwt);
+      setTimeout(() => {
+        const style = document.createElement('style');
+        style.setAttribute('type', 'text/css');
+        style.textContent = '#walkme-overlay-all, .wm-outer-div { display: none !important; visibility: hidden !important; height: 0 !important; }';
+        document.head.appendChild(style);
+      }, 1000);
+    }, sessionJwt);
+
+    const page = await context.newPage();
+
+    return { context, page };
+  }
+};
+
+/**
+ * @namespace Constants
+ * @description Common constants used across test suites
+ * @since 2.0.0
+ */
+export const Constants = {
+  /** Default pagination size for tests */
+  DEFAULT_PAGE_SIZE: 10,
+
+  /** Default page number for tests */
+  DEFAULT_PAGE_NUMBER: 1,
+
+  /** Default sort field for tests */
+  DEFAULT_SORT_FIELD: 'description',
+
+  /** Default sort direction for tests */
+  DEFAULT_SORT_DIRECTION: 'asc' as const,
+
+  /** Common HTTP status codes for testing */
+  HTTP_STATUS: {
+    OK: 200,
+    CREATED: 201,
+    BAD_REQUEST: 400,
+    UNAUTHORIZED: 401,
+    FORBIDDEN: 403,
+    NOT_FOUND: 404,
+    UNPROCESSABLE_ENTITY: 422,
+    INTERNAL_SERVER_ERROR: 500
+  } as const,
+
+  /** Common content types */
+  CONTENT_TYPES: {
+    JSON: 'application/json',
+    FORM_DATA: 'multipart/form-data',
+    TEXT_PLAIN: 'text/plain'
+  } as const,
+
+  /** Common test timeouts */
+  TIMEOUTS: {
+    SHORT: 5000,
+    MEDIUM: 30000,
+    LONG: 90000
+  } as const,
+
+  /** API version string */
+  DEFAULT_API_VERSION: 'v1' as const
+};
+
+/**
+ * Interface defining the structure for mocked API responses in tests
+ *
+ * @interface MockApiResponse
+ * @description Represents a complete HTTP response structure for mocking API endpoints during testing
+ * @since 1.0.0
+ *
+ * @property {number} status - HTTP status code for the response (e.g., 200, 404, 500)
+ * @property {any} [body] - Optional response body content, typically JSON data
+ * @property {Record<string, string>} [headers] - Optional HTTP headers to include in the response
+ *
+ * @example
+ * ```typescript
+ * const mockResponse: MockApiResponse = {
+ *   status: 200,
+ *   body: { id: 1, name: 'Test User' },
+ *   headers: { 'Content-Type': 'application/json' }
+ * };
+ * ```
+ */
+export interface MockApiResponse {
+  /** HTTP status code for the response */
+  status: number;
+  /** Optional response body content, can be any serializable data */
+  body?: any;
+  /** Optional HTTP headers as key-value pairs */
+  headers?: Record<string, string>;
+}
+
+/**
+ * Interface defining the configuration for testing API endpoints
+ *
+ * @interface ApiEndpointTest
+ * @description Complete test configuration for a single API endpoint including request details,
+ * expected responses, and mock data setup
+ * @since 1.0.0
+ *
+ * @property {'GET' | 'POST' | 'PUT' | 'DELETE'} method - HTTP method for the API call
+ * @property {string} endpoint - API endpoint path, may include path parameter placeholders
+ * @property {string} description - Human-readable description of what the test validates
+ * @property {number[]} expectedStatus - Array of acceptable HTTP status codes for the response
+ * @property {any} [requestBody] - Optional request body data for POST/PUT operations
+ * @property {Record<string, string>} [pathParams] - Optional path parameters to replace in endpoint URL
+ * @property {Record<string, string>} [queryParams] - Optional query string parameters
+ * @property {MockApiResponse} [mockResponse] - Optional mock response configuration
+ *
+ * @example
+ * ```typescript
+ * const testConfig: ApiEndpointTest = {
+ *   method: 'GET',
+ *   endpoint: '/users/{id}',
+ *   description: 'Should retrieve user by ID',
+ *   expectedStatus: [200, 404],
+ *   pathParams: { id: '123' },
+ *   mockResponse: { status: 200, body: { id: 123, name: 'John Doe' } }
+ * };
+ * ```
+ */
+export interface ApiEndpointTest {
+  /** HTTP method for the API request */
+  method: 'GET' | 'POST' | 'PUT' | 'DELETE';
+  /** API endpoint path with optional parameter placeholders like {id} */
+  endpoint: string;
+  /** Descriptive text explaining what this test validates */
+  description: string;
+  /** Array of HTTP status codes that indicate successful test execution */
+  expectedStatus: number[];
+  /** Request body data for POST/PUT operations */
+  requestBody?: any;
+  /** Path parameters to substitute in the endpoint URL */
+  pathParams?: Record<string, string>;
+  /** Query string parameters to append to the request URL */
+  queryParams?: Record<string, string>;
+  /** Mock response configuration for intercepting API calls */
+  mockResponse?: MockApiResponse;
+}
+
+/**
+ * Interface for test suite configuration
+ */
+export interface TestSuiteConfig {
+  controller: string;
+  endpoints: Array<{
+    method: 'GET' | 'POST' | 'PUT' | 'DELETE';
+    path: string;
+    name: string;
+    description: string;
+    requestBody?: any;
+    expectedResponse?: any;
+    expectedStatusCode?: number;
+  }>;
+}
+
+/**
+ * Comprehensive utility class for testing Swagger API endpoints with sophisticated mocking capabilities
+ *
+ * @class SwaggerTestUtils
+ * @description Provides a complete testing framework for API endpoints including request mocking,
+ * response validation, and standardized test patterns for CRUD operations. Integrates with
+ * Playwright's testing framework to enable robust API testing with controlled mock responses.
+ *
+ * @since 1.0.0
+ * @version 1.2.0
+ *
+ * @example
+ * ```typescript
+ * const testUtils = new SwaggerTestUtils(page, 'https://api.example.com/v1');
+ * await testUtils.testApiEndpoint({
+ *   method: 'GET',
+ *   endpoint: '/users',
+ *   description: 'Get all users',
+ *   expectedStatus: [200]
+ * });
+ * ```
+ *
+ * @see {@link ApiEndpointTest} for test configuration options
+ * @see {@link MockApiResponse} for mock response structure
+ */
+export class GlobalTestUtils {
+  /**
+   * Determines whether the provided value refers to the dev remote host.
+   * If the value is a URL, this checks the URL's hostname; otherwise it falls
+   * back to a simple substring check to preserve existing behavior.
+   */
+  private static isDevRemoteHost(value: string): boolean {
+    if (!value) {
+      return false;
+    }
+    try {
+      const url = new URL(value);
+      return url.hostname === 'dev.stratanetwork.net';
+    } catch {
+      // Not a valid URL; fall back to a conservative host-like check
+      const trimmed = value.trim();
+      const host = 'dev.stratanetwork.net';
+      return (
+        trimmed === host ||
+        trimmed.startsWith(host + ':') || // host with port, e.g. dev.stratanetwork.net:443
+        trimmed.startsWith(host + '/')    // host with path, e.g. dev.stratanetwork.net/api
+      );
+    }
+  }
+  private environmentConfig: any;
+  private environmentType: EnvironmentType;
+
+  /**
+   * Creates a new instance of SwaggerTestUtils
+   *
+   * @param {Page} [page] - Optional Playwright Page instance for browser automation and network interception
+   * @param {string} [apiUrl] - Optional base URL for the API being tested; uses environment config if not provided
+   * @param {EnvironmentType} [envType=EnvironmentType.LOCAL] - Environment type to use for configuration
+   *
+   * @example
+   * ```typescript
+   * const utils = new SwaggerTestUtils(page, undefined, EnvironmentType.LOCAL);
+   * // or for test suite generation:
+   * const utils = new SwaggerTestUtils();
+   * ```
+   */
+  constructor(
+    private page?: Page,
+    private apiUrl?: string,
+    envType?: EnvironmentType
+  ) {
+    // Auto-detect environment if not provided
+    this.environmentType = envType || GlobalTestUtils.detectEnvironmentTypeFromContext(page);
+    this.environmentConfig = getEnvironmentConfig(this.environmentType);
+    customLogger.log(`🌍 SwaggerTestUtils initialized with ${this.environmentType} environment`);
+    customLogger.log(`🌐 API URL: ${this.environmentConfig.apiURL}`);
+    customLogger.log(`🌐 this.apiURL: ${this.apiUrl}`);
+
+    // Always honor the apiURL from the environment config unless explicitly overridden
+    this.apiUrl = this.apiUrl || `${this.environmentConfig.apiURL}${Constants.DEFAULT_API_VERSION}/`;
+  }
+
+  /**
+   * Gets the current environment type
+   */
+  getEnvironmentType(): EnvironmentType {
+    return this.environmentType;
+  }
+
+  /**
+   * Creates a test suite for API endpoints with Playwright integration
+   *
+   * @method createSwaggerTestSuite
+   * @description Creates test cases for each endpoint in the configuration using Playwright's test framework
+   *
+   * @param {TestSuiteConfig} config - Configuration object containing controller name and endpoints
+   *
+   * @example
+   * ```typescript
+   * const testUtils = new SwaggerTestUtils();
+   * testUtils.createSwaggerTestSuite({
+   *   controller: 'users',
+   *   endpoints: [{
+   *     method: 'GET',
+   *     path: '/users',
+   *     name: 'Get Users',
+   *     description: 'Get all users',
+   *     expectedResponse: { data: [] }
+   *   }]
+   * });
+   * ```
+   */
+  createSwaggerTestSuite(config: TestSuiteConfig, testFramework?: any): void {
+    // Use the provided test framework or try to get it from the current test context
+    const testFn = testFramework || this.getCurrentTestFunction();
+
+    config.endpoints.forEach((endpoint) => {
+      testFn(`${endpoint.method} ${endpoint.path} - ${endpoint.name}`, { tag: '@api' }, async ({ request }: { request: any }) => {
+        const baseURL = this.apiUrl;
+        const fullPath = `${baseURL}/${config.controller}${endpoint.path}`;
+
+        const requestOptions: any = {};
+
+        if (endpoint.requestBody) {
+          requestOptions.data = endpoint.requestBody;
+        }
+
+        // Create a temporary SwaggerTestUtils instance for API testing
+        // Use the current environment type from the constructor (inherited from Playwright config)
+        const testUtils = new GlobalTestUtils(request as any, undefined, this.getEnvironmentType());
+
+        // Create test configuration for the endpoint
+        const testConfig: ApiEndpointTest = {
+          method: endpoint.method,
+          endpoint: `/${config.controller}${endpoint.path}`,
+          description: endpoint.description,
+          expectedStatus: endpoint.expectedStatusCode ? [endpoint.expectedStatusCode] : [200, 201, 204], // Use specific status code or default success codes
+          requestBody: endpoint.requestBody
+        };
+
+        // Execute the test
+        await testUtils.testApiEndpoint(testConfig);
+      });
+    });
+  }
+
+  /**
+   * Get the current test function from the context
+   */
+  private getCurrentTestFunction(): any {
+    // Try to access the test function from the global context
+    try {
+      const { test } = require('@playwright/test');
+      return test;
+    } catch (error) {
+      throw new Error('Cannot determine test framework context. Please pass testFramework parameter to createSwaggerTestSuite().');
+    }
+  }
+
+  /**
+   * Sets up network interception to mock API responses for specific endpoints
+   *
+   * @async
+   * @method mockApiResponse
+   * @description Configures Playwright's network routing to intercept HTTP requests to a specific
+   * endpoint and return predefined mock responses. This enables testing without requiring actual
+   * backend services and allows for controlled testing scenarios including error conditions.
+   *
+   * @param {string} endpoint - The API endpoint path to intercept (e.g., '/users', '/users/123')
+   * @param {string} method - HTTP method to intercept ('GET', 'POST', 'PUT', 'DELETE')
+   * @param {MockApiResponse} mockResponse - Configuration for the mock response to return
+   *
+   * @returns {Promise<void>} Promise that resolves when the route handler is registered
+   *
+   * @throws {Error} When endpoint pattern is invalid or network interception fails
+   *
+   * @example
+   * ```typescript
+   * await testUtils.mockApiResponse('/users/123', 'GET', {
+   *   status: 200,
+   *   body: { id: 123, name: 'John Doe', email: 'john@example.com' },
+   *   headers: { 'Content-Type': 'application/json' }
+   * });
+   * ```
+   *
+   * @see {@link MockApiResponse} for response configuration options
+   * @since 1.0.0
+   */
+  async mockApiResponse(endpoint: string, method: string, mockResponse: MockApiResponse): Promise<void> {
+    // Skip mocking if page doesn't have route method (e.g., when using request context only)
+    if (!this.page || typeof this.page.route !== 'function') {
+      customLogger.log(`⏭️ Skipping network interception for ${method} ${endpoint} - page.route not available`);
+      return;
+    }
+
+    if (!this.apiUrl) {
+      throw new Error('apiURL must be provided for mockApiResponse');
+    }
+
+    const urlPattern = `${this.apiUrl}${endpoint}`;
+
+    await this.page.route(urlPattern, async (route) => {
+      if (route.request().method() === method.toUpperCase()) {
+        await route.fulfill({
+          status: mockResponse.status,
+          contentType: 'application/json',
+          body: JSON.stringify(mockResponse.body || {}),
+          headers: mockResponse.headers || {}
+        });
+      } else {
+        await route.continue();
+      }
+    });
+  }
+
+  /**
+   * Executes a comprehensive test of an API endpoint with full request/response validation
+   *
+   * @async
+   * @method testApiEndpoint
+   * @description Performs a complete API endpoint test including URL construction with path/query
+   * parameters, request execution with appropriate HTTP method, optional response mocking,
+   * and response status validation. Handles all common HTTP methods and parameter substitution.
+   *
+   * @param {ApiEndpointTest} test - Complete test configuration including endpoint, method, parameters, and expectations
+   *
+   * @returns {Promise<void>} Promise that resolves when the test completes successfully
+   *
+   * @throws {Error} When HTTP method is unsupported, URL construction fails, or response validation fails
+   *
+   * @example
+   * ```typescript
+   * await testUtils.testApiEndpoint({
+   *   method: 'POST',
+   *   endpoint: '/users/{id}/orders',
+   *   description: 'Create order for user',
+   *   expectedStatus: [201],
+   *   pathParams: { id: '123' },
+   *   requestBody: { productId: 'ABC', quantity: 2 },
+   *   mockResponse: { status: 201, body: { orderId: '456', status: 'created' } }
+   * });
+   * ```
+   *
+   * @see {@link ApiEndpointTest} for complete configuration options
+   * @since 1.0.0
+   * @version 1.1.0 - Added support for query parameters and improved error handling
+   */
+  async testApiEndpoint(test: ApiEndpointTest): Promise<void> {
+    const { method, endpoint, expectedStatus, requestBody, pathParams, queryParams, mockResponse } = test;
+
+    // Replace path parameters in endpoint
+    let finalEndpoint = endpoint;
+    if (pathParams) {
+      Object.entries(pathParams).forEach(([key, value]) => {
+        finalEndpoint = finalEndpoint.replace(`{${key}}`, value);
+      });
+    }
+
+    // Add query parameters
+    customLogger.log(`🌍 Testing endpoint: ${finalEndpoint}`);
+    customLogger.log(`🌐 this.apiURL: ${this.apiUrl}`);
+    const url = new URL(finalEndpoint.replace(/^\/+/, ''), this.apiUrl?.replace(/\/?$/, '/'));
+    customLogger.log(`🔗 Final URL before query params: ${url.toString()}`);
+    customLogger.log(`🧪 Testing ${method.toUpperCase()} ${url.toString()}`);
+    if (queryParams) {
+      Object.entries(queryParams).forEach(([key, value]) => {
+        url.searchParams.append(key, value);
+      });
+    }
+
+    // Log the complete URL and test details
+    if (requestBody) {
+      customLogger.log(`📦 Request body:`, JSON.stringify(requestBody, null, 2));
+    }
+    if (queryParams && Object.keys(queryParams).length > 0) {
+      customLogger.log(`🔍 Query parameters:`, queryParams);
+    }
+    if (pathParams && Object.keys(pathParams).length > 0) {
+      customLogger.log(`🛣️  Path parameters:`, pathParams);
+    }
+
+    // Mock the response if provided
+    if (mockResponse) {
+      await this.mockApiResponse(finalEndpoint, method, mockResponse);
+    }
+
+    // Make the API call based on method
+    let response: any;
+    const requestOptions = requestBody ? { data: requestBody } : {};
+
+    // Determine the request object to use
+    let requestClient: any;
+    if (this.page && typeof this.page.request !== 'undefined') {
+      // Use page.request if available (full browser context)
+      requestClient = this.page.request;
+    } else if (this.page && typeof (this.page as any).get !== 'undefined') {
+      // Use direct request object (API testing context)
+      requestClient = this.page;
+    } else {
+      throw new Error('No valid request client available - page or request object required');
+    }
+
+    // Add SSL configuration to ignore self-signed certificates in development
+    const sslOptions = {
+      ignoreHTTPSErrors: true
+    };
+
+    switch (method.toUpperCase()) {
+      case 'GET':
+        response = await requestClient.get(url.toString(), sslOptions);
+        break;
+      case 'POST':
+        response = await requestClient.post(url.toString(), { ...requestOptions, ...sslOptions });
+        break;
+      case 'PUT':
+        response = await requestClient.put(url.toString(), { ...requestOptions, ...sslOptions });
+        break;
+      case 'DELETE':
+        response = await requestClient.delete(url.toString(), sslOptions);
+        break;
+      default:
+        throw new Error(`Unsupported HTTP method: ${method}`);
+    }
+
+    // Log response details
+    customLogger.log(`✅ Response status: ${response.status()}`);
+    customLogger.log(`📋 Expected statuses: [${expectedStatus.join(', ')}]`);
+
+    // Assert response status
+    try {
+      expect(expectedStatus).toContain(response.status());
+    } catch (error) {
+      customLogger.log(`📡 Unexpected response status: ${response.status()}.`);
+      customLogger.log(`📋 Expected one of: [${expectedStatus.join(', ')}]`);
+      return;
+    }
+  }
+
+  /**
+   * Factory method for creating standardized successful API response mocks
+   *
+   * @static
+   * @method createSuccessResponse
+   * @description Generates a properly formatted mock response for successful API operations
+   * with consistent headers and structure. Provides sensible defaults while allowing
+   * customization of response data and status codes for different success scenarios.
+   *
+   * @param {any} [data] - Optional response data payload; defaults to { success: true }
+   * @param {number} [status=200] - HTTP status code for success response; defaults to 200
+   *
+   * @returns {MockApiResponse} Configured mock response object ready for use in tests
+   *
+   * @example
+   * ```typescript
+   * // Basic success response
+   * const response = SwaggerTestUtils.createSuccessResponse();
+   * // { status: 200, body: { success: true }, headers: { 'Content-Type': 'application/json' } }
+   *
+   * // Custom success response with data
+   * const userResponse = SwaggerTestUtils.createSuccessResponse(
+   *   { id: 123, name: 'John Doe', email: 'john@example.com' },
+   *   201
+   * );
+   *
+   * // List response
+   * const listResponse = SwaggerTestUtils.createSuccessResponse([
+   *   { id: 1, name: 'Item 1' },
+   *   { id: 2, name: 'Item 2' }
+   * ]);
+   * ```
+   *
+   * @see {@link MockApiResponse} for return type structure
+   * @since 1.0.0
+   */
+  static createSuccessResponse(data?: any, status: number = 200): MockApiResponse {
+    return {
+      status,
+      body: data || { success: true },
+      headers: { 'Content-Type': 'application/json' }
+    };
+  }
+
+  /**
+   * Factory method for creating standardized error API response mocks
+   *
+   * @static
+   * @method createErrorResponse
+   * @description Generates properly formatted mock responses for API error conditions following
+   * RFC 7807 Problem Details specification. Creates consistent error response structure
+   * with appropriate HTTP status codes and detailed error information.
+   *
+   * @param {string} [message='Error'] - Descriptive error message for the detail field
+   * @param {number} [status=400] - HTTP error status code (400-599 range)
+   *
+   * @returns {MockApiResponse} Configured mock error response following RFC 7807 format
+   *
+   * @example
+   * ```typescript
+   * // Basic validation error
+   * const validationError = SwaggerTestUtils.createErrorResponse(
+   *   'Email address is required',
+   *   400
+   * );
+   *
+   * // Not found error
+   * const notFoundError = SwaggerTestUtils.createErrorResponse(
+   *   'User with ID 123 not found',
+   *   404
+   * );
+   *
+   * // Server error
+   * const serverError = SwaggerTestUtils.createErrorResponse(
+   *   'Internal server error occurred',
+   *   500
+   * );
+   * ```
+   *
+   * @see {@link https://tools.ietf.org/html/rfc7807} RFC 7807 Problem Details Specification
+   * @see {@link MockApiResponse} for return type structure
+   * @since 1.0.0
+   */
+  static createErrorResponse(message: string = 'Error', status: number = 400): MockApiResponse {
+    return {
+      status,
+      body: {
+        type: 'https://tools.ietf.org/html/rfc7231#section-6.5.1',
+        title: 'Bad Request',
+        status,
+        detail: message
+      },
+      headers: { 'Content-Type': 'application/json' }
+    };
+  }
+
+  /**
+   * Generates a complete set of standardized CRUD operation tests for REST APIs
+   *
+   * @static
+   * @method createCrudTests
+   * @description Creates a comprehensive test suite covering all standard CRUD (Create, Read,
+   * Update, Delete) operations for a REST API resource. Includes proper HTTP methods,
+   * realistic test data, appropriate status code expectations, and mock responses
+   * following REST conventions.
+   *
+   * @param {string} controllerName - Name of the API controller for test organization
+   * @param {string} entityName - Name of the entity being tested (e.g., 'User', 'Order')
+   * @param {string} basePath - Base API path for the resource (e.g., `${Constants.DEFAULT_API_VERSION}users`)
+   * @param {any} [sampleData] - Optional custom test data; uses generated defaults if not provided
+   *
+   * @returns {ApiEndpointTest[]} Array of configured test cases for all CRUD operations
+   *
+   * @example
+   * ```typescript
+   * // Generate tests with default data
+   * const userTests = SwaggerTestUtils.createCrudTests(
+   *   'UserController',
+   *   'User',
+   *   '1',
+   *   'users'
+   * );
+   *
+   * // Generate tests with custom data
+   * const customUserTests = SwaggerTestUtils.createCrudTests(
+   *   'UserController',
+   *   'User',
+   *   '1',
+   *   'users',
+   *   { id: 'custom-id', name: 'Custom User', email: 'custom@example.com' }
+   * );
+   *
+   * // Use in test suite
+   * customUserTests.forEach(test => {
+   *   it(`${test.method} ${test.endpoint} - ${test.description}`, async () => {
+   *     await testUtils.testApiEndpoint(test);
+   *   });
+   * });
+   * ```
+   *
+   * Generated tests include:
+   * - GET /resource - List all entities
+   * - POST /resource - Create new entity
+   * - GET /resource/{id} - Get entity by ID
+   * - PUT /resource/{id} - Update entity by ID
+   * - DELETE /resource/{id} - Delete entity by ID
+   *
+   * @see {@link ApiEndpointTest} for individual test configuration
+   * @since 1.0.0
+   * @version 1.1.0 - Added support for custom sample data
+   */
+  static createCrudTests(controllerName: string, entityName: string, version: string, basePath: string, sampleData?: any): ApiEndpointTest[] {
+    const defaultData = sampleData || { id: '123e4567-e89b-12d3-a456-426614174000', name: `Test ${entityName}` };
+    const apiEndpoint = `/api/v${version}/${basePath}`;
+
+    return [
+      {
+        method: 'GET',
+        endpoint: apiEndpoint,
+        description: `Get all ${entityName.toLowerCase()}s`,
+        expectedStatus: [200, 204],
+        mockResponse: GlobalTestUtils.createSuccessResponse([defaultData])
+      },
+      {
+        method: 'POST',
+        endpoint: apiEndpoint,
+        description: `Create ${entityName.toLowerCase()}`,
+        expectedStatus: [200, 201],
+        requestBody: defaultData,
+        mockResponse: GlobalTestUtils.createSuccessResponse(defaultData, 201)
+      },
+      {
+        method: 'GET',
+        endpoint: `${apiEndpoint}/{id}`,
+        description: `Get ${entityName.toLowerCase()} by ID`,
+        expectedStatus: [200, 404],
+        pathParams: { id: '123e4567-e89b-12d3-a456-426614174000' },
+        mockResponse: GlobalTestUtils.createSuccessResponse(defaultData)
+      },
+      {
+        method: 'PUT',
+        endpoint: `${apiEndpoint}/{id}`,
+        description: `Update ${entityName.toLowerCase()}`,
+        expectedStatus: [200, 204, 404],
+        pathParams: { id: '123e4567-e89b-12d3-a456-426614174000' },
+        requestBody: defaultData,
+        mockResponse: GlobalTestUtils.createSuccessResponse(defaultData)
+      },
+      {
+        method: 'DELETE',
+        endpoint: `${apiEndpoint}/{id}`,
+        description: `Delete ${entityName.toLowerCase()}`,
+        expectedStatus: [200, 204, 404],
+        pathParams: { id: '123e4567-e89b-12d3-a456-426614174000' },
+        mockResponse: GlobalTestUtils.createSuccessResponse(null, 204)
+      }
+    ];
+  }
+
+  /**
+   * Generates a consistent UUID for use in test scenarios
+   *
+   * @static
+   * @method generateTestUUID
+   * @description Provides a deterministic UUID that remains consistent across test runs
+   * for reliable and reproducible testing. Uses a fixed UUID format that's valid
+   * but predictable, making it ideal for test scenarios where consistent IDs are needed.
+   *
+   * @returns {string} A valid UUID v4 string in standard format
+   *
+   * @example
+   * ```typescript
+   * const testId = SwaggerTestUtils.generateTestUUID();
+   * // Returns: '123e4567-e89b-12d3-a456-426614174000'
+   *
+   * // Use in test data
+   * const testUser = {
+   *   id: SwaggerTestUtils.generateTestUUID(),
+   *   name: 'Test User',
+   *   createdAt: SwaggerTestUtils.generateTestDate()
+   * };
+   * ```
+   *
+   * @see {@link https://tools.ietf.org/html/rfc4122} UUID RFC Specification
+   * @since 1.0.0
+   */
+  static generateTestUUID(): string {
+    return randomUUID();
+  }
+
+  /**
+   *
+   * @static
+   * @method defaultConfigurationGuid
+   * @description Default configuration GUID used in opportunity page tests and swagger API tests
+   *
+   * @returns {string} The default configuration GUID in standard UUID format
+   *
+   * @since 1.0.0
+   */
+  static defaultConfigurationGuid(): string {
+    return 'aa4cba4f-2506-462c-8e34-c45b21653988';
+  }
+
+  /**
+   * Generates an ISO 8601 formatted timestamp for current date/time
+   *
+   * @static
+   * @method generateTestDate
+   * @description Creates a properly formatted ISO 8601 timestamp representing the current
+   * date and time in UTC. Useful for creating realistic test data with current timestamps
+   * while maintaining consistency within test execution timeframes.
+   *
+   * @returns {string} ISO 8601 formatted date string in UTC timezone
+   *
+   * @example
+   * ```typescript
+   * const timestamp = SwaggerTestUtils.generateTestDate();
+   * // Returns: '2024-01-15T10:30:45.123Z'
+   *
+   * // Use in test scenarios
+   * const testEvent = {
+   *   id: SwaggerTestUtils.generateTestUUID(),
+   *   occurredAt: SwaggerTestUtils.generateTestDate(),
+   *   type: 'user_login'
+   * };
+   *
+   * // Use for date-based filtering tests
+   * const filterParams = {
+   *   startDate: SwaggerTestUtils.generateTestDate(),
+   *   endDate: SwaggerTestUtils.generateTestDate()
+   * };
+   * ```
+   *
+   * @see {@link https://en.wikipedia.org/wiki/ISO_8601} ISO 8601 Date Format Specification
+   * @since 1.0.0
+   */
+  static generateTestDate(): string {
+    return new Date().toISOString();
+  }
+
+  /**
+   * Verifies that the API version header is present and contains the expected version.
+   *
+   * This function checks for the 'api-supported-versions' header in HTTP response headers
+   * and validates that it contains version '1.0' to ensure API compatibility.
+   *
+   * @param headers - Array of HTTP headers from the API response
+   * @param expectedVersion - Expected API version string (default: '1.0')
+   * @throws {AssertionError} When the API version header is missing or doesn't contain expected version
+   *
+   * @example
+   * ```typescript
+   * const headers = response.headersArray();
+   * GlobalTestUtils.verifyApiVersionHeader(headers, '1.0');
+   * ```
+   */
+  static verifyApiVersionHeader(headers: { name: string; value: string }[], expectedVersion: string = '1.0'): void {
+    const apiVersions = headers.find((header: { name: string; value: string }) => header.name.toLowerCase() === 'api-supported-versions');
+    customLogger.log('🔍 API Supported Versions Header:', apiVersions);
+    expect(apiVersions).toBeDefined();
+    if (!apiVersions) {
+      customLogger.error('⚠️ API Supported Versions header is missing');
+    } else if (!apiVersions.value.includes(expectedVersion)) {
+      customLogger.error(`⚠️ Expected API version ${expectedVersion} not found in header value: ${apiVersions.value}`);
+    }
+    expect(apiVersions?.value).toContain(expectedVersion);
+  }
+
+  /**
+   * Validates an API response and returns its headers after performing standard checks.
+   *
+   * This function performs common API response validation including:
+   * - Verifying the response was successful (2xx status code)
+   * - Checking for required API version headers
+   * - Extracting and returning response headers for further validation
+   *
+   * @param response - The API response object from Playwright request
+   * @param expectedVersion - Expected API version string (default: '1.0')
+   * @returns Array of HTTP headers from the validated response
+   * @throws {AssertionError} When response is not successful or missing required headers
+   *
+   * @example
+   * ```typescript
+   * const response = await apiRequest.get(`${Constants.VERSION}endpoint`);
+   * const headers = GlobalTestUtils.validateApiResponse(response);
+   * // headers can now be used for additional validation
+   * ```
+   */
+  static validateApiResponse(response: any, expectedVersion: string = '1.0'): { name: string; value: string }[] {
+    customLogger.log(`🔄 Validating API Response: ${response.url()} with status ${response.status()}`);
+    expect([200, 201, 202, 204]).toContain(response.status());
+    const headers: { name: string; value: string }[] = response.headersArray();
+    GlobalTestUtils.verifyApiVersionHeader(headers, expectedVersion);
+    if (response.status() === 204) {
+      customLogger.log('ℹ️ No Content response, skipping body validation.');
+    } else if (response.status() === 201) {
+      customLogger.log('ℹ️ Created response, validating body content.');
+      expect(response.body()).toBeDefined();
+      const responseBody = response.json();
+      expect(responseBody).not.toBeNull();
+    } else {
+      customLogger.log('📋 Response Headers:', headers);
+    }
+    return headers;
+  }
+
+  /**
+   * Detect the current environment type from Playwright test context
+   *
+   * @method detectEnvironmentTypeFromContext
+   * @description Determines environment type by examining the base URL configured in the
+   * current Playwright test context. This provides accurate environment detection that
+   * respects the actual configuration file being used (playwright.config.ts vs playwright.config.local.ts).
+   *
+   * @param {Page} [page] - Optional Playwright page object to extract base URL from context
+   * @returns {EnvironmentType} The detected environment type (LOCAL or REMOTE)
+   *
+   * @example
+   * ```typescript
+   * const envType = SwaggerTestUtils.detectEnvironmentTypeFromContext(page);
+   *  customLogger.log(`Running tests in ${envType} environment`);
+   * ```
+   *
+   * @see {@link EnvironmentType} for available environment types
+   * @since 1.3.0
+   */
+  static detectEnvironmentTypeFromContext(page?: Page): EnvironmentType {
+    customLogger.log('🔍 Detecting environment type from Playwright context...');
+    customLogger.log(`🔍 Page context apiURL: ${(page?.context() as any)?._options?.apiURL || 'undefined'}`);
+
+    try {
+      // Try to get base URL from page context if available
+      if (page?.context()) {
+        const baseURL = (page.context() as any)._options?.baseURL;
+        try {
+          const parsedUrl = new URL(baseURL);
+          const hostName = parsedUrl.hostname.toLocaleLowerCase();
+          customLogger.log('📍 Parsed base URL hostname from context:', hostName);
+          if (hostName.includes('localhost')) {
+            customLogger.log('✅ Detected LOCAL environment (hostname contains localhost)');
+            return EnvironmentType.LOCAL;
+          }
+
+          // Explicit whitelist of known remote dev hosts
+          const devHosts = ['dev.stratanetwork.net', 'dev.stratanetwork.com'];
+          if (devHosts.includes(hostName)) {
+            customLogger.log('✅ Detected REMOTE environment (hostname contains dev.stratanetwork.net)');
+            return EnvironmentType.REMOTE;
+          }
+        } catch (parseError) {
+          customLogger.log('⚠️ Could not log full page context options:', parseError);
+        }
+      }
+    } catch (error) {
+      customLogger.log('⚠️ Could not extract base URL from page context:', error);
+    }
+
+    // Fallback to environment variable detection
+    return this.detectEnvironmentType();
+  }
+
+  /**
+   * Detects the current environment type based on environment variables or configuration
+   *
+   * @static
+   * @method detectEnvironmentType
+   * @description Automatically determines whether tests are running in LOCAL or REMOTE
+   * environment based on environment variables, CI flags, or URL patterns.
+   *
+   * @returns {EnvironmentType} The detected environment type
+   *
+   * @example
+   * ```typescript
+   * const envType = SwaggerTestUtils.detectEnvironmentType();
+   * const utils = new SwaggerTestUtils(page, undefined, envType);
+   * ```
+   *
+   * @since 1.2.0
+   */
+  static detectEnvironmentType(): EnvironmentType {
+    // Check for a global or process-level EnvironmentType set by Playwright config
+    if ((global as any).EnvironmentType) {
+      customLogger.log('🔍 Detected EnvironmentType from global:', (global as any).EnvironmentType);
+      return (global as any).EnvironmentType;
+    }
+    if ((process as any).EnvironmentType) {
+      customLogger.log('🔍 Detected EnvironmentType from process:', (process as any).EnvironmentType);
+      return (process as any).EnvironmentType;
+    }
+
+    // Provide defaults for undefined environment variables (defaulting to REMOTE)
+    const environment = process.env.ENVIRONMENT || 'remote';
+    const baseUrl = process.env.BASE_URL || '';
+    const ci = process.env.CI || 'false';
+    const nodeEnv = process.env.NODE_ENV || 'development';
+    const playwrightConfig = process.env.PLAYWRIGHT_CONFIG || '';
+
+    customLogger.log('🔍 Detecting environment type from environment variables...');
+    customLogger.log('Environment variables (with REMOTE defaults):', {
+      CI: ci,
+      ENVIRONMENT: environment,
+      BASE_URL: baseUrl,
+      NODE_ENV: nodeEnv,
+      PLAYWRIGHT_CONFIG: playwrightConfig
+    });
+
+    // Default to REMOTE environment unless explicitly indicated otherwise
+    customLogger.log('🌐 Defaulting to REMOTE environment (matches playwright.config.ts)');
+
+    // Check for explicit LOCAL environment indicators
+    if (environment === 'local') {
+      customLogger.log('✅ Detected LOCAL environment (explicit ENVIRONMENT=local)');
+      return EnvironmentType.LOCAL;
+    }
+
+    // Check if base URL suggests local environment
+    if (baseUrl.includes('localhost')) {
+      customLogger.log('✅ Detected LOCAL environment (BASE_URL contains localhost)');
+      return EnvironmentType.LOCAL;
+    }
+
+    // Check for playwright config local indicators
+    if (playwrightConfig.includes('local')) {
+      customLogger.log('✅ Detected LOCAL environment (PLAYWRIGHT_CONFIG suggests local)');
+      return EnvironmentType.LOCAL;
+    }
+
+    // Check command line arguments for local config file
+    if (process.argv.some((arg) => arg.includes('playwright.config.local'))) {
+      customLogger.log('✅ Detected LOCAL environment (command line uses playwright.config.local.ts)');
+      return EnvironmentType.LOCAL;
+    }
+
+    // Return REMOTE for all other cases (CI, explicit remote, dev URLs, or no indicators)
+    if (ci === 'true') {
+      customLogger.log('✅ Using REMOTE environment (CI environment)');
+    } else if (environment === 'remote') {
+      customLogger.log('✅ Using REMOTE environment (explicit ENVIRONMENT=remote)');
+    } else if (GlobalTestUtils.isDevRemoteHost(baseUrl)) {
+      customLogger.log('✅ Using REMOTE environment (BASE_URL indicates dev.stratanetwork.net)');
+    } else if (process.argv.some((arg) => arg.includes('remote') || GlobalTestUtils.isDevRemoteHost(arg))) {
+      customLogger.log('✅ Using REMOTE environment (command line arguments suggest remote)');
+    } else {
+      customLogger.log('✅ Using REMOTE environment (default - no local indicators found)');
+    }
+
+    return EnvironmentType.REMOTE;
+  }
+}
+
+/**
+ * @namespace TestConfigurations
+ * @description Centralized test configurations factory method for consistent test execution across all modules.
+ * Use the factory method to create properly configured test configurations with test frameworks.
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * import { TestConfigurations } from '../helpers/testUtils';
+ * import { test, strataUserTest, gBriggsTest } from '../auth/authenticatedTest';
+ *
+ * // Use in all test types (API, Swagger, UI)
+ * TestConfigurations.createTestConfigs(test, strataUserTest, gBriggsTest).forEach(config => {
+ *   YourTestFunction(config);
+ * });
+ * ```
+ */
+export const TestConfigurations = {
+  /**
+   * @method createTestConfigs
+   * @description Factory method to create test configurations with specific test frameworks for all test types
+   * @param {any} cciCostLeader - Standard test framework
+   * @param {any} cciCostLeaderDevMaster - Dev master test framework
+   * @param {any} strataUserTest - Strata user test framework
+   * @param {any} gBriggsTest - G Briggs user test framework
+   * @param {any} ukUserTest - UK user test framework
+   * @returns {Array} Array of test configurations with assigned frameworks
+   * @since 2.0.0
+   *
+   * @example
+   * ```typescript
+   * import { cciCostLeader, cciCostLeaderDevMaster, strataUserTest, gBriggsTest, ukUserTest } from '../auth/authenticatedTest';
+   *
+   * const configs = TestConfigurations.createTestConfigs(cciCostLeader, cciCostLeaderDevMaster, strataUserTest, gBriggsTest, ukUserTest);
+   * configs.forEach(config => YourTestFunction(config));
+   * ```
+   */
+  createTestConfigs: (cciCostLeader?: any, cciCostLeaderDevMaster?: any, strataUserTest?: any, gBriggsTest?: any, ukUserTest?: any): OpportunityPageTestConfig[] => {
+    return testConfigs.map((config) => {
+      switch (config.userType) {
+        case UserType.CCI_COST_LEADER:
+          return { ...config, testFramework: cciCostLeader ?? config.testFramework };
+        case UserType.CCI_COST_LEADER_DEV_MASTER:
+          return { ...config, testFramework: cciCostLeaderDevMaster ?? config.testFramework ?? cciCostLeader };
+        case UserType.STRATA_USER:
+          return { ...config, testFramework: strataUserTest ?? config.testFramework ?? cciCostLeader };
+        case UserType.G_BRIGGS_USER:
+          return { ...config, testFramework: gBriggsTest ?? config.testFramework ?? cciCostLeader };
+        case UserType.UK_USER:
+          return { ...config, testFramework: ukUserTest ?? config.testFramework ?? cciCostLeader };
+        default:
+          return { ...config, testFramework: config.testFramework ?? cciCostLeader };
+      }
+    });
+  }
+};
+
+/**
+ * @method getTestUserDisplayName
+ * @description Generates a standardized test user name for logging and identification
+ * @param {string} [userType] - Optional user type from UserDisplayNames
+ * @param {string} [jwtToken] - Optional JWT token for extracting username
+ * @returns {string} Formatted test user name
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * const testUserName = getTestUserDisplayName(userType, jwtToken);
+ * customLogger.log(`Running test as: ${testUserName}`);
+ * ```
+ */
+export const getTestUserDisplayName = (userType?: string, jwtToken?: string): string => {
+  if (userType) {
+    return `User: ${userType}`;
+  }
+  if (jwtToken) {
+    try {
+      const decoded: any = jwtDecode(jwtToken);
+      // Try common claims for username
+      const username = decoded.name || decoded.email || decoded.sub;
+      if (username) {
+        return `User: ${username}`;
+      }
+    } catch (e) {
+      // Ignore decode errors, fall through to unknown user
+    }
+  }
+  return 'Unknown User';
+};
+
+type TestFramework = typeof cciCostLeader | typeof cciCostLeaderDevMaster | typeof strataUserTest | typeof gBriggsTest | typeof ukUserTest;
+
+/**
+ * @constant TEST_FRAMEWORK_MAPPING
+ * @description Maps user types to their corresponding test frameworks
+ */
+const TEST_FRAMEWORK_MAPPING: Record<UserType, TestFramework> = {
+  [UserType.CCI_COST_LEADER]: cciCostLeader,
+  [UserType.CCI_COST_LEADER_DEV_MASTER]: cciCostLeaderDevMaster,
+  [UserType.STRATA_USER]: strataUserTest,
+  [UserType.G_BRIGGS_USER]: gBriggsTest,
+  [UserType.UK_USER]: ukUserTest,
+  [UserType.DSS_ADMIN]: cciCostLeader
+};
+
+/**
+ * Array of test configurations for different user types and test frameworks
+ * Dynamically built from USER_REGISTRY to avoid duplication
+ */
+export const testConfigs: OpportunityPageTestConfig[] = Object.entries(USER_REGISTRY)
+  .filter(([userType]) => userType !== UserType.DSS_ADMIN) // Exclude DSS Admin from main configs
+  .map(([userType, userInfo]) => ({
+    userType: userType as UserType,
+    testFramework: TEST_FRAMEWORK_MAPPING[userType as UserType],
+    isLocalizationTest: userType === UserType.UK_USER,
+    testName: userInfo.testName
+  }));
+
+/**
+ * Test configurations for non-CI users, focusing on DSS Admin role
+ * Dynamically built from USER_REGISTRY
+ */
+export const nonCIUserTestConfigs: OpportunityPageTestConfig[] = Object.entries(USER_REGISTRY)
+  .filter(([userType]) => userType === UserType.DSS_ADMIN)
+  .map(([userType, userInfo]) => ({
+    userType: userType as UserType,
+    testFramework: TEST_FRAMEWORK_MAPPING[userType as UserType],
+    isLocalizationTest: false,
+    testName: `${userInfo.fullName} Non-CI User`
+  }));
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/package-lock.json b/src/Strata.ContinuousImprovement.Web/e2e/package-lock.json
new file mode 100644
index 0000000..9a8c2e2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/package-lock.json
@@ -0,0 +1,3686 @@
+{
+  "name": "e2e",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "e2e",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "crypto": "^1.0.1",
+        "dayjs": "^1.11.18",
+        "jwt-decode": "^4.0.0",
+        "uuid": "^11.1.0"
+      },
+      "devDependencies": {
+        "@playwright/test": "^1.42.1",
+        "@types/node": "^20.12.4",
+        "@typescript-eslint/eslint-plugin": "^8.9.0",
+        "@typescript-eslint/parser": "^8.9.0",
+        "eslint": "^8.57.1",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-flowtype": "^8.0.3",
+        "eslint-plugin-import": "^2.31.0",
+        "eslint-plugin-prettier": "^5.2.1",
+        "eslint-plugin-simple-import-sort": "^12.1.1",
+        "prettier": "^3.3.3",
+        "typescript": "^4.9.5"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.2.tgz",
+      "integrity": "sha512-TUtMJYRPyUb/9aU8f3K0mjmjf6M9N5Woshn2CS6nqJSeJtTtQcpLUXjGt9vbF8ZGff0El99sWkLgzwW3VXnxZQ==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.1.tgz",
+      "integrity": "sha512-IaaGWsQqfsQWVLqMn9OB92MNN7zukfVA4s7KKAI0KfrrDsZ0yhi5uV4baBuLuN7n3vsZpwP8asPPcVwApxvjBQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.27.1",
+        "@babel/helper-compilation-targets": "^7.27.1",
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helpers": "^7.27.1",
+        "@babel/parser": "^7.27.1",
+        "@babel/template": "^7.27.1",
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.1.tgz",
+      "integrity": "sha512-UnJfnIpc/+JO0/+KRVQNGU+y5taA5vCbwN8+azkX6beii/ZF+enZJSOKo11ZSzGJjlNfJHfQtmQT8H+9TXPG2w==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/parser": "^7.27.1",
+        "@babel/types": "^7.27.1",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz",
+      "integrity": "sha512-WnuuDILl9oOBbKnb4L+DyODx7iC47XfzmNCpTttFsSp6hTG7XZxu60+4IO+2/hPfcGOoKbFiwoI/+zwARbNQow==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.27.2",
+        "@babel/helper-validator-option": "^7.27.1",
+        "browserslist": "^4.24.0",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.1.tgz",
+      "integrity": "sha512-9yHn519/8KvTU5BjTVEEeIM3w9/2yXNKoD82JifINImhpKkARMJKPP59kLo+BafpdN5zgNeIcS4jsGDmd3l58g==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.1.tgz",
+      "integrity": "sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/template": "^7.27.1",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz",
+      "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/types": "^7.27.1"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-flow": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.27.1.tgz",
+      "integrity": "sha512-p9OkPbZ5G7UT1MofwYFigGebnrzGJacoBSQM0/6bi/PUMVE+qlWDD/OalvQKbwgQzU6dl0xAv6r4X7Jme0RYxA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
+      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-jsx": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz",
+      "integrity": "sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.1.tgz",
+      "integrity": "sha512-ZCYtZciz1IWJB4U61UPu4KEaqyfj+r5T1Q5mqPo+IBpcG9kHv30Z0aD8LXPgC1trYa6rK0orRyAhqUgk4MjmEg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.27.1",
+        "@babel/parser": "^7.27.1",
+        "@babel/template": "^7.27.1",
+        "@babel/types": "^7.27.1",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz",
+      "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
+      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
+      "deprecated": "Use @eslint/config-array instead",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.3",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
+      "dev": true
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@pkgr/core": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+      "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
+    "node_modules/@playwright/test": {
+      "version": "1.45.3",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.3.tgz",
+      "integrity": "sha512-UKF4XsBfy+u3MFWEH44hva1Q8Da28G6RFtR2+5saw+jgAFQV5yYnB1fu68Mz7fO+5GJF3wgwAIs0UelU8TxFrA==",
+      "dev": true,
+      "dependencies": {
+        "playwright": "1.45.3"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.14.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.12.tgz",
+      "integrity": "sha512-r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.9.0.tgz",
+      "integrity": "sha512-Y1n621OCy4m7/vTXNlCbMVp87zSd7NH0L9cXD8aIpOaNlzeWxIK4+Q19A68gSmTNRZn92UjocVUWDthGxtqHFg==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.9.0",
+        "@typescript-eslint/type-utils": "8.9.0",
+        "@typescript-eslint/utils": "8.9.0",
+        "@typescript-eslint/visitor-keys": "8.9.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.9.0.tgz",
+      "integrity": "sha512-U+BLn2rqTTHnc4FL3FJjxaXptTxmf9sNftJK62XLz4+GxG3hLHm/SUNaaXP5Y4uTiuYoL5YLy4JBCJe3+t8awQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.9.0",
+        "@typescript-eslint/types": "8.9.0",
+        "@typescript-eslint/typescript-estree": "8.9.0",
+        "@typescript-eslint/visitor-keys": "8.9.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.9.0.tgz",
+      "integrity": "sha512-bZu9bUud9ym1cabmOYH9S6TnbWRzpklVmwqICeOulTCZ9ue2/pczWzQvt/cGj2r2o1RdKoZbuEMalJJSYw3pHQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "8.9.0",
+        "@typescript-eslint/visitor-keys": "8.9.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.9.0.tgz",
+      "integrity": "sha512-JD+/pCqlKqAk5961vxCluK+clkppHY07IbV3vett97KOV+8C6l+CPEPwpUuiMwgbOz/qrN3Ke4zzjqbT+ls+1Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "8.9.0",
+        "@typescript-eslint/utils": "8.9.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.9.0.tgz",
+      "integrity": "sha512-SjgkvdYyt1FAPhU9c6FiYCXrldwYYlIQLkuc+LfAhCna6ggp96ACncdtlbn8FmnG72tUkXclrDExOpEYf1nfJQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.9.0.tgz",
+      "integrity": "sha512-9iJYTgKLDG6+iqegehc5+EqE6sqaee7kb8vWpmHZ86EqwDjmlqNNHeqDVqb9duh+BY6WCNHfIGvuVU3Tf9Db0g==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "8.9.0",
+        "@typescript-eslint/visitor-keys": "8.9.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.9.0.tgz",
+      "integrity": "sha512-PKgMmaSo/Yg/F7kIZvrgrWa1+Vwn036CdNUvYFEkYbPwOH4i8xvkaRlu148W3vtheWK9ckKRIz7PBP5oUlkrvQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "8.9.0",
+        "@typescript-eslint/types": "8.9.0",
+        "@typescript-eslint/typescript-estree": "8.9.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.9.0.tgz",
+      "integrity": "sha512-Ht4y38ubk4L5/U8xKUBfKNYGmvKvA1CANoxiTRMM+tOLk3lbF3DvzZCxJCRSE+2GdCMSh6zq9VZJc3asc1XuAA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "8.9.0",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.24.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
+      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "peer": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001716",
+        "electron-to-chromium": "^1.5.149",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.3"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001718",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
+      "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "peer": true
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz",
+      "integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==",
+      "deprecated": "This package is no longer supported. It's now a built-in Node module. If you've depended on crypto, you should switch to the one that's built-in."
+    },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.18",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz",
+      "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==",
+      "license": "MIT"
+    },
+    "node_modules/debug": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.155",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.155.tgz",
+      "integrity": "sha512-ps5KcGGmwL8VaeJlvlDlu4fORQpv3+GIcF5I3f9tUKUlJ/wsysh6HU8P5L1XWRYeXfA0oJd4PyM8ds8zTFf6Ng==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/es-abstract": {
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.3",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-prettier": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+      "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+      "dev": true,
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-flowtype": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
+      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "string-natural-compare": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@babel/plugin-syntax-flow": "^7.14.5",
+        "@babel/plugin-transform-react-jsx": "^7.14.9",
+        "eslint": "^8.1.0"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
+      "dev": true,
+      "dependencies": {
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.12.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
+        "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.8",
+        "tsconfig-paths": "^3.15.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint-plugin-prettier": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz",
+      "integrity": "sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==",
+      "dev": true,
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.0",
+        "synckit": "^0.9.1"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-plugin-prettier"
+      },
+      "peerDependencies": {
+        "@types/eslint": ">=8.0.0",
+        "eslint": ">=8.0.0",
+        "eslint-config-prettier": "*",
+        "prettier": ">=3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/eslint": {
+          "optional": true
+        },
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-simple-import-sort": {
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.1.tgz",
+      "integrity": "sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA==",
+      "dev": true,
+      "peerDependencies": {
+        "eslint": ">=5.0.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-diff": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+      "dev": true
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dev": true,
+      "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"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+      "dev": true
+    },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/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,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "dev": true,
+      "dependencies": {
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "dev": true,
+      "dependencies": {
+        "which-typed-array": "^1.1.14"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/jwt-decode": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz",
+      "integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/playwright": {
+      "version": "1.45.3",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.3.tgz",
+      "integrity": "sha512-QhVaS+lpluxCaioejDZ95l4Y4jSFCsBvl2UZkpeXlzxmqS+aABr5c82YmfMHrL6x27nvrvykJAFpkzT2eWdJww==",
+      "dev": true,
+      "dependencies": {
+        "playwright-core": "1.45.3"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.45.3",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.3.tgz",
+      "integrity": "sha512-+ym0jNbcjikaOwwSZycFbwkWgfruWvYlJfThKYAlImbxUgdWFO2oW70ojPm4OpE4t6TAo2FY/smM+hpVTtkhDA==",
+      "dev": true,
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "dependencies": {
+        "fast-diff": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string-natural-compare": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
+      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==",
+      "dev": true
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "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==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/synckit": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz",
+      "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==",
+      "dev": true,
+      "dependencies": {
+        "@pkgr/core": "^0.1.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/ts-api-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "peer": true,
+      "dependencies": {
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/esm/bin/uuid"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/package.json b/src/Strata.ContinuousImprovement.Web/e2e/package.json
new file mode 100644
index 0000000..1b489af
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "e2e",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "npx playwright test --ui",
+    "test-local": "npx playwright test --ui -c ./playwright.config.local.ts",
+    "test-report": "npx playwright test",
+    "test-report-local": "npx playwright test -c ./playwright.config.local.ts"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@playwright/test": "^1.42.1",
+    "@types/node": "^20.12.4",
+    "@typescript-eslint/eslint-plugin": "^8.9.0",
+    "@typescript-eslint/parser": "^8.9.0",
+    "eslint": "^8.57.1",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-flowtype": "^8.0.3",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
+    "prettier": "^3.3.3",
+    "typescript": "^4.9.5"
+  },
+  "dependencies": {
+    "crypto": "^1.0.1",
+    "dayjs": "^1.11.18",
+    "jwt-decode": "^4.0.0",
+    "uuid": "^11.1.0"
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/AllOpportunitiesPage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/AllOpportunitiesPage.ts
new file mode 100644
index 0000000..a7583f6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/AllOpportunitiesPage.ts
@@ -0,0 +1,42 @@
+import { expect, Locator, type Page } from '@playwright/test';
+import { OpportunityTypePage } from './components/OpportunityTypePage';
+import { CreateEncounterOpportunityWizard } from './CreateEncounterOpportunityWizard';
+
+export class AllOpportunitiesPage extends OpportunityTypePage {
+  public readonly encounterOption: Locator;
+
+  constructor(page: Page) {
+    super(page, '/continuousimprovement/', '');
+    this.encounterOption = page.locator('.ant-select-dropdown .ant-select-item').filter({ hasText: 'Encounter' });
+  }
+
+  async FilterForGL() {
+    await this.FilterFor('General Ledger');
+  }
+
+  async FilterForFreeForm() {
+    await this.FilterFor('Free Form');
+  }
+
+  async FilterForUV() {
+    await this.FilterFor('Utilization Variation');
+  }
+
+  async FilterFor(opportunityType: string) {
+    await expect(this.opportunitiesHeader.filterButton).toContainText('Filters');
+    await this.opportunitiesHeader.filterButton.click();
+    await this.opportunitiesHeader.clearFiltersButton.click();
+    await expect(this.page.locator('.ant-select-selection-overflow')).toBeVisible();
+    await this.page.locator('.ant-select-selector').click();
+    await this.page.getByTitle(opportunityType).locator('div').click();
+    await this.opportunitiesHeader.applyButton.click();
+    await this.loader.waitForLoading();
+  }
+
+  async createEncounterOpportunity() {
+    const wizardPage = new CreateEncounterOpportunityWizard(this.page);
+    await this.page.getByRole('button', { name: 'plus Opportunity down' }).click();
+    await this.page.getByText('Encounter').nth(1).click();
+    wizardPage.createEncounterOpportunity();
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/ChargeCodeOpportunitiesPage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/ChargeCodeOpportunitiesPage.ts
new file mode 100644
index 0000000..2520433
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/ChargeCodeOpportunitiesPage.ts
@@ -0,0 +1,8 @@
+import type { Page } from '@playwright/test';
+import { OpportunityTypePage } from './components/OpportunityTypePage';
+
+export class ChargeCodeOpportunitiesPage extends OpportunityTypePage {
+  constructor(page: Page) {
+    super(page, '/continuousimprovement/charge-code/opportunities', 'CC');
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/ClientWarehousePage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/ClientWarehousePage.ts
new file mode 100644
index 0000000..d8dd256
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/ClientWarehousePage.ts
@@ -0,0 +1,13 @@
+import { Locator, type Page } from '@playwright/test';
+import { PageBase } from './components/PageBase';
+
+export class ClientWarehousePage extends PageBase {
+  readonly addClientWarehouseButton: Locator;
+  readonly totalItems: Locator;
+
+  constructor(page: Page) {
+    super(page, '/continuousimprovement/client-warehouses');
+    this.addClientWarehouseButton = page.getByRole('button', { name: 'plus Client Warehouse' });
+    this.totalItems = page.getByText(/\d+\s+total items/);
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/CreateEncounterOpportunityWizard.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/CreateEncounterOpportunityWizard.ts
new file mode 100644
index 0000000..514a5bf
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/CreateEncounterOpportunityWizard.ts
@@ -0,0 +1,126 @@
+import { expect, Locator, type Page } from '@playwright/test';
+import { get } from 'http';
+import { PageBase } from './components/PageBase';
+
+export class CreateEncounterOpportunityWizard extends PageBase {
+  readonly page: Page;
+  readonly name: Locator;
+  readonly wizardTitle: Locator;
+  readonly nextButton: Locator;
+  readonly saveButton: Locator;
+  readonly caseTypeEditButton: Locator;
+  readonly caseTypeModal: Locator;
+  readonly caseTypeModelSelectButton: Locator;
+  readonly caseTypeSearchBox: Locator;
+  readonly opportunityLevelSelector: Locator;
+  readonly opportunityLevelEntitySelector: Locator;
+  readonly opportunityLevelEntityEditButton: Locator;
+  readonly entityModal: Locator;
+  readonly entityModelSelectButton: Locator;
+  readonly seasonalitySelector: Locator;
+  readonly ciCostLeader: Locator;
+  readonly ciCostLeaderPicker: Locator;
+  readonly ciOwner: Locator;
+  readonly ciOwnerPicker: Locator;
+  readonly ciExecutiveSponsor: Locator;
+  readonly ciExecutiveSponsorPicker: Locator;
+  readonly dianaAbbey: Locator;
+  readonly abbeyNormal: Locator;
+  readonly aaronHooper: Locator;
+
+  constructor(page: Page) {
+    super(page, '');
+    this.page = page;
+    this.name = page.getByLabel('Name');
+    this.wizardTitle = page.getByRole('strong');
+    this.nextButton = page.getByRole('button', { name: 'Next' });
+    this.saveButton = page.getByRole('button', { name: 'Save' });
+    this.caseTypeEditButton = page.getByRole('button', { name: 'edit Edit' }).first();
+    this.caseTypeModal = page.getByLabel('Case Types').getByText('Case Types');
+    this.caseTypeModelSelectButton = this.page.getByRole('button', { name: 'Select' });
+    this.caseTypeSearchBox = page.getByPlaceholder('Search');
+    this.opportunityLevelSelector = page.getByText('System', { exact: true });
+    this.opportunityLevelEntitySelector = page.getByTitle('Entity');
+    this.opportunityLevelEntityEditButton = this.page.getByRole('button', { name: 'edit Edit' }).nth(1);
+    this.entityModal = page.getByLabel('Entities').getByText('Entities');
+    this.entityModelSelectButton = this.page.getByRole('button', { name: 'Select' });
+    this.seasonalitySelector = page.getByText('With Seasonality');
+    this.ciCostLeader = this.page.getByRole('row', { name: 'CI - Cost Leader' });
+    this.ciCostLeaderPicker = this.page.getByLabel('Cost Leader');
+    this.ciOwner = this.page.getByText('Owner');
+    this.ciOwnerPicker = this.page.getByLabel('Owner');
+    this.ciExecutiveSponsor = this.page.getByText('Executive Sponsor');
+    this.ciExecutiveSponsorPicker = this.page.getByLabel('Executive Sponsor');
+    this.dianaAbbey = this.page.getByText(/Dian+a Abbey/i).nth(1);
+    this.abbeyNormal = this.page.getByText(/Abbey Normal/i);
+    this.aaronHooper = this.page.getByText(/Aaron Hooper/i).last();
+  }
+
+  async createEncounterOpportunity(): Promise<string> {
+    await this.page.waitForURL('**/initiatives/create/encounter');
+    const testNumber = await this.testNumber();
+    const testName = `EN playwright test ${testNumber}`;
+    await this.page.getByLabel('Name').click();
+
+    await expect(this.wizardTitle).toBeVisible();
+    await expect(this.wizardTitle).toContainText('Create Encounter Opportunity and Initiative');
+    await this.name.click();
+    await this.name.fill(testName);
+    await this.nextButton.click();
+
+    await expect(this.caseTypeEditButton).toBeVisible();
+    await this.caseTypeEditButton.click();
+    await this.caseTypeModal.isVisible();
+    await this.caseTypeSearchBox.isVisible();
+    await this.caseTypeSearchBox.click();
+    await this.caseTypeSearchBox.fill('knee');
+    await this.waitForLoading();
+
+    await this.page
+      .locator('.ant-tree-checkbox-inner')
+      .getByText(/ADLT Total Knee Replacement/i, { exact: false })
+      .isVisible();
+    await this.page.locator('.ant-tree-checkbox-inner').first().click();
+    await expect(this.caseTypeModelSelectButton).toBeVisible();
+    await this.caseTypeModelSelectButton.click();
+    await this.opportunityLevelSelector.click();
+    await this.opportunityLevelEntitySelector.click();
+    await this.opportunityLevelEntityEditButton.click();
+    await this.entityModal.isVisible();
+    await this.waitForLoading();
+    await this.page.locator('div:nth-child(2) > .ant-tree-checkbox > .ant-tree-checkbox-inner').click();
+    await this.page.locator('div:nth-child(3) > .ant-tree-checkbox > .ant-tree-checkbox-inner').click();
+    await this.page.locator('div:nth-child(4) > .ant-tree-checkbox > .ant-tree-checkbox-inner').click();
+    await this.page.locator('div:nth-child(5) > .ant-tree-checkbox > .ant-tree-checkbox-inner').click();
+    await this.entityModelSelectButton.click();
+
+    await this.seasonalitySelector.click();
+    await expect(this.nextButton).toBeVisible();
+    await this.nextButton.click();
+
+    await this.ciCostLeader.isVisible();
+    await this.ciCostLeaderPicker.isVisible();
+    await this.ciCostLeaderPicker.click();
+    await this.ciCostLeaderPicker.fill('Abbey');
+    await this.page.getByTitle(/Dian+a Abbey/).click();
+
+    await this.ciOwner.isVisible();
+    await this.ciOwnerPicker.isVisible();
+    await this.ciOwnerPicker.click();
+    await this.ciOwnerPicker.fill('Abbey Normal');
+    await this.page.getByTitle('Abbey Normal').click();
+
+    await this.ciExecutiveSponsor.isVisible();
+    await this.ciExecutiveSponsorPicker.isVisible();
+    await this.ciExecutiveSponsorPicker.click();
+    await this.ciExecutiveSponsorPicker.fill('Aaron Hooper');
+    await this.page.getByTitle('Aaron Hooper').click();
+
+    await expect(this.nextButton).toBeVisible();
+    await this.nextButton.click();
+
+    await expect(this.saveButton).toBeVisible();
+    await this.saveButton.click();
+    return testName;
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/CreateEncounterOpportunityWizardPage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/CreateEncounterOpportunityWizardPage.ts
new file mode 100644
index 0000000..ea8e19c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/CreateEncounterOpportunityWizardPage.ts
@@ -0,0 +1,29 @@
+import { type Locator, type Page } from '@playwright/test';
+import { PageBase } from './components/PageBase';
+
+export class CreateEncounterOpportunityWizardPage extends PageBase {
+  readonly name: Locator;
+  readonly wizardTitle: Locator;
+  readonly nextButton: Locator;
+  readonly saveButton: Locator;
+  readonly caseTypeEditButton: Locator;
+  readonly caseTypeModal: Locator;
+  readonly caseTypeSearchBox: Locator;
+  readonly opportunityLevelSelector: Locator;
+  readonly opportunityLevelEntitySelector: Locator;
+  readonly seasonalitySelector: Locator;
+
+  constructor(page: Page) {
+    super(page, '/continuousimprovement/initiatives/create/encounter');
+    this.name = page.getByLabel('Name');
+    this.wizardTitle = page.getByRole('strong');
+    this.nextButton = page.getByRole('button', { name: 'Next' });
+    this.saveButton = page.getByRole('button', { name: 'Save' });
+    this.caseTypeEditButton = page.getByRole('button', { name: 'edit Edit' }).first();
+    this.caseTypeModal = page.getByLabel('Case Types').getByText('Case Types');
+    this.caseTypeSearchBox = page.getByPlaceholder('Search');
+    this.opportunityLevelSelector = page.getByText('System', { exact: true });
+    this.opportunityLevelEntitySelector = page.getByTitle('Entity');
+    this.seasonalitySelector = page.getByText('With Seasonality');
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/EncounterOpportunitiesPage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/EncounterOpportunitiesPage.ts
new file mode 100644
index 0000000..d4c5a1f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/EncounterOpportunitiesPage.ts
@@ -0,0 +1,8 @@
+import type { Page } from '@playwright/test';
+import { OpportunityTypePage } from './components/OpportunityTypePage';
+
+export class EncounterOpportunitiesPage extends OpportunityTypePage {
+  constructor(page: Page) {
+    super(page, '/continuousimprovement/encounter/opportunities', 'EN');
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/FreeFormOpportunitiesPage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/FreeFormOpportunitiesPage.ts
new file mode 100644
index 0000000..3b37cd0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/FreeFormOpportunitiesPage.ts
@@ -0,0 +1,8 @@
+import { type Page } from '@playwright/test';
+import { OpportunityTypePage } from './components/OpportunityTypePage';
+
+export class FreeFormOpportunitiesPage extends OpportunityTypePage {
+  constructor(page: Page) {
+    super(page, '/continuousimprovement/free-form/opportunities', 'FF');
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/GeneralLedgerOpportunitiesPage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/GeneralLedgerOpportunitiesPage.ts
new file mode 100644
index 0000000..5595c7b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/GeneralLedgerOpportunitiesPage.ts
@@ -0,0 +1,8 @@
+import type { Page } from '@playwright/test';
+import { OpportunityTypePage } from './components/OpportunityTypePage';
+
+export class GeneralLedgerOpportunitiesPage extends OpportunityTypePage {
+  constructor(page: Page) {
+    super(page, '/continuousimprovement/general-ledger/opportunities', 'GL');
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/PayrollOpportunitiesPage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/PayrollOpportunitiesPage.ts
new file mode 100644
index 0000000..3c216e4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/PayrollOpportunitiesPage.ts
@@ -0,0 +1,8 @@
+import type { Page } from '@playwright/test';
+import { OpportunityTypePage } from './components/OpportunityTypePage';
+
+export class PayrollOpportunitiesPage extends OpportunityTypePage {
+  constructor(page: Page) {
+    super(page, '/continuousimprovement/payroll/opportunities', 'PR');
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/QualityVariationOpportunitiesPage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/QualityVariationOpportunitiesPage.ts
new file mode 100644
index 0000000..5781c50
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/QualityVariationOpportunitiesPage.ts
@@ -0,0 +1,8 @@
+import type { Page } from '@playwright/test';
+import { OpportunityTypePage } from './components/OpportunityTypePage';
+
+export class QualityVariationOpportunitiesPage extends OpportunityTypePage {
+  constructor(page: Page) {
+    super(page, '/continuousimprovement/quality-variation/opportunities', 'QV');
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/StrategicOpportunityDetailPage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/StrategicOpportunityDetailPage.ts
new file mode 100644
index 0000000..e592f08
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/StrategicOpportunityDetailPage.ts
@@ -0,0 +1,48 @@
+import { type Locator, type Page } from '@playwright/test';
+import { PageBase } from './components/PageBase';
+
+export class StrategicOpportunityDetailPage extends PageBase {
+  public readonly headerTitle: Locator;
+  public readonly expandAllButton: Locator;
+  public readonly collapseAllButton: Locator;
+  public readonly optionsButton: Locator;
+  public readonly editGridLayoutOption: Locator;
+  public readonly commentsButton: Locator;
+  public readonly convertToInitiativeButton: Locator;
+  public readonly saveButton: Locator;
+  public readonly cancelButton: Locator;
+  public readonly gridLayoutDrawer: Locator;
+
+  constructor(page: Page, opportunityId: number) {
+    super(page, `/strategic-tracker/opportunity/${opportunityId}`);
+    this.headerTitle = page.getByRole('heading').first();
+    this.expandAllButton = page.getByRole('button', { name: 'Expand All' });
+    this.collapseAllButton = page.getByRole('button', { name: 'Collapse All' });
+    this.optionsButton = page.getByRole('button', { name: 'Options' });
+    this.editGridLayoutOption = page.getByText('Edit Grid Layout');
+    this.commentsButton = page.getByRole('button', { name: 'Comments' });
+    this.convertToInitiativeButton = page.getByRole('button', { name: 'Convert To Initiative' });
+    this.saveButton = page.getByRole('button', { name: 'Save' });
+    this.cancelButton = page.getByRole('button', { name: 'Cancel' });
+    this.gridLayoutDrawer = page.getByRole('dialog', { name: 'Edit Grid Layout' });
+  }
+
+  getGridHeaders(): Locator {
+    return this.page.locator('[role="columnheader"]');
+  }
+
+  getGridRows(): Locator {
+    return this.page.locator('tbody [role="row"]');
+  }
+
+  async openEditGridLayout(): Promise<void> {
+    await this.optionsButton.click();
+    await this.editGridLayoutOption.click();
+  }
+
+  async getVisibleColumnHeaders(): Promise<string[]> {
+    const headers = this.getGridHeaders();
+    await headers.first().waitFor({ state: 'visible', timeout: 30_000 });
+    return headers.allTextContents();
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/UtilizationVariationOpportunitiesPage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/UtilizationVariationOpportunitiesPage.ts
new file mode 100644
index 0000000..b05199f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/UtilizationVariationOpportunitiesPage.ts
@@ -0,0 +1,8 @@
+import type { Page } from '@playwright/test';
+import { OpportunityTypePage } from './components/OpportunityTypePage';
+
+export class UtilizationVariationOpportunitiesPage extends OpportunityTypePage {
+  constructor(page: Page) {
+    super(page, '/continuousimprovement/utilization-variation/opportunities', 'UV');
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunitiesHeader.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunitiesHeader.ts
new file mode 100644
index 0000000..ad1a092
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunitiesHeader.ts
@@ -0,0 +1,41 @@
+import type { Locator, Page } from '@playwright/test';
+import { Loader } from '../../components/Loader';
+
+export class OpportunitiesHeader {
+  readonly page;
+  readonly fiscalYrSelector: Locator;
+  readonly exportButton: Locator;
+  readonly newOpportunityButton: Locator;
+  readonly newEncounterOpportunityButton: Locator;
+  readonly filterButton: Locator;
+  readonly filterAppliedButton: Locator;
+  readonly searchTextBar: Locator;
+  readonly menuHeader: Locator;
+  readonly header: Locator;
+  readonly infoIconButton: Locator;
+  readonly clearFiltersButton: Locator;
+  readonly applyButton: Locator;
+  readonly cancelButton: Locator;
+  readonly generalLedgerOpportunityFilter: Locator;
+  readonly loader;
+
+  constructor(page: Page) {
+    this.page = page;
+    this.fiscalYrSelector = page.getByRole('button', { name: /FY\d+.*/ });
+    this.exportButton = page.getByRole('button', { name: 'Export' });
+    this.newOpportunityButton = page.getByRole('button', { name: /plus Opportunity/ });
+    this.newEncounterOpportunityButton = page.getByText('Encounter').nth(1);
+    this.filterButton = page.getByRole('button', { name: /ter Filters?|ter Filters?\s*\(?\d*\)?/ });
+    this.filterAppliedButton = page.getByRole('button', { name: /ter Filters\s+\(\d*\)/ });
+    this.searchTextBar = page.getByPlaceholder('Search');
+    this.menuHeader = page.getByRole('complementary');
+    this.header = page.getByRole('main');
+    this.infoIconButton = page.getByRole('button', { name: 'info-circle' });
+    this.clearFiltersButton = page.getByRole('button', { name: 'Clear Filters' });
+    this.applyButton = page.getByRole('button', { name: 'Apply' });
+    this.cancelButton = page.getByRole('button', { name: 'Cancel' });
+    this.generalLedgerOpportunityFilter = page.getByTitle('General Ledger').locator('div');
+
+    this.loader = new Loader(this.page);
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunitiesMenu.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunitiesMenu.ts
new file mode 100644
index 0000000..d3e675e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunitiesMenu.ts
@@ -0,0 +1,39 @@
+import { type Locator, type Page } from '@playwright/test';
+import { Loader } from '../../components/Loader';
+
+export class OpportunitiesMenu {
+  readonly page: Page;
+  readonly fiscalYrSelector: Locator;
+  readonly menuHeader: Locator;
+  readonly header: Locator;
+  readonly allLink: Locator;
+  readonly chargeCodeLink: Locator;
+  readonly encounterLink: Locator;
+  readonly freeFormLink: Locator;
+  readonly generalLedgerLink: Locator;
+  readonly payrollLink: Locator;
+  readonly qualityVariationLink: Locator;
+  readonly variationLink: Locator;
+  readonly infoIconButton: Locator;
+  readonly generalLedgerOpportunityFilter: Locator;
+  readonly loader: Loader;
+
+  constructor(page: Page) {
+    this.page = page;
+    this.fiscalYrSelector = page.getByRole('button', { name: /FY\d+.*/ });
+    this.menuHeader = page.getByRole('complementary');
+    this.header = page.getByRole('main');
+    this.allLink = page.getByRole('link', { name: 'All' });
+    this.chargeCodeLink = page.getByRole('link', { name: 'Charge Code' });
+    this.encounterLink = page.getByRole('link', { name: 'Encounter' });
+    this.freeFormLink = page.getByRole('link', { name: 'Free Form' });
+    this.generalLedgerLink = page.getByRole('link', { name: 'General Ledger' });
+    this.payrollLink = page.getByRole('link', { name: 'Payroll' });
+    this.qualityVariationLink = page.getByRole('link', { name: 'Quality Variation' });
+    this.variationLink = page.getByRole('link', { name: 'Utilization Variation' });
+    this.infoIconButton = page.getByRole('button', { name: 'info-circle' });
+    this.generalLedgerOpportunityFilter = page.getByTitle('General Ledger').locator('div');
+
+    this.loader = new Loader(this.page);
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunitiesPage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunitiesPage.ts
new file mode 100644
index 0000000..a07b2ea
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunitiesPage.ts
@@ -0,0 +1,25 @@
+import { type Locator, type Page } from '@playwright/test';
+import { OpportunitiesHeader } from './OpportunitiesHeader';
+import { OpportunitiesMenu } from './OpportunitiesMenu';
+import { PageBase } from './PageBase';
+
+export class OpportunitiesPage extends PageBase {
+  readonly opportunitiesMenu: OpportunitiesMenu;
+  readonly opportunitiesHeader: OpportunitiesHeader;
+  readonly nullTotalItems: Locator;
+  readonly totalItems: Locator;
+
+  constructor(page: Page, pageUrl: string) {
+    super(page, pageUrl);
+    this.opportunitiesMenu = new OpportunitiesMenu(page);
+    this.opportunitiesHeader = new OpportunitiesHeader(page);
+    this.nullTotalItems = page.getByText(/null\s+total items/i);
+    this.totalItems = page.getByText(/\d+\s+total items/);
+  }
+
+  async goto(): Promise<any> {
+    const response = await this.page.goto(this.pageUrl);
+    await this.waitForLoading();
+    return response;
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunityPageBasicTests.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunityPageBasicTests.ts
new file mode 100644
index 0000000..6e6dd3f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunityPageBasicTests.ts
@@ -0,0 +1,197 @@
+import { expect, Page, TestInfo } from '@playwright/test';
+import { customLogger } from '../../customLogger';
+import { OpportunityPageTestConfig } from '../../helpers/OpportunityPageTestConfig';
+import { AllOpportunitiesPage } from '../AllOpportunitiesPage';
+import { ChargeCodeOpportunitiesPage } from '../ChargeCodeOpportunitiesPage';
+import { EncounterOpportunitiesPage } from '../EncounterOpportunitiesPage';
+import { FreeFormOpportunitiesPage } from '../FreeFormOpportunitiesPage';
+import { GeneralLedgerOpportunitiesPage } from '../GeneralLedgerOpportunitiesPage';
+import { PayrollOpportunitiesPage } from '../PayrollOpportunitiesPage';
+import { QualityVariationOpportunitiesPage } from '../QualityVariationOpportunitiesPage';
+import { UtilizationVariationOpportunitiesPage } from '../UtilizationVariationOpportunitiesPage';
+import { OpportunityTypePage } from './OpportunityTypePage';
+
+export interface OpportunityPage {
+  opportunityName: string;
+  pageName: string;
+  header?: string;
+  url: string;
+  openTest?: boolean;
+  createTest?: boolean;
+}
+
+export const opportunityPages: OpportunityPage[] = [
+  { opportunityName: 'All', pageName: AllOpportunitiesPage.name, url: '' },
+  { opportunityName: 'Charge Code', pageName: ChargeCodeOpportunitiesPage.name, url: 'charge-code-opportunity' },
+  { opportunityName: 'Encounter', pageName: EncounterOpportunitiesPage.name, url: 'encounter-opportunity' },
+  { opportunityName: 'Free Form', pageName: FreeFormOpportunitiesPage.name, url: 'free-form-opportunity', openTest: true },
+  { opportunityName: 'General Ledger', pageName: GeneralLedgerOpportunitiesPage.name, url: 'general-ledger-opportunity' },
+  { opportunityName: 'Payroll', pageName: PayrollOpportunitiesPage.name, url: 'payroll-opportunity' },
+  { opportunityName: 'Quality Variation', pageName: QualityVariationOpportunitiesPage.name, url: 'quality-variation-opportunity' },
+  { opportunityName: 'Utilization Variation', pageName: UtilizationVariationOpportunitiesPage.name, url: 'utilization-variation-opportunity' }
+];
+
+export const getPageInstance = (page: Page, pageName: string) => {
+  switch (pageName) {
+    case AllOpportunitiesPage.name:
+      return new AllOpportunitiesPage(page);
+    case ChargeCodeOpportunitiesPage.name:
+      return new ChargeCodeOpportunitiesPage(page);
+    case EncounterOpportunitiesPage.name:
+      return new EncounterOpportunitiesPage(page);
+    case FreeFormOpportunitiesPage.name:
+      return new FreeFormOpportunitiesPage(page);
+    case GeneralLedgerOpportunitiesPage.name:
+      return new GeneralLedgerOpportunitiesPage(page);
+    case PayrollOpportunitiesPage.name:
+      return new PayrollOpportunitiesPage(page);
+    case QualityVariationOpportunitiesPage.name:
+      return new QualityVariationOpportunitiesPage(page);
+    case UtilizationVariationOpportunitiesPage.name:
+      return new UtilizationVariationOpportunitiesPage(page);
+    default:
+      return new OpportunityTypePage(page, '/continuousimprovement/', '');
+  }
+};
+
+const checkMenuLinkVisibility = async (opportunityPage: AllOpportunitiesPage, pageName: string): Promise<boolean> => {
+  switch (pageName) {
+    case AllOpportunitiesPage.name:
+      return await opportunityPage.opportunitiesMenu.allLink.isHidden();
+    case ChargeCodeOpportunitiesPage.name:
+      return await opportunityPage.opportunitiesMenu.chargeCodeLink.isHidden();
+    case EncounterOpportunitiesPage.name:
+      return await opportunityPage.opportunitiesMenu.encounterLink.isHidden();
+    case FreeFormOpportunitiesPage.name:
+      return await opportunityPage.opportunitiesMenu.freeFormLink.isHidden();
+    case GeneralLedgerOpportunitiesPage.name:
+      return await opportunityPage.opportunitiesMenu.generalLedgerLink.isHidden();
+    case PayrollOpportunitiesPage.name:
+      return await opportunityPage.opportunitiesMenu.payrollLink.isHidden();
+    case QualityVariationOpportunitiesPage.name:
+      return await opportunityPage.opportunitiesMenu.qualityVariationLink.isHidden();
+    case UtilizationVariationOpportunitiesPage.name:
+      return await opportunityPage.opportunitiesMenu.variationLink.isHidden();
+    default:
+      return true;
+  }
+};
+
+// Common setup function to avoid duplication
+export const setupOpportunityPageTest = async (page: any, pageName: string, testInfo: TestInfo, testFramework: any) => {
+  const opportunityPage = new AllOpportunitiesPage(page);
+  await opportunityPage.goto();
+
+  const isHidden = await checkMenuLinkVisibility(opportunityPage, pageName);
+  testFramework.skip(isHidden, `Menu option '${pageName}' is hidden`);
+
+  const opportunitiesPage = getPageInstance(page, pageName);
+  await opportunitiesPage.goto();
+
+  try {
+    await expect(opportunitiesPage.opportunitiesHeader.filterButton).toContainText(/Filters?/i, { timeout: 30_000 });
+    await opportunitiesPage.opportunitiesHeader.filterButton.click({ timeout: 30_000 });
+    await expect(opportunitiesPage.opportunitiesHeader.clearFiltersButton).toBeVisible({ timeout: 30_000 });
+    await opportunitiesPage.opportunitiesHeader.clearFiltersButton.click({ timeout: 30_000 });
+    await opportunitiesPage.opportunitiesHeader.applyButton.click();
+  } catch (error: any) {
+    customLogger.error(`📡 Error during setup for page '${pageName}':`);
+    customLogger.error(`📡 ${error.message}`);
+    return;
+  }
+};
+
+export const OpportunityPageBasicTests = (config: OpportunityPageTestConfig) => {
+  const { isLocalizationTest, testFramework, testName, userType } = config;
+  const nameOfTest = testName ?? '';
+
+  interface VerificationResult {
+    opportunityName: string;
+    locatorName: string;
+    userType: string;
+    isVerified: boolean;
+    wasSkipped: boolean;
+    errorMessage?: string;
+  }
+
+  opportunityPages.forEach(({ opportunityName, pageName, header, url, openTest }) => {
+    testFramework.describe(`${opportunityName}${isLocalizationTest ? ' (Localization Test)' : ''}`, () => {
+      const heading = header ?? `${opportunityName} Opportunities`;
+
+      testFramework.beforeEach(async ({ page }: any, testInfo: TestInfo) => {
+        await setupOpportunityPageTest(page, pageName, testInfo, testFramework);
+      });
+
+      testFramework.describe(`Verify Page Elements`, () => {
+        testFramework(nameOfTest, async ({ browserName, page }: any) => {
+          const verificationResults: VerificationResult[] = [];
+          const opportunitiesPage = getPageInstance(page, pageName);
+          expect(page.url()).toMatch(/\/continuousimprovement\//i);
+          verificationResults.push({ opportunityName, locatorName: 'URL', userType, isVerified: true, wasSkipped: false });
+
+          if (browserName.toLowerCase() === 'chromium') {
+            await expect(opportunitiesPage.menuHeader).toContainText('Continuous Improvement', { timeout: 30_000 });
+            verificationResults.push({ opportunityName, locatorName: 'Menu Header', userType, isVerified: true, wasSkipped: false });
+            await expect(opportunitiesPage.header).toContainText(heading, { timeout: 30_000 });
+            verificationResults.push({ opportunityName, locatorName: 'Page Header', userType, isVerified: true, wasSkipped: false });
+          } else {
+            verificationResults.push({ opportunityName, locatorName: 'Menu Header', userType, isVerified: false, wasSkipped: true, errorMessage: 'Non-Chromium browser' });
+            verificationResults.push({ opportunityName, locatorName: 'Page Header', userType, isVerified: false, wasSkipped: true, errorMessage: 'Non-Chromium browser' });
+          }
+          await expect(opportunitiesPage.opportunitiesMenu.infoIconButton).toBeVisible();
+          verificationResults.push({ opportunityName, locatorName: 'Info Icon Button', userType, isVerified: true, wasSkipped: false });
+          if (!(await opportunitiesPage.nullTotalItems.isVisible())) {
+            await expect(opportunitiesPage.opportunitiesHeader.filterButton).toContainText(/Filters?/i, { timeout: 30_000 });
+            verificationResults.push({ opportunityName, locatorName: 'Filter Button', userType, isVerified: true, wasSkipped: false });
+            await expect(opportunitiesPage.opportunitiesMenu.fiscalYrSelector).toBeVisible({ timeout: 10 });
+            verificationResults.push({ opportunityName, locatorName: 'Fiscal Year Selector', userType, isVerified: true, wasSkipped: false });
+            const d = new Date();
+            const year = d.getFullYear();
+            const fiscalYrSelectorText = (await opportunitiesPage.opportunitiesMenu.fiscalYrSelector.innerText()).replace(/\s+/g, '');
+            await expect([`FY${year}`, `FY${year - 1}`]).toContain(fiscalYrSelectorText);
+            await expect(opportunitiesPage.totalItems).toBeVisible();
+            await expect(opportunitiesPage.totalItems).toContainText(/\d+\s+total items/);
+            verificationResults.push({ opportunityName, locatorName: 'Total Items', userType, isVerified: true, wasSkipped: false });
+            await expect(opportunitiesPage.opportunitiesHeader.exportButton).toBeVisible({ timeout: 30_000 });
+            verificationResults.push({ opportunityName, locatorName: 'Export Button', userType, isVerified: true, wasSkipped: false });
+          } else {
+            verificationResults.push({ opportunityName, locatorName: 'Total Items', userType, isVerified: false, wasSkipped: true, errorMessage: 'Total Items not visible' });
+            customLogger.log(`⚠️ Skipping Total Items check for ${pageName} Page due to ${nameOfTest} user.`);
+          }
+
+          customLogger.table(
+            verificationResults.map((result) => ({
+              Page: result.opportunityName,
+              Locator: result.locatorName,
+              'User Type': result.userType,
+              Verified: result.isVerified,
+              Skipped: result.wasSkipped,
+              'Error Message': result.errorMessage ?? ''
+            }))
+          );
+        });
+      });
+
+      testFramework.describe(`Opportunities Page Localization`, () => {
+        testFramework(nameOfTest, { tag: '@ui' }, async ({ browserName, page }: any, testInfo: any) => {
+          testFramework.skip(!isLocalizationTest, 'Skipping non-localization test');
+          const opportunitiesPage = getPageInstance(page, pageName);
+          await page.getByRole('img', { name: 'Settings' }).click();
+          await expect(page.getByText(/CCI \(QA Localization Master/i)).toBeVisible();
+          if (pageName === AllOpportunitiesPage.name) {
+            await expect(page.locator('tbody')).toContainText(/£[\d,]/);
+          }
+        });
+      });
+
+      testFramework.describe(`Opportunities Page New Opportunity Button`, () => {
+        testFramework(nameOfTest, { tag: '@ui' }, async ({ browserName, page }: any, testInfo: any) => {
+          const opportunitiesPage = getPageInstance(page, pageName);
+          testFramework.skip(!openTest, `Skipping New Opportunity Button test for Legacy Jazz page '${pageName}'`);
+          testFramework.skip([QualityVariationOpportunitiesPage.name, UtilizationVariationOpportunitiesPage.name].includes(pageName), `Skipping New Opportunity Button test for page '${pageName}'.`);
+          await expect(opportunitiesPage.opportunitiesHeader.newOpportunityButton).toBeVisible();
+        });
+      });
+    });
+  });
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunityPageTests.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunityPageTests.ts
new file mode 100644
index 0000000..f6a0c04
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunityPageTests.ts
@@ -0,0 +1,104 @@
+import { expect, TestInfo } from '@playwright/test';
+import { filterParams } from '../../components/PageFilterParam';
+import { customLogger } from '../../customLogger';
+import { OpportunityPageTestConfig } from '../../helpers/OpportunityPageTestConfig';
+import { getPageInstance, OpportunityPage, OpportunityPageBasicTests, opportunityPages, setupOpportunityPageTest } from './OpportunityPageBasicTests';
+
+export const OpportunityPageTests = (config: OpportunityPageTestConfig) => {
+  // First add additional tests specific to OpportunityPageTests
+  const { isLocalizationTest, testFramework, testName, userType } = config;
+  const nameOfTest = testName ?? '';
+  // Then, run all the basic tests
+  OpportunityPageBasicTests(config);
+
+  opportunityPages.forEach((opportunityPage: OpportunityPage) => {
+    const { opportunityName, pageName, header, url, openTest, createTest } = opportunityPage;
+    testFramework.describe(`${opportunityName}${isLocalizationTest ? ' (Localization Test)' : ''}`, () => {
+      const canOpen = openTest ?? false;
+      const canCreate = createTest ?? false;
+      const urlRegex = `/${url}/[a-fA-F0-9]{8}[-]?([a-fA-F0-9]{4}[-]?){3}[a-fA-F0-9]{12}`;
+
+      testFramework.beforeEach(async ({ page }: any, testInfo: TestInfo) => {
+        await setupOpportunityPageTest(page, pageName, testInfo, testFramework);
+      });
+
+      // Additional tests specific to OpportunityPageTests
+      testFramework.describe(`Create Opportunity`, () => {
+        testFramework(nameOfTest, { tag: '@ui' }, async ({ page }: any) => {
+          if (!canCreate) {
+            customLogger.log(`⚠️ Skipping Create Opportunity test for ${pageName} Page`);
+            return;
+          }
+          const opportunitiesPage = getPageInstance(page, pageName);
+        });
+      });
+
+      testFramework.describe(`Open Opportunity`, () => {
+        testFramework(nameOfTest, { tag: '@ui' }, async ({ page }: any) => {
+          if (!canOpen) {
+            customLogger.warn(`⚠️ Skipping Open Opportunity test for page '${pageName}' as it is Legacy Jazz`);
+            return;
+          }
+          try {
+            const opportunitiesPage = getPageInstance(page, pageName);
+
+            await opportunitiesPage.opportunityLink.first().click({ timeout: 10000 });
+            await opportunitiesPage.waitForLoading();
+            const urlRegexp = new RegExp(urlRegex, 'i');
+            await expect(page).toHaveURL(urlRegexp);
+          } catch (error: any) {
+            customLogger.error(`📡 Error during Open Opportunity test for page '${pageName}':`);
+            customLogger.error(error.message);
+            return;
+          }
+        });
+      });
+
+      testFramework.describe(`Apply Filter (Stepped)`, () => {
+        testFramework(nameOfTest, { tag: '@ui' }, async ({ page }: any) => {
+          if (!config.isLocalizationTest && config.testName === 'G Briggs User') {
+            customLogger.log(`⚠️ Skipping Apply Filter test for G Briggs User due to known issues.`);
+            return;
+          }
+          const filters = filterParams(page, pageName);
+          if (!filters) {
+            customLogger.warn(`⚠️ No filters defined for page '${pageName}', skipping Apply Filter test`);
+            return;
+          }
+          let idx = 0;
+          try {
+            const opportunitiesPage = getPageInstance(page, pageName);
+            for (const filter of filters) {
+              idx += 1;
+              await opportunitiesPage.waitForLoading();
+              await opportunitiesPage.opportunitiesHeader.filterButton.first().click();
+              await page.getByText(/Identified Savings Minimum/i).isVisible();
+              await filter.locator.click();
+              await filter.text.click();
+              const filterCnt = `Filters (${idx})`;
+              await opportunitiesPage.opportunitiesHeader.applyButton.click();
+              await expect(opportunitiesPage.opportunitiesHeader.filterAppliedButton).toContainText(filterCnt);
+              await opportunitiesPage.waitForLoading();
+            }
+          } catch (error: any) {
+            customLogger.error(`📡 Error during Apply Filter test for page '${pageName}' on filter #${idx}:`);
+            customLogger.error(`📡 ${error.message}`);
+            return;
+          }
+        });
+      });
+    });
+  });
+};
+
+export const TestOpportunityPages = (opportunityPageTestConfigs: OpportunityPageTestConfig[]) => {
+  opportunityPageTestConfigs.forEach((opportunityPageTestConfig) => {
+    if (opportunityPageTestConfig.isLocalizationTest && opportunityPageTestConfig.testName !== 'UK User') {
+      return;
+    }
+    if (!opportunityPageTestConfig.isLocalizationTest && opportunityPageTestConfig.testName === 'UK User') {
+      return;
+    }
+    OpportunityPageTests(opportunityPageTestConfig);
+  });
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunityTypePage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunityTypePage.ts
new file mode 100644
index 0000000..42db82a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/OpportunityTypePage.ts
@@ -0,0 +1,14 @@
+import { Locator, type Page } from '@playwright/test';
+import { OpportunitiesPage } from './OpportunitiesPage';
+
+export class OpportunityTypePage extends OpportunitiesPage {
+  readonly page;
+  readonly opportunityLink: Locator;
+
+  constructor(page: Page, url: string, tag: string) {
+    super(page, url);
+    this.page = page;
+
+    this.opportunityLink = page.getByRole('link', { name: `${tag} -` });
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/components/PageBase.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/PageBase.ts
new file mode 100644
index 0000000..20d93ab
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/PageBase.ts
@@ -0,0 +1,50 @@
+import { expect, type Locator, type Page, type Response } from '@playwright/test';
+import { Loader } from '../../components/Loader';
+
+export class PageBase {
+  protected readonly page;
+  public readonly menuHeader: Locator;
+  public header: Locator;
+  protected readonly loader;
+  protected pageUrl: string;
+
+  constructor(page: Page, pageUrl: string) {
+    this.page = page;
+    this.pageUrl = pageUrl;
+    this.menuHeader = page.getByRole('complementary');
+    this.header = page.getByRole('main');
+    this.loader = new Loader(this.page);
+  }
+
+  async goto(): Promise<Response | null> {
+    const response = await this.page.goto(this.pageUrl);
+    await this.waitForLoading();
+    return response;
+  }
+
+  async waitForLoading(): Promise<void> {
+    await this.loader.waitForLoading();
+  }
+
+  async isPermissionDeniedPageVisible(): Promise<boolean> {
+    return (await this.page.getByTestId('permission-denied').isVisible()) || (await this.page.getByText('Permission Denied').isVisible());
+  }
+
+  async isNotStrataEmployee(isStrataEmployee: boolean): Promise<boolean> {
+    const isPermissionDeniedPage = await this.isPermissionDeniedPageVisible();
+    if (isStrataEmployee) {
+      return isPermissionDeniedPage;
+    }
+    expect(isPermissionDeniedPage).toBeTruthy();
+    return isPermissionDeniedPage;
+  }
+
+  /// Generates a random 8-digit number.
+  async testNumber(): Promise<number> {
+    // Math.random() returns a float between 0 (inclusive) and 1 (exclusive).
+    // We scale it to the desired range and use Math.floor to get an integer.
+    const min = 10000000; // Smallest 8-digit number
+    const max = 99999999; // Largest 8-digit number
+    return Math.floor(Math.random() * (max - min + 1)) + min;
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/components/TestClientWarehousePages.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/TestClientWarehousePages.ts
new file mode 100644
index 0000000..a4da775
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/components/TestClientWarehousePages.ts
@@ -0,0 +1,110 @@
+import { expect } from '@playwright/test';
+import { customLogger } from '../../customLogger';
+import { GlobalTestUtils } from '../../helpers/globalTestUtils';
+import { OpportunityPageTestConfig } from '../../helpers/OpportunityPageTestConfig';
+import { ClientWarehousePage } from '../ClientWarehousePage';
+
+export const TestClientWarehousePages = (opportunityPageTestConfigs: OpportunityPageTestConfig[]) => {
+  opportunityPageTestConfigs.forEach((config) => {
+    const controllerName = 'Client Warehouses Page';
+    const resolvedEnvType = GlobalTestUtils.detectEnvironmentType();
+    customLogger.log(`🌍 Creating test suite for ${controllerName} in ${resolvedEnvType} environment`);
+    const testFramework = config.testFramework;
+
+    testFramework.describe(`${controllerName}${config.isLocalizationTest ? ' (Localization Test)' : ''}`, () => {
+      const configurationGuid = config.configurationGuid || 'aa4cba4f-2506-462c-8e34-c45b21653988';
+      if (config.testName === 'UK User') {
+        customLogger.log(`📡 Client Warehouses page is not applicable for ${config.testName} profile`);
+        return;
+      }
+
+      testFramework(config.testName, { tag: '@ui' }, async ({ page }: { page: any }) => {
+        const errors: Error[] = [];
+        const consoleLogs: string[] = [];
+        const failedRequests: string[] = [];
+
+        // Listen for page errors (e.g., JavaScript exceptions)
+        page.on('pageerror', (error: any) => {
+          errors.push(error.message);
+        });
+
+        // Listen for console messages, including errors
+        page.on('console', (message: any) => {
+          if (message.type() === 'error') {
+            consoleLogs.push(message.text());
+          }
+        });
+
+        // Listen for failed network responses
+        const unexpectedErrors: string[] = [];
+        page.on('response', (response: any) => {
+          const status = response.status();
+          if (status >= 400 && status !== 404) {
+            const errorInfo = `${response.url()} - ${status}`;
+            failedRequests.push(errorInfo);
+
+            // Track non-authorization errors as unexpected
+            if (status < 400 || status >= 500) {
+              unexpectedErrors.push(errorInfo);
+            }
+          }
+        });
+
+        customLogger.log('Navigating to Client Warehouses Page');
+        const clientWarehousesPage = new ClientWarehousePage(page);
+        await clientWarehousesPage.goto();
+
+        // Fail test only for unexpected errors (non-400+ authorization errors)
+        if (errors.length > 0) {
+          customLogger.log('📋 Page errors:', errors);
+        }
+        if (consoleLogs.length > 0) {
+          customLogger.log('📝 Console messages:', consoleLogs);
+        }
+        if (unexpectedErrors.length > 0) {
+          customLogger.log('📡 Unexpected HTTP errors:', unexpectedErrors);
+        }
+
+        let status = 0;
+        // Log expected 400+ authorization errors but don't fail the test
+        const authErrors = failedRequests.filter((req) => {
+          status = parseInt(req.split(' - ')[1]);
+          return status >= 400 && status < 500;
+        });
+        if (authErrors.length > 0) {
+          customLogger.log(`🔒 Expected authorization errors for ${config.testName}:`, authErrors);
+        }
+
+        await expect(page).toHaveURL(/\/continuousimprovement\/client-warehouses/);
+
+        if (status >= 400 && status < 500) {
+          customLogger.log(`Skipping further tests due to authorization errors for ${config.testName}`);
+          return;
+        }
+        try {
+          await expect(page.getByText('Client Warehouses')).toBeVisible();
+          await expect(clientWarehousesPage.addClientWarehouseButton).toBeVisible();
+          await clientWarehousesPage.addClientWarehouseButton.click();
+          await expect(page.getByRole('heading', { name: 'Add Client Warehouse' })).toBeVisible();
+          await page.getByRole('heading', { name: 'Add Client Warehouse' }).click();
+          await page.locator('.ant-select-selector').first().click();
+          await page.getByLabel('Clients').fill('0555');
+          await page.getByTitle(/Dev Master/i).click();
+          try {
+            await page.getByLabel(/Warehouse Size/i).click();
+            await page.getByText('S').click();
+          } catch (error) {
+            customLogger.log('Warehouse Size selection not available');
+            await page.keyboard.press('Escape');
+          }
+          await page.getByRole('button', { name: 'Cancel' }).click();
+          await expect(clientWarehousesPage.totalItems).toContainText(/\d+\s+total items/);
+        } catch (error: any) {
+          customLogger.log(`📡 Test failed during Client Warehouses Page interactions for ${config.testName}`);
+          customLogger.log(`📡 ${error.message}`);
+          return;
+        }
+      });
+    });
+  });
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/pages/exploration/CaseTypeFamilySummaryGridPage.ts b/src/Strata.ContinuousImprovement.Web/e2e/pages/exploration/CaseTypeFamilySummaryGridPage.ts
new file mode 100644
index 0000000..02804df
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/pages/exploration/CaseTypeFamilySummaryGridPage.ts
@@ -0,0 +1,162 @@
+import { Locator, type Page } from '@playwright/test';
+import { IColumnVisibilityStates } from '../../components/IColumnVisibilityStates';
+import { PageBase } from '../components/PageBase';
+
+export class CaseTypeFamilySummaryGridPage extends PageBase {
+  readonly page: Page;
+  readonly totalItems: Locator;
+  readonly infoButton: Locator;
+  readonly editColumnLayoutButton: Locator;
+  readonly totalEncountersEyeButton: Locator;
+  readonly mortalityRateEyeButton: Locator;
+  readonly totalEncountersEyeInvisibleButton: Locator;
+  readonly mortalityRateEyeInvisibleButton: Locator;
+  readonly editColumnLayoutSaveButton: Locator;
+  readonly editColumnLayoutCancelButton: Locator;
+  readonly editColumnLayoutPanel: Locator;
+  readonly helpPageBreadcrumbs: Locator;
+  readonly filterRefinementOptionsButton: Locator;
+  readonly addPopulationCriteriaButton: Locator;
+  readonly ageCohortOption: Locator;
+  readonly searchPlaceholder: Locator;
+  readonly selectAllResultsText: Locator;
+  readonly borderButton: Locator;
+  readonly closeCircleButton: Locator;
+  readonly refinementDialog: Locator;
+  readonly caseTypeFamilyOption: Locator;
+  readonly applyButton: Locator;
+  readonly okButton: Locator;
+  // New locators for refinement options by test id
+  readonly addPopulationCriteriaButtonByTestId: Locator;
+  readonly addNewPopulationCriteriaButtonByTestId: Locator;
+  readonly applyPopulationCriteriaButtonByTestId: Locator;
+  readonly applyRefinementOptionsButtonByTestId: Locator;
+  readonly searchRefinementOptionsButtonByTestId: Locator;
+  readonly refinementSearchInput: Locator;
+  readonly addButton: Locator;
+  readonly searchButton: Locator;
+  readonly saveButton: Locator;
+
+  constructor(page: Page) {
+    super(page, '/continuousimprovement/explorectf');
+    this.page = page;
+    this.totalItems = page.getByText(/\d+\s+total items/);
+    this.editColumnLayoutButton = page.getByRole('button', { name: 'Edit Column Layout' });
+    this.editColumnLayoutCancelButton = page.getByRole('button', { name: 'Cancel' });
+    this.infoButton = page.getByRole('button', { name: 'info-circle' });
+    this.totalEncountersEyeButton = page.getByRole('row', { name: 'Total Encounters eye' }).getByRole('button');
+    this.totalEncountersEyeInvisibleButton = page.getByRole('row', { name: 'Total Encounters eye-invisible' }).getByRole('button');
+    this.mortalityRateEyeButton = page.getByRole('row', { name: 'Mortality Rate eye' }).getByRole('button');
+    this.mortalityRateEyeInvisibleButton = page.getByRole('row', { name: 'Mortality Rate eye-invisible' }).getByRole('button');
+    this.editColumnLayoutSaveButton = page.getByRole('button', { name: 'Save' });
+    this.editColumnLayoutPanel = page.getByLabel('Column Name');
+    this.helpPageBreadcrumbs = page.getByLabel('Breadcrumbs');
+    this.filterRefinementOptionsButton = page.getByRole('button', { name: 'filter Refinement Options' });
+    this.addPopulationCriteriaButton = page.getByRole('button', { name: 'plus Add Population Criteria' });
+    this.ageCohortOption = page.getByText('Age Cohort');
+    this.searchPlaceholder = page.getByPlaceholder('Search');
+    this.selectAllResultsText = page.getByText('Select All Results');
+    this.borderButton = page.getByRole('button', { name: 'border' });
+    this.closeCircleButton = page.getByRole('button', { name: 'close-circle' });
+    this.refinementDialog = page.getByRole('dialog');
+    this.caseTypeFamilyOption = page.getByText('Case Type Family', { exact: true });
+    this.applyButton = page.getByRole('button', { name: 'Apply' });
+    this.okButton = page.getByRole('button', { name: 'OK' });
+
+    this.addPopulationCriteriaButtonByTestId = page.getByTestId('add-population-criteria');
+    this.addNewPopulationCriteriaButtonByTestId = page.getByTestId('add-population-criteria-add');
+    this.applyPopulationCriteriaButtonByTestId = page.getByTestId('apply-criteria');
+    this.applyRefinementOptionsButtonByTestId = page.getByTestId('apply-refinement-options');
+    this.searchRefinementOptionsButtonByTestId = page.getByTestId('filter-chip-picker-search');
+    this.refinementSearchInput = page.locator('[class*="ant-input"]').getByPlaceholder('Search').first();
+    this.addButton = page.getByRole('button', { name: 'Add', exact: true });
+    this.searchButton = page.getByRole('button', { name: 'search' });
+    this.saveButton = page.getByRole('button', { name: 'Save' });
+  }
+
+  showHelpPopup = async (): Promise<Page> => {
+    const [helpPage] = await Promise.all([this.page.waitForEvent('popup'), this.infoButton.click()]);
+    return helpPage;
+  };
+
+  /**
+   * Gets a locator for a population option by name
+   * @param populationName - The name of the population (e.g., 'Age Cohort', 'Case Type Family')
+   * @returns Locator for the population option
+   */
+  getPopulationOption = (populationName: string | RegExp, exactMatch?: boolean): Locator => {
+    return this.page.getByText(populationName, { exact: exactMatch ?? typeof populationName === 'string' });
+  };
+
+  /**
+   * Gets the Apply button within a specific population criteria popover
+   * @param populationName - The name of the population heading
+   * @returns Locator for the Apply button
+   */
+  getPopulationApplyButton = (populationName: string | RegExp, exactMatch?: boolean): Locator => {
+    return this.page
+      .locator('[class*="ant-popover-content"]')
+      .filter({ has: this.page.getByRole('heading', { name: populationName, exact: exactMatch ?? typeof populationName === 'string' }) })
+      .getByRole('button', { name: 'Apply' });
+  };
+
+  /**
+   * Gets the criteria validation text for a specific population
+   * @param populationName - The name of the population
+   * @returns Locator for the criteria text
+   */
+  getPopulationCriteriaText = (populationName: string | RegExp, exactMatch?: boolean): Locator => {
+    return this.page.getByText(populationName, { exact: exactMatch ?? typeof populationName === 'string' });
+  };
+
+  /**
+   * Gets a locator for a search result by text
+   * @param searchText - The text to search for
+   * @returns Locator for the search result
+   */
+  getSearchResultText = (searchText: string | RegExp, exactMatch?: boolean): Locator => {
+    return this.page.getByText(searchText, { exact: exactMatch ?? typeof searchText === 'string' });
+  };
+
+  /**
+   * Gets the visibility states of column eye buttons in the column layout editor
+   * @returns Promise resolving to an object containing visibility states for all column buttons
+   */
+  getColumnVisibilityStates = async (): Promise<IColumnVisibilityStates> => {
+    return {
+      totalEncountersEyeButtonVisible: await this.totalEncountersEyeButton.isVisible(),
+      mortalityRateEyeButtonVisible: await this.mortalityRateEyeButton.isVisible(),
+      totalEncountersEyeInvisibleButtonVisible: await this.totalEncountersEyeInvisibleButton.isVisible(),
+      mortalityRateEyeInvisibleButtonVisible: await this.mortalityRateEyeInvisibleButton.isVisible()
+    };
+  };
+
+  /**
+   * Resets the column layout to default state with all columns visible
+   * Handles edge cases where the layout might be in an unexpected state from interrupted tests
+   * @returns Promise that resolves when the column layout has been reset
+   */
+  resetColumnLayoutToDefault = async (): Promise<void> => {
+    // Open column layout editor
+    await this.editColumnLayoutButton.click();
+    let visibilityStates = await this.getColumnVisibilityStates();
+
+    // In case the previous test was interrupted and left the layout in an unexpected state
+    if (!visibilityStates.totalEncountersEyeButtonVisible && !visibilityStates.totalEncountersEyeInvisibleButtonVisible) {
+      await this.editColumnLayoutCancelButton.click();
+      await this.editColumnLayoutButton.click();
+      visibilityStates = await this.getColumnVisibilityStates();
+    }
+
+    // Make columns visible if they are currently hidden
+    if (!visibilityStates.totalEncountersEyeButtonVisible && visibilityStates.totalEncountersEyeInvisibleButtonVisible) {
+      await this.totalEncountersEyeInvisibleButton.click();
+    }
+    if (!visibilityStates.mortalityRateEyeButtonVisible && visibilityStates.mortalityRateEyeInvisibleButtonVisible) {
+      await this.mortalityRateEyeInvisibleButton.click();
+    }
+
+    // Save the layout changes
+    await this.editColumnLayoutSaveButton.click();
+  };
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/assets/codeMirrorModule-BxIIN4UE.js b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/assets/codeMirrorModule-BxIIN4UE.js
new file mode 100644
index 0000000..8c6afe3
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/assets/codeMirrorModule-BxIIN4UE.js
@@ -0,0 +1,24 @@
+import{n as mu,o as bu}from"./testServerConnection-JQMZFCzK.js";var ho={exports:{}},ha;function Ar(){return ha||(ha=1,function(yr,Or){(function(F,Ee){yr.exports=Ee()})(mu,function(){var F=navigator.userAgent,Ee=navigator.platform,Se=/gecko\/\d/i.test(F),We=/MSIE \d/.test(F),Qe=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(F),Ce=/Edge\/(\d+)/.exec(F),M=We||Qe||Ce,j=M&&(We?document.documentMode||6:+(Ce||Qe)[1]),_=!Ce&&/WebKit\//.test(F),ie=_&&/Qt\/\d+\.\d+/.test(F),G=!Ce&&/Chrome\/(\d+)/.exec(F),se=G&&+G[1],ce=/Opera\//.test(F),Ie=/Apple Computer/.test(navigator.vendor),Te=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(F),Oe=/PhantomJS/.test(F),ae=Ie&&(/Mobile\/\w+/.test(F)||navigator.maxTouchPoints>2),V=/Android/.test(F),oe=ae||V||/webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(F),xe=ae||/Mac/.test(Ee),_e=/\bCrOS\b/.test(F),ye=/win/i.test(Ee),Me=ce&&F.match(/Version\/(\d*\.\d*)/);Me&&(Me=Number(Me[1])),Me&&Me>=15&&(ce=!1,_=!0);var He=xe&&(ie||ce&&(Me==null||Me<12.11)),ee=Se||M&&j>=9;function X(e){return new RegExp("(^|\\s)"+e+"(?:$|\\s)\\s*")}var me=function(e,t){var n=e.className,r=X(t).exec(n);if(r){var i=n.slice(r.index+r[0].length);e.className=n.slice(0,r.index)+(i?r[1]+i:"")}};function T(e){for(var t=e.childNodes.length;t>0;--t)e.removeChild(e.firstChild);return e}function H(e,t){return T(e).appendChild(t)}function c(e,t,n,r){var i=document.createElement(e);if(n&&(i.className=n),r&&(i.style.cssText=r),typeof t=="string")i.appendChild(document.createTextNode(t));else if(t)for(var o=0;o<t.length;++o)i.appendChild(t[o]);return i}function x(e,t,n,r){var i=c(e,t,n,r);return i.setAttribute("role","presentation"),i}var b;document.createRange?b=function(e,t,n,r){var i=document.createRange();return i.setEnd(r||e,n),i.setStart(e,t),i}:b=function(e,t,n){var r=document.body.createTextRange();try{r.moveToElementText(e.parentNode)}catch{return r}return r.collapse(!0),r.moveEnd("character",n),r.moveStart("character",t),r};function v(e,t){if(t.nodeType==3&&(t=t.parentNode),e.contains)return e.contains(t);do if(t.nodeType==11&&(t=t.host),t==e)return!0;while(t=t.parentNode)}function g(e){var t=e.ownerDocument||e,n;try{n=e.activeElement}catch{n=t.body||null}for(;n&&n.shadowRoot&&n.shadowRoot.activeElement;)n=n.shadowRoot.activeElement;return n}function D(e,t){var n=e.className;X(t).test(n)||(e.className+=(n?" ":"")+t)}function K(e,t){for(var n=e.split(" "),r=0;r<n.length;r++)n[r]&&!X(n[r]).test(t)&&(t+=" "+n[r]);return t}var $=function(e){e.select()};ae?$=function(e){e.selectionStart=0,e.selectionEnd=e.value.length}:M&&($=function(e){try{e.select()}catch{}});function pe(e){return e.display.wrapper.ownerDocument}function Re(e){return ze(e.display.wrapper)}function ze(e){return e.getRootNode?e.getRootNode():e.ownerDocument}function le(e){return pe(e).defaultView}function te(e){var t=Array.prototype.slice.call(arguments,1);return function(){return e.apply(null,t)}}function de(e,t,n){t||(t={});for(var r in e)e.hasOwnProperty(r)&&(n!==!1||!t.hasOwnProperty(r))&&(t[r]=e[r]);return t}function he(e,t,n,r,i){t==null&&(t=e.search(/[^\s\u00a0]/),t==-1&&(t=e.length));for(var o=r||0,l=i||0;;){var a=e.indexOf("	",o);if(a<0||a>=t)return l+(t-o);l+=a-o,l+=n-l%n,o=a+1}}var ue=function(){this.id=null,this.f=null,this.time=0,this.handler=te(this.onTimeout,this)};ue.prototype.onTimeout=function(e){e.id=0,e.time<=+new Date?e.f():setTimeout(e.handler,e.time-+new Date)},ue.prototype.set=function(e,t){this.f=t;var n=+new Date+e;(!this.id||n<this.time)&&(clearTimeout(this.id),this.id=setTimeout(this.handler,e),this.time=n)};function q(e,t){for(var n=0;n<e.length;++n)if(e[n]==t)return n;return-1}var Ve=50,Ct={toString:function(){return"CodeMirror.Pass"}},st={scroll:!1},gt={origin:"*mouse"},Le={origin:"+move"};function Ke(e,t,n){for(var r=0,i=0;;){var o=e.indexOf("	",r);o==-1&&(o=e.length);var l=o-r;if(o==e.length||i+l>=t)return r+Math.min(l,t-i);if(i+=o-r,i+=n-i%n,r=o+1,i>=t)return r}}var lt=[""];function ht(e){for(;lt.length<=e;)lt.push(re(lt)+" ");return lt[e]}function re(e){return e[e.length-1]}function Ne(e,t){for(var n=[],r=0;r<e.length;r++)n[r]=t(e[r],r);return n}function w(e,t,n){for(var r=0,i=n(t);r<e.length&&n(e[r])<=i;)r++;e.splice(r,0,t)}function A(){}function C(e,t){var n;return Object.create?n=Object.create(e):(A.prototype=e,n=new A),t&&de(t,n),n}var be=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;function R(e){return/\w/.test(e)||e>"€"&&(e.toUpperCase()!=e.toLowerCase()||be.test(e))}function ne(e,t){return t?t.source.indexOf("\\w")>-1&&R(e)?!0:t.test(e):R(e)}function Y(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t])return!1;return!0}var we=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;function ve(e){return e.charCodeAt(0)>=768&&we.test(e)}function Tt(e,t,n){for(;(n<0?t>0:t<e.length)&&ve(e.charAt(t));)t+=n;return t}function Ot(e,t,n){for(var r=t>n?-1:1;;){if(t==n)return t;var i=(t+n)/2,o=r<0?Math.ceil(i):Math.floor(i);if(o==t)return e(o)?t:n;e(o)?n=o:t=o+r}}function rr(e,t,n,r){if(!e)return r(t,n,"ltr",0);for(var i=!1,o=0;o<e.length;++o){var l=e[o];(l.from<n&&l.to>t||t==n&&l.to==t)&&(r(Math.max(l.from,t),Math.min(l.to,n),l.level==1?"rtl":"ltr",o),i=!0)}i||r(t,n,"ltr")}var mr=null;function nr(e,t,n){var r;mr=null;for(var i=0;i<e.length;++i){var o=e[i];if(o.from<t&&o.to>t)return i;o.to==t&&(o.from!=o.to&&n=="before"?r=i:mr=i),o.from==t&&(o.from!=o.to&&n!="before"?r=i:mr=i)}return r??mr}var gi=function(){var e="bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN",t="nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111";function n(u){return u<=247?e.charAt(u):1424<=u&&u<=1524?"R":1536<=u&&u<=1785?t.charAt(u-1536):1774<=u&&u<=2220?"r":8192<=u&&u<=8203?"w":u==8204?"b":"L"}var r=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,i=/[stwN]/,o=/[LRr]/,l=/[Lb1n]/,a=/[1n]/;function s(u,d,p){this.level=u,this.from=d,this.to=p}return function(u,d){var p=d=="ltr"?"L":"R";if(u.length==0||d=="ltr"&&!r.test(u))return!1;for(var m=u.length,y=[],S=0;S<m;++S)y.push(n(u.charCodeAt(S)));for(var N=0,z=p;N<m;++N){var P=y[N];P=="m"?y[N]=z:z=P}for(var W=0,E=p;W<m;++W){var B=y[W];B=="1"&&E=="r"?y[W]="n":o.test(B)&&(E=B,B=="r"&&(y[W]="R"))}for(var Q=1,Z=y[0];Q<m-1;++Q){var ge=y[Q];ge=="+"&&Z=="1"&&y[Q+1]=="1"?y[Q]="1":ge==","&&Z==y[Q+1]&&(Z=="1"||Z=="n")&&(y[Q]=Z),Z=ge}for(var Fe=0;Fe<m;++Fe){var it=y[Fe];if(it==",")y[Fe]="N";else if(it=="%"){var Ue=void 0;for(Ue=Fe+1;Ue<m&&y[Ue]=="%";++Ue);for(var Nt=Fe&&y[Fe-1]=="!"||Ue<m&&y[Ue]=="1"?"1":"N",wt=Fe;wt<Ue;++wt)y[wt]=Nt;Fe=Ue-1}}for(var Ze=0,kt=p;Ze<m;++Ze){var at=y[Ze];kt=="L"&&at=="1"?y[Ze]="L":o.test(at)&&(kt=at)}for(var $e=0;$e<m;++$e)if(i.test(y[$e])){var Je=void 0;for(Je=$e+1;Je<m&&i.test(y[Je]);++Je);for(var Xe=($e?y[$e-1]:p)=="L",St=(Je<m?y[Je]:p)=="L",nn=Xe==St?Xe?"L":"R":p,gr=$e;gr<Je;++gr)y[gr]=nn;$e=Je-1}for(var dt=[],Xt,ot=0;ot<m;)if(l.test(y[ot])){var fo=ot;for(++ot;ot<m&&l.test(y[ot]);++ot);dt.push(new s(0,fo,ot))}else{var tr=ot,Nr=dt.length,Dr=d=="rtl"?1:0;for(++ot;ot<m&&y[ot]!="L";++ot);for(var vt=tr;vt<ot;)if(a.test(y[vt])){tr<vt&&(dt.splice(Nr,0,new s(1,tr,vt)),Nr+=Dr);var on=vt;for(++vt;vt<ot&&a.test(y[vt]);++vt);dt.splice(Nr,0,new s(2,on,vt)),Nr+=Dr,tr=vt}else++vt;tr<ot&&dt.splice(Nr,0,new s(1,tr,ot))}return d=="ltr"&&(dt[0].level==1&&(Xt=u.match(/^\s+/))&&(dt[0].from=Xt[0].length,dt.unshift(new s(0,0,Xt[0].length))),re(dt).level==1&&(Xt=u.match(/\s+$/))&&(re(dt).to-=Xt[0].length,dt.push(new s(0,m-Xt[0].length,m)))),d=="rtl"?dt.reverse():dt}}();function ke(e,t){var n=e.order;return n==null&&(n=e.order=gi(e.text,t)),n}var Wn=[],J=function(e,t,n){if(e.addEventListener)e.addEventListener(t,n,!1);else if(e.attachEvent)e.attachEvent("on"+t,n);else{var r=e._handlers||(e._handlers={});r[t]=(r[t]||Wn).concat(n)}};function Yt(e,t){return e._handlers&&e._handlers[t]||Wn}function ut(e,t,n){if(e.removeEventListener)e.removeEventListener(t,n,!1);else if(e.detachEvent)e.detachEvent("on"+t,n);else{var r=e._handlers,i=r&&r[t];if(i){var o=q(i,n);o>-1&&(r[t]=i.slice(0,o).concat(i.slice(o+1)))}}}function qe(e,t){var n=Yt(e,t);if(n.length)for(var r=Array.prototype.slice.call(arguments,2),i=0;i<n.length;++i)n[i].apply(null,r)}function Ge(e,t,n){return typeof t=="string"&&(t={type:t,preventDefault:function(){this.defaultPrevented=!0}}),qe(e,n||t.type,e,t),yt(t)||t.codemirrorIgnore}function zt(e){var t=e._handlers&&e._handlers.cursorActivity;if(t)for(var n=e.curOp.cursorActivityHandlers||(e.curOp.cursorActivityHandlers=[]),r=0;r<t.length;++r)q(n,t[r])==-1&&n.push(t[r])}function Lt(e,t){return Yt(e,t).length>0}function Et(e){e.prototype.on=function(t,n){J(this,t,n)},e.prototype.off=function(t,n){ut(this,t,n)}}function ft(e){e.preventDefault?e.preventDefault():e.returnValue=!1}function zr(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0}function yt(e){return e.defaultPrevented!=null?e.defaultPrevented:e.returnValue==!1}function ir(e){ft(e),zr(e)}function ln(e){return e.target||e.srcElement}function It(e){var t=e.which;return t==null&&(e.button&1?t=1:e.button&2?t=3:e.button&4&&(t=2)),xe&&e.ctrlKey&&t==1&&(t=3),t}var yi=function(){if(M&&j<9)return!1;var e=c("div");return"draggable"in e||"dragDrop"in e}(),Pr;function _n(e){if(Pr==null){var t=c("span","​");H(e,c("span",[t,document.createTextNode("x")])),e.firstChild.offsetHeight!=0&&(Pr=t.offsetWidth<=1&&t.offsetHeight>2&&!(M&&j<8))}var n=Pr?c("span","​"):c("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px");return n.setAttribute("cm-text",""),n}var an;function or(e){if(an!=null)return an;var t=H(e,document.createTextNode("AخA")),n=b(t,0,1).getBoundingClientRect(),r=b(t,1,2).getBoundingClientRect();return T(e),!n||n.left==n.right?!1:an=r.right-n.right<3}var Pt=`
+
+b`.split(/\n/).length!=3?function(e){for(var t=0,n=[],r=e.length;t<=r;){var i=e.indexOf(`
+`,t);i==-1&&(i=e.length);var o=e.slice(t,e.charAt(i-1)=="\r"?i-1:i),l=o.indexOf("\r");l!=-1?(n.push(o.slice(0,l)),t+=l+1):(n.push(o),t=i+1)}return n}:function(e){return e.split(/\r\n?|\n/)},lr=window.getSelection?function(e){try{return e.selectionStart!=e.selectionEnd}catch{return!1}}:function(e){var t;try{t=e.ownerDocument.selection.createRange()}catch{}return!t||t.parentElement()!=e?!1:t.compareEndPoints("StartToEnd",t)!=0},Hn=function(){var e=c("div");return"oncopy"in e?!0:(e.setAttribute("oncopy","return;"),typeof e.oncopy=="function")}(),Ft=null;function mi(e){if(Ft!=null)return Ft;var t=H(e,c("span","x")),n=t.getBoundingClientRect(),r=b(t,0,1).getBoundingClientRect();return Ft=Math.abs(n.left-r.left)>1}var Er={},Wt={};function _t(e,t){arguments.length>2&&(t.dependencies=Array.prototype.slice.call(arguments,2)),Er[e]=t}function br(e,t){Wt[e]=t}function Ir(e){if(typeof e=="string"&&Wt.hasOwnProperty(e))e=Wt[e];else if(e&&typeof e.name=="string"&&Wt.hasOwnProperty(e.name)){var t=Wt[e.name];typeof t=="string"&&(t={name:t}),e=C(t,e),e.name=t.name}else{if(typeof e=="string"&&/^[\w\-]+\/[\w\-]+\+xml$/.test(e))return Ir("application/xml");if(typeof e=="string"&&/^[\w\-]+\/[\w\-]+\+json$/.test(e))return Ir("application/json")}return typeof e=="string"?{name:e}:e||{name:"null"}}function Fr(e,t){t=Ir(t);var n=Er[t.name];if(!n)return Fr(e,"text/plain");var r=n(e,t);if(ar.hasOwnProperty(t.name)){var i=ar[t.name];for(var o in i)i.hasOwnProperty(o)&&(r.hasOwnProperty(o)&&(r["_"+o]=r[o]),r[o]=i[o])}if(r.name=t.name,t.helperType&&(r.helperType=t.helperType),t.modeProps)for(var l in t.modeProps)r[l]=t.modeProps[l];return r}var ar={};function Wr(e,t){var n=ar.hasOwnProperty(e)?ar[e]:ar[e]={};de(t,n)}function Ut(e,t){if(t===!0)return t;if(e.copyState)return e.copyState(t);var n={};for(var r in t){var i=t[r];i instanceof Array&&(i=i.concat([])),n[r]=i}return n}function sn(e,t){for(var n;e.innerMode&&(n=e.innerMode(t),!(!n||n.mode==e));)t=n.state,e=n.mode;return n||{mode:e,state:t}}function _r(e,t,n){return e.startState?e.startState(t,n):!0}var je=function(e,t,n){this.pos=this.start=0,this.string=e,this.tabSize=t||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0,this.lineOracle=n};je.prototype.eol=function(){return this.pos>=this.string.length},je.prototype.sol=function(){return this.pos==this.lineStart},je.prototype.peek=function(){return this.string.charAt(this.pos)||void 0},je.prototype.next=function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},je.prototype.eat=function(e){var t=this.string.charAt(this.pos),n;if(typeof e=="string"?n=t==e:n=t&&(e.test?e.test(t):e(t)),n)return++this.pos,t},je.prototype.eatWhile=function(e){for(var t=this.pos;this.eat(e););return this.pos>t},je.prototype.eatSpace=function(){for(var e=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>e},je.prototype.skipToEnd=function(){this.pos=this.string.length},je.prototype.skipTo=function(e){var t=this.string.indexOf(e,this.pos);if(t>-1)return this.pos=t,!0},je.prototype.backUp=function(e){this.pos-=e},je.prototype.column=function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=he(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?he(this.string,this.lineStart,this.tabSize):0)},je.prototype.indentation=function(){return he(this.string,null,this.tabSize)-(this.lineStart?he(this.string,this.lineStart,this.tabSize):0)},je.prototype.match=function(e,t,n){if(typeof e=="string"){var r=function(l){return n?l.toLowerCase():l},i=this.string.substr(this.pos,e.length);if(r(i)==r(e))return t!==!1&&(this.pos+=e.length),!0}else{var o=this.string.slice(this.pos).match(e);return o&&o.index>0?null:(o&&t!==!1&&(this.pos+=o[0].length),o)}},je.prototype.current=function(){return this.string.slice(this.start,this.pos)},je.prototype.hideFirstChars=function(e,t){this.lineStart+=e;try{return t()}finally{this.lineStart-=e}},je.prototype.lookAhead=function(e){var t=this.lineOracle;return t&&t.lookAhead(e)},je.prototype.baseToken=function(){var e=this.lineOracle;return e&&e.baseToken(this.pos)};function U(e,t){if(t-=e.first,t<0||t>=e.size)throw new Error("There is no line "+(t+e.first)+" in the document.");for(var n=e;!n.lines;)for(var r=0;;++r){var i=n.children[r],o=i.chunkSize();if(t<o){n=i;break}t-=o}return n.lines[t]}function Zt(e,t,n){var r=[],i=t.line;return e.iter(t.line,n.line+1,function(o){var l=o.text;i==n.line&&(l=l.slice(0,n.ch)),i==t.line&&(l=l.slice(t.ch)),r.push(l),++i}),r}function un(e,t,n){var r=[];return e.iter(t,n,function(i){r.push(i.text)}),r}function Dt(e,t){var n=t-e.height;if(n)for(var r=e;r;r=r.parent)r.height+=n}function f(e){if(e.parent==null)return null;for(var t=e.parent,n=q(t.lines,e),r=t.parent;r;t=r,r=r.parent)for(var i=0;r.children[i]!=t;++i)n+=r.children[i].chunkSize();return n+t.first}function h(e,t){var n=e.first;e:do{for(var r=0;r<e.children.length;++r){var i=e.children[r],o=i.height;if(t<o){e=i;continue e}t-=o,n+=i.chunkSize()}return n}while(!e.lines);for(var l=0;l<e.lines.length;++l){var a=e.lines[l],s=a.height;if(t<s)break;t-=s}return n+l}function L(e,t){return t>=e.first&&t<e.first+e.size}function O(e,t){return String(e.lineNumberFormatter(t+e.firstLineNumber))}function k(e,t,n){if(n===void 0&&(n=null),!(this instanceof k))return new k(e,t,n);this.line=e,this.ch=t,this.sticky=n}function I(e,t){return e.line-t.line||e.ch-t.ch}function De(e,t){return e.sticky==t.sticky&&I(e,t)==0}function et(e){return k(e.line,e.ch)}function mt(e,t){return I(e,t)<0?t:e}function Hr(e,t){return I(e,t)<0?e:t}function po(e,t){return Math.max(e.first,Math.min(t,e.first+e.size-1))}function fe(e,t){if(t.line<e.first)return k(e.first,0);var n=e.first+e.size-1;return t.line>n?k(n,U(e,n).text.length):ba(t,U(e,t.line).text.length)}function ba(e,t){var n=e.ch;return n==null||n>t?k(e.line,t):n<0?k(e.line,0):e}function vo(e,t){for(var n=[],r=0;r<t.length;r++)n[r]=fe(e,t[r]);return n}var Bn=function(e,t){this.state=e,this.lookAhead=t},qt=function(e,t,n,r){this.state=t,this.doc=e,this.line=n,this.maxLookAhead=r||0,this.baseTokens=null,this.baseTokenPos=1};qt.prototype.lookAhead=function(e){var t=this.doc.getLine(this.line+e);return t!=null&&e>this.maxLookAhead&&(this.maxLookAhead=e),t},qt.prototype.baseToken=function(e){if(!this.baseTokens)return null;for(;this.baseTokens[this.baseTokenPos]<=e;)this.baseTokenPos+=2;var t=this.baseTokens[this.baseTokenPos+1];return{type:t&&t.replace(/( |^)overlay .*/,""),size:this.baseTokens[this.baseTokenPos]-e}},qt.prototype.nextLine=function(){this.line++,this.maxLookAhead>0&&this.maxLookAhead--},qt.fromSaved=function(e,t,n){return t instanceof Bn?new qt(e,Ut(e.mode,t.state),n,t.lookAhead):new qt(e,Ut(e.mode,t),n)},qt.prototype.save=function(e){var t=e!==!1?Ut(this.doc.mode,this.state):this.state;return this.maxLookAhead>0?new Bn(t,this.maxLookAhead):t};function go(e,t,n,r){var i=[e.state.modeGen],o={};ko(e,t.text,e.doc.mode,n,function(u,d){return i.push(u,d)},o,r);for(var l=n.state,a=function(u){n.baseTokens=i;var d=e.state.overlays[u],p=1,m=0;n.state=!0,ko(e,t.text,d.mode,n,function(y,S){for(var N=p;m<y;){var z=i[p];z>y&&i.splice(p,1,y,i[p+1],z),p+=2,m=Math.min(y,z)}if(S)if(d.opaque)i.splice(N,p-N,y,"overlay "+S),p=N+2;else for(;N<p;N+=2){var P=i[N+1];i[N+1]=(P?P+" ":"")+"overlay "+S}},o),n.state=l,n.baseTokens=null,n.baseTokenPos=1},s=0;s<e.state.overlays.length;++s)a(s);return{styles:i,classes:o.bgClass||o.textClass?o:null}}function yo(e,t,n){if(!t.styles||t.styles[0]!=e.state.modeGen){var r=fn(e,f(t)),i=t.text.length>e.options.maxHighlightLength&&Ut(e.doc.mode,r.state),o=go(e,t,r);i&&(r.state=i),t.stateAfter=r.save(!i),t.styles=o.styles,o.classes?t.styleClasses=o.classes:t.styleClasses&&(t.styleClasses=null),n===e.doc.highlightFrontier&&(e.doc.modeFrontier=Math.max(e.doc.modeFrontier,++e.doc.highlightFrontier))}return t.styles}function fn(e,t,n){var r=e.doc,i=e.display;if(!r.mode.startState)return new qt(r,!0,t);var o=xa(e,t,n),l=o>r.first&&U(r,o-1).stateAfter,a=l?qt.fromSaved(r,l,o):new qt(r,_r(r.mode),o);return r.iter(o,t,function(s){bi(e,s.text,a);var u=a.line;s.stateAfter=u==t-1||u%5==0||u>=i.viewFrom&&u<i.viewTo?a.save():null,a.nextLine()}),n&&(r.modeFrontier=a.line),a}function bi(e,t,n,r){var i=e.doc.mode,o=new je(t,e.options.tabSize,n);for(o.start=o.pos=r||0,t==""&&mo(i,n.state);!o.eol();)xi(i,o,n.state),o.start=o.pos}function mo(e,t){if(e.blankLine)return e.blankLine(t);if(e.innerMode){var n=sn(e,t);if(n.mode.blankLine)return n.mode.blankLine(n.state)}}function xi(e,t,n,r){for(var i=0;i<10;i++){r&&(r[0]=sn(e,n).mode);var o=e.token(t,n);if(t.pos>t.start)return o}throw new Error("Mode "+e.name+" failed to advance stream.")}var bo=function(e,t,n){this.start=e.start,this.end=e.pos,this.string=e.current(),this.type=t||null,this.state=n};function xo(e,t,n,r){var i=e.doc,o=i.mode,l;t=fe(i,t);var a=U(i,t.line),s=fn(e,t.line,n),u=new je(a.text,e.options.tabSize,s),d;for(r&&(d=[]);(r||u.pos<t.ch)&&!u.eol();)u.start=u.pos,l=xi(o,u,s.state),r&&d.push(new bo(u,l,Ut(i.mode,s.state)));return r?d:new bo(u,l,s.state)}function wo(e,t){if(e)for(;;){var n=e.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!n)break;e=e.slice(0,n.index)+e.slice(n.index+n[0].length);var r=n[1]?"bgClass":"textClass";t[r]==null?t[r]=n[2]:new RegExp("(?:^|\\s)"+n[2]+"(?:$|\\s)").test(t[r])||(t[r]+=" "+n[2])}return e}function ko(e,t,n,r,i,o,l){var a=n.flattenSpans;a==null&&(a=e.options.flattenSpans);var s=0,u=null,d=new je(t,e.options.tabSize,r),p,m=e.options.addModeClass&&[null];for(t==""&&wo(mo(n,r.state),o);!d.eol();){if(d.pos>e.options.maxHighlightLength?(a=!1,l&&bi(e,t,r,d.pos),d.pos=t.length,p=null):p=wo(xi(n,d,r.state,m),o),m){var y=m[0].name;y&&(p="m-"+(p?y+" "+p:y))}if(!a||u!=p){for(;s<d.start;)s=Math.min(d.start,s+5e3),i(s,u);u=p}d.start=d.pos}for(;s<d.pos;){var S=Math.min(d.pos,s+5e3);i(S,u),s=S}}function xa(e,t,n){for(var r,i,o=e.doc,l=n?-1:t-(e.doc.mode.innerMode?1e3:100),a=t;a>l;--a){if(a<=o.first)return o.first;var s=U(o,a-1),u=s.stateAfter;if(u&&(!n||a+(u instanceof Bn?u.lookAhead:0)<=o.modeFrontier))return a;var d=he(s.text,null,e.options.tabSize);(i==null||r>d)&&(i=a-1,r=d)}return i}function wa(e,t){if(e.modeFrontier=Math.min(e.modeFrontier,t),!(e.highlightFrontier<t-10)){for(var n=e.first,r=t-1;r>n;r--){var i=U(e,r).stateAfter;if(i&&(!(i instanceof Bn)||r+i.lookAhead<t)){n=r+1;break}}e.highlightFrontier=Math.min(e.highlightFrontier,n)}}var So=!1,Jt=!1;function ka(){So=!0}function Sa(){Jt=!0}function Rn(e,t,n){this.marker=e,this.from=t,this.to=n}function cn(e,t){if(e)for(var n=0;n<e.length;++n){var r=e[n];if(r.marker==t)return r}}function Ca(e,t){for(var n,r=0;r<e.length;++r)e[r]!=t&&(n||(n=[])).push(e[r]);return n}function Ta(e,t,n){var r=n&&window.WeakSet&&(n.markedSpans||(n.markedSpans=new WeakSet));r&&e.markedSpans&&r.has(e.markedSpans)?e.markedSpans.push(t):(e.markedSpans=e.markedSpans?e.markedSpans.concat([t]):[t],r&&r.add(e.markedSpans)),t.marker.attachLine(e)}function La(e,t,n){var r;if(e)for(var i=0;i<e.length;++i){var o=e[i],l=o.marker,a=o.from==null||(l.inclusiveLeft?o.from<=t:o.from<t);if(a||o.from==t&&l.type=="bookmark"&&(!n||!o.marker.insertLeft)){var s=o.to==null||(l.inclusiveRight?o.to>=t:o.to>t);(r||(r=[])).push(new Rn(l,o.from,s?null:o.to))}}return r}function Ma(e,t,n){var r;if(e)for(var i=0;i<e.length;++i){var o=e[i],l=o.marker,a=o.to==null||(l.inclusiveRight?o.to>=t:o.to>t);if(a||o.from==t&&l.type=="bookmark"&&(!n||o.marker.insertLeft)){var s=o.from==null||(l.inclusiveLeft?o.from<=t:o.from<t);(r||(r=[])).push(new Rn(l,s?null:o.from-t,o.to==null?null:o.to-t))}}return r}function wi(e,t){if(t.full)return null;var n=L(e,t.from.line)&&U(e,t.from.line).markedSpans,r=L(e,t.to.line)&&U(e,t.to.line).markedSpans;if(!n&&!r)return null;var i=t.from.ch,o=t.to.ch,l=I(t.from,t.to)==0,a=La(n,i,l),s=Ma(r,o,l),u=t.text.length==1,d=re(t.text).length+(u?i:0);if(a)for(var p=0;p<a.length;++p){var m=a[p];if(m.to==null){var y=cn(s,m.marker);y?u&&(m.to=y.to==null?null:y.to+d):m.to=i}}if(s)for(var S=0;S<s.length;++S){var N=s[S];if(N.to!=null&&(N.to+=d),N.from==null){var z=cn(a,N.marker);z||(N.from=d,u&&(a||(a=[])).push(N))}else N.from+=d,u&&(a||(a=[])).push(N)}a&&(a=Co(a)),s&&s!=a&&(s=Co(s));var P=[a];if(!u){var W=t.text.length-2,E;if(W>0&&a)for(var B=0;B<a.length;++B)a[B].to==null&&(E||(E=[])).push(new Rn(a[B].marker,null,null));for(var Q=0;Q<W;++Q)P.push(E);P.push(s)}return P}function Co(e){for(var t=0;t<e.length;++t){var n=e[t];n.from!=null&&n.from==n.to&&n.marker.clearWhenEmpty!==!1&&e.splice(t--,1)}return e.length?e:null}function Na(e,t,n){var r=null;if(e.iter(t.line,n.line+1,function(y){if(y.markedSpans)for(var S=0;S<y.markedSpans.length;++S){var N=y.markedSpans[S].marker;N.readOnly&&(!r||q(r,N)==-1)&&(r||(r=[])).push(N)}}),!r)return null;for(var i=[{from:t,to:n}],o=0;o<r.length;++o)for(var l=r[o],a=l.find(0),s=0;s<i.length;++s){var u=i[s];if(!(I(u.to,a.from)<0||I(u.from,a.to)>0)){var d=[s,1],p=I(u.from,a.from),m=I(u.to,a.to);(p<0||!l.inclusiveLeft&&!p)&&d.push({from:u.from,to:a.from}),(m>0||!l.inclusiveRight&&!m)&&d.push({from:a.to,to:u.to}),i.splice.apply(i,d),s+=d.length-3}}return i}function To(e){var t=e.markedSpans;if(t){for(var n=0;n<t.length;++n)t[n].marker.detachLine(e);e.markedSpans=null}}function Lo(e,t){if(t){for(var n=0;n<t.length;++n)t[n].marker.attachLine(e);e.markedSpans=t}}function Kn(e){return e.inclusiveLeft?-1:0}function Un(e){return e.inclusiveRight?1:0}function ki(e,t){var n=e.lines.length-t.lines.length;if(n!=0)return n;var r=e.find(),i=t.find(),o=I(r.from,i.from)||Kn(e)-Kn(t);if(o)return-o;var l=I(r.to,i.to)||Un(e)-Un(t);return l||t.id-e.id}function Mo(e,t){var n=Jt&&e.markedSpans,r;if(n)for(var i=void 0,o=0;o<n.length;++o)i=n[o],i.marker.collapsed&&(t?i.from:i.to)==null&&(!r||ki(r,i.marker)<0)&&(r=i.marker);return r}function No(e){return Mo(e,!0)}function qn(e){return Mo(e,!1)}function Da(e,t){var n=Jt&&e.markedSpans,r;if(n)for(var i=0;i<n.length;++i){var o=n[i];o.marker.collapsed&&(o.from==null||o.from<t)&&(o.to==null||o.to>t)&&(!r||ki(r,o.marker)<0)&&(r=o.marker)}return r}function Do(e,t,n,r,i){var o=U(e,t),l=Jt&&o.markedSpans;if(l)for(var a=0;a<l.length;++a){var s=l[a];if(s.marker.collapsed){var u=s.marker.find(0),d=I(u.from,n)||Kn(s.marker)-Kn(i),p=I(u.to,r)||Un(s.marker)-Un(i);if(!(d>=0&&p<=0||d<=0&&p>=0)&&(d<=0&&(s.marker.inclusiveRight&&i.inclusiveLeft?I(u.to,n)>=0:I(u.to,n)>0)||d>=0&&(s.marker.inclusiveRight&&i.inclusiveLeft?I(u.from,r)<=0:I(u.from,r)<0)))return!0}}}function Ht(e){for(var t;t=No(e);)e=t.find(-1,!0).line;return e}function Aa(e){for(var t;t=qn(e);)e=t.find(1,!0).line;return e}function Oa(e){for(var t,n;t=qn(e);)e=t.find(1,!0).line,(n||(n=[])).push(e);return n}function Si(e,t){var n=U(e,t),r=Ht(n);return n==r?t:f(r)}function Ao(e,t){if(t>e.lastLine())return t;var n=U(e,t),r;if(!sr(e,n))return t;for(;r=qn(n);)n=r.find(1,!0).line;return f(n)+1}function sr(e,t){var n=Jt&&t.markedSpans;if(n){for(var r=void 0,i=0;i<n.length;++i)if(r=n[i],!!r.marker.collapsed){if(r.from==null)return!0;if(!r.marker.widgetNode&&r.from==0&&r.marker.inclusiveLeft&&Ci(e,t,r))return!0}}}function Ci(e,t,n){if(n.to==null){var r=n.marker.find(1,!0);return Ci(e,r.line,cn(r.line.markedSpans,n.marker))}if(n.marker.inclusiveRight&&n.to==t.text.length)return!0;for(var i=void 0,o=0;o<t.markedSpans.length;++o)if(i=t.markedSpans[o],i.marker.collapsed&&!i.marker.widgetNode&&i.from==n.to&&(i.to==null||i.to!=n.from)&&(i.marker.inclusiveLeft||n.marker.inclusiveRight)&&Ci(e,t,i))return!0}function Qt(e){e=Ht(e);for(var t=0,n=e.parent,r=0;r<n.lines.length;++r){var i=n.lines[r];if(i==e)break;t+=i.height}for(var o=n.parent;o;n=o,o=n.parent)for(var l=0;l<o.children.length;++l){var a=o.children[l];if(a==n)break;t+=a.height}return t}function Gn(e){if(e.height==0)return 0;for(var t=e.text.length,n,r=e;n=No(r);){var i=n.find(0,!0);r=i.from.line,t+=i.from.ch-i.to.ch}for(r=e;n=qn(r);){var o=n.find(0,!0);t-=r.text.length-o.from.ch,r=o.to.line,t+=r.text.length-o.to.ch}return t}function Ti(e){var t=e.display,n=e.doc;t.maxLine=U(n,n.first),t.maxLineLength=Gn(t.maxLine),t.maxLineChanged=!0,n.iter(function(r){var i=Gn(r);i>t.maxLineLength&&(t.maxLineLength=i,t.maxLine=r)})}var Br=function(e,t,n){this.text=e,Lo(this,t),this.height=n?n(this):1};Br.prototype.lineNo=function(){return f(this)},Et(Br);function za(e,t,n,r){e.text=t,e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null),e.order!=null&&(e.order=null),To(e),Lo(e,n);var i=r?r(e):1;i!=e.height&&Dt(e,i)}function Pa(e){e.parent=null,To(e)}var Ea={},Ia={};function Oo(e,t){if(!e||/^\s*$/.test(e))return null;var n=t.addModeClass?Ia:Ea;return n[e]||(n[e]=e.replace(/\S+/g,"cm-$&"))}function zo(e,t){var n=x("span",null,null,_?"padding-right: .1px":null),r={pre:x("pre",[n],"CodeMirror-line"),content:n,col:0,pos:0,cm:e,trailingSpace:!1,splitSpaces:e.getOption("lineWrapping")};t.measure={};for(var i=0;i<=(t.rest?t.rest.length:0);i++){var o=i?t.rest[i-1]:t.line,l=void 0;r.pos=0,r.addToken=Wa,or(e.display.measure)&&(l=ke(o,e.doc.direction))&&(r.addToken=Ha(r.addToken,l)),r.map=[];var a=t!=e.display.externalMeasured&&f(o);Ba(o,r,yo(e,o,a)),o.styleClasses&&(o.styleClasses.bgClass&&(r.bgClass=K(o.styleClasses.bgClass,r.bgClass||"")),o.styleClasses.textClass&&(r.textClass=K(o.styleClasses.textClass,r.textClass||""))),r.map.length==0&&r.map.push(0,0,r.content.appendChild(_n(e.display.measure))),i==0?(t.measure.map=r.map,t.measure.cache={}):((t.measure.maps||(t.measure.maps=[])).push(r.map),(t.measure.caches||(t.measure.caches=[])).push({}))}if(_){var s=r.content.lastChild;(/\bcm-tab\b/.test(s.className)||s.querySelector&&s.querySelector(".cm-tab"))&&(r.content.className="cm-tab-wrap-hack")}return qe(e,"renderLine",e,t.line,r.pre),r.pre.className&&(r.textClass=K(r.pre.className,r.textClass||"")),r}function Fa(e){var t=c("span","•","cm-invalidchar");return t.title="\\u"+e.charCodeAt(0).toString(16),t.setAttribute("aria-label",t.title),t}function Wa(e,t,n,r,i,o,l){if(t){var a=e.splitSpaces?_a(t,e.trailingSpace):t,s=e.cm.state.specialChars,u=!1,d;if(!s.test(t))e.col+=t.length,d=document.createTextNode(a),e.map.push(e.pos,e.pos+t.length,d),M&&j<9&&(u=!0),e.pos+=t.length;else{d=document.createDocumentFragment();for(var p=0;;){s.lastIndex=p;var m=s.exec(t),y=m?m.index-p:t.length-p;if(y){var S=document.createTextNode(a.slice(p,p+y));M&&j<9?d.appendChild(c("span",[S])):d.appendChild(S),e.map.push(e.pos,e.pos+y,S),e.col+=y,e.pos+=y}if(!m)break;p+=y+1;var N=void 0;if(m[0]=="	"){var z=e.cm.options.tabSize,P=z-e.col%z;N=d.appendChild(c("span",ht(P),"cm-tab")),N.setAttribute("role","presentation"),N.setAttribute("cm-text","	"),e.col+=P}else m[0]=="\r"||m[0]==`
+`?(N=d.appendChild(c("span",m[0]=="\r"?"␍":"␤","cm-invalidchar")),N.setAttribute("cm-text",m[0]),e.col+=1):(N=e.cm.options.specialCharPlaceholder(m[0]),N.setAttribute("cm-text",m[0]),M&&j<9?d.appendChild(c("span",[N])):d.appendChild(N),e.col+=1);e.map.push(e.pos,e.pos+1,N),e.pos++}}if(e.trailingSpace=a.charCodeAt(t.length-1)==32,n||r||i||u||o||l){var W=n||"";r&&(W+=r),i&&(W+=i);var E=c("span",[d],W,o);if(l)for(var B in l)l.hasOwnProperty(B)&&B!="style"&&B!="class"&&E.setAttribute(B,l[B]);return e.content.appendChild(E)}e.content.appendChild(d)}}function _a(e,t){if(e.length>1&&!/  /.test(e))return e;for(var n=t,r="",i=0;i<e.length;i++){var o=e.charAt(i);o==" "&&n&&(i==e.length-1||e.charCodeAt(i+1)==32)&&(o=" "),r+=o,n=o==" "}return r}function Ha(e,t){return function(n,r,i,o,l,a,s){i=i?i+" cm-force-border":"cm-force-border";for(var u=n.pos,d=u+r.length;;){for(var p=void 0,m=0;m<t.length&&(p=t[m],!(p.to>u&&p.from<=u));m++);if(p.to>=d)return e(n,r,i,o,l,a,s);e(n,r.slice(0,p.to-u),i,o,null,a,s),o=null,r=r.slice(p.to-u),u=p.to}}}function Po(e,t,n,r){var i=!r&&n.widgetNode;i&&e.map.push(e.pos,e.pos+t,i),!r&&e.cm.display.input.needsContentAttribute&&(i||(i=e.content.appendChild(document.createElement("span"))),i.setAttribute("cm-marker",n.id)),i&&(e.cm.display.input.setUneditable(i),e.content.appendChild(i)),e.pos+=t,e.trailingSpace=!1}function Ba(e,t,n){var r=e.markedSpans,i=e.text,o=0;if(!r){for(var l=1;l<n.length;l+=2)t.addToken(t,i.slice(o,o=n[l]),Oo(n[l+1],t.cm.options));return}for(var a=i.length,s=0,u=1,d="",p,m,y=0,S,N,z,P,W;;){if(y==s){S=N=z=m="",W=null,P=null,y=1/0;for(var E=[],B=void 0,Q=0;Q<r.length;++Q){var Z=r[Q],ge=Z.marker;if(ge.type=="bookmark"&&Z.from==s&&ge.widgetNode)E.push(ge);else if(Z.from<=s&&(Z.to==null||Z.to>s||ge.collapsed&&Z.to==s&&Z.from==s)){if(Z.to!=null&&Z.to!=s&&y>Z.to&&(y=Z.to,N=""),ge.className&&(S+=" "+ge.className),ge.css&&(m=(m?m+";":"")+ge.css),ge.startStyle&&Z.from==s&&(z+=" "+ge.startStyle),ge.endStyle&&Z.to==y&&(B||(B=[])).push(ge.endStyle,Z.to),ge.title&&((W||(W={})).title=ge.title),ge.attributes)for(var Fe in ge.attributes)(W||(W={}))[Fe]=ge.attributes[Fe];ge.collapsed&&(!P||ki(P.marker,ge)<0)&&(P=Z)}else Z.from>s&&y>Z.from&&(y=Z.from)}if(B)for(var it=0;it<B.length;it+=2)B[it+1]==y&&(N+=" "+B[it]);if(!P||P.from==s)for(var Ue=0;Ue<E.length;++Ue)Po(t,0,E[Ue]);if(P&&(P.from||0)==s){if(Po(t,(P.to==null?a+1:P.to)-s,P.marker,P.from==null),P.to==null)return;P.to==s&&(P=!1)}}if(s>=a)break;for(var Nt=Math.min(a,y);;){if(d){var wt=s+d.length;if(!P){var Ze=wt>Nt?d.slice(0,Nt-s):d;t.addToken(t,Ze,p?p+S:S,z,s+Ze.length==y?N:"",m,W)}if(wt>=Nt){d=d.slice(Nt-s),s=Nt;break}s=wt,z=""}d=i.slice(o,o=n[u++]),p=Oo(n[u++],t.cm.options)}}}function Eo(e,t,n){this.line=t,this.rest=Oa(t),this.size=this.rest?f(re(this.rest))-n+1:1,this.node=this.text=null,this.hidden=sr(e,t)}function jn(e,t,n){for(var r=[],i,o=t;o<n;o=i){var l=new Eo(e.doc,U(e.doc,o),o);i=o+l.size,r.push(l)}return r}var Rr=null;function Ra(e){Rr?Rr.ops.push(e):e.ownsGroup=Rr={ops:[e],delayedCallbacks:[]}}function Ka(e){var t=e.delayedCallbacks,n=0;do{for(;n<t.length;n++)t[n].call(null);for(var r=0;r<e.ops.length;r++){var i=e.ops[r];if(i.cursorActivityHandlers)for(;i.cursorActivityCalled<i.cursorActivityHandlers.length;)i.cursorActivityHandlers[i.cursorActivityCalled++].call(null,i.cm)}}while(n<t.length)}function Ua(e,t){var n=e.ownsGroup;if(n)try{Ka(n)}finally{Rr=null,t(n)}}var dn=null;function tt(e,t){var n=Yt(e,t);if(n.length){var r=Array.prototype.slice.call(arguments,2),i;Rr?i=Rr.delayedCallbacks:dn?i=dn:(i=dn=[],setTimeout(qa,0));for(var o=function(a){i.push(function(){return n[a].apply(null,r)})},l=0;l<n.length;++l)o(l)}}function qa(){var e=dn;dn=null;for(var t=0;t<e.length;++t)e[t]()}function Io(e,t,n,r){for(var i=0;i<t.changes.length;i++){var o=t.changes[i];o=="text"?ja(e,t):o=="gutter"?Wo(e,t,n,r):o=="class"?Li(e,t):o=="widget"&&Xa(e,t,r)}t.changes=null}function hn(e){return e.node==e.text&&(e.node=c("div",null,null,"position: relative"),e.text.parentNode&&e.text.parentNode.replaceChild(e.node,e.text),e.node.appendChild(e.text),M&&j<8&&(e.node.style.zIndex=2)),e.node}function Ga(e,t){var n=t.bgClass?t.bgClass+" "+(t.line.bgClass||""):t.line.bgClass;if(n&&(n+=" CodeMirror-linebackground"),t.background)n?t.background.className=n:(t.background.parentNode.removeChild(t.background),t.background=null);else if(n){var r=hn(t);t.background=r.insertBefore(c("div",null,n),r.firstChild),e.display.input.setUneditable(t.background)}}function Fo(e,t){var n=e.display.externalMeasured;return n&&n.line==t.line?(e.display.externalMeasured=null,t.measure=n.measure,n.built):zo(e,t)}function ja(e,t){var n=t.text.className,r=Fo(e,t);t.text==t.node&&(t.node=r.pre),t.text.parentNode.replaceChild(r.pre,t.text),t.text=r.pre,r.bgClass!=t.bgClass||r.textClass!=t.textClass?(t.bgClass=r.bgClass,t.textClass=r.textClass,Li(e,t)):n&&(t.text.className=n)}function Li(e,t){Ga(e,t),t.line.wrapClass?hn(t).className=t.line.wrapClass:t.node!=t.text&&(t.node.className="");var n=t.textClass?t.textClass+" "+(t.line.textClass||""):t.line.textClass;t.text.className=n||""}function Wo(e,t,n,r){if(t.gutter&&(t.node.removeChild(t.gutter),t.gutter=null),t.gutterBackground&&(t.node.removeChild(t.gutterBackground),t.gutterBackground=null),t.line.gutterClass){var i=hn(t);t.gutterBackground=c("div",null,"CodeMirror-gutter-background "+t.line.gutterClass,"left: "+(e.options.fixedGutter?r.fixedPos:-r.gutterTotalWidth)+"px; width: "+r.gutterTotalWidth+"px"),e.display.input.setUneditable(t.gutterBackground),i.insertBefore(t.gutterBackground,t.text)}var o=t.line.gutterMarkers;if(e.options.lineNumbers||o){var l=hn(t),a=t.gutter=c("div",null,"CodeMirror-gutter-wrapper","left: "+(e.options.fixedGutter?r.fixedPos:-r.gutterTotalWidth)+"px");if(a.setAttribute("aria-hidden","true"),e.display.input.setUneditable(a),l.insertBefore(a,t.text),t.line.gutterClass&&(a.className+=" "+t.line.gutterClass),e.options.lineNumbers&&(!o||!o["CodeMirror-linenumbers"])&&(t.lineNumber=a.appendChild(c("div",O(e.options,n),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+r.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+e.display.lineNumInnerWidth+"px"))),o)for(var s=0;s<e.display.gutterSpecs.length;++s){var u=e.display.gutterSpecs[s].className,d=o.hasOwnProperty(u)&&o[u];d&&a.appendChild(c("div",[d],"CodeMirror-gutter-elt","left: "+r.gutterLeft[u]+"px; width: "+r.gutterWidth[u]+"px"))}}}function Xa(e,t,n){t.alignable&&(t.alignable=null);for(var r=X("CodeMirror-linewidget"),i=t.node.firstChild,o=void 0;i;i=o)o=i.nextSibling,r.test(i.className)&&t.node.removeChild(i);_o(e,t,n)}function Ya(e,t,n,r){var i=Fo(e,t);return t.text=t.node=i.pre,i.bgClass&&(t.bgClass=i.bgClass),i.textClass&&(t.textClass=i.textClass),Li(e,t),Wo(e,t,n,r),_o(e,t,r),t.node}function _o(e,t,n){if(Ho(e,t.line,t,n,!0),t.rest)for(var r=0;r<t.rest.length;r++)Ho(e,t.rest[r],t,n,!1)}function Ho(e,t,n,r,i){if(t.widgets)for(var o=hn(n),l=0,a=t.widgets;l<a.length;++l){var s=a[l],u=c("div",[s.node],"CodeMirror-linewidget"+(s.className?" "+s.className:""));s.handleMouseEvents||u.setAttribute("cm-ignore-events","true"),Za(s,u,n,r),e.display.input.setUneditable(u),i&&s.above?o.insertBefore(u,n.gutter||n.text):o.appendChild(u),tt(s,"redraw")}}function Za(e,t,n,r){if(e.noHScroll){(n.alignable||(n.alignable=[])).push(t);var i=r.wrapperWidth;t.style.left=r.fixedPos+"px",e.coverGutter||(i-=r.gutterTotalWidth,t.style.paddingLeft=r.gutterTotalWidth+"px"),t.style.width=i+"px"}e.coverGutter&&(t.style.zIndex=5,t.style.position="relative",e.noHScroll||(t.style.marginLeft=-r.gutterTotalWidth+"px"))}function pn(e){if(e.height!=null)return e.height;var t=e.doc.cm;if(!t)return 0;if(!v(document.body,e.node)){var n="position: relative;";e.coverGutter&&(n+="margin-left: -"+t.display.gutters.offsetWidth+"px;"),e.noHScroll&&(n+="width: "+t.display.wrapper.clientWidth+"px;"),H(t.display.measure,c("div",[e.node],null,n))}return e.height=e.node.parentNode.offsetHeight}function Vt(e,t){for(var n=ln(t);n!=e.wrapper;n=n.parentNode)if(!n||n.nodeType==1&&n.getAttribute("cm-ignore-events")=="true"||n.parentNode==e.sizer&&n!=e.mover)return!0}function Xn(e){return e.lineSpace.offsetTop}function Mi(e){return e.mover.offsetHeight-e.lineSpace.offsetHeight}function Bo(e){if(e.cachedPaddingH)return e.cachedPaddingH;var t=H(e.measure,c("pre","x","CodeMirror-line-like")),n=window.getComputedStyle?window.getComputedStyle(t):t.currentStyle,r={left:parseInt(n.paddingLeft),right:parseInt(n.paddingRight)};return!isNaN(r.left)&&!isNaN(r.right)&&(e.cachedPaddingH=r),r}function Gt(e){return Ve-e.display.nativeBarWidth}function xr(e){return e.display.scroller.clientWidth-Gt(e)-e.display.barWidth}function Ni(e){return e.display.scroller.clientHeight-Gt(e)-e.display.barHeight}function Ja(e,t,n){var r=e.options.lineWrapping,i=r&&xr(e);if(!t.measure.heights||r&&t.measure.width!=i){var o=t.measure.heights=[];if(r){t.measure.width=i;for(var l=t.text.firstChild.getClientRects(),a=0;a<l.length-1;a++){var s=l[a],u=l[a+1];Math.abs(s.bottom-u.bottom)>2&&o.push((s.bottom+u.top)/2-n.top)}}o.push(n.bottom-n.top)}}function Ro(e,t,n){if(e.line==t)return{map:e.measure.map,cache:e.measure.cache};if(e.rest){for(var r=0;r<e.rest.length;r++)if(e.rest[r]==t)return{map:e.measure.maps[r],cache:e.measure.caches[r]};for(var i=0;i<e.rest.length;i++)if(f(e.rest[i])>n)return{map:e.measure.maps[i],cache:e.measure.caches[i],before:!0}}}function Qa(e,t){t=Ht(t);var n=f(t),r=e.display.externalMeasured=new Eo(e.doc,t,n);r.lineN=n;var i=r.built=zo(e,r);return r.text=i.pre,H(e.display.lineMeasure,i.pre),r}function Ko(e,t,n,r){return jt(e,Kr(e,t),n,r)}function Di(e,t){if(t>=e.display.viewFrom&&t<e.display.viewTo)return e.display.view[Sr(e,t)];var n=e.display.externalMeasured;if(n&&t>=n.lineN&&t<n.lineN+n.size)return n}function Kr(e,t){var n=f(t),r=Di(e,n);r&&!r.text?r=null:r&&r.changes&&(Io(e,r,n,Ei(e)),e.curOp.forceUpdate=!0),r||(r=Qa(e,t));var i=Ro(r,t,n);return{line:t,view:r,rect:null,map:i.map,cache:i.cache,before:i.before,hasHeights:!1}}function jt(e,t,n,r,i){t.before&&(n=-1);var o=n+(r||""),l;return t.cache.hasOwnProperty(o)?l=t.cache[o]:(t.rect||(t.rect=t.view.text.getBoundingClientRect()),t.hasHeights||(Ja(e,t.view,t.rect),t.hasHeights=!0),l=$a(e,t,n,r),l.bogus||(t.cache[o]=l)),{left:l.left,right:l.right,top:i?l.rtop:l.top,bottom:i?l.rbottom:l.bottom}}var Uo={left:0,right:0,top:0,bottom:0};function qo(e,t,n){for(var r,i,o,l,a,s,u=0;u<e.length;u+=3)if(a=e[u],s=e[u+1],t<a?(i=0,o=1,l="left"):t<s?(i=t-a,o=i+1):(u==e.length-3||t==s&&e[u+3]>t)&&(o=s-a,i=o-1,t>=s&&(l="right")),i!=null){if(r=e[u+2],a==s&&n==(r.insertLeft?"left":"right")&&(l=n),n=="left"&&i==0)for(;u&&e[u-2]==e[u-3]&&e[u-1].insertLeft;)r=e[(u-=3)+2],l="left";if(n=="right"&&i==s-a)for(;u<e.length-3&&e[u+3]==e[u+4]&&!e[u+5].insertLeft;)r=e[(u+=3)+2],l="right";break}return{node:r,start:i,end:o,collapse:l,coverStart:a,coverEnd:s}}function Va(e,t){var n=Uo;if(t=="left")for(var r=0;r<e.length&&(n=e[r]).left==n.right;r++);else for(var i=e.length-1;i>=0&&(n=e[i]).left==n.right;i--);return n}function $a(e,t,n,r){var i=qo(t.map,n,r),o=i.node,l=i.start,a=i.end,s=i.collapse,u;if(o.nodeType==3){for(var d=0;d<4;d++){for(;l&&ve(t.line.text.charAt(i.coverStart+l));)--l;for(;i.coverStart+a<i.coverEnd&&ve(t.line.text.charAt(i.coverStart+a));)++a;if(M&&j<9&&l==0&&a==i.coverEnd-i.coverStart?u=o.parentNode.getBoundingClientRect():u=Va(b(o,l,a).getClientRects(),r),u.left||u.right||l==0)break;a=l,l=l-1,s="right"}M&&j<11&&(u=es(e.display.measure,u))}else{l>0&&(s=r="right");var p;e.options.lineWrapping&&(p=o.getClientRects()).length>1?u=p[r=="right"?p.length-1:0]:u=o.getBoundingClientRect()}if(M&&j<9&&!l&&(!u||!u.left&&!u.right)){var m=o.parentNode.getClientRects()[0];m?u={left:m.left,right:m.left+qr(e.display),top:m.top,bottom:m.bottom}:u=Uo}for(var y=u.top-t.rect.top,S=u.bottom-t.rect.top,N=(y+S)/2,z=t.view.measure.heights,P=0;P<z.length-1&&!(N<z[P]);P++);var W=P?z[P-1]:0,E=z[P],B={left:(s=="right"?u.right:u.left)-t.rect.left,right:(s=="left"?u.left:u.right)-t.rect.left,top:W,bottom:E};return!u.left&&!u.right&&(B.bogus=!0),e.options.singleCursorHeightPerLine||(B.rtop=y,B.rbottom=S),B}function es(e,t){if(!window.screen||screen.logicalXDPI==null||screen.logicalXDPI==screen.deviceXDPI||!mi(e))return t;var n=screen.logicalXDPI/screen.deviceXDPI,r=screen.logicalYDPI/screen.deviceYDPI;return{left:t.left*n,right:t.right*n,top:t.top*r,bottom:t.bottom*r}}function Go(e){if(e.measure&&(e.measure.cache={},e.measure.heights=null,e.rest))for(var t=0;t<e.rest.length;t++)e.measure.caches[t]={}}function jo(e){e.display.externalMeasure=null,T(e.display.lineMeasure);for(var t=0;t<e.display.view.length;t++)Go(e.display.view[t])}function vn(e){jo(e),e.display.cachedCharWidth=e.display.cachedTextHeight=e.display.cachedPaddingH=null,e.options.lineWrapping||(e.display.maxLineChanged=!0),e.display.lineNumChars=null}function Xo(e){return G&&V?-(e.body.getBoundingClientRect().left-parseInt(getComputedStyle(e.body).marginLeft)):e.defaultView.pageXOffset||(e.documentElement||e.body).scrollLeft}function Yo(e){return G&&V?-(e.body.getBoundingClientRect().top-parseInt(getComputedStyle(e.body).marginTop)):e.defaultView.pageYOffset||(e.documentElement||e.body).scrollTop}function Ai(e){var t=Ht(e),n=t.widgets,r=0;if(n)for(var i=0;i<n.length;++i)n[i].above&&(r+=pn(n[i]));return r}function Yn(e,t,n,r,i){if(!i){var o=Ai(t);n.top+=o,n.bottom+=o}if(r=="line")return n;r||(r="local");var l=Qt(t);if(r=="local"?l+=Xn(e.display):l-=e.display.viewOffset,r=="page"||r=="window"){var a=e.display.lineSpace.getBoundingClientRect();l+=a.top+(r=="window"?0:Yo(pe(e)));var s=a.left+(r=="window"?0:Xo(pe(e)));n.left+=s,n.right+=s}return n.top+=l,n.bottom+=l,n}function Zo(e,t,n){if(n=="div")return t;var r=t.left,i=t.top;if(n=="page")r-=Xo(pe(e)),i-=Yo(pe(e));else if(n=="local"||!n){var o=e.display.sizer.getBoundingClientRect();r+=o.left,i+=o.top}var l=e.display.lineSpace.getBoundingClientRect();return{left:r-l.left,top:i-l.top}}function Zn(e,t,n,r,i){return r||(r=U(e.doc,t.line)),Yn(e,r,Ko(e,r,t.ch,i),n)}function Bt(e,t,n,r,i,o){r=r||U(e.doc,t.line),i||(i=Kr(e,r));function l(S,N){var z=jt(e,i,S,N?"right":"left",o);return N?z.left=z.right:z.right=z.left,Yn(e,r,z,n)}var a=ke(r,e.doc.direction),s=t.ch,u=t.sticky;if(s>=r.text.length?(s=r.text.length,u="before"):s<=0&&(s=0,u="after"),!a)return l(u=="before"?s-1:s,u=="before");function d(S,N,z){var P=a[N],W=P.level==1;return l(z?S-1:S,W!=z)}var p=nr(a,s,u),m=mr,y=d(s,p,u=="before");return m!=null&&(y.other=d(s,m,u!="before")),y}function Jo(e,t){var n=0;t=fe(e.doc,t),e.options.lineWrapping||(n=qr(e.display)*t.ch);var r=U(e.doc,t.line),i=Qt(r)+Xn(e.display);return{left:n,right:n,top:i,bottom:i+r.height}}function Oi(e,t,n,r,i){var o=k(e,t,n);return o.xRel=i,r&&(o.outside=r),o}function zi(e,t,n){var r=e.doc;if(n+=e.display.viewOffset,n<0)return Oi(r.first,0,null,-1,-1);var i=h(r,n),o=r.first+r.size-1;if(i>o)return Oi(r.first+r.size-1,U(r,o).text.length,null,1,1);t<0&&(t=0);for(var l=U(r,i);;){var a=ts(e,l,i,t,n),s=Da(l,a.ch+(a.xRel>0||a.outside>0?1:0));if(!s)return a;var u=s.find(1);if(u.line==i)return u;l=U(r,i=u.line)}}function Qo(e,t,n,r){r-=Ai(t);var i=t.text.length,o=Ot(function(l){return jt(e,n,l-1).bottom<=r},i,0);return i=Ot(function(l){return jt(e,n,l).top>r},o,i),{begin:o,end:i}}function Vo(e,t,n,r){n||(n=Kr(e,t));var i=Yn(e,t,jt(e,n,r),"line").top;return Qo(e,t,n,i)}function Pi(e,t,n,r){return e.bottom<=n?!1:e.top>n?!0:(r?e.left:e.right)>t}function ts(e,t,n,r,i){i-=Qt(t);var o=Kr(e,t),l=Ai(t),a=0,s=t.text.length,u=!0,d=ke(t,e.doc.direction);if(d){var p=(e.options.lineWrapping?ns:rs)(e,t,n,o,d,r,i);u=p.level!=1,a=u?p.from:p.to-1,s=u?p.to:p.from-1}var m=null,y=null,S=Ot(function(Q){var Z=jt(e,o,Q);return Z.top+=l,Z.bottom+=l,Pi(Z,r,i,!1)?(Z.top<=i&&Z.left<=r&&(m=Q,y=Z),!0):!1},a,s),N,z,P=!1;if(y){var W=r-y.left<y.right-r,E=W==u;S=m+(E?0:1),z=E?"after":"before",N=W?y.left:y.right}else{!u&&(S==s||S==a)&&S++,z=S==0?"after":S==t.text.length?"before":jt(e,o,S-(u?1:0)).bottom+l<=i==u?"after":"before";var B=Bt(e,k(n,S,z),"line",t,o);N=B.left,P=i<B.top?-1:i>=B.bottom?1:0}return S=Tt(t.text,S,1),Oi(n,S,z,P,r-N)}function rs(e,t,n,r,i,o,l){var a=Ot(function(p){var m=i[p],y=m.level!=1;return Pi(Bt(e,k(n,y?m.to:m.from,y?"before":"after"),"line",t,r),o,l,!0)},0,i.length-1),s=i[a];if(a>0){var u=s.level!=1,d=Bt(e,k(n,u?s.from:s.to,u?"after":"before"),"line",t,r);Pi(d,o,l,!0)&&d.top>l&&(s=i[a-1])}return s}function ns(e,t,n,r,i,o,l){var a=Qo(e,t,r,l),s=a.begin,u=a.end;/\s/.test(t.text.charAt(u-1))&&u--;for(var d=null,p=null,m=0;m<i.length;m++){var y=i[m];if(!(y.from>=u||y.to<=s)){var S=y.level!=1,N=jt(e,r,S?Math.min(u,y.to)-1:Math.max(s,y.from)).right,z=N<o?o-N+1e9:N-o;(!d||p>z)&&(d=y,p=z)}}return d||(d=i[i.length-1]),d.from<s&&(d={from:s,to:d.to,level:d.level}),d.to>u&&(d={from:d.from,to:u,level:d.level}),d}var wr;function Ur(e){if(e.cachedTextHeight!=null)return e.cachedTextHeight;if(wr==null){wr=c("pre",null,"CodeMirror-line-like");for(var t=0;t<49;++t)wr.appendChild(document.createTextNode("x")),wr.appendChild(c("br"));wr.appendChild(document.createTextNode("x"))}H(e.measure,wr);var n=wr.offsetHeight/50;return n>3&&(e.cachedTextHeight=n),T(e.measure),n||1}function qr(e){if(e.cachedCharWidth!=null)return e.cachedCharWidth;var t=c("span","xxxxxxxxxx"),n=c("pre",[t],"CodeMirror-line-like");H(e.measure,n);var r=t.getBoundingClientRect(),i=(r.right-r.left)/10;return i>2&&(e.cachedCharWidth=i),i||10}function Ei(e){for(var t=e.display,n={},r={},i=t.gutters.clientLeft,o=t.gutters.firstChild,l=0;o;o=o.nextSibling,++l){var a=e.display.gutterSpecs[l].className;n[a]=o.offsetLeft+o.clientLeft+i,r[a]=o.clientWidth}return{fixedPos:Ii(t),gutterTotalWidth:t.gutters.offsetWidth,gutterLeft:n,gutterWidth:r,wrapperWidth:t.wrapper.clientWidth}}function Ii(e){return e.scroller.getBoundingClientRect().left-e.sizer.getBoundingClientRect().left}function $o(e){var t=Ur(e.display),n=e.options.lineWrapping,r=n&&Math.max(5,e.display.scroller.clientWidth/qr(e.display)-3);return function(i){if(sr(e.doc,i))return 0;var o=0;if(i.widgets)for(var l=0;l<i.widgets.length;l++)i.widgets[l].height&&(o+=i.widgets[l].height);return n?o+(Math.ceil(i.text.length/r)||1)*t:o+t}}function Fi(e){var t=e.doc,n=$o(e);t.iter(function(r){var i=n(r);i!=r.height&&Dt(r,i)})}function kr(e,t,n,r){var i=e.display;if(!n&&ln(t).getAttribute("cm-not-content")=="true")return null;var o,l,a=i.lineSpace.getBoundingClientRect();try{o=t.clientX-a.left,l=t.clientY-a.top}catch{return null}var s=zi(e,o,l),u;if(r&&s.xRel>0&&(u=U(e.doc,s.line).text).length==s.ch){var d=he(u,u.length,e.options.tabSize)-u.length;s=k(s.line,Math.max(0,Math.round((o-Bo(e.display).left)/qr(e.display))-d))}return s}function Sr(e,t){if(t>=e.display.viewTo||(t-=e.display.viewFrom,t<0))return null;for(var n=e.display.view,r=0;r<n.length;r++)if(t-=n[r].size,t<0)return r}function bt(e,t,n,r){t==null&&(t=e.doc.first),n==null&&(n=e.doc.first+e.doc.size),r||(r=0);var i=e.display;if(r&&n<i.viewTo&&(i.updateLineNumbers==null||i.updateLineNumbers>t)&&(i.updateLineNumbers=t),e.curOp.viewChanged=!0,t>=i.viewTo)Jt&&Si(e.doc,t)<i.viewTo&&fr(e);else if(n<=i.viewFrom)Jt&&Ao(e.doc,n+r)>i.viewFrom?fr(e):(i.viewFrom+=r,i.viewTo+=r);else if(t<=i.viewFrom&&n>=i.viewTo)fr(e);else if(t<=i.viewFrom){var o=Jn(e,n,n+r,1);o?(i.view=i.view.slice(o.index),i.viewFrom=o.lineN,i.viewTo+=r):fr(e)}else if(n>=i.viewTo){var l=Jn(e,t,t,-1);l?(i.view=i.view.slice(0,l.index),i.viewTo=l.lineN):fr(e)}else{var a=Jn(e,t,t,-1),s=Jn(e,n,n+r,1);a&&s?(i.view=i.view.slice(0,a.index).concat(jn(e,a.lineN,s.lineN)).concat(i.view.slice(s.index)),i.viewTo+=r):fr(e)}var u=i.externalMeasured;u&&(n<u.lineN?u.lineN+=r:t<u.lineN+u.size&&(i.externalMeasured=null))}function ur(e,t,n){e.curOp.viewChanged=!0;var r=e.display,i=e.display.externalMeasured;if(i&&t>=i.lineN&&t<i.lineN+i.size&&(r.externalMeasured=null),!(t<r.viewFrom||t>=r.viewTo)){var o=r.view[Sr(e,t)];if(o.node!=null){var l=o.changes||(o.changes=[]);q(l,n)==-1&&l.push(n)}}}function fr(e){e.display.viewFrom=e.display.viewTo=e.doc.first,e.display.view=[],e.display.viewOffset=0}function Jn(e,t,n,r){var i=Sr(e,t),o,l=e.display.view;if(!Jt||n==e.doc.first+e.doc.size)return{index:i,lineN:n};for(var a=e.display.viewFrom,s=0;s<i;s++)a+=l[s].size;if(a!=t){if(r>0){if(i==l.length-1)return null;o=a+l[i].size-t,i++}else o=a-t;t+=o,n+=o}for(;Si(e.doc,n)!=n;){if(i==(r<0?0:l.length-1))return null;n+=r*l[i-(r<0?1:0)].size,i+=r}return{index:i,lineN:n}}function is(e,t,n){var r=e.display,i=r.view;i.length==0||t>=r.viewTo||n<=r.viewFrom?(r.view=jn(e,t,n),r.viewFrom=t):(r.viewFrom>t?r.view=jn(e,t,r.viewFrom).concat(r.view):r.viewFrom<t&&(r.view=r.view.slice(Sr(e,t))),r.viewFrom=t,r.viewTo<n?r.view=r.view.concat(jn(e,r.viewTo,n)):r.viewTo>n&&(r.view=r.view.slice(0,Sr(e,n)))),r.viewTo=n}function el(e){for(var t=e.display.view,n=0,r=0;r<t.length;r++){var i=t[r];!i.hidden&&(!i.node||i.changes)&&++n}return n}function gn(e){e.display.input.showSelection(e.display.input.prepareSelection())}function tl(e,t){t===void 0&&(t=!0);var n=e.doc,r={},i=r.cursors=document.createDocumentFragment(),o=r.selection=document.createDocumentFragment(),l=e.options.$customCursor;l&&(t=!0);for(var a=0;a<n.sel.ranges.length;a++)if(!(!t&&a==n.sel.primIndex)){var s=n.sel.ranges[a];if(!(s.from().line>=e.display.viewTo||s.to().line<e.display.viewFrom)){var u=s.empty();if(l){var d=l(e,s);d&&Wi(e,d,i)}else(u||e.options.showCursorWhenSelecting)&&Wi(e,s.head,i);u||os(e,s,o)}}return r}function Wi(e,t,n){var r=Bt(e,t,"div",null,null,!e.options.singleCursorHeightPerLine),i=n.appendChild(c("div"," ","CodeMirror-cursor"));if(i.style.left=r.left+"px",i.style.top=r.top+"px",i.style.height=Math.max(0,r.bottom-r.top)*e.options.cursorHeight+"px",/\bcm-fat-cursor\b/.test(e.getWrapperElement().className)){var o=Zn(e,t,"div",null,null),l=o.right-o.left;i.style.width=(l>0?l:e.defaultCharWidth())+"px"}if(r.other){var a=n.appendChild(c("div"," ","CodeMirror-cursor CodeMirror-secondarycursor"));a.style.display="",a.style.left=r.other.left+"px",a.style.top=r.other.top+"px",a.style.height=(r.other.bottom-r.other.top)*.85+"px"}}function Qn(e,t){return e.top-t.top||e.left-t.left}function os(e,t,n){var r=e.display,i=e.doc,o=document.createDocumentFragment(),l=Bo(e.display),a=l.left,s=Math.max(r.sizerWidth,xr(e)-r.sizer.offsetLeft)-l.right,u=i.direction=="ltr";function d(E,B,Q,Z){B<0&&(B=0),B=Math.round(B),Z=Math.round(Z),o.appendChild(c("div",null,"CodeMirror-selected","position: absolute; left: "+E+`px;
+                             top: `+B+"px; width: "+(Q??s-E)+`px;
+                             height: `+(Z-B)+"px"))}function p(E,B,Q){var Z=U(i,E),ge=Z.text.length,Fe,it;function Ue(Ze,kt){return Zn(e,k(E,Ze),"div",Z,kt)}function Nt(Ze,kt,at){var $e=Vo(e,Z,null,Ze),Je=kt=="ltr"==(at=="after")?"left":"right",Xe=at=="after"?$e.begin:$e.end-(/\s/.test(Z.text.charAt($e.end-1))?2:1);return Ue(Xe,Je)[Je]}var wt=ke(Z,i.direction);return rr(wt,B||0,Q??ge,function(Ze,kt,at,$e){var Je=at=="ltr",Xe=Ue(Ze,Je?"left":"right"),St=Ue(kt-1,Je?"right":"left"),nn=B==null&&Ze==0,gr=Q==null&&kt==ge,dt=$e==0,Xt=!wt||$e==wt.length-1;if(St.top-Xe.top<=3){var ot=(u?nn:gr)&&dt,fo=(u?gr:nn)&&Xt,tr=ot?a:(Je?Xe:St).left,Nr=fo?s:(Je?St:Xe).right;d(tr,Xe.top,Nr-tr,Xe.bottom)}else{var Dr,vt,on,co;Je?(Dr=u&&nn&&dt?a:Xe.left,vt=u?s:Nt(Ze,at,"before"),on=u?a:Nt(kt,at,"after"),co=u&&gr&&Xt?s:St.right):(Dr=u?Nt(Ze,at,"before"):a,vt=!u&&nn&&dt?s:Xe.right,on=!u&&gr&&Xt?a:St.left,co=u?Nt(kt,at,"after"):s),d(Dr,Xe.top,vt-Dr,Xe.bottom),Xe.bottom<St.top&&d(a,Xe.bottom,null,St.top),d(on,St.top,co-on,St.bottom)}(!Fe||Qn(Xe,Fe)<0)&&(Fe=Xe),Qn(St,Fe)<0&&(Fe=St),(!it||Qn(Xe,it)<0)&&(it=Xe),Qn(St,it)<0&&(it=St)}),{start:Fe,end:it}}var m=t.from(),y=t.to();if(m.line==y.line)p(m.line,m.ch,y.ch);else{var S=U(i,m.line),N=U(i,y.line),z=Ht(S)==Ht(N),P=p(m.line,m.ch,z?S.text.length+1:null).end,W=p(y.line,z?0:null,y.ch).start;z&&(P.top<W.top-2?(d(P.right,P.top,null,P.bottom),d(a,W.top,W.left,W.bottom)):d(P.right,P.top,W.left-P.right,P.bottom)),P.bottom<W.top&&d(a,P.bottom,null,W.top)}n.appendChild(o)}function _i(e){if(e.state.focused){var t=e.display;clearInterval(t.blinker);var n=!0;t.cursorDiv.style.visibility="",e.options.cursorBlinkRate>0?t.blinker=setInterval(function(){e.hasFocus()||Gr(e),t.cursorDiv.style.visibility=(n=!n)?"":"hidden"},e.options.cursorBlinkRate):e.options.cursorBlinkRate<0&&(t.cursorDiv.style.visibility="hidden")}}function rl(e){e.hasFocus()||(e.display.input.focus(),e.state.focused||Bi(e))}function Hi(e){e.state.delayingBlurEvent=!0,setTimeout(function(){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1,e.state.focused&&Gr(e))},100)}function Bi(e,t){e.state.delayingBlurEvent&&!e.state.draggingText&&(e.state.delayingBlurEvent=!1),e.options.readOnly!="nocursor"&&(e.state.focused||(qe(e,"focus",e,t),e.state.focused=!0,D(e.display.wrapper,"CodeMirror-focused"),!e.curOp&&e.display.selForContextMenu!=e.doc.sel&&(e.display.input.reset(),_&&setTimeout(function(){return e.display.input.reset(!0)},20)),e.display.input.receivedFocus()),_i(e))}function Gr(e,t){e.state.delayingBlurEvent||(e.state.focused&&(qe(e,"blur",e,t),e.state.focused=!1,me(e.display.wrapper,"CodeMirror-focused")),clearInterval(e.display.blinker),setTimeout(function(){e.state.focused||(e.display.shift=!1)},150))}function Vn(e){for(var t=e.display,n=t.lineDiv.offsetTop,r=Math.max(0,t.scroller.getBoundingClientRect().top),i=t.lineDiv.getBoundingClientRect().top,o=0,l=0;l<t.view.length;l++){var a=t.view[l],s=e.options.lineWrapping,u=void 0,d=0;if(!a.hidden){if(i+=a.line.height,M&&j<8){var p=a.node.offsetTop+a.node.offsetHeight;u=p-n,n=p}else{var m=a.node.getBoundingClientRect();u=m.bottom-m.top,!s&&a.text.firstChild&&(d=a.text.firstChild.getBoundingClientRect().right-m.left-1)}var y=a.line.height-u;if((y>.005||y<-.005)&&(i<r&&(o-=y),Dt(a.line,u),nl(a.line),a.rest))for(var S=0;S<a.rest.length;S++)nl(a.rest[S]);if(d>e.display.sizerWidth){var N=Math.ceil(d/qr(e.display));N>e.display.maxLineLength&&(e.display.maxLineLength=N,e.display.maxLine=a.line,e.display.maxLineChanged=!0)}}}Math.abs(o)>2&&(t.scroller.scrollTop+=o)}function nl(e){if(e.widgets)for(var t=0;t<e.widgets.length;++t){var n=e.widgets[t],r=n.node.parentNode;r&&(n.height=r.offsetHeight)}}function $n(e,t,n){var r=n&&n.top!=null?Math.max(0,n.top):e.scroller.scrollTop;r=Math.floor(r-Xn(e));var i=n&&n.bottom!=null?n.bottom:r+e.wrapper.clientHeight,o=h(t,r),l=h(t,i);if(n&&n.ensure){var a=n.ensure.from.line,s=n.ensure.to.line;a<o?(o=a,l=h(t,Qt(U(t,a))+e.wrapper.clientHeight)):Math.min(s,t.lastLine())>=l&&(o=h(t,Qt(U(t,s))-e.wrapper.clientHeight),l=s)}return{from:o,to:Math.max(l,o+1)}}function ls(e,t){if(!Ge(e,"scrollCursorIntoView")){var n=e.display,r=n.sizer.getBoundingClientRect(),i=null,o=n.wrapper.ownerDocument;if(t.top+r.top<0?i=!0:t.bottom+r.top>(o.defaultView.innerHeight||o.documentElement.clientHeight)&&(i=!1),i!=null&&!Oe){var l=c("div","​",null,`position: absolute;
+                         top: `+(t.top-n.viewOffset-Xn(e.display))+`px;
+                         height: `+(t.bottom-t.top+Gt(e)+n.barHeight)+`px;
+                         left: `+t.left+"px; width: "+Math.max(2,t.right-t.left)+"px;");e.display.lineSpace.appendChild(l),l.scrollIntoView(i),e.display.lineSpace.removeChild(l)}}}function as(e,t,n,r){r==null&&(r=0);var i;!e.options.lineWrapping&&t==n&&(n=t.sticky=="before"?k(t.line,t.ch+1,"before"):t,t=t.ch?k(t.line,t.sticky=="before"?t.ch-1:t.ch,"after"):t);for(var o=0;o<5;o++){var l=!1,a=Bt(e,t),s=!n||n==t?a:Bt(e,n);i={left:Math.min(a.left,s.left),top:Math.min(a.top,s.top)-r,right:Math.max(a.left,s.left),bottom:Math.max(a.bottom,s.bottom)+r};var u=Ri(e,i),d=e.doc.scrollTop,p=e.doc.scrollLeft;if(u.scrollTop!=null&&(mn(e,u.scrollTop),Math.abs(e.doc.scrollTop-d)>1&&(l=!0)),u.scrollLeft!=null&&(Cr(e,u.scrollLeft),Math.abs(e.doc.scrollLeft-p)>1&&(l=!0)),!l)break}return i}function ss(e,t){var n=Ri(e,t);n.scrollTop!=null&&mn(e,n.scrollTop),n.scrollLeft!=null&&Cr(e,n.scrollLeft)}function Ri(e,t){var n=e.display,r=Ur(e.display);t.top<0&&(t.top=0);var i=e.curOp&&e.curOp.scrollTop!=null?e.curOp.scrollTop:n.scroller.scrollTop,o=Ni(e),l={};t.bottom-t.top>o&&(t.bottom=t.top+o);var a=e.doc.height+Mi(n),s=t.top<r,u=t.bottom>a-r;if(t.top<i)l.scrollTop=s?0:t.top;else if(t.bottom>i+o){var d=Math.min(t.top,(u?a:t.bottom)-o);d!=i&&(l.scrollTop=d)}var p=e.options.fixedGutter?0:n.gutters.offsetWidth,m=e.curOp&&e.curOp.scrollLeft!=null?e.curOp.scrollLeft:n.scroller.scrollLeft-p,y=xr(e)-n.gutters.offsetWidth,S=t.right-t.left>y;return S&&(t.right=t.left+y),t.left<10?l.scrollLeft=0:t.left<m?l.scrollLeft=Math.max(0,t.left+p-(S?0:10)):t.right>y+m-3&&(l.scrollLeft=t.right+(S?0:10)-y),l}function Ki(e,t){t!=null&&(ei(e),e.curOp.scrollTop=(e.curOp.scrollTop==null?e.doc.scrollTop:e.curOp.scrollTop)+t)}function jr(e){ei(e);var t=e.getCursor();e.curOp.scrollToPos={from:t,to:t,margin:e.options.cursorScrollMargin}}function yn(e,t,n){(t!=null||n!=null)&&ei(e),t!=null&&(e.curOp.scrollLeft=t),n!=null&&(e.curOp.scrollTop=n)}function us(e,t){ei(e),e.curOp.scrollToPos=t}function ei(e){var t=e.curOp.scrollToPos;if(t){e.curOp.scrollToPos=null;var n=Jo(e,t.from),r=Jo(e,t.to);il(e,n,r,t.margin)}}function il(e,t,n,r){var i=Ri(e,{left:Math.min(t.left,n.left),top:Math.min(t.top,n.top)-r,right:Math.max(t.right,n.right),bottom:Math.max(t.bottom,n.bottom)+r});yn(e,i.scrollLeft,i.scrollTop)}function mn(e,t){Math.abs(e.doc.scrollTop-t)<2||(Se||qi(e,{top:t}),ol(e,t,!0),Se&&qi(e),wn(e,100))}function ol(e,t,n){t=Math.max(0,Math.min(e.display.scroller.scrollHeight-e.display.scroller.clientHeight,t)),!(e.display.scroller.scrollTop==t&&!n)&&(e.doc.scrollTop=t,e.display.scrollbars.setScrollTop(t),e.display.scroller.scrollTop!=t&&(e.display.scroller.scrollTop=t))}function Cr(e,t,n,r){t=Math.max(0,Math.min(t,e.display.scroller.scrollWidth-e.display.scroller.clientWidth)),!((n?t==e.doc.scrollLeft:Math.abs(e.doc.scrollLeft-t)<2)&&!r)&&(e.doc.scrollLeft=t,fl(e),e.display.scroller.scrollLeft!=t&&(e.display.scroller.scrollLeft=t),e.display.scrollbars.setScrollLeft(t))}function bn(e){var t=e.display,n=t.gutters.offsetWidth,r=Math.round(e.doc.height+Mi(e.display));return{clientHeight:t.scroller.clientHeight,viewHeight:t.wrapper.clientHeight,scrollWidth:t.scroller.scrollWidth,clientWidth:t.scroller.clientWidth,viewWidth:t.wrapper.clientWidth,barLeft:e.options.fixedGutter?n:0,docHeight:r,scrollHeight:r+Gt(e)+t.barHeight,nativeBarWidth:t.nativeBarWidth,gutterWidth:n}}var Tr=function(e,t,n){this.cm=n;var r=this.vert=c("div",[c("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),i=this.horiz=c("div",[c("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");r.tabIndex=i.tabIndex=-1,e(r),e(i),J(r,"scroll",function(){r.clientHeight&&t(r.scrollTop,"vertical")}),J(i,"scroll",function(){i.clientWidth&&t(i.scrollLeft,"horizontal")}),this.checkedZeroWidth=!1,M&&j<8&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")};Tr.prototype.update=function(e){var t=e.scrollWidth>e.clientWidth+1,n=e.scrollHeight>e.clientHeight+1,r=e.nativeBarWidth;if(n){this.vert.style.display="block",this.vert.style.bottom=t?r+"px":"0";var i=e.viewHeight-(t?r:0);this.vert.firstChild.style.height=Math.max(0,e.scrollHeight-e.clientHeight+i)+"px"}else this.vert.scrollTop=0,this.vert.style.display="",this.vert.firstChild.style.height="0";if(t){this.horiz.style.display="block",this.horiz.style.right=n?r+"px":"0",this.horiz.style.left=e.barLeft+"px";var o=e.viewWidth-e.barLeft-(n?r:0);this.horiz.firstChild.style.width=Math.max(0,e.scrollWidth-e.clientWidth+o)+"px"}else this.horiz.style.display="",this.horiz.firstChild.style.width="0";return!this.checkedZeroWidth&&e.clientHeight>0&&(r==0&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:n?r:0,bottom:t?r:0}},Tr.prototype.setScrollLeft=function(e){this.horiz.scrollLeft!=e&&(this.horiz.scrollLeft=e),this.disableHoriz&&this.enableZeroWidthBar(this.horiz,this.disableHoriz,"horiz")},Tr.prototype.setScrollTop=function(e){this.vert.scrollTop!=e&&(this.vert.scrollTop=e),this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert,"vert")},Tr.prototype.zeroWidthHack=function(){var e=xe&&!Te?"12px":"18px";this.horiz.style.height=this.vert.style.width=e,this.horiz.style.visibility=this.vert.style.visibility="hidden",this.disableHoriz=new ue,this.disableVert=new ue},Tr.prototype.enableZeroWidthBar=function(e,t,n){e.style.visibility="";function r(){var i=e.getBoundingClientRect(),o=n=="vert"?document.elementFromPoint(i.right-1,(i.top+i.bottom)/2):document.elementFromPoint((i.right+i.left)/2,i.bottom-1);o!=e?e.style.visibility="hidden":t.set(1e3,r)}t.set(1e3,r)},Tr.prototype.clear=function(){var e=this.horiz.parentNode;e.removeChild(this.horiz),e.removeChild(this.vert)};var xn=function(){};xn.prototype.update=function(){return{bottom:0,right:0}},xn.prototype.setScrollLeft=function(){},xn.prototype.setScrollTop=function(){},xn.prototype.clear=function(){};function Xr(e,t){t||(t=bn(e));var n=e.display.barWidth,r=e.display.barHeight;ll(e,t);for(var i=0;i<4&&n!=e.display.barWidth||r!=e.display.barHeight;i++)n!=e.display.barWidth&&e.options.lineWrapping&&Vn(e),ll(e,bn(e)),n=e.display.barWidth,r=e.display.barHeight}function ll(e,t){var n=e.display,r=n.scrollbars.update(t);n.sizer.style.paddingRight=(n.barWidth=r.right)+"px",n.sizer.style.paddingBottom=(n.barHeight=r.bottom)+"px",n.heightForcer.style.borderBottom=r.bottom+"px solid transparent",r.right&&r.bottom?(n.scrollbarFiller.style.display="block",n.scrollbarFiller.style.height=r.bottom+"px",n.scrollbarFiller.style.width=r.right+"px"):n.scrollbarFiller.style.display="",r.bottom&&e.options.coverGutterNextToScrollbar&&e.options.fixedGutter?(n.gutterFiller.style.display="block",n.gutterFiller.style.height=r.bottom+"px",n.gutterFiller.style.width=t.gutterWidth+"px"):n.gutterFiller.style.display=""}var al={native:Tr,null:xn};function sl(e){e.display.scrollbars&&(e.display.scrollbars.clear(),e.display.scrollbars.addClass&&me(e.display.wrapper,e.display.scrollbars.addClass)),e.display.scrollbars=new al[e.options.scrollbarStyle](function(t){e.display.wrapper.insertBefore(t,e.display.scrollbarFiller),J(t,"mousedown",function(){e.state.focused&&setTimeout(function(){return e.display.input.focus()},0)}),t.setAttribute("cm-not-content","true")},function(t,n){n=="horizontal"?Cr(e,t):mn(e,t)},e),e.display.scrollbars.addClass&&D(e.display.wrapper,e.display.scrollbars.addClass)}var fs=0;function Lr(e){e.curOp={cm:e,viewChanged:!1,startHeight:e.doc.height,forceUpdate:!1,updateInput:0,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++fs,markArrays:null},Ra(e.curOp)}function Mr(e){var t=e.curOp;t&&Ua(t,function(n){for(var r=0;r<n.ops.length;r++)n.ops[r].cm.curOp=null;cs(n)})}function cs(e){for(var t=e.ops,n=0;n<t.length;n++)ds(t[n]);for(var r=0;r<t.length;r++)hs(t[r]);for(var i=0;i<t.length;i++)ps(t[i]);for(var o=0;o<t.length;o++)vs(t[o]);for(var l=0;l<t.length;l++)gs(t[l])}function ds(e){var t=e.cm,n=t.display;ms(t),e.updateMaxLine&&Ti(t),e.mustUpdate=e.viewChanged||e.forceUpdate||e.scrollTop!=null||e.scrollToPos&&(e.scrollToPos.from.line<n.viewFrom||e.scrollToPos.to.line>=n.viewTo)||n.maxLineChanged&&t.options.lineWrapping,e.update=e.mustUpdate&&new ti(t,e.mustUpdate&&{top:e.scrollTop,ensure:e.scrollToPos},e.forceUpdate)}function hs(e){e.updatedDisplay=e.mustUpdate&&Ui(e.cm,e.update)}function ps(e){var t=e.cm,n=t.display;e.updatedDisplay&&Vn(t),e.barMeasure=bn(t),n.maxLineChanged&&!t.options.lineWrapping&&(e.adjustWidthTo=Ko(t,n.maxLine,n.maxLine.text.length).left+3,t.display.sizerWidth=e.adjustWidthTo,e.barMeasure.scrollWidth=Math.max(n.scroller.clientWidth,n.sizer.offsetLeft+e.adjustWidthTo+Gt(t)+t.display.barWidth),e.maxScrollLeft=Math.max(0,n.sizer.offsetLeft+e.adjustWidthTo-xr(t))),(e.updatedDisplay||e.selectionChanged)&&(e.preparedSelection=n.input.prepareSelection())}function vs(e){var t=e.cm;e.adjustWidthTo!=null&&(t.display.sizer.style.minWidth=e.adjustWidthTo+"px",e.maxScrollLeft<t.doc.scrollLeft&&Cr(t,Math.min(t.display.scroller.scrollLeft,e.maxScrollLeft),!0),t.display.maxLineChanged=!1);var n=e.focus&&e.focus==g(Re(t));e.preparedSelection&&t.display.input.showSelection(e.preparedSelection,n),(e.updatedDisplay||e.startHeight!=t.doc.height)&&Xr(t,e.barMeasure),e.updatedDisplay&&ji(t,e.barMeasure),e.selectionChanged&&_i(t),t.state.focused&&e.updateInput&&t.display.input.reset(e.typing),n&&rl(e.cm)}function gs(e){var t=e.cm,n=t.display,r=t.doc;if(e.updatedDisplay&&ul(t,e.update),n.wheelStartX!=null&&(e.scrollTop!=null||e.scrollLeft!=null||e.scrollToPos)&&(n.wheelStartX=n.wheelStartY=null),e.scrollTop!=null&&ol(t,e.scrollTop,e.forceScroll),e.scrollLeft!=null&&Cr(t,e.scrollLeft,!0,!0),e.scrollToPos){var i=as(t,fe(r,e.scrollToPos.from),fe(r,e.scrollToPos.to),e.scrollToPos.margin);ls(t,i)}var o=e.maybeHiddenMarkers,l=e.maybeUnhiddenMarkers;if(o)for(var a=0;a<o.length;++a)o[a].lines.length||qe(o[a],"hide");if(l)for(var s=0;s<l.length;++s)l[s].lines.length&&qe(l[s],"unhide");n.wrapper.offsetHeight&&(r.scrollTop=t.display.scroller.scrollTop),e.changeObjs&&qe(t,"changes",t,e.changeObjs),e.update&&e.update.finish()}function Mt(e,t){if(e.curOp)return t();Lr(e);try{return t()}finally{Mr(e)}}function rt(e,t){return function(){if(e.curOp)return t.apply(e,arguments);Lr(e);try{return t.apply(e,arguments)}finally{Mr(e)}}}function pt(e){return function(){if(this.curOp)return e.apply(this,arguments);Lr(this);try{return e.apply(this,arguments)}finally{Mr(this)}}}function nt(e){return function(){var t=this.cm;if(!t||t.curOp)return e.apply(this,arguments);Lr(t);try{return e.apply(this,arguments)}finally{Mr(t)}}}function wn(e,t){e.doc.highlightFrontier<e.display.viewTo&&e.state.highlight.set(t,te(ys,e))}function ys(e){var t=e.doc;if(!(t.highlightFrontier>=e.display.viewTo)){var n=+new Date+e.options.workTime,r=fn(e,t.highlightFrontier),i=[];t.iter(r.line,Math.min(t.first+t.size,e.display.viewTo+500),function(o){if(r.line>=e.display.viewFrom){var l=o.styles,a=o.text.length>e.options.maxHighlightLength?Ut(t.mode,r.state):null,s=go(e,o,r,!0);a&&(r.state=a),o.styles=s.styles;var u=o.styleClasses,d=s.classes;d?o.styleClasses=d:u&&(o.styleClasses=null);for(var p=!l||l.length!=o.styles.length||u!=d&&(!u||!d||u.bgClass!=d.bgClass||u.textClass!=d.textClass),m=0;!p&&m<l.length;++m)p=l[m]!=o.styles[m];p&&i.push(r.line),o.stateAfter=r.save(),r.nextLine()}else o.text.length<=e.options.maxHighlightLength&&bi(e,o.text,r),o.stateAfter=r.line%5==0?r.save():null,r.nextLine();if(+new Date>n)return wn(e,e.options.workDelay),!0}),t.highlightFrontier=r.line,t.modeFrontier=Math.max(t.modeFrontier,r.line),i.length&&Mt(e,function(){for(var o=0;o<i.length;o++)ur(e,i[o],"text")})}}var ti=function(e,t,n){var r=e.display;this.viewport=t,this.visible=$n(r,e.doc,t),this.editorIsHidden=!r.wrapper.offsetWidth,this.wrapperHeight=r.wrapper.clientHeight,this.wrapperWidth=r.wrapper.clientWidth,this.oldDisplayWidth=xr(e),this.force=n,this.dims=Ei(e),this.events=[]};ti.prototype.signal=function(e,t){Lt(e,t)&&this.events.push(arguments)},ti.prototype.finish=function(){for(var e=0;e<this.events.length;e++)qe.apply(null,this.events[e])};function ms(e){var t=e.display;!t.scrollbarsClipped&&t.scroller.offsetWidth&&(t.nativeBarWidth=t.scroller.offsetWidth-t.scroller.clientWidth,t.heightForcer.style.height=Gt(e)+"px",t.sizer.style.marginBottom=-t.nativeBarWidth+"px",t.sizer.style.borderRightWidth=Gt(e)+"px",t.scrollbarsClipped=!0)}function bs(e){if(e.hasFocus())return null;var t=g(Re(e));if(!t||!v(e.display.lineDiv,t))return null;var n={activeElt:t};if(window.getSelection){var r=le(e).getSelection();r.anchorNode&&r.extend&&v(e.display.lineDiv,r.anchorNode)&&(n.anchorNode=r.anchorNode,n.anchorOffset=r.anchorOffset,n.focusNode=r.focusNode,n.focusOffset=r.focusOffset)}return n}function xs(e){if(!(!e||!e.activeElt||e.activeElt==g(ze(e.activeElt)))&&(e.activeElt.focus(),!/^(INPUT|TEXTAREA)$/.test(e.activeElt.nodeName)&&e.anchorNode&&v(document.body,e.anchorNode)&&v(document.body,e.focusNode))){var t=e.activeElt.ownerDocument,n=t.defaultView.getSelection(),r=t.createRange();r.setEnd(e.anchorNode,e.anchorOffset),r.collapse(!1),n.removeAllRanges(),n.addRange(r),n.extend(e.focusNode,e.focusOffset)}}function Ui(e,t){var n=e.display,r=e.doc;if(t.editorIsHidden)return fr(e),!1;if(!t.force&&t.visible.from>=n.viewFrom&&t.visible.to<=n.viewTo&&(n.updateLineNumbers==null||n.updateLineNumbers>=n.viewTo)&&n.renderedView==n.view&&el(e)==0)return!1;cl(e)&&(fr(e),t.dims=Ei(e));var i=r.first+r.size,o=Math.max(t.visible.from-e.options.viewportMargin,r.first),l=Math.min(i,t.visible.to+e.options.viewportMargin);n.viewFrom<o&&o-n.viewFrom<20&&(o=Math.max(r.first,n.viewFrom)),n.viewTo>l&&n.viewTo-l<20&&(l=Math.min(i,n.viewTo)),Jt&&(o=Si(e.doc,o),l=Ao(e.doc,l));var a=o!=n.viewFrom||l!=n.viewTo||n.lastWrapHeight!=t.wrapperHeight||n.lastWrapWidth!=t.wrapperWidth;is(e,o,l),n.viewOffset=Qt(U(e.doc,n.viewFrom)),e.display.mover.style.top=n.viewOffset+"px";var s=el(e);if(!a&&s==0&&!t.force&&n.renderedView==n.view&&(n.updateLineNumbers==null||n.updateLineNumbers>=n.viewTo))return!1;var u=bs(e);return s>4&&(n.lineDiv.style.display="none"),ws(e,n.updateLineNumbers,t.dims),s>4&&(n.lineDiv.style.display=""),n.renderedView=n.view,xs(u),T(n.cursorDiv),T(n.selectionDiv),n.gutters.style.height=n.sizer.style.minHeight=0,a&&(n.lastWrapHeight=t.wrapperHeight,n.lastWrapWidth=t.wrapperWidth,wn(e,400)),n.updateLineNumbers=null,!0}function ul(e,t){for(var n=t.viewport,r=!0;;r=!1){if(!r||!e.options.lineWrapping||t.oldDisplayWidth==xr(e)){if(n&&n.top!=null&&(n={top:Math.min(e.doc.height+Mi(e.display)-Ni(e),n.top)}),t.visible=$n(e.display,e.doc,n),t.visible.from>=e.display.viewFrom&&t.visible.to<=e.display.viewTo)break}else r&&(t.visible=$n(e.display,e.doc,n));if(!Ui(e,t))break;Vn(e);var i=bn(e);gn(e),Xr(e,i),ji(e,i),t.force=!1}t.signal(e,"update",e),(e.display.viewFrom!=e.display.reportedViewFrom||e.display.viewTo!=e.display.reportedViewTo)&&(t.signal(e,"viewportChange",e,e.display.viewFrom,e.display.viewTo),e.display.reportedViewFrom=e.display.viewFrom,e.display.reportedViewTo=e.display.viewTo)}function qi(e,t){var n=new ti(e,t);if(Ui(e,n)){Vn(e),ul(e,n);var r=bn(e);gn(e),Xr(e,r),ji(e,r),n.finish()}}function ws(e,t,n){var r=e.display,i=e.options.lineNumbers,o=r.lineDiv,l=o.firstChild;function a(S){var N=S.nextSibling;return _&&xe&&e.display.currentWheelTarget==S?S.style.display="none":S.parentNode.removeChild(S),N}for(var s=r.view,u=r.viewFrom,d=0;d<s.length;d++){var p=s[d];if(!p.hidden)if(!p.node||p.node.parentNode!=o){var m=Ya(e,p,u,n);o.insertBefore(m,l)}else{for(;l!=p.node;)l=a(l);var y=i&&t!=null&&t<=u&&p.lineNumber;p.changes&&(q(p.changes,"gutter")>-1&&(y=!1),Io(e,p,u,n)),y&&(T(p.lineNumber),p.lineNumber.appendChild(document.createTextNode(O(e.options,u)))),l=p.node.nextSibling}u+=p.size}for(;l;)l=a(l)}function Gi(e){var t=e.gutters.offsetWidth;e.sizer.style.marginLeft=t+"px",tt(e,"gutterChanged",e)}function ji(e,t){e.display.sizer.style.minHeight=t.docHeight+"px",e.display.heightForcer.style.top=t.docHeight+"px",e.display.gutters.style.height=t.docHeight+e.display.barHeight+Gt(e)+"px"}function fl(e){var t=e.display,n=t.view;if(!(!t.alignWidgets&&(!t.gutters.firstChild||!e.options.fixedGutter))){for(var r=Ii(t)-t.scroller.scrollLeft+e.doc.scrollLeft,i=t.gutters.offsetWidth,o=r+"px",l=0;l<n.length;l++)if(!n[l].hidden){e.options.fixedGutter&&(n[l].gutter&&(n[l].gutter.style.left=o),n[l].gutterBackground&&(n[l].gutterBackground.style.left=o));var a=n[l].alignable;if(a)for(var s=0;s<a.length;s++)a[s].style.left=o}e.options.fixedGutter&&(t.gutters.style.left=r+i+"px")}}function cl(e){if(!e.options.lineNumbers)return!1;var t=e.doc,n=O(e.options,t.first+t.size-1),r=e.display;if(n.length!=r.lineNumChars){var i=r.measure.appendChild(c("div",[c("div",n)],"CodeMirror-linenumber CodeMirror-gutter-elt")),o=i.firstChild.offsetWidth,l=i.offsetWidth-o;return r.lineGutter.style.width="",r.lineNumInnerWidth=Math.max(o,r.lineGutter.offsetWidth-l)+1,r.lineNumWidth=r.lineNumInnerWidth+l,r.lineNumChars=r.lineNumInnerWidth?n.length:-1,r.lineGutter.style.width=r.lineNumWidth+"px",Gi(e.display),!0}return!1}function Xi(e,t){for(var n=[],r=!1,i=0;i<e.length;i++){var o=e[i],l=null;if(typeof o!="string"&&(l=o.style,o=o.className),o=="CodeMirror-linenumbers")if(t)r=!0;else continue;n.push({className:o,style:l})}return t&&!r&&n.push({className:"CodeMirror-linenumbers",style:null}),n}function dl(e){var t=e.gutters,n=e.gutterSpecs;T(t),e.lineGutter=null;for(var r=0;r<n.length;++r){var i=n[r],o=i.className,l=i.style,a=t.appendChild(c("div",null,"CodeMirror-gutter "+o));l&&(a.style.cssText=l),o=="CodeMirror-linenumbers"&&(e.lineGutter=a,a.style.width=(e.lineNumWidth||1)+"px")}t.style.display=n.length?"":"none",Gi(e)}function kn(e){dl(e.display),bt(e),fl(e)}function ks(e,t,n,r){var i=this;this.input=n,i.scrollbarFiller=c("div",null,"CodeMirror-scrollbar-filler"),i.scrollbarFiller.setAttribute("cm-not-content","true"),i.gutterFiller=c("div",null,"CodeMirror-gutter-filler"),i.gutterFiller.setAttribute("cm-not-content","true"),i.lineDiv=x("div",null,"CodeMirror-code"),i.selectionDiv=c("div",null,null,"position: relative; z-index: 1"),i.cursorDiv=c("div",null,"CodeMirror-cursors"),i.measure=c("div",null,"CodeMirror-measure"),i.lineMeasure=c("div",null,"CodeMirror-measure"),i.lineSpace=x("div",[i.measure,i.lineMeasure,i.selectionDiv,i.cursorDiv,i.lineDiv],null,"position: relative; outline: none");var o=x("div",[i.lineSpace],"CodeMirror-lines");i.mover=c("div",[o],null,"position: relative"),i.sizer=c("div",[i.mover],"CodeMirror-sizer"),i.sizerWidth=null,i.heightForcer=c("div",null,null,"position: absolute; height: "+Ve+"px; width: 1px;"),i.gutters=c("div",null,"CodeMirror-gutters"),i.lineGutter=null,i.scroller=c("div",[i.sizer,i.heightForcer,i.gutters],"CodeMirror-scroll"),i.scroller.setAttribute("tabIndex","-1"),i.wrapper=c("div",[i.scrollbarFiller,i.gutterFiller,i.scroller],"CodeMirror"),G&&se>=105&&(i.wrapper.style.clipPath="inset(0px)"),i.wrapper.setAttribute("translate","no"),M&&j<8&&(i.gutters.style.zIndex=-1,i.scroller.style.paddingRight=0),!_&&!(Se&&oe)&&(i.scroller.draggable=!0),e&&(e.appendChild?e.appendChild(i.wrapper):e(i.wrapper)),i.viewFrom=i.viewTo=t.first,i.reportedViewFrom=i.reportedViewTo=t.first,i.view=[],i.renderedView=null,i.externalMeasured=null,i.viewOffset=0,i.lastWrapHeight=i.lastWrapWidth=0,i.updateLineNumbers=null,i.nativeBarWidth=i.barHeight=i.barWidth=0,i.scrollbarsClipped=!1,i.lineNumWidth=i.lineNumInnerWidth=i.lineNumChars=null,i.alignWidgets=!1,i.cachedCharWidth=i.cachedTextHeight=i.cachedPaddingH=null,i.maxLine=null,i.maxLineLength=0,i.maxLineChanged=!1,i.wheelDX=i.wheelDY=i.wheelStartX=i.wheelStartY=null,i.shift=!1,i.selForContextMenu=null,i.activeTouch=null,i.gutterSpecs=Xi(r.gutters,r.lineNumbers),dl(i),n.init(i)}var ri=0,$t=null;M?$t=-.53:Se?$t=15:G?$t=-.7:Ie&&($t=-1/3);function hl(e){var t=e.wheelDeltaX,n=e.wheelDeltaY;return t==null&&e.detail&&e.axis==e.HORIZONTAL_AXIS&&(t=e.detail),n==null&&e.detail&&e.axis==e.VERTICAL_AXIS?n=e.detail:n==null&&(n=e.wheelDelta),{x:t,y:n}}function Ss(e){var t=hl(e);return t.x*=$t,t.y*=$t,t}function pl(e,t){G&&se==102&&(e.display.chromeScrollHack==null?e.display.sizer.style.pointerEvents="none":clearTimeout(e.display.chromeScrollHack),e.display.chromeScrollHack=setTimeout(function(){e.display.chromeScrollHack=null,e.display.sizer.style.pointerEvents=""},100));var n=hl(t),r=n.x,i=n.y,o=$t;t.deltaMode===0&&(r=t.deltaX,i=t.deltaY,o=1);var l=e.display,a=l.scroller,s=a.scrollWidth>a.clientWidth,u=a.scrollHeight>a.clientHeight;if(r&&s||i&&u){if(i&&xe&&_){e:for(var d=t.target,p=l.view;d!=a;d=d.parentNode)for(var m=0;m<p.length;m++)if(p[m].node==d){e.display.currentWheelTarget=d;break e}}if(r&&!Se&&!ce&&o!=null){i&&u&&mn(e,Math.max(0,a.scrollTop+i*o)),Cr(e,Math.max(0,a.scrollLeft+r*o)),(!i||i&&u)&&ft(t),l.wheelStartX=null;return}if(i&&o!=null){var y=i*o,S=e.doc.scrollTop,N=S+l.wrapper.clientHeight;y<0?S=Math.max(0,S+y-50):N=Math.min(e.doc.height,N+y+50),qi(e,{top:S,bottom:N})}ri<20&&t.deltaMode!==0&&(l.wheelStartX==null?(l.wheelStartX=a.scrollLeft,l.wheelStartY=a.scrollTop,l.wheelDX=r,l.wheelDY=i,setTimeout(function(){if(l.wheelStartX!=null){var z=a.scrollLeft-l.wheelStartX,P=a.scrollTop-l.wheelStartY,W=P&&l.wheelDY&&P/l.wheelDY||z&&l.wheelDX&&z/l.wheelDX;l.wheelStartX=l.wheelStartY=null,W&&($t=($t*ri+W)/(ri+1),++ri)}},200)):(l.wheelDX+=r,l.wheelDY+=i))}}var At=function(e,t){this.ranges=e,this.primIndex=t};At.prototype.primary=function(){return this.ranges[this.primIndex]},At.prototype.equals=function(e){if(e==this)return!0;if(e.primIndex!=this.primIndex||e.ranges.length!=this.ranges.length)return!1;for(var t=0;t<this.ranges.length;t++){var n=this.ranges[t],r=e.ranges[t];if(!De(n.anchor,r.anchor)||!De(n.head,r.head))return!1}return!0},At.prototype.deepCopy=function(){for(var e=[],t=0;t<this.ranges.length;t++)e[t]=new Ae(et(this.ranges[t].anchor),et(this.ranges[t].head));return new At(e,this.primIndex)},At.prototype.somethingSelected=function(){for(var e=0;e<this.ranges.length;e++)if(!this.ranges[e].empty())return!0;return!1},At.prototype.contains=function(e,t){t||(t=e);for(var n=0;n<this.ranges.length;n++){var r=this.ranges[n];if(I(t,r.from())>=0&&I(e,r.to())<=0)return n}return-1};var Ae=function(e,t){this.anchor=e,this.head=t};Ae.prototype.from=function(){return Hr(this.anchor,this.head)},Ae.prototype.to=function(){return mt(this.anchor,this.head)},Ae.prototype.empty=function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch};function Rt(e,t,n){var r=e&&e.options.selectionsMayTouch,i=t[n];t.sort(function(m,y){return I(m.from(),y.from())}),n=q(t,i);for(var o=1;o<t.length;o++){var l=t[o],a=t[o-1],s=I(a.to(),l.from());if(r&&!l.empty()?s>0:s>=0){var u=Hr(a.from(),l.from()),d=mt(a.to(),l.to()),p=a.empty()?l.from()==l.head:a.from()==a.head;o<=n&&--n,t.splice(--o,2,new Ae(p?d:u,p?u:d))}}return new At(t,n)}function cr(e,t){return new At([new Ae(e,t||e)],0)}function dr(e){return e.text?k(e.from.line+e.text.length-1,re(e.text).length+(e.text.length==1?e.from.ch:0)):e.to}function vl(e,t){if(I(e,t.from)<0)return e;if(I(e,t.to)<=0)return dr(t);var n=e.line+t.text.length-(t.to.line-t.from.line)-1,r=e.ch;return e.line==t.to.line&&(r+=dr(t).ch-t.to.ch),k(n,r)}function Yi(e,t){for(var n=[],r=0;r<e.sel.ranges.length;r++){var i=e.sel.ranges[r];n.push(new Ae(vl(i.anchor,t),vl(i.head,t)))}return Rt(e.cm,n,e.sel.primIndex)}function gl(e,t,n){return e.line==t.line?k(n.line,e.ch-t.ch+n.ch):k(n.line+(e.line-t.line),e.ch)}function Cs(e,t,n){for(var r=[],i=k(e.first,0),o=i,l=0;l<t.length;l++){var a=t[l],s=gl(a.from,i,o),u=gl(dr(a),i,o);if(i=a.to,o=u,n=="around"){var d=e.sel.ranges[l],p=I(d.head,d.anchor)<0;r[l]=new Ae(p?u:s,p?s:u)}else r[l]=new Ae(s,s)}return new At(r,e.sel.primIndex)}function Zi(e){e.doc.mode=Fr(e.options,e.doc.modeOption),Sn(e)}function Sn(e){e.doc.iter(function(t){t.stateAfter&&(t.stateAfter=null),t.styles&&(t.styles=null)}),e.doc.modeFrontier=e.doc.highlightFrontier=e.doc.first,wn(e,100),e.state.modeGen++,e.curOp&&bt(e)}function yl(e,t){return t.from.ch==0&&t.to.ch==0&&re(t.text)==""&&(!e.cm||e.cm.options.wholeLineUpdateBefore)}function Ji(e,t,n,r){function i(W){return n?n[W]:null}function o(W,E,B){za(W,E,B,r),tt(W,"change",W,t)}function l(W,E){for(var B=[],Q=W;Q<E;++Q)B.push(new Br(u[Q],i(Q),r));return B}var a=t.from,s=t.to,u=t.text,d=U(e,a.line),p=U(e,s.line),m=re(u),y=i(u.length-1),S=s.line-a.line;if(t.full)e.insert(0,l(0,u.length)),e.remove(u.length,e.size-u.length);else if(yl(e,t)){var N=l(0,u.length-1);o(p,p.text,y),S&&e.remove(a.line,S),N.length&&e.insert(a.line,N)}else if(d==p)if(u.length==1)o(d,d.text.slice(0,a.ch)+m+d.text.slice(s.ch),y);else{var z=l(1,u.length-1);z.push(new Br(m+d.text.slice(s.ch),y,r)),o(d,d.text.slice(0,a.ch)+u[0],i(0)),e.insert(a.line+1,z)}else if(u.length==1)o(d,d.text.slice(0,a.ch)+u[0]+p.text.slice(s.ch),i(0)),e.remove(a.line+1,S);else{o(d,d.text.slice(0,a.ch)+u[0],i(0)),o(p,m+p.text.slice(s.ch),y);var P=l(1,u.length-1);S>1&&e.remove(a.line+1,S-1),e.insert(a.line+1,P)}tt(e,"change",e,t)}function hr(e,t,n){function r(i,o,l){if(i.linked)for(var a=0;a<i.linked.length;++a){var s=i.linked[a];if(s.doc!=o){var u=l&&s.sharedHist;n&&!u||(t(s.doc,u),r(s.doc,i,u))}}}r(e,null,!0)}function ml(e,t){if(t.cm)throw new Error("This document is already in use.");e.doc=t,t.cm=e,Fi(e),Zi(e),bl(e),e.options.direction=t.direction,e.options.lineWrapping||Ti(e),e.options.mode=t.modeOption,bt(e)}function bl(e){(e.doc.direction=="rtl"?D:me)(e.display.lineDiv,"CodeMirror-rtl")}function Ts(e){Mt(e,function(){bl(e),bt(e)})}function ni(e){this.done=[],this.undone=[],this.undoDepth=e?e.undoDepth:1/0,this.lastModTime=this.lastSelTime=0,this.lastOp=this.lastSelOp=null,this.lastOrigin=this.lastSelOrigin=null,this.generation=this.maxGeneration=e?e.maxGeneration:1}function Qi(e,t){var n={from:et(t.from),to:dr(t),text:Zt(e,t.from,t.to)};return kl(e,n,t.from.line,t.to.line+1),hr(e,function(r){return kl(r,n,t.from.line,t.to.line+1)},!0),n}function xl(e){for(;e.length;){var t=re(e);if(t.ranges)e.pop();else break}}function Ls(e,t){if(t)return xl(e.done),re(e.done);if(e.done.length&&!re(e.done).ranges)return re(e.done);if(e.done.length>1&&!e.done[e.done.length-2].ranges)return e.done.pop(),re(e.done)}function wl(e,t,n,r){var i=e.history;i.undone.length=0;var o=+new Date,l,a;if((i.lastOp==r||i.lastOrigin==t.origin&&t.origin&&(t.origin.charAt(0)=="+"&&i.lastModTime>o-(e.cm?e.cm.options.historyEventDelay:500)||t.origin.charAt(0)=="*"))&&(l=Ls(i,i.lastOp==r)))a=re(l.changes),I(t.from,t.to)==0&&I(t.from,a.to)==0?a.to=dr(t):l.changes.push(Qi(e,t));else{var s=re(i.done);for((!s||!s.ranges)&&ii(e.sel,i.done),l={changes:[Qi(e,t)],generation:i.generation},i.done.push(l);i.done.length>i.undoDepth;)i.done.shift(),i.done[0].ranges||i.done.shift()}i.done.push(n),i.generation=++i.maxGeneration,i.lastModTime=i.lastSelTime=o,i.lastOp=i.lastSelOp=r,i.lastOrigin=i.lastSelOrigin=t.origin,a||qe(e,"historyAdded")}function Ms(e,t,n,r){var i=t.charAt(0);return i=="*"||i=="+"&&n.ranges.length==r.ranges.length&&n.somethingSelected()==r.somethingSelected()&&new Date-e.history.lastSelTime<=(e.cm?e.cm.options.historyEventDelay:500)}function Ns(e,t,n,r){var i=e.history,o=r&&r.origin;n==i.lastSelOp||o&&i.lastSelOrigin==o&&(i.lastModTime==i.lastSelTime&&i.lastOrigin==o||Ms(e,o,re(i.done),t))?i.done[i.done.length-1]=t:ii(t,i.done),i.lastSelTime=+new Date,i.lastSelOrigin=o,i.lastSelOp=n,r&&r.clearRedo!==!1&&xl(i.undone)}function ii(e,t){var n=re(t);n&&n.ranges&&n.equals(e)||t.push(e)}function kl(e,t,n,r){var i=t["spans_"+e.id],o=0;e.iter(Math.max(e.first,n),Math.min(e.first+e.size,r),function(l){l.markedSpans&&((i||(i=t["spans_"+e.id]={}))[o]=l.markedSpans),++o})}function Ds(e){if(!e)return null;for(var t,n=0;n<e.length;++n)e[n].marker.explicitlyCleared?t||(t=e.slice(0,n)):t&&t.push(e[n]);return t?t.length?t:null:e}function As(e,t){var n=t["spans_"+e.id];if(!n)return null;for(var r=[],i=0;i<t.text.length;++i)r.push(Ds(n[i]));return r}function Sl(e,t){var n=As(e,t),r=wi(e,t);if(!n)return r;if(!r)return n;for(var i=0;i<n.length;++i){var o=n[i],l=r[i];if(o&&l)e:for(var a=0;a<l.length;++a){for(var s=l[a],u=0;u<o.length;++u)if(o[u].marker==s.marker)continue e;o.push(s)}else l&&(n[i]=l)}return n}function Yr(e,t,n){for(var r=[],i=0;i<e.length;++i){var o=e[i];if(o.ranges){r.push(n?At.prototype.deepCopy.call(o):o);continue}var l=o.changes,a=[];r.push({changes:a});for(var s=0;s<l.length;++s){var u=l[s],d=void 0;if(a.push({from:u.from,to:u.to,text:u.text}),t)for(var p in u)(d=p.match(/^spans_(\d+)$/))&&q(t,Number(d[1]))>-1&&(re(a)[p]=u[p],delete u[p])}}return r}function Vi(e,t,n,r){if(r){var i=e.anchor;if(n){var o=I(t,i)<0;o!=I(n,i)<0?(i=t,t=n):o!=I(t,n)<0&&(t=n)}return new Ae(i,t)}else return new Ae(n||t,t)}function oi(e,t,n,r,i){i==null&&(i=e.cm&&(e.cm.display.shift||e.extend)),ct(e,new At([Vi(e.sel.primary(),t,n,i)],0),r)}function Cl(e,t,n){for(var r=[],i=e.cm&&(e.cm.display.shift||e.extend),o=0;o<e.sel.ranges.length;o++)r[o]=Vi(e.sel.ranges[o],t[o],null,i);var l=Rt(e.cm,r,e.sel.primIndex);ct(e,l,n)}function $i(e,t,n,r){var i=e.sel.ranges.slice(0);i[t]=n,ct(e,Rt(e.cm,i,e.sel.primIndex),r)}function Tl(e,t,n,r){ct(e,cr(t,n),r)}function Os(e,t,n){var r={ranges:t.ranges,update:function(i){this.ranges=[];for(var o=0;o<i.length;o++)this.ranges[o]=new Ae(fe(e,i[o].anchor),fe(e,i[o].head))},origin:n&&n.origin};return qe(e,"beforeSelectionChange",e,r),e.cm&&qe(e.cm,"beforeSelectionChange",e.cm,r),r.ranges!=t.ranges?Rt(e.cm,r.ranges,r.ranges.length-1):t}function Ll(e,t,n){var r=e.history.done,i=re(r);i&&i.ranges?(r[r.length-1]=t,li(e,t,n)):ct(e,t,n)}function ct(e,t,n){li(e,t,n),Ns(e,e.sel,e.cm?e.cm.curOp.id:NaN,n)}function li(e,t,n){(Lt(e,"beforeSelectionChange")||e.cm&&Lt(e.cm,"beforeSelectionChange"))&&(t=Os(e,t,n));var r=n&&n.bias||(I(t.primary().head,e.sel.primary().head)<0?-1:1);Ml(e,Dl(e,t,r,!0)),!(n&&n.scroll===!1)&&e.cm&&e.cm.getOption("readOnly")!="nocursor"&&jr(e.cm)}function Ml(e,t){t.equals(e.sel)||(e.sel=t,e.cm&&(e.cm.curOp.updateInput=1,e.cm.curOp.selectionChanged=!0,zt(e.cm)),tt(e,"cursorActivity",e))}function Nl(e){Ml(e,Dl(e,e.sel,null,!1))}function Dl(e,t,n,r){for(var i,o=0;o<t.ranges.length;o++){var l=t.ranges[o],a=t.ranges.length==e.sel.ranges.length&&e.sel.ranges[o],s=ai(e,l.anchor,a&&a.anchor,n,r),u=l.head==l.anchor?s:ai(e,l.head,a&&a.head,n,r);(i||s!=l.anchor||u!=l.head)&&(i||(i=t.ranges.slice(0,o)),i[o]=new Ae(s,u))}return i?Rt(e.cm,i,t.primIndex):t}function Zr(e,t,n,r,i){var o=U(e,t.line);if(o.markedSpans)for(var l=0;l<o.markedSpans.length;++l){var a=o.markedSpans[l],s=a.marker,u="selectLeft"in s?!s.selectLeft:s.inclusiveLeft,d="selectRight"in s?!s.selectRight:s.inclusiveRight;if((a.from==null||(u?a.from<=t.ch:a.from<t.ch))&&(a.to==null||(d?a.to>=t.ch:a.to>t.ch))){if(i&&(qe(s,"beforeCursorEnter"),s.explicitlyCleared))if(o.markedSpans){--l;continue}else break;if(!s.atomic)continue;if(n){var p=s.find(r<0?1:-1),m=void 0;if((r<0?d:u)&&(p=Al(e,p,-r,p&&p.line==t.line?o:null)),p&&p.line==t.line&&(m=I(p,n))&&(r<0?m<0:m>0))return Zr(e,p,t,r,i)}var y=s.find(r<0?-1:1);return(r<0?u:d)&&(y=Al(e,y,r,y.line==t.line?o:null)),y?Zr(e,y,t,r,i):null}}return t}function ai(e,t,n,r,i){var o=r||1,l=Zr(e,t,n,o,i)||!i&&Zr(e,t,n,o,!0)||Zr(e,t,n,-o,i)||!i&&Zr(e,t,n,-o,!0);return l||(e.cantEdit=!0,k(e.first,0))}function Al(e,t,n,r){return n<0&&t.ch==0?t.line>e.first?fe(e,k(t.line-1)):null:n>0&&t.ch==(r||U(e,t.line)).text.length?t.line<e.first+e.size-1?k(t.line+1,0):null:new k(t.line,t.ch+n)}function Ol(e){e.setSelection(k(e.firstLine(),0),k(e.lastLine()),st)}function zl(e,t,n){var r={canceled:!1,from:t.from,to:t.to,text:t.text,origin:t.origin,cancel:function(){return r.canceled=!0}};return n&&(r.update=function(i,o,l,a){i&&(r.from=fe(e,i)),o&&(r.to=fe(e,o)),l&&(r.text=l),a!==void 0&&(r.origin=a)}),qe(e,"beforeChange",e,r),e.cm&&qe(e.cm,"beforeChange",e.cm,r),r.canceled?(e.cm&&(e.cm.curOp.updateInput=2),null):{from:r.from,to:r.to,text:r.text,origin:r.origin}}function Jr(e,t,n){if(e.cm){if(!e.cm.curOp)return rt(e.cm,Jr)(e,t,n);if(e.cm.state.suppressEdits)return}if(!((Lt(e,"beforeChange")||e.cm&&Lt(e.cm,"beforeChange"))&&(t=zl(e,t,!0),!t))){var r=So&&!n&&Na(e,t.from,t.to);if(r)for(var i=r.length-1;i>=0;--i)Pl(e,{from:r[i].from,to:r[i].to,text:i?[""]:t.text,origin:t.origin});else Pl(e,t)}}function Pl(e,t){if(!(t.text.length==1&&t.text[0]==""&&I(t.from,t.to)==0)){var n=Yi(e,t);wl(e,t,n,e.cm?e.cm.curOp.id:NaN),Cn(e,t,n,wi(e,t));var r=[];hr(e,function(i,o){!o&&q(r,i.history)==-1&&(Wl(i.history,t),r.push(i.history)),Cn(i,t,null,wi(i,t))})}}function si(e,t,n){var r=e.cm&&e.cm.state.suppressEdits;if(!(r&&!n)){for(var i=e.history,o,l=e.sel,a=t=="undo"?i.done:i.undone,s=t=="undo"?i.undone:i.done,u=0;u<a.length&&(o=a[u],!(n?o.ranges&&!o.equals(e.sel):!o.ranges));u++);if(u!=a.length){for(i.lastOrigin=i.lastSelOrigin=null;;)if(o=a.pop(),o.ranges){if(ii(o,s),n&&!o.equals(e.sel)){ct(e,o,{clearRedo:!1});return}l=o}else if(r){a.push(o);return}else break;var d=[];ii(l,s),s.push({changes:d,generation:i.generation}),i.generation=o.generation||++i.maxGeneration;for(var p=Lt(e,"beforeChange")||e.cm&&Lt(e.cm,"beforeChange"),m=function(N){var z=o.changes[N];if(z.origin=t,p&&!zl(e,z,!1))return a.length=0,{};d.push(Qi(e,z));var P=N?Yi(e,z):re(a);Cn(e,z,P,Sl(e,z)),!N&&e.cm&&e.cm.scrollIntoView({from:z.from,to:dr(z)});var W=[];hr(e,function(E,B){!B&&q(W,E.history)==-1&&(Wl(E.history,z),W.push(E.history)),Cn(E,z,null,Sl(E,z))})},y=o.changes.length-1;y>=0;--y){var S=m(y);if(S)return S.v}}}}function El(e,t){if(t!=0&&(e.first+=t,e.sel=new At(Ne(e.sel.ranges,function(i){return new Ae(k(i.anchor.line+t,i.anchor.ch),k(i.head.line+t,i.head.ch))}),e.sel.primIndex),e.cm)){bt(e.cm,e.first,e.first-t,t);for(var n=e.cm.display,r=n.viewFrom;r<n.viewTo;r++)ur(e.cm,r,"gutter")}}function Cn(e,t,n,r){if(e.cm&&!e.cm.curOp)return rt(e.cm,Cn)(e,t,n,r);if(t.to.line<e.first){El(e,t.text.length-1-(t.to.line-t.from.line));return}if(!(t.from.line>e.lastLine())){if(t.from.line<e.first){var i=t.text.length-1-(e.first-t.from.line);El(e,i),t={from:k(e.first,0),to:k(t.to.line+i,t.to.ch),text:[re(t.text)],origin:t.origin}}var o=e.lastLine();t.to.line>o&&(t={from:t.from,to:k(o,U(e,o).text.length),text:[t.text[0]],origin:t.origin}),t.removed=Zt(e,t.from,t.to),n||(n=Yi(e,t)),e.cm?zs(e.cm,t,r):Ji(e,t,r),li(e,n,st),e.cantEdit&&ai(e,k(e.firstLine(),0))&&(e.cantEdit=!1)}}function zs(e,t,n){var r=e.doc,i=e.display,o=t.from,l=t.to,a=!1,s=o.line;e.options.lineWrapping||(s=f(Ht(U(r,o.line))),r.iter(s,l.line+1,function(y){if(y==i.maxLine)return a=!0,!0})),r.sel.contains(t.from,t.to)>-1&&zt(e),Ji(r,t,n,$o(e)),e.options.lineWrapping||(r.iter(s,o.line+t.text.length,function(y){var S=Gn(y);S>i.maxLineLength&&(i.maxLine=y,i.maxLineLength=S,i.maxLineChanged=!0,a=!1)}),a&&(e.curOp.updateMaxLine=!0)),wa(r,o.line),wn(e,400);var u=t.text.length-(l.line-o.line)-1;t.full?bt(e):o.line==l.line&&t.text.length==1&&!yl(e.doc,t)?ur(e,o.line,"text"):bt(e,o.line,l.line+1,u);var d=Lt(e,"changes"),p=Lt(e,"change");if(p||d){var m={from:o,to:l,text:t.text,removed:t.removed,origin:t.origin};p&&tt(e,"change",e,m),d&&(e.curOp.changeObjs||(e.curOp.changeObjs=[])).push(m)}e.display.selForContextMenu=null}function Qr(e,t,n,r,i){var o;r||(r=n),I(r,n)<0&&(o=[r,n],n=o[0],r=o[1]),typeof t=="string"&&(t=e.splitLines(t)),Jr(e,{from:n,to:r,text:t,origin:i})}function Il(e,t,n,r){n<e.line?e.line+=r:t<e.line&&(e.line=t,e.ch=0)}function Fl(e,t,n,r){for(var i=0;i<e.length;++i){var o=e[i],l=!0;if(o.ranges){o.copied||(o=e[i]=o.deepCopy(),o.copied=!0);for(var a=0;a<o.ranges.length;a++)Il(o.ranges[a].anchor,t,n,r),Il(o.ranges[a].head,t,n,r);continue}for(var s=0;s<o.changes.length;++s){var u=o.changes[s];if(n<u.from.line)u.from=k(u.from.line+r,u.from.ch),u.to=k(u.to.line+r,u.to.ch);else if(t<=u.to.line){l=!1;break}}l||(e.splice(0,i+1),i=0)}}function Wl(e,t){var n=t.from.line,r=t.to.line,i=t.text.length-(r-n)-1;Fl(e.done,n,r,i),Fl(e.undone,n,r,i)}function Tn(e,t,n,r){var i=t,o=t;return typeof t=="number"?o=U(e,po(e,t)):i=f(t),i==null?null:(r(o,i)&&e.cm&&ur(e.cm,i,n),o)}function Ln(e){this.lines=e,this.parent=null;for(var t=0,n=0;n<e.length;++n)e[n].parent=this,t+=e[n].height;this.height=t}Ln.prototype={chunkSize:function(){return this.lines.length},removeInner:function(e,t){for(var n=e,r=e+t;n<r;++n){var i=this.lines[n];this.height-=i.height,Pa(i),tt(i,"delete")}this.lines.splice(e,t)},collapse:function(e){e.push.apply(e,this.lines)},insertInner:function(e,t,n){this.height+=n,this.lines=this.lines.slice(0,e).concat(t).concat(this.lines.slice(e));for(var r=0;r<t.length;++r)t[r].parent=this},iterN:function(e,t,n){for(var r=e+t;e<r;++e)if(n(this.lines[e]))return!0}};function Mn(e){this.children=e;for(var t=0,n=0,r=0;r<e.length;++r){var i=e[r];t+=i.chunkSize(),n+=i.height,i.parent=this}this.size=t,this.height=n,this.parent=null}Mn.prototype={chunkSize:function(){return this.size},removeInner:function(e,t){this.size-=t;for(var n=0;n<this.children.length;++n){var r=this.children[n],i=r.chunkSize();if(e<i){var o=Math.min(t,i-e),l=r.height;if(r.removeInner(e,o),this.height-=l-r.height,i==o&&(this.children.splice(n--,1),r.parent=null),(t-=o)==0)break;e=0}else e-=i}if(this.size-t<25&&(this.children.length>1||!(this.children[0]instanceof Ln))){var a=[];this.collapse(a),this.children=[new Ln(a)],this.children[0].parent=this}},collapse:function(e){for(var t=0;t<this.children.length;++t)this.children[t].collapse(e)},insertInner:function(e,t,n){this.size+=t.length,this.height+=n;for(var r=0;r<this.children.length;++r){var i=this.children[r],o=i.chunkSize();if(e<=o){if(i.insertInner(e,t,n),i.lines&&i.lines.length>50){for(var l=i.lines.length%25+25,a=l;a<i.lines.length;){var s=new Ln(i.lines.slice(a,a+=25));i.height-=s.height,this.children.splice(++r,0,s),s.parent=this}i.lines=i.lines.slice(0,l),this.maybeSpill()}break}e-=o}},maybeSpill:function(){if(!(this.children.length<=10)){var e=this;do{var t=e.children.splice(e.children.length-5,5),n=new Mn(t);if(e.parent){e.size-=n.size,e.height-=n.height;var i=q(e.parent.children,e);e.parent.children.splice(i+1,0,n)}else{var r=new Mn(e.children);r.parent=e,e.children=[r,n],e=r}n.parent=e.parent}while(e.children.length>10);e.parent.maybeSpill()}},iterN:function(e,t,n){for(var r=0;r<this.children.length;++r){var i=this.children[r],o=i.chunkSize();if(e<o){var l=Math.min(t,o-e);if(i.iterN(e,l,n))return!0;if((t-=l)==0)break;e=0}else e-=o}}};var Nn=function(e,t,n){if(n)for(var r in n)n.hasOwnProperty(r)&&(this[r]=n[r]);this.doc=e,this.node=t};Nn.prototype.clear=function(){var e=this.doc.cm,t=this.line.widgets,n=this.line,r=f(n);if(!(r==null||!t)){for(var i=0;i<t.length;++i)t[i]==this&&t.splice(i--,1);t.length||(n.widgets=null);var o=pn(this);Dt(n,Math.max(0,n.height-o)),e&&(Mt(e,function(){_l(e,n,-o),ur(e,r,"widget")}),tt(e,"lineWidgetCleared",e,this,r))}},Nn.prototype.changed=function(){var e=this,t=this.height,n=this.doc.cm,r=this.line;this.height=null;var i=pn(this)-t;i&&(sr(this.doc,r)||Dt(r,r.height+i),n&&Mt(n,function(){n.curOp.forceUpdate=!0,_l(n,r,i),tt(n,"lineWidgetChanged",n,e,f(r))}))},Et(Nn);function _l(e,t,n){Qt(t)<(e.curOp&&e.curOp.scrollTop||e.doc.scrollTop)&&Ki(e,n)}function Ps(e,t,n,r){var i=new Nn(e,n,r),o=e.cm;return o&&i.noHScroll&&(o.display.alignWidgets=!0),Tn(e,t,"widget",function(l){var a=l.widgets||(l.widgets=[]);if(i.insertAt==null?a.push(i):a.splice(Math.min(a.length,Math.max(0,i.insertAt)),0,i),i.line=l,o&&!sr(e,l)){var s=Qt(l)<e.scrollTop;Dt(l,l.height+pn(i)),s&&Ki(o,i.height),o.curOp.forceUpdate=!0}return!0}),o&&tt(o,"lineWidgetAdded",o,i,typeof t=="number"?t:f(t)),i}var Hl=0,pr=function(e,t){this.lines=[],this.type=t,this.doc=e,this.id=++Hl};pr.prototype.clear=function(){if(!this.explicitlyCleared){var e=this.doc.cm,t=e&&!e.curOp;if(t&&Lr(e),Lt(this,"clear")){var n=this.find();n&&tt(this,"clear",n.from,n.to)}for(var r=null,i=null,o=0;o<this.lines.length;++o){var l=this.lines[o],a=cn(l.markedSpans,this);e&&!this.collapsed?ur(e,f(l),"text"):e&&(a.to!=null&&(i=f(l)),a.from!=null&&(r=f(l))),l.markedSpans=Ca(l.markedSpans,a),a.from==null&&this.collapsed&&!sr(this.doc,l)&&e&&Dt(l,Ur(e.display))}if(e&&this.collapsed&&!e.options.lineWrapping)for(var s=0;s<this.lines.length;++s){var u=Ht(this.lines[s]),d=Gn(u);d>e.display.maxLineLength&&(e.display.maxLine=u,e.display.maxLineLength=d,e.display.maxLineChanged=!0)}r!=null&&e&&this.collapsed&&bt(e,r,i+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,e&&Nl(e.doc)),e&&tt(e,"markerCleared",e,this,r,i),t&&Mr(e),this.parent&&this.parent.clear()}},pr.prototype.find=function(e,t){e==null&&this.type=="bookmark"&&(e=1);for(var n,r,i=0;i<this.lines.length;++i){var o=this.lines[i],l=cn(o.markedSpans,this);if(l.from!=null&&(n=k(t?o:f(o),l.from),e==-1))return n;if(l.to!=null&&(r=k(t?o:f(o),l.to),e==1))return r}return n&&{from:n,to:r}},pr.prototype.changed=function(){var e=this,t=this.find(-1,!0),n=this,r=this.doc.cm;!t||!r||Mt(r,function(){var i=t.line,o=f(t.line),l=Di(r,o);if(l&&(Go(l),r.curOp.selectionChanged=r.curOp.forceUpdate=!0),r.curOp.updateMaxLine=!0,!sr(n.doc,i)&&n.height!=null){var a=n.height;n.height=null;var s=pn(n)-a;s&&Dt(i,i.height+s)}tt(r,"markerChanged",r,e)})},pr.prototype.attachLine=function(e){if(!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;(!t.maybeHiddenMarkers||q(t.maybeHiddenMarkers,this)==-1)&&(t.maybeUnhiddenMarkers||(t.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(e)},pr.prototype.detachLine=function(e){if(this.lines.splice(q(this.lines,e),1),!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;(t.maybeHiddenMarkers||(t.maybeHiddenMarkers=[])).push(this)}},Et(pr);function Vr(e,t,n,r,i){if(r&&r.shared)return Es(e,t,n,r,i);if(e.cm&&!e.cm.curOp)return rt(e.cm,Vr)(e,t,n,r,i);var o=new pr(e,i),l=I(t,n);if(r&&de(r,o,!1),l>0||l==0&&o.clearWhenEmpty!==!1)return o;if(o.replacedWith&&(o.collapsed=!0,o.widgetNode=x("span",[o.replacedWith],"CodeMirror-widget"),r.handleMouseEvents||o.widgetNode.setAttribute("cm-ignore-events","true"),r.insertLeft&&(o.widgetNode.insertLeft=!0)),o.collapsed){if(Do(e,t.line,t,n,o)||t.line!=n.line&&Do(e,n.line,t,n,o))throw new Error("Inserting collapsed marker partially overlapping an existing one");Sa()}o.addToHistory&&wl(e,{from:t,to:n,origin:"markText"},e.sel,NaN);var a=t.line,s=e.cm,u;if(e.iter(a,n.line+1,function(p){s&&o.collapsed&&!s.options.lineWrapping&&Ht(p)==s.display.maxLine&&(u=!0),o.collapsed&&a!=t.line&&Dt(p,0),Ta(p,new Rn(o,a==t.line?t.ch:null,a==n.line?n.ch:null),e.cm&&e.cm.curOp),++a}),o.collapsed&&e.iter(t.line,n.line+1,function(p){sr(e,p)&&Dt(p,0)}),o.clearOnEnter&&J(o,"beforeCursorEnter",function(){return o.clear()}),o.readOnly&&(ka(),(e.history.done.length||e.history.undone.length)&&e.clearHistory()),o.collapsed&&(o.id=++Hl,o.atomic=!0),s){if(u&&(s.curOp.updateMaxLine=!0),o.collapsed)bt(s,t.line,n.line+1);else if(o.className||o.startStyle||o.endStyle||o.css||o.attributes||o.title)for(var d=t.line;d<=n.line;d++)ur(s,d,"text");o.atomic&&Nl(s.doc),tt(s,"markerAdded",s,o)}return o}var Dn=function(e,t){this.markers=e,this.primary=t;for(var n=0;n<e.length;++n)e[n].parent=this};Dn.prototype.clear=function(){if(!this.explicitlyCleared){this.explicitlyCleared=!0;for(var e=0;e<this.markers.length;++e)this.markers[e].clear();tt(this,"clear")}},Dn.prototype.find=function(e,t){return this.primary.find(e,t)},Et(Dn);function Es(e,t,n,r,i){r=de(r),r.shared=!1;var o=[Vr(e,t,n,r,i)],l=o[0],a=r.widgetNode;return hr(e,function(s){a&&(r.widgetNode=a.cloneNode(!0)),o.push(Vr(s,fe(s,t),fe(s,n),r,i));for(var u=0;u<s.linked.length;++u)if(s.linked[u].isParent)return;l=re(o)}),new Dn(o,l)}function Bl(e){return e.findMarks(k(e.first,0),e.clipPos(k(e.lastLine())),function(t){return t.parent})}function Is(e,t){for(var n=0;n<t.length;n++){var r=t[n],i=r.find(),o=e.clipPos(i.from),l=e.clipPos(i.to);if(I(o,l)){var a=Vr(e,o,l,r.primary,r.primary.type);r.markers.push(a),a.parent=r}}}function Fs(e){for(var t=function(r){var i=e[r],o=[i.primary.doc];hr(i.primary.doc,function(s){return o.push(s)});for(var l=0;l<i.markers.length;l++){var a=i.markers[l];q(o,a.doc)==-1&&(a.parent=null,i.markers.splice(l--,1))}},n=0;n<e.length;n++)t(n)}var Ws=0,xt=function(e,t,n,r,i){if(!(this instanceof xt))return new xt(e,t,n,r,i);n==null&&(n=0),Mn.call(this,[new Ln([new Br("",null)])]),this.first=n,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.cleanGeneration=1,this.modeFrontier=this.highlightFrontier=n;var o=k(n,0);this.sel=cr(o),this.history=new ni(null),this.id=++Ws,this.modeOption=t,this.lineSep=r,this.direction=i=="rtl"?"rtl":"ltr",this.extend=!1,typeof e=="string"&&(e=this.splitLines(e)),Ji(this,{from:o,to:o,text:e}),ct(this,cr(o),st)};xt.prototype=C(Mn.prototype,{constructor:xt,iter:function(e,t,n){n?this.iterN(e-this.first,t-e,n):this.iterN(this.first,this.first+this.size,e)},insert:function(e,t){for(var n=0,r=0;r<t.length;++r)n+=t[r].height;this.insertInner(e-this.first,t,n)},remove:function(e,t){this.removeInner(e-this.first,t)},getValue:function(e){var t=un(this,this.first,this.first+this.size);return e===!1?t:t.join(e||this.lineSeparator())},setValue:nt(function(e){var t=k(this.first,0),n=this.first+this.size-1;Jr(this,{from:t,to:k(n,U(this,n).text.length),text:this.splitLines(e),origin:"setValue",full:!0},!0),this.cm&&yn(this.cm,0,0),ct(this,cr(t),st)}),replaceRange:function(e,t,n,r){t=fe(this,t),n=n?fe(this,n):t,Qr(this,e,t,n,r)},getRange:function(e,t,n){var r=Zt(this,fe(this,e),fe(this,t));return n===!1?r:n===""?r.join(""):r.join(n||this.lineSeparator())},getLine:function(e){var t=this.getLineHandle(e);return t&&t.text},getLineHandle:function(e){if(L(this,e))return U(this,e)},getLineNumber:function(e){return f(e)},getLineHandleVisualStart:function(e){return typeof e=="number"&&(e=U(this,e)),Ht(e)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(e){return fe(this,e)},getCursor:function(e){var t=this.sel.primary(),n;return e==null||e=="head"?n=t.head:e=="anchor"?n=t.anchor:e=="end"||e=="to"||e===!1?n=t.to():n=t.from(),n},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:nt(function(e,t,n){Tl(this,fe(this,typeof e=="number"?k(e,t||0):e),null,n)}),setSelection:nt(function(e,t,n){Tl(this,fe(this,e),fe(this,t||e),n)}),extendSelection:nt(function(e,t,n){oi(this,fe(this,e),t&&fe(this,t),n)}),extendSelections:nt(function(e,t){Cl(this,vo(this,e),t)}),extendSelectionsBy:nt(function(e,t){var n=Ne(this.sel.ranges,e);Cl(this,vo(this,n),t)}),setSelections:nt(function(e,t,n){if(e.length){for(var r=[],i=0;i<e.length;i++)r[i]=new Ae(fe(this,e[i].anchor),fe(this,e[i].head||e[i].anchor));t==null&&(t=Math.min(e.length-1,this.sel.primIndex)),ct(this,Rt(this.cm,r,t),n)}}),addSelection:nt(function(e,t,n){var r=this.sel.ranges.slice(0);r.push(new Ae(fe(this,e),fe(this,t||e))),ct(this,Rt(this.cm,r,r.length-1),n)}),getSelection:function(e){for(var t=this.sel.ranges,n,r=0;r<t.length;r++){var i=Zt(this,t[r].from(),t[r].to());n=n?n.concat(i):i}return e===!1?n:n.join(e||this.lineSeparator())},getSelections:function(e){for(var t=[],n=this.sel.ranges,r=0;r<n.length;r++){var i=Zt(this,n[r].from(),n[r].to());e!==!1&&(i=i.join(e||this.lineSeparator())),t[r]=i}return t},replaceSelection:function(e,t,n){for(var r=[],i=0;i<this.sel.ranges.length;i++)r[i]=e;this.replaceSelections(r,t,n||"+input")},replaceSelections:nt(function(e,t,n){for(var r=[],i=this.sel,o=0;o<i.ranges.length;o++){var l=i.ranges[o];r[o]={from:l.from(),to:l.to(),text:this.splitLines(e[o]),origin:n}}for(var a=t&&t!="end"&&Cs(this,r,t),s=r.length-1;s>=0;s--)Jr(this,r[s]);a?Ll(this,a):this.cm&&jr(this.cm)}),undo:nt(function(){si(this,"undo")}),redo:nt(function(){si(this,"redo")}),undoSelection:nt(function(){si(this,"undo",!0)}),redoSelection:nt(function(){si(this,"redo",!0)}),setExtending:function(e){this.extend=e},getExtending:function(){return this.extend},historySize:function(){for(var e=this.history,t=0,n=0,r=0;r<e.done.length;r++)e.done[r].ranges||++t;for(var i=0;i<e.undone.length;i++)e.undone[i].ranges||++n;return{undo:t,redo:n}},clearHistory:function(){var e=this;this.history=new ni(this.history),hr(this,function(t){return t.history=e.history},!0)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(e){return e&&(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null),this.history.generation},isClean:function(e){return this.history.generation==(e||this.cleanGeneration)},getHistory:function(){return{done:Yr(this.history.done),undone:Yr(this.history.undone)}},setHistory:function(e){var t=this.history=new ni(this.history);t.done=Yr(e.done.slice(0),null,!0),t.undone=Yr(e.undone.slice(0),null,!0)},setGutterMarker:nt(function(e,t,n){return Tn(this,e,"gutter",function(r){var i=r.gutterMarkers||(r.gutterMarkers={});return i[t]=n,!n&&Y(i)&&(r.gutterMarkers=null),!0})}),clearGutter:nt(function(e){var t=this;this.iter(function(n){n.gutterMarkers&&n.gutterMarkers[e]&&Tn(t,n,"gutter",function(){return n.gutterMarkers[e]=null,Y(n.gutterMarkers)&&(n.gutterMarkers=null),!0})})}),lineInfo:function(e){var t;if(typeof e=="number"){if(!L(this,e)||(t=e,e=U(this,e),!e))return null}else if(t=f(e),t==null)return null;return{line:t,handle:e,text:e.text,gutterMarkers:e.gutterMarkers,textClass:e.textClass,bgClass:e.bgClass,wrapClass:e.wrapClass,widgets:e.widgets}},addLineClass:nt(function(e,t,n){return Tn(this,e,t=="gutter"?"gutter":"class",function(r){var i=t=="text"?"textClass":t=="background"?"bgClass":t=="gutter"?"gutterClass":"wrapClass";if(!r[i])r[i]=n;else{if(X(n).test(r[i]))return!1;r[i]+=" "+n}return!0})}),removeLineClass:nt(function(e,t,n){return Tn(this,e,t=="gutter"?"gutter":"class",function(r){var i=t=="text"?"textClass":t=="background"?"bgClass":t=="gutter"?"gutterClass":"wrapClass",o=r[i];if(o)if(n==null)r[i]=null;else{var l=o.match(X(n));if(!l)return!1;var a=l.index+l[0].length;r[i]=o.slice(0,l.index)+(!l.index||a==o.length?"":" ")+o.slice(a)||null}else return!1;return!0})}),addLineWidget:nt(function(e,t,n){return Ps(this,e,t,n)}),removeLineWidget:function(e){e.clear()},markText:function(e,t,n){return Vr(this,fe(this,e),fe(this,t),n,n&&n.type||"range")},setBookmark:function(e,t){var n={replacedWith:t&&(t.nodeType==null?t.widget:t),insertLeft:t&&t.insertLeft,clearWhenEmpty:!1,shared:t&&t.shared,handleMouseEvents:t&&t.handleMouseEvents};return e=fe(this,e),Vr(this,e,e,n,"bookmark")},findMarksAt:function(e){e=fe(this,e);var t=[],n=U(this,e.line).markedSpans;if(n)for(var r=0;r<n.length;++r){var i=n[r];(i.from==null||i.from<=e.ch)&&(i.to==null||i.to>=e.ch)&&t.push(i.marker.parent||i.marker)}return t},findMarks:function(e,t,n){e=fe(this,e),t=fe(this,t);var r=[],i=e.line;return this.iter(e.line,t.line+1,function(o){var l=o.markedSpans;if(l)for(var a=0;a<l.length;a++){var s=l[a];!(s.to!=null&&i==e.line&&e.ch>=s.to||s.from==null&&i!=e.line||s.from!=null&&i==t.line&&s.from>=t.ch)&&(!n||n(s.marker))&&r.push(s.marker.parent||s.marker)}++i}),r},getAllMarks:function(){var e=[];return this.iter(function(t){var n=t.markedSpans;if(n)for(var r=0;r<n.length;++r)n[r].from!=null&&e.push(n[r].marker)}),e},posFromIndex:function(e){var t,n=this.first,r=this.lineSeparator().length;return this.iter(function(i){var o=i.text.length+r;if(o>e)return t=e,!0;e-=o,++n}),fe(this,k(n,t))},indexFromPos:function(e){e=fe(this,e);var t=e.ch;if(e.line<this.first||e.ch<0)return 0;var n=this.lineSeparator().length;return this.iter(this.first,e.line,function(r){t+=r.text.length+n}),t},copy:function(e){var t=new xt(un(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep,this.direction);return t.scrollTop=this.scrollTop,t.scrollLeft=this.scrollLeft,t.sel=this.sel,t.extend=!1,e&&(t.history.undoDepth=this.history.undoDepth,t.setHistory(this.getHistory())),t},linkedDoc:function(e){e||(e={});var t=this.first,n=this.first+this.size;e.from!=null&&e.from>t&&(t=e.from),e.to!=null&&e.to<n&&(n=e.to);var r=new xt(un(this,t,n),e.mode||this.modeOption,t,this.lineSep,this.direction);return e.sharedHist&&(r.history=this.history),(this.linked||(this.linked=[])).push({doc:r,sharedHist:e.sharedHist}),r.linked=[{doc:this,isParent:!0,sharedHist:e.sharedHist}],Is(r,Bl(this)),r},unlinkDoc:function(e){if(e instanceof Be&&(e=e.doc),this.linked)for(var t=0;t<this.linked.length;++t){var n=this.linked[t];if(n.doc==e){this.linked.splice(t,1),e.unlinkDoc(this),Fs(Bl(this));break}}if(e.history==this.history){var r=[e.id];hr(e,function(i){return r.push(i.id)},!0),e.history=new ni(null),e.history.done=Yr(this.history.done,r),e.history.undone=Yr(this.history.undone,r)}},iterLinkedDocs:function(e){hr(this,e)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(e){return this.lineSep?e.split(this.lineSep):Pt(e)},lineSeparator:function(){return this.lineSep||`
+`},setDirection:nt(function(e){e!="rtl"&&(e="ltr"),e!=this.direction&&(this.direction=e,this.iter(function(t){return t.order=null}),this.cm&&Ts(this.cm))})}),xt.prototype.eachLine=xt.prototype.iter;var Rl=0;function _s(e){var t=this;if(Kl(t),!(Ge(t,e)||Vt(t.display,e))){ft(e),M&&(Rl=+new Date);var n=kr(t,e,!0),r=e.dataTransfer.files;if(!(!n||t.isReadOnly()))if(r&&r.length&&window.FileReader&&window.File)for(var i=r.length,o=Array(i),l=0,a=function(){++l==i&&rt(t,function(){n=fe(t.doc,n);var y={from:n,to:n,text:t.doc.splitLines(o.filter(function(S){return S!=null}).join(t.doc.lineSeparator())),origin:"paste"};Jr(t.doc,y),Ll(t.doc,cr(fe(t.doc,n),fe(t.doc,dr(y))))})()},s=function(y,S){if(t.options.allowDropFileTypes&&q(t.options.allowDropFileTypes,y.type)==-1){a();return}var N=new FileReader;N.onerror=function(){return a()},N.onload=function(){var z=N.result;if(/[\x00-\x08\x0e-\x1f]{2}/.test(z)){a();return}o[S]=z,a()},N.readAsText(y)},u=0;u<r.length;u++)s(r[u],u);else{if(t.state.draggingText&&t.doc.sel.contains(n)>-1){t.state.draggingText(e),setTimeout(function(){return t.display.input.focus()},20);return}try{var d=e.dataTransfer.getData("Text");if(d){var p;if(t.state.draggingText&&!t.state.draggingText.copy&&(p=t.listSelections()),li(t.doc,cr(n,n)),p)for(var m=0;m<p.length;++m)Qr(t.doc,"",p[m].anchor,p[m].head,"drag");t.replaceSelection(d,"around","paste"),t.display.input.focus()}}catch{}}}}function Hs(e,t){if(M&&(!e.state.draggingText||+new Date-Rl<100)){ir(t);return}if(!(Ge(e,t)||Vt(e.display,t))&&(t.dataTransfer.setData("Text",e.getSelection()),t.dataTransfer.effectAllowed="copyMove",t.dataTransfer.setDragImage&&!Ie)){var n=c("img",null,null,"position: fixed; left: 0; top: 0;");n.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",ce&&(n.width=n.height=1,e.display.wrapper.appendChild(n),n._top=n.offsetTop),t.dataTransfer.setDragImage(n,0,0),ce&&n.parentNode.removeChild(n)}}function Bs(e,t){var n=kr(e,t);if(n){var r=document.createDocumentFragment();Wi(e,n,r),e.display.dragCursor||(e.display.dragCursor=c("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),e.display.lineSpace.insertBefore(e.display.dragCursor,e.display.cursorDiv)),H(e.display.dragCursor,r)}}function Kl(e){e.display.dragCursor&&(e.display.lineSpace.removeChild(e.display.dragCursor),e.display.dragCursor=null)}function Ul(e){if(document.getElementsByClassName){for(var t=document.getElementsByClassName("CodeMirror"),n=[],r=0;r<t.length;r++){var i=t[r].CodeMirror;i&&n.push(i)}n.length&&n[0].operation(function(){for(var o=0;o<n.length;o++)e(n[o])})}}var ql=!1;function Rs(){ql||(Ks(),ql=!0)}function Ks(){var e;J(window,"resize",function(){e==null&&(e=setTimeout(function(){e=null,Ul(Us)},100))}),J(window,"blur",function(){return Ul(Gr)})}function Us(e){var t=e.display;t.cachedCharWidth=t.cachedTextHeight=t.cachedPaddingH=null,t.scrollbarsClipped=!1,e.setSize()}for(var vr={3:"Pause",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"=",109:"-",110:".",111:"/",145:"ScrollLock",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",224:"Mod",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"},An=0;An<10;An++)vr[An+48]=vr[An+96]=String(An);for(var ui=65;ui<=90;ui++)vr[ui]=String.fromCharCode(ui);for(var On=1;On<=12;On++)vr[On+111]=vr[On+63235]="F"+On;var er={};er.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},er.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},er.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},er.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]},er.default=xe?er.macDefault:er.pcDefault;function qs(e){var t=e.split(/-(?!$)/);e=t[t.length-1];for(var n,r,i,o,l=0;l<t.length-1;l++){var a=t[l];if(/^(cmd|meta|m)$/i.test(a))o=!0;else if(/^a(lt)?$/i.test(a))n=!0;else if(/^(c|ctrl|control)$/i.test(a))r=!0;else if(/^s(hift)?$/i.test(a))i=!0;else throw new Error("Unrecognized modifier name: "+a)}return n&&(e="Alt-"+e),r&&(e="Ctrl-"+e),o&&(e="Cmd-"+e),i&&(e="Shift-"+e),e}function Gs(e){var t={};for(var n in e)if(e.hasOwnProperty(n)){var r=e[n];if(/^(name|fallthrough|(de|at)tach)$/.test(n))continue;if(r=="..."){delete e[n];continue}for(var i=Ne(n.split(" "),qs),o=0;o<i.length;o++){var l=void 0,a=void 0;o==i.length-1?(a=i.join(" "),l=r):(a=i.slice(0,o+1).join(" "),l="...");var s=t[a];if(!s)t[a]=l;else if(s!=l)throw new Error("Inconsistent bindings for "+a)}delete e[n]}for(var u in t)e[u]=t[u];return e}function $r(e,t,n,r){t=fi(t);var i=t.call?t.call(e,r):t[e];if(i===!1)return"nothing";if(i==="...")return"multi";if(i!=null&&n(i))return"handled";if(t.fallthrough){if(Object.prototype.toString.call(t.fallthrough)!="[object Array]")return $r(e,t.fallthrough,n,r);for(var o=0;o<t.fallthrough.length;o++){var l=$r(e,t.fallthrough[o],n,r);if(l)return l}}}function Gl(e){var t=typeof e=="string"?e:vr[e.keyCode];return t=="Ctrl"||t=="Alt"||t=="Shift"||t=="Mod"}function jl(e,t,n){var r=e;return t.altKey&&r!="Alt"&&(e="Alt-"+e),(He?t.metaKey:t.ctrlKey)&&r!="Ctrl"&&(e="Ctrl-"+e),(He?t.ctrlKey:t.metaKey)&&r!="Mod"&&(e="Cmd-"+e),!n&&t.shiftKey&&r!="Shift"&&(e="Shift-"+e),e}function Xl(e,t){if(ce&&e.keyCode==34&&e.char)return!1;var n=vr[e.keyCode];return n==null||e.altGraphKey?!1:(e.keyCode==3&&e.code&&(n=e.code),jl(n,e,t))}function fi(e){return typeof e=="string"?er[e]:e}function en(e,t){for(var n=e.doc.sel.ranges,r=[],i=0;i<n.length;i++){for(var o=t(n[i]);r.length&&I(o.from,re(r).to)<=0;){var l=r.pop();if(I(l.from,o.from)<0){o.from=l.from;break}}r.push(o)}Mt(e,function(){for(var a=r.length-1;a>=0;a--)Qr(e.doc,"",r[a].from,r[a].to,"+delete");jr(e)})}function eo(e,t,n){var r=Tt(e.text,t+n,n);return r<0||r>e.text.length?null:r}function to(e,t,n){var r=eo(e,t.ch,n);return r==null?null:new k(t.line,r,n<0?"after":"before")}function ro(e,t,n,r,i){if(e){t.doc.direction=="rtl"&&(i=-i);var o=ke(n,t.doc.direction);if(o){var l=i<0?re(o):o[0],a=i<0==(l.level==1),s=a?"after":"before",u;if(l.level>0||t.doc.direction=="rtl"){var d=Kr(t,n);u=i<0?n.text.length-1:0;var p=jt(t,d,u).top;u=Ot(function(m){return jt(t,d,m).top==p},i<0==(l.level==1)?l.from:l.to-1,u),s=="before"&&(u=eo(n,u,1))}else u=i<0?l.to:l.from;return new k(r,u,s)}}return new k(r,i<0?n.text.length:0,i<0?"before":"after")}function js(e,t,n,r){var i=ke(t,e.doc.direction);if(!i)return to(t,n,r);n.ch>=t.text.length?(n.ch=t.text.length,n.sticky="before"):n.ch<=0&&(n.ch=0,n.sticky="after");var o=nr(i,n.ch,n.sticky),l=i[o];if(e.doc.direction=="ltr"&&l.level%2==0&&(r>0?l.to>n.ch:l.from<n.ch))return to(t,n,r);var a=function(P,W){return eo(t,P instanceof k?P.ch:P,W)},s,u=function(P){return e.options.lineWrapping?(s=s||Kr(e,t),Vo(e,t,s,P)):{begin:0,end:t.text.length}},d=u(n.sticky=="before"?a(n,-1):n.ch);if(e.doc.direction=="rtl"||l.level==1){var p=l.level==1==r<0,m=a(n,p?1:-1);if(m!=null&&(p?m<=l.to&&m<=d.end:m>=l.from&&m>=d.begin)){var y=p?"before":"after";return new k(n.line,m,y)}}var S=function(P,W,E){for(var B=function(Fe,it){return it?new k(n.line,a(Fe,1),"before"):new k(n.line,Fe,"after")};P>=0&&P<i.length;P+=W){var Q=i[P],Z=W>0==(Q.level!=1),ge=Z?E.begin:a(E.end,-1);if(Q.from<=ge&&ge<Q.to||(ge=Z?Q.from:a(Q.to,-1),E.begin<=ge&&ge<E.end))return B(ge,Z)}},N=S(o+r,r,d);if(N)return N;var z=r>0?d.end:a(d.begin,-1);return z!=null&&!(r>0&&z==t.text.length)&&(N=S(r>0?0:i.length-1,r,u(z)),N)?N:null}var zn={selectAll:Ol,singleSelection:function(e){return e.setSelection(e.getCursor("anchor"),e.getCursor("head"),st)},killLine:function(e){return en(e,function(t){if(t.empty()){var n=U(e.doc,t.head.line).text.length;return t.head.ch==n&&t.head.line<e.lastLine()?{from:t.head,to:k(t.head.line+1,0)}:{from:t.head,to:k(t.head.line,n)}}else return{from:t.from(),to:t.to()}})},deleteLine:function(e){return en(e,function(t){return{from:k(t.from().line,0),to:fe(e.doc,k(t.to().line+1,0))}})},delLineLeft:function(e){return en(e,function(t){return{from:k(t.from().line,0),to:t.from()}})},delWrappedLineLeft:function(e){return en(e,function(t){var n=e.charCoords(t.head,"div").top+5,r=e.coordsChar({left:0,top:n},"div");return{from:r,to:t.from()}})},delWrappedLineRight:function(e){return en(e,function(t){var n=e.charCoords(t.head,"div").top+5,r=e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:n},"div");return{from:t.from(),to:r}})},undo:function(e){return e.undo()},redo:function(e){return e.redo()},undoSelection:function(e){return e.undoSelection()},redoSelection:function(e){return e.redoSelection()},goDocStart:function(e){return e.extendSelection(k(e.firstLine(),0))},goDocEnd:function(e){return e.extendSelection(k(e.lastLine()))},goLineStart:function(e){return e.extendSelectionsBy(function(t){return Yl(e,t.head.line)},{origin:"+move",bias:1})},goLineStartSmart:function(e){return e.extendSelectionsBy(function(t){return Zl(e,t.head)},{origin:"+move",bias:1})},goLineEnd:function(e){return e.extendSelectionsBy(function(t){return Xs(e,t.head.line)},{origin:"+move",bias:-1})},goLineRight:function(e){return e.extendSelectionsBy(function(t){var n=e.cursorCoords(t.head,"div").top+5;return e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:n},"div")},Le)},goLineLeft:function(e){return e.extendSelectionsBy(function(t){var n=e.cursorCoords(t.head,"div").top+5;return e.coordsChar({left:0,top:n},"div")},Le)},goLineLeftSmart:function(e){return e.extendSelectionsBy(function(t){var n=e.cursorCoords(t.head,"div").top+5,r=e.coordsChar({left:0,top:n},"div");return r.ch<e.getLine(r.line).search(/\S/)?Zl(e,t.head):r},Le)},goLineUp:function(e){return e.moveV(-1,"line")},goLineDown:function(e){return e.moveV(1,"line")},goPageUp:function(e){return e.moveV(-1,"page")},goPageDown:function(e){return e.moveV(1,"page")},goCharLeft:function(e){return e.moveH(-1,"char")},goCharRight:function(e){return e.moveH(1,"char")},goColumnLeft:function(e){return e.moveH(-1,"column")},goColumnRight:function(e){return e.moveH(1,"column")},goWordLeft:function(e){return e.moveH(-1,"word")},goGroupRight:function(e){return e.moveH(1,"group")},goGroupLeft:function(e){return e.moveH(-1,"group")},goWordRight:function(e){return e.moveH(1,"word")},delCharBefore:function(e){return e.deleteH(-1,"codepoint")},delCharAfter:function(e){return e.deleteH(1,"char")},delWordBefore:function(e){return e.deleteH(-1,"word")},delWordAfter:function(e){return e.deleteH(1,"word")},delGroupBefore:function(e){return e.deleteH(-1,"group")},delGroupAfter:function(e){return e.deleteH(1,"group")},indentAuto:function(e){return e.indentSelection("smart")},indentMore:function(e){return e.indentSelection("add")},indentLess:function(e){return e.indentSelection("subtract")},insertTab:function(e){return e.replaceSelection("	")},insertSoftTab:function(e){for(var t=[],n=e.listSelections(),r=e.options.tabSize,i=0;i<n.length;i++){var o=n[i].from(),l=he(e.getLine(o.line),o.ch,r);t.push(ht(r-l%r))}e.replaceSelections(t)},defaultTab:function(e){e.somethingSelected()?e.indentSelection("add"):e.execCommand("insertTab")},transposeChars:function(e){return Mt(e,function(){for(var t=e.listSelections(),n=[],r=0;r<t.length;r++)if(t[r].empty()){var i=t[r].head,o=U(e.doc,i.line).text;if(o){if(i.ch==o.length&&(i=new k(i.line,i.ch-1)),i.ch>0)i=new k(i.line,i.ch+1),e.replaceRange(o.charAt(i.ch-1)+o.charAt(i.ch-2),k(i.line,i.ch-2),i,"+transpose");else if(i.line>e.doc.first){var l=U(e.doc,i.line-1).text;l&&(i=new k(i.line,1),e.replaceRange(o.charAt(0)+e.doc.lineSeparator()+l.charAt(l.length-1),k(i.line-1,l.length-1),i,"+transpose"))}}n.push(new Ae(i,i))}e.setSelections(n)})},newlineAndIndent:function(e){return Mt(e,function(){for(var t=e.listSelections(),n=t.length-1;n>=0;n--)e.replaceRange(e.doc.lineSeparator(),t[n].anchor,t[n].head,"+input");t=e.listSelections();for(var r=0;r<t.length;r++)e.indentLine(t[r].from().line,null,!0);jr(e)})},openLine:function(e){return e.replaceSelection(`
+`,"start")},toggleOverwrite:function(e){return e.toggleOverwrite()}};function Yl(e,t){var n=U(e.doc,t),r=Ht(n);return r!=n&&(t=f(r)),ro(!0,e,r,t,1)}function Xs(e,t){var n=U(e.doc,t),r=Aa(n);return r!=n&&(t=f(r)),ro(!0,e,n,t,-1)}function Zl(e,t){var n=Yl(e,t.line),r=U(e.doc,n.line),i=ke(r,e.doc.direction);if(!i||i[0].level==0){var o=Math.max(n.ch,r.text.search(/\S/)),l=t.line==n.line&&t.ch<=o&&t.ch;return k(n.line,l?0:o,n.sticky)}return n}function ci(e,t,n){if(typeof t=="string"&&(t=zn[t],!t))return!1;e.display.input.ensurePolled();var r=e.display.shift,i=!1;try{e.isReadOnly()&&(e.state.suppressEdits=!0),n&&(e.display.shift=!1),i=t(e)!=Ct}finally{e.display.shift=r,e.state.suppressEdits=!1}return i}function Ys(e,t,n){for(var r=0;r<e.state.keyMaps.length;r++){var i=$r(t,e.state.keyMaps[r],n,e);if(i)return i}return e.options.extraKeys&&$r(t,e.options.extraKeys,n,e)||$r(t,e.options.keyMap,n,e)}var Zs=new ue;function Pn(e,t,n,r){var i=e.state.keySeq;if(i){if(Gl(t))return"handled";if(/\'$/.test(t)?e.state.keySeq=null:Zs.set(50,function(){e.state.keySeq==i&&(e.state.keySeq=null,e.display.input.reset())}),Jl(e,i+" "+t,n,r))return!0}return Jl(e,t,n,r)}function Jl(e,t,n,r){var i=Ys(e,t,r);return i=="multi"&&(e.state.keySeq=t),i=="handled"&&tt(e,"keyHandled",e,t,n),(i=="handled"||i=="multi")&&(ft(n),_i(e)),!!i}function Ql(e,t){var n=Xl(t,!0);return n?t.shiftKey&&!e.state.keySeq?Pn(e,"Shift-"+n,t,function(r){return ci(e,r,!0)})||Pn(e,n,t,function(r){if(typeof r=="string"?/^go[A-Z]/.test(r):r.motion)return ci(e,r)}):Pn(e,n,t,function(r){return ci(e,r)}):!1}function Js(e,t,n){return Pn(e,"'"+n+"'",t,function(r){return ci(e,r,!0)})}var no=null;function Vl(e){var t=this;if(!(e.target&&e.target!=t.display.input.getField())&&(t.curOp.focus=g(Re(t)),!Ge(t,e))){M&&j<11&&e.keyCode==27&&(e.returnValue=!1);var n=e.keyCode;t.display.shift=n==16||e.shiftKey;var r=Ql(t,e);ce&&(no=r?n:null,!r&&n==88&&!Hn&&(xe?e.metaKey:e.ctrlKey)&&t.replaceSelection("",null,"cut")),Se&&!xe&&!r&&n==46&&e.shiftKey&&!e.ctrlKey&&document.execCommand&&document.execCommand("cut"),n==18&&!/\bCodeMirror-crosshair\b/.test(t.display.lineDiv.className)&&Qs(t)}}function Qs(e){var t=e.display.lineDiv;D(t,"CodeMirror-crosshair");function n(r){(r.keyCode==18||!r.altKey)&&(me(t,"CodeMirror-crosshair"),ut(document,"keyup",n),ut(document,"mouseover",n))}J(document,"keyup",n),J(document,"mouseover",n)}function $l(e){e.keyCode==16&&(this.doc.sel.shift=!1),Ge(this,e)}function ea(e){var t=this;if(!(e.target&&e.target!=t.display.input.getField())&&!(Vt(t.display,e)||Ge(t,e)||e.ctrlKey&&!e.altKey||xe&&e.metaKey)){var n=e.keyCode,r=e.charCode;if(ce&&n==no){no=null,ft(e);return}if(!(ce&&(!e.which||e.which<10)&&Ql(t,e))){var i=String.fromCharCode(r??n);i!="\b"&&(Js(t,e,i)||t.display.input.onKeyPress(e))}}}var Vs=400,io=function(e,t,n){this.time=e,this.pos=t,this.button=n};io.prototype.compare=function(e,t,n){return this.time+Vs>e&&I(t,this.pos)==0&&n==this.button};var En,In;function $s(e,t){var n=+new Date;return In&&In.compare(n,e,t)?(En=In=null,"triple"):En&&En.compare(n,e,t)?(In=new io(n,e,t),En=null,"double"):(En=new io(n,e,t),In=null,"single")}function ta(e){var t=this,n=t.display;if(!(Ge(t,e)||n.activeTouch&&n.input.supportsTouch())){if(n.input.ensurePolled(),n.shift=e.shiftKey,Vt(n,e)){_||(n.scroller.draggable=!1,setTimeout(function(){return n.scroller.draggable=!0},100));return}if(!oo(t,e)){var r=kr(t,e),i=It(e),o=r?$s(r,i):"single";le(t).focus(),i==1&&t.state.selectingText&&t.state.selectingText(e),!(r&&eu(t,i,r,o,e))&&(i==1?r?ru(t,r,o,e):ln(e)==n.scroller&&ft(e):i==2?(r&&oi(t.doc,r),setTimeout(function(){return n.input.focus()},20)):i==3&&(ee?t.display.input.onContextMenu(e):Hi(t)))}}}function eu(e,t,n,r,i){var o="Click";return r=="double"?o="Double"+o:r=="triple"&&(o="Triple"+o),o=(t==1?"Left":t==2?"Middle":"Right")+o,Pn(e,jl(o,i),i,function(l){if(typeof l=="string"&&(l=zn[l]),!l)return!1;var a=!1;try{e.isReadOnly()&&(e.state.suppressEdits=!0),a=l(e,n)!=Ct}finally{e.state.suppressEdits=!1}return a})}function tu(e,t,n){var r=e.getOption("configureMouse"),i=r?r(e,t,n):{};if(i.unit==null){var o=_e?n.shiftKey&&n.metaKey:n.altKey;i.unit=o?"rectangle":t=="single"?"char":t=="double"?"word":"line"}return(i.extend==null||e.doc.extend)&&(i.extend=e.doc.extend||n.shiftKey),i.addNew==null&&(i.addNew=xe?n.metaKey:n.ctrlKey),i.moveOnDrag==null&&(i.moveOnDrag=!(xe?n.altKey:n.ctrlKey)),i}function ru(e,t,n,r){M?setTimeout(te(rl,e),0):e.curOp.focus=g(Re(e));var i=tu(e,n,r),o=e.doc.sel,l;e.options.dragDrop&&yi&&!e.isReadOnly()&&n=="single"&&(l=o.contains(t))>-1&&(I((l=o.ranges[l]).from(),t)<0||t.xRel>0)&&(I(l.to(),t)>0||t.xRel<0)?nu(e,r,t,i):iu(e,r,t,i)}function nu(e,t,n,r){var i=e.display,o=!1,l=rt(e,function(u){_&&(i.scroller.draggable=!1),e.state.draggingText=!1,e.state.delayingBlurEvent&&(e.hasFocus()?e.state.delayingBlurEvent=!1:Hi(e)),ut(i.wrapper.ownerDocument,"mouseup",l),ut(i.wrapper.ownerDocument,"mousemove",a),ut(i.scroller,"dragstart",s),ut(i.scroller,"drop",l),o||(ft(u),r.addNew||oi(e.doc,n,null,null,r.extend),_&&!Ie||M&&j==9?setTimeout(function(){i.wrapper.ownerDocument.body.focus({preventScroll:!0}),i.input.focus()},20):i.input.focus())}),a=function(u){o=o||Math.abs(t.clientX-u.clientX)+Math.abs(t.clientY-u.clientY)>=10},s=function(){return o=!0};_&&(i.scroller.draggable=!0),e.state.draggingText=l,l.copy=!r.moveOnDrag,J(i.wrapper.ownerDocument,"mouseup",l),J(i.wrapper.ownerDocument,"mousemove",a),J(i.scroller,"dragstart",s),J(i.scroller,"drop",l),e.state.delayingBlurEvent=!0,setTimeout(function(){return i.input.focus()},20),i.scroller.dragDrop&&i.scroller.dragDrop()}function ra(e,t,n){if(n=="char")return new Ae(t,t);if(n=="word")return e.findWordAt(t);if(n=="line")return new Ae(k(t.line,0),fe(e.doc,k(t.line+1,0)));var r=n(e,t);return new Ae(r.from,r.to)}function iu(e,t,n,r){M&&Hi(e);var i=e.display,o=e.doc;ft(t);var l,a,s=o.sel,u=s.ranges;if(r.addNew&&!r.extend?(a=o.sel.contains(n),a>-1?l=u[a]:l=new Ae(n,n)):(l=o.sel.primary(),a=o.sel.primIndex),r.unit=="rectangle")r.addNew||(l=new Ae(n,n)),n=kr(e,t,!0,!0),a=-1;else{var d=ra(e,n,r.unit);r.extend?l=Vi(l,d.anchor,d.head,r.extend):l=d}r.addNew?a==-1?(a=u.length,ct(o,Rt(e,u.concat([l]),a),{scroll:!1,origin:"*mouse"})):u.length>1&&u[a].empty()&&r.unit=="char"&&!r.extend?(ct(o,Rt(e,u.slice(0,a).concat(u.slice(a+1)),0),{scroll:!1,origin:"*mouse"}),s=o.sel):$i(o,a,l,gt):(a=0,ct(o,new At([l],0),gt),s=o.sel);var p=n;function m(E){if(I(p,E)!=0)if(p=E,r.unit=="rectangle"){for(var B=[],Q=e.options.tabSize,Z=he(U(o,n.line).text,n.ch,Q),ge=he(U(o,E.line).text,E.ch,Q),Fe=Math.min(Z,ge),it=Math.max(Z,ge),Ue=Math.min(n.line,E.line),Nt=Math.min(e.lastLine(),Math.max(n.line,E.line));Ue<=Nt;Ue++){var wt=U(o,Ue).text,Ze=Ke(wt,Fe,Q);Fe==it?B.push(new Ae(k(Ue,Ze),k(Ue,Ze))):wt.length>Ze&&B.push(new Ae(k(Ue,Ze),k(Ue,Ke(wt,it,Q))))}B.length||B.push(new Ae(n,n)),ct(o,Rt(e,s.ranges.slice(0,a).concat(B),a),{origin:"*mouse",scroll:!1}),e.scrollIntoView(E)}else{var kt=l,at=ra(e,E,r.unit),$e=kt.anchor,Je;I(at.anchor,$e)>0?(Je=at.head,$e=Hr(kt.from(),at.anchor)):(Je=at.anchor,$e=mt(kt.to(),at.head));var Xe=s.ranges.slice(0);Xe[a]=ou(e,new Ae(fe(o,$e),Je)),ct(o,Rt(e,Xe,a),gt)}}var y=i.wrapper.getBoundingClientRect(),S=0;function N(E){var B=++S,Q=kr(e,E,!0,r.unit=="rectangle");if(Q)if(I(Q,p)!=0){e.curOp.focus=g(Re(e)),m(Q);var Z=$n(i,o);(Q.line>=Z.to||Q.line<Z.from)&&setTimeout(rt(e,function(){S==B&&N(E)}),150)}else{var ge=E.clientY<y.top?-20:E.clientY>y.bottom?20:0;ge&&setTimeout(rt(e,function(){S==B&&(i.scroller.scrollTop+=ge,N(E))}),50)}}function z(E){e.state.selectingText=!1,S=1/0,E&&(ft(E),i.input.focus()),ut(i.wrapper.ownerDocument,"mousemove",P),ut(i.wrapper.ownerDocument,"mouseup",W),o.history.lastSelOrigin=null}var P=rt(e,function(E){E.buttons===0||!It(E)?z(E):N(E)}),W=rt(e,z);e.state.selectingText=W,J(i.wrapper.ownerDocument,"mousemove",P),J(i.wrapper.ownerDocument,"mouseup",W)}function ou(e,t){var n=t.anchor,r=t.head,i=U(e.doc,n.line);if(I(n,r)==0&&n.sticky==r.sticky)return t;var o=ke(i);if(!o)return t;var l=nr(o,n.ch,n.sticky),a=o[l];if(a.from!=n.ch&&a.to!=n.ch)return t;var s=l+(a.from==n.ch==(a.level!=1)?0:1);if(s==0||s==o.length)return t;var u;if(r.line!=n.line)u=(r.line-n.line)*(e.doc.direction=="ltr"?1:-1)>0;else{var d=nr(o,r.ch,r.sticky),p=d-l||(r.ch-n.ch)*(a.level==1?-1:1);d==s-1||d==s?u=p<0:u=p>0}var m=o[s+(u?-1:0)],y=u==(m.level==1),S=y?m.from:m.to,N=y?"after":"before";return n.ch==S&&n.sticky==N?t:new Ae(new k(n.line,S,N),r)}function na(e,t,n,r){var i,o;if(t.touches)i=t.touches[0].clientX,o=t.touches[0].clientY;else try{i=t.clientX,o=t.clientY}catch{return!1}if(i>=Math.floor(e.display.gutters.getBoundingClientRect().right))return!1;r&&ft(t);var l=e.display,a=l.lineDiv.getBoundingClientRect();if(o>a.bottom||!Lt(e,n))return yt(t);o-=a.top-l.viewOffset;for(var s=0;s<e.display.gutterSpecs.length;++s){var u=l.gutters.childNodes[s];if(u&&u.getBoundingClientRect().right>=i){var d=h(e.doc,o),p=e.display.gutterSpecs[s];return qe(e,n,e,d,p.className,t),yt(t)}}}function oo(e,t){return na(e,t,"gutterClick",!0)}function ia(e,t){Vt(e.display,t)||lu(e,t)||Ge(e,t,"contextmenu")||ee||e.display.input.onContextMenu(t)}function lu(e,t){return Lt(e,"gutterContextMenu")?na(e,t,"gutterContextMenu",!1):!1}function oa(e){e.display.wrapper.className=e.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+e.options.theme.replace(/(^|\s)\s*/g," cm-s-"),vn(e)}var tn={toString:function(){return"CodeMirror.Init"}},la={},di={};function au(e){var t=e.optionHandlers;function n(r,i,o,l){e.defaults[r]=i,o&&(t[r]=l?function(a,s,u){u!=tn&&o(a,s,u)}:o)}e.defineOption=n,e.Init=tn,n("value","",function(r,i){return r.setValue(i)},!0),n("mode",null,function(r,i){r.doc.modeOption=i,Zi(r)},!0),n("indentUnit",2,Zi,!0),n("indentWithTabs",!1),n("smartIndent",!0),n("tabSize",4,function(r){Sn(r),vn(r),bt(r)},!0),n("lineSeparator",null,function(r,i){if(r.doc.lineSep=i,!!i){var o=[],l=r.doc.first;r.doc.iter(function(s){for(var u=0;;){var d=s.text.indexOf(i,u);if(d==-1)break;u=d+i.length,o.push(k(l,d))}l++});for(var a=o.length-1;a>=0;a--)Qr(r.doc,i,o[a],k(o[a].line,o[a].ch+i.length))}}),n("specialChars",/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\u202d\u202e\u2066\u2067\u2069\ufeff\ufff9-\ufffc]/g,function(r,i,o){r.state.specialChars=new RegExp(i.source+(i.test("	")?"":"|	"),"g"),o!=tn&&r.refresh()}),n("specialCharPlaceholder",Fa,function(r){return r.refresh()},!0),n("electricChars",!0),n("inputStyle",oe?"contenteditable":"textarea",function(){throw new Error("inputStyle can not (yet) be changed in a running editor")},!0),n("spellcheck",!1,function(r,i){return r.getInputField().spellcheck=i},!0),n("autocorrect",!1,function(r,i){return r.getInputField().autocorrect=i},!0),n("autocapitalize",!1,function(r,i){return r.getInputField().autocapitalize=i},!0),n("rtlMoveVisually",!ye),n("wholeLineUpdateBefore",!0),n("theme","default",function(r){oa(r),kn(r)},!0),n("keyMap","default",function(r,i,o){var l=fi(i),a=o!=tn&&fi(o);a&&a.detach&&a.detach(r,l),l.attach&&l.attach(r,a||null)}),n("extraKeys",null),n("configureMouse",null),n("lineWrapping",!1,uu,!0),n("gutters",[],function(r,i){r.display.gutterSpecs=Xi(i,r.options.lineNumbers),kn(r)},!0),n("fixedGutter",!0,function(r,i){r.display.gutters.style.left=i?Ii(r.display)+"px":"0",r.refresh()},!0),n("coverGutterNextToScrollbar",!1,function(r){return Xr(r)},!0),n("scrollbarStyle","native",function(r){sl(r),Xr(r),r.display.scrollbars.setScrollTop(r.doc.scrollTop),r.display.scrollbars.setScrollLeft(r.doc.scrollLeft)},!0),n("lineNumbers",!1,function(r,i){r.display.gutterSpecs=Xi(r.options.gutters,i),kn(r)},!0),n("firstLineNumber",1,kn,!0),n("lineNumberFormatter",function(r){return r},kn,!0),n("showCursorWhenSelecting",!1,gn,!0),n("resetSelectionOnContextMenu",!0),n("lineWiseCopyCut",!0),n("pasteLinesPerSelection",!0),n("selectionsMayTouch",!1),n("readOnly",!1,function(r,i){i=="nocursor"&&(Gr(r),r.display.input.blur()),r.display.input.readOnlyChanged(i)}),n("screenReaderLabel",null,function(r,i){i=i===""?null:i,r.display.input.screenReaderLabelChanged(i)}),n("disableInput",!1,function(r,i){i||r.display.input.reset()},!0),n("dragDrop",!0,su),n("allowDropFileTypes",null),n("cursorBlinkRate",530),n("cursorScrollMargin",0),n("cursorHeight",1,gn,!0),n("singleCursorHeightPerLine",!0,gn,!0),n("workTime",100),n("workDelay",100),n("flattenSpans",!0,Sn,!0),n("addModeClass",!1,Sn,!0),n("pollInterval",100),n("undoDepth",200,function(r,i){return r.doc.history.undoDepth=i}),n("historyEventDelay",1250),n("viewportMargin",10,function(r){return r.refresh()},!0),n("maxHighlightLength",1e4,Sn,!0),n("moveInputWithCursor",!0,function(r,i){i||r.display.input.resetPosition()}),n("tabindex",null,function(r,i){return r.display.input.getField().tabIndex=i||""}),n("autofocus",null),n("direction","ltr",function(r,i){return r.doc.setDirection(i)},!0),n("phrases",null)}function su(e,t,n){var r=n&&n!=tn;if(!t!=!r){var i=e.display.dragFunctions,o=t?J:ut;o(e.display.scroller,"dragstart",i.start),o(e.display.scroller,"dragenter",i.enter),o(e.display.scroller,"dragover",i.over),o(e.display.scroller,"dragleave",i.leave),o(e.display.scroller,"drop",i.drop)}}function uu(e){e.options.lineWrapping?(D(e.display.wrapper,"CodeMirror-wrap"),e.display.sizer.style.minWidth="",e.display.sizerWidth=null):(me(e.display.wrapper,"CodeMirror-wrap"),Ti(e)),Fi(e),bt(e),vn(e),setTimeout(function(){return Xr(e)},100)}function Be(e,t){var n=this;if(!(this instanceof Be))return new Be(e,t);this.options=t=t?de(t):{},de(la,t,!1);var r=t.value;typeof r=="string"?r=new xt(r,t.mode,null,t.lineSeparator,t.direction):t.mode&&(r.modeOption=t.mode),this.doc=r;var i=new Be.inputStyles[t.inputStyle](this),o=this.display=new ks(e,r,i,t);o.wrapper.CodeMirror=this,oa(this),t.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap"),sl(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:-1,cutIncoming:-1,selectingText:!1,draggingText:!1,highlight:new ue,keySeq:null,specialChars:null},t.autofocus&&!oe&&o.input.focus(),M&&j<11&&setTimeout(function(){return n.display.input.reset(!0)},20),fu(this),Rs(),Lr(this),this.curOp.forceUpdate=!0,ml(this,r),t.autofocus&&!oe||this.hasFocus()?setTimeout(function(){n.hasFocus()&&!n.state.focused&&Bi(n)},20):Gr(this);for(var l in di)di.hasOwnProperty(l)&&di[l](this,t[l],tn);cl(this),t.finishInit&&t.finishInit(this);for(var a=0;a<lo.length;++a)lo[a](this);Mr(this),_&&t.lineWrapping&&getComputedStyle(o.lineDiv).textRendering=="optimizelegibility"&&(o.lineDiv.style.textRendering="auto")}Be.defaults=la,Be.optionHandlers=di;function fu(e){var t=e.display;J(t.scroller,"mousedown",rt(e,ta)),M&&j<11?J(t.scroller,"dblclick",rt(e,function(s){if(!Ge(e,s)){var u=kr(e,s);if(!(!u||oo(e,s)||Vt(e.display,s))){ft(s);var d=e.findWordAt(u);oi(e.doc,d.anchor,d.head)}}})):J(t.scroller,"dblclick",function(s){return Ge(e,s)||ft(s)}),J(t.scroller,"contextmenu",function(s){return ia(e,s)}),J(t.input.getField(),"contextmenu",function(s){t.scroller.contains(s.target)||ia(e,s)});var n,r={end:0};function i(){t.activeTouch&&(n=setTimeout(function(){return t.activeTouch=null},1e3),r=t.activeTouch,r.end=+new Date)}function o(s){if(s.touches.length!=1)return!1;var u=s.touches[0];return u.radiusX<=1&&u.radiusY<=1}function l(s,u){if(u.left==null)return!0;var d=u.left-s.left,p=u.top-s.top;return d*d+p*p>20*20}J(t.scroller,"touchstart",function(s){if(!Ge(e,s)&&!o(s)&&!oo(e,s)){t.input.ensurePolled(),clearTimeout(n);var u=+new Date;t.activeTouch={start:u,moved:!1,prev:u-r.end<=300?r:null},s.touches.length==1&&(t.activeTouch.left=s.touches[0].pageX,t.activeTouch.top=s.touches[0].pageY)}}),J(t.scroller,"touchmove",function(){t.activeTouch&&(t.activeTouch.moved=!0)}),J(t.scroller,"touchend",function(s){var u=t.activeTouch;if(u&&!Vt(t,s)&&u.left!=null&&!u.moved&&new Date-u.start<300){var d=e.coordsChar(t.activeTouch,"page"),p;!u.prev||l(u,u.prev)?p=new Ae(d,d):!u.prev.prev||l(u,u.prev.prev)?p=e.findWordAt(d):p=new Ae(k(d.line,0),fe(e.doc,k(d.line+1,0))),e.setSelection(p.anchor,p.head),e.focus(),ft(s)}i()}),J(t.scroller,"touchcancel",i),J(t.scroller,"scroll",function(){t.scroller.clientHeight&&(mn(e,t.scroller.scrollTop),Cr(e,t.scroller.scrollLeft,!0),qe(e,"scroll",e))}),J(t.scroller,"mousewheel",function(s){return pl(e,s)}),J(t.scroller,"DOMMouseScroll",function(s){return pl(e,s)}),J(t.wrapper,"scroll",function(){return t.wrapper.scrollTop=t.wrapper.scrollLeft=0}),t.dragFunctions={enter:function(s){Ge(e,s)||ir(s)},over:function(s){Ge(e,s)||(Bs(e,s),ir(s))},start:function(s){return Hs(e,s)},drop:rt(e,_s),leave:function(s){Ge(e,s)||Kl(e)}};var a=t.input.getField();J(a,"keyup",function(s){return $l.call(e,s)}),J(a,"keydown",rt(e,Vl)),J(a,"keypress",rt(e,ea)),J(a,"focus",function(s){return Bi(e,s)}),J(a,"blur",function(s){return Gr(e,s)})}var lo=[];Be.defineInitHook=function(e){return lo.push(e)};function Fn(e,t,n,r){var i=e.doc,o;n==null&&(n="add"),n=="smart"&&(i.mode.indent?o=fn(e,t).state:n="prev");var l=e.options.tabSize,a=U(i,t),s=he(a.text,null,l);a.stateAfter&&(a.stateAfter=null);var u=a.text.match(/^\s*/)[0],d;if(!r&&!/\S/.test(a.text))d=0,n="not";else if(n=="smart"&&(d=i.mode.indent(o,a.text.slice(u.length),a.text),d==Ct||d>150)){if(!r)return;n="prev"}n=="prev"?t>i.first?d=he(U(i,t-1).text,null,l):d=0:n=="add"?d=s+e.options.indentUnit:n=="subtract"?d=s-e.options.indentUnit:typeof n=="number"&&(d=s+n),d=Math.max(0,d);var p="",m=0;if(e.options.indentWithTabs)for(var y=Math.floor(d/l);y;--y)m+=l,p+="	";if(m<d&&(p+=ht(d-m)),p!=u)return Qr(i,p,k(t,0),k(t,u.length),"+input"),a.stateAfter=null,!0;for(var S=0;S<i.sel.ranges.length;S++){var N=i.sel.ranges[S];if(N.head.line==t&&N.head.ch<u.length){var z=k(t,u.length);$i(i,S,new Ae(z,z));break}}}var Kt=null;function hi(e){Kt=e}function ao(e,t,n,r,i){var o=e.doc;e.display.shift=!1,r||(r=o.sel);var l=+new Date-200,a=i=="paste"||e.state.pasteIncoming>l,s=Pt(t),u=null;if(a&&r.ranges.length>1)if(Kt&&Kt.text.join(`
+`)==t){if(r.ranges.length%Kt.text.length==0){u=[];for(var d=0;d<Kt.text.length;d++)u.push(o.splitLines(Kt.text[d]))}}else s.length==r.ranges.length&&e.options.pasteLinesPerSelection&&(u=Ne(s,function(P){return[P]}));for(var p=e.curOp.updateInput,m=r.ranges.length-1;m>=0;m--){var y=r.ranges[m],S=y.from(),N=y.to();y.empty()&&(n&&n>0?S=k(S.line,S.ch-n):e.state.overwrite&&!a?N=k(N.line,Math.min(U(o,N.line).text.length,N.ch+re(s).length)):a&&Kt&&Kt.lineWise&&Kt.text.join(`
+`)==s.join(`
+`)&&(S=N=k(S.line,0)));var z={from:S,to:N,text:u?u[m%u.length]:s,origin:i||(a?"paste":e.state.cutIncoming>l?"cut":"+input")};Jr(e.doc,z),tt(e,"inputRead",e,z)}t&&!a&&sa(e,t),jr(e),e.curOp.updateInput<2&&(e.curOp.updateInput=p),e.curOp.typing=!0,e.state.pasteIncoming=e.state.cutIncoming=-1}function aa(e,t){var n=e.clipboardData&&e.clipboardData.getData("Text");if(n)return e.preventDefault(),!t.isReadOnly()&&!t.options.disableInput&&t.hasFocus()&&Mt(t,function(){return ao(t,n,0,null,"paste")}),!0}function sa(e,t){if(!(!e.options.electricChars||!e.options.smartIndent))for(var n=e.doc.sel,r=n.ranges.length-1;r>=0;r--){var i=n.ranges[r];if(!(i.head.ch>100||r&&n.ranges[r-1].head.line==i.head.line)){var o=e.getModeAt(i.head),l=!1;if(o.electricChars){for(var a=0;a<o.electricChars.length;a++)if(t.indexOf(o.electricChars.charAt(a))>-1){l=Fn(e,i.head.line,"smart");break}}else o.electricInput&&o.electricInput.test(U(e.doc,i.head.line).text.slice(0,i.head.ch))&&(l=Fn(e,i.head.line,"smart"));l&&tt(e,"electricInput",e,i.head.line)}}}function ua(e){for(var t=[],n=[],r=0;r<e.doc.sel.ranges.length;r++){var i=e.doc.sel.ranges[r].head.line,o={anchor:k(i,0),head:k(i+1,0)};n.push(o),t.push(e.getRange(o.anchor,o.head))}return{text:t,ranges:n}}function so(e,t,n,r){e.setAttribute("autocorrect",n?"on":"off"),e.setAttribute("autocapitalize",r?"on":"off"),e.setAttribute("spellcheck",!!t)}function fa(){var e=c("textarea",null,null,"position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; min-height: 1em; outline: none"),t=c("div",[e],null,"overflow: hidden; position: relative; width: 3px; height: 0px;");return _?e.style.width="1000px":e.setAttribute("wrap","off"),ae&&(e.style.border="1px solid black"),t}function cu(e){var t=e.optionHandlers,n=e.helpers={};e.prototype={constructor:e,focus:function(){le(this).focus(),this.display.input.focus()},setOption:function(r,i){var o=this.options,l=o[r];o[r]==i&&r!="mode"||(o[r]=i,t.hasOwnProperty(r)&&rt(this,t[r])(this,i,l),qe(this,"optionChange",this,r))},getOption:function(r){return this.options[r]},getDoc:function(){return this.doc},addKeyMap:function(r,i){this.state.keyMaps[i?"push":"unshift"](fi(r))},removeKeyMap:function(r){for(var i=this.state.keyMaps,o=0;o<i.length;++o)if(i[o]==r||i[o].name==r)return i.splice(o,1),!0},addOverlay:pt(function(r,i){var o=r.token?r:e.getMode(this.options,r);if(o.startState)throw new Error("Overlays may not be stateful.");w(this.state.overlays,{mode:o,modeSpec:r,opaque:i&&i.opaque,priority:i&&i.priority||0},function(l){return l.priority}),this.state.modeGen++,bt(this)}),removeOverlay:pt(function(r){for(var i=this.state.overlays,o=0;o<i.length;++o){var l=i[o].modeSpec;if(l==r||typeof r=="string"&&l.name==r){i.splice(o,1),this.state.modeGen++,bt(this);return}}}),indentLine:pt(function(r,i,o){typeof i!="string"&&typeof i!="number"&&(i==null?i=this.options.smartIndent?"smart":"prev":i=i?"add":"subtract"),L(this.doc,r)&&Fn(this,r,i,o)}),indentSelection:pt(function(r){for(var i=this.doc.sel.ranges,o=-1,l=0;l<i.length;l++){var a=i[l];if(a.empty())a.head.line>o&&(Fn(this,a.head.line,r,!0),o=a.head.line,l==this.doc.sel.primIndex&&jr(this));else{var s=a.from(),u=a.to(),d=Math.max(o,s.line);o=Math.min(this.lastLine(),u.line-(u.ch?0:1))+1;for(var p=d;p<o;++p)Fn(this,p,r);var m=this.doc.sel.ranges;s.ch==0&&i.length==m.length&&m[l].from().ch>0&&$i(this.doc,l,new Ae(s,m[l].to()),st)}}}),getTokenAt:function(r,i){return xo(this,r,i)},getLineTokens:function(r,i){return xo(this,k(r),i,!0)},getTokenTypeAt:function(r){r=fe(this.doc,r);var i=yo(this,U(this.doc,r.line)),o=0,l=(i.length-1)/2,a=r.ch,s;if(a==0)s=i[2];else for(;;){var u=o+l>>1;if((u?i[u*2-1]:0)>=a)l=u;else if(i[u*2+1]<a)o=u+1;else{s=i[u*2+2];break}}var d=s?s.indexOf("overlay "):-1;return d<0?s:d==0?null:s.slice(0,d-1)},getModeAt:function(r){var i=this.doc.mode;return i.innerMode?e.innerMode(i,this.getTokenAt(r).state).mode:i},getHelper:function(r,i){return this.getHelpers(r,i)[0]},getHelpers:function(r,i){var o=[];if(!n.hasOwnProperty(i))return o;var l=n[i],a=this.getModeAt(r);if(typeof a[i]=="string")l[a[i]]&&o.push(l[a[i]]);else if(a[i])for(var s=0;s<a[i].length;s++){var u=l[a[i][s]];u&&o.push(u)}else a.helperType&&l[a.helperType]?o.push(l[a.helperType]):l[a.name]&&o.push(l[a.name]);for(var d=0;d<l._global.length;d++){var p=l._global[d];p.pred(a,this)&&q(o,p.val)==-1&&o.push(p.val)}return o},getStateAfter:function(r,i){var o=this.doc;return r=po(o,r??o.first+o.size-1),fn(this,r+1,i).state},cursorCoords:function(r,i){var o,l=this.doc.sel.primary();return r==null?o=l.head:typeof r=="object"?o=fe(this.doc,r):o=r?l.from():l.to(),Bt(this,o,i||"page")},charCoords:function(r,i){return Zn(this,fe(this.doc,r),i||"page")},coordsChar:function(r,i){return r=Zo(this,r,i||"page"),zi(this,r.left,r.top)},lineAtHeight:function(r,i){return r=Zo(this,{top:r,left:0},i||"page").top,h(this.doc,r+this.display.viewOffset)},heightAtLine:function(r,i,o){var l=!1,a;if(typeof r=="number"){var s=this.doc.first+this.doc.size-1;r<this.doc.first?r=this.doc.first:r>s&&(r=s,l=!0),a=U(this.doc,r)}else a=r;return Yn(this,a,{top:0,left:0},i||"page",o||l).top+(l?this.doc.height-Qt(a):0)},defaultTextHeight:function(){return Ur(this.display)},defaultCharWidth:function(){return qr(this.display)},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(r,i,o,l,a){var s=this.display;r=Bt(this,fe(this.doc,r));var u=r.bottom,d=r.left;if(i.style.position="absolute",i.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(i),s.sizer.appendChild(i),l=="over")u=r.top;else if(l=="above"||l=="near"){var p=Math.max(s.wrapper.clientHeight,this.doc.height),m=Math.max(s.sizer.clientWidth,s.lineSpace.clientWidth);(l=="above"||r.bottom+i.offsetHeight>p)&&r.top>i.offsetHeight?u=r.top-i.offsetHeight:r.bottom+i.offsetHeight<=p&&(u=r.bottom),d+i.offsetWidth>m&&(d=m-i.offsetWidth)}i.style.top=u+"px",i.style.left=i.style.right="",a=="right"?(d=s.sizer.clientWidth-i.offsetWidth,i.style.right="0px"):(a=="left"?d=0:a=="middle"&&(d=(s.sizer.clientWidth-i.offsetWidth)/2),i.style.left=d+"px"),o&&ss(this,{left:d,top:u,right:d+i.offsetWidth,bottom:u+i.offsetHeight})},triggerOnKeyDown:pt(Vl),triggerOnKeyPress:pt(ea),triggerOnKeyUp:$l,triggerOnMouseDown:pt(ta),execCommand:function(r){if(zn.hasOwnProperty(r))return zn[r].call(null,this)},triggerElectric:pt(function(r){sa(this,r)}),findPosH:function(r,i,o,l){var a=1;i<0&&(a=-1,i=-i);for(var s=fe(this.doc,r),u=0;u<i&&(s=uo(this.doc,s,a,o,l),!s.hitSide);++u);return s},moveH:pt(function(r,i){var o=this;this.extendSelectionsBy(function(l){return o.display.shift||o.doc.extend||l.empty()?uo(o.doc,l.head,r,i,o.options.rtlMoveVisually):r<0?l.from():l.to()},Le)}),deleteH:pt(function(r,i){var o=this.doc.sel,l=this.doc;o.somethingSelected()?l.replaceSelection("",null,"+delete"):en(this,function(a){var s=uo(l,a.head,r,i,!1);return r<0?{from:s,to:a.head}:{from:a.head,to:s}})}),findPosV:function(r,i,o,l){var a=1,s=l;i<0&&(a=-1,i=-i);for(var u=fe(this.doc,r),d=0;d<i;++d){var p=Bt(this,u,"div");if(s==null?s=p.left:p.left=s,u=ca(this,p,a,o),u.hitSide)break}return u},moveV:pt(function(r,i){var o=this,l=this.doc,a=[],s=!this.display.shift&&!l.extend&&l.sel.somethingSelected();if(l.extendSelectionsBy(function(d){if(s)return r<0?d.from():d.to();var p=Bt(o,d.head,"div");d.goalColumn!=null&&(p.left=d.goalColumn),a.push(p.left);var m=ca(o,p,r,i);return i=="page"&&d==l.sel.primary()&&Ki(o,Zn(o,m,"div").top-p.top),m},Le),a.length)for(var u=0;u<l.sel.ranges.length;u++)l.sel.ranges[u].goalColumn=a[u]}),findWordAt:function(r){var i=this.doc,o=U(i,r.line).text,l=r.ch,a=r.ch;if(o){var s=this.getHelper(r,"wordChars");(r.sticky=="before"||a==o.length)&&l?--l:++a;for(var u=o.charAt(l),d=ne(u,s)?function(p){return ne(p,s)}:/\s/.test(u)?function(p){return/\s/.test(p)}:function(p){return!/\s/.test(p)&&!ne(p)};l>0&&d(o.charAt(l-1));)--l;for(;a<o.length&&d(o.charAt(a));)++a}return new Ae(k(r.line,l),k(r.line,a))},toggleOverwrite:function(r){r!=null&&r==this.state.overwrite||((this.state.overwrite=!this.state.overwrite)?D(this.display.cursorDiv,"CodeMirror-overwrite"):me(this.display.cursorDiv,"CodeMirror-overwrite"),qe(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return this.display.input.getField()==g(Re(this))},isReadOnly:function(){return!!(this.options.readOnly||this.doc.cantEdit)},scrollTo:pt(function(r,i){yn(this,r,i)}),getScrollInfo:function(){var r=this.display.scroller;return{left:r.scrollLeft,top:r.scrollTop,height:r.scrollHeight-Gt(this)-this.display.barHeight,width:r.scrollWidth-Gt(this)-this.display.barWidth,clientHeight:Ni(this),clientWidth:xr(this)}},scrollIntoView:pt(function(r,i){r==null?(r={from:this.doc.sel.primary().head,to:null},i==null&&(i=this.options.cursorScrollMargin)):typeof r=="number"?r={from:k(r,0),to:null}:r.from==null&&(r={from:r,to:null}),r.to||(r.to=r.from),r.margin=i||0,r.from.line!=null?us(this,r):il(this,r.from,r.to,r.margin)}),setSize:pt(function(r,i){var o=this,l=function(s){return typeof s=="number"||/^\d+$/.test(String(s))?s+"px":s};r!=null&&(this.display.wrapper.style.width=l(r)),i!=null&&(this.display.wrapper.style.height=l(i)),this.options.lineWrapping&&jo(this);var a=this.display.viewFrom;this.doc.iter(a,this.display.viewTo,function(s){if(s.widgets){for(var u=0;u<s.widgets.length;u++)if(s.widgets[u].noHScroll){ur(o,a,"widget");break}}++a}),this.curOp.forceUpdate=!0,qe(this,"refresh",this)}),operation:function(r){return Mt(this,r)},startOperation:function(){return Lr(this)},endOperation:function(){return Mr(this)},refresh:pt(function(){var r=this.display.cachedTextHeight;bt(this),this.curOp.forceUpdate=!0,vn(this),yn(this,this.doc.scrollLeft,this.doc.scrollTop),Gi(this.display),(r==null||Math.abs(r-Ur(this.display))>.5||this.options.lineWrapping)&&Fi(this),qe(this,"refresh",this)}),swapDoc:pt(function(r){var i=this.doc;return i.cm=null,this.state.selectingText&&this.state.selectingText(),ml(this,r),vn(this),this.display.input.reset(),yn(this,r.scrollLeft,r.scrollTop),this.curOp.forceScroll=!0,tt(this,"swapDoc",this,i),i}),phrase:function(r){var i=this.options.phrases;return i&&Object.prototype.hasOwnProperty.call(i,r)?i[r]:r},getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},Et(e),e.registerHelper=function(r,i,o){n.hasOwnProperty(r)||(n[r]=e[r]={_global:[]}),n[r][i]=o},e.registerGlobalHelper=function(r,i,o,l){e.registerHelper(r,i,l),n[r]._global.push({pred:o,val:l})}}function uo(e,t,n,r,i){var o=t,l=n,a=U(e,t.line),s=i&&e.direction=="rtl"?-n:n;function u(){var W=t.line+s;return W<e.first||W>=e.first+e.size?!1:(t=new k(W,t.ch,t.sticky),a=U(e,W))}function d(W){var E;if(r=="codepoint"){var B=a.text.charCodeAt(t.ch+(n>0?0:-1));if(isNaN(B))E=null;else{var Q=n>0?B>=55296&&B<56320:B>=56320&&B<57343;E=new k(t.line,Math.max(0,Math.min(a.text.length,t.ch+n*(Q?2:1))),-n)}}else i?E=js(e.cm,a,t,n):E=to(a,t,n);if(E==null)if(!W&&u())t=ro(i,e.cm,a,t.line,s);else return!1;else t=E;return!0}if(r=="char"||r=="codepoint")d();else if(r=="column")d(!0);else if(r=="word"||r=="group")for(var p=null,m=r=="group",y=e.cm&&e.cm.getHelper(t,"wordChars"),S=!0;!(n<0&&!d(!S));S=!1){var N=a.text.charAt(t.ch)||`
+`,z=ne(N,y)?"w":m&&N==`
+`?"n":!m||/\s/.test(N)?null:"p";if(m&&!S&&!z&&(z="s"),p&&p!=z){n<0&&(n=1,d(),t.sticky="after");break}if(z&&(p=z),n>0&&!d(!S))break}var P=ai(e,t,o,l,!0);return De(o,P)&&(P.hitSide=!0),P}function ca(e,t,n,r){var i=e.doc,o=t.left,l;if(r=="page"){var a=Math.min(e.display.wrapper.clientHeight,le(e).innerHeight||i(e).documentElement.clientHeight),s=Math.max(a-.5*Ur(e.display),3);l=(n>0?t.bottom:t.top)+n*s}else r=="line"&&(l=n>0?t.bottom+3:t.top-3);for(var u;u=zi(e,o,l),!!u.outside;){if(n<0?l<=0:l>=i.height){u.hitSide=!0;break}l+=n*5}return u}var Pe=function(e){this.cm=e,this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null,this.polling=new ue,this.composing=null,this.gracePeriod=!1,this.readDOMTimeout=null};Pe.prototype.init=function(e){var t=this,n=this,r=n.cm,i=n.div=e.lineDiv;i.contentEditable=!0,so(i,r.options.spellcheck,r.options.autocorrect,r.options.autocapitalize);function o(a){for(var s=a.target;s;s=s.parentNode){if(s==i)return!0;if(/\bCodeMirror-(?:line)?widget\b/.test(s.className))break}return!1}J(i,"paste",function(a){!o(a)||Ge(r,a)||aa(a,r)||j<=11&&setTimeout(rt(r,function(){return t.updateFromDOM()}),20)}),J(i,"compositionstart",function(a){t.composing={data:a.data,done:!1}}),J(i,"compositionupdate",function(a){t.composing||(t.composing={data:a.data,done:!1})}),J(i,"compositionend",function(a){t.composing&&(a.data!=t.composing.data&&t.readFromDOMSoon(),t.composing.done=!0)}),J(i,"touchstart",function(){return n.forceCompositionEnd()}),J(i,"input",function(){t.composing||t.readFromDOMSoon()});function l(a){if(!(!o(a)||Ge(r,a))){if(r.somethingSelected())hi({lineWise:!1,text:r.getSelections()}),a.type=="cut"&&r.replaceSelection("",null,"cut");else if(r.options.lineWiseCopyCut){var s=ua(r);hi({lineWise:!0,text:s.text}),a.type=="cut"&&r.operation(function(){r.setSelections(s.ranges,0,st),r.replaceSelection("",null,"cut")})}else return;if(a.clipboardData){a.clipboardData.clearData();var u=Kt.text.join(`
+`);if(a.clipboardData.setData("Text",u),a.clipboardData.getData("Text")==u){a.preventDefault();return}}var d=fa(),p=d.firstChild;so(p),r.display.lineSpace.insertBefore(d,r.display.lineSpace.firstChild),p.value=Kt.text.join(`
+`);var m=g(ze(i));$(p),setTimeout(function(){r.display.lineSpace.removeChild(d),m.focus(),m==i&&n.showPrimarySelection()},50)}}J(i,"copy",l),J(i,"cut",l)},Pe.prototype.screenReaderLabelChanged=function(e){e?this.div.setAttribute("aria-label",e):this.div.removeAttribute("aria-label")},Pe.prototype.prepareSelection=function(){var e=tl(this.cm,!1);return e.focus=g(ze(this.div))==this.div,e},Pe.prototype.showSelection=function(e,t){!e||!this.cm.display.view.length||((e.focus||t)&&this.showPrimarySelection(),this.showMultipleSelections(e))},Pe.prototype.getSelection=function(){return this.cm.display.wrapper.ownerDocument.getSelection()},Pe.prototype.showPrimarySelection=function(){var e=this.getSelection(),t=this.cm,n=t.doc.sel.primary(),r=n.from(),i=n.to();if(t.display.viewTo==t.display.viewFrom||r.line>=t.display.viewTo||i.line<t.display.viewFrom){e.removeAllRanges();return}var o=pi(t,e.anchorNode,e.anchorOffset),l=pi(t,e.focusNode,e.focusOffset);if(!(o&&!o.bad&&l&&!l.bad&&I(Hr(o,l),r)==0&&I(mt(o,l),i)==0)){var a=t.display.view,s=r.line>=t.display.viewFrom&&da(t,r)||{node:a[0].measure.map[2],offset:0},u=i.line<t.display.viewTo&&da(t,i);if(!u){var d=a[a.length-1].measure,p=d.maps?d.maps[d.maps.length-1]:d.map;u={node:p[p.length-1],offset:p[p.length-2]-p[p.length-3]}}if(!s||!u){e.removeAllRanges();return}var m=e.rangeCount&&e.getRangeAt(0),y;try{y=b(s.node,s.offset,u.offset,u.node)}catch{}y&&(!Se&&t.state.focused?(e.collapse(s.node,s.offset),y.collapsed||(e.removeAllRanges(),e.addRange(y))):(e.removeAllRanges(),e.addRange(y)),m&&e.anchorNode==null?e.addRange(m):Se&&this.startGracePeriod()),this.rememberSelection()}},Pe.prototype.startGracePeriod=function(){var e=this;clearTimeout(this.gracePeriod),this.gracePeriod=setTimeout(function(){e.gracePeriod=!1,e.selectionChanged()&&e.cm.operation(function(){return e.cm.curOp.selectionChanged=!0})},20)},Pe.prototype.showMultipleSelections=function(e){H(this.cm.display.cursorDiv,e.cursors),H(this.cm.display.selectionDiv,e.selection)},Pe.prototype.rememberSelection=function(){var e=this.getSelection();this.lastAnchorNode=e.anchorNode,this.lastAnchorOffset=e.anchorOffset,this.lastFocusNode=e.focusNode,this.lastFocusOffset=e.focusOffset},Pe.prototype.selectionInEditor=function(){var e=this.getSelection();if(!e.rangeCount)return!1;var t=e.getRangeAt(0).commonAncestorContainer;return v(this.div,t)},Pe.prototype.focus=function(){this.cm.options.readOnly!="nocursor"&&((!this.selectionInEditor()||g(ze(this.div))!=this.div)&&this.showSelection(this.prepareSelection(),!0),this.div.focus())},Pe.prototype.blur=function(){this.div.blur()},Pe.prototype.getField=function(){return this.div},Pe.prototype.supportsTouch=function(){return!0},Pe.prototype.receivedFocus=function(){var e=this,t=this;this.selectionInEditor()?setTimeout(function(){return e.pollSelection()},20):Mt(this.cm,function(){return t.cm.curOp.selectionChanged=!0});function n(){t.cm.state.focused&&(t.pollSelection(),t.polling.set(t.cm.options.pollInterval,n))}this.polling.set(this.cm.options.pollInterval,n)},Pe.prototype.selectionChanged=function(){var e=this.getSelection();return e.anchorNode!=this.lastAnchorNode||e.anchorOffset!=this.lastAnchorOffset||e.focusNode!=this.lastFocusNode||e.focusOffset!=this.lastFocusOffset},Pe.prototype.pollSelection=function(){if(!(this.readDOMTimeout!=null||this.gracePeriod||!this.selectionChanged())){var e=this.getSelection(),t=this.cm;if(V&&G&&this.cm.display.gutterSpecs.length&&du(e.anchorNode)){this.cm.triggerOnKeyDown({type:"keydown",keyCode:8,preventDefault:Math.abs}),this.blur(),this.focus();return}if(!this.composing){this.rememberSelection();var n=pi(t,e.anchorNode,e.anchorOffset),r=pi(t,e.focusNode,e.focusOffset);n&&r&&Mt(t,function(){ct(t.doc,cr(n,r),st),(n.bad||r.bad)&&(t.curOp.selectionChanged=!0)})}}},Pe.prototype.pollContent=function(){this.readDOMTimeout!=null&&(clearTimeout(this.readDOMTimeout),this.readDOMTimeout=null);var e=this.cm,t=e.display,n=e.doc.sel.primary(),r=n.from(),i=n.to();if(r.ch==0&&r.line>e.firstLine()&&(r=k(r.line-1,U(e.doc,r.line-1).length)),i.ch==U(e.doc,i.line).text.length&&i.line<e.lastLine()&&(i=k(i.line+1,0)),r.line<t.viewFrom||i.line>t.viewTo-1)return!1;var o,l,a;r.line==t.viewFrom||(o=Sr(e,r.line))==0?(l=f(t.view[0].line),a=t.view[0].node):(l=f(t.view[o].line),a=t.view[o-1].node.nextSibling);var s=Sr(e,i.line),u,d;if(s==t.view.length-1?(u=t.viewTo-1,d=t.lineDiv.lastChild):(u=f(t.view[s+1].line)-1,d=t.view[s+1].node.previousSibling),!a)return!1;for(var p=e.doc.splitLines(hu(e,a,d,l,u)),m=Zt(e.doc,k(l,0),k(u,U(e.doc,u).text.length));p.length>1&&m.length>1;)if(re(p)==re(m))p.pop(),m.pop(),u--;else if(p[0]==m[0])p.shift(),m.shift(),l++;else break;for(var y=0,S=0,N=p[0],z=m[0],P=Math.min(N.length,z.length);y<P&&N.charCodeAt(y)==z.charCodeAt(y);)++y;for(var W=re(p),E=re(m),B=Math.min(W.length-(p.length==1?y:0),E.length-(m.length==1?y:0));S<B&&W.charCodeAt(W.length-S-1)==E.charCodeAt(E.length-S-1);)++S;if(p.length==1&&m.length==1&&l==r.line)for(;y&&y>r.ch&&W.charCodeAt(W.length-S-1)==E.charCodeAt(E.length-S-1);)y--,S++;p[p.length-1]=W.slice(0,W.length-S).replace(/^\u200b+/,""),p[0]=p[0].slice(y).replace(/\u200b+$/,"");var Q=k(l,y),Z=k(u,m.length?re(m).length-S:0);if(p.length>1||p[0]||I(Q,Z))return Qr(e.doc,p,Q,Z,"+input"),!0},Pe.prototype.ensurePolled=function(){this.forceCompositionEnd()},Pe.prototype.reset=function(){this.forceCompositionEnd()},Pe.prototype.forceCompositionEnd=function(){this.composing&&(clearTimeout(this.readDOMTimeout),this.composing=null,this.updateFromDOM(),this.div.blur(),this.div.focus())},Pe.prototype.readFromDOMSoon=function(){var e=this;this.readDOMTimeout==null&&(this.readDOMTimeout=setTimeout(function(){if(e.readDOMTimeout=null,e.composing)if(e.composing.done)e.composing=null;else return;e.updateFromDOM()},80))},Pe.prototype.updateFromDOM=function(){var e=this;(this.cm.isReadOnly()||!this.pollContent())&&Mt(this.cm,function(){return bt(e.cm)})},Pe.prototype.setUneditable=function(e){e.contentEditable="false"},Pe.prototype.onKeyPress=function(e){e.charCode==0||this.composing||(e.preventDefault(),this.cm.isReadOnly()||rt(this.cm,ao)(this.cm,String.fromCharCode(e.charCode==null?e.keyCode:e.charCode),0))},Pe.prototype.readOnlyChanged=function(e){this.div.contentEditable=String(e!="nocursor")},Pe.prototype.onContextMenu=function(){},Pe.prototype.resetPosition=function(){},Pe.prototype.needsContentAttribute=!0;function da(e,t){var n=Di(e,t.line);if(!n||n.hidden)return null;var r=U(e.doc,t.line),i=Ro(n,r,t.line),o=ke(r,e.doc.direction),l="left";if(o){var a=nr(o,t.ch);l=a%2?"right":"left"}var s=qo(i.map,t.ch,l);return s.offset=s.collapse=="right"?s.end:s.start,s}function du(e){for(var t=e;t;t=t.parentNode)if(/CodeMirror-gutter-wrapper/.test(t.className))return!0;return!1}function rn(e,t){return t&&(e.bad=!0),e}function hu(e,t,n,r,i){var o="",l=!1,a=e.doc.lineSeparator(),s=!1;function u(y){return function(S){return S.id==y}}function d(){l&&(o+=a,s&&(o+=a),l=s=!1)}function p(y){y&&(d(),o+=y)}function m(y){if(y.nodeType==1){var S=y.getAttribute("cm-text");if(S){p(S);return}var N=y.getAttribute("cm-marker"),z;if(N){var P=e.findMarks(k(r,0),k(i+1,0),u(+N));P.length&&(z=P[0].find(0))&&p(Zt(e.doc,z.from,z.to).join(a));return}if(y.getAttribute("contenteditable")=="false")return;var W=/^(pre|div|p|li|table|br)$/i.test(y.nodeName);if(!/^br$/i.test(y.nodeName)&&y.textContent.length==0)return;W&&d();for(var E=0;E<y.childNodes.length;E++)m(y.childNodes[E]);/^(pre|p)$/i.test(y.nodeName)&&(s=!0),W&&(l=!0)}else y.nodeType==3&&p(y.nodeValue.replace(/\u200b/g,"").replace(/\u00a0/g," "))}for(;m(t),t!=n;)t=t.nextSibling,s=!1;return o}function pi(e,t,n){var r;if(t==e.display.lineDiv){if(r=e.display.lineDiv.childNodes[n],!r)return rn(e.clipPos(k(e.display.viewTo-1)),!0);t=null,n=0}else for(r=t;;r=r.parentNode){if(!r||r==e.display.lineDiv)return null;if(r.parentNode&&r.parentNode==e.display.lineDiv)break}for(var i=0;i<e.display.view.length;i++){var o=e.display.view[i];if(o.node==r)return pu(o,t,n)}}function pu(e,t,n){var r=e.text.firstChild,i=!1;if(!t||!v(r,t))return rn(k(f(e.line),0),!0);if(t==r&&(i=!0,t=r.childNodes[n],n=0,!t)){var o=e.rest?re(e.rest):e.line;return rn(k(f(o),o.text.length),i)}var l=t.nodeType==3?t:null,a=t;for(!l&&t.childNodes.length==1&&t.firstChild.nodeType==3&&(l=t.firstChild,n&&(n=l.nodeValue.length));a.parentNode!=r;)a=a.parentNode;var s=e.measure,u=s.maps;function d(z,P,W){for(var E=-1;E<(u?u.length:0);E++)for(var B=E<0?s.map:u[E],Q=0;Q<B.length;Q+=3){var Z=B[Q+2];if(Z==z||Z==P){var ge=f(E<0?e.line:e.rest[E]),Fe=B[Q]+W;return(W<0||Z!=z)&&(Fe=B[Q+(W?1:0)]),k(ge,Fe)}}}var p=d(l,a,n);if(p)return rn(p,i);for(var m=a.nextSibling,y=l?l.nodeValue.length-n:0;m;m=m.nextSibling){if(p=d(m,m.firstChild,0),p)return rn(k(p.line,p.ch-y),i);y+=m.textContent.length}for(var S=a.previousSibling,N=n;S;S=S.previousSibling){if(p=d(S,S.firstChild,-1),p)return rn(k(p.line,p.ch+N),i);N+=S.textContent.length}}var Ye=function(e){this.cm=e,this.prevInput="",this.pollingFast=!1,this.polling=new ue,this.hasSelection=!1,this.composing=null,this.resetting=!1};Ye.prototype.init=function(e){var t=this,n=this,r=this.cm;this.createField(e);var i=this.textarea;e.wrapper.insertBefore(this.wrapper,e.wrapper.firstChild),ae&&(i.style.width="0px"),J(i,"input",function(){M&&j>=9&&t.hasSelection&&(t.hasSelection=null),n.poll()}),J(i,"paste",function(l){Ge(r,l)||aa(l,r)||(r.state.pasteIncoming=+new Date,n.fastPoll())});function o(l){if(!Ge(r,l)){if(r.somethingSelected())hi({lineWise:!1,text:r.getSelections()});else if(r.options.lineWiseCopyCut){var a=ua(r);hi({lineWise:!0,text:a.text}),l.type=="cut"?r.setSelections(a.ranges,null,st):(n.prevInput="",i.value=a.text.join(`
+`),$(i))}else return;l.type=="cut"&&(r.state.cutIncoming=+new Date)}}J(i,"cut",o),J(i,"copy",o),J(e.scroller,"paste",function(l){if(!(Vt(e,l)||Ge(r,l))){if(!i.dispatchEvent){r.state.pasteIncoming=+new Date,n.focus();return}var a=new Event("paste");a.clipboardData=l.clipboardData,i.dispatchEvent(a)}}),J(e.lineSpace,"selectstart",function(l){Vt(e,l)||ft(l)}),J(i,"compositionstart",function(){var l=r.getCursor("from");n.composing&&n.composing.range.clear(),n.composing={start:l,range:r.markText(l,r.getCursor("to"),{className:"CodeMirror-composing"})}}),J(i,"compositionend",function(){n.composing&&(n.poll(),n.composing.range.clear(),n.composing=null)})},Ye.prototype.createField=function(e){this.wrapper=fa(),this.textarea=this.wrapper.firstChild;var t=this.cm.options;so(this.textarea,t.spellcheck,t.autocorrect,t.autocapitalize)},Ye.prototype.screenReaderLabelChanged=function(e){e?this.textarea.setAttribute("aria-label",e):this.textarea.removeAttribute("aria-label")},Ye.prototype.prepareSelection=function(){var e=this.cm,t=e.display,n=e.doc,r=tl(e);if(e.options.moveInputWithCursor){var i=Bt(e,n.sel.primary().head,"div"),o=t.wrapper.getBoundingClientRect(),l=t.lineDiv.getBoundingClientRect();r.teTop=Math.max(0,Math.min(t.wrapper.clientHeight-10,i.top+l.top-o.top)),r.teLeft=Math.max(0,Math.min(t.wrapper.clientWidth-10,i.left+l.left-o.left))}return r},Ye.prototype.showSelection=function(e){var t=this.cm,n=t.display;H(n.cursorDiv,e.cursors),H(n.selectionDiv,e.selection),e.teTop!=null&&(this.wrapper.style.top=e.teTop+"px",this.wrapper.style.left=e.teLeft+"px")},Ye.prototype.reset=function(e){if(!(this.contextMenuPending||this.composing&&e)){var t=this.cm;if(this.resetting=!0,t.somethingSelected()){this.prevInput="";var n=t.getSelection();this.textarea.value=n,t.state.focused&&$(this.textarea),M&&j>=9&&(this.hasSelection=n)}else e||(this.prevInput=this.textarea.value="",M&&j>=9&&(this.hasSelection=null));this.resetting=!1}},Ye.prototype.getField=function(){return this.textarea},Ye.prototype.supportsTouch=function(){return!1},Ye.prototype.focus=function(){if(this.cm.options.readOnly!="nocursor"&&(!oe||g(ze(this.textarea))!=this.textarea))try{this.textarea.focus()}catch{}},Ye.prototype.blur=function(){this.textarea.blur()},Ye.prototype.resetPosition=function(){this.wrapper.style.top=this.wrapper.style.left=0},Ye.prototype.receivedFocus=function(){this.slowPoll()},Ye.prototype.slowPoll=function(){var e=this;this.pollingFast||this.polling.set(this.cm.options.pollInterval,function(){e.poll(),e.cm.state.focused&&e.slowPoll()})},Ye.prototype.fastPoll=function(){var e=!1,t=this;t.pollingFast=!0;function n(){var r=t.poll();!r&&!e?(e=!0,t.polling.set(60,n)):(t.pollingFast=!1,t.slowPoll())}t.polling.set(20,n)},Ye.prototype.poll=function(){var e=this,t=this.cm,n=this.textarea,r=this.prevInput;if(this.contextMenuPending||this.resetting||!t.state.focused||lr(n)&&!r&&!this.composing||t.isReadOnly()||t.options.disableInput||t.state.keySeq)return!1;var i=n.value;if(i==r&&!t.somethingSelected())return!1;if(M&&j>=9&&this.hasSelection===i||xe&&/[\uf700-\uf7ff]/.test(i))return t.display.input.reset(),!1;if(t.doc.sel==t.display.selForContextMenu){var o=i.charCodeAt(0);if(o==8203&&!r&&(r="​"),o==8666)return this.reset(),this.cm.execCommand("undo")}for(var l=0,a=Math.min(r.length,i.length);l<a&&r.charCodeAt(l)==i.charCodeAt(l);)++l;return Mt(t,function(){ao(t,i.slice(l),r.length-l,null,e.composing?"*compose":null),i.length>1e3||i.indexOf(`
+`)>-1?n.value=e.prevInput="":e.prevInput=i,e.composing&&(e.composing.range.clear(),e.composing.range=t.markText(e.composing.start,t.getCursor("to"),{className:"CodeMirror-composing"}))}),!0},Ye.prototype.ensurePolled=function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)},Ye.prototype.onKeyPress=function(){M&&j>=9&&(this.hasSelection=null),this.fastPoll()},Ye.prototype.onContextMenu=function(e){var t=this,n=t.cm,r=n.display,i=t.textarea;t.contextMenuPending&&t.contextMenuPending();var o=kr(n,e),l=r.scroller.scrollTop;if(!o||ce)return;var a=n.options.resetSelectionOnContextMenu;a&&n.doc.sel.contains(o)==-1&&rt(n,ct)(n.doc,cr(o),st);var s=i.style.cssText,u=t.wrapper.style.cssText,d=t.wrapper.offsetParent.getBoundingClientRect();t.wrapper.style.cssText="position: static",i.style.cssText=`position: absolute; width: 30px; height: 30px;
+      top: `+(e.clientY-d.top-5)+"px; left: "+(e.clientX-d.left-5)+`px;
+      z-index: 1000; background: `+(M?"rgba(255, 255, 255, .05)":"transparent")+`;
+      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);`;var p;_&&(p=i.ownerDocument.defaultView.scrollY),r.input.focus(),_&&i.ownerDocument.defaultView.scrollTo(null,p),r.input.reset(),n.somethingSelected()||(i.value=t.prevInput=" "),t.contextMenuPending=y,r.selForContextMenu=n.doc.sel,clearTimeout(r.detectingSelectAll);function m(){if(i.selectionStart!=null){var N=n.somethingSelected(),z="​"+(N?i.value:"");i.value="⇚",i.value=z,t.prevInput=N?"":"​",i.selectionStart=1,i.selectionEnd=z.length,r.selForContextMenu=n.doc.sel}}function y(){if(t.contextMenuPending==y&&(t.contextMenuPending=!1,t.wrapper.style.cssText=u,i.style.cssText=s,M&&j<9&&r.scrollbars.setScrollTop(r.scroller.scrollTop=l),i.selectionStart!=null)){(!M||M&&j<9)&&m();var N=0,z=function(){r.selForContextMenu==n.doc.sel&&i.selectionStart==0&&i.selectionEnd>0&&t.prevInput=="​"?rt(n,Ol)(n):N++<10?r.detectingSelectAll=setTimeout(z,500):(r.selForContextMenu=null,r.input.reset())};r.detectingSelectAll=setTimeout(z,200)}}if(M&&j>=9&&m(),ee){ir(e);var S=function(){ut(window,"mouseup",S),setTimeout(y,20)};J(window,"mouseup",S)}else setTimeout(y,50)},Ye.prototype.readOnlyChanged=function(e){e||this.reset(),this.textarea.disabled=e=="nocursor",this.textarea.readOnly=!!e},Ye.prototype.setUneditable=function(){},Ye.prototype.needsContentAttribute=!1;function vu(e,t){if(t=t?de(t):{},t.value=e.value,!t.tabindex&&e.tabIndex&&(t.tabindex=e.tabIndex),!t.placeholder&&e.placeholder&&(t.placeholder=e.placeholder),t.autofocus==null){var n=g(ze(e));t.autofocus=n==e||e.getAttribute("autofocus")!=null&&n==document.body}function r(){e.value=a.getValue()}var i;if(e.form&&(J(e.form,"submit",r),!t.leaveSubmitMethodAlone)){var o=e.form;i=o.submit;try{var l=o.submit=function(){r(),o.submit=i,o.submit(),o.submit=l}}catch{}}t.finishInit=function(s){s.save=r,s.getTextArea=function(){return e},s.toTextArea=function(){s.toTextArea=isNaN,r(),e.parentNode.removeChild(s.getWrapperElement()),e.style.display="",e.form&&(ut(e.form,"submit",r),!t.leaveSubmitMethodAlone&&typeof e.form.submit=="function"&&(e.form.submit=i))}},e.style.display="none";var a=Be(function(s){return e.parentNode.insertBefore(s,e.nextSibling)},t);return a}function gu(e){e.off=ut,e.on=J,e.wheelEventPixels=Ss,e.Doc=xt,e.splitLines=Pt,e.countColumn=he,e.findColumn=Ke,e.isWordChar=R,e.Pass=Ct,e.signal=qe,e.Line=Br,e.changeEnd=dr,e.scrollbarModel=al,e.Pos=k,e.cmpPos=I,e.modes=Er,e.mimeModes=Wt,e.resolveMode=Ir,e.getMode=Fr,e.modeExtensions=ar,e.extendMode=Wr,e.copyState=Ut,e.startState=_r,e.innerMode=sn,e.commands=zn,e.keyMap=er,e.keyName=Xl,e.isModifierKey=Gl,e.lookupKey=$r,e.normalizeKeyMap=Gs,e.StringStream=je,e.SharedTextMarker=Dn,e.TextMarker=pr,e.LineWidget=Nn,e.e_preventDefault=ft,e.e_stopPropagation=zr,e.e_stop=ir,e.addClass=D,e.contains=v,e.rmClass=me,e.keyNames=vr}au(Be),cu(Be);var yu="iter insert remove copy getEditor constructor".split(" ");for(var vi in xt.prototype)xt.prototype.hasOwnProperty(vi)&&q(yu,vi)<0&&(Be.prototype[vi]=function(e){return function(){return e.apply(this.doc,arguments)}}(xt.prototype[vi]));return Et(xt),Be.inputStyles={textarea:Ye,contenteditable:Pe},Be.defineMode=function(e){!Be.defaults.mode&&e!="null"&&(Be.defaults.mode=e),_t.apply(this,arguments)},Be.defineMIME=br,Be.defineMode("null",function(){return{token:function(e){return e.skipToEnd()}}}),Be.defineMIME("text/plain","null"),Be.defineExtension=function(e,t){Be.prototype[e]=t},Be.defineDocExtension=function(e,t){xt.prototype[e]=t},Be.fromTextArea=vu,gu(Be),Be.version="5.65.15",Be})}(ho)),ho.exports}var xu=Ar();const Tu=bu(xu);var wu={exports:{}};(function(yr,Or){(function(F){F(Ar())})(function(F){F.defineMode("css",function(ee,X){var me=X.inline;X.propertyKeywords||(X=F.resolveMode("text/css"));var T=ee.indentUnit,H=X.tokenHooks,c=X.documentTypes||{},x=X.mediaTypes||{},b=X.mediaFeatures||{},v=X.mediaValueKeywords||{},g=X.propertyKeywords||{},D=X.nonStandardPropertyKeywords||{},K=X.fontProperties||{},$=X.counterDescriptors||{},pe=X.colorKeywords||{},Re=X.valueKeywords||{},ze=X.allowNested,le=X.lineComment,te=X.supportsAtComponent===!0,de=ee.highlightNonStandardPropertyKeywords!==!1,he,ue;function q(w,A){return he=A,w}function Ve(w,A){var C=w.next();if(H[C]){var be=H[C](w,A);if(be!==!1)return be}if(C=="@")return w.eatWhile(/[\w\\\-]/),q("def",w.current());if(C=="="||(C=="~"||C=="|")&&w.eat("="))return q(null,"compare");if(C=='"'||C=="'")return A.tokenize=Ct(C),A.tokenize(w,A);if(C=="#")return w.eatWhile(/[\w\\\-]/),q("atom","hash");if(C=="!")return w.match(/^\s*\w*/),q("keyword","important");if(/\d/.test(C)||C=="."&&w.eat(/\d/))return w.eatWhile(/[\w.%]/),q("number","unit");if(C==="-"){if(/[\d.]/.test(w.peek()))return w.eatWhile(/[\w.%]/),q("number","unit");if(w.match(/^-[\w\\\-]*/))return w.eatWhile(/[\w\\\-]/),w.match(/^\s*:/,!1)?q("variable-2","variable-definition"):q("variable-2","variable");if(w.match(/^\w+-/))return q("meta","meta")}else return/[,+>*\/]/.test(C)?q(null,"select-op"):C=="."&&w.match(/^-?[_a-z][_a-z0-9-]*/i)?q("qualifier","qualifier"):/[:;{}\[\]\(\)]/.test(C)?q(null,C):w.match(/^[\w-.]+(?=\()/)?(/^(url(-prefix)?|domain|regexp)$/i.test(w.current())&&(A.tokenize=st),q("variable callee","variable")):/[\w\\\-]/.test(C)?(w.eatWhile(/[\w\\\-]/),q("property","word")):q(null,null)}function Ct(w){return function(A,C){for(var be=!1,R;(R=A.next())!=null;){if(R==w&&!be){w==")"&&A.backUp(1);break}be=!be&&R=="\\"}return(R==w||!be&&w!=")")&&(C.tokenize=null),q("string","string")}}function st(w,A){return w.next(),w.match(/^\s*[\"\')]/,!1)?A.tokenize=null:A.tokenize=Ct(")"),q(null,"(")}function gt(w,A,C){this.type=w,this.indent=A,this.prev=C}function Le(w,A,C,be){return w.context=new gt(C,A.indentation()+(be===!1?0:T),w.context),C}function Ke(w){return w.context.prev&&(w.context=w.context.prev),w.context.type}function lt(w,A,C){return Ne[C.context.type](w,A,C)}function ht(w,A,C,be){for(var R=be||1;R>0;R--)C.context=C.context.prev;return lt(w,A,C)}function re(w){var A=w.current().toLowerCase();Re.hasOwnProperty(A)?ue="atom":pe.hasOwnProperty(A)?ue="keyword":ue="variable"}var Ne={};return Ne.top=function(w,A,C){if(w=="{")return Le(C,A,"block");if(w=="}"&&C.context.prev)return Ke(C);if(te&&/@component/i.test(w))return Le(C,A,"atComponentBlock");if(/^@(-moz-)?document$/i.test(w))return Le(C,A,"documentTypes");if(/^@(media|supports|(-moz-)?document|import)$/i.test(w))return Le(C,A,"atBlock");if(/^@(font-face|counter-style)/i.test(w))return C.stateArg=w,"restricted_atBlock_before";if(/^@(-(moz|ms|o|webkit)-)?keyframes$/i.test(w))return"keyframes";if(w&&w.charAt(0)=="@")return Le(C,A,"at");if(w=="hash")ue="builtin";else if(w=="word")ue="tag";else{if(w=="variable-definition")return"maybeprop";if(w=="interpolation")return Le(C,A,"interpolation");if(w==":")return"pseudo";if(ze&&w=="(")return Le(C,A,"parens")}return C.context.type},Ne.block=function(w,A,C){if(w=="word"){var be=A.current().toLowerCase();return g.hasOwnProperty(be)?(ue="property","maybeprop"):D.hasOwnProperty(be)?(ue=de?"string-2":"property","maybeprop"):ze?(ue=A.match(/^\s*:(?:\s|$)/,!1)?"property":"tag","block"):(ue+=" error","maybeprop")}else return w=="meta"?"block":!ze&&(w=="hash"||w=="qualifier")?(ue="error","block"):Ne.top(w,A,C)},Ne.maybeprop=function(w,A,C){return w==":"?Le(C,A,"prop"):lt(w,A,C)},Ne.prop=function(w,A,C){if(w==";")return Ke(C);if(w=="{"&&ze)return Le(C,A,"propBlock");if(w=="}"||w=="{")return ht(w,A,C);if(w=="(")return Le(C,A,"parens");if(w=="hash"&&!/^#([0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/.test(A.current()))ue+=" error";else if(w=="word")re(A);else if(w=="interpolation")return Le(C,A,"interpolation");return"prop"},Ne.propBlock=function(w,A,C){return w=="}"?Ke(C):w=="word"?(ue="property","maybeprop"):C.context.type},Ne.parens=function(w,A,C){return w=="{"||w=="}"?ht(w,A,C):w==")"?Ke(C):w=="("?Le(C,A,"parens"):w=="interpolation"?Le(C,A,"interpolation"):(w=="word"&&re(A),"parens")},Ne.pseudo=function(w,A,C){return w=="meta"?"pseudo":w=="word"?(ue="variable-3",C.context.type):lt(w,A,C)},Ne.documentTypes=function(w,A,C){return w=="word"&&c.hasOwnProperty(A.current())?(ue="tag",C.context.type):Ne.atBlock(w,A,C)},Ne.atBlock=function(w,A,C){if(w=="(")return Le(C,A,"atBlock_parens");if(w=="}"||w==";")return ht(w,A,C);if(w=="{")return Ke(C)&&Le(C,A,ze?"block":"top");if(w=="interpolation")return Le(C,A,"interpolation");if(w=="word"){var be=A.current().toLowerCase();be=="only"||be=="not"||be=="and"||be=="or"?ue="keyword":x.hasOwnProperty(be)?ue="attribute":b.hasOwnProperty(be)?ue="property":v.hasOwnProperty(be)?ue="keyword":g.hasOwnProperty(be)?ue="property":D.hasOwnProperty(be)?ue=de?"string-2":"property":Re.hasOwnProperty(be)?ue="atom":pe.hasOwnProperty(be)?ue="keyword":ue="error"}return C.context.type},Ne.atComponentBlock=function(w,A,C){return w=="}"?ht(w,A,C):w=="{"?Ke(C)&&Le(C,A,ze?"block":"top",!1):(w=="word"&&(ue="error"),C.context.type)},Ne.atBlock_parens=function(w,A,C){return w==")"?Ke(C):w=="{"||w=="}"?ht(w,A,C,2):Ne.atBlock(w,A,C)},Ne.restricted_atBlock_before=function(w,A,C){return w=="{"?Le(C,A,"restricted_atBlock"):w=="word"&&C.stateArg=="@counter-style"?(ue="variable","restricted_atBlock_before"):lt(w,A,C)},Ne.restricted_atBlock=function(w,A,C){return w=="}"?(C.stateArg=null,Ke(C)):w=="word"?(C.stateArg=="@font-face"&&!K.hasOwnProperty(A.current().toLowerCase())||C.stateArg=="@counter-style"&&!$.hasOwnProperty(A.current().toLowerCase())?ue="error":ue="property","maybeprop"):"restricted_atBlock"},Ne.keyframes=function(w,A,C){return w=="word"?(ue="variable","keyframes"):w=="{"?Le(C,A,"top"):lt(w,A,C)},Ne.at=function(w,A,C){return w==";"?Ke(C):w=="{"||w=="}"?ht(w,A,C):(w=="word"?ue="tag":w=="hash"&&(ue="builtin"),"at")},Ne.interpolation=function(w,A,C){return w=="}"?Ke(C):w=="{"||w==";"?ht(w,A,C):(w=="word"?ue="variable":w!="variable"&&w!="("&&w!=")"&&(ue="error"),"interpolation")},{startState:function(w){return{tokenize:null,state:me?"block":"top",stateArg:null,context:new gt(me?"block":"top",w||0,null)}},token:function(w,A){if(!A.tokenize&&w.eatSpace())return null;var C=(A.tokenize||Ve)(w,A);return C&&typeof C=="object"&&(he=C[1],C=C[0]),ue=C,he!="comment"&&(A.state=Ne[A.state](he,w,A)),ue},indent:function(w,A){var C=w.context,be=A&&A.charAt(0),R=C.indent;return C.type=="prop"&&(be=="}"||be==")")&&(C=C.prev),C.prev&&(be=="}"&&(C.type=="block"||C.type=="top"||C.type=="interpolation"||C.type=="restricted_atBlock")?(C=C.prev,R=C.indent):(be==")"&&(C.type=="parens"||C.type=="atBlock_parens")||be=="{"&&(C.type=="at"||C.type=="atBlock"))&&(R=Math.max(0,C.indent-T))),R},electricChars:"}",blockCommentStart:"/*",blockCommentEnd:"*/",blockCommentContinue:" * ",lineComment:le,fold:"brace"}});function Ee(ee){for(var X={},me=0;me<ee.length;++me)X[ee[me].toLowerCase()]=!0;return X}var Se=["domain","regexp","url","url-prefix"],We=Ee(Se),Qe=["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"],Ce=Ee(Qe),M=["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid","orientation","device-pixel-ratio","min-device-pixel-ratio","max-device-pixel-ratio","pointer","any-pointer","hover","any-hover","prefers-color-scheme","dynamic-range","video-dynamic-range"],j=Ee(M),_=["landscape","portrait","none","coarse","fine","on-demand","hover","interlace","progressive","dark","light","standard","high"],ie=Ee(_),G=["align-content","align-items","align-self","alignment-adjust","alignment-baseline","all","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backdrop-filter","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-position-x","background-position-y","background-repeat","background-size","baseline-shift","binding","bleed","block-size","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","contain","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-content","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-family","font-feature-settings","font-kerning","font-language-override","font-optical-sizing","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-variation-settings","font-weight","gap","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-gap","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-gap","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","inset","inset-block","inset-block-end","inset-block-start","inset-inline","inset-inline-end","inset-inline-start","isolation","justify-content","justify-items","justify-self","left","letter-spacing","line-break","line-height","line-height-step","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","mask-clip","mask-composite","mask-image","mask-mode","mask-origin","mask-position","mask-repeat","mask-size","mask-type","max-block-size","max-height","max-inline-size","max-width","min-block-size","min-height","min-inline-size","min-width","mix-blend-mode","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","offset","offset-anchor","offset-distance","offset-path","offset-position","offset-rotate","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","place-content","place-items","place-self","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotate","rotation","rotation-point","row-gap","ruby-align","ruby-overhang","ruby-position","ruby-span","scale","scroll-behavior","scroll-margin","scroll-margin-block","scroll-margin-block-end","scroll-margin-block-start","scroll-margin-bottom","scroll-margin-inline","scroll-margin-inline-end","scroll-margin-inline-start","scroll-margin-left","scroll-margin-right","scroll-margin-top","scroll-padding","scroll-padding-block","scroll-padding-block-end","scroll-padding-block-start","scroll-padding-bottom","scroll-padding-inline","scroll-padding-inline-end","scroll-padding-inline-start","scroll-padding-left","scroll-padding-right","scroll-padding-top","scroll-snap-align","scroll-snap-type","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-combine-upright","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-skip-ink","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-orientation","text-outline","text-overflow","text-rendering","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","touch-action","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","translate","unicode-bidi","user-select","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","writing-mode","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","paint-order","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode"],se=Ee(G),ce=["accent-color","aspect-ratio","border-block","border-block-color","border-block-end","border-block-end-color","border-block-end-style","border-block-end-width","border-block-start","border-block-start-color","border-block-start-style","border-block-start-width","border-block-style","border-block-width","border-inline","border-inline-color","border-inline-end","border-inline-end-color","border-inline-end-style","border-inline-end-width","border-inline-start","border-inline-start-color","border-inline-start-style","border-inline-start-width","border-inline-style","border-inline-width","content-visibility","margin-block","margin-block-end","margin-block-start","margin-inline","margin-inline-end","margin-inline-start","overflow-anchor","overscroll-behavior","padding-block","padding-block-end","padding-block-start","padding-inline","padding-inline-end","padding-inline-start","scroll-snap-stop","scrollbar-3d-light-color","scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-track-color","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","shape-inside","zoom"],Ie=Ee(ce),Te=["font-display","font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"],Oe=Ee(Te),ae=["additive-symbols","fallback","negative","pad","prefix","range","speak-as","suffix","symbols","system"],V=Ee(ae),oe=["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkgrey","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkslategrey","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dimgrey","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightgrey","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightslategrey","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","slategrey","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"],xe=Ee(oe),_e=["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","auto-flow","avoid","avoid-column","avoid-page","avoid-region","axis-pan","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","blur","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","brightness","bullets","button","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","color","color-burn","color-dodge","column","column-reverse","compact","condensed","conic-gradient","contain","content","contents","content-box","context-menu","continuous","contrast","copy","counter","counters","cover","crop","cross","crosshair","cubic-bezier","currentcolor","cursive","cyclic","darken","dashed","decimal","decimal-leading-zero","default","default-button","dense","destination-atop","destination-in","destination-out","destination-over","devanagari","difference","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","drop-shadow","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","exclusion","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fill-box","fixed","flat","flex","flex-end","flex-start","footnotes","forwards","from","geometricPrecision","georgian","grayscale","graytext","grid","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hard-light","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","hue","hue-rotate","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-grid","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","lighten","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","luminosity","malayalam","manipulation","match","matrix","matrix3d","media-play-button","media-slider","media-sliderthumb","media-volume-slider","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","multiple_mask_images","multiply","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","opacity","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","pinch-zoom","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeating-conic-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row","row-resize","row-reverse","rtl","run-in","running","s-resize","sans-serif","saturate","saturation","scale","scale3d","scaleX","scaleY","scaleZ","screen","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","self-start","self-end","semi-condensed","semi-expanded","separate","sepia","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","soft-light","solid","somali","source-atop","source-in","source-out","source-over","space","space-around","space-between","space-evenly","spell-out","square","square-button","start","static","status-bar","stretch","stroke","stroke-box","sub","subpixel-antialiased","svg_masks","super","sw-resize","symbolic","symbols","system-ui","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","transform","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","unidirectional-pan","unset","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","view-box","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","wrap","wrap-reverse","x-large","x-small","xor","xx-large","xx-small"],ye=Ee(_e),Me=Se.concat(Qe).concat(M).concat(_).concat(G).concat(ce).concat(oe).concat(_e);F.registerHelper("hintWords","css",Me);function He(ee,X){for(var me=!1,T;(T=ee.next())!=null;){if(me&&T=="/"){X.tokenize=null;break}me=T=="*"}return["comment","comment"]}F.defineMIME("text/css",{documentTypes:We,mediaTypes:Ce,mediaFeatures:j,mediaValueKeywords:ie,propertyKeywords:se,nonStandardPropertyKeywords:Ie,fontProperties:Oe,counterDescriptors:V,colorKeywords:xe,valueKeywords:ye,tokenHooks:{"/":function(ee,X){return ee.eat("*")?(X.tokenize=He,He(ee,X)):!1}},name:"css"}),F.defineMIME("text/x-scss",{mediaTypes:Ce,mediaFeatures:j,mediaValueKeywords:ie,propertyKeywords:se,nonStandardPropertyKeywords:Ie,colorKeywords:xe,valueKeywords:ye,fontProperties:Oe,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(ee,X){return ee.eat("/")?(ee.skipToEnd(),["comment","comment"]):ee.eat("*")?(X.tokenize=He,He(ee,X)):["operator","operator"]},":":function(ee){return ee.match(/^\s*\{/,!1)?[null,null]:!1},$:function(ee){return ee.match(/^[\w-]+/),ee.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"]},"#":function(ee){return ee.eat("{")?[null,"interpolation"]:!1}},name:"css",helperType:"scss"}),F.defineMIME("text/x-less",{mediaTypes:Ce,mediaFeatures:j,mediaValueKeywords:ie,propertyKeywords:se,nonStandardPropertyKeywords:Ie,colorKeywords:xe,valueKeywords:ye,fontProperties:Oe,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(ee,X){return ee.eat("/")?(ee.skipToEnd(),["comment","comment"]):ee.eat("*")?(X.tokenize=He,He(ee,X)):["operator","operator"]},"@":function(ee){return ee.eat("{")?[null,"interpolation"]:ee.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/i,!1)?!1:(ee.eatWhile(/[\w\\\-]/),ee.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"])},"&":function(){return["atom","atom"]}},name:"css",helperType:"less"}),F.defineMIME("text/x-gss",{documentTypes:We,mediaTypes:Ce,mediaFeatures:j,propertyKeywords:se,nonStandardPropertyKeywords:Ie,fontProperties:Oe,counterDescriptors:V,colorKeywords:xe,valueKeywords:ye,supportsAtComponent:!0,tokenHooks:{"/":function(ee,X){return ee.eat("*")?(X.tokenize=He,He(ee,X)):!1}},name:"css",helperType:"gss"})})})();var ku=wu.exports,pa={exports:{}},va;function Su(){return va||(va=1,function(yr,Or){(function(F){F(Ar())})(function(F){var Ee={autoSelfClosers:{area:!0,base:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,menuitem:!0},implicitlyClosed:{dd:!0,li:!0,optgroup:!0,option:!0,p:!0,rp:!0,rt:!0,tbody:!0,td:!0,tfoot:!0,th:!0,tr:!0},contextGrabbers:{dd:{dd:!0,dt:!0},dt:{dd:!0,dt:!0},li:{li:!0},option:{option:!0,optgroup:!0},optgroup:{optgroup:!0},p:{address:!0,article:!0,aside:!0,blockquote:!0,dir:!0,div:!0,dl:!0,fieldset:!0,footer:!0,form:!0,h1:!0,h2:!0,h3:!0,h4:!0,h5:!0,h6:!0,header:!0,hgroup:!0,hr:!0,menu:!0,nav:!0,ol:!0,p:!0,pre:!0,section:!0,table:!0,ul:!0},rp:{rp:!0,rt:!0},rt:{rp:!0,rt:!0},tbody:{tbody:!0,tfoot:!0},td:{td:!0,th:!0},tfoot:{tbody:!0},th:{td:!0,th:!0},thead:{tbody:!0,tfoot:!0},tr:{tr:!0}},doNotIndent:{pre:!0},allowUnquoted:!0,allowMissing:!0,caseFold:!0},Se={autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:!1,allowMissing:!1,allowMissingTagName:!1,caseFold:!1};F.defineMode("xml",function(We,Qe){var Ce=We.indentUnit,M={},j=Qe.htmlMode?Ee:Se;for(var _ in j)M[_]=j[_];for(var _ in Qe)M[_]=Qe[_];var ie,G;function se(c,x){function b(D){return x.tokenize=D,D(c,x)}var v=c.next();if(v=="<")return c.eat("!")?c.eat("[")?c.match("CDATA[")?b(Te("atom","]]>")):null:c.match("--")?b(Te("comment","-->")):c.match("DOCTYPE",!0,!0)?(c.eatWhile(/[\w\._\-]/),b(Oe(1))):null:c.eat("?")?(c.eatWhile(/[\w\._\-]/),x.tokenize=Te("meta","?>"),"meta"):(ie=c.eat("/")?"closeTag":"openTag",x.tokenize=ce,"tag bracket");if(v=="&"){var g;return c.eat("#")?c.eat("x")?g=c.eatWhile(/[a-fA-F\d]/)&&c.eat(";"):g=c.eatWhile(/[\d]/)&&c.eat(";"):g=c.eatWhile(/[\w\.\-:]/)&&c.eat(";"),g?"atom":"error"}else return c.eatWhile(/[^&<]/),null}se.isInText=!0;function ce(c,x){var b=c.next();if(b==">"||b=="/"&&c.eat(">"))return x.tokenize=se,ie=b==">"?"endTag":"selfcloseTag","tag bracket";if(b=="=")return ie="equals",null;if(b=="<"){x.tokenize=se,x.state=_e,x.tagName=x.tagStart=null;var v=x.tokenize(c,x);return v?v+" tag error":"tag error"}else return/[\'\"]/.test(b)?(x.tokenize=Ie(b),x.stringStartCol=c.column(),x.tokenize(c,x)):(c.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/),"word")}function Ie(c){var x=function(b,v){for(;!b.eol();)if(b.next()==c){v.tokenize=ce;break}return"string"};return x.isInAttribute=!0,x}function Te(c,x){return function(b,v){for(;!b.eol();){if(b.match(x)){v.tokenize=se;break}b.next()}return c}}function Oe(c){return function(x,b){for(var v;(v=x.next())!=null;){if(v=="<")return b.tokenize=Oe(c+1),b.tokenize(x,b);if(v==">")if(c==1){b.tokenize=se;break}else return b.tokenize=Oe(c-1),b.tokenize(x,b)}return"meta"}}function ae(c){return c&&c.toLowerCase()}function V(c,x,b){this.prev=c.context,this.tagName=x||"",this.indent=c.indented,this.startOfLine=b,(M.doNotIndent.hasOwnProperty(x)||c.context&&c.context.noIndent)&&(this.noIndent=!0)}function oe(c){c.context&&(c.context=c.context.prev)}function xe(c,x){for(var b;;){if(!c.context||(b=c.context.tagName,!M.contextGrabbers.hasOwnProperty(ae(b))||!M.contextGrabbers[ae(b)].hasOwnProperty(ae(x))))return;oe(c)}}function _e(c,x,b){return c=="openTag"?(b.tagStart=x.column(),ye):c=="closeTag"?Me:_e}function ye(c,x,b){return c=="word"?(b.tagName=x.current(),G="tag",X):M.allowMissingTagName&&c=="endTag"?(G="tag bracket",X(c,x,b)):(G="error",ye)}function Me(c,x,b){if(c=="word"){var v=x.current();return b.context&&b.context.tagName!=v&&M.implicitlyClosed.hasOwnProperty(ae(b.context.tagName))&&oe(b),b.context&&b.context.tagName==v||M.matchClosing===!1?(G="tag",He):(G="tag error",ee)}else return M.allowMissingTagName&&c=="endTag"?(G="tag bracket",He(c,x,b)):(G="error",ee)}function He(c,x,b){return c!="endTag"?(G="error",He):(oe(b),_e)}function ee(c,x,b){return G="error",He(c,x,b)}function X(c,x,b){if(c=="word")return G="attribute",me;if(c=="endTag"||c=="selfcloseTag"){var v=b.tagName,g=b.tagStart;return b.tagName=b.tagStart=null,c=="selfcloseTag"||M.autoSelfClosers.hasOwnProperty(ae(v))?xe(b,v):(xe(b,v),b.context=new V(b,v,g==b.indented)),_e}return G="error",X}function me(c,x,b){return c=="equals"?T:(M.allowMissing||(G="error"),X(c,x,b))}function T(c,x,b){return c=="string"?H:c=="word"&&M.allowUnquoted?(G="string",X):(G="error",X(c,x,b))}function H(c,x,b){return c=="string"?H:X(c,x,b)}return{startState:function(c){var x={tokenize:se,state:_e,indented:c||0,tagName:null,tagStart:null,context:null};return c!=null&&(x.baseIndent=c),x},token:function(c,x){if(!x.tagName&&c.sol()&&(x.indented=c.indentation()),c.eatSpace())return null;ie=null;var b=x.tokenize(c,x);return(b||ie)&&b!="comment"&&(G=null,x.state=x.state(ie||b,c,x),G&&(b=G=="error"?b+" error":G)),b},indent:function(c,x,b){var v=c.context;if(c.tokenize.isInAttribute)return c.tagStart==c.indented?c.stringStartCol+1:c.indented+Ce;if(v&&v.noIndent)return F.Pass;if(c.tokenize!=ce&&c.tokenize!=se)return b?b.match(/^(\s*)/)[0].length:0;if(c.tagName)return M.multilineTagIndentPastTag!==!1?c.tagStart+c.tagName.length+2:c.tagStart+Ce*(M.multilineTagIndentFactor||1);if(M.alignCDATA&&/<!\[CDATA\[/.test(x))return 0;var g=x&&/^<(\/)?([\w_:\.-]*)/.exec(x);if(g&&g[1])for(;v;)if(v.tagName==g[2]){v=v.prev;break}else if(M.implicitlyClosed.hasOwnProperty(ae(v.tagName)))v=v.prev;else break;else if(g)for(;v;){var D=M.contextGrabbers[ae(v.tagName)];if(D&&D.hasOwnProperty(ae(g[2])))v=v.prev;else break}for(;v&&v.prev&&!v.startOfLine;)v=v.prev;return v?v.indent+Ce:c.baseIndent||0},electricInput:/<\/[\s\w:]+>$/,blockCommentStart:"<!--",blockCommentEnd:"-->",configuration:M.htmlMode?"html":"xml",helperType:M.htmlMode?"html":"xml",skipAttribute:function(c){c.state==T&&(c.state=X)},xmlCurrentTag:function(c){return c.tagName?{name:c.tagName,close:c.type=="closeTag"}:null},xmlCurrentContext:function(c){for(var x=[],b=c.context;b;b=b.prev)x.push(b.tagName);return x.reverse()}}}),F.defineMIME("text/xml","xml"),F.defineMIME("application/xml","xml"),F.mimeModes.hasOwnProperty("text/html")||F.defineMIME("text/html",{name:"xml",htmlMode:!0})})}()),pa.exports}var ga={exports:{}},ya;function ma(){return ya||(ya=1,function(yr,Or){(function(F){F(Ar())})(function(F){F.defineMode("javascript",function(Ee,Se){var We=Ee.indentUnit,Qe=Se.statementIndent,Ce=Se.jsonld,M=Se.json||Ce,j=Se.trackScope!==!1,_=Se.typescript,ie=Se.wordCharacters||/[\w$\xa1-\uffff]/,G=function(){function f(et){return{type:et,style:"keyword"}}var h=f("keyword a"),L=f("keyword b"),O=f("keyword c"),k=f("keyword d"),I=f("operator"),De={type:"atom",style:"atom"};return{if:f("if"),while:h,with:h,else:L,do:L,try:L,finally:L,return:k,break:k,continue:k,new:f("new"),delete:O,void:O,throw:O,debugger:f("debugger"),var:f("var"),const:f("var"),let:f("var"),function:f("function"),catch:f("catch"),for:f("for"),switch:f("switch"),case:f("case"),default:f("default"),in:I,typeof:I,instanceof:I,true:De,false:De,null:De,undefined:De,NaN:De,Infinity:De,this:f("this"),class:f("class"),super:f("atom"),yield:O,export:f("export"),import:f("import"),extends:O,await:O}}(),se=/[+\-*&%=<>!?|~^@]/,ce=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;function Ie(f){for(var h=!1,L,O=!1;(L=f.next())!=null;){if(!h){if(L=="/"&&!O)return;L=="["?O=!0:O&&L=="]"&&(O=!1)}h=!h&&L=="\\"}}var Te,Oe;function ae(f,h,L){return Te=f,Oe=L,h}function V(f,h){var L=f.next();if(L=='"'||L=="'")return h.tokenize=oe(L),h.tokenize(f,h);if(L=="."&&f.match(/^\d[\d_]*(?:[eE][+\-]?[\d_]+)?/))return ae("number","number");if(L=="."&&f.match(".."))return ae("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(L))return ae(L);if(L=="="&&f.eat(">"))return ae("=>","operator");if(L=="0"&&f.match(/^(?:x[\dA-Fa-f_]+|o[0-7_]+|b[01_]+)n?/))return ae("number","number");if(/\d/.test(L))return f.match(/^[\d_]*(?:n|(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)?/),ae("number","number");if(L=="/")return f.eat("*")?(h.tokenize=xe,xe(f,h)):f.eat("/")?(f.skipToEnd(),ae("comment","comment")):Dt(f,h,1)?(Ie(f),f.match(/^\b(([gimyus])(?![gimyus]*\2))+\b/),ae("regexp","string-2")):(f.eat("="),ae("operator","operator",f.current()));if(L=="`")return h.tokenize=_e,_e(f,h);if(L=="#"&&f.peek()=="!")return f.skipToEnd(),ae("meta","meta");if(L=="#"&&f.eatWhile(ie))return ae("variable","property");if(L=="<"&&f.match("!--")||L=="-"&&f.match("->")&&!/\S/.test(f.string.slice(0,f.start)))return f.skipToEnd(),ae("comment","comment");if(se.test(L))return(L!=">"||!h.lexical||h.lexical.type!=">")&&(f.eat("=")?(L=="!"||L=="=")&&f.eat("="):/[<>*+\-|&?]/.test(L)&&(f.eat(L),L==">"&&f.eat(L))),L=="?"&&f.eat(".")?ae("."):ae("operator","operator",f.current());if(ie.test(L)){f.eatWhile(ie);var O=f.current();if(h.lastType!="."){if(G.propertyIsEnumerable(O)){var k=G[O];return ae(k.type,k.style,O)}if(O=="async"&&f.match(/^(\s|\/\*([^*]|\*(?!\/))*?\*\/)*[\[\(\w]/,!1))return ae("async","keyword",O)}return ae("variable","variable",O)}}function oe(f){return function(h,L){var O=!1,k;if(Ce&&h.peek()=="@"&&h.match(ce))return L.tokenize=V,ae("jsonld-keyword","meta");for(;(k=h.next())!=null&&!(k==f&&!O);)O=!O&&k=="\\";return O||(L.tokenize=V),ae("string","string")}}function xe(f,h){for(var L=!1,O;O=f.next();){if(O=="/"&&L){h.tokenize=V;break}L=O=="*"}return ae("comment","comment")}function _e(f,h){for(var L=!1,O;(O=f.next())!=null;){if(!L&&(O=="`"||O=="$"&&f.eat("{"))){h.tokenize=V;break}L=!L&&O=="\\"}return ae("quasi","string-2",f.current())}var ye="([{}])";function Me(f,h){h.fatArrowAt&&(h.fatArrowAt=null);var L=f.string.indexOf("=>",f.start);if(!(L<0)){if(_){var O=/:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(f.string.slice(f.start,L));O&&(L=O.index)}for(var k=0,I=!1,De=L-1;De>=0;--De){var et=f.string.charAt(De),mt=ye.indexOf(et);if(mt>=0&&mt<3){if(!k){++De;break}if(--k==0){et=="("&&(I=!0);break}}else if(mt>=3&&mt<6)++k;else if(ie.test(et))I=!0;else if(/["'\/`]/.test(et))for(;;--De){if(De==0)return;var Hr=f.string.charAt(De-1);if(Hr==et&&f.string.charAt(De-2)!="\\"){De--;break}}else if(I&&!k){++De;break}}I&&!k&&(h.fatArrowAt=De)}}var He={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,this:!0,import:!0,"jsonld-keyword":!0};function ee(f,h,L,O,k,I){this.indented=f,this.column=h,this.type=L,this.prev=k,this.info=I,O!=null&&(this.align=O)}function X(f,h){if(!j)return!1;for(var L=f.localVars;L;L=L.next)if(L.name==h)return!0;for(var O=f.context;O;O=O.prev)for(var L=O.vars;L;L=L.next)if(L.name==h)return!0}function me(f,h,L,O,k){var I=f.cc;for(T.state=f,T.stream=k,T.marked=null,T.cc=I,T.style=h,f.lexical.hasOwnProperty("align")||(f.lexical.align=!0);;){var De=I.length?I.pop():M?q:he;if(De(L,O)){for(;I.length&&I[I.length-1].lex;)I.pop()();return T.marked?T.marked:L=="variable"&&X(f,O)?"variable-2":h}}}var T={state:null,column:null,marked:null,cc:null};function H(){for(var f=arguments.length-1;f>=0;f--)T.cc.push(arguments[f])}function c(){return H.apply(null,arguments),!0}function x(f,h){for(var L=h;L;L=L.next)if(L.name==f)return!0;return!1}function b(f){var h=T.state;if(T.marked="def",!!j){if(h.context){if(h.lexical.info=="var"&&h.context&&h.context.block){var L=v(f,h.context);if(L!=null){h.context=L;return}}else if(!x(f,h.localVars)){h.localVars=new K(f,h.localVars);return}}Se.globalVars&&!x(f,h.globalVars)&&(h.globalVars=new K(f,h.globalVars))}}function v(f,h){if(h)if(h.block){var L=v(f,h.prev);return L?L==h.prev?h:new D(L,h.vars,!0):null}else return x(f,h.vars)?h:new D(h.prev,new K(f,h.vars),!1);else return null}function g(f){return f=="public"||f=="private"||f=="protected"||f=="abstract"||f=="readonly"}function D(f,h,L){this.prev=f,this.vars=h,this.block=L}function K(f,h){this.name=f,this.next=h}var $=new K("this",new K("arguments",null));function pe(){T.state.context=new D(T.state.context,T.state.localVars,!1),T.state.localVars=$}function Re(){T.state.context=new D(T.state.context,T.state.localVars,!0),T.state.localVars=null}pe.lex=Re.lex=!0;function ze(){T.state.localVars=T.state.context.vars,T.state.context=T.state.context.prev}ze.lex=!0;function le(f,h){var L=function(){var O=T.state,k=O.indented;if(O.lexical.type=="stat")k=O.lexical.indented;else for(var I=O.lexical;I&&I.type==")"&&I.align;I=I.prev)k=I.indented;O.lexical=new ee(k,T.stream.column(),f,null,O.lexical,h)};return L.lex=!0,L}function te(){var f=T.state;f.lexical.prev&&(f.lexical.type==")"&&(f.indented=f.lexical.indented),f.lexical=f.lexical.prev)}te.lex=!0;function de(f){function h(L){return L==f?c():f==";"||L=="}"||L==")"||L=="]"?H():c(h)}return h}function he(f,h){return f=="var"?c(le("vardef",h),zr,de(";"),te):f=="keyword a"?c(le("form"),Ct,he,te):f=="keyword b"?c(le("form"),he,te):f=="keyword d"?T.stream.match(/^\s*$/,!1)?c():c(le("stat"),gt,de(";"),te):f=="debugger"?c(de(";")):f=="{"?c(le("}"),Re,Ot,te,ze):f==";"?c():f=="if"?(T.state.lexical.info=="else"&&T.state.cc[T.state.cc.length-1]==te&&T.state.cc.pop()(),c(le("form"),Ct,he,te,Pr)):f=="function"?c(Pt):f=="for"?c(le("form"),Re,_n,he,ze,te):f=="class"||_&&h=="interface"?(T.marked="keyword",c(le("form",f=="class"?f:h),Er,te)):f=="variable"?_&&h=="declare"?(T.marked="keyword",c(he)):_&&(h=="module"||h=="enum"||h=="type")&&T.stream.match(/^\s*\w/,!1)?(T.marked="keyword",h=="enum"?c(U):h=="type"?c(Hn,de("operator"),ke,de(";")):c(le("form"),yt,de("{"),le("}"),Ot,te,te)):_&&h=="namespace"?(T.marked="keyword",c(le("form"),q,he,te)):_&&h=="abstract"?(T.marked="keyword",c(he)):c(le("stat"),be):f=="switch"?c(le("form"),Ct,de("{"),le("}","switch"),Re,Ot,te,te,ze):f=="case"?c(q,de(":")):f=="default"?c(de(":")):f=="catch"?c(le("form"),pe,ue,he,te,ze):f=="export"?c(le("stat"),Ir,te):f=="import"?c(le("stat"),ar,te):f=="async"?c(he):h=="@"?c(q,he):H(le("stat"),q,de(";"),te)}function ue(f){if(f=="(")return c(Ft,de(")"))}function q(f,h){return st(f,h,!1)}function Ve(f,h){return st(f,h,!0)}function Ct(f){return f!="("?H():c(le(")"),gt,de(")"),te)}function st(f,h,L){if(T.state.fatArrowAt==T.stream.start){var O=L?Ne:re;if(f=="(")return c(pe,le(")"),ve(Ft,")"),te,de("=>"),O,ze);if(f=="variable")return H(pe,yt,de("=>"),O,ze)}var k=L?Ke:Le;return He.hasOwnProperty(f)?c(k):f=="function"?c(Pt,k):f=="class"||_&&h=="interface"?(T.marked="keyword",c(le("form"),mi,te)):f=="keyword c"||f=="async"?c(L?Ve:q):f=="("?c(le(")"),gt,de(")"),te,k):f=="operator"||f=="spread"?c(L?Ve:q):f=="["?c(le("]"),je,te,k):f=="{"?Tt(ne,"}",null,k):f=="quasi"?H(lt,k):f=="new"?c(w(L)):c()}function gt(f){return f.match(/[;\}\)\],]/)?H():H(q)}function Le(f,h){return f==","?c(gt):Ke(f,h,!1)}function Ke(f,h,L){var O=L==!1?Le:Ke,k=L==!1?q:Ve;if(f=="=>")return c(pe,L?Ne:re,ze);if(f=="operator")return/\+\+|--/.test(h)||_&&h=="!"?c(O):_&&h=="<"&&T.stream.match(/^([^<>]|<[^<>]*>)*>\s*\(/,!1)?c(le(">"),ve(ke,">"),te,O):h=="?"?c(q,de(":"),k):c(k);if(f=="quasi")return H(lt,O);if(f!=";"){if(f=="(")return Tt(Ve,")","call",O);if(f==".")return c(R,O);if(f=="[")return c(le("]"),gt,de("]"),te,O);if(_&&h=="as")return T.marked="keyword",c(ke,O);if(f=="regexp")return T.state.lastType=T.marked="operator",T.stream.backUp(T.stream.pos-T.stream.start-1),c(k)}}function lt(f,h){return f!="quasi"?H():h.slice(h.length-2)!="${"?c(lt):c(gt,ht)}function ht(f){if(f=="}")return T.marked="string-2",T.state.tokenize=_e,c(lt)}function re(f){return Me(T.stream,T.state),H(f=="{"?he:q)}function Ne(f){return Me(T.stream,T.state),H(f=="{"?he:Ve)}function w(f){return function(h){return h=="."?c(f?C:A):h=="variable"&&_?c(Lt,f?Ke:Le):H(f?Ve:q)}}function A(f,h){if(h=="target")return T.marked="keyword",c(Le)}function C(f,h){if(h=="target")return T.marked="keyword",c(Ke)}function be(f){return f==":"?c(te,he):H(Le,de(";"),te)}function R(f){if(f=="variable")return T.marked="property",c()}function ne(f,h){if(f=="async")return T.marked="property",c(ne);if(f=="variable"||T.style=="keyword"){if(T.marked="property",h=="get"||h=="set")return c(Y);var L;return _&&T.state.fatArrowAt==T.stream.start&&(L=T.stream.match(/^\s*:\s*/,!1))&&(T.state.fatArrowAt=T.stream.pos+L[0].length),c(we)}else{if(f=="number"||f=="string")return T.marked=Ce?"property":T.style+" property",c(we);if(f=="jsonld-keyword")return c(we);if(_&&g(h))return T.marked="keyword",c(ne);if(f=="[")return c(q,rr,de("]"),we);if(f=="spread")return c(Ve,we);if(h=="*")return T.marked="keyword",c(ne);if(f==":")return H(we)}}function Y(f){return f!="variable"?H(we):(T.marked="property",c(Pt))}function we(f){if(f==":")return c(Ve);if(f=="(")return H(Pt)}function ve(f,h,L){function O(k,I){if(L?L.indexOf(k)>-1:k==","){var De=T.state.lexical;return De.info=="call"&&(De.pos=(De.pos||0)+1),c(function(et,mt){return et==h||mt==h?H():H(f)},O)}return k==h||I==h?c():L&&L.indexOf(";")>-1?H(f):c(de(h))}return function(k,I){return k==h||I==h?c():H(f,O)}}function Tt(f,h,L){for(var O=3;O<arguments.length;O++)T.cc.push(arguments[O]);return c(le(h,L),ve(f,h),te)}function Ot(f){return f=="}"?c():H(he,Ot)}function rr(f,h){if(_){if(f==":")return c(ke);if(h=="?")return c(rr)}}function mr(f,h){if(_&&(f==":"||h=="in"))return c(ke)}function nr(f){if(_&&f==":")return T.stream.match(/^\s*\w+\s+is\b/,!1)?c(q,gi,ke):c(ke)}function gi(f,h){if(h=="is")return T.marked="keyword",c()}function ke(f,h){if(h=="keyof"||h=="typeof"||h=="infer"||h=="readonly")return T.marked="keyword",c(h=="typeof"?Ve:ke);if(f=="variable"||h=="void")return T.marked="type",c(zt);if(h=="|"||h=="&")return c(ke);if(f=="string"||f=="number"||f=="atom")return c(zt);if(f=="[")return c(le("]"),ve(ke,"]",","),te,zt);if(f=="{")return c(le("}"),J,te,zt);if(f=="(")return c(ve(Ge,")"),Wn,zt);if(f=="<")return c(ve(ke,">"),ke);if(f=="quasi")return H(ut,zt)}function Wn(f){if(f=="=>")return c(ke)}function J(f){return f.match(/[\}\)\]]/)?c():f==","||f==";"?c(J):H(Yt,J)}function Yt(f,h){if(f=="variable"||T.style=="keyword")return T.marked="property",c(Yt);if(h=="?"||f=="number"||f=="string")return c(Yt);if(f==":")return c(ke);if(f=="[")return c(de("variable"),mr,de("]"),Yt);if(f=="(")return H(lr,Yt);if(!f.match(/[;\}\)\],]/))return c()}function ut(f,h){return f!="quasi"?H():h.slice(h.length-2)!="${"?c(ut):c(ke,qe)}function qe(f){if(f=="}")return T.marked="string-2",T.state.tokenize=_e,c(ut)}function Ge(f,h){return f=="variable"&&T.stream.match(/^\s*[?:]/,!1)||h=="?"?c(Ge):f==":"?c(ke):f=="spread"?c(Ge):H(ke)}function zt(f,h){if(h=="<")return c(le(">"),ve(ke,">"),te,zt);if(h=="|"||f=="."||h=="&")return c(ke);if(f=="[")return c(ke,de("]"),zt);if(h=="extends"||h=="implements")return T.marked="keyword",c(ke);if(h=="?")return c(ke,de(":"),ke)}function Lt(f,h){if(h=="<")return c(le(">"),ve(ke,">"),te,zt)}function Et(){return H(ke,ft)}function ft(f,h){if(h=="=")return c(ke)}function zr(f,h){return h=="enum"?(T.marked="keyword",c(U)):H(yt,rr,It,yi)}function yt(f,h){if(_&&g(h))return T.marked="keyword",c(yt);if(f=="variable")return b(h),c();if(f=="spread")return c(yt);if(f=="[")return Tt(ln,"]");if(f=="{")return Tt(ir,"}")}function ir(f,h){return f=="variable"&&!T.stream.match(/^\s*:/,!1)?(b(h),c(It)):(f=="variable"&&(T.marked="property"),f=="spread"?c(yt):f=="}"?H():f=="["?c(q,de("]"),de(":"),ir):c(de(":"),yt,It))}function ln(){return H(yt,It)}function It(f,h){if(h=="=")return c(Ve)}function yi(f){if(f==",")return c(zr)}function Pr(f,h){if(f=="keyword b"&&h=="else")return c(le("form","else"),he,te)}function _n(f,h){if(h=="await")return c(_n);if(f=="(")return c(le(")"),an,te)}function an(f){return f=="var"?c(zr,or):f=="variable"?c(or):H(or)}function or(f,h){return f==")"?c():f==";"?c(or):h=="in"||h=="of"?(T.marked="keyword",c(q,or)):H(q,or)}function Pt(f,h){if(h=="*")return T.marked="keyword",c(Pt);if(f=="variable")return b(h),c(Pt);if(f=="(")return c(pe,le(")"),ve(Ft,")"),te,nr,he,ze);if(_&&h=="<")return c(le(">"),ve(Et,">"),te,Pt)}function lr(f,h){if(h=="*")return T.marked="keyword",c(lr);if(f=="variable")return b(h),c(lr);if(f=="(")return c(pe,le(")"),ve(Ft,")"),te,nr,ze);if(_&&h=="<")return c(le(">"),ve(Et,">"),te,lr)}function Hn(f,h){if(f=="keyword"||f=="variable")return T.marked="type",c(Hn);if(h=="<")return c(le(">"),ve(Et,">"),te)}function Ft(f,h){return h=="@"&&c(q,Ft),f=="spread"?c(Ft):_&&g(h)?(T.marked="keyword",c(Ft)):_&&f=="this"?c(rr,It):H(yt,rr,It)}function mi(f,h){return f=="variable"?Er(f,h):Wt(f,h)}function Er(f,h){if(f=="variable")return b(h),c(Wt)}function Wt(f,h){if(h=="<")return c(le(">"),ve(Et,">"),te,Wt);if(h=="extends"||h=="implements"||_&&f==",")return h=="implements"&&(T.marked="keyword"),c(_?ke:q,Wt);if(f=="{")return c(le("}"),_t,te)}function _t(f,h){if(f=="async"||f=="variable"&&(h=="static"||h=="get"||h=="set"||_&&g(h))&&T.stream.match(/^\s+#?[\w$\xa1-\uffff]/,!1))return T.marked="keyword",c(_t);if(f=="variable"||T.style=="keyword")return T.marked="property",c(br,_t);if(f=="number"||f=="string")return c(br,_t);if(f=="[")return c(q,rr,de("]"),br,_t);if(h=="*")return T.marked="keyword",c(_t);if(_&&f=="(")return H(lr,_t);if(f==";"||f==",")return c(_t);if(f=="}")return c();if(h=="@")return c(q,_t)}function br(f,h){if(h=="!"||h=="?")return c(br);if(f==":")return c(ke,It);if(h=="=")return c(Ve);var L=T.state.lexical.prev,O=L&&L.info=="interface";return H(O?lr:Pt)}function Ir(f,h){return h=="*"?(T.marked="keyword",c(_r,de(";"))):h=="default"?(T.marked="keyword",c(q,de(";"))):f=="{"?c(ve(Fr,"}"),_r,de(";")):H(he)}function Fr(f,h){if(h=="as")return T.marked="keyword",c(de("variable"));if(f=="variable")return H(Ve,Fr)}function ar(f){return f=="string"?c():f=="("?H(q):f=="."?H(Le):H(Wr,Ut,_r)}function Wr(f,h){return f=="{"?Tt(Wr,"}"):(f=="variable"&&b(h),h=="*"&&(T.marked="keyword"),c(sn))}function Ut(f){if(f==",")return c(Wr,Ut)}function sn(f,h){if(h=="as")return T.marked="keyword",c(Wr)}function _r(f,h){if(h=="from")return T.marked="keyword",c(q)}function je(f){return f=="]"?c():H(ve(Ve,"]"))}function U(){return H(le("form"),yt,de("{"),le("}"),ve(Zt,"}"),te,te)}function Zt(){return H(yt,It)}function un(f,h){return f.lastType=="operator"||f.lastType==","||se.test(h.charAt(0))||/[,.]/.test(h.charAt(0))}function Dt(f,h,L){return h.tokenize==V&&/^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(h.lastType)||h.lastType=="quasi"&&/\{\s*$/.test(f.string.slice(0,f.pos-(L||0)))}return{startState:function(f){var h={tokenize:V,lastType:"sof",cc:[],lexical:new ee((f||0)-We,0,"block",!1),localVars:Se.localVars,context:Se.localVars&&new D(null,null,!1),indented:f||0};return Se.globalVars&&typeof Se.globalVars=="object"&&(h.globalVars=Se.globalVars),h},token:function(f,h){if(f.sol()&&(h.lexical.hasOwnProperty("align")||(h.lexical.align=!1),h.indented=f.indentation(),Me(f,h)),h.tokenize!=xe&&f.eatSpace())return null;var L=h.tokenize(f,h);return Te=="comment"?L:(h.lastType=Te=="operator"&&(Oe=="++"||Oe=="--")?"incdec":Te,me(h,L,Te,Oe,f))},indent:function(f,h){if(f.tokenize==xe||f.tokenize==_e)return F.Pass;if(f.tokenize!=V)return 0;var L=h&&h.charAt(0),O=f.lexical,k;if(!/^\s*else\b/.test(h))for(var I=f.cc.length-1;I>=0;--I){var De=f.cc[I];if(De==te)O=O.prev;else if(De!=Pr&&De!=ze)break}for(;(O.type=="stat"||O.type=="form")&&(L=="}"||(k=f.cc[f.cc.length-1])&&(k==Le||k==Ke)&&!/^[,\.=+\-*:?[\(]/.test(h));)O=O.prev;Qe&&O.type==")"&&O.prev.type=="stat"&&(O=O.prev);var et=O.type,mt=L==et;return et=="vardef"?O.indented+(f.lastType=="operator"||f.lastType==","?O.info.length+1:0):et=="form"&&L=="{"?O.indented:et=="form"?O.indented+We:et=="stat"?O.indented+(un(f,h)?Qe||We:0):O.info=="switch"&&!mt&&Se.doubleIndentSwitch!=!1?O.indented+(/^(?:case|default)\b/.test(h)?We:2*We):O.align?O.column+(mt?0:1):O.indented+(mt?0:We)},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:M?null:"/*",blockCommentEnd:M?null:"*/",blockCommentContinue:M?null:" * ",lineComment:M?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:M?"json":"javascript",jsonldMode:Ce,jsonMode:M,expressionAllowed:Dt,skipExpression:function(f){me(f,"atom","atom","true",new F.StringStream("",2,null))}}}),F.registerHelper("wordChars","javascript",/[\w$]/),F.defineMIME("text/javascript","javascript"),F.defineMIME("text/ecmascript","javascript"),F.defineMIME("application/javascript","javascript"),F.defineMIME("application/x-javascript","javascript"),F.defineMIME("application/ecmascript","javascript"),F.defineMIME("application/json",{name:"javascript",json:!0}),F.defineMIME("application/x-json",{name:"javascript",json:!0}),F.defineMIME("application/manifest+json",{name:"javascript",json:!0}),F.defineMIME("application/ld+json",{name:"javascript",jsonld:!0}),F.defineMIME("text/typescript",{name:"javascript",typescript:!0}),F.defineMIME("application/typescript",{name:"javascript",typescript:!0})})}()),ga.exports}(function(yr,Or){(function(F){F(Ar(),Su(),ma(),ku)})(function(F){var Ee={script:[["lang",/(javascript|babel)/i,"javascript"],["type",/^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i,"javascript"],["type",/./,"text/plain"],[null,null,"javascript"]],style:[["lang",/^css$/i,"css"],["type",/^(text\/)?(x-)?(stylesheet|css)$/i,"css"],["type",/./,"text/plain"],[null,null,"css"]]};function Se(ie,G,se){var ce=ie.current(),Ie=ce.search(G);return Ie>-1?ie.backUp(ce.length-Ie):ce.match(/<\/?$/)&&(ie.backUp(ce.length),ie.match(G,!1)||ie.match(ce)),se}var We={};function Qe(ie){var G=We[ie];return G||(We[ie]=new RegExp("\\s+"+ie+`\\s*=\\s*('|")?([^'"]+)('|")?\\s*`))}function Ce(ie,G){var se=ie.match(Qe(G));return se?/^\s*(.*?)\s*$/.exec(se[2])[1]:""}function M(ie,G){return new RegExp((G?"^":"")+"</\\s*"+ie+"\\s*>","i")}function j(ie,G){for(var se in ie)for(var ce=G[se]||(G[se]=[]),Ie=ie[se],Te=Ie.length-1;Te>=0;Te--)ce.unshift(Ie[Te])}function _(ie,G){for(var se=0;se<ie.length;se++){var ce=ie[se];if(!ce[0]||ce[1].test(Ce(G,ce[0])))return ce[2]}}F.defineMode("htmlmixed",function(ie,G){var se=F.getMode(ie,{name:"xml",htmlMode:!0,multilineTagIndentFactor:G.multilineTagIndentFactor,multilineTagIndentPastTag:G.multilineTagIndentPastTag,allowMissingTagName:G.allowMissingTagName}),ce={},Ie=G&&G.tags,Te=G&&G.scriptTypes;if(j(Ee,ce),Ie&&j(Ie,ce),Te)for(var Oe=Te.length-1;Oe>=0;Oe--)ce.script.unshift(["type",Te[Oe].matches,Te[Oe].mode]);function ae(V,oe){var xe=se.token(V,oe.htmlState),_e=/\btag\b/.test(xe),ye;if(_e&&!/[<>\s\/]/.test(V.current())&&(ye=oe.htmlState.tagName&&oe.htmlState.tagName.toLowerCase())&&ce.hasOwnProperty(ye))oe.inTag=ye+" ";else if(oe.inTag&&_e&&/>$/.test(V.current())){var Me=/^([\S]+) (.*)/.exec(oe.inTag);oe.inTag=null;var He=V.current()==">"&&_(ce[Me[1]],Me[2]),ee=F.getMode(ie,He),X=M(Me[1],!0),me=M(Me[1],!1);oe.token=function(T,H){return T.match(X,!1)?(H.token=ae,H.localState=H.localMode=null,null):Se(T,me,H.localMode.token(T,H.localState))},oe.localMode=ee,oe.localState=F.startState(ee,se.indent(oe.htmlState,"",""))}else oe.inTag&&(oe.inTag+=V.current(),V.eol()&&(oe.inTag+=" "));return xe}return{startState:function(){var V=F.startState(se);return{token:ae,inTag:null,localMode:null,localState:null,htmlState:V}},copyState:function(V){var oe;return V.localState&&(oe=F.copyState(V.localMode,V.localState)),{token:V.token,inTag:V.inTag,localMode:V.localMode,localState:oe,htmlState:F.copyState(se,V.htmlState)}},token:function(V,oe){return oe.token(V,oe)},indent:function(V,oe,xe){return!V.localMode||/^\s*<\//.test(oe)?se.indent(V.htmlState,oe,xe):V.localMode.indent?V.localMode.indent(V.localState,oe,xe):F.Pass},innerMode:function(V){return{state:V.localState||V.htmlState,mode:V.localMode||se}}}},"xml","javascript","css"),F.defineMIME("text/html","htmlmixed")})})();ma();(function(yr,Or){(function(F){F(Ar())})(function(F){function Ee(j){return new RegExp("^(("+j.join(")|(")+"))\\b")}var Se=Ee(["and","or","not","is"]),We=["as","assert","break","class","continue","def","del","elif","else","except","finally","for","from","global","if","import","lambda","pass","raise","return","try","while","with","yield","in","False","True"],Qe=["abs","all","any","bin","bool","bytearray","callable","chr","classmethod","compile","complex","delattr","dict","dir","divmod","enumerate","eval","filter","float","format","frozenset","getattr","globals","hasattr","hash","help","hex","id","input","int","isinstance","issubclass","iter","len","list","locals","map","max","memoryview","min","next","object","oct","open","ord","pow","property","range","repr","reversed","round","set","setattr","slice","sorted","staticmethod","str","sum","super","tuple","type","vars","zip","__import__","NotImplemented","Ellipsis","__debug__"];F.registerHelper("hintWords","python",We.concat(Qe).concat(["exec","print"]));function Ce(j){return j.scopes[j.scopes.length-1]}F.defineMode("python",function(j,_){for(var ie="error",G=_.delimiters||_.singleDelimiters||/^[\(\)\[\]\{\}@,:`=;\.\\]/,se=[_.singleOperators,_.doubleOperators,_.doubleDelimiters,_.tripleDelimiters,_.operators||/^([-+*/%\/&|^]=?|[<>=]+|\/\/=?|\*\*=?|!=|[~!@]|\.\.\.)/],ce=0;ce<se.length;ce++)se[ce]||se.splice(ce--,1);var Ie=_.hangingIndent||j.indentUnit,Te=We,Oe=Qe;_.extra_keywords!=null&&(Te=Te.concat(_.extra_keywords)),_.extra_builtins!=null&&(Oe=Oe.concat(_.extra_builtins));var ae=!(_.version&&Number(_.version)<3);if(ae){var V=_.identifiers||/^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;Te=Te.concat(["nonlocal","None","aiter","anext","async","await","breakpoint","match","case"]),Oe=Oe.concat(["ascii","bytes","exec","print"]);var oe=new RegExp(`^(([rbuf]|(br)|(rb)|(fr)|(rf))?('{3}|"{3}|['"]))`,"i")}else{var V=_.identifiers||/^[_A-Za-z][_A-Za-z0-9]*/;Te=Te.concat(["exec","print"]),Oe=Oe.concat(["apply","basestring","buffer","cmp","coerce","execfile","file","intern","long","raw_input","reduce","reload","unichr","unicode","xrange","None"]);var oe=new RegExp(`^(([rubf]|(ur)|(br))?('{3}|"{3}|['"]))`,"i")}var xe=Ee(Te),_e=Ee(Oe);function ye(x,b){var v=x.sol()&&b.lastToken!="\\";if(v&&(b.indent=x.indentation()),v&&Ce(b).type=="py"){var g=Ce(b).offset;if(x.eatSpace()){var D=x.indentation();return D>g?X(b):D<g&&T(x,b)&&x.peek()!="#"&&(b.errorToken=!0),null}else{var K=Me(x,b);return g>0&&T(x,b)&&(K+=" "+ie),K}}return Me(x,b)}function Me(x,b,v){if(x.eatSpace())return null;if(!v&&x.match(/^#.*/))return"comment";if(x.match(/^[0-9\.]/,!1)){var g=!1;if(x.match(/^[\d_]*\.\d+(e[\+\-]?\d+)?/i)&&(g=!0),x.match(/^[\d_]+\.\d*/)&&(g=!0),x.match(/^\.\d+/)&&(g=!0),g)return x.eat(/J/i),"number";var D=!1;if(x.match(/^0x[0-9a-f_]+/i)&&(D=!0),x.match(/^0b[01_]+/i)&&(D=!0),x.match(/^0o[0-7_]+/i)&&(D=!0),x.match(/^[1-9][\d_]*(e[\+\-]?[\d_]+)?/)&&(x.eat(/J/i),D=!0),x.match(/^0(?![\dx])/i)&&(D=!0),D)return x.eat(/L/i),"number"}if(x.match(oe)){var K=x.current().toLowerCase().indexOf("f")!==-1;return K?(b.tokenize=He(x.current(),b.tokenize),b.tokenize(x,b)):(b.tokenize=ee(x.current(),b.tokenize),b.tokenize(x,b))}for(var $=0;$<se.length;$++)if(x.match(se[$]))return"operator";return x.match(G)?"punctuation":b.lastToken=="."&&x.match(V)?"property":x.match(xe)||x.match(Se)?"keyword":x.match(_e)?"builtin":x.match(/^(self|cls)\b/)?"variable-2":x.match(V)?b.lastToken=="def"||b.lastToken=="class"?"def":"variable":(x.next(),v?null:ie)}function He(x,b){for(;"rubf".indexOf(x.charAt(0).toLowerCase())>=0;)x=x.substr(1);var v=x.length==1,g="string";function D($){return function(pe,Re){var ze=Me(pe,Re,!0);return ze=="punctuation"&&(pe.current()=="{"?Re.tokenize=D($+1):pe.current()=="}"&&($>1?Re.tokenize=D($-1):Re.tokenize=K)),ze}}function K($,pe){for(;!$.eol();)if($.eatWhile(/[^'"\{\}\\]/),$.eat("\\")){if($.next(),v&&$.eol())return g}else{if($.match(x))return pe.tokenize=b,g;if($.match("{{"))return g;if($.match("{",!1))return pe.tokenize=D(0),$.current()?g:pe.tokenize($,pe);if($.match("}}"))return g;if($.match("}"))return ie;$.eat(/['"]/)}if(v){if(_.singleLineStringErrors)return ie;pe.tokenize=b}return g}return K.isString=!0,K}function ee(x,b){for(;"rubf".indexOf(x.charAt(0).toLowerCase())>=0;)x=x.substr(1);var v=x.length==1,g="string";function D(K,$){for(;!K.eol();)if(K.eatWhile(/[^'"\\]/),K.eat("\\")){if(K.next(),v&&K.eol())return g}else{if(K.match(x))return $.tokenize=b,g;K.eat(/['"]/)}if(v){if(_.singleLineStringErrors)return ie;$.tokenize=b}return g}return D.isString=!0,D}function X(x){for(;Ce(x).type!="py";)x.scopes.pop();x.scopes.push({offset:Ce(x).offset+j.indentUnit,type:"py",align:null})}function me(x,b,v){var g=x.match(/^[\s\[\{\(]*(?:#|$)/,!1)?null:x.column()+1;b.scopes.push({offset:b.indent+Ie,type:v,align:g})}function T(x,b){for(var v=x.indentation();b.scopes.length>1&&Ce(b).offset>v;){if(Ce(b).type!="py")return!0;b.scopes.pop()}return Ce(b).offset!=v}function H(x,b){x.sol()&&(b.beginningOfLine=!0,b.dedent=!1);var v=b.tokenize(x,b),g=x.current();if(b.beginningOfLine&&g=="@")return x.match(V,!1)?"meta":ae?"operator":ie;if(/\S/.test(g)&&(b.beginningOfLine=!1),(v=="variable"||v=="builtin")&&b.lastToken=="meta"&&(v="meta"),(g=="pass"||g=="return")&&(b.dedent=!0),g=="lambda"&&(b.lambda=!0),g==":"&&!b.lambda&&Ce(b).type=="py"&&x.match(/^\s*(?:#|$)/,!1)&&X(b),g.length==1&&!/string|comment/.test(v)){var D="[({".indexOf(g);if(D!=-1&&me(x,b,"])}".slice(D,D+1)),D="])}".indexOf(g),D!=-1)if(Ce(b).type==g)b.indent=b.scopes.pop().offset-Ie;else return ie}return b.dedent&&x.eol()&&Ce(b).type=="py"&&b.scopes.length>1&&b.scopes.pop(),v}var c={startState:function(x){return{tokenize:ye,scopes:[{offset:x||0,type:"py",align:null}],indent:x||0,lastToken:null,lambda:!1,dedent:0}},token:function(x,b){var v=b.errorToken;v&&(b.errorToken=!1);var g=H(x,b);return g&&g!="comment"&&(b.lastToken=g=="keyword"||g=="punctuation"?x.current():g),g=="punctuation"&&(g=null),x.eol()&&b.lambda&&(b.lambda=!1),v?g+" "+ie:g},indent:function(x,b){if(x.tokenize!=ye)return x.tokenize.isString?F.Pass:0;var v=Ce(x),g=v.type==b.charAt(0)||v.type=="py"&&!x.dedent&&/^(else:|elif |except |finally:)/.test(b);return v.align!=null?v.align-(g?1:0):v.offset-(g?Ie:0)},electricInput:/^\s*([\}\]\)]|else:|elif |except |finally:)$/,closeBrackets:{triples:`'"`},lineComment:"#",fold:"indent"};return c}),F.defineMIME("text/x-python","python");var M=function(j){return j.split(" ")};F.defineMIME("text/x-cython",{name:"python",extra_keywords:M("by cdef cimport cpdef ctypedef enum except extern gil include nogil property public readonly struct union DEF IF ELIF ELSE")})})})();(function(yr,Or){(function(F){F(Ar())})(function(F){function Ee(v,g,D,K,$,pe){this.indented=v,this.column=g,this.type=D,this.info=K,this.align=$,this.prev=pe}function Se(v,g,D,K){var $=v.indented;return v.context&&v.context.type=="statement"&&D!="statement"&&($=v.context.indented),v.context=new Ee($,g,D,K,null,v.context)}function We(v){var g=v.context.type;return(g==")"||g=="]"||g=="}")&&(v.indented=v.context.indented),v.context=v.context.prev}function Qe(v,g,D){if(g.prevToken=="variable"||g.prevToken=="type"||/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(v.string.slice(0,D))||g.typeAtEndOfLine&&v.column()==v.indentation())return!0}function Ce(v){for(;;){if(!v||v.type=="top")return!0;if(v.type=="}"&&v.prev.info!="namespace")return!1;v=v.prev}}F.defineMode("clike",function(v,g){var D=v.indentUnit,K=g.statementIndentUnit||D,$=g.dontAlignCalls,pe=g.keywords||{},Re=g.types||{},ze=g.builtin||{},le=g.blockKeywords||{},te=g.defKeywords||{},de=g.atoms||{},he=g.hooks||{},ue=g.multiLineStrings,q=g.indentStatements!==!1,Ve=g.indentSwitch!==!1,Ct=g.namespaceSeparator,st=g.isPunctuationChar||/[\[\]{}\(\),;\:\.]/,gt=g.numberStart||/[\d\.]/,Le=g.number||/^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,Ke=g.isOperatorChar||/[+\-*&%=<>!?|\/]/,lt=g.isIdentifierChar||/[\w\$_\xa1-\uffff]/,ht=g.isReservedIdentifier||!1,re,Ne;function w(R,ne){var Y=R.next();if(he[Y]){var we=he[Y](R,ne);if(we!==!1)return we}if(Y=='"'||Y=="'")return ne.tokenize=A(Y),ne.tokenize(R,ne);if(gt.test(Y)){if(R.backUp(1),R.match(Le))return"number";R.next()}if(st.test(Y))return re=Y,null;if(Y=="/"){if(R.eat("*"))return ne.tokenize=C,C(R,ne);if(R.eat("/"))return R.skipToEnd(),"comment"}if(Ke.test(Y)){for(;!R.match(/^\/[\/*]/,!1)&&R.eat(Ke););return"operator"}if(R.eatWhile(lt),Ct)for(;R.match(Ct);)R.eatWhile(lt);var ve=R.current();return j(pe,ve)?(j(le,ve)&&(re="newstatement"),j(te,ve)&&(Ne=!0),"keyword"):j(Re,ve)?"type":j(ze,ve)||ht&&ht(ve)?(j(le,ve)&&(re="newstatement"),"builtin"):j(de,ve)?"atom":"variable"}function A(R){return function(ne,Y){for(var we=!1,ve,Tt=!1;(ve=ne.next())!=null;){if(ve==R&&!we){Tt=!0;break}we=!we&&ve=="\\"}return(Tt||!(we||ue))&&(Y.tokenize=null),"string"}}function C(R,ne){for(var Y=!1,we;we=R.next();){if(we=="/"&&Y){ne.tokenize=null;break}Y=we=="*"}return"comment"}function be(R,ne){g.typeFirstDefinitions&&R.eol()&&Ce(ne.context)&&(ne.typeAtEndOfLine=Qe(R,ne,R.pos))}return{startState:function(R){return{tokenize:null,context:new Ee((R||0)-D,0,"top",null,!1),indented:0,startOfLine:!0,prevToken:null}},token:function(R,ne){var Y=ne.context;if(R.sol()&&(Y.align==null&&(Y.align=!1),ne.indented=R.indentation(),ne.startOfLine=!0),R.eatSpace())return be(R,ne),null;re=Ne=null;var we=(ne.tokenize||w)(R,ne);if(we=="comment"||we=="meta")return we;if(Y.align==null&&(Y.align=!0),re==";"||re==":"||re==","&&R.match(/^\s*(?:\/\/.*)?$/,!1))for(;ne.context.type=="statement";)We(ne);else if(re=="{")Se(ne,R.column(),"}");else if(re=="[")Se(ne,R.column(),"]");else if(re=="(")Se(ne,R.column(),")");else if(re=="}"){for(;Y.type=="statement";)Y=We(ne);for(Y.type=="}"&&(Y=We(ne));Y.type=="statement";)Y=We(ne)}else re==Y.type?We(ne):q&&((Y.type=="}"||Y.type=="top")&&re!=";"||Y.type=="statement"&&re=="newstatement")&&Se(ne,R.column(),"statement",R.current());if(we=="variable"&&(ne.prevToken=="def"||g.typeFirstDefinitions&&Qe(R,ne,R.start)&&Ce(ne.context)&&R.match(/^\s*\(/,!1))&&(we="def"),he.token){var ve=he.token(R,ne,we);ve!==void 0&&(we=ve)}return we=="def"&&g.styleDefs===!1&&(we="variable"),ne.startOfLine=!1,ne.prevToken=Ne?"def":we||re,be(R,ne),we},indent:function(R,ne){if(R.tokenize!=w&&R.tokenize!=null||R.typeAtEndOfLine&&Ce(R.context))return F.Pass;var Y=R.context,we=ne&&ne.charAt(0),ve=we==Y.type;if(Y.type=="statement"&&we=="}"&&(Y=Y.prev),g.dontIndentStatements)for(;Y.type=="statement"&&g.dontIndentStatements.test(Y.info);)Y=Y.prev;if(he.indent){var Tt=he.indent(R,Y,ne,D);if(typeof Tt=="number")return Tt}var Ot=Y.prev&&Y.prev.info=="switch";if(g.allmanIndentation&&/[{(]/.test(we)){for(;Y.type!="top"&&Y.type!="}";)Y=Y.prev;return Y.indented}return Y.type=="statement"?Y.indented+(we=="{"?0:K):Y.align&&(!$||Y.type!=")")?Y.column+(ve?0:1):Y.type==")"&&!ve?Y.indented+K:Y.indented+(ve?0:D)+(!ve&&Ot&&!/^(?:case|default)\b/.test(ne)?D:0)},electricInput:Ve?/^\s*(?:case .*?:|default:|\{\}?|\})$/:/^\s*[{}]$/,blockCommentStart:"/*",blockCommentEnd:"*/",blockCommentContinue:" * ",lineComment:"//",fold:"brace"}});function M(v){for(var g={},D=v.split(" "),K=0;K<D.length;++K)g[D[K]]=!0;return g}function j(v,g){return typeof v=="function"?v(g):v.propertyIsEnumerable(g)}var _="auto if break case register continue return default do sizeof static else struct switch extern typedef union for goto while enum const volatile inline restrict asm fortran",ie="alignas alignof and and_eq audit axiom bitand bitor catch class compl concept constexpr const_cast decltype delete dynamic_cast explicit export final friend import module mutable namespace new noexcept not not_eq operator or or_eq override private protected public reinterpret_cast requires static_assert static_cast template this thread_local throw try typeid typename using virtual xor xor_eq",G="bycopy byref in inout oneway out self super atomic nonatomic retain copy readwrite readonly strong weak assign typeof nullable nonnull null_resettable _cmd @interface @implementation @end @protocol @encode @property @synthesize @dynamic @class @public @package @private @protected @required @optional @try @catch @finally @import @selector @encode @defs @synchronized @autoreleasepool @compatibility_alias @available",se="FOUNDATION_EXPORT FOUNDATION_EXTERN NS_INLINE NS_FORMAT_FUNCTION  NS_RETURNS_RETAINEDNS_ERROR_ENUM NS_RETURNS_NOT_RETAINED NS_RETURNS_INNER_POINTER NS_DESIGNATED_INITIALIZER NS_ENUM NS_OPTIONS NS_REQUIRES_NIL_TERMINATION NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_SWIFT_NAME NS_REFINED_FOR_SWIFT",ce=M("int long char short double float unsigned signed void bool"),Ie=M("SEL instancetype id Class Protocol BOOL");function Te(v){return j(ce,v)||/.+_t$/.test(v)}function Oe(v){return Te(v)||j(Ie,v)}var ae="case do else for if switch while struct enum union",V="struct enum union";function oe(v,g){if(!g.startOfLine)return!1;for(var D,K=null;D=v.peek();){if(D=="\\"&&v.match(/^.$/)){K=oe;break}else if(D=="/"&&v.match(/^\/[\/\*]/,!1))break;v.next()}return g.tokenize=K,"meta"}function xe(v,g){return g.prevToken=="type"?"type":!1}function _e(v){return!v||v.length<2||v[0]!="_"?!1:v[1]=="_"||v[1]!==v[1].toLowerCase()}function ye(v){return v.eatWhile(/[\w\.']/),"number"}function Me(v,g){if(v.backUp(1),v.match(/^(?:R|u8R|uR|UR|LR)/)){var D=v.match(/^"([^\s\\()]{0,16})\(/);return D?(g.cpp11RawStringDelim=D[1],g.tokenize=X,X(v,g)):!1}return v.match(/^(?:u8|u|U|L)/)?v.match(/^["']/,!1)?"string":!1:(v.next(),!1)}function He(v){var g=/(\w+)::~?(\w+)$/.exec(v);return g&&g[1]==g[2]}function ee(v,g){for(var D;(D=v.next())!=null;)if(D=='"'&&!v.eat('"')){g.tokenize=null;break}return"string"}function X(v,g){var D=g.cpp11RawStringDelim.replace(/[^\w\s]/g,"\\$&"),K=v.match(new RegExp(".*?\\)"+D+'"'));return K?g.tokenize=null:v.skipToEnd(),"string"}function me(v,g){typeof v=="string"&&(v=[v]);var D=[];function K(pe){if(pe)for(var Re in pe)pe.hasOwnProperty(Re)&&D.push(Re)}K(g.keywords),K(g.types),K(g.builtin),K(g.atoms),D.length&&(g.helperType=v[0],F.registerHelper("hintWords",v[0],D));for(var $=0;$<v.length;++$)F.defineMIME(v[$],g)}me(["text/x-csrc","text/x-c","text/x-chdr"],{name:"clike",keywords:M(_),types:Te,blockKeywords:M(ae),defKeywords:M(V),typeFirstDefinitions:!0,atoms:M("NULL true false"),isReservedIdentifier:_e,hooks:{"#":oe,"*":xe},modeProps:{fold:["brace","include"]}}),me(["text/x-c++src","text/x-c++hdr"],{name:"clike",keywords:M(_+" "+ie),types:Te,blockKeywords:M(ae+" class try catch"),defKeywords:M(V+" class namespace"),typeFirstDefinitions:!0,atoms:M("true false NULL nullptr"),dontIndentStatements:/^template$/,isIdentifierChar:/[\w\$_~\xa1-\uffff]/,isReservedIdentifier:_e,hooks:{"#":oe,"*":xe,u:Me,U:Me,L:Me,R:Me,0:ye,1:ye,2:ye,3:ye,4:ye,5:ye,6:ye,7:ye,8:ye,9:ye,token:function(v,g,D){if(D=="variable"&&v.peek()=="("&&(g.prevToken==";"||g.prevToken==null||g.prevToken=="}")&&He(v.current()))return"def"}},namespaceSeparator:"::",modeProps:{fold:["brace","include"]}}),me("text/x-java",{name:"clike",keywords:M("abstract assert break case catch class const continue default do else enum extends final finally for goto if implements import instanceof interface native new package private protected public return static strictfp super switch synchronized this throw throws transient try volatile while @interface"),types:M("var byte short int long float double boolean char void Boolean Byte Character Double Float Integer Long Number Object Short String StringBuffer StringBuilder Void"),blockKeywords:M("catch class do else finally for if switch try while"),defKeywords:M("class interface enum @interface"),typeFirstDefinitions:!0,atoms:M("true false null"),number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,hooks:{"@":function(v){return v.match("interface",!1)?!1:(v.eatWhile(/[\w\$_]/),"meta")},'"':function(v,g){return v.match(/""$/)?(g.tokenize=T,g.tokenize(v,g)):!1}},modeProps:{fold:["brace","import"]}}),me("text/x-csharp",{name:"clike",keywords:M("abstract as async await base break case catch checked class const continue default delegate do else enum event explicit extern finally fixed for foreach goto if implicit in init interface internal is lock namespace new operator out override params private protected public readonly record ref required return sealed sizeof stackalloc static struct switch this throw try typeof unchecked unsafe using virtual void volatile while add alias ascending descending dynamic from get global group into join let orderby partial remove select set value var yield"),types:M("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32 UInt64 bool byte char decimal double short int long object sbyte float string ushort uint ulong"),blockKeywords:M("catch class do else finally for foreach if struct switch try while"),defKeywords:M("class interface namespace record struct var"),typeFirstDefinitions:!0,atoms:M("true false null"),hooks:{"@":function(v,g){return v.eat('"')?(g.tokenize=ee,ee(v,g)):(v.eatWhile(/[\w\$_]/),"meta")}}});function T(v,g){for(var D=!1;!v.eol();){if(!D&&v.match('"""')){g.tokenize=null;break}D=v.next()=="\\"&&!D}return"string"}function H(v){return function(g,D){for(var K;K=g.next();)if(K=="*"&&g.eat("/"))if(v==1){D.tokenize=null;break}else return D.tokenize=H(v-1),D.tokenize(g,D);else if(K=="/"&&g.eat("*"))return D.tokenize=H(v+1),D.tokenize(g,D);return"comment"}}me("text/x-scala",{name:"clike",keywords:M("abstract case catch class def do else extends final finally for forSome if implicit import lazy match new null object override package private protected return sealed super this throw trait try type val var while with yield _ assert assume require print println printf readLine readBoolean readByte readShort readChar readInt readLong readFloat readDouble"),types:M("AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either Enumeration Equiv Error Exception Fractional Function IndexedSeq Int Integral Iterable Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),multiLineStrings:!0,blockKeywords:M("catch class enum do else finally for forSome if match switch try while"),defKeywords:M("class enum def object package trait type val var"),atoms:M("true false null"),indentStatements:!1,indentSwitch:!1,isOperatorChar:/[+\-*&%=<>!?|\/#:@]/,hooks:{"@":function(v){return v.eatWhile(/[\w\$_]/),"meta"},'"':function(v,g){return v.match('""')?(g.tokenize=T,g.tokenize(v,g)):!1},"'":function(v){return v.match(/^(\\[^'\s]+|[^\\'])'/)?"string-2":(v.eatWhile(/[\w\$_\xa1-\uffff]/),"atom")},"=":function(v,g){var D=g.context;return D.type=="}"&&D.align&&v.eat(">")?(g.context=new Ee(D.indented,D.column,D.type,D.info,null,D.prev),"operator"):!1},"/":function(v,g){return v.eat("*")?(g.tokenize=H(1),g.tokenize(v,g)):!1}},modeProps:{closeBrackets:{pairs:'()[]{}""',triples:'"'}}});function c(v){return function(g,D){for(var K=!1,$,pe=!1;!g.eol();){if(!v&&!K&&g.match('"')){pe=!0;break}if(v&&g.match('"""')){pe=!0;break}$=g.next(),!K&&$=="$"&&g.match("{")&&g.skipTo("}"),K=!K&&$=="\\"&&!v}return(pe||!v)&&(D.tokenize=null),"string"}}me("text/x-kotlin",{name:"clike",keywords:M("package as typealias class interface this super val operator var fun for is in This throw return annotation break continue object if else while do try when !in !is as? file import where by get set abstract enum open inner override private public internal protected catch finally out final vararg reified dynamic companion constructor init sealed field property receiver param sparam lateinit data inline noinline tailrec external annotation crossinline const operator infix suspend actual expect setparam value"),types:M("Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void Annotation Any BooleanArray ByteArray Char CharArray DeprecationLevel DoubleArray Enum FloatArray Function Int IntArray Lazy LazyThreadSafetyMode LongArray Nothing ShortArray Unit"),intendSwitch:!1,indentStatements:!1,multiLineStrings:!0,number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+(\.\d+)?|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,blockKeywords:M("catch class do else finally for if where try while enum"),defKeywords:M("class val var object interface fun"),atoms:M("true false null this"),hooks:{"@":function(v){return v.eatWhile(/[\w\$_]/),"meta"},"*":function(v,g){return g.prevToken=="."?"variable":"operator"},'"':function(v,g){return g.tokenize=c(v.match('""')),g.tokenize(v,g)},"/":function(v,g){return v.eat("*")?(g.tokenize=H(1),g.tokenize(v,g)):!1},indent:function(v,g,D,K){var $=D&&D.charAt(0);if((v.prevToken=="}"||v.prevToken==")")&&D=="")return v.indented;if(v.prevToken=="operator"&&D!="}"&&v.context.type!="}"||v.prevToken=="variable"&&$=="."||(v.prevToken=="}"||v.prevToken==")")&&$==".")return K*2+g.indented;if(g.align&&g.type=="}")return g.indented+(v.context.type==(D||"").charAt(0)?0:K)}},modeProps:{closeBrackets:{triples:'"'}}}),me(["x-shader/x-vertex","x-shader/x-fragment"],{name:"clike",keywords:M("sampler1D sampler2D sampler3D samplerCube sampler1DShadow sampler2DShadow const attribute uniform varying break continue discard return for while do if else struct in out inout"),types:M("float int bool void vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 mat2 mat3 mat4"),blockKeywords:M("for while do if else struct"),builtin:M("radians degrees sin cos tan asin acos atan pow exp log exp2 sqrt inversesqrt abs sign floor ceil fract mod min max clamp mix step smoothstep length distance dot cross normalize ftransform faceforward reflect refract matrixCompMult lessThan lessThanEqual greaterThan greaterThanEqual equal notEqual any all not texture1D texture1DProj texture1DLod texture1DProjLod texture2D texture2DProj texture2DLod texture2DProjLod texture3D texture3DProj texture3DLod texture3DProjLod textureCube textureCubeLod shadow1D shadow2D shadow1DProj shadow2DProj shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod dFdx dFdy fwidth noise1 noise2 noise3 noise4"),atoms:M("true false gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_FogCoord gl_PointCoord gl_Position gl_PointSize gl_ClipVertex gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor gl_TexCoord gl_FogFragCoord gl_FragCoord gl_FrontFacing gl_FragData gl_FragDepth gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse gl_TextureMatrixTranspose gl_ModelViewMatrixInverseTranspose gl_ProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixInverseTranspose gl_TextureMatrixInverseTranspose gl_NormalScale gl_DepthRange gl_ClipPlane gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel gl_FrontLightModelProduct gl_BackLightModelProduct gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ gl_FogParameters gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits gl_MaxDrawBuffers"),indentSwitch:!1,hooks:{"#":oe},modeProps:{fold:["brace","include"]}}),me("text/x-nesc",{name:"clike",keywords:M(_+" as atomic async call command component components configuration event generic implementation includes interface module new norace nx_struct nx_union post provides signal task uses abstract extends"),types:Te,blockKeywords:M(ae),atoms:M("null true false"),hooks:{"#":oe},modeProps:{fold:["brace","include"]}}),me("text/x-objectivec",{name:"clike",keywords:M(_+" "+G),types:Oe,builtin:M(se),blockKeywords:M(ae+" @synthesize @try @catch @finally @autoreleasepool @synchronized"),defKeywords:M(V+" @interface @implementation @protocol @class"),dontIndentStatements:/^@.*$/,typeFirstDefinitions:!0,atoms:M("YES NO NULL Nil nil true false nullptr"),isReservedIdentifier:_e,hooks:{"#":oe,"*":xe},modeProps:{fold:["brace","include"]}}),me("text/x-objectivec++",{name:"clike",keywords:M(_+" "+G+" "+ie),types:Oe,builtin:M(se),blockKeywords:M(ae+" @synthesize @try @catch @finally @autoreleasepool @synchronized class try catch"),defKeywords:M(V+" @interface @implementation @protocol @class class namespace"),dontIndentStatements:/^@.*$|^template$/,typeFirstDefinitions:!0,atoms:M("YES NO NULL Nil nil true false nullptr"),isReservedIdentifier:_e,hooks:{"#":oe,"*":xe,u:Me,U:Me,L:Me,R:Me,0:ye,1:ye,2:ye,3:ye,4:ye,5:ye,6:ye,7:ye,8:ye,9:ye,token:function(v,g,D){if(D=="variable"&&v.peek()=="("&&(g.prevToken==";"||g.prevToken==null||g.prevToken=="}")&&He(v.current()))return"def"}},namespaceSeparator:"::",modeProps:{fold:["brace","include"]}}),me("text/x-squirrel",{name:"clike",keywords:M("base break clone continue const default delete enum extends function in class foreach local resume return this throw typeof yield constructor instanceof static"),types:Te,blockKeywords:M("case catch class else for foreach if switch try while"),defKeywords:M("function local class"),typeFirstDefinitions:!0,atoms:M("true false null"),hooks:{"#":oe},modeProps:{fold:["brace","include"]}});var x=null;function b(v){return function(g,D){for(var K=!1,$,pe=!1;!g.eol();){if(!K&&g.match('"')&&(v=="single"||g.match('""'))){pe=!0;break}if(!K&&g.match("``")){x=b(v),pe=!0;break}$=g.next(),K=v=="single"&&!K&&$=="\\"}return pe&&(D.tokenize=null),"string"}}me("text/x-ceylon",{name:"clike",keywords:M("abstracts alias assembly assert assign break case catch class continue dynamic else exists extends finally for function given if import in interface is let module new nonempty object of out outer package return satisfies super switch then this throw try value void while"),types:function(v){var g=v.charAt(0);return g===g.toUpperCase()&&g!==g.toLowerCase()},blockKeywords:M("case catch class dynamic else finally for function if interface module new object switch try while"),defKeywords:M("class dynamic function interface module object package value"),builtin:M("abstract actual aliased annotation by default deprecated doc final formal late license native optional sealed see serializable shared suppressWarnings tagged throws variable"),isPunctuationChar:/[\[\]{}\(\),;\:\.`]/,isOperatorChar:/[+\-*&%=<>!?|^~:\/]/,numberStart:/[\d#$]/,number:/^(?:#[\da-fA-F_]+|\$[01_]+|[\d_]+[kMGTPmunpf]?|[\d_]+\.[\d_]+(?:[eE][-+]?\d+|[kMGTPmunpf]|)|)/i,multiLineStrings:!0,typeFirstDefinitions:!0,atoms:M("true false null larger smaller equal empty finished"),indentSwitch:!1,styleDefs:!1,hooks:{"@":function(v){return v.eatWhile(/[\w\$_]/),"meta"},'"':function(v,g){return g.tokenize=b(v.match('""')?"triple":"single"),g.tokenize(v,g)},"`":function(v,g){return!x||!v.match("`")?!1:(g.tokenize=x,x=null,g.tokenize(v,g))},"'":function(v){return v.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},token:function(v,g,D){if((D=="variable"||D=="type")&&g.prevToken==".")return"variable-2"}},modeProps:{fold:["brace","import"],closeBrackets:{triples:'"'}}})})})();export{Tu as default};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/assets/testServerConnection-JQMZFCzK.js b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/assets/testServerConnection-JQMZFCzK.js
new file mode 100644
index 0000000..0b7849e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/assets/testServerConnection-JQMZFCzK.js
@@ -0,0 +1,69 @@
+function __vite__mapDeps(indexes) {
+  if (!__vite__mapDeps.viteFileDeps) {
+    __vite__mapDeps.viteFileDeps = ["./codeMirrorModule-BxIIN4UE.js","../codeMirrorModule.ez37Vkbh.css"]
+  }
+  return indexes.map((i) => __vite__mapDeps.viteFileDeps[i])
+}
+var Up=Object.defineProperty;var Bp=(e,t,n)=>t in e?Up(e,t,{enumerable:!0,configurable:!0,writable:!0,value:n}):e[t]=n;var B=(e,t,n)=>(Bp(e,typeof t!="symbol"?t+"":t,n),n);(function(){const t=document.createElement("link").relList;if(t&&t.supports&&t.supports("modulepreload"))return;for(const i of document.querySelectorAll('link[rel="modulepreload"]'))r(i);new MutationObserver(i=>{for(const s of i)if(s.type==="childList")for(const o of s.addedNodes)o.tagName==="LINK"&&o.rel==="modulepreload"&&r(o)}).observe(document,{childList:!0,subtree:!0});function n(i){const s={};return i.integrity&&(s.integrity=i.integrity),i.referrerPolicy&&(s.referrerPolicy=i.referrerPolicy),i.crossOrigin==="use-credentials"?s.credentials="include":i.crossOrigin==="anonymous"?s.credentials="omit":s.credentials="same-origin",s}function r(i){if(i.ep)return;i.ep=!0;const s=n(i);fetch(i.href,s)}})();var Yw=typeof globalThis<"u"?globalThis:typeof window<"u"?window:typeof global<"u"?global:typeof self<"u"?self:{};function Vp(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var Uc={exports:{}},$s={},Bc={exports:{}},O={};/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */var li=Symbol.for("react.element"),Wp=Symbol.for("react.portal"),qp=Symbol.for("react.fragment"),Xp=Symbol.for("react.strict_mode"),Qp=Symbol.for("react.profiler"),Gp=Symbol.for("react.provider"),Kp=Symbol.for("react.context"),Yp=Symbol.for("react.forward_ref"),Jp=Symbol.for("react.suspense"),Zp=Symbol.for("react.memo"),em=Symbol.for("react.lazy"),Ya=Symbol.iterator;function tm(e){return e===null||typeof e!="object"?null:(e=Ya&&e[Ya]||e["@@iterator"],typeof e=="function"?e:null)}var Vc={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},Wc=Object.assign,qc={};function nr(e,t,n){this.props=e,this.context=t,this.refs=qc,this.updater=n||Vc}nr.prototype.isReactComponent={};nr.prototype.setState=function(e,t){if(typeof e!="object"&&typeof e!="function"&&e!=null)throw Error("setState(...): takes an object of state variables to update or a function which returns an object of state variables.");this.updater.enqueueSetState(this,e,t,"setState")};nr.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this,e,"forceUpdate")};function Xc(){}Xc.prototype=nr.prototype;function Wl(e,t,n){this.props=e,this.context=t,this.refs=qc,this.updater=n||Vc}var ql=Wl.prototype=new Xc;ql.constructor=Wl;Wc(ql,nr.prototype);ql.isPureReactComponent=!0;var Ja=Array.isArray,Qc=Object.prototype.hasOwnProperty,Xl={current:null},Gc={key:!0,ref:!0,__self:!0,__source:!0};function Kc(e,t,n){var r,i={},s=null,o=null;if(t!=null)for(r in t.ref!==void 0&&(o=t.ref),t.key!==void 0&&(s=""+t.key),t)Qc.call(t,r)&&!Gc.hasOwnProperty(r)&&(i[r]=t[r]);var l=arguments.length-2;if(l===1)i.children=n;else if(1<l){for(var a=Array(l),u=0;u<l;u++)a[u]=arguments[u+2];i.children=a}if(e&&e.defaultProps)for(r in l=e.defaultProps,l)i[r]===void 0&&(i[r]=l[r]);return{$$typeof:li,type:e,key:s,ref:o,props:i,_owner:Xl.current}}function nm(e,t){return{$$typeof:li,type:e.type,key:t,ref:e.ref,props:e.props,_owner:e._owner}}function Ql(e){return typeof e=="object"&&e!==null&&e.$$typeof===li}function rm(e){var t={"=":"=0",":":"=2"};return"$"+e.replace(/[=:]/g,function(n){return t[n]})}var Za=/\/+/g;function oo(e,t){return typeof e=="object"&&e!==null&&e.key!=null?rm(""+e.key):t.toString(36)}function Di(e,t,n,r,i){var s=typeof e;(s==="undefined"||s==="boolean")&&(e=null);var o=!1;if(e===null)o=!0;else switch(s){case"string":case"number":o=!0;break;case"object":switch(e.$$typeof){case li:case Wp:o=!0}}if(o)return o=e,i=i(o),e=r===""?"."+oo(o,0):r,Ja(i)?(n="",e!=null&&(n=e.replace(Za,"$&/")+"/"),Di(i,t,n,"",function(u){return u})):i!=null&&(Ql(i)&&(i=nm(i,n+(!i.key||o&&o.key===i.key?"":(""+i.key).replace(Za,"$&/")+"/")+e)),t.push(i)),1;if(o=0,r=r===""?".":r+":",Ja(e))for(var l=0;l<e.length;l++){s=e[l];var a=r+oo(s,l);o+=Di(s,t,n,a,i)}else if(a=tm(e),typeof a=="function")for(e=a.call(e),l=0;!(s=e.next()).done;)s=s.value,a=r+oo(s,l++),o+=Di(s,t,n,a,i);else if(s==="object")throw t=String(e),Error("Objects are not valid as a React child (found: "+(t==="[object Object]"?"object with keys {"+Object.keys(e).join(", ")+"}":t)+"). If you meant to render a collection of children, use an array instead.");return o}function vi(e,t,n){if(e==null)return e;var r=[],i=0;return Di(e,r,"","",function(s){return t.call(n,s,i++)}),r}function im(e){if(e._status===-1){var t=e._result;t=t(),t.then(function(n){(e._status===0||e._status===-1)&&(e._status=1,e._result=n)},function(n){(e._status===0||e._status===-1)&&(e._status=2,e._result=n)}),e._status===-1&&(e._status=0,e._result=t)}if(e._status===1)return e._result.default;throw e._result}var Ce={current:null},Fi={transition:null},sm={ReactCurrentDispatcher:Ce,ReactCurrentBatchConfig:Fi,ReactCurrentOwner:Xl};O.Children={map:vi,forEach:function(e,t,n){vi(e,function(){t.apply(this,arguments)},n)},count:function(e){var t=0;return vi(e,function(){t++}),t},toArray:function(e){return vi(e,function(t){return t})||[]},only:function(e){if(!Ql(e))throw Error("React.Children.only expected to receive a single React element child.");return e}};O.Component=nr;O.Fragment=qp;O.Profiler=Qp;O.PureComponent=Wl;O.StrictMode=Xp;O.Suspense=Jp;O.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=sm;O.cloneElement=function(e,t,n){if(e==null)throw Error("React.cloneElement(...): The argument must be a React element, but you passed "+e+".");var r=Wc({},e.props),i=e.key,s=e.ref,o=e._owner;if(t!=null){if(t.ref!==void 0&&(s=t.ref,o=Xl.current),t.key!==void 0&&(i=""+t.key),e.type&&e.type.defaultProps)var l=e.type.defaultProps;for(a in t)Qc.call(t,a)&&!Gc.hasOwnProperty(a)&&(r[a]=t[a]===void 0&&l!==void 0?l[a]:t[a])}var a=arguments.length-2;if(a===1)r.children=n;else if(1<a){l=Array(a);for(var u=0;u<a;u++)l[u]=arguments[u+2];r.children=l}return{$$typeof:li,type:e.type,key:i,ref:s,props:r,_owner:o}};O.createContext=function(e){return e={$$typeof:Kp,_currentValue:e,_currentValue2:e,_threadCount:0,Provider:null,Consumer:null,_defaultValue:null,_globalName:null},e.Provider={$$typeof:Gp,_context:e},e.Consumer=e};O.createElement=Kc;O.createFactory=function(e){var t=Kc.bind(null,e);return t.type=e,t};O.createRef=function(){return{current:null}};O.forwardRef=function(e){return{$$typeof:Yp,render:e}};O.isValidElement=Ql;O.lazy=function(e){return{$$typeof:em,_payload:{_status:-1,_result:e},_init:im}};O.memo=function(e,t){return{$$typeof:Zp,type:e,compare:t===void 0?null:t}};O.startTransition=function(e){var t=Fi.transition;Fi.transition={};try{e()}finally{Fi.transition=t}};O.unstable_act=function(){throw Error("act(...) is not supported in production builds of React.")};O.useCallback=function(e,t){return Ce.current.useCallback(e,t)};O.useContext=function(e){return Ce.current.useContext(e)};O.useDebugValue=function(){};O.useDeferredValue=function(e){return Ce.current.useDeferredValue(e)};O.useEffect=function(e,t){return Ce.current.useEffect(e,t)};O.useId=function(){return Ce.current.useId()};O.useImperativeHandle=function(e,t,n){return Ce.current.useImperativeHandle(e,t,n)};O.useInsertionEffect=function(e,t){return Ce.current.useInsertionEffect(e,t)};O.useLayoutEffect=function(e,t){return Ce.current.useLayoutEffect(e,t)};O.useMemo=function(e,t){return Ce.current.useMemo(e,t)};O.useReducer=function(e,t,n){return Ce.current.useReducer(e,t,n)};O.useRef=function(e){return Ce.current.useRef(e)};O.useState=function(e){return Ce.current.useState(e)};O.useSyncExternalStore=function(e,t,n){return Ce.current.useSyncExternalStore(e,t,n)};O.useTransition=function(){return Ce.current.useTransition()};O.version="18.2.0";Bc.exports=O;var L=Bc.exports;const Ht=Vp(L);/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */var om=L,lm=Symbol.for("react.element"),am=Symbol.for("react.fragment"),um=Object.prototype.hasOwnProperty,cm=om.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,dm={key:!0,ref:!0,__self:!0,__source:!0};function Yc(e,t,n){var r,i={},s=null,o=null;n!==void 0&&(s=""+n),t.key!==void 0&&(s=""+t.key),t.ref!==void 0&&(o=t.ref);for(r in t)um.call(t,r)&&!dm.hasOwnProperty(r)&&(i[r]=t[r]);if(e&&e.defaultProps)for(r in t=e.defaultProps,t)i[r]===void 0&&(i[r]=t[r]);return{$$typeof:lm,type:e,key:s,ref:o,props:i,_owner:cm.current}}$s.Fragment=am;$s.jsx=Yc;$s.jsxs=Yc;Uc.exports=$s;var f=Uc.exports;function fm(e,t,n,r){const[i,s]=Ht.useState(n);return Ht.useEffect(()=>{let o=!1;return r!==void 0&&s(r),e().then(l=>{o||s(l)}),()=>{o=!0}},t),i}function vn(){const e=Ht.useRef(null),[t,n]=Ht.useState(new DOMRect(0,0,10,10));return Ht.useLayoutEffect(()=>{const r=e.current;if(!r)return;const i=new ResizeObserver(s=>{const o=s[s.length-1];o&&o.contentRect&&n(o.contentRect)});return i.observe(r),()=>i.disconnect()},[e]),[t,e]}function Ke(e){if(e<0||!isFinite(e))return"-";if(e===0)return"0";if(e<1e3)return e.toFixed(0)+"ms";const t=e/1e3;if(t<60)return t.toFixed(1)+"s";const n=t/60;if(n<60)return n.toFixed(1)+"m";const r=n/60;return r<24?r.toFixed(1)+"h":(r/24).toFixed(1)+"d"}function hm(e){if(e<0||!isFinite(e))return"-";if(e===0)return"0";if(e<1e3)return e.toFixed(0);const t=e/1024;if(t<1e3)return t.toFixed(1)+"K";const n=t/1024;return n<1e3?n.toFixed(1)+"M":(n/1024).toFixed(1)+"G"}function Jc(e,t,n,r,i){let s=r||0,o=i!==void 0?i:e.length;for(;s<o;){const l=s+o>>1;n(t,e[l])>=0?s=l+1:o=l}return o}function pm(e){const t=document.createElement("textarea");t.style.position="absolute",t.style.zIndex="-1000",t.value=e,document.body.appendChild(t),t.select(),document.execCommand("copy"),t.remove()}function is(e,t){const n=e?Ur.getObject(e,t):t,[r,i]=Ht.useState(n);return[r,o=>{e&&Ur.setObject(e,o),i(o)}]}class mm{getString(t,n){return localStorage[t]||n}setString(t,n){localStorage[t]=n,window.saveSettings&&window.saveSettings()}getObject(t,n){if(!localStorage[t])return n;try{return JSON.parse(localStorage[t])}catch{return n}}setObject(t,n){localStorage[t]=JSON.stringify(n),window.saveSettings&&window.saveSettings()}}const Ur=new mm;function Jw(){if(document.playwrightThemeInitialized)return;document.playwrightThemeInitialized=!0,document.defaultView.addEventListener("focus",n=>{n.target.document.nodeType===Node.DOCUMENT_NODE&&document.body.classList.remove("inactive")},!1),document.defaultView.addEventListener("blur",n=>{document.body.classList.add("inactive")},!1);const e=Ur.getString("theme","light-mode"),t=window.matchMedia("(prefers-color-scheme: dark)");(e==="dark-mode"||t.matches)&&document.body.classList.add("dark-mode")}const Gl=new Set;function Zw(){const e=Ur.getString("theme","light-mode");let t;e==="dark-mode"?t="light-mode":t="dark-mode",e&&document.body.classList.remove(e),document.body.classList.add(t),Ur.setString("theme",t);for(const n of Gl)n(t)}function e1(e){Gl.add(e)}function t1(e){Gl.delete(e)}function n1(){return document.body.classList.contains("dark-mode")?"dark-mode":"light-mode"}var Zc={exports:{}},Be={},ed={exports:{}},td={};/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */(function(e){function t(M,R){var $=M.length;M.push(R);e:for(;0<$;){var q=$-1>>>1,ne=M[q];if(0<i(ne,R))M[q]=R,M[$]=ne,$=q;else break e}}function n(M){return M.length===0?null:M[0]}function r(M){if(M.length===0)return null;var R=M[0],$=M.pop();if($!==R){M[0]=$;e:for(var q=0,ne=M.length,et=ne>>>1;q<et;){var vt=2*(q+1)-1,cr=M[vt],yt=vt+1,xn=M[yt];if(0>i(cr,$))yt<ne&&0>i(xn,cr)?(M[q]=xn,M[yt]=$,q=yt):(M[q]=cr,M[vt]=$,q=vt);else if(yt<ne&&0>i(xn,$))M[q]=xn,M[yt]=$,q=yt;else break e}}return R}function i(M,R){var $=M.sortIndex-R.sortIndex;return $!==0?$:M.id-R.id}if(typeof performance=="object"&&typeof performance.now=="function"){var s=performance;e.unstable_now=function(){return s.now()}}else{var o=Date,l=o.now();e.unstable_now=function(){return o.now()-l}}var a=[],u=[],c=1,h=null,d=3,g=!1,y=!1,w=!1,x=typeof setTimeout=="function"?setTimeout:null,p=typeof clearTimeout=="function"?clearTimeout:null,m=typeof setImmediate<"u"?setImmediate:null;typeof navigator<"u"&&navigator.scheduling!==void 0&&navigator.scheduling.isInputPending!==void 0&&navigator.scheduling.isInputPending.bind(navigator.scheduling);function v(M){for(var R=n(u);R!==null;){if(R.callback===null)r(u);else if(R.startTime<=M)r(u),R.sortIndex=R.expirationTime,t(a,R);else break;R=n(u)}}function E(M){if(w=!1,v(M),!y)if(n(a)!==null)y=!0,Le(C);else{var R=n(u);R!==null&&ue(E,R.startTime-M)}}function C(M,R){y=!1,w&&(w=!1,p(S),S=-1),g=!0;var $=d;try{for(v(R),h=n(a);h!==null&&(!(h.expirationTime>R)||M&&!P());){var q=h.callback;if(typeof q=="function"){h.callback=null,d=h.priorityLevel;var ne=q(h.expirationTime<=R);R=e.unstable_now(),typeof ne=="function"?h.callback=ne:h===n(a)&&r(a),v(R)}else r(a);h=n(a)}if(h!==null)var et=!0;else{var vt=n(u);vt!==null&&ue(E,vt.startTime-R),et=!1}return et}finally{h=null,d=$,g=!1}}var k=!1,N=null,S=-1,_=5,A=-1;function P(){return!(e.unstable_now()-A<_)}function T(){if(N!==null){var M=e.unstable_now();A=M;var R=!0;try{R=N(!0,M)}finally{R?j():(k=!1,N=null)}}else k=!1}var j;if(typeof m=="function")j=function(){m(T)};else if(typeof MessageChannel<"u"){var z=new MessageChannel,ae=z.port2;z.port1.onmessage=T,j=function(){ae.postMessage(null)}}else j=function(){x(T,0)};function Le(M){N=M,k||(k=!0,j())}function ue(M,R){S=x(function(){M(e.unstable_now())},R)}e.unstable_IdlePriority=5,e.unstable_ImmediatePriority=1,e.unstable_LowPriority=4,e.unstable_NormalPriority=3,e.unstable_Profiling=null,e.unstable_UserBlockingPriority=2,e.unstable_cancelCallback=function(M){M.callback=null},e.unstable_continueExecution=function(){y||g||(y=!0,Le(C))},e.unstable_forceFrameRate=function(M){0>M||125<M?console.error("forceFrameRate takes a positive int between 0 and 125, forcing frame rates higher than 125 fps is not supported"):_=0<M?Math.floor(1e3/M):5},e.unstable_getCurrentPriorityLevel=function(){return d},e.unstable_getFirstCallbackNode=function(){return n(a)},e.unstable_next=function(M){switch(d){case 1:case 2:case 3:var R=3;break;default:R=d}var $=d;d=R;try{return M()}finally{d=$}},e.unstable_pauseExecution=function(){},e.unstable_requestPaint=function(){},e.unstable_runWithPriority=function(M,R){switch(M){case 1:case 2:case 3:case 4:case 5:break;default:M=3}var $=d;d=M;try{return R()}finally{d=$}},e.unstable_scheduleCallback=function(M,R,$){var q=e.unstable_now();switch(typeof $=="object"&&$!==null?($=$.delay,$=typeof $=="number"&&0<$?q+$:q):$=q,M){case 1:var ne=-1;break;case 2:ne=250;break;case 5:ne=1073741823;break;case 4:ne=1e4;break;default:ne=5e3}return ne=$+ne,M={id:c++,callback:R,priorityLevel:M,startTime:$,expirationTime:ne,sortIndex:-1},$>q?(M.sortIndex=$,t(u,M),n(a)===null&&M===n(u)&&(w?(p(S),S=-1):w=!0,ue(E,$-q))):(M.sortIndex=ne,t(a,M),y||g||(y=!0,Le(C))),M},e.unstable_shouldYield=P,e.unstable_wrapCallback=function(M){var R=d;return function(){var $=d;d=R;try{return M.apply(this,arguments)}finally{d=$}}}})(td);ed.exports=td;var gm=ed.exports;/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */var nd=L,He=gm;function b(e){for(var t="https://reactjs.org/docs/error-decoder.html?invariant="+e,n=1;n<arguments.length;n++)t+="&args[]="+encodeURIComponent(arguments[n]);return"Minified React error #"+e+"; visit "+t+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}var rd=new Set,Br={};function yn(e,t){Gn(e,t),Gn(e+"Capture",t)}function Gn(e,t){for(Br[e]=t,e=0;e<t.length;e++)rd.add(t[e])}var Ct=!(typeof window>"u"||typeof window.document>"u"||typeof window.document.createElement>"u"),Uo=Object.prototype.hasOwnProperty,vm=/^[:A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD][:A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*$/,eu={},tu={};function ym(e){return Uo.call(tu,e)?!0:Uo.call(eu,e)?!1:vm.test(e)?tu[e]=!0:(eu[e]=!0,!1)}function wm(e,t,n,r){if(n!==null&&n.type===0)return!1;switch(typeof t){case"function":case"symbol":return!0;case"boolean":return r?!1:n!==null?!n.acceptsBooleans:(e=e.toLowerCase().slice(0,5),e!=="data-"&&e!=="aria-");default:return!1}}function xm(e,t,n,r){if(t===null||typeof t>"u"||wm(e,t,n,r))return!0;if(r)return!1;if(n!==null)switch(n.type){case 3:return!t;case 4:return t===!1;case 5:return isNaN(t);case 6:return isNaN(t)||1>t}return!1}function be(e,t,n,r,i,s,o){this.acceptsBooleans=t===2||t===3||t===4,this.attributeName=r,this.attributeNamespace=i,this.mustUseProperty=n,this.propertyName=e,this.type=t,this.sanitizeURL=s,this.removeEmptyString=o}var me={};"children dangerouslySetInnerHTML defaultValue defaultChecked innerHTML suppressContentEditableWarning suppressHydrationWarning style".split(" ").forEach(function(e){me[e]=new be(e,0,!1,e,null,!1,!1)});[["acceptCharset","accept-charset"],["className","class"],["htmlFor","for"],["httpEquiv","http-equiv"]].forEach(function(e){var t=e[0];me[t]=new be(t,1,!1,e[1],null,!1,!1)});["contentEditable","draggable","spellCheck","value"].forEach(function(e){me[e]=new be(e,2,!1,e.toLowerCase(),null,!1,!1)});["autoReverse","externalResourcesRequired","focusable","preserveAlpha"].forEach(function(e){me[e]=new be(e,2,!1,e,null,!1,!1)});"allowFullScreen async autoFocus autoPlay controls default defer disabled disablePictureInPicture disableRemotePlayback formNoValidate hidden loop noModule noValidate open playsInline readOnly required reversed scoped seamless itemScope".split(" ").forEach(function(e){me[e]=new be(e,3,!1,e.toLowerCase(),null,!1,!1)});["checked","multiple","muted","selected"].forEach(function(e){me[e]=new be(e,3,!0,e,null,!1,!1)});["capture","download"].forEach(function(e){me[e]=new be(e,4,!1,e,null,!1,!1)});["cols","rows","size","span"].forEach(function(e){me[e]=new be(e,6,!1,e,null,!1,!1)});["rowSpan","start"].forEach(function(e){me[e]=new be(e,5,!1,e.toLowerCase(),null,!1,!1)});var Kl=/[\-:]([a-z])/g;function Yl(e){return e[1].toUpperCase()}"accent-height alignment-baseline arabic-form baseline-shift cap-height clip-path clip-rule color-interpolation color-interpolation-filters color-profile color-rendering dominant-baseline enable-background fill-opacity fill-rule flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-name glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x horiz-origin-x image-rendering letter-spacing lighting-color marker-end marker-mid marker-start overline-position overline-thickness paint-order panose-1 pointer-events rendering-intent shape-rendering stop-color stop-opacity strikethrough-position strikethrough-thickness stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width text-anchor text-decoration text-rendering underline-position underline-thickness unicode-bidi unicode-range units-per-em v-alphabetic v-hanging v-ideographic v-mathematical vector-effect vert-adv-y vert-origin-x vert-origin-y word-spacing writing-mode xmlns:xlink x-height".split(" ").forEach(function(e){var t=e.replace(Kl,Yl);me[t]=new be(t,1,!1,e,null,!1,!1)});"xlink:actuate xlink:arcrole xlink:role xlink:show xlink:title xlink:type".split(" ").forEach(function(e){var t=e.replace(Kl,Yl);me[t]=new be(t,1,!1,e,"http://www.w3.org/1999/xlink",!1,!1)});["xml:base","xml:lang","xml:space"].forEach(function(e){var t=e.replace(Kl,Yl);me[t]=new be(t,1,!1,e,"http://www.w3.org/XML/1998/namespace",!1,!1)});["tabIndex","crossOrigin"].forEach(function(e){me[e]=new be(e,1,!1,e.toLowerCase(),null,!1,!1)});me.xlinkHref=new be("xlinkHref",1,!1,"xlink:href","http://www.w3.org/1999/xlink",!0,!1);["src","href","action","formAction"].forEach(function(e){me[e]=new be(e,1,!1,e.toLowerCase(),null,!0,!0)});function Jl(e,t,n,r){var i=me.hasOwnProperty(t)?me[t]:null;(i!==null?i.type!==0:r||!(2<t.length)||t[0]!=="o"&&t[0]!=="O"||t[1]!=="n"&&t[1]!=="N")&&(xm(t,n,i,r)&&(n=null),r||i===null?ym(t)&&(n===null?e.removeAttribute(t):e.setAttribute(t,""+n)):i.mustUseProperty?e[i.propertyName]=n===null?i.type===3?!1:"":n:(t=i.attributeName,r=i.attributeNamespace,n===null?e.removeAttribute(t):(i=i.type,n=i===3||i===4&&n===!0?"":""+n,r?e.setAttributeNS(r,t,n):e.setAttribute(t,n))))}var Mt=nd.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,yi=Symbol.for("react.element"),bn=Symbol.for("react.portal"),Ln=Symbol.for("react.fragment"),Zl=Symbol.for("react.strict_mode"),Bo=Symbol.for("react.profiler"),id=Symbol.for("react.provider"),sd=Symbol.for("react.context"),ea=Symbol.for("react.forward_ref"),Vo=Symbol.for("react.suspense"),Wo=Symbol.for("react.suspense_list"),ta=Symbol.for("react.memo"),jt=Symbol.for("react.lazy"),od=Symbol.for("react.offscreen"),nu=Symbol.iterator;function fr(e){return e===null||typeof e!="object"?null:(e=nu&&e[nu]||e["@@iterator"],typeof e=="function"?e:null)}var Y=Object.assign,lo;function Nr(e){if(lo===void 0)try{throw Error()}catch(n){var t=n.stack.trim().match(/\n( *(at )?)/);lo=t&&t[1]||""}return`
+`+lo+e}var ao=!1;function uo(e,t){if(!e||ao)return"";ao=!0;var n=Error.prepareStackTrace;Error.prepareStackTrace=void 0;try{if(t)if(t=function(){throw Error()},Object.defineProperty(t.prototype,"props",{set:function(){throw Error()}}),typeof Reflect=="object"&&Reflect.construct){try{Reflect.construct(t,[])}catch(u){var r=u}Reflect.construct(e,[],t)}else{try{t.call()}catch(u){r=u}e.call(t.prototype)}else{try{throw Error()}catch(u){r=u}e()}}catch(u){if(u&&r&&typeof u.stack=="string"){for(var i=u.stack.split(`
+`),s=r.stack.split(`
+`),o=i.length-1,l=s.length-1;1<=o&&0<=l&&i[o]!==s[l];)l--;for(;1<=o&&0<=l;o--,l--)if(i[o]!==s[l]){if(o!==1||l!==1)do if(o--,l--,0>l||i[o]!==s[l]){var a=`
+`+i[o].replace(" at new "," at ");return e.displayName&&a.includes("<anonymous>")&&(a=a.replace("<anonymous>",e.displayName)),a}while(1<=o&&0<=l);break}}}finally{ao=!1,Error.prepareStackTrace=n}return(e=e?e.displayName||e.name:"")?Nr(e):""}function _m(e){switch(e.tag){case 5:return Nr(e.type);case 16:return Nr("Lazy");case 13:return Nr("Suspense");case 19:return Nr("SuspenseList");case 0:case 2:case 15:return e=uo(e.type,!1),e;case 11:return e=uo(e.type.render,!1),e;case 1:return e=uo(e.type,!0),e;default:return""}}function qo(e){if(e==null)return null;if(typeof e=="function")return e.displayName||e.name||null;if(typeof e=="string")return e;switch(e){case Ln:return"Fragment";case bn:return"Portal";case Bo:return"Profiler";case Zl:return"StrictMode";case Vo:return"Suspense";case Wo:return"SuspenseList"}if(typeof e=="object")switch(e.$$typeof){case sd:return(e.displayName||"Context")+".Consumer";case id:return(e._context.displayName||"Context")+".Provider";case ea:var t=e.render;return e=e.displayName,e||(e=t.displayName||t.name||"",e=e!==""?"ForwardRef("+e+")":"ForwardRef"),e;case ta:return t=e.displayName||null,t!==null?t:qo(e.type)||"Memo";case jt:t=e._payload,e=e._init;try{return qo(e(t))}catch{}}return null}function Sm(e){var t=e.type;switch(e.tag){case 24:return"Cache";case 9:return(t.displayName||"Context")+".Consumer";case 10:return(t._context.displayName||"Context")+".Provider";case 18:return"DehydratedFragment";case 11:return e=t.render,e=e.displayName||e.name||"",t.displayName||(e!==""?"ForwardRef("+e+")":"ForwardRef");case 7:return"Fragment";case 5:return t;case 4:return"Portal";case 3:return"Root";case 6:return"Text";case 16:return qo(t);case 8:return t===Zl?"StrictMode":"Mode";case 22:return"Offscreen";case 12:return"Profiler";case 21:return"Scope";case 13:return"Suspense";case 19:return"SuspenseList";case 25:return"TracingMarker";case 1:case 0:case 17:case 2:case 14:case 15:if(typeof t=="function")return t.displayName||t.name||null;if(typeof t=="string")return t}return null}function Yt(e){switch(typeof e){case"boolean":case"number":case"string":case"undefined":return e;case"object":return e;default:return""}}function ld(e){var t=e.type;return(e=e.nodeName)&&e.toLowerCase()==="input"&&(t==="checkbox"||t==="radio")}function Em(e){var t=ld(e)?"checked":"value",n=Object.getOwnPropertyDescriptor(e.constructor.prototype,t),r=""+e[t];if(!e.hasOwnProperty(t)&&typeof n<"u"&&typeof n.get=="function"&&typeof n.set=="function"){var i=n.get,s=n.set;return Object.defineProperty(e,t,{configurable:!0,get:function(){return i.call(this)},set:function(o){r=""+o,s.call(this,o)}}),Object.defineProperty(e,t,{enumerable:n.enumerable}),{getValue:function(){return r},setValue:function(o){r=""+o},stopTracking:function(){e._valueTracker=null,delete e[t]}}}}function wi(e){e._valueTracker||(e._valueTracker=Em(e))}function ad(e){if(!e)return!1;var t=e._valueTracker;if(!t)return!0;var n=t.getValue(),r="";return e&&(r=ld(e)?e.checked?"true":"false":e.value),e=r,e!==n?(t.setValue(e),!0):!1}function ss(e){if(e=e||(typeof document<"u"?document:void 0),typeof e>"u")return null;try{return e.activeElement||e.body}catch{return e.body}}function Xo(e,t){var n=t.checked;return Y({},t,{defaultChecked:void 0,defaultValue:void 0,value:void 0,checked:n??e._wrapperState.initialChecked})}function ru(e,t){var n=t.defaultValue==null?"":t.defaultValue,r=t.checked!=null?t.checked:t.defaultChecked;n=Yt(t.value!=null?t.value:n),e._wrapperState={initialChecked:r,initialValue:n,controlled:t.type==="checkbox"||t.type==="radio"?t.checked!=null:t.value!=null}}function ud(e,t){t=t.checked,t!=null&&Jl(e,"checked",t,!1)}function Qo(e,t){ud(e,t);var n=Yt(t.value),r=t.type;if(n!=null)r==="number"?(n===0&&e.value===""||e.value!=n)&&(e.value=""+n):e.value!==""+n&&(e.value=""+n);else if(r==="submit"||r==="reset"){e.removeAttribute("value");return}t.hasOwnProperty("value")?Go(e,t.type,n):t.hasOwnProperty("defaultValue")&&Go(e,t.type,Yt(t.defaultValue)),t.checked==null&&t.defaultChecked!=null&&(e.defaultChecked=!!t.defaultChecked)}function iu(e,t,n){if(t.hasOwnProperty("value")||t.hasOwnProperty("defaultValue")){var r=t.type;if(!(r!=="submit"&&r!=="reset"||t.value!==void 0&&t.value!==null))return;t=""+e._wrapperState.initialValue,n||t===e.value||(e.value=t),e.defaultValue=t}n=e.name,n!==""&&(e.name=""),e.defaultChecked=!!e._wrapperState.initialChecked,n!==""&&(e.name=n)}function Go(e,t,n){(t!=="number"||ss(e.ownerDocument)!==e)&&(n==null?e.defaultValue=""+e._wrapperState.initialValue:e.defaultValue!==""+n&&(e.defaultValue=""+n))}var Cr=Array.isArray;function Un(e,t,n,r){if(e=e.options,t){t={};for(var i=0;i<n.length;i++)t["$"+n[i]]=!0;for(n=0;n<e.length;n++)i=t.hasOwnProperty("$"+e[n].value),e[n].selected!==i&&(e[n].selected=i),i&&r&&(e[n].defaultSelected=!0)}else{for(n=""+Yt(n),t=null,i=0;i<e.length;i++){if(e[i].value===n){e[i].selected=!0,r&&(e[i].defaultSelected=!0);return}t!==null||e[i].disabled||(t=e[i])}t!==null&&(t.selected=!0)}}function Ko(e,t){if(t.dangerouslySetInnerHTML!=null)throw Error(b(91));return Y({},t,{value:void 0,defaultValue:void 0,children:""+e._wrapperState.initialValue})}function su(e,t){var n=t.value;if(n==null){if(n=t.children,t=t.defaultValue,n!=null){if(t!=null)throw Error(b(92));if(Cr(n)){if(1<n.length)throw Error(b(93));n=n[0]}t=n}t==null&&(t=""),n=t}e._wrapperState={initialValue:Yt(n)}}function cd(e,t){var n=Yt(t.value),r=Yt(t.defaultValue);n!=null&&(n=""+n,n!==e.value&&(e.value=n),t.defaultValue==null&&e.defaultValue!==n&&(e.defaultValue=n)),r!=null&&(e.defaultValue=""+r)}function ou(e){var t=e.textContent;t===e._wrapperState.initialValue&&t!==""&&t!==null&&(e.value=t)}function dd(e){switch(e){case"svg":return"http://www.w3.org/2000/svg";case"math":return"http://www.w3.org/1998/Math/MathML";default:return"http://www.w3.org/1999/xhtml"}}function Yo(e,t){return e==null||e==="http://www.w3.org/1999/xhtml"?dd(t):e==="http://www.w3.org/2000/svg"&&t==="foreignObject"?"http://www.w3.org/1999/xhtml":e}var xi,fd=function(e){return typeof MSApp<"u"&&MSApp.execUnsafeLocalFunction?function(t,n,r,i){MSApp.execUnsafeLocalFunction(function(){return e(t,n,r,i)})}:e}(function(e,t){if(e.namespaceURI!=="http://www.w3.org/2000/svg"||"innerHTML"in e)e.innerHTML=t;else{for(xi=xi||document.createElement("div"),xi.innerHTML="<svg>"+t.valueOf().toString()+"</svg>",t=xi.firstChild;e.firstChild;)e.removeChild(e.firstChild);for(;t.firstChild;)e.appendChild(t.firstChild)}});function Vr(e,t){if(t){var n=e.firstChild;if(n&&n===e.lastChild&&n.nodeType===3){n.nodeValue=t;return}}e.textContent=t}var jr={animationIterationCount:!0,aspectRatio:!0,borderImageOutset:!0,borderImageSlice:!0,borderImageWidth:!0,boxFlex:!0,boxFlexGroup:!0,boxOrdinalGroup:!0,columnCount:!0,columns:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,flexOrder:!0,gridArea:!0,gridRow:!0,gridRowEnd:!0,gridRowSpan:!0,gridRowStart:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnSpan:!0,gridColumnStart:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,tabSize:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeDasharray:!0,strokeDashoffset:!0,strokeMiterlimit:!0,strokeOpacity:!0,strokeWidth:!0},Tm=["Webkit","ms","Moz","O"];Object.keys(jr).forEach(function(e){Tm.forEach(function(t){t=t+e.charAt(0).toUpperCase()+e.substring(1),jr[t]=jr[e]})});function hd(e,t,n){return t==null||typeof t=="boolean"||t===""?"":n||typeof t!="number"||t===0||jr.hasOwnProperty(e)&&jr[e]?(""+t).trim():t+"px"}function pd(e,t){e=e.style;for(var n in t)if(t.hasOwnProperty(n)){var r=n.indexOf("--")===0,i=hd(n,t[n],r);n==="float"&&(n="cssFloat"),r?e.setProperty(n,i):e[n]=i}}var km=Y({menuitem:!0},{area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0});function Jo(e,t){if(t){if(km[e]&&(t.children!=null||t.dangerouslySetInnerHTML!=null))throw Error(b(137,e));if(t.dangerouslySetInnerHTML!=null){if(t.children!=null)throw Error(b(60));if(typeof t.dangerouslySetInnerHTML!="object"||!("__html"in t.dangerouslySetInnerHTML))throw Error(b(61))}if(t.style!=null&&typeof t.style!="object")throw Error(b(62))}}function Zo(e,t){if(e.indexOf("-")===-1)return typeof t.is=="string";switch(e){case"annotation-xml":case"color-profile":case"font-face":case"font-face-src":case"font-face-uri":case"font-face-format":case"font-face-name":case"missing-glyph":return!1;default:return!0}}var el=null;function na(e){return e=e.target||e.srcElement||window,e.correspondingUseElement&&(e=e.correspondingUseElement),e.nodeType===3?e.parentNode:e}var tl=null,Bn=null,Vn=null;function lu(e){if(e=ci(e)){if(typeof tl!="function")throw Error(b(280));var t=e.stateNode;t&&(t=Hs(t),tl(e.stateNode,e.type,t))}}function md(e){Bn?Vn?Vn.push(e):Vn=[e]:Bn=e}function gd(){if(Bn){var e=Bn,t=Vn;if(Vn=Bn=null,lu(e),t)for(e=0;e<t.length;e++)lu(t[e])}}function vd(e,t){return e(t)}function yd(){}var co=!1;function wd(e,t,n){if(co)return e(t,n);co=!0;try{return vd(e,t,n)}finally{co=!1,(Bn!==null||Vn!==null)&&(yd(),gd())}}function Wr(e,t){var n=e.stateNode;if(n===null)return null;var r=Hs(n);if(r===null)return null;n=r[t];e:switch(t){case"onClick":case"onClickCapture":case"onDoubleClick":case"onDoubleClickCapture":case"onMouseDown":case"onMouseDownCapture":case"onMouseMove":case"onMouseMoveCapture":case"onMouseUp":case"onMouseUpCapture":case"onMouseEnter":(r=!r.disabled)||(e=e.type,r=!(e==="button"||e==="input"||e==="select"||e==="textarea")),e=!r;break e;default:e=!1}if(e)return null;if(n&&typeof n!="function")throw Error(b(231,t,typeof n));return n}var nl=!1;if(Ct)try{var hr={};Object.defineProperty(hr,"passive",{get:function(){nl=!0}}),window.addEventListener("test",hr,hr),window.removeEventListener("test",hr,hr)}catch{nl=!1}function Nm(e,t,n,r,i,s,o,l,a){var u=Array.prototype.slice.call(arguments,3);try{t.apply(n,u)}catch(c){this.onError(c)}}var Pr=!1,os=null,ls=!1,rl=null,Cm={onError:function(e){Pr=!0,os=e}};function bm(e,t,n,r,i,s,o,l,a){Pr=!1,os=null,Nm.apply(Cm,arguments)}function Lm(e,t,n,r,i,s,o,l,a){if(bm.apply(this,arguments),Pr){if(Pr){var u=os;Pr=!1,os=null}else throw Error(b(198));ls||(ls=!0,rl=u)}}function wn(e){var t=e,n=e;if(e.alternate)for(;t.return;)t=t.return;else{e=t;do t=e,t.flags&4098&&(n=t.return),e=t.return;while(e)}return t.tag===3?n:null}function xd(e){if(e.tag===13){var t=e.memoizedState;if(t===null&&(e=e.alternate,e!==null&&(t=e.memoizedState)),t!==null)return t.dehydrated}return null}function au(e){if(wn(e)!==e)throw Error(b(188))}function Am(e){var t=e.alternate;if(!t){if(t=wn(e),t===null)throw Error(b(188));return t!==e?null:e}for(var n=e,r=t;;){var i=n.return;if(i===null)break;var s=i.alternate;if(s===null){if(r=i.return,r!==null){n=r;continue}break}if(i.child===s.child){for(s=i.child;s;){if(s===n)return au(i),e;if(s===r)return au(i),t;s=s.sibling}throw Error(b(188))}if(n.return!==r.return)n=i,r=s;else{for(var o=!1,l=i.child;l;){if(l===n){o=!0,n=i,r=s;break}if(l===r){o=!0,r=i,n=s;break}l=l.sibling}if(!o){for(l=s.child;l;){if(l===n){o=!0,n=s,r=i;break}if(l===r){o=!0,r=s,n=i;break}l=l.sibling}if(!o)throw Error(b(189))}}if(n.alternate!==r)throw Error(b(190))}if(n.tag!==3)throw Error(b(188));return n.stateNode.current===n?e:t}function _d(e){return e=Am(e),e!==null?Sd(e):null}function Sd(e){if(e.tag===5||e.tag===6)return e;for(e=e.child;e!==null;){var t=Sd(e);if(t!==null)return t;e=e.sibling}return null}var Ed=He.unstable_scheduleCallback,uu=He.unstable_cancelCallback,Mm=He.unstable_shouldYield,Im=He.unstable_requestPaint,ee=He.unstable_now,jm=He.unstable_getCurrentPriorityLevel,ra=He.unstable_ImmediatePriority,Td=He.unstable_UserBlockingPriority,as=He.unstable_NormalPriority,Pm=He.unstable_LowPriority,kd=He.unstable_IdlePriority,Os=null,mt=null;function Rm(e){if(mt&&typeof mt.onCommitFiberRoot=="function")try{mt.onCommitFiberRoot(Os,e,void 0,(e.current.flags&128)===128)}catch{}}var st=Math.clz32?Math.clz32:zm,$m=Math.log,Om=Math.LN2;function zm(e){return e>>>=0,e===0?32:31-($m(e)/Om|0)|0}var _i=64,Si=4194304;function br(e){switch(e&-e){case 1:return 1;case 2:return 2;case 4:return 4;case 8:return 8;case 16:return 16;case 32:return 32;case 64:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:return e&4194240;case 4194304:case 8388608:case 16777216:case 33554432:case 67108864:return e&130023424;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 1073741824;default:return e}}function us(e,t){var n=e.pendingLanes;if(n===0)return 0;var r=0,i=e.suspendedLanes,s=e.pingedLanes,o=n&268435455;if(o!==0){var l=o&~i;l!==0?r=br(l):(s&=o,s!==0&&(r=br(s)))}else o=n&~i,o!==0?r=br(o):s!==0&&(r=br(s));if(r===0)return 0;if(t!==0&&t!==r&&!(t&i)&&(i=r&-r,s=t&-t,i>=s||i===16&&(s&4194240)!==0))return t;if(r&4&&(r|=n&16),t=e.entangledLanes,t!==0)for(e=e.entanglements,t&=r;0<t;)n=31-st(t),i=1<<n,r|=e[n],t&=~i;return r}function Dm(e,t){switch(e){case 1:case 2:case 4:return t+250;case 8:case 16:case 32:case 64:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:return t+5e3;case 4194304:case 8388608:case 16777216:case 33554432:case 67108864:return-1;case 134217728:case 268435456:case 536870912:case 1073741824:return-1;default:return-1}}function Fm(e,t){for(var n=e.suspendedLanes,r=e.pingedLanes,i=e.expirationTimes,s=e.pendingLanes;0<s;){var o=31-st(s),l=1<<o,a=i[o];a===-1?(!(l&n)||l&r)&&(i[o]=Dm(l,t)):a<=t&&(e.expiredLanes|=l),s&=~l}}function il(e){return e=e.pendingLanes&-1073741825,e!==0?e:e&1073741824?1073741824:0}function Nd(){var e=_i;return _i<<=1,!(_i&4194240)&&(_i=64),e}function fo(e){for(var t=[],n=0;31>n;n++)t.push(e);return t}function ai(e,t,n){e.pendingLanes|=t,t!==536870912&&(e.suspendedLanes=0,e.pingedLanes=0),e=e.eventTimes,t=31-st(t),e[t]=n}function Hm(e,t){var n=e.pendingLanes&~t;e.pendingLanes=t,e.suspendedLanes=0,e.pingedLanes=0,e.expiredLanes&=t,e.mutableReadLanes&=t,e.entangledLanes&=t,t=e.entanglements;var r=e.eventTimes;for(e=e.expirationTimes;0<n;){var i=31-st(n),s=1<<i;t[i]=0,r[i]=-1,e[i]=-1,n&=~s}}function ia(e,t){var n=e.entangledLanes|=t;for(e=e.entanglements;n;){var r=31-st(n),i=1<<r;i&t|e[r]&t&&(e[r]|=t),n&=~i}}var H=0;function Cd(e){return e&=-e,1<e?4<e?e&268435455?16:536870912:4:1}var bd,sa,Ld,Ad,Md,sl=!1,Ei=[],Ut=null,Bt=null,Vt=null,qr=new Map,Xr=new Map,Ot=[],Um="mousedown mouseup touchcancel touchend touchstart auxclick dblclick pointercancel pointerdown pointerup dragend dragstart drop compositionend compositionstart keydown keypress keyup input textInput copy cut paste click change contextmenu reset submit".split(" ");function cu(e,t){switch(e){case"focusin":case"focusout":Ut=null;break;case"dragenter":case"dragleave":Bt=null;break;case"mouseover":case"mouseout":Vt=null;break;case"pointerover":case"pointerout":qr.delete(t.pointerId);break;case"gotpointercapture":case"lostpointercapture":Xr.delete(t.pointerId)}}function pr(e,t,n,r,i,s){return e===null||e.nativeEvent!==s?(e={blockedOn:t,domEventName:n,eventSystemFlags:r,nativeEvent:s,targetContainers:[i]},t!==null&&(t=ci(t),t!==null&&sa(t)),e):(e.eventSystemFlags|=r,t=e.targetContainers,i!==null&&t.indexOf(i)===-1&&t.push(i),e)}function Bm(e,t,n,r,i){switch(t){case"focusin":return Ut=pr(Ut,e,t,n,r,i),!0;case"dragenter":return Bt=pr(Bt,e,t,n,r,i),!0;case"mouseover":return Vt=pr(Vt,e,t,n,r,i),!0;case"pointerover":var s=i.pointerId;return qr.set(s,pr(qr.get(s)||null,e,t,n,r,i)),!0;case"gotpointercapture":return s=i.pointerId,Xr.set(s,pr(Xr.get(s)||null,e,t,n,r,i)),!0}return!1}function Id(e){var t=sn(e.target);if(t!==null){var n=wn(t);if(n!==null){if(t=n.tag,t===13){if(t=xd(n),t!==null){e.blockedOn=t,Md(e.priority,function(){Ld(n)});return}}else if(t===3&&n.stateNode.current.memoizedState.isDehydrated){e.blockedOn=n.tag===3?n.stateNode.containerInfo:null;return}}}e.blockedOn=null}function Hi(e){if(e.blockedOn!==null)return!1;for(var t=e.targetContainers;0<t.length;){var n=ol(e.domEventName,e.eventSystemFlags,t[0],e.nativeEvent);if(n===null){n=e.nativeEvent;var r=new n.constructor(n.type,n);el=r,n.target.dispatchEvent(r),el=null}else return t=ci(n),t!==null&&sa(t),e.blockedOn=n,!1;t.shift()}return!0}function du(e,t,n){Hi(e)&&n.delete(t)}function Vm(){sl=!1,Ut!==null&&Hi(Ut)&&(Ut=null),Bt!==null&&Hi(Bt)&&(Bt=null),Vt!==null&&Hi(Vt)&&(Vt=null),qr.forEach(du),Xr.forEach(du)}function mr(e,t){e.blockedOn===t&&(e.blockedOn=null,sl||(sl=!0,He.unstable_scheduleCallback(He.unstable_NormalPriority,Vm)))}function Qr(e){function t(i){return mr(i,e)}if(0<Ei.length){mr(Ei[0],e);for(var n=1;n<Ei.length;n++){var r=Ei[n];r.blockedOn===e&&(r.blockedOn=null)}}for(Ut!==null&&mr(Ut,e),Bt!==null&&mr(Bt,e),Vt!==null&&mr(Vt,e),qr.forEach(t),Xr.forEach(t),n=0;n<Ot.length;n++)r=Ot[n],r.blockedOn===e&&(r.blockedOn=null);for(;0<Ot.length&&(n=Ot[0],n.blockedOn===null);)Id(n),n.blockedOn===null&&Ot.shift()}var Wn=Mt.ReactCurrentBatchConfig,cs=!0;function Wm(e,t,n,r){var i=H,s=Wn.transition;Wn.transition=null;try{H=1,oa(e,t,n,r)}finally{H=i,Wn.transition=s}}function qm(e,t,n,r){var i=H,s=Wn.transition;Wn.transition=null;try{H=4,oa(e,t,n,r)}finally{H=i,Wn.transition=s}}function oa(e,t,n,r){if(cs){var i=ol(e,t,n,r);if(i===null)So(e,t,r,ds,n),cu(e,r);else if(Bm(i,e,t,n,r))r.stopPropagation();else if(cu(e,r),t&4&&-1<Um.indexOf(e)){for(;i!==null;){var s=ci(i);if(s!==null&&bd(s),s=ol(e,t,n,r),s===null&&So(e,t,r,ds,n),s===i)break;i=s}i!==null&&r.stopPropagation()}else So(e,t,r,null,n)}}var ds=null;function ol(e,t,n,r){if(ds=null,e=na(r),e=sn(e),e!==null)if(t=wn(e),t===null)e=null;else if(n=t.tag,n===13){if(e=xd(t),e!==null)return e;e=null}else if(n===3){if(t.stateNode.current.memoizedState.isDehydrated)return t.tag===3?t.stateNode.containerInfo:null;e=null}else t!==e&&(e=null);return ds=e,null}function jd(e){switch(e){case"cancel":case"click":case"close":case"contextmenu":case"copy":case"cut":case"auxclick":case"dblclick":case"dragend":case"dragstart":case"drop":case"focusin":case"focusout":case"input":case"invalid":case"keydown":case"keypress":case"keyup":case"mousedown":case"mouseup":case"paste":case"pause":case"play":case"pointercancel":case"pointerdown":case"pointerup":case"ratechange":case"reset":case"resize":case"seeked":case"submit":case"touchcancel":case"touchend":case"touchstart":case"volumechange":case"change":case"selectionchange":case"textInput":case"compositionstart":case"compositionend":case"compositionupdate":case"beforeblur":case"afterblur":case"beforeinput":case"blur":case"fullscreenchange":case"focus":case"hashchange":case"popstate":case"select":case"selectstart":return 1;case"drag":case"dragenter":case"dragexit":case"dragleave":case"dragover":case"mousemove":case"mouseout":case"mouseover":case"pointermove":case"pointerout":case"pointerover":case"scroll":case"toggle":case"touchmove":case"wheel":case"mouseenter":case"mouseleave":case"pointerenter":case"pointerleave":return 4;case"message":switch(jm()){case ra:return 1;case Td:return 4;case as:case Pm:return 16;case kd:return 536870912;default:return 16}default:return 16}}var Dt=null,la=null,Ui=null;function Pd(){if(Ui)return Ui;var e,t=la,n=t.length,r,i="value"in Dt?Dt.value:Dt.textContent,s=i.length;for(e=0;e<n&&t[e]===i[e];e++);var o=n-e;for(r=1;r<=o&&t[n-r]===i[s-r];r++);return Ui=i.slice(e,1<r?1-r:void 0)}function Bi(e){var t=e.keyCode;return"charCode"in e?(e=e.charCode,e===0&&t===13&&(e=13)):e=t,e===10&&(e=13),32<=e||e===13?e:0}function Ti(){return!0}function fu(){return!1}function Ve(e){function t(n,r,i,s,o){this._reactName=n,this._targetInst=i,this.type=r,this.nativeEvent=s,this.target=o,this.currentTarget=null;for(var l in e)e.hasOwnProperty(l)&&(n=e[l],this[l]=n?n(s):s[l]);return this.isDefaultPrevented=(s.defaultPrevented!=null?s.defaultPrevented:s.returnValue===!1)?Ti:fu,this.isPropagationStopped=fu,this}return Y(t.prototype,{preventDefault:function(){this.defaultPrevented=!0;var n=this.nativeEvent;n&&(n.preventDefault?n.preventDefault():typeof n.returnValue!="unknown"&&(n.returnValue=!1),this.isDefaultPrevented=Ti)},stopPropagation:function(){var n=this.nativeEvent;n&&(n.stopPropagation?n.stopPropagation():typeof n.cancelBubble!="unknown"&&(n.cancelBubble=!0),this.isPropagationStopped=Ti)},persist:function(){},isPersistent:Ti}),t}var rr={eventPhase:0,bubbles:0,cancelable:0,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:0,isTrusted:0},aa=Ve(rr),ui=Y({},rr,{view:0,detail:0}),Xm=Ve(ui),ho,po,gr,zs=Y({},ui,{screenX:0,screenY:0,clientX:0,clientY:0,pageX:0,pageY:0,ctrlKey:0,shiftKey:0,altKey:0,metaKey:0,getModifierState:ua,button:0,buttons:0,relatedTarget:function(e){return e.relatedTarget===void 0?e.fromElement===e.srcElement?e.toElement:e.fromElement:e.relatedTarget},movementX:function(e){return"movementX"in e?e.movementX:(e!==gr&&(gr&&e.type==="mousemove"?(ho=e.screenX-gr.screenX,po=e.screenY-gr.screenY):po=ho=0,gr=e),ho)},movementY:function(e){return"movementY"in e?e.movementY:po}}),hu=Ve(zs),Qm=Y({},zs,{dataTransfer:0}),Gm=Ve(Qm),Km=Y({},ui,{relatedTarget:0}),mo=Ve(Km),Ym=Y({},rr,{animationName:0,elapsedTime:0,pseudoElement:0}),Jm=Ve(Ym),Zm=Y({},rr,{clipboardData:function(e){return"clipboardData"in e?e.clipboardData:window.clipboardData}}),eg=Ve(Zm),tg=Y({},rr,{data:0}),pu=Ve(tg),ng={Esc:"Escape",Spacebar:" ",Left:"ArrowLeft",Up:"ArrowUp",Right:"ArrowRight",Down:"ArrowDown",Del:"Delete",Win:"OS",Menu:"ContextMenu",Apps:"ContextMenu",Scroll:"ScrollLock",MozPrintableKey:"Unidentified"},rg={8:"Backspace",9:"Tab",12:"Clear",13:"Enter",16:"Shift",17:"Control",18:"Alt",19:"Pause",20:"CapsLock",27:"Escape",32:" ",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",45:"Insert",46:"Delete",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NumLock",145:"ScrollLock",224:"Meta"},ig={Alt:"altKey",Control:"ctrlKey",Meta:"metaKey",Shift:"shiftKey"};function sg(e){var t=this.nativeEvent;return t.getModifierState?t.getModifierState(e):(e=ig[e])?!!t[e]:!1}function ua(){return sg}var og=Y({},ui,{key:function(e){if(e.key){var t=ng[e.key]||e.key;if(t!=="Unidentified")return t}return e.type==="keypress"?(e=Bi(e),e===13?"Enter":String.fromCharCode(e)):e.type==="keydown"||e.type==="keyup"?rg[e.keyCode]||"Unidentified":""},code:0,location:0,ctrlKey:0,shiftKey:0,altKey:0,metaKey:0,repeat:0,locale:0,getModifierState:ua,charCode:function(e){return e.type==="keypress"?Bi(e):0},keyCode:function(e){return e.type==="keydown"||e.type==="keyup"?e.keyCode:0},which:function(e){return e.type==="keypress"?Bi(e):e.type==="keydown"||e.type==="keyup"?e.keyCode:0}}),lg=Ve(og),ag=Y({},zs,{pointerId:0,width:0,height:0,pressure:0,tangentialPressure:0,tiltX:0,tiltY:0,twist:0,pointerType:0,isPrimary:0}),mu=Ve(ag),ug=Y({},ui,{touches:0,targetTouches:0,changedTouches:0,altKey:0,metaKey:0,ctrlKey:0,shiftKey:0,getModifierState:ua}),cg=Ve(ug),dg=Y({},rr,{propertyName:0,elapsedTime:0,pseudoElement:0}),fg=Ve(dg),hg=Y({},zs,{deltaX:function(e){return"deltaX"in e?e.deltaX:"wheelDeltaX"in e?-e.wheelDeltaX:0},deltaY:function(e){return"deltaY"in e?e.deltaY:"wheelDeltaY"in e?-e.wheelDeltaY:"wheelDelta"in e?-e.wheelDelta:0},deltaZ:0,deltaMode:0}),pg=Ve(hg),mg=[9,13,27,32],ca=Ct&&"CompositionEvent"in window,Rr=null;Ct&&"documentMode"in document&&(Rr=document.documentMode);var gg=Ct&&"TextEvent"in window&&!Rr,Rd=Ct&&(!ca||Rr&&8<Rr&&11>=Rr),gu=" ",vu=!1;function $d(e,t){switch(e){case"keyup":return mg.indexOf(t.keyCode)!==-1;case"keydown":return t.keyCode!==229;case"keypress":case"mousedown":case"focusout":return!0;default:return!1}}function Od(e){return e=e.detail,typeof e=="object"&&"data"in e?e.data:null}var An=!1;function vg(e,t){switch(e){case"compositionend":return Od(t);case"keypress":return t.which!==32?null:(vu=!0,gu);case"textInput":return e=t.data,e===gu&&vu?null:e;default:return null}}function yg(e,t){if(An)return e==="compositionend"||!ca&&$d(e,t)?(e=Pd(),Ui=la=Dt=null,An=!1,e):null;switch(e){case"paste":return null;case"keypress":if(!(t.ctrlKey||t.altKey||t.metaKey)||t.ctrlKey&&t.altKey){if(t.char&&1<t.char.length)return t.char;if(t.which)return String.fromCharCode(t.which)}return null;case"compositionend":return Rd&&t.locale!=="ko"?null:t.data;default:return null}}var wg={color:!0,date:!0,datetime:!0,"datetime-local":!0,email:!0,month:!0,number:!0,password:!0,range:!0,search:!0,tel:!0,text:!0,time:!0,url:!0,week:!0};function yu(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t==="input"?!!wg[e.type]:t==="textarea"}function zd(e,t,n,r){md(r),t=fs(t,"onChange"),0<t.length&&(n=new aa("onChange","change",null,n,r),e.push({event:n,listeners:t}))}var $r=null,Gr=null;function xg(e){Gd(e,0)}function Ds(e){var t=jn(e);if(ad(t))return e}function _g(e,t){if(e==="change")return t}var Dd=!1;if(Ct){var go;if(Ct){var vo="oninput"in document;if(!vo){var wu=document.createElement("div");wu.setAttribute("oninput","return;"),vo=typeof wu.oninput=="function"}go=vo}else go=!1;Dd=go&&(!document.documentMode||9<document.documentMode)}function xu(){$r&&($r.detachEvent("onpropertychange",Fd),Gr=$r=null)}function Fd(e){if(e.propertyName==="value"&&Ds(Gr)){var t=[];zd(t,Gr,e,na(e)),wd(xg,t)}}function Sg(e,t,n){e==="focusin"?(xu(),$r=t,Gr=n,$r.attachEvent("onpropertychange",Fd)):e==="focusout"&&xu()}function Eg(e){if(e==="selectionchange"||e==="keyup"||e==="keydown")return Ds(Gr)}function Tg(e,t){if(e==="click")return Ds(t)}function kg(e,t){if(e==="input"||e==="change")return Ds(t)}function Ng(e,t){return e===t&&(e!==0||1/e===1/t)||e!==e&&t!==t}var lt=typeof Object.is=="function"?Object.is:Ng;function Kr(e,t){if(lt(e,t))return!0;if(typeof e!="object"||e===null||typeof t!="object"||t===null)return!1;var n=Object.keys(e),r=Object.keys(t);if(n.length!==r.length)return!1;for(r=0;r<n.length;r++){var i=n[r];if(!Uo.call(t,i)||!lt(e[i],t[i]))return!1}return!0}function _u(e){for(;e&&e.firstChild;)e=e.firstChild;return e}function Su(e,t){var n=_u(e);e=0;for(var r;n;){if(n.nodeType===3){if(r=e+n.textContent.length,e<=t&&r>=t)return{node:n,offset:t-e};e=r}e:{for(;n;){if(n.nextSibling){n=n.nextSibling;break e}n=n.parentNode}n=void 0}n=_u(n)}}function Hd(e,t){return e&&t?e===t?!0:e&&e.nodeType===3?!1:t&&t.nodeType===3?Hd(e,t.parentNode):"contains"in e?e.contains(t):e.compareDocumentPosition?!!(e.compareDocumentPosition(t)&16):!1:!1}function Ud(){for(var e=window,t=ss();t instanceof e.HTMLIFrameElement;){try{var n=typeof t.contentWindow.location.href=="string"}catch{n=!1}if(n)e=t.contentWindow;else break;t=ss(e.document)}return t}function da(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&(t==="input"&&(e.type==="text"||e.type==="search"||e.type==="tel"||e.type==="url"||e.type==="password")||t==="textarea"||e.contentEditable==="true")}function Cg(e){var t=Ud(),n=e.focusedElem,r=e.selectionRange;if(t!==n&&n&&n.ownerDocument&&Hd(n.ownerDocument.documentElement,n)){if(r!==null&&da(n)){if(t=r.start,e=r.end,e===void 0&&(e=t),"selectionStart"in n)n.selectionStart=t,n.selectionEnd=Math.min(e,n.value.length);else if(e=(t=n.ownerDocument||document)&&t.defaultView||window,e.getSelection){e=e.getSelection();var i=n.textContent.length,s=Math.min(r.start,i);r=r.end===void 0?s:Math.min(r.end,i),!e.extend&&s>r&&(i=r,r=s,s=i),i=Su(n,s);var o=Su(n,r);i&&o&&(e.rangeCount!==1||e.anchorNode!==i.node||e.anchorOffset!==i.offset||e.focusNode!==o.node||e.focusOffset!==o.offset)&&(t=t.createRange(),t.setStart(i.node,i.offset),e.removeAllRanges(),s>r?(e.addRange(t),e.extend(o.node,o.offset)):(t.setEnd(o.node,o.offset),e.addRange(t)))}}for(t=[],e=n;e=e.parentNode;)e.nodeType===1&&t.push({element:e,left:e.scrollLeft,top:e.scrollTop});for(typeof n.focus=="function"&&n.focus(),n=0;n<t.length;n++)e=t[n],e.element.scrollLeft=e.left,e.element.scrollTop=e.top}}var bg=Ct&&"documentMode"in document&&11>=document.documentMode,Mn=null,ll=null,Or=null,al=!1;function Eu(e,t,n){var r=n.window===n?n.document:n.nodeType===9?n:n.ownerDocument;al||Mn==null||Mn!==ss(r)||(r=Mn,"selectionStart"in r&&da(r)?r={start:r.selectionStart,end:r.selectionEnd}:(r=(r.ownerDocument&&r.ownerDocument.defaultView||window).getSelection(),r={anchorNode:r.anchorNode,anchorOffset:r.anchorOffset,focusNode:r.focusNode,focusOffset:r.focusOffset}),Or&&Kr(Or,r)||(Or=r,r=fs(ll,"onSelect"),0<r.length&&(t=new aa("onSelect","select",null,t,n),e.push({event:t,listeners:r}),t.target=Mn)))}function ki(e,t){var n={};return n[e.toLowerCase()]=t.toLowerCase(),n["Webkit"+e]="webkit"+t,n["Moz"+e]="moz"+t,n}var In={animationend:ki("Animation","AnimationEnd"),animationiteration:ki("Animation","AnimationIteration"),animationstart:ki("Animation","AnimationStart"),transitionend:ki("Transition","TransitionEnd")},yo={},Bd={};Ct&&(Bd=document.createElement("div").style,"AnimationEvent"in window||(delete In.animationend.animation,delete In.animationiteration.animation,delete In.animationstart.animation),"TransitionEvent"in window||delete In.transitionend.transition);function Fs(e){if(yo[e])return yo[e];if(!In[e])return e;var t=In[e],n;for(n in t)if(t.hasOwnProperty(n)&&n in Bd)return yo[e]=t[n];return e}var Vd=Fs("animationend"),Wd=Fs("animationiteration"),qd=Fs("animationstart"),Xd=Fs("transitionend"),Qd=new Map,Tu="abort auxClick cancel canPlay canPlayThrough click close contextMenu copy cut drag dragEnd dragEnter dragExit dragLeave dragOver dragStart drop durationChange emptied encrypted ended error gotPointerCapture input invalid keyDown keyPress keyUp load loadedData loadedMetadata loadStart lostPointerCapture mouseDown mouseMove mouseOut mouseOver mouseUp paste pause play playing pointerCancel pointerDown pointerMove pointerOut pointerOver pointerUp progress rateChange reset resize seeked seeking stalled submit suspend timeUpdate touchCancel touchEnd touchStart volumeChange scroll toggle touchMove waiting wheel".split(" ");function Zt(e,t){Qd.set(e,t),yn(t,[e])}for(var wo=0;wo<Tu.length;wo++){var xo=Tu[wo],Lg=xo.toLowerCase(),Ag=xo[0].toUpperCase()+xo.slice(1);Zt(Lg,"on"+Ag)}Zt(Vd,"onAnimationEnd");Zt(Wd,"onAnimationIteration");Zt(qd,"onAnimationStart");Zt("dblclick","onDoubleClick");Zt("focusin","onFocus");Zt("focusout","onBlur");Zt(Xd,"onTransitionEnd");Gn("onMouseEnter",["mouseout","mouseover"]);Gn("onMouseLeave",["mouseout","mouseover"]);Gn("onPointerEnter",["pointerout","pointerover"]);Gn("onPointerLeave",["pointerout","pointerover"]);yn("onChange","change click focusin focusout input keydown keyup selectionchange".split(" "));yn("onSelect","focusout contextmenu dragend focusin keydown keyup mousedown mouseup selectionchange".split(" "));yn("onBeforeInput",["compositionend","keypress","textInput","paste"]);yn("onCompositionEnd","compositionend focusout keydown keypress keyup mousedown".split(" "));yn("onCompositionStart","compositionstart focusout keydown keypress keyup mousedown".split(" "));yn("onCompositionUpdate","compositionupdate focusout keydown keypress keyup mousedown".split(" "));var Lr="abort canplay canplaythrough durationchange emptied encrypted ended error loadeddata loadedmetadata loadstart pause play playing progress ratechange resize seeked seeking stalled suspend timeupdate volumechange waiting".split(" "),Mg=new Set("cancel close invalid load scroll toggle".split(" ").concat(Lr));function ku(e,t,n){var r=e.type||"unknown-event";e.currentTarget=n,Lm(r,t,void 0,e),e.currentTarget=null}function Gd(e,t){t=(t&4)!==0;for(var n=0;n<e.length;n++){var r=e[n],i=r.event;r=r.listeners;e:{var s=void 0;if(t)for(var o=r.length-1;0<=o;o--){var l=r[o],a=l.instance,u=l.currentTarget;if(l=l.listener,a!==s&&i.isPropagationStopped())break e;ku(i,l,u),s=a}else for(o=0;o<r.length;o++){if(l=r[o],a=l.instance,u=l.currentTarget,l=l.listener,a!==s&&i.isPropagationStopped())break e;ku(i,l,u),s=a}}}if(ls)throw e=rl,ls=!1,rl=null,e}function V(e,t){var n=t[hl];n===void 0&&(n=t[hl]=new Set);var r=e+"__bubble";n.has(r)||(Kd(t,e,2,!1),n.add(r))}function _o(e,t,n){var r=0;t&&(r|=4),Kd(n,e,r,t)}var Ni="_reactListening"+Math.random().toString(36).slice(2);function Yr(e){if(!e[Ni]){e[Ni]=!0,rd.forEach(function(n){n!=="selectionchange"&&(Mg.has(n)||_o(n,!1,e),_o(n,!0,e))});var t=e.nodeType===9?e:e.ownerDocument;t===null||t[Ni]||(t[Ni]=!0,_o("selectionchange",!1,t))}}function Kd(e,t,n,r){switch(jd(t)){case 1:var i=Wm;break;case 4:i=qm;break;default:i=oa}n=i.bind(null,t,n,e),i=void 0,!nl||t!=="touchstart"&&t!=="touchmove"&&t!=="wheel"||(i=!0),r?i!==void 0?e.addEventListener(t,n,{capture:!0,passive:i}):e.addEventListener(t,n,!0):i!==void 0?e.addEventListener(t,n,{passive:i}):e.addEventListener(t,n,!1)}function So(e,t,n,r,i){var s=r;if(!(t&1)&&!(t&2)&&r!==null)e:for(;;){if(r===null)return;var o=r.tag;if(o===3||o===4){var l=r.stateNode.containerInfo;if(l===i||l.nodeType===8&&l.parentNode===i)break;if(o===4)for(o=r.return;o!==null;){var a=o.tag;if((a===3||a===4)&&(a=o.stateNode.containerInfo,a===i||a.nodeType===8&&a.parentNode===i))return;o=o.return}for(;l!==null;){if(o=sn(l),o===null)return;if(a=o.tag,a===5||a===6){r=s=o;continue e}l=l.parentNode}}r=r.return}wd(function(){var u=s,c=na(n),h=[];e:{var d=Qd.get(e);if(d!==void 0){var g=aa,y=e;switch(e){case"keypress":if(Bi(n)===0)break e;case"keydown":case"keyup":g=lg;break;case"focusin":y="focus",g=mo;break;case"focusout":y="blur",g=mo;break;case"beforeblur":case"afterblur":g=mo;break;case"click":if(n.button===2)break e;case"auxclick":case"dblclick":case"mousedown":case"mousemove":case"mouseup":case"mouseout":case"mouseover":case"contextmenu":g=hu;break;case"drag":case"dragend":case"dragenter":case"dragexit":case"dragleave":case"dragover":case"dragstart":case"drop":g=Gm;break;case"touchcancel":case"touchend":case"touchmove":case"touchstart":g=cg;break;case Vd:case Wd:case qd:g=Jm;break;case Xd:g=fg;break;case"scroll":g=Xm;break;case"wheel":g=pg;break;case"copy":case"cut":case"paste":g=eg;break;case"gotpointercapture":case"lostpointercapture":case"pointercancel":case"pointerdown":case"pointermove":case"pointerout":case"pointerover":case"pointerup":g=mu}var w=(t&4)!==0,x=!w&&e==="scroll",p=w?d!==null?d+"Capture":null:d;w=[];for(var m=u,v;m!==null;){v=m;var E=v.stateNode;if(v.tag===5&&E!==null&&(v=E,p!==null&&(E=Wr(m,p),E!=null&&w.push(Jr(m,E,v)))),x)break;m=m.return}0<w.length&&(d=new g(d,y,null,n,c),h.push({event:d,listeners:w}))}}if(!(t&7)){e:{if(d=e==="mouseover"||e==="pointerover",g=e==="mouseout"||e==="pointerout",d&&n!==el&&(y=n.relatedTarget||n.fromElement)&&(sn(y)||y[bt]))break e;if((g||d)&&(d=c.window===c?c:(d=c.ownerDocument)?d.defaultView||d.parentWindow:window,g?(y=n.relatedTarget||n.toElement,g=u,y=y?sn(y):null,y!==null&&(x=wn(y),y!==x||y.tag!==5&&y.tag!==6)&&(y=null)):(g=null,y=u),g!==y)){if(w=hu,E="onMouseLeave",p="onMouseEnter",m="mouse",(e==="pointerout"||e==="pointerover")&&(w=mu,E="onPointerLeave",p="onPointerEnter",m="pointer"),x=g==null?d:jn(g),v=y==null?d:jn(y),d=new w(E,m+"leave",g,n,c),d.target=x,d.relatedTarget=v,E=null,sn(c)===u&&(w=new w(p,m+"enter",y,n,c),w.target=v,w.relatedTarget=x,E=w),x=E,g&&y)t:{for(w=g,p=y,m=0,v=w;v;v=_n(v))m++;for(v=0,E=p;E;E=_n(E))v++;for(;0<m-v;)w=_n(w),m--;for(;0<v-m;)p=_n(p),v--;for(;m--;){if(w===p||p!==null&&w===p.alternate)break t;w=_n(w),p=_n(p)}w=null}else w=null;g!==null&&Nu(h,d,g,w,!1),y!==null&&x!==null&&Nu(h,x,y,w,!0)}}e:{if(d=u?jn(u):window,g=d.nodeName&&d.nodeName.toLowerCase(),g==="select"||g==="input"&&d.type==="file")var C=_g;else if(yu(d))if(Dd)C=kg;else{C=Eg;var k=Sg}else(g=d.nodeName)&&g.toLowerCase()==="input"&&(d.type==="checkbox"||d.type==="radio")&&(C=Tg);if(C&&(C=C(e,u))){zd(h,C,n,c);break e}k&&k(e,d,u),e==="focusout"&&(k=d._wrapperState)&&k.controlled&&d.type==="number"&&Go(d,"number",d.value)}switch(k=u?jn(u):window,e){case"focusin":(yu(k)||k.contentEditable==="true")&&(Mn=k,ll=u,Or=null);break;case"focusout":Or=ll=Mn=null;break;case"mousedown":al=!0;break;case"contextmenu":case"mouseup":case"dragend":al=!1,Eu(h,n,c);break;case"selectionchange":if(bg)break;case"keydown":case"keyup":Eu(h,n,c)}var N;if(ca)e:{switch(e){case"compositionstart":var S="onCompositionStart";break e;case"compositionend":S="onCompositionEnd";break e;case"compositionupdate":S="onCompositionUpdate";break e}S=void 0}else An?$d(e,n)&&(S="onCompositionEnd"):e==="keydown"&&n.keyCode===229&&(S="onCompositionStart");S&&(Rd&&n.locale!=="ko"&&(An||S!=="onCompositionStart"?S==="onCompositionEnd"&&An&&(N=Pd()):(Dt=c,la="value"in Dt?Dt.value:Dt.textContent,An=!0)),k=fs(u,S),0<k.length&&(S=new pu(S,e,null,n,c),h.push({event:S,listeners:k}),N?S.data=N:(N=Od(n),N!==null&&(S.data=N)))),(N=gg?vg(e,n):yg(e,n))&&(u=fs(u,"onBeforeInput"),0<u.length&&(c=new pu("onBeforeInput","beforeinput",null,n,c),h.push({event:c,listeners:u}),c.data=N))}Gd(h,t)})}function Jr(e,t,n){return{instance:e,listener:t,currentTarget:n}}function fs(e,t){for(var n=t+"Capture",r=[];e!==null;){var i=e,s=i.stateNode;i.tag===5&&s!==null&&(i=s,s=Wr(e,n),s!=null&&r.unshift(Jr(e,s,i)),s=Wr(e,t),s!=null&&r.push(Jr(e,s,i))),e=e.return}return r}function _n(e){if(e===null)return null;do e=e.return;while(e&&e.tag!==5);return e||null}function Nu(e,t,n,r,i){for(var s=t._reactName,o=[];n!==null&&n!==r;){var l=n,a=l.alternate,u=l.stateNode;if(a!==null&&a===r)break;l.tag===5&&u!==null&&(l=u,i?(a=Wr(n,s),a!=null&&o.unshift(Jr(n,a,l))):i||(a=Wr(n,s),a!=null&&o.push(Jr(n,a,l)))),n=n.return}o.length!==0&&e.push({event:t,listeners:o})}var Ig=/\r\n?/g,jg=/\u0000|\uFFFD/g;function Cu(e){return(typeof e=="string"?e:""+e).replace(Ig,`
+`).replace(jg,"")}function Ci(e,t,n){if(t=Cu(t),Cu(e)!==t&&n)throw Error(b(425))}function hs(){}var ul=null,cl=null;function dl(e,t){return e==="textarea"||e==="noscript"||typeof t.children=="string"||typeof t.children=="number"||typeof t.dangerouslySetInnerHTML=="object"&&t.dangerouslySetInnerHTML!==null&&t.dangerouslySetInnerHTML.__html!=null}var fl=typeof setTimeout=="function"?setTimeout:void 0,Pg=typeof clearTimeout=="function"?clearTimeout:void 0,bu=typeof Promise=="function"?Promise:void 0,Rg=typeof queueMicrotask=="function"?queueMicrotask:typeof bu<"u"?function(e){return bu.resolve(null).then(e).catch($g)}:fl;function $g(e){setTimeout(function(){throw e})}function Eo(e,t){var n=t,r=0;do{var i=n.nextSibling;if(e.removeChild(n),i&&i.nodeType===8)if(n=i.data,n==="/$"){if(r===0){e.removeChild(i),Qr(t);return}r--}else n!=="$"&&n!=="$?"&&n!=="$!"||r++;n=i}while(n);Qr(t)}function Wt(e){for(;e!=null;e=e.nextSibling){var t=e.nodeType;if(t===1||t===3)break;if(t===8){if(t=e.data,t==="$"||t==="$!"||t==="$?")break;if(t==="/$")return null}}return e}function Lu(e){e=e.previousSibling;for(var t=0;e;){if(e.nodeType===8){var n=e.data;if(n==="$"||n==="$!"||n==="$?"){if(t===0)return e;t--}else n==="/$"&&t++}e=e.previousSibling}return null}var ir=Math.random().toString(36).slice(2),pt="__reactFiber$"+ir,Zr="__reactProps$"+ir,bt="__reactContainer$"+ir,hl="__reactEvents$"+ir,Og="__reactListeners$"+ir,zg="__reactHandles$"+ir;function sn(e){var t=e[pt];if(t)return t;for(var n=e.parentNode;n;){if(t=n[bt]||n[pt]){if(n=t.alternate,t.child!==null||n!==null&&n.child!==null)for(e=Lu(e);e!==null;){if(n=e[pt])return n;e=Lu(e)}return t}e=n,n=e.parentNode}return null}function ci(e){return e=e[pt]||e[bt],!e||e.tag!==5&&e.tag!==6&&e.tag!==13&&e.tag!==3?null:e}function jn(e){if(e.tag===5||e.tag===6)return e.stateNode;throw Error(b(33))}function Hs(e){return e[Zr]||null}var pl=[],Pn=-1;function en(e){return{current:e}}function W(e){0>Pn||(e.current=pl[Pn],pl[Pn]=null,Pn--)}function U(e,t){Pn++,pl[Pn]=e.current,e.current=t}var Jt={},_e=en(Jt),Re=en(!1),dn=Jt;function Kn(e,t){var n=e.type.contextTypes;if(!n)return Jt;var r=e.stateNode;if(r&&r.__reactInternalMemoizedUnmaskedChildContext===t)return r.__reactInternalMemoizedMaskedChildContext;var i={},s;for(s in n)i[s]=t[s];return r&&(e=e.stateNode,e.__reactInternalMemoizedUnmaskedChildContext=t,e.__reactInternalMemoizedMaskedChildContext=i),i}function $e(e){return e=e.childContextTypes,e!=null}function ps(){W(Re),W(_e)}function Au(e,t,n){if(_e.current!==Jt)throw Error(b(168));U(_e,t),U(Re,n)}function Yd(e,t,n){var r=e.stateNode;if(t=t.childContextTypes,typeof r.getChildContext!="function")return n;r=r.getChildContext();for(var i in r)if(!(i in t))throw Error(b(108,Sm(e)||"Unknown",i));return Y({},n,r)}function ms(e){return e=(e=e.stateNode)&&e.__reactInternalMemoizedMergedChildContext||Jt,dn=_e.current,U(_e,e),U(Re,Re.current),!0}function Mu(e,t,n){var r=e.stateNode;if(!r)throw Error(b(169));n?(e=Yd(e,t,dn),r.__reactInternalMemoizedMergedChildContext=e,W(Re),W(_e),U(_e,e)):W(Re),U(Re,n)}var Et=null,Us=!1,To=!1;function Jd(e){Et===null?Et=[e]:Et.push(e)}function Dg(e){Us=!0,Jd(e)}function tn(){if(!To&&Et!==null){To=!0;var e=0,t=H;try{var n=Et;for(H=1;e<n.length;e++){var r=n[e];do r=r(!0);while(r!==null)}Et=null,Us=!1}catch(i){throw Et!==null&&(Et=Et.slice(e+1)),Ed(ra,tn),i}finally{H=t,To=!1}}return null}var Rn=[],$n=0,gs=null,vs=0,We=[],qe=0,fn=null,Tt=1,kt="";function nn(e,t){Rn[$n++]=vs,Rn[$n++]=gs,gs=e,vs=t}function Zd(e,t,n){We[qe++]=Tt,We[qe++]=kt,We[qe++]=fn,fn=e;var r=Tt;e=kt;var i=32-st(r)-1;r&=~(1<<i),n+=1;var s=32-st(t)+i;if(30<s){var o=i-i%5;s=(r&(1<<o)-1).toString(32),r>>=o,i-=o,Tt=1<<32-st(t)+i|n<<i|r,kt=s+e}else Tt=1<<s|n<<i|r,kt=e}function fa(e){e.return!==null&&(nn(e,1),Zd(e,1,0))}function ha(e){for(;e===gs;)gs=Rn[--$n],Rn[$n]=null,vs=Rn[--$n],Rn[$n]=null;for(;e===fn;)fn=We[--qe],We[qe]=null,kt=We[--qe],We[qe]=null,Tt=We[--qe],We[qe]=null}var Fe=null,De=null,Q=!1,it=null;function ef(e,t){var n=Qe(5,null,null,0);n.elementType="DELETED",n.stateNode=t,n.return=e,t=e.deletions,t===null?(e.deletions=[n],e.flags|=16):t.push(n)}function Iu(e,t){switch(e.tag){case 5:var n=e.type;return t=t.nodeType!==1||n.toLowerCase()!==t.nodeName.toLowerCase()?null:t,t!==null?(e.stateNode=t,Fe=e,De=Wt(t.firstChild),!0):!1;case 6:return t=e.pendingProps===""||t.nodeType!==3?null:t,t!==null?(e.stateNode=t,Fe=e,De=null,!0):!1;case 13:return t=t.nodeType!==8?null:t,t!==null?(n=fn!==null?{id:Tt,overflow:kt}:null,e.memoizedState={dehydrated:t,treeContext:n,retryLane:1073741824},n=Qe(18,null,null,0),n.stateNode=t,n.return=e,e.child=n,Fe=e,De=null,!0):!1;default:return!1}}function ml(e){return(e.mode&1)!==0&&(e.flags&128)===0}function gl(e){if(Q){var t=De;if(t){var n=t;if(!Iu(e,t)){if(ml(e))throw Error(b(418));t=Wt(n.nextSibling);var r=Fe;t&&Iu(e,t)?ef(r,n):(e.flags=e.flags&-4097|2,Q=!1,Fe=e)}}else{if(ml(e))throw Error(b(418));e.flags=e.flags&-4097|2,Q=!1,Fe=e}}}function ju(e){for(e=e.return;e!==null&&e.tag!==5&&e.tag!==3&&e.tag!==13;)e=e.return;Fe=e}function bi(e){if(e!==Fe)return!1;if(!Q)return ju(e),Q=!0,!1;var t;if((t=e.tag!==3)&&!(t=e.tag!==5)&&(t=e.type,t=t!=="head"&&t!=="body"&&!dl(e.type,e.memoizedProps)),t&&(t=De)){if(ml(e))throw tf(),Error(b(418));for(;t;)ef(e,t),t=Wt(t.nextSibling)}if(ju(e),e.tag===13){if(e=e.memoizedState,e=e!==null?e.dehydrated:null,!e)throw Error(b(317));e:{for(e=e.nextSibling,t=0;e;){if(e.nodeType===8){var n=e.data;if(n==="/$"){if(t===0){De=Wt(e.nextSibling);break e}t--}else n!=="$"&&n!=="$!"&&n!=="$?"||t++}e=e.nextSibling}De=null}}else De=Fe?Wt(e.stateNode.nextSibling):null;return!0}function tf(){for(var e=De;e;)e=Wt(e.nextSibling)}function Yn(){De=Fe=null,Q=!1}function pa(e){it===null?it=[e]:it.push(e)}var Fg=Mt.ReactCurrentBatchConfig;function nt(e,t){if(e&&e.defaultProps){t=Y({},t),e=e.defaultProps;for(var n in e)t[n]===void 0&&(t[n]=e[n]);return t}return t}var ys=en(null),ws=null,On=null,ma=null;function ga(){ma=On=ws=null}function va(e){var t=ys.current;W(ys),e._currentValue=t}function vl(e,t,n){for(;e!==null;){var r=e.alternate;if((e.childLanes&t)!==t?(e.childLanes|=t,r!==null&&(r.childLanes|=t)):r!==null&&(r.childLanes&t)!==t&&(r.childLanes|=t),e===n)break;e=e.return}}function qn(e,t){ws=e,ma=On=null,e=e.dependencies,e!==null&&e.firstContext!==null&&(e.lanes&t&&(Pe=!0),e.firstContext=null)}function Je(e){var t=e._currentValue;if(ma!==e)if(e={context:e,memoizedValue:t,next:null},On===null){if(ws===null)throw Error(b(308));On=e,ws.dependencies={lanes:0,firstContext:e}}else On=On.next=e;return t}var on=null;function ya(e){on===null?on=[e]:on.push(e)}function nf(e,t,n,r){var i=t.interleaved;return i===null?(n.next=n,ya(t)):(n.next=i.next,i.next=n),t.interleaved=n,Lt(e,r)}function Lt(e,t){e.lanes|=t;var n=e.alternate;for(n!==null&&(n.lanes|=t),n=e,e=e.return;e!==null;)e.childLanes|=t,n=e.alternate,n!==null&&(n.childLanes|=t),n=e,e=e.return;return n.tag===3?n.stateNode:null}var Pt=!1;function wa(e){e.updateQueue={baseState:e.memoizedState,firstBaseUpdate:null,lastBaseUpdate:null,shared:{pending:null,interleaved:null,lanes:0},effects:null}}function rf(e,t){e=e.updateQueue,t.updateQueue===e&&(t.updateQueue={baseState:e.baseState,firstBaseUpdate:e.firstBaseUpdate,lastBaseUpdate:e.lastBaseUpdate,shared:e.shared,effects:e.effects})}function Nt(e,t){return{eventTime:e,lane:t,tag:0,payload:null,callback:null,next:null}}function qt(e,t,n){var r=e.updateQueue;if(r===null)return null;if(r=r.shared,D&2){var i=r.pending;return i===null?t.next=t:(t.next=i.next,i.next=t),r.pending=t,Lt(e,n)}return i=r.interleaved,i===null?(t.next=t,ya(r)):(t.next=i.next,i.next=t),r.interleaved=t,Lt(e,n)}function Vi(e,t,n){if(t=t.updateQueue,t!==null&&(t=t.shared,(n&4194240)!==0)){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,ia(e,n)}}function Pu(e,t){var n=e.updateQueue,r=e.alternate;if(r!==null&&(r=r.updateQueue,n===r)){var i=null,s=null;if(n=n.firstBaseUpdate,n!==null){do{var o={eventTime:n.eventTime,lane:n.lane,tag:n.tag,payload:n.payload,callback:n.callback,next:null};s===null?i=s=o:s=s.next=o,n=n.next}while(n!==null);s===null?i=s=t:s=s.next=t}else i=s=t;n={baseState:r.baseState,firstBaseUpdate:i,lastBaseUpdate:s,shared:r.shared,effects:r.effects},e.updateQueue=n;return}e=n.lastBaseUpdate,e===null?n.firstBaseUpdate=t:e.next=t,n.lastBaseUpdate=t}function xs(e,t,n,r){var i=e.updateQueue;Pt=!1;var s=i.firstBaseUpdate,o=i.lastBaseUpdate,l=i.shared.pending;if(l!==null){i.shared.pending=null;var a=l,u=a.next;a.next=null,o===null?s=u:o.next=u,o=a;var c=e.alternate;c!==null&&(c=c.updateQueue,l=c.lastBaseUpdate,l!==o&&(l===null?c.firstBaseUpdate=u:l.next=u,c.lastBaseUpdate=a))}if(s!==null){var h=i.baseState;o=0,c=u=a=null,l=s;do{var d=l.lane,g=l.eventTime;if((r&d)===d){c!==null&&(c=c.next={eventTime:g,lane:0,tag:l.tag,payload:l.payload,callback:l.callback,next:null});e:{var y=e,w=l;switch(d=t,g=n,w.tag){case 1:if(y=w.payload,typeof y=="function"){h=y.call(g,h,d);break e}h=y;break e;case 3:y.flags=y.flags&-65537|128;case 0:if(y=w.payload,d=typeof y=="function"?y.call(g,h,d):y,d==null)break e;h=Y({},h,d);break e;case 2:Pt=!0}}l.callback!==null&&l.lane!==0&&(e.flags|=64,d=i.effects,d===null?i.effects=[l]:d.push(l))}else g={eventTime:g,lane:d,tag:l.tag,payload:l.payload,callback:l.callback,next:null},c===null?(u=c=g,a=h):c=c.next=g,o|=d;if(l=l.next,l===null){if(l=i.shared.pending,l===null)break;d=l,l=d.next,d.next=null,i.lastBaseUpdate=d,i.shared.pending=null}}while(!0);if(c===null&&(a=h),i.baseState=a,i.firstBaseUpdate=u,i.lastBaseUpdate=c,t=i.shared.interleaved,t!==null){i=t;do o|=i.lane,i=i.next;while(i!==t)}else s===null&&(i.shared.lanes=0);pn|=o,e.lanes=o,e.memoizedState=h}}function Ru(e,t,n){if(e=t.effects,t.effects=null,e!==null)for(t=0;t<e.length;t++){var r=e[t],i=r.callback;if(i!==null){if(r.callback=null,r=n,typeof i!="function")throw Error(b(191,i));i.call(r)}}}var sf=new nd.Component().refs;function yl(e,t,n,r){t=e.memoizedState,n=n(r,t),n=n==null?t:Y({},t,n),e.memoizedState=n,e.lanes===0&&(e.updateQueue.baseState=n)}var Bs={isMounted:function(e){return(e=e._reactInternals)?wn(e)===e:!1},enqueueSetState:function(e,t,n){e=e._reactInternals;var r=ke(),i=Qt(e),s=Nt(r,i);s.payload=t,n!=null&&(s.callback=n),t=qt(e,s,i),t!==null&&(ot(t,e,i,r),Vi(t,e,i))},enqueueReplaceState:function(e,t,n){e=e._reactInternals;var r=ke(),i=Qt(e),s=Nt(r,i);s.tag=1,s.payload=t,n!=null&&(s.callback=n),t=qt(e,s,i),t!==null&&(ot(t,e,i,r),Vi(t,e,i))},enqueueForceUpdate:function(e,t){e=e._reactInternals;var n=ke(),r=Qt(e),i=Nt(n,r);i.tag=2,t!=null&&(i.callback=t),t=qt(e,i,r),t!==null&&(ot(t,e,r,n),Vi(t,e,r))}};function $u(e,t,n,r,i,s,o){return e=e.stateNode,typeof e.shouldComponentUpdate=="function"?e.shouldComponentUpdate(r,s,o):t.prototype&&t.prototype.isPureReactComponent?!Kr(n,r)||!Kr(i,s):!0}function of(e,t,n){var r=!1,i=Jt,s=t.contextType;return typeof s=="object"&&s!==null?s=Je(s):(i=$e(t)?dn:_e.current,r=t.contextTypes,s=(r=r!=null)?Kn(e,i):Jt),t=new t(n,s),e.memoizedState=t.state!==null&&t.state!==void 0?t.state:null,t.updater=Bs,e.stateNode=t,t._reactInternals=e,r&&(e=e.stateNode,e.__reactInternalMemoizedUnmaskedChildContext=i,e.__reactInternalMemoizedMaskedChildContext=s),t}function Ou(e,t,n,r){e=t.state,typeof t.componentWillReceiveProps=="function"&&t.componentWillReceiveProps(n,r),typeof t.UNSAFE_componentWillReceiveProps=="function"&&t.UNSAFE_componentWillReceiveProps(n,r),t.state!==e&&Bs.enqueueReplaceState(t,t.state,null)}function wl(e,t,n,r){var i=e.stateNode;i.props=n,i.state=e.memoizedState,i.refs=sf,wa(e);var s=t.contextType;typeof s=="object"&&s!==null?i.context=Je(s):(s=$e(t)?dn:_e.current,i.context=Kn(e,s)),i.state=e.memoizedState,s=t.getDerivedStateFromProps,typeof s=="function"&&(yl(e,t,s,n),i.state=e.memoizedState),typeof t.getDerivedStateFromProps=="function"||typeof i.getSnapshotBeforeUpdate=="function"||typeof i.UNSAFE_componentWillMount!="function"&&typeof i.componentWillMount!="function"||(t=i.state,typeof i.componentWillMount=="function"&&i.componentWillMount(),typeof i.UNSAFE_componentWillMount=="function"&&i.UNSAFE_componentWillMount(),t!==i.state&&Bs.enqueueReplaceState(i,i.state,null),xs(e,n,i,r),i.state=e.memoizedState),typeof i.componentDidMount=="function"&&(e.flags|=4194308)}function vr(e,t,n){if(e=n.ref,e!==null&&typeof e!="function"&&typeof e!="object"){if(n._owner){if(n=n._owner,n){if(n.tag!==1)throw Error(b(309));var r=n.stateNode}if(!r)throw Error(b(147,e));var i=r,s=""+e;return t!==null&&t.ref!==null&&typeof t.ref=="function"&&t.ref._stringRef===s?t.ref:(t=function(o){var l=i.refs;l===sf&&(l=i.refs={}),o===null?delete l[s]:l[s]=o},t._stringRef=s,t)}if(typeof e!="string")throw Error(b(284));if(!n._owner)throw Error(b(290,e))}return e}function Li(e,t){throw e=Object.prototype.toString.call(t),Error(b(31,e==="[object Object]"?"object with keys {"+Object.keys(t).join(", ")+"}":e))}function zu(e){var t=e._init;return t(e._payload)}function lf(e){function t(p,m){if(e){var v=p.deletions;v===null?(p.deletions=[m],p.flags|=16):v.push(m)}}function n(p,m){if(!e)return null;for(;m!==null;)t(p,m),m=m.sibling;return null}function r(p,m){for(p=new Map;m!==null;)m.key!==null?p.set(m.key,m):p.set(m.index,m),m=m.sibling;return p}function i(p,m){return p=Gt(p,m),p.index=0,p.sibling=null,p}function s(p,m,v){return p.index=v,e?(v=p.alternate,v!==null?(v=v.index,v<m?(p.flags|=2,m):v):(p.flags|=2,m)):(p.flags|=1048576,m)}function o(p){return e&&p.alternate===null&&(p.flags|=2),p}function l(p,m,v,E){return m===null||m.tag!==6?(m=Mo(v,p.mode,E),m.return=p,m):(m=i(m,v),m.return=p,m)}function a(p,m,v,E){var C=v.type;return C===Ln?c(p,m,v.props.children,E,v.key):m!==null&&(m.elementType===C||typeof C=="object"&&C!==null&&C.$$typeof===jt&&zu(C)===m.type)?(E=i(m,v.props),E.ref=vr(p,m,v),E.return=p,E):(E=Ki(v.type,v.key,v.props,null,p.mode,E),E.ref=vr(p,m,v),E.return=p,E)}function u(p,m,v,E){return m===null||m.tag!==4||m.stateNode.containerInfo!==v.containerInfo||m.stateNode.implementation!==v.implementation?(m=Io(v,p.mode,E),m.return=p,m):(m=i(m,v.children||[]),m.return=p,m)}function c(p,m,v,E,C){return m===null||m.tag!==7?(m=un(v,p.mode,E,C),m.return=p,m):(m=i(m,v),m.return=p,m)}function h(p,m,v){if(typeof m=="string"&&m!==""||typeof m=="number")return m=Mo(""+m,p.mode,v),m.return=p,m;if(typeof m=="object"&&m!==null){switch(m.$$typeof){case yi:return v=Ki(m.type,m.key,m.props,null,p.mode,v),v.ref=vr(p,null,m),v.return=p,v;case bn:return m=Io(m,p.mode,v),m.return=p,m;case jt:var E=m._init;return h(p,E(m._payload),v)}if(Cr(m)||fr(m))return m=un(m,p.mode,v,null),m.return=p,m;Li(p,m)}return null}function d(p,m,v,E){var C=m!==null?m.key:null;if(typeof v=="string"&&v!==""||typeof v=="number")return C!==null?null:l(p,m,""+v,E);if(typeof v=="object"&&v!==null){switch(v.$$typeof){case yi:return v.key===C?a(p,m,v,E):null;case bn:return v.key===C?u(p,m,v,E):null;case jt:return C=v._init,d(p,m,C(v._payload),E)}if(Cr(v)||fr(v))return C!==null?null:c(p,m,v,E,null);Li(p,v)}return null}function g(p,m,v,E,C){if(typeof E=="string"&&E!==""||typeof E=="number")return p=p.get(v)||null,l(m,p,""+E,C);if(typeof E=="object"&&E!==null){switch(E.$$typeof){case yi:return p=p.get(E.key===null?v:E.key)||null,a(m,p,E,C);case bn:return p=p.get(E.key===null?v:E.key)||null,u(m,p,E,C);case jt:var k=E._init;return g(p,m,v,k(E._payload),C)}if(Cr(E)||fr(E))return p=p.get(v)||null,c(m,p,E,C,null);Li(m,E)}return null}function y(p,m,v,E){for(var C=null,k=null,N=m,S=m=0,_=null;N!==null&&S<v.length;S++){N.index>S?(_=N,N=null):_=N.sibling;var A=d(p,N,v[S],E);if(A===null){N===null&&(N=_);break}e&&N&&A.alternate===null&&t(p,N),m=s(A,m,S),k===null?C=A:k.sibling=A,k=A,N=_}if(S===v.length)return n(p,N),Q&&nn(p,S),C;if(N===null){for(;S<v.length;S++)N=h(p,v[S],E),N!==null&&(m=s(N,m,S),k===null?C=N:k.sibling=N,k=N);return Q&&nn(p,S),C}for(N=r(p,N);S<v.length;S++)_=g(N,p,S,v[S],E),_!==null&&(e&&_.alternate!==null&&N.delete(_.key===null?S:_.key),m=s(_,m,S),k===null?C=_:k.sibling=_,k=_);return e&&N.forEach(function(P){return t(p,P)}),Q&&nn(p,S),C}function w(p,m,v,E){var C=fr(v);if(typeof C!="function")throw Error(b(150));if(v=C.call(v),v==null)throw Error(b(151));for(var k=C=null,N=m,S=m=0,_=null,A=v.next();N!==null&&!A.done;S++,A=v.next()){N.index>S?(_=N,N=null):_=N.sibling;var P=d(p,N,A.value,E);if(P===null){N===null&&(N=_);break}e&&N&&P.alternate===null&&t(p,N),m=s(P,m,S),k===null?C=P:k.sibling=P,k=P,N=_}if(A.done)return n(p,N),Q&&nn(p,S),C;if(N===null){for(;!A.done;S++,A=v.next())A=h(p,A.value,E),A!==null&&(m=s(A,m,S),k===null?C=A:k.sibling=A,k=A);return Q&&nn(p,S),C}for(N=r(p,N);!A.done;S++,A=v.next())A=g(N,p,S,A.value,E),A!==null&&(e&&A.alternate!==null&&N.delete(A.key===null?S:A.key),m=s(A,m,S),k===null?C=A:k.sibling=A,k=A);return e&&N.forEach(function(T){return t(p,T)}),Q&&nn(p,S),C}function x(p,m,v,E){if(typeof v=="object"&&v!==null&&v.type===Ln&&v.key===null&&(v=v.props.children),typeof v=="object"&&v!==null){switch(v.$$typeof){case yi:e:{for(var C=v.key,k=m;k!==null;){if(k.key===C){if(C=v.type,C===Ln){if(k.tag===7){n(p,k.sibling),m=i(k,v.props.children),m.return=p,p=m;break e}}else if(k.elementType===C||typeof C=="object"&&C!==null&&C.$$typeof===jt&&zu(C)===k.type){n(p,k.sibling),m=i(k,v.props),m.ref=vr(p,k,v),m.return=p,p=m;break e}n(p,k);break}else t(p,k);k=k.sibling}v.type===Ln?(m=un(v.props.children,p.mode,E,v.key),m.return=p,p=m):(E=Ki(v.type,v.key,v.props,null,p.mode,E),E.ref=vr(p,m,v),E.return=p,p=E)}return o(p);case bn:e:{for(k=v.key;m!==null;){if(m.key===k)if(m.tag===4&&m.stateNode.containerInfo===v.containerInfo&&m.stateNode.implementation===v.implementation){n(p,m.sibling),m=i(m,v.children||[]),m.return=p,p=m;break e}else{n(p,m);break}else t(p,m);m=m.sibling}m=Io(v,p.mode,E),m.return=p,p=m}return o(p);case jt:return k=v._init,x(p,m,k(v._payload),E)}if(Cr(v))return y(p,m,v,E);if(fr(v))return w(p,m,v,E);Li(p,v)}return typeof v=="string"&&v!==""||typeof v=="number"?(v=""+v,m!==null&&m.tag===6?(n(p,m.sibling),m=i(m,v),m.return=p,p=m):(n(p,m),m=Mo(v,p.mode,E),m.return=p,p=m),o(p)):n(p,m)}return x}var Jn=lf(!0),af=lf(!1),di={},gt=en(di),ei=en(di),ti=en(di);function ln(e){if(e===di)throw Error(b(174));return e}function xa(e,t){switch(U(ti,t),U(ei,e),U(gt,di),e=t.nodeType,e){case 9:case 11:t=(t=t.documentElement)?t.namespaceURI:Yo(null,"");break;default:e=e===8?t.parentNode:t,t=e.namespaceURI||null,e=e.tagName,t=Yo(t,e)}W(gt),U(gt,t)}function Zn(){W(gt),W(ei),W(ti)}function uf(e){ln(ti.current);var t=ln(gt.current),n=Yo(t,e.type);t!==n&&(U(ei,e),U(gt,n))}function _a(e){ei.current===e&&(W(gt),W(ei))}var G=en(0);function _s(e){for(var t=e;t!==null;){if(t.tag===13){var n=t.memoizedState;if(n!==null&&(n=n.dehydrated,n===null||n.data==="$?"||n.data==="$!"))return t}else if(t.tag===19&&t.memoizedProps.revealOrder!==void 0){if(t.flags&128)return t}else if(t.child!==null){t.child.return=t,t=t.child;continue}if(t===e)break;for(;t.sibling===null;){if(t.return===null||t.return===e)return null;t=t.return}t.sibling.return=t.return,t=t.sibling}return null}var ko=[];function Sa(){for(var e=0;e<ko.length;e++)ko[e]._workInProgressVersionPrimary=null;ko.length=0}var Wi=Mt.ReactCurrentDispatcher,No=Mt.ReactCurrentBatchConfig,hn=0,K=null,oe=null,ce=null,Ss=!1,zr=!1,ni=0,Hg=0;function ge(){throw Error(b(321))}function Ea(e,t){if(t===null)return!1;for(var n=0;n<t.length&&n<e.length;n++)if(!lt(e[n],t[n]))return!1;return!0}function Ta(e,t,n,r,i,s){if(hn=s,K=t,t.memoizedState=null,t.updateQueue=null,t.lanes=0,Wi.current=e===null||e.memoizedState===null?Wg:qg,e=n(r,i),zr){s=0;do{if(zr=!1,ni=0,25<=s)throw Error(b(301));s+=1,ce=oe=null,t.updateQueue=null,Wi.current=Xg,e=n(r,i)}while(zr)}if(Wi.current=Es,t=oe!==null&&oe.next!==null,hn=0,ce=oe=K=null,Ss=!1,t)throw Error(b(300));return e}function ka(){var e=ni!==0;return ni=0,e}function dt(){var e={memoizedState:null,baseState:null,baseQueue:null,queue:null,next:null};return ce===null?K.memoizedState=ce=e:ce=ce.next=e,ce}function Ze(){if(oe===null){var e=K.alternate;e=e!==null?e.memoizedState:null}else e=oe.next;var t=ce===null?K.memoizedState:ce.next;if(t!==null)ce=t,oe=e;else{if(e===null)throw Error(b(310));oe=e,e={memoizedState:oe.memoizedState,baseState:oe.baseState,baseQueue:oe.baseQueue,queue:oe.queue,next:null},ce===null?K.memoizedState=ce=e:ce=ce.next=e}return ce}function ri(e,t){return typeof t=="function"?t(e):t}function Co(e){var t=Ze(),n=t.queue;if(n===null)throw Error(b(311));n.lastRenderedReducer=e;var r=oe,i=r.baseQueue,s=n.pending;if(s!==null){if(i!==null){var o=i.next;i.next=s.next,s.next=o}r.baseQueue=i=s,n.pending=null}if(i!==null){s=i.next,r=r.baseState;var l=o=null,a=null,u=s;do{var c=u.lane;if((hn&c)===c)a!==null&&(a=a.next={lane:0,action:u.action,hasEagerState:u.hasEagerState,eagerState:u.eagerState,next:null}),r=u.hasEagerState?u.eagerState:e(r,u.action);else{var h={lane:c,action:u.action,hasEagerState:u.hasEagerState,eagerState:u.eagerState,next:null};a===null?(l=a=h,o=r):a=a.next=h,K.lanes|=c,pn|=c}u=u.next}while(u!==null&&u!==s);a===null?o=r:a.next=l,lt(r,t.memoizedState)||(Pe=!0),t.memoizedState=r,t.baseState=o,t.baseQueue=a,n.lastRenderedState=r}if(e=n.interleaved,e!==null){i=e;do s=i.lane,K.lanes|=s,pn|=s,i=i.next;while(i!==e)}else i===null&&(n.lanes=0);return[t.memoizedState,n.dispatch]}function bo(e){var t=Ze(),n=t.queue;if(n===null)throw Error(b(311));n.lastRenderedReducer=e;var r=n.dispatch,i=n.pending,s=t.memoizedState;if(i!==null){n.pending=null;var o=i=i.next;do s=e(s,o.action),o=o.next;while(o!==i);lt(s,t.memoizedState)||(Pe=!0),t.memoizedState=s,t.baseQueue===null&&(t.baseState=s),n.lastRenderedState=s}return[s,r]}function cf(){}function df(e,t){var n=K,r=Ze(),i=t(),s=!lt(r.memoizedState,i);if(s&&(r.memoizedState=i,Pe=!0),r=r.queue,Na(pf.bind(null,n,r,e),[e]),r.getSnapshot!==t||s||ce!==null&&ce.memoizedState.tag&1){if(n.flags|=2048,ii(9,hf.bind(null,n,r,i,t),void 0,null),de===null)throw Error(b(349));hn&30||ff(n,t,i)}return i}function ff(e,t,n){e.flags|=16384,e={getSnapshot:t,value:n},t=K.updateQueue,t===null?(t={lastEffect:null,stores:null},K.updateQueue=t,t.stores=[e]):(n=t.stores,n===null?t.stores=[e]:n.push(e))}function hf(e,t,n,r){t.value=n,t.getSnapshot=r,mf(t)&&gf(e)}function pf(e,t,n){return n(function(){mf(t)&&gf(e)})}function mf(e){var t=e.getSnapshot;e=e.value;try{var n=t();return!lt(e,n)}catch{return!0}}function gf(e){var t=Lt(e,1);t!==null&&ot(t,e,1,-1)}function Du(e){var t=dt();return typeof e=="function"&&(e=e()),t.memoizedState=t.baseState=e,e={pending:null,interleaved:null,lanes:0,dispatch:null,lastRenderedReducer:ri,lastRenderedState:e},t.queue=e,e=e.dispatch=Vg.bind(null,K,e),[t.memoizedState,e]}function ii(e,t,n,r){return e={tag:e,create:t,destroy:n,deps:r,next:null},t=K.updateQueue,t===null?(t={lastEffect:null,stores:null},K.updateQueue=t,t.lastEffect=e.next=e):(n=t.lastEffect,n===null?t.lastEffect=e.next=e:(r=n.next,n.next=e,e.next=r,t.lastEffect=e)),e}function vf(){return Ze().memoizedState}function qi(e,t,n,r){var i=dt();K.flags|=e,i.memoizedState=ii(1|t,n,void 0,r===void 0?null:r)}function Vs(e,t,n,r){var i=Ze();r=r===void 0?null:r;var s=void 0;if(oe!==null){var o=oe.memoizedState;if(s=o.destroy,r!==null&&Ea(r,o.deps)){i.memoizedState=ii(t,n,s,r);return}}K.flags|=e,i.memoizedState=ii(1|t,n,s,r)}function Fu(e,t){return qi(8390656,8,e,t)}function Na(e,t){return Vs(2048,8,e,t)}function yf(e,t){return Vs(4,2,e,t)}function wf(e,t){return Vs(4,4,e,t)}function xf(e,t){if(typeof t=="function")return e=e(),t(e),function(){t(null)};if(t!=null)return e=e(),t.current=e,function(){t.current=null}}function _f(e,t,n){return n=n!=null?n.concat([e]):null,Vs(4,4,xf.bind(null,t,e),n)}function Ca(){}function Sf(e,t){var n=Ze();t=t===void 0?null:t;var r=n.memoizedState;return r!==null&&t!==null&&Ea(t,r[1])?r[0]:(n.memoizedState=[e,t],e)}function Ef(e,t){var n=Ze();t=t===void 0?null:t;var r=n.memoizedState;return r!==null&&t!==null&&Ea(t,r[1])?r[0]:(e=e(),n.memoizedState=[e,t],e)}function Tf(e,t,n){return hn&21?(lt(n,t)||(n=Nd(),K.lanes|=n,pn|=n,e.baseState=!0),t):(e.baseState&&(e.baseState=!1,Pe=!0),e.memoizedState=n)}function Ug(e,t){var n=H;H=n!==0&&4>n?n:4,e(!0);var r=No.transition;No.transition={};try{e(!1),t()}finally{H=n,No.transition=r}}function kf(){return Ze().memoizedState}function Bg(e,t,n){var r=Qt(e);if(n={lane:r,action:n,hasEagerState:!1,eagerState:null,next:null},Nf(e))Cf(t,n);else if(n=nf(e,t,n,r),n!==null){var i=ke();ot(n,e,r,i),bf(n,t,r)}}function Vg(e,t,n){var r=Qt(e),i={lane:r,action:n,hasEagerState:!1,eagerState:null,next:null};if(Nf(e))Cf(t,i);else{var s=e.alternate;if(e.lanes===0&&(s===null||s.lanes===0)&&(s=t.lastRenderedReducer,s!==null))try{var o=t.lastRenderedState,l=s(o,n);if(i.hasEagerState=!0,i.eagerState=l,lt(l,o)){var a=t.interleaved;a===null?(i.next=i,ya(t)):(i.next=a.next,a.next=i),t.interleaved=i;return}}catch{}finally{}n=nf(e,t,i,r),n!==null&&(i=ke(),ot(n,e,r,i),bf(n,t,r))}}function Nf(e){var t=e.alternate;return e===K||t!==null&&t===K}function Cf(e,t){zr=Ss=!0;var n=e.pending;n===null?t.next=t:(t.next=n.next,n.next=t),e.pending=t}function bf(e,t,n){if(n&4194240){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,ia(e,n)}}var Es={readContext:Je,useCallback:ge,useContext:ge,useEffect:ge,useImperativeHandle:ge,useInsertionEffect:ge,useLayoutEffect:ge,useMemo:ge,useReducer:ge,useRef:ge,useState:ge,useDebugValue:ge,useDeferredValue:ge,useTransition:ge,useMutableSource:ge,useSyncExternalStore:ge,useId:ge,unstable_isNewReconciler:!1},Wg={readContext:Je,useCallback:function(e,t){return dt().memoizedState=[e,t===void 0?null:t],e},useContext:Je,useEffect:Fu,useImperativeHandle:function(e,t,n){return n=n!=null?n.concat([e]):null,qi(4194308,4,xf.bind(null,t,e),n)},useLayoutEffect:function(e,t){return qi(4194308,4,e,t)},useInsertionEffect:function(e,t){return qi(4,2,e,t)},useMemo:function(e,t){var n=dt();return t=t===void 0?null:t,e=e(),n.memoizedState=[e,t],e},useReducer:function(e,t,n){var r=dt();return t=n!==void 0?n(t):t,r.memoizedState=r.baseState=t,e={pending:null,interleaved:null,lanes:0,dispatch:null,lastRenderedReducer:e,lastRenderedState:t},r.queue=e,e=e.dispatch=Bg.bind(null,K,e),[r.memoizedState,e]},useRef:function(e){var t=dt();return e={current:e},t.memoizedState=e},useState:Du,useDebugValue:Ca,useDeferredValue:function(e){return dt().memoizedState=e},useTransition:function(){var e=Du(!1),t=e[0];return e=Ug.bind(null,e[1]),dt().memoizedState=e,[t,e]},useMutableSource:function(){},useSyncExternalStore:function(e,t,n){var r=K,i=dt();if(Q){if(n===void 0)throw Error(b(407));n=n()}else{if(n=t(),de===null)throw Error(b(349));hn&30||ff(r,t,n)}i.memoizedState=n;var s={value:n,getSnapshot:t};return i.queue=s,Fu(pf.bind(null,r,s,e),[e]),r.flags|=2048,ii(9,hf.bind(null,r,s,n,t),void 0,null),n},useId:function(){var e=dt(),t=de.identifierPrefix;if(Q){var n=kt,r=Tt;n=(r&~(1<<32-st(r)-1)).toString(32)+n,t=":"+t+"R"+n,n=ni++,0<n&&(t+="H"+n.toString(32)),t+=":"}else n=Hg++,t=":"+t+"r"+n.toString(32)+":";return e.memoizedState=t},unstable_isNewReconciler:!1},qg={readContext:Je,useCallback:Sf,useContext:Je,useEffect:Na,useImperativeHandle:_f,useInsertionEffect:yf,useLayoutEffect:wf,useMemo:Ef,useReducer:Co,useRef:vf,useState:function(){return Co(ri)},useDebugValue:Ca,useDeferredValue:function(e){var t=Ze();return Tf(t,oe.memoizedState,e)},useTransition:function(){var e=Co(ri)[0],t=Ze().memoizedState;return[e,t]},useMutableSource:cf,useSyncExternalStore:df,useId:kf,unstable_isNewReconciler:!1},Xg={readContext:Je,useCallback:Sf,useContext:Je,useEffect:Na,useImperativeHandle:_f,useInsertionEffect:yf,useLayoutEffect:wf,useMemo:Ef,useReducer:bo,useRef:vf,useState:function(){return bo(ri)},useDebugValue:Ca,useDeferredValue:function(e){var t=Ze();return oe===null?t.memoizedState=e:Tf(t,oe.memoizedState,e)},useTransition:function(){var e=bo(ri)[0],t=Ze().memoizedState;return[e,t]},useMutableSource:cf,useSyncExternalStore:df,useId:kf,unstable_isNewReconciler:!1};function er(e,t){try{var n="",r=t;do n+=_m(r),r=r.return;while(r);var i=n}catch(s){i=`
+Error generating stack: `+s.message+`
+`+s.stack}return{value:e,source:t,stack:i,digest:null}}function Lo(e,t,n){return{value:e,source:null,stack:n??null,digest:t??null}}function xl(e,t){try{console.error(t.value)}catch(n){setTimeout(function(){throw n})}}var Qg=typeof WeakMap=="function"?WeakMap:Map;function Lf(e,t,n){n=Nt(-1,n),n.tag=3,n.payload={element:null};var r=t.value;return n.callback=function(){ks||(ks=!0,Al=r),xl(e,t)},n}function Af(e,t,n){n=Nt(-1,n),n.tag=3;var r=e.type.getDerivedStateFromError;if(typeof r=="function"){var i=t.value;n.payload=function(){return r(i)},n.callback=function(){xl(e,t)}}var s=e.stateNode;return s!==null&&typeof s.componentDidCatch=="function"&&(n.callback=function(){xl(e,t),typeof r!="function"&&(Xt===null?Xt=new Set([this]):Xt.add(this));var o=t.stack;this.componentDidCatch(t.value,{componentStack:o!==null?o:""})}),n}function Hu(e,t,n){var r=e.pingCache;if(r===null){r=e.pingCache=new Qg;var i=new Set;r.set(t,i)}else i=r.get(t),i===void 0&&(i=new Set,r.set(t,i));i.has(n)||(i.add(n),e=av.bind(null,e,t,n),t.then(e,e))}function Uu(e){do{var t;if((t=e.tag===13)&&(t=e.memoizedState,t=t!==null?t.dehydrated!==null:!0),t)return e;e=e.return}while(e!==null);return null}function Bu(e,t,n,r,i){return e.mode&1?(e.flags|=65536,e.lanes=i,e):(e===t?e.flags|=65536:(e.flags|=128,n.flags|=131072,n.flags&=-52805,n.tag===1&&(n.alternate===null?n.tag=17:(t=Nt(-1,1),t.tag=2,qt(n,t,1))),n.lanes|=1),e)}var Gg=Mt.ReactCurrentOwner,Pe=!1;function Se(e,t,n,r){t.child=e===null?af(t,null,n,r):Jn(t,e.child,n,r)}function Vu(e,t,n,r,i){n=n.render;var s=t.ref;return qn(t,i),r=Ta(e,t,n,r,s,i),n=ka(),e!==null&&!Pe?(t.updateQueue=e.updateQueue,t.flags&=-2053,e.lanes&=~i,At(e,t,i)):(Q&&n&&fa(t),t.flags|=1,Se(e,t,r,i),t.child)}function Wu(e,t,n,r,i){if(e===null){var s=n.type;return typeof s=="function"&&!Ra(s)&&s.defaultProps===void 0&&n.compare===null&&n.defaultProps===void 0?(t.tag=15,t.type=s,Mf(e,t,s,r,i)):(e=Ki(n.type,null,r,t,t.mode,i),e.ref=t.ref,e.return=t,t.child=e)}if(s=e.child,!(e.lanes&i)){var o=s.memoizedProps;if(n=n.compare,n=n!==null?n:Kr,n(o,r)&&e.ref===t.ref)return At(e,t,i)}return t.flags|=1,e=Gt(s,r),e.ref=t.ref,e.return=t,t.child=e}function Mf(e,t,n,r,i){if(e!==null){var s=e.memoizedProps;if(Kr(s,r)&&e.ref===t.ref)if(Pe=!1,t.pendingProps=r=s,(e.lanes&i)!==0)e.flags&131072&&(Pe=!0);else return t.lanes=e.lanes,At(e,t,i)}return _l(e,t,n,r,i)}function If(e,t,n){var r=t.pendingProps,i=r.children,s=e!==null?e.memoizedState:null;if(r.mode==="hidden")if(!(t.mode&1))t.memoizedState={baseLanes:0,cachePool:null,transitions:null},U(Dn,ze),ze|=n;else{if(!(n&1073741824))return e=s!==null?s.baseLanes|n:n,t.lanes=t.childLanes=1073741824,t.memoizedState={baseLanes:e,cachePool:null,transitions:null},t.updateQueue=null,U(Dn,ze),ze|=e,null;t.memoizedState={baseLanes:0,cachePool:null,transitions:null},r=s!==null?s.baseLanes:n,U(Dn,ze),ze|=r}else s!==null?(r=s.baseLanes|n,t.memoizedState=null):r=n,U(Dn,ze),ze|=r;return Se(e,t,i,n),t.child}function jf(e,t){var n=t.ref;(e===null&&n!==null||e!==null&&e.ref!==n)&&(t.flags|=512,t.flags|=2097152)}function _l(e,t,n,r,i){var s=$e(n)?dn:_e.current;return s=Kn(t,s),qn(t,i),n=Ta(e,t,n,r,s,i),r=ka(),e!==null&&!Pe?(t.updateQueue=e.updateQueue,t.flags&=-2053,e.lanes&=~i,At(e,t,i)):(Q&&r&&fa(t),t.flags|=1,Se(e,t,n,i),t.child)}function qu(e,t,n,r,i){if($e(n)){var s=!0;ms(t)}else s=!1;if(qn(t,i),t.stateNode===null)Xi(e,t),of(t,n,r),wl(t,n,r,i),r=!0;else if(e===null){var o=t.stateNode,l=t.memoizedProps;o.props=l;var a=o.context,u=n.contextType;typeof u=="object"&&u!==null?u=Je(u):(u=$e(n)?dn:_e.current,u=Kn(t,u));var c=n.getDerivedStateFromProps,h=typeof c=="function"||typeof o.getSnapshotBeforeUpdate=="function";h||typeof o.UNSAFE_componentWillReceiveProps!="function"&&typeof o.componentWillReceiveProps!="function"||(l!==r||a!==u)&&Ou(t,o,r,u),Pt=!1;var d=t.memoizedState;o.state=d,xs(t,r,o,i),a=t.memoizedState,l!==r||d!==a||Re.current||Pt?(typeof c=="function"&&(yl(t,n,c,r),a=t.memoizedState),(l=Pt||$u(t,n,l,r,d,a,u))?(h||typeof o.UNSAFE_componentWillMount!="function"&&typeof o.componentWillMount!="function"||(typeof o.componentWillMount=="function"&&o.componentWillMount(),typeof o.UNSAFE_componentWillMount=="function"&&o.UNSAFE_componentWillMount()),typeof o.componentDidMount=="function"&&(t.flags|=4194308)):(typeof o.componentDidMount=="function"&&(t.flags|=4194308),t.memoizedProps=r,t.memoizedState=a),o.props=r,o.state=a,o.context=u,r=l):(typeof o.componentDidMount=="function"&&(t.flags|=4194308),r=!1)}else{o=t.stateNode,rf(e,t),l=t.memoizedProps,u=t.type===t.elementType?l:nt(t.type,l),o.props=u,h=t.pendingProps,d=o.context,a=n.contextType,typeof a=="object"&&a!==null?a=Je(a):(a=$e(n)?dn:_e.current,a=Kn(t,a));var g=n.getDerivedStateFromProps;(c=typeof g=="function"||typeof o.getSnapshotBeforeUpdate=="function")||typeof o.UNSAFE_componentWillReceiveProps!="function"&&typeof o.componentWillReceiveProps!="function"||(l!==h||d!==a)&&Ou(t,o,r,a),Pt=!1,d=t.memoizedState,o.state=d,xs(t,r,o,i);var y=t.memoizedState;l!==h||d!==y||Re.current||Pt?(typeof g=="function"&&(yl(t,n,g,r),y=t.memoizedState),(u=Pt||$u(t,n,u,r,d,y,a)||!1)?(c||typeof o.UNSAFE_componentWillUpdate!="function"&&typeof o.componentWillUpdate!="function"||(typeof o.componentWillUpdate=="function"&&o.componentWillUpdate(r,y,a),typeof o.UNSAFE_componentWillUpdate=="function"&&o.UNSAFE_componentWillUpdate(r,y,a)),typeof o.componentDidUpdate=="function"&&(t.flags|=4),typeof o.getSnapshotBeforeUpdate=="function"&&(t.flags|=1024)):(typeof o.componentDidUpdate!="function"||l===e.memoizedProps&&d===e.memoizedState||(t.flags|=4),typeof o.getSnapshotBeforeUpdate!="function"||l===e.memoizedProps&&d===e.memoizedState||(t.flags|=1024),t.memoizedProps=r,t.memoizedState=y),o.props=r,o.state=y,o.context=a,r=u):(typeof o.componentDidUpdate!="function"||l===e.memoizedProps&&d===e.memoizedState||(t.flags|=4),typeof o.getSnapshotBeforeUpdate!="function"||l===e.memoizedProps&&d===e.memoizedState||(t.flags|=1024),r=!1)}return Sl(e,t,n,r,s,i)}function Sl(e,t,n,r,i,s){jf(e,t);var o=(t.flags&128)!==0;if(!r&&!o)return i&&Mu(t,n,!1),At(e,t,s);r=t.stateNode,Gg.current=t;var l=o&&typeof n.getDerivedStateFromError!="function"?null:r.render();return t.flags|=1,e!==null&&o?(t.child=Jn(t,e.child,null,s),t.child=Jn(t,null,l,s)):Se(e,t,l,s),t.memoizedState=r.state,i&&Mu(t,n,!0),t.child}function Pf(e){var t=e.stateNode;t.pendingContext?Au(e,t.pendingContext,t.pendingContext!==t.context):t.context&&Au(e,t.context,!1),xa(e,t.containerInfo)}function Xu(e,t,n,r,i){return Yn(),pa(i),t.flags|=256,Se(e,t,n,r),t.child}var El={dehydrated:null,treeContext:null,retryLane:0};function Tl(e){return{baseLanes:e,cachePool:null,transitions:null}}function Rf(e,t,n){var r=t.pendingProps,i=G.current,s=!1,o=(t.flags&128)!==0,l;if((l=o)||(l=e!==null&&e.memoizedState===null?!1:(i&2)!==0),l?(s=!0,t.flags&=-129):(e===null||e.memoizedState!==null)&&(i|=1),U(G,i&1),e===null)return gl(t),e=t.memoizedState,e!==null&&(e=e.dehydrated,e!==null)?(t.mode&1?e.data==="$!"?t.lanes=8:t.lanes=1073741824:t.lanes=1,null):(o=r.children,e=r.fallback,s?(r=t.mode,s=t.child,o={mode:"hidden",children:o},!(r&1)&&s!==null?(s.childLanes=0,s.pendingProps=o):s=Xs(o,r,0,null),e=un(e,r,n,null),s.return=t,e.return=t,s.sibling=e,t.child=s,t.child.memoizedState=Tl(n),t.memoizedState=El,e):ba(t,o));if(i=e.memoizedState,i!==null&&(l=i.dehydrated,l!==null))return Kg(e,t,o,r,l,i,n);if(s){s=r.fallback,o=t.mode,i=e.child,l=i.sibling;var a={mode:"hidden",children:r.children};return!(o&1)&&t.child!==i?(r=t.child,r.childLanes=0,r.pendingProps=a,t.deletions=null):(r=Gt(i,a),r.subtreeFlags=i.subtreeFlags&14680064),l!==null?s=Gt(l,s):(s=un(s,o,n,null),s.flags|=2),s.return=t,r.return=t,r.sibling=s,t.child=r,r=s,s=t.child,o=e.child.memoizedState,o=o===null?Tl(n):{baseLanes:o.baseLanes|n,cachePool:null,transitions:o.transitions},s.memoizedState=o,s.childLanes=e.childLanes&~n,t.memoizedState=El,r}return s=e.child,e=s.sibling,r=Gt(s,{mode:"visible",children:r.children}),!(t.mode&1)&&(r.lanes=n),r.return=t,r.sibling=null,e!==null&&(n=t.deletions,n===null?(t.deletions=[e],t.flags|=16):n.push(e)),t.child=r,t.memoizedState=null,r}function ba(e,t){return t=Xs({mode:"visible",children:t},e.mode,0,null),t.return=e,e.child=t}function Ai(e,t,n,r){return r!==null&&pa(r),Jn(t,e.child,null,n),e=ba(t,t.pendingProps.children),e.flags|=2,t.memoizedState=null,e}function Kg(e,t,n,r,i,s,o){if(n)return t.flags&256?(t.flags&=-257,r=Lo(Error(b(422))),Ai(e,t,o,r)):t.memoizedState!==null?(t.child=e.child,t.flags|=128,null):(s=r.fallback,i=t.mode,r=Xs({mode:"visible",children:r.children},i,0,null),s=un(s,i,o,null),s.flags|=2,r.return=t,s.return=t,r.sibling=s,t.child=r,t.mode&1&&Jn(t,e.child,null,o),t.child.memoizedState=Tl(o),t.memoizedState=El,s);if(!(t.mode&1))return Ai(e,t,o,null);if(i.data==="$!"){if(r=i.nextSibling&&i.nextSibling.dataset,r)var l=r.dgst;return r=l,s=Error(b(419)),r=Lo(s,r,void 0),Ai(e,t,o,r)}if(l=(o&e.childLanes)!==0,Pe||l){if(r=de,r!==null){switch(o&-o){case 4:i=2;break;case 16:i=8;break;case 64:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:case 4194304:case 8388608:case 16777216:case 33554432:case 67108864:i=32;break;case 536870912:i=268435456;break;default:i=0}i=i&(r.suspendedLanes|o)?0:i,i!==0&&i!==s.retryLane&&(s.retryLane=i,Lt(e,i),ot(r,e,i,-1))}return Pa(),r=Lo(Error(b(421))),Ai(e,t,o,r)}return i.data==="$?"?(t.flags|=128,t.child=e.child,t=uv.bind(null,e),i._reactRetry=t,null):(e=s.treeContext,De=Wt(i.nextSibling),Fe=t,Q=!0,it=null,e!==null&&(We[qe++]=Tt,We[qe++]=kt,We[qe++]=fn,Tt=e.id,kt=e.overflow,fn=t),t=ba(t,r.children),t.flags|=4096,t)}function Qu(e,t,n){e.lanes|=t;var r=e.alternate;r!==null&&(r.lanes|=t),vl(e.return,t,n)}function Ao(e,t,n,r,i){var s=e.memoizedState;s===null?e.memoizedState={isBackwards:t,rendering:null,renderingStartTime:0,last:r,tail:n,tailMode:i}:(s.isBackwards=t,s.rendering=null,s.renderingStartTime=0,s.last=r,s.tail=n,s.tailMode=i)}function $f(e,t,n){var r=t.pendingProps,i=r.revealOrder,s=r.tail;if(Se(e,t,r.children,n),r=G.current,r&2)r=r&1|2,t.flags|=128;else{if(e!==null&&e.flags&128)e:for(e=t.child;e!==null;){if(e.tag===13)e.memoizedState!==null&&Qu(e,n,t);else if(e.tag===19)Qu(e,n,t);else if(e.child!==null){e.child.return=e,e=e.child;continue}if(e===t)break e;for(;e.sibling===null;){if(e.return===null||e.return===t)break e;e=e.return}e.sibling.return=e.return,e=e.sibling}r&=1}if(U(G,r),!(t.mode&1))t.memoizedState=null;else switch(i){case"forwards":for(n=t.child,i=null;n!==null;)e=n.alternate,e!==null&&_s(e)===null&&(i=n),n=n.sibling;n=i,n===null?(i=t.child,t.child=null):(i=n.sibling,n.sibling=null),Ao(t,!1,i,n,s);break;case"backwards":for(n=null,i=t.child,t.child=null;i!==null;){if(e=i.alternate,e!==null&&_s(e)===null){t.child=i;break}e=i.sibling,i.sibling=n,n=i,i=e}Ao(t,!0,n,null,s);break;case"together":Ao(t,!1,null,null,void 0);break;default:t.memoizedState=null}return t.child}function Xi(e,t){!(t.mode&1)&&e!==null&&(e.alternate=null,t.alternate=null,t.flags|=2)}function At(e,t,n){if(e!==null&&(t.dependencies=e.dependencies),pn|=t.lanes,!(n&t.childLanes))return null;if(e!==null&&t.child!==e.child)throw Error(b(153));if(t.child!==null){for(e=t.child,n=Gt(e,e.pendingProps),t.child=n,n.return=t;e.sibling!==null;)e=e.sibling,n=n.sibling=Gt(e,e.pendingProps),n.return=t;n.sibling=null}return t.child}function Yg(e,t,n){switch(t.tag){case 3:Pf(t),Yn();break;case 5:uf(t);break;case 1:$e(t.type)&&ms(t);break;case 4:xa(t,t.stateNode.containerInfo);break;case 10:var r=t.type._context,i=t.memoizedProps.value;U(ys,r._currentValue),r._currentValue=i;break;case 13:if(r=t.memoizedState,r!==null)return r.dehydrated!==null?(U(G,G.current&1),t.flags|=128,null):n&t.child.childLanes?Rf(e,t,n):(U(G,G.current&1),e=At(e,t,n),e!==null?e.sibling:null);U(G,G.current&1);break;case 19:if(r=(n&t.childLanes)!==0,e.flags&128){if(r)return $f(e,t,n);t.flags|=128}if(i=t.memoizedState,i!==null&&(i.rendering=null,i.tail=null,i.lastEffect=null),U(G,G.current),r)break;return null;case 22:case 23:return t.lanes=0,If(e,t,n)}return At(e,t,n)}var Of,kl,zf,Df;Of=function(e,t){for(var n=t.child;n!==null;){if(n.tag===5||n.tag===6)e.appendChild(n.stateNode);else if(n.tag!==4&&n.child!==null){n.child.return=n,n=n.child;continue}if(n===t)break;for(;n.sibling===null;){if(n.return===null||n.return===t)return;n=n.return}n.sibling.return=n.return,n=n.sibling}};kl=function(){};zf=function(e,t,n,r){var i=e.memoizedProps;if(i!==r){e=t.stateNode,ln(gt.current);var s=null;switch(n){case"input":i=Xo(e,i),r=Xo(e,r),s=[];break;case"select":i=Y({},i,{value:void 0}),r=Y({},r,{value:void 0}),s=[];break;case"textarea":i=Ko(e,i),r=Ko(e,r),s=[];break;default:typeof i.onClick!="function"&&typeof r.onClick=="function"&&(e.onclick=hs)}Jo(n,r);var o;n=null;for(u in i)if(!r.hasOwnProperty(u)&&i.hasOwnProperty(u)&&i[u]!=null)if(u==="style"){var l=i[u];for(o in l)l.hasOwnProperty(o)&&(n||(n={}),n[o]="")}else u!=="dangerouslySetInnerHTML"&&u!=="children"&&u!=="suppressContentEditableWarning"&&u!=="suppressHydrationWarning"&&u!=="autoFocus"&&(Br.hasOwnProperty(u)?s||(s=[]):(s=s||[]).push(u,null));for(u in r){var a=r[u];if(l=i!=null?i[u]:void 0,r.hasOwnProperty(u)&&a!==l&&(a!=null||l!=null))if(u==="style")if(l){for(o in l)!l.hasOwnProperty(o)||a&&a.hasOwnProperty(o)||(n||(n={}),n[o]="");for(o in a)a.hasOwnProperty(o)&&l[o]!==a[o]&&(n||(n={}),n[o]=a[o])}else n||(s||(s=[]),s.push(u,n)),n=a;else u==="dangerouslySetInnerHTML"?(a=a?a.__html:void 0,l=l?l.__html:void 0,a!=null&&l!==a&&(s=s||[]).push(u,a)):u==="children"?typeof a!="string"&&typeof a!="number"||(s=s||[]).push(u,""+a):u!=="suppressContentEditableWarning"&&u!=="suppressHydrationWarning"&&(Br.hasOwnProperty(u)?(a!=null&&u==="onScroll"&&V("scroll",e),s||l===a||(s=[])):(s=s||[]).push(u,a))}n&&(s=s||[]).push("style",n);var u=s;(t.updateQueue=u)&&(t.flags|=4)}};Df=function(e,t,n,r){n!==r&&(t.flags|=4)};function yr(e,t){if(!Q)switch(e.tailMode){case"hidden":t=e.tail;for(var n=null;t!==null;)t.alternate!==null&&(n=t),t=t.sibling;n===null?e.tail=null:n.sibling=null;break;case"collapsed":n=e.tail;for(var r=null;n!==null;)n.alternate!==null&&(r=n),n=n.sibling;r===null?t||e.tail===null?e.tail=null:e.tail.sibling=null:r.sibling=null}}function ve(e){var t=e.alternate!==null&&e.alternate.child===e.child,n=0,r=0;if(t)for(var i=e.child;i!==null;)n|=i.lanes|i.childLanes,r|=i.subtreeFlags&14680064,r|=i.flags&14680064,i.return=e,i=i.sibling;else for(i=e.child;i!==null;)n|=i.lanes|i.childLanes,r|=i.subtreeFlags,r|=i.flags,i.return=e,i=i.sibling;return e.subtreeFlags|=r,e.childLanes=n,t}function Jg(e,t,n){var r=t.pendingProps;switch(ha(t),t.tag){case 2:case 16:case 15:case 0:case 11:case 7:case 8:case 12:case 9:case 14:return ve(t),null;case 1:return $e(t.type)&&ps(),ve(t),null;case 3:return r=t.stateNode,Zn(),W(Re),W(_e),Sa(),r.pendingContext&&(r.context=r.pendingContext,r.pendingContext=null),(e===null||e.child===null)&&(bi(t)?t.flags|=4:e===null||e.memoizedState.isDehydrated&&!(t.flags&256)||(t.flags|=1024,it!==null&&(jl(it),it=null))),kl(e,t),ve(t),null;case 5:_a(t);var i=ln(ti.current);if(n=t.type,e!==null&&t.stateNode!=null)zf(e,t,n,r,i),e.ref!==t.ref&&(t.flags|=512,t.flags|=2097152);else{if(!r){if(t.stateNode===null)throw Error(b(166));return ve(t),null}if(e=ln(gt.current),bi(t)){r=t.stateNode,n=t.type;var s=t.memoizedProps;switch(r[pt]=t,r[Zr]=s,e=(t.mode&1)!==0,n){case"dialog":V("cancel",r),V("close",r);break;case"iframe":case"object":case"embed":V("load",r);break;case"video":case"audio":for(i=0;i<Lr.length;i++)V(Lr[i],r);break;case"source":V("error",r);break;case"img":case"image":case"link":V("error",r),V("load",r);break;case"details":V("toggle",r);break;case"input":ru(r,s),V("invalid",r);break;case"select":r._wrapperState={wasMultiple:!!s.multiple},V("invalid",r);break;case"textarea":su(r,s),V("invalid",r)}Jo(n,s),i=null;for(var o in s)if(s.hasOwnProperty(o)){var l=s[o];o==="children"?typeof l=="string"?r.textContent!==l&&(s.suppressHydrationWarning!==!0&&Ci(r.textContent,l,e),i=["children",l]):typeof l=="number"&&r.textContent!==""+l&&(s.suppressHydrationWarning!==!0&&Ci(r.textContent,l,e),i=["children",""+l]):Br.hasOwnProperty(o)&&l!=null&&o==="onScroll"&&V("scroll",r)}switch(n){case"input":wi(r),iu(r,s,!0);break;case"textarea":wi(r),ou(r);break;case"select":case"option":break;default:typeof s.onClick=="function"&&(r.onclick=hs)}r=i,t.updateQueue=r,r!==null&&(t.flags|=4)}else{o=i.nodeType===9?i:i.ownerDocument,e==="http://www.w3.org/1999/xhtml"&&(e=dd(n)),e==="http://www.w3.org/1999/xhtml"?n==="script"?(e=o.createElement("div"),e.innerHTML="<script><\/script>",e=e.removeChild(e.firstChild)):typeof r.is=="string"?e=o.createElement(n,{is:r.is}):(e=o.createElement(n),n==="select"&&(o=e,r.multiple?o.multiple=!0:r.size&&(o.size=r.size))):e=o.createElementNS(e,n),e[pt]=t,e[Zr]=r,Of(e,t,!1,!1),t.stateNode=e;e:{switch(o=Zo(n,r),n){case"dialog":V("cancel",e),V("close",e),i=r;break;case"iframe":case"object":case"embed":V("load",e),i=r;break;case"video":case"audio":for(i=0;i<Lr.length;i++)V(Lr[i],e);i=r;break;case"source":V("error",e),i=r;break;case"img":case"image":case"link":V("error",e),V("load",e),i=r;break;case"details":V("toggle",e),i=r;break;case"input":ru(e,r),i=Xo(e,r),V("invalid",e);break;case"option":i=r;break;case"select":e._wrapperState={wasMultiple:!!r.multiple},i=Y({},r,{value:void 0}),V("invalid",e);break;case"textarea":su(e,r),i=Ko(e,r),V("invalid",e);break;default:i=r}Jo(n,i),l=i;for(s in l)if(l.hasOwnProperty(s)){var a=l[s];s==="style"?pd(e,a):s==="dangerouslySetInnerHTML"?(a=a?a.__html:void 0,a!=null&&fd(e,a)):s==="children"?typeof a=="string"?(n!=="textarea"||a!=="")&&Vr(e,a):typeof a=="number"&&Vr(e,""+a):s!=="suppressContentEditableWarning"&&s!=="suppressHydrationWarning"&&s!=="autoFocus"&&(Br.hasOwnProperty(s)?a!=null&&s==="onScroll"&&V("scroll",e):a!=null&&Jl(e,s,a,o))}switch(n){case"input":wi(e),iu(e,r,!1);break;case"textarea":wi(e),ou(e);break;case"option":r.value!=null&&e.setAttribute("value",""+Yt(r.value));break;case"select":e.multiple=!!r.multiple,s=r.value,s!=null?Un(e,!!r.multiple,s,!1):r.defaultValue!=null&&Un(e,!!r.multiple,r.defaultValue,!0);break;default:typeof i.onClick=="function"&&(e.onclick=hs)}switch(n){case"button":case"input":case"select":case"textarea":r=!!r.autoFocus;break e;case"img":r=!0;break e;default:r=!1}}r&&(t.flags|=4)}t.ref!==null&&(t.flags|=512,t.flags|=2097152)}return ve(t),null;case 6:if(e&&t.stateNode!=null)Df(e,t,e.memoizedProps,r);else{if(typeof r!="string"&&t.stateNode===null)throw Error(b(166));if(n=ln(ti.current),ln(gt.current),bi(t)){if(r=t.stateNode,n=t.memoizedProps,r[pt]=t,(s=r.nodeValue!==n)&&(e=Fe,e!==null))switch(e.tag){case 3:Ci(r.nodeValue,n,(e.mode&1)!==0);break;case 5:e.memoizedProps.suppressHydrationWarning!==!0&&Ci(r.nodeValue,n,(e.mode&1)!==0)}s&&(t.flags|=4)}else r=(n.nodeType===9?n:n.ownerDocument).createTextNode(r),r[pt]=t,t.stateNode=r}return ve(t),null;case 13:if(W(G),r=t.memoizedState,e===null||e.memoizedState!==null&&e.memoizedState.dehydrated!==null){if(Q&&De!==null&&t.mode&1&&!(t.flags&128))tf(),Yn(),t.flags|=98560,s=!1;else if(s=bi(t),r!==null&&r.dehydrated!==null){if(e===null){if(!s)throw Error(b(318));if(s=t.memoizedState,s=s!==null?s.dehydrated:null,!s)throw Error(b(317));s[pt]=t}else Yn(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;ve(t),s=!1}else it!==null&&(jl(it),it=null),s=!0;if(!s)return t.flags&65536?t:null}return t.flags&128?(t.lanes=n,t):(r=r!==null,r!==(e!==null&&e.memoizedState!==null)&&r&&(t.child.flags|=8192,t.mode&1&&(e===null||G.current&1?le===0&&(le=3):Pa())),t.updateQueue!==null&&(t.flags|=4),ve(t),null);case 4:return Zn(),kl(e,t),e===null&&Yr(t.stateNode.containerInfo),ve(t),null;case 10:return va(t.type._context),ve(t),null;case 17:return $e(t.type)&&ps(),ve(t),null;case 19:if(W(G),s=t.memoizedState,s===null)return ve(t),null;if(r=(t.flags&128)!==0,o=s.rendering,o===null)if(r)yr(s,!1);else{if(le!==0||e!==null&&e.flags&128)for(e=t.child;e!==null;){if(o=_s(e),o!==null){for(t.flags|=128,yr(s,!1),r=o.updateQueue,r!==null&&(t.updateQueue=r,t.flags|=4),t.subtreeFlags=0,r=n,n=t.child;n!==null;)s=n,e=r,s.flags&=14680066,o=s.alternate,o===null?(s.childLanes=0,s.lanes=e,s.child=null,s.subtreeFlags=0,s.memoizedProps=null,s.memoizedState=null,s.updateQueue=null,s.dependencies=null,s.stateNode=null):(s.childLanes=o.childLanes,s.lanes=o.lanes,s.child=o.child,s.subtreeFlags=0,s.deletions=null,s.memoizedProps=o.memoizedProps,s.memoizedState=o.memoizedState,s.updateQueue=o.updateQueue,s.type=o.type,e=o.dependencies,s.dependencies=e===null?null:{lanes:e.lanes,firstContext:e.firstContext}),n=n.sibling;return U(G,G.current&1|2),t.child}e=e.sibling}s.tail!==null&&ee()>tr&&(t.flags|=128,r=!0,yr(s,!1),t.lanes=4194304)}else{if(!r)if(e=_s(o),e!==null){if(t.flags|=128,r=!0,n=e.updateQueue,n!==null&&(t.updateQueue=n,t.flags|=4),yr(s,!0),s.tail===null&&s.tailMode==="hidden"&&!o.alternate&&!Q)return ve(t),null}else 2*ee()-s.renderingStartTime>tr&&n!==1073741824&&(t.flags|=128,r=!0,yr(s,!1),t.lanes=4194304);s.isBackwards?(o.sibling=t.child,t.child=o):(n=s.last,n!==null?n.sibling=o:t.child=o,s.last=o)}return s.tail!==null?(t=s.tail,s.rendering=t,s.tail=t.sibling,s.renderingStartTime=ee(),t.sibling=null,n=G.current,U(G,r?n&1|2:n&1),t):(ve(t),null);case 22:case 23:return ja(),r=t.memoizedState!==null,e!==null&&e.memoizedState!==null!==r&&(t.flags|=8192),r&&t.mode&1?ze&1073741824&&(ve(t),t.subtreeFlags&6&&(t.flags|=8192)):ve(t),null;case 24:return null;case 25:return null}throw Error(b(156,t.tag))}function Zg(e,t){switch(ha(t),t.tag){case 1:return $e(t.type)&&ps(),e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 3:return Zn(),W(Re),W(_e),Sa(),e=t.flags,e&65536&&!(e&128)?(t.flags=e&-65537|128,t):null;case 5:return _a(t),null;case 13:if(W(G),e=t.memoizedState,e!==null&&e.dehydrated!==null){if(t.alternate===null)throw Error(b(340));Yn()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 19:return W(G),null;case 4:return Zn(),null;case 10:return va(t.type._context),null;case 22:case 23:return ja(),null;case 24:return null;default:return null}}var Mi=!1,we=!1,ev=typeof WeakSet=="function"?WeakSet:Set,I=null;function zn(e,t){var n=e.ref;if(n!==null)if(typeof n=="function")try{n(null)}catch(r){Z(e,t,r)}else n.current=null}function Nl(e,t,n){try{n()}catch(r){Z(e,t,r)}}var Gu=!1;function tv(e,t){if(ul=cs,e=Ud(),da(e)){if("selectionStart"in e)var n={start:e.selectionStart,end:e.selectionEnd};else e:{n=(n=e.ownerDocument)&&n.defaultView||window;var r=n.getSelection&&n.getSelection();if(r&&r.rangeCount!==0){n=r.anchorNode;var i=r.anchorOffset,s=r.focusNode;r=r.focusOffset;try{n.nodeType,s.nodeType}catch{n=null;break e}var o=0,l=-1,a=-1,u=0,c=0,h=e,d=null;t:for(;;){for(var g;h!==n||i!==0&&h.nodeType!==3||(l=o+i),h!==s||r!==0&&h.nodeType!==3||(a=o+r),h.nodeType===3&&(o+=h.nodeValue.length),(g=h.firstChild)!==null;)d=h,h=g;for(;;){if(h===e)break t;if(d===n&&++u===i&&(l=o),d===s&&++c===r&&(a=o),(g=h.nextSibling)!==null)break;h=d,d=h.parentNode}h=g}n=l===-1||a===-1?null:{start:l,end:a}}else n=null}n=n||{start:0,end:0}}else n=null;for(cl={focusedElem:e,selectionRange:n},cs=!1,I=t;I!==null;)if(t=I,e=t.child,(t.subtreeFlags&1028)!==0&&e!==null)e.return=t,I=e;else for(;I!==null;){t=I;try{var y=t.alternate;if(t.flags&1024)switch(t.tag){case 0:case 11:case 15:break;case 1:if(y!==null){var w=y.memoizedProps,x=y.memoizedState,p=t.stateNode,m=p.getSnapshotBeforeUpdate(t.elementType===t.type?w:nt(t.type,w),x);p.__reactInternalSnapshotBeforeUpdate=m}break;case 3:var v=t.stateNode.containerInfo;v.nodeType===1?v.textContent="":v.nodeType===9&&v.documentElement&&v.removeChild(v.documentElement);break;case 5:case 6:case 4:case 17:break;default:throw Error(b(163))}}catch(E){Z(t,t.return,E)}if(e=t.sibling,e!==null){e.return=t.return,I=e;break}I=t.return}return y=Gu,Gu=!1,y}function Dr(e,t,n){var r=t.updateQueue;if(r=r!==null?r.lastEffect:null,r!==null){var i=r=r.next;do{if((i.tag&e)===e){var s=i.destroy;i.destroy=void 0,s!==void 0&&Nl(t,n,s)}i=i.next}while(i!==r)}}function Ws(e,t){if(t=t.updateQueue,t=t!==null?t.lastEffect:null,t!==null){var n=t=t.next;do{if((n.tag&e)===e){var r=n.create;n.destroy=r()}n=n.next}while(n!==t)}}function Cl(e){var t=e.ref;if(t!==null){var n=e.stateNode;switch(e.tag){case 5:e=n;break;default:e=n}typeof t=="function"?t(e):t.current=e}}function Ff(e){var t=e.alternate;t!==null&&(e.alternate=null,Ff(t)),e.child=null,e.deletions=null,e.sibling=null,e.tag===5&&(t=e.stateNode,t!==null&&(delete t[pt],delete t[Zr],delete t[hl],delete t[Og],delete t[zg])),e.stateNode=null,e.return=null,e.dependencies=null,e.memoizedProps=null,e.memoizedState=null,e.pendingProps=null,e.stateNode=null,e.updateQueue=null}function Hf(e){return e.tag===5||e.tag===3||e.tag===4}function Ku(e){e:for(;;){for(;e.sibling===null;){if(e.return===null||Hf(e.return))return null;e=e.return}for(e.sibling.return=e.return,e=e.sibling;e.tag!==5&&e.tag!==6&&e.tag!==18;){if(e.flags&2||e.child===null||e.tag===4)continue e;e.child.return=e,e=e.child}if(!(e.flags&2))return e.stateNode}}function bl(e,t,n){var r=e.tag;if(r===5||r===6)e=e.stateNode,t?n.nodeType===8?n.parentNode.insertBefore(e,t):n.insertBefore(e,t):(n.nodeType===8?(t=n.parentNode,t.insertBefore(e,n)):(t=n,t.appendChild(e)),n=n._reactRootContainer,n!=null||t.onclick!==null||(t.onclick=hs));else if(r!==4&&(e=e.child,e!==null))for(bl(e,t,n),e=e.sibling;e!==null;)bl(e,t,n),e=e.sibling}function Ll(e,t,n){var r=e.tag;if(r===5||r===6)e=e.stateNode,t?n.insertBefore(e,t):n.appendChild(e);else if(r!==4&&(e=e.child,e!==null))for(Ll(e,t,n),e=e.sibling;e!==null;)Ll(e,t,n),e=e.sibling}var fe=null,rt=!1;function It(e,t,n){for(n=n.child;n!==null;)Uf(e,t,n),n=n.sibling}function Uf(e,t,n){if(mt&&typeof mt.onCommitFiberUnmount=="function")try{mt.onCommitFiberUnmount(Os,n)}catch{}switch(n.tag){case 5:we||zn(n,t);case 6:var r=fe,i=rt;fe=null,It(e,t,n),fe=r,rt=i,fe!==null&&(rt?(e=fe,n=n.stateNode,e.nodeType===8?e.parentNode.removeChild(n):e.removeChild(n)):fe.removeChild(n.stateNode));break;case 18:fe!==null&&(rt?(e=fe,n=n.stateNode,e.nodeType===8?Eo(e.parentNode,n):e.nodeType===1&&Eo(e,n),Qr(e)):Eo(fe,n.stateNode));break;case 4:r=fe,i=rt,fe=n.stateNode.containerInfo,rt=!0,It(e,t,n),fe=r,rt=i;break;case 0:case 11:case 14:case 15:if(!we&&(r=n.updateQueue,r!==null&&(r=r.lastEffect,r!==null))){i=r=r.next;do{var s=i,o=s.destroy;s=s.tag,o!==void 0&&(s&2||s&4)&&Nl(n,t,o),i=i.next}while(i!==r)}It(e,t,n);break;case 1:if(!we&&(zn(n,t),r=n.stateNode,typeof r.componentWillUnmount=="function"))try{r.props=n.memoizedProps,r.state=n.memoizedState,r.componentWillUnmount()}catch(l){Z(n,t,l)}It(e,t,n);break;case 21:It(e,t,n);break;case 22:n.mode&1?(we=(r=we)||n.memoizedState!==null,It(e,t,n),we=r):It(e,t,n);break;default:It(e,t,n)}}function Yu(e){var t=e.updateQueue;if(t!==null){e.updateQueue=null;var n=e.stateNode;n===null&&(n=e.stateNode=new ev),t.forEach(function(r){var i=cv.bind(null,e,r);n.has(r)||(n.add(r),r.then(i,i))})}}function tt(e,t){var n=t.deletions;if(n!==null)for(var r=0;r<n.length;r++){var i=n[r];try{var s=e,o=t,l=o;e:for(;l!==null;){switch(l.tag){case 5:fe=l.stateNode,rt=!1;break e;case 3:fe=l.stateNode.containerInfo,rt=!0;break e;case 4:fe=l.stateNode.containerInfo,rt=!0;break e}l=l.return}if(fe===null)throw Error(b(160));Uf(s,o,i),fe=null,rt=!1;var a=i.alternate;a!==null&&(a.return=null),i.return=null}catch(u){Z(i,t,u)}}if(t.subtreeFlags&12854)for(t=t.child;t!==null;)Bf(t,e),t=t.sibling}function Bf(e,t){var n=e.alternate,r=e.flags;switch(e.tag){case 0:case 11:case 14:case 15:if(tt(t,e),at(e),r&4){try{Dr(3,e,e.return),Ws(3,e)}catch(w){Z(e,e.return,w)}try{Dr(5,e,e.return)}catch(w){Z(e,e.return,w)}}break;case 1:tt(t,e),at(e),r&512&&n!==null&&zn(n,n.return);break;case 5:if(tt(t,e),at(e),r&512&&n!==null&&zn(n,n.return),e.flags&32){var i=e.stateNode;try{Vr(i,"")}catch(w){Z(e,e.return,w)}}if(r&4&&(i=e.stateNode,i!=null)){var s=e.memoizedProps,o=n!==null?n.memoizedProps:s,l=e.type,a=e.updateQueue;if(e.updateQueue=null,a!==null)try{l==="input"&&s.type==="radio"&&s.name!=null&&ud(i,s),Zo(l,o);var u=Zo(l,s);for(o=0;o<a.length;o+=2){var c=a[o],h=a[o+1];c==="style"?pd(i,h):c==="dangerouslySetInnerHTML"?fd(i,h):c==="children"?Vr(i,h):Jl(i,c,h,u)}switch(l){case"input":Qo(i,s);break;case"textarea":cd(i,s);break;case"select":var d=i._wrapperState.wasMultiple;i._wrapperState.wasMultiple=!!s.multiple;var g=s.value;g!=null?Un(i,!!s.multiple,g,!1):d!==!!s.multiple&&(s.defaultValue!=null?Un(i,!!s.multiple,s.defaultValue,!0):Un(i,!!s.multiple,s.multiple?[]:"",!1))}i[Zr]=s}catch(w){Z(e,e.return,w)}}break;case 6:if(tt(t,e),at(e),r&4){if(e.stateNode===null)throw Error(b(162));i=e.stateNode,s=e.memoizedProps;try{i.nodeValue=s}catch(w){Z(e,e.return,w)}}break;case 3:if(tt(t,e),at(e),r&4&&n!==null&&n.memoizedState.isDehydrated)try{Qr(t.containerInfo)}catch(w){Z(e,e.return,w)}break;case 4:tt(t,e),at(e);break;case 13:tt(t,e),at(e),i=e.child,i.flags&8192&&(s=i.memoizedState!==null,i.stateNode.isHidden=s,!s||i.alternate!==null&&i.alternate.memoizedState!==null||(Ma=ee())),r&4&&Yu(e);break;case 22:if(c=n!==null&&n.memoizedState!==null,e.mode&1?(we=(u=we)||c,tt(t,e),we=u):tt(t,e),at(e),r&8192){if(u=e.memoizedState!==null,(e.stateNode.isHidden=u)&&!c&&e.mode&1)for(I=e,c=e.child;c!==null;){for(h=I=c;I!==null;){switch(d=I,g=d.child,d.tag){case 0:case 11:case 14:case 15:Dr(4,d,d.return);break;case 1:zn(d,d.return);var y=d.stateNode;if(typeof y.componentWillUnmount=="function"){r=d,n=d.return;try{t=r,y.props=t.memoizedProps,y.state=t.memoizedState,y.componentWillUnmount()}catch(w){Z(r,n,w)}}break;case 5:zn(d,d.return);break;case 22:if(d.memoizedState!==null){Zu(h);continue}}g!==null?(g.return=d,I=g):Zu(h)}c=c.sibling}e:for(c=null,h=e;;){if(h.tag===5){if(c===null){c=h;try{i=h.stateNode,u?(s=i.style,typeof s.setProperty=="function"?s.setProperty("display","none","important"):s.display="none"):(l=h.stateNode,a=h.memoizedProps.style,o=a!=null&&a.hasOwnProperty("display")?a.display:null,l.style.display=hd("display",o))}catch(w){Z(e,e.return,w)}}}else if(h.tag===6){if(c===null)try{h.stateNode.nodeValue=u?"":h.memoizedProps}catch(w){Z(e,e.return,w)}}else if((h.tag!==22&&h.tag!==23||h.memoizedState===null||h===e)&&h.child!==null){h.child.return=h,h=h.child;continue}if(h===e)break e;for(;h.sibling===null;){if(h.return===null||h.return===e)break e;c===h&&(c=null),h=h.return}c===h&&(c=null),h.sibling.return=h.return,h=h.sibling}}break;case 19:tt(t,e),at(e),r&4&&Yu(e);break;case 21:break;default:tt(t,e),at(e)}}function at(e){var t=e.flags;if(t&2){try{e:{for(var n=e.return;n!==null;){if(Hf(n)){var r=n;break e}n=n.return}throw Error(b(160))}switch(r.tag){case 5:var i=r.stateNode;r.flags&32&&(Vr(i,""),r.flags&=-33);var s=Ku(e);Ll(e,s,i);break;case 3:case 4:var o=r.stateNode.containerInfo,l=Ku(e);bl(e,l,o);break;default:throw Error(b(161))}}catch(a){Z(e,e.return,a)}e.flags&=-3}t&4096&&(e.flags&=-4097)}function nv(e,t,n){I=e,Vf(e)}function Vf(e,t,n){for(var r=(e.mode&1)!==0;I!==null;){var i=I,s=i.child;if(i.tag===22&&r){var o=i.memoizedState!==null||Mi;if(!o){var l=i.alternate,a=l!==null&&l.memoizedState!==null||we;l=Mi;var u=we;if(Mi=o,(we=a)&&!u)for(I=i;I!==null;)o=I,a=o.child,o.tag===22&&o.memoizedState!==null?ec(i):a!==null?(a.return=o,I=a):ec(i);for(;s!==null;)I=s,Vf(s),s=s.sibling;I=i,Mi=l,we=u}Ju(e)}else i.subtreeFlags&8772&&s!==null?(s.return=i,I=s):Ju(e)}}function Ju(e){for(;I!==null;){var t=I;if(t.flags&8772){var n=t.alternate;try{if(t.flags&8772)switch(t.tag){case 0:case 11:case 15:we||Ws(5,t);break;case 1:var r=t.stateNode;if(t.flags&4&&!we)if(n===null)r.componentDidMount();else{var i=t.elementType===t.type?n.memoizedProps:nt(t.type,n.memoizedProps);r.componentDidUpdate(i,n.memoizedState,r.__reactInternalSnapshotBeforeUpdate)}var s=t.updateQueue;s!==null&&Ru(t,s,r);break;case 3:var o=t.updateQueue;if(o!==null){if(n=null,t.child!==null)switch(t.child.tag){case 5:n=t.child.stateNode;break;case 1:n=t.child.stateNode}Ru(t,o,n)}break;case 5:var l=t.stateNode;if(n===null&&t.flags&4){n=l;var a=t.memoizedProps;switch(t.type){case"button":case"input":case"select":case"textarea":a.autoFocus&&n.focus();break;case"img":a.src&&(n.src=a.src)}}break;case 6:break;case 4:break;case 12:break;case 13:if(t.memoizedState===null){var u=t.alternate;if(u!==null){var c=u.memoizedState;if(c!==null){var h=c.dehydrated;h!==null&&Qr(h)}}}break;case 19:case 17:case 21:case 22:case 23:case 25:break;default:throw Error(b(163))}we||t.flags&512&&Cl(t)}catch(d){Z(t,t.return,d)}}if(t===e){I=null;break}if(n=t.sibling,n!==null){n.return=t.return,I=n;break}I=t.return}}function Zu(e){for(;I!==null;){var t=I;if(t===e){I=null;break}var n=t.sibling;if(n!==null){n.return=t.return,I=n;break}I=t.return}}function ec(e){for(;I!==null;){var t=I;try{switch(t.tag){case 0:case 11:case 15:var n=t.return;try{Ws(4,t)}catch(a){Z(t,n,a)}break;case 1:var r=t.stateNode;if(typeof r.componentDidMount=="function"){var i=t.return;try{r.componentDidMount()}catch(a){Z(t,i,a)}}var s=t.return;try{Cl(t)}catch(a){Z(t,s,a)}break;case 5:var o=t.return;try{Cl(t)}catch(a){Z(t,o,a)}}}catch(a){Z(t,t.return,a)}if(t===e){I=null;break}var l=t.sibling;if(l!==null){l.return=t.return,I=l;break}I=t.return}}var rv=Math.ceil,Ts=Mt.ReactCurrentDispatcher,La=Mt.ReactCurrentOwner,Ye=Mt.ReactCurrentBatchConfig,D=0,de=null,ie=null,pe=0,ze=0,Dn=en(0),le=0,si=null,pn=0,qs=0,Aa=0,Fr=null,Me=null,Ma=0,tr=1/0,St=null,ks=!1,Al=null,Xt=null,Ii=!1,Ft=null,Ns=0,Hr=0,Ml=null,Qi=-1,Gi=0;function ke(){return D&6?ee():Qi!==-1?Qi:Qi=ee()}function Qt(e){return e.mode&1?D&2&&pe!==0?pe&-pe:Fg.transition!==null?(Gi===0&&(Gi=Nd()),Gi):(e=H,e!==0||(e=window.event,e=e===void 0?16:jd(e.type)),e):1}function ot(e,t,n,r){if(50<Hr)throw Hr=0,Ml=null,Error(b(185));ai(e,n,r),(!(D&2)||e!==de)&&(e===de&&(!(D&2)&&(qs|=n),le===4&&zt(e,pe)),Oe(e,r),n===1&&D===0&&!(t.mode&1)&&(tr=ee()+500,Us&&tn()))}function Oe(e,t){var n=e.callbackNode;Fm(e,t);var r=us(e,e===de?pe:0);if(r===0)n!==null&&uu(n),e.callbackNode=null,e.callbackPriority=0;else if(t=r&-r,e.callbackPriority!==t){if(n!=null&&uu(n),t===1)e.tag===0?Dg(tc.bind(null,e)):Jd(tc.bind(null,e)),Rg(function(){!(D&6)&&tn()}),n=null;else{switch(Cd(r)){case 1:n=ra;break;case 4:n=Td;break;case 16:n=as;break;case 536870912:n=kd;break;default:n=as}n=Jf(n,Wf.bind(null,e))}e.callbackPriority=t,e.callbackNode=n}}function Wf(e,t){if(Qi=-1,Gi=0,D&6)throw Error(b(327));var n=e.callbackNode;if(Xn()&&e.callbackNode!==n)return null;var r=us(e,e===de?pe:0);if(r===0)return null;if(r&30||r&e.expiredLanes||t)t=Cs(e,r);else{t=r;var i=D;D|=2;var s=Xf();(de!==e||pe!==t)&&(St=null,tr=ee()+500,an(e,t));do try{ov();break}catch(l){qf(e,l)}while(!0);ga(),Ts.current=s,D=i,ie!==null?t=0:(de=null,pe=0,t=le)}if(t!==0){if(t===2&&(i=il(e),i!==0&&(r=i,t=Il(e,i))),t===1)throw n=si,an(e,0),zt(e,r),Oe(e,ee()),n;if(t===6)zt(e,r);else{if(i=e.current.alternate,!(r&30)&&!iv(i)&&(t=Cs(e,r),t===2&&(s=il(e),s!==0&&(r=s,t=Il(e,s))),t===1))throw n=si,an(e,0),zt(e,r),Oe(e,ee()),n;switch(e.finishedWork=i,e.finishedLanes=r,t){case 0:case 1:throw Error(b(345));case 2:rn(e,Me,St);break;case 3:if(zt(e,r),(r&130023424)===r&&(t=Ma+500-ee(),10<t)){if(us(e,0)!==0)break;if(i=e.suspendedLanes,(i&r)!==r){ke(),e.pingedLanes|=e.suspendedLanes&i;break}e.timeoutHandle=fl(rn.bind(null,e,Me,St),t);break}rn(e,Me,St);break;case 4:if(zt(e,r),(r&4194240)===r)break;for(t=e.eventTimes,i=-1;0<r;){var o=31-st(r);s=1<<o,o=t[o],o>i&&(i=o),r&=~s}if(r=i,r=ee()-r,r=(120>r?120:480>r?480:1080>r?1080:1920>r?1920:3e3>r?3e3:4320>r?4320:1960*rv(r/1960))-r,10<r){e.timeoutHandle=fl(rn.bind(null,e,Me,St),r);break}rn(e,Me,St);break;case 5:rn(e,Me,St);break;default:throw Error(b(329))}}}return Oe(e,ee()),e.callbackNode===n?Wf.bind(null,e):null}function Il(e,t){var n=Fr;return e.current.memoizedState.isDehydrated&&(an(e,t).flags|=256),e=Cs(e,t),e!==2&&(t=Me,Me=n,t!==null&&jl(t)),e}function jl(e){Me===null?Me=e:Me.push.apply(Me,e)}function iv(e){for(var t=e;;){if(t.flags&16384){var n=t.updateQueue;if(n!==null&&(n=n.stores,n!==null))for(var r=0;r<n.length;r++){var i=n[r],s=i.getSnapshot;i=i.value;try{if(!lt(s(),i))return!1}catch{return!1}}}if(n=t.child,t.subtreeFlags&16384&&n!==null)n.return=t,t=n;else{if(t===e)break;for(;t.sibling===null;){if(t.return===null||t.return===e)return!0;t=t.return}t.sibling.return=t.return,t=t.sibling}}return!0}function zt(e,t){for(t&=~Aa,t&=~qs,e.suspendedLanes|=t,e.pingedLanes&=~t,e=e.expirationTimes;0<t;){var n=31-st(t),r=1<<n;e[n]=-1,t&=~r}}function tc(e){if(D&6)throw Error(b(327));Xn();var t=us(e,0);if(!(t&1))return Oe(e,ee()),null;var n=Cs(e,t);if(e.tag!==0&&n===2){var r=il(e);r!==0&&(t=r,n=Il(e,r))}if(n===1)throw n=si,an(e,0),zt(e,t),Oe(e,ee()),n;if(n===6)throw Error(b(345));return e.finishedWork=e.current.alternate,e.finishedLanes=t,rn(e,Me,St),Oe(e,ee()),null}function Ia(e,t){var n=D;D|=1;try{return e(t)}finally{D=n,D===0&&(tr=ee()+500,Us&&tn())}}function mn(e){Ft!==null&&Ft.tag===0&&!(D&6)&&Xn();var t=D;D|=1;var n=Ye.transition,r=H;try{if(Ye.transition=null,H=1,e)return e()}finally{H=r,Ye.transition=n,D=t,!(D&6)&&tn()}}function ja(){ze=Dn.current,W(Dn)}function an(e,t){e.finishedWork=null,e.finishedLanes=0;var n=e.timeoutHandle;if(n!==-1&&(e.timeoutHandle=-1,Pg(n)),ie!==null)for(n=ie.return;n!==null;){var r=n;switch(ha(r),r.tag){case 1:r=r.type.childContextTypes,r!=null&&ps();break;case 3:Zn(),W(Re),W(_e),Sa();break;case 5:_a(r);break;case 4:Zn();break;case 13:W(G);break;case 19:W(G);break;case 10:va(r.type._context);break;case 22:case 23:ja()}n=n.return}if(de=e,ie=e=Gt(e.current,null),pe=ze=t,le=0,si=null,Aa=qs=pn=0,Me=Fr=null,on!==null){for(t=0;t<on.length;t++)if(n=on[t],r=n.interleaved,r!==null){n.interleaved=null;var i=r.next,s=n.pending;if(s!==null){var o=s.next;s.next=i,r.next=o}n.pending=r}on=null}return e}function qf(e,t){do{var n=ie;try{if(ga(),Wi.current=Es,Ss){for(var r=K.memoizedState;r!==null;){var i=r.queue;i!==null&&(i.pending=null),r=r.next}Ss=!1}if(hn=0,ce=oe=K=null,zr=!1,ni=0,La.current=null,n===null||n.return===null){le=1,si=t,ie=null;break}e:{var s=e,o=n.return,l=n,a=t;if(t=pe,l.flags|=32768,a!==null&&typeof a=="object"&&typeof a.then=="function"){var u=a,c=l,h=c.tag;if(!(c.mode&1)&&(h===0||h===11||h===15)){var d=c.alternate;d?(c.updateQueue=d.updateQueue,c.memoizedState=d.memoizedState,c.lanes=d.lanes):(c.updateQueue=null,c.memoizedState=null)}var g=Uu(o);if(g!==null){g.flags&=-257,Bu(g,o,l,s,t),g.mode&1&&Hu(s,u,t),t=g,a=u;var y=t.updateQueue;if(y===null){var w=new Set;w.add(a),t.updateQueue=w}else y.add(a);break e}else{if(!(t&1)){Hu(s,u,t),Pa();break e}a=Error(b(426))}}else if(Q&&l.mode&1){var x=Uu(o);if(x!==null){!(x.flags&65536)&&(x.flags|=256),Bu(x,o,l,s,t),pa(er(a,l));break e}}s=a=er(a,l),le!==4&&(le=2),Fr===null?Fr=[s]:Fr.push(s),s=o;do{switch(s.tag){case 3:s.flags|=65536,t&=-t,s.lanes|=t;var p=Lf(s,a,t);Pu(s,p);break e;case 1:l=a;var m=s.type,v=s.stateNode;if(!(s.flags&128)&&(typeof m.getDerivedStateFromError=="function"||v!==null&&typeof v.componentDidCatch=="function"&&(Xt===null||!Xt.has(v)))){s.flags|=65536,t&=-t,s.lanes|=t;var E=Af(s,l,t);Pu(s,E);break e}}s=s.return}while(s!==null)}Gf(n)}catch(C){t=C,ie===n&&n!==null&&(ie=n=n.return);continue}break}while(!0)}function Xf(){var e=Ts.current;return Ts.current=Es,e===null?Es:e}function Pa(){(le===0||le===3||le===2)&&(le=4),de===null||!(pn&268435455)&&!(qs&268435455)||zt(de,pe)}function Cs(e,t){var n=D;D|=2;var r=Xf();(de!==e||pe!==t)&&(St=null,an(e,t));do try{sv();break}catch(i){qf(e,i)}while(!0);if(ga(),D=n,Ts.current=r,ie!==null)throw Error(b(261));return de=null,pe=0,le}function sv(){for(;ie!==null;)Qf(ie)}function ov(){for(;ie!==null&&!Mm();)Qf(ie)}function Qf(e){var t=Yf(e.alternate,e,ze);e.memoizedProps=e.pendingProps,t===null?Gf(e):ie=t,La.current=null}function Gf(e){var t=e;do{var n=t.alternate;if(e=t.return,t.flags&32768){if(n=Zg(n,t),n!==null){n.flags&=32767,ie=n;return}if(e!==null)e.flags|=32768,e.subtreeFlags=0,e.deletions=null;else{le=6,ie=null;return}}else if(n=Jg(n,t,ze),n!==null){ie=n;return}if(t=t.sibling,t!==null){ie=t;return}ie=t=e}while(t!==null);le===0&&(le=5)}function rn(e,t,n){var r=H,i=Ye.transition;try{Ye.transition=null,H=1,lv(e,t,n,r)}finally{Ye.transition=i,H=r}return null}function lv(e,t,n,r){do Xn();while(Ft!==null);if(D&6)throw Error(b(327));n=e.finishedWork;var i=e.finishedLanes;if(n===null)return null;if(e.finishedWork=null,e.finishedLanes=0,n===e.current)throw Error(b(177));e.callbackNode=null,e.callbackPriority=0;var s=n.lanes|n.childLanes;if(Hm(e,s),e===de&&(ie=de=null,pe=0),!(n.subtreeFlags&2064)&&!(n.flags&2064)||Ii||(Ii=!0,Jf(as,function(){return Xn(),null})),s=(n.flags&15990)!==0,n.subtreeFlags&15990||s){s=Ye.transition,Ye.transition=null;var o=H;H=1;var l=D;D|=4,La.current=null,tv(e,n),Bf(n,e),Cg(cl),cs=!!ul,cl=ul=null,e.current=n,nv(n),Im(),D=l,H=o,Ye.transition=s}else e.current=n;if(Ii&&(Ii=!1,Ft=e,Ns=i),s=e.pendingLanes,s===0&&(Xt=null),Rm(n.stateNode),Oe(e,ee()),t!==null)for(r=e.onRecoverableError,n=0;n<t.length;n++)i=t[n],r(i.value,{componentStack:i.stack,digest:i.digest});if(ks)throw ks=!1,e=Al,Al=null,e;return Ns&1&&e.tag!==0&&Xn(),s=e.pendingLanes,s&1?e===Ml?Hr++:(Hr=0,Ml=e):Hr=0,tn(),null}function Xn(){if(Ft!==null){var e=Cd(Ns),t=Ye.transition,n=H;try{if(Ye.transition=null,H=16>e?16:e,Ft===null)var r=!1;else{if(e=Ft,Ft=null,Ns=0,D&6)throw Error(b(331));var i=D;for(D|=4,I=e.current;I!==null;){var s=I,o=s.child;if(I.flags&16){var l=s.deletions;if(l!==null){for(var a=0;a<l.length;a++){var u=l[a];for(I=u;I!==null;){var c=I;switch(c.tag){case 0:case 11:case 15:Dr(8,c,s)}var h=c.child;if(h!==null)h.return=c,I=h;else for(;I!==null;){c=I;var d=c.sibling,g=c.return;if(Ff(c),c===u){I=null;break}if(d!==null){d.return=g,I=d;break}I=g}}}var y=s.alternate;if(y!==null){var w=y.child;if(w!==null){y.child=null;do{var x=w.sibling;w.sibling=null,w=x}while(w!==null)}}I=s}}if(s.subtreeFlags&2064&&o!==null)o.return=s,I=o;else e:for(;I!==null;){if(s=I,s.flags&2048)switch(s.tag){case 0:case 11:case 15:Dr(9,s,s.return)}var p=s.sibling;if(p!==null){p.return=s.return,I=p;break e}I=s.return}}var m=e.current;for(I=m;I!==null;){o=I;var v=o.child;if(o.subtreeFlags&2064&&v!==null)v.return=o,I=v;else e:for(o=m;I!==null;){if(l=I,l.flags&2048)try{switch(l.tag){case 0:case 11:case 15:Ws(9,l)}}catch(C){Z(l,l.return,C)}if(l===o){I=null;break e}var E=l.sibling;if(E!==null){E.return=l.return,I=E;break e}I=l.return}}if(D=i,tn(),mt&&typeof mt.onPostCommitFiberRoot=="function")try{mt.onPostCommitFiberRoot(Os,e)}catch{}r=!0}return r}finally{H=n,Ye.transition=t}}return!1}function nc(e,t,n){t=er(n,t),t=Lf(e,t,1),e=qt(e,t,1),t=ke(),e!==null&&(ai(e,1,t),Oe(e,t))}function Z(e,t,n){if(e.tag===3)nc(e,e,n);else for(;t!==null;){if(t.tag===3){nc(t,e,n);break}else if(t.tag===1){var r=t.stateNode;if(typeof t.type.getDerivedStateFromError=="function"||typeof r.componentDidCatch=="function"&&(Xt===null||!Xt.has(r))){e=er(n,e),e=Af(t,e,1),t=qt(t,e,1),e=ke(),t!==null&&(ai(t,1,e),Oe(t,e));break}}t=t.return}}function av(e,t,n){var r=e.pingCache;r!==null&&r.delete(t),t=ke(),e.pingedLanes|=e.suspendedLanes&n,de===e&&(pe&n)===n&&(le===4||le===3&&(pe&130023424)===pe&&500>ee()-Ma?an(e,0):Aa|=n),Oe(e,t)}function Kf(e,t){t===0&&(e.mode&1?(t=Si,Si<<=1,!(Si&130023424)&&(Si=4194304)):t=1);var n=ke();e=Lt(e,t),e!==null&&(ai(e,t,n),Oe(e,n))}function uv(e){var t=e.memoizedState,n=0;t!==null&&(n=t.retryLane),Kf(e,n)}function cv(e,t){var n=0;switch(e.tag){case 13:var r=e.stateNode,i=e.memoizedState;i!==null&&(n=i.retryLane);break;case 19:r=e.stateNode;break;default:throw Error(b(314))}r!==null&&r.delete(t),Kf(e,n)}var Yf;Yf=function(e,t,n){if(e!==null)if(e.memoizedProps!==t.pendingProps||Re.current)Pe=!0;else{if(!(e.lanes&n)&&!(t.flags&128))return Pe=!1,Yg(e,t,n);Pe=!!(e.flags&131072)}else Pe=!1,Q&&t.flags&1048576&&Zd(t,vs,t.index);switch(t.lanes=0,t.tag){case 2:var r=t.type;Xi(e,t),e=t.pendingProps;var i=Kn(t,_e.current);qn(t,n),i=Ta(null,t,r,e,i,n);var s=ka();return t.flags|=1,typeof i=="object"&&i!==null&&typeof i.render=="function"&&i.$$typeof===void 0?(t.tag=1,t.memoizedState=null,t.updateQueue=null,$e(r)?(s=!0,ms(t)):s=!1,t.memoizedState=i.state!==null&&i.state!==void 0?i.state:null,wa(t),i.updater=Bs,t.stateNode=i,i._reactInternals=t,wl(t,r,e,n),t=Sl(null,t,r,!0,s,n)):(t.tag=0,Q&&s&&fa(t),Se(null,t,i,n),t=t.child),t;case 16:r=t.elementType;e:{switch(Xi(e,t),e=t.pendingProps,i=r._init,r=i(r._payload),t.type=r,i=t.tag=fv(r),e=nt(r,e),i){case 0:t=_l(null,t,r,e,n);break e;case 1:t=qu(null,t,r,e,n);break e;case 11:t=Vu(null,t,r,e,n);break e;case 14:t=Wu(null,t,r,nt(r.type,e),n);break e}throw Error(b(306,r,""))}return t;case 0:return r=t.type,i=t.pendingProps,i=t.elementType===r?i:nt(r,i),_l(e,t,r,i,n);case 1:return r=t.type,i=t.pendingProps,i=t.elementType===r?i:nt(r,i),qu(e,t,r,i,n);case 3:e:{if(Pf(t),e===null)throw Error(b(387));r=t.pendingProps,s=t.memoizedState,i=s.element,rf(e,t),xs(t,r,null,n);var o=t.memoizedState;if(r=o.element,s.isDehydrated)if(s={element:r,isDehydrated:!1,cache:o.cache,pendingSuspenseBoundaries:o.pendingSuspenseBoundaries,transitions:o.transitions},t.updateQueue.baseState=s,t.memoizedState=s,t.flags&256){i=er(Error(b(423)),t),t=Xu(e,t,r,n,i);break e}else if(r!==i){i=er(Error(b(424)),t),t=Xu(e,t,r,n,i);break e}else for(De=Wt(t.stateNode.containerInfo.firstChild),Fe=t,Q=!0,it=null,n=af(t,null,r,n),t.child=n;n;)n.flags=n.flags&-3|4096,n=n.sibling;else{if(Yn(),r===i){t=At(e,t,n);break e}Se(e,t,r,n)}t=t.child}return t;case 5:return uf(t),e===null&&gl(t),r=t.type,i=t.pendingProps,s=e!==null?e.memoizedProps:null,o=i.children,dl(r,i)?o=null:s!==null&&dl(r,s)&&(t.flags|=32),jf(e,t),Se(e,t,o,n),t.child;case 6:return e===null&&gl(t),null;case 13:return Rf(e,t,n);case 4:return xa(t,t.stateNode.containerInfo),r=t.pendingProps,e===null?t.child=Jn(t,null,r,n):Se(e,t,r,n),t.child;case 11:return r=t.type,i=t.pendingProps,i=t.elementType===r?i:nt(r,i),Vu(e,t,r,i,n);case 7:return Se(e,t,t.pendingProps,n),t.child;case 8:return Se(e,t,t.pendingProps.children,n),t.child;case 12:return Se(e,t,t.pendingProps.children,n),t.child;case 10:e:{if(r=t.type._context,i=t.pendingProps,s=t.memoizedProps,o=i.value,U(ys,r._currentValue),r._currentValue=o,s!==null)if(lt(s.value,o)){if(s.children===i.children&&!Re.current){t=At(e,t,n);break e}}else for(s=t.child,s!==null&&(s.return=t);s!==null;){var l=s.dependencies;if(l!==null){o=s.child;for(var a=l.firstContext;a!==null;){if(a.context===r){if(s.tag===1){a=Nt(-1,n&-n),a.tag=2;var u=s.updateQueue;if(u!==null){u=u.shared;var c=u.pending;c===null?a.next=a:(a.next=c.next,c.next=a),u.pending=a}}s.lanes|=n,a=s.alternate,a!==null&&(a.lanes|=n),vl(s.return,n,t),l.lanes|=n;break}a=a.next}}else if(s.tag===10)o=s.type===t.type?null:s.child;else if(s.tag===18){if(o=s.return,o===null)throw Error(b(341));o.lanes|=n,l=o.alternate,l!==null&&(l.lanes|=n),vl(o,n,t),o=s.sibling}else o=s.child;if(o!==null)o.return=s;else for(o=s;o!==null;){if(o===t){o=null;break}if(s=o.sibling,s!==null){s.return=o.return,o=s;break}o=o.return}s=o}Se(e,t,i.children,n),t=t.child}return t;case 9:return i=t.type,r=t.pendingProps.children,qn(t,n),i=Je(i),r=r(i),t.flags|=1,Se(e,t,r,n),t.child;case 14:return r=t.type,i=nt(r,t.pendingProps),i=nt(r.type,i),Wu(e,t,r,i,n);case 15:return Mf(e,t,t.type,t.pendingProps,n);case 17:return r=t.type,i=t.pendingProps,i=t.elementType===r?i:nt(r,i),Xi(e,t),t.tag=1,$e(r)?(e=!0,ms(t)):e=!1,qn(t,n),of(t,r,i),wl(t,r,i,n),Sl(null,t,r,!0,e,n);case 19:return $f(e,t,n);case 22:return If(e,t,n)}throw Error(b(156,t.tag))};function Jf(e,t){return Ed(e,t)}function dv(e,t,n,r){this.tag=e,this.key=n,this.sibling=this.child=this.return=this.stateNode=this.type=this.elementType=null,this.index=0,this.ref=null,this.pendingProps=t,this.dependencies=this.memoizedState=this.updateQueue=this.memoizedProps=null,this.mode=r,this.subtreeFlags=this.flags=0,this.deletions=null,this.childLanes=this.lanes=0,this.alternate=null}function Qe(e,t,n,r){return new dv(e,t,n,r)}function Ra(e){return e=e.prototype,!(!e||!e.isReactComponent)}function fv(e){if(typeof e=="function")return Ra(e)?1:0;if(e!=null){if(e=e.$$typeof,e===ea)return 11;if(e===ta)return 14}return 2}function Gt(e,t){var n=e.alternate;return n===null?(n=Qe(e.tag,t,e.key,e.mode),n.elementType=e.elementType,n.type=e.type,n.stateNode=e.stateNode,n.alternate=e,e.alternate=n):(n.pendingProps=t,n.type=e.type,n.flags=0,n.subtreeFlags=0,n.deletions=null),n.flags=e.flags&14680064,n.childLanes=e.childLanes,n.lanes=e.lanes,n.child=e.child,n.memoizedProps=e.memoizedProps,n.memoizedState=e.memoizedState,n.updateQueue=e.updateQueue,t=e.dependencies,n.dependencies=t===null?null:{lanes:t.lanes,firstContext:t.firstContext},n.sibling=e.sibling,n.index=e.index,n.ref=e.ref,n}function Ki(e,t,n,r,i,s){var o=2;if(r=e,typeof e=="function")Ra(e)&&(o=1);else if(typeof e=="string")o=5;else e:switch(e){case Ln:return un(n.children,i,s,t);case Zl:o=8,i|=8;break;case Bo:return e=Qe(12,n,t,i|2),e.elementType=Bo,e.lanes=s,e;case Vo:return e=Qe(13,n,t,i),e.elementType=Vo,e.lanes=s,e;case Wo:return e=Qe(19,n,t,i),e.elementType=Wo,e.lanes=s,e;case od:return Xs(n,i,s,t);default:if(typeof e=="object"&&e!==null)switch(e.$$typeof){case id:o=10;break e;case sd:o=9;break e;case ea:o=11;break e;case ta:o=14;break e;case jt:o=16,r=null;break e}throw Error(b(130,e==null?e:typeof e,""))}return t=Qe(o,n,t,i),t.elementType=e,t.type=r,t.lanes=s,t}function un(e,t,n,r){return e=Qe(7,e,r,t),e.lanes=n,e}function Xs(e,t,n,r){return e=Qe(22,e,r,t),e.elementType=od,e.lanes=n,e.stateNode={isHidden:!1},e}function Mo(e,t,n){return e=Qe(6,e,null,t),e.lanes=n,e}function Io(e,t,n){return t=Qe(4,e.children!==null?e.children:[],e.key,t),t.lanes=n,t.stateNode={containerInfo:e.containerInfo,pendingChildren:null,implementation:e.implementation},t}function hv(e,t,n,r,i){this.tag=t,this.containerInfo=e,this.finishedWork=this.pingCache=this.current=this.pendingChildren=null,this.timeoutHandle=-1,this.callbackNode=this.pendingContext=this.context=null,this.callbackPriority=0,this.eventTimes=fo(0),this.expirationTimes=fo(-1),this.entangledLanes=this.finishedLanes=this.mutableReadLanes=this.expiredLanes=this.pingedLanes=this.suspendedLanes=this.pendingLanes=0,this.entanglements=fo(0),this.identifierPrefix=r,this.onRecoverableError=i,this.mutableSourceEagerHydrationData=null}function $a(e,t,n,r,i,s,o,l,a){return e=new hv(e,t,n,l,a),t===1?(t=1,s===!0&&(t|=8)):t=0,s=Qe(3,null,null,t),e.current=s,s.stateNode=e,s.memoizedState={element:r,isDehydrated:n,cache:null,transitions:null,pendingSuspenseBoundaries:null},wa(s),e}function pv(e,t,n){var r=3<arguments.length&&arguments[3]!==void 0?arguments[3]:null;return{$$typeof:bn,key:r==null?null:""+r,children:e,containerInfo:t,implementation:n}}function Zf(e){if(!e)return Jt;e=e._reactInternals;e:{if(wn(e)!==e||e.tag!==1)throw Error(b(170));var t=e;do{switch(t.tag){case 3:t=t.stateNode.context;break e;case 1:if($e(t.type)){t=t.stateNode.__reactInternalMemoizedMergedChildContext;break e}}t=t.return}while(t!==null);throw Error(b(171))}if(e.tag===1){var n=e.type;if($e(n))return Yd(e,n,t)}return t}function eh(e,t,n,r,i,s,o,l,a){return e=$a(n,r,!0,e,i,s,o,l,a),e.context=Zf(null),n=e.current,r=ke(),i=Qt(n),s=Nt(r,i),s.callback=t??null,qt(n,s,i),e.current.lanes=i,ai(e,i,r),Oe(e,r),e}function Qs(e,t,n,r){var i=t.current,s=ke(),o=Qt(i);return n=Zf(n),t.context===null?t.context=n:t.pendingContext=n,t=Nt(s,o),t.payload={element:e},r=r===void 0?null:r,r!==null&&(t.callback=r),e=qt(i,t,o),e!==null&&(ot(e,i,o,s),Vi(e,i,o)),o}function bs(e){if(e=e.current,!e.child)return null;switch(e.child.tag){case 5:return e.child.stateNode;default:return e.child.stateNode}}function rc(e,t){if(e=e.memoizedState,e!==null&&e.dehydrated!==null){var n=e.retryLane;e.retryLane=n!==0&&n<t?n:t}}function Oa(e,t){rc(e,t),(e=e.alternate)&&rc(e,t)}function mv(){return null}var th=typeof reportError=="function"?reportError:function(e){console.error(e)};function za(e){this._internalRoot=e}Gs.prototype.render=za.prototype.render=function(e){var t=this._internalRoot;if(t===null)throw Error(b(409));Qs(e,t,null,null)};Gs.prototype.unmount=za.prototype.unmount=function(){var e=this._internalRoot;if(e!==null){this._internalRoot=null;var t=e.containerInfo;mn(function(){Qs(null,e,null,null)}),t[bt]=null}};function Gs(e){this._internalRoot=e}Gs.prototype.unstable_scheduleHydration=function(e){if(e){var t=Ad();e={blockedOn:null,target:e,priority:t};for(var n=0;n<Ot.length&&t!==0&&t<Ot[n].priority;n++);Ot.splice(n,0,e),n===0&&Id(e)}};function Da(e){return!(!e||e.nodeType!==1&&e.nodeType!==9&&e.nodeType!==11)}function Ks(e){return!(!e||e.nodeType!==1&&e.nodeType!==9&&e.nodeType!==11&&(e.nodeType!==8||e.nodeValue!==" react-mount-point-unstable "))}function ic(){}function gv(e,t,n,r,i){if(i){if(typeof r=="function"){var s=r;r=function(){var u=bs(o);s.call(u)}}var o=eh(t,r,e,0,null,!1,!1,"",ic);return e._reactRootContainer=o,e[bt]=o.current,Yr(e.nodeType===8?e.parentNode:e),mn(),o}for(;i=e.lastChild;)e.removeChild(i);if(typeof r=="function"){var l=r;r=function(){var u=bs(a);l.call(u)}}var a=$a(e,0,!1,null,null,!1,!1,"",ic);return e._reactRootContainer=a,e[bt]=a.current,Yr(e.nodeType===8?e.parentNode:e),mn(function(){Qs(t,a,n,r)}),a}function Ys(e,t,n,r,i){var s=n._reactRootContainer;if(s){var o=s;if(typeof i=="function"){var l=i;i=function(){var a=bs(o);l.call(a)}}Qs(t,o,e,i)}else o=gv(n,t,e,i,r);return bs(o)}bd=function(e){switch(e.tag){case 3:var t=e.stateNode;if(t.current.memoizedState.isDehydrated){var n=br(t.pendingLanes);n!==0&&(ia(t,n|1),Oe(t,ee()),!(D&6)&&(tr=ee()+500,tn()))}break;case 13:mn(function(){var r=Lt(e,1);if(r!==null){var i=ke();ot(r,e,1,i)}}),Oa(e,1)}};sa=function(e){if(e.tag===13){var t=Lt(e,134217728);if(t!==null){var n=ke();ot(t,e,134217728,n)}Oa(e,134217728)}};Ld=function(e){if(e.tag===13){var t=Qt(e),n=Lt(e,t);if(n!==null){var r=ke();ot(n,e,t,r)}Oa(e,t)}};Ad=function(){return H};Md=function(e,t){var n=H;try{return H=e,t()}finally{H=n}};tl=function(e,t,n){switch(t){case"input":if(Qo(e,n),t=n.name,n.type==="radio"&&t!=null){for(n=e;n.parentNode;)n=n.parentNode;for(n=n.querySelectorAll("input[name="+JSON.stringify(""+t)+'][type="radio"]'),t=0;t<n.length;t++){var r=n[t];if(r!==e&&r.form===e.form){var i=Hs(r);if(!i)throw Error(b(90));ad(r),Qo(r,i)}}}break;case"textarea":cd(e,n);break;case"select":t=n.value,t!=null&&Un(e,!!n.multiple,t,!1)}};vd=Ia;yd=mn;var vv={usingClientEntryPoint:!1,Events:[ci,jn,Hs,md,gd,Ia]},wr={findFiberByHostInstance:sn,bundleType:0,version:"18.2.0",rendererPackageName:"react-dom"},yv={bundleType:wr.bundleType,version:wr.version,rendererPackageName:wr.rendererPackageName,rendererConfig:wr.rendererConfig,overrideHookState:null,overrideHookStateDeletePath:null,overrideHookStateRenamePath:null,overrideProps:null,overridePropsDeletePath:null,overridePropsRenamePath:null,setErrorHandler:null,setSuspenseHandler:null,scheduleUpdate:null,currentDispatcherRef:Mt.ReactCurrentDispatcher,findHostInstanceByFiber:function(e){return e=_d(e),e===null?null:e.stateNode},findFiberByHostInstance:wr.findFiberByHostInstance||mv,findHostInstancesForRefresh:null,scheduleRefresh:null,scheduleRoot:null,setRefreshHandler:null,getCurrentFiber:null,reconcilerVersion:"18.2.0-next-9e3b772b8-20220608"};if(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<"u"){var ji=__REACT_DEVTOOLS_GLOBAL_HOOK__;if(!ji.isDisabled&&ji.supportsFiber)try{Os=ji.inject(yv),mt=ji}catch{}}Be.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=vv;Be.createPortal=function(e,t){var n=2<arguments.length&&arguments[2]!==void 0?arguments[2]:null;if(!Da(t))throw Error(b(200));return pv(e,t,null,n)};Be.createRoot=function(e,t){if(!Da(e))throw Error(b(299));var n=!1,r="",i=th;return t!=null&&(t.unstable_strictMode===!0&&(n=!0),t.identifierPrefix!==void 0&&(r=t.identifierPrefix),t.onRecoverableError!==void 0&&(i=t.onRecoverableError)),t=$a(e,1,!1,null,null,n,!1,r,i),e[bt]=t.current,Yr(e.nodeType===8?e.parentNode:e),new za(t)};Be.findDOMNode=function(e){if(e==null)return null;if(e.nodeType===1)return e;var t=e._reactInternals;if(t===void 0)throw typeof e.render=="function"?Error(b(188)):(e=Object.keys(e).join(","),Error(b(268,e)));return e=_d(t),e=e===null?null:e.stateNode,e};Be.flushSync=function(e){return mn(e)};Be.hydrate=function(e,t,n){if(!Ks(t))throw Error(b(200));return Ys(null,e,t,!0,n)};Be.hydrateRoot=function(e,t,n){if(!Da(e))throw Error(b(405));var r=n!=null&&n.hydratedSources||null,i=!1,s="",o=th;if(n!=null&&(n.unstable_strictMode===!0&&(i=!0),n.identifierPrefix!==void 0&&(s=n.identifierPrefix),n.onRecoverableError!==void 0&&(o=n.onRecoverableError)),t=eh(t,null,e,1,n??null,i,!1,s,o),e[bt]=t.current,Yr(e),r)for(e=0;e<r.length;e++)n=r[e],i=n._getVersion,i=i(n._source),t.mutableSourceEagerHydrationData==null?t.mutableSourceEagerHydrationData=[n,i]:t.mutableSourceEagerHydrationData.push(n,i);return new Gs(t)};Be.render=function(e,t,n){if(!Ks(t))throw Error(b(200));return Ys(null,e,t,!1,n)};Be.unmountComponentAtNode=function(e){if(!Ks(e))throw Error(b(40));return e._reactRootContainer?(mn(function(){Ys(null,null,e,!1,function(){e._reactRootContainer=null,e[bt]=null})}),!0):!1};Be.unstable_batchedUpdates=Ia;Be.unstable_renderSubtreeIntoContainer=function(e,t,n,r){if(!Ks(n))throw Error(b(200));if(e==null||e._reactInternals===void 0)throw Error(b(38));return Ys(e,t,n,!1,r)};Be.version="18.2.0-next-9e3b772b8-20220608";function nh(){if(!(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__>"u"||typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE!="function"))try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(nh)}catch(e){console.error(e)}}nh(),Zc.exports=Be;var r1=Zc.exports;const Qn=({children:e,title:t="",icon:n,disabled:r=!1,toggled:i=!1,onClick:s=()=>{},style:o})=>{let l=`toolbar-button ${n}`;return i&&(l+=" toggled"),f.jsxs("button",{className:l,onMouseDown:sc,onClick:s,onDoubleClick:sc,title:t,disabled:!!r,style:o,children:[n&&f.jsx("span",{className:`codicon codicon-${n}`,style:e?{marginRight:5}:{}}),e]})},sc=e=>{e.stopPropagation(),e.preventDefault()},Ar=Symbol("context"),rh=Symbol("next"),ih=Symbol("prev"),oc=Symbol("events");class i1{constructor(t){B(this,"startTime");B(this,"endTime");B(this,"browserName");B(this,"channel");B(this,"platform");B(this,"wallTime");B(this,"title");B(this,"options");B(this,"pages");B(this,"actions");B(this,"events");B(this,"stdio");B(this,"errors");B(this,"errorDescriptors");B(this,"hasSource");B(this,"hasStepData");B(this,"sdkLanguage");B(this,"testIdAttributeName");B(this,"sources");B(this,"resources");t.forEach(r=>wv(r));const n=t.find(r=>r.origin==="library");this.browserName=(n==null?void 0:n.browserName)||"",this.sdkLanguage=n==null?void 0:n.sdkLanguage,this.channel=n==null?void 0:n.channel,this.testIdAttributeName=n==null?void 0:n.testIdAttributeName,this.platform=(n==null?void 0:n.platform)||"",this.title=(n==null?void 0:n.title)||"",this.options=(n==null?void 0:n.options)||{},this.actions=xv(t),this.pages=[].concat(...t.map(r=>r.pages)),this.wallTime=t.map(r=>r.wallTime).reduce((r,i)=>Math.min(r||Number.MAX_VALUE,i),Number.MAX_VALUE),this.startTime=t.map(r=>r.startTime).reduce((r,i)=>Math.min(r,i),Number.MAX_VALUE),this.endTime=t.map(r=>r.endTime).reduce((r,i)=>Math.max(r,i),Number.MIN_VALUE),this.events=[].concat(...t.map(r=>r.events)),this.stdio=[].concat(...t.map(r=>r.stdio)),this.errors=[].concat(...t.map(r=>r.errors)),this.hasSource=t.some(r=>r.hasSource),this.hasStepData=t.some(r=>r.origin==="testRunner"),this.resources=[...t.map(r=>r.resources)].flat(),this.events.sort((r,i)=>r.time-i.time),this.resources.sort((r,i)=>r._monotonicTime-i._monotonicTime),this.errorDescriptors=this.hasStepData?this._errorDescriptorsFromTestRunner():this._errorDescriptorsFromActions(),this.sources=Av(this.actions,this.errorDescriptors)}failedAction(){return this.actions.findLast(t=>t.error)}_errorDescriptorsFromActions(){var n;const t=[];for(const r of this.actions||[])(n=r.error)!=null&&n.message&&t.push({action:r,stack:r.stack,message:r.error.message});return t}_errorDescriptorsFromTestRunner(){const t=[];for(const n of this.errors||[])n.message&&t.push({stack:n.stack,message:n.message});return t}}function wv(e){for(const n of e.pages)n[Ar]=e;for(let n=0;n<e.actions.length;++n){const r=e.actions[n];r[Ar]=e}let t;for(let n=e.actions.length-1;n>=0;n--){const r=e.actions[n];r[rh]=t,r.apiName.includes("route.")||(t=r)}for(const n of e.events)n[Ar]=e;for(const n of e.resources)n[Ar]=e}function xv(e){const t=new Map;for(const i of e){const s=i.traceUrl;let o=t.get(s);o||(o=[],t.set(s,o)),o.push(i)}const n=[];let r=0;for(const[,i]of t){t.size>1&&_v(i,++r);const s=Sv(i);n.push(...s)}n.sort((i,s)=>s.parentId===i.callId?-1:i.parentId===s.callId?1:i.startTime-s.startTime);for(let i=1;i<n.length;++i)n[i][ih]=n[i-1];return n}function _v(e,t){for(const n of e)for(const r of n.actions)r.callId&&(r.callId=`${t}:${r.callId}`),r.parentId&&(r.parentId=`${t}:${r.parentId}`)}function Sv(e){const t=new Map,n=e.filter(l=>l.origin==="library"),r=e.filter(l=>l.origin==="testRunner");if(!r.length||!n.length)return e.map(l=>l.actions.map(a=>({...a,context:l}))).flat();const i=n.some(l=>l.actions.some(a=>!!a.stepId));for(const l of n)for(const a of l.actions){const u=i?a.stepId:`${a.apiName}@${a.wallTime}`;t.set(u,{...a,context:l})}const s=Tv(r,t,i);s&&Ev(n,s);const o=new Map;for(const l of r)for(const a of l.actions){const u=i?a.callId:`${a.apiName}@${a.wallTime}`,c=t.get(u);if(c){o.set(a.callId,c.callId),a.error&&(c.error=a.error),a.attachments&&(c.attachments=a.attachments),a.parentId&&(c.parentId=o.get(a.parentId)??a.parentId),c.startTime=a.startTime,c.endTime=a.endTime;continue}a.parentId&&(a.parentId=o.get(a.parentId)??a.parentId),t.set(u,{...a,context:l})}return[...t.values()]}function Ev(e,t){for(const n of e){n.startTime+=t,n.endTime+=t;for(const r of n.actions)r.startTime&&(r.startTime+=t),r.endTime&&(r.endTime+=t);for(const r of n.events)r.time+=t;for(const r of n.stdio)r.timestamp+=t;for(const r of n.pages)for(const i of r.screencastFrames)i.timestamp+=t}}function Tv(e,t,n){for(const r of e)for(const i of r.actions){if(!i.startTime)continue;const s=n?i.stepId:`${i.apiName}@${i.wallTime}`,o=t.get(s);if(o)return i.startTime-o.startTime}return 0}function kv(e){const t=new Map;for(const r of e)t.set(r.callId,{id:r.callId,parent:void 0,children:[],action:r});const n={id:"",parent:void 0,children:[]};for(const r of t.values()){const i=r.action.parentId&&t.get(r.action.parentId)||n;i.children.push(r),r.parent=i}return{rootItem:n,itemMap:t}}function s1(e){return`${e.pageId||"none"}:${e.callId}`}function Ls(e){return e[Ar]}function Nv(e){return e[rh]}function Cv(e){return e[ih]}function bv(e){let t=0,n=0;for(const r of Lv(e)){if(r.type==="console"){const i=r.messageType;i==="warning"?++n:i==="error"&&++t}r.type==="event"&&r.method==="pageError"&&++t}return{errors:t,warnings:n}}function Lv(e){let t=e[oc];if(t)return t;const n=Nv(e);return t=Ls(e).events.filter(r=>r.time>=e.startTime&&(!n||r.time<n.startTime)),e[oc]=t,t}function Av(e,t){var r;const n=new Map;for(const i of e)for(const s of i.stack||[]){let o=n.get(s.file);o||(o={errors:[],content:void 0},n.set(s.file,o))}for(const i of t){const{action:s,stack:o,message:l}=i;!s||!o||(r=n.get(o[0].file))==null||r.errors.push({line:o[0].line||0,message:l})}return n}const Mv=50,As=({sidebarSize:e,sidebarHidden:t=!1,sidebarIsFirst:n=!1,orientation:r="vertical",minSidebarSize:i=Mv,settingName:s,children:o})=>{const[l,a]=is(s?s+"."+r+":size":void 0,Math.max(i,e)*window.devicePixelRatio),[u,c]=is(s?s+"."+r+":size":void 0,Math.max(i,e)*window.devicePixelRatio),[h,d]=L.useState(null),[g,y]=vn();let w;r==="vertical"?(w=u/window.devicePixelRatio,g&&g.height<w&&(w=g.height-10)):(w=l/window.devicePixelRatio,g&&g.width<w&&(w=g.width-10));const x=L.Children.toArray(o);document.body.style.userSelect=h?"none":"inherit";let p={};return r==="vertical"?n?p={top:h?0:w-4,bottom:h?0:void 0,height:h?"initial":8}:p={bottom:h?0:w-4,top:h?0:void 0,height:h?"initial":8}:n?p={left:h?0:w-4,right:h?0:void 0,width:h?"initial":8}:p={right:h?0:w-4,left:h?0:void 0,width:h?"initial":8},f.jsxs("div",{className:"split-view "+r+(n?" sidebar-first":""),ref:y,children:[f.jsx("div",{className:"split-view-main",children:x[0]}),!t&&f.jsx("div",{style:{flexBasis:w},className:"split-view-sidebar",children:x[1]}),!t&&f.jsx("div",{style:p,className:"split-view-resizer",onMouseDown:m=>d({offset:r==="vertical"?m.clientY:m.clientX,size:w}),onMouseUp:()=>d(null),onMouseMove:m=>{if(!m.buttons)d(null);else if(h){const E=(r==="vertical"?m.clientY:m.clientX)-h.offset,C=n?h.size+E:h.size-E,N=m.target.parentElement.getBoundingClientRect(),S=Math.min(Math.max(i,C),(r==="vertical"?N.height:N.width)-i);r==="vertical"?c(S*window.devicePixelRatio):a(S*window.devicePixelRatio)}}})]})};function Js(e,t="'"){const n=JSON.stringify(e),r=n.substring(1,n.length-1).replace(/\\"/g,'"');if(t==="'")return t+r.replace(/[']/g,"\\'")+t;if(t==='"')return t+r.replace(/["]/g,'\\"')+t;if(t==="`")return t+r.replace(/[`]/g,"`")+t;throw new Error("Invalid escape char")}function Ms(e){return e.charAt(0).toUpperCase()+e.substring(1)}function sh(e){return e.replace(/([a-z0-9])([A-Z])/g,"$1_$2").replace(/([A-Z])([A-Z][a-z])/g,"$1_$2").toLowerCase()}function Xe(e){let t="";for(let n=0;n<e.length;n++)t+=Iv(e,n);return t}function xr(e){return`"${Xe(e).replace(/\\ /g," ")}"`}function Iv(e,t){const n=e.charCodeAt(t);return n===0?"�":n>=1&&n<=31||n>=48&&n<=57&&(t===0||t===1&&e.charCodeAt(0)===45)?"\\"+n.toString(16)+" ":t===0&&n===45&&e.length===1?"\\"+e.charAt(t):n>=128||n===45||n===95||n>=48&&n<=57||n>=65&&n<=90||n>=97&&n<=122?e.charAt(t):"\\"+e.charAt(t)}function Ue(e){return e.replace(/\u200b/g,"").trim().replace(/\s+/g," ")}function Zs(e){return e.replace(/(^|[^\\])(\\\\)*\\(['"`])/g,"$1$2$3")}function oh(e){return e.unicode||e.unicodeSets?String(e):String(e).replace(/(^|[^\\])(\\\\)*(["'`])/g,"$1$2\\$3").replace(/>>/g,"\\>\\>")}function Ge(e,t){return typeof e!="string"?oh(e):`${JSON.stringify(e)}${t?"s":"i"}`}function Ee(e,t){return typeof e!="string"?oh(e):`"${e.replace(/\\/g,"\\\\").replace(/["]/g,'\\"')}"${t?"s":"i"}`}function jv(e,t,n=""){if(e.length<=t)return e;const r=[...e];return r.length>t?r.slice(0,t-n.length).join("")+n:r.join("")}function lc(e,t){return jv(e,t,"…")}function Pv(e){return e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}const re=function(e,t,n){return e>=t&&e<=n};function Ae(e){return re(e,48,57)}function ac(e){return Ae(e)||re(e,65,70)||re(e,97,102)}function Rv(e){return re(e,65,90)}function $v(e){return re(e,97,122)}function Ov(e){return Rv(e)||$v(e)}function zv(e){return e>=128}function Yi(e){return Ov(e)||zv(e)||e===95}function uc(e){return Yi(e)||Ae(e)||e===45}function Dv(e){return re(e,0,8)||e===11||re(e,14,31)||e===127}function Ji(e){return e===10}function wt(e){return Ji(e)||e===9||e===32}const Fv=1114111;class Fa extends Error{constructor(t){super(t),this.name="InvalidCharacterError"}}function Hv(e){const t=[];for(let n=0;n<e.length;n++){let r=e.charCodeAt(n);if(r===13&&e.charCodeAt(n+1)===10&&(r=10,n++),(r===13||r===12)&&(r=10),r===0&&(r=65533),re(r,55296,56319)&&re(e.charCodeAt(n+1),56320,57343)){const i=r-55296,s=e.charCodeAt(n+1)-56320;r=Math.pow(2,16)+i*Math.pow(2,10)+s,n++}t.push(r)}return t}function se(e){if(e<=65535)return String.fromCharCode(e);e-=Math.pow(2,16);const t=Math.floor(e/Math.pow(2,10))+55296,n=e%Math.pow(2,10)+56320;return String.fromCharCode(t)+String.fromCharCode(n)}function Uv(e){const t=Hv(e);let n=-1;const r=[];let i;const s=function(T){return T>=t.length?-1:t[T]},o=function(T){if(T===void 0&&(T=1),T>3)throw"Spec Error: no more than three codepoints of lookahead.";return s(n+T)},l=function(T){return T===void 0&&(T=1),n+=T,i=s(n),!0},a=function(){return n-=1,!0},u=function(T){return T===void 0&&(T=i),T===-1},c=function(){if(h(),l(),wt(i)){for(;wt(o());)l();return new Pl}else{if(i===34)return y();if(i===35)if(uc(o())||p(o(1),o(2))){const T=new _h("");return v(o(1),o(2),o(3))&&(T.type="id"),T.value=N(),T}else return new ye(i);else return i===36?o()===61?(l(),new qv):new ye(i):i===39?y():i===40?new gh:i===41?new vh:i===42?o()===61?(l(),new Xv):new ye(i):i===43?k()?(a(),d()):new ye(i):i===44?new fh:i===45?k()?(a(),d()):o(1)===45&&o(2)===62?(l(2),new uh):E()?(a(),g()):new ye(i):i===46?k()?(a(),d()):new ye(i):i===58?new ch:i===59?new dh:i===60?o(1)===33&&o(2)===45&&o(3)===45?(l(3),new ah):new ye(i):i===64?v(o(1),o(2),o(3))?new xh(N()):new ye(i):i===91?new mh:i===92?m()?(a(),g()):new ye(i):i===93?new Rl:i===94?o()===61?(l(),new Wv):new ye(i):i===123?new hh:i===124?o()===61?(l(),new Vv):o()===124?(l(),new yh):new ye(i):i===125?new ph:i===126?o()===61?(l(),new Bv):new ye(i):Ae(i)?(a(),d()):Yi(i)?(a(),g()):u()?new es:new ye(i)}},h=function(){for(;o(1)===47&&o(2)===42;)for(l(2);;)if(l(),i===42&&o()===47){l();break}else if(u())return},d=function(){const T=S();if(v(o(1),o(2),o(3))){const j=new Qv;return j.value=T.value,j.repr=T.repr,j.type=T.type,j.unit=N(),j}else if(o()===37){l();const j=new kh;return j.value=T.value,j.repr=T.repr,j}else{const j=new Th;return j.value=T.value,j.repr=T.repr,j.type=T.type,j}},g=function(){const T=N();if(T.toLowerCase()==="url"&&o()===40){for(l();wt(o(1))&&wt(o(2));)l();return o()===34||o()===39?new ts(T):wt(o())&&(o(2)===34||o(2)===39)?new ts(T):w()}else return o()===40?(l(),new ts(T)):new wh(T)},y=function(T){T===void 0&&(T=i);let j="";for(;l();){if(i===T||u())return new Sh(j);if(Ji(i))return a(),new lh;i===92?u(o())||(Ji(o())?l():j+=se(x())):j+=se(i)}throw new Error("Internal error")},w=function(){const T=new Eh("");for(;wt(o());)l();if(u(o()))return T;for(;l();){if(i===41||u())return T;if(wt(i)){for(;wt(o());)l();return o()===41||u(o())?(l(),T):(A(),new Zi)}else{if(i===34||i===39||i===40||Dv(i))return A(),new Zi;if(i===92)if(m())T.value+=se(x());else return A(),new Zi;else T.value+=se(i)}}throw new Error("Internal error")},x=function(){if(l(),ac(i)){const T=[i];for(let z=0;z<5&&ac(o());z++)l(),T.push(i);wt(o())&&l();let j=parseInt(T.map(function(z){return String.fromCharCode(z)}).join(""),16);return j>Fv&&(j=65533),j}else return u()?65533:i},p=function(T,j){return!(T!==92||Ji(j))},m=function(){return p(i,o())},v=function(T,j,z){return T===45?Yi(j)||j===45||p(j,z):Yi(T)?!0:T===92?p(T,j):!1},E=function(){return v(i,o(1),o(2))},C=function(T,j,z){return T===43||T===45?!!(Ae(j)||j===46&&Ae(z)):T===46?!!Ae(j):!!Ae(T)},k=function(){return C(i,o(1),o(2))},N=function(){let T="";for(;l();)if(uc(i))T+=se(i);else if(m())T+=se(x());else return a(),T;throw new Error("Internal parse error")},S=function(){let T="",j="integer";for((o()===43||o()===45)&&(l(),T+=se(i));Ae(o());)l(),T+=se(i);if(o(1)===46&&Ae(o(2)))for(l(),T+=se(i),l(),T+=se(i),j="number";Ae(o());)l(),T+=se(i);const z=o(1),ae=o(2),Le=o(3);if((z===69||z===101)&&Ae(ae))for(l(),T+=se(i),l(),T+=se(i),j="number";Ae(o());)l(),T+=se(i);else if((z===69||z===101)&&(ae===43||ae===45)&&Ae(Le))for(l(),T+=se(i),l(),T+=se(i),l(),T+=se(i),j="number";Ae(o());)l(),T+=se(i);const ue=_(T);return{type:j,value:ue,repr:T}},_=function(T){return+T},A=function(){for(;l();){if(i===41||u())return;m()&&x()}};let P=0;for(;!u(o());)if(r.push(c()),P++,P>t.length*2)throw new Error("I'm infinite-looping!");return r}class te{constructor(){this.tokenType=""}toJSON(){return{token:this.tokenType}}toString(){return this.tokenType}toSource(){return""+this}}class lh extends te{constructor(){super(...arguments),this.tokenType="BADSTRING"}}class Zi extends te{constructor(){super(...arguments),this.tokenType="BADURL"}}class Pl extends te{constructor(){super(...arguments),this.tokenType="WHITESPACE"}toString(){return"WS"}toSource(){return" "}}class ah extends te{constructor(){super(...arguments),this.tokenType="CDO"}toSource(){return"<!--"}}class uh extends te{constructor(){super(...arguments),this.tokenType="CDC"}toSource(){return"-->"}}class ch extends te{constructor(){super(...arguments),this.tokenType=":"}}class dh extends te{constructor(){super(...arguments),this.tokenType=";"}}class fh extends te{constructor(){super(...arguments),this.tokenType=","}}class sr extends te{constructor(){super(...arguments),this.value="",this.mirror=""}}class hh extends sr{constructor(){super(),this.tokenType="{",this.value="{",this.mirror="}"}}class ph extends sr{constructor(){super(),this.tokenType="}",this.value="}",this.mirror="{"}}class mh extends sr{constructor(){super(),this.tokenType="[",this.value="[",this.mirror="]"}}class Rl extends sr{constructor(){super(),this.tokenType="]",this.value="]",this.mirror="["}}class gh extends sr{constructor(){super(),this.tokenType="(",this.value="(",this.mirror=")"}}class vh extends sr{constructor(){super(),this.tokenType=")",this.value=")",this.mirror="("}}class Bv extends te{constructor(){super(...arguments),this.tokenType="~="}}class Vv extends te{constructor(){super(...arguments),this.tokenType="|="}}class Wv extends te{constructor(){super(...arguments),this.tokenType="^="}}class qv extends te{constructor(){super(...arguments),this.tokenType="$="}}class Xv extends te{constructor(){super(...arguments),this.tokenType="*="}}class yh extends te{constructor(){super(...arguments),this.tokenType="||"}}class es extends te{constructor(){super(...arguments),this.tokenType="EOF"}toSource(){return""}}class ye extends te{constructor(t){super(),this.tokenType="DELIM",this.value="",this.value=se(t)}toString(){return"DELIM("+this.value+")"}toJSON(){const t=this.constructor.prototype.constructor.prototype.toJSON.call(this);return t.value=this.value,t}toSource(){return this.value==="\\"?`\\
+`:this.value}}class or extends te{constructor(){super(...arguments),this.value=""}ASCIIMatch(t){return this.value.toLowerCase()===t.toLowerCase()}toJSON(){const t=this.constructor.prototype.constructor.prototype.toJSON.call(this);return t.value=this.value,t}}class wh extends or{constructor(t){super(),this.tokenType="IDENT",this.value=t}toString(){return"IDENT("+this.value+")"}toSource(){return fi(this.value)}}class ts extends or{constructor(t){super(),this.tokenType="FUNCTION",this.value=t,this.mirror=")"}toString(){return"FUNCTION("+this.value+")"}toSource(){return fi(this.value)+"("}}class xh extends or{constructor(t){super(),this.tokenType="AT-KEYWORD",this.value=t}toString(){return"AT("+this.value+")"}toSource(){return"@"+fi(this.value)}}class _h extends or{constructor(t){super(),this.tokenType="HASH",this.value=t,this.type="unrestricted"}toString(){return"HASH("+this.value+")"}toJSON(){const t=this.constructor.prototype.constructor.prototype.toJSON.call(this);return t.value=this.value,t.type=this.type,t}toSource(){return this.type==="id"?"#"+fi(this.value):"#"+Gv(this.value)}}class Sh extends or{constructor(t){super(),this.tokenType="STRING",this.value=t}toString(){return'"'+Nh(this.value)+'"'}}class Eh extends or{constructor(t){super(),this.tokenType="URL",this.value=t}toString(){return"URL("+this.value+")"}toSource(){return'url("'+Nh(this.value)+'")'}}class Th extends te{constructor(){super(),this.tokenType="NUMBER",this.type="integer",this.repr=""}toString(){return this.type==="integer"?"INT("+this.value+")":"NUMBER("+this.value+")"}toJSON(){const t=super.toJSON();return t.value=this.value,t.type=this.type,t.repr=this.repr,t}toSource(){return this.repr}}class kh extends te{constructor(){super(),this.tokenType="PERCENTAGE",this.repr=""}toString(){return"PERCENTAGE("+this.value+")"}toJSON(){const t=this.constructor.prototype.constructor.prototype.toJSON.call(this);return t.value=this.value,t.repr=this.repr,t}toSource(){return this.repr+"%"}}class Qv extends te{constructor(){super(),this.tokenType="DIMENSION",this.type="integer",this.repr="",this.unit=""}toString(){return"DIM("+this.value+","+this.unit+")"}toJSON(){const t=this.constructor.prototype.constructor.prototype.toJSON.call(this);return t.value=this.value,t.type=this.type,t.repr=this.repr,t.unit=this.unit,t}toSource(){const t=this.repr;let n=fi(this.unit);return n[0].toLowerCase()==="e"&&(n[1]==="-"||re(n.charCodeAt(1),48,57))&&(n="\\65 "+n.slice(1,n.length)),t+n}}function fi(e){e=""+e;let t="";const n=e.charCodeAt(0);for(let r=0;r<e.length;r++){const i=e.charCodeAt(r);if(i===0)throw new Fa("Invalid character: the input contains U+0000.");re(i,1,31)||i===127||r===0&&re(i,48,57)||r===1&&re(i,48,57)&&n===45?t+="\\"+i.toString(16)+" ":i>=128||i===45||i===95||re(i,48,57)||re(i,65,90)||re(i,97,122)?t+=e[r]:t+="\\"+e[r]}return t}function Gv(e){e=""+e;let t="";for(let n=0;n<e.length;n++){const r=e.charCodeAt(n);if(r===0)throw new Fa("Invalid character: the input contains U+0000.");r>=128||r===45||r===95||re(r,48,57)||re(r,65,90)||re(r,97,122)?t+=e[n]:t+="\\"+r.toString(16)+" "}return t}function Nh(e){e=""+e;let t="";for(let n=0;n<e.length;n++){const r=e.charCodeAt(n);if(r===0)throw new Fa("Invalid character: the input contains U+0000.");re(r,1,31)||r===127?t+="\\"+r.toString(16)+" ":r===34||r===92?t+="\\"+e[n]:t+=e[n]}return t}class Ie extends Error{}function Kv(e,t){let n;try{n=Uv(e),n[n.length-1]instanceof es||n.push(new es)}catch(_){const A=_.message+` while parsing selector "${e}"`,P=(_.stack||"").indexOf(_.message);throw P!==-1&&(_.stack=_.stack.substring(0,P)+A+_.stack.substring(P+_.message.length)),_.message=A,_}const r=n.find(_=>_ instanceof xh||_ instanceof lh||_ instanceof Zi||_ instanceof yh||_ instanceof ah||_ instanceof uh||_ instanceof dh||_ instanceof hh||_ instanceof ph||_ instanceof Eh||_ instanceof kh);if(r)throw new Ie(`Unsupported token "${r.toSource()}" while parsing selector "${e}"`);let i=0;const s=new Set;function o(){return new Ie(`Unexpected token "${n[i].toSource()}" while parsing selector "${e}"`)}function l(){for(;n[i]instanceof Pl;)i++}function a(_=i){return n[_]instanceof wh}function u(_=i){return n[_]instanceof Sh}function c(_=i){return n[_]instanceof Th}function h(_=i){return n[_]instanceof fh}function d(_=i){return n[_]instanceof gh}function g(_=i){return n[_]instanceof vh}function y(_=i){return n[_]instanceof ts}function w(_=i){return n[_]instanceof ye&&n[_].value==="*"}function x(_=i){return n[_]instanceof es}function p(_=i){return n[_]instanceof ye&&[">","+","~"].includes(n[_].value)}function m(_=i){return h(_)||g(_)||x(_)||p(_)||n[_]instanceof Pl}function v(){const _=[E()];for(;l(),!!h();)i++,_.push(E());return _}function E(){return l(),c()||u()?n[i++].value:C()}function C(){const _={simples:[]};for(l(),p()?_.simples.push({selector:{functions:[{name:"scope",args:[]}]},combinator:""}):_.simples.push({selector:k(),combinator:""});;){if(l(),p())_.simples[_.simples.length-1].combinator=n[i++].value,l();else if(m())break;_.simples.push({combinator:"",selector:k()})}return _}function k(){let _="";const A=[];for(;!m();)if(a()||w())_+=n[i++].toSource();else if(n[i]instanceof _h)_+=n[i++].toSource();else if(n[i]instanceof ye&&n[i].value===".")if(i++,a())_+="."+n[i++].toSource();else throw o();else if(n[i]instanceof ch)if(i++,a())if(!t.has(n[i].value.toLowerCase()))_+=":"+n[i++].toSource();else{const P=n[i++].value.toLowerCase();A.push({name:P,args:[]}),s.add(P)}else if(y()){const P=n[i++].value.toLowerCase();if(t.has(P)?(A.push({name:P,args:v()}),s.add(P)):_+=`:${P}(${N()})`,l(),!g())throw o();i++}else throw o();else if(n[i]instanceof mh){for(_+="[",i++;!(n[i]instanceof Rl)&&!x();)_+=n[i++].toSource();if(!(n[i]instanceof Rl))throw o();_+="]",i++}else throw o();if(!_&&!A.length)throw o();return{css:_||void 0,functions:A}}function N(){let _="",A=1;for(;!x()&&((d()||y())&&A++,g()&&A--,!!A);)_+=n[i++].toSource();return _}const S=v();if(!x())throw o();if(S.some(_=>typeof _!="object"||!("simples"in _)))throw new Ie(`Error while parsing selector "${e}"`);return{selector:S,names:Array.from(s)}}const $l=new Set(["internal:has","internal:has-not","internal:and","internal:or","internal:chain","left-of","right-of","above","below","near"]),Yv=new Set(["left-of","right-of","above","below","near"]),Ch=new Set(["not","is","where","has","scope","light","visible","text","text-matches","text-is","has-text","above","below","right-of","left-of","near","nth-match"]);function eo(e){const t=e0(e),n=[];for(const r of t.parts){if(r.name==="css"||r.name==="css:light"){r.name==="css:light"&&(r.body=":light("+r.body+")");const i=Kv(r.body,Ch);n.push({name:"css",body:i.selector,source:r.body});continue}if($l.has(r.name)){let i,s;try{const u=JSON.parse("["+r.body+"]");if(!Array.isArray(u)||u.length<1||u.length>2||typeof u[0]!="string")throw new Ie(`Malformed selector: ${r.name}=`+r.body);if(i=u[0],u.length===2){if(typeof u[1]!="number"||!Yv.has(r.name))throw new Ie(`Malformed selector: ${r.name}=`+r.body);s=u[1]}}catch{throw new Ie(`Malformed selector: ${r.name}=`+r.body)}const o={name:r.name,source:r.body,body:{parsed:eo(i),distance:s}},l=[...o.body.parsed.parts].reverse().find(u=>u.name==="internal:control"&&u.body==="enter-frame"),a=l?o.body.parsed.parts.indexOf(l):-1;a!==-1&&Jv(o.body.parsed.parts.slice(0,a+1),n.slice(0,a+1))&&o.body.parsed.parts.splice(0,a+1),n.push(o);continue}n.push({...r,source:r.body})}if($l.has(n[0].name))throw new Ie(`"${n[0].name}" selector cannot be first`);return{capture:t.capture,parts:n}}function Jv(e,t){return gn({parts:e})===gn({parts:t})}function gn(e,t){return typeof e=="string"?e:e.parts.map((n,r)=>{let i=!0;!t&&r!==e.capture&&(n.name==="css"||n.name==="xpath"&&n.source.startsWith("//")||n.source.startsWith(".."))&&(i=!1);const s=i?n.name+"=":"";return`${r===e.capture?"*":""}${s}${n.source}`}).join(" >> ")}function Zv(e,t){const n=(r,i)=>{for(const s of r.parts)t(s,i),$l.has(s.name)&&n(s.body.parsed,!0)};n(e,!1)}function e0(e){let t=0,n,r=0;const i={parts:[]},s=()=>{const l=e.substring(r,t).trim(),a=l.indexOf("=");let u,c;a!==-1&&l.substring(0,a).trim().match(/^[a-zA-Z_0-9-+:*]+$/)?(u=l.substring(0,a).trim(),c=l.substring(a+1)):l.length>1&&l[0]==='"'&&l[l.length-1]==='"'||l.length>1&&l[0]==="'"&&l[l.length-1]==="'"?(u="text",c=l):/^\(*\/\//.test(l)||l.startsWith("..")?(u="xpath",c=l):(u="css",c=l);let h=!1;if(u[0]==="*"&&(h=!0,u=u.substring(1)),i.parts.push({name:u,body:c}),h){if(i.capture!==void 0)throw new Ie("Only one of the selectors can capture using * modifier");i.capture=i.parts.length-1}};if(!e.includes(">>"))return t=e.length,s(),i;const o=()=>{const a=e.substring(r,t).match(/^\s*text\s*=(.*)$/);return!!a&&!!a[1]};for(;t<e.length;){const l=e[t];l==="\\"&&t+1<e.length?t+=2:l===n?(n=void 0,t++):!n&&(l==='"'||l==="'"||l==="`")&&!o()?(n=l,t++):!n&&l===">"&&e[t+1]===">"?(s(),t+=2,r=t):t++}return s(),i}function cn(e,t){let n=0,r=e.length===0;const i=()=>e[n]||"",s=()=>{const x=i();return++n,r=n>=e.length,x},o=x=>{throw r?new Ie(`Unexpected end of selector while parsing selector \`${e}\``):new Ie(`Error while parsing selector \`${e}\` - unexpected symbol "${i()}" at position ${n}`+(x?" during "+x:""))};function l(){for(;!r&&/\s/.test(i());)s()}function a(x){return x>="€"||x>="0"&&x<="9"||x>="A"&&x<="Z"||x>="a"&&x<="z"||x>="0"&&x<="9"||x==="_"||x==="-"}function u(){let x="";for(l();!r&&a(i());)x+=s();return x}function c(x){let p=s();for(p!==x&&o("parsing quoted string");!r&&i()!==x;)i()==="\\"&&s(),p+=s();return i()!==x&&o("parsing quoted string"),p+=s(),p}function h(){s()!=="/"&&o("parsing regular expression");let x="",p=!1;for(;!r;){if(i()==="\\")x+=s(),r&&o("parsing regular expression");else if(p&&i()==="]")p=!1;else if(!p&&i()==="[")p=!0;else if(!p&&i()==="/")break;x+=s()}s()!=="/"&&o("parsing regular expression");let m="";for(;!r&&i().match(/[dgimsuy]/);)m+=s();try{return new RegExp(x,m)}catch(v){throw new Ie(`Error while parsing selector \`${e}\`: ${v.message}`)}}function d(){let x="";return l(),i()==="'"||i()==='"'?x=c(i()).slice(1,-1):x=u(),x||o("parsing property path"),x}function g(){l();let x="";return r||(x+=s()),!r&&x!=="="&&(x+=s()),["=","*=","^=","$=","|=","~="].includes(x)||o("parsing operator"),x}function y(){s();const x=[];for(x.push(d()),l();i()===".";)s(),x.push(d()),l();if(i()==="]")return s(),{name:x.join("."),jsonPath:x,op:"<truthy>",value:null,caseSensitive:!1};const p=g();let m,v=!0;if(l(),i()==="/"){if(p!=="=")throw new Ie(`Error while parsing selector \`${e}\` - cannot use ${p} in attribute with regular expression`);m=h()}else if(i()==="'"||i()==='"')m=c(i()).slice(1,-1),l(),i()==="i"||i()==="I"?(v=!1,s()):(i()==="s"||i()==="S")&&(v=!0,s());else{for(m="";!r&&(a(i())||i()==="+"||i()===".");)m+=s();m==="true"?m=!0:m==="false"?m=!1:t||(m=+m,Number.isNaN(m)&&o("parsing attribute value"))}if(l(),i()!=="]"&&o("parsing attribute value"),s(),p!=="="&&typeof m!="string")throw new Ie(`Error while parsing selector \`${e}\` - cannot use ${p} in attribute with non-string matching value - ${m}`);return{name:x.join("."),jsonPath:x,op:p,value:m,caseSensitive:v}}const w={name:"",attributes:[]};for(w.name=u(),l();i()==="[";)w.attributes.push(y()),l();if(r||o(void 0),!w.name&&!w.attributes.length)throw new Ie(`Error while parsing selector \`${e}\` - selector cannot be empty`);return w}function Kt(e,t,n=!1){return bh(e,t,n)[0]}function bh(e,t,n=!1,r=20,i){try{return Nn(new l0[e](i),eo(t),n,r)}catch{return[t]}}function Nn(e,t,n=!1,r=20){const i=[...t.parts];for(let l=0;l<i.length-1;l++)if(i[l].name==="nth"&&i[l+1].name==="internal:control"&&i[l+1].body==="enter-frame"){const[a]=i.splice(l,1);i.splice(l+1,0,a)}const s=[];let o=n?"frame-locator":"page";for(let l=0;l<i.length;l++){const a=i[l],u=o;if(o="locator",a.name==="nth"){a.body==="0"?s.push([e.generateLocator(u,"first",""),e.generateLocator(u,"nth","0")]):a.body==="-1"?s.push([e.generateLocator(u,"last",""),e.generateLocator(u,"nth","-1")]):s.push([e.generateLocator(u,"nth",a.body)]);continue}if(a.name==="internal:text"){const{exact:w,text:x}=_r(a.body);s.push([e.generateLocator(u,"text",x,{exact:w})]);continue}if(a.name==="internal:has-text"){const{exact:w,text:x}=_r(a.body);if(!w){s.push([e.generateLocator(u,"has-text",x,{exact:w})]);continue}}if(a.name==="internal:has-not-text"){const{exact:w,text:x}=_r(a.body);if(!w){s.push([e.generateLocator(u,"has-not-text",x,{exact:w})]);continue}}if(a.name==="internal:has"){const w=Nn(e,a.body.parsed,!1,r);s.push(w.map(x=>e.generateLocator(u,"has",x)));continue}if(a.name==="internal:has-not"){const w=Nn(e,a.body.parsed,!1,r);s.push(w.map(x=>e.generateLocator(u,"hasNot",x)));continue}if(a.name==="internal:and"){const w=Nn(e,a.body.parsed,!1,r);s.push(w.map(x=>e.generateLocator(u,"and",x)));continue}if(a.name==="internal:or"){const w=Nn(e,a.body.parsed,!1,r);s.push(w.map(x=>e.generateLocator(u,"or",x)));continue}if(a.name==="internal:chain"){const w=Nn(e,a.body.parsed,!1,r);s.push(w.map(x=>e.generateLocator(u,"chain",x)));continue}if(a.name==="internal:label"){const{exact:w,text:x}=_r(a.body);s.push([e.generateLocator(u,"label",x,{exact:w})]);continue}if(a.name==="internal:role"){const w=cn(a.body,!0),x={attrs:[]};for(const p of w.attributes)p.name==="name"?(x.exact=p.caseSensitive,x.name=p.value):(p.name==="level"&&typeof p.value=="string"&&(p.value=+p.value),x.attrs.push({name:p.name==="include-hidden"?"includeHidden":p.name,value:p.value}));s.push([e.generateLocator(u,"role",w.name,x)]);continue}if(a.name==="internal:testid"){const w=cn(a.body,!0),{value:x}=w.attributes[0];s.push([e.generateLocator(u,"test-id",x)]);continue}if(a.name==="internal:attr"){const w=cn(a.body,!0),{name:x,value:p,caseSensitive:m}=w.attributes[0],v=p,E=!!m;if(x==="placeholder"){s.push([e.generateLocator(u,"placeholder",v,{exact:E})]);continue}if(x==="alt"){s.push([e.generateLocator(u,"alt",v,{exact:E})]);continue}if(x==="title"){s.push([e.generateLocator(u,"title",v,{exact:E})]);continue}}let c="default";const h=i[l+1];h&&h.name==="internal:control"&&h.body==="enter-frame"&&(c="frame",o="frame-locator",l++);const d=gn({parts:[a]}),g=e.generateLocator(u,c,d);if(c==="default"&&h&&["internal:has-text","internal:has-not-text"].includes(h.name)){const{exact:w,text:x}=_r(h.body);if(!w){const p=e.generateLocator("locator",h.name==="internal:has-text"?"has-text":"has-not-text",x,{exact:w}),m={};h.name==="internal:has-text"?m.hasText=x:m.hasNotText=x;const v=e.generateLocator(u,"default",d,m);s.push([e.chainLocators([g,p]),v]),l++;continue}}let y;if(["xpath","css"].includes(a.name)){const w=gn({parts:[a]},!0);y=e.generateLocator(u,c,w)}s.push([g,y].filter(Boolean))}return t0(e,s,r)}function t0(e,t,n){const r=t.map(()=>""),i=[],s=o=>{if(o===t.length)return i.push(e.chainLocators(r)),r.length<n;for(const l of t[o])if(r[o]=l,!s(o+1))return!1;return!0};return s(0),i}function _r(e){let t=!1;const n=e.match(/^\/(.*)\/([igm]*)$/);return n?{text:new RegExp(n[1],n[2])}:(e.endsWith('"')?(e=JSON.parse(e),t=!0):e.endsWith('"s')?(e=JSON.parse(e.substring(0,e.length-1)),t=!0):e.endsWith('"i')&&(e=JSON.parse(e.substring(0,e.length-1)),t=!1),{exact:t,text:e})}class n0{constructor(t){this.preferredQuote=t}generateLocator(t,n,r,i={}){switch(n){case"default":return i.hasText!==void 0?`locator(${this.quote(r)}, { hasText: ${this.toHasText(i.hasText)} })`:i.hasNotText!==void 0?`locator(${this.quote(r)}, { hasNotText: ${this.toHasText(i.hasNotText)} })`:`locator(${this.quote(r)})`;case"frame":return`frameLocator(${this.quote(r)})`;case"nth":return`nth(${r})`;case"first":return"first()";case"last":return"last()";case"role":const s=[];he(i.name)?s.push(`name: ${this.regexToSourceString(i.name)}`):typeof i.name=="string"&&(s.push(`name: ${this.quote(i.name)}`),i.exact&&s.push("exact: true"));for(const{name:l,value:a}of i.attrs)s.push(`${l}: ${typeof a=="string"?this.quote(a):a}`);const o=s.length?`, { ${s.join(", ")} }`:"";return`getByRole(${this.quote(r)}${o})`;case"has-text":return`filter({ hasText: ${this.toHasText(r)} })`;case"has-not-text":return`filter({ hasNotText: ${this.toHasText(r)} })`;case"has":return`filter({ has: ${r} })`;case"hasNot":return`filter({ hasNot: ${r} })`;case"and":return`and(${r})`;case"or":return`or(${r})`;case"chain":return`locator(${r})`;case"test-id":return`getByTestId(${this.toTestIdValue(r)})`;case"text":return this.toCallWithExact("getByText",r,!!i.exact);case"alt":return this.toCallWithExact("getByAltText",r,!!i.exact);case"placeholder":return this.toCallWithExact("getByPlaceholder",r,!!i.exact);case"label":return this.toCallWithExact("getByLabel",r,!!i.exact);case"title":return this.toCallWithExact("getByTitle",r,!!i.exact);default:throw new Error("Unknown selector kind "+n)}}chainLocators(t){return t.join(".")}regexToSourceString(t){return Zs(String(t))}toCallWithExact(t,n,r){return he(n)?`${t}(${this.regexToSourceString(n)})`:r?`${t}(${this.quote(n)}, { exact: true })`:`${t}(${this.quote(n)})`}toHasText(t){return he(t)?this.regexToSourceString(t):this.quote(t)}toTestIdValue(t){return he(t)?this.regexToSourceString(t):this.quote(t)}quote(t){return Js(t,this.preferredQuote??"'")}}class r0{generateLocator(t,n,r,i={}){switch(n){case"default":return i.hasText!==void 0?`locator(${this.quote(r)}, has_text=${this.toHasText(i.hasText)})`:i.hasNotText!==void 0?`locator(${this.quote(r)}, has_not_text=${this.toHasText(i.hasNotText)})`:`locator(${this.quote(r)})`;case"frame":return`frame_locator(${this.quote(r)})`;case"nth":return`nth(${r})`;case"first":return"first";case"last":return"last";case"role":const s=[];he(i.name)?s.push(`name=${this.regexToString(i.name)}`):typeof i.name=="string"&&(s.push(`name=${this.quote(i.name)}`),i.exact&&s.push("exact=True"));for(const{name:l,value:a}of i.attrs){let u=typeof a=="string"?this.quote(a):a;typeof a=="boolean"&&(u=a?"True":"False"),s.push(`${sh(l)}=${u}`)}const o=s.length?`, ${s.join(", ")}`:"";return`get_by_role(${this.quote(r)}${o})`;case"has-text":return`filter(has_text=${this.toHasText(r)})`;case"has-not-text":return`filter(has_not_text=${this.toHasText(r)})`;case"has":return`filter(has=${r})`;case"hasNot":return`filter(has_not=${r})`;case"and":return`and_(${r})`;case"or":return`or_(${r})`;case"chain":return`locator(${r})`;case"test-id":return`get_by_test_id(${this.toTestIdValue(r)})`;case"text":return this.toCallWithExact("get_by_text",r,!!i.exact);case"alt":return this.toCallWithExact("get_by_alt_text",r,!!i.exact);case"placeholder":return this.toCallWithExact("get_by_placeholder",r,!!i.exact);case"label":return this.toCallWithExact("get_by_label",r,!!i.exact);case"title":return this.toCallWithExact("get_by_title",r,!!i.exact);default:throw new Error("Unknown selector kind "+n)}}chainLocators(t){return t.join(".")}regexToString(t){const n=t.flags.includes("i")?", re.IGNORECASE":"";return`re.compile(r"${Zs(t.source).replace(/\\\//,"/").replace(/"/g,'\\"')}"${n})`}toCallWithExact(t,n,r){return he(n)?`${t}(${this.regexToString(n)})`:r?`${t}(${this.quote(n)}, exact=True)`:`${t}(${this.quote(n)})`}toHasText(t){return he(t)?this.regexToString(t):`${this.quote(t)}`}toTestIdValue(t){return he(t)?this.regexToString(t):this.quote(t)}quote(t){return Js(t,'"')}}class i0{generateLocator(t,n,r,i={}){let s;switch(t){case"page":s="Page";break;case"frame-locator":s="FrameLocator";break;case"locator":s="Locator";break}switch(n){case"default":return i.hasText!==void 0?`locator(${this.quote(r)}, new ${s}.LocatorOptions().setHasText(${this.toHasText(i.hasText)}))`:i.hasNotText!==void 0?`locator(${this.quote(r)}, new ${s}.LocatorOptions().setHasNotText(${this.toHasText(i.hasNotText)}))`:`locator(${this.quote(r)})`;case"frame":return`frameLocator(${this.quote(r)})`;case"nth":return`nth(${r})`;case"first":return"first()";case"last":return"last()";case"role":const o=[];he(i.name)?o.push(`.setName(${this.regexToString(i.name)})`):typeof i.name=="string"&&(o.push(`.setName(${this.quote(i.name)})`),i.exact&&o.push(".setExact(true)"));for(const{name:a,value:u}of i.attrs)o.push(`.set${Ms(a)}(${typeof u=="string"?this.quote(u):u})`);const l=o.length?`, new ${s}.GetByRoleOptions()${o.join("")}`:"";return`getByRole(AriaRole.${sh(r).toUpperCase()}${l})`;case"has-text":return`filter(new ${s}.FilterOptions().setHasText(${this.toHasText(r)}))`;case"has-not-text":return`filter(new ${s}.FilterOptions().setHasNotText(${this.toHasText(r)}))`;case"has":return`filter(new ${s}.FilterOptions().setHas(${r}))`;case"hasNot":return`filter(new ${s}.FilterOptions().setHasNot(${r}))`;case"and":return`and(${r})`;case"or":return`or(${r})`;case"chain":return`locator(${r})`;case"test-id":return`getByTestId(${this.toTestIdValue(r)})`;case"text":return this.toCallWithExact(s,"getByText",r,!!i.exact);case"alt":return this.toCallWithExact(s,"getByAltText",r,!!i.exact);case"placeholder":return this.toCallWithExact(s,"getByPlaceholder",r,!!i.exact);case"label":return this.toCallWithExact(s,"getByLabel",r,!!i.exact);case"title":return this.toCallWithExact(s,"getByTitle",r,!!i.exact);default:throw new Error("Unknown selector kind "+n)}}chainLocators(t){return t.join(".")}regexToString(t){const n=t.flags.includes("i")?", Pattern.CASE_INSENSITIVE":"";return`Pattern.compile(${this.quote(Zs(t.source))}${n})`}toCallWithExact(t,n,r,i){return he(r)?`${n}(${this.regexToString(r)})`:i?`${n}(${this.quote(r)}, new ${t}.${Ms(n)}Options().setExact(true))`:`${n}(${this.quote(r)})`}toHasText(t){return he(t)?this.regexToString(t):this.quote(t)}toTestIdValue(t){return he(t)?this.regexToString(t):this.quote(t)}quote(t){return Js(t,'"')}}class s0{generateLocator(t,n,r,i={}){switch(n){case"default":return i.hasText!==void 0?`Locator(${this.quote(r)}, new() { ${this.toHasText(i.hasText)} })`:i.hasNotText!==void 0?`Locator(${this.quote(r)}, new() { ${this.toHasNotText(i.hasNotText)} })`:`Locator(${this.quote(r)})`;case"frame":return`FrameLocator(${this.quote(r)})`;case"nth":return`Nth(${r})`;case"first":return"First";case"last":return"Last";case"role":const s=[];he(i.name)?s.push(`NameRegex = ${this.regexToString(i.name)}`):typeof i.name=="string"&&(s.push(`Name = ${this.quote(i.name)}`),i.exact&&s.push("Exact = true"));for(const{name:l,value:a}of i.attrs)s.push(`${Ms(l)} = ${typeof a=="string"?this.quote(a):a}`);const o=s.length?`, new() { ${s.join(", ")} }`:"";return`GetByRole(AriaRole.${Ms(r)}${o})`;case"has-text":return`Filter(new() { ${this.toHasText(r)} })`;case"has-not-text":return`Filter(new() { ${this.toHasNotText(r)} })`;case"has":return`Filter(new() { Has = ${r} })`;case"hasNot":return`Filter(new() { HasNot = ${r} })`;case"and":return`And(${r})`;case"or":return`Or(${r})`;case"chain":return`Locator(${r})`;case"test-id":return`GetByTestId(${this.toTestIdValue(r)})`;case"text":return this.toCallWithExact("GetByText",r,!!i.exact);case"alt":return this.toCallWithExact("GetByAltText",r,!!i.exact);case"placeholder":return this.toCallWithExact("GetByPlaceholder",r,!!i.exact);case"label":return this.toCallWithExact("GetByLabel",r,!!i.exact);case"title":return this.toCallWithExact("GetByTitle",r,!!i.exact);default:throw new Error("Unknown selector kind "+n)}}chainLocators(t){return t.join(".")}regexToString(t){const n=t.flags.includes("i")?", RegexOptions.IgnoreCase":"";return`new Regex(${this.quote(Zs(t.source))}${n})`}toCallWithExact(t,n,r){return he(n)?`${t}(${this.regexToString(n)})`:r?`${t}(${this.quote(n)}, new() { Exact = true })`:`${t}(${this.quote(n)})`}toHasText(t){return he(t)?`HasTextRegex = ${this.regexToString(t)}`:`HasText = ${this.quote(t)}`}toTestIdValue(t){return he(t)?this.regexToString(t):this.quote(t)}toHasNotText(t){return he(t)?`HasNotTextRegex = ${this.regexToString(t)}`:`HasNotText = ${this.quote(t)}`}quote(t){return Js(t,'"')}}class o0{generateLocator(t,n,r,i={}){return JSON.stringify({kind:n,body:r,options:i})}chainLocators(t){const n=t.map(r=>JSON.parse(r));for(let r=0;r<n.length-1;++r)n[r].next=n[r+1];return JSON.stringify(n[0])}}const l0={javascript:n0,python:r0,java:i0,csharp:s0,jsonl:o0};function he(e){return e instanceof RegExp}const cc=new Map;function hi({name:e,items:t=[],id:n,render:r,icon:i,isError:s,isWarning:o,isInfo:l,indent:a,selectedItem:u,onAccepted:c,onSelected:h,onLeftArrow:d,onRightArrow:g,onHighlighted:y,onIconClicked:w,noItemsMessage:x,dataTestId:p,noHighlightOnHover:m}){const v=L.useRef(null),[E,C]=L.useState();return L.useEffect(()=>{y==null||y(E)},[y,E]),L.useEffect(()=>{const k=v.current;if(!k)return;const N=()=>{cc.set(e,k.scrollTop)};return k.addEventListener("scroll",N,{passive:!0}),()=>k.removeEventListener("scroll",N)},[e]),L.useEffect(()=>{v.current&&(v.current.scrollTop=cc.get(e)||0)},[e]),f.jsx("div",{className:"list-view vbox "+e+"-list-view",role:t.length>0?"list":void 0,"data-testid":p||e+"-list",children:f.jsxs("div",{className:"list-view-content",tabIndex:0,onDoubleClick:()=>u&&(c==null?void 0:c(u,t.indexOf(u))),onKeyDown:k=>{var A;if(u&&k.key==="Enter"){c==null||c(u,t.indexOf(u));return}if(k.key!=="ArrowDown"&&k.key!=="ArrowUp"&&k.key!=="ArrowLeft"&&k.key!=="ArrowRight")return;if(k.stopPropagation(),k.preventDefault(),u&&k.key==="ArrowLeft"){d==null||d(u,t.indexOf(u));return}if(u&&k.key==="ArrowRight"){g==null||g(u,t.indexOf(u));return}const N=u?t.indexOf(u):-1;let S=N;k.key==="ArrowDown"&&(N===-1?S=0:S=Math.min(N+1,t.length-1)),k.key==="ArrowUp"&&(N===-1?S=t.length-1:S=Math.max(N-1,0));const _=(A=v.current)==null?void 0:A.children.item(S);a0(_||void 0),y==null||y(void 0),h==null||h(t[S],S)},ref:v,children:[x&&t.length===0&&f.jsx("div",{className:"list-view-empty",children:x}),t.map((k,N)=>{const S=u===k?" selected":"",_=!m&&E===k?" highlighted":"",A=s!=null&&s(k,N)?" error":"",P=o!=null&&o(k,N)?" warning":"",T=l!=null&&l(k,N)?" info":"",j=(a==null?void 0:a(k,N))||0,z=r(k,N);return f.jsxs("div",{role:"listitem",className:"list-view-entry"+S+_+A+P+T,onClick:()=>h==null?void 0:h(k,N),onMouseEnter:()=>C(k),onMouseLeave:()=>C(void 0),children:[j?new Array(j).fill(0).map(()=>f.jsx("div",{className:"list-view-indent"})):void 0,i&&f.jsx("div",{className:"codicon "+(i(k,N)||"codicon-blank"),style:{minWidth:16,marginRight:4},onDoubleClick:ae=>{ae.preventDefault(),ae.stopPropagation()},onClick:ae=>{ae.stopPropagation(),ae.preventDefault(),w==null||w(k,N)}}),typeof z=="string"?f.jsx("div",{style:{textOverflow:"ellipsis",overflow:"hidden"},children:z}):z]},(n==null?void 0:n(k,N))||N)})]})})}function a0(e){e&&(e!=null&&e.scrollIntoViewIfNeeded?e.scrollIntoViewIfNeeded(!1):e==null||e.scrollIntoView())}const u0=hi;function c0({name:e,rootItem:t,render:n,icon:r,isError:i,isVisible:s,selectedItem:o,onAccepted:l,onSelected:a,onHighlighted:u,treeState:c,setTreeState:h,noItemsMessage:d,dataTestId:g,autoExpandDepth:y}){const w=L.useMemo(()=>d0(t,o,c.expandedItems,y||0),[t,o,c,y]),x=L.useMemo(()=>{if(!s)return[...w.keys()];const p=new Map,m=E=>{const C=p.get(E);if(C!==void 0)return C;let k=E.children.some(S=>m(S));for(const S of E.children){const _=m(S);k=k||_}const N=s(E)||k;return p.set(E,N),N};for(const E of w.keys())m(E);const v=[];for(const E of w.keys())s(E)&&v.push(E);return v},[w,s]);return f.jsx(u0,{name:e,items:x,id:p=>p.id,dataTestId:g||e+"-tree",render:p=>{const m=n(p);return f.jsxs(f.Fragment,{children:[r&&f.jsx("div",{className:"codicon "+(r(p)||"blank"),style:{minWidth:16,marginRight:4}}),typeof m=="string"?f.jsx("div",{style:{textOverflow:"ellipsis",overflow:"hidden"},children:m}):m]})},icon:p=>{const m=w.get(p).expanded;if(typeof m=="boolean")return m?"codicon-chevron-down":"codicon-chevron-right"},isError:p=>(i==null?void 0:i(p))||!1,indent:p=>w.get(p).depth,selectedItem:o,onAccepted:p=>l==null?void 0:l(p),onSelected:p=>a==null?void 0:a(p),onHighlighted:p=>u==null?void 0:u(p),onLeftArrow:p=>{const{expanded:m,parent:v}=w.get(p);m?(c.expandedItems.set(p.id,!1),h({...c})):v&&(a==null||a(v))},onRightArrow:p=>{p.children.length&&(c.expandedItems.set(p.id,!0),h({...c}))},onIconClicked:p=>{const{expanded:m}=w.get(p);if(m){for(let v=o;v;v=v.parent)if(v===p){a==null||a(p);break}c.expandedItems.set(p.id,!1)}else c.expandedItems.set(p.id,!0);h({...c})},noItemsMessage:d})}function d0(e,t,n,r){const i=new Map,s=new Set;for(let l=t==null?void 0:t.parent;l;l=l.parent)s.add(l.id);const o=(l,a)=>{for(const u of l.children){const c=s.has(u.id)||n.get(u.id),h=r>a&&i.size<25&&c!==!1,d=u.children.length?c??h:void 0;i.set(u,{depth:a,expanded:d,parent:e===l?null:l}),d&&o(u,a+1)}};return o(e,0),i}const f0=c0,h0=({actions:e,selectedAction:t,selectedTime:n,setSelectedTime:r,sdkLanguage:i,onSelected:s,onHighlighted:o,revealConsole:l,isLive:a})=>{const[u,c]=L.useState({expandedItems:new Map}),{rootItem:h,itemMap:d}=L.useMemo(()=>kv(e),[e]),{selectedItem:g}=L.useMemo(()=>({selectedItem:t?d.get(t.callId):void 0}),[d,t]);return f.jsxs("div",{className:"vbox",children:[n&&f.jsxs("div",{className:"action-list-show-all",onClick:()=>r(void 0),children:[f.jsx("span",{className:"codicon codicon-triangle-left"}),"Show all"]}),f.jsx(f0,{name:"actions",rootItem:h,treeState:u,setTreeState:c,selectedItem:g,onSelected:y=>s(y.action),onHighlighted:y=>o(y==null?void 0:y.action),onAccepted:y=>r({minimum:y.action.startTime,maximum:y.action.endTime}),isError:y=>{var w,x;return!!((x=(w=y.action)==null?void 0:w.error)!=null&&x.message)},isVisible:y=>!n||y.action.startTime<=n.maximum&&y.action.endTime>=n.minimum,render:y=>Ha(y.action,{sdkLanguage:i,revealConsole:l,isLive:a,showDuration:!0,showBadges:!0})})]})},Ha=(e,t)=>{const{sdkLanguage:n,revealConsole:r,isLive:i,showDuration:s,showBadges:o}=t,{errors:l,warnings:a}=bv(e),u=e.params.selector?Kt(n||"javascript",e.params.selector):void 0;let c="";return e.endTime?c=Ke(e.endTime-e.startTime):e.error?c="Timed out":i||(c="-"),f.jsxs(f.Fragment,{children:[f.jsxs("div",{className:"action-title",title:e.apiName,children:[f.jsx("span",{children:e.apiName}),u&&f.jsx("div",{className:"action-selector",title:u,children:u}),e.method==="goto"&&e.params.url&&f.jsx("div",{className:"action-url",title:e.params.url,children:e.params.url})]}),(s||o)&&f.jsx("div",{className:"spacer"}),s&&f.jsx("div",{className:"action-duration",children:c||f.jsx("span",{className:"codicon codicon-loading"})}),o&&f.jsxs("div",{className:"action-icons",onClick:()=>r==null?void 0:r(),children:[!!l&&f.jsxs("div",{className:"action-icon",children:[f.jsx("span",{className:"codicon codicon-error"}),f.jsx("span",{className:"action-icon-value",children:l})]}),!!a&&f.jsxs("div",{className:"action-icon",children:[f.jsx("span",{className:"codicon codicon-warning"}),f.jsx("span",{className:"action-icon-value",children:a})]})]})]})},p0=({value:e})=>{const[t,n]=L.useState("codicon-clippy"),r=L.useCallback(()=>{navigator.clipboard.writeText(e).then(()=>{n("codicon-check"),setTimeout(()=>{n("codicon-clippy")},3e3)},()=>{n("codicon-close")})},[e]);return f.jsx("span",{className:`copy-icon codicon ${t}`,onClick:r})},lr=({text:e})=>f.jsx("div",{className:"fill",style:{display:"flex",alignItems:"center",justifyContent:"center",fontSize:24,fontWeight:"bold",opacity:.5},children:e}),m0=({action:e,sdkLanguage:t})=>{if(!e)return f.jsx(lr,{text:"No action selected"});const n={...e.params};delete n.info;const r=Object.keys(n),i=e.startTime+(e.context.wallTime-e.context.startTime),s=new Date(i).toLocaleString(),o=e.endTime?Ke(e.endTime-e.startTime):"Timed Out";return f.jsxs("div",{className:"call-tab",children:[f.jsx("div",{className:"call-line",children:e.apiName}),f.jsxs(f.Fragment,{children:[f.jsx("div",{className:"call-section",children:"Time"}),s&&f.jsxs("div",{className:"call-line",children:["wall time:",f.jsx("span",{className:"call-value datetime",title:s,children:s})]}),f.jsxs("div",{className:"call-line",children:["duration:",f.jsx("span",{className:"call-value datetime",title:o,children:o})]})]}),!!r.length&&f.jsx("div",{className:"call-section",children:"Parameters"}),!!r.length&&r.map((l,a)=>dc(fc(e,l,n[l],t),"param-"+a)),!!e.result&&f.jsx("div",{className:"call-section",children:"Return value"}),!!e.result&&Object.keys(e.result).map((l,a)=>dc(fc(e,l,e.result[l],t),"result-"+a))]})};function dc(e,t){let n=e.text.replace(/\n/g,"↵");return e.type==="string"&&(n=`"${n}"`),f.jsxs("div",{className:"call-line",children:[e.name,":",f.jsx("span",{className:`call-value ${e.type}`,title:e.text,children:n}),["string","number","object","locator"].includes(e.type)&&f.jsx(p0,{value:e.text})]},t)}function fc(e,t,n,r){const i=e.method.includes("eval")||e.method==="waitForFunction";if(t==="files")return{text:"<files>",type:"string",name:t};if((t==="eventInit"||t==="expectedValue"||t==="arg"&&i)&&(n=Is(n.value,new Array(10).fill({handle:"<handle>"}))),(t==="value"&&i||t==="received"&&e.method==="expect")&&(n=Is(n,new Array(10).fill({handle:"<handle>"}))),t==="selector")return{text:Kt(r||"javascript",e.params.selector),type:"locator",name:"locator"};const s=typeof n;return s!=="object"||n===null?{text:String(n),type:s,name:t}:n.guid?{text:"<handle>",type:"handle",name:t}:{text:JSON.stringify(n).slice(0,1e3),type:"object",name:t}}function Is(e,t){if(e.n!==void 0)return e.n;if(e.s!==void 0)return e.s;if(e.b!==void 0)return e.b;if(e.v!==void 0){if(e.v==="undefined")return;if(e.v==="null")return null;if(e.v==="NaN")return NaN;if(e.v==="Infinity")return 1/0;if(e.v==="-Infinity")return-1/0;if(e.v==="-0")return-0}if(e.d!==void 0)return new Date(e.d);if(e.r!==void 0)return new RegExp(e.r.p,e.r.f);if(e.a!==void 0)return e.a.map(n=>Is(n,t));if(e.o!==void 0){const n={};for(const{k:r,v:i}of e.o)n[r]=Is(i,t);return n}return e.h!==void 0?t===void 0?"<object>":t[e.h]:"<object>"}const g0=hi,v0=({action:e,isLive:t})=>{const n=L.useMemo(()=>{var o;if(!e||!e.log.length)return[];const r=e.log,i=e.context.wallTime-e.context.startTime,s=[];for(let l=0;l<r.length;++l){let a="";if(r[l].time!==-1){const u=(o=r[l])==null?void 0:o.time;l+1<r.length?a=Ke(r[l+1].time-u):e.endTime>0?a=Ke(e.endTime-u):t?a=Ke(Date.now()-i-u):a="-"}s.push({message:r[l].message,time:a})}return s},[e,t]);return n.length?f.jsx(g0,{name:"log",items:n,render:r=>f.jsxs("div",{className:"log-list-item",children:[f.jsx("span",{className:"log-list-duration",children:r.time}),r.message]}),noHighlightOnHover:!0}):f.jsx(lr,{text:"No log entries"})};function oi(e){const t=/(\x1b\[(\d+(;\d+)*)m)|([^\x1b]+)/g,n=[];let r,i={};for(;(r=t.exec(e))!==null;){const[,,s,,o]=r;if(s){const l=+s;switch(l){case 0:i={};break;case 1:i["font-weight"]="bold";break;case 3:i["font-style"]="italic";break;case 4:i["text-decoration"]="underline";break;case 8:i.display="none";break;case 9:i["text-decoration"]="line-through";break;case 22:i={...i,"font-weight":void 0,"font-style":void 0,"text-decoration":void 0};break;case 23:i={...i,"font-weight":void 0,"font-style":void 0};break;case 24:i={...i,"text-decoration":void 0};break;case 30:case 31:case 32:case 33:case 34:case 35:case 36:case 37:i.color=hc[l-30];break;case 39:i={...i,color:void 0};break;case 40:case 41:case 42:case 43:case 44:case 45:case 46:case 47:i["background-color"]=hc[l-40];break;case 49:i={...i,"background-color":void 0};break;case 53:i["text-decoration"]="overline";break;case 90:case 91:case 92:case 93:case 94:case 95:case 96:case 97:i.color=pc[l-90];break;case 100:case 101:case 102:case 103:case 104:case 105:case 106:case 107:i["background-color"]=pc[l-100];break}}else o&&n.push(`<span style="${w0(i)}">${y0(o)}</span>`)}return n.join("")}const hc={0:"var(--vscode-terminal-ansiBlack)",1:"var(--vscode-terminal-ansiRed)",2:"var(--vscode-terminal-ansiGreen)",3:"var(--vscode-terminal-ansiYellow)",4:"var(--vscode-terminal-ansiBlue)",5:"var(--vscode-terminal-ansiMagenta)",6:"var(--vscode-terminal-ansiCyan)",7:"var(--vscode-terminal-ansiWhite)"},pc={0:"var(--vscode-terminal-ansiBrightBlack)",1:"var(--vscode-terminal-ansiBrightRed)",2:"var(--vscode-terminal-ansiBrightGreen)",3:"var(--vscode-terminal-ansiBrightYellow)",4:"var(--vscode-terminal-ansiBrightBlue)",5:"var(--vscode-terminal-ansiBrightMagenta)",6:"var(--vscode-terminal-ansiBrightCyan)",7:"var(--vscode-terminal-ansiBrightWhite)"};function y0(e){return e.replace(/[&"<>]/g,t=>({"&":"&amp;",'"':"&quot;","<":"&lt;",">":"&gt;"})[t])}function w0(e){return Object.entries(e).map(([t,n])=>`${t}: ${n}`).join("; ")}const x0=({error:e})=>{const t=L.useMemo(()=>oi(e),[e]);return f.jsx("div",{className:"error-message",dangerouslySetInnerHTML:{__html:t||""}})};function _0(e){return L.useMemo(()=>{if(!e)return{errors:new Map};const t=new Map;for(const n of e.errorDescriptors)t.set(n.message,n);return{errors:t}},[e])}const S0=({errorsModel:e,sdkLanguage:t,revealInSource:n})=>e.errors.size?f.jsx("div",{className:"fill",style:{overflow:"auto"},children:[...e.errors.entries()].map(([r,i])=>{var a;let s,o;const l=(a=i.stack)==null?void 0:a[0];return l&&(s=l.file.replace(/.*[/\\](.*)/,"$1")+":"+l.line,o=l.file+":"+l.line),f.jsxs("div",{children:[f.jsxs("div",{className:"hbox",style:{alignItems:"center",padding:"5px 10px",minHeight:36,fontWeight:"bold",color:"var(--vscode-errorForeground)"},children:[i.action&&Ha(i.action,{sdkLanguage:t}),s&&f.jsxs("div",{className:"action-location",children:["@ ",f.jsx("span",{title:o,onClick:()=>n(i),children:s})]})]}),f.jsx(x0,{error:r})]},r)})}):f.jsx(lr,{text:"No errors"}),E0=hi;function T0(e,t){const{entries:n}=L.useMemo(()=>{if(!e)return{entries:[]};const i=[];for(const s of e.events){if(s.type==="console"){const o=s.args&&s.args.length?N0(s.args):Lh(s.text),l=s.location.url,u=`${l?l.substring(l.lastIndexOf("/")+1):"<anonymous>"}:${s.location.lineNumber}`;i.push({browserMessage:{body:o,location:u},isError:s.messageType==="error",isWarning:s.messageType==="warning",timestamp:s.time})}s.type==="event"&&s.method==="pageError"&&i.push({browserError:s.params.error,isError:!0,isWarning:!1,timestamp:s.time})}for(const s of e.stdio){let o="";s.text&&(o=oi(s.text.trim())||""),s.base64&&(o=oi(atob(s.base64).trim())||""),i.push({nodeMessage:{html:o},isError:s.type==="stderr",isWarning:!1,timestamp:s.timestamp})}return i.sort((s,o)=>s.timestamp-o.timestamp),{entries:i}},[e]);return{entries:L.useMemo(()=>t?n.filter(i=>i.timestamp>=t.minimum&&i.timestamp<=t.maximum):n,[n,t])}}const k0=({consoleModel:e,boundaries:t})=>e.entries.length?f.jsx("div",{className:"console-tab",children:f.jsx(E0,{name:"console",items:e.entries,isError:n=>n.isError,isWarning:n=>n.isWarning,render:n=>{const r=Ke(n.timestamp-t.minimum),i=f.jsx("span",{className:"console-time",children:r}),s=n.isError?" status-error":n.isWarning?" status-warning":" status-none",o=n.browserMessage||n.browserError?f.jsx("span",{className:"codicon codicon-browser"+s,title:"Browser message"}):f.jsx("span",{className:"codicon codicon-file"+s,title:"Runner message"});let l,a,u,c;const{browserMessage:h,browserError:d,nodeMessage:g}=n;if(h&&(l=h.location,a=h.body),d){const{error:y,value:w}=d;y?(a=y.message,c=y.stack):a=String(w)}return g&&(u=g.html),f.jsxs("div",{className:"console-line",children:[i,o,l&&f.jsx("span",{className:"console-location",children:l}),a&&f.jsx("span",{className:"console-line-message",children:a}),u&&f.jsx("span",{className:"console-line-message",dangerouslySetInnerHTML:{__html:u}}),c&&f.jsx("div",{className:"console-stack",children:c})]})}})}):f.jsx(lr,{text:"No console entries"});function N0(e){if(e.length===1)return Lh(e[0].preview);const t=typeof e[0].value=="string"&&e[0].value.includes("%"),n=t?e[0].value:"",r=t?e.slice(1):e;let i=0;const s=/%([%sdifoOc])/g;let o;const l=[];let a=[];l.push(f.jsx("span",{children:a}));let u=0;for(;(o=s.exec(n))!==null;){const c=n.substring(u,o.index);a.push(f.jsx("span",{children:c})),u=o.index+2;const h=o[0][1];if(h==="%")a.push(f.jsx("span",{children:"%"}));else if(h==="s"||h==="o"||h==="O"||h==="d"||h==="i"||h==="f"){const d=r[i++],g={};typeof(d==null?void 0:d.value)!="string"&&(g.color="var(--vscode-debugTokenExpression-number)"),a.push(f.jsx("span",{style:g,children:(d==null?void 0:d.preview)||""}))}else if(h==="c"){a=[];const d=r[i++],g=d?C0(d.preview):{};l.push(f.jsx("span",{style:g,children:a}))}}for(u<n.length&&a.push(f.jsx("span",{children:n.substring(u)}));i<r.length;i++){const c=r[i],h={};a.length&&a.push(f.jsx("span",{children:" "})),typeof(c==null?void 0:c.value)!="string"&&(h.color="var(--vscode-debugTokenExpression-number)"),a.push(f.jsx("span",{style:h,children:(c==null?void 0:c.preview)||""}))}return l}function Lh(e){return[f.jsx("span",{dangerouslySetInnerHTML:{__html:oi(e.trim())}})]}function C0(e){try{const t={},n=e.split(";");for(const r of n){const i=r.trim();if(!i)continue;let[s,o]=i.split(":");if(s=s.trim(),o=o.trim(),!b0(s))continue;const l=s.replace(/-([a-z])/g,a=>a[1].toUpperCase());t[l]=o}return t}catch{return{}}}function b0(e){return["background","border","color","font","line","margin","padding","text"].some(n=>e.startsWith(n))}const Ah=({noShadow:e,children:t,noMinHeight:n})=>f.jsx("div",{className:"toolbar"+(e?" no-shadow":"")+(n?" no-min-height":""),children:t}),Ol=({tabs:e,selectedTab:t,setSelectedTab:n,leftToolbar:r,rightToolbar:i,dataTestId:s,mode:o})=>(o||(o="default"),f.jsx("div",{className:"tabbed-pane","data-testid":s,children:f.jsxs("div",{className:"vbox",children:[f.jsxs(Ah,{children:[r&&f.jsxs("div",{style:{flex:"none",display:"flex",margin:"0 4px",alignItems:"center"},children:[...r]}),o==="default"&&f.jsx("div",{style:{flex:"auto",display:"flex",height:"100%",overflow:"hidden"},children:[...e.map(l=>f.jsx(Mh,{id:l.id,title:l.title,count:l.count,errorCount:l.errorCount,selected:t===l.id,onSelect:n}))]}),o==="select"&&f.jsx("div",{style:{flex:"auto",display:"flex",height:"100%",overflow:"hidden"},children:f.jsx("select",{style:{width:"100%",background:"none",cursor:"pointer"},onChange:l=>{n(e[l.currentTarget.selectedIndex].id)},children:e.map(l=>{let a="";return l.count===1?a=" 🔵":l.count&&(a=` 🔵✖️${l.count}`),l.errorCount===1?a=" 🔴":l.errorCount&&(a=` 🔴✖️${l.errorCount}`),f.jsxs("option",{value:l.id,selected:l.id===t,children:[l.title,a]})})})}),i&&f.jsxs("div",{style:{flex:"none",display:"flex",alignItems:"center"},children:[...i]})]}),e.map(l=>{const a="tab-content tab-"+l.id;if(l.component)return f.jsx("div",{className:a,style:{display:t===l.id?"inherit":"none"},children:l.component},l.id);if(t===l.id)return f.jsx("div",{className:a,children:l.render()},l.id)})]})})),Mh=({id:e,title:t,count:n,errorCount:r,selected:i,onSelect:s})=>f.jsxs("div",{className:"tabbed-pane-tab "+(i?"selected":""),onClick:()=>s(e),title:t,children:[f.jsx("div",{className:"tabbed-pane-tab-label",children:t}),!!n&&f.jsx("div",{className:"tabbed-pane-tab-counter",children:n}),!!r&&f.jsx("div",{className:"tabbed-pane-tab-counter error",children:r})]},e),L0="modulepreload",A0=function(e,t){return new URL(e,t).href},mc={},M0=function(t,n,r){let i=Promise.resolve();if(n&&n.length>0){const s=document.getElementsByTagName("link"),o=document.querySelector("meta[property=csp-nonce]"),l=(o==null?void 0:o.nonce)||(o==null?void 0:o.getAttribute("nonce"));i=Promise.all(n.map(a=>{if(a=A0(a,r),a in mc)return;mc[a]=!0;const u=a.endsWith(".css"),c=u?'[rel="stylesheet"]':"";if(!!r)for(let g=s.length-1;g>=0;g--){const y=s[g];if(y.href===a&&(!u||y.rel==="stylesheet"))return}else if(document.querySelector(`link[href="${a}"]${c}`))return;const d=document.createElement("link");if(d.rel=u?"stylesheet":L0,u||(d.as="script",d.crossOrigin=""),d.href=a,l&&d.setAttribute("nonce",l),document.head.appendChild(d),u)return new Promise((g,y)=>{d.addEventListener("load",g),d.addEventListener("error",()=>y(new Error(`Unable to preload CSS for ${a}`)))})}))}return i.then(()=>t()).catch(s=>{const o=new Event("vite:preloadError",{cancelable:!0});if(o.payload=s,window.dispatchEvent(o),!o.defaultPrevented)throw s})},to=({text:e,language:t,readOnly:n,highlight:r,revealLine:i,lineNumbers:s,isFocused:o,focusOnChange:l,wrapLines:a,onChange:u})=>{const[c,h]=vn(),[d]=L.useState(M0(()=>import("./codeMirrorModule-BxIIN4UE.js"),__vite__mapDeps([0,1]),import.meta.url).then(x=>x.default)),g=L.useRef(null),[y,w]=L.useState();return L.useEffect(()=>{(async()=>{var E,C;const x=await d,p=h.current;if(!p)return;let m="";if(t==="javascript"&&(m="javascript"),t==="python"&&(m="python"),t==="java"&&(m="text/x-java"),t==="csharp"&&(m="text/x-csharp"),t==="html"&&(m="htmlmixed"),t==="css"&&(m="css"),g.current&&m===g.current.cm.getOption("mode")&&!!n===g.current.cm.getOption("readOnly")&&s===g.current.cm.getOption("lineNumbers")&&a===g.current.cm.getOption("lineWrapping"))return;(C=(E=g.current)==null?void 0:E.cm)==null||C.getWrapperElement().remove();const v=x(p,{value:"",mode:m,readOnly:!!n,lineNumbers:s,lineWrapping:a});return g.current={cm:v},o&&v.focus(),w(v),v})()},[d,y,h,t,s,a,n,o]),L.useEffect(()=>{g.current&&g.current.cm.setSize(c.width,c.height)},[c]),L.useLayoutEffect(()=>{var m;if(!y)return;let x=!1;if(y.getValue()!==e&&(y.setValue(e),x=!0,l&&(y.execCommand("selectAll"),y.focus())),x||JSON.stringify(r)!==JSON.stringify(g.current.highlight)){for(const E of g.current.highlight||[])y.removeLineClass(E.line-1,"wrap");for(const E of r||[])y.addLineClass(E.line-1,"wrap",`source-line-${E.type}`);for(const E of g.current.widgets||[])y.removeLineWidget(E);const v=[];for(const E of r||[]){if(E.type!=="error")continue;const C=(m=g.current)==null?void 0:m.cm.getLine(E.line-1);if(C){const N=document.createElement("div");N.className="source-line-error-underline",N.innerHTML="&nbsp;".repeat(C.length||1),v.push(y.addLineWidget(E.line,N,{above:!0,coverGutter:!1}))}const k=document.createElement("div");k.innerHTML=oi(E.message||""),k.className="source-line-error-widget",v.push(y.addLineWidget(E.line,k,{above:!0,coverGutter:!1}))}g.current.highlight=r,g.current.widgets=v}typeof i=="number"&&g.current.cm.lineCount()>=i&&y.scrollIntoView({line:Math.max(0,i-1),ch:0},50);let p;return u&&(p=()=>u(y.getValue()),y.on("change",p)),()=>{p&&y.off("change",p)}},[y,e,r,i,l,u]),f.jsx("div",{className:"cm-wrapper",ref:h})},I0=({resource:e,onClose:t})=>{const[n,r]=L.useState("request");return f.jsx(Ol,{dataTestId:"network-request-details",leftToolbar:[f.jsx(Qn,{icon:"close",title:"Close",onClick:t})],tabs:[{id:"request",title:"Request",render:()=>f.jsx(j0,{resource:e})},{id:"response",title:"Response",render:()=>f.jsx(P0,{resource:e})},{id:"body",title:"Body",render:()=>f.jsx(R0,{resource:e})}],selectedTab:n,setSelectedTab:r})},j0=({resource:e})=>{const[t,n]=L.useState(null);return L.useEffect(()=>{(async()=>{if(e.request.postData){const i=e.request.headers.find(l=>l.name==="Content-Type"),s=i?i.value:"",o=Ih(s);if(e.request.postData._sha1){const l=await fetch(`sha1/${e.request.postData._sha1}`);n({text:zl(await l.text(),s),language:o})}else n({text:zl(e.request.postData.text,s),language:o})}else n(null)})()},[e]),f.jsxs("div",{className:"network-request-details-tab",children:[f.jsx("div",{className:"network-request-details-header",children:"URL"}),f.jsx("div",{className:"network-request-details-url",children:e.request.url}),f.jsx("div",{className:"network-request-details-header",children:"Request Headers"}),f.jsx("div",{className:"network-request-details-headers",children:e.request.headers.map(r=>`${r.name}: ${r.value}`).join(`
+`)}),t&&f.jsx("div",{className:"network-request-details-header",children:"Request Body"}),t&&f.jsx(to,{text:t.text,language:t.language,readOnly:!0,lineNumbers:!0})]})},P0=({resource:e})=>f.jsxs("div",{className:"network-request-details-tab",children:[f.jsx("div",{className:"network-request-details-header",children:"Response Headers"}),f.jsx("div",{className:"network-request-details-headers",children:e.response.headers.map(t=>`${t.name}: ${t.value}`).join(`
+`)})]}),R0=({resource:e})=>{const[t,n]=L.useState(null);return L.useEffect(()=>{(async()=>{if(e.response.content._sha1){const i=e.response.content.mimeType.includes("image"),s=await fetch(`sha1/${e.response.content._sha1}`);if(i){const o=await s.blob(),l=new FileReader,a=new Promise(u=>l.onload=u);l.readAsDataURL(o),n({dataUrl:(await a).target.result})}else{const o=zl(await s.text(),e.response.content.mimeType),l=Ih(e.response.content.mimeType);n({text:o,language:l})}}})()},[e]),f.jsxs("div",{className:"network-request-details-tab",children:[!e.response.content._sha1&&f.jsx("div",{children:"Response body is not available for this request."}),t&&t.dataUrl&&f.jsx("img",{draggable:"false",src:t.dataUrl}),t&&t.text&&f.jsx(to,{text:t.text,language:t.language,readOnly:!0,lineNumbers:!0})]})};function zl(e,t){if(e===null)return"Loading...";const n=e;if(n==="")return"<Empty>";if(t.includes("application/json"))try{return JSON.stringify(JSON.parse(n),null,2)}catch{return n}return t.includes("application/x-www-form-urlencoded")?decodeURIComponent(n):n}function Ih(e){if(e.includes("javascript")||e.includes("json"))return"javascript";if(e.includes("html"))return"html";if(e.includes("css"))return"css"}const jh=({cursor:e,onPaneMouseMove:t,onPaneMouseUp:n,onPaneDoubleClick:r})=>(Ht.useEffect(()=>{const i=document.createElement("div");return i.style.position="fixed",i.style.top="0",i.style.right="0",i.style.bottom="0",i.style.left="0",i.style.zIndex="9999",i.style.cursor=e,document.body.appendChild(i),t&&i.addEventListener("mousemove",t),n&&i.addEventListener("mouseup",n),r&&document.body.addEventListener("dblclick",r),()=>{t&&i.removeEventListener("mousemove",t),n&&i.removeEventListener("mouseup",n),r&&document.body.removeEventListener("dblclick",r),document.body.removeChild(i)}},[e,t,n,r]),f.jsx(f.Fragment,{})),$0={position:"absolute",top:0,right:0,bottom:0,left:0},Ph=({orientation:e,offsets:t,setOffsets:n,resizerColor:r,resizerWidth:i,minColumnWidth:s})=>{const o=s||0,[l,a]=Ht.useState(null),[u,c]=vn(),h={position:"absolute",right:e==="horizontal"?void 0:0,bottom:e==="horizontal"?0:void 0,width:e==="horizontal"?7:void 0,height:e==="horizontal"?void 0:7,borderTopWidth:e==="horizontal"?void 0:(7-i)/2,borderRightWidth:e==="horizontal"?(7-i)/2:void 0,borderBottomWidth:e==="horizontal"?void 0:(7-i)/2,borderLeftWidth:e==="horizontal"?(7-i)/2:void 0,borderColor:"transparent",borderStyle:"solid",cursor:e==="horizontal"?"ew-resize":"ns-resize"};return f.jsxs("div",{style:{position:"absolute",top:0,right:0,bottom:0,left:-(7-i)/2,zIndex:100,pointerEvents:"none"},ref:c,children:[!!l&&f.jsx(jh,{cursor:e==="horizontal"?"ew-resize":"ns-resize",onPaneMouseUp:()=>a(null),onPaneMouseMove:d=>{if(!d.buttons)a(null);else if(l){const g=e==="horizontal"?d.clientX-l.clientX:d.clientY-l.clientY,y=l.offset+g,w=l.index>0?t[l.index-1]:0,x=e==="horizontal"?u.width:u.height,p=Math.min(Math.max(w+o,y),x-o)-t[l.index];for(let m=l.index;m<t.length;++m)t[m]=t[m]+p;n([...t])}}}),t.map((d,g)=>f.jsx("div",{style:{...h,top:e==="horizontal"?0:d,left:e==="horizontal"?d:0,pointerEvents:"initial"},onMouseDown:y=>a({clientX:y.clientX,clientY:y.clientY,offset:d,index:g}),children:f.jsx("div",{style:{...$0,background:r}})}))]})};function O0(e){const[t,n]=L.useState([]);L.useEffect(()=>{const s=[];for(let o=0;o<e.columns.length-1;++o){const l=e.columns[o];s[o]=(s[o-1]||0)+e.columnWidths.get(l)}n(s)},[e.columns,e.columnWidths]);function r(s){const o=new Map(e.columnWidths.entries());for(let l=0;l<s.length;++l){const a=s[l]-(s[l-1]||0),u=e.columns[l];o.set(u,a)}e.setColumnWidths(o)}const i=L.useCallback(s=>{var o,l;(l=e.setSorting)==null||l.call(e,{by:s,negate:((o=e.sorting)==null?void 0:o.by)===s?!e.sorting.negate:!1})},[e]);return f.jsxs("div",{className:`grid-view ${e.name}-grid-view`,children:[f.jsx(Ph,{orientation:"horizontal",offsets:t,setOffsets:r,resizerColor:"var(--vscode-panel-border)",resizerWidth:1,minColumnWidth:25}),f.jsxs("div",{className:"vbox",children:[f.jsx("div",{className:"grid-view-header",children:e.columns.map((s,o)=>f.jsxs("div",{className:"grid-view-header-cell "+z0(s,e.sorting),style:{width:o<e.columns.length-1?e.columnWidths.get(s):void 0},onClick:()=>e.setSorting&&i(s),children:[f.jsx("span",{className:"grid-view-header-cell-title",children:e.columnTitle(s)}),f.jsx("span",{className:"codicon codicon-triangle-up"}),f.jsx("span",{className:"codicon codicon-triangle-down"})]}))}),f.jsx(hi,{name:e.name,items:e.items,id:e.id,render:(s,o)=>f.jsx(f.Fragment,{children:e.columns.map((l,a)=>{const{body:u,title:c}=e.render(s,l,o);return f.jsx("div",{className:`grid-view-cell grid-view-column-${String(l)}`,title:c,style:{width:a<e.columns.length-1?e.columnWidths.get(l):void 0},children:u})})}),icon:e.icon,indent:e.indent,isError:e.isError,isWarning:e.isWarning,isInfo:e.isInfo,selectedItem:e.selectedItem,onAccepted:e.onAccepted,onSelected:e.onSelected,onLeftArrow:e.onLeftArrow,onRightArrow:e.onRightArrow,onHighlighted:e.onHighlighted,onIconClicked:e.onIconClicked,noItemsMessage:e.noItemsMessage,dataTestId:e.dataTestId,noHighlightOnHover:e.noHighlightOnHover})]})]})}function z0(e,t){return e===(t==null?void 0:t.by)?" filter-"+(t.negate?"negative":"positive"):""}const D0=O0;function F0(e,t){const n=L.useMemo(()=>((e==null?void 0:e.resources)||[]).filter(o=>t?!!o._monotonicTime&&o._monotonicTime>=t.minimum&&o._monotonicTime<=t.maximum:!0),[e,t]),r=L.useMemo(()=>new q0(e),[e]);return{resources:n,contextIdMap:r}}const H0=({boundaries:e,networkModel:t,onEntryHovered:n})=>{const[r,i]=L.useState(void 0),[s,o]=L.useState(void 0),{renderedEntries:l}=L.useMemo(()=>{const h=t.resources.map(d=>X0(d,e,t.contextIdMap));return r&&G0(h,r),{renderedEntries:h}},[t.resources,t.contextIdMap,r,e]),[a,u]=L.useState(()=>new Map(Rh().map(h=>[h,B0(h)])));if(!t.resources.length)return f.jsx(lr,{text:"No network calls"});const c=f.jsx(D0,{name:"network",items:l,selectedItem:s,onSelected:h=>o(h),onHighlighted:h=>n(h==null?void 0:h.resource),columns:V0(!!s,l),columnTitle:U0,columnWidths:a,setColumnWidths:u,isError:h=>h.status.code>=400,isInfo:h=>!!h.route,render:(h,d)=>W0(h,d),sorting:r,setSorting:i});return f.jsxs(f.Fragment,{children:[!s&&c,s&&f.jsxs(As,{sidebarSize:a.get("name"),sidebarIsFirst:!0,orientation:"horizontal",settingName:"networkResourceDetails",children:[f.jsx(I0,{resource:s.resource,onClose:()=>o(void 0)}),c]})]})},U0=e=>e==="contextId"?"Source":e==="name"?"Name":e==="method"?"Method":e==="status"?"Status":e==="contentType"?"Content Type":e==="duration"?"Duration":e==="size"?"Size":e==="start"?"Start":e==="route"?"Route":"",B0=e=>e==="name"?200:e==="method"||e==="status"?60:e==="contentType"?200:e==="contextId"?60:100;function V0(e,t){if(e){const r=["name"];return gc(t)&&r.unshift("contextId"),r}let n=Rh();return gc(t)||(n=n.filter(r=>r!=="contextId")),n}function Rh(){return["contextId","name","method","status","contentType","duration","size","start","route"]}const W0=(e,t)=>t==="contextId"?{body:e.contextId,title:e.name.url}:t==="name"?{body:e.name.name,title:e.name.url}:t==="method"?{body:e.method}:t==="status"?{body:e.status.code>0?e.status.code:"",title:e.status.text}:t==="contentType"?{body:e.contentType}:t==="duration"?{body:Ke(e.duration)}:t==="size"?{body:hm(e.size)}:t==="start"?{body:Ke(e.start)}:t==="route"?{body:e.route}:{body:""};class q0{constructor(t){B(this,"_pagerefToShortId",new Map);B(this,"_contextToId",new Map);B(this,"_lastPageId",0);B(this,"_lastApiRequestContextId",0)}contextId(t){return t.pageref?this._pageId(t.pageref):t._apiRequest?this._apiRequestContextId(t):""}_pageId(t){let n=this._pagerefToShortId.get(t);return n||(++this._lastPageId,n="page#"+this._lastPageId,this._pagerefToShortId.set(t,n)),n}_apiRequestContextId(t){const n=Ls(t);if(!n)return"";let r=this._contextToId.get(n);return r||(++this._lastApiRequestContextId,r="api#"+this._lastApiRequestContextId,this._contextToId.set(n,r)),r}}function gc(e){const t=new Set;for(const n of e)if(t.add(n.contextId),t.size>1)return!0;return!1}const X0=(e,t,n)=>{const r=Q0(e);let i;try{const l=new URL(e.request.url);i=l.pathname.substring(l.pathname.lastIndexOf("/")+1),i||(i=l.host)}catch{i=e.request.url}let s=e.response.content.mimeType;const o=s.match(/^(.*);\s*charset=.*$/);return o&&(s=o[1]),{name:{name:i,url:e.request.url},method:e.request.method,status:{code:e.response.status,text:e.response.statusText},contentType:s,duration:e.time,size:e.response._transferSize>0?e.response._transferSize:e.response.bodySize,start:e._monotonicTime-t.minimum,route:r,resource:e,contextId:n.contextId(e)}};function Q0(e){return e._wasAborted?"aborted":e._wasContinued?"continued":e._wasFulfilled?"fulfilled":e._apiRequest?"api":""}function G0(e,t){const n=K0(t==null?void 0:t.by);n&&e.sort(n),t.negate&&e.reverse()}function K0(e){if(e==="start")return(t,n)=>t.start-n.start;if(e==="duration")return(t,n)=>t.duration-n.duration;if(e==="status")return(t,n)=>t.status.code-n.status.code;if(e==="method")return(t,n)=>{const r=t.method,i=n.method;return r.localeCompare(i)};if(e==="size")return(t,n)=>t.size-n.size;if(e==="contentType")return(t,n)=>t.contentType.localeCompare(n.contentType);if(e==="name")return(t,n)=>t.name.name.localeCompare(n.name.name);if(e==="route")return(t,n)=>t.route.localeCompare(n.route);if(e==="contextId")return(t,n)=>t.contextId.localeCompare(n.contextId)}const vc={queryAll(e,t){t.startsWith("/")&&e.nodeType!==Node.DOCUMENT_NODE&&(t="."+t);const n=[],r=e.ownerDocument||e;if(!r)return n;const i=r.evaluate(t,e,null,XPathResult.ORDERED_NODE_ITERATOR_TYPE);for(let s=i.iterateNext();s;s=i.iterateNext())s.nodeType===Node.ELEMENT_NODE&&n.push(s);return n}};let $h="";function Y0(e){$h=e}function no(e,t){for(;t;){if(e.contains(t))return!0;t=zh(t)}return!1}function Te(e){if(e.parentElement)return e.parentElement;if(e.parentNode&&e.parentNode.nodeType===11&&e.parentNode.host)return e.parentNode.host}function Oh(e){let t=e;for(;t.parentNode;)t=t.parentNode;if(t.nodeType===11||t.nodeType===9)return t}function zh(e){for(;e.parentElement;)e=e.parentElement;return Te(e)}function Mr(e,t,n){for(;e;){const r=e.closest(t);if(n&&r!==n&&(r!=null&&r.contains(n)))return;if(r)return r;e=zh(e)}}function ar(e,t){return e.ownerDocument&&e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,t):void 0}function Dh(e,t){if(t=t??ar(e),!t)return!0;if(Element.prototype.checkVisibility&&$h!=="webkit"){if(!e.checkVisibility())return!1}else{const n=e.closest("details,summary");if(n!==e&&(n==null?void 0:n.nodeName)==="DETAILS"&&!n.open)return!1}return t.visibility==="visible"}function js(e){const t=ar(e);if(!t)return!0;if(t.display==="contents"){for(let r=e.firstChild;r;r=r.nextSibling)if(r.nodeType===1&&js(r)||r.nodeType===3&&Fh(r))return!0;return!1}if(!Dh(e,t))return!1;const n=e.getBoundingClientRect();return n.width>0&&n.height>0}function Fh(e){const t=e.ownerDocument.createRange();t.selectNode(e);const n=t.getBoundingClientRect();return n.width>0&&n.height>0}function xe(e){return e instanceof HTMLFormElement?"FORM":e.tagName.toUpperCase()}function yc(e){return e.hasAttribute("aria-label")||e.hasAttribute("aria-labelledby")}const wc="article:not([role]), aside:not([role]), main:not([role]), nav:not([role]), section:not([role]), [role=article], [role=complementary], [role=main], [role=navigation], [role=region]",J0=new Map([["aria-atomic",void 0],["aria-busy",void 0],["aria-controls",void 0],["aria-current",void 0],["aria-describedby",void 0],["aria-details",void 0],["aria-dropeffect",void 0],["aria-flowto",void 0],["aria-grabbed",void 0],["aria-hidden",void 0],["aria-keyshortcuts",void 0],["aria-label",new Set(["caption","code","deletion","emphasis","generic","insertion","paragraph","presentation","strong","subscript","superscript"])],["aria-labelledby",new Set(["caption","code","deletion","emphasis","generic","insertion","paragraph","presentation","strong","subscript","superscript"])],["aria-live",void 0],["aria-owns",void 0],["aria-relevant",void 0],["aria-roledescription",new Set(["generic"])]]);function Hh(e,t){return[...J0].some(([n,r])=>!(r!=null&&r.has(t||""))&&e.hasAttribute(n))}function Uh(e){return!Number.isNaN(Number(String(e.getAttribute("tabindex"))))}function Z0(e){return!ep(e)&&(ey(e)||Uh(e))}function ey(e){const t=xe(e);return["BUTTON","DETAILS","SELECT","TEXTAREA"].includes(t)?!0:t==="A"||t==="AREA"?e.hasAttribute("href"):t==="INPUT"?!e.hidden:!1}const jo={A:e=>e.hasAttribute("href")?"link":null,AREA:e=>e.hasAttribute("href")?"link":null,ARTICLE:()=>"article",ASIDE:()=>"complementary",BLOCKQUOTE:()=>"blockquote",BUTTON:()=>"button",CAPTION:()=>"caption",CODE:()=>"code",DATALIST:()=>"listbox",DD:()=>"definition",DEL:()=>"deletion",DETAILS:()=>"group",DFN:()=>"term",DIALOG:()=>"dialog",DT:()=>"term",EM:()=>"emphasis",FIELDSET:()=>"group",FIGURE:()=>"figure",FOOTER:e=>Mr(e,wc)?null:"contentinfo",FORM:e=>yc(e)?"form":null,H1:()=>"heading",H2:()=>"heading",H3:()=>"heading",H4:()=>"heading",H5:()=>"heading",H6:()=>"heading",HEADER:e=>Mr(e,wc)?null:"banner",HR:()=>"separator",HTML:()=>"document",IMG:e=>e.getAttribute("alt")===""&&!e.getAttribute("title")&&!Hh(e)&&!Uh(e)?"presentation":"img",INPUT:e=>{const t=e.type.toLowerCase();if(t==="search")return e.hasAttribute("list")?"combobox":"searchbox";if(["email","tel","text","url",""].includes(t)){const n=pi(e,e.getAttribute("list"))[0];return n&&xe(n)==="DATALIST"?"combobox":"textbox"}return t==="hidden"?"":{button:"button",checkbox:"checkbox",image:"button",number:"spinbutton",radio:"radio",range:"slider",reset:"button",submit:"button"}[t]||"textbox"},INS:()=>"insertion",LI:()=>"listitem",MAIN:()=>"main",MARK:()=>"mark",MATH:()=>"math",MENU:()=>"list",METER:()=>"meter",NAV:()=>"navigation",OL:()=>"list",OPTGROUP:()=>"group",OPTION:()=>"option",OUTPUT:()=>"status",P:()=>"paragraph",PROGRESS:()=>"progressbar",SECTION:e=>yc(e)?"region":null,SELECT:e=>e.hasAttribute("multiple")||e.size>1?"listbox":"combobox",STRONG:()=>"strong",SUB:()=>"subscript",SUP:()=>"superscript",SVG:()=>"img",TABLE:()=>"table",TBODY:()=>"rowgroup",TD:e=>{const t=Mr(e,"table"),n=t?Ps(t):"";return n==="grid"||n==="treegrid"?"gridcell":"cell"},TEXTAREA:()=>"textbox",TFOOT:()=>"rowgroup",TH:e=>{if(e.getAttribute("scope")==="col")return"columnheader";if(e.getAttribute("scope")==="row")return"rowheader";const t=Mr(e,"table"),n=t?Ps(t):"";return n==="grid"||n==="treegrid"?"gridcell":"cell"},THEAD:()=>"rowgroup",TIME:()=>"time",TR:()=>"row",UL:()=>"list"},ty={DD:["DL","DIV"],DIV:["DL"],DT:["DL","DIV"],LI:["OL","UL"],TBODY:["TABLE"],TD:["TR"],TFOOT:["TABLE"],TH:["TR"],THEAD:["TABLE"],TR:["THEAD","TBODY","TFOOT","TABLE"]};function xc(e){var r;const t=((r=jo[xe(e)])==null?void 0:r.call(jo,e))||"";if(!t)return null;let n=e;for(;n;){const i=Te(n),s=ty[xe(n)];if(!s||!i||!s.includes(xe(i)))break;const o=Ps(i);if((o==="none"||o==="presentation")&&!Bh(i,o))return o;n=i}return t}const ny=["alert","alertdialog","application","article","banner","blockquote","button","caption","cell","checkbox","code","columnheader","combobox","command","complementary","composite","contentinfo","definition","deletion","dialog","directory","document","emphasis","feed","figure","form","generic","grid","gridcell","group","heading","img","input","insertion","landmark","link","list","listbox","listitem","log","main","marquee","math","meter","menu","menubar","menuitem","menuitemcheckbox","menuitemradio","navigation","none","note","option","paragraph","presentation","progressbar","radio","radiogroup","range","region","roletype","row","rowgroup","rowheader","scrollbar","search","searchbox","section","sectionhead","select","separator","slider","spinbutton","status","strong","structure","subscript","superscript","switch","tab","table","tablist","tabpanel","term","textbox","time","timer","toolbar","tooltip","tree","treegrid","treeitem","widget","window"],ry=["command","composite","input","landmark","range","roletype","section","sectionhead","select","structure","widget","window"],iy=ny.filter(e=>!ry.includes(e));function Ps(e){return(e.getAttribute("role")||"").split(" ").map(n=>n.trim()).find(n=>iy.includes(n))||null}function Bh(e,t){return Hh(e,t)||Z0(e)}function Ne(e){const t=Ps(e);if(!t)return xc(e);if(t==="none"||t==="presentation"){const n=xc(e);if(Bh(e,n))return n}return t}function Vh(e){return e===null?void 0:e.toLowerCase()==="true"}function ht(e){if(["STYLE","SCRIPT","NOSCRIPT","TEMPLATE"].includes(xe(e)))return!0;const t=ar(e),n=e.nodeName==="SLOT";if((t==null?void 0:t.display)==="contents"&&!n){for(let i=e.firstChild;i;i=i.nextSibling)if(i.nodeType===1&&!ht(i)||i.nodeType===3&&Fh(i))return!1;return!0}return!(e.nodeName==="OPTION"&&!!e.closest("select"))&&!n&&!Dh(e,t)?!0:Wh(e)}function Wh(e){let t=Rt==null?void 0:Rt.get(e);if(t===void 0){if(t=!1,e.parentElement&&e.parentElement.shadowRoot&&!e.assignedSlot&&(t=!0),!t){const n=ar(e);t=!n||n.display==="none"||Vh(e.getAttribute("aria-hidden"))===!0}if(!t){const n=Te(e);n&&(t=Wh(n))}Rt==null||Rt.set(e,t)}return t}function pi(e,t){if(!t)return[];const n=Oh(e);if(!n)return[];try{const r=t.split(" ").filter(s=>!!s),i=new Set;for(const s of r){const o=n.querySelector("#"+CSS.escape(s));o&&i.add(o)}return[...i]}catch{return[]}}function xt(e){return e.trim()}function ns(e){return e.split(" ").map(t=>t.replace(/\r\n/g,`
+`).replace(/\s\s*/g," ")).join(" ").trim()}function _c(e,t){const n=[...e.querySelectorAll(t)];for(const r of pi(e,e.getAttribute("aria-owns")))r.matches(t)&&n.push(r),n.push(...r.querySelectorAll(t));return n}function Sc(e,t){const n=t==="::before"?qa:Xa;if(n!=null&&n.has(e))return(n==null?void 0:n.get(e))||"";const r=ar(e,t),i=sy(r);return n&&n.set(e,i),i}function sy(e){if(!e)return"";const t=e.content;if(t[0]==="'"&&t[t.length-1]==="'"||t[0]==='"'&&t[t.length-1]==='"'){const n=t.substring(1,t.length-1);return(e.display||"inline")!=="inline"?" "+n+" ":n}return""}function qh(e){const t=e.getAttribute("aria-labelledby");return t===null?null:pi(e,t)}function oy(e,t){const n=["button","cell","checkbox","columnheader","gridcell","heading","link","menuitem","menuitemcheckbox","menuitemradio","option","radio","row","rowheader","switch","tab","tooltip","treeitem"].includes(e),r=t&&["","caption","code","contentinfo","definition","deletion","emphasis","insertion","list","listitem","mark","none","paragraph","presentation","region","row","rowgroup","section","strong","subscript","superscript","table","term","time"].includes(e);return n||r}function Rs(e,t){const n=t?Ba:Ua;let r=n==null?void 0:n.get(e);return r===void 0&&(r="",["caption","code","definition","deletion","emphasis","generic","insertion","mark","paragraph","presentation","strong","subscript","suggestion","superscript","term","time"].includes(Ne(e)||"")||(r=ns(ft(e,{includeHidden:t,visitedElements:new Set,embeddedInDescribedBy:void 0,embeddedInLabelledBy:void 0,embeddedInLabel:void 0,embeddedInNativeTextAlternative:void 0,embeddedInTargetElement:"self"}))),n==null||n.set(e,r)),r}function Ec(e,t){const n=t?Wa:Va;let r=n==null?void 0:n.get(e);if(r===void 0){if(r="",e.hasAttribute("aria-describedby")){const i=pi(e,e.getAttribute("aria-describedby"));r=ns(i.map(s=>ft(s,{includeHidden:t,visitedElements:new Set,embeddedInLabelledBy:void 0,embeddedInLabel:void 0,embeddedInNativeTextAlternative:void 0,embeddedInTargetElement:"none",embeddedInDescribedBy:{element:s,hidden:ht(s)}})).join(" "))}else e.hasAttribute("aria-description")?r=ns(e.getAttribute("aria-description")||""):r=ns(e.getAttribute("title")||"");n==null||n.set(e,r)}return r}function ft(e,t){var a,u,c,h;if(t.visitedElements.has(e))return"";const n={...t,embeddedInTargetElement:t.embeddedInTargetElement==="self"?"descendant":t.embeddedInTargetElement};if(!t.includeHidden&&!((a=t.embeddedInLabelledBy)!=null&&a.hidden)&&!((u=t.embeddedInDescribedBy)!=null&&u.hidden)&&!((c=t==null?void 0:t.embeddedInNativeTextAlternative)!=null&&c.hidden)&&!((h=t==null?void 0:t.embeddedInLabel)!=null&&h.hidden)&&ht(e))return t.visitedElements.add(e),"";const r=qh(e);if(!t.embeddedInLabelledBy){const d=(r||[]).map(g=>ft(g,{...t,embeddedInLabelledBy:{element:g,hidden:ht(g)},embeddedInDescribedBy:void 0,embeddedInTargetElement:"none",embeddedInLabel:void 0,embeddedInNativeTextAlternative:void 0})).join(" ");if(d)return d}const i=Ne(e)||"",s=xe(e);if(t.embeddedInLabel||t.embeddedInLabelledBy||t.embeddedInTargetElement==="descendant"){const d=[...e.labels||[]].includes(e),g=(r||[]).includes(e);if(!d&&!g){if(i==="textbox")return t.visitedElements.add(e),s==="INPUT"||s==="TEXTAREA"?e.value:e.textContent||"";if(["combobox","listbox"].includes(i)){t.visitedElements.add(e);let y;if(s==="SELECT")y=[...e.selectedOptions],!y.length&&e.options.length&&y.push(e.options[0]);else{const w=i==="combobox"?_c(e,"*").find(x=>Ne(x)==="listbox"):e;y=w?_c(w,'[aria-selected="true"]').filter(x=>Ne(x)==="option"):[]}return!y.length&&s==="INPUT"?e.value:y.map(w=>ft(w,n)).join(" ")}if(["progressbar","scrollbar","slider","spinbutton","meter"].includes(i))return t.visitedElements.add(e),e.hasAttribute("aria-valuetext")?e.getAttribute("aria-valuetext")||"":e.hasAttribute("aria-valuenow")?e.getAttribute("aria-valuenow")||"":e.getAttribute("value")||"";if(["menu"].includes(i))return t.visitedElements.add(e),""}}const o=e.getAttribute("aria-label")||"";if(xt(o))return t.visitedElements.add(e),o;if(!["presentation","none"].includes(i)){if(s==="INPUT"&&["button","submit","reset"].includes(e.type)){t.visitedElements.add(e);const d=e.value||"";return xt(d)?d:e.type==="submit"?"Submit":e.type==="reset"?"Reset":e.getAttribute("title")||""}if(s==="INPUT"&&e.type==="image"){t.visitedElements.add(e);const d=e.labels||[];if(d.length&&!t.embeddedInLabelledBy)return Pi(d,t);const g=e.getAttribute("alt")||"";if(xt(g))return g;const y=e.getAttribute("title")||"";return xt(y)?y:"Submit"}if(!r&&s==="BUTTON"){t.visitedElements.add(e);const d=e.labels||[];if(d.length)return Pi(d,t)}if(!r&&s==="OUTPUT"){t.visitedElements.add(e);const d=e.labels||[];return d.length?Pi(d,t):e.getAttribute("title")||""}if(!r&&(s==="TEXTAREA"||s==="SELECT"||s==="INPUT")){t.visitedElements.add(e);const d=e.labels||[];if(d.length)return Pi(d,t);const g=s==="INPUT"&&["text","password","search","tel","email","url"].includes(e.type)||s==="TEXTAREA",y=e.getAttribute("placeholder")||"",w=e.getAttribute("title")||"";return!g||w?w:y}if(!r&&s==="FIELDSET"){t.visitedElements.add(e);for(let g=e.firstElementChild;g;g=g.nextElementSibling)if(xe(g)==="LEGEND")return ft(g,{...n,embeddedInNativeTextAlternative:{element:g,hidden:ht(g)}});return e.getAttribute("title")||""}if(!r&&s==="FIGURE"){t.visitedElements.add(e);for(let g=e.firstElementChild;g;g=g.nextElementSibling)if(xe(g)==="FIGCAPTION")return ft(g,{...n,embeddedInNativeTextAlternative:{element:g,hidden:ht(g)}});return e.getAttribute("title")||""}if(s==="IMG"){t.visitedElements.add(e);const d=e.getAttribute("alt")||"";return xt(d)?d:e.getAttribute("title")||""}if(s==="TABLE"){t.visitedElements.add(e);for(let g=e.firstElementChild;g;g=g.nextElementSibling)if(xe(g)==="CAPTION")return ft(g,{...n,embeddedInNativeTextAlternative:{element:g,hidden:ht(g)}});const d=e.getAttribute("summary")||"";if(d)return d}if(s==="AREA"){t.visitedElements.add(e);const d=e.getAttribute("alt")||"";return xt(d)?d:e.getAttribute("title")||""}if(s==="SVG"||e.ownerSVGElement){t.visitedElements.add(e);for(let d=e.firstElementChild;d;d=d.nextElementSibling)if(xe(d)==="TITLE"&&d.ownerSVGElement)return ft(d,{...n,embeddedInLabelledBy:{element:d,hidden:ht(d)}})}if(e.ownerSVGElement&&s==="A"){const d=e.getAttribute("xlink:title")||"";if(xt(d))return t.visitedElements.add(e),d}}const l=s==="SUMMARY"&&!["presentation","none"].includes(i);if(oy(i,t.embeddedInTargetElement==="descendant")||l||t.embeddedInLabelledBy||t.embeddedInDescribedBy||t.embeddedInLabel||t.embeddedInNativeTextAlternative){t.visitedElements.add(e);const d=[],g=(p,m)=>{var v;if(!(m&&p.assignedSlot))if(p.nodeType===1){const E=((v=ar(p))==null?void 0:v.display)||"inline";let C=ft(p,n);(E!=="inline"||p.nodeName==="BR")&&(C=" "+C+" "),d.push(C)}else p.nodeType===3&&d.push(p.textContent||"")};d.push(Sc(e,"::before"));const y=e.nodeName==="SLOT"?e.assignedNodes():[];if(y.length)for(const p of y)g(p,!1);else{for(let p=e.firstChild;p;p=p.nextSibling)g(p,!0);if(e.shadowRoot)for(let p=e.shadowRoot.firstChild;p;p=p.nextSibling)g(p,!0);for(const p of pi(e,e.getAttribute("aria-owns")))g(p,!0)}d.push(Sc(e,"::after"));const w=d.join("");if(t.embeddedInTargetElement==="self"?xt(w):w)return w}if(!["presentation","none"].includes(i)||s==="IFRAME"){t.visitedElements.add(e);const d=e.getAttribute("title")||"";if(xt(d))return d}return t.visitedElements.add(e),""}const Xh=["gridcell","option","row","tab","rowheader","columnheader","treeitem"];function ly(e){return xe(e)==="OPTION"?e.selected:Xh.includes(Ne(e)||"")?Vh(e.getAttribute("aria-selected"))===!0:!1}const Qh=["checkbox","menuitemcheckbox","option","radio","switch","menuitemradio","treeitem"];function ay(e){const t=Gh(e,!0);return t==="error"?!1:t}function Gh(e,t){const n=xe(e);if(t&&n==="INPUT"&&e.indeterminate)return"mixed";if(n==="INPUT"&&["checkbox","radio"].includes(e.type))return e.checked;if(Qh.includes(Ne(e)||"")){const r=e.getAttribute("aria-checked");return r==="true"?!0:t&&r==="mixed"?"mixed":!1}return"error"}const Kh=["button"];function uy(e){if(Kh.includes(Ne(e)||"")){const t=e.getAttribute("aria-pressed");if(t==="true")return!0;if(t==="mixed")return"mixed"}return!1}const Yh=["application","button","checkbox","combobox","gridcell","link","listbox","menuitem","row","rowheader","tab","treeitem","columnheader","menuitemcheckbox","menuitemradio","rowheader","switch"];function cy(e){if(xe(e)==="DETAILS")return e.open;if(Yh.includes(Ne(e)||"")){const t=e.getAttribute("aria-expanded");return t===null?"none":t==="true"}return"none"}const Jh=["heading","listitem","row","treeitem"];function dy(e){const t={H1:1,H2:2,H3:3,H4:4,H5:5,H6:6}[xe(e)];if(t)return t;if(Jh.includes(Ne(e)||"")){const n=e.getAttribute("aria-level"),r=n===null?Number.NaN:Number(n);if(Number.isInteger(r)&&r>=1)return r}return 0}const fy=["application","button","composite","gridcell","group","input","link","menuitem","scrollbar","separator","tab","checkbox","columnheader","combobox","grid","listbox","menu","menubar","menuitemcheckbox","menuitemradio","option","radio","radiogroup","row","rowheader","searchbox","select","slider","spinbutton","switch","tablist","textbox","toolbar","tree","treegrid","treeitem"];function Zh(e){return ep(e)||np(e)}function ep(e){return["BUTTON","INPUT","SELECT","TEXTAREA","OPTION","OPTGROUP"].includes(e.tagName)&&(e.hasAttribute("disabled")||tp(e))}function tp(e){return e?xe(e)==="FIELDSET"&&e.hasAttribute("disabled")?!0:tp(e.parentElement):!1}function np(e){if(!e)return!1;if(fy.includes(Ne(e)||"")){const t=(e.getAttribute("aria-disabled")||"").toLowerCase();if(t==="true")return!0;if(t==="false")return!1}return np(Te(e))}function Pi(e,t){return[...e].map(n=>ft(n,{...t,embeddedInLabel:{element:n,hidden:ht(n)},embeddedInNativeTextAlternative:void 0,embeddedInLabelledBy:void 0,embeddedInDescribedBy:void 0,embeddedInTargetElement:"none"})).filter(n=>!!n).join(" ")}let Ua,Ba,Va,Wa,Rt,qa,Xa,rp=0;function ip(){++rp,Ua??(Ua=new Map),Ba??(Ba=new Map),Va??(Va=new Map),Wa??(Wa=new Map),Rt??(Rt=new Map),qa??(qa=new Map),Xa??(Xa=new Map)}function sp(){--rp||(Ua=void 0,Ba=void 0,Va=void 0,Wa=void 0,Rt=void 0,qa=void 0,Xa=void 0)}function op(e,t){for(const n of t.jsonPath)e!=null&&(e=e[n]);return lp(e,t)}function lp(e,t){const n=typeof e=="string"&&!t.caseSensitive?e.toUpperCase():e,r=typeof t.value=="string"&&!t.caseSensitive?t.value.toUpperCase():t.value;return t.op==="<truthy>"?!!n:t.op==="="?r instanceof RegExp?typeof n=="string"&&!!n.match(r):n===r:typeof n!="string"||typeof r!="string"?!1:t.op==="*="?n.includes(r):t.op==="^="?n.startsWith(r):t.op==="$="?n.endsWith(r):t.op==="|="?n===r||n.startsWith(r+"-"):t.op==="~="?n.split(" ").includes(r):!1}function Qa(e){const t=e.ownerDocument;return e.nodeName==="SCRIPT"||e.nodeName==="NOSCRIPT"||e.nodeName==="STYLE"||t.head&&t.head.contains(e)}function je(e,t){let n=e.get(t);if(n===void 0){if(n={full:"",normalized:"",immediate:[]},!Qa(t)){let r="";if(t instanceof HTMLInputElement&&(t.type==="submit"||t.type==="button"))n={full:t.value,normalized:Ue(t.value),immediate:[t.value]};else{for(let i=t.firstChild;i;i=i.nextSibling)i.nodeType===Node.TEXT_NODE?(n.full+=i.nodeValue||"",r+=i.nodeValue||""):(r&&n.immediate.push(r),r="",i.nodeType===Node.ELEMENT_NODE&&(n.full+=je(e,i).full));r&&n.immediate.push(r),t.shadowRoot&&(n.full+=je(e,t.shadowRoot).full),n.full&&(n.normalized=Ue(n.full))}}e.set(t,n)}return n}function ro(e,t,n){if(Qa(t)||!n(je(e,t)))return"none";for(let r=t.firstChild;r;r=r.nextSibling)if(r.nodeType===Node.ELEMENT_NODE&&n(je(e,r)))return"selfAndChildren";return t.shadowRoot&&n(je(e,t.shadowRoot))?"selfAndChildren":"self"}function ap(e,t){const n=qh(t);if(n)return n.map(s=>je(e,s));const r=t.getAttribute("aria-label");if(r!==null&&r.trim())return[{full:r,normalized:Ue(r),immediate:[r]}];const i=t.nodeName==="INPUT"&&t.type!=="hidden";if(["BUTTON","METER","OUTPUT","PROGRESS","SELECT","TEXTAREA"].includes(t.nodeName)||i){const s=t.labels;if(s)return[...s].map(o=>je(e,o))}return[]}function Tc(e){return e.displayName||e.name||"Anonymous"}function hy(e){if(e.type)switch(typeof e.type){case"function":return Tc(e.type);case"string":return e.type;case"object":return e.type.displayName||(e.type.render?Tc(e.type.render):"")}if(e._currentElement){const t=e._currentElement.type;if(typeof t=="string")return t;if(typeof t=="function")return t.displayName||t.name||"Anonymous"}return""}function py(e){var t;return e.key??((t=e._currentElement)==null?void 0:t.key)}function my(e){if(e.child){const n=[];for(let r=e.child;r;r=r.sibling)n.push(r);return n}if(!e._currentElement)return[];const t=n=>{var i;const r=(i=n._currentElement)==null?void 0:i.type;return typeof r=="function"||typeof r=="string"};if(e._renderedComponent){const n=e._renderedComponent;return t(n)?[n]:[]}return e._renderedChildren?[...Object.values(e._renderedChildren)].filter(t):[]}function gy(e){var r;const t=e.memoizedProps||((r=e._currentElement)==null?void 0:r.props);if(!t||typeof t=="string")return t;const n={...t};return delete n.children,n}function up(e){var r;const t={key:py(e),name:hy(e),children:my(e).map(up),rootElements:[],props:gy(e)},n=e.stateNode||e._hostNode||((r=e._renderedComponent)==null?void 0:r._hostNode);if(n instanceof Element)t.rootElements.push(n);else for(const i of t.children)t.rootElements.push(...i.rootElements);return t}function cp(e,t,n=[]){t(e)&&n.push(e);for(const r of e.children)cp(r,t,n);return n}function dp(e,t=[]){const r=(e.ownerDocument||e).createTreeWalker(e,NodeFilter.SHOW_ELEMENT);do{const i=r.currentNode,s=i,o=Object.keys(s).find(a=>a.startsWith("__reactContainer")&&s[a]!==null);if(o)t.push(s[o].stateNode.current);else{const a="_reactRootContainer";s.hasOwnProperty(a)&&s[a]!==null&&t.push(s[a]._internalRoot.current)}if(i instanceof Element&&i.hasAttribute("data-reactroot"))for(const a of Object.keys(i))(a.startsWith("__reactInternalInstance")||a.startsWith("__reactFiber"))&&t.push(i[a]);const l=i instanceof Element?i.shadowRoot:null;l&&dp(l,t)}while(r.nextNode());return t}const vy={queryAll(e,t){const{name:n,attributes:r}=cn(t,!1),o=dp(e.ownerDocument||e).map(a=>up(a)).map(a=>cp(a,u=>{const c=u.props??{};if(u.key!==void 0&&(c.key=u.key),n&&u.name!==n||u.rootElements.some(h=>!no(e,h)))return!1;for(const h of r)if(!op(c,h))return!1;return!0})).flat(),l=new Set;for(const a of o)for(const u of a.rootElements)l.add(u);return[...l]}};function fp(e,t){const n=e.replace(/^[a-zA-Z]:/,"").replace(/\\/g,"/");let r=n.substring(n.lastIndexOf("/")+1);return t&&r.endsWith(t)&&(r=r.substring(0,r.length-t.length)),r}function yy(e,t){return t?t.toUpperCase():""}const wy=/(?:^|[-_/])(\w)/g,hp=e=>e&&e.replace(wy,yy);function xy(e){function t(c){const h=c.name||c._componentTag||c.__playwright_guessedName;if(h)return h;const d=c.__file;if(d)return hp(fp(d,".vue"))}function n(c,h){return c.type.__playwright_guessedName=h,h}function r(c){var d,g,y,w;const h=t(c.type||{});if(h)return h;if(c.root===c)return"Root";for(const x in(g=(d=c.parent)==null?void 0:d.type)==null?void 0:g.components)if(((y=c.parent)==null?void 0:y.type.components[x])===c.type)return n(c,x);for(const x in(w=c.appContext)==null?void 0:w.components)if(c.appContext.components[x]===c.type)return n(c,x);return"Anonymous Component"}function i(c){return c._isBeingDestroyed||c.isUnmounted}function s(c){return c.subTree.type.toString()==="Symbol(Fragment)"}function o(c){const h=[];return c.component&&h.push(c.component),c.suspense&&h.push(...o(c.suspense.activeBranch)),Array.isArray(c.children)&&c.children.forEach(d=>{d.component?h.push(d.component):h.push(...o(d))}),h.filter(d=>{var g;return!i(d)&&!((g=d.type.devtools)!=null&&g.hide)})}function l(c){return s(c)?a(c.subTree):[c.subTree.el]}function a(c){if(!c.children)return[];const h=[];for(let d=0,g=c.children.length;d<g;d++){const y=c.children[d];y.component?h.push(...l(y.component)):y.el&&h.push(y.el)}return h}function u(c){return{name:r(c),children:o(c.subTree).map(u),rootElements:l(c),props:c.props}}return u(e)}function _y(e){function t(s){const o=s.displayName||s.name||s._componentTag;if(o)return o;const l=s.__file;if(l)return hp(fp(l,".vue"))}function n(s){const o=t(s.$options||s.fnOptions||{});return o||(s.$root===s?"Root":"Anonymous Component")}function r(s){return s.$children?s.$children:Array.isArray(s.subTree.children)?s.subTree.children.filter(o=>!!o.component).map(o=>o.component):[]}function i(s){return{name:n(s),children:r(s).map(i),rootElements:[s.$el],props:s._props}}return i(e)}function pp(e,t,n=[]){t(e)&&n.push(e);for(const r of e.children)pp(r,t,n);return n}function mp(e,t=[]){const r=(e.ownerDocument||e).createTreeWalker(e,NodeFilter.SHOW_ELEMENT),i=new Set;do{const s=r.currentNode;s.__vue__&&i.add(s.__vue__.$root),s.__vue_app__&&s._vnode&&s._vnode.component&&t.push({root:s._vnode.component,version:3});const o=s instanceof Element?s.shadowRoot:null;o&&mp(o,t)}while(r.nextNode());for(const s of i)t.push({version:2,root:s});return t}const Sy={queryAll(e,t){const n=e.ownerDocument||e,{name:r,attributes:i}=cn(t,!1),l=mp(n).map(u=>u.version===3?xy(u.root):_y(u.root)).map(u=>pp(u,c=>{if(r&&c.name!==r||c.rootElements.some(h=>!no(e,h)))return!1;for(const h of i)if(!op(c.props,h))return!1;return!0})).flat(),a=new Set;for(const u of l)for(const c of u.rootElements)a.add(c);return[...a]}},gp=["selected","checked","pressed","expanded","level","disabled","name","include-hidden"];gp.sort();function Sr(e,t,n){if(!t.includes(n))throw new Error(`"${e}" attribute is only supported for roles: ${t.slice().sort().map(r=>`"${r}"`).join(", ")}`)}function Sn(e,t){if(e.op!=="<truthy>"&&!t.includes(e.value))throw new Error(`"${e.name}" must be one of ${t.map(n=>JSON.stringify(n)).join(", ")}`)}function En(e,t){if(!t.includes(e.op))throw new Error(`"${e.name}" does not support "${e.op}" matcher`)}function Ey(e,t){const n={role:t};for(const r of e)switch(r.name){case"checked":{Sr(r.name,Qh,t),Sn(r,[!0,!1,"mixed"]),En(r,["<truthy>","="]),n.checked=r.op==="<truthy>"?!0:r.value;break}case"pressed":{Sr(r.name,Kh,t),Sn(r,[!0,!1,"mixed"]),En(r,["<truthy>","="]),n.pressed=r.op==="<truthy>"?!0:r.value;break}case"selected":{Sr(r.name,Xh,t),Sn(r,[!0,!1]),En(r,["<truthy>","="]),n.selected=r.op==="<truthy>"?!0:r.value;break}case"expanded":{Sr(r.name,Yh,t),Sn(r,[!0,!1]),En(r,["<truthy>","="]),n.expanded=r.op==="<truthy>"?!0:r.value;break}case"level":{if(Sr(r.name,Jh,t),typeof r.value=="string"&&(r.value=+r.value),r.op!=="="||typeof r.value!="number"||Number.isNaN(r.value))throw new Error('"level" attribute must be compared to a number');n.level=r.value;break}case"disabled":{Sn(r,[!0,!1]),En(r,["<truthy>","="]),n.disabled=r.op==="<truthy>"?!0:r.value;break}case"name":{if(r.op==="<truthy>")throw new Error('"name" attribute must have a value');if(typeof r.value!="string"&&!(r.value instanceof RegExp))throw new Error('"name" attribute must be a string or a regular expression');n.name=r.value,n.nameOp=r.op,n.exact=r.caseSensitive;break}case"include-hidden":{Sn(r,[!0,!1]),En(r,["<truthy>","="]),n.includeHidden=r.op==="<truthy>"?!0:r.value;break}default:throw new Error(`Unknown attribute "${r.name}", must be one of ${gp.map(i=>`"${i}"`).join(", ")}.`)}return n}function Ty(e,t,n){const r=[],i=o=>{if(Ne(o)===t.role&&!(t.selected!==void 0&&ly(o)!==t.selected)&&!(t.checked!==void 0&&ay(o)!==t.checked)&&!(t.pressed!==void 0&&uy(o)!==t.pressed)&&!(t.expanded!==void 0&&cy(o)!==t.expanded)&&!(t.level!==void 0&&dy(o)!==t.level)&&!(t.disabled!==void 0&&Zh(o)!==t.disabled)&&!(!t.includeHidden&&ht(o))){if(t.name!==void 0){const l=Ue(Rs(o,!!t.includeHidden));if(typeof t.name=="string"&&(t.name=Ue(t.name)),n&&!t.exact&&t.nameOp==="="&&(t.nameOp="*="),!lp(l,{name:"",jsonPath:[],op:t.nameOp||"=",value:t.name,caseSensitive:!!t.exact}))return}r.push(o)}},s=o=>{const l=[];o.shadowRoot&&l.push(o.shadowRoot);for(const a of o.querySelectorAll("*"))i(a),a.shadowRoot&&l.push(a.shadowRoot);l.forEach(s)};return s(e),r}function kc(e){return{queryAll:(t,n)=>{const r=cn(n,!0),i=r.name.toLowerCase();if(!i)throw new Error("Role must not be empty");const s=Ey(r.attributes,i);ip();try{return Ty(t,s,e)}finally{sp()}}}}function ky(e,t,n){const r=e.left-t.right;if(!(r<0||n!==void 0&&r>n))return r+Math.max(t.bottom-e.bottom,0)+Math.max(e.top-t.top,0)}function Ny(e,t,n){const r=t.left-e.right;if(!(r<0||n!==void 0&&r>n))return r+Math.max(t.bottom-e.bottom,0)+Math.max(e.top-t.top,0)}function Cy(e,t,n){const r=t.top-e.bottom;if(!(r<0||n!==void 0&&r>n))return r+Math.max(e.left-t.left,0)+Math.max(t.right-e.right,0)}function by(e,t,n){const r=e.top-t.bottom;if(!(r<0||n!==void 0&&r>n))return r+Math.max(e.left-t.left,0)+Math.max(t.right-e.right,0)}function Ly(e,t,n){const r=n===void 0?50:n;let i=0;return e.left-t.right>=0&&(i+=e.left-t.right),t.left-e.right>=0&&(i+=t.left-e.right),t.top-e.bottom>=0&&(i+=t.top-e.bottom),e.top-t.bottom>=0&&(i+=e.top-t.bottom),i>r?void 0:i}const Ay=["left-of","right-of","above","below","near"];function vp(e,t,n,r){const i=t.getBoundingClientRect(),s={"left-of":Ny,"right-of":ky,above:Cy,below:by,near:Ly}[e];let o;for(const l of n){if(l===t)continue;const a=s(i,l.getBoundingClientRect(),r);a!==void 0&&(o===void 0||a<o)&&(o=a)}return o}class My{constructor(t){this._engines=new Map,this._cacheQueryCSS=new Map,this._cacheMatches=new Map,this._cacheQuery=new Map,this._cacheMatchesSimple=new Map,this._cacheMatchesParents=new Map,this._cacheCallMatches=new Map,this._cacheCallQuery=new Map,this._cacheQuerySimple=new Map,this._cacheText=new Map,this._retainCacheCounter=0;for(const[i,s]of t)this._engines.set(i,s);this._engines.set("not",Py),this._engines.set("is",Ir),this._engines.set("where",Ir),this._engines.set("has",Iy),this._engines.set("scope",jy),this._engines.set("light",Ry),this._engines.set("visible",$y),this._engines.set("text",Oy),this._engines.set("text-is",zy),this._engines.set("text-matches",Dy),this._engines.set("has-text",Fy),this._engines.set("right-of",Er("right-of")),this._engines.set("left-of",Er("left-of")),this._engines.set("above",Er("above")),this._engines.set("below",Er("below")),this._engines.set("near",Er("near")),this._engines.set("nth-match",Hy);const n=[...this._engines.keys()];n.sort();const r=[...Ch];if(r.sort(),n.join("|")!==r.join("|"))throw new Error(`Please keep customCSSNames in sync with evaluator engines: ${n.join("|")} vs ${r.join("|")}`)}begin(){++this._retainCacheCounter}end(){--this._retainCacheCounter,this._retainCacheCounter||(this._cacheQueryCSS.clear(),this._cacheMatches.clear(),this._cacheQuery.clear(),this._cacheMatchesSimple.clear(),this._cacheMatchesParents.clear(),this._cacheCallMatches.clear(),this._cacheCallQuery.clear(),this._cacheQuerySimple.clear(),this._cacheText.clear())}_cached(t,n,r,i){t.has(n)||t.set(n,[]);const s=t.get(n),o=s.find(a=>r.every((u,c)=>a.rest[c]===u));if(o)return o.result;const l=i();return s.push({rest:r,result:l}),l}_checkSelector(t){if(!(typeof t=="object"&&t&&(Array.isArray(t)||"simples"in t&&t.simples.length)))throw new Error(`Malformed selector "${t}"`);return t}matches(t,n,r){const i=this._checkSelector(n);this.begin();try{return this._cached(this._cacheMatches,t,[i,r.scope,r.pierceShadow,r.originalScope],()=>Array.isArray(i)?this._matchesEngine(Ir,t,i,r):(this._hasScopeClause(i)&&(r=this._expandContextForScopeMatching(r)),this._matchesSimple(t,i.simples[i.simples.length-1].selector,r)?this._matchesParents(t,i,i.simples.length-2,r):!1))}finally{this.end()}}query(t,n){const r=this._checkSelector(n);this.begin();try{return this._cached(this._cacheQuery,r,[t.scope,t.pierceShadow,t.originalScope],()=>{if(Array.isArray(r))return this._queryEngine(Ir,t,r);this._hasScopeClause(r)&&(t=this._expandContextForScopeMatching(t));const i=this._scoreMap;this._scoreMap=new Map;let s=this._querySimple(t,r.simples[r.simples.length-1].selector);return s=s.filter(o=>this._matchesParents(o,r,r.simples.length-2,t)),this._scoreMap.size&&s.sort((o,l)=>{const a=this._scoreMap.get(o),u=this._scoreMap.get(l);return a===u?0:a===void 0?1:u===void 0?-1:a-u}),this._scoreMap=i,s})}finally{this.end()}}_markScore(t,n){this._scoreMap&&this._scoreMap.set(t,n)}_hasScopeClause(t){return t.simples.some(n=>n.selector.functions.some(r=>r.name==="scope"))}_expandContextForScopeMatching(t){if(t.scope.nodeType!==1)return t;const n=Te(t.scope);return n?{...t,scope:n,originalScope:t.originalScope||t.scope}:t}_matchesSimple(t,n,r){return this._cached(this._cacheMatchesSimple,t,[n,r.scope,r.pierceShadow,r.originalScope],()=>{if(t===r.scope||n.css&&!this._matchesCSS(t,n.css))return!1;for(const i of n.functions)if(!this._matchesEngine(this._getEngine(i.name),t,i.args,r))return!1;return!0})}_querySimple(t,n){return n.functions.length?this._cached(this._cacheQuerySimple,n,[t.scope,t.pierceShadow,t.originalScope],()=>{let r=n.css;const i=n.functions;r==="*"&&i.length&&(r=void 0);let s,o=-1;r!==void 0?s=this._queryCSS(t,r):(o=i.findIndex(l=>this._getEngine(l.name).query!==void 0),o===-1&&(o=0),s=this._queryEngine(this._getEngine(i[o].name),t,i[o].args));for(let l=0;l<i.length;l++){if(l===o)continue;const a=this._getEngine(i[l].name);a.matches!==void 0&&(s=s.filter(u=>this._matchesEngine(a,u,i[l].args,t)))}for(let l=0;l<i.length;l++){if(l===o)continue;const a=this._getEngine(i[l].name);a.matches===void 0&&(s=s.filter(u=>this._matchesEngine(a,u,i[l].args,t)))}return s}):this._queryCSS(t,n.css||"*")}_matchesParents(t,n,r,i){return r<0?!0:this._cached(this._cacheMatchesParents,t,[n,r,i.scope,i.pierceShadow,i.originalScope],()=>{const{selector:s,combinator:o}=n.simples[r];if(o===">"){const l=Ri(t,i);return!l||!this._matchesSimple(l,s,i)?!1:this._matchesParents(l,n,r-1,i)}if(o==="+"){const l=Po(t,i);return!l||!this._matchesSimple(l,s,i)?!1:this._matchesParents(l,n,r-1,i)}if(o===""){let l=Ri(t,i);for(;l;){if(this._matchesSimple(l,s,i)){if(this._matchesParents(l,n,r-1,i))return!0;if(n.simples[r-1].combinator==="")break}l=Ri(l,i)}return!1}if(o==="~"){let l=Po(t,i);for(;l;){if(this._matchesSimple(l,s,i)){if(this._matchesParents(l,n,r-1,i))return!0;if(n.simples[r-1].combinator==="~")break}l=Po(l,i)}return!1}if(o===">="){let l=t;for(;l;){if(this._matchesSimple(l,s,i)){if(this._matchesParents(l,n,r-1,i))return!0;if(n.simples[r-1].combinator==="")break}l=Ri(l,i)}return!1}throw new Error(`Unsupported combinator "${o}"`)})}_matchesEngine(t,n,r,i){if(t.matches)return this._callMatches(t,n,r,i);if(t.query)return this._callQuery(t,r,i).includes(n);throw new Error('Selector engine should implement "matches" or "query"')}_queryEngine(t,n,r){if(t.query)return this._callQuery(t,r,n);if(t.matches)return this._queryCSS(n,"*").filter(i=>this._callMatches(t,i,r,n));throw new Error('Selector engine should implement "matches" or "query"')}_callMatches(t,n,r,i){return this._cached(this._cacheCallMatches,n,[t,i.scope,i.pierceShadow,i.originalScope,...r],()=>t.matches(n,r,i,this))}_callQuery(t,n,r){return this._cached(this._cacheCallQuery,t,[r.scope,r.pierceShadow,r.originalScope,...n],()=>t.query(r,n,this))}_matchesCSS(t,n){return t.matches(n)}_queryCSS(t,n){return this._cached(this._cacheQueryCSS,n,[t.scope,t.pierceShadow,t.originalScope],()=>{let r=[];function i(s){if(r=r.concat([...s.querySelectorAll(n)]),!!t.pierceShadow){s.shadowRoot&&i(s.shadowRoot);for(const o of s.querySelectorAll("*"))o.shadowRoot&&i(o.shadowRoot)}}return i(t.scope),r})}_getEngine(t){const n=this._engines.get(t);if(!n)throw new Error(`Unknown selector engine "${t}"`);return n}}const Ir={matches(e,t,n,r){if(t.length===0)throw new Error('"is" engine expects non-empty selector list');return t.some(i=>r.matches(e,i,n))},query(e,t,n){if(t.length===0)throw new Error('"is" engine expects non-empty selector list');let r=[];for(const i of t)r=r.concat(n.query(e,i));return t.length===1?r:yp(r)}},Iy={matches(e,t,n,r){if(t.length===0)throw new Error('"has" engine expects non-empty selector list');return r.query({...n,scope:e},t).length>0}},jy={matches(e,t,n,r){if(t.length!==0)throw new Error('"scope" engine expects no arguments');const i=n.originalScope||n.scope;return i.nodeType===9?e===i.documentElement:e===i},query(e,t,n){if(t.length!==0)throw new Error('"scope" engine expects no arguments');const r=e.originalScope||e.scope;if(r.nodeType===9){const i=r.documentElement;return i?[i]:[]}return r.nodeType===1?[r]:[]}},Py={matches(e,t,n,r){if(t.length===0)throw new Error('"not" engine expects non-empty selector list');return!r.matches(e,t,n)}},Ry={query(e,t,n){return n.query({...e,pierceShadow:!1},t)},matches(e,t,n,r){return r.matches(e,t,{...n,pierceShadow:!1})}},$y={matches(e,t,n,r){if(t.length)throw new Error('"visible" engine expects no arguments');return js(e)}},Oy={matches(e,t,n,r){if(t.length!==1||typeof t[0]!="string")throw new Error('"text" engine expects a single string');const i=Ue(t[0]).toLowerCase(),s=o=>o.normalized.toLowerCase().includes(i);return ro(r._cacheText,e,s)==="self"}},zy={matches(e,t,n,r){if(t.length!==1||typeof t[0]!="string")throw new Error('"text-is" engine expects a single string');const i=Ue(t[0]),s=o=>!i&&!o.immediate.length?!0:o.immediate.some(l=>Ue(l)===i);return ro(r._cacheText,e,s)!=="none"}},Dy={matches(e,t,n,r){if(t.length===0||typeof t[0]!="string"||t.length>2||t.length===2&&typeof t[1]!="string")throw new Error('"text-matches" engine expects a regexp body and optional regexp flags');const i=new RegExp(t[0],t.length===2?t[1]:void 0),s=o=>i.test(o.full);return ro(r._cacheText,e,s)==="self"}},Fy={matches(e,t,n,r){if(t.length!==1||typeof t[0]!="string")throw new Error('"has-text" engine expects a single string');if(Qa(e))return!1;const i=Ue(t[0]).toLowerCase();return(o=>o.normalized.toLowerCase().includes(i))(je(r._cacheText,e))}};function Er(e){return{matches(t,n,r,i){const s=n.length&&typeof n[n.length-1]=="number"?n[n.length-1]:void 0,o=s===void 0?n:n.slice(0,n.length-1);if(n.length<1+(s===void 0?0:1))throw new Error(`"${e}" engine expects a selector list and optional maximum distance in pixels`);const l=i.query(r,o),a=vp(e,t,l,s);return a===void 0?!1:(i._markScore(t,a),!0)}}}const Hy={query(e,t,n){let r=t[t.length-1];if(t.length<2)throw new Error('"nth-match" engine expects non-empty selector list and an index argument');if(typeof r!="number"||r<1)throw new Error('"nth-match" engine expects a one-based index as the last argument');const i=Ir.query(e,t.slice(0,t.length-1),n);return r--,r<i.length?[i[r]]:[]}};function Ri(e,t){if(e!==t.scope)return t.pierceShadow?Te(e):e.parentElement||void 0}function Po(e,t){if(e!==t.scope)return e.previousElementSibling||void 0}function yp(e){const t=new Map,n=[],r=[];function i(o){let l=t.get(o);if(l)return l;const a=Te(o);return a?i(a).children.push(o):n.push(o),l={children:[],taken:!1},t.set(o,l),l}for(const o of e)i(o).taken=!0;function s(o){const l=t.get(o);if(l.taken&&r.push(o),l.children.length>1){const a=new Set(l.children);l.children=[];let u=o.firstElementChild;for(;u&&l.children.length<a.size;)a.has(u)&&l.children.push(u),u=u.nextElementSibling;for(u=o.shadowRoot?o.shadowRoot.firstElementChild:null;u&&l.children.length<a.size;)a.has(u)&&l.children.push(u),u=u.nextElementSibling}l.children.forEach(s)}return n.forEach(s),r}const Dl=new Map,Fl=new Map,wp=10,ur=wp/2,Nc=1,Uy=2,By=10,Vy=50,xp=100,_p=120,Sp=140,Ep=160,Hl=180,Tp=200,Wy=250,qy=xp+ur,Xy=_p+ur,Qy=Sp+ur,Gy=Ep+ur,Ky=Hl+ur,Yy=Tp+ur,Jy=300,Zy=500,ew=510,Ro=520,kp=530,Np=1e4,tw=1e7,nw=1e3;function Cc(e,t,n){e._evaluator.begin(),ip();try{let r=[];if(n.forTextExpect){let o=$i(e,t.ownerDocument.documentElement,n);for(let l=t;l;l=Te(l)){const a=Tn(e,l,{...n,noText:!0});if(!a)continue;if($t(a)<=nw){o=a;break}}r=[rs(o)]}else if(t=Mr(t,"button,select,input,[role=button],[role=checkbox],[role=radio],a,[role=link]",n.root)||t,n.multiple){const o=Tn(e,t,n),l=Tn(e,t,{...n,noText:!0});let a=[o,l];if(Dl.clear(),Fl.clear(),o&&$o(o)&&a.push(Tn(e,t,{...n,noCSSId:!0})),l&&$o(l)&&a.push(Tn(e,t,{...n,noText:!0,noCSSId:!0})),a=a.filter(Boolean),!a.length){const u=$i(e,t,n);a.push(u),$o(u)&&a.push($i(e,t,{...n,noCSSId:!0}))}r=[...new Set(a.map(u=>rs(u)))]}else{const o=Tn(e,t,n)||$i(e,t,n);r=[rs(o)]}const i=r[0],s=e.parseSelector(i);return{selector:i,selectors:r,elements:e.querySelectorAll(s,n.root??t.ownerDocument)}}finally{Dl.clear(),Fl.clear(),sp(),e._evaluator.end()}}function bc(e){return e.filter(t=>t[0].selector[0]!=="/")}function Tn(e,t,n){if(n.root&&!no(n.root,t))throw new Error("Target element must belong to the root's subtree");if(t===n.root)return[{engine:"css",selector:":scope",score:1}];if(t.ownerDocument.documentElement===t)return[{engine:"css",selector:"html",score:1}];const r=(s,o)=>{const l=s===t;let a=o?iw(e,s,s===t):[];s!==t&&(a=bc(a));const u=rw(e,s,n).filter(d=>!n.omitInternalEngines||!d.engine.startsWith("internal:")).map(d=>[d]);let c=Lc(e,n.root??t.ownerDocument,s,[...a,...u],l);a=bc(a);const h=d=>{const g=o&&!d.length,y=[...d,...u].filter(x=>c?$t(x)<$t(c):!0);let w=y[0];if(w)for(let x=Te(s);x&&x!==n.root;x=Te(x)){const p=i(x,g);if(!p||c&&$t([...p,...w])>=$t(c))continue;if(w=Lc(e,x,s,y,l),!w)return;const m=[...p,...w];(!c||$t(m)<$t(c))&&(c=m)}};return h(a),s===t&&a.length&&h([]),c},i=(s,o)=>{const l=o?Dl:Fl;let a=l.get(s);return a===void 0&&(a=r(s,o),l.set(s,a)),a};return r(t,!n.noText)}function rw(e,t,n){const r=[];{for(const o of["data-testid","data-test-id","data-test"])o!==n.testIdAttributeName&&t.getAttribute(o)&&r.push({engine:"css",selector:`[${o}=${xr(t.getAttribute(o))}]`,score:Uy});if(!n.noCSSId){const o=t.getAttribute("id");o&&!sw(o)&&r.push({engine:"css",selector:Cp(o),score:Zy})}r.push({engine:"css",selector:Xe(t.nodeName.toLowerCase()),score:kp})}if(t.nodeName==="IFRAME"){for(const o of["name","title"])t.getAttribute(o)&&r.push({engine:"css",selector:`${Xe(t.nodeName.toLowerCase())}[${o}=${xr(t.getAttribute(o))}]`,score:By});return t.getAttribute(n.testIdAttributeName)&&r.push({engine:"css",selector:`[${n.testIdAttributeName}=${xr(t.getAttribute(n.testIdAttributeName))}]`,score:Nc}),Ul([r]),r}if(t.getAttribute(n.testIdAttributeName)&&r.push({engine:"internal:testid",selector:`[${n.testIdAttributeName}=${Ee(t.getAttribute(n.testIdAttributeName),!0)}]`,score:Nc}),t.nodeName==="INPUT"||t.nodeName==="TEXTAREA"){const o=t;if(o.placeholder){r.push({engine:"internal:attr",selector:`[placeholder=${Ee(o.placeholder,!0)}]`,score:qy});for(const l of Fn(o.placeholder))r.push({engine:"internal:attr",selector:`[placeholder=${Ee(l.text,!1)}]`,score:xp-l.scoreBouns})}}const i=ap(e._evaluator._cacheText,t);for(const o of i){const l=o.normalized;r.push({engine:"internal:label",selector:Ge(l,!0),score:Xy});for(const a of Fn(l))r.push({engine:"internal:label",selector:Ge(a.text,!1),score:_p-a.scoreBouns})}const s=Ne(t);return s&&!["none","presentation"].includes(s)&&r.push({engine:"internal:role",selector:s,score:ew}),t.getAttribute("name")&&["BUTTON","FORM","FIELDSET","FRAME","IFRAME","INPUT","KEYGEN","OBJECT","OUTPUT","SELECT","TEXTAREA","MAP","META","PARAM"].includes(t.nodeName)&&r.push({engine:"css",selector:`${Xe(t.nodeName.toLowerCase())}[name=${xr(t.getAttribute("name"))}]`,score:Ro}),["INPUT","TEXTAREA"].includes(t.nodeName)&&t.getAttribute("type")!=="hidden"&&t.getAttribute("type")&&r.push({engine:"css",selector:`${Xe(t.nodeName.toLowerCase())}[type=${xr(t.getAttribute("type"))}]`,score:Ro}),["INPUT","TEXTAREA","SELECT"].includes(t.nodeName)&&t.getAttribute("type")!=="hidden"&&r.push({engine:"css",selector:Xe(t.nodeName.toLowerCase()),score:Ro+1}),Ul([r]),r}function iw(e,t,n){if(t.nodeName==="SELECT")return[];const r=[],i=t.getAttribute("title");if(i){r.push([{engine:"internal:attr",selector:`[title=${Ee(i,!0)}]`,score:Yy}]);for(const a of Fn(i))r.push([{engine:"internal:attr",selector:`[title=${Ee(a.text,!1)}]`,score:Tp-a.scoreBouns}])}const s=t.getAttribute("alt");if(s&&["APPLET","AREA","IMG","INPUT"].includes(t.nodeName)){r.push([{engine:"internal:attr",selector:`[alt=${Ee(s,!0)}]`,score:Gy}]);for(const a of Fn(s))r.push([{engine:"internal:attr",selector:`[alt=${Ee(a.text,!1)}]`,score:Ep-a.scoreBouns}])}const o=je(e._evaluator._cacheText,t).normalized;if(o){const a=Fn(o);if(n){o.length<=80&&r.push([{engine:"internal:text",selector:Ge(o,!0),score:Ky}]);for(const c of a)r.push([{engine:"internal:text",selector:Ge(c.text,!1),score:Hl-c.scoreBouns}])}const u={engine:"css",selector:Xe(t.nodeName.toLowerCase()),score:kp};for(const c of a)r.push([u,{engine:"internal:has-text",selector:Ge(c.text,!1),score:Hl-c.scoreBouns}]);if(o.length<=80){const c=new RegExp("^"+Pv(o)+"$");r.push([u,{engine:"internal:has-text",selector:Ge(c,!1),score:Wy}])}}const l=Ne(t);if(l&&!["none","presentation"].includes(l)){const a=Rs(t,!1);if(a){r.push([{engine:"internal:role",selector:`${l}[name=${Ee(a,!0)}]`,score:Qy}]);for(const u of Fn(a))r.push([{engine:"internal:role",selector:`${l}[name=${Ee(u.text,!1)}]`,score:Sp-u.scoreBouns}])}}return Ul(r),r}function Cp(e){return/^[a-zA-Z][a-zA-Z0-9\-\_]+$/.test(e)?"#"+e:`[id="${Xe(e)}"]`}function $o(e){return e.some(t=>t.engine==="css"&&(t.selector.startsWith("#")||t.selector.startsWith('[id="')))}function $i(e,t,n){const r=n.root??t.ownerDocument,i=[];function s(l){const a=i.slice();l&&a.unshift(l);const u=a.join(" > "),c=e.parseSelector(u);return e.querySelector(c,r,!1)===t?u:void 0}function o(l){const a={engine:"css",selector:l,score:tw},u=e.parseSelector(l),c=e.querySelectorAll(u,r);if(c.length===1)return[a];const h={engine:"nth",selector:String(c.indexOf(t)),score:Np};return[a,h]}for(let l=t;l&&l!==r;l=Te(l)){const a=l.nodeName.toLowerCase();let u="";if(l.id&&!n.noCSSId){const d=Cp(l.id),g=s(d);if(g)return o(g);u=d}const c=l.parentNode,h=[...l.classList];for(let d=0;d<h.length;++d){const g="."+Xe(h.slice(0,d+1).join(".")),y=s(g);if(y)return o(y);!u&&c&&c.querySelectorAll(g).length===1&&(u=g)}if(c){const d=[...c.children],y=d.filter(x=>x.nodeName.toLowerCase()===a).indexOf(l)===0?Xe(a):`${Xe(a)}:nth-child(${1+d.indexOf(l)})`,w=s(y);if(w)return o(w);u||(u=y)}else u||(u=Xe(a));i.unshift(u)}return o(s())}function Ul(e){for(const t of e)for(const n of t)n.score>Vy&&n.score<Jy&&(n.score+=Math.min(wp,n.selector.length/10|0))}function rs(e){const t=[];let n="";for(const{engine:r,selector:i}of e)t.length&&(n!=="css"||r!=="css"||i.startsWith(":nth-match("))&&t.push(">>"),n=r,r==="css"?t.push(i):t.push(`${r}=${i}`);return t.join(" ")}function $t(e){let t=0;for(let n=0;n<e.length;n++)t+=e[n].score*(e.length-n);return t}function Lc(e,t,n,r,i){const s=r.map(l=>({tokens:l,score:$t(l)}));s.sort((l,a)=>l.score-a.score);let o=null;for(const{tokens:l}of s){const a=e.parseSelector(rs(l)),u=e.querySelectorAll(a,t);if(u[0]===n&&u.length===1)return l;const c=u.indexOf(n);if(!i||o||c===-1||u.length>5)continue;const h={engine:"nth",selector:String(c),score:Np};o=[...l,h]}return o}function sw(e){let t,n=0;for(let r=0;r<e.length;++r){const i=e[r];let s;if(!(i==="-"||i==="_")){if(i>="a"&&i<="z"?s="lower":i>="A"&&i<="Z"?s="upper":i>="0"&&i<="9"?s="digit":s="other",s==="lower"&&t==="upper"){t=s;continue}t&&t!==s&&++n,t=s}}return n>=e.length/4}function Ac(e,t){if(e.length<=t)return e;e=e.substring(0,t);const n=e.match(/^(.*)\b(.+?)$/);return n?n[1].trimEnd():""}function Fn(e){let t=[];{const n=e.match(/^([\d.,]+)[^.,\w]/),r=n?n[1].length:0;if(r){const i=e.substring(r).trimStart();t.push({text:i,scoreBouns:i.length<=30?2:1})}}{const n=e.match(/[^.,\w]([\d.,]+)$/),r=n?n[1].length:0;if(r){const i=e.substring(0,e.length-r).trimEnd();t.push({text:i,scoreBouns:i.length<=30?2:1})}}return e.length<=30?t.push({text:e,scoreBouns:0}):(t.push({text:Ac(e,80),scoreBouns:0}),t.push({text:Ac(e,30),scoreBouns:1})),t=t.filter(n=>n.text),t.length||t.push({text:e.substring(0,80),scoreBouns:0}),t}const Mc=":host{font-size:13px;font-family:system-ui,Ubuntu,Droid Sans,sans-serif;color:#333}svg{position:absolute;height:0}x-pw-tooltip{-webkit-backdrop-filter:blur(5px);backdrop-filter:blur(5px);background-color:#fff;border-radius:6px;box-shadow:0 .5rem 1.2rem #0000004d;display:none;font-size:12.8px;font-weight:400;left:0;line-height:1.5;max-width:600px;position:absolute;top:0;padding:0;flex-direction:column;overflow:hidden}x-pw-tooltip-line{display:flex;max-width:600px;padding:6px;-webkit-user-select:none;user-select:none;cursor:pointer}x-pw-tooltip-line.selectable:hover{background-color:#f2f2f2;overflow:hidden}x-pw-tooltip-footer{display:flex;max-width:600px;padding:6px;-webkit-user-select:none;user-select:none;color:#777}x-pw-dialog{background-color:#fff;pointer-events:auto;border-radius:6px;box-shadow:0 .5rem 1.2rem #0000004d;display:flex;flex-direction:column;position:absolute;width:400px;height:150px;z-index:10;font-size:13px}x-pw-dialog-body{display:flex;flex-direction:column;flex:auto}x-pw-dialog-body label{margin:5px 8px;display:flex;flex-direction:row;align-items:center}x-pw-highlight{position:absolute;top:0;left:0;width:0;height:0}x-pw-action-point{position:absolute;width:20px;height:20px;background:red;border-radius:10px;margin:-10px 0 0 -10px;z-index:2}x-pw-separator{height:1px;margin:6px 9px;background:#949494e5}x-pw-tool-gripper{height:28px;width:24px;margin:2px 0;cursor:grab}x-pw-tool-gripper:active{cursor:grabbing}x-pw-tool-gripper>x-div{width:16px;height:16px;margin:6px 4px;clip-path:url(#icon-gripper);background-color:#555}x-pw-tools-list>label{display:flex;align-items:center;margin:0 10px;-webkit-user-select:none;user-select:none}x-pw-tools-list{display:flex;width:100%;border-bottom:1px solid #dddddd}x-pw-tool-item{pointer-events:auto;cursor:pointer;height:28px;width:28px;border-radius:3px}x-pw-tool-item:not(.disabled):hover{background-color:#dbdbdb}x-pw-tool-item.active{background-color:#8acae480}x-pw-tool-item.active:not(.disabled):hover{background-color:#8acae4c4}x-pw-tool-item>x-div{width:16px;height:16px;margin:6px;background-color:#3a3a3a}x-pw-tool-item.disabled>x-div{background-color:#61616180;cursor:default}x-pw-tool-item.record.active{background-color:transparent}x-pw-tool-item.record.active:hover{background-color:#dbdbdb}x-pw-tool-item.record.active>x-div{background-color:#a1260d}x-pw-tool-item.accept>x-div{background-color:#388a34}x-pw-tool-item.record>x-div{clip-path:url(#icon-circle-large-filled)}x-pw-tool-item.pick-locator>x-div{clip-path:url(#icon-inspect)}x-pw-tool-item.text>x-div{clip-path:url(#icon-whole-word)}x-pw-tool-item.visibility>x-div{clip-path:url(#icon-eye)}x-pw-tool-item.value>x-div{clip-path:url(#icon-symbol-constant)}x-pw-tool-item.accept>x-div{clip-path:url(#icon-check)}x-pw-tool-item.cancel>x-div{clip-path:url(#icon-close)}x-pw-tool-item.succeeded>x-div{clip-path:url(#icon-pass);background-color:#388a34!important}x-pw-overlay{position:absolute;top:0;max-width:min-content;z-index:2147483647;background:transparent;pointer-events:auto}x-pw-overlay x-pw-tools-list{background-color:#fffd;box-shadow:#0000001a 0 5px 5px;border-radius:3px;border-bottom:none}x-pw-overlay x-pw-tool-item{margin:2px}textarea.text-editor{font-family:system-ui,Ubuntu,Droid Sans,sans-serif;flex:auto;border:none;margin:6px 10px;color:#333;outline:1px solid transparent!important;resize:none;padding:0;font-size:13px}textarea.text-editor.does-not-match{outline:1px solid red!important}x-div{display:block}x-spacer{flex:auto}*{box-sizing:border-box}*[hidden]{display:none!important}x-locator-editor{flex:none;width:100%;height:60px;padding:4px;border-bottom:1px solid #dddddd;outline:1px solid transparent}x-locator-editor.does-not-match{outline:1px solid red}.CodeMirror{width:100%!important;height:100%!important}";class Oo{constructor(t){this._highlightEntries=[],this._highlightOptions={},this._language="javascript",this._injectedScript=t;const n=t.document;this._isUnderTest=t.isUnderTest,this._glassPaneElement=n.createElement("x-pw-glass"),this._glassPaneElement.style.position="fixed",this._glassPaneElement.style.top="0",this._glassPaneElement.style.right="0",this._glassPaneElement.style.bottom="0",this._glassPaneElement.style.left="0",this._glassPaneElement.style.zIndex="2147483646",this._glassPaneElement.style.pointerEvents="none",this._glassPaneElement.style.display="flex",this._glassPaneElement.style.backgroundColor="transparent";for(const r of["click","auxclick","dragstart","input","keydown","keyup","pointerdown","pointerup","mousedown","mouseup","mouseleave","focus","scroll"])this._glassPaneElement.addEventListener(r,i=>{i.stopPropagation(),i.stopImmediatePropagation(),i.type==="click"&&i.button===0&&this._highlightOptions.tooltipListItemSelected&&this._highlightOptions.tooltipListItemSelected(void 0)});if(this._actionPointElement=n.createElement("x-pw-action-point"),this._actionPointElement.setAttribute("hidden","true"),this._glassPaneShadow=this._glassPaneElement.attachShadow({mode:this._isUnderTest?"open":"closed"}),typeof this._glassPaneShadow.adoptedStyleSheets.push=="function"){const r=new this._injectedScript.window.CSSStyleSheet;r.replaceSync(Mc),this._glassPaneShadow.adoptedStyleSheets.push(r)}else{const r=this._injectedScript.document.createElement("style");r.textContent=Mc,this._glassPaneShadow.appendChild(r)}this._glassPaneShadow.appendChild(this._actionPointElement)}install(){this._injectedScript.document.documentElement.appendChild(this._glassPaneElement)}setLanguage(t){this._language=t}runHighlightOnRaf(t){this._rafRequest&&cancelAnimationFrame(this._rafRequest),this.updateHighlight(this._injectedScript.querySelectorAll(t,this._injectedScript.document.documentElement),{tooltipText:Kt(this._language,gn(t))}),this._rafRequest=this._injectedScript.builtinRequestAnimationFrame(()=>this.runHighlightOnRaf(t))}uninstall(){this._rafRequest&&cancelAnimationFrame(this._rafRequest),this._glassPaneElement.remove()}showActionPoint(t,n){this._actionPointElement.style.top=n+"px",this._actionPointElement.style.left=t+"px",this._actionPointElement.hidden=!1}hideActionPoint(){this._actionPointElement.hidden=!0}clearHighlight(){var t,n;for(const r of this._highlightEntries)(t=r.highlightElement)==null||t.remove(),(n=r.tooltipElement)==null||n.remove();this._highlightEntries=[],this._highlightOptions={},this._glassPaneElement.style.pointerEvents="none"}updateHighlight(t,n){this._innerUpdateHighlight(t,n)}maskElements(t,n){this._innerUpdateHighlight(t,{color:n})}_innerUpdateHighlight(t,n){let r=n.color;if(r||(r=t.length>1?"#f6b26b7f":"#6fa8dc7f"),!this._highlightIsUpToDate(t,n)){this.clearHighlight(),this._highlightOptions=n,this._glassPaneElement.style.pointerEvents=n.tooltipListItemSelected?"initial":"none";for(let i=0;i<t.length;++i){const s=this._createHighlightElement();this._glassPaneShadow.appendChild(s);let o;if(n.tooltipList||n.tooltipText||n.tooltipFooter){o=this._injectedScript.document.createElement("x-pw-tooltip"),this._glassPaneShadow.appendChild(o),o.style.top="0",o.style.left="0",o.style.display="flex";let l=[];if(n.tooltipList)l=n.tooltipList;else if(n.tooltipText){const a=t.length>1?` [${i+1} of ${t.length}]`:"";l=[n.tooltipText+a]}for(let a=0;a<l.length;a++){const u=this._injectedScript.document.createElement("x-pw-tooltip-line");u.textContent=l[a],o.appendChild(u),n.tooltipListItemSelected&&(u.classList.add("selectable"),u.addEventListener("click",()=>{var c;return(c=n.tooltipListItemSelected)==null?void 0:c.call(n,a)}))}if(n.tooltipFooter){const a=this._injectedScript.document.createElement("x-pw-tooltip-footer");a.textContent=n.tooltipFooter,o.appendChild(a)}}this._highlightEntries.push({targetElement:t[i],tooltipElement:o,highlightElement:s})}for(const i of this._highlightEntries){if(i.box=i.targetElement.getBoundingClientRect(),!i.tooltipElement)continue;const{anchorLeft:s,anchorTop:o}=this.tooltipPosition(i.box,i.tooltipElement);i.tooltipTop=o,i.tooltipLeft=s}for(const i of this._highlightEntries){i.tooltipElement&&(i.tooltipElement.style.top=i.tooltipTop+"px",i.tooltipElement.style.left=i.tooltipLeft+"px");const s=i.box;i.highlightElement.style.backgroundColor=r,i.highlightElement.style.left=s.x+"px",i.highlightElement.style.top=s.y+"px",i.highlightElement.style.width=s.width+"px",i.highlightElement.style.height=s.height+"px",i.highlightElement.style.display="block",this._isUnderTest&&console.error("Highlight box for test: "+JSON.stringify({x:s.x,y:s.y,width:s.width,height:s.height}))}}}firstBox(){var t;return(t=this._highlightEntries[0])==null?void 0:t.box}tooltipPosition(t,n){const r=n.offsetWidth,i=n.offsetHeight,s=this._glassPaneElement.offsetWidth,o=this._glassPaneElement.offsetHeight;let l=t.left;l+r>s-5&&(l=s-r-5);let a=t.bottom+5;return a+i>o-5&&(t.top>i+5?a=t.top-i-5:a=o-5-i),{anchorLeft:l,anchorTop:a}}_highlightIsUpToDate(t,n){var r,i;if(n.tooltipText!==this._highlightOptions.tooltipText||n.tooltipListItemSelected!==this._highlightOptions.tooltipListItemSelected||n.tooltipFooter!==this._highlightOptions.tooltipFooter||((r=n.tooltipList)==null?void 0:r.length)!==((i=this._highlightOptions.tooltipList)==null?void 0:i.length))return!1;if(n.tooltipList&&this._highlightOptions.tooltipList){for(let s=0;s<n.tooltipList.length;s++)if(n.tooltipList[s]!==this._highlightOptions.tooltipList[s])return!1}if(t.length!==this._highlightEntries.length)return!1;for(let s=0;s<this._highlightEntries.length;++s){if(t[s]!==this._highlightEntries[s].targetElement)return!1;const o=this._highlightEntries[s].box;if(!o)return!1;const l=t[s].getBoundingClientRect();if(l.top!==o.top||l.right!==o.right||l.bottom!==o.bottom||l.left!==o.left)return!1}return!0}_createHighlightElement(){return this._injectedScript.document.createElement("x-pw-highlight")}appendChild(t){this._glassPaneShadow.appendChild(t)}}class bp{constructor(t,n,r,i,s,o,l){this.onGlobalListenersRemoved=new Set,this._testIdAttributeNameForStrictErrorAndConsoleCodegen="data-testid",this.utils={isInsideScope:no,elementText:je,asLocator:Kt,normalizeWhiteSpace:Ue},this.window=t,this.document=t.document,this.isUnderTest=n,this._sdkLanguage=r,this._testIdAttributeNameForStrictErrorAndConsoleCodegen=i,this._evaluator=new My(new Map),this._engines=new Map,this._engines.set("xpath",vc),this._engines.set("xpath:light",vc),this._engines.set("_react",vy),this._engines.set("_vue",Sy),this._engines.set("role",kc(!1)),this._engines.set("text",this._createTextEngine(!0,!1)),this._engines.set("text:light",this._createTextEngine(!1,!1)),this._engines.set("id",this._createAttributeEngine("id",!0)),this._engines.set("id:light",this._createAttributeEngine("id",!1)),this._engines.set("data-testid",this._createAttributeEngine("data-testid",!0)),this._engines.set("data-testid:light",this._createAttributeEngine("data-testid",!1)),this._engines.set("data-test-id",this._createAttributeEngine("data-test-id",!0)),this._engines.set("data-test-id:light",this._createAttributeEngine("data-test-id",!1)),this._engines.set("data-test",this._createAttributeEngine("data-test",!0)),this._engines.set("data-test:light",this._createAttributeEngine("data-test",!1)),this._engines.set("css",this._createCSSEngine()),this._engines.set("nth",{queryAll:()=>[]}),this._engines.set("visible",this._createVisibleEngine()),this._engines.set("internal:control",this._createControlEngine()),this._engines.set("internal:has",this._createHasEngine()),this._engines.set("internal:has-not",this._createHasNotEngine()),this._engines.set("internal:and",{queryAll:()=>[]}),this._engines.set("internal:or",{queryAll:()=>[]}),this._engines.set("internal:chain",this._createInternalChainEngine()),this._engines.set("internal:label",this._createInternalLabelEngine()),this._engines.set("internal:text",this._createTextEngine(!0,!0)),this._engines.set("internal:has-text",this._createInternalHasTextEngine()),this._engines.set("internal:has-not-text",this._createInternalHasNotTextEngine()),this._engines.set("internal:attr",this._createNamedAttributeEngine()),this._engines.set("internal:testid",this._createNamedAttributeEngine()),this._engines.set("internal:role",kc(!0));for(const{name:a,engine:u}of l)this._engines.set(a,u);this._stableRafCount=s,this._browserName=o,Y0(o),this._setupGlobalListenersRemovalDetection(),this._setupHitTargetInterceptors(),n&&(this.window.__injectedScript=this)}builtinSetTimeout(t,n){var r;return(r=this.window.__pwClock)!=null&&r.builtin?this.window.__pwClock.builtin.setTimeout(t,n):setTimeout(t,n)}builtinRequestAnimationFrame(t){var n;return(n=this.window.__pwClock)!=null&&n.builtin?this.window.__pwClock.builtin.requestAnimationFrame(t):requestAnimationFrame(t)}eval(t){return this.window.eval(t)}testIdAttributeNameForStrictErrorAndConsoleCodegen(){return this._testIdAttributeNameForStrictErrorAndConsoleCodegen}parseSelector(t){const n=eo(t);return Zv(n,r=>{if(!this._engines.has(r.name))throw this.createStacklessError(`Unknown engine "${r.name}" while parsing selector ${t}`)}),n}generateSelector(t,n){return Cc(this,t,n)}generateSelectorSimple(t,n){return Cc(this,t,{...n,testIdAttributeName:this._testIdAttributeNameForStrictErrorAndConsoleCodegen}).selector}querySelector(t,n,r){const i=this.querySelectorAll(t,n);if(r&&i.length>1)throw this.strictModeViolationError(t,i);return i[0]}_queryNth(t,n){const r=[...t];let i=+n.body;return i===-1&&(i=r.length-1),new Set(r.slice(i,i+1))}_queryLayoutSelector(t,n,r){const i=n.name,s=n.body,o=[],l=this.querySelectorAll(s.parsed,r);for(const a of t){const u=vp(i,a,l,s.distance);u!==void 0&&o.push({element:a,score:u})}return o.sort((a,u)=>a.score-u.score),new Set(o.map(a=>a.element))}querySelectorAll(t,n){if(t.capture!==void 0){if(t.parts.some(i=>i.name==="nth"))throw this.createStacklessError("Can't query n-th element in a request with the capture.");const r={parts:t.parts.slice(0,t.capture+1)};if(t.capture<t.parts.length-1){const i={parts:t.parts.slice(t.capture+1)},s={name:"internal:has",body:{parsed:i},source:gn(i)};r.parts.push(s)}return this.querySelectorAll(r,n)}if(!n.querySelectorAll)throw this.createStacklessError("Node is not queryable.");if(t.capture!==void 0)throw this.createStacklessError("Internal error: there should not be a capture in the selector.");if(n.nodeType===11&&t.parts.length===1&&t.parts[0].name==="css"&&t.parts[0].source===":scope")return[n];this._evaluator.begin();try{let r=new Set([n]);for(const i of t.parts)if(i.name==="nth")r=this._queryNth(r,i);else if(i.name==="internal:and"){const s=this.querySelectorAll(i.body.parsed,n);r=new Set(s.filter(o=>r.has(o)))}else if(i.name==="internal:or"){const s=this.querySelectorAll(i.body.parsed,n);r=new Set(yp(new Set([...r,...s])))}else if(Ay.includes(i.name))r=this._queryLayoutSelector(r,i,n);else{const s=new Set;for(const o of r){const l=this._queryEngineAll(i,o);for(const a of l)s.add(a)}r=s}return[...r]}finally{this._evaluator.end()}}_queryEngineAll(t,n){const r=this._engines.get(t.name).queryAll(n,t.body);for(const i of r)if(!("nodeName"in i))throw this.createStacklessError(`Expected a Node but got ${Object.prototype.toString.call(i)}`);return r}_createAttributeEngine(t,n){const r=i=>[{simples:[{selector:{css:`[${t}=${JSON.stringify(i)}]`,functions:[]},combinator:""}]}];return{queryAll:(i,s)=>this._evaluator.query({scope:i,pierceShadow:n},r(s))}}_createCSSEngine(){return{queryAll:(t,n)=>this._evaluator.query({scope:t,pierceShadow:!0},n)}}_createTextEngine(t,n){return{queryAll:(i,s)=>{const{matcher:o,kind:l}=zi(s,n),a=[];let u=null;const c=d=>{if(l==="lax"&&u&&u.contains(d))return!1;const g=ro(this._evaluator._cacheText,d,o);g==="none"&&(u=d),(g==="self"||g==="selfAndChildren"&&l==="strict"&&!n)&&a.push(d)};i.nodeType===Node.ELEMENT_NODE&&c(i);const h=this._evaluator._queryCSS({scope:i,pierceShadow:t},"*");for(const d of h)c(d);return a}}}_createInternalHasTextEngine(){return{queryAll:(t,n)=>{if(t.nodeType!==1)return[];const r=t,i=je(this._evaluator._cacheText,r),{matcher:s}=zi(n,!0);return s(i)?[r]:[]}}}_createInternalHasNotTextEngine(){return{queryAll:(t,n)=>{if(t.nodeType!==1)return[];const r=t,i=je(this._evaluator._cacheText,r),{matcher:s}=zi(n,!0);return s(i)?[]:[r]}}}_createInternalLabelEngine(){return{queryAll:(t,n)=>{const{matcher:r}=zi(n,!0);return this._evaluator._queryCSS({scope:t,pierceShadow:!0},"*").filter(s=>ap(this._evaluator._cacheText,s).some(o=>r(o)))}}}_createNamedAttributeEngine(){return{queryAll:(n,r)=>{const i=cn(r,!0);if(i.name||i.attributes.length!==1)throw new Error("Malformed attribute selector: "+r);const{name:s,value:o,caseSensitive:l}=i.attributes[0],a=l?null:o.toLowerCase();let u;return o instanceof RegExp?u=h=>!!h.match(o):l?u=h=>h===o:u=h=>h.toLowerCase().includes(a),this._evaluator._queryCSS({scope:n,pierceShadow:!0},`[${s}]`).filter(h=>u(h.getAttribute(s)))}}}_createControlEngine(){return{queryAll(t,n){if(n==="enter-frame")return[];if(n==="return-empty")return[];if(n==="component")return t.nodeType!==1?[]:[t.childElementCount===1?t.firstElementChild:t];throw new Error(`Internal error, unknown internal:control selector ${n}`)}}}_createHasEngine(){return{queryAll:(n,r)=>n.nodeType!==1?[]:!!this.querySelector(r.parsed,n,!1)?[n]:[]}}_createHasNotEngine(){return{queryAll:(n,r)=>n.nodeType!==1?[]:!!this.querySelector(r.parsed,n,!1)?[]:[n]}}_createVisibleEngine(){return{queryAll:(n,r)=>n.nodeType!==1?[]:js(n)===!!r?[n]:[]}}_createInternalChainEngine(){return{queryAll:(n,r)=>this.querySelectorAll(r.parsed,n)}}extend(t,n){const r=this.window.eval(`
+    (() => {
+      const module = {};
+      ${t}
+      return module.exports.default();
+    })()`);return new r(this,n)}isVisible(t){return js(t)}async viewportRatio(t){return await new Promise(n=>{const r=new IntersectionObserver(i=>{n(i[0].intersectionRatio),r.disconnect()});r.observe(t),this.builtinRequestAnimationFrame(()=>{})})}getElementBorderWidth(t){if(t.nodeType!==Node.ELEMENT_NODE||!t.ownerDocument||!t.ownerDocument.defaultView)return{left:0,top:0};const n=t.ownerDocument.defaultView.getComputedStyle(t);return{left:parseInt(n.borderLeftWidth||"",10),top:parseInt(n.borderTopWidth||"",10)}}describeIFrameStyle(t){if(!t.ownerDocument||!t.ownerDocument.defaultView)return"error:notconnected";const n=t.ownerDocument.defaultView;for(let i=t;i;i=Te(i))if(n.getComputedStyle(i).transform!=="none")return"transformed";const r=n.getComputedStyle(t);return{left:parseInt(r.borderLeftWidth||"",10)+parseInt(r.paddingLeft||"",10),top:parseInt(r.borderTopWidth||"",10)+parseInt(r.paddingTop||"",10)}}retarget(t,n){let r=t.nodeType===Node.ELEMENT_NODE?t:t.parentElement;return r?(n==="none"||(!r.matches("input, textarea, select")&&!r.isContentEditable&&(n==="button-link"?r=r.closest("button, [role=button], a, [role=link]")||r:r=r.closest("button, [role=button], [role=checkbox], [role=radio]")||r),n==="follow-label"&&(!r.matches("input, textarea, button, select, [role=button], [role=checkbox], [role=radio]")&&!r.isContentEditable&&(r=r.closest("label")||r),r.nodeName==="LABEL"&&(r=r.control||r))),r):null}async checkElementStates(t,n){if(n.includes("stable")){const r=await this._checkElementIsStable(t);if(r===!1)return{missingState:"stable"};if(r==="error:notconnected")return r}for(const r of n)if(r!=="stable"){const i=this.elementState(t,r);if(i===!1)return{missingState:r};if(i==="error:notconnected")return i}}async _checkElementIsStable(t){const n=Symbol("continuePolling");let r,i=0,s=0;const o=()=>{const h=this.retarget(t,"no-follow-label");if(!h)return"error:notconnected";const d=performance.now();if(this._stableRafCount>1&&d-s<15)return n;s=d;const g=h.getBoundingClientRect(),y={x:g.top,y:g.left,width:g.width,height:g.height};if(r){if(!(y.x===r.x&&y.y===r.y&&y.width===r.width&&y.height===r.height))return!1;if(++i>=this._stableRafCount)return!0}return r=y,n};let l,a;const u=new Promise((h,d)=>{l=h,a=d}),c=()=>{try{const h=o();h!==n?l(h):this.builtinRequestAnimationFrame(c)}catch(h){a(h)}};return this.builtinRequestAnimationFrame(c),u}elementState(t,n){const r=this.retarget(t,["stable","visible","hidden"].includes(n)?"none":"follow-label");if(!r||!r.isConnected)return n==="hidden"?!0:"error:notconnected";if(n==="visible")return this.isVisible(r);if(n==="hidden")return!this.isVisible(r);const i=Zh(r);if(n==="disabled")return i;if(n==="enabled")return!i;const s=!(["INPUT","TEXTAREA","SELECT"].includes(r.nodeName)&&r.hasAttribute("readonly"));if(n==="editable")return!i&&s;if(n==="checked"||n==="unchecked"){const o=n==="checked",l=Gh(r,!1);if(l==="error")throw this.createStacklessError("Not a checkbox or radio button");return o===l}throw this.createStacklessError(`Unexpected element state "${n}"`)}selectOptions(t,n){const r=this.retarget(t,"follow-label");if(!r)return"error:notconnected";if(r.nodeName.toLowerCase()!=="select")throw this.createStacklessError("Element is not a <select> element");const i=r,s=[...i.options],o=[];let l=n.slice();for(let a=0;a<s.length;a++){const u=s[a],c=h=>{if(h instanceof Node)return u===h;let d=!0;return h.valueOrLabel!==void 0&&(d=d&&(h.valueOrLabel===u.value||h.valueOrLabel===u.label)),h.value!==void 0&&(d=d&&h.value===u.value),h.label!==void 0&&(d=d&&h.label===u.label),h.index!==void 0&&(d=d&&h.index===a),d};if(l.some(c))if(o.push(u),i.multiple)l=l.filter(h=>!c(h));else{l=[];break}}return l.length?"error:optionsnotfound":(i.value=void 0,o.forEach(a=>a.selected=!0),i.dispatchEvent(new Event("input",{bubbles:!0,composed:!0})),i.dispatchEvent(new Event("change",{bubbles:!0})),o.map(a=>a.value))}fill(t,n){const r=this.retarget(t,"follow-label");if(!r)return"error:notconnected";if(r.nodeName.toLowerCase()==="input"){const i=r,s=i.type.toLowerCase(),o=new Set(["color","date","time","datetime-local","month","range","week"]);if(!new Set(["","email","number","password","search","tel","text","url"]).has(s)&&!o.has(s))throw this.createStacklessError(`Input of type "${s}" cannot be filled`);if(s==="number"&&(n=n.trim(),isNaN(Number(n))))throw this.createStacklessError("Cannot type text into input[type=number]");if(o.has(s)){if(n=n.trim(),i.focus(),i.value=n,i.value!==n)throw this.createStacklessError("Malformed value");return r.dispatchEvent(new Event("input",{bubbles:!0,composed:!0})),r.dispatchEvent(new Event("change",{bubbles:!0})),"done"}}else if(r.nodeName.toLowerCase()!=="textarea"){if(!r.isContentEditable)throw this.createStacklessError("Element is not an <input>, <textarea> or [contenteditable] element")}return this.selectText(r),"needsinput"}selectText(t){const n=this.retarget(t,"follow-label");if(!n)return"error:notconnected";if(n.nodeName.toLowerCase()==="input"){const s=n;return s.select(),s.focus(),"done"}if(n.nodeName.toLowerCase()==="textarea"){const s=n;return s.selectionStart=0,s.selectionEnd=s.value.length,s.focus(),"done"}const r=n.ownerDocument.createRange();r.selectNodeContents(n);const i=n.ownerDocument.defaultView.getSelection();return i&&(i.removeAllRanges(),i.addRange(r)),n.focus(),"done"}_activelyFocused(t){const n=t.getRootNode().activeElement,r=n===t&&!!t.ownerDocument&&t.ownerDocument.hasFocus();return{activeElement:n,isFocused:r}}focusNode(t,n){if(!t.isConnected)return"error:notconnected";if(t.nodeType!==Node.ELEMENT_NODE)throw this.createStacklessError("Node is not an element");const{activeElement:r,isFocused:i}=this._activelyFocused(t);if(t.isContentEditable&&!i&&r&&r.blur&&r.blur(),t.focus(),t.focus(),n&&!i&&t.nodeName.toLowerCase()==="input")try{t.setSelectionRange(0,0)}catch{}return"done"}blurNode(t){if(!t.isConnected)return"error:notconnected";if(t.nodeType!==Node.ELEMENT_NODE)throw this.createStacklessError("Node is not an element");return t.blur(),"done"}setInputFiles(t,n){if(t.nodeType!==Node.ELEMENT_NODE)return"Node is not of type HTMLElement";const r=t;if(r.nodeName!=="INPUT")return"Not an <input> element";const i=r;if((i.getAttribute("type")||"").toLowerCase()!=="file")return"Not an input[type=file] element";const o=n.map(a=>{const u=Uint8Array.from(atob(a.buffer),c=>c.charCodeAt(0));return new File([u],a.name,{type:a.mimeType,lastModified:a.lastModifiedMs})}),l=new DataTransfer;for(const a of o)l.items.add(a);i.files=l.files,i.dispatchEvent(new Event("input",{bubbles:!0,composed:!0})),i.dispatchEvent(new Event("change",{bubbles:!0}))}expectHitTarget(t,n){const r=[];let i=n;for(;i;){const c=Oh(i);if(!c||(r.push(c),c.nodeType===9))break;i=c.host}let s;for(let c=r.length-1;c>=0;c--){const h=r[c],d=h.elementsFromPoint(t.x,t.y),g=h.elementFromPoint(t.x,t.y);if(g&&d[0]&&Te(g)===d[0]){const w=this.window.getComputedStyle(g);(w==null?void 0:w.display)==="contents"&&d.unshift(g)}d[0]&&d[0].shadowRoot===h&&d[1]===g&&d.shift();const y=d[0];if(!y||(s=y,c&&y!==r[c-1].host))break}const o=[];for(;s&&s!==n;)o.push(s),s=Te(s);if(s===n)return"done";const l=this.previewNode(o[0]||this.document.documentElement);let a,u=n;for(;u;){const c=o.indexOf(u);if(c!==-1){c>1&&(a=this.previewNode(o[c-1]));break}u=Te(u)}return a?{hitTargetDescription:`${l} from ${a} subtree`}:{hitTargetDescription:l}}setupHitTargetInterceptor(t,n,r,i){const s=this.retarget(t,"button-link");if(!s||!s.isConnected)return"error:notconnected";if(r){const c=this.expectHitTarget(r,s);if(c!=="done")return c.hitTargetDescription}if(n==="drag")return{stop:()=>"done"};const o={hover:Lp,tap:Ap,mouse:Mp}[n];let l;const a=c=>{if(!o.has(c.type)||!c.isTrusted)return;const h=this.window.TouchEvent&&c instanceof this.window.TouchEvent?c.touches[0]:c;l===void 0&&h&&(l=this.expectHitTarget({x:h.clientX,y:h.clientY},s)),(i||l!=="done"&&l!==void 0)&&(c.preventDefault(),c.stopPropagation(),c.stopImmediatePropagation())},u=()=>(this._hitTargetInterceptor===a&&(this._hitTargetInterceptor=void 0),l||"done");return this._hitTargetInterceptor=a,{stop:u}}dispatchEvent(t,n,r){let i;switch(r={bubbles:!0,cancelable:!0,composed:!0,...r},aw.get(n)){case"mouse":i=new MouseEvent(n,r);break;case"keyboard":i=new KeyboardEvent(n,r);break;case"touch":i=new TouchEvent(n,r);break;case"pointer":i=new PointerEvent(n,r);break;case"focus":i=new FocusEvent(n,r);break;case"drag":i=new DragEvent(n,r);break;case"wheel":i=new WheelEvent(n,r);break;case"deviceorientation":try{i=new DeviceOrientationEvent(n,r)}catch{const{bubbles:s,cancelable:o,alpha:l,beta:a,gamma:u,absolute:c}=r;i=this.document.createEvent("DeviceOrientationEvent"),i.initDeviceOrientationEvent(n,s,o,l,a,u,c)}break;case"devicemotion":try{i=new DeviceMotionEvent(n,r)}catch{const{bubbles:s,cancelable:o,acceleration:l,accelerationIncludingGravity:a,rotationRate:u,interval:c}=r;i=this.document.createEvent("DeviceMotionEvent"),i.initDeviceMotionEvent(n,s,o,l,a,u,c)}break;default:i=new Event(n,r);break}t.dispatchEvent(i)}previewNode(t){if(t.nodeType===Node.TEXT_NODE)return Oi(`#text=${t.nodeValue||""}`);if(t.nodeType!==Node.ELEMENT_NODE)return Oi(`<${t.nodeName.toLowerCase()} />`);const n=t,r=[];for(let a=0;a<n.attributes.length;a++){const{name:u,value:c}=n.attributes[a];u!=="style"&&(!c&&lw.has(u)?r.push(` ${u}`):r.push(` ${u}="${c}"`))}r.sort((a,u)=>a.length-u.length);const i=lc(r.join(""),500);if(ow.has(n.nodeName))return Oi(`<${n.nodeName.toLowerCase()}${i}/>`);const s=n.childNodes;let o=!1;if(s.length<=5){o=!0;for(let a=0;a<s.length;a++)o=o&&s[a].nodeType===Node.TEXT_NODE}const l=o?n.textContent||"":s.length?"…":"";return Oi(`<${n.nodeName.toLowerCase()}${i}>${lc(l,50)}</${n.nodeName.toLowerCase()}>`)}strictModeViolationError(t,n){const r=n.slice(0,10).map(s=>({preview:this.previewNode(s),selector:this.generateSelectorSimple(s)})),i=r.map((s,o)=>`
+    ${o+1}) ${s.preview} aka ${Kt(this._sdkLanguage,s.selector)}`);return r.length<n.length&&i.push(`
+    ...`),this.createStacklessError(`strict mode violation: ${Kt(this._sdkLanguage,gn(t))} resolved to ${n.length} elements:${i.join("")}
+`)}createStacklessError(t){if(this._browserName==="firefox"){const r=new Error("Error: "+t);return r.stack="",r}const n=new Error(t);return delete n.stack,n}createHighlight(){return new Oo(this)}maskSelectors(t,n){this._highlight&&this.hideHighlight(),this._highlight=new Oo(this),this._highlight.install();const r=[];for(const i of t)r.push(this.querySelectorAll(i,this.document.documentElement));this._highlight.maskElements(r.flat(),n)}highlight(t){this._highlight||(this._highlight=new Oo(this),this._highlight.install()),this._highlight.runHighlightOnRaf(t)}hideHighlight(){this._highlight&&(this._highlight.uninstall(),delete this._highlight)}markTargetElements(t,n){const r=new CustomEvent("__playwright_target__",{bubbles:!0,cancelable:!0,detail:n,composed:!0});for(const i of t)i.dispatchEvent(r)}_setupGlobalListenersRemovalDetection(){const t="__playwright_global_listeners_check__";let n=!1;const r=()=>n=!0;this.window.addEventListener(t,r),new MutationObserver(i=>{if(i.some(o=>Array.from(o.addedNodes).includes(this.document.documentElement))&&(n=!1,this.window.dispatchEvent(new CustomEvent(t)),!n)){this.window.addEventListener(t,r);for(const o of this.onGlobalListenersRemoved)o()}}).observe(this.document,{childList:!0})}_setupHitTargetInterceptors(){const t=r=>{var i;return(i=this._hitTargetInterceptor)==null?void 0:i.call(this,r)},n=()=>{for(const r of uw)this.window.addEventListener(r,t,{capture:!0,passive:!1})};n(),this.onGlobalListenersRemoved.add(n)}async expect(t,n,r){return n.expression==="to.have.count"||n.expression.endsWith(".array")?this.expectArray(r,n):t?await this.expectSingleElement(t,n):!n.isNot&&n.expression==="to.be.hidden"?{matches:!0}:n.isNot&&n.expression==="to.be.visible"?{matches:!1}:!n.isNot&&n.expression==="to.be.detached"?{matches:!0}:n.isNot&&n.expression==="to.be.attached"?{matches:!1}:n.isNot&&n.expression==="to.be.in.viewport"?{matches:!1}:{matches:n.isNot,missingReceived:!0}}async expectSingleElement(t,n){var i;const r=n.expression;{let s;if(r==="to.have.attribute"?s=t.hasAttribute(n.expressionArg):r==="to.be.checked"?s=this.elementState(t,"checked"):r==="to.be.unchecked"?s=this.elementState(t,"unchecked"):r==="to.be.disabled"?s=this.elementState(t,"disabled"):r==="to.be.editable"?s=this.elementState(t,"editable"):r==="to.be.readonly"?s=!this.elementState(t,"editable"):r==="to.be.empty"?t.nodeName==="INPUT"||t.nodeName==="TEXTAREA"?s=!t.value:s=!((i=t.textContent)!=null&&i.trim()):r==="to.be.enabled"?s=this.elementState(t,"enabled"):r==="to.be.focused"?s=this._activelyFocused(t).isFocused:r==="to.be.hidden"?s=this.elementState(t,"hidden"):r==="to.be.visible"?s=this.elementState(t,"visible"):r==="to.be.attached"?s=!0:r==="to.be.detached"&&(s=!1),s!==void 0){if(s==="error:notcheckbox")throw this.createStacklessError("Element is not a checkbox");if(s==="error:notconnected")throw this.createStacklessError("Element is not connected");return{received:s,matches:s}}}if(r==="to.have.property"){let s=t;const o=n.expressionArg.split(".");for(let u=0;u<o.length-1;u++){if(typeof s!="object"||!(o[u]in s))return{received:void 0,matches:!1};s=s[o[u]]}const l=s[o[o.length-1]],a=Bl(l,n.expectedValue);return{received:l,matches:a}}if(r==="to.be.in.viewport"){const s=await this.viewportRatio(t);return{received:`viewport ratio ${s}`,matches:s>0&&s>(n.expectedNumber??0)-1e-9}}if(r==="to.have.values"){if(t=this.retarget(t,"follow-label"),t.nodeName!=="SELECT"||!t.multiple)throw this.createStacklessError("Not a select element with a multiple attribute");const s=[...t.selectedOptions].map(o=>o.value);return s.length!==n.expectedText.length?{received:s,matches:!1}:{received:s,matches:s.map((o,l)=>new zo(n.expectedText[l]).matches(o)).every(Boolean)}}{let s;if(r==="to.have.attribute.value"){const o=t.getAttribute(n.expressionArg);if(o===null)return{received:null,matches:!1};s=o}else if(r==="to.have.class")s=t.classList.toString();else if(r==="to.have.css")s=this.window.getComputedStyle(t).getPropertyValue(n.expressionArg);else if(r==="to.have.id")s=t.id;else if(r==="to.have.text")s=n.useInnerText?t.innerText:je(new Map,t).full;else if(r==="to.have.accessible.name")s=Rs(t,!1);else if(r==="to.have.accessible.description")s=Ec(t,!1);else if(r==="to.have.role")s=Ne(t)||"";else if(r==="to.have.title")s=this.document.title;else if(r==="to.have.url")s=this.document.location.href;else if(r==="to.have.value"){if(t=this.retarget(t,"follow-label"),t.nodeName!=="INPUT"&&t.nodeName!=="TEXTAREA"&&t.nodeName!=="SELECT")throw this.createStacklessError("Not an input element");s=t.value}if(s!==void 0&&n.expectedText){const o=new zo(n.expectedText[0]);return{received:s,matches:o.matches(s)}}}throw this.createStacklessError("Unknown expect matcher: "+r)}expectArray(t,n){const r=n.expression;if(r==="to.have.count"){const s=t.length,o=s===n.expectedNumber;return{received:s,matches:o}}let i;if(r==="to.have.text.array"||r==="to.contain.text.array"?i=t.map(s=>n.useInnerText?s.innerText:je(new Map,s).full):r==="to.have.class.array"&&(i=t.map(s=>s.classList.toString())),i&&n.expectedText){const s=r!=="to.contain.text.array";if(!(i.length===n.expectedText.length||!s))return{received:i,matches:!1};const l=n.expectedText.map(c=>new zo(c));let a=0,u=0;for(;a<l.length&&u<i.length;)l[a].matches(i[u])&&++a,++u;return{received:i,matches:a===l.length}}throw this.createStacklessError("Unknown expect matcher: "+r)}getElementAccessibleName(t,n){return Rs(t,!!n)}getElementAccessibleDescription(t,n){return Ec(t,!!n)}getAriaRole(t){return Ne(t)}}const ow=new Set(["AREA","BASE","BR","COL","COMMAND","EMBED","HR","IMG","INPUT","KEYGEN","LINK","MENUITEM","META","PARAM","SOURCE","TRACK","WBR"]),lw=new Set(["checked","selected","disabled","readonly","multiple"]);function Oi(e){return e.replace(/\n/g,"↵").replace(/\t/g,"⇆")}const aw=new Map([["auxclick","mouse"],["click","mouse"],["dblclick","mouse"],["mousedown","mouse"],["mouseeenter","mouse"],["mouseleave","mouse"],["mousemove","mouse"],["mouseout","mouse"],["mouseover","mouse"],["mouseup","mouse"],["mouseleave","mouse"],["mousewheel","mouse"],["keydown","keyboard"],["keyup","keyboard"],["keypress","keyboard"],["textInput","keyboard"],["touchstart","touch"],["touchmove","touch"],["touchend","touch"],["touchcancel","touch"],["pointerover","pointer"],["pointerout","pointer"],["pointerenter","pointer"],["pointerleave","pointer"],["pointerdown","pointer"],["pointerup","pointer"],["pointermove","pointer"],["pointercancel","pointer"],["gotpointercapture","pointer"],["lostpointercapture","pointer"],["focus","focus"],["blur","focus"],["drag","drag"],["dragstart","drag"],["dragend","drag"],["dragover","drag"],["dragenter","drag"],["dragleave","drag"],["dragexit","drag"],["drop","drag"],["wheel","wheel"],["deviceorientation","deviceorientation"],["deviceorientationabsolute","deviceorientation"],["devicemotion","devicemotion"]]),Lp=new Set(["mousemove"]),Ap=new Set(["pointerdown","pointerup","touchstart","touchend","touchcancel"]),Mp=new Set(["mousedown","mouseup","pointerdown","pointerup","click","auxclick","dblclick","contextmenu"]),uw=new Set([...Lp,...Ap,...Mp]);function cw(e){if(e=e.substring(1,e.length-1),!e.includes("\\"))return e;const t=[];let n=0;for(;n<e.length;)e[n]==="\\"&&n+1<e.length&&n++,t.push(e[n++]);return t.join("")}function zi(e,t){if(e[0]==="/"&&e.lastIndexOf("/")>0){const i=e.lastIndexOf("/"),s=new RegExp(e.substring(1,i),e.substring(i+1));return{matcher:o=>s.test(o.full),kind:"regex"}}const n=t?JSON.parse.bind(JSON):cw;let r=!1;return e.length>1&&e[0]==='"'&&e[e.length-1]==='"'?(e=n(e),r=!0):t&&e.length>1&&e[0]==='"'&&e[e.length-2]==='"'&&e[e.length-1]==="i"?(e=n(e.substring(0,e.length-1)),r=!1):t&&e.length>1&&e[0]==='"'&&e[e.length-2]==='"'&&e[e.length-1]==="s"?(e=n(e.substring(0,e.length-1)),r=!0):e.length>1&&e[0]==="'"&&e[e.length-1]==="'"&&(e=n(e),r=!0),e=Ue(e),r?t?{kind:"strict",matcher:s=>s.normalized===e}:{matcher:s=>!e&&!s.immediate.length?!0:s.immediate.some(o=>Ue(o)===e),kind:"strict"}:(e=e.toLowerCase(),{kind:"lax",matcher:i=>i.normalized.toLowerCase().includes(e)})}class zo{constructor(t){if(this._normalizeWhiteSpace=t.normalizeWhiteSpace,this._ignoreCase=t.ignoreCase,this._string=t.matchSubstring?void 0:this.normalize(t.string),this._substring=t.matchSubstring?this.normalize(t.string):void 0,t.regexSource){const n=new Set((t.regexFlags||"").split(""));t.ignoreCase===!1&&n.delete("i"),t.ignoreCase===!0&&n.add("i"),this._regex=new RegExp(t.regexSource,[...n].join(""))}}matches(t){return this._regex||(t=this.normalize(t)),this._string!==void 0?t===this._string:this._substring!==void 0?t.includes(this._substring):this._regex?!!this._regex.test(t):!1}normalize(t){return t&&(this._normalizeWhiteSpace&&(t=Ue(t)),this._ignoreCase&&(t=t.toLocaleLowerCase()),t)}}function Bl(e,t){if(e===t)return!0;if(e&&t&&typeof e=="object"&&typeof t=="object"){if(e.constructor!==t.constructor)return!1;if(Array.isArray(e)){if(e.length!==t.length)return!1;for(let r=0;r<e.length;++r)if(!Bl(e[r],t[r]))return!1;return!0}if(e instanceof RegExp)return e.source===t.source&&e.flags===t.flags;if(e.valueOf!==Object.prototype.valueOf)return e.valueOf()===t.valueOf();if(e.toString!==Object.prototype.toString)return e.toString()===t.toString();const n=Object.keys(e);if(n.length!==Object.keys(t).length)return!1;for(let r=0;r<n.length;++r)if(!t.hasOwnProperty(n[r]))return!1;for(const r of n)if(!Bl(e[r],t[r]))return!1;return!0}return typeof e=="number"&&typeof t=="number"?isNaN(e)&&isNaN(t):!1}const dw={tagName:"svg",children:[{tagName:"defs",children:[{tagName:"clipPath",attrs:{width:"16",height:"16",viewBox:"0 0 16 16",fill:"currentColor",id:"icon-gripper"},children:[{tagName:"path",attrs:{d:"M5 3h2v2H5zm0 4h2v2H5zm0 4h2v2H5zm4-8h2v2H9zm0 4h2v2H9zm0 4h2v2H9z"}}]},{tagName:"clipPath",attrs:{width:"16",height:"16",viewBox:"0 0 16 16",fill:"currentColor",id:"icon-circle-large-filled"},children:[{tagName:"path",attrs:{d:"M8 1a6.8 6.8 0 0 1 1.86.253 6.899 6.899 0 0 1 3.083 1.805 6.903 6.903 0 0 1 1.804 3.083C14.916 6.738 15 7.357 15 8s-.084 1.262-.253 1.86a6.9 6.9 0 0 1-.704 1.674 7.157 7.157 0 0 1-2.516 2.509 6.966 6.966 0 0 1-1.668.71A6.984 6.984 0 0 1 8 15a6.984 6.984 0 0 1-1.86-.246 7.098 7.098 0 0 1-1.674-.711 7.3 7.3 0 0 1-1.415-1.094 7.295 7.295 0 0 1-1.094-1.415 7.098 7.098 0 0 1-.71-1.675A6.985 6.985 0 0 1 1 8c0-.643.082-1.262.246-1.86a6.968 6.968 0 0 1 .711-1.667 7.156 7.156 0 0 1 2.509-2.516 6.895 6.895 0 0 1 1.675-.704A6.808 6.808 0 0 1 8 1z"}}]},{tagName:"clipPath",attrs:{width:"16",height:"16",viewBox:"0 0 16 16",fill:"currentColor",id:"icon-inspect"},children:[{tagName:"path",attrs:{"fill-rule":"evenodd","clip-rule":"evenodd",d:"M1 3l1-1h12l1 1v6h-1V3H2v8h5v1H2l-1-1V3zm14.707 9.707L9 6v9.414l2.707-2.707h4zM10 13V8.414l3.293 3.293h-2L10 13z"}}]},{tagName:"clipPath",attrs:{width:"16",height:"16",viewBox:"0 0 16 16",fill:"currentColor",id:"icon-whole-word"},children:[{tagName:"path",attrs:{"fill-rule":"evenodd","clip-rule":"evenodd",d:"M0 11H1V13H15V11H16V14H15H1H0V11Z"}},{tagName:"path",attrs:{d:"M6.84048 11H5.95963V10.1406H5.93814C5.555 10.7995 4.99104 11.1289 4.24625 11.1289C3.69839 11.1289 3.26871 10.9839 2.95718 10.6938C2.64924 10.4038 2.49527 10.0189 2.49527 9.53906C2.49527 8.51139 3.10041 7.91341 4.3107 7.74512L5.95963 7.51416C5.95963 6.57959 5.58186 6.1123 4.82632 6.1123C4.16389 6.1123 3.56591 6.33789 3.03238 6.78906V5.88672C3.57307 5.54297 4.19612 5.37109 4.90152 5.37109C6.19416 5.37109 6.84048 6.05501 6.84048 7.42285V11ZM5.95963 8.21777L4.63297 8.40039C4.22476 8.45768 3.91682 8.55973 3.70914 8.70654C3.50145 8.84977 3.39761 9.10579 3.39761 9.47461C3.39761 9.74316 3.4925 9.96338 3.68228 10.1353C3.87564 10.3035 4.13166 10.3877 4.45035 10.3877C4.8872 10.3877 5.24706 10.2355 5.52994 9.93115C5.8164 9.62321 5.95963 9.2347 5.95963 8.76562V8.21777Z"}},{tagName:"path",attrs:{d:"M9.3475 10.2051H9.32601V11H8.44515V2.85742H9.32601V6.4668H9.3475C9.78076 5.73633 10.4146 5.37109 11.2489 5.37109C11.9543 5.37109 12.5057 5.61816 12.9032 6.1123C13.3042 6.60286 13.5047 7.26172 13.5047 8.08887C13.5047 9.00911 13.2809 9.74674 12.8333 10.3018C12.3857 10.8532 11.7734 11.1289 10.9964 11.1289C10.2695 11.1289 9.71989 10.821 9.3475 10.2051ZM9.32601 7.98682V8.75488C9.32601 9.20964 9.47282 9.59635 9.76644 9.91504C10.0636 10.2301 10.4396 10.3877 10.8944 10.3877C11.4279 10.3877 11.8451 10.1836 12.1458 9.77539C12.4502 9.36719 12.6024 8.79964 12.6024 8.07275C12.6024 7.46045 12.4609 6.98063 12.1781 6.6333C11.8952 6.28597 11.512 6.1123 11.0286 6.1123C10.5166 6.1123 10.1048 6.29134 9.7933 6.64941C9.48177 7.00391 9.32601 7.44971 9.32601 7.98682Z"}}]},{tagName:"clipPath",attrs:{width:"16",height:"16",viewBox:"0 0 16 16",fill:"currentColor",id:"icon-eye"},children:[{tagName:"path",attrs:{d:"M7.99993 6.00316C9.47266 6.00316 10.6666 7.19708 10.6666 8.66981C10.6666 10.1426 9.47266 11.3365 7.99993 11.3365C6.52715 11.3365 5.33324 10.1426 5.33324 8.66981C5.33324 7.19708 6.52715 6.00316 7.99993 6.00316ZM7.99993 7.00315C7.07946 7.00315 6.33324 7.74935 6.33324 8.66981C6.33324 9.59028 7.07946 10.3365 7.99993 10.3365C8.9204 10.3365 9.6666 9.59028 9.6666 8.66981C9.6666 7.74935 8.9204 7.00315 7.99993 7.00315ZM7.99993 3.66675C11.0756 3.66675 13.7307 5.76675 14.4673 8.70968C14.5344 8.97755 14.3716 9.24908 14.1037 9.31615C13.8358 9.38315 13.5643 9.22041 13.4973 8.95248C12.8713 6.45205 10.6141 4.66675 7.99993 4.66675C5.38454 4.66675 3.12664 6.45359 2.50182 8.95555C2.43491 9.22341 2.16348 9.38635 1.89557 9.31948C1.62766 9.25255 1.46471 8.98115 1.53162 8.71321C2.26701 5.76856 4.9229 3.66675 7.99993 3.66675Z"}}]},{tagName:"clipPath",attrs:{width:"16",height:"16",viewBox:"0 0 16 16",fill:"currentColor",id:"icon-symbol-constant"},children:[{tagName:"path",attrs:{"fill-rule":"evenodd","clip-rule":"evenodd",d:"M4 6h8v1H4V6zm8 3H4v1h8V9z"}},{tagName:"path",attrs:{"fill-rule":"evenodd","clip-rule":"evenodd",d:"M1 4l1-1h12l1 1v8l-1 1H2l-1-1V4zm1 0v8h12V4H2z"}}]},{tagName:"clipPath",attrs:{width:"16",height:"16",viewBox:"0 0 16 16",fill:"currentColor",id:"icon-check"},children:[{tagName:"path",attrs:{"fill-rule":"evenodd","clip-rule":"evenodd",d:"M14.431 3.323l-8.47 10-.79-.036-3.35-4.77.818-.574 2.978 4.24 8.051-9.506.764.646z"}}]},{tagName:"clipPath",attrs:{width:"16",height:"16",viewBox:"0 0 16 16",fill:"currentColor",id:"icon-close"},children:[{tagName:"path",attrs:{"fill-rule":"evenodd","clip-rule":"evenodd",d:"M8 8.707l3.646 3.647.708-.707L8.707 8l3.647-3.646-.707-.708L8 7.293 4.354 3.646l-.707.708L7.293 8l-3.646 3.646.707.708L8 8.707z"}}]},{tagName:"clipPath",attrs:{width:"16",height:"16",viewBox:"0 0 16 16",fill:"currentColor",id:"icon-pass"},children:[{tagName:"path",attrs:{d:"M6.27 10.87h.71l4.56-4.56-.71-.71-4.2 4.21-1.92-1.92L4 8.6l2.27 2.27z"}},{tagName:"path",attrs:{"fill-rule":"evenodd","clip-rule":"evenodd",d:"M8.6 1c1.6.1 3.1.9 4.2 2 1.3 1.4 2 3.1 2 5.1 0 1.6-.6 3.1-1.6 4.4-1 1.2-2.4 2.1-4 2.4-1.6.3-3.2.1-4.6-.7-1.4-.8-2.5-2-3.1-3.5C.9 9.2.8 7.5 1.3 6c.5-1.6 1.4-2.9 2.8-3.8C5.4 1.3 7 .9 8.6 1zm.5 12.9c1.3-.3 2.5-1 3.4-2.1.8-1.1 1.3-2.4 1.2-3.8 0-1.6-.6-3.2-1.7-4.3-1-1-2.2-1.6-3.6-1.7-1.3-.1-2.7.2-3.8 1-1.1.8-1.9 1.9-2.3 3.3-.4 1.3-.4 2.7.2 4 .6 1.3 1.5 2.3 2.7 3 1.2.7 2.6.9 3.9.6z"}}]}]}]};class Ic{cursor(){return"default"}}class Do{constructor(t,n){this._hoveredModel=null,this._hoveredElement=null,this._hoveredSelectors=null,this._recorder=t,this._assertVisibility=n}cursor(){return"pointer"}cleanup(){this._hoveredModel=null,this._hoveredElement=null,this._hoveredSelectors=null}onClick(t){var n;X(t),t.button===0&&(n=this._hoveredModel)!=null&&n.selector&&this._commit(this._hoveredModel.selector)}onContextMenu(t){if(this._hoveredModel&&!this._hoveredModel.tooltipListItemSelected&&this._hoveredSelectors&&this._hoveredSelectors.length>1){X(t);const n=this._hoveredSelectors;this._hoveredModel.tooltipFooter=void 0,this._hoveredModel.tooltipList=n.map(r=>this._recorder.injectedScript.utils.asLocator(this._recorder.state.language,r)),this._hoveredModel.tooltipListItemSelected=r=>{r===void 0?this._reset(!0):this._commit(n[r])},this._recorder.updateHighlight(this._hoveredModel,!0)}}onPointerDown(t){X(t)}onPointerUp(t){X(t)}onMouseDown(t){X(t)}onMouseUp(t){X(t)}onMouseMove(t){var s;X(t);let n=this._recorder.deepEventTarget(t);if(n.isConnected||(n=null),this._hoveredElement===n)return;this._hoveredElement=n;let r=null,i=[];if(this._hoveredElement){const o=this._recorder.injectedScript.generateSelector(this._hoveredElement,{testIdAttributeName:this._recorder.state.testIdAttributeName,multiple:!1});i=o.selectors,r={selector:o.selector,elements:o.elements,tooltipText:this._recorder.injectedScript.utils.asLocator(this._recorder.state.language,o.selector),tooltipFooter:i.length>1?"Click to select, right-click for more options":void 0,color:this._assertVisibility?"#8acae480":void 0}}((s=this._hoveredModel)==null?void 0:s.selector)!==(r==null?void 0:r.selector)&&(this._hoveredModel=r,this._hoveredSelectors=i,this._recorder.updateHighlight(r,!0))}onMouseEnter(t){X(t)}onMouseLeave(t){X(t);const n=this._recorder.injectedScript.window;n.top!==n&&this._recorder.deepEventTarget(t).nodeType===Node.DOCUMENT_NODE&&this._reset(!0)}onKeyDown(t){var n,r,i;X(t),t.key==="Escape"&&((n=this._hoveredModel)!=null&&n.tooltipListItemSelected?this._reset(!0):this._assertVisibility&&((i=(r=this._recorder.delegate).setMode)==null||i.call(r,"recording")))}onKeyUp(t){X(t)}onScroll(t){this._reset(!1)}_commit(t){var n,r,i,s,o,l,a;this._assertVisibility?((r=(n=this._recorder.delegate).recordAction)==null||r.call(n,{name:"assertVisible",selector:t,signals:[]}),(s=(i=this._recorder.delegate).setMode)==null||s.call(i,"recording"),(o=this._recorder.overlay)==null||o.flashToolSucceeded("assertingVisibility")):(a=(l=this._recorder.delegate).setSelector)==null||a.call(l,t)}_reset(t){this._hoveredElement=null,this._hoveredModel=null,this._hoveredSelectors=null,this._recorder.updateHighlight(null,t)}}class fw{constructor(t){this._performingAction=!1,this._hoveredModel=null,this._hoveredElement=null,this._activeModel=null,this._expectProgrammaticKeyUp=!1,this._recorder=t}cursor(){return"pointer"}cleanup(){this._hoveredModel=null,this._hoveredElement=null,this._activeModel=null,this._expectProgrammaticKeyUp=!1}onClick(t){if(Rc(this._hoveredElement)||this._shouldIgnoreMouseEvent(t)||this._actionInProgress(t)||this._consumedDueToNoModel(t,this._hoveredModel))return;const n=Fo(this._recorder.deepEventTarget(t));if(n){this._performAction({name:n.checked?"check":"uncheck",selector:this._hoveredModel.selector,signals:[]});return}this._performAction({name:"click",selector:this._hoveredModel.selector,position:vw(t),signals:[],button:gw(t),modifiers:Pc(t),clickCount:t.detail})}onPointerDown(t){this._shouldIgnoreMouseEvent(t)||this._performingAction||X(t)}onPointerUp(t){this._shouldIgnoreMouseEvent(t)||this._performingAction||X(t)}onMouseDown(t){this._shouldIgnoreMouseEvent(t)||(this._performingAction||X(t),this._activeModel=this._hoveredModel)}onMouseUp(t){this._shouldIgnoreMouseEvent(t)||this._performingAction||X(t)}onMouseMove(t){const n=this._recorder.deepEventTarget(t);this._hoveredElement!==n&&(this._hoveredElement=n,this._updateModelForHoveredElement())}onMouseLeave(t){const n=this._recorder.injectedScript.window;n.top!==n&&this._recorder.deepEventTarget(t).nodeType===Node.DOCUMENT_NODE&&(this._hoveredElement=null,this._updateModelForHoveredElement())}onFocus(t){this._onFocus(!0)}onInput(t){var r,i,s,o,l,a;const n=this._recorder.deepEventTarget(t);if(n.nodeName==="INPUT"&&n.type.toLowerCase()==="file"){(i=(r=this._recorder.delegate).recordAction)==null||i.call(r,{name:"setInputFiles",selector:this._activeModel.selector,signals:[],files:[...n.files||[]].map(u=>u.name)});return}if(Rc(n)){(o=(s=this._recorder.delegate).recordAction)==null||o.call(s,{name:"fill",selector:this._hoveredModel.selector,signals:[],text:n.value});return}if(["INPUT","TEXTAREA"].includes(n.nodeName)||n.isContentEditable){if(n.nodeName==="INPUT"&&["checkbox","radio"].includes(n.type.toLowerCase())||this._consumedDueWrongTarget(t))return;(a=(l=this._recorder.delegate).recordAction)==null||a.call(l,{name:"fill",selector:this._activeModel.selector,signals:[],text:n.isContentEditable?n.innerText:n.value})}if(n.nodeName==="SELECT"){const u=n;if(this._actionInProgress(t))return;this._performAction({name:"select",selector:this._hoveredModel.selector,options:[...u.selectedOptions].map(c=>c.value),signals:[]})}}onKeyDown(t){if(this._shouldGenerateKeyPressFor(t)){if(this._actionInProgress(t)){this._expectProgrammaticKeyUp=!0;return}if(!this._consumedDueWrongTarget(t)){if(t.key===" "){const n=Fo(this._recorder.deepEventTarget(t));if(n){this._performAction({name:n.checked?"uncheck":"check",selector:this._activeModel.selector,signals:[]});return}}this._performAction({name:"press",selector:this._activeModel.selector,signals:[],key:t.key,modifiers:Pc(t)})}}}onKeyUp(t){if(this._shouldGenerateKeyPressFor(t)){if(!this._expectProgrammaticKeyUp){X(t);return}this._expectProgrammaticKeyUp=!1}}onScroll(t){this._hoveredModel=null,this._hoveredElement=null,this._recorder.updateHighlight(null,!1)}_onFocus(t){const n=mw(this._recorder.document);if(t&&n===this._recorder.document.body)return;const r=n?this._recorder.injectedScript.generateSelector(n,{testIdAttributeName:this._recorder.state.testIdAttributeName}):null;this._activeModel=r&&r.selector?r:null,t&&(this._hoveredElement=n),this._updateModelForHoveredElement()}_shouldIgnoreMouseEvent(t){const n=this._recorder.deepEventTarget(t),r=n.nodeName;return!!(r==="SELECT"||r==="OPTION"||r==="INPUT"&&["date","range"].includes(n.type))}_actionInProgress(t){return this._performingAction?!0:(X(t),!1)}_consumedDueToNoModel(t,n){return n?!1:(X(t),!0)}_consumedDueWrongTarget(t){return this._activeModel&&this._activeModel.elements[0]===this._recorder.deepEventTarget(t)?!1:(X(t),!0)}async _performAction(t){var n,r;this._hoveredElement=null,this._hoveredModel=null,this._activeModel=null,this._recorder.updateHighlight(null,!1),this._performingAction=!0,await((r=(n=this._recorder.delegate).performAction)==null?void 0:r.call(n,t).catch(()=>{})),this._performingAction=!1,this._onFocus(!1),this._recorder.injectedScript.isUnderTest&&console.error("Action performed for test: "+JSON.stringify({hovered:this._hoveredModel?this._hoveredModel.selector:null,active:this._activeModel?this._activeModel.selector:null}))}_shouldGenerateKeyPressFor(t){if(t.key==="Enter"&&(this._recorder.deepEventTarget(t).nodeName==="TEXTAREA"||this._recorder.deepEventTarget(t).isContentEditable)||["Backspace","Delete","AltGraph"].includes(t.key)||t.key==="@"&&t.code==="KeyL")return!1;if(navigator.platform.includes("Mac")){if(t.key==="v"&&t.metaKey)return!1}else if(t.key==="v"&&t.ctrlKey||t.key==="Insert"&&t.shiftKey)return!1;if(["Shift","Control","Meta","Alt","Process"].includes(t.key))return!1;const n=t.ctrlKey||t.altKey||t.metaKey;return t.key.length===1&&!n?!!Fo(this._recorder.deepEventTarget(t)):!0}_updateModelForHoveredElement(){if(!this._hoveredElement||!this._hoveredElement.isConnected){this._hoveredModel=null,this._hoveredElement=null,this._recorder.updateHighlight(null,!0);return}const{selector:t,elements:n}=this._recorder.injectedScript.generateSelector(this._hoveredElement,{testIdAttributeName:this._recorder.state.testIdAttributeName});this._hoveredModel&&this._hoveredModel.selector===t||(this._hoveredModel=t?{selector:t,elements:n,color:"#dc6f6f7f"}:null,this._recorder.updateHighlight(this._hoveredModel,!0))}}class jc{constructor(t,n){this._hoverHighlight=null,this._action=null,this._dialogElement=null,this._textCache=new Map,this._recorder=t,this._kind=n,this._acceptButton=this._recorder.document.createElement("x-pw-tool-item"),this._acceptButton.title="Accept",this._acceptButton.classList.add("accept"),this._acceptButton.appendChild(this._recorder.document.createElement("x-div")),this._acceptButton.addEventListener("click",()=>this._commit()),this._cancelButton=this._recorder.document.createElement("x-pw-tool-item"),this._cancelButton.title="Close",this._cancelButton.classList.add("cancel"),this._cancelButton.appendChild(this._recorder.document.createElement("x-div")),this._cancelButton.addEventListener("click",()=>this._closeDialog())}cursor(){return"pointer"}cleanup(){this._closeDialog(),this._hoverHighlight=null}onClick(t){X(t),this._kind==="value"?this._commitAssertValue():this._dialogElement||this._showDialog()}onMouseDown(t){const n=this._recorder.deepEventTarget(t);this._elementHasValue(n)&&t.preventDefault()}onPointerUp(t){var r;const n=(r=this._hoverHighlight)==null?void 0:r.elements[0];this._kind==="value"&&n&&n.nodeName==="INPUT"&&n.disabled&&this._commitAssertValue()}onMouseMove(t){var r;if(this._dialogElement)return;const n=this._recorder.deepEventTarget(t);((r=this._hoverHighlight)==null?void 0:r.elements[0])!==n&&(this._kind==="text"?this._hoverHighlight=this._recorder.injectedScript.utils.elementText(this._textCache,n).full?{elements:[n],selector:""}:null:this._hoverHighlight=this._elementHasValue(n)?this._recorder.injectedScript.generateSelector(n,{testIdAttributeName:this._recorder.state.testIdAttributeName}):null,this._hoverHighlight&&(this._hoverHighlight.color="#8acae480"),this._recorder.updateHighlight(this._hoverHighlight,!0))}onKeyDown(t){var n,r;t.key==="Escape"&&((r=(n=this._recorder.delegate).setMode)==null||r.call(n,"recording")),X(t)}onScroll(t){this._recorder.updateHighlight(this._hoverHighlight,!1)}_elementHasValue(t){return t.nodeName==="TEXTAREA"||t.nodeName==="SELECT"||t.nodeName==="INPUT"&&!["button","image","reset","submit"].includes(t.type)}_generateAction(){var n;this._textCache.clear();const t=(n=this._hoverHighlight)==null?void 0:n.elements[0];if(!t)return null;if(this._kind==="value"){if(!this._elementHasValue(t))return null;const{selector:r}=this._recorder.injectedScript.generateSelector(t,{testIdAttributeName:this._recorder.state.testIdAttributeName});return t.nodeName==="INPUT"&&["checkbox","radio"].includes(t.type.toLowerCase())?{name:"assertChecked",selector:r,signals:[],checked:!t.checked}:{name:"assertValue",selector:r,signals:[],value:t.value}}else return this._hoverHighlight=this._recorder.injectedScript.generateSelector(t,{testIdAttributeName:this._recorder.state.testIdAttributeName,forTextExpect:!0}),this._hoverHighlight.color="#8acae480",this._recorder.updateHighlight(this._hoverHighlight,!0),{name:"assertText",selector:this._hoverHighlight.selector,signals:[],text:this._recorder.injectedScript.utils.elementText(this._textCache,t).normalized,substring:!0}}_renderValue(t){return(t==null?void 0:t.name)==="assertText"?this._recorder.injectedScript.utils.normalizeWhiteSpace(t.text):(t==null?void 0:t.name)==="assertChecked"?String(t.checked):(t==null?void 0:t.name)==="assertValue"?t.value:""}_commit(){var t,n,r,i;!this._action||!this._dialogElement||(this._closeDialog(),(n=(t=this._recorder.delegate).recordAction)==null||n.call(t,this._action),(i=(r=this._recorder.delegate).setMode)==null||i.call(r,"recording"))}_showDialog(){var a;if(!((a=this._hoverHighlight)!=null&&a.elements[0])||(this._action=this._generateAction(),!this._action||this._action.name!=="assertText"))return;this._dialogElement=this._recorder.document.createElement("x-pw-dialog"),this._keyboardListener=u=>{if(u.key==="Escape"){this._closeDialog();return}if(u.key==="Enter"&&(u.ctrlKey||u.metaKey)){this._dialogElement&&this._commit();return}},this._recorder.document.addEventListener("keydown",this._keyboardListener,!0);const t=this._recorder.document.createElement("x-pw-tools-list"),n=this._recorder.document.createElement("label");n.textContent="Assert that element contains text",t.appendChild(n),t.appendChild(this._recorder.document.createElement("x-spacer")),t.appendChild(this._acceptButton),t.appendChild(this._cancelButton),this._dialogElement.appendChild(t);const r=this._recorder.document.createElement("x-pw-dialog-body"),i=this._action,s=this._recorder.document.createElement("textarea");s.setAttribute("spellcheck","false"),s.value=this._renderValue(this._action),s.classList.add("text-editor");const o=()=>{var g;const u=this._recorder.injectedScript.utils.normalizeWhiteSpace(s.value),c=(g=this._hoverHighlight)==null?void 0:g.elements[0];if(!c)return;i.text=u;const h=this._recorder.injectedScript.utils.elementText(this._textCache,c).normalized,d=u&&h.includes(u);s.classList.toggle("does-not-match",!d)};s.addEventListener("input",o),r.appendChild(s),this._dialogElement.appendChild(r),this._recorder.highlight.appendChild(this._dialogElement);const l=this._recorder.highlight.tooltipPosition(this._recorder.highlight.firstBox(),this._dialogElement);this._dialogElement.style.top=l.anchorTop+"px",this._dialogElement.style.left=l.anchorLeft+"px",s.focus()}_closeDialog(){this._dialogElement&&(this._dialogElement.remove(),this._recorder.document.removeEventListener("keydown",this._keyboardListener),this._dialogElement=null)}_commitAssertValue(){var n,r,i,s,o;if(this._kind!=="value")return;const t=this._generateAction();t&&((r=(n=this._recorder.delegate).recordAction)==null||r.call(n,t),(s=(i=this._recorder.delegate).setMode)==null||s.call(i,"recording"),(o=this._recorder.overlay)==null||o.flashToolSucceeded("assertingValue"))}}class hw{constructor(t){this._listeners=[],this._offsetX=0,this._measure={width:0,height:0},this._recorder=t;const n=this._recorder.document;this._overlayElement=n.createElement("x-pw-overlay"),this._overlayElement.appendChild(jp(this._recorder.document,dw));const r=n.createElement("x-pw-tools-list");this._overlayElement.appendChild(r),this._dragHandle=n.createElement("x-pw-tool-gripper"),this._dragHandle.appendChild(n.createElement("x-div")),r.appendChild(this._dragHandle),this._recordToggle=this._recorder.document.createElement("x-pw-tool-item"),this._recordToggle.title="Record",this._recordToggle.classList.add("record"),this._recordToggle.appendChild(this._recorder.document.createElement("x-div")),r.appendChild(this._recordToggle),this._pickLocatorToggle=this._recorder.document.createElement("x-pw-tool-item"),this._pickLocatorToggle.title="Pick locator",this._pickLocatorToggle.classList.add("pick-locator"),this._pickLocatorToggle.appendChild(this._recorder.document.createElement("x-div")),r.appendChild(this._pickLocatorToggle),this._assertVisibilityToggle=this._recorder.document.createElement("x-pw-tool-item"),this._assertVisibilityToggle.title="Assert visibility",this._assertVisibilityToggle.classList.add("visibility"),this._assertVisibilityToggle.appendChild(this._recorder.document.createElement("x-div")),r.appendChild(this._assertVisibilityToggle),this._assertTextToggle=this._recorder.document.createElement("x-pw-tool-item"),this._assertTextToggle.title="Assert text",this._assertTextToggle.classList.add("text"),this._assertTextToggle.appendChild(this._recorder.document.createElement("x-div")),r.appendChild(this._assertTextToggle),this._assertValuesToggle=this._recorder.document.createElement("x-pw-tool-item"),this._assertValuesToggle.title="Assert value",this._assertValuesToggle.classList.add("value"),this._assertValuesToggle.appendChild(this._recorder.document.createElement("x-div")),r.appendChild(this._assertValuesToggle),this._updateVisualPosition(),this._refreshListeners()}_refreshListeners(){Ip(this._listeners),this._listeners=[J(this._dragHandle,"mousedown",t=>{this._dragState={offsetX:this._offsetX,dragStart:{x:t.clientX,y:0}}}),J(this._recordToggle,"click",()=>{var t,n;(n=(t=this._recorder.delegate).setMode)==null||n.call(t,this._recorder.state.mode==="none"||this._recorder.state.mode==="standby"||this._recorder.state.mode==="inspecting"?"recording":"standby")}),J(this._pickLocatorToggle,"click",()=>{var n,r;const t={inspecting:"standby",none:"inspecting",standby:"inspecting",recording:"recording-inspecting","recording-inspecting":"recording",assertingText:"recording-inspecting",assertingVisibility:"recording-inspecting",assertingValue:"recording-inspecting"};(r=(n=this._recorder.delegate).setMode)==null||r.call(n,t[this._recorder.state.mode])}),J(this._assertVisibilityToggle,"click",()=>{var t,n;this._assertVisibilityToggle.classList.contains("disabled")||(n=(t=this._recorder.delegate).setMode)==null||n.call(t,this._recorder.state.mode==="assertingVisibility"?"recording":"assertingVisibility")}),J(this._assertTextToggle,"click",()=>{var t,n;this._assertTextToggle.classList.contains("disabled")||(n=(t=this._recorder.delegate).setMode)==null||n.call(t,this._recorder.state.mode==="assertingText"?"recording":"assertingText")}),J(this._assertValuesToggle,"click",()=>{var t,n;this._assertValuesToggle.classList.contains("disabled")||(n=(t=this._recorder.delegate).setMode)==null||n.call(t,this._recorder.state.mode==="assertingValue"?"recording":"assertingValue")})]}install(){this._recorder.highlight.appendChild(this._overlayElement),this._refreshListeners(),this._updateVisualPosition()}contains(t){return this._recorder.injectedScript.utils.isInsideScope(this._overlayElement,t)}setUIState(t){this._recordToggle.classList.toggle("active",t.mode==="recording"||t.mode==="assertingText"||t.mode==="assertingVisibility"||t.mode==="assertingValue"||t.mode==="recording-inspecting"),this._pickLocatorToggle.classList.toggle("active",t.mode==="inspecting"||t.mode==="recording-inspecting"),this._assertVisibilityToggle.classList.toggle("active",t.mode==="assertingVisibility"),this._assertVisibilityToggle.classList.toggle("disabled",t.mode==="none"||t.mode==="standby"||t.mode==="inspecting"),this._assertTextToggle.classList.toggle("active",t.mode==="assertingText"),this._assertTextToggle.classList.toggle("disabled",t.mode==="none"||t.mode==="standby"||t.mode==="inspecting"),this._assertValuesToggle.classList.toggle("active",t.mode==="assertingValue"),this._assertValuesToggle.classList.toggle("disabled",t.mode==="none"||t.mode==="standby"||t.mode==="inspecting"),this._offsetX!==t.overlay.offsetX&&(this._offsetX=t.overlay.offsetX,this._updateVisualPosition()),t.mode==="none"?this._hideOverlay():this._showOverlay()}flashToolSucceeded(t){const n=t==="assertingVisibility"?this._assertVisibilityToggle:this._assertValuesToggle;n.classList.add("succeeded"),this._recorder.injectedScript.builtinSetTimeout(()=>n.classList.remove("succeeded"),2e3)}_hideOverlay(){this._overlayElement.setAttribute("hidden","true")}_showOverlay(){this._overlayElement.hasAttribute("hidden")&&(this._overlayElement.removeAttribute("hidden"),this._updateVisualPosition())}_updateVisualPosition(){this._measure=this._overlayElement.getBoundingClientRect(),this._overlayElement.style.left=(this._recorder.injectedScript.window.innerWidth-this._measure.width)/2+this._offsetX+"px"}onMouseMove(t){var n,r;if(!t.buttons)return this._dragState=void 0,!1;if(this._dragState){this._offsetX=this._dragState.offsetX+t.clientX-this._dragState.dragStart.x;const i=(this._recorder.injectedScript.window.innerWidth-this._measure.width)/2-10;return this._offsetX=Math.max(-i,Math.min(i,this._offsetX)),this._updateVisualPosition(),(r=(n=this._recorder.delegate).setOverlayState)==null||r.call(n,{offsetX:this._offsetX}),X(t),!0}return!1}onMouseUp(t){return this._dragState?(X(t),!0):!1}onClick(t){return this._dragState?(this._dragState=void 0,X(t),!0):!1}}class pw{constructor(t){this._listeners=[],this._actionSelectorModel=null,this.state={mode:"none",testIdAttributeName:"data-testid",language:"javascript",overlay:{offsetX:0}},this.delegate={},this.document=t.document,this.injectedScript=t,this.highlight=t.createHighlight(),this._tools={none:new Ic,standby:new Ic,inspecting:new Do(this,!1),recording:new fw(this),"recording-inspecting":new Do(this,!1),assertingText:new jc(this,"text"),assertingVisibility:new Do(this,!0),assertingValue:new jc(this,"value")},this._currentTool=this._tools.none,t.window.top===t.window&&(this.overlay=new hw(this),this.overlay.setUIState(this.state)),this._stylesheet=new t.window.CSSStyleSheet,this._stylesheet.replaceSync(`
+      body[data-pw-cursor=pointer] *, body[data-pw-cursor=pointer] *::after { cursor: pointer !important; }
+      body[data-pw-cursor=text] *, body[data-pw-cursor=text] *::after { cursor: text !important; }
+    `),this.installListeners(),t.isUnderTest&&console.error("Recorder script ready for test")}installListeners(){var t;Ip(this._listeners),this._listeners=[J(this.document,"click",n=>this._onClick(n),!0),J(this.document,"auxclick",n=>this._onClick(n),!0),J(this.document,"contextmenu",n=>this._onContextMenu(n),!0),J(this.document,"dragstart",n=>this._onDragStart(n),!0),J(this.document,"input",n=>this._onInput(n),!0),J(this.document,"keydown",n=>this._onKeyDown(n),!0),J(this.document,"keyup",n=>this._onKeyUp(n),!0),J(this.document,"pointerdown",n=>this._onPointerDown(n),!0),J(this.document,"pointerup",n=>this._onPointerUp(n),!0),J(this.document,"mousedown",n=>this._onMouseDown(n),!0),J(this.document,"mouseup",n=>this._onMouseUp(n),!0),J(this.document,"mousemove",n=>this._onMouseMove(n),!0),J(this.document,"mouseleave",n=>this._onMouseLeave(n),!0),J(this.document,"mouseenter",n=>this._onMouseEnter(n),!0),J(this.document,"focus",n=>this._onFocus(n),!0),J(this.document,"scroll",n=>this._onScroll(n),!0)],this.highlight.install(),(t=this.overlay)==null||t.install(),this.document.adoptedStyleSheets.push(this._stylesheet)}_switchCurrentTool(){var n,r,i;const t=this._tools[this.state.mode];t!==this._currentTool&&((r=(n=this._currentTool).cleanup)==null||r.call(n),this.clearHighlight(),this._currentTool=t,(i=this.injectedScript.document.body)==null||i.setAttribute("data-pw-cursor",t.cursor()))}setUIState(t,n){var r,i,s,o;this.delegate=n,t.actionPoint&&this.state.actionPoint&&t.actionPoint.x===this.state.actionPoint.x&&t.actionPoint.y===this.state.actionPoint.y||!t.actionPoint&&!this.state.actionPoint||(t.actionPoint?this.highlight.showActionPoint(t.actionPoint.x,t.actionPoint.y):this.highlight.hideActionPoint()),this.state=t,this.highlight.setLanguage(t.language),this._switchCurrentTool(),(r=this.overlay)==null||r.setUIState(t),(i=this._actionSelectorModel)!=null&&i.selector&&!((s=this._actionSelectorModel)!=null&&s.elements.length)&&(this._actionSelectorModel=null),t.actionSelector!==((o=this._actionSelectorModel)==null?void 0:o.selector)&&(this._actionSelectorModel=t.actionSelector?yw(this.injectedScript,t.actionSelector,this.document):null),(this.state.mode==="none"||this.state.mode==="standby")&&this.updateHighlight(this._actionSelectorModel,!1)}clearHighlight(){var t,n;(n=(t=this._currentTool).cleanup)==null||n.call(t),this.updateHighlight(null,!1)}_onClick(t){var n,r,i;t.isTrusted&&((n=this.overlay)!=null&&n.onClick(t)||this._ignoreOverlayEvent(t)||(i=(r=this._currentTool).onClick)==null||i.call(r,t))}_onContextMenu(t){var n,r;t.isTrusted&&(this._ignoreOverlayEvent(t)||(r=(n=this._currentTool).onContextMenu)==null||r.call(n,t))}_onDragStart(t){var n,r;t.isTrusted&&(this._ignoreOverlayEvent(t)||(r=(n=this._currentTool).onDragStart)==null||r.call(n,t))}_onPointerDown(t){var n,r;t.isTrusted&&(this._ignoreOverlayEvent(t)||(r=(n=this._currentTool).onPointerDown)==null||r.call(n,t))}_onPointerUp(t){var n,r;t.isTrusted&&(this._ignoreOverlayEvent(t)||(r=(n=this._currentTool).onPointerUp)==null||r.call(n,t))}_onMouseDown(t){var n,r;t.isTrusted&&(this._ignoreOverlayEvent(t)||(r=(n=this._currentTool).onMouseDown)==null||r.call(n,t))}_onMouseUp(t){var n,r,i;t.isTrusted&&((n=this.overlay)!=null&&n.onMouseUp(t)||this._ignoreOverlayEvent(t)||(i=(r=this._currentTool).onMouseUp)==null||i.call(r,t))}_onMouseMove(t){var n,r,i;t.isTrusted&&((n=this.overlay)!=null&&n.onMouseMove(t)||this._ignoreOverlayEvent(t)||(i=(r=this._currentTool).onMouseMove)==null||i.call(r,t))}_onMouseEnter(t){var n,r;t.isTrusted&&(this._ignoreOverlayEvent(t)||(r=(n=this._currentTool).onMouseEnter)==null||r.call(n,t))}_onMouseLeave(t){var n,r;t.isTrusted&&(this._ignoreOverlayEvent(t)||(r=(n=this._currentTool).onMouseLeave)==null||r.call(n,t))}_onFocus(t){var n,r;t.isTrusted&&(this._ignoreOverlayEvent(t)||(r=(n=this._currentTool).onFocus)==null||r.call(n,t))}_onScroll(t){var n,r;t.isTrusted&&(this.highlight.hideActionPoint(),(r=(n=this._currentTool).onScroll)==null||r.call(n,t))}_onInput(t){var n,r;this._ignoreOverlayEvent(t)||(r=(n=this._currentTool).onInput)==null||r.call(n,t)}_onKeyDown(t){var n,r;t.isTrusted&&(this._ignoreOverlayEvent(t)||(r=(n=this._currentTool).onKeyDown)==null||r.call(n,t))}_onKeyUp(t){var n,r;t.isTrusted&&(this._ignoreOverlayEvent(t)||(r=(n=this._currentTool).onKeyUp)==null||r.call(n,t))}updateHighlight(t,n){var i,s;let r=t==null?void 0:t.tooltipText;r===void 0&&!(t!=null&&t.tooltipList)&&(t!=null&&t.selector)&&(r=this.injectedScript.utils.asLocator(this.state.language,t.selector)),this.highlight.updateHighlight((t==null?void 0:t.elements)||[],{...t,tooltipText:r}),n&&((s=(i=this.delegate).highlightUpdated)==null||s.call(i))}_ignoreOverlayEvent(t){return t.composedPath().some(n=>(n.nodeName||"").toLowerCase()==="x-pw-glass")}deepEventTarget(t){var n;for(const r of t.composedPath())if(!((n=this.overlay)!=null&&n.contains(r)))return r;return t.composedPath()[0]}}function mw(e){let t=e.activeElement;for(;t&&t.shadowRoot&&t.shadowRoot.activeElement;)t=t.shadowRoot.activeElement;return t}function Pc(e){return(e.altKey?1:0)|(e.ctrlKey?2:0)|(e.metaKey?4:0)|(e.shiftKey?8:0)}function gw(e){switch(e.which){case 1:return"left";case 2:return"middle";case 3:return"right"}return"left"}function vw(e){if(e.target.nodeName==="CANVAS")return{x:e.offsetX,y:e.offsetY}}function X(e){e.preventDefault(),e.stopPropagation(),e.stopImmediatePropagation()}function Fo(e){if(!e||e.nodeName!=="INPUT")return null;const t=e;return["checkbox","radio"].includes(t.type)?t:null}function Rc(e){return!e||e.nodeName!=="INPUT"?!1:e.type.toLowerCase()==="range"}function J(e,t,n,r){return e.addEventListener(t,n,r),()=>{e.removeEventListener(t,n,r)}}function Ip(e){for(const t of e)t();e.splice(0,e.length)}function yw(e,t,n){try{const r=e.parseSelector(t);return{selector:t,elements:e.querySelectorAll(r,n)}}catch{return{selector:t,elements:[]}}}function jp(e,{tagName:t,attrs:n,children:r}){const i=e.createElementNS("http://www.w3.org/2000/svg",t);if(n)for(const[s,o]of Object.entries(n))i.setAttribute(s,o);if(r)for(const s of r)i.appendChild(jp(e,s));return i}function Ga(e,t,n){return`internal:attr=[${e}=${Ee(t,(n==null?void 0:n.exact)||!1)}]`}function ww(e,t){return`internal:testid=[${e}=${Ee(t,!0)}]`}function xw(e,t){return"internal:label="+Ge(e,!!(t!=null&&t.exact))}function _w(e,t){return Ga("alt",e,t)}function Sw(e,t){return Ga("title",e,t)}function Ew(e,t){return Ga("placeholder",e,t)}function Tw(e,t){return"internal:text="+Ge(e,!!(t!=null&&t.exact))}function kw(e,t={}){const n=[];return t.checked!==void 0&&n.push(["checked",String(t.checked)]),t.disabled!==void 0&&n.push(["disabled",String(t.disabled)]),t.selected!==void 0&&n.push(["selected",String(t.selected)]),t.expanded!==void 0&&n.push(["expanded",String(t.expanded)]),t.includeHidden!==void 0&&n.push(["include-hidden",String(t.includeHidden)]),t.level!==void 0&&n.push(["level",String(t.level)]),t.name!==void 0&&n.push(["name",Ee(t.name,!!t.exact)]),t.pressed!==void 0&&n.push(["pressed",String(t.pressed)]),`internal:role=${e}${n.map(([r,i])=>`[${r}=${i}]`).join("")}`}const Tr=Symbol("selector");class Hn{constructor(t,n,r){if(r!=null&&r.hasText&&(n+=` >> internal:has-text=${Ge(r.hasText,!1)}`),r!=null&&r.hasNotText&&(n+=` >> internal:has-not-text=${Ge(r.hasNotText,!1)}`),r!=null&&r.has&&(n+=" >> internal:has="+JSON.stringify(r.has[Tr])),r!=null&&r.hasNot&&(n+=" >> internal:has-not="+JSON.stringify(r.hasNot[Tr])),this[Tr]=n,n){const o=t.parseSelector(n);this.element=t.querySelector(o,t.document,!1),this.elements=t.querySelectorAll(o,t.document)}const i=n,s=this;s.locator=(o,l)=>new Hn(t,i?i+" >> "+o:o,l),s.getByTestId=o=>s.locator(ww(t.testIdAttributeNameForStrictErrorAndConsoleCodegen(),o)),s.getByAltText=(o,l)=>s.locator(_w(o,l)),s.getByLabel=(o,l)=>s.locator(xw(o,l)),s.getByPlaceholder=(o,l)=>s.locator(Ew(o,l)),s.getByText=(o,l)=>s.locator(Tw(o,l)),s.getByTitle=(o,l)=>s.locator(Sw(o,l)),s.getByRole=(o,l={})=>s.locator(kw(o,l)),s.filter=o=>new Hn(t,n,o),s.first=()=>s.locator("nth=0"),s.last=()=>s.locator("nth=-1"),s.nth=o=>s.locator(`nth=${o}`),s.and=o=>new Hn(t,i+" >> internal:and="+JSON.stringify(o[Tr])),s.or=o=>new Hn(t,i+" >> internal:or="+JSON.stringify(o[Tr]))}}class Nw{constructor(t){this._injectedScript=t,!this._injectedScript.window.playwright&&(this._injectedScript.window.playwright={$:(n,r)=>this._querySelector(n,!!r),$$:n=>this._querySelectorAll(n),inspect:n=>this._inspect(n),selector:n=>this._selector(n),generateLocator:(n,r)=>this._generateLocator(n,r),resume:()=>this._resume(),...new Hn(t,"")},delete this._injectedScript.window.playwright.filter,delete this._injectedScript.window.playwright.first,delete this._injectedScript.window.playwright.last,delete this._injectedScript.window.playwright.nth,delete this._injectedScript.window.playwright.and,delete this._injectedScript.window.playwright.or)}_querySelector(t,n){if(typeof t!="string")throw new Error("Usage: playwright.query('Playwright >> selector').");const r=this._injectedScript.parseSelector(t);return this._injectedScript.querySelector(r,this._injectedScript.document,n)}_querySelectorAll(t){if(typeof t!="string")throw new Error("Usage: playwright.$$('Playwright >> selector').");const n=this._injectedScript.parseSelector(t);return this._injectedScript.querySelectorAll(n,this._injectedScript.document)}_inspect(t){if(typeof t!="string")throw new Error("Usage: playwright.inspect('Playwright >> selector').");this._injectedScript.window.inspect(this._querySelector(t,!1))}_selector(t){if(!(t instanceof Element))throw new Error("Usage: playwright.selector(element).");return this._injectedScript.generateSelectorSimple(t)}_generateLocator(t,n){if(!(t instanceof Element))throw new Error("Usage: playwright.locator(element).");const r=this._injectedScript.generateSelectorSimple(t);return Kt(n||"javascript",r)}_resume(){this._injectedScript.window.__pw_resume().catch(()=>{})}}function Cw(e,t){e=e.replace(/AriaRole\s*\.\s*([\w]+)/g,(s,o)=>o.toLowerCase()).replace(/(get_by_role|getByRole)\s*\(\s*(?:["'`])([^'"`]+)['"`]/g,(s,o,l)=>`${o}(${l.toLowerCase()}`);const n=[];let r="";for(let s=0;s<e.length;++s){const o=e[s];if(o!=='"'&&o!=="'"&&o!=="`"&&o!=="/"){r+=o;continue}const l=e[s-1]==="r"||e[s]==="/";++s;let a="";for(;s<e.length;){if(e[s]==="\\"){l?(e[s+1]!==o&&(a+=e[s]),++s,a+=e[s]):(++s,e[s]==="n"?a+=`
+`:e[s]==="r"?a+="\r":e[s]==="t"?a+="	":a+=e[s]),++s;continue}if(e[s]!==o){a+=e[s++];continue}break}n.push({quote:o,text:a}),r+=(o==="/"?"r":"")+"$"+n.length}r=r.toLowerCase().replace(/get_by_alt_text/g,"getbyalttext").replace(/get_by_test_id/g,"getbytestid").replace(/get_by_([\w]+)/g,"getby$1").replace(/has_not_text/g,"hasnottext").replace(/has_text/g,"hastext").replace(/has_not/g,"hasnot").replace(/frame_locator/g,"framelocator").replace(/[{}\s]/g,"").replace(/new\(\)/g,"").replace(/new[\w]+\.[\w]+options\(\)/g,"").replace(/\.set/g,",set").replace(/\.or_\(/g,"or(").replace(/\.and_\(/g,"and(").replace(/:/g,"=").replace(/,re\.ignorecase/g,"i").replace(/,pattern.case_insensitive/g,"i").replace(/,regexoptions.ignorecase/g,"i").replace(/re.compile\(([^)]+)\)/g,"$1").replace(/pattern.compile\(([^)]+)\)/g,"r$1").replace(/newregex\(([^)]+)\)/g,"r$1").replace(/string=/g,"=").replace(/regex=/g,"=").replace(/,,/g,",");const i=n.map(s=>s.quote).filter(s=>"'\"`".includes(s))[0];return{selector:Pp(r,n,t),preferredQuote:i}}function $c(e){return[...e.matchAll(/\$\d+/g)].length}function Oc(e,t){return e.replace(/\$(\d+)/g,(n,r)=>`$${r-t}`)}function Pp(e,t,n){for(;;){const i=e.match(/filter\(,?(has=|hasnot=|sethas\(|sethasnot\()/);if(!i)break;const s=i.index+i[0].length;let o=0,l=s;for(;l<e.length&&(e[l]==="("?o++:e[l]===")"&&o--,!(o<0));l++);let a=e.substring(0,s),u=0;["sethas(","sethasnot("].includes(i[1])&&(u=1,a=a.replace(/sethas\($/,"has=").replace(/sethasnot\($/,"hasnot="));const c=$c(e.substring(0,s)),h=Oc(e.substring(s,l),c),d=$c(h),g=t.slice(c,c+d),y=JSON.stringify(Pp(h,g,n));e=a.replace(/=$/,"2=")+`$${c+1}`+Oc(e.substring(l+u),d-1);const w=t.slice(0,c),x=t.slice(c+d);t=w.concat([{quote:'"',text:y}]).concat(x)}e=e.replace(/\,set([\w]+)\(([^)]+)\)/g,(i,s,o)=>","+s.toLowerCase()+"="+o.toLowerCase()).replace(/framelocator\(([^)]+)\)/g,"$1.internal:control=enter-frame").replace(/locator\(([^)]+),hastext=([^),]+)\)/g,"locator($1).internal:has-text=$2").replace(/locator\(([^)]+),hasnottext=([^),]+)\)/g,"locator($1).internal:has-not-text=$2").replace(/locator\(([^)]+),hastext=([^),]+)\)/g,"locator($1).internal:has-text=$2").replace(/locator\(([^)]+)\)/g,"$1").replace(/getbyrole\(([^)]+)\)/g,"internal:role=$1").replace(/getbytext\(([^)]+)\)/g,"internal:text=$1").replace(/getbylabel\(([^)]+)\)/g,"internal:label=$1").replace(/getbytestid\(([^)]+)\)/g,`internal:testid=[${n}=$1]`).replace(/getby(placeholder|alt|title)(?:text)?\(([^)]+)\)/g,"internal:attr=[$1=$2]").replace(/first(\(\))?/g,"nth=0").replace(/last(\(\))?/g,"nth=-1").replace(/nth\(([^)]+)\)/g,"nth=$1").replace(/filter\(,?hastext=([^)]+)\)/g,"internal:has-text=$1").replace(/filter\(,?hasnottext=([^)]+)\)/g,"internal:has-not-text=$1").replace(/filter\(,?has2=([^)]+)\)/g,"internal:has=$1").replace(/filter\(,?hasnot2=([^)]+)\)/g,"internal:has-not=$1").replace(/,exact=false/g,"").replace(/,exact=true/g,"s").replace(/\,/g,"][");const r=e.split(".");for(let i=0;i<r.length-1;i++)if(r[i]==="internal:control=enter-frame"&&r[i+1].startsWith("nth=")){const[s]=r.splice(i,1);r.splice(i+1,0,s)}return r.map(i=>!i.startsWith("internal:")||i==="internal:control"?i.replace(/\$(\d+)/g,(s,o)=>t[+o-1].text):(i=i.includes("[")?i.replace(/\]/,"")+"]":i,i=i.replace(/(?:r)\$(\d+)(i)?/g,(s,o,l)=>{const a=t[+o-1];return i.startsWith("internal:attr")||i.startsWith("internal:testid")||i.startsWith("internal:role")?Ee(new RegExp(a.text),!1)+(l||""):Ge(new RegExp(a.text,l),!1)}).replace(/\$(\d+)(i|s)?/g,(s,o,l)=>{const a=t[+o-1];return i.startsWith("internal:has=")||i.startsWith("internal:has-not=")?a.text:i.startsWith("internal:testid")?Ee(a.text,!0):i.startsWith("internal:attr")||i.startsWith("internal:role")?Ee(a.text,l==="s"):Ge(a.text,l==="s")}),i)).join(" >> ")}function bw(e,t,n){try{return eo(t),t}catch{}try{const{selector:r,preferredQuote:i}=Cw(t,n),s=bh(e,r,void 0,void 0,i),o=zc(e,t);if(s.some(l=>zc(e,l)===o))return r}catch{}return""}function zc(e,t){return t=t.replace(/\s/g,""),e==="javascript"&&(t=t.replace(/\\?["`]/g,"'")),t}const Lw=({url:e})=>f.jsxs("div",{className:"browser-frame-header",children:[f.jsxs("div",{style:{whiteSpace:"nowrap"},children:[f.jsx("span",{className:"browser-frame-dot",style:{backgroundColor:"rgb(242, 95, 88)"}}),f.jsx("span",{className:"browser-frame-dot",style:{backgroundColor:"rgb(251, 190, 60)"}}),f.jsx("span",{className:"browser-frame-dot",style:{backgroundColor:"rgb(88, 203, 66)"}})]}),f.jsx("div",{className:"browser-frame-address-bar",title:e||"about:blank",children:e||"about:blank"}),f.jsx("div",{style:{marginLeft:"auto"},children:f.jsxs("div",{children:[f.jsx("span",{className:"browser-frame-menu-bar"}),f.jsx("span",{className:"browser-frame-menu-bar"}),f.jsx("span",{className:"browser-frame-menu-bar"})]})})]}),Aw=({action:e,sdkLanguage:t,testIdAttributeName:n,isInspecting:r,setIsInspecting:i,highlightedLocator:s,setHighlightedLocator:o})=>{const[l,a]=vn(),[u,c]=L.useState("action"),{snapshots:h}=L.useMemo(()=>{if(!e)return{snapshots:{}};let S=e.beforeSnapshot?{action:e,snapshotName:e.beforeSnapshot}:void 0,_=e;for(;!S&&_;)_=Cv(_),S=_!=null&&_.afterSnapshot?{action:_,snapshotName:_==null?void 0:_.afterSnapshot}:void 0;const A=e.afterSnapshot?{action:e,snapshotName:e.afterSnapshot}:S,P=e.inputSnapshot?{action:e,snapshotName:e.inputSnapshot}:A;return P&&(P.point=e.point),{snapshots:{action:P,before:S,after:A}}},[e]),{snapshotInfoUrl:d,snapshotUrl:g,popoutUrl:y}=L.useMemo(()=>{const S=h[u];if(!S)return{snapshotUrl:Iw};const _=new URLSearchParams;_.set("trace",Ls(S.action).traceUrl),_.set("name",S.snapshotName),S.point&&(_.set("pointX",String(S.point.x)),_.set("pointY",String(S.point.y)));const A=new URL(`snapshot/${S.action.pageId}?${_.toString()}`,window.location.href).toString(),P=new URL(`snapshotInfo/${S.action.pageId}?${_.toString()}`,window.location.href).toString(),T=new URLSearchParams;T.set("r",A),T.set("trace",Ls(S.action).traceUrl),S.point&&(T.set("pointX",String(S.point.x)),T.set("pointY",String(S.point.y)));const j=new URL(`snapshot.html?${T.toString()}`,window.location.href).toString();return{snapshots:h,snapshotInfoUrl:P,snapshotUrl:A,popoutUrl:j}},[h,u]),w=L.useRef(null),x=L.useRef(null),[p,m]=L.useState({viewport:Fc,url:""}),v=L.useRef({iteration:0,visibleIframe:0});L.useEffect(()=>{(async()=>{const S=v.current.iteration+1,_=1-v.current.visibleIframe;v.current.iteration=S;const A={url:"",viewport:Fc};if(d){const j=await(await fetch(d)).json();j.error||(A.url=j.url,A.viewport=j.viewport)}if(v.current.iteration!==S)return;const P=[w,x][_].current;if(P){let T=()=>{};const j=new Promise(z=>T=z);try{P.addEventListener("load",T),P.addEventListener("error",T),P.contentWindow?P.contentWindow.location.replace(g):P.src=g,await j}catch{}finally{P.removeEventListener("load",T),P.removeEventListener("error",T)}}v.current.iteration===S&&(v.current.visibleIframe=_,m(A))})()},[g,d]);const C={width:p.viewport.width,height:p.viewport.height+40},k=Math.min(l.width/C.width,l.height/C.height,1),N={x:(l.width-C.width)/2,y:(l.height-C.height)/2};return f.jsxs("div",{className:"snapshot-tab",tabIndex:0,onKeyDown:S=>{S.key==="Escape"&&r&&i(!1)},children:[f.jsx(Dc,{isInspecting:r,sdkLanguage:t,testIdAttributeName:n,highlightedLocator:s,setHighlightedLocator:o,iframe:w.current,iteration:v.current.iteration}),f.jsx(Dc,{isInspecting:r,sdkLanguage:t,testIdAttributeName:n,highlightedLocator:s,setHighlightedLocator:o,iframe:x.current,iteration:v.current.iteration}),f.jsxs(Ah,{children:[["action","before","after"].map(S=>f.jsx(Mh,{id:S,title:Mw(S),selected:u===S,onSelect:()=>c(S)})),f.jsx("div",{style:{flex:"auto"}}),f.jsx(Qn,{icon:"link-external",title:"Open snapshot in a new tab",disabled:!y,onClick:()=>{const S=window.open(y||"","_blank");S==null||S.addEventListener("DOMContentLoaded",()=>{const _=new bp(S,!1,t,n,1,"chromium",[]);new Nw(_)})}})]}),f.jsx("div",{ref:a,className:"snapshot-wrapper",children:f.jsxs("div",{className:"snapshot-container",style:{width:C.width+"px",height:C.height+"px",transform:`translate(${N.x}px, ${N.y}px) scale(${k})`},children:[f.jsx(Lw,{url:p.url}),f.jsxs("div",{className:"snapshot-switcher",children:[f.jsx("iframe",{ref:w,name:"snapshot",title:"DOM Snapshot",className:v.current.visibleIframe===0?"snapshot-visible":""}),f.jsx("iframe",{ref:x,name:"snapshot",title:"DOM Snapshot",className:v.current.visibleIframe===1?"snapshot-visible":""})]})]})})]})};function Mw(e){return e==="before"?"Before":e==="after"?"After":e==="action"?"Action":e}const Dc=({iframe:e,isInspecting:t,sdkLanguage:n,testIdAttributeName:r,highlightedLocator:i,setHighlightedLocator:s,iteration:o})=>(L.useEffect(()=>{const l=[],a=new URLSearchParams(window.location.search).get("isUnderTest")==="true";try{Rp(l,n,r,a,"",e==null?void 0:e.contentWindow)}catch{}for(const{recorder:u,frameSelector:c}of l){const h=bw(n,i,r);u.setUIState({mode:t?"inspecting":"none",actionSelector:h.startsWith(c)?h.substring(c.length).trim():void 0,language:n,testIdAttributeName:r,overlay:{offsetX:0}},{async setSelector(d){s(Kt(n,c+d))},highlightUpdated(){for(const d of l)d.recorder!==u&&d.recorder.clearHighlight()}})}},[e,t,i,s,n,r,o]),f.jsx(f.Fragment,{}));function Rp(e,t,n,r,i,s){if(!s)return;const o=s;if(!o._recorder){const l=new bp(s,r,t,n,1,"chromium",[]),a=new pw(l);o._injectedScript=l,o._recorder={recorder:a,frameSelector:i}}e.push(o._recorder);for(let l=0;l<s.frames.length;++l){const a=s.frames[l],u=a.frameElement?o._injectedScript.generateSelectorSimple(a.frameElement,{omitInternalEngines:!0,testIdAttributeName:n})+" >> internal:control=enter-frame >> ":"";Rp(e,t,n,r,i+u,a)}}const Fc={width:1280,height:720},Iw='data:text/html,<body style="background: #ddd"></body>',jw=hi,Pw=({stack:e,setSelectedFrame:t,selectedFrame:n})=>{const r=e||[];return f.jsx(jw,{name:"stack-trace",items:r,selectedItem:r[n],render:i=>{const s=i.file[1]===":"?"\\":"/";return f.jsxs(f.Fragment,{children:[f.jsx("span",{className:"stack-trace-frame-function",children:i.function||"(anonymous)"}),f.jsx("span",{className:"stack-trace-frame-location",children:i.file.split(s).pop()}),f.jsx("span",{className:"stack-trace-frame-line",children:":"+i.line})]})},onSelected:i=>t(r.indexOf(i))})},Rw=({stack:e,sources:t,rootDir:n,fallbackLocation:r,stackFrameLocation:i})=>{const[s,o]=L.useState(),[l,a]=L.useState(0);L.useEffect(()=>{s!==e&&(o(e),a(0))},[e,s,o,a]);const{source:u,highlight:c,targetLine:h,fileName:d}=fm(async()=>{var C,k;const y=e==null?void 0:e[l],w=!(y!=null&&y.file);if(w&&!r)return{source:{file:"",errors:[],content:void 0},targetLine:0,highlight:[]};const x=w?r.file:y.file;let p=t.get(x);p||(p={errors:((C=r==null?void 0:r.source)==null?void 0:C.errors)||[],content:void 0},t.set(x,p));const m=w?(r==null?void 0:r.line)||((k=p.errors[0])==null?void 0:k.line)||0:y.line,v=n&&x.startsWith(n)?x.substring(n.length+1):x,E=p.errors.map(N=>({type:"error",line:N.line,message:N.message}));if(E.push({line:m,type:"running"}),p.content===void 0||w){const N=await $w(x);try{let S=await fetch(`sha1/src@${N}.txt`);S.status===404&&(S=await fetch(`file?path=${encodeURIComponent(x)}`)),S.status>=400?p.content=`<Unable to read "${x}">`:p.content=await S.text()}catch{p.content=`<Unable to read "${x}">`}}return{source:p,highlight:E,targetLine:m,fileName:v}},[e,l,n,r],{source:{errors:[],content:"Loading…"},highlight:[]}),g=((e==null?void 0:e.length)??0)>1;return f.jsxs(As,{sidebarSize:200,orientation:i==="bottom"?"vertical":"horizontal",sidebarHidden:!g,children:[f.jsxs("div",{className:"vbox","data-testid":"source-code",children:[d&&f.jsx("div",{className:"source-tab-file-name",children:d}),f.jsx(to,{text:u.content||"",language:"javascript",highlight:c,revealLine:h,readOnly:!0,lineNumbers:!0})]}),f.jsx(Pw,{stack:e,selectedFrame:l,setSelectedFrame:a})]})};async function $w(e){const t=new TextEncoder().encode(e),n=await crypto.subtle.digest("SHA-1",t),r=[],i=new DataView(n);for(let s=0;s<i.byteLength;s+=1){const o=i.getUint8(s).toString(16).padStart(2,"0");r.push(o)}return r.join("")}const $p={width:200,height:45},Cn=2.5,Ow=$p.height+Cn*2,zw=({model:e,boundaries:t,previewPoint:n})=>{var c,h;const[r,i]=vn(),s=L.useRef(null);let o=0;if(s.current&&n){const d=s.current.getBoundingClientRect();o=(n.clientY-d.top+s.current.scrollTop)/Ow|0}const l=(h=(c=e==null?void 0:e.pages)==null?void 0:c[o])==null?void 0:h.screencastFrames;let a,u;if(n!==void 0&&l&&l.length){const d=t.minimum+(t.maximum-t.minimum)*n.x/r.width;a=l[Jc(l,d,Op)-1];const g={width:Math.min(800,window.innerWidth/2|0),height:Math.min(800,window.innerHeight/2|0)};u=a?zp({width:a.width,height:a.height},g):void 0}return f.jsxs("div",{className:"film-strip",ref:i,children:[f.jsx("div",{className:"film-strip-lanes",ref:s,children:e==null?void 0:e.pages.map((d,g)=>d.screencastFrames.length?f.jsx(Dw,{boundaries:t,page:d,width:r.width},g):null)}),(n==null?void 0:n.x)!==void 0&&f.jsxs("div",{className:"film-strip-hover",style:{top:r.bottom+5,left:Math.min(n.x,r.width-(u?u.width:0)-10)},children:[n.action&&f.jsx("div",{className:"film-strip-hover-title",children:Ha(n.action,n)}),a&&u&&f.jsx("div",{style:{width:u.width,height:u.height},children:f.jsx("img",{src:`sha1/${a.sha1}`,width:u.width,height:u.height})})]})]})},Dw=({boundaries:e,page:t,width:n})=>{const r={width:0,height:0},i=t.screencastFrames;for(const w of i)r.width=Math.max(r.width,w.width),r.height=Math.max(r.height,w.height);const s=zp(r,$p),o=i[0].timestamp,l=i[i.length-1].timestamp,a=e.maximum-e.minimum,u=(o-e.minimum)/a*n,c=(e.maximum-l)/a*n,d=(l-o)/a*n/(s.width+2*Cn)|0,g=(l-o)/d,y=[];for(let w=0;o&&g&&w<d;++w){const x=o+g*w,p=Jc(i,x,Op)-1;y.push(f.jsx("div",{className:"film-strip-frame",style:{width:s.width,height:s.height,backgroundImage:`url(sha1/${i[p].sha1})`,backgroundSize:`${s.width}px ${s.height}px`,margin:Cn,marginRight:Cn}},w))}return y.push(f.jsx("div",{className:"film-strip-frame",style:{width:s.width,height:s.height,backgroundImage:`url(sha1/${i[i.length-1].sha1})`,backgroundSize:`${s.width}px ${s.height}px`,margin:Cn,marginRight:Cn}},y.length)),f.jsx("div",{className:"film-strip-lane",style:{marginLeft:u+"px",marginRight:c+"px"},children:y})};function Op(e,t){return e-t.timestamp}function zp(e,t){const n=Math.max(e.width/t.width,e.height/t.height);return{width:e.width/n|0,height:e.height/n|0}}const Fw=({model:e,boundaries:t,onSelected:n,highlightedAction:r,highlightedEntry:i,selectedTime:s,setSelectedTime:o,sdkLanguage:l})=>{const[a,u]=vn(),[c,h]=L.useState(),[d,g]=L.useState(),{offsets:y,curtainLeft:w,curtainRight:x}=L.useMemo(()=>{let S=s||t;if(c&&c.startX!==c.endX){const T=ut(a.width,t,c.startX),j=ut(a.width,t,c.endX);S={minimum:Math.min(T,j),maximum:Math.max(T,j)}}const _=ct(a.width,t,S.minimum),P=ct(a.width,t,t.maximum)-ct(a.width,t,S.maximum);return{offsets:Hw(a.width,t),curtainLeft:_,curtainRight:P}},[s,t,c,a]),p=L.useMemo(()=>{const S=[];for(const _ of(e==null?void 0:e.actions)||[])_.class!=="Test"&&S.push({action:_,leftTime:_.startTime,rightTime:_.endTime||t.maximum,leftPosition:ct(a.width,t,_.startTime),rightPosition:ct(a.width,t,_.endTime||t.maximum),active:!1,error:!!_.error});for(const _ of(e==null?void 0:e.resources)||[]){const A=_._monotonicTime,P=_._monotonicTime+_.time;S.push({resource:_,leftTime:A,rightTime:P,leftPosition:ct(a.width,t,A),rightPosition:ct(a.width,t,P),active:!1,error:!1})}return S},[e,t,a]);L.useMemo(()=>{for(const S of p)S.active=!!r&&S.action===r||!!i&&S.resource===i},[p,r,i]);const m=L.useCallback(S=>{if(g(void 0),!u.current)return;const _=S.clientX-u.current.getBoundingClientRect().left,A=ut(a.width,t,_),P=s?ct(a.width,t,s.minimum):0,T=s?ct(a.width,t,s.maximum):0;s&&Math.abs(_-P)<10?h({startX:T,endX:_,type:"resize"}):s&&Math.abs(_-T)<10?h({startX:P,endX:_,type:"resize"}):s&&A>s.minimum&&A<s.maximum&&S.clientY-u.current.getBoundingClientRect().top<20?h({startX:P,endX:T,pivot:_,type:"move"}):h({startX:_,endX:_,type:"resize"})},[t,a,u,s]),v=L.useCallback(S=>{if(!u.current)return;const _=S.clientX-u.current.getBoundingClientRect().left,A=ut(a.width,t,_),P=e==null?void 0:e.actions.findLast(ae=>ae.startTime<=A);if(!S.buttons){h(void 0);return}if(P&&n(P),!c)return;let T=c;if(c.type==="resize")T={...c,endX:_};else{const ae=_-c.pivot;let Le=c.startX+ae,ue=c.endX+ae;Le<0&&(Le=0,ue=Le+(c.endX-c.startX)),ue>a.width&&(ue=a.width,Le=ue-(c.endX-c.startX)),T={...c,startX:Le,endX:ue,pivot:_}}h(T);const j=ut(a.width,t,T.startX),z=ut(a.width,t,T.endX);j!==z&&o({minimum:Math.min(j,z),maximum:Math.max(j,z)})},[t,c,a,e,n,u,o]),E=L.useCallback(()=>{if(g(void 0),!!c){if(c.startX!==c.endX){const S=ut(a.width,t,c.startX),_=ut(a.width,t,c.endX);o({minimum:Math.min(S,_),maximum:Math.max(S,_)})}else{const S=ut(a.width,t,c.startX),_=e==null?void 0:e.actions.findLast(A=>A.startTime<=S);_&&n(_),o(void 0)}h(void 0)}},[t,c,a,e,o,n]),C=L.useCallback(S=>{if(!u.current)return;const _=S.clientX-u.current.getBoundingClientRect().left,A=ut(a.width,t,_),P=e==null?void 0:e.actions.findLast(T=>T.startTime<=A);g({x:_,clientY:S.clientY,action:P,sdkLanguage:l})},[t,a,e,u,l]),k=L.useCallback(()=>{g(void 0)},[]),N=L.useCallback(()=>{o(void 0)},[o]);return f.jsxs("div",{style:{flex:"none",borderBottom:"1px solid var(--vscode-panel-border)"},children:[!!c&&f.jsx(jh,{cursor:(c==null?void 0:c.type)==="resize"?"ew-resize":"grab",onPaneMouseUp:E,onPaneMouseMove:v,onPaneDoubleClick:N}),f.jsxs("div",{ref:u,className:"timeline-view",onMouseDown:m,onMouseMove:C,onMouseLeave:k,children:[f.jsx("div",{className:"timeline-grid",children:y.map((S,_)=>f.jsx("div",{className:"timeline-divider",style:{left:S.position+"px"},children:f.jsx("div",{className:"timeline-time",children:Ke(S.time-t.minimum)})},_))}),f.jsx("div",{style:{height:8}}),f.jsx(zw,{model:e,boundaries:t,previewPoint:d}),f.jsx("div",{className:"timeline-bars",children:p.map((S,_)=>f.jsx("div",{className:"timeline-bar"+(S.action?" action":"")+(S.resource?" network":"")+(S.active?" active":"")+(S.error?" error":""),style:{left:S.leftPosition,width:Math.max(1,S.rightPosition-S.leftPosition),top:Uw(S),bottom:0}},_))}),f.jsx("div",{className:"timeline-marker",style:{display:d!==void 0?"block":"none",left:((d==null?void 0:d.x)||0)+"px"}}),s&&f.jsxs("div",{className:"timeline-window",children:[f.jsx("div",{className:"timeline-window-curtain left",style:{width:w}}),f.jsx("div",{className:"timeline-window-resizer",style:{left:-5}}),f.jsx("div",{className:"timeline-window-center",children:f.jsx("div",{className:"timeline-window-drag"})}),f.jsx("div",{className:"timeline-window-resizer",style:{left:5}}),f.jsx("div",{className:"timeline-window-curtain right",style:{width:x}})]})]})]})};function Hw(e,t){let r=e/64;const i=t.maximum-t.minimum,s=e/i;let o=i/r;const l=Math.ceil(Math.log(o)/Math.LN10);o=Math.pow(10,l),o*s>=5*64&&(o=o/5),o*s>=2*64&&(o=o/2);const a=t.minimum;let u=t.maximum;u+=64/s,r=Math.ceil((u-a)/o),o||(r=0);const c=[];for(let h=0;h<r;++h){const d=a+o*h;c.push({position:ct(e,t,d),time:d})}return c}function ct(e,t,n){return(n-t.minimum)/(t.maximum-t.minimum)*e}function ut(e,t,n){return n/e*(t.maximum-t.minimum)+t.minimum}function Uw(e){return e.resource?25:20}const Bw=({model:e})=>{var t,n;return e?f.jsxs("div",{className:"metadata-view vbox",children:[f.jsx("div",{className:"call-section",style:{paddingTop:2},children:"Time"}),!!e.wallTime&&f.jsxs("div",{className:"call-line",children:["start time:",f.jsx("span",{className:"call-value datetime",title:new Date(e.wallTime).toLocaleString(),children:new Date(e.wallTime).toLocaleString()})]}),f.jsxs("div",{className:"call-line",children:["duration:",f.jsx("span",{className:"call-value number",title:Ke(e.endTime-e.startTime),children:Ke(e.endTime-e.startTime)})]}),f.jsx("div",{className:"call-section",children:"Browser"}),f.jsxs("div",{className:"call-line",children:["engine:",f.jsx("span",{className:"call-value string",title:e.browserName,children:e.browserName})]}),e.channel&&f.jsxs("div",{className:"call-line",children:["channel:",f.jsx("span",{className:"call-value string",title:e.channel,children:e.channel})]}),e.platform&&f.jsxs("div",{className:"call-line",children:["platform:",f.jsx("span",{className:"call-value string",title:e.platform,children:e.platform})]}),e.options.userAgent&&f.jsxs("div",{className:"call-line",children:["user agent:",f.jsx("span",{className:"call-value datetime",title:e.options.userAgent,children:e.options.userAgent})]}),f.jsx("div",{className:"call-section",children:"Viewport"}),e.options.viewport&&f.jsxs("div",{className:"call-line",children:["width:",f.jsx("span",{className:"call-value number",title:String(!!((t=e.options.viewport)!=null&&t.width)),children:e.options.viewport.width})]}),e.options.viewport&&f.jsxs("div",{className:"call-line",children:["height:",f.jsx("span",{className:"call-value number",title:String(!!((n=e.options.viewport)!=null&&n.height)),children:e.options.viewport.height})]}),f.jsxs("div",{className:"call-line",children:["is mobile:",f.jsx("span",{className:"call-value boolean",title:String(!!e.options.isMobile),children:String(!!e.options.isMobile)})]}),e.options.deviceScaleFactor&&f.jsxs("div",{className:"call-line",children:["device scale:",f.jsx("span",{className:"call-value number",title:String(e.options.deviceScaleFactor),children:String(e.options.deviceScaleFactor)})]}),f.jsx("div",{className:"call-section",children:"Counts"}),f.jsxs("div",{className:"call-line",children:["pages:",f.jsx("span",{className:"call-value number",children:e.pages.length})]}),f.jsxs("div",{className:"call-line",children:["actions:",f.jsx("span",{className:"call-value number",children:e.actions.length})]}),f.jsxs("div",{className:"call-line",children:["events:",f.jsx("span",{className:"call-value number",children:e.events.length})]})]}):f.jsx(f.Fragment,{})};async function Ho(e){const t=new Image;return e&&(t.src=e,await new Promise((n,r)=>{t.onload=n,t.onerror=n})),t}const Vl={backgroundImage:`linear-gradient(45deg, #80808020 25%, transparent 25%),
+                    linear-gradient(-45deg, #80808020 25%, transparent 25%),
+                    linear-gradient(45deg, transparent 75%, #80808020 75%),
+                    linear-gradient(-45deg, transparent 75%, #80808020 75%)`,backgroundSize:"20px 20px",backgroundPosition:"0 0, 0 10px, 10px -10px, -10px 0px",boxShadow:`rgb(0 0 0 / 10%) 0px 1.8px 1.9px,
+              rgb(0 0 0 / 15%) 0px 6.1px 6.3px,
+              rgb(0 0 0 / 10%) 0px -2px 4px,
+              rgb(0 0 0 / 15%) 0px -6.1px 12px,
+              rgb(0 0 0 / 25%) 0px 6px 12px`},Vw=({diff:e})=>{const[t,n]=L.useState(e.diff?"diff":"actual"),[r,i]=L.useState(!1),[s,o]=L.useState(null),[l,a]=L.useState(null),[u,c]=L.useState(null),[h,d]=vn();L.useEffect(()=>{(async()=>{var C,k,N;o(await Ho((C=e.expected)==null?void 0:C.attachment.path)),a(await Ho((k=e.actual)==null?void 0:k.attachment.path)),c(await Ho((N=e.diff)==null?void 0:N.attachment.path))})()},[e]);const g=s&&l&&u,y=g?Math.max(s.naturalWidth,l.naturalWidth,200):500,w=g?Math.max(s.naturalHeight,l.naturalHeight,200):500,x=Math.min(1,(h.width-30)/y),p=Math.min(1,(h.width-50)/y/2),m=y*x,v=w*x,E={flex:"none",margin:"0 10px",cursor:"pointer",userSelect:"none"};return f.jsx("div",{"data-testid":"test-result-image-mismatch",style:{display:"flex",flexDirection:"column",alignItems:"center",flex:"auto"},ref:d,children:g&&f.jsxs(f.Fragment,{children:[f.jsxs("div",{"data-testid":"test-result-image-mismatch-tabs",style:{display:"flex",margin:"10px 0 20px"},children:[e.diff&&f.jsx("div",{style:{...E,fontWeight:t==="diff"?600:"initial"},onClick:()=>n("diff"),children:"Diff"}),f.jsx("div",{style:{...E,fontWeight:t==="actual"?600:"initial"},onClick:()=>n("actual"),children:"Actual"}),f.jsx("div",{style:{...E,fontWeight:t==="expected"?600:"initial"},onClick:()=>n("expected"),children:"Expected"}),f.jsx("div",{style:{...E,fontWeight:t==="sxs"?600:"initial"},onClick:()=>n("sxs"),children:"Side by side"}),f.jsx("div",{style:{...E,fontWeight:t==="slider"?600:"initial"},onClick:()=>n("slider"),children:"Slider"})]}),f.jsxs("div",{style:{display:"flex",justifyContent:"center",flex:"auto",minHeight:v+60},children:[e.diff&&t==="diff"&&f.jsx(_t,{image:u,alt:"Diff",canvasWidth:m,canvasHeight:v,scale:x}),e.diff&&t==="actual"&&f.jsx(_t,{image:l,alt:"Actual",canvasWidth:m,canvasHeight:v,scale:x}),e.diff&&t==="expected"&&f.jsx(_t,{image:s,alt:"Expected",canvasWidth:m,canvasHeight:v,scale:x}),e.diff&&t==="slider"&&f.jsx(Ww,{expectedImage:s,actualImage:l,canvasWidth:m,canvasHeight:v,scale:x}),e.diff&&t==="sxs"&&f.jsxs("div",{style:{display:"flex"},children:[f.jsx(_t,{image:s,title:"Expected",canvasWidth:p*y,canvasHeight:p*w,scale:p}),f.jsx(_t,{image:r?u:l,title:r?"Diff":"Actual",onClick:()=>i(!r),canvasWidth:p*y,canvasHeight:p*w,scale:p})]}),!e.diff&&t==="actual"&&f.jsx(_t,{image:l,title:"Actual",canvasWidth:m,canvasHeight:v,scale:x}),!e.diff&&t==="expected"&&f.jsx(_t,{image:s,title:"Expected",canvasWidth:m,canvasHeight:v,scale:x}),!e.diff&&t==="sxs"&&f.jsxs("div",{style:{display:"flex"},children:[f.jsx(_t,{image:s,title:"Expected",canvasWidth:p*y,canvasHeight:p*w,scale:p}),f.jsx(_t,{image:l,title:"Actual",canvasWidth:p*y,canvasHeight:p*w,scale:p})]})]}),f.jsxs("div",{style:{alignSelf:"start",lineHeight:"18px"},children:[f.jsx("div",{children:e.diff&&f.jsx("a",{target:"_blank",href:e.diff.attachment.path,children:e.diff.attachment.name})}),f.jsx("div",{children:f.jsx("a",{target:"_blank",href:e.actual.attachment.path,children:e.actual.attachment.name})}),f.jsx("div",{children:f.jsx("a",{target:"_blank",href:e.expected.attachment.path,children:e.expected.attachment.name})})]})]})})},Ww=({expectedImage:e,actualImage:t,canvasWidth:n,canvasHeight:r,scale:i})=>{const s={position:"absolute",top:0,left:0},[o,l]=L.useState(n/2),a=e.naturalWidth===t.naturalWidth&&e.naturalHeight===t.naturalHeight;return f.jsxs("div",{style:{flex:"none",display:"flex",alignItems:"center",flexDirection:"column",userSelect:"none"},children:[f.jsxs("div",{style:{margin:5},children:[!a&&f.jsx("span",{style:{flex:"none",margin:"0 5px"},children:"Expected "}),f.jsx("span",{children:e.naturalWidth}),f.jsx("span",{style:{flex:"none",margin:"0 5px"},children:"x"}),f.jsx("span",{children:e.naturalHeight}),!a&&f.jsx("span",{style:{flex:"none",margin:"0 5px 0 15px"},children:"Actual "}),!a&&f.jsx("span",{children:t.naturalWidth}),!a&&f.jsx("span",{style:{flex:"none",margin:"0 5px"},children:"x"}),!a&&f.jsx("span",{children:t.naturalHeight})]}),f.jsxs("div",{style:{position:"relative",width:n,height:r,margin:15,...Vl},children:[f.jsx(Ph,{orientation:"horizontal",offsets:[o],setOffsets:u=>l(u[0]),resizerColor:"#57606a80",resizerWidth:6}),f.jsx("img",{alt:"Expected",style:{width:e.naturalWidth*i,height:e.naturalHeight*i},draggable:"false",src:e.src}),f.jsx("div",{style:{...s,bottom:0,overflow:"hidden",width:o,...Vl},children:f.jsx("img",{alt:"Actual",style:{width:t.naturalWidth*i,height:t.naturalHeight*i},draggable:"false",src:t.src})})]})]})},_t=({image:e,title:t,alt:n,canvasWidth:r,canvasHeight:i,scale:s,onClick:o})=>f.jsxs("div",{style:{flex:"none",display:"flex",alignItems:"center",flexDirection:"column"},children:[f.jsxs("div",{style:{margin:5},children:[t&&f.jsx("span",{style:{flex:"none",margin:"0 5px"},children:t}),f.jsx("span",{children:e.naturalWidth}),f.jsx("span",{style:{flex:"none",margin:"0 5px"},children:"x"}),f.jsx("span",{children:e.naturalHeight})]}),f.jsx("div",{style:{display:"flex",flex:"none",width:r,height:i,margin:15,...Vl},children:f.jsx("img",{width:e.naturalWidth*s,height:e.naturalHeight*s,alt:t||n,style:{cursor:o?"pointer":"initial"},draggable:"false",src:e.src,onClick:o})})]}),qw=({model:e})=>{const{diffMap:t,screenshots:n,attachments:r}=L.useMemo(()=>{const i=new Set,s=new Set;for(const l of(e==null?void 0:e.actions)||[]){const a=l.context.traceUrl;for(const u of l.attachments||[])i.add({...u,traceUrl:a})}const o=new Map;for(const l of i){if(!l.path&&!l.sha1)continue;const a=l.name.match(/^(.*)-(expected|actual|diff)\.png$/);if(a){const u=a[1],c=a[2],h=o.get(u)||{expected:void 0,actual:void 0,diff:void 0};h[c]=l,o.set(u,h)}l.contentType.startsWith("image/")&&(s.add(l),i.delete(l))}return{diffMap:o,attachments:i,screenshots:s}},[e]);return!t.size&&!n.size&&!r.size?f.jsx(lr,{text:"No attachments"}):f.jsxs("div",{className:"attachments-tab",children:[[...t.values()].map(({expected:i,actual:s,diff:o})=>f.jsxs(f.Fragment,{children:[i&&s&&f.jsx("div",{className:"attachments-section",children:"Image diff"}),i&&s&&f.jsx(Vw,{diff:{name:"Image diff",expected:{attachment:{...i,path:kr(i)},title:"Expected"},actual:{attachment:{...s,path:kr(s)}},diff:o?{attachment:{...o,path:kr(o)}}:void 0}})]})),n.size?f.jsx("div",{className:"attachments-section",children:"Screenshots"}):void 0,[...n.values()].map((i,s)=>{const o=kr(i);return f.jsxs("div",{className:"attachment-item",children:[f.jsx("div",{children:f.jsx("img",{draggable:"false",src:o})}),f.jsx("div",{children:f.jsx("a",{target:"_blank",href:o,children:i.name})})]},`screenshot-${s}`)}),r.size?f.jsx("div",{className:"attachments-section",children:"Attachments"}):void 0,[...r.values()].map((i,s)=>f.jsx("div",{className:"attachment-item",children:f.jsx("a",{href:kr(i)+"&download",children:i.name})},`attachment-${s}`))]})};function kr(e){return e.sha1?"sha1/"+e.sha1+"?trace="+encodeURIComponent(e.traceUrl):"file?path="+encodeURIComponent(e.path)}const Xw=({sdkLanguage:e,setIsInspecting:t,highlightedLocator:n,setHighlightedLocator:r})=>f.jsxs("div",{className:"vbox",style:{backgroundColor:"var(--vscode-sideBar-background)"},children:[f.jsx("div",{style:{margin:"10px 0px 10px 10px",color:"var(--vscode-editorCodeLens-foreground)",flex:"none"},children:"Locator"}),f.jsx("div",{style:{margin:"0 10px 10px",flex:"auto"},children:f.jsx(to,{text:n,language:e,focusOnChange:!0,isFocused:!0,wrapLines:!0,onChange:i=>{r(i),t(!1)}})}),f.jsx("div",{style:{position:"absolute",right:5,top:5},children:f.jsx(Qn,{icon:"files",title:"Copy locator",onClick:()=>{pm(n)}})})]});function Qw(e){return e==="scheduled"?"codicon-clock":e==="running"?"codicon-loading":e==="failed"?"codicon-error":e==="passed"?"codicon-check":e==="skipped"?"codicon-circle-slash":"codicon-circle-outline"}function Gw(e){return e==="scheduled"?"Pending":e==="running"?"Running":e==="failed"?"Failed":e==="passed"?"Passed":e==="skipped"?"Skipped":"Did not run"}const o1=({model:e,showSourcesFirst:t,rootDir:n,fallbackLocation:r,initialSelection:i,onSelectionChanged:s,isLive:o,status:l,inert:a})=>{const[u,c]=L.useState(void 0),[h,d]=L.useState(void 0),[g,y]=L.useState(),[w,x]=L.useState(),[p,m]=L.useState("actions"),[v,E]=is("propertiesTab",t?"source":"call"),[C,k]=L.useState(!1),[N,S]=L.useState(""),_=e?g||u:void 0,[A,P]=L.useState(),[T,j]=is("propertiesSidebarLocation","bottom"),z=L.useCallback(F=>{c(F),d(F==null?void 0:F.stack)},[c,d]),ae=L.useMemo(()=>(e==null?void 0:e.sources)||new Map,[e]);L.useEffect(()=>{P(void 0)},[e]),L.useEffect(()=>{if(u&&(e!=null&&e.actions.includes(u)))return;const F=e==null?void 0:e.failedAction();if(i&&(e!=null&&e.actions.includes(i)))z(i);else if(F)z(F);else if(e!=null&&e.actions.length){let Ka=e.actions.length-1;for(let dr=0;dr<e.actions.length;++dr)if(e.actions[dr].apiName==="After Hooks"&&dr){Ka=dr-1;break}z(e.actions[Ka])}},[e,u,z,i]);const Le=L.useCallback(F=>{z(F),s==null||s(F)},[z,s]),ue=L.useCallback(F=>{E(F),F!=="inspector"&&k(!1)},[E]),M=L.useCallback(F=>{S(F),ue("inspector")},[ue]),R=T0(e,A),$=F0(e,A),q=_0(e),ne=L.useMemo(()=>(e==null?void 0:e.actions.map(F=>F.attachments||[]).flat())||[],[e]),et=(e==null?void 0:e.sdkLanguage)||"javascript",vt={id:"inspector",title:"Locator",render:()=>f.jsx(Xw,{sdkLanguage:et,setIsInspecting:k,highlightedLocator:N,setHighlightedLocator:S})},cr={id:"call",title:"Call",render:()=>f.jsx(m0,{action:_,sdkLanguage:et})},yt={id:"log",title:"Log",render:()=>f.jsx(v0,{action:_,isLive:o})},xn={id:"errors",title:"Errors",errorCount:q.errors.size,render:()=>f.jsx(S0,{errorsModel:q,sdkLanguage:et,revealInSource:F=>{F.action?z(F.action):d(F.stack),ue("source")}})},io={id:"source",title:"Source",render:()=>f.jsx(Rw,{stack:h,sources:ae,rootDir:n,stackFrameLocation:T==="bottom"?"right":"bottom",fallbackLocation:r})},Dp={id:"console",title:"Console",count:R.entries.length,render:()=>f.jsx(k0,{consoleModel:R,boundaries:so,selectedTime:A})},Fp={id:"network",title:"Network",count:$.resources.length,render:()=>f.jsx(H0,{boundaries:so,networkModel:$,onEntryHovered:x})},Hp={id:"attachments",title:"Attachments",count:ne.length,render:()=>f.jsx(qw,{model:e})},mi=[vt,cr,yt,xn,Dp,Fp,io,Hp];if(t){const F=mi.indexOf(io);mi.splice(F,1),mi.splice(1,0,io)}const{boundaries:so}=L.useMemo(()=>{const F={minimum:(e==null?void 0:e.startTime)||0,maximum:(e==null?void 0:e.endTime)||3e4};return F.minimum>F.maximum&&(F.minimum=0,F.maximum=3e4),F.maximum+=(F.maximum-F.minimum)/20,{boundaries:F}},[e]);let gi=0;return!o&&e&&e.endTime>=0?gi=e.endTime-e.startTime:e&&e.wallTime&&(gi=Date.now()-e.wallTime),f.jsxs("div",{className:"vbox workbench",...a?{inert:"true"}:{},children:[f.jsx(Fw,{model:e,boundaries:so,highlightedAction:g,highlightedEntry:w,onSelected:Le,sdkLanguage:et,selectedTime:A,setSelectedTime:P}),f.jsxs(As,{sidebarSize:250,orientation:T==="bottom"?"vertical":"horizontal",settingName:"propertiesSidebar",children:[f.jsxs(As,{sidebarSize:250,orientation:"horizontal",sidebarIsFirst:!0,settingName:"actionListSidebar",children:[f.jsx(Aw,{action:_,sdkLanguage:et,testIdAttributeName:(e==null?void 0:e.testIdAttributeName)||"data-testid",isInspecting:C,setIsInspecting:k,highlightedLocator:N,setHighlightedLocator:M}),f.jsx(Ol,{tabs:[{id:"actions",title:"Actions",component:f.jsxs("div",{className:"vbox",children:[l&&f.jsxs("div",{className:"workbench-run-status",children:[f.jsx("span",{className:`codicon ${Qw(l)}`}),f.jsx("div",{children:Gw(l)}),f.jsx("div",{className:"spacer"}),f.jsx("div",{className:"workbench-run-duration",children:gi?Ke(gi):""})]}),f.jsx(h0,{sdkLanguage:et,actions:(e==null?void 0:e.actions)||[],selectedAction:e?u:void 0,selectedTime:A,setSelectedTime:P,onSelected:Le,onHighlighted:y,revealConsole:()=>ue("console"),isLive:o})]})},{id:"metadata",title:"Metadata",component:f.jsx(Bw,{model:e})}],selectedTab:p,setSelectedTab:m})]}),f.jsx(Ol,{tabs:mi,selectedTab:v,setSelectedTab:ue,leftToolbar:[f.jsx(Qn,{title:"Pick locator",icon:"target",toggled:C,onClick:()=>{C||ue("inspector"),k(!C)}})],rightToolbar:[T==="bottom"?f.jsx(Qn,{title:"Dock to right",icon:"layout-sidebar-right-off",onClick:()=>{j("right")}}):f.jsx(Qn,{title:"Dock to bottom",icon:"layout-panel-off",onClick:()=>{j("bottom")}})],mode:T==="bottom"?"default":"select"})]})]})};var Hc;(e=>{function t(n){for(const r of n.splice(0))r.dispose()}e.disposeAll=t})(Hc||(Hc={}));class kn{constructor(){this._listeners=new Set,this.event=(t,n)=>{this._listeners.add(t);let r=!1;const i=this,s={dispose(){r||(r=!0,i._listeners.delete(t))}};return n&&n.push(s),s}}fire(t){const n=!this._deliveryQueue;this._deliveryQueue||(this._deliveryQueue=[]);for(const r of this._listeners)this._deliveryQueue.push({listener:r,event:t});if(n){for(let r=0;r<this._deliveryQueue.length;r++){const{listener:i,event:s}=this._deliveryQueue[r];i.call(null,s)}this._deliveryQueue=void 0}}dispose(){this._listeners.clear(),this._deliveryQueue&&(this._deliveryQueue=[])}}class l1{constructor(t){this._onCloseEmitter=new kn,this._onReportEmitter=new kn,this._onStdioEmitter=new kn,this._onListChangedEmitter=new kn,this._onTestFilesChangedEmitter=new kn,this._onLoadTraceRequestedEmitter=new kn,this._lastId=0,this._callbacks=new Map,this.onClose=this._onCloseEmitter.event,this.onReport=this._onReportEmitter.event,this.onStdio=this._onStdioEmitter.event,this.onListChanged=this._onListChangedEmitter.event,this.onTestFilesChanged=this._onTestFilesChangedEmitter.event,this.onLoadTraceRequested=this._onLoadTraceRequestedEmitter.event,this._ws=new WebSocket(t),this._ws.addEventListener("message",r=>{const i=JSON.parse(String(r.data)),{id:s,result:o,error:l,method:a,params:u}=i;if(s){const c=this._callbacks.get(s);if(!c)return;this._callbacks.delete(s),l?c.reject(new Error(l)):c.resolve(o)}else this._dispatchEvent(a,u)});const n=setInterval(()=>this._sendMessage("ping").catch(()=>{}),3e4);this._connectedPromise=new Promise((r,i)=>{this._ws.addEventListener("open",()=>r()),this._ws.addEventListener("error",i)}),this._ws.addEventListener("close",()=>{this._onCloseEmitter.fire(),clearInterval(n)})}async _sendMessage(t,n){const r=globalThis.__logForTest;r==null||r({method:t,params:n}),await this._connectedPromise;const i=++this._lastId,s={id:i,method:t,params:n};return this._ws.send(JSON.stringify(s)),new Promise((o,l)=>{this._callbacks.set(i,{resolve:o,reject:l})})}_sendMessageNoReply(t,n){this._sendMessage(t,n).catch(()=>{})}_dispatchEvent(t,n){t==="report"?this._onReportEmitter.fire(n):t==="stdio"?this._onStdioEmitter.fire(n):t==="listChanged"?this._onListChangedEmitter.fire(n):t==="testFilesChanged"?this._onTestFilesChangedEmitter.fire(n):t==="loadTraceRequested"&&this._onLoadTraceRequestedEmitter.fire(n)}async initialize(t){await this._sendMessage("initialize",t)}async ping(t){await this._sendMessage("ping",t)}async pingNoReply(t){this._sendMessageNoReply("ping",t)}async watch(t){await this._sendMessage("watch",t)}watchNoReply(t){this._sendMessageNoReply("watch",t)}async open(t){await this._sendMessage("open",t)}openNoReply(t){this._sendMessageNoReply("open",t)}async resizeTerminal(t){await this._sendMessage("resizeTerminal",t)}resizeTerminalNoReply(t){this._sendMessageNoReply("resizeTerminal",t)}async checkBrowsers(t){return await this._sendMessage("checkBrowsers",t)}async installBrowsers(t){await this._sendMessage("installBrowsers",t)}async runGlobalSetup(t){return await this._sendMessage("runGlobalSetup",t)}async runGlobalTeardown(t){return await this._sendMessage("runGlobalTeardown",t)}async startDevServer(t){return await this._sendMessage("startDevServer",t)}async stopDevServer(t){return await this._sendMessage("stopDevServer",t)}async clearCache(t){return await this._sendMessage("clearCache",t)}async listFiles(t){return await this._sendMessage("listFiles",t)}async listTests(t){return await this._sendMessage("listTests",t)}async runTests(t){return await this._sendMessage("runTests",t)}async findRelatedTestFiles(t){return await this._sendMessage("findRelatedTestFiles",t)}async stopTests(t){await this._sendMessage("stopTests",t)}stopTestsNoReply(t){this._sendMessageNoReply("stopTests",t)}async closeGracefully(t){await this._sendMessage("closeGracefully",t)}close(){try{this._ws.close()}catch{}}}export{i1 as M,Ht as R,As as S,l1 as T,o1 as W,M0 as _,Qn as a,Jw as b,r1 as c,n1 as d,e1 as e,t1 as f,Ah as g,Qw as h,c0 as i,f as j,s1 as k,is as l,Ke as m,Yw as n,Vp as o,L as r,Ur as s,Zw as t,vn as u};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/codeMirrorModule.ez37Vkbh.css b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/codeMirrorModule.ez37Vkbh.css
new file mode 100644
index 0000000..a2760cc
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/codeMirrorModule.ez37Vkbh.css
@@ -0,0 +1 @@
+.CodeMirror{font-family:monospace;height:300px;color:#000;direction:ltr}.CodeMirror-lines{padding:4px 0}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{padding:0 4px}.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid black;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-fat-cursor .CodeMirror-line::selection,.cm-fat-cursor .CodeMirror-line>span::selection,.cm-fat-cursor .CodeMirror-line>span>span::selection{background:transparent}.cm-fat-cursor .CodeMirror-line::-moz-selection,.cm-fat-cursor .CodeMirror-line>span::-moz-selection,.cm-fat-cursor .CodeMirror-line>span>span::-moz-selection{background:transparent}.cm-fat-cursor{caret-color:transparent}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:0;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3,.cm-s-default .cm-type{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-s-default .cm-error,.cm-invalidchar{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#a22}.CodeMirror-matchingtag{background:#ff96004d}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-50px;margin-right:-50px;padding-bottom:50px;height:100%;outline:none;position:relative;z-index:0}.CodeMirror-sizer{position:relative;border-right:50px solid transparent}.CodeMirror-vscrollbar,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{position:absolute;z-index:6;display:none;outline:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-50px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:none!important;border:none!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:transparent;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-wrap pre.CodeMirror-line,.CodeMirror-wrap pre.CodeMirror-line-like{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;padding:.1px}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:none}.CodeMirror-scroll,.CodeMirror-sizer,.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}div.CodeMirror-dragcursors,.CodeMirror-focused div.CodeMirror-cursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background-color:#ffa;background-color:#ff06}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:""}span.CodeMirror-selectedtext{background:none}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/index.CrbWWHbf.css b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/index.CrbWWHbf.css
new file mode 100644
index 0000000..326d3a5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/index.CrbWWHbf.css
@@ -0,0 +1 @@
+.drop-target{display:flex;align-items:center;justify-content:center;flex:auto;flex-direction:column;background-color:var(--vscode-editor-background);position:absolute;top:0;right:0;bottom:0;left:0;z-index:100;line-height:24px}body .drop-target{background:#fffc}body.dark-mode .drop-target{background:#000c}.drop-target .title{font-size:24px;font-weight:700;margin-bottom:30px}.drop-target .processing-error{font-size:24px;color:#e74c3c;font-weight:700;text-align:center;margin:30px}.drop-target input{margin-top:50px}.drop-target button{color:#fff;background-color:#007acc;padding:8px 12px;border:none;margin:30px 0;cursor:pointer}.progress{flex:none;width:100%;height:3px;margin-top:-3px;z-index:10}.inner-progress{background-color:var(--vscode-progressBar-background);height:100%}.header{display:flex;background-color:#000;flex:none;flex-basis:48px;line-height:48px;font-size:16px;color:#ccc}.workbench-loader{contain:size}.workbench-loader .header .toolbar-button{margin:12px;padding:8px 4px}.workbench-loader .logo{margin-left:16px;display:flex;align-items:center}.workbench-loader .logo img{height:32px;width:32px;pointer-events:none;flex:none}.workbench-loader .product{font-weight:600;margin-left:16px;flex:none}.workbench-loader .header .title{margin-left:16px;overflow:hidden;text-overflow:ellipsis;text-wrap:nowrap}html,body{min-width:550px;min-height:450px;overflow:auto}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/index.ZHEPt4GY.js b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/index.ZHEPt4GY.js
new file mode 100644
index 0000000..d7e082a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/index.ZHEPt4GY.js
@@ -0,0 +1,2 @@
+import{M as N,r as s,T as W,j as e,a as D,t as M,W as C,b as F,c as O}from"./assets/testServerConnection-JQMZFCzK.js";const A=()=>{const[i,k]=s.useState(!1),[c,h]=s.useState([]),[u,U]=s.useState([]),[w,S]=s.useState(L),[v,m]=s.useState({done:0,total:0}),[T,g]=s.useState(!1),[y,f]=s.useState(null),[x,E]=s.useState(null),p=s.useCallback(t=>{const o=[],a=[],r=new URL(window.location.href);for(let n=0;n<t.length;n++){const l=t.item(n);if(!l)continue;const b=URL.createObjectURL(l);o.push(b),a.push(l.name),r.searchParams.append("trace",b),r.searchParams.append("traceFileName",l.name)}const d=r.toString();window.history.pushState({},"",d),h(o),U(a),g(!1),f(null)},[]),P=s.useCallback(t=>{t.preventDefault(),p(t.dataTransfer.files)},[p]),R=s.useCallback(t=>{t.preventDefault(),t.target.files&&p(t.target.files)},[p]);s.useEffect(()=>{const t=new URL(window.location.href).searchParams,o=t.getAll("trace");k(t.has("isServer"));for(const a of o)if(a.startsWith("file:")){E(a||null);return}if(t.has("isServer")){const a=new URLSearchParams(window.location.search).get("ws"),r=new URL(`../${a}`,window.location.toString());r.protocol=window.location.protocol==="https:"?"wss:":"ws:";const d=new W(r.toString());d.onLoadTraceRequested(async n=>{h(n.traceUrl?[n.traceUrl]:[]),g(!1),f(null)}),d.initialize({}).catch(()=>{})}else o.some(a=>a.startsWith("blob:"))||h(o)},[]),s.useEffect(()=>{(async()=>{if(c.length){const t=r=>{r.data.method==="progress"&&m(r.data.params)};navigator.serviceWorker.addEventListener("message",t),m({done:0,total:1});const o=[];for(let r=0;r<c.length;r++){const d=c[r],n=new URLSearchParams;n.set("trace",d),u.length&&n.set("traceFileName",u[r]);const l=await fetch(`contexts?${n.toString()}`);if(!l.ok){i||h([]),f((await l.json()).error);return}o.push(...await l.json())}navigator.serviceWorker.removeEventListener("message",t);const a=new N(o);m({done:0,total:0}),S(a)}else S(L)})()},[i,c,u]);const j=!!(!i&&!T&&!x&&(!c.length||y));return e.jsxs("div",{className:"vbox workbench-loader",onDragOver:t=>{t.preventDefault(),g(!0)},children:[e.jsxs("div",{className:"hbox header",...j?{inert:"true"}:{},children:[e.jsx("div",{className:"logo",children:e.jsx("img",{src:"playwright-logo.svg",alt:"Playwright logo"})}),e.jsx("div",{className:"product",children:"Playwright"}),w.title&&e.jsx("div",{className:"title",children:w.title}),e.jsx("div",{className:"spacer"}),e.jsx(D,{icon:"color-mode",title:"Toggle color mode",toggled:!1,onClick:()=>M()})]}),e.jsx("div",{className:"progress",children:e.jsx("div",{className:"inner-progress",style:{width:v.total?100*v.done/v.total+"%":0}})}),e.jsx(C,{model:w,inert:j}),x&&e.jsxs("div",{className:"drop-target",children:[e.jsx("div",{children:"Trace Viewer uses Service Workers to show traces. To view trace:"}),e.jsxs("div",{style:{paddingTop:20},children:[e.jsxs("div",{children:["1. Click ",e.jsx("a",{href:x,children:"here"})," to put your trace into the download shelf"]}),e.jsxs("div",{children:["2. Go to ",e.jsx("a",{href:"https://trace.playwright.dev",children:"trace.playwright.dev"})]}),e.jsx("div",{children:"3. Drop the trace from the download shelf into the page"})]})]}),j&&e.jsxs("div",{className:"drop-target",children:[e.jsx("div",{className:"processing-error",role:"alert",children:y}),e.jsx("div",{className:"title",role:"heading","aria-level":1,children:"Drop Playwright Trace to load"}),e.jsx("div",{children:"or"}),e.jsx("button",{onClick:()=>{const t=document.createElement("input");t.type="file",t.multiple=!0,t.click(),t.addEventListener("change",o=>R(o))},type:"button",children:"Select file(s)"}),e.jsx("div",{style:{maxWidth:400},children:"Playwright Trace Viewer is a Progressive Web App, it does not send your trace anywhere, it opens it locally."})]}),i&&!c.length&&e.jsx("div",{className:"drop-target",children:e.jsx("div",{className:"title",children:"Select test to see the trace"})}),T&&e.jsx("div",{className:"drop-target",onDragLeave:()=>{g(!1)},onDrop:t=>P(t),children:e.jsx("div",{className:"title",children:"Release to analyse the Playwright Trace"})})]})},L=new N([]);(async()=>{if(F(),window.location.protocol!=="file:"){if(window.location.href.includes("isUnderTest=true")&&await new Promise(i=>setTimeout(i,1e3)),!navigator.serviceWorker)throw new Error(`Service workers are not supported.
+Make sure to serve the Trace Viewer (${window.location}) via HTTPS or localhost.`);navigator.serviceWorker.register("sw.bundle.js"),navigator.serviceWorker.controller||await new Promise(i=>{navigator.serviceWorker.oncontrollerchange=()=>i()}),setInterval(function(){fetch("ping")},1e4)}O.render(e.jsx(A,{}),document.querySelector("#root"))})();
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/sw.bundle.js b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/sw.bundle.js
new file mode 100644
index 0000000..306f656
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/sw.bundle.js
@@ -0,0 +1,3 @@
+var Nr=Object.defineProperty;var Pr=(n,t,e)=>t in n?Nr(n,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):n[t]=e;var F=(n,t,e)=>(Pr(n,typeof t!="symbol"?t+"":t,e),e);function Lr(n,t){const e=new Array(t.length).fill(0);return new Array(t.length).fill(0).map((r,s)=>(i,a)=>{e[s]=i/a*t[s]*1e3,n(e.reduce((o,l)=>o+l,0),1e3)})}function En(n){return Array.isArray(n)&&typeof n[0]=="string"}function Fr(n){return Array.isArray(n)&&Array.isArray(n[0])}class Mr{constructor(t,e,r){F(this,"_snapshots");F(this,"_index");F(this,"snapshotName");F(this,"_resources");F(this,"_snapshot");F(this,"_callId");this._resources=t,this._snapshots=e,this._index=r,this._snapshot=e[r],this._callId=e[r].callId,this.snapshotName=e[r].snapshotName}snapshot(){return this._snapshots[this._index]}viewport(){return this._snapshots[this._index].viewport}render(){const t=(i,a,o,l)=>{if(typeof i=="string"){const _=Hr(i);return o==="STYLE"||o==="style"?qr(_):_}if(!i._string)if(Fr(i)){const _=a-i[0][0];if(_>=0&&_<=a){const d=Wr(this._snapshots[_]),p=i[0][1];p>=0&&p<d.length&&(i._string=t(d[p],_,o,l))}}else if(En(i)){const[_,d,...p]=i,h=_==="NOSCRIPT"?"X-NOSCRIPT":_,g=Object.entries(d||{}),y=[];y.push("<",h);const f="__playwright_current_src__",c=h==="IFRAME"||h==="FRAME",u=h==="A",m=h==="IMG",w=m&&g.some(A=>A[0]===f),x=h==="SOURCE"&&o==="PICTURE"&&(l==null?void 0:l.some(A=>A[0]===f));for(const[A,b]of g){let T=A;c&&A.toLowerCase()==="src"&&(T="__playwright_src__"),m&&A===f&&(T="src"),["src","srcset"].includes(A.toLowerCase())&&(w||x)&&(T="_"+T);let S=b;u&&A.toLowerCase()==="href"?S="link://"+b:(A.toLowerCase()==="href"||A.toLowerCase()==="src"||A===f)&&(S=Qe(b)),y.push(" ",T,'="',vr(S),'"')}y.push(">");for(const A of p)y.push(t(A,a,h,g));Ur.has(h)||y.push("</",h,">"),i._string=y.join("")}else i._string="";return i._string},e=this._snapshot;let r=t(e.html,this._index,void 0,void 0);return r?(r=(e.doctype?`<!DOCTYPE ${e.doctype}>`:"")+["<style>*,*::before,*::after { visibility: hidden }</style>",`<script>${Br(this._callId,this.snapshotName)}<\/script>`].join("")+r,{html:r,pageId:e.pageId,frameId:e.frameId,index:this._index}):{html:"",pageId:e.pageId,frameId:e.frameId,index:this._index}}resourceByUrl(t,e){const r=this._snapshot;let s,i;for(const o of this._resources){if(typeof o._monotonicTime=="number"&&o._monotonicTime>=r.timestamp)break;o.response.status!==304&&o.request.url===t&&o.request.method===e&&(o._frameref===r.frameId?s=o:i=o)}let a=s??i;if(a&&e.toUpperCase()==="GET"){for(const o of r.resourceOverrides)if(t===o.url&&o.sha1){a={...a,response:{...a.response,content:{...a.response.content,_sha1:o.sha1}}};break}}return a}}const Ur=new Set(["AREA","BASE","BR","COL","COMMAND","EMBED","HR","IMG","INPUT","KEYGEN","LINK","MENUITEM","META","PARAM","SOURCE","TRACK","WBR"]),Tn={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"};function vr(n){return n.replace(/[&<>"']/ug,t=>Tn[t])}function Hr(n){return n.replace(/[&<]/ug,t=>Tn[t])}function Wr(n){if(!n._nodes){const t=[],e=r=>{if(typeof r=="string")t.push(r);else if(En(r)){const[,,...s]=r;for(const i of s)e(i);t.push(r)}};e(n.html),n._nodes=t}return n._nodes}function Br(...n){function t(e,...r){const s="Recorded click position in absolute coordinates did not match the center of the clicked element. This is likely due to a difference between the test runner and the trace viewer operating systems.",i=[],a=[],o=[],l=p=>{for(const h of p.querySelectorAll("[__playwright_scroll_top_]"))i.push(h);for(const h of p.querySelectorAll("[__playwright_scroll_left_]"))a.push(h);for(const h of p.querySelectorAll("[__playwright_value_]")){const g=h;g.type!=="file"&&(g.value=g.getAttribute("__playwright_value_")),h.removeAttribute("__playwright_value_")}for(const h of p.querySelectorAll("[__playwright_checked_]"))h.checked=h.getAttribute("__playwright_checked_")==="true",h.removeAttribute("__playwright_checked_");for(const h of p.querySelectorAll("[__playwright_selected_]"))h.selected=h.getAttribute("__playwright_selected_")==="true",h.removeAttribute("__playwright_selected_");for(const h of r)for(const g of p.querySelectorAll(`[__playwright_target__="${h}"]`)){const y=g.style;y.outline="2px solid #006ab1",y.backgroundColor="#6fa8dc7f",o.push(g)}for(const h of p.querySelectorAll("iframe, frame")){const g=h.getAttribute("__playwright_src__");if(!g)h.setAttribute("src",'data:text/html,<body style="background: #ddd"></body>');else{const y=new URL(e(window.location.href)),f=y.pathname.lastIndexOf("/snapshot/");f!==-1&&(y.pathname=y.pathname.substring(0,f+1)),y.pathname+=g.substring(1),h.setAttribute("src",y.toString())}}{const h=p.querySelector("body[__playwright_custom_elements__]");if(h&&window.customElements){const g=(h.getAttribute("__playwright_custom_elements__")||"").split(",");for(const y of g)window.customElements.define(y,class extends HTMLElement{})}}for(const h of p.querySelectorAll("template[__playwright_shadow_root_]")){const g=h,y=g.parentElement.attachShadow({mode:"open"});y.appendChild(g.content),g.remove(),l(y)}if("adoptedStyleSheets"in p){const h=[...p.adoptedStyleSheets];for(const g of p.querySelectorAll("template[__playwright_style_sheet_]")){const y=g,f=new CSSStyleSheet;f.replaceSync(y.getAttribute("__playwright_style_sheet_")),h.push(f)}p.adoptedStyleSheets=h}},_=()=>{window.removeEventListener("load",_);for(const h of i)h.scrollTop=+h.getAttribute("__playwright_scroll_top_"),h.removeAttribute("__playwright_scroll_top_");for(const h of a)h.scrollLeft=+h.getAttribute("__playwright_scroll_left_"),h.removeAttribute("__playwright_scroll_left_");document.styleSheets[0].disabled=!0;const p=new URL(window.location.href).searchParams;if(p.get("pointX")&&p.get("pointY")){const h=+p.get("pointX"),g=+p.get("pointY"),y=o.length>0,f=document.documentElement?[document.documentElement]:[];for(const c of y?o:f){const u=document.createElement("x-pw-pointer");if(u.style.position="fixed",u.style.backgroundColor="#f44336",u.style.width="20px",u.style.height="20px",u.style.borderRadius="10px",u.style.margin="-10px 0 0 -10px",u.style.zIndex="2147483646",u.style.display="flex",u.style.alignItems="center",u.style.justifyContent="center",y){const m=c.getBoundingClientRect(),w=m.left+m.width/2,x=m.top+m.height/2;if(u.style.left=w+"px",u.style.top=x+"px",Math.abs(w-h)>=10||Math.abs(x-g)>=10){const A=document.createElement("x-pw-pointer-warning");A.textContent="⚠",A.style.fontSize="19px",A.style.color="white",A.style.marginTop="-3.5px",A.style.userSelect="none",u.appendChild(A),u.setAttribute("title",s)}}else u.style.left=h+"px",u.style.top=g+"px";document.documentElement.appendChild(u)}}},d=()=>l(document);window.addEventListener("load",_),window.addEventListener("DOMContentLoaded",d)}return`
+(${t.toString()})(${ze.toString()}${n.map(e=>`, "${e}"`).join("")})`}const Sn=["about:","blob:","data:","file:","ftp:","http:","https:","mailto:","sftp:","ws:","wss:"],Ot="http://playwright.bloburl/#";function Qe(n){n.startsWith(Ot)&&(n=n.substring(Ot.length));try{const t=new URL(n);if(t.protocol==="javascript:"||t.protocol==="vbscript:")return"javascript:void(0)";const e=t.protocol==="blob:",r=t.protocol==="file:";if(!e&&!r&&Sn.includes(t.protocol))return n;const s="pw-"+t.protocol.slice(0,t.protocol.length-1);return r||(t.protocol="https:"),t.hostname=t.hostname?`${s}--${t.hostname}`:s,r&&(t.protocol="https:"),t.toString()}catch{return n}}const jr=/url\(['"]?([\w-]+:)\/\//ig;function qr(n){return n.replace(jr,(t,e)=>!(e==="blob:")&&!(e==="file:")&&Sn.includes(e)?t:t.replace(e+"//",`https://pw-${e.slice(0,-1)}--`))}function ze(n){const t=new URL(n);return t.pathname.endsWith("/snapshot.html")?t.searchParams.get("r"):n}class Gr{constructor(t,e){F(this,"_snapshotStorage");F(this,"_resourceLoader");F(this,"_snapshotIds",new Map);this._snapshotStorage=t,this._resourceLoader=e}serveSnapshot(t,e,r){const s=this._snapshot(t.substring(9),e);if(!s)return new Response(null,{status:404});const i=s.render();return this._snapshotIds.set(r,s),new Response(i.html,{status:200,headers:{"Content-Type":"text/html"}})}serveSnapshotInfo(t,e){const r=this._snapshot(t.substring(13),e);return this._respondWithJson(r?{viewport:r.viewport(),url:r.snapshot().frameUrl}:{error:"No snapshot found"})}_snapshot(t,e){const r=e.get("name");return this._snapshotStorage.snapshotByName(t.slice(1),r)}_respondWithJson(t){return new Response(JSON.stringify(t),{status:200,headers:{"Cache-Control":"public, max-age=31536000","Content-Type":"application/json"}})}async serveResource(t,e,r){let s;const i=this._snapshotIds.get(r);for(const g of t)if(s=i==null?void 0:i.resourceByUrl(Yr(g),e),s)break;if(!s)return new Response(null,{status:404});const a=s.response.content._sha1,o=a?await this._resourceLoader(a)||new Blob([]):new Blob([]);let l=s.response.content.mimeType;/^text\/|^application\/(javascript|json)/.test(l)&&!l.includes("charset")&&(l=`${l}; charset=utf-8`);const d=new Headers;d.set("Content-Type",l);for(const{name:g,value:y}of s.response.headers)d.set(g,y);d.delete("Content-Encoding"),d.delete("Access-Control-Allow-Origin"),d.set("Access-Control-Allow-Origin","*"),d.delete("Content-Length"),d.set("Content-Length",String(o.size)),d.set("Cache-Control","public, max-age=31536000");const{status:p}=s.response,h=p===101||p===204||p===205||p===304;return new Response(h?null:o,{headers:d,status:s.response.status,statusText:s.response.statusText})}}function Yr(n){try{const t=new URL(n);return t.hash="",t.toString()}catch{return n}}function Vr(n){const t=new Map,{files:e,stacks:r}=n;for(const s of r){const[i,a]=s;t.set(`call@${i}`,a.map(o=>({file:e[o[0]],line:o[1],column:o[2],function:o[3]})))}return t}function Zr(){return{origin:"testRunner",traceUrl:"",startTime:Number.MAX_SAFE_INTEGER,wallTime:Number.MAX_SAFE_INTEGER,endTime:0,browserName:"",options:{deviceScaleFactor:1,isMobile:!1,viewport:{width:1280,height:800}},pages:[],resources:[],actions:[],events:[],errors:[],stdio:[],hasSource:!1}}class Kr{constructor(){F(this,"_resources",[]);F(this,"_frameSnapshots",new Map)}addResource(t){t.request.url=Qe(t.request.url),this._resources.push(t)}addFrameSnapshot(t){for(const s of t.resourceOverrides)s.url=Qe(s.url);let e=this._frameSnapshots.get(t.frameId);e||(e={raw:[],renderers:[]},this._frameSnapshots.set(t.frameId,e),t.isMainFrame&&this._frameSnapshots.set(t.pageId,e)),e.raw.push(t);const r=new Mr(this._resources,e.raw,e.raw.length-1);return e.renderers.push(r),r}snapshotByName(t,e){const r=this._frameSnapshots.get(t);return r==null?void 0:r.renderers.find(s=>s.snapshotName===e)}snapshotsForTest(){return[...this._frameSnapshots.keys()]}finalize(){this._resources.sort((t,e)=>(t._monotonicTime||0)-(e._monotonicTime||0))}}class An extends Error{constructor(t){super(t),this.name="TraceVersionError"}}const kt=7;class Xr{constructor(t,e,r){F(this,"_contextEntry");F(this,"_snapshotStorage");F(this,"_attachments");F(this,"_actionMap",new Map);F(this,"_version");F(this,"_pageEntries",new Map);F(this,"_jsHandles",new Map);F(this,"_consoleObjects",new Map);this._contextEntry=t,this._snapshotStorage=e,this._attachments=r}appendTrace(t){for(const e of t.split(`
+`))this._appendEvent(e)}actions(){return[...this._actionMap.values()]}_pageEntry(t){let e=this._pageEntries.get(t);return e||(e={screencastFrames:[]},this._pageEntries.set(t,e),this._contextEntry.pages.push(e)),e}_appendEvent(t){if(!t)return;const e=this._modernize(JSON.parse(t));for(const r of e)this._innerAppendEvent(r)}_innerAppendEvent(t){var r;const e=this._contextEntry;switch(t.type){case"context-options":{if(t.version>kt)throw new An("The trace was created by a newer version of Playwright and is not supported by this version of the viewer. Please use latest Playwright to open the trace.");this._version=t.version,e.origin=t.origin,e.browserName=t.browserName,e.channel=t.channel,e.title=t.title,e.platform=t.platform,e.wallTime=t.wallTime,e.startTime=t.monotonicTime,e.sdkLanguage=t.sdkLanguage,e.options=t.options,e.testIdAttributeName=t.testIdAttributeName;break}case"screencast-frame":{this._pageEntry(t.pageId).screencastFrames.push(t);break}case"before":{this._actionMap.set(t.callId,{...t,type:"action",endTime:0,log:[]});break}case"input":{const s=this._actionMap.get(t.callId);s.inputSnapshot=t.inputSnapshot,s.point=t.point;break}case"log":{const s=this._actionMap.get(t.callId);if(!s)return;s.log.push({time:t.time,message:t.message});break}case"after":{const s=this._actionMap.get(t.callId);s.afterSnapshot=t.afterSnapshot,s.endTime=t.endTime,s.result=t.result,s.error=t.error,s.attachments=t.attachments,t.point&&(s.point=t.point);for(const i of((r=t.attachments)==null?void 0:r.filter(a=>a.sha1))||[])this._attachments.set(i.sha1,i);break}case"action":{this._actionMap.set(t.callId,{...t,log:[]});break}case"event":{e.events.push(t);break}case"stdout":{e.stdio.push(t);break}case"stderr":{e.stdio.push(t);break}case"error":{e.errors.push(t);break}case"console":{e.events.push(t);break}case"resource-snapshot":this._snapshotStorage.addResource(t.snapshot),e.resources.push(t.snapshot);break;case"frame-snapshot":this._snapshotStorage.addFrameSnapshot(t.snapshot);break}"pageId"in t&&t.pageId&&this._pageEntry(t.pageId),(t.type==="action"||t.type==="before")&&(e.startTime=Math.min(e.startTime,t.startTime)),(t.type==="action"||t.type==="after")&&(e.endTime=Math.max(e.endTime,t.endTime)),t.type==="event"&&(e.startTime=Math.min(e.startTime,t.time),e.endTime=Math.max(e.endTime,t.time)),t.type==="screencast-frame"&&(e.startTime=Math.min(e.startTime,t.timestamp),e.endTime=Math.max(e.endTime,t.timestamp))}_processedContextCreatedEvent(){return this._version!==void 0}_modernize(t){let e=this._version||t.version;if(e===void 0)return[t];let r=[t];for(;e<kt;++e)r=this[`_modernize_${e}_to_${e+1}`].call(this,r);return r}_modernize_0_to_1(t){for(const e of t)e.type==="action"&&typeof e.metadata.error=="string"&&(e.metadata.error={error:{name:"Error",message:e.metadata.error}});return t}_modernize_1_to_2(t){var e;for(const r of t)r.type!=="frame-snapshot"||!r.snapshot.isMainFrame||(r.snapshot.viewport=((e=this._contextEntry.options)==null?void 0:e.viewport)||{width:1280,height:720});return t}_modernize_2_to_3(t){for(const e of t){if(e.type!=="resource-snapshot"||e.snapshot.request)continue;const r=e.snapshot;e.snapshot={_frameref:r.frameId,request:{url:r.url,method:r.method,headers:r.requestHeaders,postData:r.requestSha1?{_sha1:r.requestSha1}:void 0},response:{status:r.status,headers:r.responseHeaders,content:{mimeType:r.contentType,_sha1:r.responseSha1}},_monotonicTime:r.timestamp}}return t}_modernize_3_to_4(t){const e=[];for(const r of t){const s=this._modernize_event_3_to_4(r);s&&e.push(s)}return e}_modernize_event_3_to_4(t){var r,s,i,a;if(t.type!=="action"&&t.type!=="event")return t;const e=t.metadata;return e.internal||e.method.startsWith("tracing")?null:t.type==="event"?e.method==="__create__"&&e.type==="ConsoleMessage"?{type:"object",class:e.type,guid:e.params.guid,initializer:e.params.initializer}:{type:"event",time:e.startTime,class:e.type,method:e.method,params:e.params,pageId:e.pageId}:{type:"action",callId:e.id,startTime:e.startTime,endTime:e.endTime,apiName:e.apiName||e.type+"."+e.method,class:e.type,method:e.method,params:e.params,wallTime:e.wallTime||Date.now(),log:e.log,beforeSnapshot:(r=e.snapshots.find(o=>o.title==="before"))==null?void 0:r.snapshotName,inputSnapshot:(s=e.snapshots.find(o=>o.title==="input"))==null?void 0:s.snapshotName,afterSnapshot:(i=e.snapshots.find(o=>o.title==="after"))==null?void 0:i.snapshotName,error:(a=e.error)==null?void 0:a.error,result:e.result,point:e.point,pageId:e.pageId}}_modernize_4_to_5(t){const e=[];for(const r of t){const s=this._modernize_event_4_to_5(r);s&&e.push(s)}return e}_modernize_event_4_to_5(t){var e,r;if(t.type==="event"&&t.method==="__create__"&&t.class==="JSHandle"&&this._jsHandles.set(t.params.guid,t.params.initializer),t.type==="object"){if(t.class!=="ConsoleMessage")return null;const s=(e=t.initializer.args)==null?void 0:e.map(i=>{if(i.guid){const a=this._jsHandles.get(i.guid);return{preview:(a==null?void 0:a.preview)||"",value:""}}return{preview:i.preview||"",value:i.value||""}});return this._consoleObjects.set(t.guid,{type:t.initializer.type,text:t.initializer.text,location:t.initializer.location,args:s}),null}if(t.type==="event"&&t.method==="console"){const s=this._consoleObjects.get(((r=t.params.message)==null?void 0:r.guid)||"");return s?{type:"console",time:t.time,pageId:t.pageId,messageType:s.type,text:s.text,args:s.args,location:s.location}:null}return t}_modernize_5_to_6(t){const e=[];for(const r of t)if(e.push(r),!(r.type!=="after"||!r.log.length))for(const s of r.log)e.push({type:"log",callId:r.callId,message:s,time:-1});return e}_modernize_6_to_7(t){const e=[];if(!this._processedContextCreatedEvent()&&t[0].type!=="context-options"){const r={type:"context-options",origin:"testRunner",version:7,browserName:"",options:{},platform:process.platform,wallTime:0,monotonicTime:0,sdkLanguage:"javascript"};e.push(r)}for(const r of t){if(r.type==="context-options"){e.push({...r,monotonicTime:0,origin:"library"});continue}!this._contextEntry.wallTime&&r.type==="before"&&(this._contextEntry.wallTime=r.wallTime),!this._contextEntry.startTime&&r.type==="before"&&(this._contextEntry.startTime=r.startTime),e.push(r)}return e}}class $r{constructor(){F(this,"contextEntries",[]);F(this,"_snapshotStorage");F(this,"_backend");F(this,"_attachments",new Map);F(this,"_resourceToContentType",new Map)}async load(t,e){var o,l;this._backend=t;const r=[];let s=!1;for(const _ of await this._backend.entryNames()){const d=_.match(/(.+)\.trace/);d&&r.push(d[1]||""),_.includes("src@")&&(s=!0)}if(!r.length)throw new Error("Cannot find .trace file");this._snapshotStorage=new Kr;const i=r.length*3;let a=0;for(const _ of r){const d=Zr();d.traceUrl=t.traceURL(),d.hasSource=s;const p=new Xr(d,this._snapshotStorage,this._attachments),h=await this._backend.readText(_+".trace")||"";p.appendTrace(h),e(++a,i);const g=await this._backend.readText(_+".network")||"";if(p.appendTrace(g),e(++a,i),d.actions=p.actions().sort((f,c)=>f.startTime-c.startTime),!t.isLive()){for(const f of d.actions.slice().reverse())if(!f.endTime&&!f.error)for(const c of d.actions)c.parentId===f.callId&&f.endTime<c.endTime&&(f.endTime=c.endTime)}const y=await this._backend.readText(_+".stacks");if(y){const f=Vr(JSON.parse(y));for(const c of d.actions)c.stack=c.stack||f.get(c.callId)}e(++a,i);for(const f of d.resources)(o=f.request.postData)!=null&&o._sha1&&this._resourceToContentType.set(f.request.postData._sha1,Dt(f.request.postData.mimeType)),(l=f.response.content)!=null&&l._sha1&&this._resourceToContentType.set(f.response.content._sha1,Dt(f.response.content.mimeType));this.contextEntries.push(d)}this._snapshotStorage.finalize()}async hasEntry(t){return this._backend.hasEntry(t)}async resourceForSha1(t){const e=await this._backend.readBlob("resources/"+t);if(e)return new Blob([e],{type:this._resourceToContentType.get(t)||"application/octet-stream"})}attachmentForSha1(t){return this._attachments.get(t)}storage(){return this._snapshotStorage}}function Dt(n){const t=n.match(/^(.*);\s*charset=.*$/);return t?t[1]:n}const Jr=15,L=0,z=1,Qr=2,V=-2,W=-3,It=-4,ee=-5,Z=[0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535],Rn=1440,zr=0,es=4,ts=9,ns=5,rs=[96,7,256,0,8,80,0,8,16,84,8,115,82,7,31,0,8,112,0,8,48,0,9,192,80,7,10,0,8,96,0,8,32,0,9,160,0,8,0,0,8,128,0,8,64,0,9,224,80,7,6,0,8,88,0,8,24,0,9,144,83,7,59,0,8,120,0,8,56,0,9,208,81,7,17,0,8,104,0,8,40,0,9,176,0,8,8,0,8,136,0,8,72,0,9,240,80,7,4,0,8,84,0,8,20,85,8,227,83,7,43,0,8,116,0,8,52,0,9,200,81,7,13,0,8,100,0,8,36,0,9,168,0,8,4,0,8,132,0,8,68,0,9,232,80,7,8,0,8,92,0,8,28,0,9,152,84,7,83,0,8,124,0,8,60,0,9,216,82,7,23,0,8,108,0,8,44,0,9,184,0,8,12,0,8,140,0,8,76,0,9,248,80,7,3,0,8,82,0,8,18,85,8,163,83,7,35,0,8,114,0,8,50,0,9,196,81,7,11,0,8,98,0,8,34,0,9,164,0,8,2,0,8,130,0,8,66,0,9,228,80,7,7,0,8,90,0,8,26,0,9,148,84,7,67,0,8,122,0,8,58,0,9,212,82,7,19,0,8,106,0,8,42,0,9,180,0,8,10,0,8,138,0,8,74,0,9,244,80,7,5,0,8,86,0,8,22,192,8,0,83,7,51,0,8,118,0,8,54,0,9,204,81,7,15,0,8,102,0,8,38,0,9,172,0,8,6,0,8,134,0,8,70,0,9,236,80,7,9,0,8,94,0,8,30,0,9,156,84,7,99,0,8,126,0,8,62,0,9,220,82,7,27,0,8,110,0,8,46,0,9,188,0,8,14,0,8,142,0,8,78,0,9,252,96,7,256,0,8,81,0,8,17,85,8,131,82,7,31,0,8,113,0,8,49,0,9,194,80,7,10,0,8,97,0,8,33,0,9,162,0,8,1,0,8,129,0,8,65,0,9,226,80,7,6,0,8,89,0,8,25,0,9,146,83,7,59,0,8,121,0,8,57,0,9,210,81,7,17,0,8,105,0,8,41,0,9,178,0,8,9,0,8,137,0,8,73,0,9,242,80,7,4,0,8,85,0,8,21,80,8,258,83,7,43,0,8,117,0,8,53,0,9,202,81,7,13,0,8,101,0,8,37,0,9,170,0,8,5,0,8,133,0,8,69,0,9,234,80,7,8,0,8,93,0,8,29,0,9,154,84,7,83,0,8,125,0,8,61,0,9,218,82,7,23,0,8,109,0,8,45,0,9,186,0,8,13,0,8,141,0,8,77,0,9,250,80,7,3,0,8,83,0,8,19,85,8,195,83,7,35,0,8,115,0,8,51,0,9,198,81,7,11,0,8,99,0,8,35,0,9,166,0,8,3,0,8,131,0,8,67,0,9,230,80,7,7,0,8,91,0,8,27,0,9,150,84,7,67,0,8,123,0,8,59,0,9,214,82,7,19,0,8,107,0,8,43,0,9,182,0,8,11,0,8,139,0,8,75,0,9,246,80,7,5,0,8,87,0,8,23,192,8,0,83,7,51,0,8,119,0,8,55,0,9,206,81,7,15,0,8,103,0,8,39,0,9,174,0,8,7,0,8,135,0,8,71,0,9,238,80,7,9,0,8,95,0,8,31,0,9,158,84,7,99,0,8,127,0,8,63,0,9,222,82,7,27,0,8,111,0,8,47,0,9,190,0,8,15,0,8,143,0,8,79,0,9,254,96,7,256,0,8,80,0,8,16,84,8,115,82,7,31,0,8,112,0,8,48,0,9,193,80,7,10,0,8,96,0,8,32,0,9,161,0,8,0,0,8,128,0,8,64,0,9,225,80,7,6,0,8,88,0,8,24,0,9,145,83,7,59,0,8,120,0,8,56,0,9,209,81,7,17,0,8,104,0,8,40,0,9,177,0,8,8,0,8,136,0,8,72,0,9,241,80,7,4,0,8,84,0,8,20,85,8,227,83,7,43,0,8,116,0,8,52,0,9,201,81,7,13,0,8,100,0,8,36,0,9,169,0,8,4,0,8,132,0,8,68,0,9,233,80,7,8,0,8,92,0,8,28,0,9,153,84,7,83,0,8,124,0,8,60,0,9,217,82,7,23,0,8,108,0,8,44,0,9,185,0,8,12,0,8,140,0,8,76,0,9,249,80,7,3,0,8,82,0,8,18,85,8,163,83,7,35,0,8,114,0,8,50,0,9,197,81,7,11,0,8,98,0,8,34,0,9,165,0,8,2,0,8,130,0,8,66,0,9,229,80,7,7,0,8,90,0,8,26,0,9,149,84,7,67,0,8,122,0,8,58,0,9,213,82,7,19,0,8,106,0,8,42,0,9,181,0,8,10,0,8,138,0,8,74,0,9,245,80,7,5,0,8,86,0,8,22,192,8,0,83,7,51,0,8,118,0,8,54,0,9,205,81,7,15,0,8,102,0,8,38,0,9,173,0,8,6,0,8,134,0,8,70,0,9,237,80,7,9,0,8,94,0,8,30,0,9,157,84,7,99,0,8,126,0,8,62,0,9,221,82,7,27,0,8,110,0,8,46,0,9,189,0,8,14,0,8,142,0,8,78,0,9,253,96,7,256,0,8,81,0,8,17,85,8,131,82,7,31,0,8,113,0,8,49,0,9,195,80,7,10,0,8,97,0,8,33,0,9,163,0,8,1,0,8,129,0,8,65,0,9,227,80,7,6,0,8,89,0,8,25,0,9,147,83,7,59,0,8,121,0,8,57,0,9,211,81,7,17,0,8,105,0,8,41,0,9,179,0,8,9,0,8,137,0,8,73,0,9,243,80,7,4,0,8,85,0,8,21,80,8,258,83,7,43,0,8,117,0,8,53,0,9,203,81,7,13,0,8,101,0,8,37,0,9,171,0,8,5,0,8,133,0,8,69,0,9,235,80,7,8,0,8,93,0,8,29,0,9,155,84,7,83,0,8,125,0,8,61,0,9,219,82,7,23,0,8,109,0,8,45,0,9,187,0,8,13,0,8,141,0,8,77,0,9,251,80,7,3,0,8,83,0,8,19,85,8,195,83,7,35,0,8,115,0,8,51,0,9,199,81,7,11,0,8,99,0,8,35,0,9,167,0,8,3,0,8,131,0,8,67,0,9,231,80,7,7,0,8,91,0,8,27,0,9,151,84,7,67,0,8,123,0,8,59,0,9,215,82,7,19,0,8,107,0,8,43,0,9,183,0,8,11,0,8,139,0,8,75,0,9,247,80,7,5,0,8,87,0,8,23,192,8,0,83,7,51,0,8,119,0,8,55,0,9,207,81,7,15,0,8,103,0,8,39,0,9,175,0,8,7,0,8,135,0,8,71,0,9,239,80,7,9,0,8,95,0,8,31,0,9,159,84,7,99,0,8,127,0,8,63,0,9,223,82,7,27,0,8,111,0,8,47,0,9,191,0,8,15,0,8,143,0,8,79,0,9,255],ss=[80,5,1,87,5,257,83,5,17,91,5,4097,81,5,5,89,5,1025,85,5,65,93,5,16385,80,5,3,88,5,513,84,5,33,92,5,8193,82,5,9,90,5,2049,86,5,129,192,5,24577,80,5,2,87,5,385,83,5,25,91,5,6145,81,5,7,89,5,1537,85,5,97,93,5,24577,80,5,4,88,5,769,84,5,49,92,5,12289,82,5,13,90,5,3073,86,5,193,192,5,24577],is=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],as=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,112,112],os=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577],cs=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],te=15;function et(){const n=this;let t,e,r,s,i,a;function o(_,d,p,h,g,y,f,c,u,m,w){let x,A,b,T,S,C,E,R,D,O,P,N,k,v,M;O=0,S=p;do r[_[d+O]]++,O++,S--;while(S!==0);if(r[0]==p)return f[0]=-1,c[0]=0,L;for(R=c[0],C=1;C<=te&&r[C]===0;C++);for(E=C,R<C&&(R=C),S=te;S!==0&&r[S]===0;S--);for(b=S,R>S&&(R=S),c[0]=R,v=1<<C;C<S;C++,v<<=1)if((v-=r[C])<0)return W;if((v-=r[S])<0)return W;for(r[S]+=v,a[1]=C=0,O=1,k=2;--S!==0;)a[k]=C+=r[O],k++,O++;S=0,O=0;do(C=_[d+O])!==0&&(w[a[C]++]=S),O++;while(++S<p);for(p=a[b],a[0]=S=0,O=0,T=-1,N=-R,i[0]=0,P=0,M=0;E<=b;E++)for(x=r[E];x--!==0;){for(;E>N+R;){if(T++,N+=R,M=b-N,M=M>R?R:M,(A=1<<(C=E-N))>x+1&&(A-=x+1,k=E,C<M))for(;++C<M&&!((A<<=1)<=r[++k]);)A-=r[k];if(M=1<<C,m[0]+M>Rn)return W;i[T]=P=m[0],m[0]+=M,T!==0?(a[T]=S,s[0]=C,s[1]=R,C=S>>>N-R,s[2]=P-i[T-1]-C,u.set(s,(i[T-1]+C)*3)):f[0]=P}for(s[1]=E-N,O>=p?s[0]=192:w[O]<h?(s[0]=w[O]<256?0:96,s[2]=w[O++]):(s[0]=y[w[O]-h]+16+64,s[2]=g[w[O++]-h]),A=1<<E-N,C=S>>>N;C<M;C+=A)u.set(s,(P+C)*3);for(C=1<<E-1;S&C;C>>>=1)S^=C;for(S^=C,D=(1<<N)-1;(S&D)!=a[T];)T--,N-=R,D=(1<<N)-1}return v!==0&&b!=1?ee:L}function l(_){let d;for(t||(t=[],e=[],r=new Int32Array(te+1),s=[],i=new Int32Array(te),a=new Int32Array(te+1)),e.length<_&&(e=[]),d=0;d<_;d++)e[d]=0;for(d=0;d<te+1;d++)r[d]=0;for(d=0;d<3;d++)s[d]=0;i.set(r.subarray(0,te),0),a.set(r.subarray(0,te+1),0)}n.inflate_trees_bits=function(_,d,p,h,g){let y;return l(19),t[0]=0,y=o(_,0,19,19,null,null,p,d,h,t,e),y==W?g.msg="oversubscribed dynamic bit lengths tree":(y==ee||d[0]===0)&&(g.msg="incomplete dynamic bit lengths tree",y=W),y},n.inflate_trees_dynamic=function(_,d,p,h,g,y,f,c,u){let m;return l(288),t[0]=0,m=o(p,0,_,257,is,as,y,h,c,t,e),m!=L||h[0]===0?(m==W?u.msg="oversubscribed literal/length tree":m!=It&&(u.msg="incomplete literal/length tree",m=W),m):(l(288),m=o(p,_,d,0,os,cs,f,g,c,t,e),m!=L||g[0]===0&&_>257?(m==W?u.msg="oversubscribed distance tree":m==ee?(u.msg="incomplete distance tree",m=W):m!=It&&(u.msg="empty distance tree with lengths",m=W),m):L)}}et.inflate_trees_fixed=function(n,t,e,r){return n[0]=ts,t[0]=ns,e[0]=rs,r[0]=ss,L};const ke=0,Nt=1,Pt=2,Lt=3,Ft=4,Mt=5,Ut=6,qe=7,vt=8,De=9;function ls(){const n=this;let t,e=0,r,s=0,i=0,a=0,o=0,l=0,_=0,d=0,p,h=0,g,y=0;function f(c,u,m,w,x,A,b,T){let S,C,E,R,D,O,P,N,k,v,M,ge,I,le,U,H;P=T.next_in_index,N=T.avail_in,D=b.bitb,O=b.bitk,k=b.write,v=k<b.read?b.read-k-1:b.end-k,M=Z[c],ge=Z[u];do{for(;O<20;)N--,D|=(T.read_byte(P++)&255)<<O,O+=8;if(S=D&M,C=m,E=w,H=(E+S)*3,(R=C[H])===0){D>>=C[H+1],O-=C[H+1],b.win[k++]=C[H+2],v--;continue}do{if(D>>=C[H+1],O-=C[H+1],R&16){for(R&=15,I=C[H+2]+(D&Z[R]),D>>=R,O-=R;O<15;)N--,D|=(T.read_byte(P++)&255)<<O,O+=8;S=D&ge,C=x,E=A,H=(E+S)*3,R=C[H];do if(D>>=C[H+1],O-=C[H+1],R&16){for(R&=15;O<R;)N--,D|=(T.read_byte(P++)&255)<<O,O+=8;if(le=C[H+2]+(D&Z[R]),D>>=R,O-=R,v-=I,k>=le)U=k-le,k-U>0&&2>k-U?(b.win[k++]=b.win[U++],b.win[k++]=b.win[U++],I-=2):(b.win.set(b.win.subarray(U,U+2),k),k+=2,U+=2,I-=2);else{U=k-le;do U+=b.end;while(U<0);if(R=b.end-U,I>R){if(I-=R,k-U>0&&R>k-U)do b.win[k++]=b.win[U++];while(--R!==0);else b.win.set(b.win.subarray(U,U+R),k),k+=R,U+=R,R=0;U=0}}if(k-U>0&&I>k-U)do b.win[k++]=b.win[U++];while(--I!==0);else b.win.set(b.win.subarray(U,U+I),k),k+=I,U+=I,I=0;break}else if(!(R&64))S+=C[H+2],S+=D&Z[R],H=(E+S)*3,R=C[H];else return T.msg="invalid distance code",I=T.avail_in-N,I=O>>3<I?O>>3:I,N+=I,P-=I,O-=I<<3,b.bitb=D,b.bitk=O,T.avail_in=N,T.total_in+=P-T.next_in_index,T.next_in_index=P,b.write=k,W;while(!0);break}if(R&64)return R&32?(I=T.avail_in-N,I=O>>3<I?O>>3:I,N+=I,P-=I,O-=I<<3,b.bitb=D,b.bitk=O,T.avail_in=N,T.total_in+=P-T.next_in_index,T.next_in_index=P,b.write=k,z):(T.msg="invalid literal/length code",I=T.avail_in-N,I=O>>3<I?O>>3:I,N+=I,P-=I,O-=I<<3,b.bitb=D,b.bitk=O,T.avail_in=N,T.total_in+=P-T.next_in_index,T.next_in_index=P,b.write=k,W);if(S+=C[H+2],S+=D&Z[R],H=(E+S)*3,(R=C[H])===0){D>>=C[H+1],O-=C[H+1],b.win[k++]=C[H+2],v--;break}}while(!0)}while(v>=258&&N>=10);return I=T.avail_in-N,I=O>>3<I?O>>3:I,N+=I,P-=I,O-=I<<3,b.bitb=D,b.bitk=O,T.avail_in=N,T.total_in+=P-T.next_in_index,T.next_in_index=P,b.write=k,L}n.init=function(c,u,m,w,x,A){t=ke,_=c,d=u,p=m,h=w,g=x,y=A,r=null},n.proc=function(c,u,m){let w,x,A,b=0,T=0,S=0,C,E,R,D;for(S=u.next_in_index,C=u.avail_in,b=c.bitb,T=c.bitk,E=c.write,R=E<c.read?c.read-E-1:c.end-E;;)switch(t){case ke:if(R>=258&&C>=10&&(c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,m=f(_,d,p,h,g,y,c,u),S=u.next_in_index,C=u.avail_in,b=c.bitb,T=c.bitk,E=c.write,R=E<c.read?c.read-E-1:c.end-E,m!=L)){t=m==z?qe:De;break}i=_,r=p,s=h,t=Nt;case Nt:for(w=i;T<w;){if(C!==0)m=L;else return c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,c.inflate_flush(u,m);C--,b|=(u.read_byte(S++)&255)<<T,T+=8}if(x=(s+(b&Z[w]))*3,b>>>=r[x+1],T-=r[x+1],A=r[x],A===0){a=r[x+2],t=Ut;break}if(A&16){o=A&15,e=r[x+2],t=Pt;break}if(!(A&64)){i=A,s=x/3+r[x+2];break}if(A&32){t=qe;break}return t=De,u.msg="invalid literal/length code",m=W,c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,c.inflate_flush(u,m);case Pt:for(w=o;T<w;){if(C!==0)m=L;else return c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,c.inflate_flush(u,m);C--,b|=(u.read_byte(S++)&255)<<T,T+=8}e+=b&Z[w],b>>=w,T-=w,i=d,r=g,s=y,t=Lt;case Lt:for(w=i;T<w;){if(C!==0)m=L;else return c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,c.inflate_flush(u,m);C--,b|=(u.read_byte(S++)&255)<<T,T+=8}if(x=(s+(b&Z[w]))*3,b>>=r[x+1],T-=r[x+1],A=r[x],A&16){o=A&15,l=r[x+2],t=Ft;break}if(!(A&64)){i=A,s=x/3+r[x+2];break}return t=De,u.msg="invalid distance code",m=W,c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,c.inflate_flush(u,m);case Ft:for(w=o;T<w;){if(C!==0)m=L;else return c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,c.inflate_flush(u,m);C--,b|=(u.read_byte(S++)&255)<<T,T+=8}l+=b&Z[w],b>>=w,T-=w,t=Mt;case Mt:for(D=E-l;D<0;)D+=c.end;for(;e!==0;){if(R===0&&(E==c.end&&c.read!==0&&(E=0,R=E<c.read?c.read-E-1:c.end-E),R===0&&(c.write=E,m=c.inflate_flush(u,m),E=c.write,R=E<c.read?c.read-E-1:c.end-E,E==c.end&&c.read!==0&&(E=0,R=E<c.read?c.read-E-1:c.end-E),R===0)))return c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,c.inflate_flush(u,m);c.win[E++]=c.win[D++],R--,D==c.end&&(D=0),e--}t=ke;break;case Ut:if(R===0&&(E==c.end&&c.read!==0&&(E=0,R=E<c.read?c.read-E-1:c.end-E),R===0&&(c.write=E,m=c.inflate_flush(u,m),E=c.write,R=E<c.read?c.read-E-1:c.end-E,E==c.end&&c.read!==0&&(E=0,R=E<c.read?c.read-E-1:c.end-E),R===0)))return c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,c.inflate_flush(u,m);m=L,c.win[E++]=a,R--,t=ke;break;case qe:if(T>7&&(T-=8,C++,S--),c.write=E,m=c.inflate_flush(u,m),E=c.write,R=E<c.read?c.read-E-1:c.end-E,c.read!=c.write)return c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,c.inflate_flush(u,m);t=vt;case vt:return m=z,c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,c.inflate_flush(u,m);case De:return m=W,c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,c.inflate_flush(u,m);default:return m=V,c.bitb=b,c.bitk=T,u.avail_in=C,u.total_in+=S-u.next_in_index,u.next_in_index=S,c.write=E,c.inflate_flush(u,m)}},n.free=function(){}}const Ht=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],he=0,Ge=1,Wt=2,Bt=3,jt=4,qt=5,Ie=6,Ne=7,Gt=8,fe=9;function fs(n,t){const e=this;let r=he,s=0,i=0,a=0,o;const l=[0],_=[0],d=new ls;let p=0,h=new Int32Array(Rn*3);const g=0,y=new et;e.bitk=0,e.bitb=0,e.win=new Uint8Array(t),e.end=t,e.read=0,e.write=0,e.reset=function(f,c){c&&(c[0]=g),r==Ie&&d.free(f),r=he,e.bitk=0,e.bitb=0,e.read=e.write=0},e.reset(n,null),e.inflate_flush=function(f,c){let u,m,w;return m=f.next_out_index,w=e.read,u=(w<=e.write?e.write:e.end)-w,u>f.avail_out&&(u=f.avail_out),u!==0&&c==ee&&(c=L),f.avail_out-=u,f.total_out+=u,f.next_out.set(e.win.subarray(w,w+u),m),m+=u,w+=u,w==e.end&&(w=0,e.write==e.end&&(e.write=0),u=e.write-w,u>f.avail_out&&(u=f.avail_out),u!==0&&c==ee&&(c=L),f.avail_out-=u,f.total_out+=u,f.next_out.set(e.win.subarray(w,w+u),m),m+=u,w+=u),f.next_out_index=m,e.read=w,c},e.proc=function(f,c){let u,m,w,x,A,b,T,S;for(x=f.next_in_index,A=f.avail_in,m=e.bitb,w=e.bitk,b=e.write,T=b<e.read?e.read-b-1:e.end-b;;){let C,E,R,D,O,P,N,k;switch(r){case he:for(;w<3;){if(A!==0)c=L;else return e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);A--,m|=(f.read_byte(x++)&255)<<w,w+=8}switch(u=m&7,p=u&1,u>>>1){case 0:m>>>=3,w-=3,u=w&7,m>>>=u,w-=u,r=Ge;break;case 1:C=[],E=[],R=[[]],D=[[]],et.inflate_trees_fixed(C,E,R,D),d.init(C[0],E[0],R[0],0,D[0],0),m>>>=3,w-=3,r=Ie;break;case 2:m>>>=3,w-=3,r=Bt;break;case 3:return m>>>=3,w-=3,r=fe,f.msg="invalid block type",c=W,e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c)}break;case Ge:for(;w<32;){if(A!==0)c=L;else return e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);A--,m|=(f.read_byte(x++)&255)<<w,w+=8}if((~m>>>16&65535)!=(m&65535))return r=fe,f.msg="invalid stored block lengths",c=W,e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);s=m&65535,m=w=0,r=s!==0?Wt:p!==0?Ne:he;break;case Wt:if(A===0||T===0&&(b==e.end&&e.read!==0&&(b=0,T=b<e.read?e.read-b-1:e.end-b),T===0&&(e.write=b,c=e.inflate_flush(f,c),b=e.write,T=b<e.read?e.read-b-1:e.end-b,b==e.end&&e.read!==0&&(b=0,T=b<e.read?e.read-b-1:e.end-b),T===0)))return e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);if(c=L,u=s,u>A&&(u=A),u>T&&(u=T),e.win.set(f.read_buf(x,u),b),x+=u,A-=u,b+=u,T-=u,(s-=u)!==0)break;r=p!==0?Ne:he;break;case Bt:for(;w<14;){if(A!==0)c=L;else return e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);A--,m|=(f.read_byte(x++)&255)<<w,w+=8}if(i=u=m&16383,(u&31)>29||(u>>5&31)>29)return r=fe,f.msg="too many length or distance symbols",c=W,e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);if(u=258+(u&31)+(u>>5&31),!o||o.length<u)o=[];else for(S=0;S<u;S++)o[S]=0;m>>>=14,w-=14,a=0,r=jt;case jt:for(;a<4+(i>>>10);){for(;w<3;){if(A!==0)c=L;else return e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);A--,m|=(f.read_byte(x++)&255)<<w,w+=8}o[Ht[a++]]=m&7,m>>>=3,w-=3}for(;a<19;)o[Ht[a++]]=0;if(l[0]=7,u=y.inflate_trees_bits(o,l,_,h,f),u!=L)return c=u,c==W&&(o=null,r=fe),e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);a=0,r=qt;case qt:for(;u=i,!(a>=258+(u&31)+(u>>5&31));){let v,M;for(u=l[0];w<u;){if(A!==0)c=L;else return e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);A--,m|=(f.read_byte(x++)&255)<<w,w+=8}if(u=h[(_[0]+(m&Z[u]))*3+1],M=h[(_[0]+(m&Z[u]))*3+2],M<16)m>>>=u,w-=u,o[a++]=M;else{for(S=M==18?7:M-14,v=M==18?11:3;w<u+S;){if(A!==0)c=L;else return e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);A--,m|=(f.read_byte(x++)&255)<<w,w+=8}if(m>>>=u,w-=u,v+=m&Z[S],m>>>=S,w-=S,S=a,u=i,S+v>258+(u&31)+(u>>5&31)||M==16&&S<1)return o=null,r=fe,f.msg="invalid bit length repeat",c=W,e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);M=M==16?o[S-1]:0;do o[S++]=M;while(--v!==0);a=S}}if(_[0]=-1,O=[],P=[],N=[],k=[],O[0]=9,P[0]=6,u=i,u=y.inflate_trees_dynamic(257+(u&31),1+(u>>5&31),o,O,P,N,k,h,f),u!=L)return u==W&&(o=null,r=fe),c=u,e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);d.init(O[0],P[0],h,N[0],h,k[0]),r=Ie;case Ie:if(e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,(c=d.proc(e,f,c))!=z)return e.inflate_flush(f,c);if(c=L,d.free(f),x=f.next_in_index,A=f.avail_in,m=e.bitb,w=e.bitk,b=e.write,T=b<e.read?e.read-b-1:e.end-b,p===0){r=he;break}r=Ne;case Ne:if(e.write=b,c=e.inflate_flush(f,c),b=e.write,T=b<e.read?e.read-b-1:e.end-b,e.read!=e.write)return e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);r=Gt;case Gt:return c=z,e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);case fe:return c=W,e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c);default:return c=V,e.bitb=m,e.bitk=w,f.avail_in=A,f.total_in+=x-f.next_in_index,f.next_in_index=x,e.write=b,e.inflate_flush(f,c)}}},e.free=function(f){e.reset(f,null),e.win=null,h=null},e.set_dictionary=function(f,c,u){e.win.set(f.subarray(c,c+u),0),e.read=e.write=u},e.sync_point=function(){return r==Ge?1:0}}const us=32,ds=8,_s=0,Yt=1,Vt=2,Zt=3,Kt=4,Xt=5,Ye=6,ye=7,$t=12,ne=13,hs=[0,0,255,255];function ps(){const n=this;n.mode=0,n.method=0,n.was=[0],n.need=0,n.marker=0,n.wbits=0;function t(e){return!e||!e.istate?V:(e.total_in=e.total_out=0,e.msg=null,e.istate.mode=ye,e.istate.blocks.reset(e,null),L)}n.inflateEnd=function(e){return n.blocks&&n.blocks.free(e),n.blocks=null,L},n.inflateInit=function(e,r){return e.msg=null,n.blocks=null,r<8||r>15?(n.inflateEnd(e),V):(n.wbits=r,e.istate.blocks=new fs(e,1<<r),t(e),L)},n.inflate=function(e,r){let s,i;if(!e||!e.istate||!e.next_in)return V;const a=e.istate;for(r=r==es?ee:L,s=ee;;)switch(a.mode){case _s:if(e.avail_in===0)return s;if(s=r,e.avail_in--,e.total_in++,((a.method=e.read_byte(e.next_in_index++))&15)!=ds){a.mode=ne,e.msg="unknown compression method",a.marker=5;break}if((a.method>>4)+8>a.wbits){a.mode=ne,e.msg="invalid win size",a.marker=5;break}a.mode=Yt;case Yt:if(e.avail_in===0)return s;if(s=r,e.avail_in--,e.total_in++,i=e.read_byte(e.next_in_index++)&255,((a.method<<8)+i)%31!==0){a.mode=ne,e.msg="incorrect header check",a.marker=5;break}if(!(i&us)){a.mode=ye;break}a.mode=Vt;case Vt:if(e.avail_in===0)return s;s=r,e.avail_in--,e.total_in++,a.need=(e.read_byte(e.next_in_index++)&255)<<24&4278190080,a.mode=Zt;case Zt:if(e.avail_in===0)return s;s=r,e.avail_in--,e.total_in++,a.need+=(e.read_byte(e.next_in_index++)&255)<<16&16711680,a.mode=Kt;case Kt:if(e.avail_in===0)return s;s=r,e.avail_in--,e.total_in++,a.need+=(e.read_byte(e.next_in_index++)&255)<<8&65280,a.mode=Xt;case Xt:return e.avail_in===0?s:(s=r,e.avail_in--,e.total_in++,a.need+=e.read_byte(e.next_in_index++)&255,a.mode=Ye,Qr);case Ye:return a.mode=ne,e.msg="need dictionary",a.marker=0,V;case ye:if(s=a.blocks.proc(e,s),s==W){a.mode=ne,a.marker=0;break}if(s==L&&(s=r),s!=z)return s;s=r,a.blocks.reset(e,a.was),a.mode=$t;case $t:return e.avail_in=0,z;case ne:return W;default:return V}},n.inflateSetDictionary=function(e,r,s){let i=0,a=s;if(!e||!e.istate||e.istate.mode!=Ye)return V;const o=e.istate;return a>=1<<o.wbits&&(a=(1<<o.wbits)-1,i=s-a),o.blocks.set_dictionary(r,i,a),o.mode=ye,L},n.inflateSync=function(e){let r,s,i,a,o;if(!e||!e.istate)return V;const l=e.istate;if(l.mode!=ne&&(l.mode=ne,l.marker=0),(r=e.avail_in)===0)return ee;for(s=e.next_in_index,i=l.marker;r!==0&&i<4;)e.read_byte(s)==hs[i]?i++:e.read_byte(s)!==0?i=0:i=4-i,s++,r--;return e.total_in+=s-e.next_in_index,e.next_in_index=s,e.avail_in=r,l.marker=i,i!=4?W:(a=e.total_in,o=e.total_out,t(e),e.total_in=a,e.total_out=o,l.mode=ye,L)},n.inflateSyncPoint=function(e){return!e||!e.istate||!e.istate.blocks?V:e.istate.blocks.sync_point()}}function Cn(){}Cn.prototype={inflateInit(n){const t=this;return t.istate=new ps,n||(n=Jr),t.istate.inflateInit(t,n)},inflate(n){const t=this;return t.istate?t.istate.inflate(t,n):V},inflateEnd(){const n=this;if(!n.istate)return V;const t=n.istate.inflateEnd(n);return n.istate=null,t},inflateSync(){const n=this;return n.istate?n.istate.inflateSync(n):V},inflateSetDictionary(n,t){const e=this;return e.istate?e.istate.inflateSetDictionary(e,n,t):V},read_byte(n){return this.next_in[n]},read_buf(n,t){return this.next_in.subarray(n,n+t)}};function ms(n){const t=this,e=new Cn,r=n&&n.chunkSize?Math.floor(n.chunkSize*2):128*1024,s=zr,i=new Uint8Array(r);let a=!1;e.inflateInit(),e.next_out=i,t.append=function(o,l){const _=[];let d,p,h=0,g=0,y=0;if(o.length!==0){e.next_in_index=0,e.next_in=o,e.avail_in=o.length;do{if(e.next_out_index=0,e.avail_out=r,e.avail_in===0&&!a&&(e.next_in_index=0,a=!0),d=e.inflate(s),a&&d===ee){if(e.avail_in!==0)throw new Error("inflating: bad input")}else if(d!==L&&d!==z)throw new Error("inflating: "+e.msg);if((a||d===z)&&e.avail_in===o.length)throw new Error("inflating: bad input");e.next_out_index&&(e.next_out_index===r?_.push(new Uint8Array(i)):_.push(i.subarray(0,e.next_out_index))),y+=e.next_out_index,l&&e.next_in_index>0&&e.next_in_index!=h&&(l(e.next_in_index),h=e.next_in_index)}while(e.avail_in>0||e.avail_out===0);return _.length>1?(p=new Uint8Array(y),_.forEach(function(f){p.set(f,g),g+=f.length})):p=_[0]?new Uint8Array(_[0]):new Uint8Array,p}},t.flush=function(){e.inflateEnd()}}const de=4294967295,ae=65535,ws=8,bs=0,gs=99,ys=67324752,xs=134695760,Jt=33639248,Es=101010256,Qt=101075792,Ts=117853008,pe=22,Ve=20,Ze=56,Ss=1,As=39169,Rs=10,Cs=1,Os=21589,ks=28789,Ds=25461,Is=6534,zt=1,Ns=6,en=8,tn=2048,nn=16,Ps="/",$=void 0,Fe="undefined",On="function";class rn{constructor(t){return class extends TransformStream{constructor(e,r){const s=new t(r);super({transform(i,a){a.enqueue(s.append(i))},flush(i){const a=s.flush();a&&i.enqueue(a)}})}}}}const Ls=64;let kn=2;try{typeof navigator!=Fe&&navigator.hardwareConcurrency&&(kn=navigator.hardwareConcurrency)}catch{}const Fs={chunkSize:512*1024,maxWorkers:kn,terminateWorkerTimeout:5e3,useWebWorkers:!0,useCompressionStream:!0,workerScripts:$,CompressionStreamNative:typeof CompressionStream!=Fe&&CompressionStream,DecompressionStreamNative:typeof DecompressionStream!=Fe&&DecompressionStream},oe=Object.assign({},Fs);function Dn(){return oe}function Ms(n){return Math.max(n.chunkSize,Ls)}function In(n){const{baseURL:t,chunkSize:e,maxWorkers:r,terminateWorkerTimeout:s,useCompressionStream:i,useWebWorkers:a,Deflate:o,Inflate:l,CompressionStream:_,DecompressionStream:d,workerScripts:p}=n;if(re("baseURL",t),re("chunkSize",e),re("maxWorkers",r),re("terminateWorkerTimeout",s),re("useCompressionStream",i),re("useWebWorkers",a),o&&(oe.CompressionStream=new rn(o)),l&&(oe.DecompressionStream=new rn(l)),re("CompressionStream",_),re("DecompressionStream",d),p!==$){const{deflate:h,inflate:g}=p;if((h||g)&&(oe.workerScripts||(oe.workerScripts={})),h){if(!Array.isArray(h))throw new Error("workerScripts.deflate must be an array");oe.workerScripts.deflate=h}if(g){if(!Array.isArray(g))throw new Error("workerScripts.inflate must be an array");oe.workerScripts.inflate=g}}}function re(n,t){t!==$&&(oe[n]=t)}function Us(){return"application/octet-stream"}const Nn=[];for(let n=0;n<256;n++){let t=n;for(let e=0;e<8;e++)t&1?t=t>>>1^3988292384:t=t>>>1;Nn[n]=t}class Me{constructor(t){this.crc=t||-1}append(t){let e=this.crc|0;for(let r=0,s=t.length|0;r<s;r++)e=e>>>8^Nn[(e^t[r])&255];this.crc=e}get(){return~this.crc}}class Pn extends TransformStream{constructor(){let t;const e=new Me;super({transform(r,s){e.append(r),s.enqueue(r)},flush(){const r=new Uint8Array(4);new DataView(r.buffer).setUint32(0,e.get()),t.value=r}}),t=this}}function vs(n){if(typeof TextEncoder>"u"){n=unescape(encodeURIComponent(n));const t=new Uint8Array(n.length);for(let e=0;e<t.length;e++)t[e]=n.charCodeAt(e);return t}else return new TextEncoder().encode(n)}const Y={concat(n,t){if(n.length===0||t.length===0)return n.concat(t);const e=n[n.length-1],r=Y.getPartial(e);return r===32?n.concat(t):Y._shiftRight(t,r,e|0,n.slice(0,n.length-1))},bitLength(n){const t=n.length;if(t===0)return 0;const e=n[t-1];return(t-1)*32+Y.getPartial(e)},clamp(n,t){if(n.length*32<t)return n;n=n.slice(0,Math.ceil(t/32));const e=n.length;return t=t&31,e>0&&t&&(n[e-1]=Y.partial(t,n[e-1]&2147483648>>t-1,1)),n},partial(n,t,e){return n===32?t:(e?t|0:t<<32-n)+n*1099511627776},getPartial(n){return Math.round(n/1099511627776)||32},_shiftRight(n,t,e,r){for(r===void 0&&(r=[]);t>=32;t-=32)r.push(e),e=0;if(t===0)return r.concat(n);for(let a=0;a<n.length;a++)r.push(e|n[a]>>>t),e=n[a]<<32-t;const s=n.length?n[n.length-1]:0,i=Y.getPartial(s);return r.push(Y.partial(t+i&31,t+i>32?e:r.pop(),1)),r}},Ue={bytes:{fromBits(n){const e=Y.bitLength(n)/8,r=new Uint8Array(e);let s;for(let i=0;i<e;i++)i&3||(s=n[i/4]),r[i]=s>>>24,s<<=8;return r},toBits(n){const t=[];let e,r=0;for(e=0;e<n.length;e++)r=r<<8|n[e],(e&3)===3&&(t.push(r),r=0);return e&3&&t.push(Y.partial(8*(e&3),r)),t}}},Ln={};Ln.sha1=class{constructor(n){const t=this;t.blockSize=512,t._init=[1732584193,4023233417,2562383102,271733878,3285377520],t._key=[1518500249,1859775393,2400959708,3395469782],n?(t._h=n._h.slice(0),t._buffer=n._buffer.slice(0),t._length=n._length):t.reset()}reset(){const n=this;return n._h=n._init.slice(0),n._buffer=[],n._length=0,n}update(n){const t=this;typeof n=="string"&&(n=Ue.utf8String.toBits(n));const e=t._buffer=Y.concat(t._buffer,n),r=t._length,s=t._length=r+Y.bitLength(n);if(s>9007199254740991)throw new Error("Cannot hash more than 2^53 - 1 bits");const i=new Uint32Array(e);let a=0;for(let o=t.blockSize+r-(t.blockSize+r&t.blockSize-1);o<=s;o+=t.blockSize)t._block(i.subarray(16*a,16*(a+1))),a+=1;return e.splice(0,16*a),t}finalize(){const n=this;let t=n._buffer;const e=n._h;t=Y.concat(t,[Y.partial(1,1)]);for(let r=t.length+2;r&15;r++)t.push(0);for(t.push(Math.floor(n._length/4294967296)),t.push(n._length|0);t.length;)n._block(t.splice(0,16));return n.reset(),e}_f(n,t,e,r){if(n<=19)return t&e|~t&r;if(n<=39)return t^e^r;if(n<=59)return t&e|t&r|e&r;if(n<=79)return t^e^r}_S(n,t){return t<<n|t>>>32-n}_block(n){const t=this,e=t._h,r=Array(80);for(let _=0;_<16;_++)r[_]=n[_];let s=e[0],i=e[1],a=e[2],o=e[3],l=e[4];for(let _=0;_<=79;_++){_>=16&&(r[_]=t._S(1,r[_-3]^r[_-8]^r[_-14]^r[_-16]));const d=t._S(5,s)+t._f(_,i,a,o)+l+r[_]+t._key[Math.floor(_/20)]|0;l=o,o=a,a=t._S(30,i),i=s,s=d}e[0]=e[0]+s|0,e[1]=e[1]+i|0,e[2]=e[2]+a|0,e[3]=e[3]+o|0,e[4]=e[4]+l|0}};const Fn={};Fn.aes=class{constructor(n){const t=this;t._tables=[[[],[],[],[],[]],[[],[],[],[],[]]],t._tables[0][0][0]||t._precompute();const e=t._tables[0][4],r=t._tables[1],s=n.length;let i,a,o,l=1;if(s!==4&&s!==6&&s!==8)throw new Error("invalid aes key size");for(t._key=[a=n.slice(0),o=[]],i=s;i<4*s+28;i++){let _=a[i-1];(i%s===0||s===8&&i%s===4)&&(_=e[_>>>24]<<24^e[_>>16&255]<<16^e[_>>8&255]<<8^e[_&255],i%s===0&&(_=_<<8^_>>>24^l<<24,l=l<<1^(l>>7)*283)),a[i]=a[i-s]^_}for(let _=0;i;_++,i--){const d=a[_&3?i:i-4];i<=4||_<4?o[_]=d:o[_]=r[0][e[d>>>24]]^r[1][e[d>>16&255]]^r[2][e[d>>8&255]]^r[3][e[d&255]]}}encrypt(n){return this._crypt(n,0)}decrypt(n){return this._crypt(n,1)}_precompute(){const n=this._tables[0],t=this._tables[1],e=n[4],r=t[4],s=[],i=[];let a,o,l,_;for(let d=0;d<256;d++)i[(s[d]=d<<1^(d>>7)*283)^d]=d;for(let d=a=0;!e[d];d^=o||1,a=i[a]||1){let p=a^a<<1^a<<2^a<<3^a<<4;p=p>>8^p&255^99,e[d]=p,r[p]=d,_=s[l=s[o=s[d]]];let h=_*16843009^l*65537^o*257^d*16843008,g=s[p]*257^p*16843008;for(let y=0;y<4;y++)n[y][d]=g=g<<24^g>>>8,t[y][p]=h=h<<24^h>>>8}for(let d=0;d<5;d++)n[d]=n[d].slice(0),t[d]=t[d].slice(0)}_crypt(n,t){if(n.length!==4)throw new Error("invalid aes block size");const e=this._key[t],r=e.length/4-2,s=[0,0,0,0],i=this._tables[t],a=i[0],o=i[1],l=i[2],_=i[3],d=i[4];let p=n[0]^e[0],h=n[t?3:1]^e[1],g=n[2]^e[2],y=n[t?1:3]^e[3],f=4,c,u,m;for(let w=0;w<r;w++)c=a[p>>>24]^o[h>>16&255]^l[g>>8&255]^_[y&255]^e[f],u=a[h>>>24]^o[g>>16&255]^l[y>>8&255]^_[p&255]^e[f+1],m=a[g>>>24]^o[y>>16&255]^l[p>>8&255]^_[h&255]^e[f+2],y=a[y>>>24]^o[p>>16&255]^l[h>>8&255]^_[g&255]^e[f+3],f+=4,p=c,h=u,g=m;for(let w=0;w<4;w++)s[t?3&-w:w]=d[p>>>24]<<24^d[h>>16&255]<<16^d[g>>8&255]<<8^d[y&255]^e[f++],c=p,p=h,h=g,g=y,y=c;return s}};const Hs={getRandomValues(n){const t=new Uint32Array(n.buffer),e=r=>{let s=987654321;const i=4294967295;return function(){return s=36969*(s&65535)+(s>>16)&i,r=18e3*(r&65535)+(r>>16)&i,(((s<<16)+r&i)/4294967296+.5)*(Math.random()>.5?1:-1)}};for(let r=0,s;r<n.length;r+=4){const i=e((s||Math.random())*4294967296);s=i()*987654071,t[r/4]=i()*4294967296|0}return n}},Mn={};Mn.ctrGladman=class{constructor(n,t){this._prf=n,this._initIv=t,this._iv=t}reset(){this._iv=this._initIv}update(n){return this.calculate(this._prf,n,this._iv)}incWord(n){if((n>>24&255)===255){let t=n>>16&255,e=n>>8&255,r=n&255;t===255?(t=0,e===255?(e=0,r===255?r=0:++r):++e):++t,n=0,n+=t<<16,n+=e<<8,n+=r}else n+=1<<24;return n}incCounter(n){(n[0]=this.incWord(n[0]))===0&&(n[1]=this.incWord(n[1]))}calculate(n,t,e){let r;if(!(r=t.length))return[];const s=Y.bitLength(t);for(let i=0;i<r;i+=4){this.incCounter(e);const a=n.encrypt(e);t[i]^=a[0],t[i+1]^=a[1],t[i+2]^=a[2],t[i+3]^=a[3]}return Y.clamp(t,s)}};const _e={importKey(n){return new _e.hmacSha1(Ue.bytes.toBits(n))},pbkdf2(n,t,e,r){if(e=e||1e4,r<0||e<0)throw new Error("invalid params to pbkdf2");const s=(r>>5)+1<<2;let i,a,o,l,_;const d=new ArrayBuffer(s),p=new DataView(d);let h=0;const g=Y;for(t=Ue.bytes.toBits(t),_=1;h<(s||1);_++){for(i=a=n.encrypt(g.concat(t,[_])),o=1;o<e;o++)for(a=n.encrypt(a),l=0;l<a.length;l++)i[l]^=a[l];for(o=0;h<(s||1)&&o<i.length;o++)p.setInt32(h,i[o]),h+=4}return d.slice(0,r/8)}};_e.hmacSha1=class{constructor(n){const t=this,e=t._hash=Ln.sha1,r=[[],[]];t._baseHash=[new e,new e];const s=t._baseHash[0].blockSize/32;n.length>s&&(n=new e().update(n).finalize());for(let i=0;i<s;i++)r[0][i]=n[i]^909522486,r[1][i]=n[i]^1549556828;t._baseHash[0].update(r[0]),t._baseHash[1].update(r[1]),t._resultHash=new e(t._baseHash[0])}reset(){const n=this;n._resultHash=new n._hash(n._baseHash[0]),n._updated=!1}update(n){const t=this;t._updated=!0,t._resultHash.update(n)}digest(){const n=this,t=n._resultHash.finalize(),e=new n._hash(n._baseHash[1]).update(t).finalize();return n.reset(),e}encrypt(n){if(this._updated)throw new Error("encrypt on already updated hmac called!");return this.update(n),this.digest(n)}};const Ws=typeof crypto<"u"&&typeof crypto.getRandomValues=="function",dt="Invalid password",_t="Invalid signature",ht="zipjs-abort-check-password";function Un(n){return Ws?crypto.getRandomValues(n):Hs.getRandomValues(n)}const me=16,Bs="raw",vn={name:"PBKDF2"},js={name:"HMAC"},qs="SHA-1",Gs=Object.assign({hash:js},vn),tt=Object.assign({iterations:1e3,hash:{name:qs}},vn),Ys=["deriveBits"],Te=[8,12,16],xe=[16,24,32],se=10,Vs=[0,0,0,0],Hn="undefined",Wn="function",We=typeof crypto!=Hn,Ce=We&&crypto.subtle,Bn=We&&typeof Ce!=Hn,J=Ue.bytes,Zs=Fn.aes,Ks=Mn.ctrGladman,Xs=_e.hmacSha1;let sn=We&&Bn&&typeof Ce.importKey==Wn,an=We&&Bn&&typeof Ce.deriveBits==Wn;class $s extends TransformStream{constructor({password:t,signed:e,encryptionStrength:r,checkPasswordOnly:s}){super({start(){Object.assign(this,{ready:new Promise(i=>this.resolveReady=i),password:t,signed:e,strength:r-1,pending:new Uint8Array})},async transform(i,a){const o=this,{password:l,strength:_,resolveReady:d,ready:p}=o;l?(await Qs(o,_,l,X(i,0,Te[_]+2)),i=X(i,Te[_]+2),s?a.error(new Error(ht)):d()):await p;const h=new Uint8Array(i.length-se-(i.length-se)%me);a.enqueue(jn(o,i,h,0,se,!0))},async flush(i){const{signed:a,ctr:o,hmac:l,pending:_,ready:d}=this;if(l&&o){await d;const p=X(_,0,_.length-se),h=X(_,_.length-se);let g=new Uint8Array;if(p.length){const y=Ae(J,p);l.update(y);const f=o.update(y);g=Se(J,f)}if(a){const y=X(Se(J,l.digest()),0,se);for(let f=0;f<se;f++)if(y[f]!=h[f])throw new Error(_t)}i.enqueue(g)}}})}}class Js extends TransformStream{constructor({password:t,encryptionStrength:e}){let r;super({start(){Object.assign(this,{ready:new Promise(s=>this.resolveReady=s),password:t,strength:e-1,pending:new Uint8Array})},async transform(s,i){const a=this,{password:o,strength:l,resolveReady:_,ready:d}=a;let p=new Uint8Array;o?(p=await zs(a,l,o),_()):await d;const h=new Uint8Array(p.length+s.length-s.length%me);h.set(p,0),i.enqueue(jn(a,s,h,p.length,0))},async flush(s){const{ctr:i,hmac:a,pending:o,ready:l}=this;if(a&&i){await l;let _=new Uint8Array;if(o.length){const d=i.update(Ae(J,o));a.update(d),_=Se(J,d)}r.signature=Se(J,a.digest()).slice(0,se),s.enqueue(pt(_,r.signature))}}}),r=this}}function jn(n,t,e,r,s,i){const{ctr:a,hmac:o,pending:l}=n,_=t.length-s;l.length&&(t=pt(l,t),e=ni(e,_-_%me));let d;for(d=0;d<=_-me;d+=me){const p=Ae(J,X(t,d,d+me));i&&o.update(p);const h=a.update(p);i||o.update(h),e.set(Se(J,h),d+r)}return n.pending=X(t,d),e}async function Qs(n,t,e,r){const s=await qn(n,t,e,X(r,0,Te[t])),i=X(r,Te[t]);if(s[0]!=i[0]||s[1]!=i[1])throw new Error(dt)}async function zs(n,t,e){const r=Un(new Uint8Array(Te[t])),s=await qn(n,t,e,r);return pt(r,s)}async function qn(n,t,e,r){n.password=null;const s=vs(e),i=await ei(Bs,s,Gs,!1,Ys),a=await ti(Object.assign({salt:r},tt),i,8*(xe[t]*2+2)),o=new Uint8Array(a),l=Ae(J,X(o,0,xe[t])),_=Ae(J,X(o,xe[t],xe[t]*2)),d=X(o,xe[t]*2);return Object.assign(n,{keys:{key:l,authentication:_,passwordVerification:d},ctr:new Ks(new Zs(l),Array.from(Vs)),hmac:new Xs(_)}),d}async function ei(n,t,e,r,s){if(sn)try{return await Ce.importKey(n,t,e,r,s)}catch{return sn=!1,_e.importKey(t)}else return _e.importKey(t)}async function ti(n,t,e){if(an)try{return await Ce.deriveBits(n,t,e)}catch{return an=!1,_e.pbkdf2(t,n.salt,tt.iterations,e)}else return _e.pbkdf2(t,n.salt,tt.iterations,e)}function pt(n,t){let e=n;return n.length+t.length&&(e=new Uint8Array(n.length+t.length),e.set(n,0),e.set(t,n.length)),e}function ni(n,t){if(t&&t>n.length){const e=n;n=new Uint8Array(t),n.set(e,0)}return n}function X(n,t,e){return n.subarray(t,e)}function Se(n,t){return n.fromBits(t)}function Ae(n,t){return n.toBits(t)}const we=12;class ri extends TransformStream{constructor({password:t,passwordVerification:e,checkPasswordOnly:r}){super({start(){Object.assign(this,{password:t,passwordVerification:e}),Gn(this,t)},transform(s,i){const a=this;if(a.password){const o=on(a,s.subarray(0,we));if(a.password=null,o[we-1]!=a.passwordVerification)throw new Error(dt);s=s.subarray(we)}r?i.error(new Error(ht)):i.enqueue(on(a,s))}})}}class si extends TransformStream{constructor({password:t,passwordVerification:e}){super({start(){Object.assign(this,{password:t,passwordVerification:e}),Gn(this,t)},transform(r,s){const i=this;let a,o;if(i.password){i.password=null;const l=Un(new Uint8Array(we));l[we-1]=i.passwordVerification,a=new Uint8Array(r.length+l.length),a.set(cn(i,l),0),o=we}else a=new Uint8Array(r.length),o=0;a.set(cn(i,r),o),s.enqueue(a)}})}}function on(n,t){const e=new Uint8Array(t.length);for(let r=0;r<t.length;r++)e[r]=Yn(n)^t[r],mt(n,e[r]);return e}function cn(n,t){const e=new Uint8Array(t.length);for(let r=0;r<t.length;r++)e[r]=Yn(n)^t[r],mt(n,t[r]);return e}function Gn(n,t){const e=[305419896,591751049,878082192];Object.assign(n,{keys:e,crcKey0:new Me(e[0]),crcKey2:new Me(e[2])});for(let r=0;r<t.length;r++)mt(n,t.charCodeAt(r))}function mt(n,t){let[e,r,s]=n.keys;n.crcKey0.append([t]),e=~n.crcKey0.get(),r=ln(Math.imul(ln(r+Vn(e)),134775813)+1),n.crcKey2.append([r>>>24]),s=~n.crcKey2.get(),n.keys=[e,r,s]}function Yn(n){const t=n.keys[2]|2;return Vn(Math.imul(t,t^1)>>>8)}function Vn(n){return n&255}function ln(n){return n&4294967295}const fn="deflate-raw";class ii extends TransformStream{constructor(t,{chunkSize:e,CompressionStream:r,CompressionStreamNative:s}){super({});const{compressed:i,encrypted:a,useCompressionStream:o,zipCrypto:l,signed:_,level:d}=t,p=this;let h,g,y=Zn(super.readable);(!a||l)&&_&&(h=new Pn,y=Q(y,h)),i&&(y=Xn(y,o,{level:d,chunkSize:e},s,r)),a&&(l?y=Q(y,new si(t)):(g=new Js(t),y=Q(y,g))),Kn(p,y,()=>{let f;a&&!l&&(f=g.signature),(!a||l)&&_&&(f=new DataView(h.value.buffer).getUint32(0)),p.signature=f})}}class ai extends TransformStream{constructor(t,{chunkSize:e,DecompressionStream:r,DecompressionStreamNative:s}){super({});const{zipCrypto:i,encrypted:a,signed:o,signature:l,compressed:_,useCompressionStream:d}=t;let p,h,g=Zn(super.readable);a&&(i?g=Q(g,new ri(t)):(h=new $s(t),g=Q(g,h))),_&&(g=Xn(g,d,{chunkSize:e},s,r)),(!a||i)&&o&&(p=new Pn,g=Q(g,p)),Kn(this,g,()=>{if((!a||i)&&o){const y=new DataView(p.value.buffer);if(l!=y.getUint32(0,!1))throw new Error(_t)}})}}function Zn(n){return Q(n,new TransformStream({transform(t,e){t&&t.length&&e.enqueue(t)}}))}function Kn(n,t,e){t=Q(t,new TransformStream({flush:e})),Object.defineProperty(n,"readable",{get(){return t}})}function Xn(n,t,e,r,s){try{const i=t&&r?r:s;n=Q(n,new i(fn,e))}catch(i){if(t)n=Q(n,new s(fn,e));else throw i}return n}function Q(n,t){return n.pipeThrough(t)}const oi="message",ci="start",li="pull",un="data",fi="ack",ui="close",di="deflate",$n="inflate";class _i extends TransformStream{constructor(t,e){super({});const r=this,{codecType:s}=t;let i;s.startsWith(di)?i=ii:s.startsWith($n)&&(i=ai);let a=0;const o=new i(t,e),l=super.readable,_=new TransformStream({transform(d,p){d&&d.length&&(a+=d.length,p.enqueue(d))},flush(){const{signature:d}=o;Object.assign(r,{signature:d,size:a})}});Object.defineProperty(r,"readable",{get(){return l.pipeThrough(o).pipeThrough(_)}})}}const hi=typeof Worker!=Fe;class Ke{constructor(t,{readable:e,writable:r},{options:s,config:i,streamOptions:a,useWebWorkers:o,transferStreams:l,scripts:_},d){const{signal:p}=a;return Object.assign(t,{busy:!0,readable:e.pipeThrough(new pi(e,a,i),{signal:p}),writable:r,options:Object.assign({},s),scripts:_,transferStreams:l,terminate(){const{worker:h,busy:g}=t;h&&!g&&(h.terminate(),t.interface=null)},onTaskFinished(){t.busy=!1,d(t)}}),(o&&hi?wi:mi)(t,i)}}class pi extends TransformStream{constructor(t,{onstart:e,onprogress:r,size:s,onend:i},{chunkSize:a}){let o=0;super({start(){e&&Xe(e,s)},async transform(l,_){o+=l.length,r&&await Xe(r,o,s),_.enqueue(l)},flush(){t.size=o,i&&Xe(i,o)}},{highWaterMark:1,size:()=>a})}}async function Xe(n,...t){try{await n(...t)}catch{}}function mi(n,t){return{run:()=>bi(n,t)}}function wi(n,{baseURL:t,chunkSize:e}){return n.interface||Object.assign(n,{worker:xi(n.scripts[0],t,n),interface:{run:()=>gi(n,{chunkSize:e})}}),n.interface}async function bi({options:n,readable:t,writable:e,onTaskFinished:r},s){const i=new _i(n,s);try{await t.pipeThrough(i).pipeTo(e,{preventClose:!0,preventAbort:!0});const{signature:a,size:o}=i;return{signature:a,size:o}}finally{r()}}async function gi(n,t){let e,r;const s=new Promise((h,g)=>{e=h,r=g});Object.assign(n,{reader:null,writer:null,resolveResult:e,rejectResult:r,result:s});const{readable:i,options:a,scripts:o}=n,{writable:l,closed:_}=yi(n.writable);nt({type:ci,scripts:o.slice(1),options:a,config:t,readable:i,writable:l},n)||Object.assign(n,{reader:i.getReader(),writer:l.getWriter()});const p=await s;try{await l.getWriter().close()}catch{}return await _,p}function yi(n){const t=n.getWriter();let e;const r=new Promise(i=>e=i);return{writable:new WritableStream({async write(i){await t.ready,await t.write(i)},close(){t.releaseLock(),e()},abort(i){return t.abort(i)}}),closed:r}}let dn=!0,_n=!0;function xi(n,t,e){const r={type:"module"};let s,i;typeof n==On&&(n=n());try{s=new URL(n,t)}catch{s=n}if(dn)try{i=new Worker(s)}catch{dn=!1,i=new Worker(s,r)}else i=new Worker(s,r);return i.addEventListener(oi,a=>Ei(a,e)),i}function nt(n,{worker:t,writer:e,onTaskFinished:r,transferStreams:s}){try{let{value:i,readable:a,writable:o}=n;const l=[];if(i&&(i.byteLength<i.buffer.byteLength?n.value=i.buffer.slice(0,i.byteLength):n.value=i.buffer,l.push(n.value)),s&&_n?(a&&l.push(a),o&&l.push(o)):n.readable=n.writable=null,l.length)try{return t.postMessage(n,l),!0}catch{_n=!1,n.readable=n.writable=null,t.postMessage(n)}else t.postMessage(n)}catch(i){throw e&&e.releaseLock(),r(),i}}async function Ei({data:n},t){const{type:e,value:r,messageId:s,result:i,error:a}=n,{reader:o,writer:l,resolveResult:_,rejectResult:d,onTaskFinished:p}=t;try{if(a){const{message:g,stack:y,code:f,name:c}=a,u=new Error(g);Object.assign(u,{stack:y,code:f,name:c}),h(u)}else{if(e==li){const{value:g,done:y}=await o.read();nt({type:un,value:g,done:y,messageId:s},t)}e==un&&(await l.ready,await l.write(new Uint8Array(r)),nt({type:fi,messageId:s},t)),e==ui&&h(null,i)}}catch(g){h(g)}function h(g,y){g?d(g):_(y),l&&l.releaseLock(),p()}}let ie=[];const $e=[];let hn=0;async function Ti(n,t){const{options:e,config:r}=t,{transferStreams:s,useWebWorkers:i,useCompressionStream:a,codecType:o,compressed:l,signed:_,encrypted:d}=e,{workerScripts:p,maxWorkers:h,terminateWorkerTimeout:g}=r;t.transferStreams=s||s===$;const y=!l&&!_&&!d&&!t.transferStreams;t.useWebWorkers=!y&&(i||i===$&&r.useWebWorkers),t.scripts=t.useWebWorkers&&p?p[o]:[],e.useCompressionStream=a||a===$&&r.useCompressionStream;let f;const c=ie.find(m=>!m.busy);if(c)rt(c),f=new Ke(c,n,t,u);else if(ie.length<h){const m={indexWorker:hn};hn++,ie.push(m),f=new Ke(m,n,t,u)}else f=await new Promise(m=>$e.push({resolve:m,stream:n,workerOptions:t}));return f.run();function u(m){if($e.length){const[{resolve:w,stream:x,workerOptions:A}]=$e.splice(0,1);w(new Ke(m,x,A,u))}else m.worker?(rt(m),Number.isFinite(g)&&g>=0&&(m.terminateTimeout=setTimeout(()=>{ie=ie.filter(w=>w!=m),m.terminate()},g))):ie=ie.filter(w=>w!=m)}}function rt(n){const{terminateTimeout:t}=n;t&&(clearTimeout(t),n.terminateTimeout=null)}function Si(){ie.forEach(n=>{rt(n),n.terminate()})}const Jn="HTTP error ",Oe="HTTP Range not supported",Qn="Writer iterator completed too soon",Ai="text/plain",Ri="Content-Length",Ci="Content-Range",Oi="Accept-Ranges",ki="Range",Di="Content-Type",Ii="HEAD",wt="GET",zn="bytes",Ni=64*1024,bt="writable";class Be{constructor(){this.size=0}init(){this.initialized=!0}}class ce extends Be{get readable(){const t=this,{chunkSize:e=Ni}=t,r=new ReadableStream({start(){this.chunkOffset=0},async pull(s){const{offset:i=0,size:a,diskNumberStart:o}=r,{chunkOffset:l}=this;s.enqueue(await G(t,i+l,Math.min(e,a-l),o)),l+e>a?s.close():this.chunkOffset+=e}});return r}}class gt extends Be{constructor(){super();const t=this,e=new WritableStream({write(r){return t.writeUint8Array(r)}});Object.defineProperty(t,bt,{get(){return e}})}writeUint8Array(){}}class Pi extends ce{constructor(t){super();let e=t.length;for(;t.charAt(e-1)=="=";)e--;const r=t.indexOf(",")+1;Object.assign(this,{dataURI:t,dataStart:r,size:Math.floor((e-r)*.75)})}readUint8Array(t,e){const{dataStart:r,dataURI:s}=this,i=new Uint8Array(e),a=Math.floor(t/3)*4,o=atob(s.substring(a+r,Math.ceil((t+e)/3)*4+r)),l=t-Math.floor(a/4)*3;for(let _=l;_<l+e;_++)i[_-l]=o.charCodeAt(_);return i}}class Li extends gt{constructor(t){super(),Object.assign(this,{data:"data:"+(t||"")+";base64,",pending:[]})}writeUint8Array(t){const e=this;let r=0,s=e.pending;const i=e.pending.length;for(e.pending="",r=0;r<Math.floor((i+t.length)/3)*3-i;r++)s+=String.fromCharCode(t[r]);for(;r<t.length;r++)e.pending+=String.fromCharCode(t[r]);s.length>2?e.data+=btoa(s):e.pending=s}getData(){return this.data+btoa(this.pending)}}class yt extends ce{constructor(t){super(),Object.assign(this,{blob:t,size:t.size})}async readUint8Array(t,e){const r=this,s=t+e;let a=await(t||s<r.size?r.blob.slice(t,s):r.blob).arrayBuffer();return a.byteLength>e&&(a=a.slice(t,s)),new Uint8Array(a)}}class er extends Be{constructor(t){super();const e=this,r=new TransformStream,s=[];t&&s.push([Di,t]),Object.defineProperty(e,bt,{get(){return r.writable}}),e.blob=new Response(r.readable,{headers:s}).blob()}getData(){return this.blob}}class Fi extends yt{constructor(t){super(new Blob([t],{type:Ai}))}}class Mi extends er{constructor(t){super(t),Object.assign(this,{encoding:t,utf8:!t||t.toLowerCase()=="utf-8"})}async getData(){const{encoding:t,utf8:e}=this,r=await super.getData();if(r.text&&e)return r.text();{const s=new FileReader;return new Promise((i,a)=>{Object.assign(s,{onload:({target:o})=>i(o.result),onerror:()=>a(s.error)}),s.readAsText(r,t)})}}}class Ui extends ce{constructor(t,e){super(),tr(this,t,e)}async init(){await nr(this,st,pn),super.init()}readUint8Array(t,e){return rr(this,t,e,st,pn)}}class vi extends ce{constructor(t,e){super(),tr(this,t,e)}async init(){await nr(this,it,mn),super.init()}readUint8Array(t,e){return rr(this,t,e,it,mn)}}function tr(n,t,e){const{preventHeadRequest:r,useRangeHeader:s,forceRangeRequests:i}=e;e=Object.assign({},e),delete e.preventHeadRequest,delete e.useRangeHeader,delete e.forceRangeRequests,delete e.useXHR,Object.assign(n,{url:t,options:e,preventHeadRequest:r,useRangeHeader:s,forceRangeRequests:i})}async function nr(n,t,e){const{url:r,useRangeHeader:s,forceRangeRequests:i}=n;if(ji(r)&&(s||i)){const{headers:a}=await t(wt,n,sr(n));if(!i&&a.get(Oi)!=zn)throw new Error(Oe);{let o;const l=a.get(Ci);if(l){const _=l.trim().split(/\s*\/\s*/);if(_.length){const d=_[1];d&&d!="*"&&(o=Number(d))}}o===$?await wn(n,t,e):n.size=o}}else await wn(n,t,e)}async function rr(n,t,e,r,s){const{useRangeHeader:i,forceRangeRequests:a,options:o}=n;if(i||a){const l=await r(wt,n,sr(n,t,e));if(l.status!=206)throw new Error(Oe);return new Uint8Array(await l.arrayBuffer())}else{const{data:l}=n;return l||await s(n,o),new Uint8Array(n.data.subarray(t,t+e))}}function sr(n,t=0,e=1){return Object.assign({},xt(n),{[ki]:zn+"="+t+"-"+(t+e-1)})}function xt({options:n}){const{headers:t}=n;if(t)return Symbol.iterator in t?Object.fromEntries(t):t}async function pn(n){await ir(n,st)}async function mn(n){await ir(n,it)}async function ir(n,t){const e=await t(wt,n,xt(n));n.data=new Uint8Array(await e.arrayBuffer()),n.size||(n.size=n.data.length)}async function wn(n,t,e){if(n.preventHeadRequest)await e(n,n.options);else{const s=(await t(Ii,n,xt(n))).headers.get(Ri);s?n.size=Number(s):await e(n,n.options)}}async function st(n,{options:t,url:e},r){const s=await fetch(e,Object.assign({},t,{method:n,headers:r}));if(s.status<400)return s;throw s.status==416?new Error(Oe):new Error(Jn+(s.statusText||s.status))}function it(n,{url:t},e){return new Promise((r,s)=>{const i=new XMLHttpRequest;if(i.addEventListener("load",()=>{if(i.status<400){const a=[];i.getAllResponseHeaders().trim().split(/[\r\n]+/).forEach(o=>{const l=o.trim().split(/\s*:\s*/);l[0]=l[0].trim().replace(/^[a-z]|-[a-z]/g,_=>_.toUpperCase()),a.push(l)}),r({status:i.status,arrayBuffer:()=>i.response,headers:new Map(a)})}else s(i.status==416?new Error(Oe):new Error(Jn+(i.statusText||i.status)))},!1),i.addEventListener("error",a=>s(a.detail?a.detail.error:new Error("Network error")),!1),i.open(n,t),e)for(const a of Object.entries(e))i.setRequestHeader(a[0],a[1]);i.responseType="arraybuffer",i.send()})}class ar extends ce{constructor(t,e={}){super(),Object.assign(this,{url:t,reader:e.useXHR?new vi(t,e):new Ui(t,e)})}set size(t){}get size(){return this.reader.size}async init(){await this.reader.init(),super.init()}readUint8Array(t,e){return this.reader.readUint8Array(t,e)}}class Hi extends ar{constructor(t,e={}){e.useRangeHeader=!0,super(t,e)}}class Wi extends ce{constructor(t){super(),Object.assign(this,{array:t,size:t.length})}readUint8Array(t,e){return this.array.slice(t,t+e)}}class Bi extends gt{init(t=0){Object.assign(this,{offset:0,array:new Uint8Array(t)}),super.init()}writeUint8Array(t){const e=this;if(e.offset+t.length>e.array.length){const r=e.array;e.array=new Uint8Array(r.length+t.length),e.array.set(r)}e.array.set(t,e.offset),e.offset+=t.length}getData(){return this.array}}class Et extends ce{constructor(t){super(),this.readers=t}async init(){const t=this,{readers:e}=t;t.lastDiskNumber=0,t.lastDiskOffset=0,await Promise.all(e.map(async(r,s)=>{await r.init(),s!=e.length-1&&(t.lastDiskOffset+=r.size),t.size+=r.size})),super.init()}async readUint8Array(t,e,r=0){const s=this,{readers:i}=this;let a,o=r;o==-1&&(o=i.length-1);let l=t;for(;l>=i[o].size;)l-=i[o].size,o++;const _=i[o],d=_.size;if(l+e<=d)a=await G(_,l,e);else{const p=d-l;a=new Uint8Array(e),a.set(await G(_,l,p)),a.set(await s.readUint8Array(t+p,e-p,r),p)}return s.lastDiskNumber=Math.max(o,s.lastDiskNumber),a}}class ve extends Be{constructor(t,e=4294967295){super();const r=this;Object.assign(r,{diskNumber:0,diskOffset:0,size:0,maxSize:e,availableSize:e});let s,i,a;const o=new WritableStream({async write(d){const{availableSize:p}=r;if(a)d.length>=p?(await l(d.slice(0,p)),await _(),r.diskOffset+=s.size,r.diskNumber++,a=null,await this.write(d.slice(p))):await l(d);else{const{value:h,done:g}=await t.next();if(g&&!h)throw new Error(Qn);s=h,s.size=0,s.maxSize&&(r.maxSize=s.maxSize),r.availableSize=r.maxSize,await Re(s),i=h.writable,a=i.getWriter(),await this.write(d)}},async close(){await a.ready,await _()}});Object.defineProperty(r,bt,{get(){return o}});async function l(d){const p=d.length;p&&(await a.ready,await a.write(d),s.size+=p,r.size+=p,r.availableSize-=p)}async function _(){i.size=s.size,await a.close()}}}function ji(n){const{baseURL:t}=Dn(),{protocol:e}=new URL(n,t);return e=="http:"||e=="https:"}async function Re(n,t){n.init&&!n.initialized&&await n.init(t)}function or(n){return Array.isArray(n)&&(n=new Et(n)),n instanceof ReadableStream&&(n={readable:n}),n}function cr(n){n.writable===$&&typeof n.next==On&&(n=new ve(n)),n instanceof WritableStream&&(n={writable:n});const{writable:t}=n;return t.size===$&&(t.size=0),n instanceof ve||Object.assign(n,{diskNumber:0,diskOffset:0,availableSize:1/0,maxSize:1/0}),n}function G(n,t,e,r){return n.readUint8Array(t,e,r)}const qi=Et,Gi=ve,lr="\0☺☻♥♦♣♠•◘○◙♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼ !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~⌂ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ".split(""),Yi=lr.length==256;function Vi(n){if(Yi){let t="";for(let e=0;e<n.length;e++)t+=lr[n[e]];return t}else return new TextDecoder().decode(n)}function at(n,t){return t&&t.trim().toLowerCase()=="cp437"?Vi(n):new TextDecoder(t).decode(n)}const fr="filename",ur="rawFilename",dr="comment",_r="rawComment",hr="uncompressedSize",pr="compressedSize",mr="offset",ot="diskNumberStart",ct="lastModDate",lt="rawLastModDate",wr="lastAccessDate",Zi="rawLastAccessDate",br="creationDate",Ki="rawCreationDate",Xi="internalFileAttribute",$i="externalFileAttribute",Ji="msDosCompatible",Qi="zip64",zi=[fr,ur,pr,hr,ct,lt,dr,_r,wr,br,mr,ot,ot,Xi,$i,Ji,Qi,"directory","bitFlag","encrypted","signature","filenameUTF8","commentUTF8","compressionMethod","version","versionMadeBy","extraField","rawExtraField","extraFieldZip64","extraFieldUnicodePath","extraFieldUnicodeComment","extraFieldAES","extraFieldNTFS","extraFieldExtendedTimestamp"];class bn{constructor(t){zi.forEach(e=>this[e]=t[e])}}const Pe="File format is not recognized",gr="End of central directory not found",yr="End of Zip64 central directory not found",xr="End of Zip64 central directory locator not found",Er="Central directory header not found",Tr="Local file header not found",Sr="Zip64 extra field not found",Ar="File contains encrypted entry",Rr="Encryption method not supported",ft="Compression method not supported",ut="Split zip file",gn="utf-8",yn="cp437",ea=[[hr,de],[pr,de],[mr,de],[ot,ae]],ta={[ae]:{getValue:B,bytes:4},[de]:{getValue:Le,bytes:8}};class na{constructor(t,e={}){Object.assign(this,{reader:or(t),options:e,config:Dn()})}async*getEntriesGenerator(t={}){const e=this;let{reader:r}=e;const{config:s}=e;if(await Re(r),(r.size===$||!r.readUint8Array)&&(r=new yt(await new Response(r.readable).blob()),await Re(r)),r.size<pe)throw new Error(Pe);r.chunkSize=Ms(s);const i=await ca(r,Es,r.size,pe,ae*16);if(!i){const E=await G(r,0,4),R=q(E);throw B(R)==xs?new Error(ut):new Error(gr)}const a=q(i);let o=B(a,12),l=B(a,16);const _=i.offset,d=j(a,20),p=_+pe+d;let h=j(a,4);const g=r.lastDiskNumber||0;let y=j(a,6),f=j(a,8),c=0,u=0;if(l==de||o==de||f==ae||y==ae){const E=await G(r,i.offset-Ve,Ve),R=q(E);if(B(R,0)!=Ts)throw new Error(yr);l=Le(R,8);let D=await G(r,l,Ze,-1),O=q(D);const P=i.offset-Ve-Ze;if(B(O,0)!=Qt&&l!=P){const N=l;l=P,c=l-N,D=await G(r,l,Ze,-1),O=q(D)}if(B(O,0)!=Qt)throw new Error(xr);h==ae&&(h=B(O,16)),y==ae&&(y=B(O,20)),f==ae&&(f=Le(O,32)),o==de&&(o=Le(O,40)),l-=o}if(l>=r.size&&(c=r.size-l-o-pe,l=r.size-o-pe),g!=h)throw new Error(ut);if(l<0)throw new Error(Pe);let m=0,w=await G(r,l,o,y),x=q(w);if(o){const E=i.offset-o;if(B(x,m)!=Jt&&l!=E){const R=l;l=E,c+=l-R,w=await G(r,l,o,y),x=q(w)}}const A=i.offset-l-(r.lastDiskOffset||0);if(o!=A&&A>=0&&(o=A,w=await G(r,l,o,y),x=q(w)),l<0||l>=r.size)throw new Error(Pe);const b=K(e,t,"filenameEncoding"),T=K(e,t,"commentEncoding");for(let E=0;E<f;E++){const R=new ra(r,s,e.options);if(B(x,m)!=Jt)throw new Error(Er);Cr(R,x,m+6);const D=!!R.bitFlag.languageEncodingFlag,O=m+46,P=O+R.filenameLength,N=P+R.extraFieldLength,k=j(x,m+4),v=(k&0)==0,M=w.subarray(O,P),ge=j(x,m+32),I=N+ge,le=w.subarray(N,I),U=D,H=D,Tt=v&&(be(x,m+38)&nn)==nn,St=B(x,m+42)+c;Object.assign(R,{versionMadeBy:k,msDosCompatible:v,compressedSize:0,uncompressedSize:0,commentLength:ge,directory:Tt,offset:St,diskNumberStart:j(x,m+34),internalFileAttribute:j(x,m+36),externalFileAttribute:B(x,m+38),rawFilename:M,filenameUTF8:U,commentUTF8:H,rawExtraField:w.subarray(P,N)});const[At,Dr]=await Promise.all([at(M,U?gn:b||yn),at(le,H?gn:T||yn)]);Object.assign(R,{rawComment:le,filename:At,comment:Dr,directory:Tt||At.endsWith(Ps)}),u=Math.max(St,u),await Or(R,R,x,m+6);const je=new bn(R);je.getData=(Ct,Ir)=>R.getData(Ct,je,Ir),m=I;const{onprogress:Rt}=t;if(Rt)try{await Rt(E+1,f,new bn(R))}catch{}yield je}const S=K(e,t,"extractPrependedData"),C=K(e,t,"extractAppendedData");return S&&(e.prependedData=u>0?await G(r,0,u):new Uint8Array),e.comment=d?await G(r,_+pe,d):new Uint8Array,C&&(e.appendedData=p<r.size?await G(r,p,r.size-p):new Uint8Array),!0}async getEntries(t={}){const e=[];for await(const r of this.getEntriesGenerator(t))e.push(r);return e}async close(){}}class ra{constructor(t,e,r){Object.assign(this,{reader:t,config:e,options:r})}async getData(t,e,r={}){const s=this,{reader:i,offset:a,diskNumberStart:o,extraFieldAES:l,compressionMethod:_,config:d,bitFlag:p,signature:h,rawLastModDate:g,uncompressedSize:y,compressedSize:f}=s,c=e.localDirectory={},u=await G(i,a,30,o),m=q(u);let w=K(s,r,"password");if(w=w&&w.length&&w,l&&l.originalCompressionMethod!=gs)throw new Error(ft);if(_!=bs&&_!=ws)throw new Error(ft);if(B(m,0)!=ys)throw new Error(Tr);Cr(c,m,4),c.rawExtraField=c.extraFieldLength?await G(i,a+30+c.filenameLength,c.extraFieldLength,o):new Uint8Array,await Or(s,c,m,4,!0),Object.assign(e,{lastAccessDate:c.lastAccessDate,creationDate:c.creationDate});const x=s.encrypted&&c.encrypted,A=x&&!l;if(x){if(!A&&l.strength===$)throw new Error(Rr);if(!w)throw new Error(Ar)}const b=a+30+c.filenameLength+c.extraFieldLength,T=f,S=i.readable;Object.assign(S,{diskNumberStart:o,offset:b,size:T});const C=K(s,r,"signal"),E=K(s,r,"checkPasswordOnly");E&&(t=new WritableStream),t=cr(t),await Re(t,y);const{writable:R}=t,{onstart:D,onprogress:O,onend:P}=r,N={options:{codecType:$n,password:w,zipCrypto:A,encryptionStrength:l&&l.strength,signed:K(s,r,"checkSignature"),passwordVerification:A&&(p.dataDescriptor?g>>>8&255:h>>>24&255),signature:h,compressed:_!=0,encrypted:x,useWebWorkers:K(s,r,"useWebWorkers"),useCompressionStream:K(s,r,"useCompressionStream"),transferStreams:K(s,r,"transferStreams"),checkPasswordOnly:E},config:d,streamOptions:{signal:C,size:T,onstart:D,onprogress:O,onend:P}};let k=0;try{({outputSize:k}=await Ti({readable:S,writable:R},N))}catch(v){if(!E||v.message!=ht)throw v}finally{const v=K(s,r,"preventClose");R.size+=k,!v&&!R.locked&&await R.getWriter().close()}return E?void 0:t.getData?t.getData():R}}function Cr(n,t,e){const r=n.rawBitFlag=j(t,e+2),s=(r&zt)==zt,i=B(t,e+6);Object.assign(n,{encrypted:s,version:j(t,e),bitFlag:{level:(r&Ns)>>1,dataDescriptor:(r&en)==en,languageEncodingFlag:(r&tn)==tn},rawLastModDate:i,lastModDate:la(i),filenameLength:j(t,e+22),extraFieldLength:j(t,e+24)})}async function Or(n,t,e,r,s){const{rawExtraField:i}=t,a=t.extraField=new Map,o=q(new Uint8Array(i));let l=0;try{for(;l<i.length;){const u=j(o,l),m=j(o,l+2);a.set(u,{type:u,data:i.slice(l+4,l+4+m)}),l+=4+m}}catch{}const _=j(e,r+4);Object.assign(t,{signature:B(e,r+10),uncompressedSize:B(e,r+18),compressedSize:B(e,r+14)});const d=a.get(Ss);d&&(sa(d,t),t.extraFieldZip64=d);const p=a.get(ks);p&&(await xn(p,fr,ur,t,n),t.extraFieldUnicodePath=p);const h=a.get(Ds);h&&(await xn(h,dr,_r,t,n),t.extraFieldUnicodeComment=h);const g=a.get(As);g?(ia(g,t,_),t.extraFieldAES=g):t.compressionMethod=_;const y=a.get(Rs);y&&(aa(y,t),t.extraFieldNTFS=y);const f=a.get(Os);f&&(oa(f,t,s),t.extraFieldExtendedTimestamp=f);const c=a.get(Is);c&&(t.extraFieldUSDZ=c)}function sa(n,t){t.zip64=!0;const e=q(n.data),r=ea.filter(([s,i])=>t[s]==i);for(let s=0,i=0;s<r.length;s++){const[a,o]=r[s];if(t[a]==o){const l=ta[o];t[a]=n[a]=l.getValue(e,i),i+=l.bytes}else if(n[a])throw new Error(Sr)}}async function xn(n,t,e,r,s){const i=q(n.data),a=new Me;a.append(s[e]);const o=q(new Uint8Array(4));o.setUint32(0,a.get(),!0);const l=B(i,1);Object.assign(n,{version:be(i,0),[t]:at(n.data.subarray(5)),valid:!s.bitFlag.languageEncodingFlag&&l==B(o,0)}),n.valid&&(r[t]=n[t],r[t+"UTF8"]=!0)}function ia(n,t,e){const r=q(n.data),s=be(r,4);Object.assign(n,{vendorVersion:be(r,0),vendorId:be(r,2),strength:s,originalCompressionMethod:e,compressionMethod:j(r,5)}),t.compressionMethod=n.compressionMethod}function aa(n,t){const e=q(n.data);let r=4,s;try{for(;r<n.data.length&&!s;){const i=j(e,r),a=j(e,r+2);i==Cs&&(s=n.data.slice(r+4,r+4+a)),r+=4+a}}catch{}try{if(s&&s.length==24){const i=q(s),a=i.getBigUint64(0,!0),o=i.getBigUint64(8,!0),l=i.getBigUint64(16,!0);Object.assign(n,{rawLastModDate:a,rawLastAccessDate:o,rawCreationDate:l});const _=Je(a),d=Je(o),p=Je(l),h={lastModDate:_,lastAccessDate:d,creationDate:p};Object.assign(n,h),Object.assign(t,h)}}catch{}}function oa(n,t,e){const r=q(n.data),s=be(r,0),i=[],a=[];e?((s&1)==1&&(i.push(ct),a.push(lt)),(s&2)==2&&(i.push(wr),a.push(Zi)),(s&4)==4&&(i.push(br),a.push(Ki))):n.data.length>=5&&(i.push(ct),a.push(lt));let o=1;i.forEach((l,_)=>{if(n.data.length>=o+4){const d=B(r,o);t[l]=n[l]=new Date(d*1e3);const p=a[_];n[p]=d}o+=4})}async function ca(n,t,e,r,s){const i=new Uint8Array(4),a=q(i);fa(a,0,t);const o=r+s;return await l(r)||await l(Math.min(o,e));async function l(_){const d=e-_,p=await G(n,d,_);for(let h=p.length-r;h>=0;h--)if(p[h]==i[0]&&p[h+1]==i[1]&&p[h+2]==i[2]&&p[h+3]==i[3])return{offset:d+h,buffer:p.slice(h,h+r).buffer}}}function K(n,t,e){return t[e]===$?n.options[e]:t[e]}function la(n){const t=(n&4294901760)>>16,e=n&65535;try{return new Date(1980+((t&65024)>>9),((t&480)>>5)-1,t&31,(e&63488)>>11,(e&2016)>>5,(e&31)*2,0)}catch{}}function Je(n){return new Date(Number(n/BigInt(1e4)-BigInt(116444736e5)))}function be(n,t){return n.getUint8(t)}function j(n,t){return n.getUint16(t,!0)}function B(n,t){return n.getUint32(t,!0)}function Le(n,t){return Number(n.getBigUint64(t,!0))}function fa(n,t,e){n.setUint32(t,e,!0)}function q(n){return new DataView(n.buffer)}In({Inflate:ms});const ua=Object.freeze(Object.defineProperty({__proto__:null,BlobReader:yt,BlobWriter:er,Data64URIReader:Pi,Data64URIWriter:Li,ERR_BAD_FORMAT:Pe,ERR_CENTRAL_DIRECTORY_NOT_FOUND:Er,ERR_ENCRYPTED:Ar,ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND:xr,ERR_EOCDR_NOT_FOUND:gr,ERR_EOCDR_ZIP64_NOT_FOUND:yr,ERR_EXTRAFIELD_ZIP64_NOT_FOUND:Sr,ERR_HTTP_RANGE:Oe,ERR_INVALID_PASSWORD:dt,ERR_INVALID_SIGNATURE:_t,ERR_ITERATOR_COMPLETED_TOO_SOON:Qn,ERR_LOCAL_FILE_HEADER_NOT_FOUND:Tr,ERR_SPLIT_ZIP_FILE:ut,ERR_UNSUPPORTED_COMPRESSION:ft,ERR_UNSUPPORTED_ENCRYPTION:Rr,HttpRangeReader:Hi,HttpReader:ar,Reader:ce,SplitDataReader:Et,SplitDataWriter:ve,SplitZipReader:qi,SplitZipWriter:Gi,TextReader:Fi,TextWriter:Mi,Uint8ArrayReader:Wi,Uint8ArrayWriter:Bi,Writer:gt,ZipReader:na,configure:In,getMimeType:Us,initReader:or,initStream:Re,initWriter:cr,readUint8Array:G,terminateWorkers:Si},Symbol.toStringTag,{value:"Module"})),Ee=ua;class da{constructor(t,e){F(this,"_zipReader");F(this,"_entriesPromise");F(this,"_traceURL");this._traceURL=t,Ee.configure({baseURL:self.location.href}),this._zipReader=new Ee.ZipReader(new Ee.HttpReader(ha(t),{mode:"cors",preventHeadRequest:!0}),{useWebWorkers:!1}),this._entriesPromise=this._zipReader.getEntries({onprogress:e}).then(r=>{const s=new Map;for(const i of r)s.set(i.filename,i);return s})}isLive(){return!1}traceURL(){return this._traceURL}async entryNames(){return[...(await this._entriesPromise).keys()]}async hasEntry(t){return(await this._entriesPromise).has(t)}async readText(t){var i;const r=(await this._entriesPromise).get(t);if(!r)return;const s=new Ee.TextWriter;return await((i=r.getData)==null?void 0:i.call(r,s)),s.getData()}async readBlob(t){const r=(await this._entriesPromise).get(t);if(!r)return;const s=new Ee.BlobWriter;return await r.getData(s),s.getData()}}class _a{constructor(t){F(this,"_entriesPromise");F(this,"_traceURL");this._traceURL=t,this._entriesPromise=fetch("/trace/file?path="+encodeURIComponent(t)).then(async e=>{const r=JSON.parse(await e.text()),s=new Map;for(const i of r.entries)s.set(i.name,i.path);return s})}isLive(){return!0}traceURL(){return this._traceURL}async entryNames(){return[...(await this._entriesPromise).keys()]}async hasEntry(t){return(await this._entriesPromise).has(t)}async readText(t){const e=await this._readEntry(t);return e==null?void 0:e.text()}async readBlob(t){const e=await this._readEntry(t);return(e==null?void 0:e.status)===200?await(e==null?void 0:e.blob()):void 0}async _readEntry(t){const r=(await this._entriesPromise).get(t);if(r)return fetch("/trace/file?path="+encodeURIComponent(r))}}function ha(n){let t=n.startsWith("http")||n.startsWith("blob")?n:`file?path=${encodeURIComponent(n)}`;return t.startsWith("https://www.dropbox.com/")&&(t="https://dl.dropboxusercontent.com/"+t.substring(24)),t}self.addEventListener("install",function(n){self.skipWaiting()});self.addEventListener("activate",function(n){n.waitUntil(self.clients.claim())});const pa=new URL(self.registration.scope).pathname,ue=new Map,He=new Map;async function ma(n,t,e,r){var o;await kr();let s=He.get(e);s||(s=new Set,He.set(e,s)),s.add(n);const i=new $r;try{const[l,_]=Lr(r,[.5,.4,.1]),d=n.endsWith("json")?new _a(n):new da(n,l);await i.load(d,_)}catch(l){throw console.error(l),(o=l==null?void 0:l.message)!=null&&o.includes("Cannot find .trace file")&&await i.hasEntry("index.html")?new Error("Could not load trace. Did you upload a Playwright HTML report instead? Make sure to extract the archive first and then double-click the index.html file or put it on a web server."):l instanceof An?new Error(`Could not load trace from ${t||n}. ${l.message}`):t?new Error(`Could not load trace from ${t}. Make sure to upload a valid Playwright trace.`):new Error(`Could not load trace from ${n}. Make sure a valid Playwright Trace is accessible over this url.`)}const a=new Gr(i.storage(),l=>i.resourceForSha1(l));return ue.set(n,{traceModel:i,snapshotServer:a}),i}async function wa(n){if(n.request.url.startsWith("chrome-extension://"))return fetch(n.request);const t=n.request,e=await self.clients.get(n.clientId),r=self.registration.scope.startsWith("https://");if(t.url.startsWith(self.registration.scope)){const l=new URL(ze(t.url)),_=l.pathname.substring(pa.length-1);if(_==="/ping")return await kr(),new Response(null,{status:200});const d=l.searchParams.get("trace");if(_==="/contexts")try{const p=await ma(d,l.searchParams.get("traceFileName"),n.clientId,(h,g)=>{e.postMessage({method:"progress",params:{done:h,total:g}})});return new Response(JSON.stringify(p.contextEntries),{status:200,headers:{"Content-Type":"application/json"}})}catch(p){return new Response(JSON.stringify({error:p==null?void 0:p.message}),{status:500,headers:{"Content-Type":"application/json"}})}if(_.startsWith("/snapshotInfo/")){const{snapshotServer:p}=ue.get(d)||{};return p?p.serveSnapshotInfo(_,l.searchParams):new Response(null,{status:404})}if(_.startsWith("/snapshot/")){const{snapshotServer:p}=ue.get(d)||{};if(!p)return new Response(null,{status:404});const h=p.serveSnapshot(_,l.searchParams,l.href);return r&&h.headers.set("Content-Security-Policy","upgrade-insecure-requests"),h}if(_.startsWith("/sha1/")){const p=l.searchParams.has("download"),h=_.slice(6);for(const g of ue.values()){const y=await g.traceModel.resourceForSha1(h);if(y)return new Response(y,{status:200,headers:p?ba(g.traceModel,h):void 0})}return new Response(null,{status:404})}return fetch(n.request)}const s=ze(e.url),i=new URL(s).searchParams.get("trace"),{snapshotServer:a}=ue.get(i)||{};if(!a)return new Response(null,{status:404});const o=[t.url];return r&&t.url.startsWith("https://")&&o.push(t.url.replace(/^https/,"http")),a.serveResource(o,t.method,s)}function ba(n,t){const e=n.attachmentForSha1(t);if(!e)return;const r=new Headers;return r.set("Content-Disposition",`attachment; filename="attachment"; filename*=UTF-8''${encodeURIComponent(e.name)}`),e.contentType&&r.set("Content-Type",e.contentType),r}async function kr(){const n=await self.clients.matchAll(),t=new Set;for(const[e,r]of He)n.find(s=>s.id===e)?r.forEach(s=>t.add(s)):He.delete(e);for(const e of ue.keys())t.has(e)||ue.delete(e)}self.addEventListener("fetch",function(n){n.respondWith(wa(n))});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/testServerConnection.0WapKERv.css b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/testServerConnection.0WapKERv.css
new file mode 100644
index 0000000..7492ba8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/testServerConnection.0WapKERv.css
@@ -0,0 +1 @@
+:root{color-scheme:light dark}body{--transparent-blue: #2196F355;--light-pink: #ff69b460;--gray: #888888;--sidebar-width: 250px;--box-shadow: rgba(0, 0, 0, .133) 0px 1.6px 3.6px 0px, rgba(0, 0, 0, .11) 0px .3px .9px 0px}html,body{width:100%;height:100%;padding:0;margin:0;overflow:hidden;display:flex;overscroll-behavior-x:none}#root{width:100%;height:100%;display:flex}body,dialog{background-color:var(--vscode-panel-background);color:var(--vscode-foreground);font-family:var(--vscode-font-family);font-weight:var(--vscode-font-weight);font-size:var(--vscode-font-size);-webkit-font-smoothing:antialiased}a{color:var(--vscode-textLink-foreground)}dialog{border:none;padding:0;box-shadow:var(--box-shadow);line-height:28px;max-width:400px}dialog .title{display:flex;align-items:center;margin:0;padding:0 5px;height:32px;background-color:var(--vscode-sideBar-background);max-width:400px}dialog .title .codicon{margin-right:3px}dialog .body{padding:10px;text-align:center}.button{color:var(--vscode-button-foreground);background:var(--vscode-button-background);margin:10px;border:none;height:28px;min-width:40px;cursor:pointer;-webkit-user-select:none;user-select:none}.button:focus{outline:1px solid var(--vscode-focusBorder)}.button:hover{background:var(--vscode-button-hoverBackground)}.button.secondary{color:var(--vscode-button-secondaryForeground);background:var(--vscode-button-secondaryBackground)}.button.secondary:hover{background:var(--vscode-button-secondaryHoverBackground)}*{box-sizing:border-box;min-width:0;min-height:0}*[hidden],.hidden{display:none!important}.invisible{visibility:hidden!important}svg{fill:currentColor}.vbox{display:flex;flex-direction:column;flex:auto;position:relative}.fill{position:absolute;top:0;right:0;bottom:0;left:0}.hbox{display:flex;flex:auto;position:relative}.spacer{flex:auto}.codicon-check{color:var(--vscode-charts-green)}.codicon-error{color:var(--vscode-errorForeground)}.codicon-warning{color:var(--vscode-list-warningForeground)}.codicon-circle-outline{color:var(--vscode-disabledForeground)}input[type=text],input[type=search]{color:var(--vscode-input-foreground);background-color:var(--vscode-input-background);border:none;outline:none}body.dark-mode ::-webkit-scrollbar{width:10px}body.dark-mode ::-webkit-scrollbar-thumb{background-color:#555}body.dark-mode ::-webkit-scrollbar-track{background-color:#333}body.dark-mode ::-webkit-scrollbar-thumb:hover{background-color:#777}body.dark-mode ::-webkit-scrollbar-track:hover{background-color:#444}.codicon-loading{animation:spin 1s infinite linear}::placeholder{color:var(--vscode-input-placeholderForeground)}@keyframes spin{to{transform:rotate(360deg)}}@font-face{font-family:codicon;src:url(./codicon.DMa5iZz2.ttf) format("truetype")}.codicon{font: 16px/1 codicon;flex:none;display:inline-block;text-decoration:none;text-rendering:auto;text-align:center;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.codicon-blank:before{content:" "}.codicon-add:before{content:""}.codicon-plus:before{content:""}.codicon-gist-new:before{content:""}.codicon-repo-create:before{content:""}.codicon-lightbulb:before{content:""}.codicon-light-bulb:before{content:""}.codicon-repo:before{content:""}.codicon-repo-delete:before{content:""}.codicon-gist-fork:before{content:""}.codicon-repo-forked:before{content:""}.codicon-git-pull-request:before{content:""}.codicon-git-pull-request-abandoned:before{content:""}.codicon-record-keys:before{content:""}.codicon-keyboard:before{content:""}.codicon-tag:before{content:""}.codicon-tag-add:before{content:""}.codicon-tag-remove:before{content:""}.codicon-person:before{content:""}.codicon-person-follow:before{content:""}.codicon-person-outline:before{content:""}.codicon-person-filled:before{content:""}.codicon-git-branch:before{content:""}.codicon-git-branch-create:before{content:""}.codicon-git-branch-delete:before{content:""}.codicon-source-control:before{content:""}.codicon-mirror:before{content:""}.codicon-mirror-public:before{content:""}.codicon-star:before{content:""}.codicon-star-add:before{content:""}.codicon-star-delete:before{content:""}.codicon-star-empty:before{content:""}.codicon-comment:before{content:""}.codicon-comment-add:before{content:""}.codicon-alert:before{content:""}.codicon-warning:before{content:""}.codicon-search:before{content:""}.codicon-search-save:before{content:""}.codicon-log-out:before{content:""}.codicon-sign-out:before{content:""}.codicon-log-in:before{content:""}.codicon-sign-in:before{content:""}.codicon-eye:before{content:""}.codicon-eye-unwatch:before{content:""}.codicon-eye-watch:before{content:""}.codicon-circle-filled:before{content:""}.codicon-primitive-dot:before{content:""}.codicon-close-dirty:before{content:""}.codicon-debug-breakpoint:before{content:""}.codicon-debug-breakpoint-disabled:before{content:""}.codicon-debug-hint:before{content:""}.codicon-primitive-square:before{content:""}.codicon-edit:before{content:""}.codicon-pencil:before{content:""}.codicon-info:before{content:""}.codicon-issue-opened:before{content:""}.codicon-gist-private:before{content:""}.codicon-git-fork-private:before{content:""}.codicon-lock:before{content:""}.codicon-mirror-private:before{content:""}.codicon-close:before{content:""}.codicon-remove-close:before{content:""}.codicon-x:before{content:""}.codicon-repo-sync:before{content:""}.codicon-sync:before{content:""}.codicon-clone:before{content:""}.codicon-desktop-download:before{content:""}.codicon-beaker:before{content:""}.codicon-microscope:before{content:""}.codicon-vm:before{content:""}.codicon-device-desktop:before{content:""}.codicon-file:before{content:""}.codicon-file-text:before{content:""}.codicon-more:before{content:""}.codicon-ellipsis:before{content:""}.codicon-kebab-horizontal:before{content:""}.codicon-mail-reply:before{content:""}.codicon-reply:before{content:""}.codicon-organization:before{content:""}.codicon-organization-filled:before{content:""}.codicon-organization-outline:before{content:""}.codicon-new-file:before{content:""}.codicon-file-add:before{content:""}.codicon-new-folder:before{content:""}.codicon-file-directory-create:before{content:""}.codicon-trash:before{content:""}.codicon-trashcan:before{content:""}.codicon-history:before{content:""}.codicon-clock:before{content:""}.codicon-folder:before{content:""}.codicon-file-directory:before{content:""}.codicon-symbol-folder:before{content:""}.codicon-logo-github:before{content:""}.codicon-mark-github:before{content:""}.codicon-github:before{content:""}.codicon-terminal:before{content:""}.codicon-console:before{content:""}.codicon-repl:before{content:""}.codicon-zap:before{content:""}.codicon-symbol-event:before{content:""}.codicon-error:before{content:""}.codicon-stop:before{content:""}.codicon-variable:before{content:""}.codicon-symbol-variable:before{content:""}.codicon-array:before{content:""}.codicon-symbol-array:before{content:""}.codicon-symbol-module:before{content:""}.codicon-symbol-package:before{content:""}.codicon-symbol-namespace:before{content:""}.codicon-symbol-object:before{content:""}.codicon-symbol-method:before{content:""}.codicon-symbol-function:before{content:""}.codicon-symbol-constructor:before{content:""}.codicon-symbol-boolean:before{content:""}.codicon-symbol-null:before{content:""}.codicon-symbol-numeric:before{content:""}.codicon-symbol-number:before{content:""}.codicon-symbol-structure:before{content:""}.codicon-symbol-struct:before{content:""}.codicon-symbol-parameter:before{content:""}.codicon-symbol-type-parameter:before{content:""}.codicon-symbol-key:before{content:""}.codicon-symbol-text:before{content:""}.codicon-symbol-reference:before{content:""}.codicon-go-to-file:before{content:""}.codicon-symbol-enum:before{content:""}.codicon-symbol-value:before{content:""}.codicon-symbol-ruler:before{content:""}.codicon-symbol-unit:before{content:""}.codicon-activate-breakpoints:before{content:""}.codicon-archive:before{content:""}.codicon-arrow-both:before{content:""}.codicon-arrow-down:before{content:""}.codicon-arrow-left:before{content:""}.codicon-arrow-right:before{content:""}.codicon-arrow-small-down:before{content:""}.codicon-arrow-small-left:before{content:""}.codicon-arrow-small-right:before{content:""}.codicon-arrow-small-up:before{content:""}.codicon-arrow-up:before{content:""}.codicon-bell:before{content:""}.codicon-bold:before{content:""}.codicon-book:before{content:""}.codicon-bookmark:before{content:""}.codicon-debug-breakpoint-conditional-unverified:before{content:""}.codicon-debug-breakpoint-conditional:before{content:""}.codicon-debug-breakpoint-conditional-disabled:before{content:""}.codicon-debug-breakpoint-data-unverified:before{content:""}.codicon-debug-breakpoint-data:before{content:""}.codicon-debug-breakpoint-data-disabled:before{content:""}.codicon-debug-breakpoint-log-unverified:before{content:""}.codicon-debug-breakpoint-log:before{content:""}.codicon-debug-breakpoint-log-disabled:before{content:""}.codicon-briefcase:before{content:""}.codicon-broadcast:before{content:""}.codicon-browser:before{content:""}.codicon-bug:before{content:""}.codicon-calendar:before{content:""}.codicon-case-sensitive:before{content:""}.codicon-check:before{content:""}.codicon-checklist:before{content:""}.codicon-chevron-down:before{content:""}.codicon-drop-down-button:before{content:""}.codicon-chevron-left:before{content:""}.codicon-chevron-right:before{content:""}.codicon-chevron-up:before{content:""}.codicon-chrome-close:before{content:""}.codicon-chrome-maximize:before{content:""}.codicon-chrome-minimize:before{content:""}.codicon-chrome-restore:before{content:""}.codicon-circle:before{content:""}.codicon-circle-outline:before{content:""}.codicon-debug-breakpoint-unverified:before{content:""}.codicon-circle-slash:before{content:""}.codicon-circuit-board:before{content:""}.codicon-clear-all:before{content:""}.codicon-clippy:before{content:""}.codicon-close-all:before{content:""}.codicon-cloud-download:before{content:""}.codicon-cloud-upload:before{content:""}.codicon-code:before{content:""}.codicon-collapse-all:before{content:""}.codicon-color-mode:before{content:""}.codicon-comment-discussion:before{content:""}.codicon-compare-changes:before{content:""}.codicon-credit-card:before{content:""}.codicon-dash:before{content:""}.codicon-dashboard:before{content:""}.codicon-database:before{content:""}.codicon-debug-continue:before{content:""}.codicon-debug-disconnect:before{content:""}.codicon-debug-pause:before{content:""}.codicon-debug-restart:before{content:""}.codicon-debug-start:before{content:""}.codicon-debug-step-into:before{content:""}.codicon-debug-step-out:before{content:""}.codicon-debug-step-over:before{content:""}.codicon-debug-stop:before{content:""}.codicon-debug:before{content:""}.codicon-device-camera-video:before{content:""}.codicon-device-camera:before{content:""}.codicon-device-mobile:before{content:""}.codicon-diff-added:before{content:""}.codicon-diff-ignored:before{content:""}.codicon-diff-modified:before{content:""}.codicon-diff-removed:before{content:""}.codicon-diff-renamed:before{content:""}.codicon-diff:before{content:""}.codicon-discard:before{content:""}.codicon-editor-layout:before{content:""}.codicon-empty-window:before{content:""}.codicon-exclude:before{content:""}.codicon-extensions:before{content:""}.codicon-eye-closed:before{content:""}.codicon-file-binary:before{content:""}.codicon-file-code:before{content:""}.codicon-file-media:before{content:""}.codicon-file-pdf:before{content:""}.codicon-file-submodule:before{content:""}.codicon-file-symlink-directory:before{content:""}.codicon-file-symlink-file:before{content:""}.codicon-file-zip:before{content:""}.codicon-files:before{content:""}.codicon-filter:before{content:""}.codicon-flame:before{content:""}.codicon-fold-down:before{content:""}.codicon-fold-up:before{content:""}.codicon-fold:before{content:""}.codicon-folder-active:before{content:""}.codicon-folder-opened:before{content:""}.codicon-gear:before{content:""}.codicon-gift:before{content:""}.codicon-gist-secret:before{content:""}.codicon-gist:before{content:""}.codicon-git-commit:before{content:""}.codicon-git-compare:before{content:""}.codicon-git-merge:before{content:""}.codicon-github-action:before{content:""}.codicon-github-alt:before{content:""}.codicon-globe:before{content:""}.codicon-grabber:before{content:""}.codicon-graph:before{content:""}.codicon-gripper:before{content:""}.codicon-heart:before{content:""}.codicon-home:before{content:""}.codicon-horizontal-rule:before{content:""}.codicon-hubot:before{content:""}.codicon-inbox:before{content:""}.codicon-issue-closed:before{content:""}.codicon-issue-reopened:before{content:""}.codicon-issues:before{content:""}.codicon-italic:before{content:""}.codicon-jersey:before{content:""}.codicon-json:before{content:""}.codicon-bracket:before{content:""}.codicon-kebab-vertical:before{content:""}.codicon-key:before{content:""}.codicon-law:before{content:""}.codicon-lightbulb-autofix:before{content:""}.codicon-link-external:before{content:""}.codicon-link:before{content:""}.codicon-list-ordered:before{content:""}.codicon-list-unordered:before{content:""}.codicon-live-share:before{content:""}.codicon-loading:before{content:""}.codicon-location:before{content:""}.codicon-mail-read:before{content:""}.codicon-mail:before{content:""}.codicon-markdown:before{content:""}.codicon-megaphone:before{content:""}.codicon-mention:before{content:""}.codicon-milestone:before{content:""}.codicon-mortar-board:before{content:""}.codicon-move:before{content:""}.codicon-multiple-windows:before{content:""}.codicon-mute:before{content:""}.codicon-no-newline:before{content:""}.codicon-note:before{content:""}.codicon-octoface:before{content:""}.codicon-open-preview:before{content:""}.codicon-package:before{content:""}.codicon-paintcan:before{content:""}.codicon-pin:before{content:""}.codicon-play:before{content:""}.codicon-run:before{content:""}.codicon-plug:before{content:""}.codicon-preserve-case:before{content:""}.codicon-preview:before{content:""}.codicon-project:before{content:""}.codicon-pulse:before{content:""}.codicon-question:before{content:""}.codicon-quote:before{content:""}.codicon-radio-tower:before{content:""}.codicon-reactions:before{content:""}.codicon-references:before{content:""}.codicon-refresh:before{content:""}.codicon-regex:before{content:""}.codicon-remote-explorer:before{content:""}.codicon-remote:before{content:""}.codicon-remove:before{content:""}.codicon-replace-all:before{content:""}.codicon-replace:before{content:""}.codicon-repo-clone:before{content:""}.codicon-repo-force-push:before{content:""}.codicon-repo-pull:before{content:""}.codicon-repo-push:before{content:""}.codicon-report:before{content:""}.codicon-request-changes:before{content:""}.codicon-rocket:before{content:""}.codicon-root-folder-opened:before{content:""}.codicon-root-folder:before{content:""}.codicon-rss:before{content:""}.codicon-ruby:before{content:""}.codicon-save-all:before{content:""}.codicon-save-as:before{content:""}.codicon-save:before{content:""}.codicon-screen-full:before{content:""}.codicon-screen-normal:before{content:""}.codicon-search-stop:before{content:""}.codicon-server:before{content:""}.codicon-settings-gear:before{content:""}.codicon-settings:before{content:""}.codicon-shield:before{content:""}.codicon-smiley:before{content:""}.codicon-sort-precedence:before{content:""}.codicon-split-horizontal:before{content:""}.codicon-split-vertical:before{content:""}.codicon-squirrel:before{content:""}.codicon-star-full:before{content:""}.codicon-star-half:before{content:""}.codicon-symbol-class:before{content:""}.codicon-symbol-color:before{content:""}.codicon-symbol-customcolor:before{content:""}.codicon-symbol-constant:before{content:""}.codicon-symbol-enum-member:before{content:""}.codicon-symbol-field:before{content:""}.codicon-symbol-file:before{content:""}.codicon-symbol-interface:before{content:""}.codicon-symbol-keyword:before{content:""}.codicon-symbol-misc:before{content:""}.codicon-symbol-operator:before{content:""}.codicon-symbol-property:before{content:""}.codicon-wrench:before{content:""}.codicon-wrench-subaction:before{content:""}.codicon-symbol-snippet:before{content:""}.codicon-tasklist:before{content:""}.codicon-telescope:before{content:""}.codicon-text-size:before{content:""}.codicon-three-bars:before{content:""}.codicon-thumbsdown:before{content:""}.codicon-thumbsup:before{content:""}.codicon-tools:before{content:""}.codicon-triangle-down:before{content:""}.codicon-triangle-left:before{content:""}.codicon-triangle-right:before{content:""}.codicon-triangle-up:before{content:""}.codicon-twitter:before{content:""}.codicon-unfold:before{content:""}.codicon-unlock:before{content:""}.codicon-unmute:before{content:""}.codicon-unverified:before{content:""}.codicon-verified:before{content:""}.codicon-versions:before{content:""}.codicon-vm-active:before{content:""}.codicon-vm-outline:before{content:""}.codicon-vm-running:before{content:""}.codicon-watch:before{content:""}.codicon-whitespace:before{content:""}.codicon-whole-word:before{content:""}.codicon-window:before{content:""}.codicon-word-wrap:before{content:""}.codicon-zoom-in:before{content:""}.codicon-zoom-out:before{content:""}.codicon-list-filter:before{content:""}.codicon-list-flat:before{content:""}.codicon-list-selection:before{content:""}.codicon-selection:before{content:""}.codicon-list-tree:before{content:""}.codicon-debug-breakpoint-function-unverified:before{content:""}.codicon-debug-breakpoint-function:before{content:""}.codicon-debug-breakpoint-function-disabled:before{content:""}.codicon-debug-stackframe-active:before{content:""}.codicon-circle-small-filled:before{content:""}.codicon-debug-stackframe-dot:before{content:""}.codicon-debug-stackframe:before{content:""}.codicon-debug-stackframe-focused:before{content:""}.codicon-debug-breakpoint-unsupported:before{content:""}.codicon-symbol-string:before{content:""}.codicon-debug-reverse-continue:before{content:""}.codicon-debug-step-back:before{content:""}.codicon-debug-restart-frame:before{content:""}.codicon-call-incoming:before{content:""}.codicon-call-outgoing:before{content:""}.codicon-menu:before{content:""}.codicon-expand-all:before{content:""}.codicon-feedback:before{content:""}.codicon-group-by-ref-type:before{content:""}.codicon-ungroup-by-ref-type:before{content:""}.codicon-account:before{content:""}.codicon-bell-dot:before{content:""}.codicon-debug-console:before{content:""}.codicon-library:before{content:""}.codicon-output:before{content:""}.codicon-run-all:before{content:""}.codicon-sync-ignored:before{content:""}.codicon-pinned:before{content:""}.codicon-github-inverted:before{content:""}.codicon-debug-alt:before{content:""}.codicon-server-process:before{content:""}.codicon-server-environment:before{content:""}.codicon-pass:before{content:""}.codicon-stop-circle:before{content:""}.codicon-play-circle:before{content:""}.codicon-record:before{content:""}.codicon-debug-alt-small:before{content:""}.codicon-vm-connect:before{content:""}.codicon-cloud:before{content:""}.codicon-merge:before{content:""}.codicon-export:before{content:""}.codicon-graph-left:before{content:""}.codicon-magnet:before{content:""}.codicon-notebook:before{content:""}.codicon-redo:before{content:""}.codicon-check-all:before{content:""}.codicon-pinned-dirty:before{content:""}.codicon-pass-filled:before{content:""}.codicon-circle-large-filled:before{content:""}.codicon-circle-large:before{content:""}.codicon-circle-large-outline:before{content:""}.codicon-combine:before{content:""}.codicon-gather:before{content:""}.codicon-table:before{content:""}.codicon-variable-group:before{content:""}.codicon-type-hierarchy:before{content:""}.codicon-type-hierarchy-sub:before{content:""}.codicon-type-hierarchy-super:before{content:""}.codicon-git-pull-request-create:before{content:""}.codicon-run-above:before{content:""}.codicon-run-below:before{content:""}.codicon-notebook-template:before{content:""}.codicon-debug-rerun:before{content:""}.codicon-workspace-trusted:before{content:""}.codicon-workspace-untrusted:before{content:""}.codicon-workspace-unspecified:before{content:""}.codicon-terminal-cmd:before{content:""}.codicon-terminal-debian:before{content:""}.codicon-terminal-linux:before{content:""}.codicon-terminal-powershell:before{content:""}.codicon-terminal-tmux:before{content:""}.codicon-terminal-ubuntu:before{content:""}.codicon-terminal-bash:before{content:""}.codicon-arrow-swap:before{content:""}.codicon-copy:before{content:""}.codicon-person-add:before{content:""}.codicon-filter-filled:before{content:""}.codicon-wand:before{content:""}.codicon-debug-line-by-line:before{content:""}.codicon-inspect:before{content:""}.codicon-layers:before{content:""}.codicon-layers-dot:before{content:""}.codicon-layers-active:before{content:""}.codicon-compass:before{content:""}.codicon-compass-dot:before{content:""}.codicon-compass-active:before{content:""}.codicon-azure:before{content:""}.codicon-issue-draft:before{content:""}.codicon-git-pull-request-closed:before{content:""}.codicon-git-pull-request-draft:before{content:""}.codicon-debug-all:before{content:""}.codicon-debug-coverage:before{content:""}.codicon-run-errors:before{content:""}.codicon-folder-library:before{content:""}.codicon-debug-continue-small:before{content:""}.codicon-beaker-stop:before{content:""}.codicon-graph-line:before{content:""}.codicon-graph-scatter:before{content:""}.codicon-pie-chart:before{content:""}.codicon-bracket-dot:before{content:""}.codicon-bracket-error:before{content:""}.codicon-lock-small:before{content:""}.codicon-azure-devops:before{content:""}.codicon-verified-filled:before{content:""}.codicon-newline:before{content:""}.codicon-layout:before{content:""}.codicon-layout-activitybar-left:before{content:""}.codicon-layout-activitybar-right:before{content:""}.codicon-layout-panel-left:before{content:""}.codicon-layout-panel-center:before{content:""}.codicon-layout-panel-justify:before{content:""}.codicon-layout-panel-right:before{content:""}.codicon-layout-panel:before{content:""}.codicon-layout-sidebar-left:before{content:""}.codicon-layout-sidebar-right:before{content:""}.codicon-layout-statusbar:before{content:""}.codicon-layout-menubar:before{content:""}.codicon-layout-centered:before{content:""}.codicon-layout-sidebar-right-off:before{content:""}.codicon-layout-panel-off:before{content:""}.codicon-layout-sidebar-left-off:before{content:""}.codicon-target:before{content:""}.codicon-indent:before{content:""}.codicon-record-small:before{content:""}.codicon-error-small:before{content:""}.codicon-arrow-circle-down:before{content:""}.codicon-arrow-circle-left:before{content:""}.codicon-arrow-circle-right:before{content:""}.codicon-arrow-circle-up:before{content:""}.codicon-heart-filled:before{content:""}.codicon-map:before{content:""}.codicon-map-filled:before{content:""}.codicon-circle-small:before{content:""}.codicon-bell-slash:before{content:""}.codicon-bell-slash-dot:before{content:""}.codicon-comment-unresolved:before{content:""}.codicon-git-pull-request-go-to-changes:before{content:""}.codicon-git-pull-request-new-changes:before{content:""}.codicon-search-fuzzy:before{content:""}.codicon-comment-draft:before{content:""}.codicon-send:before{content:""}.codicon-sparkle:before{content:""}.codicon-insert:before{content:""}.toolbar-button{flex:none;border:none;outline:none;color:var(--vscode-sideBarTitle-foreground);background:transparent;padding:4px;cursor:pointer;display:inline-flex;align-items:center}.toolbar-button:disabled{color:var(--vscode-disabledForeground)!important;cursor:default}.toolbar-button:not(:disabled):hover{background-color:var(--vscode-toolbar-hoverBackground)}.toolbar-button:not(:disabled):active{background-color:var(--vscode-toolbar-activeBackground)}.toolbar-button.toggled{color:var(--vscode-notificationLink-foreground)}.toolbar-separator{flex:none;background-color:var(--vscode-menu-separatorBackground);width:1px;padding:0;margin:5px 4px;height:16px}.split-view{display:flex;flex:auto;position:relative}.split-view.vertical{flex-direction:column}.split-view.vertical.sidebar-first{flex-direction:column-reverse}.split-view.horizontal{flex-direction:row}.split-view.horizontal.sidebar-first{flex-direction:row-reverse}.split-view-main{display:flex;flex:auto}.split-view-sidebar{display:flex;flex:none}.split-view.vertical:not(.sidebar-first)>.split-view-sidebar{border-top:1px solid var(--vscode-panel-border)}.split-view.horizontal:not(.sidebar-first)>.split-view-sidebar{border-left:1px solid var(--vscode-panel-border)}.split-view.vertical.sidebar-first>.split-view-sidebar{border-bottom:1px solid var(--vscode-panel-border)}.split-view.horizontal.sidebar-first>.split-view-sidebar{border-right:1px solid var(--vscode-panel-border)}.split-view-resizer{position:absolute;z-index:100}.split-view.vertical>.split-view-resizer{left:0;right:0;height:12px;cursor:ns-resize}.split-view.horizontal>.split-view-resizer{top:0;bottom:0;width:12px;cursor:ew-resize}.action-title{display:block;overflow:hidden;text-overflow:ellipsis}.action-location{display:flex;flex:none;margin:0 4px;color:var(--vscode-foreground)}.action-location>span{margin:0 4px;cursor:pointer;text-decoration:underline}.action-duration{display:flex;flex:none;align-items:center;margin:0 4px;color:var(--vscode-editorCodeLens-foreground)}.action-icon{flex:none;display:flex;align-items:center;padding-right:3px}.action-icons{flex:none;display:flex;flex-direction:row;cursor:pointer;height:20px;position:relative;top:1px;border-bottom:1px solid transparent}.action-icons:hover{border-bottom:1px solid var(--vscode-sideBarTitle-foreground)}.action-error{color:var(--vscode-errorForeground);position:relative;margin-right:2px;flex:none}.action-selector{display:inline;flex:none;padding-left:5px;color:var(--vscode-charts-orange)}.action-url{display:inline;flex:none;padding-left:5px;color:var(--vscode-charts-blue)}.action-list-show-all{display:flex;cursor:pointer;height:28px;align-items:center}.list-view-content{display:flex;flex-direction:column;flex:auto;position:relative;-webkit-user-select:none;user-select:none;overflow:hidden auto;outline:1px solid transparent}.list-view-entry{display:flex;flex:none;cursor:pointer;align-items:center;white-space:nowrap;line-height:28px;padding-left:5px}.list-view-entry.highlighted:not(.selected){background-color:var(--vscode-list-inactiveSelectionBackground)!important}.list-view-entry.selected{z-index:10}.list-view-indent{min-width:16px}.list-view-content:focus .list-view-entry.selected{background-color:var(--vscode-list-activeSelectionBackground);color:var(--vscode-list-activeSelectionForeground);outline:1px solid var(--vscode-focusBorder)}.list-view-content .list-view-entry.selected{background-color:var(--vscode-list-inactiveSelectionBackground)}.list-view-content:focus .list-view-entry.selected *{color:var(--vscode-list-activeSelectionForeground)!important;background-color:transparent!important}.list-view-content:focus .list-view-entry.selected .codicon{color:var(--vscode-list-activeSelectionForeground)!important}.list-view-empty{flex:auto;display:flex;align-items:center;justify-content:center}.list-view-entry.error{color:var(--vscode-list-errorForeground);background-color:var(--vscode-inputValidation-errorBackground)}.list-view-entry.warning{color:var(--vscode-list-warningForeground);background-color:var(--vscode-inputValidation-warningBackground)}.list-view-entry.info{background-color:var(--vscode-inputValidation-infoBackground)}.call-tab{flex:auto;line-height:24px;white-space:pre;overflow:auto;-webkit-user-select:text;user-select:text}.call-error{border-bottom:1px solid var(--vscode-panel-border);padding:3px 0 3px 12px}.call-error .codicon{color:var(--vscode-errorForeground);position:relative;top:2px;margin-right:2px}.call-section{padding-left:6px;font-weight:700;text-transform:uppercase;font-size:10px;color:var(--vscode-sideBarTitle-foreground);line-height:24px}.call-section:not(:first-child){border-top:1px solid var(--vscode-panel-border)}.call-line{padding:4px 0 4px 6px;display:flex;align-items:center;text-overflow:ellipsis;overflow:hidden;line-height:18px;white-space:nowrap}.copy-icon{display:none;margin-right:4px}.call-line:hover .copy-icon{display:block;cursor:pointer}.call-value{margin-left:2px;text-overflow:ellipsis;overflow:hidden;flex:1}.call-value:before{content:" "}.call-value.datetime,.call-value.string,.call-value.locator{color:var(--vscode-charts-orange)}.call-value.number,.call-value.bigint,.call-value.boolean,.call-value.symbol,.call-value.undefined,.call-value.function,.call-value.object{color:var(--vscode-charts-blue)}.call-tab .error-message{padding:5px;line-height:17px}.log-list-duration{display:flex;flex:none;align-items:center;color:var(--vscode-editorCodeLens-foreground);float:right;margin-right:5px;-webkit-user-select:none;user-select:none}.log-list-item{text-wrap:wrap;-webkit-user-select:text;user-select:text;width:100%}.error-message{font-family:var(--vscode-editor-font-family);font-weight:var(--vscode-editor-font-weight);font-size:var(--vscode-editor-font-size);white-space:pre-wrap;word-break:break-word;padding:10px}.console-tab{display:flex;flex:auto;white-space:pre}.console-line{width:100%;-webkit-user-select:text;user-select:text}.console-line .codicon{padding:0 2px 0 3px;position:relative;flex:none;top:3px}.console-line.warning .codicon{color:#ff8c00}.console-line-message{word-break:break-word;white-space:pre-wrap;position:relative}.console-location{padding-right:3px;float:right;color:var(--vscode-editorCodeLens-foreground);-webkit-user-select:none;user-select:none}.console-time{float:left;min-width:50px;color:var(--vscode-editorCodeLens-foreground);-webkit-user-select:none;user-select:none}.console-stack{white-space:pre-wrap;margin-left:50px}.console-line .codicon.status-none:after,.console-line .codicon.status-error:after,.console-line .codicon.status-warning:after{display:inline-block;content:"a";color:transparent;border-radius:4px;width:8px;height:8px;position:relative;top:8px;left:-7px}.console-line .codicon.status-error:after{background-color:var(--vscode-errorForeground)}.console-line .codicon.status-warning:after{background-color:var(--vscode-list-warningForeground)}.network-request-status-route{color:var(--vscode-statusBar-foreground);background-color:var(--vscode-statusBar-background)}.network-request-status-route.api{color:var(--vscode-statusBar-foreground);background-color:var(--vscode-statusBarItem-remoteBackground)}.network-grid-view .grid-view-column-method,.network-grid-view .grid-view-column-status{text-align:center}.network-grid-view .grid-view-column-duration,.network-grid-view .grid-view-column-size,.network-grid-view .grid-view-column-start{text-align:end}.network-request-details-tab{width:100%;-webkit-user-select:text;user-select:text;line-height:24px;margin-left:10px;overflow:auto}.network-request-details-url{white-space:normal;word-wrap:break-word;margin-left:10px}.network-request-details-headers{white-space:pre;overflow:hidden;margin-left:10px}.network-request-details-header{margin:3px 0;font-weight:700}.network-request-details-tab .cm-wrapper{overflow:hidden}.tab-network .toolbar{min-height:30px!important;background-color:initial!important;border-bottom:1px solid var(--vscode-panel-border)}.tab-network .toolbar:after{box-shadow:none!important}.tab-network .tabbed-pane-tab.selected{font-weight:700}.tabbed-pane{display:flex;flex:auto;overflow:hidden}.tabbed-pane .toolbar{background-color:var(--vscode-sideBar-background)}.tabbed-pane .tab-content{display:flex;flex:auto;overflow:hidden;position:relative;flex-direction:column}.tabbed-pane-tab{padding:2px 6px 0;cursor:pointer;display:flex;align-items:center;justify-content:center;-webkit-user-select:none;user-select:none;border-bottom:2px solid transparent;outline:none;height:100%}.tabbed-pane-tab-label{max-width:250px;white-space:pre;overflow:hidden;text-overflow:ellipsis;display:inline-block}.tabbed-pane-tab.selected{background-color:var(--vscode-tab-activeBackground)}.tabbed-pane-tab-counter{padding:0 4px;background:var(--vscode-menu-separatorBackground);border-radius:8px;height:16px;margin-left:4px;line-height:16px;min-width:18px;display:flex;align-items:center;justify-content:center}.tabbed-pane-tab-counter.error{background:var(--vscode-list-errorForeground);color:var(--vscode-button-foreground)}.toolbar{position:relative;display:flex;color:var(--vscode-sideBarTitle-foreground);min-height:35px;align-items:center;flex:none;padding-right:4px}.toolbar:after{content:"";display:block;position:absolute;pointer-events:none;top:0;bottom:0;left:-2px;right:-2px;box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px;z-index:100}.toolbar.no-shadow:after{box-shadow:none}.toolbar.no-min-height{min-height:0}.toolbar input{padding:0 5px;line-height:24px;outline:none;margin:0 4px}.toolbar select{background:none;outline:none;padding:3px;margin:2px}.toolbar input,.toolbar select{border:none;color:var(--vscode-input-foreground);background-color:var(--vscode-input-background)}body{--vscode-font-family: system-ui, "Ubuntu", "Droid Sans", sans-serif;--vscode-font-weight: normal;--vscode-font-size: 13px;--vscode-editor-font-family: "Droid Sans Mono", "monospace", monospace;--vscode-editor-font-weight: normal;--vscode-editor-font-size: 14px;--vscode-foreground: #616161;--vscode-disabledForeground: rgba(97, 97, 97, .5);--vscode-errorForeground: #a1260d;--vscode-descriptionForeground: #717171;--vscode-icon-foreground: #424242;--vscode-focusBorder: #0090f1;--vscode-textSeparator-foreground: rgba(0, 0, 0, .18);--vscode-textLink-foreground: #006ab1;--vscode-textLink-activeForeground: #006ab1;--vscode-textPreformat-foreground: #a31515;--vscode-textBlockQuote-background: rgba(127, 127, 127, .1);--vscode-textBlockQuote-border: rgba(0, 122, 204, .5);--vscode-textCodeBlock-background: rgba(220, 220, 220, .4);--vscode-widget-shadow: rgba(0, 0, 0, .16);--vscode-input-background: #ffffff;--vscode-input-foreground: #616161;--vscode-inputOption-activeBorder: #007acc;--vscode-inputOption-hoverBackground: rgba(184, 184, 184, .31);--vscode-inputOption-activeBackground: rgba(0, 144, 241, .2);--vscode-inputOption-activeForeground: #000000;--vscode-input-placeholderForeground: #767676;--vscode-inputValidation-infoBackground: #d6ecf2;--vscode-inputValidation-infoBorder: #007acc;--vscode-inputValidation-warningBackground: #f6f5d2;--vscode-inputValidation-warningBorder: #b89500;--vscode-inputValidation-errorBackground: #f2dede;--vscode-inputValidation-errorBorder: #be1100;--vscode-dropdown-background: #ffffff;--vscode-dropdown-border: #cecece;--vscode-checkbox-background: #ffffff;--vscode-checkbox-border: #cecece;--vscode-button-foreground: #ffffff;--vscode-button-separator: rgba(255, 255, 255, .4);--vscode-button-background: #007acc;--vscode-button-hoverBackground: #0062a3;--vscode-button-secondaryForeground: #ffffff;--vscode-button-secondaryBackground: #5f6a79;--vscode-button-secondaryHoverBackground: #4c5561;--vscode-badge-background: #c4c4c4;--vscode-badge-foreground: #333333;--vscode-scrollbar-shadow: #dddddd;--vscode-scrollbarSlider-background: rgba(100, 100, 100, .4);--vscode-scrollbarSlider-hoverBackground: rgba(100, 100, 100, .7);--vscode-scrollbarSlider-activeBackground: rgba(0, 0, 0, .6);--vscode-progressBar-background: #0e70c0;--vscode-editorError-foreground: #e51400;--vscode-editorWarning-foreground: #bf8803;--vscode-editorInfo-foreground: #1a85ff;--vscode-editorHint-foreground: #6c6c6c;--vscode-sash-hoverBorder: #0090f1;--vscode-editor-background: #ffffff;--vscode-editor-foreground: #000000;--vscode-editorStickyScroll-background: #ffffff;--vscode-editorStickyScrollHover-background: #f0f0f0;--vscode-editorWidget-background: #f3f3f3;--vscode-editorWidget-foreground: #616161;--vscode-editorWidget-border: #c8c8c8;--vscode-quickInput-background: #f3f3f3;--vscode-quickInput-foreground: #616161;--vscode-quickInputTitle-background: rgba(0, 0, 0, .06);--vscode-pickerGroup-foreground: #0066bf;--vscode-pickerGroup-border: #cccedb;--vscode-keybindingLabel-background: rgba(221, 221, 221, .4);--vscode-keybindingLabel-foreground: #555555;--vscode-keybindingLabel-border: rgba(204, 204, 204, .4);--vscode-keybindingLabel-bottomBorder: rgba(187, 187, 187, .4);--vscode-editor-selectionBackground: #add6ff;--vscode-editor-inactiveSelectionBackground: #e5ebf1;--vscode-editor-selectionHighlightBackground: rgba(173, 214, 255, .5);--vscode-editor-findMatchBackground: #a8ac94;--vscode-editor-findMatchHighlightBackground: rgba(234, 92, 0, .33);--vscode-editor-findRangeHighlightBackground: rgba(180, 180, 180, .3);--vscode-searchEditor-findMatchBackground: rgba(234, 92, 0, .22);--vscode-editor-hoverHighlightBackground: rgba(173, 214, 255, .15);--vscode-editorHoverWidget-background: #f3f3f3;--vscode-editorHoverWidget-foreground: #616161;--vscode-editorHoverWidget-border: #c8c8c8;--vscode-editorHoverWidget-statusBarBackground: #e7e7e7;--vscode-editorLink-activeForeground: #0000ff;--vscode-editorInlayHint-foreground: rgba(51, 51, 51, .8);--vscode-editorInlayHint-background: rgba(196, 196, 196, .3);--vscode-editorInlayHint-typeForeground: rgba(51, 51, 51, .8);--vscode-editorInlayHint-typeBackground: rgba(196, 196, 196, .3);--vscode-editorInlayHint-parameterForeground: rgba(51, 51, 51, .8);--vscode-editorInlayHint-parameterBackground: rgba(196, 196, 196, .3);--vscode-editorLightBulb-foreground: #ddb100;--vscode-editorLightBulbAutoFix-foreground: #007acc;--vscode-diffEditor-insertedTextBackground: rgba(156, 204, 44, .4);--vscode-diffEditor-removedTextBackground: rgba(255, 0, 0, .3);--vscode-diffEditor-insertedLineBackground: rgba(155, 185, 85, .2);--vscode-diffEditor-removedLineBackground: rgba(255, 0, 0, .2);--vscode-diffEditor-diagonalFill: rgba(34, 34, 34, .2);--vscode-list-focusOutline: #0090f1;--vscode-list-focusAndSelectionOutline: #90c2f9;--vscode-list-activeSelectionBackground: #0060c0;--vscode-list-activeSelectionForeground: #ffffff;--vscode-list-activeSelectionIconForeground: #ffffff;--vscode-list-inactiveSelectionBackground: #e4e6f1;--vscode-list-hoverBackground: #e8e8e8;--vscode-list-dropBackground: #d6ebff;--vscode-list-highlightForeground: #0066bf;--vscode-list-focusHighlightForeground: #bbe7ff;--vscode-list-invalidItemForeground: #b89500;--vscode-list-errorForeground: #b01011;--vscode-list-warningForeground: #855f00;--vscode-listFilterWidget-background: #f3f3f3;--vscode-listFilterWidget-outline: rgba(0, 0, 0, 0);--vscode-listFilterWidget-noMatchesOutline: #be1100;--vscode-listFilterWidget-shadow: rgba(0, 0, 0, .16);--vscode-list-filterMatchBackground: rgba(234, 92, 0, .33);--vscode-tree-indentGuidesStroke: #a9a9a9;--vscode-tree-tableColumnsBorder: rgba(97, 97, 97, .13);--vscode-tree-tableOddRowsBackground: rgba(97, 97, 97, .04);--vscode-list-deemphasizedForeground: #8e8e90;--vscode-quickInputList-focusForeground: #ffffff;--vscode-quickInputList-focusIconForeground: #ffffff;--vscode-quickInputList-focusBackground: #0060c0;--vscode-menu-foreground: #616161;--vscode-menu-background: #ffffff;--vscode-menu-selectionForeground: #ffffff;--vscode-menu-selectionBackground: #0060c0;--vscode-menu-separatorBackground: #d4d4d4;--vscode-toolbar-hoverBackground: rgba(184, 184, 184, .31);--vscode-toolbar-activeBackground: rgba(166, 166, 166, .31);--vscode-editor-snippetTabstopHighlightBackground: rgba(10, 50, 100, .2);--vscode-editor-snippetFinalTabstopHighlightBorder: rgba(10, 50, 100, .5);--vscode-breadcrumb-foreground: rgba(97, 97, 97, .8);--vscode-breadcrumb-background: #ffffff;--vscode-breadcrumb-focusForeground: #4e4e4e;--vscode-breadcrumb-activeSelectionForeground: #4e4e4e;--vscode-breadcrumbPicker-background: #f3f3f3;--vscode-merge-currentHeaderBackground: rgba(64, 200, 174, .5);--vscode-merge-currentContentBackground: rgba(64, 200, 174, .2);--vscode-merge-incomingHeaderBackground: rgba(64, 166, 255, .5);--vscode-merge-incomingContentBackground: rgba(64, 166, 255, .2);--vscode-merge-commonHeaderBackground: rgba(96, 96, 96, .4);--vscode-merge-commonContentBackground: rgba(96, 96, 96, .16);--vscode-editorOverviewRuler-currentContentForeground: rgba(64, 200, 174, .5);--vscode-editorOverviewRuler-incomingContentForeground: rgba(64, 166, 255, .5);--vscode-editorOverviewRuler-commonContentForeground: rgba(96, 96, 96, .4);--vscode-editorOverviewRuler-findMatchForeground: rgba(209, 134, 22, .49);--vscode-editorOverviewRuler-selectionHighlightForeground: rgba(160, 160, 160, .8);--vscode-minimap-findMatchHighlight: #d18616;--vscode-minimap-selectionOccurrenceHighlight: #c9c9c9;--vscode-minimap-selectionHighlight: #add6ff;--vscode-minimap-errorHighlight: rgba(255, 18, 18, .7);--vscode-minimap-warningHighlight: #bf8803;--vscode-minimap-foregroundOpacity: #000000;--vscode-minimapSlider-background: rgba(100, 100, 100, .2);--vscode-minimapSlider-hoverBackground: rgba(100, 100, 100, .35);--vscode-minimapSlider-activeBackground: rgba(0, 0, 0, .3);--vscode-problemsErrorIcon-foreground: #e51400;--vscode-problemsWarningIcon-foreground: #bf8803;--vscode-problemsInfoIcon-foreground: #1a85ff;--vscode-charts-foreground: #616161;--vscode-charts-lines: rgba(97, 97, 97, .5);--vscode-charts-red: #e51400;--vscode-charts-blue: #1a85ff;--vscode-charts-yellow: #bf8803;--vscode-charts-orange: #d18616;--vscode-charts-green: #388a34;--vscode-charts-purple: #652d90;--vscode-editor-lineHighlightBorder: #eeeeee;--vscode-editor-rangeHighlightBackground: rgba(253, 255, 0, .2);--vscode-editor-symbolHighlightBackground: rgba(234, 92, 0, .33);--vscode-editorCursor-foreground: #000000;--vscode-editorWhitespace-foreground: rgba(51, 51, 51, .2);--vscode-editorIndentGuide-background: #d3d3d3;--vscode-editorIndentGuide-activeBackground: #939393;--vscode-editorLineNumber-foreground: #237893;--vscode-editorActiveLineNumber-foreground: #0b216f;--vscode-editorLineNumber-activeForeground: #0b216f;--vscode-editorRuler-foreground: #d3d3d3;--vscode-editorCodeLens-foreground: #919191;--vscode-editorBracketMatch-background: rgba(0, 100, 0, .1);--vscode-editorBracketMatch-border: #b9b9b9;--vscode-editorOverviewRuler-border: rgba(127, 127, 127, .3);--vscode-editorGutter-background: #ffffff;--vscode-editorUnnecessaryCode-opacity: rgba(0, 0, 0, .47);--vscode-editorGhostText-foreground: rgba(0, 0, 0, .47);--vscode-editorOverviewRuler-rangeHighlightForeground: rgba(0, 122, 204, .6);--vscode-editorOverviewRuler-errorForeground: rgba(255, 18, 18, .7);--vscode-editorOverviewRuler-warningForeground: #bf8803;--vscode-editorOverviewRuler-infoForeground: #1a85ff;--vscode-editorBracketHighlight-foreground1: #0431fa;--vscode-editorBracketHighlight-foreground2: #319331;--vscode-editorBracketHighlight-foreground3: #7b3814;--vscode-editorBracketHighlight-foreground4: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-foreground5: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-foreground6: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-unexpectedBracket\.foreground: rgba(255, 18, 18, .8);--vscode-editorBracketPairGuide-background1: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background2: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background3: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background4: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background5: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background6: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground1: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground2: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground3: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground4: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground5: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground6: rgba(0, 0, 0, 0);--vscode-editorUnicodeHighlight-border: #cea33d;--vscode-editorUnicodeHighlight-background: rgba(206, 163, 61, .08);--vscode-symbolIcon-arrayForeground: #616161;--vscode-symbolIcon-booleanForeground: #616161;--vscode-symbolIcon-classForeground: #d67e00;--vscode-symbolIcon-colorForeground: #616161;--vscode-symbolIcon-constantForeground: #616161;--vscode-symbolIcon-constructorForeground: #652d90;--vscode-symbolIcon-enumeratorForeground: #d67e00;--vscode-symbolIcon-enumeratorMemberForeground: #007acc;--vscode-symbolIcon-eventForeground: #d67e00;--vscode-symbolIcon-fieldForeground: #007acc;--vscode-symbolIcon-fileForeground: #616161;--vscode-symbolIcon-folderForeground: #616161;--vscode-symbolIcon-functionForeground: #652d90;--vscode-symbolIcon-interfaceForeground: #007acc;--vscode-symbolIcon-keyForeground: #616161;--vscode-symbolIcon-keywordForeground: #616161;--vscode-symbolIcon-methodForeground: #652d90;--vscode-symbolIcon-moduleForeground: #616161;--vscode-symbolIcon-namespaceForeground: #616161;--vscode-symbolIcon-nullForeground: #616161;--vscode-symbolIcon-numberForeground: #616161;--vscode-symbolIcon-objectForeground: #616161;--vscode-symbolIcon-operatorForeground: #616161;--vscode-symbolIcon-packageForeground: #616161;--vscode-symbolIcon-propertyForeground: #616161;--vscode-symbolIcon-referenceForeground: #616161;--vscode-symbolIcon-snippetForeground: #616161;--vscode-symbolIcon-stringForeground: #616161;--vscode-symbolIcon-structForeground: #616161;--vscode-symbolIcon-textForeground: #616161;--vscode-symbolIcon-typeParameterForeground: #616161;--vscode-symbolIcon-unitForeground: #616161;--vscode-symbolIcon-variableForeground: #007acc;--vscode-editorHoverWidget-highlightForeground: #0066bf;--vscode-editorOverviewRuler-bracketMatchForeground: #a0a0a0;--vscode-editor-foldBackground: rgba(173, 214, 255, .3);--vscode-editorGutter-foldingControlForeground: #424242;--vscode-editor-linkedEditingBackground: rgba(255, 0, 0, .3);--vscode-editor-wordHighlightBackground: rgba(87, 87, 87, .25);--vscode-editor-wordHighlightStrongBackground: rgba(14, 99, 156, .25);--vscode-editorOverviewRuler-wordHighlightForeground: rgba(160, 160, 160, .8);--vscode-editorOverviewRuler-wordHighlightStrongForeground: rgba(192, 160, 192, .8);--vscode-peekViewTitle-background: rgba(26, 133, 255, .1);--vscode-peekViewTitleLabel-foreground: #000000;--vscode-peekViewTitleDescription-foreground: #616161;--vscode-peekView-border: #1a85ff;--vscode-peekViewResult-background: #f3f3f3;--vscode-peekViewResult-lineForeground: #646465;--vscode-peekViewResult-fileForeground: #1e1e1e;--vscode-peekViewResult-selectionBackground: rgba(51, 153, 255, .2);--vscode-peekViewResult-selectionForeground: #6c6c6c;--vscode-peekViewEditor-background: #f2f8fc;--vscode-peekViewEditorGutter-background: #f2f8fc;--vscode-peekViewResult-matchHighlightBackground: rgba(234, 92, 0, .3);--vscode-peekViewEditor-matchHighlightBackground: rgba(245, 216, 2, .87);--vscode-editorMarkerNavigationError-background: #e51400;--vscode-editorMarkerNavigationError-headerBackground: rgba(229, 20, 0, .1);--vscode-editorMarkerNavigationWarning-background: #bf8803;--vscode-editorMarkerNavigationWarning-headerBackground: rgba(191, 136, 3, .1);--vscode-editorMarkerNavigationInfo-background: #1a85ff;--vscode-editorMarkerNavigationInfo-headerBackground: rgba(26, 133, 255, .1);--vscode-editorMarkerNavigation-background: #ffffff;--vscode-editorSuggestWidget-background: #f3f3f3;--vscode-editorSuggestWidget-border: #c8c8c8;--vscode-editorSuggestWidget-foreground: #000000;--vscode-editorSuggestWidget-selectedForeground: #ffffff;--vscode-editorSuggestWidget-selectedIconForeground: #ffffff;--vscode-editorSuggestWidget-selectedBackground: #0060c0;--vscode-editorSuggestWidget-highlightForeground: #0066bf;--vscode-editorSuggestWidget-focusHighlightForeground: #bbe7ff;--vscode-editorSuggestWidgetStatus-foreground: rgba(0, 0, 0, .5);--vscode-tab-activeBackground: #ffffff;--vscode-tab-unfocusedActiveBackground: #ffffff;--vscode-tab-inactiveBackground: #ececec;--vscode-tab-unfocusedInactiveBackground: #ececec;--vscode-tab-activeForeground: #333333;--vscode-tab-inactiveForeground: rgba(51, 51, 51, .7);--vscode-tab-unfocusedActiveForeground: rgba(51, 51, 51, .7);--vscode-tab-unfocusedInactiveForeground: rgba(51, 51, 51, .35);--vscode-tab-border: #f3f3f3;--vscode-tab-lastPinnedBorder: rgba(97, 97, 97, .19);--vscode-tab-activeModifiedBorder: #33aaee;--vscode-tab-inactiveModifiedBorder: rgba(51, 170, 238, .5);--vscode-tab-unfocusedActiveModifiedBorder: rgba(51, 170, 238, .7);--vscode-tab-unfocusedInactiveModifiedBorder: rgba(51, 170, 238, .25);--vscode-editorPane-background: #ffffff;--vscode-editorGroupHeader-tabsBackground: #f3f3f3;--vscode-editorGroupHeader-noTabsBackground: #ffffff;--vscode-editorGroup-border: #e7e7e7;--vscode-editorGroup-dropBackground: rgba(38, 119, 203, .18);--vscode-editorGroup-dropIntoPromptForeground: #616161;--vscode-editorGroup-dropIntoPromptBackground: #f3f3f3;--vscode-sideBySideEditor-horizontalBorder: #e7e7e7;--vscode-sideBySideEditor-verticalBorder: #e7e7e7;--vscode-panel-background: #ffffff;--vscode-panel-border: rgba(128, 128, 128, .35);--vscode-panelTitle-activeForeground: #424242;--vscode-panelTitle-inactiveForeground: rgba(66, 66, 66, .75);--vscode-panelTitle-activeBorder: #424242;--vscode-panelInput-border: #dddddd;--vscode-panel-dropBorder: #424242;--vscode-panelSection-dropBackground: rgba(38, 119, 203, .18);--vscode-panelSectionHeader-background: rgba(128, 128, 128, .2);--vscode-panelSection-border: rgba(128, 128, 128, .35);--vscode-banner-background: #004386;--vscode-banner-foreground: #ffffff;--vscode-banner-iconForeground: #1a85ff;--vscode-statusBar-foreground: #ffffff;--vscode-statusBar-noFolderForeground: #ffffff;--vscode-statusBar-background: #007acc;--vscode-statusBar-noFolderBackground: #68217a;--vscode-statusBar-focusBorder: #ffffff;--vscode-statusBarItem-activeBackground: rgba(255, 255, 255, .18);--vscode-statusBarItem-focusBorder: #ffffff;--vscode-statusBarItem-hoverBackground: rgba(255, 255, 255, .12);--vscode-statusBarItem-compactHoverBackground: rgba(255, 255, 255, .2);--vscode-statusBarItem-prominentForeground: #ffffff;--vscode-statusBarItem-prominentBackground: rgba(0, 0, 0, .5);--vscode-statusBarItem-prominentHoverBackground: rgba(0, 0, 0, .3);--vscode-statusBarItem-errorBackground: #c72e0f;--vscode-statusBarItem-errorForeground: #ffffff;--vscode-statusBarItem-warningBackground: #725102;--vscode-statusBarItem-warningForeground: #ffffff;--vscode-activityBar-background: #2c2c2c;--vscode-activityBar-foreground: #ffffff;--vscode-activityBar-inactiveForeground: rgba(255, 255, 255, .4);--vscode-activityBar-activeBorder: #ffffff;--vscode-activityBar-dropBorder: #ffffff;--vscode-activityBarBadge-background: #007acc;--vscode-activityBarBadge-foreground: #ffffff;--vscode-statusBarItem-remoteBackground: #16825d;--vscode-statusBarItem-remoteForeground: #ffffff;--vscode-extensionBadge-remoteBackground: #007acc;--vscode-extensionBadge-remoteForeground: #ffffff;--vscode-sideBar-background: #f3f3f3;--vscode-sideBarTitle-foreground: #6f6f6f;--vscode-sideBar-dropBackground: rgba(38, 119, 203, .18);--vscode-sideBarSectionHeader-background: rgba(0, 0, 0, 0);--vscode-sideBarSectionHeader-border: rgba(97, 97, 97, .19);--vscode-titleBar-activeForeground: #333333;--vscode-titleBar-inactiveForeground: rgba(51, 51, 51, .6);--vscode-titleBar-activeBackground: #dddddd;--vscode-titleBar-inactiveBackground: rgba(221, 221, 221, .6);--vscode-menubar-selectionForeground: #333333;--vscode-menubar-selectionBackground: rgba(184, 184, 184, .31);--vscode-notifications-foreground: #616161;--vscode-notifications-background: #f3f3f3;--vscode-notificationLink-foreground: #006ab1;--vscode-notificationCenterHeader-background: #e7e7e7;--vscode-notifications-border: #e7e7e7;--vscode-notificationsErrorIcon-foreground: #e51400;--vscode-notificationsWarningIcon-foreground: #bf8803;--vscode-notificationsInfoIcon-foreground: #1a85ff;--vscode-commandCenter-foreground: #333333;--vscode-commandCenter-activeForeground: #333333;--vscode-commandCenter-activeBackground: rgba(184, 184, 184, .31);--vscode-commandCenter-border: rgba(128, 128, 128, .35);--vscode-editorCommentsWidget-resolvedBorder: rgba(97, 97, 97, .5);--vscode-editorCommentsWidget-unresolvedBorder: #1a85ff;--vscode-editorCommentsWidget-rangeBackground: rgba(26, 133, 255, .1);--vscode-editorCommentsWidget-rangeBorder: rgba(26, 133, 255, .4);--vscode-editorCommentsWidget-rangeActiveBackground: rgba(26, 133, 255, .1);--vscode-editorCommentsWidget-rangeActiveBorder: rgba(26, 133, 255, .4);--vscode-editorGutter-commentRangeForeground: #d5d8e9;--vscode-debugToolBar-background: #f3f3f3;--vscode-debugIcon-startForeground: #388a34;--vscode-editor-stackFrameHighlightBackground: rgba(255, 255, 102, .45);--vscode-editor-focusedStackFrameHighlightBackground: rgba(206, 231, 206, .45);--vscode-mergeEditor-change\.background: rgba(155, 185, 85, .2);--vscode-mergeEditor-change\.word\.background: rgba(156, 204, 44, .4);--vscode-mergeEditor-conflict\.unhandledUnfocused\.border: rgba(255, 166, 0, .48);--vscode-mergeEditor-conflict\.unhandledFocused\.border: #ffa600;--vscode-mergeEditor-conflict\.handledUnfocused\.border: rgba(134, 134, 134, .29);--vscode-mergeEditor-conflict\.handledFocused\.border: rgba(193, 193, 193, .8);--vscode-mergeEditor-conflict\.handled\.minimapOverViewRuler: rgba(173, 172, 168, .93);--vscode-mergeEditor-conflict\.unhandled\.minimapOverViewRuler: #fcba03;--vscode-mergeEditor-conflictingLines\.background: rgba(255, 234, 0, .28);--vscode-settings-headerForeground: #444444;--vscode-settings-modifiedItemIndicator: #66afe0;--vscode-settings-headerBorder: rgba(128, 128, 128, .35);--vscode-settings-sashBorder: rgba(128, 128, 128, .35);--vscode-settings-dropdownBackground: #ffffff;--vscode-settings-dropdownBorder: #cecece;--vscode-settings-dropdownListBorder: #c8c8c8;--vscode-settings-checkboxBackground: #ffffff;--vscode-settings-checkboxBorder: #cecece;--vscode-settings-textInputBackground: #ffffff;--vscode-settings-textInputForeground: #616161;--vscode-settings-textInputBorder: #cecece;--vscode-settings-numberInputBackground: #ffffff;--vscode-settings-numberInputForeground: #616161;--vscode-settings-numberInputBorder: #cecece;--vscode-settings-focusedRowBackground: rgba(232, 232, 232, .6);--vscode-settings-rowHoverBackground: rgba(232, 232, 232, .3);--vscode-settings-focusedRowBorder: rgba(0, 0, 0, .12);--vscode-terminal-foreground: #333333;--vscode-terminal-selectionBackground: #add6ff;--vscode-terminal-inactiveSelectionBackground: #e5ebf1;--vscode-terminalCommandDecoration-defaultBackground: rgba(0, 0, 0, .25);--vscode-terminalCommandDecoration-successBackground: #2090d3;--vscode-terminalCommandDecoration-errorBackground: #e51400;--vscode-terminalOverviewRuler-cursorForeground: rgba(160, 160, 160, .8);--vscode-terminal-border: rgba(128, 128, 128, .35);--vscode-terminal-findMatchBackground: #a8ac94;--vscode-terminal-findMatchHighlightBackground: rgba(234, 92, 0, .33);--vscode-terminalOverviewRuler-findMatchForeground: rgba(209, 134, 22, .49);--vscode-terminal-dropBackground: rgba(38, 119, 203, .18);--vscode-testing-iconFailed: #f14c4c;--vscode-testing-iconErrored: #f14c4c;--vscode-testing-iconPassed: #73c991;--vscode-testing-runAction: #73c991;--vscode-testing-iconQueued: #cca700;--vscode-testing-iconUnset: #848484;--vscode-testing-iconSkipped: #848484;--vscode-testing-peekBorder: #e51400;--vscode-testing-peekHeaderBackground: rgba(229, 20, 0, .1);--vscode-testing-message\.error\.decorationForeground: #e51400;--vscode-testing-message\.error\.lineBackground: rgba(255, 0, 0, .2);--vscode-testing-message\.info\.decorationForeground: rgba(0, 0, 0, .5);--vscode-welcomePage-tileBackground: #f3f3f3;--vscode-welcomePage-tileHoverBackground: #dbdbdb;--vscode-welcomePage-tileShadow: rgba(0, 0, 0, .16);--vscode-welcomePage-progress\.background: #ffffff;--vscode-welcomePage-progress\.foreground: #006ab1;--vscode-debugExceptionWidget-border: #a31515;--vscode-debugExceptionWidget-background: #f1dfde;--vscode-ports-iconRunningProcessForeground: #369432;--vscode-statusBar-debuggingBackground: #cc6633;--vscode-statusBar-debuggingForeground: #ffffff;--vscode-editor-inlineValuesForeground: rgba(0, 0, 0, .5);--vscode-editor-inlineValuesBackground: rgba(255, 200, 0, .2);--vscode-editorGutter-modifiedBackground: #2090d3;--vscode-editorGutter-addedBackground: #48985d;--vscode-editorGutter-deletedBackground: #e51400;--vscode-minimapGutter-modifiedBackground: #2090d3;--vscode-minimapGutter-addedBackground: #48985d;--vscode-minimapGutter-deletedBackground: #e51400;--vscode-editorOverviewRuler-modifiedForeground: rgba(32, 144, 211, .6);--vscode-editorOverviewRuler-addedForeground: rgba(72, 152, 93, .6);--vscode-editorOverviewRuler-deletedForeground: rgba(229, 20, 0, .6);--vscode-debugIcon-breakpointForeground: #e51400;--vscode-debugIcon-breakpointDisabledForeground: #848484;--vscode-debugIcon-breakpointUnverifiedForeground: #848484;--vscode-debugIcon-breakpointCurrentStackframeForeground: #be8700;--vscode-debugIcon-breakpointStackframeForeground: #89d185;--vscode-notebook-cellBorderColor: #e8e8e8;--vscode-notebook-focusedEditorBorder: #0090f1;--vscode-notebookStatusSuccessIcon-foreground: #388a34;--vscode-notebookStatusErrorIcon-foreground: #a1260d;--vscode-notebookStatusRunningIcon-foreground: #616161;--vscode-notebook-cellToolbarSeparator: rgba(128, 128, 128, .35);--vscode-notebook-selectedCellBackground: rgba(200, 221, 241, .31);--vscode-notebook-selectedCellBorder: #e8e8e8;--vscode-notebook-focusedCellBorder: #0090f1;--vscode-notebook-inactiveFocusedCellBorder: #e8e8e8;--vscode-notebook-cellStatusBarItemHoverBackground: rgba(0, 0, 0, .08);--vscode-notebook-cellInsertionIndicator: #0090f1;--vscode-notebookScrollbarSlider-background: rgba(100, 100, 100, .4);--vscode-notebookScrollbarSlider-hoverBackground: rgba(100, 100, 100, .7);--vscode-notebookScrollbarSlider-activeBackground: rgba(0, 0, 0, .6);--vscode-notebook-symbolHighlightBackground: rgba(253, 255, 0, .2);--vscode-notebook-cellEditorBackground: #f3f3f3;--vscode-notebook-editorBackground: #ffffff;--vscode-keybindingTable-headerBackground: rgba(97, 97, 97, .04);--vscode-keybindingTable-rowsBackground: rgba(97, 97, 97, .04);--vscode-scm-providerBorder: #c8c8c8;--vscode-searchEditor-textInputBorder: #cecece;--vscode-debugTokenExpression-name: #9b46b0;--vscode-debugTokenExpression-value: rgba(108, 108, 108, .8);--vscode-debugTokenExpression-string: #a31515;--vscode-debugTokenExpression-boolean: #0000ff;--vscode-debugTokenExpression-number: #098658;--vscode-debugTokenExpression-error: #e51400;--vscode-debugView-exceptionLabelForeground: #ffffff;--vscode-debugView-exceptionLabelBackground: #a31515;--vscode-debugView-stateLabelForeground: #616161;--vscode-debugView-stateLabelBackground: rgba(136, 136, 136, .27);--vscode-debugView-valueChangedHighlight: #569cd6;--vscode-debugConsole-infoForeground: #1a85ff;--vscode-debugConsole-warningForeground: #bf8803;--vscode-debugConsole-errorForeground: #a1260d;--vscode-debugConsole-sourceForeground: #616161;--vscode-debugConsoleInputIcon-foreground: #616161;--vscode-debugIcon-pauseForeground: #007acc;--vscode-debugIcon-stopForeground: #a1260d;--vscode-debugIcon-disconnectForeground: #a1260d;--vscode-debugIcon-restartForeground: #388a34;--vscode-debugIcon-stepOverForeground: #007acc;--vscode-debugIcon-stepIntoForeground: #007acc;--vscode-debugIcon-stepOutForeground: #007acc;--vscode-debugIcon-continueForeground: #007acc;--vscode-debugIcon-stepBackForeground: #007acc;--vscode-extensionButton-prominentBackground: #007acc;--vscode-extensionButton-prominentForeground: #ffffff;--vscode-extensionButton-prominentHoverBackground: #0062a3;--vscode-extensionIcon-starForeground: #df6100;--vscode-extensionIcon-verifiedForeground: #006ab1;--vscode-extensionIcon-preReleaseForeground: #1d9271;--vscode-extensionIcon-sponsorForeground: #b51e78;--vscode-terminal-ansiBlack: #000000;--vscode-terminal-ansiRed: #cd3131;--vscode-terminal-ansiGreen: #00bc00;--vscode-terminal-ansiYellow: #949800;--vscode-terminal-ansiBlue: #0451a5;--vscode-terminal-ansiMagenta: #bc05bc;--vscode-terminal-ansiCyan: #0598bc;--vscode-terminal-ansiWhite: #555555;--vscode-terminal-ansiBrightBlack: #666666;--vscode-terminal-ansiBrightRed: #cd3131;--vscode-terminal-ansiBrightGreen: #14ce14;--vscode-terminal-ansiBrightYellow: #b5ba00;--vscode-terminal-ansiBrightBlue: #0451a5;--vscode-terminal-ansiBrightMagenta: #bc05bc;--vscode-terminal-ansiBrightCyan: #0598bc;--vscode-terminal-ansiBrightWhite: #a5a5a5;--vscode-interactive-activeCodeBorder: #1a85ff;--vscode-interactive-inactiveCodeBorder: #e4e6f1;--vscode-gitDecoration-addedResourceForeground: #587c0c;--vscode-gitDecoration-modifiedResourceForeground: #895503;--vscode-gitDecoration-deletedResourceForeground: #ad0707;--vscode-gitDecoration-renamedResourceForeground: #007100;--vscode-gitDecoration-untrackedResourceForeground: #007100;--vscode-gitDecoration-ignoredResourceForeground: #8e8e90;--vscode-gitDecoration-stageModifiedResourceForeground: #895503;--vscode-gitDecoration-stageDeletedResourceForeground: #ad0707;--vscode-gitDecoration-conflictingResourceForeground: #ad0707;--vscode-gitDecoration-submoduleResourceForeground: #1258a7}body.dark-mode{--vscode-font-family: system-ui, "Ubuntu", "Droid Sans", sans-serif;--vscode-font-weight: normal;--vscode-font-size: 13px;--vscode-editor-font-family: "Droid Sans Mono", "monospace", monospace;--vscode-editor-font-weight: normal;--vscode-editor-font-size: 14px;--vscode-foreground: #cccccc;--vscode-disabledForeground: rgba(204, 204, 204, .5);--vscode-errorForeground: #f48771;--vscode-descriptionForeground: rgba(204, 204, 204, .7);--vscode-icon-foreground: #c5c5c5;--vscode-focusBorder: #007fd4;--vscode-textSeparator-foreground: rgba(255, 255, 255, .18);--vscode-textLink-foreground: #3794ff;--vscode-textLink-activeForeground: #3794ff;--vscode-textPreformat-foreground: #d7ba7d;--vscode-textBlockQuote-background: rgba(127, 127, 127, .1);--vscode-textBlockQuote-border: rgba(0, 122, 204, .5);--vscode-textCodeBlock-background: rgba(10, 10, 10, .4);--vscode-widget-shadow: rgba(0, 0, 0, .36);--vscode-input-background: #3c3c3c;--vscode-input-foreground: #cccccc;--vscode-inputOption-activeBorder: #007acc;--vscode-inputOption-hoverBackground: rgba(90, 93, 94, .5);--vscode-inputOption-activeBackground: rgba(0, 127, 212, .4);--vscode-inputOption-activeForeground: #ffffff;--vscode-input-placeholderForeground: #a6a6a6;--vscode-inputValidation-infoBackground: #063b49;--vscode-inputValidation-infoBorder: #007acc;--vscode-inputValidation-warningBackground: #352a05;--vscode-inputValidation-warningBorder: #b89500;--vscode-inputValidation-errorBackground: #5a1d1d;--vscode-inputValidation-errorBorder: #be1100;--vscode-dropdown-background: #3c3c3c;--vscode-dropdown-foreground: #f0f0f0;--vscode-dropdown-border: #3c3c3c;--vscode-checkbox-background: #3c3c3c;--vscode-checkbox-foreground: #f0f0f0;--vscode-checkbox-border: #3c3c3c;--vscode-button-foreground: #ffffff;--vscode-button-separator: rgba(255, 255, 255, .4);--vscode-button-background: #0e639c;--vscode-button-hoverBackground: #1177bb;--vscode-button-secondaryForeground: #ffffff;--vscode-button-secondaryBackground: #3a3d41;--vscode-button-secondaryHoverBackground: #45494e;--vscode-badge-background: #4d4d4d;--vscode-badge-foreground: #ffffff;--vscode-scrollbar-shadow: #000000;--vscode-scrollbarSlider-background: rgba(121, 121, 121, .4);--vscode-scrollbarSlider-hoverBackground: rgba(100, 100, 100, .7);--vscode-scrollbarSlider-activeBackground: rgba(191, 191, 191, .4);--vscode-progressBar-background: #0e70c0;--vscode-editorError-foreground: #f14c4c;--vscode-editorWarning-foreground: #cca700;--vscode-editorInfo-foreground: #3794ff;--vscode-editorHint-foreground: rgba(238, 238, 238, .7);--vscode-sash-hoverBorder: #007fd4;--vscode-editor-background: #1e1e1e;--vscode-editor-foreground: #d4d4d4;--vscode-editorStickyScroll-background: #1e1e1e;--vscode-editorStickyScrollHover-background: #2a2d2e;--vscode-editorWidget-background: #252526;--vscode-editorWidget-foreground: #cccccc;--vscode-editorWidget-border: #454545;--vscode-quickInput-background: #252526;--vscode-quickInput-foreground: #cccccc;--vscode-quickInputTitle-background: rgba(255, 255, 255, .1);--vscode-pickerGroup-foreground: #3794ff;--vscode-pickerGroup-border: #3f3f46;--vscode-keybindingLabel-background: rgba(128, 128, 128, .17);--vscode-keybindingLabel-foreground: #cccccc;--vscode-keybindingLabel-border: rgba(51, 51, 51, .6);--vscode-keybindingLabel-bottomBorder: rgba(68, 68, 68, .6);--vscode-editor-selectionBackground: #264f78;--vscode-editor-inactiveSelectionBackground: #3a3d41;--vscode-editor-selectionHighlightBackground: rgba(173, 214, 255, .15);--vscode-editor-findMatchBackground: #515c6a;--vscode-editor-findMatchHighlightBackground: rgba(234, 92, 0, .33);--vscode-editor-findRangeHighlightBackground: rgba(58, 61, 65, .4);--vscode-searchEditor-findMatchBackground: rgba(234, 92, 0, .22);--vscode-editor-hoverHighlightBackground: rgba(38, 79, 120, .25);--vscode-editorHoverWidget-background: #252526;--vscode-editorHoverWidget-foreground: #cccccc;--vscode-editorHoverWidget-border: #454545;--vscode-editorHoverWidget-statusBarBackground: #2c2c2d;--vscode-editorLink-activeForeground: #4e94ce;--vscode-editorInlayHint-foreground: rgba(255, 255, 255, .8);--vscode-editorInlayHint-background: rgba(77, 77, 77, .6);--vscode-editorInlayHint-typeForeground: rgba(255, 255, 255, .8);--vscode-editorInlayHint-typeBackground: rgba(77, 77, 77, .6);--vscode-editorInlayHint-parameterForeground: rgba(255, 255, 255, .8);--vscode-editorInlayHint-parameterBackground: rgba(77, 77, 77, .6);--vscode-editorLightBulb-foreground: #ffcc00;--vscode-editorLightBulbAutoFix-foreground: #75beff;--vscode-diffEditor-insertedTextBackground: rgba(156, 204, 44, .2);--vscode-diffEditor-removedTextBackground: rgba(255, 0, 0, .4);--vscode-diffEditor-insertedLineBackground: rgba(155, 185, 85, .2);--vscode-diffEditor-removedLineBackground: rgba(255, 0, 0, .2);--vscode-diffEditor-diagonalFill: rgba(204, 204, 204, .2);--vscode-list-focusOutline: #007fd4;--vscode-list-activeSelectionBackground: #04395e;--vscode-list-activeSelectionForeground: #ffffff;--vscode-list-activeSelectionIconForeground: #ffffff;--vscode-list-inactiveSelectionBackground: #37373d;--vscode-list-hoverBackground: #2a2d2e;--vscode-list-dropBackground: #383b3d;--vscode-list-highlightForeground: #2aaaff;--vscode-list-focusHighlightForeground: #2aaaff;--vscode-list-invalidItemForeground: #b89500;--vscode-list-errorForeground: #f88070;--vscode-list-warningForeground: #cca700;--vscode-listFilterWidget-background: #252526;--vscode-listFilterWidget-outline: rgba(0, 0, 0, 0);--vscode-listFilterWidget-noMatchesOutline: #be1100;--vscode-listFilterWidget-shadow: rgba(0, 0, 0, .36);--vscode-list-filterMatchBackground: rgba(234, 92, 0, .33);--vscode-tree-indentGuidesStroke: #585858;--vscode-tree-tableColumnsBorder: rgba(204, 204, 204, .13);--vscode-tree-tableOddRowsBackground: rgba(204, 204, 204, .04);--vscode-list-deemphasizedForeground: #8c8c8c;--vscode-quickInputList-focusForeground: #ffffff;--vscode-quickInputList-focusIconForeground: #ffffff;--vscode-quickInputList-focusBackground: #04395e;--vscode-menu-foreground: #cccccc;--vscode-menu-background: #303031;--vscode-menu-selectionForeground: #ffffff;--vscode-menu-selectionBackground: #04395e;--vscode-menu-separatorBackground: #606060;--vscode-toolbar-hoverBackground: rgba(90, 93, 94, .31);--vscode-toolbar-activeBackground: rgba(99, 102, 103, .31);--vscode-editor-snippetTabstopHighlightBackground: rgba(124, 124, 124, .3);--vscode-editor-snippetFinalTabstopHighlightBorder: #525252;--vscode-breadcrumb-foreground: rgba(204, 204, 204, .8);--vscode-breadcrumb-background: #1e1e1e;--vscode-breadcrumb-focusForeground: #e0e0e0;--vscode-breadcrumb-activeSelectionForeground: #e0e0e0;--vscode-breadcrumbPicker-background: #252526;--vscode-merge-currentHeaderBackground: rgba(64, 200, 174, .5);--vscode-merge-currentContentBackground: rgba(64, 200, 174, .2);--vscode-merge-incomingHeaderBackground: rgba(64, 166, 255, .5);--vscode-merge-incomingContentBackground: rgba(64, 166, 255, .2);--vscode-merge-commonHeaderBackground: rgba(96, 96, 96, .4);--vscode-merge-commonContentBackground: rgba(96, 96, 96, .16);--vscode-editorOverviewRuler-currentContentForeground: rgba(64, 200, 174, .5);--vscode-editorOverviewRuler-incomingContentForeground: rgba(64, 166, 255, .5);--vscode-editorOverviewRuler-commonContentForeground: rgba(96, 96, 96, .4);--vscode-editorOverviewRuler-findMatchForeground: rgba(209, 134, 22, .49);--vscode-editorOverviewRuler-selectionHighlightForeground: rgba(160, 160, 160, .8);--vscode-minimap-findMatchHighlight: #d18616;--vscode-minimap-selectionOccurrenceHighlight: #676767;--vscode-minimap-selectionHighlight: #264f78;--vscode-minimap-errorHighlight: rgba(255, 18, 18, .7);--vscode-minimap-warningHighlight: #cca700;--vscode-minimap-foregroundOpacity: #000000;--vscode-minimapSlider-background: rgba(121, 121, 121, .2);--vscode-minimapSlider-hoverBackground: rgba(100, 100, 100, .35);--vscode-minimapSlider-activeBackground: rgba(191, 191, 191, .2);--vscode-problemsErrorIcon-foreground: #f14c4c;--vscode-problemsWarningIcon-foreground: #cca700;--vscode-problemsInfoIcon-foreground: #3794ff;--vscode-charts-foreground: #cccccc;--vscode-charts-lines: rgba(204, 204, 204, .5);--vscode-charts-red: #f14c4c;--vscode-charts-blue: #3794ff;--vscode-charts-yellow: #cca700;--vscode-charts-orange: #d18616;--vscode-charts-green: #89d185;--vscode-charts-purple: #b180d7;--vscode-editor-lineHighlightBorder: #282828;--vscode-editor-rangeHighlightBackground: rgba(255, 255, 255, .04);--vscode-editor-symbolHighlightBackground: rgba(234, 92, 0, .33);--vscode-editorCursor-foreground: #aeafad;--vscode-editorWhitespace-foreground: rgba(227, 228, 226, .16);--vscode-editorIndentGuide-background: #404040;--vscode-editorIndentGuide-activeBackground: #707070;--vscode-editorLineNumber-foreground: #858585;--vscode-editorActiveLineNumber-foreground: #c6c6c6;--vscode-editorLineNumber-activeForeground: #c6c6c6;--vscode-editorRuler-foreground: #5a5a5a;--vscode-editorCodeLens-foreground: #999999;--vscode-editorBracketMatch-background: rgba(0, 100, 0, .1);--vscode-editorBracketMatch-border: #888888;--vscode-editorOverviewRuler-border: rgba(127, 127, 127, .3);--vscode-editorGutter-background: #1e1e1e;--vscode-editorUnnecessaryCode-opacity: rgba(0, 0, 0, .67);--vscode-editorGhostText-foreground: rgba(255, 255, 255, .34);--vscode-editorOverviewRuler-rangeHighlightForeground: rgba(0, 122, 204, .6);--vscode-editorOverviewRuler-errorForeground: rgba(255, 18, 18, .7);--vscode-editorOverviewRuler-warningForeground: #cca700;--vscode-editorOverviewRuler-infoForeground: #3794ff;--vscode-editorBracketHighlight-foreground1: #ffd700;--vscode-editorBracketHighlight-foreground2: #da70d6;--vscode-editorBracketHighlight-foreground3: #179fff;--vscode-editorBracketHighlight-foreground4: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-foreground5: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-foreground6: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-unexpectedBracket\.foreground: rgba(255, 18, 18, .8);--vscode-editorBracketPairGuide-background1: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background2: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background3: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background4: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background5: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background6: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground1: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground2: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground3: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground4: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground5: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground6: rgba(0, 0, 0, 0);--vscode-editorUnicodeHighlight-border: #bd9b03;--vscode-editorUnicodeHighlight-background: rgba(189, 155, 3, .15);--vscode-symbolIcon-arrayForeground: #cccccc;--vscode-symbolIcon-booleanForeground: #cccccc;--vscode-symbolIcon-classForeground: #ee9d28;--vscode-symbolIcon-colorForeground: #cccccc;--vscode-symbolIcon-constantForeground: #cccccc;--vscode-symbolIcon-constructorForeground: #b180d7;--vscode-symbolIcon-enumeratorForeground: #ee9d28;--vscode-symbolIcon-enumeratorMemberForeground: #75beff;--vscode-symbolIcon-eventForeground: #ee9d28;--vscode-symbolIcon-fieldForeground: #75beff;--vscode-symbolIcon-fileForeground: #cccccc;--vscode-symbolIcon-folderForeground: #cccccc;--vscode-symbolIcon-functionForeground: #b180d7;--vscode-symbolIcon-interfaceForeground: #75beff;--vscode-symbolIcon-keyForeground: #cccccc;--vscode-symbolIcon-keywordForeground: #cccccc;--vscode-symbolIcon-methodForeground: #b180d7;--vscode-symbolIcon-moduleForeground: #cccccc;--vscode-symbolIcon-namespaceForeground: #cccccc;--vscode-symbolIcon-nullForeground: #cccccc;--vscode-symbolIcon-numberForeground: #cccccc;--vscode-symbolIcon-objectForeground: #cccccc;--vscode-symbolIcon-operatorForeground: #cccccc;--vscode-symbolIcon-packageForeground: #cccccc;--vscode-symbolIcon-propertyForeground: #cccccc;--vscode-symbolIcon-referenceForeground: #cccccc;--vscode-symbolIcon-snippetForeground: #cccccc;--vscode-symbolIcon-stringForeground: #cccccc;--vscode-symbolIcon-structForeground: #cccccc;--vscode-symbolIcon-textForeground: #cccccc;--vscode-symbolIcon-typeParameterForeground: #cccccc;--vscode-symbolIcon-unitForeground: #cccccc;--vscode-symbolIcon-variableForeground: #75beff;--vscode-editorHoverWidget-highlightForeground: #2aaaff;--vscode-editorOverviewRuler-bracketMatchForeground: #a0a0a0;--vscode-editor-foldBackground: rgba(38, 79, 120, .3);--vscode-editorGutter-foldingControlForeground: #c5c5c5;--vscode-editor-linkedEditingBackground: rgba(255, 0, 0, .3);--vscode-editor-wordHighlightBackground: rgba(87, 87, 87, .72);--vscode-editor-wordHighlightStrongBackground: rgba(0, 73, 114, .72);--vscode-editorOverviewRuler-wordHighlightForeground: rgba(160, 160, 160, .8);--vscode-editorOverviewRuler-wordHighlightStrongForeground: rgba(192, 160, 192, .8);--vscode-peekViewTitle-background: rgba(55, 148, 255, .1);--vscode-peekViewTitleLabel-foreground: #ffffff;--vscode-peekViewTitleDescription-foreground: rgba(204, 204, 204, .7);--vscode-peekView-border: #3794ff;--vscode-peekViewResult-background: #252526;--vscode-peekViewResult-lineForeground: #bbbbbb;--vscode-peekViewResult-fileForeground: #ffffff;--vscode-peekViewResult-selectionBackground: rgba(51, 153, 255, .2);--vscode-peekViewResult-selectionForeground: #ffffff;--vscode-peekViewEditor-background: #001f33;--vscode-peekViewEditorGutter-background: #001f33;--vscode-peekViewResult-matchHighlightBackground: rgba(234, 92, 0, .3);--vscode-peekViewEditor-matchHighlightBackground: rgba(255, 143, 0, .6);--vscode-editorMarkerNavigationError-background: #f14c4c;--vscode-editorMarkerNavigationError-headerBackground: rgba(241, 76, 76, .1);--vscode-editorMarkerNavigationWarning-background: #cca700;--vscode-editorMarkerNavigationWarning-headerBackground: rgba(204, 167, 0, .1);--vscode-editorMarkerNavigationInfo-background: #3794ff;--vscode-editorMarkerNavigationInfo-headerBackground: rgba(55, 148, 255, .1);--vscode-editorMarkerNavigation-background: #1e1e1e;--vscode-editorSuggestWidget-background: #252526;--vscode-editorSuggestWidget-border: #454545;--vscode-editorSuggestWidget-foreground: #d4d4d4;--vscode-editorSuggestWidget-selectedForeground: #ffffff;--vscode-editorSuggestWidget-selectedIconForeground: #ffffff;--vscode-editorSuggestWidget-selectedBackground: #04395e;--vscode-editorSuggestWidget-highlightForeground: #2aaaff;--vscode-editorSuggestWidget-focusHighlightForeground: #2aaaff;--vscode-editorSuggestWidgetStatus-foreground: rgba(212, 212, 212, .5);--vscode-tab-activeBackground: #1e1e1e;--vscode-tab-unfocusedActiveBackground: #1e1e1e;--vscode-tab-inactiveBackground: #2d2d2d;--vscode-tab-unfocusedInactiveBackground: #2d2d2d;--vscode-tab-activeForeground: #ffffff;--vscode-tab-inactiveForeground: rgba(255, 255, 255, .5);--vscode-tab-unfocusedActiveForeground: rgba(255, 255, 255, .5);--vscode-tab-unfocusedInactiveForeground: rgba(255, 255, 255, .25);--vscode-tab-border: #252526;--vscode-tab-lastPinnedBorder: rgba(204, 204, 204, .2);--vscode-tab-activeModifiedBorder: #3399cc;--vscode-tab-inactiveModifiedBorder: rgba(51, 153, 204, .5);--vscode-tab-unfocusedActiveModifiedBorder: rgba(51, 153, 204, .5);--vscode-tab-unfocusedInactiveModifiedBorder: rgba(51, 153, 204, .25);--vscode-editorPane-background: #1e1e1e;--vscode-editorGroupHeader-tabsBackground: #252526;--vscode-editorGroupHeader-noTabsBackground: #1e1e1e;--vscode-editorGroup-border: #444444;--vscode-editorGroup-dropBackground: rgba(83, 89, 93, .5);--vscode-editorGroup-dropIntoPromptForeground: #cccccc;--vscode-editorGroup-dropIntoPromptBackground: #252526;--vscode-sideBySideEditor-horizontalBorder: #444444;--vscode-sideBySideEditor-verticalBorder: #444444;--vscode-panel-background: #1e1e1e;--vscode-panel-border: rgba(128, 128, 128, .35);--vscode-panelTitle-activeForeground: #e7e7e7;--vscode-panelTitle-inactiveForeground: rgba(231, 231, 231, .6);--vscode-panelTitle-activeBorder: #e7e7e7;--vscode-panel-dropBorder: #e7e7e7;--vscode-panelSection-dropBackground: rgba(83, 89, 93, .5);--vscode-panelSectionHeader-background: rgba(128, 128, 128, .2);--vscode-panelSection-border: rgba(128, 128, 128, .35);--vscode-banner-background: #04395e;--vscode-banner-foreground: #ffffff;--vscode-banner-iconForeground: #3794ff;--vscode-statusBar-foreground: #ffffff;--vscode-statusBar-noFolderForeground: #ffffff;--vscode-statusBar-background: #007acc;--vscode-statusBar-noFolderBackground: #68217a;--vscode-statusBar-focusBorder: #ffffff;--vscode-statusBarItem-activeBackground: rgba(255, 255, 255, .18);--vscode-statusBarItem-focusBorder: #ffffff;--vscode-statusBarItem-hoverBackground: rgba(255, 255, 255, .12);--vscode-statusBarItem-compactHoverBackground: rgba(255, 255, 255, .2);--vscode-statusBarItem-prominentForeground: #ffffff;--vscode-statusBarItem-prominentBackground: rgba(0, 0, 0, .5);--vscode-statusBarItem-prominentHoverBackground: rgba(0, 0, 0, .3);--vscode-statusBarItem-errorBackground: #c72e0f;--vscode-statusBarItem-errorForeground: #ffffff;--vscode-statusBarItem-warningBackground: #7a6400;--vscode-statusBarItem-warningForeground: #ffffff;--vscode-activityBar-background: #333333;--vscode-activityBar-foreground: #ffffff;--vscode-activityBar-inactiveForeground: rgba(255, 255, 255, .4);--vscode-activityBar-activeBorder: #ffffff;--vscode-activityBar-dropBorder: #ffffff;--vscode-activityBarBadge-background: #007acc;--vscode-activityBarBadge-foreground: #ffffff;--vscode-statusBarItem-remoteBackground: #16825d;--vscode-statusBarItem-remoteForeground: #ffffff;--vscode-extensionBadge-remoteBackground: #007acc;--vscode-extensionBadge-remoteForeground: #ffffff;--vscode-sideBar-background: #252526;--vscode-sideBarTitle-foreground: #bbbbbb;--vscode-sideBar-dropBackground: rgba(83, 89, 93, .5);--vscode-sideBarSectionHeader-background: rgba(0, 0, 0, 0);--vscode-sideBarSectionHeader-border: rgba(204, 204, 204, .2);--vscode-titleBar-activeForeground: #cccccc;--vscode-titleBar-inactiveForeground: rgba(204, 204, 204, .6);--vscode-titleBar-activeBackground: #3c3c3c;--vscode-titleBar-inactiveBackground: rgba(60, 60, 60, .6);--vscode-menubar-selectionForeground: #cccccc;--vscode-menubar-selectionBackground: rgba(90, 93, 94, .31);--vscode-notifications-foreground: #cccccc;--vscode-notifications-background: #252526;--vscode-notificationLink-foreground: #3794ff;--vscode-notificationCenterHeader-background: #303031;--vscode-notifications-border: #303031;--vscode-notificationsErrorIcon-foreground: #f14c4c;--vscode-notificationsWarningIcon-foreground: #cca700;--vscode-notificationsInfoIcon-foreground: #3794ff;--vscode-commandCenter-foreground: #cccccc;--vscode-commandCenter-activeForeground: #cccccc;--vscode-commandCenter-activeBackground: rgba(90, 93, 94, .31);--vscode-commandCenter-border: rgba(128, 128, 128, .35);--vscode-editorCommentsWidget-resolvedBorder: rgba(204, 204, 204, .5);--vscode-editorCommentsWidget-unresolvedBorder: #3794ff;--vscode-editorCommentsWidget-rangeBackground: rgba(55, 148, 255, .1);--vscode-editorCommentsWidget-rangeBorder: rgba(55, 148, 255, .4);--vscode-editorCommentsWidget-rangeActiveBackground: rgba(55, 148, 255, .1);--vscode-editorCommentsWidget-rangeActiveBorder: rgba(55, 148, 255, .4);--vscode-editorGutter-commentRangeForeground: #37373d;--vscode-debugToolBar-background: #333333;--vscode-debugIcon-startForeground: #89d185;--vscode-editor-stackFrameHighlightBackground: rgba(255, 255, 0, .2);--vscode-editor-focusedStackFrameHighlightBackground: rgba(122, 189, 122, .3);--vscode-mergeEditor-change\.background: rgba(155, 185, 85, .2);--vscode-mergeEditor-change\.word\.background: rgba(156, 204, 44, .2);--vscode-mergeEditor-conflict\.unhandledUnfocused\.border: rgba(255, 166, 0, .48);--vscode-mergeEditor-conflict\.unhandledFocused\.border: #ffa600;--vscode-mergeEditor-conflict\.handledUnfocused\.border: rgba(134, 134, 134, .29);--vscode-mergeEditor-conflict\.handledFocused\.border: rgba(193, 193, 193, .8);--vscode-mergeEditor-conflict\.handled\.minimapOverViewRuler: rgba(173, 172, 168, .93);--vscode-mergeEditor-conflict\.unhandled\.minimapOverViewRuler: #fcba03;--vscode-mergeEditor-conflictingLines\.background: rgba(255, 234, 0, .28);--vscode-settings-headerForeground: #e7e7e7;--vscode-settings-modifiedItemIndicator: #0c7d9d;--vscode-settings-headerBorder: rgba(128, 128, 128, .35);--vscode-settings-sashBorder: rgba(128, 128, 128, .35);--vscode-settings-dropdownBackground: #3c3c3c;--vscode-settings-dropdownForeground: #f0f0f0;--vscode-settings-dropdownBorder: #3c3c3c;--vscode-settings-dropdownListBorder: #454545;--vscode-settings-checkboxBackground: #3c3c3c;--vscode-settings-checkboxForeground: #f0f0f0;--vscode-settings-checkboxBorder: #3c3c3c;--vscode-settings-textInputBackground: #3c3c3c;--vscode-settings-textInputForeground: #cccccc;--vscode-settings-numberInputBackground: #3c3c3c;--vscode-settings-numberInputForeground: #cccccc;--vscode-settings-focusedRowBackground: rgba(42, 45, 46, .6);--vscode-settings-rowHoverBackground: rgba(42, 45, 46, .3);--vscode-settings-focusedRowBorder: rgba(255, 255, 255, .12);--vscode-terminal-foreground: #cccccc;--vscode-terminal-selectionBackground: #264f78;--vscode-terminal-inactiveSelectionBackground: #3a3d41;--vscode-terminalCommandDecoration-defaultBackground: rgba(255, 255, 255, .25);--vscode-terminalCommandDecoration-successBackground: #1b81a8;--vscode-terminalCommandDecoration-errorBackground: #f14c4c;--vscode-terminalOverviewRuler-cursorForeground: rgba(160, 160, 160, .8);--vscode-terminal-border: rgba(128, 128, 128, .35);--vscode-terminal-findMatchBackground: #515c6a;--vscode-terminal-findMatchHighlightBackground: rgba(234, 92, 0, .33);--vscode-terminalOverviewRuler-findMatchForeground: rgba(209, 134, 22, .49);--vscode-terminal-dropBackground: rgba(83, 89, 93, .5);--vscode-testing-iconFailed: #f14c4c;--vscode-testing-iconErrored: #f14c4c;--vscode-testing-iconPassed: #73c991;--vscode-testing-runAction: #73c991;--vscode-testing-iconQueued: #cca700;--vscode-testing-iconUnset: #848484;--vscode-testing-iconSkipped: #848484;--vscode-testing-peekBorder: #f14c4c;--vscode-testing-peekHeaderBackground: rgba(241, 76, 76, .1);--vscode-testing-message\.error\.decorationForeground: #f14c4c;--vscode-testing-message\.error\.lineBackground: rgba(255, 0, 0, .2);--vscode-testing-message\.info\.decorationForeground: rgba(212, 212, 212, .5);--vscode-welcomePage-tileBackground: #252526;--vscode-welcomePage-tileHoverBackground: #2c2c2d;--vscode-welcomePage-tileShadow: rgba(0, 0, 0, .36);--vscode-welcomePage-progress\.background: #3c3c3c;--vscode-welcomePage-progress\.foreground: #3794ff;--vscode-debugExceptionWidget-border: #a31515;--vscode-debugExceptionWidget-background: #420b0d;--vscode-ports-iconRunningProcessForeground: #369432;--vscode-statusBar-debuggingBackground: #cc6633;--vscode-statusBar-debuggingForeground: #ffffff;--vscode-editor-inlineValuesForeground: rgba(255, 255, 255, .5);--vscode-editor-inlineValuesBackground: rgba(255, 200, 0, .2);--vscode-editorGutter-modifiedBackground: #1b81a8;--vscode-editorGutter-addedBackground: #487e02;--vscode-editorGutter-deletedBackground: #f14c4c;--vscode-minimapGutter-modifiedBackground: #1b81a8;--vscode-minimapGutter-addedBackground: #487e02;--vscode-minimapGutter-deletedBackground: #f14c4c;--vscode-editorOverviewRuler-modifiedForeground: rgba(27, 129, 168, .6);--vscode-editorOverviewRuler-addedForeground: rgba(72, 126, 2, .6);--vscode-editorOverviewRuler-deletedForeground: rgba(241, 76, 76, .6);--vscode-debugIcon-breakpointForeground: #e51400;--vscode-debugIcon-breakpointDisabledForeground: #848484;--vscode-debugIcon-breakpointUnverifiedForeground: #848484;--vscode-debugIcon-breakpointCurrentStackframeForeground: #ffcc00;--vscode-debugIcon-breakpointStackframeForeground: #89d185;--vscode-notebook-cellBorderColor: #37373d;--vscode-notebook-focusedEditorBorder: #007fd4;--vscode-notebookStatusSuccessIcon-foreground: #89d185;--vscode-notebookStatusErrorIcon-foreground: #f48771;--vscode-notebookStatusRunningIcon-foreground: #cccccc;--vscode-notebook-cellToolbarSeparator: rgba(128, 128, 128, .35);--vscode-notebook-selectedCellBackground: #37373d;--vscode-notebook-selectedCellBorder: #37373d;--vscode-notebook-focusedCellBorder: #007fd4;--vscode-notebook-inactiveFocusedCellBorder: #37373d;--vscode-notebook-cellStatusBarItemHoverBackground: rgba(255, 255, 255, .15);--vscode-notebook-cellInsertionIndicator: #007fd4;--vscode-notebookScrollbarSlider-background: rgba(121, 121, 121, .4);--vscode-notebookScrollbarSlider-hoverBackground: rgba(100, 100, 100, .7);--vscode-notebookScrollbarSlider-activeBackground: rgba(191, 191, 191, .4);--vscode-notebook-symbolHighlightBackground: rgba(255, 255, 255, .04);--vscode-notebook-cellEditorBackground: #252526;--vscode-notebook-editorBackground: #1e1e1e;--vscode-keybindingTable-headerBackground: rgba(204, 204, 204, .04);--vscode-keybindingTable-rowsBackground: rgba(204, 204, 204, .04);--vscode-scm-providerBorder: #454545;--vscode-debugTokenExpression-name: #c586c0;--vscode-debugTokenExpression-value: rgba(204, 204, 204, .6);--vscode-debugTokenExpression-string: #ce9178;--vscode-debugTokenExpression-boolean: #4e94ce;--vscode-debugTokenExpression-number: #b5cea8;--vscode-debugTokenExpression-error: #f48771;--vscode-debugView-exceptionLabelForeground: #cccccc;--vscode-debugView-exceptionLabelBackground: #6c2022;--vscode-debugView-stateLabelForeground: #cccccc;--vscode-debugView-stateLabelBackground: rgba(136, 136, 136, .27);--vscode-debugView-valueChangedHighlight: #569cd6;--vscode-debugConsole-infoForeground: #3794ff;--vscode-debugConsole-warningForeground: #cca700;--vscode-debugConsole-errorForeground: #f48771;--vscode-debugConsole-sourceForeground: #cccccc;--vscode-debugConsoleInputIcon-foreground: #cccccc;--vscode-debugIcon-pauseForeground: #75beff;--vscode-debugIcon-stopForeground: #f48771;--vscode-debugIcon-disconnectForeground: #f48771;--vscode-debugIcon-restartForeground: #89d185;--vscode-debugIcon-stepOverForeground: #75beff;--vscode-debugIcon-stepIntoForeground: #75beff;--vscode-debugIcon-stepOutForeground: #75beff;--vscode-debugIcon-continueForeground: #75beff;--vscode-debugIcon-stepBackForeground: #75beff;--vscode-extensionButton-prominentBackground: #0e639c;--vscode-extensionButton-prominentForeground: #ffffff;--vscode-extensionButton-prominentHoverBackground: #1177bb;--vscode-extensionIcon-starForeground: #ff8e00;--vscode-extensionIcon-verifiedForeground: #3794ff;--vscode-extensionIcon-preReleaseForeground: #1d9271;--vscode-extensionIcon-sponsorForeground: #d758b3;--vscode-terminal-ansiBlack: #000000;--vscode-terminal-ansiRed: #cd3131;--vscode-terminal-ansiGreen: #0dbc79;--vscode-terminal-ansiYellow: #e5e510;--vscode-terminal-ansiBlue: #2472c8;--vscode-terminal-ansiMagenta: #bc3fbc;--vscode-terminal-ansiCyan: #11a8cd;--vscode-terminal-ansiWhite: #e5e5e5;--vscode-terminal-ansiBrightBlack: #666666;--vscode-terminal-ansiBrightRed: #f14c4c;--vscode-terminal-ansiBrightGreen: #23d18b;--vscode-terminal-ansiBrightYellow: #f5f543;--vscode-terminal-ansiBrightBlue: #3b8eea;--vscode-terminal-ansiBrightMagenta: #d670d6;--vscode-terminal-ansiBrightCyan: #29b8db;--vscode-terminal-ansiBrightWhite: #e5e5e5;--vscode-interactive-activeCodeBorder: #3794ff;--vscode-interactive-inactiveCodeBorder: #37373d;--vscode-gitDecoration-addedResourceForeground: #81b88b;--vscode-gitDecoration-modifiedResourceForeground: #e2c08d;--vscode-gitDecoration-deletedResourceForeground: #c74e39;--vscode-gitDecoration-renamedResourceForeground: #73c991;--vscode-gitDecoration-untrackedResourceForeground: #73c991;--vscode-gitDecoration-ignoredResourceForeground: #8c8c8c;--vscode-gitDecoration-stageModifiedResourceForeground: #e2c08d;--vscode-gitDecoration-stageDeletedResourceForeground: #c74e39;--vscode-gitDecoration-conflictingResourceForeground: #e4676b;--vscode-gitDecoration-submoduleResourceForeground: #8db9e2}.cm-wrapper{line-height:18px}.cm-wrapper,.cm-wrapper>div{width:100%;height:100%}.CodeMirror span.cm-meta{color:var(--vscode-editor-foreground)}.CodeMirror span.cm-number{color:var(--vscode-debugTokenExpression-number)}.CodeMirror span.cm-keyword{color:var(--vscode-debugTokenExpression-name)}.CodeMirror span.cm-operator{color:var(--vscode-editor-foreground)}.CodeMirror span.cm-string,.CodeMirror span.cm-string-2{color:var(--vscode-debugTokenExpression-string)}.CodeMirror span.cm-error{color:var(--vscode-errorForeground)}.CodeMirror span.cm-def,.CodeMirror span.cm-tag{color:#0070c1}.CodeMirror span.cm-comment,.CodeMirror span.cm-link{color:green}.CodeMirror span.cm-variable,.CodeMirror span.cm-variable-2,.CodeMirror span.cm-atom{color:#0070c1}.CodeMirror span.cm-property{color:#795e26}.CodeMirror span.cm-qualifier,.CodeMirror span.cm-attribute{color:#001080}.CodeMirror span.cm-variable-3,.CodeMirror span.cm-type{color:#267f99}body.dark-mode .CodeMirror span.cm-def,body.dark-mode .CodeMirror span.cm-tag{color:var(--vscode-debugView-valueChangedHighlight)}body.dark-mode .CodeMirror span.cm-comment,body.dark-mode .CodeMirror span.cm-link{color:#6a9955}body.dark-mode .CodeMirror span.cm-variable,body.dark-mode .CodeMirror span.cm-variable-2,body.dark-mode .CodeMirror span.cm-atom{color:#4fc1ff}body.dark-mode .CodeMirror span.cm-property{color:#dcdcaa}body.dark-mode .CodeMirror span.cm-qualifier,body.dark-mode .CodeMirror span.cm-attribute{color:#9cdcfe}body.dark-mode .CodeMirror span.cm-variable-3,body.dark-mode .CodeMirror span.cm-type{color:#4ec9b0}.CodeMirror span.cm-bracket{color:var(--vscode-editorBracketHighlight-foreground3)}.CodeMirror-cursor{border-left:1px solid var(--vscode-editor-foreground)!important}.CodeMirror div.CodeMirror-selected{background:var(--vscode-terminal-inactiveSelectionBackground)}.CodeMirror .CodeMirror-gutters{z-index:0;background:1px solid var(--vscode-editorGroup-border);border-right:none}.CodeMirror .CodeMirror-gutter-elt{background-color:var(--vscode-editorGutter-background)}.CodeMirror .CodeMirror-gutterwrapper{border-right:1px solid var(--vscode-editorGroup-border);color:var(--vscode-editorLineNumber-foreground)}.CodeMirror .CodeMirror-matchingbracket{background-color:var(--vscode-editorBracketPairGuide-background1);color:var(--vscode-editorBracketHighlight-foreground1)!important}.CodeMirror{font-family:var(--vscode-editor-font-family)!important;color:var(--vscode-editor-foreground)!important;background-color:var(--vscode-editor-background)!important;font-weight:var(--vscode-editor-font-weight)!important;font-size:var(--vscode-editor-font-size)!important}.CodeMirror .source-line-running{background-color:var(--vscode-editor-selectionBackground);z-index:2}.CodeMirror .source-line-paused{background-color:var(--vscode-editor-selectionHighlightBackground);z-index:2}.CodeMirror .source-line-error-underline{text-decoration:underline wavy var(--vscode-errorForeground);position:relative;top:-12px}.CodeMirror .source-line-error-widget{background-color:var(--vscode-inputValidation-errorBackground);white-space:pre-wrap;margin:3px 10px;padding:5px}.grid-view{display:flex;position:relative;flex:auto}.grid-view .list-view-entry{padding-left:0}.grid-view-cell{overflow:hidden;text-overflow:ellipsis;padding:0 5px;flex:none}.grid-view-header{-webkit-user-select:none;user-select:none;display:flex;flex:0 0 30px;align-items:center;flex-direction:row;border-bottom:1px solid var(--vscode-panel-border)}.grid-view-header .codicon-triangle-up,.grid-view-header .codicon-triangle-down{display:none}.grid-view-header>.filter-positive .codicon-triangle-down{display:initial!important}.grid-view-header>.filter-negative .codicon-triangle-up{display:initial!important}.grid-view-header-cell{flex:none;align-items:center;overflow:hidden;text-overflow:ellipsis;padding-left:10px;cursor:pointer;display:flex;white-space:nowrap}.grid-view-header-cell-title{overflow:hidden;text-overflow:ellipsis;flex:auto}.snapshot-tab{display:flex;flex:auto;flex-direction:column;align-items:stretch;outline:none;--browser-frame-header-height: 40px;overflow:hidden}.snapshot-tab .toolbar{background-color:var(--vscode-sideBar-background)}.snapshot-controls{flex:none;background-color:var(--vscode-sideBar-background);color:var(--vscode-sideBarTitle-foreground);display:flex;box-shadow:var(--box-shadow);height:32px;align-items:center;justify-content:center}.snapshot-toggle{margin-top:4px;padding:4px 8px;cursor:pointer;border-radius:20px;margin-left:4px;width:60px;display:flex;align-items:center;justify-content:center}.snapshot-toggle:hover{background-color:#ededed}.snapshot-toggle.toggled{background:var(--gray);color:#fff}.snapshot-tab:focus .snapshot-toggle.toggled{background:var(--vscode-charts-blue)}.snapshot-wrapper{flex:auto;margin:1px;padding:10px;position:relative}.snapshot-container{display:block;box-shadow:0 12px 28px #0003,0 2px 4px #0000001a}.snapshot-switcher{width:100%;height:calc(100% - var(--browser-frame-header-height));position:relative}iframe[name=snapshot]{position:absolute;top:0;left:0;width:100%;height:100%;border:none;background:#fff;visibility:hidden}iframe.snapshot-visible[name=snapshot]{visibility:visible}.no-snapshot{text-align:center;padding:50px}.popout-icon{position:absolute;top:0;right:0;color:var(--vscode-sideBarTitle-foreground);font-size:14px;z-index:100;width:24px;height:24px;display:flex;align-items:center;justify-content:center;text-decoration:none}.popout-icon:not(.popout-disabled):hover{color:var(--vscode-foreground)}.popout-icon.popout-disabled{opacity:var(--vscode-disabledForeground)}.snapshot-tab .cm-wrapper{line-height:23px;margin-right:4px}.browser-frame-dot{border-radius:50%;display:inline-block;height:12px;margin-right:6px;margin-top:4px;width:12px}.browser-frame-address-bar{background-color:var(--vscode-input-background);border-radius:12.5px;color:var(--vscode-input-foreground);flex:1 0;font:400 16px Arial,sans-serif;margin:0 16px 0 8px;padding:5px 15px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.browser-frame-menu-bar{background-color:#aaa;display:block;height:3px;margin:3px 0;width:17px}.browser-frame-header{align-items:center;background:#ebedf0;display:flex;padding:8px 16px;border-top-left-radius:6px;border-top-right-radius:6px;height:var(--browser-frame-header-height)}body.dark-mode .browser-frame-header{background:#444950}.source-tab{flex:auto;position:relative;overflow:hidden;display:flex;flex-direction:row}.source-tab-file-name{height:24px;margin-left:8px;display:flex;align-items:center;background-color:var(--vscode-breadcrumb-background);box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px;z-index:10}.stack-trace-frame-function{flex:1 1 100px;overflow:hidden;text-overflow:ellipsis}.stack-trace-frame-location{flex:1 1 100px;overflow:hidden;text-overflow:ellipsis;text-align:end}.stack-trace-frame-line{flex:none}.film-strip{flex:none;display:flex;flex-direction:column;position:relative}.film-strip-lanes{flex:none;display:flex;flex-direction:column;position:relative;min-height:50px;max-height:200px;overflow-x:hidden;overflow-y:auto}.film-strip-lane{flex:none;display:flex}.film-strip-frame{flex:none;pointer-events:none;box-shadow:var(--box-shadow)}.film-strip-hover{position:absolute;top:0;left:0;background-color:var(--vscode-panel-background);box-shadow:#0002 0 1.6px 10px,#0000001c 0 .3px 10px;z-index:200;pointer-events:none}.film-strip-hover-title{padding:2px 4px;display:flex;align-items:center;overflow:hidden}.timeline-view{flex:none;position:relative;display:flex;flex-direction:column;padding:20px 0 5px;cursor:text;-webkit-user-select:none;user-select:none;margin-left:10px;overflow-x:clip}.timeline-divider{position:absolute;width:1px;top:0;bottom:0;background-color:var(--vscode-panel-border)}.timeline-time{position:absolute;top:4px;right:3px;font-size:80%;white-space:nowrap;pointer-events:none}.timeline-time-input{cursor:pointer}.timeline-lane{pointer-events:none;overflow:hidden;flex:none;height:20px;position:relative}.timeline-grid{position:absolute;top:0;right:0;bottom:0;left:0}.timeline-bars{position:absolute;top:0;bottom:0;left:0;right:0;pointer-events:none}.timeline-bar{position:absolute;--action-color: gray;--action-background-color: #88888802;border-top:2px solid var(--action-color)}.timeline-bar.active{background-color:var(--action-background-color)}.timeline-bar.action{--action-color: var(--vscode-charts-orange);--action-background-color: #d1861666}.timeline-bar.action.error{--action-color: var(--vscode-charts-red);--action-background-color: #e5140066}.timeline-bar.network{--action-color: var(--vscode-charts-blue);--action-background-color: #1a85ff66}body.dark-mode .timeline-bar.action.error{--action-color: var(--vscode-errorForeground);--action-background-color: #f4877166}.timeline-label{position:absolute;top:0;bottom:0;margin-left:2px;background-color:var(--vscode-panel-background);justify-content:center;display:none;white-space:nowrap}.timeline-label.selected{display:flex}.timeline-marker{display:none;position:absolute;top:0;bottom:0;pointer-events:none;border-left:3px solid var(--light-pink)}.timeline-window{display:flex;position:absolute;top:0;bottom:0;left:0;right:0;pointer-events:none}.timeline-window-center{flex:auto}.timeline-window-drag{height:20px;cursor:grab;pointer-events:all}.timeline-window-curtain{flex:none;background-color:#3879d91a}body.dark-mode .timeline-window-curtain{background-color:#161718bf}.timeline-window-resizer{flex:none;width:10px;cursor:ew-resize;pointer-events:all;position:relative;background-color:var(--vscode-panel-border);border-left:1px solid var(--vscode-panel-border);border-right:1px solid var(--vscode-panel-border)}.attachments-tab{flex:auto;line-height:24px;white-space:pre;overflow:auto;-webkit-user-select:text;user-select:text}.attachments-section{padding-left:6px;font-weight:700;text-transform:uppercase;font-size:10px;color:var(--vscode-sideBarTitle-foreground);line-height:24px}.attachments-section:not(:first-child){border-top:1px solid var(--vscode-panel-border)}.attachment-item{margin:4px 8px}.attachment-item img{flex:none;min-width:200px;max-width:80%;box-shadow:0 12px 28px #0003,0 2px 4px #0000001a}.workbench-run-status{height:30px;padding:4px;flex:none;display:flex;flex-direction:row;align-items:center;border-bottom:1px solid var(--vscode-panel-border)}.workbench-run-status.failed{color:var(--vscode-errorForeground)}.workbench-run-status .codicon{margin-right:4px}.workbench-run-duration{display:flex;flex:none;align-items:center;color:var(--vscode-editorCodeLens-foreground)}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/uiMode.Btn2TM9w.css b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/uiMode.Btn2TM9w.css
new file mode 100644
index 0000000..9775fe0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/uiMode.Btn2TM9w.css
@@ -0,0 +1 @@
+.ui-mode-sidebar{background-color:var(--vscode-sideBar-background)}.ui-mode-sidebar input[type=search]{flex:auto}.ui-mode-sidebar .toolbar-button:not([disabled]) .codicon-play{color:var(--vscode-debugIcon-restartForeground)}.ui-mode-sidebar .toolbar-button:not([disabled]) .codicon-debug-stop{color:var(--vscode-debugIcon-stopForeground)}.ui-mode .section-title{display:flex;flex:auto;flex-direction:row;align-items:center;font-size:11px;text-transform:uppercase;font-weight:700;text-overflow:ellipsis;overflow:hidden;padding:8px;height:30px}.ui-mode-sidebar img{flex:none;margin-left:6px;width:24px;height:24px}.ui-mode .disconnected{display:flex;align-items:center;justify-content:center;flex:auto;flex-direction:column;background-color:var(--vscode-editor-background);position:absolute;top:0;right:0;bottom:0;left:0;z-index:1000;line-height:24px}.disconnected .title{font-size:24px;font-weight:700;margin-bottom:30px}.status-line{flex:auto;white-space:nowrap;line-height:22px;padding-left:10px;display:flex;flex-direction:row;align-items:center;height:30px}.status-line>div{overflow:hidden;text-overflow:ellipsis}.ui-mode-sidebar input[type=search]{flex:auto;padding:0 5px;line-height:24px;outline:none;margin:0 4px;border:none;color:var(--vscode-input-foreground);background-color:var(--vscode-input-background)}body{--vscode-font-family: system-ui, "Ubuntu", "Droid Sans", sans-serif;--vscode-font-weight: normal;--vscode-font-size: 13px;--vscode-editor-font-family: "Droid Sans Mono", "monospace", monospace;--vscode-editor-font-weight: normal;--vscode-editor-font-size: 14px;--vscode-foreground: #616161;--vscode-disabledForeground: rgba(97, 97, 97, .5);--vscode-errorForeground: #a1260d;--vscode-descriptionForeground: #717171;--vscode-icon-foreground: #424242;--vscode-focusBorder: #0090f1;--vscode-textSeparator-foreground: rgba(0, 0, 0, .18);--vscode-textLink-foreground: #006ab1;--vscode-textLink-activeForeground: #006ab1;--vscode-textPreformat-foreground: #a31515;--vscode-textBlockQuote-background: rgba(127, 127, 127, .1);--vscode-textBlockQuote-border: rgba(0, 122, 204, .5);--vscode-textCodeBlock-background: rgba(220, 220, 220, .4);--vscode-widget-shadow: rgba(0, 0, 0, .16);--vscode-input-background: #ffffff;--vscode-input-foreground: #616161;--vscode-inputOption-activeBorder: #007acc;--vscode-inputOption-hoverBackground: rgba(184, 184, 184, .31);--vscode-inputOption-activeBackground: rgba(0, 144, 241, .2);--vscode-inputOption-activeForeground: #000000;--vscode-input-placeholderForeground: #767676;--vscode-inputValidation-infoBackground: #d6ecf2;--vscode-inputValidation-infoBorder: #007acc;--vscode-inputValidation-warningBackground: #f6f5d2;--vscode-inputValidation-warningBorder: #b89500;--vscode-inputValidation-errorBackground: #f2dede;--vscode-inputValidation-errorBorder: #be1100;--vscode-dropdown-background: #ffffff;--vscode-dropdown-border: #cecece;--vscode-checkbox-background: #ffffff;--vscode-checkbox-border: #cecece;--vscode-button-foreground: #ffffff;--vscode-button-separator: rgba(255, 255, 255, .4);--vscode-button-background: #007acc;--vscode-button-hoverBackground: #0062a3;--vscode-button-secondaryForeground: #ffffff;--vscode-button-secondaryBackground: #5f6a79;--vscode-button-secondaryHoverBackground: #4c5561;--vscode-badge-background: #c4c4c4;--vscode-badge-foreground: #333333;--vscode-scrollbar-shadow: #dddddd;--vscode-scrollbarSlider-background: rgba(100, 100, 100, .4);--vscode-scrollbarSlider-hoverBackground: rgba(100, 100, 100, .7);--vscode-scrollbarSlider-activeBackground: rgba(0, 0, 0, .6);--vscode-progressBar-background: #0e70c0;--vscode-editorError-foreground: #e51400;--vscode-editorWarning-foreground: #bf8803;--vscode-editorInfo-foreground: #1a85ff;--vscode-editorHint-foreground: #6c6c6c;--vscode-sash-hoverBorder: #0090f1;--vscode-editor-background: #ffffff;--vscode-editor-foreground: #000000;--vscode-editorStickyScroll-background: #ffffff;--vscode-editorStickyScrollHover-background: #f0f0f0;--vscode-editorWidget-background: #f3f3f3;--vscode-editorWidget-foreground: #616161;--vscode-editorWidget-border: #c8c8c8;--vscode-quickInput-background: #f3f3f3;--vscode-quickInput-foreground: #616161;--vscode-quickInputTitle-background: rgba(0, 0, 0, .06);--vscode-pickerGroup-foreground: #0066bf;--vscode-pickerGroup-border: #cccedb;--vscode-keybindingLabel-background: rgba(221, 221, 221, .4);--vscode-keybindingLabel-foreground: #555555;--vscode-keybindingLabel-border: rgba(204, 204, 204, .4);--vscode-keybindingLabel-bottomBorder: rgba(187, 187, 187, .4);--vscode-editor-selectionBackground: #add6ff;--vscode-editor-inactiveSelectionBackground: #e5ebf1;--vscode-editor-selectionHighlightBackground: rgba(173, 214, 255, .5);--vscode-editor-findMatchBackground: #a8ac94;--vscode-editor-findMatchHighlightBackground: rgba(234, 92, 0, .33);--vscode-editor-findRangeHighlightBackground: rgba(180, 180, 180, .3);--vscode-searchEditor-findMatchBackground: rgba(234, 92, 0, .22);--vscode-editor-hoverHighlightBackground: rgba(173, 214, 255, .15);--vscode-editorHoverWidget-background: #f3f3f3;--vscode-editorHoverWidget-foreground: #616161;--vscode-editorHoverWidget-border: #c8c8c8;--vscode-editorHoverWidget-statusBarBackground: #e7e7e7;--vscode-editorLink-activeForeground: #0000ff;--vscode-editorInlayHint-foreground: rgba(51, 51, 51, .8);--vscode-editorInlayHint-background: rgba(196, 196, 196, .3);--vscode-editorInlayHint-typeForeground: rgba(51, 51, 51, .8);--vscode-editorInlayHint-typeBackground: rgba(196, 196, 196, .3);--vscode-editorInlayHint-parameterForeground: rgba(51, 51, 51, .8);--vscode-editorInlayHint-parameterBackground: rgba(196, 196, 196, .3);--vscode-editorLightBulb-foreground: #ddb100;--vscode-editorLightBulbAutoFix-foreground: #007acc;--vscode-diffEditor-insertedTextBackground: rgba(156, 204, 44, .4);--vscode-diffEditor-removedTextBackground: rgba(255, 0, 0, .3);--vscode-diffEditor-insertedLineBackground: rgba(155, 185, 85, .2);--vscode-diffEditor-removedLineBackground: rgba(255, 0, 0, .2);--vscode-diffEditor-diagonalFill: rgba(34, 34, 34, .2);--vscode-list-focusOutline: #0090f1;--vscode-list-focusAndSelectionOutline: #90c2f9;--vscode-list-activeSelectionBackground: #0060c0;--vscode-list-activeSelectionForeground: #ffffff;--vscode-list-activeSelectionIconForeground: #ffffff;--vscode-list-inactiveSelectionBackground: #e4e6f1;--vscode-list-hoverBackground: #e8e8e8;--vscode-list-dropBackground: #d6ebff;--vscode-list-highlightForeground: #0066bf;--vscode-list-focusHighlightForeground: #bbe7ff;--vscode-list-invalidItemForeground: #b89500;--vscode-list-errorForeground: #b01011;--vscode-list-warningForeground: #855f00;--vscode-listFilterWidget-background: #f3f3f3;--vscode-listFilterWidget-outline: rgba(0, 0, 0, 0);--vscode-listFilterWidget-noMatchesOutline: #be1100;--vscode-listFilterWidget-shadow: rgba(0, 0, 0, .16);--vscode-list-filterMatchBackground: rgba(234, 92, 0, .33);--vscode-tree-indentGuidesStroke: #a9a9a9;--vscode-tree-tableColumnsBorder: rgba(97, 97, 97, .13);--vscode-tree-tableOddRowsBackground: rgba(97, 97, 97, .04);--vscode-list-deemphasizedForeground: #8e8e90;--vscode-quickInputList-focusForeground: #ffffff;--vscode-quickInputList-focusIconForeground: #ffffff;--vscode-quickInputList-focusBackground: #0060c0;--vscode-menu-foreground: #616161;--vscode-menu-background: #ffffff;--vscode-menu-selectionForeground: #ffffff;--vscode-menu-selectionBackground: #0060c0;--vscode-menu-separatorBackground: #d4d4d4;--vscode-toolbar-hoverBackground: rgba(184, 184, 184, .31);--vscode-toolbar-activeBackground: rgba(166, 166, 166, .31);--vscode-editor-snippetTabstopHighlightBackground: rgba(10, 50, 100, .2);--vscode-editor-snippetFinalTabstopHighlightBorder: rgba(10, 50, 100, .5);--vscode-breadcrumb-foreground: rgba(97, 97, 97, .8);--vscode-breadcrumb-background: #ffffff;--vscode-breadcrumb-focusForeground: #4e4e4e;--vscode-breadcrumb-activeSelectionForeground: #4e4e4e;--vscode-breadcrumbPicker-background: #f3f3f3;--vscode-merge-currentHeaderBackground: rgba(64, 200, 174, .5);--vscode-merge-currentContentBackground: rgba(64, 200, 174, .2);--vscode-merge-incomingHeaderBackground: rgba(64, 166, 255, .5);--vscode-merge-incomingContentBackground: rgba(64, 166, 255, .2);--vscode-merge-commonHeaderBackground: rgba(96, 96, 96, .4);--vscode-merge-commonContentBackground: rgba(96, 96, 96, .16);--vscode-editorOverviewRuler-currentContentForeground: rgba(64, 200, 174, .5);--vscode-editorOverviewRuler-incomingContentForeground: rgba(64, 166, 255, .5);--vscode-editorOverviewRuler-commonContentForeground: rgba(96, 96, 96, .4);--vscode-editorOverviewRuler-findMatchForeground: rgba(209, 134, 22, .49);--vscode-editorOverviewRuler-selectionHighlightForeground: rgba(160, 160, 160, .8);--vscode-minimap-findMatchHighlight: #d18616;--vscode-minimap-selectionOccurrenceHighlight: #c9c9c9;--vscode-minimap-selectionHighlight: #add6ff;--vscode-minimap-errorHighlight: rgba(255, 18, 18, .7);--vscode-minimap-warningHighlight: #bf8803;--vscode-minimap-foregroundOpacity: #000000;--vscode-minimapSlider-background: rgba(100, 100, 100, .2);--vscode-minimapSlider-hoverBackground: rgba(100, 100, 100, .35);--vscode-minimapSlider-activeBackground: rgba(0, 0, 0, .3);--vscode-problemsErrorIcon-foreground: #e51400;--vscode-problemsWarningIcon-foreground: #bf8803;--vscode-problemsInfoIcon-foreground: #1a85ff;--vscode-charts-foreground: #616161;--vscode-charts-lines: rgba(97, 97, 97, .5);--vscode-charts-red: #e51400;--vscode-charts-blue: #1a85ff;--vscode-charts-yellow: #bf8803;--vscode-charts-orange: #d18616;--vscode-charts-green: #388a34;--vscode-charts-purple: #652d90;--vscode-editor-lineHighlightBorder: #eeeeee;--vscode-editor-rangeHighlightBackground: rgba(253, 255, 0, .2);--vscode-editor-symbolHighlightBackground: rgba(234, 92, 0, .33);--vscode-editorCursor-foreground: #000000;--vscode-editorWhitespace-foreground: rgba(51, 51, 51, .2);--vscode-editorIndentGuide-background: #d3d3d3;--vscode-editorIndentGuide-activeBackground: #939393;--vscode-editorLineNumber-foreground: #237893;--vscode-editorActiveLineNumber-foreground: #0b216f;--vscode-editorLineNumber-activeForeground: #0b216f;--vscode-editorRuler-foreground: #d3d3d3;--vscode-editorCodeLens-foreground: #919191;--vscode-editorBracketMatch-background: rgba(0, 100, 0, .1);--vscode-editorBracketMatch-border: #b9b9b9;--vscode-editorOverviewRuler-border: rgba(127, 127, 127, .3);--vscode-editorGutter-background: #ffffff;--vscode-editorUnnecessaryCode-opacity: rgba(0, 0, 0, .47);--vscode-editorGhostText-foreground: rgba(0, 0, 0, .47);--vscode-editorOverviewRuler-rangeHighlightForeground: rgba(0, 122, 204, .6);--vscode-editorOverviewRuler-errorForeground: rgba(255, 18, 18, .7);--vscode-editorOverviewRuler-warningForeground: #bf8803;--vscode-editorOverviewRuler-infoForeground: #1a85ff;--vscode-editorBracketHighlight-foreground1: #0431fa;--vscode-editorBracketHighlight-foreground2: #319331;--vscode-editorBracketHighlight-foreground3: #7b3814;--vscode-editorBracketHighlight-foreground4: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-foreground5: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-foreground6: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-unexpectedBracket\.foreground: rgba(255, 18, 18, .8);--vscode-editorBracketPairGuide-background1: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background2: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background3: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background4: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background5: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background6: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground1: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground2: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground3: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground4: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground5: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground6: rgba(0, 0, 0, 0);--vscode-editorUnicodeHighlight-border: #cea33d;--vscode-editorUnicodeHighlight-background: rgba(206, 163, 61, .08);--vscode-symbolIcon-arrayForeground: #616161;--vscode-symbolIcon-booleanForeground: #616161;--vscode-symbolIcon-classForeground: #d67e00;--vscode-symbolIcon-colorForeground: #616161;--vscode-symbolIcon-constantForeground: #616161;--vscode-symbolIcon-constructorForeground: #652d90;--vscode-symbolIcon-enumeratorForeground: #d67e00;--vscode-symbolIcon-enumeratorMemberForeground: #007acc;--vscode-symbolIcon-eventForeground: #d67e00;--vscode-symbolIcon-fieldForeground: #007acc;--vscode-symbolIcon-fileForeground: #616161;--vscode-symbolIcon-folderForeground: #616161;--vscode-symbolIcon-functionForeground: #652d90;--vscode-symbolIcon-interfaceForeground: #007acc;--vscode-symbolIcon-keyForeground: #616161;--vscode-symbolIcon-keywordForeground: #616161;--vscode-symbolIcon-methodForeground: #652d90;--vscode-symbolIcon-moduleForeground: #616161;--vscode-symbolIcon-namespaceForeground: #616161;--vscode-symbolIcon-nullForeground: #616161;--vscode-symbolIcon-numberForeground: #616161;--vscode-symbolIcon-objectForeground: #616161;--vscode-symbolIcon-operatorForeground: #616161;--vscode-symbolIcon-packageForeground: #616161;--vscode-symbolIcon-propertyForeground: #616161;--vscode-symbolIcon-referenceForeground: #616161;--vscode-symbolIcon-snippetForeground: #616161;--vscode-symbolIcon-stringForeground: #616161;--vscode-symbolIcon-structForeground: #616161;--vscode-symbolIcon-textForeground: #616161;--vscode-symbolIcon-typeParameterForeground: #616161;--vscode-symbolIcon-unitForeground: #616161;--vscode-symbolIcon-variableForeground: #007acc;--vscode-editorHoverWidget-highlightForeground: #0066bf;--vscode-editorOverviewRuler-bracketMatchForeground: #a0a0a0;--vscode-editor-foldBackground: rgba(173, 214, 255, .3);--vscode-editorGutter-foldingControlForeground: #424242;--vscode-editor-linkedEditingBackground: rgba(255, 0, 0, .3);--vscode-editor-wordHighlightBackground: rgba(87, 87, 87, .25);--vscode-editor-wordHighlightStrongBackground: rgba(14, 99, 156, .25);--vscode-editorOverviewRuler-wordHighlightForeground: rgba(160, 160, 160, .8);--vscode-editorOverviewRuler-wordHighlightStrongForeground: rgba(192, 160, 192, .8);--vscode-peekViewTitle-background: rgba(26, 133, 255, .1);--vscode-peekViewTitleLabel-foreground: #000000;--vscode-peekViewTitleDescription-foreground: #616161;--vscode-peekView-border: #1a85ff;--vscode-peekViewResult-background: #f3f3f3;--vscode-peekViewResult-lineForeground: #646465;--vscode-peekViewResult-fileForeground: #1e1e1e;--vscode-peekViewResult-selectionBackground: rgba(51, 153, 255, .2);--vscode-peekViewResult-selectionForeground: #6c6c6c;--vscode-peekViewEditor-background: #f2f8fc;--vscode-peekViewEditorGutter-background: #f2f8fc;--vscode-peekViewResult-matchHighlightBackground: rgba(234, 92, 0, .3);--vscode-peekViewEditor-matchHighlightBackground: rgba(245, 216, 2, .87);--vscode-editorMarkerNavigationError-background: #e51400;--vscode-editorMarkerNavigationError-headerBackground: rgba(229, 20, 0, .1);--vscode-editorMarkerNavigationWarning-background: #bf8803;--vscode-editorMarkerNavigationWarning-headerBackground: rgba(191, 136, 3, .1);--vscode-editorMarkerNavigationInfo-background: #1a85ff;--vscode-editorMarkerNavigationInfo-headerBackground: rgba(26, 133, 255, .1);--vscode-editorMarkerNavigation-background: #ffffff;--vscode-editorSuggestWidget-background: #f3f3f3;--vscode-editorSuggestWidget-border: #c8c8c8;--vscode-editorSuggestWidget-foreground: #000000;--vscode-editorSuggestWidget-selectedForeground: #ffffff;--vscode-editorSuggestWidget-selectedIconForeground: #ffffff;--vscode-editorSuggestWidget-selectedBackground: #0060c0;--vscode-editorSuggestWidget-highlightForeground: #0066bf;--vscode-editorSuggestWidget-focusHighlightForeground: #bbe7ff;--vscode-editorSuggestWidgetStatus-foreground: rgba(0, 0, 0, .5);--vscode-tab-activeBackground: #ffffff;--vscode-tab-unfocusedActiveBackground: #ffffff;--vscode-tab-inactiveBackground: #ececec;--vscode-tab-unfocusedInactiveBackground: #ececec;--vscode-tab-activeForeground: #333333;--vscode-tab-inactiveForeground: rgba(51, 51, 51, .7);--vscode-tab-unfocusedActiveForeground: rgba(51, 51, 51, .7);--vscode-tab-unfocusedInactiveForeground: rgba(51, 51, 51, .35);--vscode-tab-border: #f3f3f3;--vscode-tab-lastPinnedBorder: rgba(97, 97, 97, .19);--vscode-tab-activeModifiedBorder: #33aaee;--vscode-tab-inactiveModifiedBorder: rgba(51, 170, 238, .5);--vscode-tab-unfocusedActiveModifiedBorder: rgba(51, 170, 238, .7);--vscode-tab-unfocusedInactiveModifiedBorder: rgba(51, 170, 238, .25);--vscode-editorPane-background: #ffffff;--vscode-editorGroupHeader-tabsBackground: #f3f3f3;--vscode-editorGroupHeader-noTabsBackground: #ffffff;--vscode-editorGroup-border: #e7e7e7;--vscode-editorGroup-dropBackground: rgba(38, 119, 203, .18);--vscode-editorGroup-dropIntoPromptForeground: #616161;--vscode-editorGroup-dropIntoPromptBackground: #f3f3f3;--vscode-sideBySideEditor-horizontalBorder: #e7e7e7;--vscode-sideBySideEditor-verticalBorder: #e7e7e7;--vscode-panel-background: #ffffff;--vscode-panel-border: rgba(128, 128, 128, .35);--vscode-panelTitle-activeForeground: #424242;--vscode-panelTitle-inactiveForeground: rgba(66, 66, 66, .75);--vscode-panelTitle-activeBorder: #424242;--vscode-panelInput-border: #dddddd;--vscode-panel-dropBorder: #424242;--vscode-panelSection-dropBackground: rgba(38, 119, 203, .18);--vscode-panelSectionHeader-background: rgba(128, 128, 128, .2);--vscode-panelSection-border: rgba(128, 128, 128, .35);--vscode-banner-background: #004386;--vscode-banner-foreground: #ffffff;--vscode-banner-iconForeground: #1a85ff;--vscode-statusBar-foreground: #ffffff;--vscode-statusBar-noFolderForeground: #ffffff;--vscode-statusBar-background: #007acc;--vscode-statusBar-noFolderBackground: #68217a;--vscode-statusBar-focusBorder: #ffffff;--vscode-statusBarItem-activeBackground: rgba(255, 255, 255, .18);--vscode-statusBarItem-focusBorder: #ffffff;--vscode-statusBarItem-hoverBackground: rgba(255, 255, 255, .12);--vscode-statusBarItem-compactHoverBackground: rgba(255, 255, 255, .2);--vscode-statusBarItem-prominentForeground: #ffffff;--vscode-statusBarItem-prominentBackground: rgba(0, 0, 0, .5);--vscode-statusBarItem-prominentHoverBackground: rgba(0, 0, 0, .3);--vscode-statusBarItem-errorBackground: #c72e0f;--vscode-statusBarItem-errorForeground: #ffffff;--vscode-statusBarItem-warningBackground: #725102;--vscode-statusBarItem-warningForeground: #ffffff;--vscode-activityBar-background: #2c2c2c;--vscode-activityBar-foreground: #ffffff;--vscode-activityBar-inactiveForeground: rgba(255, 255, 255, .4);--vscode-activityBar-activeBorder: #ffffff;--vscode-activityBar-dropBorder: #ffffff;--vscode-activityBarBadge-background: #007acc;--vscode-activityBarBadge-foreground: #ffffff;--vscode-statusBarItem-remoteBackground: #16825d;--vscode-statusBarItem-remoteForeground: #ffffff;--vscode-extensionBadge-remoteBackground: #007acc;--vscode-extensionBadge-remoteForeground: #ffffff;--vscode-sideBar-background: #f3f3f3;--vscode-sideBarTitle-foreground: #6f6f6f;--vscode-sideBar-dropBackground: rgba(38, 119, 203, .18);--vscode-sideBarSectionHeader-background: rgba(0, 0, 0, 0);--vscode-sideBarSectionHeader-border: rgba(97, 97, 97, .19);--vscode-titleBar-activeForeground: #333333;--vscode-titleBar-inactiveForeground: rgba(51, 51, 51, .6);--vscode-titleBar-activeBackground: #dddddd;--vscode-titleBar-inactiveBackground: rgba(221, 221, 221, .6);--vscode-menubar-selectionForeground: #333333;--vscode-menubar-selectionBackground: rgba(184, 184, 184, .31);--vscode-notifications-foreground: #616161;--vscode-notifications-background: #f3f3f3;--vscode-notificationLink-foreground: #006ab1;--vscode-notificationCenterHeader-background: #e7e7e7;--vscode-notifications-border: #e7e7e7;--vscode-notificationsErrorIcon-foreground: #e51400;--vscode-notificationsWarningIcon-foreground: #bf8803;--vscode-notificationsInfoIcon-foreground: #1a85ff;--vscode-commandCenter-foreground: #333333;--vscode-commandCenter-activeForeground: #333333;--vscode-commandCenter-activeBackground: rgba(184, 184, 184, .31);--vscode-commandCenter-border: rgba(128, 128, 128, .35);--vscode-editorCommentsWidget-resolvedBorder: rgba(97, 97, 97, .5);--vscode-editorCommentsWidget-unresolvedBorder: #1a85ff;--vscode-editorCommentsWidget-rangeBackground: rgba(26, 133, 255, .1);--vscode-editorCommentsWidget-rangeBorder: rgba(26, 133, 255, .4);--vscode-editorCommentsWidget-rangeActiveBackground: rgba(26, 133, 255, .1);--vscode-editorCommentsWidget-rangeActiveBorder: rgba(26, 133, 255, .4);--vscode-editorGutter-commentRangeForeground: #d5d8e9;--vscode-debugToolBar-background: #f3f3f3;--vscode-debugIcon-startForeground: #388a34;--vscode-editor-stackFrameHighlightBackground: rgba(255, 255, 102, .45);--vscode-editor-focusedStackFrameHighlightBackground: rgba(206, 231, 206, .45);--vscode-mergeEditor-change\.background: rgba(155, 185, 85, .2);--vscode-mergeEditor-change\.word\.background: rgba(156, 204, 44, .4);--vscode-mergeEditor-conflict\.unhandledUnfocused\.border: rgba(255, 166, 0, .48);--vscode-mergeEditor-conflict\.unhandledFocused\.border: #ffa600;--vscode-mergeEditor-conflict\.handledUnfocused\.border: rgba(134, 134, 134, .29);--vscode-mergeEditor-conflict\.handledFocused\.border: rgba(193, 193, 193, .8);--vscode-mergeEditor-conflict\.handled\.minimapOverViewRuler: rgba(173, 172, 168, .93);--vscode-mergeEditor-conflict\.unhandled\.minimapOverViewRuler: #fcba03;--vscode-mergeEditor-conflictingLines\.background: rgba(255, 234, 0, .28);--vscode-settings-headerForeground: #444444;--vscode-settings-modifiedItemIndicator: #66afe0;--vscode-settings-headerBorder: rgba(128, 128, 128, .35);--vscode-settings-sashBorder: rgba(128, 128, 128, .35);--vscode-settings-dropdownBackground: #ffffff;--vscode-settings-dropdownBorder: #cecece;--vscode-settings-dropdownListBorder: #c8c8c8;--vscode-settings-checkboxBackground: #ffffff;--vscode-settings-checkboxBorder: #cecece;--vscode-settings-textInputBackground: #ffffff;--vscode-settings-textInputForeground: #616161;--vscode-settings-textInputBorder: #cecece;--vscode-settings-numberInputBackground: #ffffff;--vscode-settings-numberInputForeground: #616161;--vscode-settings-numberInputBorder: #cecece;--vscode-settings-focusedRowBackground: rgba(232, 232, 232, .6);--vscode-settings-rowHoverBackground: rgba(232, 232, 232, .3);--vscode-settings-focusedRowBorder: rgba(0, 0, 0, .12);--vscode-terminal-foreground: #333333;--vscode-terminal-selectionBackground: #add6ff;--vscode-terminal-inactiveSelectionBackground: #e5ebf1;--vscode-terminalCommandDecoration-defaultBackground: rgba(0, 0, 0, .25);--vscode-terminalCommandDecoration-successBackground: #2090d3;--vscode-terminalCommandDecoration-errorBackground: #e51400;--vscode-terminalOverviewRuler-cursorForeground: rgba(160, 160, 160, .8);--vscode-terminal-border: rgba(128, 128, 128, .35);--vscode-terminal-findMatchBackground: #a8ac94;--vscode-terminal-findMatchHighlightBackground: rgba(234, 92, 0, .33);--vscode-terminalOverviewRuler-findMatchForeground: rgba(209, 134, 22, .49);--vscode-terminal-dropBackground: rgba(38, 119, 203, .18);--vscode-testing-iconFailed: #f14c4c;--vscode-testing-iconErrored: #f14c4c;--vscode-testing-iconPassed: #73c991;--vscode-testing-runAction: #73c991;--vscode-testing-iconQueued: #cca700;--vscode-testing-iconUnset: #848484;--vscode-testing-iconSkipped: #848484;--vscode-testing-peekBorder: #e51400;--vscode-testing-peekHeaderBackground: rgba(229, 20, 0, .1);--vscode-testing-message\.error\.decorationForeground: #e51400;--vscode-testing-message\.error\.lineBackground: rgba(255, 0, 0, .2);--vscode-testing-message\.info\.decorationForeground: rgba(0, 0, 0, .5);--vscode-welcomePage-tileBackground: #f3f3f3;--vscode-welcomePage-tileHoverBackground: #dbdbdb;--vscode-welcomePage-tileShadow: rgba(0, 0, 0, .16);--vscode-welcomePage-progress\.background: #ffffff;--vscode-welcomePage-progress\.foreground: #006ab1;--vscode-debugExceptionWidget-border: #a31515;--vscode-debugExceptionWidget-background: #f1dfde;--vscode-ports-iconRunningProcessForeground: #369432;--vscode-statusBar-debuggingBackground: #cc6633;--vscode-statusBar-debuggingForeground: #ffffff;--vscode-editor-inlineValuesForeground: rgba(0, 0, 0, .5);--vscode-editor-inlineValuesBackground: rgba(255, 200, 0, .2);--vscode-editorGutter-modifiedBackground: #2090d3;--vscode-editorGutter-addedBackground: #48985d;--vscode-editorGutter-deletedBackground: #e51400;--vscode-minimapGutter-modifiedBackground: #2090d3;--vscode-minimapGutter-addedBackground: #48985d;--vscode-minimapGutter-deletedBackground: #e51400;--vscode-editorOverviewRuler-modifiedForeground: rgba(32, 144, 211, .6);--vscode-editorOverviewRuler-addedForeground: rgba(72, 152, 93, .6);--vscode-editorOverviewRuler-deletedForeground: rgba(229, 20, 0, .6);--vscode-debugIcon-breakpointForeground: #e51400;--vscode-debugIcon-breakpointDisabledForeground: #848484;--vscode-debugIcon-breakpointUnverifiedForeground: #848484;--vscode-debugIcon-breakpointCurrentStackframeForeground: #be8700;--vscode-debugIcon-breakpointStackframeForeground: #89d185;--vscode-notebook-cellBorderColor: #e8e8e8;--vscode-notebook-focusedEditorBorder: #0090f1;--vscode-notebookStatusSuccessIcon-foreground: #388a34;--vscode-notebookStatusErrorIcon-foreground: #a1260d;--vscode-notebookStatusRunningIcon-foreground: #616161;--vscode-notebook-cellToolbarSeparator: rgba(128, 128, 128, .35);--vscode-notebook-selectedCellBackground: rgba(200, 221, 241, .31);--vscode-notebook-selectedCellBorder: #e8e8e8;--vscode-notebook-focusedCellBorder: #0090f1;--vscode-notebook-inactiveFocusedCellBorder: #e8e8e8;--vscode-notebook-cellStatusBarItemHoverBackground: rgba(0, 0, 0, .08);--vscode-notebook-cellInsertionIndicator: #0090f1;--vscode-notebookScrollbarSlider-background: rgba(100, 100, 100, .4);--vscode-notebookScrollbarSlider-hoverBackground: rgba(100, 100, 100, .7);--vscode-notebookScrollbarSlider-activeBackground: rgba(0, 0, 0, .6);--vscode-notebook-symbolHighlightBackground: rgba(253, 255, 0, .2);--vscode-notebook-cellEditorBackground: #f3f3f3;--vscode-notebook-editorBackground: #ffffff;--vscode-keybindingTable-headerBackground: rgba(97, 97, 97, .04);--vscode-keybindingTable-rowsBackground: rgba(97, 97, 97, .04);--vscode-scm-providerBorder: #c8c8c8;--vscode-searchEditor-textInputBorder: #cecece;--vscode-debugTokenExpression-name: #9b46b0;--vscode-debugTokenExpression-value: rgba(108, 108, 108, .8);--vscode-debugTokenExpression-string: #a31515;--vscode-debugTokenExpression-boolean: #0000ff;--vscode-debugTokenExpression-number: #098658;--vscode-debugTokenExpression-error: #e51400;--vscode-debugView-exceptionLabelForeground: #ffffff;--vscode-debugView-exceptionLabelBackground: #a31515;--vscode-debugView-stateLabelForeground: #616161;--vscode-debugView-stateLabelBackground: rgba(136, 136, 136, .27);--vscode-debugView-valueChangedHighlight: #569cd6;--vscode-debugConsole-infoForeground: #1a85ff;--vscode-debugConsole-warningForeground: #bf8803;--vscode-debugConsole-errorForeground: #a1260d;--vscode-debugConsole-sourceForeground: #616161;--vscode-debugConsoleInputIcon-foreground: #616161;--vscode-debugIcon-pauseForeground: #007acc;--vscode-debugIcon-stopForeground: #a1260d;--vscode-debugIcon-disconnectForeground: #a1260d;--vscode-debugIcon-restartForeground: #388a34;--vscode-debugIcon-stepOverForeground: #007acc;--vscode-debugIcon-stepIntoForeground: #007acc;--vscode-debugIcon-stepOutForeground: #007acc;--vscode-debugIcon-continueForeground: #007acc;--vscode-debugIcon-stepBackForeground: #007acc;--vscode-extensionButton-prominentBackground: #007acc;--vscode-extensionButton-prominentForeground: #ffffff;--vscode-extensionButton-prominentHoverBackground: #0062a3;--vscode-extensionIcon-starForeground: #df6100;--vscode-extensionIcon-verifiedForeground: #006ab1;--vscode-extensionIcon-preReleaseForeground: #1d9271;--vscode-extensionIcon-sponsorForeground: #b51e78;--vscode-terminal-ansiBlack: #000000;--vscode-terminal-ansiRed: #cd3131;--vscode-terminal-ansiGreen: #00bc00;--vscode-terminal-ansiYellow: #949800;--vscode-terminal-ansiBlue: #0451a5;--vscode-terminal-ansiMagenta: #bc05bc;--vscode-terminal-ansiCyan: #0598bc;--vscode-terminal-ansiWhite: #555555;--vscode-terminal-ansiBrightBlack: #666666;--vscode-terminal-ansiBrightRed: #cd3131;--vscode-terminal-ansiBrightGreen: #14ce14;--vscode-terminal-ansiBrightYellow: #b5ba00;--vscode-terminal-ansiBrightBlue: #0451a5;--vscode-terminal-ansiBrightMagenta: #bc05bc;--vscode-terminal-ansiBrightCyan: #0598bc;--vscode-terminal-ansiBrightWhite: #a5a5a5;--vscode-interactive-activeCodeBorder: #1a85ff;--vscode-interactive-inactiveCodeBorder: #e4e6f1;--vscode-gitDecoration-addedResourceForeground: #587c0c;--vscode-gitDecoration-modifiedResourceForeground: #895503;--vscode-gitDecoration-deletedResourceForeground: #ad0707;--vscode-gitDecoration-renamedResourceForeground: #007100;--vscode-gitDecoration-untrackedResourceForeground: #007100;--vscode-gitDecoration-ignoredResourceForeground: #8e8e90;--vscode-gitDecoration-stageModifiedResourceForeground: #895503;--vscode-gitDecoration-stageDeletedResourceForeground: #ad0707;--vscode-gitDecoration-conflictingResourceForeground: #ad0707;--vscode-gitDecoration-submoduleResourceForeground: #1258a7}body.dark-mode{--vscode-font-family: system-ui, "Ubuntu", "Droid Sans", sans-serif;--vscode-font-weight: normal;--vscode-font-size: 13px;--vscode-editor-font-family: "Droid Sans Mono", "monospace", monospace;--vscode-editor-font-weight: normal;--vscode-editor-font-size: 14px;--vscode-foreground: #cccccc;--vscode-disabledForeground: rgba(204, 204, 204, .5);--vscode-errorForeground: #f48771;--vscode-descriptionForeground: rgba(204, 204, 204, .7);--vscode-icon-foreground: #c5c5c5;--vscode-focusBorder: #007fd4;--vscode-textSeparator-foreground: rgba(255, 255, 255, .18);--vscode-textLink-foreground: #3794ff;--vscode-textLink-activeForeground: #3794ff;--vscode-textPreformat-foreground: #d7ba7d;--vscode-textBlockQuote-background: rgba(127, 127, 127, .1);--vscode-textBlockQuote-border: rgba(0, 122, 204, .5);--vscode-textCodeBlock-background: rgba(10, 10, 10, .4);--vscode-widget-shadow: rgba(0, 0, 0, .36);--vscode-input-background: #3c3c3c;--vscode-input-foreground: #cccccc;--vscode-inputOption-activeBorder: #007acc;--vscode-inputOption-hoverBackground: rgba(90, 93, 94, .5);--vscode-inputOption-activeBackground: rgba(0, 127, 212, .4);--vscode-inputOption-activeForeground: #ffffff;--vscode-input-placeholderForeground: #a6a6a6;--vscode-inputValidation-infoBackground: #063b49;--vscode-inputValidation-infoBorder: #007acc;--vscode-inputValidation-warningBackground: #352a05;--vscode-inputValidation-warningBorder: #b89500;--vscode-inputValidation-errorBackground: #5a1d1d;--vscode-inputValidation-errorBorder: #be1100;--vscode-dropdown-background: #3c3c3c;--vscode-dropdown-foreground: #f0f0f0;--vscode-dropdown-border: #3c3c3c;--vscode-checkbox-background: #3c3c3c;--vscode-checkbox-foreground: #f0f0f0;--vscode-checkbox-border: #3c3c3c;--vscode-button-foreground: #ffffff;--vscode-button-separator: rgba(255, 255, 255, .4);--vscode-button-background: #0e639c;--vscode-button-hoverBackground: #1177bb;--vscode-button-secondaryForeground: #ffffff;--vscode-button-secondaryBackground: #3a3d41;--vscode-button-secondaryHoverBackground: #45494e;--vscode-badge-background: #4d4d4d;--vscode-badge-foreground: #ffffff;--vscode-scrollbar-shadow: #000000;--vscode-scrollbarSlider-background: rgba(121, 121, 121, .4);--vscode-scrollbarSlider-hoverBackground: rgba(100, 100, 100, .7);--vscode-scrollbarSlider-activeBackground: rgba(191, 191, 191, .4);--vscode-progressBar-background: #0e70c0;--vscode-editorError-foreground: #f14c4c;--vscode-editorWarning-foreground: #cca700;--vscode-editorInfo-foreground: #3794ff;--vscode-editorHint-foreground: rgba(238, 238, 238, .7);--vscode-sash-hoverBorder: #007fd4;--vscode-editor-background: #1e1e1e;--vscode-editor-foreground: #d4d4d4;--vscode-editorStickyScroll-background: #1e1e1e;--vscode-editorStickyScrollHover-background: #2a2d2e;--vscode-editorWidget-background: #252526;--vscode-editorWidget-foreground: #cccccc;--vscode-editorWidget-border: #454545;--vscode-quickInput-background: #252526;--vscode-quickInput-foreground: #cccccc;--vscode-quickInputTitle-background: rgba(255, 255, 255, .1);--vscode-pickerGroup-foreground: #3794ff;--vscode-pickerGroup-border: #3f3f46;--vscode-keybindingLabel-background: rgba(128, 128, 128, .17);--vscode-keybindingLabel-foreground: #cccccc;--vscode-keybindingLabel-border: rgba(51, 51, 51, .6);--vscode-keybindingLabel-bottomBorder: rgba(68, 68, 68, .6);--vscode-editor-selectionBackground: #264f78;--vscode-editor-inactiveSelectionBackground: #3a3d41;--vscode-editor-selectionHighlightBackground: rgba(173, 214, 255, .15);--vscode-editor-findMatchBackground: #515c6a;--vscode-editor-findMatchHighlightBackground: rgba(234, 92, 0, .33);--vscode-editor-findRangeHighlightBackground: rgba(58, 61, 65, .4);--vscode-searchEditor-findMatchBackground: rgba(234, 92, 0, .22);--vscode-editor-hoverHighlightBackground: rgba(38, 79, 120, .25);--vscode-editorHoverWidget-background: #252526;--vscode-editorHoverWidget-foreground: #cccccc;--vscode-editorHoverWidget-border: #454545;--vscode-editorHoverWidget-statusBarBackground: #2c2c2d;--vscode-editorLink-activeForeground: #4e94ce;--vscode-editorInlayHint-foreground: rgba(255, 255, 255, .8);--vscode-editorInlayHint-background: rgba(77, 77, 77, .6);--vscode-editorInlayHint-typeForeground: rgba(255, 255, 255, .8);--vscode-editorInlayHint-typeBackground: rgba(77, 77, 77, .6);--vscode-editorInlayHint-parameterForeground: rgba(255, 255, 255, .8);--vscode-editorInlayHint-parameterBackground: rgba(77, 77, 77, .6);--vscode-editorLightBulb-foreground: #ffcc00;--vscode-editorLightBulbAutoFix-foreground: #75beff;--vscode-diffEditor-insertedTextBackground: rgba(156, 204, 44, .2);--vscode-diffEditor-removedTextBackground: rgba(255, 0, 0, .4);--vscode-diffEditor-insertedLineBackground: rgba(155, 185, 85, .2);--vscode-diffEditor-removedLineBackground: rgba(255, 0, 0, .2);--vscode-diffEditor-diagonalFill: rgba(204, 204, 204, .2);--vscode-list-focusOutline: #007fd4;--vscode-list-activeSelectionBackground: #04395e;--vscode-list-activeSelectionForeground: #ffffff;--vscode-list-activeSelectionIconForeground: #ffffff;--vscode-list-inactiveSelectionBackground: #37373d;--vscode-list-hoverBackground: #2a2d2e;--vscode-list-dropBackground: #383b3d;--vscode-list-highlightForeground: #2aaaff;--vscode-list-focusHighlightForeground: #2aaaff;--vscode-list-invalidItemForeground: #b89500;--vscode-list-errorForeground: #f88070;--vscode-list-warningForeground: #cca700;--vscode-listFilterWidget-background: #252526;--vscode-listFilterWidget-outline: rgba(0, 0, 0, 0);--vscode-listFilterWidget-noMatchesOutline: #be1100;--vscode-listFilterWidget-shadow: rgba(0, 0, 0, .36);--vscode-list-filterMatchBackground: rgba(234, 92, 0, .33);--vscode-tree-indentGuidesStroke: #585858;--vscode-tree-tableColumnsBorder: rgba(204, 204, 204, .13);--vscode-tree-tableOddRowsBackground: rgba(204, 204, 204, .04);--vscode-list-deemphasizedForeground: #8c8c8c;--vscode-quickInputList-focusForeground: #ffffff;--vscode-quickInputList-focusIconForeground: #ffffff;--vscode-quickInputList-focusBackground: #04395e;--vscode-menu-foreground: #cccccc;--vscode-menu-background: #303031;--vscode-menu-selectionForeground: #ffffff;--vscode-menu-selectionBackground: #04395e;--vscode-menu-separatorBackground: #606060;--vscode-toolbar-hoverBackground: rgba(90, 93, 94, .31);--vscode-toolbar-activeBackground: rgba(99, 102, 103, .31);--vscode-editor-snippetTabstopHighlightBackground: rgba(124, 124, 124, .3);--vscode-editor-snippetFinalTabstopHighlightBorder: #525252;--vscode-breadcrumb-foreground: rgba(204, 204, 204, .8);--vscode-breadcrumb-background: #1e1e1e;--vscode-breadcrumb-focusForeground: #e0e0e0;--vscode-breadcrumb-activeSelectionForeground: #e0e0e0;--vscode-breadcrumbPicker-background: #252526;--vscode-merge-currentHeaderBackground: rgba(64, 200, 174, .5);--vscode-merge-currentContentBackground: rgba(64, 200, 174, .2);--vscode-merge-incomingHeaderBackground: rgba(64, 166, 255, .5);--vscode-merge-incomingContentBackground: rgba(64, 166, 255, .2);--vscode-merge-commonHeaderBackground: rgba(96, 96, 96, .4);--vscode-merge-commonContentBackground: rgba(96, 96, 96, .16);--vscode-editorOverviewRuler-currentContentForeground: rgba(64, 200, 174, .5);--vscode-editorOverviewRuler-incomingContentForeground: rgba(64, 166, 255, .5);--vscode-editorOverviewRuler-commonContentForeground: rgba(96, 96, 96, .4);--vscode-editorOverviewRuler-findMatchForeground: rgba(209, 134, 22, .49);--vscode-editorOverviewRuler-selectionHighlightForeground: rgba(160, 160, 160, .8);--vscode-minimap-findMatchHighlight: #d18616;--vscode-minimap-selectionOccurrenceHighlight: #676767;--vscode-minimap-selectionHighlight: #264f78;--vscode-minimap-errorHighlight: rgba(255, 18, 18, .7);--vscode-minimap-warningHighlight: #cca700;--vscode-minimap-foregroundOpacity: #000000;--vscode-minimapSlider-background: rgba(121, 121, 121, .2);--vscode-minimapSlider-hoverBackground: rgba(100, 100, 100, .35);--vscode-minimapSlider-activeBackground: rgba(191, 191, 191, .2);--vscode-problemsErrorIcon-foreground: #f14c4c;--vscode-problemsWarningIcon-foreground: #cca700;--vscode-problemsInfoIcon-foreground: #3794ff;--vscode-charts-foreground: #cccccc;--vscode-charts-lines: rgba(204, 204, 204, .5);--vscode-charts-red: #f14c4c;--vscode-charts-blue: #3794ff;--vscode-charts-yellow: #cca700;--vscode-charts-orange: #d18616;--vscode-charts-green: #89d185;--vscode-charts-purple: #b180d7;--vscode-editor-lineHighlightBorder: #282828;--vscode-editor-rangeHighlightBackground: rgba(255, 255, 255, .04);--vscode-editor-symbolHighlightBackground: rgba(234, 92, 0, .33);--vscode-editorCursor-foreground: #aeafad;--vscode-editorWhitespace-foreground: rgba(227, 228, 226, .16);--vscode-editorIndentGuide-background: #404040;--vscode-editorIndentGuide-activeBackground: #707070;--vscode-editorLineNumber-foreground: #858585;--vscode-editorActiveLineNumber-foreground: #c6c6c6;--vscode-editorLineNumber-activeForeground: #c6c6c6;--vscode-editorRuler-foreground: #5a5a5a;--vscode-editorCodeLens-foreground: #999999;--vscode-editorBracketMatch-background: rgba(0, 100, 0, .1);--vscode-editorBracketMatch-border: #888888;--vscode-editorOverviewRuler-border: rgba(127, 127, 127, .3);--vscode-editorGutter-background: #1e1e1e;--vscode-editorUnnecessaryCode-opacity: rgba(0, 0, 0, .67);--vscode-editorGhostText-foreground: rgba(255, 255, 255, .34);--vscode-editorOverviewRuler-rangeHighlightForeground: rgba(0, 122, 204, .6);--vscode-editorOverviewRuler-errorForeground: rgba(255, 18, 18, .7);--vscode-editorOverviewRuler-warningForeground: #cca700;--vscode-editorOverviewRuler-infoForeground: #3794ff;--vscode-editorBracketHighlight-foreground1: #ffd700;--vscode-editorBracketHighlight-foreground2: #da70d6;--vscode-editorBracketHighlight-foreground3: #179fff;--vscode-editorBracketHighlight-foreground4: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-foreground5: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-foreground6: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-unexpectedBracket\.foreground: rgba(255, 18, 18, .8);--vscode-editorBracketPairGuide-background1: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background2: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background3: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background4: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background5: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background6: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground1: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground2: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground3: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground4: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground5: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground6: rgba(0, 0, 0, 0);--vscode-editorUnicodeHighlight-border: #bd9b03;--vscode-editorUnicodeHighlight-background: rgba(189, 155, 3, .15);--vscode-symbolIcon-arrayForeground: #cccccc;--vscode-symbolIcon-booleanForeground: #cccccc;--vscode-symbolIcon-classForeground: #ee9d28;--vscode-symbolIcon-colorForeground: #cccccc;--vscode-symbolIcon-constantForeground: #cccccc;--vscode-symbolIcon-constructorForeground: #b180d7;--vscode-symbolIcon-enumeratorForeground: #ee9d28;--vscode-symbolIcon-enumeratorMemberForeground: #75beff;--vscode-symbolIcon-eventForeground: #ee9d28;--vscode-symbolIcon-fieldForeground: #75beff;--vscode-symbolIcon-fileForeground: #cccccc;--vscode-symbolIcon-folderForeground: #cccccc;--vscode-symbolIcon-functionForeground: #b180d7;--vscode-symbolIcon-interfaceForeground: #75beff;--vscode-symbolIcon-keyForeground: #cccccc;--vscode-symbolIcon-keywordForeground: #cccccc;--vscode-symbolIcon-methodForeground: #b180d7;--vscode-symbolIcon-moduleForeground: #cccccc;--vscode-symbolIcon-namespaceForeground: #cccccc;--vscode-symbolIcon-nullForeground: #cccccc;--vscode-symbolIcon-numberForeground: #cccccc;--vscode-symbolIcon-objectForeground: #cccccc;--vscode-symbolIcon-operatorForeground: #cccccc;--vscode-symbolIcon-packageForeground: #cccccc;--vscode-symbolIcon-propertyForeground: #cccccc;--vscode-symbolIcon-referenceForeground: #cccccc;--vscode-symbolIcon-snippetForeground: #cccccc;--vscode-symbolIcon-stringForeground: #cccccc;--vscode-symbolIcon-structForeground: #cccccc;--vscode-symbolIcon-textForeground: #cccccc;--vscode-symbolIcon-typeParameterForeground: #cccccc;--vscode-symbolIcon-unitForeground: #cccccc;--vscode-symbolIcon-variableForeground: #75beff;--vscode-editorHoverWidget-highlightForeground: #2aaaff;--vscode-editorOverviewRuler-bracketMatchForeground: #a0a0a0;--vscode-editor-foldBackground: rgba(38, 79, 120, .3);--vscode-editorGutter-foldingControlForeground: #c5c5c5;--vscode-editor-linkedEditingBackground: rgba(255, 0, 0, .3);--vscode-editor-wordHighlightBackground: rgba(87, 87, 87, .72);--vscode-editor-wordHighlightStrongBackground: rgba(0, 73, 114, .72);--vscode-editorOverviewRuler-wordHighlightForeground: rgba(160, 160, 160, .8);--vscode-editorOverviewRuler-wordHighlightStrongForeground: rgba(192, 160, 192, .8);--vscode-peekViewTitle-background: rgba(55, 148, 255, .1);--vscode-peekViewTitleLabel-foreground: #ffffff;--vscode-peekViewTitleDescription-foreground: rgba(204, 204, 204, .7);--vscode-peekView-border: #3794ff;--vscode-peekViewResult-background: #252526;--vscode-peekViewResult-lineForeground: #bbbbbb;--vscode-peekViewResult-fileForeground: #ffffff;--vscode-peekViewResult-selectionBackground: rgba(51, 153, 255, .2);--vscode-peekViewResult-selectionForeground: #ffffff;--vscode-peekViewEditor-background: #001f33;--vscode-peekViewEditorGutter-background: #001f33;--vscode-peekViewResult-matchHighlightBackground: rgba(234, 92, 0, .3);--vscode-peekViewEditor-matchHighlightBackground: rgba(255, 143, 0, .6);--vscode-editorMarkerNavigationError-background: #f14c4c;--vscode-editorMarkerNavigationError-headerBackground: rgba(241, 76, 76, .1);--vscode-editorMarkerNavigationWarning-background: #cca700;--vscode-editorMarkerNavigationWarning-headerBackground: rgba(204, 167, 0, .1);--vscode-editorMarkerNavigationInfo-background: #3794ff;--vscode-editorMarkerNavigationInfo-headerBackground: rgba(55, 148, 255, .1);--vscode-editorMarkerNavigation-background: #1e1e1e;--vscode-editorSuggestWidget-background: #252526;--vscode-editorSuggestWidget-border: #454545;--vscode-editorSuggestWidget-foreground: #d4d4d4;--vscode-editorSuggestWidget-selectedForeground: #ffffff;--vscode-editorSuggestWidget-selectedIconForeground: #ffffff;--vscode-editorSuggestWidget-selectedBackground: #04395e;--vscode-editorSuggestWidget-highlightForeground: #2aaaff;--vscode-editorSuggestWidget-focusHighlightForeground: #2aaaff;--vscode-editorSuggestWidgetStatus-foreground: rgba(212, 212, 212, .5);--vscode-tab-activeBackground: #1e1e1e;--vscode-tab-unfocusedActiveBackground: #1e1e1e;--vscode-tab-inactiveBackground: #2d2d2d;--vscode-tab-unfocusedInactiveBackground: #2d2d2d;--vscode-tab-activeForeground: #ffffff;--vscode-tab-inactiveForeground: rgba(255, 255, 255, .5);--vscode-tab-unfocusedActiveForeground: rgba(255, 255, 255, .5);--vscode-tab-unfocusedInactiveForeground: rgba(255, 255, 255, .25);--vscode-tab-border: #252526;--vscode-tab-lastPinnedBorder: rgba(204, 204, 204, .2);--vscode-tab-activeModifiedBorder: #3399cc;--vscode-tab-inactiveModifiedBorder: rgba(51, 153, 204, .5);--vscode-tab-unfocusedActiveModifiedBorder: rgba(51, 153, 204, .5);--vscode-tab-unfocusedInactiveModifiedBorder: rgba(51, 153, 204, .25);--vscode-editorPane-background: #1e1e1e;--vscode-editorGroupHeader-tabsBackground: #252526;--vscode-editorGroupHeader-noTabsBackground: #1e1e1e;--vscode-editorGroup-border: #444444;--vscode-editorGroup-dropBackground: rgba(83, 89, 93, .5);--vscode-editorGroup-dropIntoPromptForeground: #cccccc;--vscode-editorGroup-dropIntoPromptBackground: #252526;--vscode-sideBySideEditor-horizontalBorder: #444444;--vscode-sideBySideEditor-verticalBorder: #444444;--vscode-panel-background: #1e1e1e;--vscode-panel-border: rgba(128, 128, 128, .35);--vscode-panelTitle-activeForeground: #e7e7e7;--vscode-panelTitle-inactiveForeground: rgba(231, 231, 231, .6);--vscode-panelTitle-activeBorder: #e7e7e7;--vscode-panel-dropBorder: #e7e7e7;--vscode-panelSection-dropBackground: rgba(83, 89, 93, .5);--vscode-panelSectionHeader-background: rgba(128, 128, 128, .2);--vscode-panelSection-border: rgba(128, 128, 128, .35);--vscode-banner-background: #04395e;--vscode-banner-foreground: #ffffff;--vscode-banner-iconForeground: #3794ff;--vscode-statusBar-foreground: #ffffff;--vscode-statusBar-noFolderForeground: #ffffff;--vscode-statusBar-background: #007acc;--vscode-statusBar-noFolderBackground: #68217a;--vscode-statusBar-focusBorder: #ffffff;--vscode-statusBarItem-activeBackground: rgba(255, 255, 255, .18);--vscode-statusBarItem-focusBorder: #ffffff;--vscode-statusBarItem-hoverBackground: rgba(255, 255, 255, .12);--vscode-statusBarItem-compactHoverBackground: rgba(255, 255, 255, .2);--vscode-statusBarItem-prominentForeground: #ffffff;--vscode-statusBarItem-prominentBackground: rgba(0, 0, 0, .5);--vscode-statusBarItem-prominentHoverBackground: rgba(0, 0, 0, .3);--vscode-statusBarItem-errorBackground: #c72e0f;--vscode-statusBarItem-errorForeground: #ffffff;--vscode-statusBarItem-warningBackground: #7a6400;--vscode-statusBarItem-warningForeground: #ffffff;--vscode-activityBar-background: #333333;--vscode-activityBar-foreground: #ffffff;--vscode-activityBar-inactiveForeground: rgba(255, 255, 255, .4);--vscode-activityBar-activeBorder: #ffffff;--vscode-activityBar-dropBorder: #ffffff;--vscode-activityBarBadge-background: #007acc;--vscode-activityBarBadge-foreground: #ffffff;--vscode-statusBarItem-remoteBackground: #16825d;--vscode-statusBarItem-remoteForeground: #ffffff;--vscode-extensionBadge-remoteBackground: #007acc;--vscode-extensionBadge-remoteForeground: #ffffff;--vscode-sideBar-background: #252526;--vscode-sideBarTitle-foreground: #bbbbbb;--vscode-sideBar-dropBackground: rgba(83, 89, 93, .5);--vscode-sideBarSectionHeader-background: rgba(0, 0, 0, 0);--vscode-sideBarSectionHeader-border: rgba(204, 204, 204, .2);--vscode-titleBar-activeForeground: #cccccc;--vscode-titleBar-inactiveForeground: rgba(204, 204, 204, .6);--vscode-titleBar-activeBackground: #3c3c3c;--vscode-titleBar-inactiveBackground: rgba(60, 60, 60, .6);--vscode-menubar-selectionForeground: #cccccc;--vscode-menubar-selectionBackground: rgba(90, 93, 94, .31);--vscode-notifications-foreground: #cccccc;--vscode-notifications-background: #252526;--vscode-notificationLink-foreground: #3794ff;--vscode-notificationCenterHeader-background: #303031;--vscode-notifications-border: #303031;--vscode-notificationsErrorIcon-foreground: #f14c4c;--vscode-notificationsWarningIcon-foreground: #cca700;--vscode-notificationsInfoIcon-foreground: #3794ff;--vscode-commandCenter-foreground: #cccccc;--vscode-commandCenter-activeForeground: #cccccc;--vscode-commandCenter-activeBackground: rgba(90, 93, 94, .31);--vscode-commandCenter-border: rgba(128, 128, 128, .35);--vscode-editorCommentsWidget-resolvedBorder: rgba(204, 204, 204, .5);--vscode-editorCommentsWidget-unresolvedBorder: #3794ff;--vscode-editorCommentsWidget-rangeBackground: rgba(55, 148, 255, .1);--vscode-editorCommentsWidget-rangeBorder: rgba(55, 148, 255, .4);--vscode-editorCommentsWidget-rangeActiveBackground: rgba(55, 148, 255, .1);--vscode-editorCommentsWidget-rangeActiveBorder: rgba(55, 148, 255, .4);--vscode-editorGutter-commentRangeForeground: #37373d;--vscode-debugToolBar-background: #333333;--vscode-debugIcon-startForeground: #89d185;--vscode-editor-stackFrameHighlightBackground: rgba(255, 255, 0, .2);--vscode-editor-focusedStackFrameHighlightBackground: rgba(122, 189, 122, .3);--vscode-mergeEditor-change\.background: rgba(155, 185, 85, .2);--vscode-mergeEditor-change\.word\.background: rgba(156, 204, 44, .2);--vscode-mergeEditor-conflict\.unhandledUnfocused\.border: rgba(255, 166, 0, .48);--vscode-mergeEditor-conflict\.unhandledFocused\.border: #ffa600;--vscode-mergeEditor-conflict\.handledUnfocused\.border: rgba(134, 134, 134, .29);--vscode-mergeEditor-conflict\.handledFocused\.border: rgba(193, 193, 193, .8);--vscode-mergeEditor-conflict\.handled\.minimapOverViewRuler: rgba(173, 172, 168, .93);--vscode-mergeEditor-conflict\.unhandled\.minimapOverViewRuler: #fcba03;--vscode-mergeEditor-conflictingLines\.background: rgba(255, 234, 0, .28);--vscode-settings-headerForeground: #e7e7e7;--vscode-settings-modifiedItemIndicator: #0c7d9d;--vscode-settings-headerBorder: rgba(128, 128, 128, .35);--vscode-settings-sashBorder: rgba(128, 128, 128, .35);--vscode-settings-dropdownBackground: #3c3c3c;--vscode-settings-dropdownForeground: #f0f0f0;--vscode-settings-dropdownBorder: #3c3c3c;--vscode-settings-dropdownListBorder: #454545;--vscode-settings-checkboxBackground: #3c3c3c;--vscode-settings-checkboxForeground: #f0f0f0;--vscode-settings-checkboxBorder: #3c3c3c;--vscode-settings-textInputBackground: #3c3c3c;--vscode-settings-textInputForeground: #cccccc;--vscode-settings-numberInputBackground: #3c3c3c;--vscode-settings-numberInputForeground: #cccccc;--vscode-settings-focusedRowBackground: rgba(42, 45, 46, .6);--vscode-settings-rowHoverBackground: rgba(42, 45, 46, .3);--vscode-settings-focusedRowBorder: rgba(255, 255, 255, .12);--vscode-terminal-foreground: #cccccc;--vscode-terminal-selectionBackground: #264f78;--vscode-terminal-inactiveSelectionBackground: #3a3d41;--vscode-terminalCommandDecoration-defaultBackground: rgba(255, 255, 255, .25);--vscode-terminalCommandDecoration-successBackground: #1b81a8;--vscode-terminalCommandDecoration-errorBackground: #f14c4c;--vscode-terminalOverviewRuler-cursorForeground: rgba(160, 160, 160, .8);--vscode-terminal-border: rgba(128, 128, 128, .35);--vscode-terminal-findMatchBackground: #515c6a;--vscode-terminal-findMatchHighlightBackground: rgba(234, 92, 0, .33);--vscode-terminalOverviewRuler-findMatchForeground: rgba(209, 134, 22, .49);--vscode-terminal-dropBackground: rgba(83, 89, 93, .5);--vscode-testing-iconFailed: #f14c4c;--vscode-testing-iconErrored: #f14c4c;--vscode-testing-iconPassed: #73c991;--vscode-testing-runAction: #73c991;--vscode-testing-iconQueued: #cca700;--vscode-testing-iconUnset: #848484;--vscode-testing-iconSkipped: #848484;--vscode-testing-peekBorder: #f14c4c;--vscode-testing-peekHeaderBackground: rgba(241, 76, 76, .1);--vscode-testing-message\.error\.decorationForeground: #f14c4c;--vscode-testing-message\.error\.lineBackground: rgba(255, 0, 0, .2);--vscode-testing-message\.info\.decorationForeground: rgba(212, 212, 212, .5);--vscode-welcomePage-tileBackground: #252526;--vscode-welcomePage-tileHoverBackground: #2c2c2d;--vscode-welcomePage-tileShadow: rgba(0, 0, 0, .36);--vscode-welcomePage-progress\.background: #3c3c3c;--vscode-welcomePage-progress\.foreground: #3794ff;--vscode-debugExceptionWidget-border: #a31515;--vscode-debugExceptionWidget-background: #420b0d;--vscode-ports-iconRunningProcessForeground: #369432;--vscode-statusBar-debuggingBackground: #cc6633;--vscode-statusBar-debuggingForeground: #ffffff;--vscode-editor-inlineValuesForeground: rgba(255, 255, 255, .5);--vscode-editor-inlineValuesBackground: rgba(255, 200, 0, .2);--vscode-editorGutter-modifiedBackground: #1b81a8;--vscode-editorGutter-addedBackground: #487e02;--vscode-editorGutter-deletedBackground: #f14c4c;--vscode-minimapGutter-modifiedBackground: #1b81a8;--vscode-minimapGutter-addedBackground: #487e02;--vscode-minimapGutter-deletedBackground: #f14c4c;--vscode-editorOverviewRuler-modifiedForeground: rgba(27, 129, 168, .6);--vscode-editorOverviewRuler-addedForeground: rgba(72, 126, 2, .6);--vscode-editorOverviewRuler-deletedForeground: rgba(241, 76, 76, .6);--vscode-debugIcon-breakpointForeground: #e51400;--vscode-debugIcon-breakpointDisabledForeground: #848484;--vscode-debugIcon-breakpointUnverifiedForeground: #848484;--vscode-debugIcon-breakpointCurrentStackframeForeground: #ffcc00;--vscode-debugIcon-breakpointStackframeForeground: #89d185;--vscode-notebook-cellBorderColor: #37373d;--vscode-notebook-focusedEditorBorder: #007fd4;--vscode-notebookStatusSuccessIcon-foreground: #89d185;--vscode-notebookStatusErrorIcon-foreground: #f48771;--vscode-notebookStatusRunningIcon-foreground: #cccccc;--vscode-notebook-cellToolbarSeparator: rgba(128, 128, 128, .35);--vscode-notebook-selectedCellBackground: #37373d;--vscode-notebook-selectedCellBorder: #37373d;--vscode-notebook-focusedCellBorder: #007fd4;--vscode-notebook-inactiveFocusedCellBorder: #37373d;--vscode-notebook-cellStatusBarItemHoverBackground: rgba(255, 255, 255, .15);--vscode-notebook-cellInsertionIndicator: #007fd4;--vscode-notebookScrollbarSlider-background: rgba(121, 121, 121, .4);--vscode-notebookScrollbarSlider-hoverBackground: rgba(100, 100, 100, .7);--vscode-notebookScrollbarSlider-activeBackground: rgba(191, 191, 191, .4);--vscode-notebook-symbolHighlightBackground: rgba(255, 255, 255, .04);--vscode-notebook-cellEditorBackground: #252526;--vscode-notebook-editorBackground: #1e1e1e;--vscode-keybindingTable-headerBackground: rgba(204, 204, 204, .04);--vscode-keybindingTable-rowsBackground: rgba(204, 204, 204, .04);--vscode-scm-providerBorder: #454545;--vscode-debugTokenExpression-name: #c586c0;--vscode-debugTokenExpression-value: rgba(204, 204, 204, .6);--vscode-debugTokenExpression-string: #ce9178;--vscode-debugTokenExpression-boolean: #4e94ce;--vscode-debugTokenExpression-number: #b5cea8;--vscode-debugTokenExpression-error: #f48771;--vscode-debugView-exceptionLabelForeground: #cccccc;--vscode-debugView-exceptionLabelBackground: #6c2022;--vscode-debugView-stateLabelForeground: #cccccc;--vscode-debugView-stateLabelBackground: rgba(136, 136, 136, .27);--vscode-debugView-valueChangedHighlight: #569cd6;--vscode-debugConsole-infoForeground: #3794ff;--vscode-debugConsole-warningForeground: #cca700;--vscode-debugConsole-errorForeground: #f48771;--vscode-debugConsole-sourceForeground: #cccccc;--vscode-debugConsoleInputIcon-foreground: #cccccc;--vscode-debugIcon-pauseForeground: #75beff;--vscode-debugIcon-stopForeground: #f48771;--vscode-debugIcon-disconnectForeground: #f48771;--vscode-debugIcon-restartForeground: #89d185;--vscode-debugIcon-stepOverForeground: #75beff;--vscode-debugIcon-stepIntoForeground: #75beff;--vscode-debugIcon-stepOutForeground: #75beff;--vscode-debugIcon-continueForeground: #75beff;--vscode-debugIcon-stepBackForeground: #75beff;--vscode-extensionButton-prominentBackground: #0e639c;--vscode-extensionButton-prominentForeground: #ffffff;--vscode-extensionButton-prominentHoverBackground: #1177bb;--vscode-extensionIcon-starForeground: #ff8e00;--vscode-extensionIcon-verifiedForeground: #3794ff;--vscode-extensionIcon-preReleaseForeground: #1d9271;--vscode-extensionIcon-sponsorForeground: #d758b3;--vscode-terminal-ansiBlack: #000000;--vscode-terminal-ansiRed: #cd3131;--vscode-terminal-ansiGreen: #0dbc79;--vscode-terminal-ansiYellow: #e5e510;--vscode-terminal-ansiBlue: #2472c8;--vscode-terminal-ansiMagenta: #bc3fbc;--vscode-terminal-ansiCyan: #11a8cd;--vscode-terminal-ansiWhite: #e5e5e5;--vscode-terminal-ansiBrightBlack: #666666;--vscode-terminal-ansiBrightRed: #f14c4c;--vscode-terminal-ansiBrightGreen: #23d18b;--vscode-terminal-ansiBrightYellow: #f5f543;--vscode-terminal-ansiBrightBlue: #3b8eea;--vscode-terminal-ansiBrightMagenta: #d670d6;--vscode-terminal-ansiBrightCyan: #29b8db;--vscode-terminal-ansiBrightWhite: #e5e5e5;--vscode-interactive-activeCodeBorder: #3794ff;--vscode-interactive-inactiveCodeBorder: #37373d;--vscode-gitDecoration-addedResourceForeground: #81b88b;--vscode-gitDecoration-modifiedResourceForeground: #e2c08d;--vscode-gitDecoration-deletedResourceForeground: #c74e39;--vscode-gitDecoration-renamedResourceForeground: #73c991;--vscode-gitDecoration-untrackedResourceForeground: #73c991;--vscode-gitDecoration-ignoredResourceForeground: #8c8c8c;--vscode-gitDecoration-stageModifiedResourceForeground: #e2c08d;--vscode-gitDecoration-stageDeletedResourceForeground: #c74e39;--vscode-gitDecoration-conflictingResourceForeground: #e4676b;--vscode-gitDecoration-submoduleResourceForeground: #8db9e2}.xterm-wrapper{padding-left:5px}.xterm-wrapper .xterm-viewport{background-color:var(--vscode-panel-background)!important;color:var(--vscode-foreground)!important}.expandable{flex:none;flex-direction:column;line-height:28px}.expandable-title{flex:none;display:flex;flex-direction:row;align-items:center;white-space:nowrap;-webkit-user-select:none;user-select:none;cursor:pointer}.filters{flex:none;display:flex;flex-direction:column;margin:2px 0}.filter-list{padding:0 10px 10px;-webkit-user-select:none;user-select:none}.filter-title,.filter-summary{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;-webkit-user-select:none;user-select:none;cursor:pointer}.filter-label{color:var(--vscode-disabledForeground)}.filter-summary{line-height:24px;margin-left:24px}.filter-summary .filter-label{margin-left:5px}.filter-entry{line-height:24px}.filter-entry label{display:flex;align-items:center;cursor:pointer}.filter-entry input{flex:none;display:flex;align-items:center;cursor:pointer}.filter-entry label div{overflow:hidden;text-overflow:ellipsis}.ui-mode-list-item{flex:auto}.ui-mode-list-item-title{flex:auto;text-overflow:ellipsis;overflow:hidden}.ui-mode-list-item-time{flex:none;color:var(--vscode-editorCodeLens-foreground);margin:0 4px;-webkit-user-select:none;user-select:none}.tests-list-view .list-view-entry.selected .ui-mode-list-item-time,.tests-list-view .list-view-entry.highlighted .ui-mode-list-item-time{display:none}.tests-list-view .list-view-entry:not(.highlighted):not(.selected) .toolbar-button:not(.toggled){display:none}.tag{display:inline-block;padding:0 8px;font-size:12px;font-weight:500;line-height:18px;border:1px solid transparent;border-radius:2em;background-color:#8c959f;color:#fff;margin:0 10px;flex:none;font-weight:600}.tag-color-0{background-color:#ddf4ff;color:#0550ae;border:1px solid #218bff}.tag-color-1{background-color:#fff8c5;color:#7d4e00;border:1px solid #bf8700}.tag-color-2{background-color:#fbefff;color:#6e40c9;border:1px solid #a475f9}.tag-color-3{background-color:#ffeff7;color:#99286e;border:1px solid #e85aad}.tag-color-4{background-color:#fff0eb;color:#9e2f1c;border:1px solid #EA6045}.tag-color-5{background-color:#fff1e5;color:#9b4215;border:1px solid #e16f24}.dark-mode .tag-color-0{background-color:#051d4d;color:#80ccff;border:1px solid #218bff}.dark-mode .tag-color-1{background-color:#3b2300;color:#eac54f;border:1px solid #bf8700}.dark-mode .tag-color-2{background-color:#271052;color:#d2a8ff;border:1px solid #a475f9}.dark-mode .tag-color-3{background-color:#42062a;color:#ff9bce;border:1px solid #e85aad}.dark-mode .tag-color-4{background-color:#460701;color:#ffa28b;border:1px solid #EC6547}.dark-mode .tag-color-5{background-color:#471700;color:#ffa657;border:1px solid #e16f24}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/uiMode.DSXgz0Bm.js b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/uiMode.DSXgz0Bm.js
new file mode 100644
index 0000000..0da6fd5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/uiMode.DSXgz0Bm.js
@@ -0,0 +1,10 @@
+function __vite__mapDeps(indexes) {
+  if (!__vite__mapDeps.viteFileDeps) {
+    __vite__mapDeps.viteFileDeps = ["./assets/xtermModule-BeNbaIVa.js","./xtermModule.DSXBckUd.css"]
+  }
+  return indexes.map((i) => __vite__mapDeps.viteFileDeps[i])
+}
+var bt=Object.defineProperty;var St=(r,t,e)=>t in r?bt(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e;var F=(r,t,e)=>(St(r,typeof t!="symbol"?t+"":t,e),e);import{u as Tt,r as V,d as kt,_ as jt,e as yt,f as Et,j as o,R as h,s as ut,m as It,g as X,a as N,h as Rt,i as Bt,k as nt,W as Ct,M as Nt,l as Pt,T as Dt,S as Lt,t as Mt,b as Ft,c as Ot}from"./assets/testServerConnection-JQMZFCzK.js";var At={};class et{constructor(t,e={}){this.isListing=!1,this._tests=new Map,this._rootSuite=new q("","root"),this._options=e,this._reporter=t}reset(){this._rootSuite._entries=[],this._tests.clear()}dispatch(t){const{method:e,params:s}=t;if(e==="onConfigure"){this._onConfigure(s.config);return}if(e==="onProject"){this._onProject(s.project);return}if(e==="onBegin"){this._onBegin();return}if(e==="onTestBegin"){this._onTestBegin(s.testId,s.result);return}if(e==="onTestEnd"){this._onTestEnd(s.test,s.result);return}if(e==="onStepBegin"){this._onStepBegin(s.testId,s.resultId,s.step);return}if(e==="onStepEnd"){this._onStepEnd(s.testId,s.resultId,s.step);return}if(e==="onError"){this._onError(s.error);return}if(e==="onStdIO"){this._onStdIO(s.type,s.testId,s.resultId,s.data,s.isBase64);return}if(e==="onEnd")return this._onEnd(s.result);if(e==="onExit")return this._onExit()}_onConfigure(t){var e,s;this._rootDir=t.rootDir,this._config=this._parseConfig(t),(s=(e=this._reporter).onConfigure)==null||s.call(e,this._config)}_onProject(t){let e=this._options.mergeProjects?this._rootSuite.suites.find(s=>s.project().name===t.name):void 0;e||(e=new q(t.name,"project"),this._rootSuite._addSuite(e)),e._project=this._parseProject(t);for(const s of t.suites)this._mergeSuiteInto(s,e)}_onBegin(){var t,e;(e=(t=this._reporter).onBegin)==null||e.call(t,this._rootSuite)}_onTestBegin(t,e){var d,a;const s=this._tests.get(t);this._options.clearPreviousResultsWhenTestBegins&&(s.results=[]);const i=s._createTestResult(e.id);i.retry=e.retry,i.workerIndex=e.workerIndex,i.parallelIndex=e.parallelIndex,i.setStartTimeNumber(e.startTime),(a=(d=this._reporter).onTestBegin)==null||a.call(d,s,i)}_onTestEnd(t,e){var d,a,f;const s=this._tests.get(t.testId);s.timeout=t.timeout,s.expectedStatus=t.expectedStatus,s.annotations=t.annotations;const i=s.results.find(n=>n._id===e.id);i.duration=e.duration,i.status=e.status,i.errors=e.errors,i.error=(d=i.errors)==null?void 0:d[0],i.attachments=this._parseAttachments(e.attachments),(f=(a=this._reporter).onTestEnd)==null||f.call(a,s,i),i._stepMap=new Map}_onStepBegin(t,e,s){var m,u;const i=this._tests.get(t),d=i.results.find(g=>g._id===e),a=s.parentStepId?d._stepMap.get(s.parentStepId):void 0,f=this._absoluteLocation(s.location),n=new Ut(s,a,f);a?a.steps.push(n):d.steps.push(n),d._stepMap.set(s.id,n),(u=(m=this._reporter).onStepBegin)==null||u.call(m,i,d,n)}_onStepEnd(t,e,s){var f,n;const i=this._tests.get(t),d=i.results.find(m=>m._id===e),a=d._stepMap.get(s.id);a.duration=s.duration,a.error=s.error,(n=(f=this._reporter).onStepEnd)==null||n.call(f,i,d,a)}_onError(t){var e,s;(s=(e=this._reporter).onError)==null||s.call(e,t)}_onStdIO(t,e,s,i,d){var m,u,g,k;const a=d?globalThis.Buffer?Buffer.from(i,"base64"):atob(i):i,f=e?this._tests.get(e):void 0,n=f&&s?f.results.find(l=>l._id===s):void 0;t==="stdout"?(n==null||n.stdout.push(a),(u=(m=this._reporter).onStdOut)==null||u.call(m,a,f,n)):(n==null||n.stderr.push(a),(k=(g=this._reporter).onStdErr)==null||k.call(g,a,f,n))}async _onEnd(t){var e,s;await((s=(e=this._reporter).onEnd)==null?void 0:s.call(e,{status:t.status,startTime:new Date(t.startTime),duration:t.duration}))}_onExit(){var t,e;return(e=(t=this._reporter).onExit)==null?void 0:e.call(t)}_parseConfig(t){const e={...Kt,...t};return this._options.configOverrides&&(e.configFile=this._options.configOverrides.configFile,e.reportSlowTests=this._options.configOverrides.reportSlowTests,e.quiet=this._options.configOverrides.quiet,e.reporter=[...this._options.configOverrides.reporter]),e}_parseProject(t){return{metadata:t.metadata,name:t.name,outputDir:this._absolutePath(t.outputDir),repeatEach:t.repeatEach,retries:t.retries,testDir:this._absolutePath(t.testDir),testIgnore:Q(t.testIgnore),testMatch:Q(t.testMatch),timeout:t.timeout,grep:Q(t.grep),grepInvert:Q(t.grepInvert),dependencies:t.dependencies,teardown:t.teardown,snapshotDir:this._absolutePath(t.snapshotDir),use:{}}}_parseAttachments(t){return t.map(e=>({...e,body:e.base64&&globalThis.Buffer?Buffer.from(e.base64,"base64"):void 0}))}_mergeSuiteInto(t,e){let s=e.suites.find(i=>i.title===t.title);s||(s=new q(t.title,e.type==="project"?"file":"describe"),e._addSuite(s)),s.location=this._absoluteLocation(t.location),t.entries.forEach(i=>{"testId"in i?this._mergeTestInto(i,s):this._mergeSuiteInto(i,s)})}_mergeTestInto(t,e){let s=this._options.mergeTestCases?e.tests.find(i=>i.title===t.title&&i.repeatEachIndex===t.repeatEachIndex):void 0;s||(s=new Wt(t.testId,t.title,this._absoluteLocation(t.location),t.repeatEachIndex),e._addTest(s),this._tests.set(s.id,s)),this._updateTest(t,s)}_updateTest(t,e){return e.id=t.testId,e.location=this._absoluteLocation(t.location),e.retries=t.retries,e.tags=t.tags??[],e.annotations=t.annotations??[],e}_absoluteLocation(t){return t&&{...t,file:this._absolutePath(t.file)}}_absolutePath(t){if(t!==void 0)return this._options.resolvePath?this._options.resolvePath(this._rootDir,t):this._rootDir+"/"+t}}class q{constructor(t,e){this._entries=[],this._requireFile="",this._parallelMode="none",this.title=t,this._type=e}get type(){return this._type}get suites(){return this._entries.filter(t=>t.type!=="test")}get tests(){return this._entries.filter(t=>t.type==="test")}entries(){return this._entries}allTests(){const t=[],e=s=>{for(const i of s.entries())i.type==="test"?t.push(i):e(i)};return e(this),t}titlePath(){const t=this.parent?this.parent.titlePath():[];return(this.title||this._type!=="describe")&&t.push(this.title),t}project(){var t;return this._project??((t=this.parent)==null?void 0:t.project())}_addTest(t){t.parent=this,this._entries.push(t)}_addSuite(t){t.parent=this,this._entries.push(t)}}class Wt{constructor(t,e,s,i){this.fn=()=>{},this.results=[],this.type="test",this.expectedStatus="passed",this.timeout=0,this.annotations=[],this.retries=0,this.tags=[],this.repeatEachIndex=0,this.id=t,this.title=e,this.location=s,this.repeatEachIndex=i}titlePath(){const t=this.parent?this.parent.titlePath():[];return t.push(this.title),t}outcome(){return Vt(this)}ok(){const t=this.outcome();return t==="expected"||t==="flaky"||t==="skipped"}_createTestResult(t){const e=new zt(this.results.length,t);return this.results.push(e),e}}class Ut{constructor(t,e,s){this.duration=-1,this.steps=[],this._startTime=0,this.title=t.title,this.category=t.category,this.location=s,this.parent=e,this._startTime=t.startTime}titlePath(){var e;return[...((e=this.parent)==null?void 0:e.titlePath())||[],this.title]}get startTime(){return new Date(this._startTime)}set startTime(t){this._startTime=+t}}class zt{constructor(t,e){this.parallelIndex=-1,this.workerIndex=-1,this.duration=-1,this.stdout=[],this.stderr=[],this.attachments=[],this.status="skipped",this.steps=[],this.errors=[],this._stepMap=new Map,this._startTime=0,this.retry=t,this._id=e}setStartTimeNumber(t){this._startTime=t}get startTime(){return new Date(this._startTime)}set startTime(t){this._startTime=+t}}const Kt={forbidOnly:!1,fullyParallel:!1,globalSetup:null,globalTeardown:null,globalTimeout:0,grep:/.*/,grepInvert:null,maxFailures:0,metadata:{},preserveOutput:"always",projects:[],reporter:[[At.CI?"dot":"list"]],reportSlowTests:{max:5,threshold:15e3},configFile:"",rootDir:"",quiet:!1,shard:null,updateSnapshots:"missing",version:"",workers:0,webServer:null};function Q(r){return r.map(t=>t.s?t.s:new RegExp(t.r.source,t.r.flags))}function Vt(r){let t=0,e=0,s=0;for(const i of r.results)i.status==="interrupted"||(i.status==="skipped"&&r.expectedStatus==="skipped"?++t:i.status==="skipped"||(i.status===r.expectedStatus?++e:++s));return e===0&&s===0?"skipped":s===0?"expected":e===0&&t===0?"unexpected":"flaky"}class at{constructor(t,e,s,i,d){this._treeItemById=new Map,this._treeItemByTestId=new Map;const a=i&&[...i.values()].some(Boolean);this.pathSeparator=d,this.rootItem={kind:"group",subKind:"folder",id:t,title:"",location:{file:"",line:0,column:0},duration:0,parent:void 0,children:[],status:"none",hasLoadErrors:!1},this._treeItemById.set(t,this.rootItem);const f=(n,m,u)=>{for(const g of m.suites){const k=g.title||"<anonymous>";let l=u.children.find(p=>p.kind==="group"&&p.title===k);l||(l={kind:"group",subKind:"describe",id:"suite:"+m.titlePath().join("")+""+k,title:k,location:g.location,duration:0,parent:u,children:[],status:"none",hasLoadErrors:!1},this._addChild(u,l)),f(n,g,l)}for(const g of m.tests){const k=g.title;let l=u.children.find(I=>I.kind!=="group"&&I.title===k);l||(l={kind:"case",id:"test:"+g.titlePath().join(""),title:k,parent:u,children:[],tests:[],location:g.location,duration:0,status:"none",project:void 0,test:void 0,tags:g.tags},this._addChild(u,l));const p=g.results[0];let x="none";(p==null?void 0:p[H])==="scheduled"?x="scheduled":(p==null?void 0:p[H])==="running"?x="running":(p==null?void 0:p.status)==="skipped"?x="skipped":(p==null?void 0:p.status)==="interrupted"?x="none":p&&g.outcome()!=="expected"?x="failed":p&&g.outcome()==="expected"&&(x="passed"),l.tests.push(g);const E={kind:"test",id:g.id,title:n.name,location:g.location,test:g,parent:l,children:[],status:x,duration:g.results.length?Math.max(0,g.results[0].duration):0,project:n};this._addChild(l,E),this._treeItemByTestId.set(g.id,E),l.duration=l.children.reduce((I,T)=>I+T.duration,0)}};for(const n of(e==null?void 0:e.suites)||[])if(!(a&&!i.get(n.title)))for(const m of n.suites){const u=this._fileItem(m.location.file.split(d),!0);f(n.project(),m,u)}for(const n of s){if(!n.location)continue;const m=this._fileItem(n.location.file.split(d),!0);m.hasLoadErrors=!0}}_addChild(t,e){t.children.push(e),e.parent=t,this._treeItemById.set(e.id,e)}filterTree(t,e,s){const i=t.trim().toLowerCase().split(" "),d=[...e.values()].some(Boolean),a=n=>{const m=[...n.tests[0].titlePath(),...n.tests[0].tags].join(" ").toLowerCase();return!i.every(u=>m.includes(u))&&!n.tests.some(u=>s==null?void 0:s.has(u.id))?!1:(n.children=n.children.filter(u=>!d||(s==null?void 0:s.has(u.test.id))||e.get(u.status)),n.tests=n.children.map(u=>u.test),!!n.children.length)},f=n=>{const m=[];for(const u of n.children)u.kind==="case"?a(u)&&m.push(u):(f(u),(u.children.length||u.hasLoadErrors)&&m.push(u));n.children=m};f(this.rootItem)}_fileItem(t,e){if(t.length===0)return this.rootItem;const s=t.join(this.pathSeparator),i=this._treeItemById.get(s);if(i)return i;const d=this._fileItem(t.slice(0,t.length-1),!1),a={kind:"group",subKind:e?"file":"folder",id:s,title:t[t.length-1],location:{file:s,line:0,column:0},duration:0,parent:d,children:[],status:"none",hasLoadErrors:!1};return this._addChild(d,a),a}sortAndPropagateStatus(){ht(this.rootItem)}flattenForSingleProject(){const t=e=>{e.kind==="case"&&e.children.length===1?(e.project=e.children[0].project,e.test=e.children[0].test,e.children=[],this._treeItemByTestId.set(e.test.id,e)):e.children.forEach(t)};t(this.rootItem)}shortenRoot(){let t=this.rootItem;for(;t.children.length===1&&t.children[0].kind==="group"&&t.children[0].subKind==="folder";)t=t.children[0];t.location=this.rootItem.location,this.rootItem=t}testIds(){const t=new Set,e=s=>{s.kind==="case"&&s.tests.forEach(i=>t.add(i.id)),s.children.forEach(e)};return e(this.rootItem),t}fileNames(){const t=new Set,e=s=>{s.kind==="group"&&s.subKind==="file"?t.add(s.id):s.children.forEach(e)};return e(this.rootItem),[...t]}flatTreeItems(){const t=[],e=s=>{t.push(s),s.children.forEach(e)};return e(this.rootItem),t}treeItemById(t){return this._treeItemById.get(t)}collectTestIds(t){return t?$t(t):new Set}}function ht(r){for(const a of r.children)ht(a);r.kind==="group"&&r.children.sort((a,f)=>a.location.file.localeCompare(f.location.file)||a.location.line-f.location.line);let t=r.children.length>0,e=r.children.length>0,s=!1,i=!1,d=!1;for(const a of r.children)e=e&&a.status==="skipped",t=t&&(a.status==="passed"||a.status==="skipped"),s=s||a.status==="failed",i=i||a.status==="running",d=d||a.status==="scheduled";i?r.status="running":d?r.status="scheduled":s?r.status="failed":e?r.status="skipped":t&&(r.status="passed")}function $t(r){const t=new Set,e=s=>{var i;s.kind==="case"?s.tests.map(d=>d.id).forEach(d=>t.add(d)):s.kind==="test"?t.add(s.id):(i=s.children)==null||i.forEach(e)};return e(r),t}const H=Symbol("statusEx");class qt{constructor(t){F(this,"rootSuite");F(this,"config");F(this,"loadErrors",[]);F(this,"progress",{total:0,passed:0,failed:0,skipped:0});F(this,"_receiver");F(this,"_lastRunReceiver");F(this,"_lastRunTestCount",0);F(this,"_options");F(this,"_testResultsSnapshot");this._receiver=new et(this._createReporter(),{mergeProjects:!0,mergeTestCases:!0,resolvePath:(e,s)=>e+t.pathSeparator+s,clearPreviousResultsWhenTestBegins:!0}),this._options=t}_createReporter(){return{version:()=>"v2",onConfigure:t=>{this.config=t,this._lastRunReceiver=new et({onBegin:e=>{this._lastRunTestCount=e.allTests().length,this._lastRunReceiver=void 0}},{mergeProjects:!0,mergeTestCases:!1,resolvePath:(e,s)=>e+this._options.pathSeparator+s})},onBegin:t=>{var e;if(this.rootSuite||(this.rootSuite=t),this._testResultsSnapshot){for(const s of this.rootSuite.allTests())s.results=((e=this._testResultsSnapshot)==null?void 0:e.get(s.id))||s.results;this._testResultsSnapshot=void 0}this.progress.total=this._lastRunTestCount,this.progress.passed=0,this.progress.failed=0,this.progress.skipped=0,this._options.onUpdate(!0)},onEnd:()=>{this._options.onUpdate(!0)},onTestBegin:(t,e)=>{e[H]="running",this._options.onUpdate()},onTestEnd:(t,e)=>{t.outcome()==="skipped"?++this.progress.skipped:t.outcome()==="unexpected"?++this.progress.failed:++this.progress.passed,e[H]=e.status,this._options.onUpdate()},onError:t=>this._handleOnError(t),printsToStdio:()=>!1,onStdOut:()=>{},onStdErr:()=>{},onExit:()=>{},onStepBegin:()=>{},onStepEnd:()=>{}}}processGlobalReport(t){const e=new et({onConfigure:s=>{this.config=s},onError:s=>this._handleOnError(s)});for(const s of t)e.dispatch(s)}processListReport(t){var s;const e=((s=this.rootSuite)==null?void 0:s.allTests())||[];this._testResultsSnapshot=new Map(e.map(i=>[i.id,i.results])),this._receiver.reset();for(const i of t)this._receiver.dispatch(i)}processTestReportEvent(t){var e,s,i;(s=(e=this._lastRunReceiver)==null?void 0:e.dispatch(t))==null||s.catch(()=>{}),(i=this._receiver.dispatch(t))==null||i.catch(()=>{})}_handleOnError(t){var e,s;this.loadErrors.push(t),(s=(e=this._options).onError)==null||s.call(e,t),this._options.onUpdate()}asModel(){return{rootSuite:this.rootSuite||new q("","root"),config:this.config,loadErrors:this.loadErrors,progress:this.progress}}}const Ht=({source:r})=>{const[t,e]=Tt(),[s,i]=V.useState(kt()),[d]=V.useState(jt(()=>import("./assets/xtermModule-BeNbaIVa.js"),__vite__mapDeps([0,1]),import.meta.url).then(f=>f.default)),a=V.useRef(null);return V.useEffect(()=>(yt(i),()=>Et(i)),[]),V.useEffect(()=>{const f=r.write,n=r.clear;return(async()=>{const{Terminal:m,FitAddon:u}=await d,g=e.current;if(!g)return;const k=s==="dark-mode"?Qt:Yt;if(a.current&&a.current.terminal.options.theme===k)return;a.current&&(g.textContent="");const l=new m({convertEol:!0,fontSize:13,scrollback:1e4,fontFamily:"var(--vscode-editor-font-family)",theme:k}),p=new u;l.loadAddon(p);for(const x of r.pending)l.write(x);r.write=x=>{r.pending.push(x),l.write(x)},r.clear=()=>{r.pending=[],l.clear()},l.open(g),p.fit(),a.current={terminal:l,fitAddon:p}})(),()=>{r.clear=n,r.write=f}},[d,a,e,r,s]),V.useEffect(()=>{setTimeout(()=>{a.current&&(a.current.fitAddon.fit(),r.resize(a.current.terminal.cols,a.current.terminal.rows))},250)},[t,r]),o.jsx("div",{"data-testid":"output",className:"xterm-wrapper",style:{flex:"auto"},ref:e})},Yt={foreground:"#383a42",background:"#fafafa",cursor:"#383a42",black:"#000000",red:"#e45649",green:"#50a14f",yellow:"#c18401",blue:"#4078f2",magenta:"#a626a4",cyan:"#0184bc",white:"#a0a0a0",brightBlack:"#000000",brightRed:"#e06c75",brightGreen:"#98c379",brightYellow:"#d19a66",brightBlue:"#4078f2",brightMagenta:"#a626a4",brightCyan:"#0184bc",brightWhite:"#383a42",selectionBackground:"#d7d7d7",selectionForeground:"#383a42"},Qt={foreground:"#f8f8f2",background:"#1e1e1e",cursor:"#f8f8f0",black:"#000000",red:"#ff5555",green:"#50fa7b",yellow:"#f1fa8c",blue:"#bd93f9",magenta:"#ff79c6",cyan:"#8be9fd",white:"#bfbfbf",brightBlack:"#4d4d4d",brightRed:"#ff6e6e",brightGreen:"#69ff94",brightYellow:"#ffffa5",brightBlue:"#d6acff",brightMagenta:"#ff92df",brightCyan:"#a4ffff",brightWhite:"#e6e6e6",selectionBackground:"#44475a",selectionForeground:"#f8f8f2"},st=navigator.userAgent.toLowerCase().includes("windows")?"\\":"/",Xt=({title:r,children:t,setExpanded:e,expanded:s,expandOnTitleClick:i})=>o.jsxs("div",{className:"expandable"+(s?" expanded":""),children:[o.jsxs("div",{className:"expandable-title",onClick:()=>i&&e(!s),children:[o.jsx("div",{className:"codicon codicon-"+(s?"chevron-down":"chevron-right"),style:{cursor:"pointer",color:"var(--vscode-foreground)",marginLeft:"5px"},onClick:()=>!i&&e(!s)}),r]}),s&&o.jsx("div",{style:{marginLeft:25},children:t})]}),Gt=({filterText:r,setFilterText:t,statusFilters:e,setStatusFilters:s,projectFilters:i,setProjectFilters:d,testModel:a,runTests:f})=>{const[n,m]=h.useState(!1),u=h.useRef(null);h.useEffect(()=>{var l;(l=u.current)==null||l.focus()},[]);const g=[...e.entries()].filter(([l,p])=>p).map(([l])=>l).join(" ")||"all",k=[...i.entries()].filter(([l,p])=>p).map(([l])=>l).join(" ")||"all";return o.jsxs("div",{className:"filters",children:[o.jsx(Xt,{expanded:n,setExpanded:m,title:o.jsx("input",{ref:u,type:"search",placeholder:"Filter (e.g. text, @tag)",spellCheck:!1,value:r,onChange:l=>{t(l.target.value)},onKeyDown:l=>{l.key==="Enter"&&f()}})}),o.jsxs("div",{className:"filter-summary",title:"Status: "+g+`
+Projects: `+k,onClick:()=>m(!n),children:[o.jsx("span",{className:"filter-label",children:"Status:"})," ",g,o.jsx("span",{className:"filter-label",children:"Projects:"})," ",k]}),n&&o.jsxs("div",{className:"hbox",style:{marginLeft:14,maxHeight:200,overflowY:"auto"},children:[o.jsx("div",{className:"filter-list",children:[...e.entries()].map(([l,p])=>o.jsx("div",{className:"filter-entry",children:o.jsxs("label",{children:[o.jsx("input",{type:"checkbox",checked:p,onClick:()=>{const x=new Map(e);x.set(l,!x.get(l)),s(x)}}),o.jsx("div",{children:l})]})}))}),o.jsx("div",{className:"filter-list",children:[...i.entries()].map(([l,p])=>o.jsx("div",{className:"filter-entry",children:o.jsxs("label",{children:[o.jsx("input",{type:"checkbox",checked:p,onClick:()=>{var I;const x=new Map(i);x.set(l,!x.get(l)),d(x);const E=(I=a==null?void 0:a.config)==null?void 0:I.configFile;E&&ut.setObject(E+":projects",[...x.entries()].filter(([T,U])=>U).map(([T])=>T))}}),o.jsx("div",{children:l||"untitled"})]})}))})]})]})},Jt=({tag:r,style:t,onClick:e})=>o.jsx("span",{className:`tag tag-color-${Zt(r)}`,onClick:e,style:{margin:"6px 0 0 6px",...t},title:`Click to filter by tag: ${r}`,children:r});function Zt(r){let t=0;for(let e=0;e<r.length;e++)t=r.charCodeAt(e)+((t<<8)-t);return Math.abs(t%6)}const te=Bt,ee=({filterText:r,testModel:t,testServerConnection:e,testTree:s,runTests:i,runningState:d,watchAll:a,watchedTreeIds:f,setWatchedTreeIds:n,isLoading:m,onItemSelected:u,requestedCollapseAllCount:g,setFilterText:k})=>{const[l,p]=h.useState({expandedItems:new Map}),[x,E]=h.useState(),[I,T]=h.useState(g);h.useEffect(()=>{if(I!==g){l.expandedItems.clear();for(const b of s.flatTreeItems())l.expandedItems.set(b.id,!1);T(g),E(void 0),p({...l});return}if(!d||d.itemSelectedByUser)return;let c;const j=b=>{var C;b.children.forEach(j),!c&&b.status==="failed"&&(b.kind==="test"&&d.testIds.has(b.test.id)||b.kind==="case"&&d.testIds.has((C=b.tests[0])==null?void 0:C.id))&&(c=b)};j(s.rootItem),c&&E(c.id)},[d,E,s,I,T,g,l,p]);const{selectedTreeItem:U}=h.useMemo(()=>{if(!t)return{selectedTreeItem:void 0};const c=x?s.treeItemById(x):void 0;let j;c&&(j={file:c.location.file,line:c.location.line,source:{errors:t.loadErrors.filter(C=>{var $;return(($=C.location)==null?void 0:$.file)===c.location.file}).map(C=>({line:C.location.line,message:C.message})),content:void 0}});let b;return(c==null?void 0:c.kind)==="test"?b=c.test:(c==null?void 0:c.kind)==="case"&&c.tests.length===1&&(b=c.tests[0]),u({treeItem:c,testCase:b,testFile:j}),{selectedTreeItem:c}},[u,x,t,s]);h.useEffect(()=>{if(!m)if(a)e==null||e.watchNoReply({fileNames:s.fileNames()});else{const c=new Set;for(const j of f.value){const b=s.treeItemById(j),C=b==null?void 0:b.location.file;C&&c.add(C)}e==null||e.watchNoReply({fileNames:[...c]})}},[m,s,a,f,e]);const O=c=>{E(c.id),i("bounce-if-busy",s.collectTestIds(c))},G=(c,j)=>{if(c.preventDefault(),c.stopPropagation(),c.metaKey||c.ctrlKey){const b=r.split(" ");b.includes(j)?k(b.filter(C=>C!==j).join(" ").trim()):k((r+" "+j).trim())}else k((r.split(" ").filter(b=>!b.startsWith("@")).join(" ")+" "+j).trim())};return o.jsx(te,{name:"tests",treeState:l,setTreeState:p,rootItem:s.rootItem,dataTestId:"test-tree",render:c=>o.jsxs("div",{className:"hbox ui-mode-list-item",children:[o.jsxs("div",{className:"ui-mode-list-item-title",children:[o.jsx("span",{title:c.title,children:c.title}),c.kind==="case"?c.tags.map(j=>o.jsx(Jt,{tag:j.slice(1),onClick:b=>G(b,j)},j)):null]}),!!c.duration&&c.status!=="skipped"&&o.jsx("div",{className:"ui-mode-list-item-time",children:It(c.duration)}),o.jsxs(X,{noMinHeight:!0,noShadow:!0,children:[o.jsx(N,{icon:"play",title:"Run",onClick:()=>O(c),disabled:!!d}),o.jsx(N,{icon:"go-to-file",title:"Open in VS Code",onClick:()=>e==null?void 0:e.openNoReply({location:c.location}),style:c.kind==="group"&&c.subKind==="folder"?{visibility:"hidden"}:{}}),!a&&o.jsx(N,{icon:"eye",title:"Watch",onClick:()=>{f.value.has(c.id)?f.value.delete(c.id):f.value.add(c.id),n({...f})},toggled:f.value.has(c.id)})]})]}),icon:c=>Rt(c.status),selectedItem:U,onAccepted:O,onSelected:c=>{d&&(d.itemSelectedByUser=!0),E(c.id)},isError:c=>c.kind==="group"?c.hasLoadErrors:!1,autoExpandDepth:r?5:1,noItemsMessage:m?"Loading…":"No tests"})};function se(r){return`.playwright-artifacts-${r}`}const ie=({item:r,rootDir:t})=>{var k;const[e,s]=h.useState(),[i,d]=h.useState(0),a=h.useRef(null),{outputDir:f}=h.useMemo(()=>({outputDir:r.testCase?re(r.testCase):void 0}),[r]),[n,m]=h.useState(),u=h.useCallback(l=>m(nt(l)),[m]),g=n?e==null?void 0:e.model.actions.find(l=>nt(l)===n):void 0;return h.useEffect(()=>{var E,I;a.current&&clearTimeout(a.current);const l=(E=r.testCase)==null?void 0:E.results[0];if(!l){s(void 0);return}const p=l&&l.duration>=0&&l.attachments.find(T=>T.name==="trace");if(p&&p.path){lt(p.path).then(T=>s({model:T,isLive:!1}));return}if(!f){s(void 0);return}const x=`${f}/${se(l.workerIndex)}/traces/${(I=r.testCase)==null?void 0:I.id}.json`;return a.current=setTimeout(async()=>{try{const T=await lt(x);s({model:T,isLive:!0})}catch{s(void 0)}finally{d(i+1)}},500),()=>{a.current&&clearTimeout(a.current)}},[f,r,s,i,d]),o.jsx(Ct,{model:e==null?void 0:e.model,showSourcesFirst:!0,rootDir:t,initialSelection:g,onSelectionChanged:u,fallbackLocation:r.testFile,isLive:e==null?void 0:e.isLive,status:(k=r.treeItem)==null?void 0:k.status},"workbench")},re=r=>{var t;for(let e=r.parent;e;e=e.parent)if(e.project())return(t=e.project())==null?void 0:t.outputDir};async function lt(r){const t=new URLSearchParams;t.set("trace",r);const s=await(await fetch(`contexts?${t.toString()}`)).json();return new Nt(s)}let ct={cols:80,rows:24};const A={pending:[],clear:()=>{},write:r=>A.pending.push(r),resize:()=>{}},D=new URLSearchParams(window.location.search),oe=D.get("ws"),ft=new URL(`../${oe}`,window.location.toString());ft.protocol=window.location.protocol==="https:"?"wss:":"ws:";const P={args:D.getAll("arg"),grep:D.get("grep")||void 0,grepInvert:D.get("grepInvert")||void 0,projects:D.getAll("project"),workers:D.get("workers")||void 0,timeout:D.has("timeout")?+D.get("timeout"):void 0,headed:D.has("headed"),outputDir:D.get("outputDir")||void 0,reporters:D.has("reporter")?D.getAll("reporter"):void 0},dt=navigator.platform==="MacIntel",ne=({})=>{var ot;const[r,t]=h.useState(""),[e,s]=h.useState(!1),[i,d]=h.useState(new Map([["passed",!1],["failed",!1],["skipped",!1]])),[a,f]=h.useState(new Map),[n,m]=h.useState(),[u,g]=h.useState(),[k,l]=h.useState({}),[p,x]=h.useState(new Set),[E,I]=h.useState(!1),[T,U]=h.useState(),[O,G]=Pt("watch-all",!1),[c,j]=h.useState({value:new Set}),b=h.useRef(Promise.resolve()),C=h.useRef(new Set),[$,pt]=h.useState(0),[gt,mt]=h.useState(!1),[it,rt]=h.useState(!0),[w,_t]=h.useState(),wt=h.useRef(null),Y=h.useCallback(()=>{_t(new Dt(ft.toString()))},[]);h.useEffect(()=>{var v;(v=wt.current)==null||v.focus(),I(!0),Y()},[Y]),h.useEffect(()=>{if(!w)return;const v=[w.onStdio(_=>{if(_.buffer){const y=atob(_.buffer);A.write(y)}else A.write(_.text)}),w.onClose(()=>mt(!0))];return A.resize=(_,y)=>{ct={cols:_,rows:y},w.resizeTerminalNoReply({cols:_,rows:y})},()=>{for(const _ of v)_.dispose()}},[w]),h.useEffect(()=>{if(!w)return;let v;const _=new qt({onUpdate:S=>{clearTimeout(v),v=void 0,S?m(_.asModel()):v||(v=setTimeout(()=>{m(_.asModel())},250))},onError:S=>{A.write((S.stack||S.value||"")+`
+`)},pathSeparator:st}),y=async()=>{b.current=b.current.then(async()=>{I(!0);try{const S=await w.listTests({projects:P.projects,locations:P.args});_.processListReport(S.report)}catch(S){console.log(S)}finally{I(!1)}})};return m(void 0),I(!0),j({value:new Set}),(async()=>{try{await w.initialize({interceptStdio:!0,watchTestDirs:!0});const{status:S,report:B}=await w.runGlobalSetup({});if(_.processGlobalReport(B),S!=="passed")return;const R=await w.listTests({projects:P.projects,locations:P.args});_.processListReport(R.report),w.onListChanged(y),w.onReport(L=>{_.processTestReportEvent(L)});const{hasBrowsers:M}=await w.checkBrowsers({});rt(M)}finally{I(!1)}})(),()=>{clearTimeout(v)}},[w]),h.useEffect(()=>{if(!n)return;const{config:v,rootSuite:_}=n,y=v.configFile?ut.getObject(v.configFile+":projects",void 0):void 0,S=new Map(a);for(const B of S.keys())_.suites.find(R=>R.title===B)||S.delete(B);for(const B of _.suites)S.has(B.title)||S.set(B.title,!!(y!=null&&y.includes(B.title)));!y&&S.size&&![...S.values()].includes(!0)&&S.set(S.entries().next().value[0],!0),(a.size!==S.size||[...a].some(([B,R])=>S.get(B)!==R))&&f(S)},[a,n]),h.useEffect(()=>{T&&(n!=null&&n.progress)?g(n.progress):n||g(void 0)},[n,T]);const{testTree:z}=h.useMemo(()=>{if(!n)return{testTree:new at("",new q("","root"),[],a,st)};const v=new at("",n.rootSuite,n.loadErrors,a,st);return v.filterTree(r,i,T==null?void 0:T.testIds),v.sortAndPropagateStatus(),v.shortenRoot(),v.flattenForSingleProject(),x(v.testIds()),{testTree:v}},[r,n,i,a,x,T]),W=h.useCallback((v,_)=>{!w||!n||v==="bounce-if-busy"&&T||(C.current=new Set([...C.current,..._]),b.current=b.current.then(async()=>{var B,R,M;const y=C.current;if(C.current=new Set,!y.size)return;{for(const L of((B=n.rootSuite)==null?void 0:B.allTests())||[])if(y.has(L.id)){L.results=[];const tt=L._createTestResult("pending");tt[H]="scheduled"}m({...n})}const S="  ["+new Date().toLocaleTimeString()+"]";A.write("\x1B[2m—".repeat(Math.max(0,ct.cols-S.length))+S+"\x1B[22m"),g({total:0,passed:0,failed:0,skipped:0}),U({testIds:y}),await w.runTests({locations:P.args,grep:P.grep,grepInvert:P.grepInvert,testIds:[...y],projects:[...a].filter(([L,tt])=>tt).map(([L])=>L),workers:P.workers,timeout:P.timeout,headed:P.headed,outputDir:P.outputDir,reporters:P.reporters,trace:"on"});for(const L of((R=n.rootSuite)==null?void 0:R.allTests())||[])((M=L.results[0])==null?void 0:M.duration)===-1&&(L.results=[]);m({...n}),U(void 0)}))},[a,T,n,w]);h.useEffect(()=>{if(!w)return;const v=w.onTestFilesChanged(_=>{const y=[],S=new Set(_.testFiles);if(O){const B=R=>{const M=R.location.file;M&&S.has(M)&&y.push(...z.collectTestIds(R)),R.kind==="group"&&R.subKind==="folder"&&R.children.forEach(B)};B(z.rootItem)}else for(const B of c.value){const R=z.treeItemById(B),M=R==null?void 0:R.location.file;M&&S.has(M)&&y.push(...z.collectTestIds(R))}W("queue-if-busy",new Set(y))});return()=>v.dispose()},[W,w,z,O,c]),h.useEffect(()=>{if(!w)return;const v=_=>{_.code==="Backquote"&&_.ctrlKey?(_.preventDefault(),s(!e)):_.code==="F5"&&_.shiftKey?(_.preventDefault(),w==null||w.stopTestsNoReply({})):_.code==="F5"&&(_.preventDefault(),W("bounce-if-busy",p))};return addEventListener("keydown",v),()=>{removeEventListener("keydown",v)}},[W,Y,w,p,e]);const K=!!T,J=h.useRef(null),vt=h.useCallback(v=>{var _;v.preventDefault(),v.stopPropagation(),(_=J.current)==null||_.showModal()},[]),Z=h.useCallback(v=>{var _;v.preventDefault(),v.stopPropagation(),(_=J.current)==null||_.close()},[]),xt=h.useCallback(v=>{Z(v),s(!0),w==null||w.installBrowsers({}).then(async()=>{s(!1);const{hasBrowsers:_}=await(w==null?void 0:w.checkBrowsers({}));rt(_)})},[Z,w]);return o.jsxs("div",{className:"vbox ui-mode",children:[!it&&o.jsxs("dialog",{ref:J,children:[o.jsxs("div",{className:"title",children:[o.jsx("span",{className:"codicon codicon-lightbulb"}),"Install browsers"]}),o.jsxs("div",{className:"body",children:["Playwright did not find installed browsers.",o.jsx("br",{}),"Would you like to run `playwright install`?",o.jsx("br",{}),o.jsx("button",{className:"button",onClick:xt,children:"Install"}),o.jsx("button",{className:"button secondary",onClick:Z,children:"Dismiss"})]})]}),gt&&o.jsxs("div",{className:"disconnected",children:[o.jsx("div",{className:"title",children:"UI Mode disconnected"}),o.jsxs("div",{children:[o.jsx("a",{href:"#",onClick:()=>window.location.href="/",children:"Reload the page"})," to reconnect"]})]}),o.jsxs(Lt,{sidebarSize:250,minSidebarSize:150,orientation:"horizontal",sidebarIsFirst:!0,settingName:"testListSidebar",children:[o.jsxs("div",{className:"vbox",children:[o.jsxs("div",{className:"vbox"+(e?"":" hidden"),children:[o.jsxs(X,{children:[o.jsx("div",{className:"section-title",style:{flex:"none"},children:"Output"}),o.jsx(N,{icon:"circle-slash",title:"Clear output",onClick:()=>A.clear()}),o.jsx("div",{className:"spacer"}),o.jsx(N,{icon:"close",title:"Close",onClick:()=>s(!1)})]}),o.jsx(Ht,{source:A})]}),o.jsx("div",{className:"vbox"+(e?" hidden":""),children:o.jsx(ie,{item:k,rootDir:(ot=n==null?void 0:n.config)==null?void 0:ot.rootDir})})]}),o.jsxs("div",{className:"vbox ui-mode-sidebar",children:[o.jsxs(X,{noShadow:!0,noMinHeight:!0,children:[o.jsx("img",{src:"playwright-logo.svg",alt:"Playwright logo"}),o.jsx("div",{className:"section-title",children:"Playwright"}),o.jsx(N,{icon:"color-mode",title:"Toggle color mode",onClick:()=>Mt()}),o.jsx(N,{icon:"refresh",title:"Reload",onClick:()=>Y(),disabled:K||E}),o.jsx(N,{icon:"terminal",title:"Toggle output — "+(dt?"⌃`":"Ctrl + `"),toggled:e,onClick:()=>{s(!e)}}),!it&&o.jsx(N,{icon:"lightbulb-autofix",style:{color:"var(--vscode-list-warningForeground)"},title:"Playwright browsers are missing",onClick:vt})]}),o.jsx(Gt,{filterText:r,setFilterText:t,statusFilters:i,setStatusFilters:d,projectFilters:a,setProjectFilters:f,testModel:n,runTests:()=>W("bounce-if-busy",p)}),o.jsxs(X,{noMinHeight:!0,children:[!K&&!u&&o.jsx("div",{className:"section-title",children:"Tests"}),!K&&u&&o.jsx("div",{"data-testid":"status-line",className:"status-line",children:o.jsxs("div",{children:[u.passed,"/",u.total," passed (",u.passed/u.total*100|0,"%)"]})}),K&&u&&o.jsx("div",{"data-testid":"status-line",className:"status-line",children:o.jsxs("div",{children:["Running ",u.passed,"/",T.testIds.size," passed (",u.passed/T.testIds.size*100|0,"%)"]})}),o.jsx(N,{icon:"play",title:"Run all — F5",onClick:()=>W("bounce-if-busy",p),disabled:K||E}),o.jsx(N,{icon:"debug-stop",title:"Stop — "+(dt?"⇧F5":"Shift + F5"),onClick:()=>w==null?void 0:w.stopTests({}),disabled:!K||E}),o.jsx(N,{icon:"eye",title:"Watch all",toggled:O,onClick:()=>{j({value:new Set}),G(!O)}}),o.jsx(N,{icon:"collapse-all",title:"Collapse all",onClick:()=>{pt($+1)}})]}),o.jsx(ee,{filterText:r,testModel:n,testTree:z,testServerConnection:w,runningState:T,runTests:W,onItemSelected:l,watchAll:O,watchedTreeIds:c,setWatchedTreeIds:j,isLoading:E,requestedCollapseAllCount:$,setFilterText:t})]})]})]})};(async()=>{if(Ft(),window.location.protocol!=="file:"){if(window.location.href.includes("isUnderTest=true")&&await new Promise(r=>setTimeout(r,1e3)),!navigator.serviceWorker)throw new Error(`Service workers are not supported.
+Make sure to serve the website (${window.location}) via HTTPS or localhost.`);navigator.serviceWorker.register("sw.bundle.js"),navigator.serviceWorker.controller||await new Promise(r=>{navigator.serviceWorker.oncontrollerchange=()=>r()}),setInterval(function(){fetch("ping")},1e4)}Ot.render(o.jsx(ne,{}),document.querySelector("#root"))})();
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/xtermModule.DSXBckUd.css b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/xtermModule.DSXBckUd.css
new file mode 100644
index 0000000..22cea37
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright-report/trace/xtermModule.DSXBckUd.css
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
+ * https://github.com/chjj/term.js
+ * @license MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Originally forked from (with the author's permission):
+ *   Fabrice Bellard's javascript vt100 for jslinux:
+ *   http://bellard.org/jslinux/
+ *   Copyright (c) 2011 Fabrice Bellard
+ *   The original design remains. The terminal itself
+ *   has been extended to include xterm CSI codes, among
+ *   other features.
+ */.xterm{cursor:text;position:relative;user-select:none;-ms-user-select:none;-webkit-user-select:none}.xterm.focus,.xterm:focus{outline:none}.xterm .xterm-helpers{position:absolute;top:0;z-index:5}.xterm .xterm-helper-textarea{padding:0;border:0;margin:0;position:absolute;opacity:0;left:-9999em;top:0;width:0;height:0;z-index:-5;white-space:nowrap;overflow:hidden;resize:none}.xterm .composition-view{background:#000;color:#fff;display:none;position:absolute;white-space:nowrap;z-index:1}.xterm .composition-view.active{display:block}.xterm .xterm-viewport{background-color:#000;overflow-y:scroll;cursor:default;position:absolute;right:0;left:0;top:0;bottom:0}.xterm .xterm-screen{position:relative}.xterm .xterm-screen canvas{position:absolute;left:0;top:0}.xterm .xterm-scroll-area{visibility:hidden}.xterm-char-measure-element{display:inline-block;visibility:hidden;position:absolute;top:0;left:-9999em;line-height:normal}.xterm.enable-mouse-events{cursor:default}.xterm.xterm-cursor-pointer,.xterm .xterm-cursor-pointer{cursor:pointer}.xterm.column-select.focus{cursor:crosshair}.xterm .xterm-accessibility,.xterm .xterm-message{position:absolute;left:0;top:0;bottom:0;right:0;z-index:10;color:transparent;pointer-events:none}.xterm .live-region{position:absolute;left:-9999px;width:1px;height:1px;overflow:hidden}.xterm-dim{opacity:1!important}.xterm-underline-1{text-decoration:underline}.xterm-underline-2{text-decoration:double underline}.xterm-underline-3{text-decoration:wavy underline}.xterm-underline-4{text-decoration:dotted underline}.xterm-underline-5{text-decoration:dashed underline}.xterm-overline{text-decoration:overline}.xterm-overline.xterm-underline-1{text-decoration:overline underline}.xterm-overline.xterm-underline-2{text-decoration:overline double underline}.xterm-overline.xterm-underline-3{text-decoration:overline wavy underline}.xterm-overline.xterm-underline-4{text-decoration:overline dotted underline}.xterm-overline.xterm-underline-5{text-decoration:overline dashed underline}.xterm-strikethrough{text-decoration:line-through}.xterm-screen .xterm-decoration-container .xterm-decoration{z-index:6;position:absolute}.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer{z-index:7}.xterm-decoration-overview-ruler{z-index:8;position:absolute;top:0;right:0;pointer-events:none}.xterm-decoration-top{z-index:2;position:relative}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.local.ts b/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.local.ts
new file mode 100644
index 0000000..dd95eba
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.local.ts
@@ -0,0 +1,62 @@
+/**
+ * @fileoverview Playwright Configuration for Local Development Environment
+ * @description Local Playwright configuration for development testing with automatic React server startup.
+ * For remote/CI execution, use: playwright.config.ts
+ * @version 2.1.0
+ * @since 2024-10-15
+ * @author Strata Decision Technology
+ *
+ * @module LocalPlaywrightConfig
+ * @requires ./playwright.config.shared
+ *
+ * @example
+ * ```bash
+ * # Local development execution
+ * npx playwright test --config=playwright.config.local.ts
+ *
+ * # Remote/CI execution (default)
+ * npx playwright test
+ *
+ * # Dry-run mode (local)
+ * DRY_RUN=true npx playwright test --config=playwright.config.local.ts
+ * ```
+ *
+ * @overview
+ * This configuration supports:
+ * - Automatic React dev server startup
+ * - Localhost URL targeting for development
+ * - Lower retry count for faster feedback
+ * - Local API endpoint integration
+ *
+ * Local Development Environment URLs:
+ * - UI: http://localhost:3000/
+ * - API: http://localhost:8443/api/
+ *
+ * @architecture
+ * Local Configuration Features:
+ * - Automatic web server startup via webServer config
+ * - Lower retry count for faster development feedback (1 retry)
+ * - Local endpoint targeting for development environment
+ * - React app auto-start with 2-minute timeout
+ * - Reuses existing server to avoid conflicts
+ * - Development-optimized trace collection
+ *
+ * @dependencies
+ * - API server must be running at http://localhost:8443/api/
+ * - React app will be started automatically at http://localhost:3000
+ * - Node.js environment with npm available
+ *
+ * @performance
+ * - Optimized for development workflow
+ * - Fast feedback with minimal retries
+ * - Automatic server management
+ * - Local network performance benefits
+ *
+ * @see https://playwright.dev/docs/test-configuration
+ */
+
+import { createPlaywrightConfig, EnvironmentType } from './playwright.config.shared';
+
+process.env.MICROSERVICE = 'continuousimprovement';
+
+export default createPlaywrightConfig(EnvironmentType.LOCAL);
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.shared.ts b/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.shared.ts
new file mode 100644
index 0000000..0aba197
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.shared.ts
@@ -0,0 +1,589 @@
+/**
+ * @fileoverview Shared Playwright Configuration Module
+ * @description Common configuration utilities and factories for Playwright test setups
+ * @version 1.0.0
+ * @since 2025-11-03
+ * @author Strata Decision Technology
+ *
+ * @module SharedPlaywrightConfig
+ * @requires @playwright/test
+ * @requires ./auth/ApiRequestOptions
+ *
+ * @example
+ * ```typescript
+ * import { createPlaywrightConfig, EnvironmentType } from './playwright.config.shared';
+ *
+ * export default createPlaywrightConfig(EnvironmentType.LOCAL, {
+ *   // environment-specific overrides
+ * });
+ * ```
+ */
+import { devices, PlaywrightTestConfig } from '@playwright/test';
+import { ApiRequestOptions } from './auth/ApiRequestOptions';
+import { Constants } from './helpers/globalTestUtils';
+import { customLogger, LoggingLevels } from './customLogger';
+
+/**
+ * @enum EnvironmentType
+ * @description Available environment configurations for test execution
+ */
+export enum EnvironmentType {
+  /** Local development environment with localhost URLs */
+  LOCAL = 'local',
+  /** Remote/CI environment with dev.stratanetwork.net URLs */
+  REMOTE = 'remote',
+  SMOKE_TEST = 'smoke-test',
+  STAGING = 'staging'
+}
+
+const microservice = process.env.MICROSERVICE || '';
+const loggingLevel = (parseInt(process.env.LOGGING_LEVEL || LoggingLevels.ERROR_ONLY.toString(), 10) as any as LoggingLevels) || LoggingLevels.ERROR_ONLY;
+
+/**
+ * @interface EnvironmentConfig
+ * @description Environment-specific configuration settings
+ */
+export interface EnvironmentConfig {
+  /** Base URL for UI tests */
+  baseURL: string;
+  /** API URL for programmatic API calls */
+  apiURL: string;
+  /** Swagger JSON URL for API documentation */
+  swaggerURL: string;
+  /** Node environment identifier */
+  nodeEnv: 'localhost' | 'development' | 'qa' | 'production';
+  /** Number of test retries */
+  retries: number;
+  /** Optional web server configuration for local development */
+  webServer?: {
+    command: string;
+    url: string;
+    reuseExistingServer: boolean;
+    timeout: number;
+    cwd: string;
+  };
+}
+
+/**
+ * @interface ProjectTemplate
+ * @description Template for creating test projects with consistent configuration
+ */
+export interface ProjectTemplate {
+  /** Project name identifier */
+  name: string;
+  /** Optional test directory */
+  testDir?: string;
+  /** Test file pattern matcher */
+  testMatch: RegExp;
+  /** Project dependencies */
+  dependencies?: string[];
+  /** Device configuration */
+  device?: any;
+  /** Browser channel (for branded browsers) */
+  channel?: string;
+}
+
+/**
+ * @constant BASE_PROJECT_CONFIG
+ * @description Shared project configuration applied to all test projects
+ */
+export const BASE_PROJECT_CONFIG = {
+  locale: 'en-US',
+  timezoneId: 'America/Chicago'
+} as const;
+
+/**
+ * @function getSwaggerUrl
+ * @description Generates Swagger JSON URL from API base URL
+ * @param {string} apiURL - API base URL (e.g., 'https://continuousimprovement-api.dev.stratanetwork.net/api/')
+ * @returns {string} Swagger JSON URL (e.g., `https://continuousimprovement-api.dev.stratanetwork.net/swagger/${Constants.DEFAULT_API_VERSION}/swagger.json`)
+ * @since 1.1.0
+ *
+ * @example
+ * `swaggerURL: getSwaggerUrl('http://localhost:8443/api/'),
+    ``typescript
+ * const swaggerUrl = getSwaggerUrl('https://continuousimprovement-api.dev.stratanetwork.net/api/');
+ * // Returns: `https://continuousimprovement-api.dev.stratanetwork.net/swagger/${Constants.DEFAULT_API_VERSION}/swagger.json`
+ * ```
+ */
+function getSwaggerUrl(apiURL: string): string {
+  // Remove /api/ suffix if present
+  const baseUrl = apiURL.replace(/\/api\/?$/, '');
+  return `${baseUrl}/swagger/${Constants.DEFAULT_API_VERSION}/swagger.json`;
+}
+
+/**
+ * @swaggerURL: getSwaggerUrl(`https://${microservice}-api.dev.stratanetwork.net/api/`),
+ * @constant ENVIRONMENT_CONFIGS
+ * @description Pre-defined environment configurations for different deployment targets
+ */
+export const ENVIRONMENT_CONFIGS: Record<EnvironmentType, EnvironmentConfig> = {
+  [EnvironmentType.LOCAL]: {
+    baseURL: `http://localhost:3000/${microservice}`,
+    apiURL: 'http://localhost:8443/api/',
+    swaggerURL: getSwaggerUrl('http://localhost:8443/api/'),
+    nodeEnv: 'localhost',
+    retries: process.env.CI ? 2 : 1,
+    webServer: {
+      command: 'npm run start',
+      url: 'http://localhost:3000',
+      reuseExistingServer: !process.env.CI,
+      timeout: 120 * 1000,
+      cwd: `../${microservice}`
+    }
+  },
+  [EnvironmentType.REMOTE]: {
+    baseURL: `https://${microservice}.dev.stratanetwork.net/${microservice}`,
+    apiURL: `https://${microservice}-api.dev.stratanetwork.net/api/`,
+    swaggerURL: getSwaggerUrl(`https://${microservice}-api.dev.stratanetwork.net/api/`),
+    nodeEnv: 'development',
+    retries: process.env.CI ? 4 : 1,
+    webServer: undefined
+  },
+  [EnvironmentType.SMOKE_TEST]: {
+    swaggerURL: getSwaggerUrl(`https://${microservice}-api.qa.stratanetwork.net/api/`),
+    baseURL: `https://app-dr.stratanetwork.com/${microservice}`,
+    apiURL: `https://${microservice}-api.qa.stratanetwork.net/api/`,
+    nodeEnv: 'qa',
+    retries: process.env.CI ? 4 : 1,
+    webServer: undefined
+  },
+  [EnvironmentType.STAGING]: {
+    baseURL: `https://app-dr.stratanetwork.com/${microservice}`,
+    apiURL: `https://${microservice}-api.qa.stratanetwork.net/api/`,
+    swaggerURL: getSwaggerUrl(`https://${microservice}-api.qa.stratanetwork.net/api/`),
+    nodeEnv: 'qa',
+    retries: process.env.CI ? 4 : 1,
+    webServer: undefined
+  }
+} as const;
+
+/**
+ * Common test directory configurations
+ */
+const TEST_DIRS = {
+  api: './tests/api',
+  ui: './tests/ui',
+  swagger: './tests/swagger',
+  localization: './tests/localization'
+} as const;
+/**
+ * Create project configurations for different test types
+ */
+const dependencies = ['auth-setup'];
+
+const apiProjects = {
+  use: {
+    locale: 'en-US',
+    timezoneId: 'America/Chicago'
+  },
+  dependencies: dependencies,
+  testDir: TEST_DIRS.api,
+  testMatch: /.*\.spec\.ts/
+};
+
+const swaggerProjects = { ...apiProjects, testDir: TEST_DIRS.swagger };
+const uiProjects = { ...apiProjects, testDir: TEST_DIRS.ui };
+
+/**
+ * @constant PROJECT_TEMPLATES
+ * @description Pre-defined project templates for different test types and browsers
+ */
+export const PROJECT_TEMPLATES: ProjectTemplate[] = [
+  // Setup project
+  { name: 'auth-setup', testDir: './auth', testMatch: /.*\.setup\.ts/ },
+
+  // API project tests
+  { ...apiProjects, name: 'chromium-api', testMatch: /.*\.spec\.ts$/, device: devices['Desktop Chrome'] },
+  { ...apiProjects, name: 'firefox-api', testMatch: /.*\.spec\.ts$/, device: devices['Desktop Firefox'] },
+  { ...apiProjects, name: 'webkit-api', testMatch: /.*\.spec\.ts$/, device: devices['Desktop Safari'] },
+
+  // Swagger project tests
+  { ...swaggerProjects, name: 'chromium-swagger', testMatch: /.*\.spec\.ts$/, device: devices['Desktop Chrome'] },
+
+  // UI project tests
+  { ...uiProjects, name: 'chromium-ui', testMatch: /.*\.spec\.ts$/, device: devices['Desktop Chrome'] },
+  { ...uiProjects, name: 'firefox-ui', testMatch: /.*\.spec\.ts$/, device: devices['Desktop Firefox'] },
+  { ...uiProjects, name: 'webkit-ui', testMatch: /.*\.spec\.ts$/, device: devices['Desktop Safari'] },
+
+  // Test against branded browsers
+  {
+    name: 'Microsoft Edge',
+    testDir: TEST_DIRS.ui,
+    testMatch: /.*\.spec\.ts$/,
+    dependencies: dependencies,
+    device: devices['Desktop Edge'],
+    channel: 'msedge'
+  }
+];
+
+/**
+ * @function createProjectConfig
+ * @description Creates a project configuration from template and environment settings
+ * @param {ProjectTemplate} template - Project template configuration
+ * @param {EnvironmentConfig} envConfig - Environment-specific settings
+ * @returns {object} Complete project configuration object
+ * @since 1.0.0
+ *
+ * @example
+ * ```typescript
+ * const project = createProjectConfig(
+ *   PROJECT_TEMPLATES.find(t => t.name === 'chromium-ui'),
+ *   ENVIRONMENT_CONFIGS[EnvironmentType.LOCAL]
+ * );
+ * ```
+ */
+export function createProjectConfig(template: ProjectTemplate, envConfig: EnvironmentConfig) {
+  const baseProjectConfig = {
+    name: template.name,
+    timeout: 60_000,
+    testDir: template.testDir || './tests',
+    testMatch: template.testMatch,
+    fullyParallel: true,
+    forbidOnly: !!process.env.CI,
+    workers: process.env.CI ? 1 : undefined,
+    reporter: 'html',
+    use: {
+      baseURL: envConfig.baseURL,
+      apiURL: envConfig.apiURL,
+      swaggerURL: envConfig.swaggerURL,
+      ...BASE_PROJECT_CONFIG
+    }
+  };
+
+  // Add dependencies if specified
+  if (template.dependencies && template.dependencies.length > 0) {
+    (baseProjectConfig as any).dependencies = template.dependencies;
+  }
+
+  // Add device configuration if specified
+  if (template.device) {
+    baseProjectConfig.use = {
+      ...baseProjectConfig.use,
+      ...template.device
+    };
+  }
+
+  // Add browser channel if specified (for branded browsers)
+  if (template.channel) {
+    (baseProjectConfig.use as any).channel = template.channel;
+  }
+
+  return baseProjectConfig;
+}
+
+/**
+ * Create project configurations for different test types
+ */
+function createProjectConfigs(envType: EnvironmentType) {
+  const dependencies = ['auth-setup'];
+
+  const apiProjects = {
+    use: {
+      locale: 'en-US',
+      timezoneId: 'America/Chicago'
+    },
+    dependencies: dependencies,
+    testDir: TEST_DIRS.api,
+    testMatch: /.*\.spec\.ts/
+  };
+
+  const swaggerProjects = { ...apiProjects, testDir: TEST_DIRS.swagger };
+  const uiProjects = { ...apiProjects, testDir: TEST_DIRS.ui };
+
+  const localizationProjects = {
+    ...uiProjects,
+    use: {
+      locale: 'en-GB',
+      timezoneId: 'Europe/London'
+    },
+    testDir: TEST_DIRS.localization
+  };
+
+  const projects = {
+    // Setup project
+    'auth-setup': { name: 'auth-setup', testDir: './auth', testMatch: /.*\.setup\.ts/ },
+
+    // API project tests
+    'chromium-api': { ...apiProjects, name: 'chromium-api', use: { ...apiProjects.use, ...devices['Desktop Chrome'] }, testMatch: apiProjects.testMatch },
+    'firefox-api': { ...apiProjects, name: 'firefox-api', use: { ...apiProjects.use, ...devices['Desktop Firefox'] }, testMatch: apiProjects.testMatch },
+    'webkit-api': { ...apiProjects, name: 'webkit-api', use: { ...apiProjects.use, ...devices['Desktop Safari'] }, testMatch: apiProjects.testMatch },
+
+    // Swagger project tests
+    'chromium-swagger': { ...swaggerProjects, name: 'chromium-swagger', use: { ...swaggerProjects.use, ...devices['Desktop Chrome'] }, testMatch: swaggerProjects.testMatch },
+
+    // UI project tests
+    'chromium-ui': { ...uiProjects, name: 'chromium-ui', use: { ...uiProjects.use, ...devices['Desktop Chrome'] }, testMatch: uiProjects.testMatch },
+    'firefox-ui': { ...uiProjects, name: 'firefox-ui', use: { ...uiProjects.use, ...devices['Desktop Firefox'] }, testMatch: uiProjects.testMatch },
+    'webkit-ui': { ...uiProjects, name: 'webkit-ui', use: { ...uiProjects.use, ...devices['Desktop Safari'] }, testMatch: uiProjects.testMatch },
+    // Localization UI Tests
+    'chromium-ui-GB': { ...localizationProjects, name: 'chromium-ui-GB', use: { ...localizationProjects.use, ...devices['Desktop Chrome'] }, testMatch: localizationProjects.testMatch },
+    'firefox-ui-GB': { ...localizationProjects, name: 'firefox-ui-GB', use: { ...localizationProjects.use, ...devices['Desktop Firefox'] }, testMatch: localizationProjects.testMatch },
+    'webkit-ui-GB': { ...localizationProjects, name: 'webkit-ui-GB', use: { ...localizationProjects.use, ...devices['Desktop Safari'] }, testMatch: localizationProjects.testMatch },
+
+    // Test against branded browsers
+    'Microsoft Edge': { ...uiProjects, name: 'Microsoft Edge', use: { ...uiProjects.use, ...devices['Desktop Edge'], channel: 'msedge' }, testMatch: uiProjects.testMatch }
+  };
+
+  return projects;
+}
+
+/**
+ * Base configuration shared across all environments
+ */
+const BASE_CONFIG = {
+  timeout: 60_000,
+  testDir: './tests',
+  fullyParallel: true,
+  forbidOnly: !!process.env.CI,
+  workers: process.env.CI ? 1 : undefined,
+  reporter: 'html',
+  use: {
+    trace: 'on-first-retry'
+  }
+} as const;
+
+/**
+ * @function createPlaywrightConfig
+ * @description Factory function to create complete Playwright configuration
+ * @param {EnvironmentType} envType - Target environment type
+ * @param {Partial<PlaywrightTestConfig<ApiRequestOptions>>} [overrides] - Optional configuration overrides
+ * @returns {PlaywrightTestConfig<ApiRequestOptions>} Complete Playwright configuration
+ * @since 1.0.0
+ *
+ * @example
+ * ```typescript
+ * // Basic usage
+ * export default createPlaywrightConfig(EnvironmentType.LOCAL);
+ *
+ * // With overrides
+ * export default createPlaywrightConfig(EnvironmentType.REMOTE, {
+ *   timeout: 30_000,
+ *   reporter: 'json'
+ * });
+ * ```
+ *
+ * @workflow
+ * 1. Selects environment configuration based on type
+ * 2. Generates all projects from templates
+ * 3. Applies environment settings to each project
+ * 4. Merges with any provided overrides
+ * 5. Returns complete configuration object
+ */
+export function createPlaywrightConfig(envType: EnvironmentType, overrides?: Partial<PlaywrightTestConfig<ApiRequestOptions>>): PlaywrightTestConfig<ApiRequestOptions> {
+  const envConfig = ENVIRONMENT_CONFIGS[envType];
+  process.env.NODE_ENV = envConfig.nodeEnv;
+  process.env.TEST_ENV = envType;
+  process.env.API_URL = envConfig.apiURL;
+  process.env.API_BASE_URL = envConfig.apiURL;
+  process.env.BASE_URL = envConfig.baseURL;
+  process.env.SWAGGER_URL = envConfig.swaggerURL;
+
+  // Generate projects from templates
+  const projects = PROJECT_TEMPLATES.map((template) => createProjectConfig(template, envConfig));
+
+  // Handle DRY_RUN mode - disable web server and modify base configuration for faster validation
+  const isDryRun = process.env.DRY_RUN === 'true';
+  const webServer = isDryRun ? undefined : envConfig.webServer;
+
+  // Base configuration shared across all environments
+  const baseConfig: PlaywrightTestConfig<ApiRequestOptions> = {
+    ...BASE_CONFIG,
+    retries: isDryRun ? 0 : envConfig.retries, // No retries in dry run mode
+    workers: isDryRun ? 1 : process.env.CI ? 1 : undefined, // Single worker for dry run
+    globalSetup: require.resolve('./tests/global.setup.ts'),
+    use: {
+      ...BASE_CONFIG.use,
+      baseURL: envConfig.baseURL,
+      apiURL: envConfig.apiURL,
+      swaggerURL: envConfig.swaggerURL,
+      ...(isDryRun && {
+        // Optimize for dry run - faster test discovery and validation
+        actionTimeout: 5000,
+        navigationTimeout: 5000
+      }),
+      trace: 'on-first-retry'
+    },
+    projects: Object.values(projects),
+    ...(webServer && { webServer })
+  };
+
+  (global as any).EnvironmentType = envType;
+  (process as any).EnvironmentType = envType;
+
+  // Add web server configuration if available (local development)
+  if (envConfig.webServer) {
+    baseConfig.webServer = envConfig.webServer;
+  }
+
+  // Merge with any provided overrides
+  const result = {
+    ...baseConfig,
+    ...overrides,
+    // Ensure use configuration is properly merged
+    use: {
+      ...baseConfig.use,
+      ...(overrides?.use || {})
+    },
+    // Ensure projects are properly merged (overrides can extend projects)
+    projects: overrides?.projects ? [...projects, ...overrides.projects] : projects
+  };
+
+  customLogger.log(`🛠  Created Playwright configuration for environment: ${envType}`);
+  customLogger.log(`🔍 Configuration details:`);
+  customLogger.log('----------------------------------------');
+  customLogger.log({ ...result, projects: [] });
+  customLogger.log('----------------------------------------');
+  customLogger.log(`🛠  Created project configurations for environment: ${envType}`);
+  customLogger.log(`🔍 Available projects:`);
+  customLogger.log('----------------------------------------');
+  customLogger.log(result.projects?.map((proj) => ({ name: proj.name || 'Unnamed Project', testDir: proj.testDir, testMatch: proj.testMatch })));
+  customLogger.log('----------------------------------------');
+
+  return result;
+}
+
+/**
+ * Get environment configuration details
+ * @param envType Environment type
+ * @returns Environment configuration object
+ */
+export function getEnvironmentConfig(envType: EnvironmentType) {
+  return ENVIRONMENT_CONFIGS[envType];
+}
+
+/**
+ * @function getEnvironmentDocumentation
+ * @description Returns usage documentation for the specified environment
+ * @param {EnvironmentType} envType - Target environment type
+ * @returns {string} Formatted documentation string
+ * @since 1.0.0
+ *
+ * @example
+ * ```typescript
+ * console.log(getEnvironmentDocumentation(EnvironmentType.LOCAL));
+ * ```
+ */
+export function getEnvironmentDocumentation(envType: EnvironmentType): string {
+  const envConfig = ENVIRONMENT_CONFIGS[envType];
+
+  switch (envType) {
+    case EnvironmentType.LOCAL:
+      return `
+ * Local Development Playwright Configuration
+ * 
+ * This configuration is for local development and testing.
+ * It uses localhost URLs and starts the React dev server automatically.
+ * 
+ * Prerequisites:
+ * - API Server running at ${envConfig.apiURL.replace(`/api/${Constants.DEFAULT_API_VERSION}/`, '')}
+ * - React app will be started automatically at ${envConfig.baseURL}
+ * 
+ * Usage: 
+ * - Standard: npx playwright test --config=playwright.config.local.ts
+ * - Dry-run: DRY_RUN=true npx playwright test --config=playwright.config.local.ts
+      `.trim();
+
+    case EnvironmentType.REMOTE:
+      return `
+ * Remote/CI Playwright Configuration
+ * 
+ * This configuration is for remote/CI environments.
+ * For local development, use: playwright.config.local.ts
+ * 
+ * This configuration supports:
+ * - UI tests (tests/ui/)
+ * - API tests (tests/api/)  
+ * - Swagger tests (tests/swagger/)
+ * 
+ * Remote/CI Environment URLs:
+ * - UI: ${envConfig.baseURL}
+ * - API: ${envConfig.apiURL}
+ * 
+ * Usage:
+ * - Default: npx playwright test
+ * - Local: npx playwright test --config=playwright.config.local.ts
+ * - Dry-run: DRY_RUN=true npx playwright test
+      `.trim();
+
+    case EnvironmentType.SMOKE_TEST:
+      return `
+ * Smoke Test Playwright Configuration
+ * 
+ * This configuration is for smoke testing in the QA environment.
+ * For local development, use: playwright.config.local.ts
+ * 
+ * This configuration supports:
+ * - UI tests (tests/ui/)
+ * - API tests (tests/api/)  
+ * - Swagger tests (tests/swagger/)
+ * 
+ * Smoke Test Environment URLs:
+ * - UI: ${envConfig.baseURL}
+ * - API: ${envConfig.apiURL}
+ * 
+ * Usage:
+ * - Standard: npx playwright test --config=playwright.config.smokeTest.ts
+ * - Dry-run: DRY_RUN=true npx playwright test --config=playwright.config.smokeTest.ts
+      `.trim();
+
+    case EnvironmentType.STAGING:
+      return `
+ * Staging Playwright Configuration
+ * 
+ * This configuration is for staging/QA environment testing.
+ * For local development, use: playwright.config.local.ts
+ * 
+ * This configuration supports:
+ * - UI tests (tests/ui/)
+ * - API tests (tests/api/)  
+ * - Swagger tests (tests/swagger/)
+ * 
+ * Staging Environment URLs:
+ * - UI: ${envConfig.baseURL}
+ * - API: ${envConfig.apiURL}
+ * 
+ * Usage:
+ * - Standard: npx playwright test --config=playwright.config.staging.ts
+ * - Dry-run: DRY_RUN=true npx playwright test --config=playwright.config.staging.ts
+      `.trim();
+
+    default:
+      return 'Unknown environment type';
+  }
+}
+
+/**
+ * Get available project names
+ * @returns Array of project names
+ */
+export function getProjectNames(): string[] {
+  return Object.keys(createProjectConfigs(EnvironmentType.LOCAL));
+}
+
+/**
+ * @constant SHARED_EXPORTS
+ * @description Convenience exports for common configurations
+ */
+export const SHARED_EXPORTS = {
+  /** Pre-configured local development setup */
+  localConfig: () => createPlaywrightConfig(EnvironmentType.LOCAL),
+
+  /** Pre-configured remote/CI setup */
+  remoteConfig: () => createPlaywrightConfig(EnvironmentType.REMOTE),
+
+  /** Pre-configured smoke test setup */
+  smokeTestConfig: () => createPlaywrightConfig(EnvironmentType.SMOKE_TEST),
+
+  /** Pre-configured staging setup */
+  stagingConfig: () => createPlaywrightConfig(EnvironmentType.STAGING),
+
+  /** Base configuration without environment specifics */
+  baseConfig: BASE_PROJECT_CONFIG,
+
+  /** All available project templates */
+  projectTemplates: PROJECT_TEMPLATES,
+
+  /** All environment configurations */
+  environments: ENVIRONMENT_CONFIGS
+} as const;
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.smokeTest.ts b/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.smokeTest.ts
new file mode 100644
index 0000000..1f4e435
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.smokeTest.ts
@@ -0,0 +1,23 @@
+/**
+ * Playwright configuration for local development
+ *
+ * This configuration is used for:
+ * - Local development and testing
+ * - Debugging test failures
+ * - Development of new test cases
+ *
+ * Key differences from remote configuration:
+ * - Uses local URLs (localhost:3000)
+ * - Auto-starts React development server
+ * - Lower retry count for faster feedback
+ * - Optimized for development workflow
+ *
+ * Usage:
+ *   npx playwright test --config=playwright.config.smokeTest.ts
+ *   $env:DRY_RUN='true'; npx playwright test --config=playwright.config.smokeTest.ts
+ */
+import { createPlaywrightConfig, EnvironmentType } from './playwright.config.shared';
+
+process.env.MICROSERVICE = 'continuousimprovement';
+
+export default createPlaywrightConfig(EnvironmentType.SMOKE_TEST);
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.staging.ts b/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.staging.ts
new file mode 100644
index 0000000..deb0abe
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.staging.ts
@@ -0,0 +1,23 @@
+/**
+ * Playwright configuration for the staging environment
+ *
+ * This configuration is used for:
+ * - Testing against the staging deployment
+ * - Validating features before production release
+ * - Reproducing issues found in staging
+ *
+ * Key differences from production configuration:
+ * - Uses staging URLs (e.g., https://staging.example.com)
+ * - May include staging-specific environment variables or feature flags
+ * - Retry and timeout settings may be tuned for staging stability
+ * - Optimized for pre-release validation workflow
+ *
+ * Usage:
+ *   npx playwright test --config=playwright.config.staging.ts
+ *   $env:DRY_RUN='true'; npx playwright test --config=playwright.config.staging.ts
+ */
+import { createPlaywrightConfig, EnvironmentType } from './playwright.config.shared';
+
+process.env.MICROSERVICE = 'continuousimprovement';
+
+export default createPlaywrightConfig(EnvironmentType.STAGING);
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.ts b/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.ts
new file mode 100644
index 0000000..1135608
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/playwright.config.ts
@@ -0,0 +1,61 @@
+/**
+ * @fileoverview Playwright Configuration for Remote/CI Environment
+ * @description Main Playwright configuration for remote test execution in dev environment.
+ * For local development, use: playwright.config.local.ts
+ * @version 2.1.0
+ * @since 2024-10-15
+ * @author Strata Decision Technology
+ *
+ * @module RemotePlaywrightConfig
+ * @requires ./playwright.config.shared
+ *
+ * @example
+ * ```bash
+ * # Remote/CI execution (default)
+ * npx playwright test
+ *
+ * # Local development
+ * npx playwright test --config=playwright.config.ts
+ *
+ * # Dry-run mode (remote)
+ * DRY_RUN=true npx playwright test
+ * ```
+ *
+ * @overview
+ * This configuration supports:
+ * - UI tests (tests/ui/)
+ * - API tests (tests/api/)
+ * - Swagger tests (tests/swagger/)
+ *
+ * Remote/CI Environment URLs:
+ * - UI: https://rxnorm.dev.stratanetwork.net/
+ * - API: https://rxnorm-api.dev.stratanetwork.net/api/
+ *
+ * @architecture
+ * Remote Configuration Features:
+ * - Higher retry count for network reliability (4 retries in CI)
+ * - Remote endpoint targeting for dev environment
+ * - No local web server startup (assumes deployed environment)
+ * - Trace collection on first retry for debugging
+ * - Full cross-browser testing support
+ * - Authentication setup project dependency
+ *
+ * @dependencies
+ * - API server must be running at remote endpoint
+ * - React app must be deployed at remote URL
+ * - Authentication tokens must be valid for dev environment
+ *
+ * @performance
+ * - Optimized for CI/CD pipelines
+ * - Parallel test execution across browser engines
+ * - Network retry logic for stability
+ * - Trace capture only on failures for storage efficiency
+ *
+ * @see https://playwright.dev/docs/test-configuration
+ */
+
+import { createPlaywrightConfig, EnvironmentType } from './playwright.config.shared';
+
+process.env.MICROSERVICE = 'continuousimprovement';
+
+export default createPlaywrightConfig(EnvironmentType.REMOTE);
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests-examples/demo-todo-app.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests-examples/demo-todo-app.spec.ts
new file mode 100644
index 0000000..b3d238e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests-examples/demo-todo-app.spec.ts
@@ -0,0 +1,416 @@
+import { expect, type Page, test } from '@playwright/test';
+
+test.beforeEach(async ({ page }) => {
+  await page.goto('https://demo.playwright.dev/todomvc');
+});
+
+const TODO_ITEMS = ['buy some cheese', 'feed the cat', 'book a doctors appointment'] as const;
+
+test.describe('New Todo', () => {
+  test('should allow me to add todo items', async ({ page }) => {
+    // create a new todo locator
+    const newTodo = page.getByPlaceholder('What needs to be done?');
+
+    // Create 1st todo.
+    await newTodo.fill(TODO_ITEMS[0]);
+    await newTodo.press('Enter');
+
+    // Make sure the list only has one todo item.
+    await expect(page.getByTestId('todo-title')).toHaveText([TODO_ITEMS[0]]);
+
+    // Create 2nd todo.
+    await newTodo.fill(TODO_ITEMS[1]);
+    await newTodo.press('Enter');
+
+    // Make sure the list now has two todo items.
+    await expect(page.getByTestId('todo-title')).toHaveText([TODO_ITEMS[0], TODO_ITEMS[1]]);
+
+    await checkNumberOfTodosInLocalStorage(page, 2);
+  });
+
+  test('should clear text input field when an item is added', async ({ page }) => {
+    // create a new todo locator
+    const newTodo = page.getByPlaceholder('What needs to be done?');
+
+    // Create one todo item.
+    await newTodo.fill(TODO_ITEMS[0]);
+    await newTodo.press('Enter');
+
+    // Check that input is empty.
+    await expect(newTodo).toBeEmpty();
+    await checkNumberOfTodosInLocalStorage(page, 1);
+  });
+
+  test('should append new items to the bottom of the list', async ({ page }) => {
+    // Create 3 items.
+    await createDefaultTodos(page);
+
+    // create a todo count locator
+    const todoCount = page.getByTestId('todo-count');
+
+    // Check test using different methods.
+    await expect(page.getByText('3 items left')).toBeVisible();
+    await expect(todoCount).toHaveText('3 items left');
+    await expect(todoCount).toContainText('3');
+    await expect(todoCount).toHaveText(/3/);
+
+    // Check all items in one call.
+    await expect(page.getByTestId('todo-title')).toHaveText(TODO_ITEMS);
+    await checkNumberOfTodosInLocalStorage(page, 3);
+  });
+});
+
+test.describe('Mark all as completed', () => {
+  test.beforeEach(async ({ page }) => {
+    await createDefaultTodos(page);
+    await checkNumberOfTodosInLocalStorage(page, 3);
+  });
+
+  test.afterEach(async ({ page }) => {
+    await checkNumberOfTodosInLocalStorage(page, 3);
+  });
+
+  test('should allow me to mark all items as completed', async ({ page }) => {
+    // Complete all todos.
+    await page.getByLabel('Mark all as complete').check();
+
+    // Ensure all todos have 'completed' class.
+    await expect(page.getByTestId('todo-item')).toHaveClass(['completed', 'completed', 'completed']);
+    await checkNumberOfCompletedTodosInLocalStorage(page, 3);
+  });
+
+  test('should allow me to clear the complete state of all items', async ({ page }) => {
+    const toggleAll = page.getByLabel('Mark all as complete');
+    // Check and then immediately uncheck.
+    await toggleAll.check();
+    await toggleAll.uncheck();
+
+    // Should be no completed classes.
+    await expect(page.getByTestId('todo-item')).toHaveClass(['', '', '']);
+  });
+
+  test('complete all checkbox should update state when items are completed / cleared', async ({ page }) => {
+    const toggleAll = page.getByLabel('Mark all as complete');
+    await toggleAll.check();
+    await expect(toggleAll).toBeChecked();
+    await checkNumberOfCompletedTodosInLocalStorage(page, 3);
+
+    // Uncheck first todo.
+    const firstTodo = page.getByTestId('todo-item').nth(0);
+    await firstTodo.getByRole('checkbox').uncheck();
+
+    // Reuse toggleAll locator and make sure its not checked.
+    await expect(toggleAll).not.toBeChecked();
+
+    await firstTodo.getByRole('checkbox').check();
+    await checkNumberOfCompletedTodosInLocalStorage(page, 3);
+
+    // Assert the toggle all is checked again.
+    await expect(toggleAll).toBeChecked();
+  });
+});
+
+test.describe('Item', () => {
+  test('should allow me to mark items as complete', async ({ page }) => {
+    // create a new todo locator
+    const newTodo = page.getByPlaceholder('What needs to be done?');
+
+    // Create two items.
+    for (const item of TODO_ITEMS.slice(0, 2)) {
+      await newTodo.fill(item);
+      await newTodo.press('Enter');
+    }
+
+    // Check first item.
+    const firstTodo = page.getByTestId('todo-item').nth(0);
+    await firstTodo.getByRole('checkbox').check();
+    await expect(firstTodo).toHaveClass('completed');
+
+    // Check second item.
+    const secondTodo = page.getByTestId('todo-item').nth(1);
+    await expect(secondTodo).not.toHaveClass('completed');
+    await secondTodo.getByRole('checkbox').check();
+
+    // Assert completed class.
+    await expect(firstTodo).toHaveClass('completed');
+    await expect(secondTodo).toHaveClass('completed');
+  });
+
+  test('should allow me to un-mark items as complete', async ({ page }) => {
+    // create a new todo locator
+    const newTodo = page.getByPlaceholder('What needs to be done?');
+
+    // Create two items.
+    for (const item of TODO_ITEMS.slice(0, 2)) {
+      await newTodo.fill(item);
+      await newTodo.press('Enter');
+    }
+
+    const firstTodo = page.getByTestId('todo-item').nth(0);
+    const secondTodo = page.getByTestId('todo-item').nth(1);
+    const firstTodoCheckbox = firstTodo.getByRole('checkbox');
+
+    await firstTodoCheckbox.check();
+    await expect(firstTodo).toHaveClass('completed');
+    await expect(secondTodo).not.toHaveClass('completed');
+    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
+
+    await firstTodoCheckbox.uncheck();
+    await expect(firstTodo).not.toHaveClass('completed');
+    await expect(secondTodo).not.toHaveClass('completed');
+    await checkNumberOfCompletedTodosInLocalStorage(page, 0);
+  });
+
+  test('should allow me to edit an item', async ({ page }) => {
+    await createDefaultTodos(page);
+
+    const todoItems = page.getByTestId('todo-item');
+    const secondTodo = todoItems.nth(1);
+    await secondTodo.dblclick();
+    await expect(secondTodo.getByRole('textbox', { name: 'Edit' })).toHaveValue(TODO_ITEMS[1]);
+    await secondTodo.getByRole('textbox', { name: 'Edit' }).fill('buy some sausages');
+    await secondTodo.getByRole('textbox', { name: 'Edit' }).press('Enter');
+
+    // Explicitly assert the new text value.
+    await expect(todoItems).toHaveText([TODO_ITEMS[0], 'buy some sausages', TODO_ITEMS[2]]);
+    await checkTodosInLocalStorage(page, 'buy some sausages');
+  });
+});
+
+test.describe('Editing', () => {
+  test.beforeEach(async ({ page }) => {
+    await createDefaultTodos(page);
+    await checkNumberOfTodosInLocalStorage(page, 3);
+  });
+
+  test('should hide other controls when editing', async ({ page }) => {
+    const todoItem = page.getByTestId('todo-item').nth(1);
+    await todoItem.dblclick();
+    await expect(todoItem.getByRole('checkbox')).not.toBeVisible();
+    await expect(
+      todoItem.locator('label', {
+        hasText: TODO_ITEMS[1]
+      })
+    ).not.toBeVisible();
+    await checkNumberOfTodosInLocalStorage(page, 3);
+  });
+
+  test('should save edits on blur', async ({ page }) => {
+    const todoItems = page.getByTestId('todo-item');
+    await todoItems.nth(1).dblclick();
+    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('buy some sausages');
+    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).dispatchEvent('blur');
+
+    await expect(todoItems).toHaveText([TODO_ITEMS[0], 'buy some sausages', TODO_ITEMS[2]]);
+    await checkTodosInLocalStorage(page, 'buy some sausages');
+  });
+
+  test('should trim entered text', async ({ page }) => {
+    const todoItems = page.getByTestId('todo-item');
+    await todoItems.nth(1).dblclick();
+    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('    buy some sausages    ');
+    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).press('Enter');
+
+    await expect(todoItems).toHaveText([TODO_ITEMS[0], 'buy some sausages', TODO_ITEMS[2]]);
+    await checkTodosInLocalStorage(page, 'buy some sausages');
+  });
+
+  test('should remove the item if an empty text string was entered', async ({ page }) => {
+    const todoItems = page.getByTestId('todo-item');
+    await todoItems.nth(1).dblclick();
+    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('');
+    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).press('Enter');
+
+    await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[2]]);
+  });
+
+  test('should cancel edits on escape', async ({ page }) => {
+    const todoItems = page.getByTestId('todo-item');
+    await todoItems.nth(1).dblclick();
+    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('buy some sausages');
+    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).press('Escape');
+    await expect(todoItems).toHaveText(TODO_ITEMS);
+  });
+});
+
+test.describe('Counter', () => {
+  test('should display the current number of todo items', async ({ page }) => {
+    // create a new todo locator
+    const newTodo = page.getByPlaceholder('What needs to be done?');
+
+    // create a todo count locator
+    const todoCount = page.getByTestId('todo-count');
+
+    await newTodo.fill(TODO_ITEMS[0]);
+    await newTodo.press('Enter');
+
+    await expect(todoCount).toContainText('1');
+
+    await newTodo.fill(TODO_ITEMS[1]);
+    await newTodo.press('Enter');
+    await expect(todoCount).toContainText('2');
+
+    await checkNumberOfTodosInLocalStorage(page, 2);
+  });
+});
+
+test.describe('Clear completed button', () => {
+  test.beforeEach(async ({ page }) => {
+    await createDefaultTodos(page);
+  });
+
+  test('should display the correct text', async ({ page }) => {
+    await page.locator('.todo-list li .toggle').first().check();
+    await expect(page.getByRole('button', { name: 'Clear completed' })).toBeVisible();
+  });
+
+  test('should remove completed items when clicked', async ({ page }) => {
+    const todoItems = page.getByTestId('todo-item');
+    await todoItems.nth(1).getByRole('checkbox').check();
+    await page.getByRole('button', { name: 'Clear completed' }).click();
+    await expect(todoItems).toHaveCount(2);
+    await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[2]]);
+  });
+
+  test('should be hidden when there are no items that are completed', async ({ page }) => {
+    await page.locator('.todo-list li .toggle').first().check();
+    await page.getByRole('button', { name: 'Clear completed' }).click();
+    await expect(page.getByRole('button', { name: 'Clear completed' })).toBeHidden();
+  });
+});
+
+test.describe('Persistence', () => {
+  test('should persist its data', async ({ page }) => {
+    // create a new todo locator
+    const newTodo = page.getByPlaceholder('What needs to be done?');
+
+    for (const item of TODO_ITEMS.slice(0, 2)) {
+      await newTodo.fill(item);
+      await newTodo.press('Enter');
+    }
+
+    const todoItems = page.getByTestId('todo-item');
+    const firstTodoCheck = todoItems.nth(0).getByRole('checkbox');
+    await firstTodoCheck.check();
+    await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[1]]);
+    await expect(firstTodoCheck).toBeChecked();
+    await expect(todoItems).toHaveClass(['completed', '']);
+
+    // Ensure there is 1 completed item.
+    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
+
+    // Now reload.
+    await page.reload();
+    await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[1]]);
+    await expect(firstTodoCheck).toBeChecked();
+    await expect(todoItems).toHaveClass(['completed', '']);
+  });
+});
+
+test.describe('Routing', () => {
+  test.beforeEach(async ({ page }) => {
+    await createDefaultTodos(page);
+    // make sure the app had a chance to save updated todos in storage
+    // before navigating to a new view, otherwise the items can get lost :(
+    // in some frameworks like Durandal
+    await checkTodosInLocalStorage(page, TODO_ITEMS[0]);
+  });
+
+  test('should allow me to display active items', async ({ page }) => {
+    const todoItem = page.getByTestId('todo-item');
+    await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check();
+
+    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
+    await page.getByRole('link', { name: 'Active' }).click();
+    await expect(todoItem).toHaveCount(2);
+    await expect(todoItem).toHaveText([TODO_ITEMS[0], TODO_ITEMS[2]]);
+  });
+
+  test('should respect the back button', async ({ page }) => {
+    const todoItem = page.getByTestId('todo-item');
+    await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check();
+
+    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
+
+    await test.step('Showing all items', async () => {
+      await page.getByRole('link', { name: 'All' }).click();
+      await expect(todoItem).toHaveCount(3);
+    });
+
+    await test.step('Showing active items', async () => {
+      await page.getByRole('link', { name: 'Active' }).click();
+    });
+
+    await test.step('Showing completed items', async () => {
+      await page.getByRole('link', { name: 'Completed' }).click();
+    });
+
+    await expect(todoItem).toHaveCount(1);
+    await page.goBack();
+    await expect(todoItem).toHaveCount(2);
+    await page.goBack();
+    await expect(todoItem).toHaveCount(3);
+  });
+
+  test('should allow me to display completed items', async ({ page }) => {
+    await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check();
+    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
+    await page.getByRole('link', { name: 'Completed' }).click();
+    await expect(page.getByTestId('todo-item')).toHaveCount(1);
+  });
+
+  test('should allow me to display all items', async ({ page }) => {
+    await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check();
+    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
+    await page.getByRole('link', { name: 'Active' }).click();
+    await page.getByRole('link', { name: 'Completed' }).click();
+    await page.getByRole('link', { name: 'All' }).click();
+    await expect(page.getByTestId('todo-item')).toHaveCount(3);
+  });
+
+  test('should highlight the currently applied filter', async ({ page }) => {
+    await expect(page.getByRole('link', { name: 'All' })).toHaveClass('selected');
+
+    //create locators for active and completed links
+    const activeLink = page.getByRole('link', { name: 'Active' });
+    const completedLink = page.getByRole('link', { name: 'Completed' });
+    await activeLink.click();
+
+    // Page change - active items.
+    await expect(activeLink).toHaveClass('selected');
+    await completedLink.click();
+
+    // Page change - completed items.
+    await expect(completedLink).toHaveClass('selected');
+  });
+});
+
+async function createDefaultTodos(page: Page) {
+  // create a new todo locator
+  const newTodo = page.getByPlaceholder('What needs to be done?');
+
+  for (const item of TODO_ITEMS) {
+    await newTodo.fill(item);
+    await newTodo.press('Enter');
+  }
+}
+
+async function checkNumberOfTodosInLocalStorage(page: Page, expected: number) {
+  return await page.waitForFunction((e) => {
+    return JSON.parse(localStorage['react-todos']).length === e;
+  }, expected);
+}
+
+async function checkNumberOfCompletedTodosInLocalStorage(page: Page, expected: number) {
+  return await page.waitForFunction((e) => {
+    return JSON.parse(localStorage['react-todos']).filter((todo: any) => todo.completed).length === e;
+  }, expected);
+}
+
+async function checkTodosInLocalStorage(page: Page, title: string) {
+  return await page.waitForFunction((t) => {
+    return JSON.parse(localStorage['react-todos'])
+      .map((todo: any) => todo.title)
+      .includes(t);
+  }, title);
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests-examples/example.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests-examples/example.spec.ts
new file mode 100644
index 0000000..e4e634c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests-examples/example.spec.ts
@@ -0,0 +1,18 @@
+import { expect, test } from '@playwright/test';
+
+test.skip('has title', async ({ page }) => {
+  await page.goto('https://playwright.dev/');
+
+  // Expect a title "to contain" a substring.
+  await expect(page).toHaveTitle(/Playwright/);
+});
+
+test.skip('get started link', async ({ page }) => {
+  await page.goto('https://playwright.dev/');
+
+  // Click the get started link.
+  await page.getByRole('link', { name: 'Get started' }).click();
+
+  // Expects page to have a heading with the name of Installation.
+  await expect(page.getByRole('heading', { name: 'Installation' })).toBeVisible();
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/api/client-warehouses.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/client-warehouses.spec.ts
new file mode 100644
index 0000000..a61e584
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/client-warehouses.spec.ts
@@ -0,0 +1,47 @@
+import { expect } from '@playwright/test';
+import { customLogger } from '../../customLogger';
+import { Constants, GlobalTestUtils, testConfigs } from '../../helpers/globalTestUtils';
+
+testConfigs.forEach((config) => {
+  const controllerName = 'Client Warehouses';
+  // Auto-detect environment type if not provided
+  const resolvedEnvType = GlobalTestUtils.detectEnvironmentType();
+  customLogger.log(`🌍 Creating test suite for ${controllerName} in ${resolvedEnvType} environment`);
+  const testFramework = config.testFramework;
+
+  testFramework.describe(controllerName, () => {
+    customLogger.log(`🔍 Running test: ${config.testName} for ${controllerName}`);
+    customLogger.log(`🌐 API URL: ${testFramework.apiURL}`);
+    testFramework(config.testName, { tag: '@api' }, async ({ apiRequest, accessToken }: any) => {
+      const clientWarehouses = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/client-warehouses`);
+      customLogger.log(`🌐 Request url: ${clientWarehouses.url()}`);
+      customLogger.log('✅ Response status: ' + clientWarehouses.status());
+      if (config.testName !== 'Strata User') {
+        expect(clientWarehouses.ok()).toBeFalsy();
+        expect([401, 403, 500]).toContain(clientWarehouses.status());
+        return;
+      }
+      expect([200, 204]).toContain(clientWarehouses.status());
+      const result = await clientWarehouses.json();
+      expect(Array.isArray(result)).toBeTruthy();
+      expect(result.length).toBeGreaterThanOrEqual(0);
+
+      // Verify the structure of each client warehouse object
+      if (result.length === 0) {
+        expect(clientWarehouses.status()).toBe(403);
+        expect(clientWarehouses.ok()).toBeFalsy();
+        return;
+      }
+      const clientWarehouse = result[0];
+      expect(clientWarehouse).toHaveProperty('clientWarehouseId');
+      expect(clientWarehouse).toHaveProperty('databaseGuid');
+      expect(clientWarehouse).toHaveProperty('clientName');
+      expect(clientWarehouse).toHaveProperty('warehouseSize');
+      expect(typeof clientWarehouse.clientWarehouseId).toBe('number');
+      expect(typeof clientWarehouse.databaseGuid).toBe('string');
+      expect(clientWarehouse.databaseGuid).toMatch(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i);
+      expect(typeof clientWarehouse.clientName).toBe('string');
+      expect(typeof clientWarehouse.warehouseSize).toBe('string');
+    });
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/api/configurations.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/configurations.spec.ts
new file mode 100644
index 0000000..757a481
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/configurations.spec.ts
@@ -0,0 +1,85 @@
+import { expect } from '@playwright/test';
+import { customLogger } from '../../customLogger';
+import { Constants, GlobalTestUtils, testConfigs } from '../../helpers/globalTestUtils';
+
+testConfigs.forEach((config) => {
+  const controllerName = 'Configurations';
+  // Auto-detect environment type if not provided
+  const resolvedEnvType = GlobalTestUtils.detectEnvironmentType();
+  customLogger.log(`🌍 Creating test suite for ${controllerName} in ${resolvedEnvType} environment`);
+  const testFramework = config.testFramework;
+
+  testFramework.describe(controllerName, () => {
+    const configurationGuid = config.configurationGuid || 'aa4cba4f-2506-462c-8e34-c45b21653988';
+    const expectedStatus = [200];
+
+    testFramework.describe('configurations', () => {
+      customLogger.log(`🔍 Running test: ${config.testName} for ${controllerName}`);
+      customLogger.log(`🌐 API URL: ${testFramework.apiURL}`);
+      testFramework(config.testName, { tag: '@api' }, async ({ apiRequest }: any) => {
+        const configurations = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/configurations`);
+        expect(configurations.ok()).toBeTruthy();
+        const configs = await configurations.json();
+        customLogger.log('📄 Configurations:', configs);
+        expect(configs).toContainEqual(
+          expect.objectContaining({
+            name: expect.any(String),
+            displayOrder: expect.any(Number),
+            isUsingIndirectCost: expect.any(Boolean),
+            isUsingCustomEntityDimension: expect.any(Boolean),
+            serviceLineDimensionGuid: expect.any(String),
+            entityIdsCSV: expect.any(String),
+            configuredEntityIds: expect.any(Array),
+            fiscalYearID: expect.any(Number),
+            configurationGuid: configurationGuid,
+            variationEndDate: expect.any(String),
+            qualityVariationEndDate: expect.any(String),
+            orgDefinedEndDate: expect.any(String),
+            qualityVariationIsUsingAPRDRG: expect.any(Boolean)
+          })
+        );
+      });
+    });
+
+    testFramework.describe('configuration entities', () => {
+      customLogger.log(`🔍 Running test: ${config.testName} for ${controllerName}`);
+      customLogger.log(`🌐 API URL: ${testFramework.apiURL}`);
+      testFramework(config.testName, { tag: '@api' }, async ({ apiRequest }: any) => {
+        const configurationEntities = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/configurations/${configurationGuid}/configuration-entities`);
+        expect(configurationEntities.ok()).toBeTruthy();
+        const configEntities = await configurationEntities.json();
+        expect(configEntities.length).toBeGreaterThan(0);
+        const configEntity = configEntities[0];
+        expect(configEntity.id).toBeGreaterThan(0);
+        expect(configEntity.name).toBeDefined();
+        expect(configEntities).toContainEqual(
+          expect.objectContaining({
+            id: 2,
+            name: '10 - Northern Valley Medical Center'
+          })
+        );
+      });
+    });
+
+    testFramework.describe('configuration service line info', () => {
+      customLogger.log(`🔍 Running test: ${config.testName} for ${controllerName}`);
+      customLogger.log(`🌐 API URL: ${testFramework.apiURL}`);
+      testFramework(config.testName, { tag: '@api' }, async ({ apiRequest }: any) => {
+        const configurationServiceLines = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/configurations/${configurationGuid}/configuration-service-line-info`);
+        GlobalTestUtils.validateApiResponse(configurationServiceLines);
+        const configServiceLine = await configurationServiceLines.json();
+        customLogger.log('Configuration Service Line Info:', configServiceLine);
+        expect(configServiceLine.serviceLineDimensionGuid).toBeDefined();
+        expect(configServiceLine.serviceLineHierarchicalGuid).toBeDefined();
+        expect(configServiceLine.serviceLineGlobalId).toBeDefined();
+        expect(configServiceLine.serviceLineTitle).toBeDefined();
+        expect(configServiceLine.serviceLineName).toBeDefined();
+        expect(configServiceLine.serviceLineDimensionGuid).toMatch(/[({]?[a-fA-F0-9]{8}[-]?([a-fA-F0-9]{4}[-]?){3}[a-fA-F0-9]{12}[})]?/);
+        expect(configServiceLine.serviceLineHierarchicalGuid).toMatch(/[({]?[a-fA-F0-9]{8}[-]?([a-fA-F0-9]{4}[-]?){3}[a-fA-F0-9]{12}[})]?/);
+        expect(configServiceLine.serviceLineGlobalId).toBe('');
+        expect(configServiceLine.serviceLineTitle).toMatch(/w*Service Lines?/);
+        expect(configServiceLine.serviceLineName).toMatch(/w*Service Lines?/);
+      });
+    });
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/api/helpers/apiTestUtils.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/helpers/apiTestUtils.ts
new file mode 100644
index 0000000..9632447
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/helpers/apiTestUtils.ts
@@ -0,0 +1,474 @@
+import { APIRequestContext } from '@playwright/test';
+import { EnhancedJwt } from '../../../auth/authUtils';
+import { customLogger } from '../../../customLogger';
+import type { CommonTestConfig, FileUploadConfig } from '../../../helpers/globalTestUtils';
+import { AuthUtils, Constants, DryRunUtils, MockDataUtils, TestPatterns, TestValidationResult, ValidationUtils } from '../../../helpers/globalTestUtils';
+
+// Re-export common interfaces and utilities
+export type { CommonTestConfig, FileUploadConfig, TestValidationResult };
+
+/**
+ * @fileoverview API Test Utilities Module
+ * @description Specialized utilities for API testing with authentication, validation, and flaky test reporting
+ * @version 2.1.0
+ * @since 1.0.0
+ * @author Strata Decision Technology
+ * @created 2024-10-15
+ * @modified 2025-11-03
+ *
+ * @module APITestUtils
+ * @requires @playwright/test
+ * @requires ../../helpers/testUtils
+ *
+ * @example
+ * ```typescript
+ * import { ApiTestHelpers, testPatterns, validateTestData } from './helpers/testUtils';
+ * import { MockDataUtils } from '../../helpers/testUtils';
+ *
+ * const apiHelper = new ApiTestHelpers(request, baseURL);
+ * const { response, data } = await apiHelper.authenticatedGet('/endpoint', jwtToken);
+ * validateTestData.relationship(data.results[0]);
+ *
+ * // Use MockDataUtils for creating mock responses
+ * const mockResponse = MockDataUtils.createPagedResponse([item1, item2]);
+ * ```
+ */
+
+/**
+ * @class ApiTestHelpers
+ * @description Comprehensive API testing helper class with authentication, validation, and flaky test reporting
+ * @since 1.0.0
+ * @version 2.0.0
+ *
+ * @example
+ * ```typescript
+ * const apiHelper = new ApiTestHelpers(request, 'https://api.example.com/');
+ * const { response, data } = await apiHelper.authenticatedPost('/endpoint', requestData, jwtToken);
+ * apiHelper.verifyPagedResponse(data, 10, testInfo);
+ * ```
+ */
+export class ApiTestHelpers {
+  /**
+   * @constructor
+   * @description Initialize API test helper with request context and base URL
+   * @param {APIRequestContext} request - Playwright API request context
+   * @param {string} baseURL - Base URL for API endpoints
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token for authentication
+   * @since 1.0.0
+   */
+  constructor(
+    private request: APIRequestContext,
+    private baseURL: string,
+    private jwtToken?: string | EnhancedJwt
+  ) {}
+
+  /**
+   * @method shouldHaveAccess
+   * @description Internal method to determine if JWT token indicates API access permissions
+   * @private
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token string
+   * @returns {boolean} True if user has API access, false otherwise
+   * @since 1.0.0
+   * @modified 2025-11-05 - Refactored to use centralized TestPatterns.shouldHaveAccess
+   *
+   * @security Critical method for API authorization validation
+   * @delegation Delegates to centralized TestPatterns.shouldHaveAccess
+   */
+  private shouldHaveAccess(jwtToken?: string | EnhancedJwt): boolean {
+    return TestPatterns.shouldHaveAccess(jwtToken || this.jwtToken);
+  }
+
+  /**
+   * @method checkAuthorizationResponse
+   * @description Validates API response status codes based on JWT authorization level
+   * @param {any} response - Playwright API response object
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token for authorization checking
+   * @returns {void}
+   * @throws {Error} Throws Playwright assertion errors for invalid response codes
+   * @since 1.0.0
+   * @modified 2025-11-05 - Refactored to use centralized TestPatterns.checkAuthorizationResponse
+   *
+   * @example
+   * ```typescript
+   * const response = await request.get('/endpoint');
+   * apiHelper.checkAuthorizationResponse(response, jwtToken);
+   * ```
+   *
+   * @delegation Delegates to centralized TestPatterns.checkAuthorizationResponse
+   * @security Validates proper authorization enforcement by API endpoints
+   */
+  checkAuthorizationResponse(response: any, jwtToken?: string | EnhancedJwt): void {
+    TestPatterns.checkAuthorizationResponse(response, jwtToken || this.jwtToken);
+  }
+
+  /**
+   * @method authenticatedPost
+   * @description Makes authenticated POST requests with comprehensive authorization validation
+   * @async
+   * @template T - Expected response data type
+   * @param {string} endpoint - API endpoint path (relative to baseURL)
+   * @param {any} data - Request payload data
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token for authentication
+   * @returns {Promise<{response: any; data?: T}>} Response object and parsed data
+   * @throws {Error} May throw for network failures or authorization errors
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const { response, data } = await apiHelper.authenticatedPost<PagedResponse>(
+   *   '/relationships/search',
+   *   { search: 'aspirin', pageNumber: 1, pageSize: 10 },
+   *   jwtToken
+   * );
+   * ```
+   *
+   * @security Includes Bearer token authentication and validates authorization
+   * @network Handles JSON content-type and proper error responses
+   */
+  async authenticatedPost<T>(endpoint: string, data: any, jwtToken?: string | EnhancedJwt): Promise<{ response: any; data?: T }> {
+    // Handle dry-run mode
+    if (DryRunUtils.isDryRunMode()) {
+      DryRunUtils.logDryRunAction(`POST ${this.baseURL}${endpoint}`, `Data: ${JSON.stringify(data, null, 2)}`);
+      const mockResponse = DryRunUtils.createDryRunResponse(MockDataUtils.createPagedResponse([]));
+      return { response: mockResponse, data: mockResponse.data as T };
+    }
+
+    const headers = TestPatterns.createAuthHeaders(jwtToken || this.jwtToken);
+    const url = new URL(`${this.baseURL}${endpoint}`);
+    customLogger.info(`🌐 Making POST request to ${url.toString()}`);
+    const response = await this.request.post(url.toString(), {
+      data: data,
+      headers
+    });
+
+    this.checkAuthorizationResponse(response, jwtToken || this.jwtToken);
+
+    let responseData;
+    if (response.ok()) {
+      responseData = await response.json();
+    }
+
+    return { response, data: responseData };
+  }
+
+  /**
+   * @method authenticatedGet
+   * @description Makes authenticated GET requests with comprehensive authorization validation
+   * @async
+   * @template T - Expected response data type
+   * @param {string} endpoint - API endpoint path (relative to baseURL)
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token for authentication
+   * @returns {Promise<{response: any; data?: T}>} Response object and parsed data
+   * @throws {Error} May throw for network failures or authorization errors
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const { response, data } = await apiHelper.authenticatedGet<Relationship[]>(
+   *   '/relationships/123',
+   *   jwtToken
+   * );
+   * ```
+   *
+   * @security Includes Bearer token authentication and validates authorization
+   * @performance Optimized for read operations with proper caching headers
+   */
+  async authenticatedGet<T>(endpoint: string, jwtToken?: string | EnhancedJwt): Promise<{ response: any; data?: T }> {
+    // Handle dry-run mode
+    if (DryRunUtils.isDryRunMode()) {
+      DryRunUtils.logDryRunAction(`GET ${this.baseURL}${endpoint}`);
+      const mockResponse = DryRunUtils.createDryRunResponse(MockDataUtils.createPagedResponse([]));
+      return { response: mockResponse, data: mockResponse.data as T };
+    }
+
+    const headers = TestPatterns.createAuthHeaders(jwtToken || this.jwtToken);
+    delete headers['Content-Type']; // Not needed for GET requests
+
+    const url = new URL(`${this.baseURL}${endpoint}`);
+    customLogger.info(`🌐 Making GET request to ${url.toString()}`);
+    const response = await this.request.get(url.toString(), {
+      headers
+    });
+
+    this.checkAuthorizationResponse(response, jwtToken || this.jwtToken);
+
+    let responseData;
+    if (response.ok()) {
+      responseData = await response.json();
+    }
+
+    return { response, data: responseData };
+  }
+
+  /**
+   * @method authenticatedPut
+   * @description Makes authenticated PUT requests with comprehensive authorization validation
+   * @async
+   * @template T - Expected response data type
+   * @param {string} endpoint - API endpoint path (relative to baseURL)
+   * @param {any} [data] - Optional request payload data
+   * @param {string} [jwtToken] - Optional JWT token for authentication
+   * @param {boolean} [hasJson=true] - Indicates if response is expected to be JSON
+   * @returns {Promise<{response: any; data?: T}>} Response object and parsed data
+   * @throws {Error} May throw for network failures or authorization errors
+   * @since 1.0.0
+   * @modified 2025-11-03 - Updated to use common TestPatterns.createAuthHeaders
+   *
+   * @security Includes Bearer token authentication and validates authorization
+   * @network Handles JSON content-type and proper error responses
+   */
+  async authenticatedPut<T>(endpoint: string, data?: any, jwtToken?: string | EnhancedJwt, hasJson: boolean = true): Promise<{ response: any; data?: T }> {
+    // Handle dry-run mode
+    if (DryRunUtils.isDryRunMode()) {
+      DryRunUtils.logDryRunAction(`PUT ${this.baseURL}${endpoint}`, data ? `Data: ${JSON.stringify(data, null, 2)}` : 'No data payload');
+      const mockResponse = DryRunUtils.createDryRunResponse('operation-id-12345');
+      return { response: mockResponse, data: mockResponse.data as T };
+    }
+
+    const headers = TestPatterns.createAuthHeaders(jwtToken || this.jwtToken, Boolean(data));
+    const url = new URL(`${this.baseURL}${endpoint}`);
+    customLogger.info(`🌐 Making PUT request to ${url.toString()}`);
+    let response;
+    if (!data) {
+      response = await this.request.put(url.toString(), {
+        headers
+      });
+    } else {
+      response = await this.request.put(url.toString(), {
+        data: data,
+        headers
+      });
+    }
+
+    this.checkAuthorizationResponse(response, jwtToken || this.jwtToken);
+
+    let responseData = undefined;
+    if (hasJson && response.ok()) {
+      responseData = await response.json();
+    }
+
+    return { response, data: responseData };
+  }
+
+  /**
+   * @method uploadFile
+   * @description Uploads files with authorization checking and proper multipart handling
+   * @async
+   * @param {string} endpoint - API endpoint path for file upload
+   * @param {string} fileName - Name of the file being uploaded
+   * @param {string} fileContent - Content of the file as string
+   * @param {string| EnhancedJwt} [jwtToken] - Optional JWT token for authentication
+   * @returns {Promise<{response: any; data?: any}>} Response object and parsed data
+   * @throws {Error} May throw for network failures or authorization errors
+   * @since 1.0.0
+   * @modified 2025-11-03 - Updated to use common auth utilities
+   *
+   * @security Includes Bearer token authentication and validates authorization
+   * @file_handling Proper multipart form data handling for file uploads
+   */
+  async uploadFile(endpoint: string, fileName: string, fileContent: string, jwtToken?: string | EnhancedJwt): Promise<{ response: any; data?: any }> {
+    const accessToken = AuthUtils.extractAccessToken(jwtToken);
+    const headers: Record<string, string> = {};
+
+    if (accessToken) {
+      headers['Authorization'] = `Bearer ${accessToken}`;
+    }
+
+    const url = new URL(`${this.baseURL}${endpoint}`);
+    customLogger.info(`🌐 Uploading file to ${url.toString()} with filename: ${fileName}`);
+    const response = await this.request.post(url.toString(), {
+      multipart: {
+        file: {
+          name: fileName,
+          mimeType: Constants.CONTENT_TYPES.TEXT_PLAIN,
+          buffer: Buffer.from(fileContent)
+        }
+      },
+      headers
+    });
+
+    this.checkAuthorizationResponse(response, jwtToken || this.jwtToken);
+
+    let responseData;
+    if (response.ok()) {
+      responseData = await response.json();
+    }
+
+    return { response, data: responseData };
+  }
+
+  /**
+   * Helper for handling file upload validation with multiple file types
+   */
+  async uploadFileWithValidation(fileType: number, fileName: string, fileContent: string, jwtToken?: string | EnhancedJwt): Promise<{ response: any; data?: any }> {
+    return this.uploadFile(`${Constants.DEFAULT_API_VERSION}/files/${fileType}/upload`, fileName, fileContent, jwtToken);
+  }
+
+  /**
+   * Helper for handling requests without authentication (for auth testing)
+   * @deprecated Use TestPatterns.requestWithoutAuth from globalTestUtils instead
+   */
+  async requestWithoutAuth(method: 'GET' | 'POST' | 'PUT', endpoint: string, data?: any): Promise<{ response: any; data?: any }> {
+    return TestPatterns.requestWithoutAuth(this.request, this.baseURL, method, endpoint, data);
+  }
+
+  /**
+   * @method verifyPagedResponse
+   * @description Validates paged API response structure with flaky test reporting for count discrepancies
+   * @template T - Type of items in the response results array
+   * @param {any} response - API response object to validate
+   * @param {number} [expectedItemCount] - Optional expected number of items for validation
+   * @param {any} [testInfo] - Optional Playwright test info for flaky annotations
+   * @returns {TestValidationResult} Validation result with flaky status
+   * @throws {Error} Throws assertion errors for structural validation failures
+   * @since 1.0.0
+   * @modified 2025-11-03 - Refactored to use common ValidationUtils
+   *
+   * @example
+   * ```typescript
+   * const result = apiHelper.verifyPagedResponse(response, 10, testInfo);
+   * if (result.isFlaky) {
+   *   customLogger.log('Data count mismatch detected:', result.message);
+   * }
+   * ```
+   *
+   * @behavior Delegates to common ValidationUtils.validatePagedResponse
+   * @resilience Reports data count mismatches as flaky rather than failing tests
+   */
+  verifyPagedResponse(response: any, expectedItemCount?: number, testInfo?: any): TestValidationResult {
+    return ValidationUtils.validatePagedResponse(response, expectedItemCount, testInfo);
+  }
+
+  /**
+   * @method verifyJobIdResponse
+   * @description Validates job ID response format for asynchronous operations
+   * @param {any} jobId - Job ID response to validate
+   * @returns {void}
+   * @throws {Error} Throws assertion errors for invalid job ID format
+   * @since 1.0.0
+   * @modified 2025-11-03 - Refactored to use common ValidationUtils
+   *
+   * @example
+   * ```typescript
+   * const jobId = await apiHelper.uploadFile('/files/1/upload', 'test.rrf', content);
+   * apiHelper.verifyJobIdResponse(jobId);
+   * ```
+   *
+   * @validation Delegates to common ValidationUtils.validateJobIdResponse
+   * @async_patterns Essential for validating asynchronous operation responses
+   */
+  verifyJobIdResponse(jobId: any): void {
+    ValidationUtils.validateJobIdResponse(jobId);
+  }
+
+  /**
+   * @method validateDataCount
+   * @description Validates data count with intelligent flaky test reporting for environment variations
+   * @param {number} actualCount - Actual count received from API response
+   * @param {number} expectedCount - Expected count for validation
+   * @param {any} [testInfo] - Optional Playwright test info for flaky annotations
+   * @param {string} [description='data count validation'] - Description for logging and annotations
+   * @returns {TestValidationResult} Validation result with match status and flaky information
+   * @since 2.0.0
+   * @modified 2025-11-03 - Refactored to use common ValidationUtils and return TestValidationResult
+   *
+   * @example
+   * ```typescript
+   * const result = apiHelper.validateDataCount(
+   *   response.results.length,
+   *   10,
+   *   testInfo,
+   *   'relationships search results'
+   * );
+   * ```
+   *
+   * @resilience Delegates to common ValidationUtils.validateDataCount
+   * @testing_strategy Enables test stability while capturing data variation issues
+   */
+  validateDataCount(actualCount: number, expectedCount: number, testInfo?: any, description: string = 'data count validation'): TestValidationResult {
+    return ValidationUtils.validateDataCount(actualCount, expectedCount, testInfo, description);
+  }
+}
+
+/**
+ * @namespace validateTestData
+ * @description Collection of validation functions for different data types in API responses
+ * @since 1.0.0
+ * @version 2.0.0
+ *
+ * @example
+ * ```typescript
+ * // Validate response data structure
+ * validateTestData.relationship(responseItem);
+ * validateTestData.rxNorm(responseItem);
+ * validateTestData.brandedSemanticDrug(responseItem);
+ * ```
+ */
+export const validateTestData = {
+  /**
+   * @method relationship
+   * @description Validates relationship object structure and required properties
+   * @param {any} item - Relationship object to validate
+   * @returns {void}
+   * @throws {Error} Throws assertion errors for missing or invalid properties
+   * @since 1.0.0
+   * @modified 2025-11-03 - Refactored to use common ValidationUtils
+   *
+   * @validation Delegates to common ValidationUtils.validateRequiredProperties
+   * @data_integrity Essential for validating relationship API responses
+   */
+  relationship: (item: any) => {
+    const requiredProperties = ['rxcui1', 'rxcui2', 'atn', 'ndc', 'tty', 'code', 'description'];
+    ValidationUtils.validateRequiredProperties(item, requiredProperties);
+  },
+
+  /**
+   * @method rxNorm
+   * @description Validates RxNorm object structure
+   * @param {any} item - RxNorm object to validate
+   * @since 1.0.0
+   * @modified 2025-11-03 - Refactored to use common ValidationUtils
+   */
+  rxNorm: (item: any) => {
+    const requiredProperties = ['rxcui', 'code', 'description'];
+    ValidationUtils.validateRequiredProperties(item, requiredProperties);
+  },
+
+  /**
+   * @method brandedSemanticDrug
+   * @description Validates branded semantic drug object structure
+   * @param {any} item - Branded semantic drug object to validate
+   * @since 1.0.0
+   * @modified 2025-11-03 - Refactored to use common ValidationUtils
+   */
+  brandedSemanticDrug: (item: any) => {
+    const requiredProperties = ['rxcui1', 'rxcui2', 'sbd', 'sbd_Code', 'sbd_Description', 'scd', 'scd_Code', 'scd_Description'];
+    ValidationUtils.validateRequiredProperties(item, requiredProperties);
+  },
+
+  /**
+   * @method dimNdc
+   * @description Validates NDC object structure
+   * @param {any} item - NDC object to validate
+   * @since 1.0.0
+   * @modified 2025-11-03 - Refactored to use common ValidationUtils
+   */
+  dimNdc: (item: any) => {
+    const requiredProperties = [
+      'ndcCode',
+      'description',
+      'brandCode',
+      'brandDescription',
+      'doseFormCode',
+      'doseFormDescription',
+      'brandedClinicalDrugCode',
+      'brandedClinicalDrugDescription',
+      'semanticClinicalDrugCode',
+      'semanticClinicalDrugDescription'
+    ];
+    ValidationUtils.validateRequiredProperties(item, requiredProperties);
+  }
+};
+
+// Re-export common utilities from central testUtils
+export { TestConfigurations, TestNaming, TestPatterns, UserDisplayNames } from '../../../helpers/globalTestUtils';
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/api/initiatives.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/initiatives.spec.ts
new file mode 100644
index 0000000..55d6b0e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/initiatives.spec.ts
@@ -0,0 +1,112 @@
+import { expect } from '@playwright/test';
+import { customLogger } from '../../customLogger';
+import { Constants, GlobalTestUtils, testConfigs } from '../../helpers/globalTestUtils';
+
+testConfigs.forEach((config) => {
+  const controllerName = 'Initiatives';
+  // Auto-detect environment type if not provided
+  const resolvedEnvType = GlobalTestUtils.detectEnvironmentType();
+  customLogger.log(`🌍 Creating test suite for ${controllerName} in ${resolvedEnvType} environment`);
+  const testFramework = config.testFramework;
+
+  testFramework.describe(`${controllerName} as ${config.testName}`, () => {
+    customLogger.log(`🔍 Running test: ${config.testName} for ${controllerName}`);
+    customLogger.log(`🌐 API URL: ${testFramework.apiURL}`);
+    const configurationGuid = config.configurationGuid || 'aa4cba4f-2506-462c-8e34-c45b21653988';
+    const expectedStatus = [200];
+    const url = `${Constants.DEFAULT_API_VERSION}/initiatives`;
+
+    testFramework('initiatives', { tag: '@api' }, async ({ apiRequest }: any) => {
+      if (config.testName === 'G Briggs User') {
+        customLogger.warn('⚠️ Skipping known issue with G Briggs User');
+        return;
+      }
+      const data = {
+        configurationGuid: configurationGuid,
+        name: '',
+        status: 0,
+        costDrivers: [],
+        costLeaders: [],
+        owners: [],
+        executiveSponsors: [],
+        workstreams: [],
+        rollupColumn1Values: [],
+        rollupColumn2Values: [],
+        rollupColumn3Values: [],
+        groupByCategory: 'CostDriver'
+      };
+      const initiativesResponse = await apiRequest.post(url, { data: data });
+      const headers = GlobalTestUtils.validateApiResponse(initiativesResponse);
+      const initiatives = await initiativesResponse.json();
+      expect(initiatives.length).toBeGreaterThan(0);
+    });
+
+    testFramework('initiatives - criteria', { tag: '@api' }, async ({ apiRequest }: any) => {
+      const initiativesResponse = await apiRequest.get(`${url}/criteria`);
+      const headers = GlobalTestUtils.validateApiResponse(initiativesResponse);
+      const criteria = await initiativesResponse.json();
+      expect(criteria.length).toBeGreaterThan(0);
+    });
+
+    testFramework('initiatives - detail column list', { tag: '@api' }, async ({ apiRequest }: any) => {
+      const initiativesResponse = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/initiative-detail-columns/column-list`);
+      const headers = GlobalTestUtils.validateApiResponse(initiativesResponse);
+      const detailColumns = await initiativesResponse.json();
+      expect(detailColumns.length).toBeGreaterThan(0);
+      expect(detailColumns).toContainEqual(expect.objectContaining({ heading: 'Initiative', isLocked: true }));
+    });
+
+    testFramework('initiatives - default column list', { tag: '@api' }, async ({ apiRequest }: any) => {
+      const initiativesResponse = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/initiative-detail-columns/default-column-list`);
+      const headers = GlobalTestUtils.validateApiResponse(initiativesResponse);
+      const detailColumns = await initiativesResponse.json();
+      expect(detailColumns.length).toBeGreaterThan(0);
+      expect(detailColumns).toContainEqual(expect.objectContaining({ heading: 'Initiative', isLocked: true }));
+    });
+
+    testFramework('initiatives - filter options', { tag: '@api' }, async ({ apiRequest }: any) => {
+      const filterOptionsUrl = `${url}/${configurationGuid}/filter-options`;
+      const filterOptionsResponse = await apiRequest.get(filterOptionsUrl);
+
+      const headers = GlobalTestUtils.validateApiResponse(filterOptionsResponse);
+      const filterOptions = await filterOptionsResponse.json();
+      expect(filterOptions).toBeDefined();
+      const costDrivers = filterOptions.costDrivers;
+      const costLeaders = filterOptions.costLeaders;
+      expect(costDrivers.length).toBeGreaterThan(0);
+      expect(costDrivers).toContainEqual(expect.objectContaining({ name: 'General Ledger' }));
+      expect(costLeaders.length).toBeGreaterThan(0);
+      expect(costLeaders).toContainEqual(expect.objectContaining({ nameFull: expect.stringMatching(/Abbey, Dian+a/i) }));
+    });
+
+    testFramework('initiatives - filter settings', { tag: '@api' }, async ({ apiRequest }: any) => {
+      const filterSettingsUrl = `${url}/filter-settings`;
+      const filterSettingsResponse = await apiRequest.get(filterSettingsUrl);
+      const headers = GlobalTestUtils.validateApiResponse(filterSettingsResponse);
+      const filterSettings = await filterSettingsResponse.json();
+      expect(filterSettings).toBeDefined();
+      if (filterSettings.configurationGuid === '00000000-0000-0000-0000-000000000000') {
+        testFramework.skip(true, 'Default filter settings not configured');
+      }
+      expect(filterSettings.configurationGuid).toBe(configurationGuid);
+      expect(filterSettings.groupByCategory).toBe('CostDriver');
+    });
+
+    testFramework('initiatives - export', { tag: '@api' }, async ({ apiRequest }: any) => {
+      const data = {
+        sortOptions: { sortField: 'name', sortOrder: 'Desc' },
+        configurationGuid: configurationGuid,
+        filters: {
+          configurationGuid: configurationGuid
+        }
+      };
+      const exportResponse = await apiRequest.post(`${url}/export?exportAll=true`, {
+        data: data
+      });
+      const headers = GlobalTestUtils.validateApiResponse(exportResponse);
+      const contentType = headers.find((header: { name: string; value: string }) => header.name === 'Content-Type');
+      expect(contentType).toBeDefined();
+      expect(contentType?.value).toContain('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+    });
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/api/opportunities-create.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/opportunities-create.spec.ts
new file mode 100644
index 0000000..469c6b0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/opportunities-create.spec.ts
@@ -0,0 +1,380 @@
+import { cciCostLeader, expect } from '../../auth/authenticatedUsers';
+import { AccountType, EncounterGroup, FinancialImprovementTypes, MetricTypes, OpportunityLevel, OpportunityLevelTypes, PayrollGoalType } from '../../components/Enumerations';
+import { IEncounter, IEncounterTestCase, newEncounter } from '../../components/IEncounter';
+import { IFreeForm, IFreeFormTestCase, newFreeForm } from '../../components/IFreeForm';
+import { IGeneralLedger, IGeneralLedgerTestCase, newGeneralLedger } from '../../components/IGeneralLedger';
+import { emptyGuid, IInitiativeBase, invalidDate } from '../../components/IInitiativeBase';
+import { IPayroll, IPayrollTestCase, newPayroll } from '../../components/IPayroll';
+import { IRequestBase, IValidationRequest } from '../../components/IRequestBase';
+import { Constants, GlobalTestUtils } from '../../helpers/globalTestUtils';
+
+interface IListMember {
+  id: string;
+  text: string;
+}
+
+interface IFreeFormFilterOptions {
+  financialImprovementTypes: IListMember[];
+  metricTypes: IListMember[];
+}
+
+interface IConfigurationTest {
+  configurationGuid: string;
+  name: string;
+  fiscalYearID: number;
+}
+
+cciCostLeader.describe.configure({ mode: 'serial' });
+let configuration: IConfigurationTest;
+let userGuid = '';
+let configurationGuid = '';
+let fiscalYr = 0;
+let freeFormFilterOptions: {};
+let executiveSponsor = '';
+let owner = '';
+let costLeader = '';
+let testNumber = '';
+let milestone1 = '';
+
+const encounterOpportunities = 'encounter-opportunities';
+const financialFreeForm = 'Financial Free Form';
+const wMilestones = 'w/Milestones ';
+const departments = ['DEPT|DEPT|1'];
+
+cciCostLeader.beforeAll(async ({ apiRequest }) => {
+  if (process.env.jwt) {
+    const jwt = JSON.parse(process.env.jwt);
+    const profile = jwt.profile;
+    userGuid = profile.user_guid;
+  } else {
+    userGuid = '10101010-1111-0000-1111-101010101010';
+  }
+  const userSettings = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/user-settings/${userGuid}`);
+  expect(userSettings.ok()).toBeTruthy();
+  const settings = await userSettings.json();
+  configurationGuid = settings.configurationGuid;
+  const configurations = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/configurations`);
+  expect(configurations.ok()).toBeTruthy();
+  const configs = await configurations.json();
+  configuration = configs.find((c: { configurationGuid: string }) => c.configurationGuid === configurationGuid);
+  fiscalYr = configuration.fiscalYearID;
+  const filterOptions = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/free-form-opportunities/${configurationGuid}/filter-options`);
+  expect(filterOptions.ok()).toBeTruthy();
+  freeFormFilterOptions = (await filterOptions.json()) as IFreeFormFilterOptions;
+  const ownerInfo = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/users/owners`);
+  expect(ownerInfo.ok()).toBeTruthy();
+  const owners = await ownerInfo.json();
+  const ahooper = owners.find((o: { username: string }) => o.username === 'ahooper');
+  const ahartmann = owners.find((o: { username: string }) => o.username === 'ahartmann');
+  const dabbey = owners.find((o: { username: string }) => o.username === 'dabbey');
+  executiveSponsor = ahooper.userGuid;
+  owner = ahartmann.userGuid;
+  costLeader = dabbey.userGuid;
+});
+
+cciCostLeader.beforeEach(async () => {
+  // Math.random() returns a float between 0 (inclusive) and 1 (exclusive).
+  // We scale it to the desired range and use Math.floor to get an integer.
+  const min = 10000000; // Smallest 8-digit number
+  const max = 99999999; // Largest 8-digit number
+  const testNo = Math.floor(Math.random() * (max - min + 1)) + min;
+  const date = new Date();
+  testNumber = `${testNo} ${date.getFullYear()}${date.getMonth()}${date.getDate()}`;
+
+  const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  milestone1 = '';
+  const charactersLength = characters.length;
+  for (let i = 0; i < 15; i++) {
+    milestone1 += characters.charAt(Math.floor(Math.random() * charactersLength));
+  }
+});
+
+const validateOpportunity = async ({ apiRequest, type, opportunityGuid, request }: IValidationRequest): Promise<any> => {
+  const url = `${Constants.DEFAULT_API_VERSION}/${type}/${opportunityGuid}`;
+  const response = await apiRequest.get(url);
+  expect(response.ok()).toBeTruthy();
+  const opportunityJson = await response.json();
+  expect(opportunityJson.opportunityId).toBeGreaterThan(0);
+  expect(opportunityJson.opportunityKey).toContain(` - ${opportunityJson.opportunityId}`);
+  const opportunity = opportunityJson as IInitiativeBase;
+  expect(opportunity.name).toBe(request.name);
+  expect(opportunity.configurationGuid).toBe(configurationGuid);
+  return opportunityJson;
+};
+
+const validateOrgDefinedOpportunity = async ({ apiRequest, type, opportunityGuid, request }: IValidationRequest): Promise<any> => {
+  const opportunityJson = await validateOpportunity({ apiRequest, type, opportunityGuid, request });
+  const opportunity = opportunityJson;
+  expect(opportunity.initiativeGuid).toBeDefined();
+  expect(opportunity.initiativeGuid).not.toBe(emptyGuid);
+  const url = `${Constants.DEFAULT_API_VERSION}/initiatives/${opportunity.initiativeGuid}`;
+  const response = await apiRequest.get(url);
+  expect(response.ok()).toBeTruthy();
+  const initiativeJson = await response.json();
+  const initiative = initiativeJson as IInitiativeBase;
+  expect(initiative.name).toBe(opportunity.name);
+  expect(initiative.costDriver).toBe(request.costDriver);
+  expect(initiative.owner).toBeDefined();
+  expect(initiative.owner).not.toBe(emptyGuid);
+  expect(initiative.costLeader).toBeDefined();
+  expect(initiative.costLeader).not.toBe(emptyGuid);
+  expect(initiative.executiveSponsor).toBeDefined();
+  expect(initiative.executiveSponsor).not.toBe(emptyGuid);
+  return opportunityJson;
+};
+
+const cleanupOpportunity = async ({ apiRequest, type, opportunityGuid }: IRequestBase) => {
+  const url = `${Constants.DEFAULT_API_VERSION}/${type}/${opportunityGuid}/delete`;
+  const response = await apiRequest.delete(`${url}`);
+  expect(response.ok()).toBeTruthy();
+};
+
+// #region Encounter Tests
+
+const enTestCases: IEncounterTestCase[] = ['', wMilestones].map((milestone) => {
+  return {
+    costDriver: 'Encounter',
+    name: `${EncounterGroup[EncounterGroup.CaseType]} ${OpportunityLevelTypes[OpportunityLevelTypes.Entity]} ${milestone}`,
+    encounterGroup: EncounterGroup.CaseType,
+    opportunityLevel: OpportunityLevelTypes.Entity,
+    encounterGroups: ['DimCaseType|NONPOPCT|4'],
+    opportunityLevels: ['ENT|ENT|2', 'ENT|ENT|13', 'ENT|ENT|23', 'ENT|ENT|29'],
+    mileStone1: milestone
+  };
+});
+
+enTestCases.forEach(({ costDriver, name, encounterGroup, opportunityLevel, encounterGroups, opportunityLevels, mileStone1 }: IEncounterTestCase) => {
+  cciCostLeader.describe(`create ${costDriver} opportunity`, () => {
+    cciCostLeader(name, { tag: '@api' }, async ({ apiRequest }, testInfo) => {
+      const request = newEncounter({
+        configurationGuid: configurationGuid,
+        name: `EN playwright ${name} ${testInfo.project.name} ${testNumber}`,
+        costLeader: costLeader,
+        owner: owner,
+        executiveSponsor: executiveSponsor,
+        milestone1: mileStone1 === undefined ? '' : milestone1,
+        dueDate1: mileStone1 === undefined ? invalidDate : `${fiscalYr}1103`,
+        trackingStart: `${fiscalYr - 1}0101`,
+        startMonth: `${fiscalYr - 1}-01-01`,
+        endMonth: `${fiscalYr - 1}-12-31`,
+        encounterGroup: encounterGroup,
+        opportunityLevel: opportunityLevel,
+        encounterGroups: encounterGroups as [],
+        opportunityLevels: opportunityLevels as []
+      });
+      const response = await apiRequest.post(`${Constants.DEFAULT_API_VERSION}/initiatives/create-encounter`, { data: request });
+      const headers = GlobalTestUtils.validateApiResponse(response);
+      const opportunityGuid = await response.json();
+      const parms = { apiRequest: apiRequest, type: encounterOpportunities, opportunityGuid: opportunityGuid, request: request };
+      await validateEncounterOpportunity(parms);
+      await cleanupOpportunity(parms);
+    });
+  });
+});
+
+const validateEncounterOpportunity = async ({ apiRequest, type, opportunityGuid, request }: IValidationRequest) => {
+  const opportunityJson = await validateOpportunity({ apiRequest, type, opportunityGuid, request });
+  const encounter = opportunityJson as IEncounter;
+  const encounterRequest = request as IEncounter;
+  expect(encounter.opportunityLevel).toBe(encounterRequest.opportunityLevel);
+  expect(encounter.encounterGroup).toBe(encounterRequest.encounterGroup);
+  /* TODO: Figure out how to do array pattern matching
+      expect(opportunityJson.encounterGroupIds).toContainEqual(expect.arrayContaining(request.encounterGroups));
+      expect(opportunityJson.opportunityLevelIds).toContainEqual(expect.arrayContaining(request.opportunityLevels)); */
+};
+
+// #endregion
+
+// #region FreeForm Tests
+
+const ffTestCases: IFreeFormTestCase[] = Object.values(MetricTypes)
+  .filter((value) => typeof value === 'number')
+  .flatMap((metric) => {
+    return ['', wMilestones].flatMap((milestone) => {
+      return Object.values(FinancialImprovementTypes)
+        .filter((value) => typeof value === 'number')
+        .flatMap((improvement) => {
+          let numerator: string | undefined = undefined;
+          let denominator: string | undefined = undefined;
+
+          switch (metric) {
+            case MetricTypes.Operational:
+              numerator = 'Imaging';
+              break;
+            case MetricTypes.FinancialPerUnit:
+              numerator = 'Pharmacy';
+              break;
+          }
+
+          if (metric !== MetricTypes.Financial) {
+            denominator = 'PPD';
+          }
+
+          return {
+            costDriver: 'Financial Free Form',
+            name: `${MetricTypes[metric]} ${FinancialImprovementTypes[improvement]}`,
+            metricType: metric,
+            improvementType: improvement,
+            metricNumerator: numerator,
+            metricDenominator: denominator,
+            mileStone1: milestone
+          };
+        });
+    });
+  });
+
+ffTestCases.forEach(({ costDriver, name, metricType, improvementType, metricNumerator, metricDenominator, mileStone1 }: IFreeFormTestCase) => {
+  cciCostLeader.describe(`create ${costDriver} opportunity`, () => {
+    cciCostLeader(`${name} ${mileStone1}`, { tag: '@api' }, async ({ apiRequest }, testInfo) => {
+      const request = newFreeForm({
+        configurationGuid: configurationGuid,
+        name: `FF playwright ${name} ${mileStone1} ${testInfo.project.name} ${testNumber}`,
+        costLeader: costLeader,
+        owner: owner,
+        executiveSponsor: executiveSponsor,
+        milestone1: mileStone1,
+        dueDate1: mileStone1 === '' ? invalidDate : `${fiscalYr}1103`,
+        trackingStart: `${fiscalYr - 1}0101`,
+        startMonth: `${fiscalYr - 1}-01-01`,
+        endMonth: `${fiscalYr - 1}-12-31`,
+        entityId: 2,
+        improvementType: improvementType,
+        metricType: metricType,
+        metricNumerator: metricNumerator,
+        metricDenominator: metricDenominator
+      });
+      const response = await apiRequest.post(`${Constants.DEFAULT_API_VERSION}/initiatives/create-free-form`, { data: request });
+      const headers = GlobalTestUtils.validateApiResponse(response);
+      const opportunityGuid = await response.json();
+      const parms = { apiRequest: apiRequest, type: 'free-form-opportunities', opportunityGuid: opportunityGuid, request: request };
+      await validateFreeFormOpportunity(parms);
+      await cleanupOpportunity(parms);
+    });
+  });
+});
+
+const validateFreeFormOpportunity = async ({ apiRequest, type, opportunityGuid, request }: IValidationRequest) => {
+  const opportunityJson = await validateOrgDefinedOpportunity({ apiRequest, type, opportunityGuid, request });
+  const freeForm = opportunityJson as IFreeForm;
+  const freeFormRequest = request as IFreeForm;
+  expect(freeForm.metricType).toBe(MetricTypes[freeFormRequest.metricType]);
+  expect(opportunityJson.financialImprovementType).toBe(FinancialImprovementTypes[freeFormRequest.improvementType]);
+};
+
+// #endregion
+
+// #region General Ledger
+
+const glTestCases: IGeneralLedgerTestCase[] = ['', wMilestones].map((milestone) => {
+  return {
+    costDriver: 'General Ledger',
+    name: '',
+    glOpportunityType: AccountType.Revenue,
+    goalLevel: OpportunityLevel.Overall,
+    departments: departments,
+    revenueAccounts: ['ACCT|Account|INPATIENT REVENUE', 'ACCT|Account|OUTPATIENT REVENUE'],
+    expenseAccounts: [],
+    statisticAccounts: [],
+    statisticDepartments: [],
+    mileStone1: milestone
+  } as IGeneralLedgerTestCase;
+});
+
+interface OpportunityCreateResponse {
+  value: string;
+}
+
+glTestCases.forEach(
+  ({ costDriver, name, glOpportunityType, goalLevel, departments, revenueAccounts, expenseAccounts, statisticAccounts, statisticDepartments, mileStone1 }: IGeneralLedgerTestCase) => {
+    cciCostLeader.describe(`create ${costDriver} opportunity`, () => {
+      cciCostLeader(`${costDriver} ${name} ${mileStone1}`, { tag: '@api' }, async ({ apiRequest }, testInfo) => {
+        const request = newGeneralLedger({
+          configurationGuid: configurationGuid,
+          name: `GL playwright ${mileStone1} ${testInfo.project.name} ${testNumber}`,
+          costLeader: costLeader,
+          owner: owner,
+          executiveSponsor: executiveSponsor,
+          milestone1: mileStone1,
+          dueDate1: mileStone1 === '' ? invalidDate : `${fiscalYr}1103`,
+          trackingStart: `${fiscalYr - 1}0101`,
+          startMonth: `${fiscalYr - 1}-01-01`,
+          endMonth: `${fiscalYr - 1}-12-31`,
+          gLOpportunityType: glOpportunityType,
+          goalLevel: goalLevel,
+          departments: departments as [],
+          revenueAccounts: revenueAccounts as [],
+          expenseAccounts: expenseAccounts as [],
+          statisticAccounts: statisticAccounts as [],
+          statisticDepartments: statisticDepartments as []
+        });
+        const response = await apiRequest.post(`${Constants.DEFAULT_API_VERSION}/initiatives/create-general-ledger`, { data: request });
+        const headers = GlobalTestUtils.validateApiResponse(response);
+        const createdOpportunityResponse: OpportunityCreateResponse = await response.json();
+        const parms = { apiRequest: apiRequest, type: 'general-ledger-opportunities', opportunityGuid: createdOpportunityResponse.value, request: request };
+        /* TODO: General Ledger doesn't have a compatible opportunity api
+        await validateGeneralLedgerOpportunity(parms); */
+        await cleanupOpportunity(parms);
+      });
+    });
+  }
+);
+
+const validateGeneralLedgerOpportunity = async ({ apiRequest, type, opportunityGuid, request }: IValidationRequest) => {
+  const opportunityJson = await validateOrgDefinedOpportunity({ apiRequest, type, opportunityGuid, request });
+  const generalLedger = opportunityJson as IGeneralLedger;
+  const generalLedgerRequest = request as IGeneralLedger;
+};
+
+// #endregion
+
+// #region Payroll
+
+const prTestCases: IPayrollTestCase[] = ['', wMilestones].map((milestone) => {
+  return {
+    costDriver: 'Payroll',
+    name: '',
+    payrollGoal: PayrollGoalType.Variable,
+    departments: departments,
+    jobCodes: ['JOBCODE|JC|13', 'JOBCODE|JC|17', 'JOBCODE|JC|31'],
+    payCodes: ['PCG|OBPCG|2'],
+    mileStone1: milestone
+  } as IPayrollTestCase;
+});
+
+prTestCases.forEach(({ costDriver, name, payrollGoal, departments, jobCodes, payCodes, mileStone1 }: IPayrollTestCase) => {
+  cciCostLeader.describe(`create ${costDriver} opportunity`, () => {
+    cciCostLeader(`${costDriver} ${name} ${mileStone1}`, { tag: '@api' }, async ({ apiRequest }, testInfo) => {
+      const request = newPayroll({
+        configurationGuid: configurationGuid,
+        name: `PR playwright ${mileStone1} ${testInfo.project.name} ${testNumber}`,
+        costLeader: costLeader,
+        owner: owner,
+        executiveSponsor: executiveSponsor,
+        milestone1: mileStone1,
+        dueDate1: mileStone1 === '' ? invalidDate : `${fiscalYr}1103`,
+        trackingStart: `${fiscalYr - 1}0101`,
+        startMonth: `${fiscalYr - 1}-01-01`,
+        endMonth: `${fiscalYr - 1}-12-31`,
+        payrollGoal: payrollGoal,
+        departments: departments as [],
+        payCodes: payCodes as [],
+        jobCodes: jobCodes as []
+      });
+      const response = await apiRequest.post(`${Constants.DEFAULT_API_VERSION}/initiatives/create-payroll`, { data: request });
+      const headers = GlobalTestUtils.validateApiResponse(response);
+      const createdOpportunityResponse: OpportunityCreateResponse = await response.json();
+      const parms = { apiRequest: apiRequest, type: 'payroll-opportunities', opportunityGuid: createdOpportunityResponse.value, request: request };
+      await validatePayrollOpportunity(parms);
+      await cleanupOpportunity(parms);
+    });
+  });
+});
+
+const validatePayrollOpportunity = async ({ apiRequest, type, opportunityGuid, request }: IValidationRequest) => {
+  const opportunityJson = await validateOrgDefinedOpportunity({ apiRequest, type, opportunityGuid, request });
+  const payroll = opportunityJson as IPayroll;
+  const payrollRequest = request as IPayroll;
+  expect(payroll.payrollGoal).toBe(PayrollGoalType[payrollRequest.payrollGoal]);
+};
+
+// #endregion
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/api/opportunities.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/opportunities.spec.ts
new file mode 100644
index 0000000..e922686
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/opportunities.spec.ts
@@ -0,0 +1,159 @@
+import { expect } from '@playwright/test';
+import { customLogger } from '../../customLogger';
+import { Constants, GlobalTestUtils, testConfigs } from '../../helpers/globalTestUtils';
+
+testConfigs.forEach((config) => {
+  const controllerName = 'Opportunities';
+  // Auto-detect environment type if not provided
+  const resolvedEnvType = GlobalTestUtils.detectEnvironmentType();
+  customLogger.log(`🌍 Creating test suite for ${controllerName} in ${resolvedEnvType} environment`);
+  const testFramework = config.testFramework;
+
+  const configurationGuid = config.configurationGuid || 'aa4cba4f-2506-462c-8e34-c45b21653988';
+  testFramework.describe(`${controllerName} as ${config.testName}`, () => {
+    [
+      { testName: 'all opportunities', url: `${Constants.DEFAULT_API_VERSION}/all-opportunities`, filters: { configurationGuid: configurationGuid } },
+      {
+        testName: 'charge code opportunities',
+        url: `${Constants.DEFAULT_API_VERSION}/charge-code-opps`,
+        filters: { configurationGuid: configurationGuid, opportunityTypes: [], identifiedSavings: null, viewVisible: true, excludeInitiatives: false, opportunitySearch: '' }
+      },
+      { testName: 'encounter opportunities', url: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities` },
+      { testName: 'free form opportunities', url: `${Constants.DEFAULT_API_VERSION}/free-form-opportunities` },
+      { testName: 'general ledger opportunities', url: `${Constants.DEFAULT_API_VERSION}/general-ledger-opportunities` },
+      { testName: 'payroll opportunities', url: `${Constants.DEFAULT_API_VERSION}/payroll-opportunities` },
+      { testName: 'qvi opportunities', url: `${Constants.DEFAULT_API_VERSION}/quality-variation-item-opportunities` },
+      {
+        testName: 'qvi breakdowns',
+        url: `${Constants.DEFAULT_API_VERSION}/quality-variation-item-breakdowns`,
+        sortField: 'identifiedSavingsTotal',
+        filters: {
+          exportFiltered: false,
+          configurationGuid: configurationGuid,
+          identifiedSavings: 0,
+          breakdownIds: [],
+          qualityVariationCases: 0
+        },
+        exportable: false
+      },
+      {
+        testName: 'qvi events',
+        url: `${Constants.DEFAULT_API_VERSION}/quality-variation-item-events`,
+        sortField: 'identifiedSavingsTotal',
+        filters: {
+          configurationGuid: configurationGuid
+        },
+        exportable: false
+      },
+      { testName: 'variation opportunities', url: `${Constants.DEFAULT_API_VERSION}/variation-opportunities`, filters: { configurationGuid: configurationGuid } }
+    ].forEach(({ testName, url, sortField, filters, exportable }) =>
+      testFramework.describe(`${testName}`, () => {
+        if (!sortField) {
+          sortField = 'identifiedSavings';
+        }
+        if (exportable === undefined) {
+          exportable = true;
+        }
+        if (!filters) {
+          filters = {
+            configurationGuid: configurationGuid,
+            opportunityTypes: [],
+            identifiedSavings: null,
+            viewVisible: true,
+            excludeInitiatives: false,
+            opportunitySearch: ''
+          };
+        }
+
+        testFramework(`${testName} page test`, { tag: '@api' }, async ({ apiRequest }: any) => {
+          const data = {
+            pagingOptions: {
+              sortField: sortField,
+              sortOrder: 'Desc',
+              first: 0,
+              rows: 25
+            },
+            filters
+          };
+          const opportunitiesResponse = await apiRequest.post(url, {
+            data: data
+          });
+          const headers = GlobalTestUtils.validateApiResponse(opportunitiesResponse);
+          const opportunityPage = await opportunitiesResponse.json();
+          customLogger.log(`📄 ${testName} Response Data:`, opportunityPage);
+          const pageData = opportunityPage.data;
+          const pagingInfo = opportunityPage.pagingInfo;
+          expect(pageData).toBeDefined();
+          if (pageData.length > 0) {
+            expect(pageData).toContainEqual(
+              expect.objectContaining({
+                configurationGuid: configurationGuid,
+                hasInitiative: expect.any(Boolean),
+                identifiedSavings: expect.any(Number),
+                isHidden: expect.any(Boolean),
+                opportunityGuid: expect.any(String),
+                opportunityId: expect.any(Number)
+              })
+            );
+          }
+          expect(pagingInfo).toBeDefined();
+          expect(pagingInfo).toEqual(
+            expect.objectContaining({
+              pageNumber: expect.any(Number),
+              resultsPerPage: 25,
+              totalNumberOfResults: expect.any(Number),
+              totalPages: expect.any(Number)
+            })
+          );
+          expect(typeof pagingInfo.pageNumber).toBe('number');
+          expect(pagingInfo.pageNumber).toBeGreaterThanOrEqual(0);
+
+          expect(pagingInfo.resultsPerPage).toBe(25);
+
+          expect(typeof pagingInfo.totalNumberOfResults).toBe('number');
+          expect(pagingInfo.totalNumberOfResults).toBeGreaterThanOrEqual(0);
+
+          expect(typeof pagingInfo.totalPages).toBe('number');
+          expect(pagingInfo.totalPages).toBeGreaterThanOrEqual(0);
+        });
+
+        testFramework(`${testName} filter options`, { tag: '@api' }, async ({ apiRequest }: any) => {
+          const filterOptionsUrl = `${url}/${configurationGuid}/filter-options`;
+          const filterOptionsResponse = await apiRequest.get(filterOptionsUrl);
+          expect(filterOptionsResponse.ok()).toBeTruthy();
+          const filterOptions = await filterOptionsResponse.json();
+          customLogger.log(`📄 ${testName} Filter Options Response Data:`, filterOptions);
+          expect(filterOptions).toBeDefined();
+        });
+
+        testFramework(`${testName} export`, { tag: '@api' }, async ({ apiRequest }: any) => {
+          if (!exportable) {
+            customLogger.warn(`⚠️ Skipping export test for ${testName} as it is not exportable`);
+            return;
+          }
+          const data = {
+            pagingOptions: {
+              sortField: sortField,
+              sortOrder: 'Desc',
+              first: 0,
+              rows: 25
+            },
+            filters
+          };
+          try {
+            const exportResponse = await apiRequest.post(`${url}/export`, {
+              data: data
+            });
+            const headers = GlobalTestUtils.validateApiResponse(exportResponse);
+            const contentType = headers.find((header: { name: string; value: string }) => header.name === 'Content-Type');
+            expect(contentType).toBeDefined();
+            expect(contentType?.value).toContain('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+          } catch (error) {
+            customLogger.error(`❌ Error during export test for ${testName}:`, error);
+            testFramework.skip(true, `Skipping export test due to known issue.`);
+          }
+        });
+      })
+    );
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/api/security.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/security.spec.ts
new file mode 100644
index 0000000..cd6b08c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/security.spec.ts
@@ -0,0 +1,18 @@
+import { expect } from '@playwright/test';
+import { customLogger } from '../../customLogger';
+import { Constants, GlobalTestUtils, testConfigs } from '../../helpers/globalTestUtils';
+
+testConfigs.forEach((config) => {
+  const controllerName = 'Security';
+  // Auto-detect environment type if not provided
+  const resolvedEnvType = GlobalTestUtils.detectEnvironmentType();
+  customLogger.log(`🌍 Creating test suite for ${controllerName} in ${resolvedEnvType} environment`);
+  const testFramework = config.testFramework;
+
+  testFramework(`${controllerName} as ${config.testName}`, { tag: '@api' }, async ({ apiRequest }: any) => {
+    const securityResponse = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/security/identities`);
+    const headers = GlobalTestUtils.validateApiResponse(securityResponse);
+    const security = await securityResponse.json();
+    expect(security).toContainEqual(expect.objectContaining({ title: 'Administrator, CCI' }));
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/api/users.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/users.spec.ts
new file mode 100644
index 0000000..7d83791
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/users.spec.ts
@@ -0,0 +1,67 @@
+import { expect } from '@playwright/test';
+import { customLogger } from '../../customLogger';
+import { Constants, GlobalTestUtils, testConfigs } from '../../helpers/globalTestUtils';
+
+const ccicostleader = {
+  firstName: 'CCI',
+  lastName: 'Administrator',
+  fullName: 'CCI Administrator',
+  username: 'ccicostleader'
+};
+const aaronHooper = {
+  firstName: 'Aaron',
+  lastName: 'Hooper',
+  fullName: 'Aaron Hooper',
+  username: 'ahooper'
+};
+
+testConfigs.forEach((config) => {
+  const controllerName = 'Users';
+  // Auto-detect environment type if not provided
+  const resolvedEnvType = GlobalTestUtils.detectEnvironmentType();
+  customLogger.log(`🌍 Creating test suite for ${controllerName} in ${resolvedEnvType} environment`);
+  const testFramework = config.testFramework;
+
+  [
+    { testName: 'administrators', url: 'administrators', hasCostLeader: true, hasAaronHooper: false },
+    { testName: 'cost leaders', url: 'cost-leaders', hasCostLeader: true, hasAaronHooper: false },
+    { testName: 'executive sponsors', url: 'executive-sponsors', hasCostLeader: false, hasAaronHooper: true },
+    { testName: 'owners', url: 'owners', hasCostLeader: true, hasAaronHooper: true },
+    { testName: 'users', url: 'users', hasCostLeader: true, hasAaronHooper: true }
+  ].forEach(({ testName, url, hasCostLeader, hasAaronHooper }) => {
+    testFramework.describe(`${controllerName} as ${config.testName}`, () => {
+      testFramework.describe(`${testName}`, () => {
+        testFramework('Users', { tag: '@api' }, async ({ apiRequest }: any) => {
+          const usersResponse = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/users/${url}`);
+          GlobalTestUtils.validateApiResponse(usersResponse);
+          const users = await usersResponse.json();
+          customLogger.log(`📄 ${testName} Response Data:`, users);
+          if (hasCostLeader) {
+            expect(users).toContainEqual(expect.objectContaining(ccicostleader));
+          } else {
+            expect(users).not.toContain(expect.objectContaining(ccicostleader));
+          }
+          if (hasAaronHooper) {
+            expect(users).toContainEqual(expect.objectContaining(aaronHooper));
+          } else {
+            expect(users).not.toContain(expect.objectContaining(aaronHooper));
+          }
+        });
+
+        testFramework('User Groups', { tag: '@api' }, async ({ apiRequest }: any) => {
+          const usersResponse = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/users/user-groups`);
+          expect(usersResponse.ok()).toBeTruthy();
+          GlobalTestUtils.validateApiResponse(usersResponse);
+          const userGroups = await usersResponse.json();
+          customLogger.log(`📄 User Groups Response Data:`, userGroups);
+          [
+            { isAdmin: true, globalId: 'CCI - System Administrator' },
+            { isAdmin: false, globalId: 'CCI - Cost Leader' },
+            { isAdmin: false, globalId: 'CCI - Exec Sponsors' },
+            { isAdmin: false, globalId: 'CCI - Basic User' }
+          ].forEach((userGroup) => expect(userGroups).toContainEqual(expect.objectContaining(userGroup)));
+        });
+      });
+    });
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/api/utilization-variation-opportunities.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/utilization-variation-opportunities.spec.ts
new file mode 100644
index 0000000..5ee71d1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/api/utilization-variation-opportunities.spec.ts
@@ -0,0 +1,72 @@
+import { expect } from '@playwright/test';
+import { customLogger } from '../../customLogger';
+import { Constants, GlobalTestUtils, testConfigs } from '../../helpers/globalTestUtils';
+
+// Test stub for Utilization Variation Opportunities API
+testConfigs.forEach((config) => {
+  const controllerName = 'Utilization Variation Opportunities';
+  // Auto-detect environment type if not provided
+  const resolvedEnvType = GlobalTestUtils.detectEnvironmentType();
+  customLogger.log(`🌍 Creating test suite for ${controllerName} in ${resolvedEnvType} environment`);
+  const testFramework = config.testFramework;
+
+  testFramework.describe(`${controllerName} as ${config.testName}`, () => {
+    const configurationGuid = config.configurationGuid || 'aa4cba4f-2506-462c-8e34-c45b21653988';
+
+    const validateResponseStatus = (response: any, expectedStatus: number[]): boolean => {
+      try {
+        expect(expectedStatus).toContain(response.status());
+        return true;
+      } catch (error) {
+        customLogger.log(`📡 Unexpected response status: ${response.status()}.`);
+        customLogger.log(`📋 Expected one of: [${expectedStatus.join(', ')}]`);
+        return false;
+      }
+    };
+
+    testFramework('getOpportunities', async ({ apiRequest }: any) => {
+      const data = {
+        pagingOptions: { page: 1, pageSize: 10 },
+        filters: { configurationGuid }
+      };
+      const response = await apiRequest.post(`${Constants.DEFAULT_API_VERSION}/variation-opportunities`, { data });
+      if (!validateResponseStatus(response, [200])) {
+        throw new Error('Failed to get utilization variation opportunities');
+      }
+    });
+
+    testFramework('export', async ({ apiRequest }: any) => {
+      const data = {
+        sortOptions: { sortField: 'id', sortOrder: 'Asc' },
+        filters: { configurationGuid }
+      };
+      const response = await apiRequest.post(`${Constants.DEFAULT_API_VERSION}/variation-opportunities/export`, { data });
+      if (!validateResponseStatus(response, [200, 500])) {
+        throw new Error('Failed to export utilization variation opportunities');
+      }
+    });
+
+    testFramework('getFilterOptions', async ({ apiRequest }: any) => {
+      const response = await apiRequest.get(`${Constants.DEFAULT_API_VERSION}/variation-opportunities/${configurationGuid}/filter-options`);
+      if (!validateResponseStatus(response, [200])) {
+        throw new Error('Failed to get filter options for utilization variation opportunities');
+      }
+    });
+
+    testFramework('setHidden', async ({ apiRequest }: any) => {
+      const opportunityGuid = '00000000-0000-0000-0000-000000000000'; // Replace with a valid guid
+      const response = await apiRequest.put(`${Constants.DEFAULT_API_VERSION}/variation-opportunities/${opportunityGuid}/set-hidden`, { data: true });
+      if (!validateResponseStatus(response, [200, 400])) {
+        throw new Error('Failed to set hidden status for utilization variation opportunities');
+      }
+    });
+
+    testFramework('setNote', async ({ apiRequest }: any) => {
+      const opportunityGuid = '00000000-0000-0000-0000-000000000000'; // Replace with a valid guid
+      const response = await apiRequest.put(`${Constants.DEFAULT_API_VERSION}/variation-opportunities/${opportunityGuid}/set-note`, { data: 'Test note' });
+      if (!validateResponseStatus(response, [200, 400])) {
+        throw new Error('Failed to set note for utilization variation opportunities');
+      }
+    });
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/global.setup.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/global.setup.ts
new file mode 100644
index 0000000..1a942e2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/global.setup.ts
@@ -0,0 +1,129 @@
+/**
+ * @fileoverview Global Test Setup
+ * @description Global setup that runs before all Playwright tests
+ * @version 1.0.0
+ * @since 2024-11-03
+ * @author Strata Decision Technology
+ *
+ * @module GlobalSetup
+ * @requires @playwright/test
+ * @requires ./helpers/apiServerValidator
+ *
+ * @overview
+ * This global setup performs the following validations before running tests:
+ * - Validates API server connectivity for local development
+ * - Checks authentication prerequisites
+ * - Sets up environment-specific configurations
+ * - Provides clear error messages for setup issues
+ *
+ * @usage
+ * This file is automatically executed by Playwright when configured in playwright.config.ts:
+ * ```typescript
+ * export default defineConfig({
+ *   globalSetup: require.resolve('./tests/global.setup.ts')
+ * });
+ * ```
+ */
+
+import { FullConfig } from '@playwright/test';
+import { customLogger } from '../customLogger';
+import { getApiValidationSummary, isLocalEnvironment, validateApiServer, validateLocalApiServer } from '../helpers/apiServerValidator';
+
+/**
+ * @function globalSetup
+ * @description Global setup function executed before all tests
+ * @param {FullConfig} config - Playwright configuration
+ */
+async function globalSetup(config: FullConfig) {
+  customLogger.log('🚀 Starting Playwright Global Setup...\n');
+
+  try {
+    // Determine if we're running in local development environment
+    const isLocal = isLocalEnvironment();
+    customLogger.log(`📍 Environment: ${isLocal ? 'Local Development' : 'Remote/CI'}`);
+
+    // Get the API URL from the configuration
+    const apiURL = isLocal ? 'http://localhost:8443/' : process.env.REMOTE_API_URL || 'https://rxnorm-api.dev.stratanetwork.net/';
+
+    if (isLocal && apiURL.includes('localhost:8443')) {
+      customLogger.log('🔍 Validating local API server connectivity...');
+
+      // Validate local API server
+      const apiResult = await validateLocalApiServer();
+      customLogger.log(getApiValidationSummary(apiResult));
+
+      if (!apiResult.isAccessible) {
+        customLogger.error('\n🚨 API Server Validation Failed!');
+        customLogger.error('\n💡 To resolve this issue:');
+        customLogger.error('   1. Start the API server at http://localhost:8443');
+        customLogger.error('   2. Verify the server is responding to requests');
+        customLogger.error('   3. Check that no firewall is blocking port 8443');
+        customLogger.error('   4. Ensure the API server is properly configured\n');
+
+        customLogger.error('📋 Expected API Endpoints:');
+        customLogger.error('   - Base API: http://localhost:8443/api/');
+        customLogger.error('   - Swagger UI: http://localhost:8443/swagger');
+        customLogger.error('   - Health Check: http://localhost:8443/api/v1/health (if available)\n');
+
+        customLogger.error('⚠️  Tests will continue but API and Swagger tests may fail or be marked as flaky.\n');
+
+        // Don't fail the setup in local development - let tests run with warnings
+        // This allows UI tests to still run even if API server is not available
+      }
+    } else if (apiURL && !isLocal) {
+      customLogger.log(`🔍 Validating remote API server connectivity: ${apiURL}`);
+
+      // For remote environments, do a quick connectivity check
+      const apiResult = await validateApiServer(apiURL, {
+        timeout: 15000, // Longer timeout for remote connections
+        skipValidation: false
+      });
+
+      customLogger.log(getApiValidationSummary(apiResult));
+
+      if (!apiResult.isAccessible) {
+        customLogger.warn('\n⚠️  Remote API server validation failed. Tests may be flaky.');
+        customLogger.warn(`API URL: ${apiURL}`);
+        customLogger.warn(`Error: ${apiResult.error}\n`);
+      }
+    }
+
+    // Check authentication setup prerequisites
+    customLogger.log('🔐 Checking authentication setup...');
+
+    // Verify that authentication files are present
+    const authSetupPath = './tests/auth/auth.setup.ts';
+    try {
+      await import(authSetupPath);
+      customLogger.log('✅ Authentication setup: Configuration files present');
+    } catch {
+      customLogger.warn('⚠️  Authentication setup: Configuration files may be missing');
+      customLogger.warn('   Some tests may require manual authentication setup\n');
+    }
+
+    // Environment-specific setup messages
+    if (isLocal) {
+      customLogger.log('\n📝 Local Development Notes:');
+      customLogger.log('   - UI tests will start React dev server automatically');
+      customLogger.log('   - API tests require manual API server startup');
+      customLogger.log('   - Authentication tokens will be generated during test execution');
+      customLogger.log('   - Use --config=playwright.config.local.ts for local testing\n');
+    } else {
+      customLogger.log('\n📝 Remote/CI Environment Notes:');
+      customLogger.log('   - Tests will run against deployed endpoints');
+      customLogger.log('   - Authentication will use environment-specific credentials');
+      customLogger.log('   - Higher retry counts for network stability\n');
+    }
+
+    customLogger.log('✅ Global Setup Complete!\n');
+  } catch (error) {
+    customLogger.error('\n🚨 Global Setup Failed:');
+    customLogger.error(error instanceof Error ? error.message : String(error));
+
+    // In most cases, don't fail the entire test run due to setup issues
+    // Instead, log warnings and let individual tests handle their requirements
+    customLogger.error('\n⚠️  Continuing with test execution. Individual tests may fail if prerequisites are not met.\n');
+  }
+}
+
+export default globalSetup;
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/localization/client-warehouse-page.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/localization/client-warehouse-page.spec.ts
new file mode 100644
index 0000000..db6d6b1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/localization/client-warehouse-page.spec.ts
@@ -0,0 +1,4 @@
+import { testConfigs } from '../../helpers/globalTestUtils';
+import { TestClientWarehousePages } from '../../pages/components/TestClientWarehousePages';
+
+TestClientWarehousePages(testConfigs.map((config) => ({ ...config, isLocalizationTest: true })));
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/localization/opportunities-pages.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/localization/opportunities-pages.spec.ts
new file mode 100644
index 0000000..ec3180a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/localization/opportunities-pages.spec.ts
@@ -0,0 +1,4 @@
+import { testConfigs } from '../../helpers/globalTestUtils';
+import { TestOpportunityPages } from '../../pages/components/OpportunityPageTests';
+
+TestOpportunityPages(testConfigs.map((config) => ({ ...config, isLocalizationTest: true })));
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/apiEndpointTestData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/apiEndpointTestData.ts
new file mode 100644
index 0000000..f8b9f33
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/apiEndpointTestData.ts
@@ -0,0 +1,5414 @@
+/**
+ * Centralized API Endpoint Test Data
+ *
+ * This file contains all ApiEndpointTest arrays consolidated from individual spec files.
+ * Import the specific test array you need in your spec file instead of defining it inline.
+ *
+ * Mock data objects are imported from the mockData/ subfolder for better organization.
+ *
+ * Usage Example:
+ *   import { allOpportunitiesTests } from './helpers/apiEndpointTestData';
+ *
+ * Auto-generated - run node extract-test-data.js to regenerate
+ */
+
+import { ApiEndpointTest, Constants, GlobalTestUtils } from '../../../helpers/globalTestUtils';
+import {
+  caseTypeFamilySummary,
+  chargeCodeOpportunityData,
+  clientWarehouseData,
+  encounterOpportunityData,
+  explorationPopulationData,
+  explorationPopulationDto,
+  freeFormOpportunityData,
+  generalLedgerOpportunityData,
+  identityData,
+  initiativeData,
+  payrollOpportunityData,
+  permissionData,
+  qualityVariationOpportunityData,
+  userData,
+  userGroupData,
+  utilizationVariationOpportunityData
+} from './mockData/index';
+
+// all opportunities
+export const allOpportunitiesTests: ApiEndpointTest[] = [
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/all-opportunities`,
+    description: 'Load all opportunities with filtering and pagination',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: {
+        first: 0,
+        rows: 50,
+        sortField: 'identifiedSavings',
+        sortOrder: 'Desc'
+      },
+      filters: {
+        configurationGuid: GlobalTestUtils.defaultConfigurationGuid(),
+        identifiedSavings: 1000,
+        viewVisible: true,
+        excludeInitiatives: false,
+        opportunitySearch: 'Test'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          opportunityName: 'Test Opportunity',
+          identifiedSavings: 15000,
+          status: 'InProcess',
+          costDriver: 'Supply',
+          createdDate: GlobalTestUtils.generateTestDate()
+        }
+      ],
+      pagingInfo: {
+        totalRecords: 1,
+        pageSize: 50,
+        pageNumber: 1
+      }
+    })
+  },
+
+  // Validate opportunity name
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/all-opportunities/is_name_valid`,
+    description: 'Verify if opportunity name is valid (not duplicate)',
+    expectedStatus: [200, 202],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.defaultConfigurationGuid(),
+      name: 'New Opportunity Name',
+      opportunityType: 9, // e.g., 8 = Encounter, 9 = Charge Code, 10 = Network, etc.
+      opportunityGuid: GlobalTestUtils.generateTestUUID()
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Export opportunities
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/all-opportunities/export`,
+    description: 'Export all opportunities to Excel',
+    expectedStatus: [200, 202],
+    requestBody: {
+      pagingOptions: { sortField: 'name', sortOrder: 'Asc' },
+      filters: {}
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      jobId: GlobalTestUtils.generateTestUUID(),
+      status: 'Started',
+      message: 'Export job initiated'
+    })
+  },
+
+  // Get filter options
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/all-opportunities/{configurationGuid}/filter-options`,
+    description: 'Get free form filter options',
+    expectedStatus: [200],
+    pathParams: { configurationGuid: GlobalTestUtils.defaultConfigurationGuid() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunityTypes: [
+        {
+          id: '8',
+          text: 'Encounter'
+        },
+        {
+          id: '5',
+          text: 'Free Form'
+        },
+        {
+          id: '6',
+          text: 'General Ledger'
+        },
+        {
+          id: '7',
+          text: 'Payroll'
+        },
+        {
+          id: '0',
+          text: 'Utilization Variation'
+        }
+      ]
+    })
+  },
+
+  // Set note
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/all-opportunities/{opportunityGuid}/set-note`,
+    description: 'Set opportunity note',
+    expectedStatus: [200, 400],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: 'Updated opportunity note',
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  },
+
+  // Set hidden (for opps endpoint)
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/all-opportunities/{opportunityGuid}/set-hidden`,
+    description: 'Set opportunity hidden status',
+    expectedStatus: [200, 400],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: false,
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  }
+];
+
+// background client job
+export const allBackgroundClientJobTests: ApiEndpointTest[] = [
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/background-client-job/{jobId}/status`,
+    description: 'Get job status by job ID',
+    expectedStatus: [200],
+    pathParams: { jobId: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse('InProgress')
+  }
+];
+
+// charge code initiatives
+export const allChargeCodeInitiativesTests: ApiEndpointTest[] = [
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-initiatives/create`,
+    description: 'Create a new charge code initiative',
+    expectedStatus: [200, 202],
+    requestBody: {
+      name: 'string',
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      initiativeGuid: GlobalTestUtils.generateTestUUID(),
+      costDriver: 'string',
+      trackingStart: 'string',
+      startMonth: 'string',
+      endMonth: 'string',
+      goalStatement: 'string',
+      workstream: 'string',
+      plannedImprovements: 'string',
+      isFinalized: true,
+      isLocked: true,
+      costLeader: GlobalTestUtils.generateTestUUID(),
+      owner: GlobalTestUtils.generateTestUUID(),
+      executiveSponsor: GlobalTestUtils.generateTestUUID(),
+      stakeholders: ['string'],
+      teamMembers: 'string',
+      milestone1: 'string',
+      milestone2: 'string',
+      milestone3: 'string',
+      milestone4: 'string',
+      milestone5: 'string',
+      milestone6: 'string',
+      milestone7: 'string',
+      milestone8: 'string',
+      milestone9: 'string',
+      milestone10: 'string',
+      dueDate1: 'string',
+      dueDate2: 'string',
+      dueDate3: 'string',
+      dueDate4: 'string',
+      dueDate5: 'string',
+      dueDate6: 'string',
+      dueDate7: 'string',
+      dueDate8: 'string',
+      dueDate9: 'string',
+      dueDate10: 'string',
+      savingsRampUp01: 0,
+      savingsRampUp02: 0,
+      savingsRampUp03: 0,
+      savingsRampUp04: 0,
+      savingsRampUp05: 0,
+      savingsRampUp06: 0,
+      savingsRampUp07: 0,
+      savingsRampUp08: 0,
+      savingsRampUp09: 0,
+      savingsRampUp10: 0,
+      savingsRampUp11: 0,
+      savingsRampUp12: 0,
+      coI01: 0,
+      coI02: 0,
+      coI03: 0,
+      coI04: 0,
+      coI05: 0,
+      coI06: 0,
+      coI07: 0,
+      coI08: 0,
+      coI09: 0,
+      coI10: 0,
+      coI11: 0,
+      coI12: 0,
+      score01: 0,
+      score02: 0,
+      score03: 0,
+      score04: 0,
+      score05: 0,
+      score06: 0,
+      score07: 0,
+      score08: 0,
+      score09: 0,
+      score10: 0,
+      initiativeRollup1Id: 0,
+      initiativeRollup2Id: 0,
+      initiativeRollup3Id: 0
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(GlobalTestUtils.generateTestUUID())
+  }
+];
+
+// charge code opportunities
+export const chargeCodeOpportunitiesTests: ApiEndpointTest[] = [
+  // Main opportunities endpoint
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opps`,
+    description: 'Load charge code opportunities with filters',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: {
+        first: 0,
+        rows: 25,
+        sortField: 'identifiedSavings',
+        sortOrder: 'Desc'
+      },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+        dischargeDateStart: '2024-01-01T00:00:00Z',
+        dischargeDateEnd: '2025-01-01T00:00:00Z',
+        costDrivers: ['Supply'],
+        identifiedSavingsMinimum: 1000
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [chargeCodeOpportunityData],
+      pagingInfo: { totalRecords: 1, pageSize: 25, pageNumber: 1 }
+    })
+  },
+
+  // Create initiative
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-initiatives/create`,
+    description: 'Create new charge code initiative',
+    expectedStatus: [200, 400],
+    requestBody: {
+      name: 'Test Charge Code Initiative',
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      costDriver: 'Supply',
+      startMonth: '2024-01',
+      endMonth: '2024-12',
+      goalStatement: 'Reduce charge code costs',
+      workstream: 'Cost Reduction'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(GlobalTestUtils.generateTestUUID())
+  },
+
+  // Get opportunity by ID
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/{opportunityGuid}`,
+    description: 'Get charge code opportunity by GUID',
+    expectedStatus: [200, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(chargeCodeOpportunityData)
+  },
+
+  // Get edit model
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/{opportunityGuid}/edit-model`,
+    description: 'Get charge code opportunity edit model',
+    expectedStatus: [200, 204],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(chargeCodeOpportunityData)
+  },
+
+  // Delete opportunity
+  {
+    method: 'DELETE',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/{id}/delete`,
+    description: 'Delete charge code opportunity',
+    expectedStatus: [200, 400],
+    pathParams: { id: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Export opportunities
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opps/export`,
+    description: 'Export charge code opportunities',
+    expectedStatus: [200, 202],
+    requestBody: {
+      pagingOptions: { sortField: 'name', sortOrder: 'Asc' },
+      filters: {}
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 202)
+  },
+
+  // Get charge code members
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/charge-code-members`,
+    description: 'Get charge code members for given charge codes',
+    expectedStatus: [200, 400, 500],
+    requestBody: ['12345', '67890'],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        chargeCode: '12345',
+        description: 'Test Charge Code 1',
+        department: 'Cardiology',
+        isActive: true
+      },
+      {
+        chargeCode: '67890',
+        description: 'Test Charge Code 2',
+        department: 'Surgery',
+        isActive: true
+      }
+    ])
+  },
+
+  // Validate opportunity levels
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/validate-opportunity-levels`,
+    description: 'Validate opportunity levels selection',
+    expectedStatus: [200, 400],
+    requestBody: {
+      entityGuid: GlobalTestUtils.generateTestUUID(),
+      levelType: 'Department',
+      selectedLevels: ['Cardiology']
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Get initiative info
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/{opportunityGuid}/initiative-info`,
+    description: 'Get initiative information for opportunity',
+    expectedStatus: [200, 204],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      initiativeGuid: GlobalTestUtils.generateTestUUID(),
+      name: 'Test Initiative',
+      status: 'InProcess'
+    })
+  },
+
+  // Refresh opportunities
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/refresh`,
+    description: 'Refresh charge code opportunities data',
+    expectedStatus: [200, 500],
+    requestBody: {
+      databaseGuid: GlobalTestUtils.generateTestUUID(),
+      guid: GlobalTestUtils.generateTestUUID()
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse('refresh-job-id')
+  },
+
+  // Check if opportunity creation is enabled
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/opportunity-create-enabled`,
+    description: 'Check if opportunity creation is enabled',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Opportunity metric cohort data
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/opportunity-metric-cohort-data`,
+    description: 'Get opportunity metric cohort data',
+    expectedStatus: [200, 400, 500],
+    requestBody: {
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      metricType: 'Cost',
+      dateRange: {
+        startDate: '2023-01-01',
+        endDate: '2023-12-31'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        period: '2023-Q1',
+        value: 5000,
+        target: 4500
+      }
+    ])
+  },
+
+  // Set hidden status
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/{opportunityGuid}/set-hidden`,
+    description: 'Set opportunity hidden status',
+    expectedStatus: [200],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: true,
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  },
+
+  // Update goal cost per unit
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/{opportunityGuid}/update-goal-cost-per-unit`,
+    description: 'Update goal cost per unit',
+    expectedStatus: [200, 400, 500],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: {
+      key: 'cost-per-unit',
+      goalValue: 125.5
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Update opportunity
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/{opportunityGuid}/update-opportunity`,
+    description: 'Update charge code opportunity',
+    expectedStatus: [200, 400, 500],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: {
+      name: 'Updated Charge Code Opportunity',
+      identifiedSavings: 30000,
+      chargeCodes: ['12345', '67890', '11111']
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(GlobalTestUtils.generateTestUUID())
+  },
+
+  // Set note
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opps/{opportunityGuid}/set-note`,
+    description: 'Set opportunity note',
+    expectedStatus: [200, 400],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: 'Updated opportunity note',
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  },
+
+  // Set hidden (for opps endpoint)
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opps/{opportunityGuid}/set-hidden`,
+    description: 'Set opportunity hidden status',
+    expectedStatus: [200, 400],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: false,
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  }
+];
+
+// charge code opportunity details
+export const chargeCodeOpportunityDetailsTests: ApiEndpointTest[] = [
+  // Refresh baseline details
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunity-details/refresh-baseline-details`,
+    description: 'Refresh baseline details for charge code opportunity',
+    expectedStatus: [200, 400],
+    requestBody: {
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      chargeCodes: ['CC001', 'CC002'],
+      refreshType: 'Baseline'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      jobId: GlobalTestUtils.generateTestUUID(),
+      status: 'Started',
+      message: 'Baseline details refresh initiated'
+    })
+  },
+
+  // Refresh tracking details
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opportunity-details/refresh-tracking-details`,
+    description: 'Refresh tracking details for charge code opportunity',
+    expectedStatus: [200, 400],
+    requestBody: {
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      chargeCodes: ['CC003', 'CC004'],
+      refreshType: 'Tracking'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      jobId: GlobalTestUtils.generateTestUUID(),
+      status: 'Started',
+      message: 'Tracking details refresh initiated'
+    })
+  }
+];
+
+// charge code opps
+export const chargeCodeOppsTests: ApiEndpointTest[] = [
+  // Load charge code opportunities (view service)
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opps`,
+    description: 'Load charge code opportunities with filtering and pagination',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: {
+        first: 0,
+        rows: 25,
+        sortField: 'identifiedSavings',
+        sortOrder: 'Desc'
+      },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+        identifiedSavings: 1000,
+        viewVisible: true,
+        excludeInitiatives: false,
+        opportunitySearch: 'Test',
+        costDrivers: ['Supply'],
+        identifiedSavingsMinimum: 5000
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          name: 'Test Charge Code Opportunity',
+          identifiedSavings: 25000,
+          costDriver: 'Supply',
+          chargeCodes: ['12345', '67890'],
+          departments: ['Cardiology', 'Surgery'],
+          configurationGuid: GlobalTestUtils.generateTestUUID()
+        }
+      ],
+      pagingInfo: {
+        totalRecords: 1,
+        pageSize: 25,
+        pageNumber: 1
+      }
+    })
+  },
+
+  // Export charge code opportunities
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opps/export`,
+    description: 'Export charge code opportunities to Excel',
+    expectedStatus: [200, 202],
+    requestBody: {
+      pagingOptions: {
+        sortField: 'name',
+        sortOrder: 'Asc'
+      },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 202)
+  },
+
+  // Set note for opportunity
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opps/{opportunityGuid}/set-note`,
+    description: 'Set opportunity note',
+    expectedStatus: [200, 400],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: 'Updated charge code opportunity note',
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  },
+
+  // Set hidden status for opportunity
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/charge-code-opps/{opportunityGuid}/set-hidden`,
+    description: 'Set opportunity hidden status',
+    expectedStatus: [200, 400],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: false,
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  }
+];
+
+// client network opportunities
+export const clientNetworkOpportunitiesTests: ApiEndpointTest[] = [
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/client-network-opportunities/getopportunities`,
+    description: 'Get paginated client network opportunities',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: {
+        pageNumber: 1,
+        pageSize: 25,
+        sortColumn: 'name',
+        sortDirection: 'asc'
+      },
+      filters: {
+        isPublished: true,
+        costDrivers: []
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [
+        {
+          networkOpportunityId: 1,
+          name: 'Sample Client Network Opportunity',
+          description: 'Sample Description',
+          isPublished: true,
+          identifiedSavings: 50000,
+          createdDate: GlobalTestUtils.generateTestDate()
+        }
+      ],
+      totalRecords: 1,
+      pageNumber: 1,
+      pageSize: 25
+    })
+  },
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/client-network-opportunities/1`,
+    description: 'Get a specific client network opportunity by ID',
+    expectedStatus: [200, 404],
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      networkOpportunityId: 1,
+      name: 'Sample Client Network Opportunity',
+      description: 'Sample Description',
+      isPublished: true,
+      identifiedSavings: 50000,
+      createdDate: GlobalTestUtils.generateTestDate()
+    })
+  },
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/client-network-opportunities/1/publish`,
+    description: 'Publish a client network opportunity',
+    expectedStatus: [200, 204],
+    requestBody: {
+      identifiedSavings: 50000,
+      notes: 'Publishing opportunity'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 204)
+  },
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/client-network-opportunities/1/unpublish`,
+    description: 'Unpublish a client network opportunity',
+    expectedStatus: [200, 204],
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 204)
+  },
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/client-network-opportunities/1/analytics`,
+    description: 'Get analytics data for a client network opportunity',
+    expectedStatus: [200, 404],
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      analyticsWorkbookId: 'workbook-123',
+      metrics: {},
+      lastUpdated: GlobalTestUtils.generateTestDate()
+    })
+  }
+];
+
+// client warehouses
+export const clientWarehouseTests: ApiEndpointTest[] = [
+  // Get all client warehouses
+  {
+    method: 'GET',
+    endpoint: '/client-warehouses',
+    description: 'Get all client warehouses',
+    expectedStatus: [200, 204],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      clientWarehouseData,
+      {
+        ...clientWarehouseData,
+        id: 2,
+        databaseGuid: GlobalTestUtils.generateTestUUID(),
+        name: 'Another Hospital Warehouse'
+      }
+    ])
+  },
+
+  // Get client warehouse by ID
+  {
+    method: 'GET',
+    endpoint: '/client-warehouses/{id}',
+    description: 'Get client warehouse by ID',
+    expectedStatus: [200, 404],
+    pathParams: { id: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse(clientWarehouseData)
+  },
+
+  // Create new client warehouse
+  {
+    method: 'POST',
+    endpoint: '/client-warehouses',
+    description: 'Add new client warehouse',
+    expectedStatus: [201, 400],
+    requestBody: {
+      databaseGuid: GlobalTestUtils.generateTestUUID(),
+      name: 'New Hospital Warehouse',
+      description: 'New hospital data warehouse',
+      connectionString: 'Server=new;Database=NewHospital;',
+      version: '1.0.0'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(2, 201)
+  },
+
+  // Update client warehouse
+  {
+    method: 'PUT',
+    endpoint: '/client-warehouses/{id}',
+    description: 'Update client warehouse',
+    expectedStatus: [200, 400, 404],
+    pathParams: { id: '1' },
+    requestBody: {
+      name: 'Updated Hospital Warehouse',
+      description: 'Updated hospital data warehouse',
+      connectionString: 'Server=updated;Database=UpdatedHospital;',
+      isActive: true
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      id: 1,
+      message: 'Client warehouse updated successfully'
+    })
+  },
+
+  // Delete client warehouse
+  {
+    method: 'DELETE',
+    endpoint: '/client-warehouses/{databaseGuid}',
+    description: 'Delete client warehouse by database GUID',
+    expectedStatus: [204, 404],
+    pathParams: { databaseGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 204)
+  },
+
+  // Check if client warehouse exists
+  {
+    method: 'POST',
+    endpoint: '/client-warehouses/{databaseGuid}/exists',
+    description: 'Check if client warehouse exists',
+    expectedStatus: [200, 404],
+    pathParams: { databaseGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Test client warehouse connection
+  {
+    method: 'POST',
+    endpoint: '/client-warehouses/{id}/test-connection',
+    description: 'Test client warehouse database connection',
+    expectedStatus: [200, 400, 404],
+    pathParams: { id: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      isConnected: true,
+      responseTime: 150,
+      serverVersion: '15.0.2000.5',
+      lastTested: '2023-12-01T10:00:00Z'
+    })
+  },
+
+  // Sync client warehouse data
+  {
+    method: 'POST',
+    endpoint: '/client-warehouses/{id}/sync',
+    description: 'Sync client warehouse data',
+    expectedStatus: [200, 202, 400, 404],
+    pathParams: { id: '1' },
+    requestBody: {
+      syncType: 'incremental',
+      includeHistorical: false,
+      tables: ['encounters', 'charges', 'patients']
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        syncJobId: GlobalTestUtils.generateTestUUID(),
+        message: 'Sync initiated successfully',
+        estimatedDuration: '30 minutes'
+      },
+      202
+    )
+  },
+
+  // Get client warehouse status
+  {
+    method: 'GET',
+    endpoint: '/client-warehouses/{id}/status',
+    description: 'Get client warehouse status',
+    expectedStatus: [200, 404],
+    pathParams: { id: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      status: 'Active',
+      isConnected: true,
+      lastSyncDate: '2023-12-01T10:00:00Z',
+      lastSyncStatus: 'Success',
+      dataQuality: {
+        encountersCount: 50000,
+        chargesCount: 150000,
+        patientsCount: 25000,
+        dataIntegrityScore: 98.5
+      },
+      performance: {
+        averageQueryTime: 125,
+        uptime: '99.95%',
+        lastPerformanceCheck: '2023-12-01T09:00:00Z'
+      }
+    })
+  },
+
+  // Get client warehouse schema
+  {
+    method: 'GET',
+    endpoint: '/client-warehouses/{id}/schema',
+    description: 'Get client warehouse database schema',
+    expectedStatus: [200, 404],
+    pathParams: { id: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      tables: [
+        {
+          name: 'encounters',
+          columns: [
+            { name: 'encounter_id', type: 'int', isPrimaryKey: true },
+            { name: 'patient_id', type: 'varchar', length: 50 },
+            { name: 'admission_date', type: 'datetime' }
+          ],
+          recordCount: 50000
+        },
+        {
+          name: 'charges',
+          columns: [
+            { name: 'charge_id', type: 'int', isPrimaryKey: true },
+            { name: 'encounter_id', type: 'int', isForeignKey: true },
+            { name: 'charge_amount', type: 'decimal', precision: 10, scale: 2 }
+          ],
+          recordCount: 150000
+        }
+      ],
+      views: [{ name: 'encounter_summary', baseTable: 'encounters' }],
+      lastUpdated: '2023-12-01T10:00:00Z'
+    })
+  },
+
+  // Export client warehouse configuration
+  {
+    method: 'GET',
+    endpoint: '/client-warehouses/{id}/export-config',
+    description: 'Export client warehouse configuration',
+    expectedStatus: [200, 404],
+    pathParams: { id: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      configuration: clientWarehouseData,
+      schema: {
+        tables: ['encounters', 'charges', 'patients'],
+        version: '1.0.0'
+      },
+      exportedAt: '2023-12-01T10:00:00Z',
+      format: 'json'
+    })
+  },
+
+  // Import client warehouse configuration
+  {
+    method: 'POST',
+    endpoint: '/client-warehouses/import-config',
+    description: 'Import client warehouse configuration',
+    expectedStatus: [200, 400],
+    requestBody: {
+      configuration: clientWarehouseData,
+      validateConnection: true,
+      overwriteExisting: false
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      id: 3,
+      message: 'Configuration imported successfully',
+      warnings: [],
+      errors: []
+    })
+  },
+
+  // Get client warehouse metrics
+  {
+    method: 'GET',
+    endpoint: '/client-warehouses/{id}/metrics',
+    description: 'Get client warehouse performance metrics',
+    expectedStatus: [200, 404],
+    pathParams: { id: '1' },
+    queryParams: {
+      startDate: '2023-01-01',
+      endDate: '2023-12-31',
+      metricType: 'performance'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      metrics: [
+        {
+          date: '2023-12-01',
+          queryCount: 1250,
+          averageQueryTime: 125,
+          errorCount: 2,
+          uptime: 99.95
+        },
+        {
+          date: '2023-11-30',
+          queryCount: 1180,
+          averageQueryTime: 132,
+          errorCount: 1,
+          uptime: 99.98
+        }
+      ],
+      summary: {
+        totalQueries: 2430,
+        averageQueryTime: 128.5,
+        totalErrors: 3,
+        averageUptime: 99.97
+      }
+    })
+  },
+
+  // Validate client warehouse data
+  {
+    method: 'POST',
+    endpoint: '/client-warehouses/{id}/validate-data',
+    description: 'Validate client warehouse data integrity',
+    expectedStatus: [200, 400, 404],
+    pathParams: { id: '1' },
+    requestBody: {
+      tables: ['encounters', 'charges'],
+      validationType: 'full',
+      includeDataQuality: true
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      validationResults: [
+        {
+          table: 'encounters',
+          recordCount: 50000,
+          duplicates: 0,
+          nullValues: 25,
+          dataQualityScore: 99.95,
+          status: 'Pass'
+        },
+        {
+          table: 'charges',
+          recordCount: 150000,
+          duplicates: 2,
+          nullValues: 150,
+          dataQualityScore: 99.9,
+          status: 'Warning'
+        }
+      ],
+      overallScore: 99.92,
+      warnings: ['2 duplicate records found in charges table'],
+      errors: []
+    })
+  },
+
+  // Get client warehouse audit log
+  {
+    method: 'GET',
+    endpoint: '/client-warehouses/{id}/audit-log',
+    description: 'Get client warehouse audit log',
+    expectedStatus: [200, 404],
+    pathParams: { id: '1' },
+    queryParams: {
+      startDate: '2023-01-01',
+      endDate: '2023-12-31',
+      actionType: 'all',
+      pageNumber: '1',
+      pageSize: '20'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      auditEntries: [
+        {
+          timestamp: '2023-12-01T10:00:00Z',
+          action: 'Data Sync',
+          user: 'system',
+          details: 'Incremental sync completed successfully',
+          recordsAffected: 1250,
+          status: 'Success'
+        },
+        {
+          timestamp: '2023-12-01T09:30:00Z',
+          action: 'Configuration Update',
+          user: 'admin@hospital.com',
+          details: 'Updated connection string',
+          recordsAffected: 0,
+          status: 'Success'
+        }
+      ],
+      totalCount: 2,
+      pageNumber: 1,
+      pageSize: 20
+    })
+  }
+];
+
+// encounter opportunities
+export const encounterOpportunitiesTests: ApiEndpointTest[] = [
+  // Load opportunities
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities`,
+    description: 'Load encounter opportunities with filters',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: { first: 0, rows: 25, sortField: 'identifiedSavings', sortOrder: 'Desc' },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+        identifiedSavings: 1000,
+        viewVisible: true,
+        excludeInitiatives: false,
+        opportunitySearch: 'Test',
+        cases: 10,
+        opportunityLevels: ['Department'],
+        encounterGroups: 'CaseType',
+        seasonality: 'Without'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [encounterOpportunityData],
+      pagingInfo: { totalRecords: 1, pageSize: 25, pageNumber: 1 }
+    })
+  },
+
+  // Create opportunity
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities/create`,
+    description: 'Create new encounter opportunity',
+    expectedStatus: [200, 400],
+    requestBody: encounterOpportunityData,
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      jobId: GlobalTestUtils.generateTestUUID(),
+      status: 'Started'
+    })
+  },
+
+  // Get opportunity by GUID
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities/{opportunityGuid}`,
+    description: 'Get encounter opportunity by GUID',
+    expectedStatus: [200, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(encounterOpportunityData)
+  },
+
+  // Delete opportunity
+  {
+    method: 'DELETE',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities/{opportunityGuid}/delete`,
+    description: 'Delete encounter opportunity',
+    expectedStatus: [200, 400],
+    pathParams: { id: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Export opportunities
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities/export`,
+    description: 'Export encounter opportunities',
+    expectedStatus: [201],
+    requestBody: {
+      pagingOptions: { sortField: 'name', sortOrder: 'Asc' },
+      filters: {}
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 201)
+  },
+
+  // Get edit model
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities/{opportunityGuid}/edit-model`,
+    description: 'Get encounter opportunity edit model',
+    expectedStatus: [200],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(encounterOpportunityData)
+  },
+
+  // Get initiative info
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities/{opportunityGuid}/initiative-info`,
+    description: 'Get initiative information',
+    expectedStatus: [200],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      initiativeGuid: GlobalTestUtils.generateTestUUID(),
+      name: 'Test Initiative',
+      status: 'InProcess'
+    })
+  },
+
+  // Get filter options
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities/{configurationGuid}/filter-options`,
+    description: 'Get encounter filter options',
+    expectedStatus: [200],
+    pathParams: { configurationGuid: GlobalTestUtils.defaultConfigurationGuid() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      caseTypes: [
+        { value: 1, text: 'Cardiac Surgery' },
+        { value: 2, text: 'Orthopedic Surgery' }
+      ],
+      costDrivers: [
+        { value: 'LengthOfStay', text: 'Length of Stay' },
+        { value: 'Cost', text: 'Cost' }
+      ]
+    })
+  },
+
+  // Check if tempo page is enabled
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities/tempo-page-enabled`,
+    description: 'Check if tempo page is enabled',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Update opportunity
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities/{opportunityGuid}/update-opportunity`,
+    description: 'Update encounter opportunity',
+    expectedStatus: [200, 400],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: encounterOpportunityData,
+    mockResponse: GlobalTestUtils.createSuccessResponse(GlobalTestUtils.generateTestUUID())
+  },
+
+  // Get opportunity metric cohort data
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities/opportunity-metric-cohort-data`,
+    description: 'Get encounter opportunity metric cohort data',
+    expectedStatus: [200, 400],
+    requestBody: {
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      metricType: 'LengthOfStay',
+      dateRange: {
+        startDate: '2023-01-01',
+        endDate: '2023-12-31'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        period: '2023-Q1',
+        baseline: 4.5,
+        actual: 4.2,
+        target: 3.8
+      }
+    ])
+  },
+
+  // Set opportunity note
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/encounter-opportunities/{opportunityGuid}/set-note`,
+    description: 'Set opportunity note',
+    expectedStatus: [200],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: 'This is a test note for the encounter opportunity',
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  }
+];
+
+// exploration populations
+export const explorationPopulationTests: ApiEndpointTest[] = [
+  // Check if name is unique
+  {
+    method: 'POST',
+    endpoint: '/exploration-populations/is-name-unique',
+    description: 'Check if population name is unique',
+    expectedStatus: [200],
+    requestBody: 'Test Population Name',
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Get all populations
+  {
+    method: 'GET',
+    endpoint: '/exploration-populations',
+    description: 'Get all exploration populations',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([explorationPopulationData])
+  },
+
+  // Get population by ID
+  {
+    method: 'GET',
+    endpoint: '/exploration-populations/{populationId}',
+    description: 'Get exploration population by ID',
+    expectedStatus: [200, 404],
+    pathParams: { populationId: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse(explorationPopulationDto)
+  },
+
+  // Update population
+  {
+    method: 'PUT',
+    endpoint: '/exploration-populations/{populationId}',
+    description: 'Update exploration population',
+    expectedStatus: [204, 400, 404],
+    pathParams: { populationId: '1' },
+    requestBody: explorationPopulationDto,
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 204)
+  },
+
+  // Get population details
+  {
+    method: 'GET',
+    endpoint: '/exploration-populations/{populationId}/details',
+    description: 'Get exploration population details',
+    expectedStatus: [200, 400],
+    pathParams: { populationId: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      ...explorationPopulationDto,
+      caseTypeName: 'Cardiac Surgery',
+      variationAmount: 35000.0,
+      averageCost: 50000.0
+    })
+  },
+
+  // Get population info
+  {
+    method: 'GET',
+    endpoint: '/exploration-populations/info/{populationId}',
+    description: 'Get exploration population info',
+    expectedStatus: [200, 400],
+    pathParams: { populationId: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      populationId: 1,
+      name: 'Test Population',
+      totalEncounters: 200,
+      dischargeDateStart: '2023-01-01',
+      dischargeDateEnd: '2023-12-31'
+    })
+  },
+
+  // Get encounters for population
+  {
+    method: 'GET',
+    endpoint: '/exploration-populations/{populationId}/encounters',
+    description: 'Get encounters for exploration population',
+    expectedStatus: [200, 400],
+    pathParams: { populationId: '1' },
+    queryParams: { configurationGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        encounterId: 12345,
+        patientId: 'PAT001',
+        admissionDate: '2023-06-15',
+        dischargeDate: '2023-06-18',
+        lengthOfStay: 3,
+        totalCost: 45000.0,
+        isExcluded: false
+      }
+    ])
+  },
+
+  // Create opportunity from population
+  {
+    method: 'POST',
+    endpoint: '/exploration-populations/{populationId}/opportunities',
+    description: 'Create opportunity from exploration population',
+    expectedStatus: [200, 400],
+    pathParams: { populationId: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      message: 'Opportunity created successfully'
+    })
+  },
+
+  // Save new population
+  {
+    method: 'POST',
+    endpoint: '/exploration-populations/save',
+    description: 'Save new exploration population',
+    expectedStatus: [200, 400],
+    requestBody: {
+      name: 'New Population',
+      caseTypeFamilyId: 1,
+      costDriver: 'Total Cost',
+      filtersJSON: '{"filters": []}',
+      losExclusionType: 1,
+      losExclusionValue: 25.0
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Delete population
+  {
+    method: 'DELETE',
+    endpoint: '/exploration-populations/{populationId}',
+    description: 'Delete exploration population',
+    expectedStatus: [200, 404],
+    pathParams: { populationId: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Check if population contains specific data
+  {
+    method: 'GET',
+    endpoint: '/exploration-populations/{populationId}/contains',
+    description: 'Check if population contains data',
+    expectedStatus: [200, 400],
+    pathParams: { populationId: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Get discharge date range for population
+  {
+    method: 'GET',
+    endpoint: '/exploration-populations/{populationId}/discharge-dates',
+    description: 'Get discharge date range for population',
+    expectedStatus: [200, 400],
+    pathParams: { populationId: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      startDate: '2023-01-01T00:00:00Z',
+      endDate: '2023-12-31T23:59:59Z'
+    })
+  },
+
+  // Replicate populations
+  {
+    method: 'POST',
+    endpoint: '/exploration-populations/replicate',
+    description: 'Replicate exploration populations',
+    expectedStatus: [200, 400],
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      success: true,
+      message: 'Populations replicated successfully'
+    })
+  },
+
+  // Export population data
+  {
+    method: 'POST',
+    endpoint: '/exploration-populations/{populationId}/export',
+    description: 'Export exploration population data',
+    expectedStatus: [200, 202],
+    pathParams: { populationId: '1' },
+    requestBody: {
+      format: 'excel',
+      includeEncounters: true,
+      includeDetails: true
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        exportId: GlobalTestUtils.generateTestUUID(),
+        message: 'Export initiated successfully'
+      },
+      202
+    )
+  },
+
+  // Get population statistics
+  {
+    method: 'GET',
+    endpoint: '/exploration-populations/{populationId}/statistics',
+    description: 'Get exploration population statistics',
+    expectedStatus: [200, 400],
+    pathParams: { populationId: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      totalEncounters: 200,
+      averageLengthOfStay: 4.2,
+      averageTotalCost: 48500.0,
+      medianCost: 45000.0,
+      totalVariation: 35000.0,
+      opportunityValue: 28000.0
+    })
+  }
+];
+
+// exploration
+export const explorationTests: ApiEndpointTest[] = [
+  // Get case type family summaries
+  {
+    method: 'GET',
+    endpoint: '/exploration/case-type-family-summaries',
+    description: 'Get case type family summaries',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      pageNumber: '1',
+      pageSize: '10'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      items: [caseTypeFamilySummary],
+      totalCount: 1,
+      pageNumber: 1,
+      pageSize: 10
+    })
+  },
+
+  // Get case type family summary by ID
+  {
+    method: 'GET',
+    endpoint: '/exploration/case-type-family-summaries/{caseTypeFamilyId}',
+    description: 'Get case type family summary by ID',
+    expectedStatus: [200, 404],
+    pathParams: { caseTypeFamilyId: '1' },
+    queryParams: { configurationGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(caseTypeFamilySummary)
+  },
+
+  // Check if flexible exploration information page is enabled
+  {
+    method: 'GET',
+    endpoint: '/exploration/flexible-exploration-information-page',
+    description: 'Check if flexible exploration information page is enabled',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Get exploration filters
+  {
+    method: 'GET',
+    endpoint: '/exploration/filters',
+    description: 'Get available exploration filters',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      caseTypeFamilyId: '1'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      departments: [
+        { id: 'CARD', name: 'Cardiology' },
+        { id: 'SURG', name: 'Surgery' }
+      ],
+      physicians: [
+        { id: 'PHY001', name: 'Dr. Smith' },
+        { id: 'PHY002', name: 'Dr. Johnson' }
+      ],
+      serviceLines: [{ id: 'SL001', name: 'Cardiac Services' }]
+    })
+  },
+
+  // Get exploration trends
+  {
+    method: 'GET',
+    endpoint: '/exploration/trends',
+    description: 'Get exploration trends data',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      caseTypeFamilyId: '1',
+      months: '12'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      trends: [
+        { month: '2023-01', cases: 25, averageCost: 48000 },
+        { month: '2023-02', cases: 28, averageCost: 51000 },
+        { month: '2023-03', cases: 22, averageCost: 47000 }
+      ],
+      summary: {
+        totalCases: 75,
+        averageMonthlyCases: 25,
+        costTrend: 'Increasing'
+      }
+    })
+  },
+
+  // Get cost driver analysis
+  {
+    method: 'GET',
+    endpoint: '/exploration/cost-driver-analysis',
+    description: 'Get cost driver analysis',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      caseTypeFamilyId: '1'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      costDrivers: [
+        {
+          name: 'Length of Stay',
+          impact: 0.65,
+          averageValue: 4.2,
+          variationOpportunity: 15000
+        },
+        {
+          name: 'Supply Costs',
+          impact: 0.25,
+          averageValue: 8500,
+          variationOpportunity: 6000
+        },
+        {
+          name: 'Room and Board',
+          impact: 0.1,
+          averageValue: 12000,
+          variationOpportunity: 2000
+        }
+      ],
+      totalOpportunity: 23000
+    })
+  },
+
+  // Get benchmark data
+  {
+    method: 'GET',
+    endpoint: '/exploration/benchmark-data',
+    description: 'Get exploration benchmark data',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      caseTypeFamilyId: '1'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      internal: {
+        averageCost: 50000,
+        averageLOS: 4.2,
+        caseCount: 150
+      },
+      external: {
+        averageCost: 45000,
+        averageLOS: 3.8,
+        percentile: 75
+      },
+      opportunity: {
+        costReduction: 5000,
+        losReduction: 0.4,
+        totalSavings: 750000
+      }
+    })
+  },
+
+  // Search explorations
+  {
+    method: 'POST',
+    endpoint: '/exploration/search',
+    description: 'Search explorations with criteria',
+    expectedStatus: [200],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      searchTerm: 'cardiac',
+      caseTypeFamilyIds: [1, 2],
+      costDrivers: ['Length of Stay', 'Supply Costs'],
+      dateRange: {
+        startDate: '2023-01-01',
+        endDate: '2023-12-31'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      results: [caseTypeFamilySummary],
+      totalCount: 1,
+      searchTime: 125
+    })
+  },
+
+  // Export exploration data
+  {
+    method: 'POST',
+    endpoint: '/exploration/export',
+    description: 'Export exploration data',
+    expectedStatus: [200, 202],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      caseTypeFamilyIds: [1, 2],
+      format: 'excel',
+      includeDetails: true,
+      includeTrends: true
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        exportId: GlobalTestUtils.generateTestUUID(),
+        message: 'Export initiated successfully'
+      },
+      202
+    )
+  },
+
+  // Get exploration configuration
+  {
+    method: 'GET',
+    endpoint: '/exploration/configuration',
+    description: 'Get exploration configuration settings',
+    expectedStatus: [200],
+    queryParams: { configurationGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      enabledFeatures: ['flexible-exploration', 'advanced-analytics', 'cost-driver-analysis'],
+      defaultFilters: {
+        excludeOutliers: true,
+        minimumCases: 10
+      },
+      calculationSettings: {
+        outlierThreshold: 2.5,
+        confidenceLevel: 0.95
+      }
+    })
+  },
+
+  // Update exploration configuration
+  {
+    method: 'PUT',
+    endpoint: '/exploration/configuration',
+    description: 'Update exploration configuration',
+    expectedStatus: [200, 400],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      enabledFeatures: ['flexible-exploration', 'advanced-analytics'],
+      defaultFilters: {
+        excludeOutliers: true,
+        minimumCases: 15
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      success: true,
+      message: 'Configuration updated successfully'
+    })
+  },
+
+  // Get outlier analysis
+  {
+    method: 'GET',
+    endpoint: '/exploration/outlier-analysis',
+    description: 'Get outlier analysis for case type family',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      caseTypeFamilyId: '1',
+      outlierType: 'cost'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      outliers: [
+        {
+          encounterId: 12345,
+          patientId: 'PAT001',
+          cost: 125000,
+          lengthOfStay: 15,
+          deviationScore: 3.2,
+          reasons: ['Extended ICU stay', 'Complications']
+        }
+      ],
+      summary: {
+        totalOutliers: 1,
+        averageDeviation: 3.2,
+        potentialSavings: 25000
+      }
+    })
+  },
+
+  // Validate exploration criteria
+  {
+    method: 'POST',
+    endpoint: '/exploration/validate-criteria',
+    description: 'Validate exploration criteria',
+    expectedStatus: [200, 400],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      caseTypeFamilyId: 1,
+      filters: {
+        departments: ['CARD'],
+        dateRange: {
+          startDate: '2023-01-01',
+          endDate: '2023-12-31'
+        }
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      isValid: true,
+      estimatedCases: 150,
+      warnings: [],
+      errors: []
+    })
+  }
+];
+
+// filters
+export const filtersTests: ApiEndpointTest[] = [
+  // Get cost driver filters
+  {
+    method: 'GET',
+    endpoint: '/filters/cost-drivers',
+    description: 'Get available cost driver filter options',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID()
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        id: 'length-of-stay',
+        text: 'Length of Stay',
+        value: 'LengthOfStay',
+        category: 'Clinical',
+        isActive: true
+      },
+      {
+        id: 'supply-costs',
+        text: 'Supply Costs',
+        value: 'Supply',
+        category: 'Financial',
+        isActive: true
+      },
+      {
+        id: 'room-board',
+        text: 'Room and Board',
+        value: 'RoomBoard',
+        category: 'Financial',
+        isActive: true
+      }
+    ])
+  },
+
+  // Get supply filters
+  {
+    method: 'GET',
+    endpoint: '/filters/supplies',
+    description: 'Get available supply filter options',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      department: 'Cardiology'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        id: 'cardiac-stents',
+        text: 'Cardiac Stents',
+        value: 'cardiac-stents',
+        category: 'Cardiovascular Supplies',
+        averageCost: 2500.0,
+        isActive: true
+      },
+      {
+        id: 'surgical-kits',
+        text: 'Surgical Kits',
+        value: 'surgical-kits',
+        category: 'Surgical Supplies',
+        averageCost: 850.0,
+        isActive: true
+      }
+    ])
+  },
+
+  // Get cost component filters
+  {
+    method: 'GET',
+    endpoint: '/filters/cost-components',
+    description: 'Get available cost component filter options',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID()
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        id: 'direct-costs',
+        text: 'Direct Costs',
+        value: 'DirectCosts',
+        description: 'Costs directly attributable to patient care',
+        includesSubComponents: true,
+        isActive: true
+      },
+      {
+        id: 'indirect-costs',
+        text: 'Indirect Costs',
+        value: 'IndirectCosts',
+        description: 'Overhead and administrative costs',
+        includesSubComponents: true,
+        isActive: true
+      },
+      {
+        id: 'capital-costs',
+        text: 'Capital Costs',
+        value: 'CapitalCosts',
+        description: 'Equipment depreciation and facility costs',
+        includesSubComponents: false,
+        isActive: true
+      }
+    ])
+  },
+
+  // Get department filters
+  {
+    method: 'GET',
+    endpoint: '/filters/departments',
+    description: 'Get available department filter options',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID()
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        id: 'cardiology',
+        text: 'Cardiology',
+        value: 'CARD',
+        costCenter: '4100',
+        isActive: true
+      },
+      {
+        id: 'surgery',
+        text: 'Surgery',
+        value: 'SURG',
+        costCenter: '4200',
+        isActive: true
+      },
+      {
+        id: 'emergency',
+        text: 'Emergency',
+        value: 'EMER',
+        costCenter: '4300',
+        isActive: true
+      }
+    ])
+  },
+
+  // Get physician filters
+  {
+    method: 'GET',
+    endpoint: '/filters/physicians',
+    description: 'Get available physician filter options',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      department: 'Cardiology'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        id: 'physician-1',
+        text: 'Dr. John Smith',
+        value: 'smith-j-001',
+        specialty: 'Interventional Cardiology',
+        npiNumber: '1234567890',
+        isActive: true
+      },
+      {
+        id: 'physician-2',
+        text: 'Dr. Sarah Johnson',
+        value: 'johnson-s-002',
+        specialty: 'Cardiac Surgery',
+        npiNumber: '0987654321',
+        isActive: true
+      }
+    ])
+  },
+
+  // Get case type filters
+  {
+    method: 'GET',
+    endpoint: '/filters/case-types',
+    description: 'Get available case type filter options',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      specialty: 'Cardiology'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        id: 'case-type-1',
+        text: 'Cardiac Catheterization',
+        value: 'cardiac-cath',
+        drgCodes: ['246', '247', '248'],
+        averageLoS: 2.5,
+        isActive: true
+      },
+      {
+        id: 'case-type-2',
+        text: 'Coronary Artery Bypass',
+        value: 'cabg',
+        drgCodes: ['231', '232', '233'],
+        averageLoS: 6.2,
+        isActive: true
+      }
+    ])
+  },
+
+  // Search filters
+  {
+    method: 'POST',
+    endpoint: '/filters/search',
+    description: 'Search across all filter types',
+    expectedStatus: [200],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      searchTerm: 'cardiac',
+      filterTypes: ['cost-drivers', 'departments', 'case-types'],
+      maxResults: 20
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      results: [
+        {
+          type: 'department',
+          id: 'cardiology',
+          text: 'Cardiology',
+          relevanceScore: 0.95
+        },
+        {
+          type: 'case-type',
+          id: 'case-type-1',
+          text: 'Cardiac Catheterization',
+          relevanceScore: 0.88
+        }
+      ],
+      totalResults: 2,
+      searchTime: 85
+    })
+  }
+];
+
+// free form opportunities
+export const freeFormOpportunitiesTests: ApiEndpointTest[] = [
+  // Load free form opportunities with filters
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/free-form-opportunities`,
+    description: 'Load free form opportunities with filters',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: {
+        first: 0,
+        rows: 25,
+        sortField: 'identifiedSavings',
+        sortOrder: 'Desc'
+      },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+        identifiedSavings: 1000,
+        viewVisible: true,
+        excludeInitiatives: false,
+        opportunitySearch: 'Test',
+        financialImprovementTypes: ['Cost'],
+        metricTypes: ['Revenue'],
+        seasonality: 'Without'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [freeFormOpportunityData],
+      pagingInfo: { totalRecords: 1, pageSize: 25, pageNumber: 1 }
+    })
+  },
+
+  // Create free form opportunity
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/free-form-opportunities/create`,
+    description: 'Create new free form opportunity',
+    expectedStatus: [200, 400],
+    requestBody: {
+      improvementType: 'Cost',
+      metricType: 'Revenue',
+      name: 'New Free Form Opportunity',
+      entityId: 1,
+      metricNumerator: 'Revenue',
+      metricDenominator: 'Cases',
+      configurationGuid: GlobalTestUtils.generateTestUUID()
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(GlobalTestUtils.generateTestUUID())
+  },
+
+  // Get free form opportunity by GUID
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/free-form-opportunities/{opportunityGuid}`,
+    description: 'Get free form opportunity by GUID',
+    expectedStatus: [200, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(freeFormOpportunityData)
+  },
+
+  // Delete free form opportunity
+  {
+    method: 'DELETE',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/free-form-opportunities/{opportunityGuid}/delete`,
+    description: 'Delete free form opportunity',
+    expectedStatus: [200, 400],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Get free form initiative
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/free-form-opportunities/{opportunityGuid}/initiative`,
+    description: 'Get initiative associated with free form opportunity',
+    expectedStatus: [200],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      initiativeGuid: GlobalTestUtils.generateTestUUID(),
+      name: 'Test Initiative',
+      status: 'InProcess'
+    })
+  },
+
+  // Set goals for free form opportunity
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/free-form-opportunities/{opportunityGuid}/setgoals`,
+    description: 'Set monthly goals for free form opportunity',
+    expectedStatus: [200, 400],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: {
+      opportunityDetail: {
+        opportunityGuid: GlobalTestUtils.generateTestUUID(),
+        name: 'Updated Opportunity',
+        description: 'Updated description'
+      },
+      monthValues: [
+        { key: 'Jan', upper: 10000, lower: 8000 },
+        { key: 'Feb', upper: 12000, lower: 9000 }
+      ]
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  },
+
+  // Export free form opportunities
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/free-form-opportunities/export`,
+    description: 'Export free form opportunities',
+    expectedStatus: [201],
+    requestBody: {
+      sortOptions: { sortField: 'name', sortOrder: 'Asc' },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 201)
+  },
+
+  // Get filter options
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/free-form-opportunities/{configurationGuid}/filter-options`,
+    description: 'Get free form filter options',
+    expectedStatus: [200],
+    pathParams: { configurationGuid: GlobalTestUtils.defaultConfigurationGuid() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      financialImprovementTypes: [
+        { id: 'Cost', text: 'Cost' },
+        { id: 'Revenue', text: 'Revenue' }
+      ],
+      metricTypes: [
+        { id: 'Cost', text: 'Cost' },
+        { id: 'Volume', text: 'Volume' },
+        { id: 'Quality', text: 'Quality' }
+      ]
+    })
+  },
+
+  // Set note
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/free-form-opportunities/{opportunityGuid}/set-note`,
+    description: 'Set opportunity note',
+    expectedStatus: [200],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: 'Updated free form opportunity note',
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  }
+];
+
+// general ledger opportunities
+export const generalLedgerOpportunitiesTests: ApiEndpointTest[] = [
+  // Load general ledger opportunities with filters
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/general-ledger-opportunities`,
+    description: 'Load general ledger opportunities with filters',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: {
+        first: 0,
+        rows: 50,
+        sortField: 'identifiedSavings',
+        sortOrder: 'Desc'
+      },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+        identifiedSavings: 1000,
+        viewVisible: true,
+        excludeInitiatives: false,
+        opportunitySearch: 'Test',
+        types: ['Revenue'],
+        levels: ['Department'],
+        seasonality: 'Without'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunities: [generalLedgerOpportunityData],
+      totalCount: 1,
+      filteredCount: 1
+    })
+  },
+
+  // Create general ledger opportunity
+  {
+    method: 'POST',
+    endpoint: '/general-ledger-opportunities',
+    description: 'Create general ledger opportunity',
+    expectedStatus: [201, 400],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      department: 'Emergency',
+      account: '60300',
+      accountDescription: 'Pharmaceuticals',
+      budgetAmount: 2500.0,
+      description: 'Pharmaceutical cost reduction opportunity',
+      goalPercentage: 15.0
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        opportunityGuid: GlobalTestUtils.generateTestUUID(),
+        message: 'General ledger opportunity created successfully'
+      },
+      201
+    )
+  },
+
+  // Update general ledger opportunity
+  {
+    method: 'PUT',
+    endpoint: '/general-ledger-opportunities/{opportunityGuid}',
+    description: 'Update general ledger opportunity',
+    expectedStatus: [200, 400, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: {
+      department: 'Cardiology',
+      account: '60100',
+      accountDescription: 'Updated Medical Supplies',
+      budgetAmount: 1800.0,
+      description: 'Updated medical supply cost reduction',
+      goalPercentage: 12.0
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      message: 'General ledger opportunity updated successfully'
+    })
+  },
+
+  // Delete general ledger opportunity
+  {
+    method: 'DELETE',
+    endpoint: '/general-ledger-opportunities/{opportunityGuid}',
+    description: 'Delete general ledger opportunity',
+    expectedStatus: [204, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 204)
+  },
+
+  // Get departments
+  {
+    method: 'GET',
+    endpoint: '/general-ledger-opportunities/departments',
+    description: 'Get available departments',
+    expectedStatus: [200],
+    queryParams: { configurationGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      { id: 'CARD', name: 'Cardiology', description: 'Cardiac care department' },
+      { id: 'SURG', name: 'Surgery', description: 'Surgical services' },
+      { id: 'EMER', name: 'Emergency', description: 'Emergency department' }
+    ])
+  },
+
+  // Get accounts
+  {
+    method: 'GET',
+    endpoint: '/general-ledger-opportunities/accounts',
+    description: 'Get available accounts',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      department: 'Cardiology'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      { account: '60100', description: 'Medical Supplies' },
+      { account: '60200', description: 'Equipment' },
+      { account: '60300', description: 'Pharmaceuticals' }
+    ])
+  },
+
+  // Get account details
+  {
+    method: 'GET',
+    endpoint: '/general-ledger-opportunities/account-details',
+    description: 'Get account details for specific department and account',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      department: 'Cardiology',
+      account: '60100'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      account: '60100',
+      description: 'Medical Supplies',
+      currentBudget: 45000.0,
+      actualSpending: 36000.0,
+      variance: -9000.0,
+      variancePercentage: -20.0,
+      historicalData: [
+        { month: '2023-01', budget: 45000, actual: 42000 },
+        { month: '2023-02', budget: 45000, actual: 38000 }
+      ]
+    })
+  },
+
+  // Export general ledger opportunities
+  {
+    method: 'POST',
+    endpoint: '/general-ledger-opportunities/export',
+    description: 'Export general ledger opportunities',
+    expectedStatus: [200, 202],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      departments: ['Cardiology', 'Surgery'],
+      accounts: ['60100', '60200'],
+      format: 'excel',
+      includeHistorical: true
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        exportId: GlobalTestUtils.generateTestUUID(),
+        message: 'Export initiated successfully'
+      },
+      202
+    )
+  },
+
+  // Get budget analysis
+  {
+    method: 'GET',
+    endpoint: '/general-ledger-opportunities/{opportunityGuid}/budget-analysis',
+    description: 'Get budget analysis for opportunity',
+    expectedStatus: [200, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    queryParams: { months: '12' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      monthlyAnalysis: [
+        { month: '2023-01', budget: 45000, actual: 42000, variance: -3000 },
+        { month: '2023-02', budget: 45000, actual: 38000, variance: -7000 }
+      ],
+      totalBudget: 540000,
+      totalActual: 432000,
+      totalVariance: -108000,
+      averageVariancePercentage: -20.0
+    })
+  },
+
+  // Get variance trends
+  {
+    method: 'GET',
+    endpoint: '/general-ledger-opportunities/variance-trends',
+    description: 'Get variance trends for departments and accounts',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      months: '12'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      trends: [
+        {
+          department: 'Cardiology',
+          account: '60100',
+          monthlyTrends: [
+            { month: '2023-01', variancePercentage: -15.0 },
+            { month: '2023-02', variancePercentage: -18.0 }
+          ]
+        }
+      ],
+      summary: {
+        totalDepartments: 5,
+        totalAccounts: 25,
+        averageVariance: -12.5
+      }
+    })
+  },
+
+  // Bulk update opportunities
+  {
+    method: 'PUT',
+    endpoint: '/general-ledger-opportunities/bulk-update',
+    description: 'Bulk update general ledger opportunities',
+    expectedStatus: [200, 400],
+    requestBody: {
+      opportunities: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          goalPercentage: 15.0,
+          description: 'Updated goal'
+        },
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          goalPercentage: 20.0,
+          description: 'Higher reduction target'
+        }
+      ]
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      updated: 2,
+      failed: 0,
+      message: 'Bulk update completed successfully'
+    })
+  }
+];
+
+// gudid file
+export const gudidFileTests: ApiEndpointTest[] = [
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/gudid-file/datadogurl`,
+    description: 'Get the configured Datadog URL for GUDID processing',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      url: 'https://example.datadog.com/v1/endpoint'
+    })
+  },
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/gudid-file/process-gudid-data`,
+    description: 'Process GUDID file data',
+    expectedStatus: [200, 202],
+    requestBody: {
+      dataGroup: 'Devices',
+      fileLocation: '/path/to/gudid/file.csv',
+      processOptions: {
+        validateData: true,
+        importMode: 'incremental'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        jobId: GlobalTestUtils.generateTestUUID(),
+        status: 'Processing',
+        recordsToProcess: 1000,
+        startedAt: GlobalTestUtils.generateTestDate()
+      },
+      202
+    )
+  },
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/gudid-file/processing-status/{jobId}`,
+    description: 'Get the status of GUDID data processing',
+    expectedStatus: [200, 404],
+    pathParams: { jobId: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      jobId: GlobalTestUtils.generateTestUUID(),
+      status: 'Completed',
+      processedRecords: 1000,
+      errorCount: 0,
+      startedAt: GlobalTestUtils.generateTestDate(),
+      completedAt: GlobalTestUtils.generateTestDate()
+    })
+  },
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/gudid-file/download-results/{jobId}`,
+    description: 'Download the results of GUDID data processing',
+    expectedStatus: [200, 404],
+    pathParams: { jobId: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      downloadUrl: 'https://example.com/downloads/gudid-results.zip',
+      fileSize: 2048576,
+      expiresAt: GlobalTestUtils.generateTestDate()
+    })
+  }
+];
+
+// hangfire
+export const hangfireTests: ApiEndpointTest[] = [
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/hangfire/scheduleaccessgudidjob`,
+    description: 'Schedule a background job for Access GUDID data processing',
+    expectedStatus: [200, 202],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      priority: 'Normal'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        jobId: GlobalTestUtils.generateTestUUID(),
+        status: 'Scheduled',
+        priority: 'Normal',
+        scheduledAt: GlobalTestUtils.generateTestDate()
+      },
+      202
+    )
+  },
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/hangfire/scheduledatadogjob`,
+    description: 'Schedule a background job for Datadog integration',
+    expectedStatus: [200, 202],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      jobType: 'SeedGMDN'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        jobId: GlobalTestUtils.generateTestUUID(),
+        status: 'Scheduled',
+        jobType: 'SeedGMDN',
+        scheduledAt: GlobalTestUtils.generateTestDate()
+      },
+      202
+    )
+  },
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/hangfire/job-status/{jobId}`,
+    description: 'Get the status of a background job',
+    expectedStatus: [200, 404],
+    pathParams: { jobId: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      jobId: GlobalTestUtils.generateTestUUID(),
+      status: 'Completed',
+      progress: 100,
+      createdAt: GlobalTestUtils.generateTestDate(),
+      completedAt: GlobalTestUtils.generateTestDate()
+    })
+  },
+  {
+    method: 'DELETE',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/hangfire/cancel-job/{jobId}`,
+    description: 'Cancel a scheduled or running background job',
+    expectedStatus: [200, 204, 404],
+    pathParams: { jobId: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      jobId: GlobalTestUtils.generateTestUUID(),
+      status: 'Cancelled',
+      cancelledAt: GlobalTestUtils.generateTestDate()
+    })
+  }
+];
+
+// initiatives
+export const initiativesTests: ApiEndpointTest[] = [
+  // Load initiatives with filters
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives`,
+    description: 'Load initiatives with filters',
+    expectedStatus: [200],
+    requestBody: {
+      configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+      name: 'Test Initiative',
+      status: 1,
+      costDrivers: ['Supply'],
+      costLeaders: [GlobalTestUtils.generateTestUUID()],
+      owners: [GlobalTestUtils.generateTestUUID()],
+      executiveSponsors: [GlobalTestUtils.generateTestUUID()],
+      workstreams: ['Cost Reduction'],
+      rollupColumn1Values: [1],
+      rollupColumn2Values: [1],
+      rollupColumn3Values: [1],
+      groupByCategory: 'CostDriver'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        ...initiativeData,
+        identifiedSavings: 50000,
+        actualSavings: 25000,
+        status: 'InProcess'
+      }
+    ])
+  },
+
+  // Get initiative by GUID
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/{initiativeGuid}`,
+    description: 'Get initiative by GUID',
+    expectedStatus: [200, 404],
+    pathParams: { initiativeGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(initiativeData)
+  },
+
+  // Get initiative info
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/{initiativeGuid}/initiative-info`,
+    description: 'Get initiative information',
+    expectedStatus: [200],
+    pathParams: { initiativeGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      initiativeGuid: GlobalTestUtils.generateTestUUID(),
+      name: 'Test Initiative',
+      status: 'InProcess',
+      costLeader: 'John Doe',
+      owner: 'Jane Smith'
+    })
+  },
+
+  // Export initiatives
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/export`,
+    description: 'Export initiatives',
+    expectedStatus: [200, 202],
+    queryParams: { exportAll: 'true' },
+    requestBody: {
+      workstreams: ['Cost Reduction'],
+      dateRange: {
+        startDate: '2023-01-01',
+        endDate: '2023-12-31'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 202)
+  },
+
+  // Get workstreams
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/workstreams`,
+    description: 'Get available workstreams',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      { id: 1, name: 'Cost Reduction', description: 'Initiatives focused on cost reduction' },
+      { id: 2, name: 'Quality Improvement', description: 'Initiatives focused on quality' }
+    ])
+  },
+
+  // Get filter options
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/{configurationGuid}/filter-options`,
+    description: 'Get initiative filter options',
+    expectedStatus: [200],
+    pathParams: { configurationGuid: GlobalTestUtils.defaultConfigurationGuid() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      workstreams: [
+        { value: 1, text: 'Cost Reduction' },
+        { value: 2, text: 'Quality Improvement' }
+      ],
+      costDrivers: [
+        { value: 'Supply', text: 'Supply' },
+        { value: 'LengthOfStay', text: 'Length of Stay' }
+      ]
+    })
+  },
+
+  // Update initiative
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/{initiativeGuid}/update`,
+    description: 'Update initiative',
+    expectedStatus: [204, 400, 404],
+    pathParams: { initiativeGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: initiativeData,
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 204)
+  },
+
+  // Set initiative rollup value
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/set-initiative-rollup-value`,
+    description: 'Set initiative rollup value',
+    expectedStatus: [200, 400, 404],
+    requestBody: {
+      initiativeGuid: GlobalTestUtils.generateTestUUID(),
+      rollupType: 'Savings',
+      value: 15000
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  },
+
+  // Create charge code initiative
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/create-charge-code`,
+    description: 'Create charge code initiative',
+    expectedStatus: [200, 400],
+    requestBody: {
+      name: 'Charge Code Initiative',
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      costDriver: 'Supply',
+      chargeCodes: ['12345', '67890']
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  },
+
+  // Update charge code initiative
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/update-charge-code`,
+    description: 'Update charge code initiative',
+    expectedStatus: [200, 400],
+    requestBody: {
+      initiativeGuid: GlobalTestUtils.generateTestUUID(),
+      name: 'Updated Charge Code Initiative',
+      chargeCodes: ['12345', '67890', '11111']
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(GlobalTestUtils.generateTestUUID())
+  },
+
+  // Create encounter initiative
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/create-encounter`,
+    description: 'Create encounter initiative',
+    expectedStatus: [200, 400],
+    requestBody: {
+      name: 'Encounter Initiative',
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      costDriver: 'LengthOfStay',
+      caseTypes: ['Cardiac Surgery']
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(GlobalTestUtils.generateTestUUID())
+  },
+
+  // Update encounter initiative
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/update-encounter`,
+    description: 'Update encounter initiative',
+    expectedStatus: [200, 400],
+    requestBody: {
+      initiativeGuid: GlobalTestUtils.generateTestUUID(),
+      name: 'Updated Encounter Initiative',
+      caseTypes: ['Cardiac Surgery', 'Orthopedic Surgery']
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(GlobalTestUtils.generateTestUUID())
+  },
+
+  // Finalize initiative
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/{initiativeGuid}/finalize`,
+    description: 'Finalize initiative',
+    expectedStatus: [200, 400],
+    pathParams: { initiativeGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  },
+
+  // Create general ledger initiative
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/create-general-ledger`,
+    description: 'Create general ledger initiative',
+    expectedStatus: [200, 400],
+    requestBody: {
+      name: 'GL Initiative',
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      departments: ['Cardiology'],
+      accounts: ['60100', '60200']
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(GlobalTestUtils.generateTestUUID())
+  },
+
+  // Create free form initiative
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/create-free-form`,
+    description: 'Create free form initiative',
+    expectedStatus: [200, 400],
+    requestBody: {
+      name: 'Free Form Initiative',
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      description: 'Test free form initiative'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(GlobalTestUtils.generateTestUUID())
+  },
+
+  // Get criteria
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/criteria`,
+    description: 'Get initiative criteria',
+    expectedStatus: [200, 400],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        id: 1,
+        name: 'Financial Impact',
+        weight: 0.4,
+        description: 'Potential financial impact'
+      },
+      {
+        id: 2,
+        name: 'Feasibility',
+        weight: 0.3,
+        description: 'Implementation feasibility'
+      }
+    ])
+  },
+
+  // Get scores
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/scores/{initiativeGuid}`,
+    description: 'Get initiative scores',
+    expectedStatus: [200, 400],
+    pathParams: { initiativeGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      initiativeGuid: GlobalTestUtils.generateTestUUID(),
+      scores: [
+        { criteriaId: 1, score: 8.5 },
+        { criteriaId: 2, score: 7.2 }
+      ],
+      totalScore: 7.9
+    })
+  },
+
+  // Set scores
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/initiatives/set-scores`,
+    description: 'Set initiative scores',
+    expectedStatus: [200, 400],
+    requestBody: {
+      initiativeGuid: GlobalTestUtils.generateTestUUID(),
+      scores: [
+        { criteriaId: 1, score: 9.0 },
+        { criteriaId: 2, score: 8.0 }
+      ]
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  }
+];
+
+// mapped columns
+export const mappedColumnsTests: ApiEndpointTest[] = [
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/mapped-columns/{configurationGuid}`,
+    description: 'Get mapped columns for a configuration',
+    expectedStatus: [200, 404],
+    pathParams: { configurationGuid: GlobalTestUtils.defaultConfigurationGuid() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [
+        {
+          columnId: 1,
+          columnName: 'Sample Column',
+          mappedName: 'Sample Mapped Name',
+          dataType: 'string',
+          isRequired: true,
+          createdDate: GlobalTestUtils.generateTestDate()
+        }
+      ],
+      totalCount: 1
+    })
+  },
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/mapped-columns/update`,
+    description: 'Update column mappings for a configuration',
+    expectedStatus: [200],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      mappings: [
+        {
+          columnId: 1,
+          mappedName: 'New Mapped Name'
+        }
+      ]
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      success: true,
+      updatedCount: 1,
+      updatedAt: GlobalTestUtils.generateTestDate()
+    })
+  },
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/mapped-columns/{configurationGuid}/available-columns`,
+    description: 'Get available columns for mapping',
+    expectedStatus: [200, 404],
+    pathParams: { configurationGuid: GlobalTestUtils.defaultConfigurationGuid() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      columns: [
+        {
+          columnId: 1,
+          columnName: 'Available Column',
+          dataType: 'string',
+          description: 'Column description',
+          isNullable: false,
+          maxLength: 255
+        }
+      ],
+      totalAvailable: 1
+    })
+  }
+];
+
+// payroll opportunities
+export const payrollOpportunitiesTests: ApiEndpointTest[] = [
+  // Load payroll opportunities with filters
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/payroll-opportunities`,
+    description: 'Load payroll opportunities with filters',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: {
+        first: 0,
+        rows: 25,
+        sortField: 'identifiedSavings',
+        sortOrder: 'Desc'
+      },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+        identifiedSavings: 1000,
+        viewVisible: true,
+        excludeInitiatives: false,
+        opportunitySearch: 'Test',
+        seasonality: 'Without'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunities: [payrollOpportunityData],
+      totalCount: 1,
+      filteredCount: 1,
+      summary: {
+        totalFTEVariance: 3.5,
+        totalAmountVariance: 364000.0,
+        averageHourlyRate: 50.0
+      }
+    })
+  },
+
+  // Create payroll opportunity
+  {
+    method: 'POST',
+    endpoint: '/payroll-opportunities',
+    description: 'Create payroll opportunity',
+    expectedStatus: [201, 400],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      department: 'ICU',
+      positionType: 'RN',
+      positionDescription: 'ICU Registered Nurse',
+      budgetedFTE: 30.0,
+      budgetedHourlyRate: 55.0,
+      description: 'ICU staffing optimization opportunity',
+      targetFTEReduction: 2.0
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        opportunityGuid: GlobalTestUtils.generateTestUUID(),
+        message: 'Payroll opportunity created successfully'
+      },
+      201
+    )
+  },
+
+  // Update payroll opportunity
+  {
+    method: 'PUT',
+    endpoint: '/payroll-opportunities/{opportunityGuid}',
+    description: 'Update payroll opportunity',
+    expectedStatus: [200, 400, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: {
+      department: 'Nursing',
+      positionType: 'RN',
+      positionDescription: 'Updated Registered Nurse',
+      budgetedFTE: 24.0,
+      budgetedHourlyRate: 52.0,
+      description: 'Updated nursing staffing opportunity',
+      targetFTEReduction: 1.5
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      message: 'Payroll opportunity updated successfully'
+    })
+  },
+
+  // Delete payroll opportunity
+  {
+    method: 'DELETE',
+    endpoint: '/payroll-opportunities/{opportunityGuid}',
+    description: 'Delete payroll opportunity',
+    expectedStatus: [204, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 204)
+  },
+
+  // Get departments
+  {
+    method: 'GET',
+    endpoint: '/payroll-opportunities/departments',
+    description: 'Get available departments',
+    expectedStatus: [200],
+    queryParams: { configurationGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      { id: 'NURS', name: 'Nursing', description: 'Nursing department' },
+      { id: 'EMER', name: 'Emergency', description: 'Emergency department' },
+      { id: 'ICU', name: 'ICU', description: 'Intensive Care Unit' }
+    ])
+  },
+
+  // Get position types
+  {
+    method: 'GET',
+    endpoint: '/payroll-opportunities/position-types',
+    description: 'Get available position types',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      department: 'Nursing'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      { code: 'RN', description: 'Registered Nurse', payGrade: 'N4' },
+      { code: 'LPN', description: 'Licensed Practical Nurse', payGrade: 'N2' },
+      { code: 'CNA', description: 'Certified Nursing Assistant', payGrade: 'N1' }
+    ])
+  },
+
+  // Get position details
+  {
+    method: 'GET',
+    endpoint: '/payroll-opportunities/position-details',
+    description: 'Get position details for specific department and type',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      department: 'Nursing',
+      positionType: 'RN'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      department: 'Nursing',
+      positionType: 'RN',
+      description: 'Registered Nurse',
+      budgetedFTE: 25.0,
+      actualFTE: 28.5,
+      averageHourlyRate: 50.0,
+      budgetedAnnualCost: 2600000.0,
+      actualAnnualCost: 2964000.0,
+      costVariance: 364000.0,
+      benchmarkFTE: 24.0,
+      benchmarkRate: 48.0
+    })
+  },
+
+  // Export payroll opportunities
+  {
+    method: 'POST',
+    endpoint: '/payroll-opportunities/export',
+    description: 'Export payroll opportunities',
+    expectedStatus: [200, 202],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      departments: ['Nursing', 'Emergency'],
+      positionTypes: ['RN', 'LPN'],
+      format: 'excel',
+      includeDetails: true
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        exportId: GlobalTestUtils.generateTestUUID(),
+        message: 'Export initiated successfully'
+      },
+      202
+    )
+  },
+
+  // Get FTE analysis
+  {
+    method: 'GET',
+    endpoint: '/payroll-opportunities/{opportunityGuid}/fte-analysis',
+    description: 'Get FTE analysis for opportunity',
+    expectedStatus: [200, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    queryParams: { months: '12' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      monthlyAnalysis: [
+        { month: '2023-01', budgetedFTE: 25.0, actualFTE: 28.0, variance: 3.0 },
+        { month: '2023-02', budgetedFTE: 25.0, actualFTE: 29.0, variance: 4.0 }
+      ],
+      averageBudgetedFTE: 25.0,
+      averageActualFTE: 28.5,
+      averageVariance: 3.5,
+      totalCostImpact: 364000.0
+    })
+  },
+
+  // Get staffing trends
+  {
+    method: 'GET',
+    endpoint: '/payroll-opportunities/staffing-trends',
+    description: 'Get staffing trends for departments and positions',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      months: '12'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      trends: [
+        {
+          department: 'Nursing',
+          positionType: 'RN',
+          monthlyTrends: [
+            { month: '2023-01', fteVariancePercentage: 12.0 },
+            { month: '2023-02', fteVariancePercentage: 16.0 }
+          ]
+        }
+      ],
+      summary: {
+        totalDepartments: 8,
+        totalPositionTypes: 15,
+        averageFTEVariance: 2.5,
+        totalCostVariance: 1250000.0
+      }
+    })
+  },
+
+  // Get benchmark data
+  {
+    method: 'GET',
+    endpoint: '/payroll-opportunities/benchmark-data',
+    description: 'Get benchmark data for departments and positions',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      department: 'Nursing'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      benchmarks: [
+        {
+          positionType: 'RN',
+          industryAvgFTE: 22.0,
+          industryAvgRate: 48.0,
+          peerAvgFTE: 23.5,
+          peerAvgRate: 49.5,
+          recommendedFTE: 24.0,
+          potentialSavings: 156000.0
+        }
+      ],
+      departmentSummary: {
+        totalPositions: 3,
+        totalPotentialSavings: 450000.0,
+        recommendedFTEReduction: 4.5
+      }
+    })
+  },
+
+  // Bulk update opportunities
+  {
+    method: 'PUT',
+    endpoint: '/payroll-opportunities/bulk-update',
+    description: 'Bulk update payroll opportunities',
+    expectedStatus: [200, 400],
+    requestBody: {
+      opportunities: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          targetFTEReduction: 2.0,
+          description: 'Updated FTE reduction target'
+        },
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          targetFTEReduction: 1.5,
+          description: 'Conservative FTE reduction'
+        }
+      ]
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      updated: 2,
+      failed: 0,
+      message: 'Bulk update completed successfully',
+      totalPotentialSavings: 350000.0
+    })
+  },
+
+  // Calculate savings impact
+  {
+    method: 'POST',
+    endpoint: '/payroll-opportunities/calculate-savings',
+    description: 'Calculate savings impact for FTE reductions',
+    expectedStatus: [200, 400],
+    requestBody: {
+      scenarios: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          proposedFTEReduction: 2.0,
+          implementationTimeframe: 6
+        },
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          proposedFTEReduction: 1.5,
+          implementationTimeframe: 3
+        }
+      ]
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      scenarios: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          fteReduction: 2.0,
+          annualSavings: 208000.0,
+          monthlyReduction: 17333.33,
+          implementationCost: 15000.0,
+          netAnnualSavings: 193000.0,
+          paybackPeriods: 0.9
+        }
+      ],
+      totalAnnualSavings: 350000.0,
+      totalImplementationCost: 25000.0,
+      totalNetSavings: 325000.0
+    })
+  }
+];
+
+// picker items
+export const pickerItemsTests: ApiEndpointTest[] = [
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/picker-items/explorations`,
+    description: 'Get exploration picker items',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [
+        {
+          text: 'Sample Exploration',
+          value: GlobalTestUtils.generateTestUUID(),
+          description: 'Sample exploration description',
+          isActive: true,
+          createdDate: GlobalTestUtils.generateTestDate()
+        }
+      ],
+      totalCount: 1
+    })
+  }
+];
+
+// quality variation item breakdowns
+export const qualityVariationItemBreakdownsTests: ApiEndpointTest[] = [
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/quality-variation-item-breakdowns`,
+    description: 'Get paginated quality variation item breakdowns',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: {
+        pageNumber: 1,
+        pageSize: 25,
+        sortColumn: 'name',
+        sortDirection: 'asc'
+      },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [
+        {
+          breakdownId: GlobalTestUtils.generateTestUUID(),
+          itemName: 'Sample Quality Item',
+          categoryName: 'Quality Category',
+          entityName: 'Sample Entity',
+          variationAmount: 15000,
+          percentage: 2.5,
+          createdDate: GlobalTestUtils.generateTestDate()
+        }
+      ],
+      totalRecords: 1,
+      pageNumber: 1,
+      pageSize: 25
+    })
+  },
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/quality-variation-item-breakdowns/{configurationGuid}/getfilteroptions`,
+    description: 'Get filter options for quality variation item breakdowns',
+    expectedStatus: [200, 404],
+    pathParams: { configurationGuid: GlobalTestUtils.defaultConfigurationGuid() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      breakdowns: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          name: 'Sample Breakdown',
+          type: 'Quality'
+        }
+      ],
+      categories: [
+        {
+          id: 'category-1',
+          name: 'Quality Category',
+          description: 'Sample category description'
+        }
+      ],
+      entities: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          name: 'Sample Entity',
+          type: 'Organization'
+        }
+      ]
+    })
+  }
+];
+
+// quality variation item events
+export const qualityVariationItemEventsTests: ApiEndpointTest[] = [
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/quality-variation-item-events`,
+    description: 'Get paginated quality variation item events',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: {
+        pageNumber: 1,
+        pageSize: 25,
+        sortColumn: 'eventDate',
+        sortDirection: 'desc'
+      },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [
+        {
+          eventId: GlobalTestUtils.generateTestUUID(),
+          itemName: 'Sample Quality Item',
+          eventType: 'Quality Issue',
+          eventDate: GlobalTestUtils.generateTestDate(),
+          categoryName: 'Quality Category',
+          entityName: 'Sample Entity',
+          severity: 'Medium',
+          description: 'Sample quality variation event',
+          impactAmount: 5000
+        }
+      ],
+      totalRecords: 1,
+      pageNumber: 1,
+      pageSize: 25
+    })
+  },
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/quality-variation-item-events/{configurationGuid}/getfilteroptions`,
+    description: 'Get filter options for quality variation item events',
+    expectedStatus: [200, 404],
+    pathParams: { configurationGuid: GlobalTestUtils.defaultConfigurationGuid() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      events: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          name: 'Quality Issue',
+          type: 'Event',
+          severity: 'Medium'
+        }
+      ],
+      categories: [
+        {
+          id: 'category-1',
+          name: 'Quality Category',
+          description: 'Sample category description',
+          eventCount: 5
+        }
+      ],
+      entities: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          name: 'Sample Entity',
+          type: 'Organization',
+          eventCount: 3
+        }
+      ]
+    })
+  }
+];
+
+// quality variation item opportunities
+export const qualityVariationItemOpportunitiesTests: ApiEndpointTest[] = [
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/quality-variation-item-opportunities`,
+    description: 'Get paginated quality variation item opportunities',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: {
+        pageNumber: 1,
+        pageSize: 25,
+        sortColumn: 'identifiedSavings',
+        sortDirection: 'desc'
+      },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+        breakdownIds: [],
+        qualityVariationEventIds: [],
+        qviCases: 0
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          opportunityName: 'Quality Variation Opportunity',
+          identifiedSavings: 25000,
+          status: 'InProgress',
+          itemName: 'Sample Quality Item',
+          categoryName: 'Quality Category',
+          entityName: 'Sample Entity',
+          qviCases: 15,
+          variationAmount: 8000,
+          createdDate: GlobalTestUtils.generateTestDate()
+        }
+      ],
+      totalRecords: 1,
+      pageNumber: 1,
+      pageSize: 25
+    })
+  },
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/quality-variation-item-opportunities/export`,
+    description: 'Export quality variation item opportunities to Excel',
+    expectedStatus: [200, 201],
+    requestBody: {
+      pagingOptions: {
+        sortColumn: 'name',
+        sortDirection: 'asc'
+      },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        exportId: GlobalTestUtils.generateTestUUID(),
+        status: 'Processing',
+        estimatedCompletionTime: GlobalTestUtils.generateTestDate(),
+        downloadUrl: null
+      },
+      201
+    )
+  },
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/quality-variation-item-opportunities/{configurationGuid}/getfilteroptions`,
+    description: 'Get filter options for quality variation items',
+    expectedStatus: [200, 404],
+    pathParams: { configurationGuid: GlobalTestUtils.defaultConfigurationGuid() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      breakdowns: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          name: 'Quality Breakdown',
+          type: 'Quality',
+          itemCount: 10
+        }
+      ],
+      qualityVariationEvents: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          name: 'Quality Event',
+          eventType: 'Variation',
+          severity: 'High'
+        }
+      ],
+      entities: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          name: 'Quality Entity',
+          type: 'Organization',
+          opportunityCount: 5
+        }
+      ]
+    })
+  }
+];
+
+// quality variation opportunities
+export const qualityVariationOpportunitiesTests: ApiEndpointTest[] = [
+  // Get all quality variation opportunities
+  {
+    method: 'GET',
+    endpoint: '/quality-variation-opportunities',
+    description: 'Get all quality variation opportunities',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      qualityVariationOpportunityData,
+      {
+        ...qualityVariationOpportunityData,
+        opportunityGuid: GlobalTestUtils.generateTestUUID(),
+        measureName: 'Readmission Rate',
+        measureCode: 'READ-001',
+        department: 'Cardiology'
+      }
+    ])
+  },
+
+  // Get quality variation opportunity by GUID
+  {
+    method: 'GET',
+    endpoint: '/quality-variation-opportunities/{opportunityGuid}',
+    description: 'Get quality variation opportunity by GUID',
+    expectedStatus: [200, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(qualityVariationOpportunityData)
+  },
+
+  // Load quality variation opportunities with filters
+  {
+    method: 'POST',
+    endpoint: '/quality-variation-opportunities/load',
+    description: 'Load quality variation opportunities with filters',
+    expectedStatus: [200],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      departments: ['ICU', 'Cardiology', 'Surgery'],
+      measureTypes: ['Infection', 'Readmission', 'Mortality'],
+      riskLevels: ['High', 'Medium'],
+      varianceThreshold: 50.0,
+      priorityScoreMin: 7.0,
+      dateRange: {
+        startDate: '2023-01-01',
+        endDate: '2023-12-31'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunities: [qualityVariationOpportunityData],
+      totalCount: 1,
+      filteredCount: 1,
+      summary: {
+        totalPotentialSavings: 87500.0,
+        highRiskCount: 1,
+        averagePriorityScore: 8.5
+      }
+    })
+  },
+
+  // Create quality variation opportunity
+  {
+    method: 'POST',
+    endpoint: '/quality-variation-opportunities',
+    description: 'Create quality variation opportunity',
+    expectedStatus: [201, 400],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      measureName: 'Surgical Site Infections',
+      measureCode: 'SSI-001',
+      department: 'Surgery',
+      currentRate: 2.8,
+      benchmarkRate: 1.5,
+      targetRate: 1.8,
+      estimatedCostPerCase: 30000.0,
+      description: 'Surgical site infection reduction opportunity'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        opportunityGuid: GlobalTestUtils.generateTestUUID(),
+        message: 'Quality variation opportunity created successfully'
+      },
+      201
+    )
+  },
+
+  // Update quality variation opportunity
+  {
+    method: 'PUT',
+    endpoint: '/quality-variation-opportunities/{opportunityGuid}',
+    description: 'Update quality variation opportunity',
+    expectedStatus: [200, 400, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: {
+      measureName: 'Hospital Acquired Infections',
+      measureCode: 'HAI-001',
+      department: 'ICU',
+      currentRate: 3.0,
+      targetRate: 1.9,
+      estimatedCostPerCase: 26000.0,
+      description: 'Updated HAI reduction target'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      message: 'Quality variation opportunity updated successfully'
+    })
+  },
+
+  // Delete quality variation opportunity
+  {
+    method: 'DELETE',
+    endpoint: '/quality-variation-opportunities/{opportunityGuid}',
+    description: 'Delete quality variation opportunity',
+    expectedStatus: [204, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 204)
+  },
+
+  // Get quality measures
+  {
+    method: 'GET',
+    endpoint: '/quality-variation-opportunities/measures',
+    description: 'Get available quality measures',
+    expectedStatus: [200],
+    queryParams: { configurationGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        code: 'HAI-001',
+        name: 'Hospital Acquired Infections',
+        category: 'Infection Control',
+        description: 'Rate of hospital-acquired infections per 1000 patient days'
+      },
+      {
+        code: 'READ-001',
+        name: 'Readmission Rate',
+        category: 'Care Transitions',
+        description: '30-day readmission rate'
+      },
+      {
+        code: 'MORT-001',
+        name: 'Mortality Rate',
+        category: 'Patient Safety',
+        description: 'Risk-adjusted mortality rate'
+      }
+    ])
+  },
+
+  // Get departments with quality data
+  {
+    method: 'GET',
+    endpoint: '/quality-variation-opportunities/departments',
+    description: 'Get departments with quality data',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      measureCode: 'HAI-001'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        id: 'ICU',
+        name: 'Intensive Care Unit',
+        currentRate: 3.2,
+        benchmarkRate: 1.8,
+        caseCount: 150
+      },
+      {
+        id: 'SURG',
+        name: 'Surgery',
+        currentRate: 2.1,
+        benchmarkRate: 1.5,
+        caseCount: 200
+      }
+    ])
+  },
+
+  // Get benchmark data
+  {
+    method: 'GET',
+    endpoint: '/quality-variation-opportunities/benchmark-data',
+    description: 'Get benchmark data for quality measures',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      measureCode: 'HAI-001',
+      department: 'ICU'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      measureCode: 'HAI-001',
+      measureName: 'Hospital Acquired Infections',
+      department: 'ICU',
+      currentRate: 3.2,
+      benchmarks: {
+        national: 2.1,
+        regional: 1.9,
+        peer: 1.8,
+        bestPractice: 1.2
+      },
+      historicalData: [
+        { period: '2023-Q1', rate: 3.5 },
+        { period: '2023-Q2', rate: 3.1 },
+        { period: '2023-Q3', rate: 3.0 },
+        { period: '2023-Q4', rate: 3.2 }
+      ]
+    })
+  },
+
+  // Export quality variation opportunities
+  {
+    method: 'POST',
+    endpoint: '/quality-variation-opportunities/export',
+    description: 'Export quality variation opportunities',
+    expectedStatus: [200, 202],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      departments: ['ICU', 'Surgery'],
+      measureCodes: ['HAI-001', 'READ-001'],
+      format: 'excel',
+      includeBenchmarks: true
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        exportId: GlobalTestUtils.generateTestUUID(),
+        message: 'Export initiated successfully'
+      },
+      202
+    )
+  },
+
+  // Get trend analysis
+  {
+    method: 'GET',
+    endpoint: '/quality-variation-opportunities/{opportunityGuid}/trend-analysis',
+    description: 'Get trend analysis for quality opportunity',
+    expectedStatus: [200, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    queryParams: { periods: '12' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      trendData: [
+        { period: '2023-01', rate: 3.5, target: 2.0, variance: 1.5 },
+        { period: '2023-02', rate: 3.2, target: 2.0, variance: 1.2 }
+      ],
+      trendDirection: 'Improving',
+      averageRate: 3.35,
+      projectedRate: 2.8,
+      timeToTarget: 8
+    })
+  },
+
+  // Get risk assessment
+  {
+    method: 'GET',
+    endpoint: '/quality-variation-opportunities/risk-assessment',
+    description: 'Get risk assessment for quality measures',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      department: 'ICU'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      riskAssessment: [
+        {
+          measureCode: 'HAI-001',
+          measureName: 'Hospital Acquired Infections',
+          currentRiskLevel: 'High',
+          riskScore: 8.5,
+          riskFactors: ['Rate significantly above benchmark', 'High financial impact', 'Patient safety concern'],
+          recommendedActions: ['Implement enhanced infection control protocols', 'Increase staff training frequency', 'Review environmental cleaning procedures']
+        }
+      ],
+      departmentRiskScore: 7.2,
+      priorityMeasures: ['HAI-001', 'MORT-001']
+    })
+  },
+
+  // Calculate improvement impact
+  {
+    method: 'POST',
+    endpoint: '/quality-variation-opportunities/calculate-impact',
+    description: 'Calculate impact of quality improvements',
+    expectedStatus: [200, 400],
+    requestBody: {
+      scenarios: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          proposedTargetRate: 2.0,
+          implementationTimeframe: 12,
+          interventionCost: 50000.0
+        },
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          proposedTargetRate: 1.8,
+          implementationTimeframe: 18,
+          interventionCost: 75000.0
+        }
+      ]
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      scenarios: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          targetRate: 2.0,
+          projectedCasesAvoided: 2,
+          annualSavings: 50000.0,
+          implementationCost: 50000.0,
+          netAnnualSavings: 50000.0,
+          paybackPeriods: 12,
+          qualityImprovement: 37.5
+        }
+      ],
+      totalAnnualSavings: 125000.0,
+      totalImplementationCost: 125000.0,
+      totalNetSavings: 125000.0
+    })
+  },
+
+  // Bulk update opportunities
+  {
+    method: 'PUT',
+    endpoint: '/quality-variation-opportunities/bulk-update',
+    description: 'Bulk update quality variation opportunities',
+    expectedStatus: [200, 400],
+    requestBody: {
+      opportunities: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          targetRate: 1.9,
+          priorityScore: 8.0,
+          description: 'Updated improvement target'
+        },
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          targetRate: 1.5,
+          priorityScore: 9.0,
+          description: 'Aggressive improvement plan'
+        }
+      ]
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      updated: 2,
+      failed: 0,
+      message: 'Bulk update completed successfully',
+      totalPotentialSavings: 150000.0
+    })
+  },
+
+  // Get action plans
+  {
+    method: 'GET',
+    endpoint: '/quality-variation-opportunities/{opportunityGuid}/action-plan',
+    description: 'Get action plan for quality opportunity',
+    expectedStatus: [200, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      measureName: 'Hospital Acquired Infections',
+      currentRate: 3.2,
+      targetRate: 2.0,
+      actionItems: [
+        {
+          id: 1,
+          action: 'Implement enhanced hand hygiene protocol',
+          owner: 'Infection Control Team',
+          dueDate: '2024-03-31',
+          status: 'In Progress'
+        },
+        {
+          id: 2,
+          action: 'Upgrade environmental cleaning procedures',
+          owner: 'Environmental Services',
+          dueDate: '2024-02-29',
+          status: 'Not Started'
+        }
+      ],
+      milestones: [
+        {
+          milestone: '25% reduction in infections',
+          targetDate: '2024-06-30',
+          expectedRate: 2.4
+        },
+        {
+          milestone: 'Target rate achieved',
+          targetDate: '2024-12-31',
+          expectedRate: 2.0
+        }
+      ]
+    })
+  }
+];
+
+// reports
+export const reportsTests: ApiEndpointTest[] = [
+  // Get reports by module
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/report/{sourceOfSavings}/by-module`,
+    description: 'Get reports filtered by source of savings module',
+    expectedStatus: [200],
+    pathParams: { sourceOfSavings: '1' },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        reportGuid: GlobalTestUtils.generateTestUUID(),
+        name: 'Module Report 1',
+        description: 'Sample module report'
+      }
+    ])
+  },
+
+  // Get reports by opportunity
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/report/{opportunityGuid}/by-opportunity`,
+    description: 'Get reports filtered by opportunity GUID',
+    expectedStatus: [200],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        reportGuid: GlobalTestUtils.generateTestUUID(),
+        name: 'Opportunity Report 1',
+        description: 'Sample opportunity report'
+      }
+    ])
+  },
+
+  // Search reports with criteria
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/report/reports`,
+    description: 'Search reports using request parameters',
+    expectedStatus: [200],
+    requestBody: {
+      sourceOfSavings: 1,
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      searchTerm: 'cost analysis'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        reportGuid: GlobalTestUtils.generateTestUUID(),
+        name: 'Cost Analysis Report',
+        description: 'Detailed cost analysis'
+      }
+    ])
+  },
+
+  // Get all reports
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/report/reports`,
+    description: 'Get all available reports',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        reportGuid: GlobalTestUtils.generateTestUUID(),
+        name: 'All Reports Sample',
+        description: 'Sample report from all reports collection'
+      }
+    ])
+  },
+
+  // Associate report with opportunity
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/report/add-by-opportunity`,
+    description: 'Associate a report with an opportunity',
+    expectedStatus: [200],
+    requestBody: {
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      reportGuid: GlobalTestUtils.generateTestUUID()
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  },
+
+  // Associate report with module
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/report/add-by-module`,
+    description: 'Associate a report with a module',
+    expectedStatus: [200],
+    requestBody: {
+      sourceOfSavings: 1,
+      reportGuid: GlobalTestUtils.generateTestUUID()
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  },
+
+  // Remove report association with opportunity
+  {
+    method: 'DELETE',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/report/remove-by-opportunity`,
+    description: 'Remove report association with an opportunity',
+    expectedStatus: [200],
+    requestBody: {
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      reportGuid: GlobalTestUtils.generateTestUUID()
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  },
+
+  // Remove report association with module
+  {
+    method: 'DELETE',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/report/remove-by-module`,
+    description: 'Remove report association with a module',
+    expectedStatus: [200],
+    requestBody: {
+      sourceOfSavings: 1,
+      reportGuid: GlobalTestUtils.generateTestUUID()
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse()
+  },
+
+  // Get report folders
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/report/folders`,
+    description: 'Get report folder structure',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      folders: [
+        {
+          folderGuid: GlobalTestUtils.generateTestUUID(),
+          name: 'Financial Reports',
+          parentGuid: null
+        }
+      ]
+    })
+  },
+
+  // Get reports in folder
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/report/{folderGuid}folder-reports`,
+    description: 'Get reports in a specific folder',
+    expectedStatus: [200],
+    pathParams: { folderGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        reportGuid: GlobalTestUtils.generateTestUUID(),
+        name: 'Folder Report 1',
+        description: 'Report in folder'
+      }
+    ])
+  }
+];
+
+// security
+export const securityTests: ApiEndpointTest[] = [
+  // Get general access permission
+  {
+    method: 'GET',
+    endpoint: '/security/general-access-permission',
+    description: 'Get general access permission for current user',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Get user permissions by loot ID
+  {
+    method: 'GET',
+    endpoint: '/security/{lootId}',
+    description: 'Get user permissions by loot ID',
+    expectedStatus: [200, 404],
+    pathParams: { lootId: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(permissionData)
+  },
+
+  // Get identities
+  {
+    method: 'GET',
+    endpoint: '/security/identities',
+    description: 'Get all security identities',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      identityData,
+      {
+        ...identityData,
+        id: GlobalTestUtils.generateTestUUID(),
+        name: 'Jane Smith',
+        type: 'User',
+        email: 'jane.smith@example.com'
+      }
+    ])
+  },
+
+  // Get simple securities (user permissions)
+  {
+    method: 'GET',
+    endpoint: '/security/{lootId}/simple-securities',
+    description: 'Get simple securities for user',
+    expectedStatus: [200, 404],
+    pathParams: { lootId: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      permissionData,
+      {
+        ...permissionData,
+        lootId: GlobalTestUtils.generateTestUUID(),
+        module: 'Initiatives',
+        canWrite: true
+      }
+    ])
+  },
+
+  // Set simple securities (update user permissions)
+  {
+    method: 'PUT',
+    endpoint: '/security/{lootId}/simple-securities',
+    description: 'Set simple securities for user',
+    expectedStatus: [200, 400, 404],
+    pathParams: { lootId: GlobalTestUtils.generateTestUUID() },
+    requestBody: [
+      {
+        lootId: GlobalTestUtils.generateTestUUID(),
+        canRead: true,
+        canWrite: true,
+        canDelete: false,
+        canAdmin: false,
+        module: 'Opportunities'
+      },
+      {
+        lootId: GlobalTestUtils.generateTestUUID(),
+        canRead: true,
+        canWrite: false,
+        canDelete: false,
+        canAdmin: false,
+        module: 'Reports'
+      }
+    ],
+    mockResponse: GlobalTestUtils.createSuccessResponse(true)
+  },
+
+  // Get user roles
+  {
+    method: 'GET',
+    endpoint: '/security/user-roles',
+    description: 'Get available user roles',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        roleId: GlobalTestUtils.generateTestUUID(),
+        name: 'Administrator',
+        description: 'Full system access',
+        permissions: ['read', 'write', 'delete', 'admin']
+      },
+      {
+        roleId: GlobalTestUtils.generateTestUUID(),
+        name: 'Cost Leader',
+        description: 'Cost management access',
+        permissions: ['read', 'write']
+      },
+      {
+        roleId: GlobalTestUtils.generateTestUUID(),
+        name: 'Basic User',
+        description: 'Standard user access',
+        permissions: ['read']
+      }
+    ])
+  },
+
+  // Get user role assignments
+  {
+    method: 'GET',
+    endpoint: '/security/{lootId}/role-assignments',
+    description: 'Get role assignments for user',
+    expectedStatus: [200, 404],
+    pathParams: { lootId: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        roleId: GlobalTestUtils.generateTestUUID(),
+        roleName: 'Basic User',
+        assignedDate: '2023-01-01T00:00:00Z',
+        assignedBy: 'system',
+        isActive: true
+      }
+    ])
+  },
+
+  // Assign role to user
+  {
+    method: 'POST',
+    endpoint: '/security/{lootId}/assign-role',
+    description: 'Assign role to user',
+    expectedStatus: [200, 400, 404],
+    pathParams: { lootId: GlobalTestUtils.generateTestUUID() },
+    requestBody: {
+      roleId: GlobalTestUtils.generateTestUUID(),
+      assignedBy: 'admin@example.com',
+      expirationDate: '2024-12-31T23:59:59Z'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      success: true,
+      message: 'Role assigned successfully'
+    })
+  },
+
+  // Remove role from user
+  {
+    method: 'DELETE',
+    endpoint: '/security/{lootId}/remove-role/{roleId}',
+    description: 'Remove role from user',
+    expectedStatus: [200, 404],
+    pathParams: {
+      lootId: GlobalTestUtils.generateTestUUID(),
+      roleId: GlobalTestUtils.generateTestUUID()
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      success: true,
+      message: 'Role removed successfully'
+    })
+  },
+
+  // Get module permissions
+  {
+    method: 'GET',
+    endpoint: '/security/module-permissions',
+    description: 'Get permissions by module',
+    expectedStatus: [200],
+    queryParams: { module: 'Opportunities' },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        lootId: GlobalTestUtils.generateTestUUID(),
+        userName: 'John Doe',
+        canRead: true,
+        canWrite: true,
+        canDelete: false,
+        canAdmin: false
+      },
+      {
+        lootId: GlobalTestUtils.generateTestUUID(),
+        userName: 'Jane Smith',
+        canRead: true,
+        canWrite: false,
+        canDelete: false,
+        canAdmin: false
+      }
+    ])
+  },
+
+  // Validate user access
+  {
+    method: 'POST',
+    endpoint: '/security/validate-access',
+    description: 'Validate user access to resource',
+    expectedStatus: [200, 400],
+    requestBody: {
+      lootId: GlobalTestUtils.generateTestUUID(),
+      resource: 'opportunities',
+      action: 'write',
+      context: {
+        opportunityId: GlobalTestUtils.generateTestUUID(),
+        department: 'Cardiology'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      hasAccess: true,
+      reason: 'User has write permission for opportunities module',
+      expiresAt: '2024-12-31T23:59:59Z'
+    })
+  },
+
+  // Get audit log
+  {
+    method: 'GET',
+    endpoint: '/security/audit-log',
+    description: 'Get security audit log',
+    expectedStatus: [200],
+    queryParams: {
+      startDate: '2023-01-01',
+      endDate: '2023-12-31',
+      userId: GlobalTestUtils.generateTestUUID(),
+      action: 'login',
+      pageNumber: '1',
+      pageSize: '20'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      auditEntries: [
+        {
+          timestamp: '2023-12-01T10:00:00Z',
+          userId: GlobalTestUtils.generateTestUUID(),
+          userName: 'john.doe@example.com',
+          action: 'Login',
+          resource: 'System',
+          ipAddress: '192.168.1.100',
+          userAgent: 'Mozilla/5.0...',
+          success: true
+        },
+        {
+          timestamp: '2023-12-01T10:05:00Z',
+          userId: GlobalTestUtils.generateTestUUID(),
+          userName: 'john.doe@example.com',
+          action: 'Access Opportunity',
+          resource: 'Opportunities',
+          resourceId: GlobalTestUtils.generateTestUUID(),
+          success: true
+        }
+      ],
+      totalCount: 2,
+      pageNumber: 1,
+      pageSize: 20
+    })
+  },
+
+  // Create security group
+  {
+    method: 'POST',
+    endpoint: '/security/groups',
+    description: 'Create security group',
+    expectedStatus: [201, 400],
+    requestBody: {
+      name: 'Department Managers',
+      description: 'Managers with departmental access',
+      permissions: [
+        {
+          module: 'Opportunities',
+          canRead: true,
+          canWrite: true,
+          canDelete: false
+        }
+      ]
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        groupId: GlobalTestUtils.generateTestUUID(),
+        message: 'Security group created successfully'
+      },
+      201
+    )
+  },
+
+  // Get security groups
+  {
+    method: 'GET',
+    endpoint: '/security/groups',
+    description: 'Get all security groups',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        groupId: GlobalTestUtils.generateTestUUID(),
+        name: 'Administrators',
+        description: 'System administrators',
+        memberCount: 5,
+        isActive: true
+      },
+      {
+        groupId: GlobalTestUtils.generateTestUUID(),
+        name: 'Department Managers',
+        description: 'Department level managers',
+        memberCount: 12,
+        isActive: true
+      }
+    ])
+  },
+
+  // Add user to security group
+  {
+    method: 'POST',
+    endpoint: '/security/groups/{groupId}/members',
+    description: 'Add user to security group',
+    expectedStatus: [200, 400, 404],
+    pathParams: { groupId: GlobalTestUtils.generateTestUUID() },
+    requestBody: {
+      lootId: GlobalTestUtils.generateTestUUID(),
+      addedBy: 'admin@example.com'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      success: true,
+      message: 'User added to group successfully'
+    })
+  },
+
+  // Get group members
+  {
+    method: 'GET',
+    endpoint: '/security/groups/{groupId}/members',
+    description: 'Get security group members',
+    expectedStatus: [200, 404],
+    pathParams: { groupId: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        lootId: GlobalTestUtils.generateTestUUID(),
+        userName: 'John Doe',
+        email: 'john.doe@example.com',
+        addedDate: '2023-01-01T00:00:00Z',
+        isActive: true
+      }
+    ])
+  }
+];
+
+// settings
+export const settingsTests: ApiEndpointTest[] = [
+  // Get feature flags
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/settings/feature-flags`,
+    description: 'Get feature flags configuration',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      enableAdvancedAnalytics: true,
+      enableExportFunctionality: true,
+      enableRealTimeUpdates: false,
+      enableNotifications: true
+    })
+  },
+
+  // Get standard data source
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/settings/standard-data-source/{standardDataSourceId}`,
+    description: 'Get standard data source by ID',
+    expectedStatus: [200],
+    pathParams: {
+      standardDataSourceId: '1'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      id: 1,
+      name: 'Primary Data Source',
+      type: 'SQL Server',
+      isActive: true
+    })
+  },
+
+  // Get performance engine calculations
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/settings/performance-engine-calculations`,
+    description: 'Get performance engine calculation data',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      calculationData: {
+        isEnabled: true,
+        refreshIntervalMinutes: 30,
+        maxConcurrentJobs: 5,
+        lastUpdated: GlobalTestUtils.generateTestDate()
+      }
+    })
+  },
+
+  // Get system settings
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/settings/system-settings`,
+    description: 'Get system settings by keys',
+    expectedStatus: [200],
+    requestBody: ['automatic-refresh-enabled', 'notification-email'],
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      'automatic-refresh-enabled': 'true',
+      'notification-email': 'admin@example.com'
+    })
+  },
+
+  // Get opportunity level limit
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/settings/opportunity-level-limit`,
+    description: 'Get opportunity level limit setting',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse(50)
+  },
+
+  // Get charge code limit
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/settings/charge-code-limit`,
+    description: 'Get charge code limit setting',
+    expectedStatus: [200],
+    queryParams: {
+      isStrategicOpportunity: 'false'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(100)
+  }
+];
+
+// strategic opportunities
+export const strategicOpportunitiesTests: ApiEndpointTest[] = [
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/strategic-opportunities`,
+    description: 'Get paginated strategic opportunities',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: { pageNumber: 1, pageSize: 25, sortColumn: 'identifiedSavings', sortDirection: 'desc' },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [
+        {
+          strategicOpportunityId: GlobalTestUtils.generateTestUUID(),
+          name: 'Sample Strategic Opportunity',
+          description: 'Sample Description',
+          identifiedSavings: 20000,
+          status: 'Active',
+          createdDate: GlobalTestUtils.generateTestDate()
+        }
+      ],
+      totalRecords: 1,
+      pageNumber: 1,
+      pageSize: 25
+    })
+  },
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/strategic-opportunities/{strategicOpportunityId}`,
+    description: 'Get a specific strategic opportunity by ID',
+    expectedStatus: [200, 404],
+    pathParams: { strategicOpportunityId: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      strategicOpportunityId: GlobalTestUtils.generateTestUUID(),
+      name: 'Sample Strategic Opportunity',
+      description: 'Sample Description',
+      identifiedSavings: 20000,
+      status: 'Active',
+      createdDate: GlobalTestUtils.generateTestDate()
+    })
+  },
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/strategic-opportunities/create`,
+    description: 'Create a new strategic opportunity',
+    expectedStatus: [201],
+    requestBody: {
+      name: 'New Strategic Opportunity',
+      description: 'New Description',
+      configurationGuid: GlobalTestUtils.generateTestUUID()
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        strategicOpportunityId: GlobalTestUtils.generateTestUUID(),
+        name: 'New Strategic Opportunity',
+        description: 'New Description',
+        status: 'Active',
+        createdDate: GlobalTestUtils.generateTestDate()
+      },
+      201
+    )
+  },
+  {
+    method: 'PUT',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/strategic-opportunities/{strategicOpportunityId}`,
+    description: 'Update an existing strategic opportunity',
+    expectedStatus: [200, 204, 404],
+    pathParams: { strategicOpportunityId: GlobalTestUtils.generateTestUUID() },
+    requestBody: {
+      name: 'Updated Strategic Opportunity',
+      description: 'Updated Description'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        strategicOpportunityId: GlobalTestUtils.generateTestUUID(),
+        name: 'Updated Strategic Opportunity',
+        description: 'Updated Description',
+        status: 'Active',
+        updatedDate: GlobalTestUtils.generateTestDate()
+      },
+      204
+    )
+  },
+  {
+    method: 'DELETE',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/strategic-opportunities/{strategicOpportunityId}`,
+    description: 'Delete a strategic opportunity',
+    expectedStatus: [200, 204, 404],
+    pathParams: { strategicOpportunityId: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 204)
+  },
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/strategic-opportunities/export`,
+    description: 'Export strategic opportunities to Excel',
+    expectedStatus: [200, 201],
+    requestBody: {
+      pagingOptions: { sortColumn: 'name', sortDirection: 'asc' },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        exportId: GlobalTestUtils.generateTestUUID(),
+        status: 'Processing',
+        estimatedCompletionTime: GlobalTestUtils.generateTestDate(),
+        downloadUrl: null
+      },
+      201
+    )
+  }
+];
+
+// users
+export const userTests: ApiEndpointTest[] = [
+  // Get all users
+  {
+    method: 'GET',
+    endpoint: '/users/users',
+    description: 'Get all users',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      userData,
+      {
+        ...userData,
+        userGuid: GlobalTestUtils.generateTestUUID(),
+        firstName: 'Jane',
+        lastName: 'Smith',
+        email: 'jane.smith@example.com',
+        displayName: 'Jane Smith'
+      }
+    ])
+  },
+
+  // Get owners
+  {
+    method: 'GET',
+    endpoint: '/users/owners',
+    description: 'Get owner users',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([userData])
+  },
+
+  // Get executive sponsors
+  {
+    method: 'GET',
+    endpoint: '/users/executive-sponsors',
+    description: 'Get executive sponsor users',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        ...userData,
+        globalId: 'CCI - Exec Sponsors',
+        displayName: 'Executive Sponsor'
+      }
+    ])
+  },
+
+  // Get cost leaders
+  {
+    method: 'GET',
+    endpoint: '/users/cost-leaders',
+    description: 'Get cost leader users',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        ...userData,
+        globalId: 'CCI - Cost Leader',
+        displayName: 'Cost Leader'
+      }
+    ])
+  },
+
+  // Get administrators
+  {
+    method: 'GET',
+    endpoint: '/users/administrators',
+    description: 'Get administrator users',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        ...userData,
+        globalId: 'CCI - System Administrator',
+        displayName: 'System Administrator',
+        isAdmin: true
+      }
+    ])
+  },
+
+  // Get Jazz users
+  {
+    method: 'GET',
+    endpoint: '/users/jazz-users',
+    description: 'Get Jazz application users',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        ...userData,
+        applicationAccess: ['Jazz', 'CCI'],
+        permissions: ['READ', 'WRITE']
+      }
+    ])
+  },
+
+  // Get user groups
+  {
+    method: 'GET',
+    endpoint: '/users/user-groups',
+    description: 'Get user groups',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      userGroupData,
+      {
+        globalId: 'CCI - Basic User',
+        name: 'Basic User',
+        description: 'Standard user access',
+        isAdmin: false,
+        userCount: 25
+      }
+    ])
+  },
+
+  // Get user by GUID
+  {
+    method: 'GET',
+    endpoint: '/users/{userGuid}/user',
+    description: 'Get user by GUID',
+    expectedStatus: [200, 404],
+    pathParams: { userGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(userData)
+  },
+
+  // Search users
+  {
+    method: 'POST',
+    endpoint: '/users/search',
+    description: 'Search users by criteria',
+    expectedStatus: [200],
+    requestBody: {
+      searchTerm: 'john',
+      globalIds: ['CCI - Basic User'],
+      isActive: true,
+      pageNumber: 1,
+      pageSize: 10
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      users: [userData],
+      totalCount: 1,
+      pageNumber: 1,
+      pageSize: 10
+    })
+  },
+
+  // Get user permissions
+  {
+    method: 'GET',
+    endpoint: '/users/{userGuid}/permissions',
+    description: 'Get user permissions',
+    expectedStatus: [200, 404],
+    pathParams: { userGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      permissions: [
+        {
+          module: 'opportunities',
+          actions: ['read', 'create', 'update']
+        },
+        {
+          module: 'initiatives',
+          actions: ['read', 'create']
+        }
+      ],
+      globalId: 'CCI - Basic User',
+      isAdmin: false
+    })
+  },
+
+  // Update user
+  {
+    method: 'PUT',
+    endpoint: '/users/{userGuid}',
+    description: 'Update user information',
+    expectedStatus: [200, 400, 404],
+    pathParams: { userGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: {
+      firstName: 'John',
+      lastName: 'Doe',
+      email: 'john.doe.updated@example.com',
+      isActive: true,
+      globalId: 'CCI - Basic User'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      ...userData,
+      email: 'john.doe.updated@example.com'
+    })
+  },
+
+  // Create user
+  {
+    method: 'POST',
+    endpoint: '/users',
+    description: 'Create new user',
+    expectedStatus: [201, 400],
+    requestBody: {
+      firstName: 'New',
+      lastName: 'User',
+      email: 'new.user@example.com',
+      globalId: 'CCI - Basic User'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        userGuid: GlobalTestUtils.generateTestUUID(),
+        message: 'User created successfully'
+      },
+      201
+    )
+  },
+
+  // Deactivate user
+  {
+    method: 'PUT',
+    endpoint: '/users/{userGuid}/deactivate',
+    description: 'Deactivate user',
+    expectedStatus: [200, 404],
+    pathParams: { userGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      success: true,
+      message: 'User deactivated successfully'
+    })
+  },
+
+  // Reactivate user
+  {
+    method: 'PUT',
+    endpoint: '/users/{userGuid}/reactivate',
+    description: 'Reactivate user',
+    expectedStatus: [200, 404],
+    pathParams: { userGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      success: true,
+      message: 'User reactivated successfully'
+    })
+  },
+
+  // Get user activity log
+  {
+    method: 'GET',
+    endpoint: '/users/{userGuid}/activity-log',
+    description: 'Get user activity log',
+    expectedStatus: [200, 404],
+    pathParams: { userGuid: GlobalTestUtils.generateTestUUID() },
+    queryParams: {
+      startDate: '2023-01-01',
+      endDate: '2023-12-31',
+      pageNumber: '1',
+      pageSize: '20'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      activities: [
+        {
+          timestamp: '2023-12-01T10:00:00Z',
+          action: 'Login',
+          details: 'User logged in successfully',
+          ipAddress: '192.168.1.100'
+        },
+        {
+          timestamp: '2023-12-01T10:15:00Z',
+          action: 'Create Opportunity',
+          details: 'Created new encounter opportunity',
+          module: 'Opportunities'
+        }
+      ],
+      totalCount: 2,
+      pageNumber: 1,
+      pageSize: 20
+    })
+  },
+
+  // Bulk update users
+  {
+    method: 'PUT',
+    endpoint: '/users/bulk-update',
+    description: 'Bulk update users',
+    expectedStatus: [200, 400],
+    requestBody: {
+      users: [
+        {
+          userGuid: GlobalTestUtils.generateTestUUID(),
+          isActive: false,
+          globalId: 'CCI - Basic User'
+        },
+        {
+          userGuid: GlobalTestUtils.generateTestUUID(),
+          isActive: true,
+          globalId: 'CCI - Cost Leader'
+        }
+      ]
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      updated: 2,
+      failed: 0,
+      message: 'Bulk update completed successfully'
+    })
+  },
+
+  // Export users
+  {
+    method: 'POST',
+    endpoint: '/users/export',
+    description: 'Export users list',
+    expectedStatus: [200, 202],
+    requestBody: {
+      globalIds: ['CCI - Basic User', 'CCI - Cost Leader'],
+      includeInactive: false,
+      format: 'excel'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        exportId: GlobalTestUtils.generateTestUUID(),
+        message: 'Export initiated successfully'
+      },
+      202
+    )
+  }
+];
+
+// utilization variation opportunities
+export const utilizationVariationOpportunitiesTests: ApiEndpointTest[] = [
+  // Get all utilization variation opportunities
+  {
+    method: 'GET',
+    endpoint: '/utilization-variation-opportunities',
+    description: 'Get all utilization variation opportunities',
+    expectedStatus: [200],
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      utilizationVariationOpportunityData,
+      {
+        ...utilizationVariationOpportunityData,
+        opportunityGuid: GlobalTestUtils.generateTestUUID(),
+        resourceType: 'MRI',
+        resourceName: 'MRI Scanner 2',
+        department: 'Radiology'
+      }
+    ])
+  },
+
+  // Get utilization variation opportunity by GUID
+  {
+    method: 'GET',
+    endpoint: '/utilization-variation-opportunities/{opportunityGuid}',
+    description: 'Get utilization variation opportunity by GUID',
+    expectedStatus: [200, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(utilizationVariationOpportunityData)
+  },
+
+  // Load utilization variation opportunities with filters
+  {
+    method: 'POST',
+    endpoint: '/utilization-variation-opportunities/load',
+    description: 'Load utilization variation opportunities with filters',
+    expectedStatus: [200],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      departments: ['Surgery', 'Radiology', 'Cardiology'],
+      resourceTypes: ['OR Suite', 'MRI', 'CT Scanner'],
+      utilizationThresholds: {
+        min: 40.0,
+        max: 90.0
+      },
+      opportunityValueMin: 100000.0,
+      priorityScoreMin: 6.0,
+      dateRange: {
+        startDate: '2023-01-01',
+        endDate: '2023-12-31'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunities: [utilizationVariationOpportunityData],
+      totalCount: 1,
+      filteredCount: 1,
+      summary: {
+        totalOpportunityValue: 350000.0,
+        averageUtilization: 65.5,
+        totalUnutilizedHours: 718
+      }
+    })
+  },
+
+  // Create utilization variation opportunity
+  {
+    method: 'POST',
+    endpoint: '/utilization-variation-opportunities',
+    description: 'Create utilization variation opportunity',
+    expectedStatus: [201, 400],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      resourceType: 'CT Scanner',
+      resourceName: 'CT Scanner 3',
+      department: 'Emergency',
+      currentUtilization: 45.0,
+      targetUtilization: 75.0,
+      availableHours: 8760,
+      resourceCostPerHour: 180.0,
+      revenuePerHour: 300.0,
+      description: 'CT scanner utilization improvement opportunity'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        opportunityGuid: GlobalTestUtils.generateTestUUID(),
+        message: 'Utilization variation opportunity created successfully'
+      },
+      201
+    )
+  },
+
+  // Update utilization variation opportunity
+  {
+    method: 'PUT',
+    endpoint: '/utilization-variation-opportunities/{opportunityGuid}',
+    description: 'Update utilization variation opportunity',
+    expectedStatus: [200, 400, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    requestBody: {
+      resourceType: 'OR Suite',
+      resourceName: 'Operating Room 5',
+      department: 'Surgery',
+      currentUtilization: 68.0,
+      targetUtilization: 82.0,
+      resourceCostPerHour: 260.0,
+      revenuePerCase: 16000.0,
+      description: 'Updated OR utilization target'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      message: 'Utilization variation opportunity updated successfully'
+    })
+  },
+
+  // Delete utilization variation opportunity
+  {
+    method: 'DELETE',
+    endpoint: '/utilization-variation-opportunities/{opportunityGuid}',
+    description: 'Delete utilization variation opportunity',
+    expectedStatus: [204, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse(null, 204)
+  },
+
+  // Get resource types
+  {
+    method: 'GET',
+    endpoint: '/utilization-variation-opportunities/resource-types',
+    description: 'Get available resource types',
+    expectedStatus: [200],
+    queryParams: { configurationGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        type: 'OR Suite',
+        category: 'Surgical',
+        description: 'Operating room suites',
+        count: 12
+      },
+      {
+        type: 'MRI',
+        category: 'Imaging',
+        description: 'MRI scanners',
+        count: 3
+      },
+      {
+        type: 'CT Scanner',
+        category: 'Imaging',
+        description: 'CT scanners',
+        count: 4
+      }
+    ])
+  },
+
+  // Get resources by type
+  {
+    method: 'GET',
+    endpoint: '/utilization-variation-opportunities/resources',
+    description: 'Get resources by type and department',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      resourceType: 'OR Suite',
+      department: 'Surgery'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse([
+      {
+        id: 'OR-001',
+        name: 'Operating Room 1',
+        currentUtilization: 82.5,
+        benchmarkUtilization: 85.0,
+        status: 'Active'
+      },
+      {
+        id: 'OR-005',
+        name: 'Operating Room 5',
+        currentUtilization: 65.5,
+        benchmarkUtilization: 85.0,
+        status: 'Underutilized'
+      }
+    ])
+  },
+
+  // Get resource details
+  {
+    method: 'GET',
+    endpoint: '/utilization-variation-opportunities/resource-details',
+    description: 'Get detailed resource utilization data',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      resourceId: 'OR-005'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      resourceId: 'OR-005',
+      resourceName: 'Operating Room 5',
+      department: 'Surgery',
+      utilizationData: {
+        daily: [
+          { date: '2023-12-01', utilization: 68.0, hours: 5.4 },
+          { date: '2023-12-02', utilization: 62.5, hours: 5.0 }
+        ],
+        weekly: [
+          { week: '2023-W48', utilization: 65.2, hours: 32.6 },
+          { week: '2023-W49', utilization: 67.8, hours: 33.9 }
+        ],
+        monthly: [
+          { month: '2023-11', utilization: 64.8, hours: 129.6 },
+          { month: '2023-12', utilization: 66.2, hours: 132.4 }
+        ]
+      },
+      benchmarks: {
+        departmentAvg: 78.5,
+        hospitalAvg: 75.2,
+        industryBest: 88.0
+      }
+    })
+  },
+
+  // Export utilization variation opportunities
+  {
+    method: 'POST',
+    endpoint: '/utilization-variation-opportunities/export',
+    description: 'Export utilization variation opportunities',
+    expectedStatus: [200, 202],
+    requestBody: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      departments: ['Surgery', 'Radiology'],
+      resourceTypes: ['OR Suite', 'MRI'],
+      format: 'excel',
+      includeDetails: true
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        exportId: GlobalTestUtils.generateTestUUID(),
+        message: 'Export initiated successfully'
+      },
+      202
+    )
+  },
+
+  // Get utilization trends
+  {
+    method: 'GET',
+    endpoint: '/utilization-variation-opportunities/{opportunityGuid}/utilization-trends',
+    description: 'Get utilization trends for opportunity',
+    expectedStatus: [200, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    queryParams: { periods: '12' },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      trendData: [
+        { period: '2023-01', utilization: 68.2, target: 80.0, gap: 11.8 },
+        { period: '2023-02', utilization: 66.5, target: 80.0, gap: 13.5 }
+      ],
+      trendDirection: 'Declining',
+      averageUtilization: 67.35,
+      projectedUtilization: 65.8,
+      timeToTarget: 24
+    })
+  },
+
+  // Get capacity analysis
+  {
+    method: 'GET',
+    endpoint: '/utilization-variation-opportunities/capacity-analysis',
+    description: 'Get capacity analysis for resources',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      department: 'Surgery'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      capacityAnalysis: [
+        {
+          resourceType: 'OR Suite',
+          totalResources: 8,
+          totalCapacityHours: 16640,
+          usedHours: 11248,
+          utilizationRate: 67.6,
+          potentialAdditionalHours: 2770,
+          potentialRevenue: 4155000.0
+        }
+      ],
+      departmentSummary: {
+        totalOpportunityValue: 4155000.0,
+        averageUtilization: 67.6,
+        recommendedImprovements: ['Block scheduling optimization', 'Case duration standardization', 'Equipment maintenance scheduling']
+      }
+    })
+  },
+
+  // Calculate improvement impact
+  {
+    method: 'POST',
+    endpoint: '/utilization-variation-opportunities/calculate-impact',
+    description: 'Calculate impact of utilization improvements',
+    expectedStatus: [200, 400],
+    requestBody: {
+      scenarios: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          proposedUtilization: 80.0,
+          implementationTimeframe: 6,
+          improvementCost: 25000.0
+        },
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          proposedUtilization: 85.0,
+          implementationTimeframe: 12,
+          improvementCost: 50000.0
+        }
+      ]
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      scenarios: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          targetUtilization: 80.0,
+          additionalHours: 302,
+          additionalCases: 20,
+          annualRevenue: 300000.0,
+          implementationCost: 25000.0,
+          netAnnualValue: 275000.0,
+          paybackPeriods: 1.0
+        }
+      ],
+      totalAnnualValue: 600000.0,
+      totalImplementationCost: 75000.0,
+      totalNetValue: 525000.0
+    })
+  },
+
+  // Bulk update opportunities
+  {
+    method: 'PUT',
+    endpoint: '/utilization-variation-opportunities/bulk-update',
+    description: 'Bulk update utilization variation opportunities',
+    expectedStatus: [200, 400],
+    requestBody: {
+      opportunities: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          targetUtilization: 82.0,
+          priorityScore: 8.0,
+          description: 'Updated utilization target'
+        },
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          targetUtilization: 78.0,
+          priorityScore: 7.5,
+          description: 'Conservative improvement plan'
+        }
+      ]
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      updated: 2,
+      failed: 0,
+      message: 'Bulk update completed successfully',
+      totalOpportunityValue: 650000.0
+    })
+  },
+
+  // Get scheduling optimization
+  {
+    method: 'GET',
+    endpoint: '/utilization-variation-opportunities/{opportunityGuid}/scheduling-optimization',
+    description: 'Get scheduling optimization recommendations',
+    expectedStatus: [200, 404],
+    pathParams: { opportunityGuid: GlobalTestUtils.generateTestUUID() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      opportunityGuid: GlobalTestUtils.generateTestUUID(),
+      resourceName: 'Operating Room 5',
+      currentScheduling: {
+        averageBlockSize: 4.2,
+        averageTurnoverTime: 35,
+        scheduledHours: 8.0,
+        actualUtilizedHours: 5.24
+      },
+      recommendations: [
+        {
+          improvement: 'Reduce turnover time',
+          currentValue: 35,
+          targetValue: 25,
+          impact: 'Additional 1.5 cases per day',
+          annualValue: 82500.0
+        },
+        {
+          improvement: 'Block scheduling optimization',
+          currentValue: '60% block utilization',
+          targetValue: '85% block utilization',
+          impact: 'Additional 2.1 hours per day',
+          annualValue: 157500.0
+        }
+      ],
+      totalPotentialImprovement: 240000.0,
+      implementationComplexity: 'Medium'
+    })
+  },
+
+  // Get benchmark comparison
+  {
+    method: 'GET',
+    endpoint: '/utilization-variation-opportunities/benchmark-comparison',
+    description: 'Get benchmark comparison for resource utilization',
+    expectedStatus: [200],
+    queryParams: {
+      configurationGuid: GlobalTestUtils.generateTestUUID(),
+      resourceType: 'OR Suite'
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      resourceType: 'OR Suite',
+      benchmarkData: {
+        hospitalCurrent: 67.6,
+        peerHospitals: 78.2,
+        industryAverage: 75.8,
+        topPerformers: 88.5,
+        bestPractice: 92.0
+      },
+      performanceGap: {
+        vsPeers: -10.6,
+        vsIndustry: -8.2,
+        vsBestPractice: -24.4
+      },
+      improvementPotential: {
+        toPeerLevel: 1764000.0,
+        toIndustryLevel: 1368000.0,
+        toBestPractice: 4056000.0
+      },
+      keySuccessFactors: ['Advanced scheduling systems', 'Standardized procedures', 'Efficient turnover processes', 'Predictive maintenance']
+    })
+  }
+];
+
+// variation case types
+export const variationCaseTypesTests: ApiEndpointTest[] = [
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/variation-case-types`,
+    description: 'Get paginated utilization variation case types',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: { pageNumber: 1, pageSize: 25, sortColumn: 'name', sortDirection: 'asc' },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+        identifiedSavings: 0,
+        caseTypeGuids: [],
+        serviceLineIds: []
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [
+        {
+          caseTypeId: GlobalTestUtils.generateTestUUID(),
+          caseTypeName: 'Sample Case Type',
+          serviceLineId: GlobalTestUtils.generateTestUUID(),
+          serviceLineName: 'Sample Service Line',
+          identifiedSavings: 10000,
+          createdDate: GlobalTestUtils.generateTestDate()
+        }
+      ],
+      totalRecords: 1,
+      pageNumber: 1,
+      pageSize: 25
+    })
+  },
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/variation-case-types/{configurationGuid}/getfilteroptions`,
+    description: 'Get filter options for utilization variation case types',
+    expectedStatus: [200, 404],
+    pathParams: { configurationGuid: GlobalTestUtils.defaultConfigurationGuid() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      caseTypes: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          text: 'Sample Case Type',
+          description: 'Sample case type description'
+        }
+      ],
+      serviceLines: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          text: 'Sample Service Line',
+          description: 'Sample service line description'
+        }
+      ]
+    })
+  },
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/variation-case-types/{configurationGuid}/addpatientpopulationcasetypes`,
+    description: 'Add patient population case types to configuration',
+    expectedStatus: [200, 201],
+    pathParams: { configurationGuid: GlobalTestUtils.defaultConfigurationGuid() },
+    requestBody: ['population-1', 'population-2'],
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        success: true,
+        addedCount: 2,
+        addedAt: GlobalTestUtils.generateTestDate()
+      },
+      201
+    )
+  }
+];
+
+// variation opportunities
+export const variationOpportunitiesTests: ApiEndpointTest[] = [
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/variation-opportunities`,
+    description: 'Get paginated utilization variation opportunities',
+    expectedStatus: [200],
+    requestBody: {
+      pagingOptions: { pageNumber: 1, pageSize: 25, sortColumn: 'identifiedSavings', sortDirection: 'desc' },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988',
+        dischargeDateStart: '2024-01-01T00:00:00Z',
+        dischargeDateEnd: '2025-01-01T00:00:00Z',
+        caseTypeIds: [],
+        costDriverIds: [],
+        entityIds: []
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      data: [
+        {
+          opportunityGuid: GlobalTestUtils.generateTestUUID(),
+          opportunityName: 'Variation Opportunity',
+          identifiedSavings: 12000,
+          status: 'Active',
+          dischargeDateStart: '2024-01-01T00:00:00Z',
+          dischargeDateEnd: '2025-01-01T00:00:00Z',
+          caseTypeIds: [],
+          costDriverIds: [],
+          entityIds: [],
+          createdDate: GlobalTestUtils.generateTestDate()
+        }
+      ],
+      totalRecords: 1,
+      pageNumber: 1,
+      pageSize: 25
+    })
+  },
+  {
+    method: 'POST',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/variation-opportunities/export`,
+    description: 'Export utilization variation opportunities to Excel',
+    expectedStatus: [200, 201],
+    requestBody: {
+      pagingOptions: { sortColumn: 'name', sortDirection: 'asc' },
+      filters: {
+        configurationGuid: 'aa4cba4f-2506-462c-8e34-c45b21653988'
+      }
+    },
+    mockResponse: GlobalTestUtils.createSuccessResponse(
+      {
+        exportId: GlobalTestUtils.generateTestUUID(),
+        status: 'Processing',
+        estimatedCompletionTime: GlobalTestUtils.generateTestDate(),
+        downloadUrl: null
+      },
+      201
+    )
+  },
+  {
+    method: 'GET',
+    endpoint: `${Constants.DEFAULT_API_VERSION}/variation-opportunities/{configurationGuid}/getfilteroptions`,
+    description: 'Get filter options for utilization variation opportunities',
+    expectedStatus: [200, 404],
+    pathParams: { configurationGuid: GlobalTestUtils.defaultConfigurationGuid() },
+    mockResponse: GlobalTestUtils.createSuccessResponse({
+      caseTypes: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          name: 'Sample Case Type',
+          description: 'Sample case type description'
+        }
+      ],
+      costDrivers: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          name: 'Sample Cost Driver',
+          description: 'Sample cost driver description'
+        }
+      ],
+      entities: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          name: 'Sample Entity',
+          type: 'Organization'
+        }
+      ],
+      serviceLines: [
+        {
+          id: GlobalTestUtils.generateTestUUID(),
+          name: 'Sample Service Line',
+          description: 'Sample service line description'
+        }
+      ]
+    })
+  }
+];
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData.ts
new file mode 100644
index 0000000..5f013a5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData.ts
@@ -0,0 +1,1249 @@
+/**
+ * @fileoverview API Mock Data and Type Definitions
+ * @description Comprehensive mock data and TypeScript interfaces for Continuous Improvement API testing
+ * @version 2.0.0
+ * @since 1.0.0
+ * @author Strata Decision Technology
+ * @created 2024-10-15
+ * @modified 2025-12-31
+ *
+ * @module APIMockData
+ *
+ * @example
+ * ```typescript
+ * import { mockOpportunity, mockPagingOptions, IPagingOptions } from './mockData';
+ *
+ * const testData: IPagingOptions = mockPagingOptions;
+ * const sampleOpportunity = mockOpportunity;
+ * ```
+ */
+
+import { Constants } from '../../../helpers/globalTestUtils';
+
+/**
+ * @section Swagger Specification Interfaces
+ * @description TypeScript interfaces for parsing and working with Swagger/OpenAPI specifications
+ */
+
+/**
+ * @interface SwaggerPath
+ * @description Swagger path definition with HTTP methods
+ * @since 2.0.0
+ */
+export interface SwaggerPath {
+  get?: SwaggerOperation;
+  post?: SwaggerOperation;
+  put?: SwaggerOperation;
+  delete?: SwaggerOperation;
+}
+
+/**
+ * @interface SwaggerOperation
+ * @description Swagger operation definition
+ * @since 2.0.0
+ */
+export interface SwaggerOperation {
+  tags?: string[];
+  operationId?: string;
+  summary?: string;
+  description?: string;
+  parameters?: SwaggerParameter[];
+  requestBody?: SwaggerRequestBody;
+  responses: Record<string, SwaggerResponse>;
+}
+
+/**
+ * @interface SwaggerParameter
+ * @description Swagger parameter definition
+ * @since 2.0.0
+ */
+export interface SwaggerParameter {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  required?: boolean;
+  schema?: {
+    type?: string;
+    format?: string;
+    $ref?: string;
+  };
+}
+
+/**
+ * @interface SwaggerRequestBody
+ * @description Swagger request body definition
+ * @since 2.0.0
+ */
+export interface SwaggerRequestBody {
+  content?: Record<string, { schema?: any }>;
+  required?: boolean;
+}
+
+/**
+ * @interface SwaggerResponse
+ * @description Swagger response definition
+ * @since 2.0.0
+ */
+export interface SwaggerResponse {
+  description: string;
+  content?: Record<string, { schema?: any }>;
+}
+
+/**
+ * @function getEndpointTestData
+ * @description Helper function to retrieve test data for a specific controller and endpoint
+ * @param {string} controller - Controller name (e.g., 'AllOpportunities')
+ * @param {string} path - Endpoint path (e.g., `/api/${Constants.DEFAULT_API_VERSION}/all-opportunities`)
+ * @param {string} [method] - Optional HTTP method filter
+ * @returns {IEndpointTestData | undefined} Test data for the endpoint or undefined if not found
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * const testData = getEndpointTestData('AllOpportunities', `/api/${Constants.DEFAULT_API_VERSION}/all-opportunities', 'GET`);
+ * if (testData) {
+ *   await apiHelper.authenticatedGet(testData.path, testData.queryParams);
+ * }
+ * ```
+ */
+export const getEndpointTestData = (controller: string, path: string, method?: string): IEndpointTestData | undefined => {
+  const endpoints = ENDPOINT_TEST_DATA[controller];
+  if (!endpoints) return undefined;
+
+  return endpoints.find((endpoint) => endpoint.path === path && (!method || endpoint.method === method));
+};
+
+/**
+ * @function getAllEndpointsByMethod
+ * @description Get all endpoints filtered by HTTP method
+ * @param {string} method - HTTP method to filter by (GET, POST, PUT, DELETE)
+ * @returns {Array<IEndpointTestData & { controller: string }>} Array of endpoints with controller names
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * const allGetEndpoints = getAllEndpointsByMethod('GET');
+ * customLogger.log(`Found ${allGetEndpoints.length} GET endpoints`);
+ * ```
+ */
+export const getAllEndpointsByMethod = (method: 'GET' | 'POST' | 'PUT' | 'DELETE'): Array<IEndpointTestData & { controller: string }> => {
+  const results: Array<IEndpointTestData & { controller: string }> = [];
+
+  for (const [controller, endpoints] of Object.entries(ENDPOINT_TEST_DATA)) {
+    const filtered = endpoints.filter((endpoint) => endpoint.method === method).map((endpoint) => ({ ...endpoint, controller }));
+    results.push(...filtered);
+  }
+
+  return results;
+};
+
+/**
+ * @section API Data Interfaces
+ * @description Core interfaces for Continuous Improvement API domain models
+ */
+
+/**
+ * @interface IPagingOptions
+ * @description Pagination configuration for API requests
+ * @since 1.0.0
+ */
+export interface IPagingOptions {
+  /** Sort field name */
+  sortField: string;
+  /** Sort order (Asc or Desc) */
+  sortOrder: 'Asc' | 'Desc';
+  /** Starting index for pagination */
+  first: number;
+  /** Number of rows per page */
+  rows: number;
+}
+
+/**
+ * @interface IOpportunityFilters
+ * @description Base filtering options for opportunity searches
+ * @since 1.0.0
+ */
+export interface IOpportunityFilters {
+  /** Configuration GUID for filtering */
+  configurationGuid: string;
+  /** Array of opportunity types */
+  opportunityTypes?: string[];
+  /** Identified savings threshold */
+  identifiedSavings?: number | null;
+  /** View visible opportunities only */
+  viewVisible?: boolean;
+  /** Exclude initiatives from results */
+  excludeInitiatives?: boolean;
+  /** Search term for opportunity name/description */
+  opportunitySearch?: string;
+}
+
+/**
+ * @interface IInitiativeFilters
+ * @description Filtering options for initiative searches
+ * @since 1.0.0
+ */
+export interface IInitiativeFilters {
+  /** Configuration GUID for filtering */
+  configurationGuid: string;
+  /** Workstream filter */
+  workstreams?: string[];
+  /** Status filter */
+  statuses?: string[];
+}
+
+/**
+ * @interface IOpportunity
+ * @description Opportunity data structure
+ * @since 1.0.0
+ */
+export interface IOpportunity {
+  /** Unique identifier for the opportunity */
+  opportunityGuid: string;
+  /** Numeric ID */
+  opportunityId: number;
+  /** Opportunity name */
+  name: string;
+  /** Configuration GUID */
+  configurationGuid: string;
+  /** Identified savings amount */
+  identifiedSavings: number;
+  /** Whether opportunity has an associated initiative */
+  hasInitiative: boolean;
+  /** Whether opportunity is hidden */
+  isHidden: boolean;
+  /** Optional note */
+  note?: string;
+}
+
+/**
+ * @interface IInitiative
+ * @description Initiative data structure
+ * @since 1.0.0
+ */
+export interface IInitiative {
+  /** Unique identifier for the initiative */
+  initiativeGuid: string;
+  /** Initiative name */
+  name: string;
+  /** Configuration GUID */
+  configurationGuid: string;
+  /** Current status */
+  status: string;
+  /** Target savings amount */
+  targetSavings: number;
+  /** Actual savings amount */
+  actualSavings: number;
+  /** Owner user GUID */
+  ownerGuid?: string;
+  /** Executive sponsor user GUID */
+  executiveSponsorGuid?: string;
+}
+
+/**
+ * @interface IConfiguration
+ * @description Configuration data structure
+ * @since 1.0.0
+ */
+export interface IConfiguration {
+  /** Unique identifier for the configuration */
+  configurationGuid: string;
+  /** Configuration name */
+  name: string;
+  /** Database GUID */
+  databaseGuid: string;
+  /** Fiscal year */
+  fiscalYear: number;
+  /** Whether configuration is active */
+  isActive: boolean;
+}
+
+/**
+ * @interface IUser
+ * @description User data structure
+ * @since 1.0.0
+ */
+export interface IUser {
+  /** Unique identifier for the user */
+  userGuid: string;
+  /** User's full name */
+  name: string;
+  /** User's email address */
+  email: string;
+  /** Whether user is active */
+  isActive: boolean;
+  /** User roles */
+  roles?: string[];
+}
+
+export interface IPagingInfo {
+  totalNumberOfResults: number;
+  pageNumber: number;
+  pageSize: number;
+  totalNumberOfPages: number;
+}
+
+/**
+ * @interface IPagedApiResponse
+ * @description Generic paged API response structure
+ * @since 1.0.0
+ */
+export interface IPagedApiResponse<T> {
+  /** Array of result items */
+  data: T[];
+  /** Paging information */
+  pagingInfo: IPagingInfo;
+}
+
+/**
+ * @interface ILoadOptions
+ * @description Load options for paginated API requests
+ * @since 1.0.0
+ */
+export interface ILoadOptions {
+  /** Paging options */
+  pagingOptions: IPagingOptions;
+  /** Filter criteria */
+  filters: IOpportunityFilters | IInitiativeFilters | Record<string, any>;
+}
+
+/**
+ * @enum OpportunityType
+ * @description Types of opportunities in the system
+ * @since 1.0.0
+ */
+export enum OpportunityType {
+  ChargeCode = 'ChargeCode',
+  Encounter = 'Encounter',
+  FreeForm = 'FreeForm',
+  GeneralLedger = 'GeneralLedger',
+  Payroll = 'Payroll',
+  QualityVariation = 'QualityVariation',
+  Variation = 'Variation',
+  Exploration = 'Exploration'
+}
+
+/**
+ * @section Mock Data Constants
+ * @description Pre-configured mock data objects for consistent testing
+ */
+
+/**
+ * @constant mockPagingOptions
+ * @description Standard pagination configuration for test scenarios
+ * @type {IPagingOptions}
+ * @since 1.0.0
+ */
+export const mockPagingOptions: IPagingOptions = {
+  sortField: 'identifiedSavings',
+  sortOrder: 'Desc',
+  first: 0,
+  rows: 25
+};
+
+/**
+ * @constant mockConfigurationGuid
+ * @description Default configuration GUID for testing
+ * @since 1.0.0
+ */
+export const mockConfigurationGuid = 'aa4cba4f-2506-462c-8e34-c45b21653988';
+
+/**
+ * @constant mockOpportunityGuid
+ * @description Default opportunity GUID for testing
+ * @since 1.0.0
+ */
+export const mockOpportunityGuid = '00000000-0000-0000-0000-000000000001';
+
+/**
+ * @constant mockInitiativeGuid
+ * @description Default initiative GUID for testing
+ * @since 1.0.0
+ */
+export const mockInitiativeGuid = '00000000-0000-0000-0000-000000000002';
+
+/**
+ * @constant testUserGuid
+ * @description Test user GUID for API testing
+ * @since 2.0.0
+ */
+export const testUserGuid = '10101010-1111-0000-1111-101010101010';
+
+/**
+ * @constant testDatabaseGuid
+ * @description Test database GUID for API testing
+ * @since 2.0.0
+ */
+export const testDatabaseGuid = '00000000-0000-0000-0000-000000000003';
+
+// Mock Filter Options
+export const mockOpportunityFilters: IOpportunityFilters = {
+  configurationGuid: mockConfigurationGuid,
+  opportunityTypes: [],
+  identifiedSavings: null,
+  viewVisible: true,
+  excludeInitiatives: false,
+  opportunitySearch: ''
+};
+
+export const mockInitiativeFilters: IInitiativeFilters = {
+  configurationGuid: mockConfigurationGuid,
+  workstreams: [],
+  statuses: []
+};
+
+// Mock Data Objects
+export const mockOpportunity: IOpportunity = {
+  opportunityGuid: mockOpportunityGuid,
+  opportunityId: 12345,
+  name: 'Test Opportunity',
+  configurationGuid: mockConfigurationGuid,
+  identifiedSavings: 50000,
+  hasInitiative: false,
+  isHidden: false,
+  note: 'Test note'
+};
+
+export const mockInitiative: IInitiative = {
+  initiativeGuid: mockInitiativeGuid,
+  name: 'Test Initiative',
+  configurationGuid: mockConfigurationGuid,
+  status: 'Active',
+  targetSavings: 100000,
+  actualSavings: 75000,
+  ownerGuid: '10101010-1111-0000-1111-101010101010',
+  executiveSponsorGuid: '20202020-2222-0000-2222-202020202020'
+};
+
+export const mockConfiguration: IConfiguration = {
+  configurationGuid: mockConfigurationGuid,
+  name: 'Test Configuration',
+  databaseGuid: '00000000-0000-0000-0000-000000000003',
+  fiscalYear: 2024,
+  isActive: true
+};
+
+export const mockUser: IUser = {
+  userGuid: '10101010-1111-0000-1111-101010101010',
+  name: 'Test User',
+  email: 'test.user@example.com',
+  isActive: true,
+  roles: ['CostLeader', 'Owner']
+};
+
+// Mock Paged Responses
+export const mockPagedOpportunitiesResponse: IPagedApiResponse<IOpportunity> = {
+  data: [mockOpportunity],
+  pagingInfo: {
+    totalNumberOfResults: 1,
+    pageNumber: 1,
+    pageSize: 25,
+    totalNumberOfPages: 1
+  }
+};
+
+export const mockPagedInitiativesResponse: IPagedApiResponse<IInitiative> = {
+  data: [mockInitiative],
+  pagingInfo: {
+    totalNumberOfResults: 1,
+    pageNumber: 1,
+    pageSize: 25,
+    totalNumberOfPages: 1
+  }
+};
+
+export const mockPagedConfigurationsResponse: IPagedApiResponse<IConfiguration> = {
+  data: [mockConfiguration],
+  pagingInfo: {
+    totalNumberOfResults: 1,
+    pageNumber: 1,
+    pageSize: 25,
+    totalNumberOfPages: 1
+  }
+};
+
+export const mockPagedUsersResponse: IPagedApiResponse<IUser> = {
+  data: [mockUser],
+  pagingInfo: {
+    totalNumberOfResults: 1,
+    pageNumber: 1,
+    pageSize: 25,
+    totalNumberOfPages: 1
+  }
+};
+
+// Mock Job IDs for update operations
+export const mockJobId = 'job-12345-abcde';
+
+/**
+ * @constant testJobId
+ * @description Alias for mockJobId to maintain backward compatibility
+ * @since 2.0.0
+ * @deprecated Use mockJobId instead
+ */
+export const testJobId = mockJobId;
+
+/**
+ * @constant mockLoadOptions
+ * @description Standard load options for paginated API requests
+ * @since 1.0.0
+ */
+export const mockLoadOptions: ILoadOptions = {
+  pagingOptions: mockPagingOptions,
+  filters: mockOpportunityFilters
+};
+
+/**
+ * @function createMockFile
+ * @description Factory function to create mock File objects for upload testing
+ * @param {string} [name='test.gmdn'] - Filename for the mock file
+ * @param {string} [content='mock file content'] - Content of the mock file
+ * @returns {File} Mock File object ready for upload testing
+ * @since 1.0.0
+ *
+ * @example
+ * ```typescript
+ * const testFile = createMockFile('gmdn-data.txt', 'test data');
+ * // Use in file upload tests
+ * ```
+ *
+ * @testing Essential for file upload endpoint validation
+ * @browser_compatibility Creates proper File objects compatible with form data
+ * @note Only available in browser context. In Node.js, this will throw an error.
+ */
+export const createMockFile = (name: string = 'test.gmdn', content: string = 'mock file content'): any => {
+  if (typeof File === 'undefined' || typeof Blob === 'undefined') {
+    // Return a placeholder for Node.js environment
+    return { name, content, type: 'text/plain', _isFilePlaceholder: true };
+  }
+  const blob = new Blob([content], { type: 'text/plain' });
+  return new File([blob], name, { type: 'text/plain' });
+};
+
+/**
+ * @function createMockLoadOptions
+ * @description Factory function to create load options with custom filters
+ * @param {Partial<IPagingOptions>} [pagingOverrides] - Paging option overrides
+ * @param {Partial<IOpportunityFilters>} [filterOverrides] - Filter overrides
+ * @returns {ILoadOptions} Load options object
+ * @since 1.0.0
+ */
+export const createMockLoadOptions = (pagingOverrides?: Partial<IPagingOptions>, filterOverrides?: Partial<IOpportunityFilters>): ILoadOptions => ({
+  pagingOptions: { ...mockPagingOptions, ...pagingOverrides },
+  filters: { ...mockOpportunityFilters, ...filterOverrides }
+});
+
+// Opportunity type values for testing
+export const mockOpportunityTypes = [
+  OpportunityType.ChargeCode,
+  OpportunityType.Encounter,
+  OpportunityType.FreeForm,
+  OpportunityType.GeneralLedger,
+  OpportunityType.Payroll,
+  OpportunityType.QualityVariation,
+  OpportunityType.Variation,
+  OpportunityType.Exploration
+];
+
+/**
+ * @section Endpoint Test Data Dictionary
+ * @description Comprehensive test data for API endpoints organized by controller
+ */
+
+/**
+ * @interface IEndpointTestData
+ * @description Test data structure for individual API endpoints
+ * @since 2.0.0
+ */
+export interface IEndpointTestData {
+  /** API endpoint path (relative to base URL) */
+  path: string;
+  /** HTTP method (GET, POST, PUT, DELETE) */
+  method: 'GET' | 'POST' | 'PUT' | 'DELETE';
+  /** Path parameters (e.g., {id: '123'}) */
+  pathParams?: Record<string, string>;
+  /** Query parameters (e.g., {page: 1, size: 25}) */
+  queryParams?: Record<string, any>;
+  /** Request body for POST/PUT operations */
+  body?: any;
+  /** Description of what the endpoint does */
+  description?: string;
+  /** Optional timeout override in milliseconds */
+  timeout?: number;
+  /** Flag to indicate if the test should be skipped */
+  isSkipped?: boolean;
+}
+
+/**
+ * @constant ENDPOINT_TEST_DATA
+ * @description Dictionary of test data for all API endpoints, organized by controller
+ * @type {Record<string, IEndpointTestData[]>}
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * import { ENDPOINT_TEST_DATA } from './mockData';
+ *
+ * // Get test data for AllOpportunities controller
+ * const opportunitiesTests = ENDPOINT_TEST_DATA['AllOpportunities'];
+ *
+ * // Use in test
+ * for (const testData of opportunitiesTests) {
+ *   await apiHelper.authenticatedGet(testData.path, testData.queryParams);
+ * }
+ * ```
+ */
+export const ENDPOINT_TEST_DATA: Record<string, IEndpointTestData[]> = {
+  AllOpportunities: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/all-opportunities`,
+      method: 'POST',
+      body: {
+        pagingOptions: {
+          sortField: 'IdentifiedSavings',
+          sortOrder: 'Asc',
+          first: 0,
+          rows: 100
+        },
+        filters: {
+          configurationGuid: mockConfigurationGuid,
+          identifiedSavings: 0,
+          viewVisible: true
+        }
+      },
+      description: 'Get all opportunities with pagination'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/all-opportunities/export`,
+      method: 'POST',
+      body: {
+        configurationGuid: mockConfigurationGuid,
+        opportunityTypes: [],
+        columns: ['name', 'identifiedSavings']
+      },
+      description: 'Export all opportunities to Excel'
+    }
+  ],
+
+  BackgroundClientJob: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/background-jobs/{jobId}`,
+      method: 'GET',
+      pathParams: { jobId: testJobId },
+      description: 'Get background job status'
+    }
+  ],
+
+  ChargeCodeInitiatives: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/charge-code-initiatives`,
+      method: 'GET',
+      queryParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Get all charge code initiatives'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/charge-code-initiatives/{initiativeGuid}`,
+      method: 'GET',
+      pathParams: { initiativeGuid: mockInitiativeGuid },
+      description: 'Get specific charge code initiative'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/charge-code-initiatives`,
+      method: 'POST',
+      body: {
+        configurationGuid: mockConfigurationGuid,
+        name: 'Test Charge Code Initiative',
+        targetSavings: 100000,
+        status: 'Active'
+      },
+      description: 'Create new charge code initiative'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/charge-code-initiatives/{initiativeGuid}`,
+      method: 'PUT',
+      pathParams: { initiativeGuid: mockInitiativeGuid },
+      body: {
+        name: 'Updated Initiative',
+        targetSavings: 150000,
+        status: 'Active'
+      },
+      description: 'Update charge code initiative'
+    }
+  ],
+
+  ChargeCodeOpportunities: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/charge-code-opportunities`,
+      method: 'POST',
+      body: {
+        pagingOptions: mockPagingOptions,
+        filters: {
+          configurationGuid: mockConfigurationGuid,
+          opportunityTypes: [],
+          identifiedSavings: null,
+          viewVisible: true
+        }
+      },
+      description: 'Get paginated charge code opportunities'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/{opportunityGuid}`,
+      method: 'GET',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      description: 'Get specific charge code opportunity'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/charge-code-opportunities/{opportunityGuid}/visibility`,
+      method: 'PUT',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      body: { isHidden: false },
+      description: 'Update opportunity visibility'
+    }
+  ],
+
+  ChargeCodeOpportunityDetails: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/charge-code-opportunity-details/{opportunityGuid}`,
+      method: 'GET',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      description: 'Get charge code opportunity details'
+    }
+  ],
+
+  ChargeCodeOpps: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/charge-code-opps/summary`,
+      method: 'GET',
+      queryParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Get charge code opportunities summary'
+    }
+  ],
+
+  ClientNetworkOpportunities: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/client-network-opportunities`,
+      method: 'GET',
+      queryParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Get client network opportunities'
+    }
+  ],
+
+  ClientWarehouses: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/client-warehouses`,
+      method: 'GET',
+      queryParams: { databaseGuid: testDatabaseGuid },
+      description: 'Get all client warehouses'
+    }
+  ],
+
+  Configurations: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/configurations`,
+      method: 'GET',
+      queryParams: { databaseGuid: testDatabaseGuid },
+      description: 'Get all configurations for database'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/configurations/{configurationGuid}`,
+      method: 'GET',
+      pathParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Get specific configuration'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/configurations`,
+      method: 'POST',
+      body: {
+        name: 'Test Configuration',
+        databaseGuid: testDatabaseGuid,
+        fiscalYear: 2024,
+        isActive: true
+      },
+      description: 'Create new configuration'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/configurations/{configurationGuid}`,
+      method: 'PUT',
+      pathParams: { configurationGuid: mockConfigurationGuid },
+      body: {
+        name: 'Updated Configuration',
+        fiscalYear: 2025,
+        isActive: true
+      },
+      description: 'Update configuration'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/configurations/{configurationGuid}`,
+      method: 'DELETE',
+      pathParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Delete configuration'
+    }
+  ],
+
+  EncounterOpportunities: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/encounter-opportunities`,
+      method: 'POST',
+      body: {
+        pagingOptions: mockPagingOptions,
+        filters: {
+          configurationGuid: mockConfigurationGuid,
+          viewVisible: true
+        }
+      },
+      description: 'Get paginated encounter opportunities'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/encounter-opportunities/{opportunityGuid}`,
+      method: 'GET',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      description: 'Get specific encounter opportunity'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/encounter-opportunities/{opportunityGuid}/visibility`,
+      method: 'PUT',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      body: { isHidden: false },
+      description: 'Update encounter opportunity visibility'
+    }
+  ],
+
+  ExplorationPopulations: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/exploration-populations`,
+      method: 'GET',
+      queryParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Get exploration populations'
+    }
+  ],
+
+  Exploration: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/exploration/analyze`,
+      method: 'POST',
+      body: {
+        configurationGuid: mockConfigurationGuid,
+        populationId: '123',
+        filters: {}
+      },
+      description: 'Analyze exploration data'
+    }
+  ],
+
+  Filters: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/filters/opportunity-types`,
+      method: 'GET',
+      queryParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Get available opportunity type filters'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/filters/workstreams`,
+      method: 'GET',
+      queryParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Get available workstream filters'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/filters/statuses`,
+      method: 'GET',
+      description: 'Get available status filters'
+    }
+  ],
+
+  FreeFormOpportunities: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/free-form-opportunities`,
+      method: 'POST',
+      body: {
+        pagingOptions: mockPagingOptions,
+        filters: {
+          configurationGuid: mockConfigurationGuid,
+          viewVisible: true
+        }
+      },
+      description: 'Get paginated free form opportunities'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/free-form-opportunities`,
+      method: 'POST',
+      body: {
+        configurationGuid: mockConfigurationGuid,
+        name: 'Test Free Form Opportunity',
+        identifiedSavings: 25000,
+        description: 'Test description'
+      },
+      description: 'Create free form opportunity'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/free-form-opportunities/{opportunityGuid}`,
+      method: 'GET',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      description: 'Get specific free form opportunity'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/free-form-opportunities/{opportunityGuid}`,
+      method: 'PUT',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      body: {
+        name: 'Updated Free Form Opportunity',
+        identifiedSavings: 30000
+      },
+      description: 'Update free form opportunity'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/free-form-opportunities/{opportunityGuid}`,
+      method: 'DELETE',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      description: 'Delete free form opportunity'
+    }
+  ],
+
+  GeneralLedgerOpportunities: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/general-ledger-opportunities`,
+      method: 'POST',
+      body: {
+        pagingOptions: mockPagingOptions,
+        filters: {
+          configurationGuid: mockConfigurationGuid,
+          viewVisible: true
+        }
+      },
+      description: 'Get paginated general ledger opportunities'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/general-ledger-opportunities/{opportunityGuid}`,
+      method: 'GET',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      description: 'Get specific general ledger opportunity'
+    }
+  ],
+
+  GudidFile: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/gudid-file/upload`,
+      method: 'POST',
+      body: {
+        fileName: 'gudid.txt',
+        fileContent: 'test gudid data'
+      },
+      description: 'Upload GUDID file'
+    }
+  ],
+
+  Hangfire: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/hangfire/jobs`,
+      method: 'GET',
+      description: 'Get Hangfire job information'
+    }
+  ],
+
+  Initiatives: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/initiatives`,
+      method: 'POST',
+      body: {
+        pagingOptions: mockPagingOptions,
+        filters: {
+          configurationGuid: mockConfigurationGuid,
+          workstreams: [],
+          statuses: []
+        }
+      },
+      description: 'Get paginated initiatives'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/initiatives/{initiativeGuid}`,
+      method: 'GET',
+      pathParams: { initiativeGuid: mockInitiativeGuid },
+      description: 'Get specific initiative'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/initiatives`,
+      method: 'POST',
+      body: {
+        configurationGuid: mockConfigurationGuid,
+        name: 'Test Initiative',
+        targetSavings: 100000,
+        status: 'Active',
+        workstream: 'Cost Reduction'
+      },
+      description: 'Create new initiative'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/initiatives/{initiativeGuid}`,
+      method: 'PUT',
+      pathParams: { initiativeGuid: mockInitiativeGuid },
+      body: {
+        name: 'Updated Initiative',
+        targetSavings: 150000,
+        actualSavings: 75000,
+        status: 'Active'
+      },
+      description: 'Update initiative'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/initiatives/{initiativeGuid}`,
+      method: 'DELETE',
+      pathParams: { initiativeGuid: mockInitiativeGuid },
+      description: 'Delete initiative'
+    }
+  ],
+
+  MappedColumns: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/mapped-columns`,
+      method: 'GET',
+      queryParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Get mapped columns configuration'
+    }
+  ],
+
+  PayrollOpportunities: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/payroll-opportunities`,
+      method: 'POST',
+      body: {
+        pagingOptions: mockPagingOptions,
+        filters: {
+          configurationGuid: mockConfigurationGuid,
+          viewVisible: true
+        }
+      },
+      description: 'Get paginated payroll opportunities'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/payroll-opportunities/{opportunityGuid}`,
+      method: 'GET',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      description: 'Get specific payroll opportunity'
+    }
+  ],
+
+  PickerItems: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/picker-items/users`,
+      method: 'GET',
+      queryParams: { search: 'test' },
+      description: 'Search for users in picker'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/picker-items/workstreams`,
+      method: 'GET',
+      description: 'Get workstreams for picker'
+    }
+  ],
+
+  QualityVariationItemBreakdowns: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/quality-variation-item-breakdowns/{itemGuid}`,
+      method: 'GET',
+      pathParams: { itemGuid: mockOpportunityGuid },
+      description: 'Get quality variation item breakdown'
+    }
+  ],
+
+  QualityVariationItemEvents: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/quality-variation-item-events/{itemGuid}`,
+      method: 'GET',
+      pathParams: { itemGuid: mockOpportunityGuid },
+      description: 'Get quality variation item events'
+    }
+  ],
+
+  QualityVariationItemOpportunities: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/quality-variation-item-opportunities`,
+      method: 'POST',
+      body: {
+        pagingOptions: mockPagingOptions,
+        filters: { configurationGuid: mockConfigurationGuid }
+      },
+      description: 'Get paginated quality variation item opportunities'
+    }
+  ],
+
+  QualityVariationOpportunities: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/quality-variation-opportunities`,
+      method: 'POST',
+      body: {
+        pagingOptions: mockPagingOptions,
+        filters: {
+          configurationGuid: mockConfigurationGuid,
+          viewVisible: true
+        }
+      },
+      description: 'Get paginated quality variation opportunities'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/quality-variation-opportunities/{opportunityGuid}`,
+      method: 'GET',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      description: 'Get specific quality variation opportunity'
+    }
+  ],
+
+  Reports: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/reports/opportunities-summary`,
+      method: 'GET',
+      queryParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Get opportunities summary report'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/reports/initiatives-summary`,
+      method: 'GET',
+      queryParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Get initiatives summary report'
+    }
+  ],
+
+  Security: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/security/permissions`,
+      method: 'GET',
+      description: 'Get current user permissions'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/security/roles`,
+      method: 'GET',
+      description: 'Get available roles'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/security/users/{userGuid}/roles`,
+      method: 'GET',
+      pathParams: { userGuid: testUserGuid },
+      description: 'Get roles for specific user'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/security/users/{userGuid}/roles`,
+      method: 'PUT',
+      pathParams: { userGuid: testUserGuid },
+      body: {
+        roles: ['CostLeader', 'Owner']
+      },
+      description: 'Update user roles'
+    }
+  ],
+
+  Settings: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/settings`,
+      method: 'GET',
+      queryParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Get configuration settings'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/settings`,
+      method: 'PUT',
+      body: {
+        configurationGuid: mockConfigurationGuid,
+        settings: {
+          enableNotifications: true,
+          defaultWorkstream: 'Cost Reduction'
+        }
+      },
+      description: 'Update configuration settings'
+    }
+  ],
+
+  StrategicOpportunities: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/strategic-opportunities`,
+      method: 'POST',
+      body: {
+        pagingOptions: mockPagingOptions,
+        filters: {
+          configurationGuid: mockConfigurationGuid,
+          viewVisible: true
+        }
+      },
+      description: 'Get paginated strategic opportunities'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/strategic-opportunities/{opportunityGuid}`,
+      method: 'GET',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      description: 'Get specific strategic opportunity'
+    }
+  ],
+
+  Users: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/users`,
+      method: 'GET',
+      queryParams: { search: 'test', pageSize: 25 },
+      description: 'Search for users'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/users/{userGuid}`,
+      method: 'GET',
+      pathParams: { userGuid: testUserGuid },
+      description: 'Get specific user'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/users/current`,
+      method: 'GET',
+      description: 'Get current authenticated user'
+    }
+  ],
+
+  UtilizationVariationOpportunities: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/utilization-variation-opportunities`,
+      method: 'POST',
+      body: {
+        pagingOptions: mockPagingOptions,
+        filters: {
+          configurationGuid: mockConfigurationGuid,
+          viewVisible: true
+        }
+      },
+      description: 'Get paginated utilization variation opportunities'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/utilization-variation-opportunities/{opportunityGuid}`,
+      method: 'GET',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      description: 'Get specific utilization variation opportunity'
+    }
+  ],
+
+  VariationCaseTypes: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/variation-case-types`,
+      method: 'GET',
+      queryParams: { configurationGuid: mockConfigurationGuid },
+      description: 'Get variation case types'
+    }
+  ],
+
+  VariationOpportunities: [
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/variation-opportunities`,
+      method: 'POST',
+      body: {
+        pagingOptions: mockPagingOptions,
+        filters: {
+          configurationGuid: mockConfigurationGuid,
+          viewVisible: true
+        }
+      },
+      description: 'Get paginated variation opportunities'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/variation-opportunities/{opportunityGuid}`,
+      method: 'GET',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      description: 'Get specific variation opportunity'
+    },
+    {
+      path: `/api/${Constants.DEFAULT_API_VERSION}/variation-opportunities/{opportunityGuid}/details`,
+      method: 'GET',
+      pathParams: { opportunityGuid: mockOpportunityGuid },
+      description: 'Get variation opportunity details'
+    }
+  ]
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/chargeCodeOpportunityData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/chargeCodeOpportunityData.ts
new file mode 100644
index 0000000..62d679b
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/chargeCodeOpportunityData.ts
@@ -0,0 +1,12 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const chargeCodeOpportunityData = {
+  opportunityGuid: GlobalTestUtils.generateTestUUID(),
+  name: 'Test Charge Code Opportunity',
+  costDriver: 'Supply',
+  identifiedSavings: 25000,
+  chargeCodes: ['12345', '67890'],
+  departments: ['Cardiology', 'Surgery'],
+  entityGuid: GlobalTestUtils.generateTestUUID(),
+  configurationGuid: GlobalTestUtils.generateTestUUID()
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/clientWarehouseData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/clientWarehouseData.ts
new file mode 100644
index 0000000..2c87815
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/clientWarehouseData.ts
@@ -0,0 +1,14 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const clientWarehouseData = {
+  id: 1,
+  databaseGuid: GlobalTestUtils.generateTestUUID(),
+  name: 'Test Hospital Warehouse',
+  description: 'Test hospital data warehouse',
+  connectionString: 'Server=test;Database=TestHospital;',
+  isActive: true,
+  createdDate: '2023-01-01T00:00:00Z',
+  lastSyncDate: '2023-12-01T10:00:00Z',
+  status: 'Active',
+  version: '1.0.0'
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/encounterOpportunityData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/encounterOpportunityData.ts
new file mode 100644
index 0000000..12efd37
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/encounterOpportunityData.ts
@@ -0,0 +1,15 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const encounterOpportunityData = {
+  opportunityGuid: GlobalTestUtils.generateTestUUID(),
+  name: 'Test Encounter Opportunity',
+  costDriver: 'LengthOfStay',
+  identifiedSavings: 35000,
+  caseTypes: ['Cardiac Surgery', 'Orthopedic Surgery'],
+  configurationGuid: GlobalTestUtils.generateTestUUID(),
+  entityGuid: GlobalTestUtils.generateTestUUID(),
+  encounterOpportunityJSON: JSON.stringify({
+    baseline: { averageLOS: 4.5, cost: 12000 },
+    target: { averageLOS: 3.8, cost: 10000 }
+  })
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/explorationData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/explorationData.ts
new file mode 100644
index 0000000..029f719
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/explorationData.ts
@@ -0,0 +1,18 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const explorationData = {
+  configurationGuid: GlobalTestUtils.generateTestUUID(),
+  caseTypeFamilyId: 1,
+  name: 'Cardiac Surgery Exploration',
+  description: 'Analysis of cardiac surgery cases',
+  costDriver: 'Length of Stay'
+};
+
+export const caseTypeFamilySummary = {
+  caseTypeFamilyId: 1,
+  name: 'Cardiac Surgery',
+  totalCases: 150,
+  averageCost: 50000.0,
+  totalVariation: 25000.0,
+  opportunityValue: 20000.0
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/explorationPopulationData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/explorationPopulationData.ts
new file mode 100644
index 0000000..caf4006
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/explorationPopulationData.ts
@@ -0,0 +1,27 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const explorationPopulationData = {
+  explorationPopulationId: 1,
+  name: 'Test Population',
+  caseTypeFamilyId: 1,
+  costDriver: 'Length of Stay',
+  losExclusionType: 1,
+  losExclusionValue: 30.0,
+  costExclusionType: 1,
+  costExclusionValue: 100000.0,
+  filtersJSON: '{}',
+  totalEncounters: 150,
+  totalVariation: 25000.0,
+  codeType: 1,
+  strataId: 12345
+};
+
+export const explorationPopulationDto = {
+  explorationPopulationId: 1,
+  name: 'Test Population DTO',
+  caseTypeFamilyId: 1,
+  costDriver: 'Length of Stay',
+  filtersJSON: '{"filters": []}',
+  totalEncounters: 200,
+  totalVariation: 35000.0
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/freeFormOpportunityData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/freeFormOpportunityData.ts
new file mode 100644
index 0000000..df0ed1e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/freeFormOpportunityData.ts
@@ -0,0 +1,15 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const freeFormOpportunityData = {
+  opportunityGuid: GlobalTestUtils.generateTestUUID(),
+  name: 'Test Free Form Opportunity',
+  description: 'Test free form opportunity description',
+  configurationGuid: GlobalTestUtils.generateTestUUID(),
+  entityId: 1,
+  improvementType: 'Cost',
+  metricType: 'Revenue',
+  metricNumerator: 'Revenue',
+  metricDenominator: 'Cases',
+  identifiedSavings: 15000,
+  isHidden: false
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/generalLedgerOpportunityData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/generalLedgerOpportunityData.ts
new file mode 100644
index 0000000..230a1a7
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/generalLedgerOpportunityData.ts
@@ -0,0 +1,17 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const generalLedgerOpportunityData = {
+  opportunityGuid: GlobalTestUtils.generateTestUUID(),
+  configurationGuid: GlobalTestUtils.generateTestUUID(),
+  department: 'Cardiology',
+  account: '60100',
+  accountDescription: 'Medical Supplies',
+  dailyBudgetAmount: 1500.0,
+  actualDailyAmount: 1200.0,
+  variance: -300.0,
+  variancePercentage: -20.0,
+  yearToDateBudget: 547500.0,
+  yearToDateActual: 438000.0,
+  monthlyBudget: 45000.0,
+  monthlyActual: 36000.0
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/index.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/index.ts
new file mode 100644
index 0000000..13fee9f
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/index.ts
@@ -0,0 +1,20 @@
+/**
+ * Centralized export for all mock data objects
+ *
+ * Usage:
+ *   import { chargeCodeOpportunityData, userData } from './mockData';
+ */
+
+export { chargeCodeOpportunityData } from './chargeCodeOpportunityData';
+export { clientWarehouseData } from './clientWarehouseData';
+export { encounterOpportunityData } from './encounterOpportunityData';
+export { caseTypeFamilySummary, explorationData } from './explorationData';
+export { explorationPopulationData, explorationPopulationDto } from './explorationPopulationData';
+export { freeFormOpportunityData } from './freeFormOpportunityData';
+export { generalLedgerOpportunityData } from './generalLedgerOpportunityData';
+export { initiativeData } from './initiativeData';
+export { payrollOpportunityData } from './payrollOpportunityData';
+export { qualityVariationOpportunityData } from './qualityVariationOpportunityData';
+export { identityData, permissionData } from './securityData';
+export { userData, userGroupData } from './userData';
+export { utilizationVariationOpportunityData } from './utilizationVariationOpportunityData';
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/initiativeData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/initiativeData.ts
new file mode 100644
index 0000000..8e23189
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/initiativeData.ts
@@ -0,0 +1,19 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const initiativeData = {
+  initiativeGuid: GlobalTestUtils.generateTestUUID(),
+  name: 'Test Initiative',
+  opportunityGuid: GlobalTestUtils.generateTestUUID(),
+  costDriver: 'Supply',
+  trackingStart: '2023-01-01',
+  startMonth: '2023-01',
+  endMonth: '2023-12',
+  goalStatement: 'Reduce supply costs by 10%',
+  workstream: 'Cost Reduction',
+  plannedImprovements: 'Standardize supply usage',
+  costLeader: GlobalTestUtils.generateTestUUID(),
+  owner: GlobalTestUtils.generateTestUUID(),
+  executiveSponsor: GlobalTestUtils.generateTestUUID(),
+  isFinalized: false,
+  isLocked: false
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/payrollOpportunityData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/payrollOpportunityData.ts
new file mode 100644
index 0000000..9de5dd0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/payrollOpportunityData.ts
@@ -0,0 +1,20 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const payrollOpportunityData = {
+  opportunityGuid: GlobalTestUtils.generateTestUUID(),
+  configurationGuid: GlobalTestUtils.generateTestUUID(),
+  department: 'Nursing',
+  positionType: 'RN',
+  positionDescription: 'Registered Nurse',
+  budgetedFTE: 25.0,
+  actualFTE: 28.5,
+  fteVariance: 3.5,
+  fteVariancePercentage: 14.0,
+  budgetedHours: 52000,
+  actualHours: 59280,
+  hoursVariance: 7280,
+  budgetedAmount: 2600000.0,
+  actualAmount: 2964000.0,
+  amountVariance: 364000.0,
+  averageHourlyRate: 50.0
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/qualityVariationOpportunityData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/qualityVariationOpportunityData.ts
new file mode 100644
index 0000000..8648283
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/qualityVariationOpportunityData.ts
@@ -0,0 +1,21 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const qualityVariationOpportunityData = {
+  opportunityGuid: GlobalTestUtils.generateTestUUID(),
+  configurationGuid: GlobalTestUtils.generateTestUUID(),
+  measureName: 'Hospital Acquired Infections',
+  measureCode: 'HAI-001',
+  department: 'ICU',
+  currentRate: 3.2,
+  benchmarkRate: 1.8,
+  targetRate: 2.0,
+  variance: 1.4,
+  variancePercentage: 77.8,
+  caseCount: 150,
+  affectedCases: 5,
+  estimatedCostPerCase: 25000.0,
+  totalEstimatedCost: 125000.0,
+  potentialSavings: 87500.0,
+  riskLevel: 'High',
+  priorityScore: 8.5
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/securityData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/securityData.ts
new file mode 100644
index 0000000..a0986b8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/securityData.ts
@@ -0,0 +1,20 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const permissionData = {
+  lootId: GlobalTestUtils.generateTestUUID(),
+  canRead: true,
+  canWrite: false,
+  canDelete: false,
+  canAdmin: false,
+  module: 'Opportunities',
+  description: 'Read access to opportunities'
+};
+
+export const identityData = {
+  id: GlobalTestUtils.generateTestUUID(),
+  name: 'John Doe',
+  type: 'User',
+  email: 'john.doe@example.com',
+  isActive: true,
+  globalId: 'CCI - Basic User'
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/userData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/userData.ts
new file mode 100644
index 0000000..9ba40ad
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/userData.ts
@@ -0,0 +1,20 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const userData = {
+  userGuid: GlobalTestUtils.generateTestUUID(),
+  firstName: 'John',
+  lastName: 'Doe',
+  email: 'john.doe@example.com',
+  displayName: 'John Doe',
+  globalId: 'CCI - Basic User',
+  isActive: true,
+  lastLoginDate: '2023-12-01T10:00:00Z'
+};
+
+export const userGroupData = {
+  globalId: 'CCI - System Administrator',
+  name: 'System Administrator',
+  description: 'Full system access',
+  isAdmin: true,
+  userCount: 5
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/utilizationVariationOpportunityData.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/utilizationVariationOpportunityData.ts
new file mode 100644
index 0000000..3b4ab58
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/mockData/utilizationVariationOpportunityData.ts
@@ -0,0 +1,22 @@
+import { GlobalTestUtils } from '../../../../helpers/globalTestUtils';
+
+export const utilizationVariationOpportunityData = {
+  opportunityGuid: GlobalTestUtils.generateTestUUID(),
+  configurationGuid: GlobalTestUtils.generateTestUUID(),
+  resourceType: 'OR Suite',
+  resourceName: 'Operating Room 5',
+  department: 'Surgery',
+  currentUtilization: 65.5,
+  benchmarkUtilization: 85.0,
+  targetUtilization: 80.0,
+  utilizationGap: 19.5,
+  availableHours: 2080,
+  usedHours: 1362,
+  unutilizedHours: 718,
+  potentialAdditionalCases: 35,
+  revenuePerCase: 15000.0,
+  potentialRevenue: 525000.0,
+  resourceCostPerHour: 250.0,
+  opportunityValue: 350000.0,
+  priorityScore: 7.8
+};
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/swaggerEndPointReport.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/swaggerEndPointReport.ts
new file mode 100644
index 0000000..8ec17fe
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/swaggerEndPointReport.ts
@@ -0,0 +1,676 @@
+/**
+ * @fileoverview Swagger Endpoint Coverage Report Generator
+ * @description Class for analyzing and reporting Swagger endpoint test coverage
+ * @version 1.0.0
+ * @since 2026-01-16
+ * @author Strata Decision Technology
+ *
+ * @module SwaggerEndPointReport
+ * @requires ../../customLogger
+ * @requires ../../playwright.config.shared
+ * @requires ../helpers/globalTestUtils
+ * @requires ./apiEndpointTestData
+ * @requires ./mockData
+ *
+ * @example
+ * ```typescript
+ * import { SwaggerEndPointReport } from './helpers/swaggerEndPointReport';
+ *
+ * const reportGenerator = new SwaggerEndPointReport();
+ * const swaggerSpec = await reportGenerator.fetchSwaggerSpec(request, jwt);
+ * const report = reportGenerator.generateCoverageReport(swaggerSpec);
+ * ```
+ */
+
+import { customLogger } from '../../../customLogger';
+import { Constants } from '../../../helpers/globalTestUtils';
+import { ENVIRONMENT_CONFIGS, EnvironmentType } from '../../../playwright.config.shared';
+import { ENDPOINT_TEST_DATA, SwaggerOperation, SwaggerPath } from './mockData';
+
+/**
+ * @interface EndpointKey
+ * @description Unique identifier for an API endpoint
+ */
+export interface EndpointKey {
+  path: string;
+  method: string;
+  controller: string;
+}
+
+/**
+ * @interface MissingEndpoint
+ * @description Details of an endpoint missing test coverage
+ */
+export interface MissingEndpoint extends EndpointKey {
+  description?: string;
+  operationId?: string;
+  hasMockData: boolean;
+  hasTest: boolean;
+  coverageSource?: 'mockData' | 'apiEndpointTestData' | 'both';
+}
+
+/**
+ * @interface CoverageReport
+ * @description Complete coverage analysis report
+ */
+export interface CoverageReport {
+  totalSwaggerEndpoints: number;
+  totalMockDataEntries: number;
+  endpointsWithMockData: number;
+  endpointsWithoutMockData: number;
+  missingEndpoints: MissingEndpoint[];
+  coveredEndpoints: MissingEndpoint[];
+  coveragePercentage: number;
+  byController: Record<
+    string,
+    {
+      totalEndpoints: number;
+      coveredEndpoints: number;
+      missingEndpoints: MissingEndpoint[];
+      covered: MissingEndpoint[];
+    }
+  >;
+}
+
+/**
+ * @class SwaggerEndPointReport
+ * @description Handles Swagger endpoint coverage analysis and report generation
+ */
+export class SwaggerEndPointReport {
+  private swaggerBaseUrl: string = '';
+
+  /**
+   * @method normalizeEndpointPath
+   * @description Normalizes an endpoint path for comparison
+   * @param {string} path - Raw endpoint path
+   * @returns {string} Normalized path
+   */
+  public normalizeEndpointPath(path: string): string {
+    // Remove leading/trailing slashes
+    let normalized = path.trim().replace(/^\/+|\/+$/g, '');
+
+    // Ensure it starts with api/v1 or api/V1
+    if (!normalized.startsWith('api/')) {
+      normalized = `api/${Constants.DEFAULT_API_VERSION}/${normalized}`;
+    }
+
+    // Normalize to lowercase for version
+    normalized = normalized.replace(/api\/V1\//i, `api/${Constants.DEFAULT_API_VERSION}/`);
+
+    return normalized;
+  }
+
+  /**
+   * @method getEndpointKey
+   * @description Creates a unique key for endpoint comparison
+   * @param {string} path - Endpoint path
+   * @param {string} method - HTTP method
+   * @returns {string} Unique endpoint key
+   */
+  public getEndpointKey(path: string, method: string): string {
+    return `${method.toUpperCase()}:${this.normalizeEndpointPath(path)}`;
+  }
+
+  /**
+   * @method fetchSwaggerSpec
+   * @description Fetches and parses the Swagger specification with authentication
+   * @param {any} request - Playwright request context
+   * @param {string} [jwt] - Optional JWT token for authenticated requests
+   * @returns {Promise<any>} Parsed Swagger specification
+   */
+  async fetchSwaggerSpec(request: any, jwt?: string): Promise<any> {
+    const swaggerURL = process.env.SWAGGER_URL || ENVIRONMENT_CONFIGS[EnvironmentType.REMOTE].swaggerURL;
+    customLogger.log(`📥 Fetching Swagger spec from: ${swaggerURL}`);
+
+    // Store base URL for generating Swagger UI links
+    this.swaggerBaseUrl = swaggerURL.replace(/\/swagger\/.*$/i, '');
+
+    const headers: Record<string, string> = {};
+    if (jwt) {
+      headers['Authorization'] = `Bearer ${jwt}`;
+    }
+
+    const response = await request.get(swaggerURL, {
+      timeout: 600_000,
+      headers
+    });
+    if (!response.ok()) {
+      throw new Error(`Failed to fetch Swagger spec: ${response.status()} ${response.statusText()}`);
+    }
+
+    const spec = await response.json();
+    customLogger.log(`✅ Loaded Swagger spec version: ${spec.info?.version}`);
+    return spec;
+  }
+
+  /**
+   * @method getSwaggerUILink
+   * @description Generates a link to the Swagger UI for a specific endpoint
+   * @param {string} method - HTTP method
+   * @param {string} path - Endpoint path
+   * @param {string} controller - Controller/tag name
+   * @returns {string} Swagger UI link
+   */
+  private getSwaggerUILink(method: string, path: string, controller: string): string {
+    if (!this.swaggerBaseUrl) {
+      return '#';
+    }
+
+    // Convert path to Swagger UI anchor format
+    // Example: /api/v1/all-opportunities -> api_v1_all_opportunities
+    const pathForAnchor = path
+      .replace(/^\//, '') // Remove leading slash
+      .replace(/\//g, '_') // Replace slashes with underscores
+      .replace(/\{/g, '') // Remove opening braces
+      .replace(/\}/g, '') // Remove closing braces
+      .replace(/-/g, '_'); // Replace hyphens with underscores
+
+    // Swagger UI format: #/{Controller}/{method}_{path}
+    const anchor = `#/${controller}/${method.toLowerCase()}_${pathForAnchor}`;
+
+    return `${this.swaggerBaseUrl}/index.html${anchor}`;
+  }
+
+  /**
+   * @method extractSwaggerEndpoints
+   * @description Extracts all endpoints from Swagger specification
+   * @param {any} spec - Swagger specification
+   * @returns {Map<string, EndpointKey>} Map of endpoint keys to endpoint details
+   */
+  private extractSwaggerEndpoints(spec: any): Map<string, EndpointKey> {
+    const endpoints = new Map<string, EndpointKey>();
+    const SUPPORTED_HTTP_METHODS = ['get', 'post', 'put', 'delete'] as const;
+
+    Object.entries(spec.paths as Record<string, SwaggerPath>).forEach(([path, pathItem]) => {
+      Object.entries(pathItem).forEach(([method, operation]) => {
+        if (SUPPORTED_HTTP_METHODS.includes(method as any) && operation) {
+          const op = operation as SwaggerOperation;
+          const tags = op.tags || ['Untagged'];
+          const controller = tags[0]; // Use first tag as controller name
+
+          const key = this.getEndpointKey(path, method);
+          endpoints.set(key, {
+            path,
+            method: method.toUpperCase(),
+            controller
+          });
+        }
+      });
+    });
+
+    return endpoints;
+  }
+
+  /**
+   * @method extractMockDataEndpoints
+   * @description Extracts all endpoints defined in ENDPOINT_TEST_DATA
+   * @returns {Map<string, EndpointKey>} Map of endpoint keys to endpoint details
+   */
+  private extractMockDataEndpoints(): Map<string, EndpointKey> {
+    const endpoints = new Map<string, EndpointKey>();
+
+    Object.entries(ENDPOINT_TEST_DATA).forEach(([controller, endpointDataArray]) => {
+      endpointDataArray.forEach((endpointData) => {
+        const key = this.getEndpointKey(endpointData.path, endpointData.method);
+        endpoints.set(key, {
+          path: endpointData.path,
+          method: endpointData.method,
+          controller
+        });
+      });
+    });
+
+    return endpoints;
+  }
+
+  /**
+   * @method extractApiEndpointTestData
+   * @description Extracts all endpoints from the provided test arrays and normalizes them for comparison with Swagger spec
+   * @param {Array<{name: string, tests: any[]}>} testArrays - Array of test collections with their controller names and test definitions
+   * @returns {Map<string, EndpointKey>} Map of endpoint keys to endpoint details
+   */
+  private extractApiEndpointTestData(testArrays: Array<{ name: string; tests: any[] }>): Map<string, EndpointKey> {
+    const endpoints = new Map<string, EndpointKey>();
+
+    const allTestArrays = testArrays;
+
+    // Extract endpoints from each test array
+    allTestArrays.forEach(({ name: controllerName, tests }) => {
+      tests.forEach((test: any) => {
+        // Normalize the endpoint path to match swagger format
+        let normalizedPath = test.endpoint;
+
+        // Add /api/ prefix if not present
+        if (!normalizedPath.startsWith('/api/') && !normalizedPath.startsWith('api/')) {
+          normalizedPath = `/api/${normalizedPath}`;
+        }
+
+        // Ensure leading slash
+        if (!normalizedPath.startsWith('/')) {
+          normalizedPath = `/${normalizedPath}`;
+        }
+
+        const key = this.getEndpointKey(normalizedPath, test.method);
+        endpoints.set(key, {
+          path: normalizedPath,
+          method: test.method,
+          controller: controllerName
+        });
+      });
+    });
+
+    return endpoints;
+  }
+
+  /**
+   * @method generateCoverageReport
+   * @description Generates a comprehensive coverage report
+   * @param {any} swaggerSpec - Swagger specification
+   * @param {Array<{name: string, tests: any[]}>} testArrays - Array of test collections with their names
+   * @returns {CoverageReport} Coverage analysis report
+   */
+  generateCoverageReport(swaggerSpec: any, testArrays: Array<{ name: string; tests: any[] }>): CoverageReport {
+    const swaggerEndpoints = this.extractSwaggerEndpoints(swaggerSpec);
+    const mockDataEndpoints = this.extractMockDataEndpoints();
+    const apiTestEndpoints = this.extractApiEndpointTestData(testArrays);
+
+    const missingEndpoints: MissingEndpoint[] = [];
+    const coveredEndpoints: MissingEndpoint[] = [];
+    const byController: Record<string, any> = {};
+
+    // Find endpoints in Swagger and check coverage from both sources
+    swaggerEndpoints.forEach((endpointInfo, key) => {
+      const hasMockData = mockDataEndpoints.has(key);
+      const hasApiTest = apiTestEndpoints.has(key);
+      const isCovered = hasMockData || hasApiTest;
+
+      let coverageSource: 'mockData' | 'apiEndpointTestData' | 'both' | undefined;
+      if (hasMockData && hasApiTest) {
+        coverageSource = 'both';
+      } else if (hasMockData) {
+        coverageSource = 'mockData';
+      } else if (hasApiTest) {
+        coverageSource = 'apiEndpointTestData';
+      }
+
+      if (!isCovered) {
+        missingEndpoints.push({
+          ...endpointInfo,
+          hasMockData: false,
+          hasTest: false
+        });
+      } else {
+        coveredEndpoints.push({
+          ...endpointInfo,
+          hasMockData,
+          hasTest: hasApiTest,
+          coverageSource
+        });
+      }
+
+      // Group by controller
+      if (!byController[endpointInfo.controller]) {
+        byController[endpointInfo.controller] = {
+          totalEndpoints: 0,
+          coveredEndpoints: 0,
+          missingEndpoints: [] as MissingEndpoint[],
+          covered: [] as MissingEndpoint[]
+        };
+      }
+
+      byController[endpointInfo.controller].totalEndpoints++;
+      if (isCovered) {
+        byController[endpointInfo.controller].coveredEndpoints++;
+        byController[endpointInfo.controller].covered.push({
+          ...endpointInfo,
+          hasMockData,
+          hasTest: hasApiTest,
+          coverageSource
+        });
+      } else {
+        byController[endpointInfo.controller].missingEndpoints.push({
+          ...endpointInfo,
+          hasMockData: false,
+          hasTest: false
+        });
+      }
+    });
+
+    const totalSwaggerEndpoints = swaggerEndpoints.size;
+    const totalMockDataEntries = mockDataEndpoints.size;
+    const endpointsWithMockData = totalSwaggerEndpoints - missingEndpoints.length;
+    const coveragePercentage = totalSwaggerEndpoints > 0 ? (endpointsWithMockData / totalSwaggerEndpoints) * 100 : 0;
+
+    return {
+      totalSwaggerEndpoints,
+      totalMockDataEntries,
+      endpointsWithMockData,
+      endpointsWithoutMockData: missingEndpoints.length,
+      missingEndpoints,
+      coveredEndpoints,
+      coveragePercentage,
+      byController
+    };
+  }
+
+  /**
+   * @method formatCoverageReport
+   * @description Formats coverage report as readable text
+   * @param {CoverageReport} report - Coverage report
+   * @returns {string} Formatted report
+   */
+  formatCoverageReport(report: CoverageReport): string {
+    const lines: string[] = [];
+
+    lines.push('');
+    lines.push('═══════════════════════════════════════════════════════════════════');
+    lines.push('  📊 SWAGGER ENDPOINT COVERAGE REPORT');
+    lines.push('═══════════════════════════════════════════════════════════════════');
+    lines.push('');
+    lines.push(`  Generated: ${new Date().toISOString()}`);
+    lines.push('');
+    lines.push('───────────────────────────────────────────────────────────────────');
+    lines.push('  📈 OVERALL COVERAGE SUMMARY');
+    lines.push('───────────────────────────────────────────────────────────────────');
+    lines.push('');
+    lines.push(`  Total Swagger Endpoints:       ${report.totalSwaggerEndpoints}`);
+    lines.push(`  Endpoints with Mock Data:      ${report.endpointsWithMockData}`);
+    lines.push(`  Endpoints without Mock Data:   ${report.endpointsWithoutMockData}`);
+    lines.push(`  Coverage Percentage:           ${report.coveragePercentage.toFixed(2)}%`);
+    lines.push('');
+    lines.push('  Coverage Legend:');
+    lines.push('  🟢 [Both]    - mockData + apiTest');
+    lines.push('  🔵 [Mock]    - mockData only');
+    lines.push('  🟡 [Test]    - apiTest only');
+    lines.push('  🔴 [Missing] - No coverage');
+    lines.push('');
+
+    // Consolidate all endpoints by controller
+    lines.push('───────────────────────────────────────────────────────────────────');
+    lines.push('  📋 ENDPOINT COVERAGE BY CONTROLLER');
+    lines.push('───────────────────────────────────────────────────────────────────');
+    lines.push('');
+
+    // Create a map of all controllers with all their endpoints
+    const controllerEndpoints = new Map<string, Array<MissingEndpoint & { covered: boolean }>>();
+
+    // Add covered endpoints
+    report.coveredEndpoints.forEach((endpoint) => {
+      if (!controllerEndpoints.has(endpoint.controller)) {
+        controllerEndpoints.set(endpoint.controller, []);
+      }
+      controllerEndpoints.get(endpoint.controller)!.push({ ...endpoint, covered: true });
+    });
+
+    // Add missing endpoints
+    report.missingEndpoints.forEach((endpoint) => {
+      if (!controllerEndpoints.has(endpoint.controller)) {
+        controllerEndpoints.set(endpoint.controller, []);
+      }
+      controllerEndpoints.get(endpoint.controller)!.push({ ...endpoint, covered: false });
+    });
+
+    // Sort controllers alphabetically
+    const sortedControllers = Array.from(controllerEndpoints.keys()).sort();
+
+    sortedControllers.forEach((controller, index) => {
+      const endpoints = controllerEndpoints.get(controller)!;
+      const controllerStats = report.byController[controller];
+      const coverage = controllerStats.totalEndpoints > 0 ? (controllerStats.coveredEndpoints / controllerStats.totalEndpoints) * 100 : 0;
+
+      lines.push(`  ${index + 1}. ${controller}`);
+      lines.push(`     Coverage: ${controllerStats.coveredEndpoints}/${controllerStats.totalEndpoints} (${coverage.toFixed(1)}%)`);
+      lines.push('');
+
+      // Sort endpoints: covered first, then by method and path
+      endpoints.sort((a, b) => {
+        if (a.covered !== b.covered) return b.covered ? 1 : -1;
+        if (a.method !== b.method) return a.method.localeCompare(b.method);
+        return a.path.localeCompare(b.path);
+      });
+
+      endpoints.forEach((endpoint, idx) => {
+        let icon: string;
+        let label: string;
+        if (!endpoint.covered) {
+          icon = '🔴';
+          label = '[Missing]';
+        } else if (endpoint.coverageSource === 'both') {
+          icon = '🟢';
+          label = '[Both]';
+        } else if (endpoint.coverageSource === 'mockData') {
+          icon = '🔵';
+          label = '[Mock]';
+        } else {
+          icon = '🟡';
+          label = '[Test]';
+        }
+        lines.push(`     ${idx + 1}. ${icon} ${endpoint.method.padEnd(6)} ${endpoint.path} ${label}`);
+      });
+      lines.push('');
+    });
+
+    if (report.missingEndpoints.length === 0) {
+      lines.push('───────────────────────────────────────────────────────────────────');
+      lines.push('  ✅ FULL COVERAGE ACHIEVED!');
+      lines.push('───────────────────────────────────────────────────────────────────');
+      lines.push('');
+      lines.push('  All Swagger endpoints have corresponding test coverage.');
+      lines.push('');
+    }
+
+    lines.push('═══════════════════════════════════════════════════════════════════');
+    lines.push('  📝 RECOMMENDATIONS');
+    lines.push('═══════════════════════════════════════════════════════════════════');
+    lines.push('');
+
+    if (report.missingEndpoints.length > 0) {
+      lines.push('  To improve coverage, add test data for missing endpoints to:');
+      lines.push('  📁 e2e/tests/swagger/helpers/mockData.ts');
+      lines.push('');
+      lines.push('  Example format:');
+      lines.push('  ```typescript');
+      lines.push('  ControllerName: [');
+      lines.push('    {');
+      lines.push('      path: `/api/${Constants.DEFAULT_API_VERSION}/endpoint-path`,');
+      lines.push("      method: 'GET',");
+      lines.push('      queryParams: { /* params */ },');
+      lines.push("      description: 'Description of endpoint'");
+      lines.push('    }');
+      lines.push('  ]');
+      lines.push('  ```');
+    } else {
+      lines.push('  ✅ No action required - all endpoints are documented!');
+    }
+
+    lines.push('');
+    lines.push('═══════════════════════════════════════════════════════════════════');
+    lines.push('');
+
+    return lines.join('\n');
+  }
+
+  /**
+   * @method generateMarkdownReport
+   * @description Generates coverage report in Markdown format
+   * @param {CoverageReport} report - Coverage report
+   * @returns {string} Markdown formatted report
+   */
+  generateMarkdownReport(report: CoverageReport): string {
+    const lines: string[] = [];
+
+    lines.push('# Swagger Endpoint Coverage Report');
+    lines.push('');
+    lines.push(`**Generated:** ${new Date().toISOString()}`);
+    lines.push('');
+
+    lines.push('## Overall Coverage Summary');
+    lines.push('');
+    lines.push('| Metric | Count |');
+    lines.push('|--------|------:|');
+    lines.push(`| Total Swagger Endpoints | ${report.totalSwaggerEndpoints} |`);
+    lines.push(`| Endpoints with Mock Data | ${report.endpointsWithMockData} |`);
+    lines.push(`| Endpoints without Mock Data | ${report.endpointsWithoutMockData} |`);
+    lines.push(`| **Coverage Percentage** | **${report.coveragePercentage.toFixed(2)}%** |`);
+    lines.push('');
+
+    lines.push('### Coverage Legend');
+    lines.push('');
+    lines.push('| Icon | Status |');
+    lines.push('|------|--------|');
+    lines.push('| 🟢 | Both mockData + apiTest |');
+    lines.push('| 🔵 | mockData only |');
+    lines.push('| 🟡 | apiTest only |');
+    lines.push('| 🔴 | Missing coverage |');
+    lines.push('');
+
+    // Generate heatmap
+    lines.push('## Coverage Heatmap');
+    lines.push('');
+    lines.push('Visual representation of coverage by controller:');
+    lines.push('');
+    lines.push('| Controller | Coverage Bar | Percentage | Endpoints |');
+    lines.push('|------------|--------------|------------|-----------|');
+
+    const sortedControllersForHeatmap = Object.keys(report.byController).sort();
+
+    sortedControllersForHeatmap.forEach((controller) => {
+      const stats = report.byController[controller];
+      const coverage = stats.totalEndpoints > 0 ? (stats.coveredEndpoints / stats.totalEndpoints) * 100 : 0;
+
+      // Determine color based on coverage percentage
+      let colorSquare: string;
+      if (coverage >= 90) {
+        colorSquare = '🟩'; // Green - excellent coverage
+      } else if (coverage >= 70) {
+        colorSquare = '🟨'; // Yellow - good coverage
+      } else if (coverage >= 50) {
+        colorSquare = '🟧'; // Orange - fair coverage
+      } else {
+        colorSquare = '🟥'; // Red - poor coverage
+      }
+
+      // Create a visual bar using repeated squares
+      const barLength = 20;
+      const filledSquares = Math.round((coverage / 100) * barLength);
+      const emptySquares = barLength - filledSquares;
+
+      let bar = colorSquare.repeat(filledSquares);
+      if (emptySquares > 0) {
+        bar += '⬜'.repeat(emptySquares);
+      }
+
+      const percentStr = `${coverage.toFixed(1)}%`;
+      const statsStr = `${stats.coveredEndpoints}/${stats.totalEndpoints}`;
+
+      lines.push(`| ${controller} | ${bar} | ${percentStr} | ${statsStr} |`);
+    });
+
+    lines.push('');
+    lines.push('**Heatmap Legend:** 🟩 ≥90% | 🟨 70-89% | 🟧 50-69% | 🟥 <50%');
+    lines.push('');
+
+    // Consolidate all endpoints by controller
+    lines.push('## Endpoint Coverage by Controller');
+    lines.push('');
+
+    // Create a map of all controllers with all their endpoints
+    const controllerEndpoints = new Map<string, Array<MissingEndpoint & { covered: boolean }>>();
+
+    // Add covered endpoints
+    report.coveredEndpoints.forEach((endpoint) => {
+      if (!controllerEndpoints.has(endpoint.controller)) {
+        controllerEndpoints.set(endpoint.controller, []);
+      }
+      controllerEndpoints.get(endpoint.controller)!.push({ ...endpoint, covered: true });
+    });
+
+    // Add missing endpoints
+    report.missingEndpoints.forEach((endpoint) => {
+      if (!controllerEndpoints.has(endpoint.controller)) {
+        controllerEndpoints.set(endpoint.controller, []);
+      }
+      controllerEndpoints.get(endpoint.controller)!.push({ ...endpoint, covered: false });
+    });
+
+    // Sort controllers alphabetically
+    const sortedControllers = Array.from(controllerEndpoints.keys()).sort();
+
+    sortedControllers.forEach((controller) => {
+      const endpoints = controllerEndpoints.get(controller)!;
+      const controllerStats = report.byController[controller];
+      const coverage = controllerStats.totalEndpoints > 0 ? (controllerStats.coveredEndpoints / controllerStats.totalEndpoints) * 100 : 0;
+
+      lines.push(`### ${controller}`);
+      lines.push('');
+      lines.push(`**Coverage:** ${controllerStats.coveredEndpoints}/${controllerStats.totalEndpoints} (${coverage.toFixed(1)}%)`);
+      lines.push('');
+      lines.push('| # | Status | Method | Endpoint |');
+      lines.push('|---|--------|--------|----------|');
+
+      // Sort endpoints: covered first, then by method and path
+      endpoints.sort((a, b) => {
+        if (a.covered !== b.covered) return b.covered ? 1 : -1;
+        if (a.method !== b.method) return a.method.localeCompare(b.method);
+        return a.path.localeCompare(b.path);
+      });
+
+      endpoints.forEach((endpoint, idx) => {
+        let icon: string;
+        if (!endpoint.covered) {
+          icon = '🔴';
+        } else if (endpoint.coverageSource === 'both') {
+          icon = '🟢';
+        } else if (endpoint.coverageSource === 'mockData') {
+          icon = '🔵';
+        } else {
+          icon = '🟡';
+        }
+
+        // Create clickable link to Swagger UI
+        const swaggerLink = this.getSwaggerUILink(endpoint.method, endpoint.path, endpoint.controller);
+        const iconLink = `[${icon}](${swaggerLink})`;
+
+        lines.push(`| ${idx + 1} | ${iconLink} | \`${endpoint.method}\` | \`${endpoint.path}\` |`);
+      });
+      lines.push('');
+    });
+
+    if (report.missingEndpoints.length === 0) {
+      lines.push('---');
+      lines.push('');
+      lines.push('## ✅ Full Coverage Achieved!');
+      lines.push('');
+      lines.push('All Swagger endpoints have corresponding test coverage.');
+      lines.push('');
+    }
+
+    lines.push('## Recommendations');
+    lines.push('');
+
+    if (report.missingEndpoints.length > 0) {
+      lines.push('To improve coverage, add test data for missing endpoints to:');
+      lines.push('');
+      lines.push('**File:** `e2e/tests/swagger/helpers/mockData.ts`');
+      lines.push('');
+      lines.push('**Example format:**');
+      lines.push('');
+      lines.push('```typescript');
+      lines.push('ControllerName: [');
+      lines.push('  {');
+      lines.push('    path: `/api/${Constants.DEFAULT_API_VERSION}/endpoint-path`,');
+      lines.push("    method: 'GET',");
+      lines.push('    queryParams: { /* params */ },');
+      lines.push("    description: 'Description of endpoint'");
+      lines.push('  }');
+      lines.push(']');
+      lines.push('```');
+    } else {
+      lines.push('✅ No action required - all endpoints are documented!');
+    }
+
+    lines.push('');
+
+    return lines.join('\n');
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/swaggerTestUtils.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/swaggerTestUtils.ts
new file mode 100644
index 0000000..4f9b21a
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/helpers/swaggerTestUtils.ts
@@ -0,0 +1,1099 @@
+/**
+ * @fileoverview Swagger API Test Utilities Module
+ * @description Comprehensive utilities for Swagger-based API testing with Playwright
+ * @version 2.0.0
+ * @since 1.0.0
+ * @author Strata Decision Technology
+ * @created 2024-10-15
+ * @modified 2025-12-31
+ *
+ * @module SwaggerTestUtils
+ * @requires @playwright/test
+ * @requires ../../helpers/globalTestUtils
+ *
+ * @example
+ * ```typescript
+ * import { SwaggerTestHelpers, generateMockRequestBody, createSwaggerTestSuite } from './helpers/swaggerUtils';
+ *
+ * const swaggerHelper = new SwaggerTestHelpers(request, baseURL);
+ * const endpoints = await swaggerHelper.discoverEndpoints('/api/relationships');
+ * const { response, data } = await swaggerHelper.authenticatedGet('/endpoint', jwtToken);
+ * ```
+ */
+
+import { APIRequestContext } from '@playwright/test';
+import { EnhancedJwt } from '../../../auth/authUtils';
+import { customLogger } from '../../../customLogger';
+import type { ApiEndpointTest, TestValidationResult } from '../../../helpers/globalTestUtils';
+import { AuthUtils, Constants, DryRunUtils, GlobalTestUtils, MockDataUtils, TestPatterns, ValidationUtils } from '../../../helpers/globalTestUtils';
+import { EnvironmentType } from '../../../playwright.config.shared';
+import { ApiTestHelpers } from '../../api/helpers/apiTestUtils';
+import { mockConfigurationGuid, mockInitiativeGuid, mockOpportunityGuid, testDatabaseGuid, testJobId, testUserGuid } from './mockData';
+
+/**
+ * @section Swagger Test Helpers
+ * @description Core Swagger testing class with authentication and validation
+ */
+
+/**
+ * @class SwaggerTestHelpers
+ * @description Advanced Swagger API testing helper with comprehensive endpoint analysis and validation
+ * @since 1.0.0
+ * @version 2.0.0
+ *
+ * @example
+ * ```typescript
+ * const swaggerHelper = new SwaggerTestHelpers(request, 'https://api.example.com/');
+ * const { response, data } = await swaggerHelper.authenticatedPost('/endpoint', requestData, jwtToken);
+ * swaggerHelper.verifyPagedResponse(data, 10, testInfo);
+ * ```
+ */
+export class SwaggerTestHelpers {
+  /** Internal API test helpers instance for common operations */
+  private apiHelpers: ApiTestHelpers;
+
+  /**
+   * @constructor
+   * @description Initialize Swagger test helper with request context and API helpers
+   * @param {APIRequestContext} request - Playwright API request context
+   * @param {string} baseURL - Base URL for API endpoints
+   * @since 1.0.0
+   */
+  constructor(
+    private request: APIRequestContext,
+    private baseURL: string
+  ) {
+    this.apiHelpers = new ApiTestHelpers(request, baseURL);
+  }
+
+  /**
+   * @getter api
+   * @description Provides access to underlying ApiTestHelpers instance for common API operations
+   * @returns {ApiTestHelpers} Configured API test helpers instance
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const { response, data } = await swaggerHelper.api.authenticatedGet('/endpoint', jwtToken);
+   * ```
+   *
+   * @delegation Exposes API helpers for standard authentication and validation
+   */
+  get api(): ApiTestHelpers {
+    return this.apiHelpers;
+  }
+
+  /**
+   * @method shouldHaveAccess
+   * @description Determines if JWT token indicates API access permissions
+   * @private
+   * @param {string} [jwtToken] - Optional JWT token string
+   * @returns {boolean} True if user has API access
+   * @since 1.0.0
+   * @delegation Delegates to centralized TestPatterns.shouldHaveAccess
+   */
+  private shouldHaveAccess(jwtToken?: string | EnhancedJwt): boolean {
+    return TestPatterns.shouldHaveAccess(jwtToken);
+  }
+
+  /**
+   * @method checkAuthorizationResponse
+   * @description Validates API response status codes based on JWT authorization level
+   * @param {any} response - Playwright API response object
+   * @param {string} [jwtToken] - Optional JWT token for authorization checking
+   * @returns {void}
+   * @throws {Error} Throws assertion errors for invalid response codes
+   * @since 1.0.0
+   * @delegation Delegates to centralized TestPatterns.checkAuthorizationResponse
+   */
+  checkAuthorizationResponse(response: any, jwtToken?: string | EnhancedJwt): void {
+    TestPatterns.checkAuthorizationResponse(response, jwtToken);
+  }
+
+  /**
+   * @method authenticatedGet
+   * @description Makes authenticated GET requests following Playwright best practices
+   * @async
+   * @template T - Expected response data type
+   * @param {string} endpoint - API endpoint path (relative to baseURL)
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token for authentication
+   * @returns {Promise<{response: any; data?: T}>} Response object and parsed data
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const { response, data } = await apiHelper.authenticatedGet<Opportunity[]>('/opportunities', jwtToken);
+   * ```
+   */
+  async authenticatedGet<T>(endpoint: string, jwtToken?: string | EnhancedJwt, queryParams?: Record<string, any>, timeout: number = 60_000): Promise<{ response: any; data?: T }> {
+    if (DryRunUtils.isDryRunMode()) {
+      DryRunUtils.logDryRunAction(`GET ${this.baseURL}${endpoint}`);
+      const mockResponse = DryRunUtils.createDryRunResponse(MockDataUtils.createPagedResponse([]));
+      return { response: mockResponse, data: mockResponse.data as T };
+    }
+
+    const headers = TestPatterns.createAuthHeaders(jwtToken);
+    delete headers['Content-Type']; // Not needed for GET requests
+
+    const url = new URL(`${this.baseURL}${endpoint}`); // Ensure proper URL construction
+    if (queryParams) {
+      Object.entries(queryParams).forEach(([key, value]) => {
+        url.searchParams.append(key, String(value));
+      });
+    }
+    customLogger.info(`🌐 GET ${url.toString()}`);
+    const response = await this.request.get(url.toString(), { headers, timeout });
+
+    this.checkAuthorizationResponse(response, jwtToken);
+
+    let responseData;
+    if (response.ok()) {
+      responseData = await response.json();
+    }
+
+    return { response, data: responseData };
+  }
+
+  /**
+   * @method authenticatedPost
+   * @description Makes authenticated POST requests with comprehensive validation
+   * @async
+   * @template T - Expected response data type
+   * @param {string} endpoint - API endpoint path (relative to baseURL)
+   * @param {any} data - Request payload data
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token for authentication
+   * @param {number} [timeout=60000] - Request timeout in milliseconds
+   * @returns {Promise<{response: any; data?: T}>} Response object and parsed data
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const { response, data } = await apiHelper.authenticatedPost<PagedResponse>(
+   *   '/opportunities/search',
+   *   { filters: { configurationGuid: '...' } },
+   *   jwtToken
+   * );
+   * ```
+   */
+  async authenticatedPost<T>(endpoint: string, data: any, jwtToken?: string | EnhancedJwt, timeout: number = 60_000): Promise<{ response: any; data?: T }> {
+    if (DryRunUtils.isDryRunMode()) {
+      DryRunUtils.logDryRunAction(`POST ${this.baseURL}${endpoint}`, `Data: ${JSON.stringify(data, null, 2)}`);
+      const mockResponse = DryRunUtils.createDryRunResponse(MockDataUtils.createPagedResponse([]));
+      return { response: mockResponse, data: mockResponse.data as T };
+    }
+
+    const headers = TestPatterns.createAuthHeaders(jwtToken);
+    const url = new URL(`${this.baseURL}${endpoint}`); // Ensure proper URL construction
+    customLogger.info(`🌐 POST ${url.toString()}`);
+    // Request options: data is the body, headers contains authorization
+    const response = await this.request.post(url.toString(), {
+      data, // Request body
+      headers, // Request headers (Authorization, Content-Type, etc.)
+      timeout
+    });
+
+    this.checkAuthorizationResponse(response, jwtToken);
+
+    let responseData;
+    if (response.ok()) {
+      responseData = await response.json();
+    }
+
+    return { response, data: responseData };
+  }
+
+  /**
+   * @method authenticatedPut
+   * @description Makes authenticated PUT requests with optional response body
+   * @async
+   * @template T - Expected response data type
+   * @param {string} endpoint - API endpoint path (relative to baseURL)
+   * @param {any} [data] - Optional request payload data
+   * @param {string | EnhancedJwt} [jwtToken] - Optional JWT token for authentication
+   * @param {boolean} [hasJson=true] - Indicates if response is expected to be JSON
+   * @param {number} [timeout=60000] - Request timeout in milliseconds
+   * @returns {Promise<{response: any; data?: T}>} Response object and parsed data
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const { response, data } = await apiHelper.authenticatedPut('/opportunities/123', updateData, jwtToken);
+   * ```
+   */
+  async authenticatedPut<T>(endpoint: string, data?: any, jwtToken?: string | EnhancedJwt, hasJson: boolean = true, timeout: number = 60_000): Promise<{ response: any; data?: T }> {
+    if (DryRunUtils.isDryRunMode()) {
+      DryRunUtils.logDryRunAction(`PUT ${this.baseURL}${endpoint}`, data ? `Data: ${JSON.stringify(data, null, 2)}` : 'No data payload');
+      const mockResponse = DryRunUtils.createDryRunResponse('operation-id-12345');
+      return { response: mockResponse, data: mockResponse.data as T };
+    }
+
+    const headers = TestPatterns.createAuthHeaders(jwtToken, Boolean(data));
+    const url = new URL(`${this.baseURL}${endpoint}`); // Ensure proper URL construction
+    customLogger.info(`🌐 PUT ${url.toString()}`);
+
+    const response = await this.request.put(url.toString(), {
+      ...(data && { data }),
+      headers,
+      timeout
+    });
+
+    this.checkAuthorizationResponse(response, jwtToken);
+
+    let responseData = undefined;
+    if (hasJson && response.ok()) {
+      responseData = await response.json();
+    }
+
+    return { response, data: responseData };
+  }
+
+  /**
+   * @method discoverEndpoints
+   * @description Automatically discovers available API endpoints by testing common HTTP methods
+   * @async
+   * @param {string} basePath - Base path to test for endpoint availability
+   * @returns {Promise<EndpointInfo[]>} Array of discovered endpoint information
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const endpoints = await swaggerHelper.discoverEndpoints('/api/relationships');
+   * // Returns: [{ path: '/api/relationships', method: 'GET', statusCode: 200, available: true }]
+   * ```
+   *
+   * @algorithm
+   * 1. Tests GET, POST, PUT, DELETE methods on the base path
+   * 2. Filters out 404 responses (endpoint not found)
+   * 3. Returns endpoint info with availability status
+   * @discovery Useful for dynamic API exploration and validation
+   */
+  async discoverEndpoints(basePath: string, jwt?: string | EnhancedJwt): Promise<EndpointInfo[]> {
+    const endpoints: EndpointInfo[] = [];
+    const commonMethods = ['GET', 'POST', 'PUT', 'DELETE'];
+
+    for (const method of commonMethods) {
+      try {
+        const response = await TestPatterns.testEndpoint(this.request, this.baseURL, basePath, method, jwt);
+        if (response.status() !== 404) {
+          endpoints.push({
+            path: basePath,
+            method: method as HttpMethod,
+            statusCode: response.status(),
+            available: response.status() < 500
+          });
+        }
+      } catch (error) {
+        // Endpoint might not exist or have network issues
+        customLogger.log(`Endpoint discovery for ${method} ${basePath}: ${error}`);
+      }
+    }
+
+    return endpoints;
+  }
+
+  /**
+   * Test parameter boundary conditions
+   */
+  async testParameterBoundaries(endpoint: string, parameter: ParameterTest, jwtToken?: string | EnhancedJwt): Promise<BoundaryTestResult[]> {
+    const results: BoundaryTestResult[] = [];
+
+    for (const testCase of parameter.testCases) {
+      try {
+        let response: any;
+        const requestData = { [parameter.name]: testCase.value, ...testCase.additionalData };
+
+        switch (parameter.method) {
+          case 'GET':
+            response = await this.apiHelpers.authenticatedGet(`${endpoint}?${parameter.name}=${testCase.value}`, jwtToken);
+            break;
+          case 'POST':
+            response = await this.apiHelpers.authenticatedPost(endpoint, requestData, jwtToken);
+            break;
+          case 'PUT':
+            response = await this.apiHelpers.authenticatedPut(endpoint, requestData, jwtToken);
+            break;
+        }
+
+        results.push({
+          testCase: testCase.description,
+          value: testCase.value,
+          expectedValid: testCase.expectedValid,
+          actualValid: response.response.ok(),
+          statusCode: response.response.status()
+        });
+      } catch (error) {
+        results.push({
+          testCase: testCase.description,
+          value: testCase.value,
+          expectedValid: testCase.expectedValid,
+          actualValid: false,
+          statusCode: 0,
+          error: String(error)
+        });
+      }
+    }
+
+    return results;
+  }
+
+  /**
+   * @method uploadFile
+   * @description Uploads files with multipart form data handling
+   * @async
+   * @param {string} endpoint - API endpoint path for file upload
+   * @param {string} fileName - Name of the file being uploaded
+   * @param {string} fileContent - Content of the file as string
+   * @param {string} [jwtToken] - Optional JWT token for authentication
+   * @param {number} [timeout=60000] - Request timeout in milliseconds
+   * @returns {Promise<{response: any; data?: any}>} Response object and parsed data
+   * @since 1.0.0
+   *
+   * @example
+   * ```typescript
+   * const { response, data } = await apiHelper.uploadFile(`${Constants.DEFAULT_API_VERSION}/files/1/upload', 'test.txt', 'content`, jwtToken);
+   * ```
+   */
+  async uploadFile(endpoint: string, fileName: string, fileContent: string, jwtToken?: string | EnhancedJwt, timeout: number = 60_000): Promise<{ response: any; data?: any }> {
+    const accessToken = AuthUtils.extractAccessToken(jwtToken);
+    const headers: Record<string, string> = {};
+
+    if (accessToken) {
+      headers['Authorization'] = `Bearer ${accessToken}`;
+    }
+
+    const url = new URL(endpoint, this.baseURL); // Ensure proper URL construction
+    customLogger.info(`🌐 Uploading file to ${url.toString()}`);
+    const response = await this.request.post(url.toString(), {
+      multipart: {
+        file: {
+          name: fileName,
+          mimeType: Constants.CONTENT_TYPES.TEXT_PLAIN,
+          buffer: Buffer.from(fileContent)
+        }
+      },
+      headers,
+      timeout
+    });
+
+    this.checkAuthorizationResponse(response, jwtToken);
+
+    let responseData;
+    if (response.ok()) {
+      responseData = await response.json();
+    }
+
+    return { response, data: responseData };
+  }
+
+  /**
+   * @method uploadFileWithValidation
+   * @description Helper for file upload with automatic validation
+   * @param {number} fileType - File type identifier
+   * @param {string} fileName - Name of the file
+   * @param {string} fileContent - File content
+   * @param {string} [jwtToken] - Optional JWT token
+   * @returns {Promise<{response: any; data?: any}>} Upload response
+   * @since 2.0.0
+   */
+  async uploadFileWithValidation(fileType: number, fileName: string, fileContent: string, jwtToken?: string): Promise<{ response: any; data?: any }> {
+    return this.uploadFile(`${Constants.DEFAULT_API_VERSION}/files/${fileType}/upload`, fileName, fileContent, jwtToken);
+  }
+
+  /**
+   * @method requestWithoutAuth
+   * @description Makes unauthenticated requests for auth testing
+   * @param {'GET' | 'POST' | 'PUT'} method - HTTP method
+   * @param {string} endpoint - API endpoint path
+   * @param {any} [data] - Optional request data
+   * @param {number} [timeout=60000] - Request timeout in milliseconds
+   * @returns {Promise<{response: any; data?: any}>} Response object
+   * @since 2.0.0
+   * @deprecated Use TestPatterns.requestWithoutAuth from globalTestUtils instead
+   */
+  async requestWithoutAuth(method: 'GET' | 'POST' | 'PUT', endpoint: string, data?: any, timeout: number = 60_000): Promise<{ response: any; data?: any }> {
+    return TestPatterns.requestWithoutAuth(this.request, this.baseURL, method, endpoint, data, timeout);
+  }
+
+  /**
+   * @method verifyPagedResponse
+   * @description Validates paged API response structure with flaky test reporting
+   * @template T - Type of items in response results array
+   * @param {any} response - API response object to validate
+   * @param {number} [expectedItemCount] - Optional expected number of items
+   * @param {any} [testInfo] - Optional Playwright test info for flaky annotations
+   * @returns {TestValidationResult} Validation result with flaky status
+   * @since 1.0.0
+   * @delegation Delegates to common ValidationUtils.validatePagedResponse
+   */
+  verifyPagedResponse(response: any, expectedItemCount?: number, testInfo?: any): TestValidationResult {
+    return ValidationUtils.validatePagedResponse(response, expectedItemCount, testInfo);
+  }
+
+  /**
+   * @method verifyJobIdResponse
+   * @description Validates job ID response format for asynchronous operations
+   * @param {any} jobId - Job ID response to validate
+   * @returns {void}
+   * @since 1.0.0
+   * @delegation Delegates to common ValidationUtils.validateJobIdResponse
+   */
+  verifyJobIdResponse(jobId: any): void {
+    ValidationUtils.validateJobIdResponse(jobId);
+  }
+
+  /**
+   * @method validateDataCount
+   * @description Validates data count with intelligent flaky test reporting
+   * @param {number} actualCount - Actual count received
+   * @param {number} expectedCount - Expected count
+   * @param {any} [testInfo] - Optional Playwright test info
+   * @param {string} [description='data count validation'] - Description for logging
+   * @returns {TestValidationResult} Validation result
+   * @since 2.0.0
+   * @delegation Delegates to common ValidationUtils.validateDataCount
+   */
+  validateDataCount(actualCount: number, expectedCount: number, testInfo?: any, description: string = 'data count validation'): TestValidationResult {
+    return ValidationUtils.validateDataCount(actualCount, expectedCount, testInfo, description);
+  }
+}
+
+/**
+ * @section Data Validation Utilities
+ * @description Collection of validation functions for different data types
+ */
+
+/**
+ * @namespace validateTestData
+ * @description Validation functions for API response data structures
+ * @since 1.0.0
+ *
+ * @example
+ * ```typescript
+ * validateTestData.opportunity(responseItem);
+ * validateTestData.initiative(responseItem);
+ * ```
+ */
+export const validateTestData = {
+  /**
+   * @method opportunity
+   * @description Validates opportunity object structure and required properties
+   * @param {any} item - Opportunity object to validate
+   * @since 1.0.0
+   */
+  opportunity: (item: any) => {
+    const requiredProperties = ['opportunityGuid', 'opportunityId', 'configurationGuid', 'identifiedSavings', 'hasInitiative', 'isHidden'];
+    ValidationUtils.validateRequiredProperties(item, requiredProperties);
+  },
+
+  /**
+   * @method initiative
+   * @description Validates initiative object structure
+   * @param {any} item - Initiative object to validate
+   * @since 1.0.0
+   */
+  initiative: (item: any) => {
+    const requiredProperties = ['initiativeGuid', 'name', 'configurationGuid', 'status', 'targetSavings', 'actualSavings'];
+    ValidationUtils.validateRequiredProperties(item, requiredProperties);
+  },
+
+  /**
+   * @method configuration
+   * @description Validates configuration object structure
+   * @param {any} item - Configuration object to validate
+   * @since 1.0.0
+   */
+  configuration: (item: any) => {
+    const requiredProperties = ['configurationGuid', 'name', 'databaseGuid', 'fiscalYear', 'isActive'];
+    ValidationUtils.validateRequiredProperties(item, requiredProperties);
+  },
+
+  /**
+   * @method user
+   * @description Validates user object structure
+   * @param {any} item - User object to validate
+   * @since 1.0.0
+   */
+  user: (item: any) => {
+    const requiredProperties = ['userGuid', 'name', 'email', 'isActive'];
+    ValidationUtils.validateRequiredProperties(item, requiredProperties);
+  }
+};
+
+/**
+ * @section Swagger Specification Utilities
+ * @description Helper functions for working with Swagger/OpenAPI specifications
+ */
+
+/**
+ * @function generateMockRequestBody
+ * @description Generates mock request body data based on endpoint path patterns
+ * @param {string} path - API endpoint path
+ * @param {string} method - HTTP method
+ * @returns {any} Mock request body or undefined
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * const body = generateMockRequestBody(`/${Constants.DEFAULT_API_VERSION}/opportunities`, 'post');
+ * ```
+ */
+export function generateMockRequestBody(path: string, method: string): any {
+  // Paging endpoints
+  if (
+    method === 'post' &&
+    !path.includes('export') &&
+    !path.includes('create') &&
+    !path.includes('validate') &&
+    (path.includes('opportunities') || path.includes('initiatives') || path.includes('encounters'))
+  ) {
+    return {
+      pagingOptions: {
+        sortField: 'identifiedSavings',
+        sortOrder: 'Desc',
+        first: 0,
+        rows: 25
+      },
+      filters: {
+        configurationGuid: mockConfigurationGuid
+      }
+    };
+  }
+
+  // Validation endpoints
+  if (path.includes('is-name-valid') || path.includes('is-name-unique')) {
+    return {
+      name: 'Test Name',
+      opportunityGuid: null
+    };
+  }
+
+  // Export endpoints
+  if (path.includes('export')) {
+    return {
+      filters: {
+        configurationGuid: mockConfigurationGuid
+      }
+    };
+  }
+
+  // Create endpoints
+  if (path.includes('create')) {
+    return {
+      name: 'Test Item',
+      description: 'Test description',
+      configurationGuid: mockConfigurationGuid
+    };
+  }
+
+  // Set hidden/note endpoints
+  if (path.includes('set-hidden')) {
+    return true;
+  }
+
+  if (path.includes('set-note')) {
+    return 'Test note';
+  }
+
+  // Comment endpoints
+  if (path.includes('comments')) {
+    return {
+      opportunityGuid: mockOpportunityGuid,
+      comment: 'Test comment'
+    };
+  }
+
+  // Default empty object for POST/PUT with body
+  if (method === 'post' || method === 'put') {
+    return {};
+  }
+
+  return undefined;
+}
+
+/**
+ * @function substitutePathParameters
+ * @description Substitutes path parameters with test values
+ * @param {string} path - API endpoint path with parameters
+ * @param {any[]} [parameters] - Array of parameter definitions
+ * @returns {string} Path with substituted parameters
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * const path = substitutePathParameters(`/${Constants.DEFAULT_API_VERSION}/opportunities/{opportunityGuid}`, []);
+ * // Returns: `/${Constants.DEFAULT_API_VERSION}/opportunities/00000000-0000-0000-0000-000000000001`
+ * ```
+ */
+export function substitutePathParameters(path: string, parameters?: any[]): string {
+  const substitutions: Record<string, string> = {
+    '{configurationGuid}': mockConfigurationGuid,
+    '{opportunityGuid}': mockOpportunityGuid,
+    '{initiativeGuid}': mockInitiativeGuid,
+    '{networkOpportunityId}': '1',
+    '{databaseGuid}': testDatabaseGuid,
+    '{userGuid}': testUserGuid,
+    '{jobId}': testJobId,
+    '{lootId}': mockOpportunityGuid,
+    '{fileType}': '1',
+    '{dataGroup}': '1',
+    '{chipKey}': '1',
+    '{workbookId}': '1',
+    '{opportunityType}': 'ChargeCode',
+    '{opportunityId}': '1',
+    '{peerGroupId}': '1',
+    '{populationId}': '1',
+    '{initiativeRollupColumnId}': '1',
+    '{sourceOfSavings}': 'Opportunities',
+    '{folderGuid}': mockConfigurationGuid
+  };
+
+  let substitutedPath = path;
+  for (const [param, value] of Object.entries(substitutions)) {
+    substitutedPath = substitutedPath.replace(param, value);
+  }
+
+  return substitutedPath;
+}
+
+/**
+ * @function getExpectedStatusCodes
+ * @description Extracts expected status codes from Swagger responses
+ * @param {Record<string, any>} responses - Swagger responses object
+ * @returns {number[]} Array of expected status codes
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * const codes = getExpectedStatusCodes(operation.responses);
+ * // Returns: [200, 400, 404]
+ * ```
+ */
+export function getExpectedStatusCodes(responses: Record<string, any>): number[] {
+  return Object.keys(responses)
+    .map((code) => parseInt(code, 10))
+    .filter((code) => !isNaN(code));
+}
+
+/**
+ * @function determineResponseType
+ * @description Determines expected response type from Swagger schema
+ * @param {any} operation - Swagger operation
+ * @returns {string} Expected response type ('boolean', 'array', 'object', 'number', 'string', 'void')
+ * @since 2.0.0
+ *
+ * @example
+ * ```typescript
+ * const type = determineResponseType(operation);
+ * // Returns: 'array' for list endpoints
+ * ```
+ */
+export function determineResponseType(operation: any): string {
+  const successResponse = operation.responses['200'] || operation.responses['201'];
+
+  if (!successResponse?.content) {
+    return 'void';
+  }
+
+  const schema = successResponse.content['application/json']?.schema;
+
+  if (!schema) {
+    return 'void';
+  }
+
+  if (schema.type === 'boolean') {
+    return 'boolean';
+  }
+
+  if (schema.type === 'array') {
+    return 'array';
+  }
+
+  if (schema.type === 'number' || schema.type === 'integer') {
+    return 'number';
+  }
+
+  if (schema.type === 'string') {
+    return 'string';
+  }
+
+  return 'object';
+}
+
+/**
+ * @section Type Definitions
+ * @description TypeScript interfaces and types for Swagger testing functionality
+ */
+
+/**
+ * @interface EndpointInfo
+ * @description Information about discovered API endpoints
+ * @since 1.0.0
+ */
+export interface EndpointInfo {
+  /** API endpoint path */
+  path: string;
+  /** HTTP method supported by the endpoint */
+  method: HttpMethod;
+  /** HTTP status code returned during discovery */
+  statusCode: number;
+  /** Whether the endpoint is available and functional */
+  available: boolean;
+}
+
+/**
+ * @type HttpMethod
+ * @description Supported HTTP methods for API testing
+ * @since 1.0.0
+ */
+export type HttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
+
+export interface ResponseSchema {
+  type: 'paged' | 'job' | 'error' | 'simple';
+  properties?: string[];
+}
+
+export interface ParameterTest {
+  name: string;
+  method: HttpMethod;
+  testCases: ParameterTestCase[];
+}
+
+export interface ParameterTestCase {
+  description: string;
+  value: any;
+  expectedValid: boolean;
+  additionalData?: Record<string, any>;
+}
+
+export interface BoundaryTestResult {
+  testCase: string;
+  value: any;
+  expectedValid: boolean;
+  actualValid: boolean;
+  statusCode: number;
+  error?: string;
+}
+
+export interface ConcurrencyTestResult {
+  totalRequests: number;
+  successful: number;
+  failed: number;
+  duration: number;
+  averageResponseTime: number;
+  successRate: number;
+}
+
+export interface CorsValidation {
+  hasOriginHeader: boolean;
+  hasMethodsHeader: boolean;
+  hasHeadersHeader: boolean;
+  hasCredentialsHeader: boolean;
+  originValue?: string;
+  methodsValue?: string;
+  headersValue?: string;
+  credentialsValue?: string;
+}
+
+export interface RateLimitResult {
+  totalRequests: number;
+  successfulRequests: number;
+  rateLimitedRequests: number;
+  isRateLimitingActive: boolean;
+  results: { timestamp: number; status: number }[];
+}
+
+export interface PerformanceMetrics {
+  iterations: number;
+  averageTime: number;
+  minTime: number;
+  maxTime: number;
+  medianTime: number;
+  p95Time: number;
+  p99Time: number;
+}
+
+/**
+ * @section Test Suite Factory
+ * @description Factory function for creating comprehensive test suites
+ */
+
+/**
+ * @interface TestResult
+ * @description Test execution result information
+ */
+interface TestResult {
+  controller: string;
+  endpoint: string;
+  method: string;
+  description: string;
+  status: 'passed' | 'failed' | 'skipped';
+  expectedStatus: number[];
+  actualStatus?: number;
+  error?: string;
+  duration?: number;
+}
+
+/**
+ * Global test results storage
+ */
+const testResults: TestResult[] = [];
+
+/**
+ * @function generateTestSummaryMarkdown
+ * @description Generates a markdown summary of all test results
+ * @param {TestResult[]} results - Array of test results
+ * @returns {string} Markdown formatted summary
+ */
+function generateTestSummaryMarkdown(results: TestResult[]): string {
+  const lines: string[] = [];
+
+  lines.push('# API Test Execution Summary');
+  lines.push('');
+  lines.push(`**Generated:** ${new Date().toISOString()}`);
+  lines.push('');
+
+  // Overall statistics
+  const passed = results.filter((r) => r.status === 'passed').length;
+  const failed = results.filter((r) => r.status === 'failed').length;
+  const skipped = results.filter((r) => r.status === 'skipped').length;
+  const total = results.length;
+  const passRate = total > 0 ? ((passed / total) * 100).toFixed(2) : '0.00';
+
+  lines.push('## Overall Statistics');
+  lines.push('');
+  lines.push('| Metric | Count | Percentage |');
+  lines.push('|--------|------:|------------|');
+  lines.push(`| Total Tests | ${total} | 100% |`);
+  lines.push(`| ✅ Passed | ${passed} | ${passRate}% |`);
+  lines.push(`| ❌ Failed | ${failed} | ${((failed / total) * 100).toFixed(2)}% |`);
+  lines.push(`| ⏭️ Skipped | ${skipped} | ${((skipped / total) * 100).toFixed(2)}% |`);
+  lines.push('');
+
+  // Group results by controller
+  const byController = new Map<string, TestResult[]>();
+  results.forEach((result) => {
+    if (!byController.has(result.controller)) {
+      byController.set(result.controller, []);
+    }
+    byController.get(result.controller)!.push(result);
+  });
+
+  // Sort controllers alphabetically
+  const sortedControllers = Array.from(byController.keys()).sort();
+
+  lines.push('## Test Results by Controller');
+  lines.push('');
+
+  sortedControllers.forEach((controller) => {
+    const controllerResults = byController.get(controller)!;
+    const controllerPassed = controllerResults.filter((r) => r.status === 'passed').length;
+    const controllerFailed = controllerResults.filter((r) => r.status === 'failed').length;
+    const controllerSkipped = controllerResults.filter((r) => r.status === 'skipped').length;
+    const controllerTotal = controllerResults.length;
+    const controllerPassRate = controllerTotal > 0 ? ((controllerPassed / controllerTotal) * 100).toFixed(1) : '0.0';
+
+    lines.push(`### ${controller}`);
+    lines.push('');
+    lines.push(`**Summary:** ${controllerPassed}/${controllerTotal} passed (${controllerPassRate}%) | Failed: ${controllerFailed} | Skipped: ${controllerSkipped}`);
+    lines.push('');
+    lines.push('| Status | Method | Endpoint | Description | Expected | Actual | Duration |');
+    lines.push('|--------|--------|----------|-------------|----------|--------|----------|');
+
+    // Sort by status (failed first, then passed, then skipped)
+    const sortedResults = controllerResults.sort((a, b) => {
+      const statusOrder = { failed: 0, passed: 1, skipped: 2 };
+      if (statusOrder[a.status] !== statusOrder[b.status]) {
+        return statusOrder[a.status] - statusOrder[b.status];
+      }
+      return a.method.localeCompare(b.method);
+    });
+
+    sortedResults.forEach((result) => {
+      const icon = result.status === 'passed' ? '✅' : result.status === 'failed' ? '❌' : '⏭️';
+      const expectedStr = result.expectedStatus.join(', ');
+      const actualStr = result.actualStatus !== undefined ? result.actualStatus.toString() : 'N/A';
+      const durationStr = result.duration !== undefined ? `${result.duration}ms` : '-';
+      const description = result.description.length > 50 ? result.description.substring(0, 47) + '...' : result.description;
+
+      lines.push(`| ${icon} | \`${result.method}\` | \`${result.endpoint}\` | ${description} | ${expectedStr} | ${actualStr} | ${durationStr} |`);
+
+      // Add error details if failed
+      if (result.status === 'failed' && result.error) {
+        lines.push(`| | | | | | **Error:** ${result.error.replace(/\|/g, '\\|')} | |`);
+      }
+    });
+
+    lines.push('');
+  });
+
+  // Legend
+  lines.push('## Legend');
+  lines.push('');
+  lines.push('| Icon | Status |');
+  lines.push('|------|--------|');
+  lines.push('| ✅ | Test passed - endpoint responded with expected status code |');
+  lines.push('| ❌ | Test failed - endpoint did not respond as expected |');
+  lines.push('| ⏭️ | Test skipped - test was not executed |');
+  lines.push('');
+
+  return lines.join('\n');
+}
+
+/**
+ * @function saveTestSummary
+ * @description Saves test summary to markdown file
+ * @param {TestResult[]} results - Array of test results
+ */
+async function saveTestSummary(results: TestResult[]): Promise<void> {
+  if (results.length === 0) {
+    return;
+  }
+
+  try {
+    const fs = await import('fs');
+    const path = await import('path');
+
+    const markdownReport = generateTestSummaryMarkdown(results);
+    const reportDir = path.join(__dirname, '../../../documentation');
+    const reportPath = path.join(reportDir, 'API_TEST_SUMMARY.md');
+
+    if (!fs.existsSync(reportDir)) {
+      fs.mkdirSync(reportDir, { recursive: true });
+    }
+
+    fs.writeFileSync(reportPath, markdownReport, 'utf-8');
+    customLogger.log(`📊 Test summary saved to: ${reportPath}`);
+  } catch (error) {
+    customLogger.error(`Failed to save test summary: ${error}`);
+  }
+}
+
+/**
+ * @function createSwaggerTestSuite
+ * @description Creates a complete test suite for API endpoints compatible with Playwright Test
+ * @param {any} testFramework - The testing framework object providing describe/test functions
+ * @param {string} controllerName - Name of the API controller for organizing test descriptions
+ * @param {ApiEndpointTest[]} tests - Array of test configurations to execute
+ * @param {EnvironmentType} [envType] - Optional environment type
+ * @since 1.0.0
+ * @version 2.0.0
+ *
+ * @example
+ * ```typescript
+ * import { test } from '@playwright/test';
+ *
+ * const opportunityTests: ApiEndpointTest[] = [
+ *   {
+ *     method: 'GET',
+ *     endpoint: `/${Constants.DEFAULT_API_VERSION}/opportunities`,
+ *     description: 'Get all opportunities',
+ *     expectedStatus: [200]
+ *   }
+ * ];
+ *
+ * createSwaggerTestSuite(test, 'OpportunityController', opportunityTests);
+ * ```
+ */
+export const createSwaggerTestSuite = (testFramework: any, controllerName: string, tests: ApiEndpointTest[], envType?: EnvironmentType) => {
+  const resolvedEnvType = envType || GlobalTestUtils.detectEnvironmentType();
+  customLogger.log(`🌍 Creating test suite for ${controllerName} in ${resolvedEnvType} environment`);
+
+  testFramework.describe(`${controllerName} API Tests`, () => {
+    // AfterAll hook to save test summary
+    testFramework.afterAll(async () => {
+      await saveTestSummary(testResults);
+    });
+
+    tests.forEach((test) => {
+      testFramework(`${test.method} ${test.endpoint} - ${test.description}`, { tag: '@api' }, async ({ apiRequest }: { apiRequest: any }) => {
+        const startTime = Date.now();
+        const result: TestResult = {
+          controller: controllerName,
+          endpoint: test.endpoint,
+          method: test.method,
+          description: test.description,
+          status: 'skipped',
+          expectedStatus: test.expectedStatus
+        };
+
+        try {
+          const utils = new GlobalTestUtils(apiRequest, undefined, resolvedEnvType);
+          await utils.testApiEndpoint(test);
+
+          result.status = 'passed';
+          result.duration = Date.now() - startTime;
+          result.actualStatus = test.expectedStatus[0]; // Assume first expected status on success
+
+          testResults.push(result);
+        } catch (error: any) {
+          result.status = 'failed';
+          result.duration = Date.now() - startTime;
+          result.error = error.message || String(error);
+
+          // Try to extract actual status from error message
+          const statusMatch = error.message?.match(/status (\d+)/i);
+          if (statusMatch) {
+            result.actualStatus = parseInt(statusMatch[1], 10);
+          }
+
+          testResults.push(result);
+
+          customLogger.error(`❌ Error during test for ${test.method} ${test.endpoint}:`, error.message);
+          throw error; // Re-throw to mark test as failed
+        }
+      });
+    });
+  });
+};
+
+/**
+ * @section Re-exports
+ * @description Re-export commonly used types and utilities for convenience
+ */
+
+// Re-export from globalTestUtils
+export { TestConfigurations, TestNaming, TestPatterns, UserDisplayNames } from '../../../helpers/globalTestUtils';
+
+// Re-export mock data types and objects
+export type {
+  IConfiguration,
+  IInitiative,
+  IInitiativeFilters,
+  ILoadOptions,
+  IOpportunity,
+  IOpportunityFilters,
+  IPagedApiResponse,
+  IPagingInfo,
+  IPagingOptions,
+  IUser,
+  SwaggerOperation,
+  SwaggerParameter,
+  SwaggerPath,
+  SwaggerRequestBody,
+  SwaggerResponse
+} from './mockData';
+export {
+  createMockFile,
+  createMockLoadOptions,
+  mockConfiguration,
+  mockConfigurationGuid,
+  mockInitiative,
+  mockInitiativeFilters,
+  mockInitiativeGuid,
+  mockJobId,
+  mockLoadOptions,
+  mockOpportunity,
+  mockOpportunityFilters,
+  mockOpportunityGuid,
+  mockOpportunityTypes,
+  mockPagedConfigurationsResponse,
+  mockPagedInitiativesResponse,
+  mockPagedOpportunitiesResponse,
+  mockPagedUsersResponse,
+  mockPagingOptions,
+  mockUser,
+  OpportunityType,
+  testDatabaseGuid,
+  testJobId,
+  testUserGuid
+} from './mockData';
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/missingEndpointsCoverage.api.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/missingEndpointsCoverage.api.spec.ts
new file mode 100644
index 0000000..358b074
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/missingEndpointsCoverage.api.spec.ts
@@ -0,0 +1,281 @@
+/**
+ * @fileoverview Missing Swagger Endpoint Coverage Test
+ * @description Identifies API endpoints from Swagger spec that lack test coverage or mock data
+ * @version 1.0.0
+ * @since 2026-01-12
+ * @author Strata Decision Technology
+ *
+ * @module MissingEndpointsCoverageTest
+ * @requires @playwright/test
+ *
+ * @overview
+ * This test suite fetches the Swagger specification and compares it against:
+ * 1. ENDPOINT_TEST_DATA in mockData.ts
+ * 2. Existing test files in the swagger directory
+ *
+ * It generates a report of endpoints that:
+ * - Exist in Swagger but have no mock data in ENDPOINT_TEST_DATA
+ * - Exist in Swagger but have no corresponding tests
+ * - Have partial coverage (some methods covered, others missing)
+ *
+ * @usage
+ * Run this test to identify gaps in API test coverage:
+ * ```bash
+ * npx playwright test missingEndpointsCoverage.api.spec.ts
+ * ```
+ */
+
+import { UserType } from '../../auth/authUtils';
+import { customLogger } from '../../customLogger';
+import { testConfigs } from '../../helpers/globalTestUtils';
+import {
+  allBackgroundClientJobTests,
+  allChargeCodeInitiativesTests,
+  allOpportunitiesTests,
+  chargeCodeOpportunitiesTests,
+  chargeCodeOpportunityDetailsTests,
+  chargeCodeOppsTests,
+  clientNetworkOpportunitiesTests,
+  clientWarehouseTests,
+  encounterOpportunitiesTests,
+  explorationPopulationTests,
+  explorationTests,
+  filtersTests,
+  freeFormOpportunitiesTests,
+  generalLedgerOpportunitiesTests,
+  gudidFileTests,
+  hangfireTests,
+  initiativesTests,
+  mappedColumnsTests,
+  payrollOpportunitiesTests,
+  pickerItemsTests,
+  qualityVariationItemBreakdownsTests,
+  qualityVariationItemEventsTests,
+  qualityVariationItemOpportunitiesTests,
+  qualityVariationOpportunitiesTests,
+  reportsTests,
+  securityTests,
+  settingsTests,
+  strategicOpportunitiesTests,
+  userTests,
+  utilizationVariationOpportunitiesTests,
+  variationCaseTypesTests,
+  variationOpportunitiesTests
+} from './helpers/apiEndpointTestData';
+import { MissingEndpoint, SwaggerEndPointReport } from './helpers/swaggerEndPointReport';
+
+// ═══════════════════════════════════════════════════════════════════
+// TEST SUITE
+// ═══════════════════════════════════════════════════════════════════
+
+// Filter to only use STRATA_USER configuration
+const strataUserConfig = testConfigs.find((config) => config.userType === UserType.STRATA_USER);
+
+if (!strataUserConfig) {
+  customLogger.log(`⚠️ Available user types: ${testConfigs.map((c) => c.userType).join(', ')}`);
+  throw new Error(`STRATA_USER configuration not found in testConfigs. Available types: ${testConfigs.map((c) => c.userType).join(', ')}`);
+}
+
+const { testFramework: strataUserTest, testName } = strataUserConfig;
+
+strataUserTest.describe(`Swagger Endpoint Coverage Analysis (${testName})`, () => {
+  strataUserTest('should generate comprehensive endpoint coverage report', async ({ request, jwt }: any) => {
+    customLogger.log(`🔐 Running comprehensive coverage analysis with ${testName} credentials`);
+    customLogger.log(' 🚀 To re-run this specific test, use the command:');
+    customLogger.log('npx playwright test missingEndpointsCoverage.api.spec.ts');
+    customLogger.log('');
+
+    // Initialize the report generator
+    const reportGenerator = new SwaggerEndPointReport();
+
+    // Fetch Swagger specification with authentication
+    const swaggerSpec = await reportGenerator.fetchSwaggerSpec(request, jwt);
+
+    // Collect all test arrays
+    const allTestArrays = [
+      { name: 'AllOpportunities', tests: allOpportunitiesTests },
+      { name: 'BackgroundClientJob', tests: allBackgroundClientJobTests },
+      { name: 'ChargeCodeInitiatives', tests: allChargeCodeInitiativesTests },
+      { name: 'ChargeCodeOpportunities', tests: chargeCodeOpportunitiesTests },
+      { name: 'ChargeCodeOpportunityDetails', tests: chargeCodeOpportunityDetailsTests },
+      { name: 'ChargeCodeOpps', tests: chargeCodeOppsTests },
+      { name: 'ClientNetworkOpportunities', tests: clientNetworkOpportunitiesTests },
+      { name: 'ClientWarehouses', tests: clientWarehouseTests },
+      { name: 'EncounterOpportunities', tests: encounterOpportunitiesTests },
+      { name: 'ExplorationPopulations', tests: explorationPopulationTests },
+      { name: 'Exploration', tests: explorationTests },
+      { name: 'Filters', tests: filtersTests },
+      { name: 'FreeFormOpportunities', tests: freeFormOpportunitiesTests },
+      { name: 'GeneralLedgerOpportunities', tests: generalLedgerOpportunitiesTests },
+      { name: 'GudidFile', tests: gudidFileTests },
+      { name: 'Hangfire', tests: hangfireTests },
+      { name: 'Initiatives', tests: initiativesTests },
+      { name: 'MappedColumns', tests: mappedColumnsTests },
+      { name: 'PayrollOpportunities', tests: payrollOpportunitiesTests },
+      { name: 'PickerItems', tests: pickerItemsTests },
+      { name: 'QualityVariationItemBreakdowns', tests: qualityVariationItemBreakdownsTests },
+      { name: 'QualityVariationItemEvents', tests: qualityVariationItemEventsTests },
+      { name: 'QualityVariationItemOpportunities', tests: qualityVariationItemOpportunitiesTests },
+      { name: 'QualityVariationOpportunities', tests: qualityVariationOpportunitiesTests },
+      { name: 'Reports', tests: reportsTests },
+      { name: 'Security', tests: securityTests },
+      { name: 'Settings', tests: settingsTests },
+      { name: 'StrategicOpportunities', tests: strategicOpportunitiesTests },
+      { name: 'Users', tests: userTests },
+      { name: 'UtilizationVariationOpportunities', tests: utilizationVariationOpportunitiesTests },
+      { name: 'VariationCaseTypes', tests: variationCaseTypesTests },
+      { name: 'VariationOpportunities', tests: variationOpportunitiesTests }
+    ];
+
+    // Generate coverage report
+    const report = reportGenerator.generateCoverageReport(swaggerSpec, allTestArrays);
+
+    // ═══════════════════════════════════════════════════════════════════
+    // SECTION 1: OVERALL SUMMARY
+    // ═══════════════════════════════════════════════════════════════════
+    customLogger.log('═══════════════════════════════════════════════════════════════════');
+    customLogger.log('  📊 SWAGGER ENDPOINT COVERAGE REPORT');
+    customLogger.log('═══════════════════════════════════════════════════════════════════');
+    customLogger.log('');
+    customLogger.log(`  Generated: ${new Date().toISOString()}`);
+    customLogger.log('');
+    customLogger.log('───────────────────────────────────────────────────────────────────');
+    customLogger.log('  📈 OVERALL COVERAGE SUMMARY');
+    customLogger.log('───────────────────────────────────────────────────────────────────');
+    customLogger.log('');
+    customLogger.log(`  Total Swagger Endpoints:       ${report.totalSwaggerEndpoints}`);
+    customLogger.log(`  Endpoints with Coverage:       ${report.endpointsWithMockData}`);
+    customLogger.log(`  Endpoints without Coverage:    ${report.endpointsWithoutMockData}`);
+    customLogger.log(`  Coverage Percentage:           ${report.coveragePercentage.toFixed(2)}%`);
+    customLogger.log('');
+    customLogger.log('  Coverage Legend:');
+    customLogger.log('  🟢 [Both]    - mockData + apiTest');
+    customLogger.log('  🔵 [Mock]    - mockData only');
+    customLogger.log('  🟡 [Test]    - apiTest only');
+    customLogger.log('  🔴 [Missing] - No coverage');
+    customLogger.log('');
+
+    // ═══════════════════════════════════════════════════════════════════
+    // SECTION 2: CONTROLLER SUMMARY
+    // ═══════════════════════════════════════════════════════════════════
+    customLogger.log('───────────────────────────────────────────────────────────────────');
+    customLogger.log('  📋 CONTROLLER COVERAGE SUMMARY');
+    customLogger.log('───────────────────────────────────────────────────────────────────');
+    customLogger.log('');
+
+    const controllers = Object.keys(report.byController).sort();
+
+    controllers.forEach((controller) => {
+      const stats = report.byController[controller];
+      const coverage = stats.totalEndpoints > 0 ? (stats.coveredEndpoints / stats.totalEndpoints) * 100 : 0;
+      const status = coverage === 100 ? '✅' : coverage >= 80 ? '🟡' : '🔴';
+
+      customLogger.log(`  ${status} ${controller.padEnd(40)} ${stats.coveredEndpoints}/${stats.totalEndpoints} (${coverage.toFixed(1)}%)`);
+    });
+
+    customLogger.log('');
+
+    // ═══════════════════════════════════════════════════════════════════
+    // SECTION 3: DETAILED ENDPOINT BREAKDOWN
+    // ═══════════════════════════════════════════════════════════════════
+    customLogger.log('───────────────────────────────────────────────────────────────────');
+    customLogger.log('  📋 DETAILED ENDPOINT COVERAGE BY CONTROLLER');
+    customLogger.log('───────────────────────────────────────────────────────────────────');
+    customLogger.log('');
+
+    // Consolidate all endpoints by controller
+    const controllerEndpoints = new Map<string, Array<MissingEndpoint & { covered: boolean }>>();
+
+    // Add covered endpoints
+    report.coveredEndpoints.forEach((endpoint) => {
+      if (!controllerEndpoints.has(endpoint.controller)) {
+        controllerEndpoints.set(endpoint.controller, []);
+      }
+      controllerEndpoints.get(endpoint.controller)!.push({ ...endpoint, covered: true });
+    });
+
+    // Add missing endpoints
+    report.missingEndpoints.forEach((endpoint) => {
+      if (!controllerEndpoints.has(endpoint.controller)) {
+        controllerEndpoints.set(endpoint.controller, []);
+      }
+      controllerEndpoints.get(endpoint.controller)!.push({ ...endpoint, covered: false });
+    });
+
+    const sortedControllers = Array.from(controllerEndpoints.keys()).sort();
+
+    sortedControllers.forEach((controller, index) => {
+      const endpoints = controllerEndpoints.get(controller)!;
+      const stats = report.byController[controller];
+      const coverage = stats.totalEndpoints > 0 ? (stats.coveredEndpoints / stats.totalEndpoints) * 100 : 0;
+
+      customLogger.log(`  ${index + 1}. ${controller}`);
+      customLogger.log(`     Coverage: ${stats.coveredEndpoints}/${stats.totalEndpoints} (${coverage.toFixed(1)}%)`);
+      customLogger.log('');
+
+      // Sort: covered first, then by method and path
+      endpoints.sort((a, b) => {
+        if (a.covered !== b.covered) return b.covered ? 1 : -1;
+        if (a.method !== b.method) return a.method.localeCompare(b.method);
+        return a.path.localeCompare(b.path);
+      });
+
+      endpoints.forEach((endpoint, idx) => {
+        let icon: string;
+        let label: string;
+        if (!endpoint.covered) {
+          icon = '🔴';
+          label = '[Missing]';
+        } else if (endpoint.coverageSource === 'both') {
+          icon = '🟢';
+          label = '[Both]';
+        } else if (endpoint.coverageSource === 'mockData') {
+          icon = '🔵';
+          label = '[Mock]';
+        } else {
+          icon = '🟡';
+          label = '[Test]';
+        }
+        customLogger.log(`     ${idx + 1}. ${icon} ${endpoint.method.padEnd(6)} ${endpoint.path} ${label}`);
+      });
+      customLogger.log('');
+    });
+
+    customLogger.log('═══════════════════════════════════════════════════════════════════');
+    customLogger.log('');
+
+    // ═══════════════════════════════════════════════════════════════════
+    // SAVE REPORTS TO FILES
+    // ═══════════════════════════════════════════════════════════════════
+    const consoleReport = reportGenerator.formatCoverageReport(report);
+    const markdownReport = reportGenerator.generateMarkdownReport(report);
+
+    const fs = await import('fs');
+    const path = await import('path');
+
+    const reportDir = path.join(__dirname, '../../documentation');
+    const consoleReportPath = path.join(reportDir, 'SWAGGER_COVERAGE_REPORT.txt');
+    const markdownReportPath = path.join(reportDir, 'SWAGGER_COVERAGE_REPORT.md');
+
+    if (!fs.existsSync(reportDir)) {
+      fs.mkdirSync(reportDir, { recursive: true });
+    }
+
+    fs.writeFileSync(consoleReportPath, consoleReport, 'utf-8');
+    fs.writeFileSync(markdownReportPath, markdownReport, 'utf-8');
+
+    customLogger.log('📁 Reports saved:');
+    customLogger.log(`   - Console: ${consoleReportPath}`);
+    customLogger.log(`   - Markdown: ${markdownReportPath}`);
+    customLogger.log('');
+
+    // Optional: Fail test if coverage is below threshold
+    // Uncomment the following lines to enforce minimum coverage:
+    // const MINIMUM_COVERAGE_THRESHOLD = 80;
+    // if (report.coveragePercentage < MINIMUM_COVERAGE_THRESHOLD) {
+    //   throw new Error(
+    //     `Coverage ${report.coveragePercentage.toFixed(2)}% is below minimum threshold of ${MINIMUM_COVERAGE_THRESHOLD}%`
+    //   );
+    // }
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/swaggerEndPointTests.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/swaggerEndPointTests.spec.ts
new file mode 100644
index 0000000..b7cf2e8
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/swaggerEndPointTests.spec.ts
@@ -0,0 +1,225 @@
+import { customLogger } from '../../customLogger';
+import { ApiEndpointTest, testConfigs } from '../../helpers/globalTestUtils';
+import { EnvironmentType } from '../../playwright.config.shared';
+import {
+  allBackgroundClientJobTests,
+  allChargeCodeInitiativesTests,
+  allOpportunitiesTests,
+  chargeCodeOpportunitiesTests,
+  chargeCodeOpportunityDetailsTests,
+  chargeCodeOppsTests,
+  clientNetworkOpportunitiesTests,
+  clientWarehouseTests,
+  encounterOpportunitiesTests,
+  explorationPopulationTests,
+  explorationTests,
+  filtersTests,
+  freeFormOpportunitiesTests,
+  generalLedgerOpportunitiesTests,
+  gudidFileTests,
+  hangfireTests,
+  initiativesTests,
+  mappedColumnsTests,
+  payrollOpportunitiesTests,
+  pickerItemsTests,
+  qualityVariationItemBreakdownsTests,
+  qualityVariationItemEventsTests,
+  qualityVariationItemOpportunitiesTests,
+  qualityVariationOpportunitiesTests,
+  reportsTests,
+  securityTests,
+  settingsTests,
+  strategicOpportunitiesTests,
+  userTests,
+  utilizationVariationOpportunitiesTests,
+  variationCaseTypesTests,
+  variationOpportunitiesTests
+} from './helpers/apiEndpointTestData';
+import { SwaggerEndPointReport } from './helpers/swaggerEndPointReport';
+import { createSwaggerTestSuite } from './helpers/swaggerTestUtils';
+
+// Array moved to ./helpers/apiEndpointTestData.ts for centralized management
+const testSuites: Array<{ name: string; tests: ApiEndpointTest[]; environment?: EnvironmentType }> = [
+  { name: 'All Opportunities', tests: allOpportunitiesTests },
+  { name: 'Background Client Job', tests: allBackgroundClientJobTests },
+  { name: 'Charge Code Initiatives', tests: allChargeCodeInitiativesTests },
+  { name: 'Charge Code Opportunities', tests: chargeCodeOpportunitiesTests },
+  { name: 'Charge Code Opportunity Details', tests: chargeCodeOpportunityDetailsTests },
+  { name: 'Charge Code Opps', tests: chargeCodeOppsTests },
+  { name: 'Client Network Opportunities', tests: clientNetworkOpportunitiesTests },
+  { name: 'Client Warehouses', tests: clientWarehouseTests },
+  { name: 'Encounter Opportunities', tests: encounterOpportunitiesTests },
+  { name: 'Exploration Populations', tests: explorationPopulationTests },
+  { name: 'Exploration', tests: explorationTests },
+  { name: 'Filters', tests: filtersTests },
+  { name: 'Free Form Opportunities', tests: freeFormOpportunitiesTests },
+  { name: 'General Ledger Opportunities', tests: generalLedgerOpportunitiesTests },
+  { name: 'Gudid File', tests: gudidFileTests },
+  { name: 'Hangfire', tests: hangfireTests },
+  { name: 'Initiatives', tests: initiativesTests, environment: EnvironmentType.REMOTE },
+  { name: 'Mapped Columns', tests: mappedColumnsTests },
+  { name: 'Payroll Opportunities', tests: payrollOpportunitiesTests },
+  { name: 'Picker Items', tests: pickerItemsTests },
+  { name: 'Quality Variation Item Breakdowns', tests: qualityVariationItemBreakdownsTests },
+  { name: 'Quality Variation Item Events', tests: qualityVariationItemEventsTests },
+  { name: 'Quality Variation Item Opportunities', tests: qualityVariationItemOpportunitiesTests },
+  { name: 'Quality Variation Opportunities', tests: qualityVariationOpportunitiesTests },
+  { name: 'Reports', tests: reportsTests },
+  { name: 'Security', tests: securityTests },
+  { name: 'Settings', tests: settingsTests },
+  { name: 'Strategic Opportunities', tests: strategicOpportunitiesTests },
+  { name: 'Users', tests: userTests },
+  { name: 'Utilization Variation Opportunities', tests: utilizationVariationOpportunitiesTests },
+  { name: 'Variation Case Types', tests: variationCaseTypesTests },
+  { name: 'Variation Opportunities', tests: variationOpportunitiesTests }
+];
+
+/**
+ * Merge Swagger endpoints with existing test suites
+ */
+async function mergeSwaggerEndpoints(request: any, jwt?: string): Promise<Array<{ name: string; tests: ApiEndpointTest[]; environment?: EnvironmentType }>> {
+  const reportGenerator = new SwaggerEndPointReport();
+
+  try {
+    // Fetch Swagger spec
+    const swaggerSpec = await reportGenerator.fetchSwaggerSpec(request, jwt);
+
+    // Extract existing test endpoints for comparison
+    const existingEndpoints = new Set<string>();
+    testSuites.forEach((suite) => {
+      suite.tests.forEach((test) => {
+        let normalizedPath = test.endpoint;
+        if (!normalizedPath.startsWith('/api/') && !normalizedPath.startsWith('api/')) {
+          normalizedPath = `/api/${normalizedPath}`;
+        }
+        if (!normalizedPath.startsWith('/')) {
+          normalizedPath = `/${normalizedPath}`;
+        }
+        const key = reportGenerator.getEndpointKey(normalizedPath, test.method);
+        existingEndpoints.add(key);
+      });
+    });
+
+    // Extract Swagger endpoints
+    const swaggerEndpoints = new Map<string, { controller: string; endpoints: ApiEndpointTest[] }>();
+    const SUPPORTED_HTTP_METHODS = ['get', 'post', 'put', 'delete'] as const;
+
+    Object.entries(swaggerSpec.paths || {}).forEach(([path, pathItem]: [string, any]) => {
+      Object.entries(pathItem).forEach(([method, operation]: [string, any]) => {
+        if (SUPPORTED_HTTP_METHODS.includes(method as any) && operation) {
+          const tags = operation.tags || ['Untagged'];
+          const controller = tags[0];
+          const key = reportGenerator.getEndpointKey(path, method);
+
+          // Only add if not already in existing test suites
+          if (!existingEndpoints.has(key)) {
+            if (!swaggerEndpoints.has(controller)) {
+              swaggerEndpoints.set(controller, { controller, endpoints: [] });
+            }
+
+            swaggerEndpoints.get(controller)!.endpoints.push({
+              endpoint: path,
+              method: method.toUpperCase() as 'GET' | 'POST' | 'PUT' | 'DELETE',
+              description: operation.summary || `${method.toUpperCase()} ${path}`,
+              expectedStatus: [200, 201, 204], // Default expected successful status codes
+              queryParams: {}
+            });
+          }
+        }
+      });
+    });
+
+    // Create merged test suites
+    const mergedSuites = [...testSuites];
+
+    // Add new test suites for controllers with missing endpoints
+    swaggerEndpoints.forEach(({ controller, endpoints }) => {
+      if (endpoints.length > 0) {
+        customLogger.log(`📝 Adding ${endpoints.length} missing endpoints for ${controller}`);
+        mergedSuites.push({
+          name: `${controller} (Auto-discovered)`,
+          tests: endpoints,
+          environment: EnvironmentType.SMOKE_TEST
+        });
+      }
+    });
+
+    return mergedSuites;
+  } catch (error) {
+    customLogger.log(`⚠️ Failed to fetch Swagger spec for merging: ${error}`);
+    customLogger.log('   Falling back to existing test suites only');
+    return testSuites;
+  }
+}
+
+// Run tests for each configuration with merged endpoints
+testConfigs.forEach((config) => {
+  config.testFramework.describe(config.testName, () => {
+    config.testFramework.describe('Merged Swagger Endpoint Tests', () => {
+      let mergedTestSuites: Array<{ name: string; tests: ApiEndpointTest[]; environment?: EnvironmentType }> = [];
+
+      // Fetch and merge endpoints before running tests
+      config.testFramework.beforeAll(async ({ request }: any) => {
+        const jwt = (config as any).jwt;
+        mergedTestSuites = await mergeSwaggerEndpoints(request, jwt);
+        customLogger.log(`📊 Total test suites after merge: ${mergedTestSuites.length}`);
+      });
+
+      // Dynamically create test suites for merged endpoints
+      config.testFramework.describe('Auto-discovered Endpoints', () => {
+        config.testFramework('should test all endpoints from Swagger', async ({ request }: any) => {
+          // Get only the auto-discovered suites
+          const autoDiscoveredSuites = mergedTestSuites.filter((s) => s.name.includes('(Auto-discovered)'));
+
+          if (autoDiscoveredSuites.length === 0) {
+            customLogger.log('✅ No missing endpoints found - all Swagger endpoints are covered!');
+            return;
+          }
+
+          customLogger.log(`🔍 Testing ${autoDiscoveredSuites.length} auto-discovered controllers`);
+
+          for (const suite of autoDiscoveredSuites) {
+            customLogger.log(`  Testing ${suite.name}: ${suite.tests.length} endpoints`);
+
+            for (const test of suite.tests) {
+              try {
+                const jwt = (config as any).jwt;
+                const headers: Record<string, string> = {};
+                if (jwt) {
+                  headers['Authorization'] = `Bearer ${jwt}`;
+                }
+
+                const response = await request[test.method.toLowerCase()](test.endpoint, {
+                  headers,
+                  params: test.queryParams
+                });
+
+                if (response.ok()) {
+                  customLogger.log(`    ✅ ${test.method} ${test.endpoint}`);
+                } else {
+                  customLogger.log(`    ⚠️ ${test.method} ${test.endpoint} - Status: ${response.status()}`);
+                }
+              } catch (error) {
+                customLogger.log(`    ❌ ${test.method} ${test.endpoint} - Error: ${error}`);
+              }
+            }
+          }
+        });
+      });
+    });
+  });
+});
+
+// Also run original test suites (for backwards compatibility)
+testSuites.forEach((suite) => {
+  testConfigs.forEach((config) => {
+    config.testFramework.describe(config.testName, () => {
+      config.testFramework.describe('Original Swagger Endpoint Tests', () => {
+        config.testFramework.describe(suite.name, () => {
+          const envType = suite.environment || EnvironmentType.SMOKE_TEST;
+          createSwaggerTestSuite(config.testFramework, config.userType, suite.tests, envType);
+        });
+      });
+    });
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/swaggerTestSuite.api.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/swaggerTestSuite.api.spec.ts
new file mode 100644
index 0000000..ca6ef28
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/swagger/swaggerTestSuite.api.spec.ts
@@ -0,0 +1,411 @@
+/**
+ * @fileoverview Comprehensive Swagger API Test Suite
+ * @description Tests all Swagger API endpoints for the Continuous Improvement application
+ * @version 2.1.0
+ * @since 2025-12-31
+ * @author Strata Decision Technology
+ *
+ * @module SwaggerAPITestSuite
+ * @requires @playwright/test
+ * @requires ./helpers/swaggerUtils
+ *
+ * @overview
+ * This test suite dynamically tests all Swagger endpoints by fetching the spec at test time
+ * and iterating through all endpoints. Tests are organized by controller tags.
+ *
+ * Features:
+ * - Dynamic endpoint testing from Swagger specification
+ * - Automatic HTTP method detection (GET, POST, PUT, DELETE)
+ * - Parameter substitution for path parameters
+ * - Request body generation for POST/PUT operations
+ * - Response validation based on expected status codes
+ * - Integration with swaggerUtils for consistent testing patterns
+ */
+
+import { expect } from '@playwright/test';
+import { EnhancedJwt, USER_REGISTRY } from '../../auth/authUtils';
+import { customLogger } from '../../customLogger';
+import { Constants, DryRunUtils, testConfigs, ValidationUtils } from '../../helpers/globalTestUtils';
+import { ENVIRONMENT_CONFIGS, EnvironmentType } from '../../playwright.config.shared';
+import { ENDPOINT_TEST_DATA, IEndpointTestData } from './helpers/mockData';
+import { determineResponseType, generateMockRequestBody, getExpectedStatusCodes, substitutePathParameters, SwaggerOperation, SwaggerPath, SwaggerTestHelpers } from './helpers/swaggerTestUtils';
+
+// Extract base URL from environment or Swagger spec
+const getBaseURL = (swaggerSpec?: any) => {
+  if (process.env.API_URL) {
+    return process.env.API_URL;
+  }
+  if (swaggerSpec?.servers?.[0]?.url) {
+    return `${swaggerSpec.servers[0].url}/api/`;
+  }
+  return 'http://localhost:8443/api/';
+};
+
+// Helper to fetch and parse Swagger spec
+async function fetchAndParseSwagger(request: any): Promise<{
+  spec: any;
+  endpointsByTag: Record<string, Array<{ path: string; method: string; operation: SwaggerOperation }>>;
+}> {
+  const swaggerURL = process.env.SWAGGER_URL || ENVIRONMENT_CONFIGS[EnvironmentType.REMOTE].swaggerURL;
+  customLogger.log(`📥 Fetching Swagger spec from: ${swaggerURL}`);
+
+  const response = await request.get(swaggerURL, { timeout: 600_000 });
+  if (!response.ok()) {
+    throw new Error(`Failed to fetch Swagger spec: ${response.status()} ${response.statusText()}`);
+  }
+
+  const spec = await response.json();
+  customLogger.log(`✅ Loaded Swagger spec version: ${spec.info?.version}`);
+
+  const endpointsByTag: Record<string, Array<{ path: string; method: string; operation: SwaggerOperation }>> = {};
+  const SUPPORTED_HTTP_METHODS = ['get', 'post', 'put', 'delete'] as const;
+
+  // Parse Swagger paths and group by tags
+  Object.entries(spec.paths as Record<string, SwaggerPath>).forEach(([path, pathItem]) => {
+    Object.entries(pathItem).forEach(([method, operation]) => {
+      if (SUPPORTED_HTTP_METHODS.includes(method as any) && operation) {
+        const op = operation as SwaggerOperation;
+        const tags = op.tags || ['Untagged'];
+
+        tags.forEach((tag) => {
+          if (!endpointsByTag[tag]) {
+            endpointsByTag[tag] = [];
+          }
+          endpointsByTag[tag].push({ path, method, operation: op });
+        });
+      }
+    });
+  });
+
+  customLogger.log(`✅ Grouped ${Object.keys(endpointsByTag).length} tags with endpoints`);
+
+  return { spec, endpointsByTag };
+}
+
+// Helper to test a single endpoint
+async function testEndpoint(
+  apiHelper: SwaggerTestHelpers,
+  path: string,
+  method: string,
+  operation: SwaggerOperation,
+  enhancedJwt?: string | EnhancedJwt,
+  baseURL?: string,
+  endpointTestData?: IEndpointTestData
+) {
+  // Substitute path parameters
+  const endpointPath = substitutePathParameters(path, operation.parameters);
+
+  // Remove /api/ prefix if present since baseURL includes it
+  let relativePath = endpointPath.replace(/^\/api\//, '');
+
+  // Only remove /${Constants.DEFAULT_API_VERSION}/ from path if baseURL already contains /${Constants.DEFAULT_API_VERSION}/ to avoid double versioning
+  if (baseURL && baseURL.includes(`/${Constants.DEFAULT_API_VERSION}/`)) {
+    relativePath = relativePath.replace(/^\/?(v1|V1)\//, '');
+  }
+
+  // Use body from ENDPOINT_TEST_DATA if available, otherwise generate mock body
+  const requestBody = endpointTestData?.body ?? generateMockRequestBody(path, method);
+
+  // Determine expected response type
+  const responseType = determineResponseType(operation);
+
+  // Get expected status codes
+  const expectedCodes = getExpectedStatusCodes(operation.responses);
+
+  // Make API call based on HTTP method
+  let response: any;
+  let data: any;
+
+  try {
+    switch (method.toLowerCase()) {
+      case 'get':
+        ({ response, data } = await apiHelper.authenticatedGet<any>(relativePath, enhancedJwt, endpointTestData?.queryParams, endpointTestData?.timeout ?? 60_000));
+        break;
+
+      case 'post':
+        ({ response, data } = await apiHelper.authenticatedPost<any>(relativePath, requestBody, enhancedJwt));
+        break;
+
+      case 'put':
+        ({ response, data } = await apiHelper.authenticatedPut<any>(relativePath, requestBody, enhancedJwt, responseType !== 'void'));
+        break;
+
+      case 'delete':
+        ({ response, data } = await apiHelper.authenticatedPut<any>(relativePath, undefined, enhancedJwt, false));
+        break;
+    }
+
+    // Validate response
+    if (response) {
+      const status = response.status();
+      const isExpectedStatus = expectedCodes.includes(status);
+      const isAcceptableError = [Constants.HTTP_STATUS.BAD_REQUEST, Constants.HTTP_STATUS.NOT_FOUND, Constants.HTTP_STATUS.UNPROCESSABLE_ENTITY, Constants.HTTP_STATUS.INTERNAL_SERVER_ERROR].includes(
+        status
+      );
+
+      if (!isExpectedStatus && !isAcceptableError) {
+        customLogger.warn(`⚠️  Unexpected status ${status} for ${method.toUpperCase()} ${path}`);
+      }
+
+      // Log 500 errors with details
+      if (status === Constants.HTTP_STATUS.INTERNAL_SERVER_ERROR) {
+        customLogger.error(`🔴 Server Error (500) for ${method.toUpperCase()} ${path}`);
+        try {
+          const responseBody = await response.text();
+          if (responseBody) {
+            customLogger.error(`   Error Response:`, responseBody.substring(0, 500));
+          }
+        } catch (e) {
+          // Ignore response body read errors
+        }
+      }
+
+      // If successful, validate response data
+      if (response.ok()) {
+        switch (responseType) {
+          case 'boolean':
+            if (data !== undefined) {
+              expect(typeof data).toBe('boolean');
+            }
+            break;
+
+          case 'array':
+            if (data !== undefined) {
+              expect(Array.isArray(data)).toBeTruthy();
+              if (data.results && data.pagingInfo) {
+                ValidationUtils.validatePagedResponse(data);
+              } else {
+                customLogger.table(data.slice(0, 5)); // Log first 5 items for visibility
+              }
+            }
+            break;
+
+          case 'number':
+            if (data !== undefined) {
+              expect(typeof data).toBe('number');
+            }
+            break;
+
+          case 'string':
+            if (data !== undefined) {
+              expect(typeof data).toBe('string');
+            }
+            break;
+
+          case 'object':
+            if (data !== undefined) {
+              expect(data).toBeDefined();
+              expect(typeof data).toBe('object');
+              if (data.results && data.pagingInfo) {
+                ValidationUtils.validatePagedResponse(data);
+              }
+            }
+            break;
+
+          case 'void':
+            // No response body expected
+            break;
+        }
+      }
+    }
+  } catch (error) {
+    const errorMessage = (error as Error).message;
+
+    if (DryRunUtils.isDryRunMode()) {
+      DryRunUtils.logDryRunAction(`Skipped ${method.toUpperCase()} ${path}`, errorMessage);
+    } else {
+      customLogger.error(`❌ Error testing ${method.toUpperCase()} ${path}:`, errorMessage);
+
+      // Log request details for debugging
+      if (response) {
+        customLogger.error(`   Status: ${response.status()}`);
+        customLogger.error(`   Status Text: ${response.statusText()}`);
+        try {
+          const responseBody = await response.text();
+          if (responseBody) {
+            customLogger.error(`   Response Body:`, responseBody.substring(0, 500));
+          }
+        } catch (e) {
+          // Ignore response body read errors
+        }
+      }
+      customLogger.error(`   Request Path: ${relativePath}`);
+
+      // Re-throw critical errors that indicate test infrastructure issues
+      if (errorMessage.includes('Target page, context or browser has been closed') || errorMessage.includes('Request context disposed') || errorMessage.includes('Session closed')) {
+        throw error;
+      }
+    }
+  }
+}
+
+/**
+ * Module-level cache for Swagger spec
+ * This will be populated in beforeAll hooks
+ */
+const cachedSwaggerData: Map<
+  string,
+  {
+    spec: any;
+    endpointsByTag: Record<string, Array<{ path: string; method: string; operation: SwaggerOperation }>>;
+    baseURL: string;
+  }
+> = new Map();
+
+/**
+ * Generate test suites with individual tests for each controller tag
+ * This provides better visibility in Playwright UI while maintaining dynamic endpoint discovery
+ */
+testConfigs.forEach((config) => {
+  const testFramework = config.testFramework;
+  const userInfo = USER_REGISTRY[config.userType];
+
+  testFramework.describe(`Swagger API Tests (${config.testName})`, () => {
+    let swaggerSpec: any;
+    let endpointsByTag: Record<string, Array<{ path: string; method: string; operation: SwaggerOperation }>>;
+    let baseURL: string;
+    let swaggerHelpers: SwaggerTestHelpers;
+
+    // Fetch Swagger spec once before all tests
+    testFramework.beforeAll(async ({ request, apiRequest }: any) => {
+      customLogger.log(`🚀 Fetching Swagger spec for ${config.testName}`);
+      const result = await fetchAndParseSwagger(request);
+      swaggerSpec = result.spec;
+      endpointsByTag = result.endpointsByTag;
+      baseURL = getBaseURL(swaggerSpec);
+      swaggerHelpers = new SwaggerTestHelpers(apiRequest, baseURL);
+
+      // Cache the data for this config
+      cachedSwaggerData.set(config.testName, { spec: swaggerSpec, endpointsByTag, baseURL });
+
+      customLogger.log(`✅ Loaded ${Object.keys(endpointsByTag).length} controller tags`);
+      customLogger.log(`📋 Controllers: ${Object.keys(endpointsByTag).join(', ')}`);
+    });
+
+    // Create individual tests for each endpoint using static endpoint data
+    // This allows tests to be defined synchronously so they appear in Playwright UI tree
+    Object.entries(ENDPOINT_TEST_DATA).forEach(([controllerName, endpoints]) => {
+      testFramework.describe(controllerName, () => {
+        testFramework.describe(`Discover ${controllerName} Controller endpoints`, () => {
+          endpoints.forEach((endpointData) => {
+            testFramework(endpointData.description, { tag: ['@swagger', '@discovery'] }, async () => {
+              try {
+                const url = new URL(endpointData.path, baseURL);
+                swaggerHelpers.discoverEndpoints(url.toString()).then(() => {
+                  customLogger.log(`🔍 Discovered endpoints for ${endpointData.path}:`, endpoints);
+
+                  // Log available endpoints for analysis
+                  if (endpoints.length > 0) {
+                    expect(endpoints).toBeDefined();
+                    expect(endpoints.length).toBeGreaterThan(0);
+                  }
+                }); // Ensure method exists for type safety
+              } catch (error) {
+                customLogger.log(`✅ Endpoint discovery for ${endpointData.path} completed: ${error}`);
+              }
+            });
+          });
+        });
+
+        testFramework.describe(`Validate ${controllerName} query parameter boundaries`, () => {
+          endpoints
+            .filter((endpoint) => endpoint.method === 'POST')
+            .forEach((endpointData) => {
+              testFramework(endpointData.description, { tag: ['@swagger', '@validation'] }, async ({ jwt: authorizationJwt }: any) => {
+                const isPagable = endpointData.queryParams || endpointData.body?.pagingOptions;
+                testFramework.skip(!isPagable, '🔄 Boundary tests only implemented for POST endpoints with query parameters');
+
+                const queryParameters = [
+                  {
+                    name: 'pageNumber',
+                    method: 'POST' as const,
+                    testCases: [
+                      { description: 'Valid page 1', value: 1, expectedValid: true, additionalData: { pagingOptions: { pageSize: 10 }, filterOptions: {} } },
+                      { description: 'Valid page 5', value: 5, expectedValid: true, additionalData: { pagingOptions: { pageSize: 10 }, filterOptions: {} } },
+                      { description: 'Invalid page 0', value: 0, expectedValid: false, additionalData: { pagingOptions: { pageSize: 10 }, filterOptions: {} } },
+                      { description: 'Invalid negative page', value: -5, expectedValid: false, additionalData: { pagingOptions: { pageSize: 10 }, filterOptions: {} } }
+                    ]
+                  },
+                  {
+                    name: 'pageSize',
+                    method: 'POST' as const,
+                    testCases: [
+                      { description: 'Valid small page size', value: 1, expectedValid: true, additionalData: { pagingOptions: { pageNumber: 1 }, filterOptions: {} } },
+                      { description: 'Valid medium page size', value: 25, expectedValid: true, additionalData: { pagingOptions: { pageNumber: 1 }, filterOptions: {} } },
+                      { description: 'Valid large page size', value: 100, expectedValid: true, additionalData: { pagingOptions: { pageNumber: 1 }, filterOptions: {} } },
+                      { description: 'Invalid page size 0', value: 0, expectedValid: false, additionalData: { pagingOptions: { pageNumber: 1 }, filterOptions: {} } },
+                      { description: 'Invalid excessive page size', value: 5000, expectedValid: false, additionalData: { pagingOptions: { pageNumber: 1 }, filterOptions: {} } }
+                    ]
+                  }
+                ];
+
+                for (const parameter of queryParameters) {
+                  try {
+                    const results = await swaggerHelpers.testParameterBoundaries(endpointData.path, parameter, authorizationJwt);
+
+                    for (const result of results) {
+                      customLogger.log(
+                        `🧪 ${controllerName} ${parameter.name} boundary test: ${result.testCase} - Expected: ${result.expectedValid}, Actual: ${result.actualValid}, Status: ${result.statusCode}`
+                      );
+
+                      if (result.expectedValid) {
+                        expect(result.statusCode).not.toBe(400);
+                      } else if (!result.expectedValid && result.statusCode >= 400 && result.statusCode < 500) {
+                        expect(result.statusCode).toBeGreaterThanOrEqual(400);
+                      }
+                    }
+                  } catch (error) {
+                    customLogger.log(`✅ ${controllerName} ${parameter.name} boundary testing completed: ${error}`);
+                  }
+                }
+              });
+            });
+        });
+
+        endpoints.forEach((endpointData, index) => {
+          // Make test name unique by including index or description if there are duplicates
+          const baseName = `${endpointData.path.replace(/^\/api\/v([\d]*)\/(.*)/, '$2 (v$1)')} ${endpointData.method}`.trim();
+          const hasDuplicates = endpoints.filter((e) => e.method === endpointData.method && e.path === endpointData.path).length > 1;
+          const testName = hasDuplicates ? `${baseName} (${endpointData.description || index + 1})` : baseName;
+
+          testFramework(testName, { timeout: 60_000 }, async ({ apiRequest, jwt }: any) => {
+            // Ensure data is loaded
+            if (!endpointsByTag) {
+              const cached = cachedSwaggerData.get(config.testName);
+              if (cached) {
+                swaggerSpec = cached.spec;
+                endpointsByTag = cached.endpointsByTag;
+                baseURL = cached.baseURL;
+              }
+            }
+
+            // Create a fresh ApiTestHelpers instance for this test with the current apiRequest context
+            // This prevents "context closed" errors when reusing a stale request context
+            const freshApiHelper = new SwaggerTestHelpers(apiRequest, baseURL);
+
+            // Find this endpoint in the Swagger spec
+            const tag = controllerName;
+            const swaggerEndpoints = endpointsByTag[tag] || [];
+            const swaggerEndpoint = swaggerEndpoints.find((e) => e.path === endpointData.path && e.method.toLowerCase() === endpointData.method.toLowerCase());
+
+            if (!swaggerEndpoint) {
+              customLogger.warn(`⊚ Endpoint not found in Swagger spec: ${testName}`);
+              testFramework.skip();
+              return;
+            }
+            testFramework.skip(endpointData.isSkipped, 'Marked as skipped in mock data');
+
+            try {
+              // Test the endpoint - pass endpointData so it can use the body from ENDPOINT_TEST_DATA
+              await testEndpoint(freshApiHelper, swaggerEndpoint.path, swaggerEndpoint.method, swaggerEndpoint.operation, jwt, baseURL, endpointData);
+            } catch (error) {
+              // Log the error but allow test to continue for visibility
+              customLogger.error(`❌ Error testing ${testName}:`, (error as Error).message);
+              throw error; // Re-throw to mark test as failed
+            }
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/all-opportunities-page.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/all-opportunities-page.spec.ts
new file mode 100644
index 0000000..c2f9ae2
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/all-opportunities-page.spec.ts
@@ -0,0 +1,100 @@
+import { cciCostLeader, expect, UserType } from '../../auth/authenticatedUsers';
+import { customLogger } from '../../customLogger';
+import { testConfigs } from '../../helpers/globalTestUtils';
+import { AllOpportunitiesPage } from '../../pages/AllOpportunitiesPage';
+
+testConfigs.forEach((config) => {
+  const { isLocalizationTest, testFramework, testName, userType } = config;
+
+  const skipForGBriggs = (userType: UserType): boolean => {
+    if (userType === UserType.G_BRIGGS_USER) {
+      customLogger.log('⚠️ Skipping All Opportunities Page test for G Briggs User due to no response.');
+      cciCostLeader.skip(true, 'No response from server for non-CI user');
+      return true;
+    }
+    return false;
+  };
+
+  testFramework.describe('All Opportunities Page Tests', () => {
+    testFramework.beforeEach(async ({ page }: any, testInfo: any) => {
+      cciCostLeader.skip(testInfo.project.name.endsWith('-GB'), 'This test is not relevant to localized testing');
+      const allOpportunitiesPage = new AllOpportunitiesPage(page);
+      await allOpportunitiesPage.goto();
+
+      await expect(allOpportunitiesPage.opportunitiesHeader.filterButton).toBeVisible({ timeout: 30_000 });
+      await allOpportunitiesPage.opportunitiesHeader.filterButton.click({ timeout: 30_000 });
+      await expect(allOpportunitiesPage.opportunitiesHeader.clearFiltersButton).toBeVisible({ timeout: 30_000 });
+      await allOpportunitiesPage.opportunitiesHeader.clearFiltersButton.click({ timeout: 30_000 });
+      await allOpportunitiesPage.opportunitiesHeader.applyButton.click();
+      await allOpportunitiesPage.waitForLoading();
+      await expect(allOpportunitiesPage.opportunitiesHeader.filterButton).toBeVisible({ timeout: 30_000 });
+      await expect(allOpportunitiesPage.opportunitiesHeader.clearFiltersButton).toBeVisible({ timeout: 30_000, visible: false });
+    });
+
+    testFramework.describe('All Opportunities Page', () => {
+      testFramework(testName, { tag: '@ui' }, async ({ browserName, page }: any) => {
+        const allOpportunitiesPage = new AllOpportunitiesPage(page);
+
+        if (browserName.toLowerCase() === 'chromium') {
+          await expect(allOpportunitiesPage.menuHeader).toContainText('Continuous Improvement', { timeout: 30_000 });
+          await expect(allOpportunitiesPage.header).toContainText('All Opportunities', { timeout: 30_000 });
+        }
+        await expect(allOpportunitiesPage.opportunitiesMenu.infoIconButton).toBeVisible();
+        await expect(allOpportunitiesPage.opportunitiesHeader.exportButton).toBeVisible({ timeout: 30_000 });
+        await expect(allOpportunitiesPage.opportunitiesHeader.newOpportunityButton).toBeVisible();
+
+        if (userType !== UserType.G_BRIGGS_USER) {
+          await expect(allOpportunitiesPage.totalItems).toContainText(/\d+\s+total items/);
+          await expect(allOpportunitiesPage.opportunitiesMenu.fiscalYrSelector).toBeVisible({ timeout: 10_000 });
+          const d = new Date();
+          const year = d.getFullYear();
+          const fiscalYrSelectorText = (await allOpportunitiesPage.opportunitiesMenu.fiscalYrSelector.innerText()).replace(/\s+/g, '');
+          expect(fiscalYrSelectorText).toMatch(new RegExp(`^FY${year}|${year - 1}$`));
+        } else {
+          await expect(allOpportunitiesPage.nullTotalItems).toBeVisible();
+        }
+      });
+    });
+
+    testFramework.describe('Filter for GL', () => {
+      testFramework(testName, { tag: '@ui' }, async ({ page }: any) => {
+        const allOpportunitiesPage = new AllOpportunitiesPage(page);
+        if (skipForGBriggs(userType)) {
+          return;
+        }
+
+        await allOpportunitiesPage.FilterForGL();
+        await expect(allOpportunitiesPage.opportunitiesHeader.filterAppliedButton).toContainText('Filters (1)');
+
+        await allOpportunitiesPage.opportunitiesHeader.searchTextBar.fill('Med Surg');
+        await expect(allOpportunitiesPage.opportunitiesHeader.searchTextBar).toHaveValue('Med Surg');
+
+        await expect(page.locator('tbody')).toContainText('GL - 1');
+      });
+    });
+
+    testFramework.describe('Navigate to General Ledger Opportunities', () => {
+      testFramework(testName, { tag: '@ui' }, async ({ page }: any) => {
+        const allOpportunitiesPage = new AllOpportunitiesPage(page);
+        if (skipForGBriggs(userType)) {
+          return;
+        }
+
+        await allOpportunitiesPage.FilterForGL();
+        await expect(allOpportunitiesPage.opportunitiesHeader.filterAppliedButton).toContainText('Filters (1)');
+
+        await allOpportunitiesPage.opportunitiesHeader.searchTextBar.fill('Med Surg');
+        await expect(allOpportunitiesPage.opportunitiesHeader.searchTextBar).toHaveValue('Med Surg');
+
+        await expect(allOpportunitiesPage.opportunitiesMenu.generalLedgerLink).toBeVisible();
+        await allOpportunitiesPage.opportunitiesMenu.generalLedgerLink.click();
+        await allOpportunitiesPage.waitForLoading();
+        await expect(page).toHaveTitle('General Ledger');
+        await allOpportunitiesPage.goto();
+        await allOpportunitiesPage.waitForLoading();
+        await expect(page).toHaveTitle('All Opportunities');
+        await expect(allOpportunitiesPage.totalItems).toContainText(/\d+\s+total items/i);
+      });
+    });
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/apply-filters-for-utilization-variation-page.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/apply-filters-for-utilization-variation-page.spec.ts
new file mode 100644
index 0000000..9be479e
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/apply-filters-for-utilization-variation-page.spec.ts
@@ -0,0 +1,58 @@
+import { cciCostLeader, expect } from '../../auth/authenticatedUsers';
+import { AllOpportunitiesPage } from '../../pages/AllOpportunitiesPage';
+
+cciCostLeader('Apply filters for Utilization variation page', { tag: '@ui' }, async ({ page }, testInfo) => {
+  cciCostLeader.skip(testInfo.project.name.endsWith('-GB'), 'This test is not relevant to localized testing');
+  const allOpportunitiesPage = new AllOpportunitiesPage(page);
+  await allOpportunitiesPage.goto();
+
+  await expect(allOpportunitiesPage.menuHeader).toContainText('Continuous Improvement');
+  await expect(allOpportunitiesPage.header).toContainText('All Opportunities');
+
+  if (await allOpportunitiesPage.opportunitiesMenu.chargeCodeLink.isVisible()) {
+    await allOpportunitiesPage.opportunitiesMenu.chargeCodeLink.click();
+    await page.getByText('Charge Code Opportunities').isVisible();
+  }
+
+  await allOpportunitiesPage.opportunitiesMenu.encounterLink.click();
+  await page.getByText('Encounter Opportunities').isVisible();
+
+  await allOpportunitiesPage.opportunitiesMenu.freeFormLink.click();
+  await page.getByText('Free Form Opportunities').isVisible();
+
+  await allOpportunitiesPage.opportunitiesMenu.generalLedgerLink.click();
+  await page.getByText('General Ledger Opportunities').isVisible();
+
+  await allOpportunitiesPage.opportunitiesMenu.payrollLink.click();
+  await page.getByText('Payroll Opportunities').isVisible();
+
+  await allOpportunitiesPage.opportunitiesMenu.qualityVariationLink.click();
+  await page.getByText('Quality Variation Opportunities').isVisible();
+
+  await allOpportunitiesPage.opportunitiesMenu.variationLink.click();
+  await page.getByText('Utilization Variation Opportunities').isVisible();
+
+  await allOpportunitiesPage.opportunitiesHeader.filterButton.click();
+  await page.locator('.ant-select-selector').nth(1).click();
+  await page.getByLabel('Cost Driver').fill('supplies');
+  await page.getByTitle('Supplies', { exact: true }).locator('div').click();
+  await allOpportunitiesPage.opportunitiesHeader.applyButton.click();
+
+  await expect(allOpportunitiesPage.opportunitiesHeader.filterAppliedButton).toBeVisible();
+  await expect(allOpportunitiesPage.opportunitiesHeader.filterAppliedButton).toContainText('Filters (1)');
+  await allOpportunitiesPage.opportunitiesHeader.filterAppliedButton.click();
+
+  await page.locator('.ant-select-selector').nth(2).click();
+  await page.getByTitle('10 - Northern Valley Medical').locator('div').click();
+  await page.getByTitle('Cost Driver').click();
+  await allOpportunitiesPage.opportunitiesHeader.applyButton.click();
+
+  await expect(allOpportunitiesPage.opportunitiesHeader.filterAppliedButton).toBeVisible();
+  await expect(allOpportunitiesPage.opportunitiesHeader.filterAppliedButton).toContainText('Filters (2)');
+  await allOpportunitiesPage.opportunitiesHeader.filterAppliedButton.click();
+
+  await allOpportunitiesPage.opportunitiesHeader.cancelButton.click();
+
+  await expect(allOpportunitiesPage.opportunitiesHeader.filterAppliedButton).toBeVisible();
+  await expect(allOpportunitiesPage.opportunitiesHeader.filterAppliedButton).toContainText('Filters (2)');
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/client-warehouse-page.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/client-warehouse-page.spec.ts
new file mode 100644
index 0000000..b83cc54
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/client-warehouse-page.spec.ts
@@ -0,0 +1,4 @@
+import { testConfigs } from '../../helpers/globalTestUtils';
+import { TestClientWarehousePages } from '../../pages/components/TestClientWarehousePages';
+
+TestClientWarehousePages(testConfigs.map((config) => ({ ...config, isLocalizationTest: false })));
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/create-encounter-opportunity.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/create-encounter-opportunity.spec.ts
new file mode 100644
index 0000000..64ac2a6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/create-encounter-opportunity.spec.ts
@@ -0,0 +1,154 @@
+import * as crypto from 'crypto';
+import { cciCostLeader, expect } from '../../auth/authenticatedUsers';
+import { customLogger } from '../../customLogger';
+import { AllOpportunitiesPage } from '../../pages/AllOpportunitiesPage';
+import { CreateEncounterOpportunityWizard } from '../../pages/CreateEncounterOpportunityWizard';
+import { CreateEncounterOpportunityWizardPage } from '../../pages/CreateEncounterOpportunityWizardPage';
+
+cciCostLeader.describe.configure({ mode: 'parallel' });
+
+cciCostLeader.describe('Create Encounter Opportunity UI Tests', () => {
+  cciCostLeader.beforeEach(async ({ browserName, channel, page }) => {
+    cciCostLeader.skip(browserName.toLowerCase() !== 'chromium' || channel?.toLowerCase() === 'msedge', '⚠️ Only run these tests for chromium');
+    const allOpportunitiesPage = new AllOpportunitiesPage(page);
+    await allOpportunitiesPage.goto();
+
+    await expect(allOpportunitiesPage.menuHeader).toContainText('Continuous Improvement');
+    await expect(allOpportunitiesPage.header).toContainText('All Opportunities');
+
+    await expect(allOpportunitiesPage.opportunitiesHeader.newOpportunityButton).toBeVisible();
+    await allOpportunitiesPage.opportunitiesHeader.newOpportunityButton.click();
+
+    expect(allOpportunitiesPage.opportunitiesHeader.newEncounterOpportunityButton).toBeVisible();
+    await allOpportunitiesPage.opportunitiesHeader.newEncounterOpportunityButton.click();
+    await allOpportunitiesPage.waitForLoading();
+  });
+
+  cciCostLeader('From All Opportunities Page', { tag: '@ui' }, async ({ browserName, channel, page }) => {
+    await page.waitForURL('**/initiatives/create/encounter');
+    try {
+      const testId = crypto.randomUUID().replace(/-/g, '');
+      const testName = `EN playwright test ${testId}`;
+      const newEncounterWizardPage = new CreateEncounterOpportunityWizard(page);
+
+      await expect(newEncounterWizardPage.wizardTitle).toBeVisible();
+      await expect(newEncounterWizardPage.wizardTitle).toContainText('Create Encounter Opportunity and Initiative');
+      await newEncounterWizardPage.name.click();
+      await newEncounterWizardPage.name.fill(testName);
+      await newEncounterWizardPage.nextButton.click();
+
+      await expect(page.getByLabel('check').locator('svg')).toBeVisible();
+      await newEncounterWizardPage.caseTypeEditButton.click();
+      await expect(newEncounterWizardPage.caseTypeModal).toBeVisible();
+      await newEncounterWizardPage.caseTypeSearchBox.click();
+      await newEncounterWizardPage.caseTypeSearchBox.fill('Total Knee');
+      await newEncounterWizardPage.waitForLoading();
+
+      await expect(page.getByText(/ADLT Total Knee Replacement.*/)).toBeVisible({ timeout: 10_000 });
+      await page.getByText('ADLT Total Knee Replacement W/O').click();
+      await page.getByRole('button', { name: 'Select' }).click();
+      await newEncounterWizardPage.opportunityLevelSelector.click();
+      await newEncounterWizardPage.opportunityLevelEntitySelector.click();
+      await page.getByRole('button', { name: 'edit Edit' }).nth(1).click();
+      await page.locator('div:nth-child(2) > .ant-tree-checkbox > .ant-tree-checkbox-inner').click();
+      await page.locator('div:nth-child(3) > .ant-tree-checkbox > .ant-tree-checkbox-inner').click();
+      await page.locator('div:nth-child(4) > .ant-tree-checkbox > .ant-tree-checkbox-inner').click();
+      await page.locator('div:nth-child(5) > .ant-tree-checkbox > .ant-tree-checkbox-inner').click();
+      await page.locator('div:nth-child(6) > .ant-tree-checkbox > .ant-tree-checkbox-inner').click();
+      await page.getByRole('button', { name: 'Select' }).click();
+      await newEncounterWizardPage.seasonalitySelector.click();
+      await newEncounterWizardPage.nextButton.click();
+      await newEncounterWizardPage.waitForLoading();
+
+      await newEncounterWizardPage.ciCostLeader.isVisible();
+      await newEncounterWizardPage.ciCostLeaderPicker.isVisible();
+      await newEncounterWizardPage.ciCostLeaderPicker.click();
+      await newEncounterWizardPage.ciCostLeaderPicker.fill('Abbey');
+      await page.getByTitle(/Dian+a Abbey/).click();
+
+      await newEncounterWizardPage.ciOwner.isVisible();
+      await newEncounterWizardPage.ciOwnerPicker.isVisible();
+      await newEncounterWizardPage.ciOwnerPicker.click();
+      await newEncounterWizardPage.ciOwnerPicker.fill('Abbey Normal');
+      await page.getByTitle('Abbey Normal').click();
+
+      await newEncounterWizardPage.ciExecutiveSponsor.isVisible();
+      await newEncounterWizardPage.ciExecutiveSponsorPicker.isVisible();
+      await newEncounterWizardPage.ciExecutiveSponsorPicker.click();
+      await newEncounterWizardPage.ciExecutiveSponsorPicker.fill('Aaron Hooper');
+      await page.getByTitle('Aaron Hooper').click();
+
+      await newEncounterWizardPage.nextButton.click();
+      await newEncounterWizardPage.waitForLoading();
+
+      await expect(newEncounterWizardPage.saveButton).toBeVisible();
+      await newEncounterWizardPage.saveButton.click();
+      await newEncounterWizardPage.waitForLoading();
+
+      const titleTest = new RegExp(`/Opportunity EN - \\d+ • ${testName}/`);
+      await expect(page.locator('h1')).toContainText(titleTest);
+      await page.getByRole('button', { name: 'Tools down' }).click();
+      await page.getByText('Edit Security').click();
+      await expect(page.getByText('Security', { exact: true })).toBeVisible();
+      const ciCostLeader = page.getByRole('row', { name: 'CI - Cost Leader' });
+      await expect(ciCostLeader.getByLabel('').first()).toBeChecked();
+      await expect(ciCostLeader.getByLabel('').nth(1)).toBeChecked();
+      await expect(ciCostLeader.getByLabel('').nth(2)).toBeChecked();
+      const ciExecSponsors = page.getByRole('row', { name: 'CI - Exec Sponsors' });
+      await expect(ciExecSponsors.getByLabel('').first()).toBeChecked();
+      await expect(ciExecSponsors.getByLabel('').nth(1)).not.toBeChecked();
+      await expect(ciExecSponsors.getByLabel('').nth(2)).not.toBeChecked();
+      await page.getByRole('button', { name: 'Cancel' }).click();
+      await page.getByRole('button', { name: 'Workbooks down' }).click();
+      await page.getByRole('button', { name: 'Workbooks down' }).click();
+
+      await page.getByText('Knee').click();
+      await page.getByRole('button', { name: 'Select' }).click();
+      await page.getByRole('button', { name: 'edit Edit' }).nth(1).click();
+      await page.getByPlaceholder('Search').click();
+      await page.getByPlaceholder('Search').fill('emergency');
+      await page.locator('.ant-tree-checkbox-inner').first().click();
+      await page.locator('div:nth-child(3) > .ant-tree-checkbox > .ant-tree-checkbox-inner').click();
+      await page.locator('div:nth-child(4) > .ant-tree-checkbox > .ant-tree-checkbox-inner').click();
+      await page.getByRole('button', { name: 'Select' }).click();
+      await page.locator('.ant-select-selector').first().click();
+      await page.getByText('Units of Service Per Case').click();
+      await page.getByRole('button', { name: 'Next' }).click();
+      await page.getByRole('button', { name: 'Next' }).click();
+      await page.getByRole('button', { name: 'Next' }).click();
+      await page.getByRole('button', { name: 'Save' }).click();
+      await page.getByRole('button', { name: 'Save' }).click();
+    } catch (error: any) {
+      customLogger.error('❌ Error during Create Encounter Opportunity From All Opportunities Page test:');
+      customLogger.error('💥 ' + error.message);
+      cciCostLeader.fail(true, 'From All Opportunities Page\n\tFailed due to error: ' + error.message);
+      return;
+    }
+  });
+
+  cciCostLeader('From Wizard Page', { tag: '@ui' }, async ({ browserName, channel, page }) => {
+    const wizardPage = new CreateEncounterOpportunityWizardPage(page);
+    await wizardPage.goto();
+
+    await expect(wizardPage.wizardTitle).toBeVisible();
+    await expect(wizardPage.wizardTitle).toContainText(/Create Encounter Opportunity/, { ignoreCase: true, useInnerText: true });
+    await expect(wizardPage.nextButton).toBeVisible();
+  });
+
+  cciCostLeader('From Wizard', { tag: '@ui' }, async ({ browserName, channel, page }, testInfo) => {
+    const wizard = new CreateEncounterOpportunityWizard(page);
+    const testName = await wizard.createEncounterOpportunity();
+    const titleExp = 'Opportunity EN - [\\d]+ • ' + testName;
+    const titleTest = new RegExp(titleExp);
+    const title = 'Opportunity EN - 23 • ' + testName;
+    expect(title).toMatch(titleTest);
+
+    /* This part isn't working yet */
+    //await wizard.waitForLoading();
+    //await page.waitForURL('**/encounter - opportunity/**');
+    // await expect(page.locator('h1')).toContainText(titleTest);
+    // await expect(page.getByRole('button', { name: 'Comments' })).toBeVisible();
+    // await expect(page.getByRole('button', { name: 'Finalize Initiative' })).toBeVisible();
+    // await expect(page.getByRole('button', { name: 'Workbooks down' })).toBeVisible();
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/exploration/caseTypeFamilySummaryGrid.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/exploration/caseTypeFamilySummaryGrid.spec.ts
new file mode 100644
index 0000000..8b17b6c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/exploration/caseTypeFamilySummaryGrid.spec.ts
@@ -0,0 +1,256 @@
+import { EnhancedJwt, expect } from '../../../auth/authUtils';
+import { customLogger } from '../../../customLogger';
+import { BrowserContextUtils, testConfigs } from '../../../helpers/globalTestUtils';
+import { CaseTypeFamilySummaryGridPage } from '../../../pages/exploration/CaseTypeFamilySummaryGridPage';
+
+testConfigs.forEach((config) => {
+  const { isLocalizationTest, testFramework, testName, userType } = config;
+  const isDevMaster = /.*Dev Master/i.test(testName);
+
+  testFramework.describe.configure({ retries: isLocalizationTest ? 1 : 0 });
+
+  // Helper function to get browser name, detecting Edge specifically
+  const getBrowserName = async (page: any): Promise<string> => {
+    const browserType = page.context().browser().browserType().name();
+
+    // For chromium-based browsers, check user agent to detect Edge
+    if (browserType === 'chromium') {
+      try {
+        const userAgent = await page.evaluate(() => navigator.userAgent);
+        // Microsoft Edge contains "Edg/" in its user agent string
+        if (userAgent.includes('Edg/')) {
+          customLogger.log(`🌐 Browser detected: msedge (via user agent: ${userAgent.substring(0, 50)}...)`);
+          return 'msedge';
+        }
+      } catch (error) {
+        customLogger.log(`⚠️ Could not evaluate user agent: ${error}`);
+      }
+    }
+
+    customLogger.log(`🌐 Browser detected: ${browserType}`);
+    return browserType;
+  };
+
+  // Helper function to capture and save screenshots
+  const saveScreenshot = async (page: any, title: string, testName: string, browserName?: string, groupName?: string) => {
+    const screenshotPath = `documentation/screenshots/${groupName ? groupName + '/' : 'before/'}${title}/${testName}/${browserName || page.context().browser().browserType().name()}.png`;
+    const absPath = require('path').resolve(screenshotPath);
+    customLogger.log(`📁 Saving screenshot to: ${absPath}`);
+    await page.screenshot({ path: screenshotPath });
+    customLogger.log(`📸 Screenshot captured: ${screenshotPath}`);
+  };
+
+  // Helper function to initialize and validate the Case Type Family Summary Grid page
+  const initializeCaseTypeFamilySummaryGridPage = async (page: any, title: string): Promise<CaseTypeFamilySummaryGridPage> => {
+    const caseTypeFamilySummaryGridPage = new CaseTypeFamilySummaryGridPage(page);
+    const response = await caseTypeFamilySummaryGridPage.goto();
+    expect(response && response.status() === 200).toBeTruthy();
+    await expect(caseTypeFamilySummaryGridPage.page).toHaveURL(/\/continuousimprovement\/explorectf/);
+
+    await expect(caseTypeFamilySummaryGridPage.menuHeader).toBeVisible({ timeout: 30_000, visible: false });
+    await expect(caseTypeFamilySummaryGridPage.header).toContainText('Explore Case Type Families', { timeout: 30_000 });
+    await expect(caseTypeFamilySummaryGridPage.totalItems).toBeVisible({ timeout: 30_000, visible: false });
+
+    const browserName = await getBrowserName(page);
+    await saveScreenshot(page, title, testName, browserName, 'before');
+    return caseTypeFamilySummaryGridPage;
+  };
+
+  // Helper function to reset column layout to default state
+  const resetColumnLayoutToDefault = async (browser: any, jwt: EnhancedJwt) => {
+    const { context, page } = await BrowserContextUtils.createAuthenticatedContext(browser, jwt);
+
+    const caseTypeFamilySummaryGridPage = new CaseTypeFamilySummaryGridPage(page);
+    const response = await caseTypeFamilySummaryGridPage.goto();
+    expect(response && response.status() === 200).toBeTruthy();
+    await expect(caseTypeFamilySummaryGridPage.page).toHaveURL(/\/continuousimprovement\/explorectf/);
+
+    // Reset column layout to default state
+    await caseTypeFamilySummaryGridPage.resetColumnLayoutToDefault();
+
+    await page.close();
+    await context.close();
+  };
+
+  interface ISearchParams {
+    searchInput: string;
+    waitForText?: string | RegExp;
+  }
+
+  interface IPopulationCriteriaParams {
+    caseTypeFamilySummaryGridPage: CaseTypeFamilySummaryGridPage;
+    population: string;
+    searchParams: ISearchParams[] | ISearchParams;
+  }
+
+  /**
+   * Helper to search and select a single option in the refinement search
+   */
+  const searchAndSelectSingleOption = async (populationCriteria: IPopulationCriteriaParams) => {
+    const { caseTypeFamilySummaryGridPage, searchParams } = populationCriteria;
+    const searchParam = Array.isArray(searchParams) ? searchParams[0] : searchParams;
+    await expect(caseTypeFamilySummaryGridPage.refinementSearchInput).toBeEnabled();
+    await caseTypeFamilySummaryGridPage.refinementSearchInput.click();
+    await caseTypeFamilySummaryGridPage.refinementSearchInput.fill(searchParam.searchInput);
+
+    if (searchParam.waitForText) {
+      const waitForOption = caseTypeFamilySummaryGridPage.page.getByText(searchParam.waitForText, { exact: true });
+      await waitForOption.waitFor({ state: 'hidden', timeout: 5000 }).catch(() => {
+        customLogger.log(`⚠️ Timeout waiting for "${searchParam.waitForText}" to hide, continuing...`);
+      });
+    }
+
+    await caseTypeFamilySummaryGridPage.getSearchResultText(searchParam.searchInput).isVisible();
+    await caseTypeFamilySummaryGridPage.borderButton.click();
+    await caseTypeFamilySummaryGridPage.selectAllResultsText.click();
+    await caseTypeFamilySummaryGridPage.closeCircleButton.click();
+  };
+
+  /**
+   * Helper to add population criteria with multiple search selections
+   */
+  const addPopulationCriteriaWithSearch = async (populationCriteria: IPopulationCriteriaParams) => {
+    const { caseTypeFamilySummaryGridPage, population, searchParams } = populationCriteria;
+    customLogger.log(`👥 Adding ${population} population criteria`);
+
+    // Add the population criteria
+    await caseTypeFamilySummaryGridPage.addPopulationCriteriaButton.click();
+    await caseTypeFamilySummaryGridPage.getPopulationOption(population).click();
+    await caseTypeFamilySummaryGridPage.addButton.click();
+    await caseTypeFamilySummaryGridPage.searchButton.click();
+
+    // Search and select each option
+    if (Array.isArray(searchParams)) {
+      for (const searchParam of searchParams) {
+        await searchAndSelectSingleOption({ caseTypeFamilySummaryGridPage, population, searchParams: searchParam });
+      }
+    } else {
+      await searchAndSelectSingleOption({ caseTypeFamilySummaryGridPage, population, searchParams });
+    }
+
+    // Save and apply
+    await caseTypeFamilySummaryGridPage.saveButton.click();
+    await caseTypeFamilySummaryGridPage.getPopulationApplyButton(population).click({ timeout: 600 });
+
+    // Validate the criteria was added
+    const populationCriteriaRegex = new RegExp(`${population}:.* +[\\d]*`, 'i');
+    await caseTypeFamilySummaryGridPage.getPopulationCriteriaText(populationCriteriaRegex).isVisible();
+  };
+
+  testFramework.describe('Case Type Family Summary Grid Page', () => {
+    testFramework.describe(testName, { tag: '@ui' }, () => {
+      testFramework.beforeAll(async ({ browser, jwt }: { browser: any; jwt: EnhancedJwt }) => {
+        await resetColumnLayoutToDefault(browser, jwt);
+      });
+
+      testFramework.beforeEach(async ({ page }: { page: any }, testInfo: any) => {
+        customLogger.log(`🚀 ${testInfo.title} started with status: ${testInfo.status}`);
+      });
+
+      testFramework.afterEach(async ({ page }: { page: any }, testInfo: any) => {
+        customLogger.log(`✅ ${testInfo.title} completed with status: ${testInfo.status}`);
+        const browserName = await getBrowserName(page);
+        await saveScreenshot(page, testInfo.title, testName, browserName, 'after');
+      });
+
+      testFramework.afterAll(async ({ browser, jwt }: { browser: any; jwt: EnhancedJwt }) => {
+        await resetColumnLayoutToDefault(browser, jwt);
+      });
+
+      testFramework('Help Test', { tag: '@ui' }, async ({ page }: { page: any }, testInfo: any) => {
+        const caseTypeFamilySummaryGridPage = await initializeCaseTypeFamilySummaryGridPage(page, testInfo.title);
+
+        // Help Button Test
+        const helpPopup = await caseTypeFamilySummaryGridPage.showHelpPopup();
+        await expect(helpPopup.getByLabel('Breadcrumbs')).toContainText('Home > SOLUTIONS > Performance > Continuous Improvement > Explore Case Type Families');
+        await expect(helpPopup.getByRole('heading', { name: /Explore Case Type Families/ })).toBeVisible();
+        const browserName = await getBrowserName(page);
+        await saveScreenshot(helpPopup, testInfo.title, testName, browserName, 'helpPopup');
+        await helpPopup.close();
+      });
+
+      testFramework('Validate Page Column Layout', { tag: '@ui' }, async ({ page }: { page: any }, testInfo: any) => {
+        const caseTypeFamilySummaryGridPage = await initializeCaseTypeFamilySummaryGridPage(page, testInfo.title);
+
+        // Column Layout Tests
+        await caseTypeFamilySummaryGridPage.editColumnLayoutButton.click();
+        const visibilityStates = await caseTypeFamilySummaryGridPage.getColumnVisibilityStates();
+        expect(visibilityStates.totalEncountersEyeButtonVisible).toBeTruthy();
+        await caseTypeFamilySummaryGridPage.totalEncountersEyeButton.click();
+        expect(visibilityStates.mortalityRateEyeButtonVisible).toBeTruthy();
+        await caseTypeFamilySummaryGridPage.mortalityRateEyeButton.click();
+        const browserName = await getBrowserName(page);
+        await saveScreenshot(page, testInfo.title, testName, browserName, 'columnLayoutEdited');
+        await caseTypeFamilySummaryGridPage.editColumnLayoutSaveButton.click({ timeout: 60_000, delay: 100 });
+        await caseTypeFamilySummaryGridPage.editColumnLayoutPanel.isHidden({ timeout: 60_000 });
+
+        await expect(caseTypeFamilySummaryGridPage.page.locator('.p-column-title').getByText(/Total Encounters/)).toBeHidden();
+        await expect(caseTypeFamilySummaryGridPage.page.locator('.p-column-title').getByText(/Mortality Rate/)).toBeHidden();
+        await saveScreenshot(page, testInfo.title, testName, browserName, 'columnLayoutFinal');
+      });
+
+      testFramework('Simple Page Refinement Options', { tag: '@ui' }, async ({ browser, page }: { browser: any; page: any }, testInfo: any) => {
+        const caseTypeFamilySummaryGridPage = await initializeCaseTypeFamilySummaryGridPage(page, testInfo.title);
+
+        // Filtering Tests
+        customLogger.log('🔧 Opening refinement options dialog');
+        await caseTypeFamilySummaryGridPage.filterRefinementOptionsButton.click();
+        await expect(caseTypeFamilySummaryGridPage.refinementDialog).toBeVisible();
+        await expect(caseTypeFamilySummaryGridPage.refinementDialog).toContainText(/Population Criteria/);
+
+        customLogger.log('⚙️ Applying simple refinement filters');
+        await caseTypeFamilySummaryGridPage.addPopulationCriteriaButton.click();
+        await page.getByRole('button', { name: 'Apply' }).click();
+        await page.getByRole('button', { name: 'Continue' }).click();
+        try {
+          await caseTypeFamilySummaryGridPage.waitForLoading();
+          await expect(page.getByText(/Select refinement options, update the criteria, and click apply/i)).not.toBeVisible();
+          customLogger.log('✨ Simple refinement options validation completed successfully');
+        } catch (error) {
+          customLogger.log('⚠️ Loading took longer than expected, proceeding with validation');
+        }
+      });
+
+      testFramework('Validate Page Refinement Options', { tag: '@ui' }, async ({ page }: { page: any }, testInfo: any) => {
+        const caseTypeFamilySummaryGridPage = await initializeCaseTypeFamilySummaryGridPage(page, testInfo.title);
+
+        // Filtering Tests
+        customLogger.log('🔧 Opening refinement options dialog');
+        await caseTypeFamilySummaryGridPage.filterRefinementOptionsButton.click();
+        await expect(caseTypeFamilySummaryGridPage.refinementDialog).toBeVisible();
+        await expect(caseTypeFamilySummaryGridPage.refinementDialog).toContainText(/Population Criteria/);
+
+        try {
+          let populationCriteria: IPopulationCriteriaParams = {
+            caseTypeFamilySummaryGridPage,
+            population: 'Age Cohort',
+            searchParams: [
+              { searchInput: 'Adult', waitForText: 'Senior' },
+              { searchInput: 'Senior', waitForText: 'Adult' }
+            ]
+          };
+          // Add Age Cohort criteria with Adult and Senior selections
+          await addPopulationCriteriaWithSearch(populationCriteria);
+
+          // Add Case Type Family criteria with Colonoscopy selection
+          populationCriteria = {
+            caseTypeFamilySummaryGridPage,
+            population: 'Case Type Family',
+            searchParams: { searchInput: 'Colonoscopy', waitForText: /Cervical Level Anterior Approach/i }
+          };
+          await addPopulationCriteriaWithSearch(populationCriteria);
+
+          customLogger.log('🎯 Applying refinement filters');
+          await page.getByRole('dialog').getByRole('button', { name: 'Apply' }).click();
+          await caseTypeFamilySummaryGridPage.waitForLoading();
+          testFramework.skip(!isDevMaster, 'Skipping for non Dev Master runs due to current instability - to be investigated');
+
+          await expect(page.getByText(/Select refinement options, update the criteria, and click apply/i)).not.toBeVisible();
+          customLogger.log('✨ Refinement options validation completed successfully');
+        } catch (error) {
+          customLogger.log('⚠️ Search input took longer than expected to appear, proceeding with interaction');
+        }
+      });
+    });
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/opportunities-pages.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/opportunities-pages.spec.ts
new file mode 100644
index 0000000..c621c36
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/opportunities-pages.spec.ts
@@ -0,0 +1,6 @@
+import { nonCIUserTestConfigs, testConfigs } from '../../helpers/globalTestUtils';
+import { TestOpportunityPages } from '../../pages/components/OpportunityPageTests';
+
+TestOpportunityPages(testConfigs.map((config) => ({ ...config, isLocalizationTest: false })));
+
+TestOpportunityPages(nonCIUserTestConfigs);
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/strategic-opportunity-detail-validation.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/strategic-opportunity-detail-validation.spec.ts
new file mode 100644
index 0000000..c977789
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/strategic-opportunity-detail-validation.spec.ts
@@ -0,0 +1,151 @@
+import { cciCostLeader, expect } from '../../auth/authenticatedUsers';
+import { StrategicOpportunityDetailPage } from '../../pages/StrategicOpportunityDetailPage';
+
+/**
+ * Strategic Opportunity Detail Page — Visual Validation Tests
+ *
+ * These tests navigate to CC and GL opportunity detail pages and validate
+ * grid structure: column headers, row hierarchy, and layout drawer options.
+ *
+ * Prerequisites:
+ * - At least one Charge Code strategic opportunity exists (set CC_OPPORTUNITY_ID env var)
+ * - At least one GL strategic opportunity exists (set GL_OPPORTUNITY_ID env var)
+ *
+ * Usage:
+ *   CC_OPPORTUNITY_ID=123 GL_OPPORTUNITY_ID=456 npx playwright test strategic-opportunity-detail-validation
+ */
+
+const ccOpportunityId = parseInt(process.env.CC_OPPORTUNITY_ID || '0', 10);
+const glOpportunityId = parseInt(process.env.GL_OPPORTUNITY_ID || '0', 10);
+
+cciCostLeader.describe('Strategic Opportunity Detail — Charge Code', () => {
+  cciCostLeader.skip(!ccOpportunityId, 'CC_OPPORTUNITY_ID env var not set');
+
+  cciCostLeader('CC detail page loads with correct grid columns', { tag: '@ui' }, async ({ page }) => {
+    const detailPage = new StrategicOpportunityDetailPage(page, ccOpportunityId);
+    await detailPage.goto();
+
+    // Verify page loaded — header should contain "CC"
+    await expect(detailPage.headerTitle).toContainText('CC', { timeout: 30_000 });
+
+    // Verify grid column headers
+    const headers = await detailPage.getVisibleColumnHeaders();
+    const nonEmptyHeaders = headers.filter((h) => h.trim().length > 0);
+
+    // CC opportunities should have encounters, units, cost columns
+    for (const expected of ['Encounters', 'Units', 'Total Improvement']) {
+      const found = nonEmptyHeaders.some((h) => h.includes(expected));
+      expect(found, `Expected column header containing "${expected}" in ${JSON.stringify(nonEmptyHeaders)}`).toBeTruthy();
+    }
+  });
+
+  cciCostLeader('CC detail page has expand/collapse controls', { tag: '@ui' }, async ({ page }) => {
+    const detailPage = new StrategicOpportunityDetailPage(page, ccOpportunityId);
+    await detailPage.goto();
+
+    await expect(detailPage.expandAllButton).toBeVisible({ timeout: 30_000 });
+    await expect(detailPage.collapseAllButton).toBeVisible();
+    await expect(detailPage.optionsButton).toBeVisible();
+    await expect(detailPage.commentsButton).toBeVisible();
+  });
+
+  cciCostLeader('CC detail page — Edit Grid Layout shows CC options', { tag: '@ui' }, async ({ page }) => {
+    const detailPage = new StrategicOpportunityDetailPage(page, ccOpportunityId);
+    await detailPage.goto();
+    await expect(detailPage.optionsButton).toBeVisible({ timeout: 30_000 });
+
+    await detailPage.openEditGridLayout();
+
+    // The layout drawer should be visible
+    await expect(detailPage.gridLayoutDrawer).toBeVisible({ timeout: 10_000 });
+
+    // CC layout should show CC-specific row options (Entity, Case Type Family, etc.)
+    const drawerText = await detailPage.gridLayoutDrawer.textContent();
+    expect(drawerText).toContain('Entity');
+    expect(drawerText).toContain('Charge Code');
+  });
+});
+
+cciCostLeader.describe('Strategic Opportunity Detail — General Ledger', () => {
+  cciCostLeader.skip(!glOpportunityId, 'GL_OPPORTUNITY_ID env var not set');
+
+  cciCostLeader('GL detail page loads with correct grid columns', { tag: '@ui' }, async ({ page }) => {
+    const detailPage = new StrategicOpportunityDetailPage(page, glOpportunityId);
+    await detailPage.goto();
+
+    // Verify page loaded — header should contain "GL"
+    await expect(detailPage.headerTitle).toContainText('GL', { timeout: 30_000 });
+
+    // Verify grid column headers
+    const headers = await detailPage.getVisibleColumnHeaders();
+    const nonEmptyHeaders = headers.filter((h) => h.trim().length > 0);
+
+    // GL opportunities should have Amount and Total Improvement columns
+    for (const expected of ['Amount', 'Total Improvement']) {
+      const found = nonEmptyHeaders.some((h) => h.includes(expected));
+      expect(found, `Expected column header containing "${expected}" in ${JSON.stringify(nonEmptyHeaders)}`).toBeTruthy();
+    }
+
+    // GL should NOT have CC-specific columns
+    const hasEncounters = nonEmptyHeaders.some((h) => h.includes('Encounters'));
+    expect(hasEncounters, 'GL detail should not have Encounters columns').toBeFalsy();
+  });
+
+  cciCostLeader('GL detail page — Edit Grid Layout shows GL options', { tag: '@ui' }, async ({ page }) => {
+    const detailPage = new StrategicOpportunityDetailPage(page, glOpportunityId);
+    await detailPage.goto();
+    await expect(detailPage.optionsButton).toBeVisible({ timeout: 30_000 });
+
+    await detailPage.openEditGridLayout();
+
+    await expect(detailPage.gridLayoutDrawer).toBeVisible({ timeout: 10_000 });
+
+    // GL layout should show GL-specific row options (Entity, Department, GL Account)
+    const drawerText = await detailPage.gridLayoutDrawer.textContent();
+    expect(drawerText).toContain('Entity');
+    expect(drawerText).toContain('Department');
+    expect(drawerText).toContain('GL Account');
+
+    // GL should NOT show CC-specific options like Case Type Family
+    expect(drawerText).not.toContain('Case Type Family');
+  });
+
+  cciCostLeader('GL detail page — row hierarchy shows GL dimensions', { tag: '@ui' }, async ({ page }) => {
+    const detailPage = new StrategicOpportunityDetailPage(page, glOpportunityId);
+    await detailPage.goto();
+
+    // Expand all rows to see dimension hierarchy
+    await expect(detailPage.expandAllButton).toBeVisible({ timeout: 30_000 });
+    await detailPage.expandAllButton.click();
+
+    // Wait for rows to render
+    const rows = detailPage.getGridRows();
+    await expect(rows.first()).toBeVisible({ timeout: 10_000 });
+
+    // Verify we have data rows (more than just the header row)
+    const rowCount = await rows.count();
+    expect(rowCount).toBeGreaterThan(1);
+  });
+});
+
+cciCostLeader.describe('Strategic Opportunity Detail — Cross-Type Consistency', () => {
+  cciCostLeader.skip(!ccOpportunityId || !glOpportunityId, 'Both CC_OPPORTUNITY_ID and GL_OPPORTUNITY_ID must be set');
+
+  cciCostLeader('CC and GL both have consistent page structure', { tag: '@ui' }, async ({ page }) => {
+    // Verify CC page structure
+    const ccPage = new StrategicOpportunityDetailPage(page, ccOpportunityId);
+    await ccPage.goto();
+    await expect(ccPage.expandAllButton).toBeVisible({ timeout: 30_000 });
+    await expect(ccPage.optionsButton).toBeVisible();
+
+    // Navigate to GL page
+    const glPage = new StrategicOpportunityDetailPage(page, glOpportunityId);
+    await glPage.goto();
+    await expect(glPage.expandAllButton).toBeVisible({ timeout: 30_000 });
+    await expect(glPage.optionsButton).toBeVisible();
+
+    // Both should have the same structural controls
+    await expect(glPage.commentsButton).toBeVisible();
+    await expect(glPage.collapseAllButton).toBeVisible();
+  });
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/update-opportunities-filters-and-exclude-opportunities.spec.ts b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/update-opportunities-filters-and-exclude-opportunities.spec.ts
new file mode 100644
index 0000000..ab3e06d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tests/ui/update-opportunities-filters-and-exclude-opportunities.spec.ts
@@ -0,0 +1,33 @@
+import { cciCostLeader, expect } from '../../auth/authenticatedUsers';
+import { AllOpportunitiesPage } from '../../pages/AllOpportunitiesPage';
+
+cciCostLeader('Update Opportunities filters and Exclude opportunities and initiatives', { tag: '@ui' }, async ({ page }) => {
+  const allOpportunitiesPage = new AllOpportunitiesPage(page);
+  await allOpportunitiesPage.goto();
+
+  await expect(allOpportunitiesPage.menuHeader).toContainText('Continuous Improvement');
+  await expect(allOpportunitiesPage.header).toContainText('All Opportunities');
+
+  await allOpportunitiesPage.opportunitiesHeader.filterButton.click();
+  await page.locator('.ant-select-selection-overflow').click();
+
+  await expect(allOpportunitiesPage.encounterOption).toBeVisible();
+
+  if (allOpportunitiesPage.encounterOption) {
+    await allOpportunitiesPage.encounterOption.click();
+
+    await page.getByRole('dialog').locator('div').filter({ hasText: 'Opportunity TypeEncounter Identified Savings MinimumDisplayVisible' }).click();
+    await page.getByLabel('Initiatives').check();
+    await allOpportunitiesPage.opportunitiesHeader.applyButton.click();
+
+    await expect(allOpportunitiesPage.opportunitiesHeader.filterAppliedButton).toBeVisible();
+    await expect(allOpportunitiesPage.opportunitiesHeader.filterAppliedButton).toContainText('Filters (2)');
+
+    await allOpportunitiesPage.opportunitiesHeader.filterAppliedButton.click();
+    await allOpportunitiesPage.opportunitiesHeader.clearFiltersButton.click();
+    await allOpportunitiesPage.opportunitiesHeader.applyButton.click();
+
+    await expect(allOpportunitiesPage.opportunitiesHeader.filterButton).toBeVisible();
+    await expect(allOpportunitiesPage.opportunitiesHeader.filterButton).toContainText('Filters');
+  }
+});
diff --git a/src/Strata.ContinuousImprovement.Web/e2e/tsconfig.json b/src/Strata.ContinuousImprovement.Web/e2e/tsconfig.json
new file mode 100644
index 0000000..a6e1b6c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/e2e/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+    "noFallthroughCasesInSwitch": true
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/cypress.env.json b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress.env.json
new file mode 100644
index 0000000..9e9d87c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress.env.json
@@ -0,0 +1,7 @@
+{
+    "username": "ccicostleader",
+    "password": "Password1",
+    "firstname":"CCI (Selenium Automation)",
+    "dbguid": "77f43f78-63a1-449a-a034-f1e88be5c9fc",
+    "clientId": "StrataUI"
+}  
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/cypress.env.json.example b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress.env.json.example
new file mode 100644
index 0000000..1c22fdd
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress.env.json.example
@@ -0,0 +1,7 @@
+{
+    "username": "ccicostleader",
+    "password": "",
+    "firstname":"CCI (Selenium Automation)",
+    "dbguid": "77f43f78-63a1-449a-a034-f1e88be5c9fc",
+    "clientId": "StrataUI"
+}  
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/cypress.json b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress.json
new file mode 100644
index 0000000..e432cf0
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress.json
@@ -0,0 +1,4 @@
+{
+    "baseUrl": "https://continuousimprovement.dev.stratanetwork.net/",
+    "requestTimeout": 8000
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/integration/verifyQualityVariationPage.spec.ts b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/integration/verifyQualityVariationPage.spec.ts
new file mode 100644
index 0000000..756f365
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/integration/verifyQualityVariationPage.spec.ts
@@ -0,0 +1,69 @@
+import { servicesVersion } from "typescript"
+import qualityVariationPage from "../pageObjects/qualityVariationPage"
+
+const qvPage = new qualityVariationPage()
+
+before(function() {
+    // Login with Identity Server Authentication
+    cy.login(Cypress.env('username'), Cypress.env('password'), Cypress.env('dbguid'), Cypress.env('clientId'))
+    // Verify that we've logined in right user
+    cy.findByText(Cypress.env('firstname'), {exact: true}).should("exist")
+    // verify url in correct
+    cy.url().should('eql', 'https://continuousimprovement.dev.stratanetwork.net/continuousimprovement/')
+    // verify page title
+    cy.title().should('eq', 'All Opportunities')
+    // # verify the page heading
+    cy.findByRole("heading", {name: 'Continuous Improvement'}).should("be.visible")
+})
+
+
+describe("Quality Variation Opportunities Tests", () => {
+
+    // table data to use in tests
+    let id, variation, cases, event, serviceLine
+
+    beforeEach(function () {
+        qvPage.getHomePage().should('be.visible').click()
+        cy.intercept('POST', 'quality-variation-item-opportunities').as('qvListItems')
+        // click the menu item
+        qvPage.getQualityVariationMenuItem().should("exist").should("be.visible").click()
+        cy.wait('@qvListItems').then(() => {
+            // verify page url
+            cy.url().then((url) => { url.includes('/quality-variation/opportunities')} )
+            // verify the page heading
+            qvPage.getPageHeading().should("exist");
+            // get table data from first row
+            cy.get('table > tbody > tr:nth-child(1)').within(($row) => {
+                id = $row.find('td').eq(0).text();
+                variation = $row.find('td').eq(1).text();
+                cases = $row.find('td').eq(2).text();
+                event = $row.find('td').eq(4).text();
+                serviceLine = $row.find('td').eq(5).text();
+            })
+        })
+    })
+
+    it('Verify QV Opportunity list page displays correctly', () => {
+        qvPage.getSelectedTab("Opportunities").should("exist").should("be.visible")
+    })
+
+    // This test is skipped because there is no more data in the database used for these
+    // tests that will create QV data.
+    it.skip('Verify search can find data in first row', () => {
+        cy.intercept('POST', 'quality-variation-item-opportunities').as('getSearchItems')
+        qvPage.getSearchInputField().type(id, {delay: 0})
+        
+        // Wait to finish test until we get response from search
+        cy.wait('@getSearchItems').then(() => {
+            cy.findByText(id).should('be.visible')
+            cy.findByText(variation).should('be.visible')
+            cy.findByText(cases).should('be.visible')
+            cy.findByText(event).should('be.visible')
+            cy.findByText(serviceLine).should('be.visible')
+        })  
+    })  
+})
+
+after(function() {
+    cy.logout()
+})
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/integration/verifyUtilizationVariationPage.spec.ts b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/integration/verifyUtilizationVariationPage.spec.ts
new file mode 100644
index 0000000..b2ae08c
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/integration/verifyUtilizationVariationPage.spec.ts
@@ -0,0 +1,278 @@
+import { waitFor } from "@testing-library/dom"
+import utilizationVariationPage from "../pageObjects/utilizationVariationPage"
+
+const uvPage = new utilizationVariationPage()
+let totalItems:any, id:any, identifiedSaving:any, caseType:string, costDriver:any, entity:any, serviceLine:any
+
+before(function() {
+    // Login with Identity Server Authentication
+    cy.login(Cypress.env('username'), Cypress.env('password'), Cypress.env('dbguid'), Cypress.env('clientId'))
+    // Verify that we've logined in right user
+    cy.findByText(Cypress.env('firstname'), {exact: true}).should("exist")
+    // verify url in correct
+    cy.url().should('eql', 'https://continuousimprovement.dev.stratanetwork.net/continuousimprovement/')
+    // verify page title
+    cy.title().should('eq', 'All Opportunities')
+    // # verify the page heading
+    cy.findByRole("heading", {name: 'Continuous Improvement'}).should("be.visible")
+})
+
+
+describe("Utilization Variation Opportunities Tests", () => {
+
+    beforeEach(function () {
+        // go to all opportunities page to reset test
+        uvPage.getHomePage().should('be.visible').click()
+        cy.intercept('POST', 'variation-opportunities').as('uvListItems')
+     
+        // go to UV page, wait for it to load and begin testing
+        uvPage.getUtilizationVariationMenuItem().should("exist").should("be.visible").click();
+        cy.wait('@uvListItems').then(() => {
+            // verify page url
+            cy.url().should('eql', 'https://continuousimprovement.dev.stratanetwork.net/continuousimprovement/utilization-variation/opportunities');
+            // verify the page heading
+            uvPage.getPageHeading().should("exist");
+            // select opportunities tab
+            uvPage.chooseTab("Opportunities").then(() =>
+            {   // get total opportunities returned
+                cy.wait(1000)
+                uvPage.getTotalItems().then(($items) =>
+                {
+                    totalItems = $items.text().replace(/\D/g, "")
+                })
+            })
+            
+            // select the tests data after page loads
+            cy.get('tbody').eq(0).find('> tr:nth-child(1)').within(($row) => {
+                id = $row.find('td').eq(0).text();
+                identifiedSaving = $row.find('td').eq(2).text();
+                caseType = $row.find('td').eq(4).text();
+                costDriver = $row.find('td').eq(5).text();
+                entity = $row.find('td').eq(6).text();
+                serviceLine = $row.find('td').eq(7).text();
+            })
+        })
+    })
+
+    it('Verify UV Opportunity list page displays correctly', () => {
+        uvPage.getSelectedTab("Opportunities").should("exist").should("be.visible")
+    })
+
+    it('Verify search finds by ID', () => {
+        //const searchToken = "UV - 272"
+        cy.intercept('POST', 'variation-opportunities').as('getSearchItems')
+
+        // type() - each keypress is delayed 10ms by default. 
+        // Search makes a request for each character typed, try to avoid by removing keypress delay.
+        uvPage.getSearchInputField().type(id, {delay: 0})
+
+        // wait to finish test until we get response from search
+        cy.wait('@getSearchItems').then(() => {
+            cy.findByText(id).should('be.visible')
+            cy.findByText(caseType).should('be.visible')
+            cy.findByText(costDriver).should('be.visible')
+            uvPage.getGridScroller().scrollTo('right')
+            cy.findByText(entity).should('be.visible')
+        })        
+    })
+
+    it('Verify identified savings filters', () => {
+      
+        uvPage.getFiltersButton().should('be.visible').click()
+        uvPage.getIdentifiedSavingsField().should('be.visible').type(identifiedSaving, {delay: 0})
+        cy.intercept('POST', 'variation-opportunities').as('getFilteredList')
+        uvPage.getFiltersApplyButton().should('be.visible').click()
+
+        cy.wait('@getFilteredList').then(() => {
+            uvPage.getTotalItems().then(($items) =>
+            {
+                let returnedItems =  $items.text().replace(/\D/g, "")
+                expect(Number(returnedItems)).to.be.lt(Number(totalItems))
+            })
+            uvPage.verifyFiltersApplied()
+        })
+    })
+
+    it('Verify case type filters', () => {
+
+        uvPage.getFiltersButton().should('be.visible').click()
+        uvPage.getCaseTypeDropDownList().focus().should('be.visible').type(caseType)
+        cy.findByTitle(caseType).click()
+        cy.intercept('POST', 'variation-opportunities').as('getFilteredList')
+        uvPage.getFiltersApplyButton().should('be.visible').click()
+
+        cy.wait('@getFilteredList').then(() => {
+            cy.findByRole('tabpanel', { hidden: false }).findAllByText(caseType).should('be.visible').should("have.length.lte", Number(totalItems))         
+            uvPage.getTotalItems().then(($items) =>
+            {
+                let returnedItems =  $items.text().replace(/\D/g, "")
+                expect(Number(returnedItems)).to.be.lte(Number(totalItems))
+            })
+            uvPage.verifyFiltersApplied()
+        })        
+        
+    })
+
+    it('Verify cost driver filters', () => {
+
+        uvPage.getFiltersButton().should('be.visible').click()
+        uvPage.getCostDriverDropDownList().focus().should('be.visible').type(costDriver)
+        cy.findByTitle(costDriver).click()
+        cy.intercept('POST', 'variation-opportunities').as('getFilteredList')
+        uvPage.getFiltersApplyButton().should('be.visible').click()
+
+        cy.wait('@getFilteredList').then(() => {
+            cy.findByRole('tabpanel', { hidden: false }).findAllByText(costDriver).should('be.visible').should("have.length.lte", Number(totalItems))
+            uvPage.getTotalItems().then(($items) =>
+            {
+                let returnedItems =  $items.text().replace(/\D/g, "")
+                expect(Number(returnedItems)).to.be.lte(Number(totalItems))
+            })
+            uvPage.verifyFiltersApplied()
+        })
+    })
+
+
+    it('Verify entity filters', () => {
+
+        uvPage.getFiltersButton().should('be.visible').click()
+        uvPage.getEntityDropDownList().focus().should('be.visible').type(entity)
+        cy.findByTitle(entity).click()
+        cy.intercept('POST', 'variation-opportunities').as('getFilteredList')
+        uvPage.getFiltersApplyButton().should('be.visible').click()
+
+        cy.wait('@getFilteredList').then(() => {
+            uvPage.getGridScroller().scrollTo('right')
+            cy.findByRole('tabpanel', { hidden: false }).findAllByText(entity).should('be.visible').should('have.length.lte', Number(totalItems))
+            uvPage.getTotalItems().then(($items) =>
+            {
+                let returnedItems =  $items.text().replace(/\D/g, "")
+                expect(Number(returnedItems)).to.be.lte(Number(totalItems))
+            })
+            uvPage.verifyFiltersApplied()
+        })          
+    })
+
+    it('Verify service line filters', () => {
+
+        uvPage.getFiltersButton().should('be.visible').click()
+        uvPage.getServiceLineDropDownList().focus().should('be.visible').type(serviceLine)
+        cy.findByTitle(serviceLine).click()
+        cy.intercept('POST', 'variation-opportunities').as('getFilteredList')        
+        uvPage.getFiltersApplyButton().should('be.visible').click()
+
+        cy.wait('@getFilteredList').then(() => {
+            uvPage.getGridScroller().scrollTo('right')
+            cy.findByRole('tabpanel', { hidden: false }).findAllByText(serviceLine).should('be.visible').should('have.length.lte', Number(totalItems))
+            uvPage.getTotalItems().then(($items) =>
+            {
+                let returnedItems =  $items.text().replace(/\D/g, "")
+                expect(Number(returnedItems)).to.be.lte(Number(totalItems))
+            })
+            uvPage.verifyFiltersApplied()
+        })
+    })
+
+      // TODO testing for remaining filters/export/paging/sorting
+})
+
+describe("Utilization Variation Case Types", () => {
+
+    beforeEach(function () {
+        // go to all opportunities page to reset test
+        uvPage.getHomePage().should('be.visible').click()
+        cy.intercept('POST', 'variation-opportunities').as('uvListItems')  
+        // go to UV page, wait for it to load and begin testing
+        uvPage.getUtilizationVariationMenuItem().should("exist").should("be.visible").click()
+        cy.wait('@uvListItems').then(() => {
+            // verify page url
+            cy.url().should('eql', 'https://continuousimprovement.dev.stratanetwork.net/continuousimprovement/utilization-variation/opportunities');
+            // verify the page heading
+            uvPage.getPageHeading().should("be.visible").should("exist");
+            // switch to case type tab, wait for data to load and test
+            cy.intercept('POST', 'variation-case-types').as('uvCaseTypListItems')
+            uvPage.chooseTab("Case Types")
+            cy.wait('@uvCaseTypListItems').then(() => {
+                cy.wait(1000); // wait for footer to load in
+                // get total case types returned
+                uvPage.getTotalItems().then(($items) =>
+                {
+                    totalItems = $items.text().replace(/\D/g, "")
+                })
+
+                // select the tests data after page loads
+                cy.get('tbody').eq(1).find('> tr:nth-child(1)').within(($row) => {
+                    identifiedSaving = $row.find('td').eq(1).text();
+                    caseType = $row.find('td').eq(0).text();
+                    serviceLine = $row.find('td').eq(3).text();
+                })
+            }) 
+        })
+    })
+
+    it('Verify UV Case Types list page displays correctly', () => {
+        uvPage.chooseTab("Case Types").should("exist").should("be.visible")
+    })
+
+    it('Verify case type filters', () => {
+
+        uvPage.getFiltersButton().should('be.visible').click()
+        uvPage.getCaseTypeDropDownList().focus().should('be.visible').type(caseType)
+        cy.findByTitle(caseType).click()
+        cy.intercept('POST', 'variation-case-types').as('getFilteredList')
+        uvPage.getFiltersApplyButton().should('be.visible').click()
+
+        cy.wait('@getFilteredList').then(() => {
+            cy.findByRole('tabpanel', { hidden: false }).findAllByText(caseType).should('be.visible').should('have.length', 1)
+            uvPage.getTotalItems().then(($items) =>
+            {
+                let returnedItems =  $items.text().replace(/\D/g, "")
+                expect(Number(returnedItems)).to.be.lte(Number(totalItems))
+            })
+            uvPage.verifyFiltersApplied()
+        })       
+        
+    })
+
+    it('Verify identified savings filters', () => {
+      
+        uvPage.getFiltersButton().should('be.visible').click()
+        uvPage.getIdentifiedSavingsField().should('be.visible').type(identifiedSaving, {delay: 0})
+        cy.intercept('POST', 'variation-case-types').as('getFilteredList')
+        uvPage.getFiltersApplyButton().should('be.visible').click()
+
+        cy.wait('@getFilteredList').then(() => {
+            uvPage.getTotalItems().then(($items) =>
+            {
+                let returnedItems =  $items.text().replace(/\D/g, "")
+                expect(Number(returnedItems)).to.be.lte(Number(totalItems))
+            })
+            uvPage.verifyFiltersApplied()
+        })
+    })
+
+    it('Verify service line filters', () => {
+
+        uvPage.getFiltersButton().should('be.visible').click()
+        uvPage.getServiceLineDropDownList().focus().should('be.visible').type(serviceLine)
+        cy.findByTitle(serviceLine).click()
+        cy.intercept('POST', 'variation-case-types').as('getFilteredList')        
+        uvPage.getFiltersApplyButton().should('be.visible').click()
+
+        cy.wait('@getFilteredList').then(() => {            
+            cy.findByRole('tabpanel', { hidden: false }).findAllByText(serviceLine).should('be.visible').should('have.length.lte', Number(totalItems))
+            uvPage.getTotalItems().then(($items) =>
+            {
+                let returnedItems =  $items.text().replace(/\D/g, "")
+                expect(Number(returnedItems)).to.be.lt(Number(totalItems))
+            })
+            uvPage.verifyFiltersApplied()
+        })
+    })
+
+    // TODO testing for filters/export/paging/sorting
+})
+
+after(function() {
+    cy.logout()
+})
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/pageObjects/qualityVariationPage.ts b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/pageObjects/qualityVariationPage.ts
new file mode 100644
index 0000000..a78b279
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/pageObjects/qualityVariationPage.ts
@@ -0,0 +1,36 @@
+export default class qualityVariationPage {
+    pageName = 'Quality Variation'
+    pageHeading = 'Quality Variation Opportunities'
+
+    getQualityVariationMenuItem() {
+        return cy.findByRole('menuitem', {name: this.pageName})
+    }
+
+    getPageHeading() {
+        return cy.findByRole("heading", {name: this.pageHeading})
+    }
+
+    getHomePage() {
+        return cy.findByRole('menuitem', {name: 'All'})
+    }
+
+    chooseTab(tabName: string) {
+        return cy.findByRole("tab", {name: tabName}).should("be.visible").click()
+    }
+
+    getTotalItems() {
+        return cy.findByRole('tabpanel').should('have.attr', 'tabindex', 0).children().contains("total items")
+     }
+
+    getSelectedTab(tabName: string) {
+        return cy.findByRole("tabpanel", {name: tabName})
+    }
+
+    getSearchInputField(){   
+        return cy.findAllByPlaceholderText('Search')
+    }
+
+    getGridScroller() {
+        return cy.get('.p-datatable-scrollable-body')
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/pageObjects/utilizationVariationPage.ts b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/pageObjects/utilizationVariationPage.ts
new file mode 100644
index 0000000..a3fd0a1
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/pageObjects/utilizationVariationPage.ts
@@ -0,0 +1,83 @@
+import { contains } from "cypress/types/jquery"
+import { values } from "cypress/types/lodash"
+
+export default class utilizationVariationPage {
+    pageName = 'Utilization Variation'
+    pageHeading = 'Utilization Variation Opportunities'
+
+    getUtilizationVariationMenuItem() {
+        return cy.findByRole('menuitem', {name: this.pageName})
+    }
+
+    getPageHeading() {
+        return cy.findByRole("heading", {name: this.pageHeading})
+    }
+
+    getHomePage() {
+        return cy.findByRole('menuitem', {name: 'All'})
+    }
+
+    chooseTab(tabName: string) {
+        return cy.findByRole("tab", {name: tabName}).should("be.visible").click()
+    }
+
+    getSelectedTab(tabName: string) {
+        return cy.findByRole("tabpanel", {name: tabName})
+    }
+
+    getSearchInputField(){   
+        return cy.findAllByPlaceholderText('Search')
+    }
+    
+    getFiltersButton() {
+        return cy.findAllByRole('button').contains('Filters').first()
+    }
+
+    getFiltersApplyButton() {
+        return cy.findByRole('button', {name: 'Apply'})
+    }
+    
+    getFiltersClearButton() {
+        return cy.findByRole('button', {name: 'Clear Filters'})
+    }
+
+    getIdentifiedSavingsField() {
+        return cy.findByLabelText("Identified Savings Minimum")
+    }
+
+    getCaseTypeDropDownList() {
+        return cy.get('#caseTypeGuids')
+    }
+
+    getCostDriverDropDownList() {
+        return cy.get('#costDrivers')
+    }
+
+    getEntityDropDownList() {
+        return cy.get('#entityIds')
+    }
+
+    getServiceLineDropDownList() {
+        return cy.get('#serviceLineIds')
+    }
+
+    getGridScroller() {
+        return cy.get('.p-datatable-scrollable-body')
+    }
+
+    getTotalItems() {
+       return cy.findByRole('tabpanel').should('have.attr', 'tabindex', 0).children().contains("total items")
+    }
+
+    verifyFiltersApplied() {
+        return cy.findAllByRole('button').contains('Filters (1)').first().should("exist")
+    }
+
+    resetFilters() {
+        this.getFiltersButton().should('be.visible').click()
+        this.getFiltersClearButton().should('be.visible').click()
+        this.getFiltersApplyButton().should('be.visible').click()
+    }
+
+}
+
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/plugins/index.ts b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/plugins/index.ts
new file mode 100644
index 0000000..59b2bab
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/plugins/index.ts
@@ -0,0 +1,22 @@
+/// <reference types="cypress" />
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+/**
+ * @type {Cypress.PluginConfig}
+ */
+// eslint-disable-next-line no-unused-vars
+module.exports = (on, config) => {
+  // `on` is used to hook into various events Cypress emits
+  // `config` is the resolved Cypress config
+}
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/support/commands.ts b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/support/commands.ts
new file mode 100644
index 0000000..afd6ea4
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/support/commands.ts
@@ -0,0 +1,42 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add('login', (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
+import '@testing-library/cypress/add-commands';
+/// <reference types="Cypress" />
+
+declare global{
+    namespace Cypress {
+      interface Chainable {
+        logout(): Chainable<Element>
+      }
+    }
+}
+
+Cypress.Commands.add('logout', () => {
+    cy.window().then((win) => {
+      win.sessionStorage.clear()
+    })
+    cy.visit('/')
+})
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/support/index.ts b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/support/index.ts
new file mode 100644
index 0000000..b56f766
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/support/index.ts
@@ -0,0 +1,30 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+import { loginCommand } from '@strata/cypress/lib/login'
+loginCommand()
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')
+
+const resizeObserverLoopErrRe = /^[^(ResizeObserver loop limit exceeded)]/
+Cypress.on('uncaught:exception', (err) => {
+    /* returning false here prevents Cypress from failing the test */
+    if (resizeObserverLoopErrRe.test(err.message)) {
+        return false
+    }
+})
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/tsconfig.json b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/tsconfig.json
new file mode 100644
index 0000000..178b540
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/cypress/tsconfig.json
@@ -0,0 +1,12 @@
+{
+    "compilerOptions": {
+        "noEmit": true,
+        "target": "es5",
+        "lib": ["es5", "dom"],
+        "types": ["cypress", "@testing-library/cypress"]
+    },
+    "include":[
+        "../node_modules",
+        "**/*.ts", "support/commands.ts"
+    ]
+}
\ No newline at end of file
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/package-lock.json b/src/Strata.ContinuousImprovement.Web/old_e2e/package-lock.json
new file mode 100644
index 0000000..8fc6df5
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/package-lock.json
@@ -0,0 +1,1645 @@
+{
+  "name": "continuousimprovement-e2e",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.16.7"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+      "dev": true
+    },
+    "@babel/highlight": {
+      "version": "7.16.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
+      "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        }
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.17.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz",
+      "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@cypress/request": {
+      "version": "2.88.10",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz",
+      "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "http-signature": "~1.3.6",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^8.3.2"
+      }
+    },
+    "@cypress/xvfb": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
+      "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.1.0",
+        "lodash.once": "^4.1.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "@strata/cypress": {
+      "version": "1.4.0",
+      "resolved": "https://proget.sdt.local/npm/npm/@strata/cypress/-/cypress-1.4.0.tgz",
+      "integrity": "sha512-nSQcRtSd8UbmA9e9mvAs2xNHNu90ixXzijaqE9ZOHEogoLmeMBzHyczhUDjNeKOakLWHiIzYB8D7CufsItf1Rg==",
+      "requires": {
+        "jwt-decode": "^3.1.2"
+      }
+    },
+    "@testing-library/cypress": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@testing-library/cypress/-/cypress-8.0.2.tgz",
+      "integrity": "sha512-KVdm7n37sg/A4e3wKMD4zUl0NpzzVhx06V9Tf0hZHZ7nrZ4yFva6Zwg2EFF1VzHkEfN/ahUzRtT1qiW+vuWnJw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.14.6",
+        "@testing-library/dom": "^8.1.0"
+      }
+    },
+    "@testing-library/dom": {
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.11.3.tgz",
+      "integrity": "sha512-9LId28I+lx70wUiZjLvi1DB/WT2zGOxUh46glrSNMaWVx849kKAluezVzZrXJfTKKoQTmEOutLes/bHg4Bj3aA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/runtime": "^7.12.5",
+        "@types/aria-query": "^4.2.0",
+        "aria-query": "^5.0.0",
+        "chalk": "^4.1.0",
+        "dom-accessibility-api": "^0.5.9",
+        "lz-string": "^1.4.4",
+        "pretty-format": "^27.0.2"
+      }
+    },
+    "@types/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "14.18.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz",
+      "integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==",
+      "dev": true
+    },
+    "@types/sinonjs__fake-timers": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
+      "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
+      "dev": true
+    },
+    "@types/sizzle": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
+      "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
+      "dev": true
+    },
+    "@types/yauzl": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
+      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "requires": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      }
+    },
+    "ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.21.3"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "arch": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
+      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
+      "dev": true
+    },
+    "aria-query": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
+      "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true
+    },
+    "async": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "dev": true
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "blob-util": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
+      "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
+      "dev": true
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
+    "cachedir": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz",
+      "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "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
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "check-more-types": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
+      "integrity": "sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=",
+      "dev": true
+    },
+    "ci-info": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
+      "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
+      "dev": true
+    },
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true
+    },
+    "cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^3.1.0"
+      }
+    },
+    "cli-table3": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.1.tgz",
+      "integrity": "sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==",
+      "dev": true,
+      "requires": {
+        "colors": "1.4.0",
+        "string-width": "^4.2.0"
+      }
+    },
+    "cli-truncate": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "dev": true,
+      "requires": {
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "colorette": {
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true,
+      "optional": true
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+      "dev": true
+    },
+    "common-tags": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
+      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
+    "cypress": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.4.1.tgz",
+      "integrity": "sha512-+JgMG9uT+QFx97JU9kOHE3jO3+0UdkQ9H1oCBiC7A74qme7Jkdy2sYDBCPjjGczutnWnGUTMRlwiNMP/Uq6LrQ==",
+      "dev": true,
+      "requires": {
+        "@cypress/request": "^2.88.10",
+        "@cypress/xvfb": "^1.2.4",
+        "@types/node": "^14.14.31",
+        "@types/sinonjs__fake-timers": "8.1.1",
+        "@types/sizzle": "^2.3.2",
+        "arch": "^2.2.0",
+        "blob-util": "^2.0.2",
+        "bluebird": "^3.7.2",
+        "buffer": "^5.6.0",
+        "cachedir": "^2.3.0",
+        "chalk": "^4.1.0",
+        "check-more-types": "^2.24.0",
+        "cli-cursor": "^3.1.0",
+        "cli-table3": "~0.6.1",
+        "commander": "^5.1.0",
+        "common-tags": "^1.8.0",
+        "dayjs": "^1.10.4",
+        "debug": "^4.3.2",
+        "enquirer": "^2.3.6",
+        "eventemitter2": "^6.4.3",
+        "execa": "4.1.0",
+        "executable": "^4.1.1",
+        "extract-zip": "2.0.1",
+        "figures": "^3.2.0",
+        "fs-extra": "^9.1.0",
+        "getos": "^3.2.1",
+        "is-ci": "^3.0.0",
+        "is-installed-globally": "~0.4.0",
+        "lazy-ass": "^1.6.0",
+        "listr2": "^3.8.3",
+        "lodash": "^4.17.21",
+        "log-symbols": "^4.0.0",
+        "minimist": "^1.2.5",
+        "ospath": "^1.2.2",
+        "pretty-bytes": "^5.6.0",
+        "proxy-from-env": "1.0.0",
+        "request-progress": "^3.0.0",
+        "semver": "^7.3.2",
+        "supports-color": "^8.1.1",
+        "tmp": "~0.2.1",
+        "untildify": "^4.0.0",
+        "yauzl": "^2.10.0"
+      },
+      "dependencies": {
+        "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
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "dayjs": {
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz",
+      "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==",
+      "dev": true
+    },
+    "debug": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      },
+      "dependencies": {
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "dom-accessibility-api": {
+      "version": "0.5.11",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.11.tgz",
+      "integrity": "sha512-7X6GvzjYf4yTdRKuCVScV+aA9Fvh5r8WzWrXBH9w82ZWB/eYDMGCnazoC/YAqAzUJWHzLOnZqr46K3iEyUhUvw==",
+      "dev": true
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.1"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "eventemitter2": {
+      "version": "6.4.5",
+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.5.tgz",
+      "integrity": "sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==",
+      "dev": true
+    },
+    "execa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
+      }
+    },
+    "executable": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
+      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+      "dev": true,
+      "requires": {
+        "pify": "^2.2.0"
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "requires": {
+        "@types/yauzl": "^2.9.1",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "dev": true,
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
+    "figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dev": true,
+      "requires": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "getos": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
+      "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==",
+      "dev": true,
+      "requires": {
+        "async": "^3.2.0"
+      }
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "global-dirs": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
+      "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
+      "dev": true,
+      "requires": {
+        "ini": "2.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.9",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
+      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "http-signature": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
+      "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^2.0.2",
+        "sshpk": "^1.14.1"
+      }
+    },
+    "human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "dev": true
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "ini": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
+      "dev": true
+    },
+    "is-ci": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
+      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
+      "dev": true,
+      "requires": {
+        "ci-info": "^3.2.0"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-installed-globally": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
+      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
+      "dev": true,
+      "requires": {
+        "global-dirs": "^3.0.0",
+        "is-path-inside": "^3.0.2"
+      }
+    },
+    "is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
+      }
+    },
+    "jsprim": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
+      "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.4.0",
+        "verror": "1.10.0"
+      }
+    },
+    "jwt-decode": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
+      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
+    },
+    "lazy-ass": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
+      "integrity": "sha1-eZllXoZGwX8In90YfRUNMyTVRRM=",
+      "dev": true
+    },
+    "listr2": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
+      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
+      "dev": true,
+      "requires": {
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.16",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.5.1",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=",
+      "dev": true
+    },
+    "log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      }
+    },
+    "log-update": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "slice-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "astral-regex": "^2.0.0",
+            "is-fullwidth-code-point": "^3.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        }
+      }
+    },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
+    "lz-string": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
+      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=",
+      "dev": true
+    },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.51.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.34",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.51.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.1.tgz",
+      "integrity": "sha512-reLxBcKUPNBnc/sVtAbxgRVFSegoGeLaSjmphNhcwcolhYLRgtJscn5mRl6YRZNQv40Y7P6JM2YhSIsbL9OB5A==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.0.0"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^2.1.0"
+      }
+    },
+    "ospath": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
+      "integrity": "sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs=",
+      "dev": true
+    },
+    "p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "requires": {
+        "aggregate-error": "^3.0.0"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true
+    },
+    "pretty-bytes": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
+      "dev": true
+    },
+    "pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true
+        }
+      }
+    },
+    "proxy-from-env": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
+      "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+      "dev": true
+    },
+    "react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true
+    },
+    "regenerator-runtime": {
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true
+    },
+    "request-progress": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
+      "integrity": "sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=",
+      "dev": true,
+      "requires": {
+        "throttleit": "^1.0.0"
+      }
+    },
+    "restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "requires": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "rfdc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "rxjs": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.4.tgz",
+      "integrity": "sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
+      }
+    },
+    "sshpk": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
+      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "dev": true,
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "throttleit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
+      "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "dev": true,
+      "requires": {
+        "rimraf": "^3.0.0"
+      }
+    },
+    "tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dev": true,
+      "requires": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      }
+    },
+    "tslib": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true
+    },
+    "typescript": {
+      "version": "4.5.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz",
+      "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==",
+      "dev": true
+    },
+    "universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "dev": true
+    },
+    "untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true
+    },
+    "uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    }
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/old_e2e/package.json b/src/Strata.ContinuousImprovement.Web/old_e2e/package.json
new file mode 100644
index 0000000..d9afce6
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/old_e2e/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "continuousimprovement-e2e",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "cypress open"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@testing-library/cypress": "^8.0.2",
+    "cypress": "^9.4.1",
+    "typescript": "^4.5.5"
+  },
+  "dependencies": {
+    "@strata/cypress": "^1.4.0"
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/package-lock.json b/src/Strata.ContinuousImprovement.Web/package-lock.json
new file mode 100644
index 0000000..8c5a3e9
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/package-lock.json
@@ -0,0 +1,91 @@
+{
+  "name": "strata.continuousimprovement.web",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "strata.continuousimprovement.web",
+      "version": "1.0.0",
+      "license": "ISC",
+      "devDependencies": {
+        "@playwright/test": "^1.52.0",
+        "@types/node": "^22.15.3"
+      }
+    },
+    "node_modules/@playwright/test": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.52.0.tgz",
+      "integrity": "sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==",
+      "dev": true,
+      "dependencies": {
+        "playwright": "1.52.0"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "22.15.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz",
+      "integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~6.21.0"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/playwright": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.52.0.tgz",
+      "integrity": "sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==",
+      "dev": true,
+      "dependencies": {
+        "playwright-core": "1.52.0"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz",
+      "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==",
+      "dev": true,
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "dev": true
+    }
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/package.json b/src/Strata.ContinuousImprovement.Web/package.json
new file mode 100644
index 0000000..0698f1d
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "strata.continuousimprovement.web",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {},
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@playwright/test": "^1.52.0",
+    "@types/node": "^22.15.3"
+  }
+}
diff --git a/src/Strata.ContinuousImprovement.Web/runtimeconfig.template.json b/src/Strata.ContinuousImprovement.Web/runtimeconfig.template.json
new file mode 100644
index 0000000..9cbaf60
--- /dev/null
+++ b/src/Strata.ContinuousImprovement.Web/runtimeconfig.template.json
@@ -0,0 +1,5 @@
+{
+  "configProperties": {
+    "System.Drawing.EnableUnixSupport":  true
+  }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Configurations/DecisionSupportServiceExtensions.cs b/src/Strata.DecisionSupport.Biz/Configurations/DecisionSupportServiceExtensions.cs
new file mode 100644
index 0000000..bfbbf81
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Configurations/DecisionSupportServiceExtensions.cs
@@ -0,0 +1,58 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Strata.ContinuousImprovement.Biz.ClientWarehouses;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.DecisionSupport.Biz.Services;
+using Strata.DecisionSupport.Biz.Snowflake;
+using Strata.SnowflakeLib.Configuration;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.DecisionSupport.Biz.Configurations
+{
+    [ExcludeFromCodeCoverage]
+    public static class DecisionSupportServiceExtensions
+    {
+        public static IServiceCollection AddDecisionSupportServices(this IServiceCollection services,
+            IConfiguration configuration)
+        {
+            services.AddSnowflakeServices(configuration);
+
+            services.AddScoped<IEncounterQueryService, EncounterQueryService>();
+            services.AddScoped<IUtilizationVariationService, UtilizationVariationService>();
+
+            return services;
+        }
+
+        private static void AddSnowflakeServices(this IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddSnowflake(configuration);
+            services.AddScoped<ISnowflakeDatabaseContextFactory, SnowflakeDatabaseContextFactory>();
+            services.AddScoped<ISnowflakeDatabaseContext, SnowflakeDatabaseContext>(provider =>
+            {
+                if (!IsDatabaseGuidKnown(provider))
+                {
+                    return null;
+                }
+
+                ISnowflakeDatabaseContextFactory snowflakeDatabaseContextFactory = provider.GetRequiredService<ISnowflakeDatabaseContextFactory>();
+                IClientWarehouseService clientWarehouseService = provider.GetRequiredService<IClientWarehouseService>();
+                return snowflakeDatabaseContextFactory.Create(provider.GetRequiredService<IClaimsPrincipalAccessor>().GetCurrentClaimsPrincipal()?.GetDatabaseGuid().ToString("N"));
+            });
+        }
+
+        private static bool IsDatabaseGuidKnown(IServiceProvider provider)
+        {
+            try
+            {
+                return provider.GetRequiredService<IClaimsPrincipalAccessor>().GetCurrentClaimsPrincipal()?.GetDatabaseGuid() != null;
+            }
+            catch (ClaimNotFoundException)
+            {
+                return false;
+            }
+        }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Encounters/AllChargeInfo.cs b/src/Strata.DecisionSupport.Biz/Encounters/AllChargeInfo.cs
new file mode 100644
index 0000000..880eaf0
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Encounters/AllChargeInfo.cs
@@ -0,0 +1,20 @@
+namespace Strata.DecisionSupport.Biz.Encounters
+{
+    public class AllChargeInfo
+    {
+        public int RowID { get; set; }
+        public int ChargeCodeId { get; set; }
+        public string Name { get; set; }
+        public string ChargeCode { get; set; }
+        public string Description { get; set; }
+        public bool IsPatientSpecific { get; set; }
+        public string CostDriver { get; set; }
+        public string Rollup { get; set; }
+        public bool IsBaseline { get; set; }
+        public double Quantity { get; set; }
+        public double AvgVariableDirectCost { get; set; }
+        public double AvgVariableIndirectCost { get; set; }
+        public double AvgFixedDirectCost { get; set; }
+        public double AvgFixedIndirectCost { get; set; }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Encounters/ChargeInfo.cs b/src/Strata.DecisionSupport.Biz/Encounters/ChargeInfo.cs
new file mode 100644
index 0000000..a91e102
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Encounters/ChargeInfo.cs
@@ -0,0 +1,26 @@
+namespace Strata.DecisionSupport.Biz.Encounters
+{
+    public class ChargeInfo
+    {
+        public int RowID { get; set; }
+        public int ChargeCodeId { get; set; }
+        public string Name { get; set; }
+        public string ChargeCode { get; set; }
+        public string Description { get; set; }
+        public bool IsPatientSpecific { get; set; }
+        public string CostDriver { get; set; }
+        public string Rollup { get; set; }
+        public bool IsBaseline { get; set; }
+        public double AvgVariableDirectCost { get; set; }
+        public double AvgVariableIndirectCost { get; set; }
+        public double AvgFixedDirectCost { get; set; }
+        public double AvgFixedIndirectCost { get; set; }
+        public bool CCICostOverride { get; set; } = false;
+
+        internal double GetCCIUnitCost(bool isUsingIndirectCost)
+        {
+            return this.AvgVariableDirectCost + this.AvgVariableIndirectCost;
+        }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Encounters/EncounterChargeInfo.cs b/src/Strata.DecisionSupport.Biz/Encounters/EncounterChargeInfo.cs
new file mode 100644
index 0000000..3efb567
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Encounters/EncounterChargeInfo.cs
@@ -0,0 +1,49 @@
+using System;
+
+namespace Strata.DecisionSupport.Biz.Encounters
+{
+    public class EncounterChargeInfo
+    {
+        public string OpportunityGuid { get; set; }
+        public long EncounterId { get; set; }
+        public string EncounterRecordNumber { get; set; }
+        public int ChargeCodeId { get; set; }
+        public decimal Charge { get; set; }
+        public DateTime AdmitDateTime { get; set; }
+        public DateTime ServiceDateTime { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+
+        public int DischargeStatusId { get; set; }
+        public string DischargeStatusGroup { get; set; }
+        public string UnitType { get; set; }
+        public int PrimaryPhysicianId { get; set; }
+        public double UOS { get; set; }
+
+        public string Name { get; set; }
+        public string ChargeCode { get; set; }
+        public string Description { get; set; }
+        public string Manufacturer { get; set; }
+        public string Vendor { get; set; }
+        public string Rollup { get; set; }
+        public double? UnitsOfService { get; set; }
+        public string CostDriver { get; set; }
+
+        public double PatientSpecificVariableIndirectCost { get; set; }
+        public double PatientSpecificVariableDirectCost { get; set; }
+        public double PatientSpecificFixedIndirectCost { get; set; }
+        public double PatientSpecificFixedDirectCost { get; set; }
+
+        public double AvgVariableIndirectCost { get; set; }
+        public double AvgVariableDirectCost { get; set; }
+        public double AvgFixedIndirectCost { get; set; }
+        public double AvgFixedDirectCost { get; set; }
+
+        public string PhysicianGroupingGuid { get; set; } = Guid.Empty.ToString();
+        public int PhysicianGroupingId { get; set; }
+        public string PhysicianGroupingName { get; set; }
+        public bool IsPatientSpecific { get; set; }
+
+        public bool IsBaseline { get; set; }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Encounters/LOSOpportunityInfo.cs b/src/Strata.DecisionSupport.Biz/Encounters/LOSOpportunityInfo.cs
new file mode 100644
index 0000000..1a40097
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Encounters/LOSOpportunityInfo.cs
@@ -0,0 +1,24 @@
+
+using System;
+
+namespace Strata.DecisionSupport.Biz.Encounters
+{
+    public class LOSOpportunityInfo
+    {
+        public long EncounterId { get; set; }
+        public string EncounterRecordNumber { get; set; }
+        public DateTime AdmitDateTime { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+        public int DischargeStatusId { get; set; }
+        public int PrimaryPhysicianId { get; set; }
+        public string DischargeStatusGroup { get; set; }
+        public string UnitType { get; set; }
+        public double UOS { get; set; }
+        public int ROM { get; set; }
+        public int SOI { get; set; }
+        public string OpportunityGuid { get; set; }
+        public string PhysicianGroupingGuid { get; set; }
+        public int PhysicianGroupingId { get; set; }
+        public string PhysicianGroupingName { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Encounters/SnowflakeEncounterInfo.cs b/src/Strata.DecisionSupport.Biz/Encounters/SnowflakeEncounterInfo.cs
new file mode 100644
index 0000000..ce1e423
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Encounters/SnowflakeEncounterInfo.cs
@@ -0,0 +1,42 @@
+using System;
+
+namespace Strata.DecisionSupport.Biz.Encounters
+{
+    public class SnowflakeEncounterInfo
+    {
+        public string EncounterRecordNumber { get; set; }
+        public long EncounterId { get; set; }
+        public int? CaseTypeFamilyId { get; set; }
+        public int? ClinicalIndicatorId { get; set; }
+        public int AgeCohortId { get; set; }
+        public int PhysicianId { get; set; }
+        public string PhysicianName { get; set; }
+        public string PhysicianGuid { get; set; }
+        public int PhysicianGroupAffiliationId { get; set; }
+        public string PhysicianGroupAffiliation { get; set; }
+        public string PhysicianGroupAffiliationGuid { get; set; }
+        public string PhysicianSpecialty { get; set; }
+        public int PhysicianSpecialtyId { get; set; }
+        public string PhysicianSpecialtyGuid { get; set; }
+        public int PatientTypeRollupId { get; set; }
+        public string PatientTypeRollupType { get; set; }
+        public double LengthOfStay { get; set; }
+        public int EntityId { get; set; }
+        public bool IsQVIEncounter { get; set; }
+        public string CCMCCCategory { get; set; }
+        public string ROM { get; set; }
+        public string SOI { get; set; }
+        public string CPTCode { get; set; }
+        public int ServiceLineId { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+
+        public SnowflakeEncounterInfo()
+        {
+            EncounterRecordNumber = string.Empty;
+            PhysicianName = string.Empty;
+            PhysicianGroupAffiliation = string.Empty;
+            PhysicianSpecialty = string.Empty;
+            PatientTypeRollupType = string.Empty;
+        }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Encounters/VariationEncounterChargeInfo.cs b/src/Strata.DecisionSupport.Biz/Encounters/VariationEncounterChargeInfo.cs
new file mode 100644
index 0000000..9d3aef7
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Encounters/VariationEncounterChargeInfo.cs
@@ -0,0 +1,49 @@
+using System;
+
+namespace Strata.DecisionSupport.Biz.Encounters
+{
+    public class VariationEncounterChargeInfo
+    {
+        public string OpportunityGuid { get; set; }
+        public long EncounterId { get; set; }
+        public string EncounterRecordNumber { get; set; }
+        public int ChargeCodeId { get; set; }
+        public decimal Charge { get; set; }
+        public DateTime AdmitDateTime { get; set; }
+        public DateTime ServiceDateTime { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+
+        public int DischargeStatusId { get; set; }
+        public string DischargeStatusGroup { get; set; }
+        public string UnitType { get; set; }
+        public int PrimaryPhysicianId { get; set; }
+        public double UOS { get; set; }
+
+        public string Name { get; set; }
+        public string ChargeCode { get; set; }
+        public string Description { get; set; }
+        public string Manufacturer { get; set; }
+        public string Vendor { get; set; }
+        public string Rollup { get; set; }
+        public double? UnitsOfService { get; set; }
+        public string CostDriver { get; set; }
+
+        public double PatientSpecificVariableIndirectCost { get; set; }
+        public double PatientSpecificVariableDirectCost { get; set; }
+        public double PatientSpecificFixedIndirectCost { get; set; }
+        public double PatientSpecificFixedDirectCost { get; set; }
+
+        public double AvgVariableIndirectCost { get; set; }
+        public double AvgVariableDirectCost { get; set; }
+        public double AvgFixedIndirectCost { get; set; }
+        public double AvgFixedDirectCost { get; set; }
+
+        public string PhysicianGroupingGuid { get; set; }
+        public int PhysicianGroupingId { get; set; }
+        public string PhysicianGroupingName { get; set; }
+        public bool IsPatientSpecific { get; set; }
+
+        public bool IsBaseline { get; set; }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Mapperly/JazzEncounterInfoMapper.cs b/src/Strata.DecisionSupport.Biz/Mapperly/JazzEncounterInfoMapper.cs
new file mode 100644
index 0000000..9e07fef
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Mapperly/JazzEncounterInfoMapper.cs
@@ -0,0 +1,45 @@
+using Riok.Mapperly.Abstractions;
+using Strata.DecisionSupport.Models.Encounters;
+using Jazz = Strata.DecisionSupport.Models.Jazz;
+
+namespace Strata.DecisionSupport.Biz.Mapperly
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true,
+        PropertyNameMappingStrategy = PropertyNameMappingStrategy.CaseInsensitive)]
+    public static partial class JazzEncounterInfoMapper
+    {
+        [MapperIgnoreSource(nameof(EncounterInfo.ClinicalIndicatorId))]
+        [MapperIgnoreSource(nameof(EncounterInfo.ROM))]
+        [MapperIgnoreSource(nameof(EncounterInfo.SOI))]
+        public static partial Jazz.MSDRGEncounterInfo MapMsdrgEncounterInfo(this EncounterInfo src);
+
+        [MapperIgnoreSource(nameof(EncounterInfo.ClinicalIndicatorId))]
+        [MapperIgnoreSource(nameof(EncounterInfo.CCMCCCategory))]
+        public static partial Jazz.APRDRGEncounterInfo MapAprdrgEncounterInfo(this EncounterInfo src);
+
+        [MapperIgnoreSource(nameof(EncounterInfo.ClinicalIndicatorId))]
+        [MapperIgnoreSource(nameof(EncounterInfo.CCMCCCategory))]
+        [MapperIgnoreSource(nameof(EncounterInfo.ROM))]
+        [MapperIgnoreSource(nameof(EncounterInfo.SOI))]
+        public static partial Jazz.CPTCodeEncounterInfo MapCptCodeEncounterInfo(this EncounterInfo src);
+
+        [MapperIgnoreSource(nameof(EncounterInfo.CaseTypeFamilyId))]
+        [MapperIgnoreSource(nameof(EncounterInfo.ROM))]
+        [MapperIgnoreSource(nameof(EncounterInfo.SOI))]
+        [MapperIgnoreSource(nameof(EncounterInfo.PatientTypeRollupId))]
+        [MapperIgnoreSource(nameof(EncounterInfo.PatientTypeRollupType))]
+        [MapperIgnoreSource(nameof(EncounterInfo.CCMCCCategory))]
+        [MapperIgnoreSource(nameof(EncounterInfo.CPTCode))]
+        public static partial Jazz.PatientPopulationEncounterInfo MapPatientPopulationEncounterInfo(this EncounterInfo src);
+
+        public static partial Jazz.EncounterChargeInfo MapToJazz(this Encounters.EncounterChargeInfo src);
+
+        public static partial Jazz.VariationEncounterChargeInfo MapToJazz(this Encounters.VariationEncounterChargeInfo src);
+
+        public static partial Jazz.LOSOpportunityInfo MapToJazz(this Encounters.LOSOpportunityInfo src);
+
+        public static partial Jazz.AllChargeInfo MapToJazz(this Encounters.AllChargeInfo src);
+
+        public static partial Jazz.ChargeInfo MapToJazz(this Encounters.ChargeInfo src);
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Mapperly/SnowflakeEncounterInfoMapper.cs b/src/Strata.DecisionSupport.Biz/Mapperly/SnowflakeEncounterInfoMapper.cs
new file mode 100644
index 0000000..60f9647
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Mapperly/SnowflakeEncounterInfoMapper.cs
@@ -0,0 +1,12 @@
+using Riok.Mapperly.Abstractions;
+using Strata.DecisionSupport.Biz.Encounters;
+using Strata.DecisionSupport.Models.Encounters;
+
+namespace Strata.DecisionSupport.Biz.Mapperly
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class SnowflakeEncounterInfoMapper
+    {
+        public static partial EncounterInfo MapFromSnowflake(this SnowflakeEncounterInfo src);
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Opportunities/LOSOpportunityInfo.cs b/src/Strata.DecisionSupport.Biz/Opportunities/LOSOpportunityInfo.cs
new file mode 100644
index 0000000..5285914
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Opportunities/LOSOpportunityInfo.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace Strata.DecisionSupport.Biz.Opportunities
+{
+#pragma warning disable S101 // Types should be named in PascalCase
+    public class LOSOpportunityInfo
+#pragma warning restore S101 // Types should be named in PascalCase
+    {
+        public int EncounterId { get; set; }
+        public string EncounterRecordNumber { get; set; }
+        public DateTime AdmitDateTime { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+        public int PhysicianGroupingId { get; set; }
+        public string PhysicianGroupingName { get; set; }
+        public string PhysicianGroupingGUID { get; set; }
+        public int DischargeStatusID { get; set; }
+        public string DischargeStatusGroup { get; set; }
+        public string UnitType { get; set; }
+        public double UOS { get; set; }
+        public int SOI { get; set; }
+        public int ROM { get; set; }
+
+        public LOSOpportunityInfo()
+        {
+            EncounterRecordNumber = string.Empty;
+            PhysicianGroupingName = string.Empty;
+            DischargeStatusGroup = string.Empty;
+            UnitType = string.Empty;
+        }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/AllChargeQueryInfo.cs b/src/Strata.DecisionSupport.Biz/Parameters/AllChargeQueryInfo.cs
new file mode 100644
index 0000000..5c8c24e
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/AllChargeQueryInfo.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public class AllChargeQueryInfo : Models.Queries.AllChargeQueryInfo, IQueryInfo
+    {
+        public AllChargeQueryInfo()
+            : base() { }
+
+        public AllChargeQueryInfo(Guid opportunityGuid, IList<int> chargeCodeIds)
+            : base(opportunityGuid, chargeCodeIds)
+        {
+        }
+
+        public Dictionary<string, object> Dictionary() => new Dictionary<string, object>
+        {
+            { nameof(OpportunityGuid), OpportunityGuid },
+            { nameof(ChargeCodeIds), ChargeCodeIds },
+        };
+
+        public dynamic Parameters() => new
+        {
+            OpportunityGuid,
+            ChargeCodeIds
+        };
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/ChargeQueryInfo.cs b/src/Strata.DecisionSupport.Biz/Parameters/ChargeQueryInfo.cs
new file mode 100644
index 0000000..1e00941
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/ChargeQueryInfo.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public class ChargeQueryInfo : Models.Queries.ChargeQueryInfo, IQueryInfo
+    {
+        public ChargeQueryInfo()
+            : base() { }
+
+        public ChargeQueryInfo(Guid configurationGuid, int entityId, IList<int> chargeCodeIds, Guid opportunityGuid)
+            : base(configurationGuid, entityId, chargeCodeIds, opportunityGuid)
+        {
+        }
+
+        public Dictionary<string, object> Dictionary() => new Dictionary<string, object>
+        {
+            { nameof(ConfigurationGuid), ConfigurationGuid },
+            { nameof(EntityId), EntityId },
+            { nameof(ChargeCodeIds), ChargeCodeIds },
+            { nameof(OpportunityGuid), OpportunityGuid},
+        };
+
+        public dynamic Parameters() => new
+        {
+            ConfigurationGuid,
+            EntityId,
+            ChargeCodeIds
+        };
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/DepartmentEncounterUnitOfServiceQueryInfo.cs b/src/Strata.DecisionSupport.Biz/Parameters/DepartmentEncounterUnitOfServiceQueryInfo.cs
new file mode 100644
index 0000000..e914700
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/DepartmentEncounterUnitOfServiceQueryInfo.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public class DepartmentEncounterUnitOfServiceQueryInfo : Models.Queries.DepartmentEncounterUnitOfServiceQueryInfo, IQueryInfo,
+        IWithGlobalId, IWithArgs
+    {
+        public DepartmentEncounterUnitOfServiceQueryInfo()
+            : base() { }
+
+        public DepartmentEncounterUnitOfServiceQueryInfo(string departmentRollupGlobalId, double observationUnitsDivisor, IEnumerable<long> encounterIds)
+            : base(departmentRollupGlobalId, observationUnitsDivisor, encounterIds) { }
+
+        public dynamic Parameters() => new
+        {
+            ObservationUnitsDivisor,
+            EncounterIds
+        };
+
+        public Dictionary<string, object> Dictionary() => new Dictionary<string, object>
+        {
+            { nameof(DepartmentRollupGlobalId), DepartmentRollupGlobalId },
+            { nameof(ObservationUnitsDivisor), ObservationUnitsDivisor },
+            { nameof(EncounterIds), EncounterIds }
+        };
+
+        public string GlobalId() => DepartmentRollupGlobalId;
+
+        public object[] Args()
+        {
+            var globalId = (DepartmentRollupGlobalId ?? "") switch
+            {
+                "" => "",
+                "Location" => "Location",
+                _ => DepartmentRollupGlobalId.Replace(" ", "") + "Id"
+            };
+            return new object[] { globalId };
+        }
+    };
+
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/EncounterChargeQueryInfo.cs b/src/Strata.DecisionSupport.Biz/Parameters/EncounterChargeQueryInfo.cs
new file mode 100644
index 0000000..8e1020a
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/EncounterChargeQueryInfo.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public class EncounterChargeQueryInfo : Models.Queries.EncounterChargeQueryInfo, IQueryInfo
+        , IWithArgs
+    {
+
+        internal bool[] HasIsBaseline => IsBaseline.HasValue ? new[] { IsBaseline.Value } : new[] { true, false };
+
+        public EncounterChargeQueryInfo()
+            : base() { }
+
+#pragma warning disable S107 // Methods should not have too many parameters
+        public EncounterChargeQueryInfo(bool hasManufacturerClientDSS, bool isManufacturerInferred,
+            bool hasSupplyClientDSS, bool isSupplyInferred, bool isUsingCustomEntityDimension,
+            bool? isBaseline,
+            Guid opportunityGuid,
+            IList<int> chargeCodeIds)
+#pragma warning restore S107 // Methods should not have too many parameters
+            : base(hasManufacturerClientDSS, isManufacturerInferred,
+                  hasSupplyClientDSS, isSupplyInferred, isUsingCustomEntityDimension,
+                  isBaseline, opportunityGuid, chargeCodeIds)
+        {
+        }
+
+#pragma warning disable CS8604 // Possible null reference argument.
+        public Dictionary<string, object> Dictionary() => new Dictionary<string, object>
+        {
+            { nameof(HasManufacturerClientDSS), HasManufacturerClientDSS },
+            { nameof(IsManufacturerInferred), IsManufacturerInferred },
+            { nameof(HasSupplyClientDSS), HasSupplyClientDSS },
+            { nameof(IsSupplyInferred), IsSupplyInferred },
+            { nameof(IsUsingCustomEntityDimension), IsUsingCustomEntityDimension },
+            { nameof(IsBaseline), HasIsBaseline },
+            { nameof(OpportunityGuid), OpportunityGuid },
+            { nameof(ChargeCodeIds), ChargeCodeIds },
+        };
+#pragma warning restore CS8604 // Possible null reference argument.
+
+        public dynamic Parameters() => ChargeCodeIds.Any() ? new
+        {
+            OpportunityGuid,
+            IsBaseline = HasIsBaseline,
+            ChargeCodeIds
+        } : new
+        {
+            OpportunityGuid,
+            IsBaseline = HasIsBaseline
+        };
+
+        internal static object[] EncounterChargeArgs(string manufacturerSchema, string supplySchema,
+            bool isManufacturerInferred, bool isSupplyInferred,
+            string chargeCodeIds,
+            string entityId) => new object[]
+        {
+            isManufacturerInferred
+                ? $"\r\n    LEFT OUTER JOIN {manufacturerSchema}.DimManufacturer manf ON supply.ManufacturerID = manf.ManufacturerID  "
+                : "",
+            isManufacturerInferred
+                ? "\r\n    , COALESCE(manf.Name, '-') AS Manufacturer  "
+                : "\r\n    , supply.Manufacturer ",
+            isSupplyInferred
+                ? $"\r\n    LEFT OUTER JOIN {supplySchema}.DimVendor ven ON supply.VendorID = ven.VendorID  "
+                : "",
+            isSupplyInferred
+                ? "\r\n    , COALESCE(ven.Name, '-') AS Vendor  "
+                : "\r\n    , supply.Vendor ",
+            chargeCodeIds, entityId
+        };
+
+        public object[] Args() => EncounterChargeArgs(
+            HasManufacturerClientDSS ? "clientDss" : "fw",
+            HasSupplyClientDSS ? "clientdss" : "cap",
+            IsManufacturerInferred, IsSupplyInferred,
+            ChargeCodeIds != null && ChargeCodeIds.Any() ? " OR cc.ChargeCodeId IN (@ChargeCodeIds)" : "",
+            IsUsingCustomEntityDimension ? "DepartmentRollupID" : "EntityID");
+
+    }
+}
+
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/EncounterCostQueryInfo.cs b/src/Strata.DecisionSupport.Biz/Parameters/EncounterCostQueryInfo.cs
new file mode 100644
index 0000000..92b1e97
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/EncounterCostQueryInfo.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public class EncounterCostQueryInfo : Models.Queries.EncounterCostQueryInfo, IQueryInfo
+        , IWithGlobalId, IWithPatientSpecific, IWithArgs
+    {
+
+        public EncounterCostQueryInfo()
+            : base() { }
+
+        public EncounterCostQueryInfo(bool isPatientSpecific, Guid configurationGuid, string costDriver,
+            string departmentRollupGlobalId, IEnumerable<long> encounterIds)
+            : base(isPatientSpecific, configurationGuid, costDriver, departmentRollupGlobalId, encounterIds) { }
+
+        public dynamic Parameters() => new
+        {
+            ConfigurationGuid,
+            EncounterIds
+        };
+
+        public Dictionary<string, object> Dictionary() => new Dictionary<string, object>
+        {
+            { nameof(IsPatientSpecific), IsPatientSpecific },
+            { nameof(ConfigurationGuid), ConfigurationGuid },
+            { nameof(DepartmentRollupGlobalId), DepartmentRollupGlobalId },
+            { nameof(EncounterIds), EncounterIds }
+        };
+
+        public string GlobalId() => DepartmentRollupGlobalId;
+
+        public bool PatientSpecific() => IsPatientSpecific;
+
+        public object[] Args()
+        {
+            var globalId = (DepartmentRollupGlobalId ?? "") switch
+            {
+                "" => "",
+                "Location" => "Location",
+                _ => DepartmentRollupGlobalId.Replace(" ", "") + "Id"
+            };
+            var condition = (CostDriver) switch
+            {
+                "" => "AND cc.CostDriver <> ''  \r\n    AND cc.CostDriver <> 'Excluded' ",
+                ContinuousImprovement.Biz.Utilities.Constants.NOT_SPECIFIED => "AND cc.CostDriver = ''",
+                _ => $"AND cc.CostDriver = '{CostDriver}'"
+            };
+            return new object[] { globalId, condition };
+        }
+    }
+
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/EncounterQueryInfo.cs b/src/Strata.DecisionSupport.Biz/Parameters/EncounterQueryInfo.cs
new file mode 100644
index 0000000..425b8eb
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/EncounterQueryInfo.cs
@@ -0,0 +1,87 @@
+using Strata.DecisionSupport.Models.Queries;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public class EncounterQueryInfo : Models.Queries.EncounterQueryInfo, IQueryInfo,
+        IWithArgs, IWithGlobalId
+    {
+
+        public EncounterQueryInfo()
+            : base() { }
+
+#pragma warning disable S107
+        public EncounterQueryInfo(
+            CaseTypeCategory caseTypeCategory,
+            int caseTypeFamilyId, DateTime startDate, DateTime endDate,
+            string departmentRollupGlobalId, Guid serviceLineGuid,
+            double observationUnitsDivisor,
+            IEnumerable<int> entityIds)
+            : base(caseTypeCategory, caseTypeFamilyId, startDate, endDate, departmentRollupGlobalId, serviceLineGuid, observationUnitsDivisor, entityIds)
+#pragma warning restore S107
+        {
+        }
+
+        public dynamic Parameters() => new
+        {
+            CaseTypeFamilyId,
+            StartDate = $"{StartDate:yyyy-MM-dd}",
+            EndDate = $"{EndDate.AddDays(1):yyyy-MM-dd}",
+            ObservationUnitsDivisor,
+            EntityIDs
+        };
+
+        public Dictionary<string, object> Dictionary() => new Dictionary<string, object>
+        {
+            { nameof(CaseTypeCategory), CaseTypeCategory },
+            { nameof(CaseTypeFamilyId), CaseTypeFamilyId },
+            { nameof(StartDate), StartDate },
+            { nameof(EndDate), EndDate },
+            { nameof(DepartmentRollupGlobalId), DepartmentRollupGlobalId },
+            { nameof(ServiceLineGuid), ServiceLineGuid },
+            { nameof(ObservationUnitsDivisor), ObservationUnitsDivisor },
+            { nameof(EntityIDs), EntityIDs }
+        };
+
+        public object[] Args(string serviceLineColumn, string serviceLineJoin)
+            => new object[]
+            {
+                serviceLineColumn,
+                serviceLineJoin,
+                new[] { "", "Location" }.Contains(DepartmentRollupGlobalId)
+                    ? DepartmentRollupGlobalId
+                    : DepartmentRollupGlobalId.Replace(" ", "") + "ID",
+                CaseTypeCategory switch
+                {
+                    CaseTypeCategory.MSDRG => @"OBJ.MSDRGCaseTypeFamilyID AS CaseTypeFamilyId
+    , msdrg.CCMCCCategory",
+                    CaseTypeCategory.APRDRG => @"OBJ.APRDRGCaseTypeFamilyID AS CaseTypeFamilyId
+    , aprdrg.APRROM AS ROM
+    , aprdrg.APRSOI AS SOI",
+                    CaseTypeCategory.CPTCode => @"OBJ.CPTCodeCaseTypeFamilyID AS CaseTypeFamilyId
+    , cpt1.CPTCode",
+                    CaseTypeCategory.PatientPopulation => "PECI.ClinicalIndicatorId"
+                },
+                CaseTypeCategory switch
+                {
+                    CaseTypeCategory.MSDRG => @"INNER JOIN dss.dimMSDRG msdrg ON OBJ.ReportingDRGID = msdrg.MSDRGID 
+       AND OBJ.MSDRGCaseTypeFamilyID = @CaseTypeFamilyId
+       AND ((msdrg.Type IN ('MED', 'SURG') AND ptr.Type = 'Inpatient') 
+             OR ptr.Type <> 'Inpatient')",
+                    CaseTypeCategory.APRDRG => @"INNER JOIN dss.DimAPRDRG aprdrg on OBJ.ReportingAPRDRGID = aprdrg.APRDRGID
+       AND OBJ.APRDRGCaseTypeFamilyID = @CaseTypeFamilyId",
+                    CaseTypeCategory.CPTCode => @"INNER JOIN dss.DimCPT cpt1 ON OBJ.PrimaryCPTID = cpt1.CPTID
+       AND OBJ.CPTCodeCaseTypeFamilyID = @CaseTypeFamilyId",
+                    CaseTypeCategory.PatientPopulation => @"INNER JOIN dss.FactPatientEncounterClinicalIndicator peci 
+       ON peci.ClinicalIndicatorID = @CaseTypeFamilyId
+       AND peci.EncounterID = OBJ.EncounterID"
+                }
+            };
+
+        public object[] Args() => Args("", "");
+
+        public string GlobalId() => DepartmentRollupGlobalId;
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/EncounterUnitOfServiceQueryInfo.cs b/src/Strata.DecisionSupport.Biz/Parameters/EncounterUnitOfServiceQueryInfo.cs
new file mode 100644
index 0000000..8338cbd
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/EncounterUnitOfServiceQueryInfo.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public class EncounterUnitOfServiceQueryInfo : Models.Queries.EncounterUnitOfServiceQueryInfo, IQueryInfo
+    {
+
+        public EncounterUnitOfServiceQueryInfo()
+            : base() { }
+
+        public EncounterUnitOfServiceQueryInfo(double observationUnitsDivisor, IEnumerable<long> encounterIds)
+            : base(observationUnitsDivisor, encounterIds) { }
+
+        public dynamic Parameters() => new
+        {
+            ObservationUnitsDivisor,
+            EncounterIds
+        };
+
+        public Dictionary<string, object> Dictionary() => new Dictionary<string, object>
+        {
+            { nameof(ObservationUnitsDivisor), ObservationUnitsDivisor },
+            { nameof(EncounterIds), EncounterIds }
+        };
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/FromSelect.cs b/src/Strata.DecisionSupport.Biz/Parameters/FromSelect.cs
new file mode 100644
index 0000000..33ce7a3
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/FromSelect.cs
@@ -0,0 +1,18 @@
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    internal class FromSelect
+    {
+        public string From { get; set; }
+        public string Select { get; set; }
+        public FromSelect(string select)
+        {
+            From = "";
+            Select = select;
+        }
+        public FromSelect(string from, string select)
+            : this(select)
+        {
+            From = from;
+        }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/IQueryInfo.cs b/src/Strata.DecisionSupport.Biz/Parameters/IQueryInfo.cs
new file mode 100644
index 0000000..6b192d3
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/IQueryInfo.cs
@@ -0,0 +1,6 @@
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public interface IQueryInfo : IWithDictionary, IWithParameters
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/IWithArgs.cs b/src/Strata.DecisionSupport.Biz/Parameters/IWithArgs.cs
new file mode 100644
index 0000000..5606029
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/IWithArgs.cs
@@ -0,0 +1,7 @@
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public interface IWithArgs
+    {
+        abstract object[] Args();
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/IWithDictionary.cs b/src/Strata.DecisionSupport.Biz/Parameters/IWithDictionary.cs
new file mode 100644
index 0000000..58392d6
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/IWithDictionary.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public interface IWithDictionary
+    {
+        abstract Dictionary<string, object> Dictionary();
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/IWithGlobalId.cs b/src/Strata.DecisionSupport.Biz/Parameters/IWithGlobalId.cs
new file mode 100644
index 0000000..b5437d1
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/IWithGlobalId.cs
@@ -0,0 +1,7 @@
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public interface IWithGlobalId
+    {
+        abstract string GlobalId();
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/IWithParameters.cs b/src/Strata.DecisionSupport.Biz/Parameters/IWithParameters.cs
new file mode 100644
index 0000000..f9b7567
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/IWithParameters.cs
@@ -0,0 +1,7 @@
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public interface IWithParameters
+    {
+        abstract dynamic Parameters();
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/IWithPatientSpecific.cs b/src/Strata.DecisionSupport.Biz/Parameters/IWithPatientSpecific.cs
new file mode 100644
index 0000000..26073a3
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/IWithPatientSpecific.cs
@@ -0,0 +1,7 @@
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public interface IWithPatientSpecific
+    {
+        abstract bool PatientSpecific();
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/LOSOpportunityQueryInfo.cs b/src/Strata.DecisionSupport.Biz/Parameters/LOSOpportunityQueryInfo.cs
new file mode 100644
index 0000000..b3d0f52
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/LOSOpportunityQueryInfo.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public class LOSOpportunityQueryInfo : Models.Queries.LOSOpportunityQueryInfo, IQueryInfo
+    {
+
+        public LOSOpportunityQueryInfo()
+            : base() { }
+
+        public LOSOpportunityQueryInfo(Guid opportunityGuid, double observationUnitsDivisor, int caseTypeId)
+            : base(opportunityGuid, observationUnitsDivisor, caseTypeId) { }
+
+        public dynamic Parameters() => new
+        {
+            OpportunityGuid,
+            ObservationUnitsDivisor,
+            CaseTypeId
+        };
+
+        public Dictionary<string, object> Dictionary() => new Dictionary<string, object>
+        {
+            { nameof(OpportunityGuid), OpportunityGuid },
+            { nameof(ObservationUnitsDivisor), ObservationUnitsDivisor },
+            { nameof(CaseTypeId), CaseTypeId }
+        };
+
+        public static object[] Args() => [];
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Parameters/VariationEncounterChargeQueryInfo.cs b/src/Strata.DecisionSupport.Biz/Parameters/VariationEncounterChargeQueryInfo.cs
new file mode 100644
index 0000000..252d514
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Parameters/VariationEncounterChargeQueryInfo.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.DecisionSupport.Biz.Parameters
+{
+    public class VariationEncounterChargeQueryInfo : Models.Queries.VariationEncounterChargeQueryInfo, IQueryInfo
+        , IWithArgs
+    {
+
+        public VariationEncounterChargeQueryInfo()
+            : base() { }
+
+#pragma warning disable S107 // Methods should not have too many parameters
+        public VariationEncounterChargeQueryInfo(bool hasManufacturerClientDSS, bool isManufacturerInferred,
+            bool hasSupplyClientDSS, bool isSupplyInferred, bool isUsingCustomEntityDimension,
+            bool? isBaseline,
+            IEnumerable<Guid> opportunityGuids,
+            IList<int> chargeCodeIds,
+            int page, int pageSize)
+#pragma warning restore S107 // Methods should not have too many parameters
+            : base(hasManufacturerClientDSS, isManufacturerInferred, hasSupplyClientDSS, isSupplyInferred, isUsingCustomEntityDimension,
+                  isBaseline, opportunityGuids, chargeCodeIds, page, pageSize)
+        {
+        }
+
+#pragma warning disable CS8604 // Possible null reference argument.
+        public Dictionary<string, object> Dictionary() => new Dictionary<string, object>
+        {
+            { nameof(HasManufacturerClientDSS), HasManufacturerClientDSS },
+            { nameof(IsManufacturerInferred), IsManufacturerInferred },
+            { nameof(HasSupplyClientDSS), HasSupplyClientDSS },
+            { nameof(IsSupplyInferred), IsSupplyInferred },
+            { nameof(IsUsingCustomEntityDimension), IsUsingCustomEntityDimension },
+            { nameof(IsBaseline), IsBaseline },
+            { nameof(OpportunityGuids), OpportunityGuids },
+            { nameof(ChargeCodeIds), ChargeCodeIds },
+            { nameof(First), First },
+            { nameof(Rows), First },
+        };
+#pragma warning restore CS8604 // Possible null reference argument.
+
+        public dynamic Parameters() => ChargeCodeIds.Any() ? new
+        {
+            OpportunityGuids,
+            IsBaseline = IsBaseline.GetValueOrDefault(true),
+            ChargeCodeIds
+        } : new
+        {
+            OpportunityGuids,
+            IsBaseline = IsBaseline.GetValueOrDefault(true)
+        };
+
+        public object[] Args()
+        {
+            var schema = HasManufacturerClientDSS ? "clientDss" : "fw";
+            var dssSupplyManufacturer = IsManufacturerInferred
+                ? new FromSelect($"\r\n    LEFT OUTER JOIN {schema}.DimManufacturer manf ON supply.ManufacturerID = manf.ManufacturerID  ",
+                "\r\n    , COALESCE(manf.Name, '-') AS Manufacturer  ")
+                : new FromSelect("\r\n    , supply.Manufacturer ");
+            schema = HasSupplyClientDSS ? "clientdss" : "cap";
+            var dssSupplyVendor = IsSupplyInferred
+                ? new FromSelect($"\r\n    LEFT OUTER JOIN {schema}.DimVendor ven ON supply.VendorID = ven.VendorID  ",
+                "\r\n    , COALESCE(ven.Name, '-') AS Vendor  ")
+                : new FromSelect("\r\n    , supply.Vendor ");
+            var chargeCodeIds = ChargeCodeIds != null && ChargeCodeIds.Any() ? " OR cc.ChargeCodeId IN (@ChargeCodeIds)" : "";
+            return new object[]
+             {
+                dssSupplyManufacturer.From,
+                dssSupplyManufacturer.Select,
+                dssSupplyVendor.From,
+                dssSupplyVendor.Select,
+                chargeCodeIds,
+                IsUsingCustomEntityDimension ? "DepartmentRollupID" : "EntityID"
+             };
+
+        }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Queries/AllChargeInfoQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/AllChargeInfoQuery.sql
new file mode 100644
index 0000000..bd2becb
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/AllChargeInfoQuery.sql
@@ -0,0 +1,21 @@
+SELECT 0 AS RoWID
+, costs.ChargeCodeId
+, cc.Name
+, cc.ChargeCode
+, cc.Description
+, cc.IsPatientSpecific
+, cc.CostDriver
+, cc.Rollup
+, saving.IsBaseline
+, CAST(costs.UnitsOfService AS FLOAT) AS Quantity
+, costs.FixedDirectCost / costs.UnitsOfService AS AvgFixedDirectCost
+, costs.FixedIndirectCost / costs.UnitsOfService AS AvgFixedIndirectCost
+, costs.VariableDirectCost / costs.UnitsOfService AS AvgVariableDirectCost
+, costs.VariableIndirectCost / costs.UnitsOfService AS AvgVariableIndirectCost
+FROM cci.EncounterChargeCodeCosts costs
+INNER JOIN fw.DimChargeCode cc ON costs.ChargeCodeId = cc.ChargeCodeId
+INNER JOIN cci.VariationEncounterSaving saving
+    ON saving.EncounterId = costs.EncounterId
+        AND cc.ChargeCodeId IN (@ChargeCodeIds)
+WHERE costs.UnitsOfService <> 0
+AND saving.OpportunityGUID = @OpportunityGuid
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Queries/Billing.sql b/src/Strata.DecisionSupport.Biz/Queries/Billing.sql
new file mode 100644
index 0000000..53fb8cd
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/Billing.sql
@@ -0,0 +1,25 @@
+SELECT
+        PBLID.EncounterRecordNumber
+        ,PBLID.ServiceDateTime
+        ,PBLID.SupplyID
+        ,PBLID.DepartmentID
+        ,PBLID.UBRevenueCodeID
+        ,costs.UnitsOfService
+        ,costs.Charge
+        ,costs.EncounterID
+        ,costs.ChargeCodeId
+        ,COALESCE(costs.FixedDirectUnitCost, 0) FixedDirectUnitCost
+        ,COALESCE(costs.FixedIndirectUnitCost, 0) FixedIndirectUnitCost
+        ,COALESCE(costs.VariableDirectUnitCost, 0) VariableDirectUnitCost
+        ,COALESCE(costs.VariableIndirectUnitCost, 0) VariableIndirectUnitCost
+        ,COALESCE(costs.FixedDirectCost, 0) FixedDirectCost
+        ,COALESCE(costs.FixedIndirectCost, 0) FixedIndirectCost
+        ,COALESCE(costs.VariableDirectCost, 0) VariableDirectCost
+        ,COALESCE(costs.VariableIndirectCost, 0) VariableIndirectCost
+        ,(COALESCE(costs.FixedDirectCost, 0) + COALESCE(costs.FixedIndirectCost, 0)) FixedCost
+        ,(COALESCE(costs.VariableDirectCost, 0) + COALESCE(costs.VariableIndirectCost, 0)) VariableCost
+        ,(COALESCE(costs.VariableDirectCost, 0) + COALESCE(costs.FixedDirectCost, 0)) DirectCost
+        ,(COALESCE(costs.VariableIndirectCost, 0) + COALESCE(costs.FixedIndirectCost, 0)) IndirectCost
+        ,(COALESCE(costs.VariableDirectCost, 0) + COALESCE(costs.VariableIndirectCost, 0) + COALESCE(costs.FixedDirectCost, 0) + COALESCE(costs.FixedIndirectCost, 0)) TotalCost
+    FROM dss.FactPatientBillingLineItemDetail PBLID
+    LEFT JOIN cci.EncounterChargeCodeCosts costs on costs.RowID = PBLID.RowID
diff --git a/src/Strata.DecisionSupport.Biz/Queries/ChargeInfoQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/ChargeInfoQuery.sql
new file mode 100644
index 0000000..40ae020
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/ChargeInfoQuery.sql
@@ -0,0 +1,19 @@
+SELECT
+    COALESCE(cccd.RowID, 0) RowID,
+    cc.ChargeCodeId,
+    cc.Name,
+    cc.ChargeCode,
+    cc.Description,
+    cc.IsPatientSpecific,
+    cc.CostDriver,
+    cc.Rollup,
+    COALESCE(cccd.AvgFixedDirectCost, 0) AvgFixedDirectCost,
+    COALESCE(cccd.AvgFixedIndirectCost, 0) AvgFixedIndirectCost,
+    COALESCE(cccd.AvgVariableDirectCost, 0) AvgVariableDirectCost,
+    COALESCE(cccd.AvgVariableIndirectCost, 0) AvgVariableIndirectCost
+FROM
+    fw.DimChargeCode cc
+    LEFT OUTER JOIN cci.ChargeCodeCostDetail cccd ON cccd.ChargeCodeId = cc.ChargeCodeId
+    AND cccd.ConfigurationGUID = @ConfigurationGuid
+    AND cccd.EntityID = @EntityId
+WHERE cc.ChargeCodeId IN (@ChargeCodeIds)
diff --git a/src/Strata.DecisionSupport.Biz/Queries/DepartmentEncounterUnitOfServiceDepartmentRollupQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/DepartmentEncounterUnitOfServiceDepartmentRollupQuery.sql
new file mode 100644
index 0000000..f7fb5f4
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/DepartmentEncounterUnitOfServiceDepartmentRollupQuery.sql
@@ -0,0 +1,14 @@
+SELECT 
+    obj.DepartmentID
+    , obj.EncounterId 
+    , cc.CostDriver
+    --, CAST(d.{0} As Int) AS EntityID
+    , CAST(( CASE WHEN rev.LOSType = 'Observation' 
+        THEN CAST(obj.UnitsOfService As Float) / @ObservationUnitsDivisor
+        ELSE obj.UnitsOfService END ) AS FLOAT) AS Uos
+FROM dss.FactPatientBillingLineItemDetail obj
+INNER JOIN dss.DimUBRevenueCode rev on rev.UBRevenueCodeID = obj.UBRevenueCodeID
+INNER JOIN fw.DimChargeCode cc ON obj.ChargeCodeId = cc.ChargeCodeId AND cc.CostDriver = 'LOS'
+INNER JOIN fw.DimDepartment d on obj.DepartmentID = d.DepartmentID and d.IsDepartmentRollup = 0
+INNER JOIN clientdss.FactPatientEncounterSummary pes on obj.EncounterId = pes.EncounterId
+WHERE obj.encounterid in (@EncounterIds)
diff --git a/src/Strata.DecisionSupport.Biz/Queries/DepartmentEncounterUnitOfServiceEntityQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/DepartmentEncounterUnitOfServiceEntityQuery.sql
new file mode 100644
index 0000000..669d7b9
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/DepartmentEncounterUnitOfServiceEntityQuery.sql
@@ -0,0 +1,14 @@
+SELECT 
+    obj.DepartmentID
+    , obj.EncounterId 
+    , cc.CostDriver
+    , CAST(d.entityid As Int) AS EntityID
+    , CAST(( CASE WHEN rev.LOSType = 'Observation' 
+        THEN CAST(obj.UnitsOfService As Float) / @ObservationUnitsDivisor
+        ELSE obj.UnitsOfService END ) AS FLOAT) AS Uos
+FROM dss.FactPatientBillingLineItemDetail obj
+INNER JOIN dss.DimUBRevenueCode rev on rev.UBRevenueCodeID = obj.UBRevenueCodeID
+INNER JOIN fw.DimChargeCode cc ON obj.ChargeCodeId = cc.ChargeCodeId AND cc.CostDriver = 'LOS'
+INNER JOIN fw.DimDepartment d on obj.DepartmentID = d.DepartmentID and d.IsDepartmentRollup = 0
+INNER JOIN clientdss.FactPatientEncounterSummary pes on obj.EncounterId = pes.EncounterId
+WHERE obj.encounterid in (@EncounterIds)
diff --git a/src/Strata.DecisionSupport.Biz/Queries/DepartmentEncounterUnitOfServiceLocationQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/DepartmentEncounterUnitOfServiceLocationQuery.sql
new file mode 100644
index 0000000..f515ef2
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/DepartmentEncounterUnitOfServiceLocationQuery.sql
@@ -0,0 +1,14 @@
+SELECT 
+    obj.DepartmentID
+    , obj.EncounterId 
+    , cc.CostDriver
+    , CAST(pes.LocationId As Int) AS EntityID
+    , CAST(( CASE WHEN rev.LOSType = 'Observation' 
+        THEN CAST(obj.UnitsOfService As Float) / @ObservationUnitsDivisor
+        ELSE obj.UnitsOfService END ) AS FLOAT) AS Uos
+FROM dss.FactPatientBillingLineItemDetail obj
+INNER JOIN dss.DimUBRevenueCode rev on rev.UBRevenueCodeID = obj.UBRevenueCodeID
+INNER JOIN fw.DimChargeCode cc ON obj.ChargeCodeId = cc.ChargeCodeId AND cc.CostDriver = 'LOS'
+INNER JOIN fw.DimDepartment d on obj.DepartmentID = d.DepartmentID and d.IsDepartmentRollup = 0
+INNER JOIN clientdss.FactPatientEncounterSummary pes on obj.EncounterId = pes.EncounterId
+WHERE obj.encounterid in (@EncounterIds)
diff --git a/src/Strata.DecisionSupport.Biz/Queries/EncounterChargeQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/EncounterChargeQuery.sql
new file mode 100644
index 0000000..8182623
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/EncounterChargeQuery.sql
@@ -0,0 +1,56 @@
+SELECT 
+      opp.OpportunityGUID
+    , OBJ.EncounterId
+    , OBJ.EncounterRecordNumber
+    , OBJ.ChargeCodeId
+    , cc.ChargeCode
+    , OBJ.Charge
+    , OBJ.ServiceDateTime
+    , CAST(OBJ.UnitsOfService AS FLOAT) AS UnitsOfService
+    , cc.Name
+    , cc.Description
+    , saving.IsBaseline
+    , cc.CostDriver
+    , cc.Rollup
+    , COALESCE(info.PhysicianGroupingGuid, '00000000-0000-0000-0000-000000000000') PhysicianGroupingGuid
+    , COALESCE(info.PhysicianGroupingId, 0) PhysicianGroupingId
+    , COALESCE(info.PhysicianGroupingName,'') PhysicianGroupingName
+    , cc.IsPatientSpecific--{1}{3}
+    , OBJ.FixedDirectCost / OBJ.UnitsOfService AS PatientSpecificFixedDirectCost
+    , OBJ.FixedIndirectCost / OBJ.UnitsOfService AS PatientSpecificFixedIndirectCost
+    , OBJ.VariableDirectCost / OBJ.UnitsOfService AS PatientSpecificVariableDirectCost
+    , OBJ.VariableIndirectCost / OBJ.UnitsOfService AS PatientSpecificVariableIndirectCost
+    , COALESCE(cd.AvgFixedDirectCost, 0) AS AvgFixedDirectCost
+    , COALESCE(cd.AvgFixedIndirectCost, 0) AS AvgFixedIndirectCost
+    , COALESCE(cd.AvgVariableDirectCost, 0) AS AvgVariableDirectCost
+    , COALESCE(cd.AvgVariableIndirectCost, 0) AS AvgVariableIndirectCost
+FROM 
+    cci.VariationOpportunity opp 
+    INNER JOIN cci.Configuration c ON opp.ConfigurationGuid = c.ConfigurationGuid
+    INNER JOIN dss.DimCaseType ct ON ct.CaseTypeId = opp.CaseTypeId
+    INNER JOIN cci.VariationEncounterSaving saving ON saving.OpportunityGUID = opp.OpportunityGUID
+    LEFT OUTER JOIN cci.VariationEncounterSavingInfo info ON opp.OpportunityGUID = info.OpportunityGUID 
+        AND saving.EncounterRecordNumber = info.EncounterRecordNumber
+    INNER JOIN billing OBJ ON OBJ.EncounterId = saving.EncounterId
+    INNER JOIN fw.DimChargeCode cc ON OBJ.ChargeCodeId = cc.ChargeCodeId
+    LEFT JOIN cci.ChargeCodeCostDetail cd ON OBJ.ChargeCodeId = cd.ChargeCodeId
+        AND cd.EntityID = CASE c.DepartmentRollupGlobalID
+            WHEN 'Department Rollup 1' THEN opp.DepartmentRollup1Id
+            WHEN 'Department Rollup 2' THEN opp.DepartmentRollup2Id
+            WHEN 'Department Rollup 3' THEN opp.DepartmentRollup3Id
+            WHEN 'Department Rollup 4' THEN opp.DepartmentRollup4Id
+            WHEN 'Department Rollup 5' THEN opp.DepartmentRollup5Id
+            WHEN 'Department Rollup 6' THEN opp.DepartmentRollup6Id
+            WHEN 'Location' THEN opp.LocationId
+            ELSE opp.EntityId
+            END
+        AND cd.ConfigurationGUID = opp.ConfigurationGUID
+    INNER JOIN dss.DimSupply supply ON supply.SupplyID = OBJ.SupplyID--{0}{2}
+WHERE 
+     OBJ.UnitsOfService <> 0
+     AND opp.OpportunityGuid = @OpportunityGuid
+     AND saving.IsBaseline IN (@IsBaseline)
+     AND (saving.CostDriver = cc.CostDriver--{4}
+         )
+ORDER BY 
+      OBJ.ServiceDateTime DESC
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Queries/EncounterInfoDepartmentRollupQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/EncounterInfoDepartmentRollupQuery.sql
new file mode 100644
index 0000000..cb7719c
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/EncounterInfoDepartmentRollupQuery.sql
@@ -0,0 +1,37 @@
+SELECT
+    OBJ.EncounterId
+    ,OBJ.EncounterRecordNumber
+    --,{3}
+    ,OBJ.AgeCohortID
+    ,p.PhysicianID
+    ,p.FullName AS PhysicianName
+    ,p.MemberGUID AS PhysicianGUID
+    ,p.PhysicianGroupAffiliationID
+    ,pga.Name PhysicianGroupAffiliation
+    ,pga.MemberGuid PhysicianGroupAffiliationGuid
+    ,ps.Name AS PhysicianSpecialty
+    ,ps.PhysicianSpecialtyID
+    ,ps.MemberGUID AS PhysicianSpecialtyGUID
+    ,ptr.PatientTypeRollupID
+    ,ptr.Type AS PatientTypeRollupType
+    --,department.{2} As EntityID
+    ,CASE WHEN fe.EncounterId IS NULL THEN 0 ELSE 1 END AS IsQVIEncounter
+    --,{0} AS ServiceLineID
+    ,COALESCE(cpt.CPTCode, '0') AS CPTCode
+    ,OBJ.DischargeDateTime
+    ,COALESCE(uos.LengthOfStay, 0) LengthOfStay
+FROM  clientdss.factpatientencountersummary OBJ
+INNER JOIN dss.DimPhysician p ON obj.PrimaryPhysicianID = p.PhysicianID
+INNER JOIN dss.DimPhysicianSpecialty ps ON p.PhysicianSpecialtyID = ps.PhysicianSpecialtyID
+INNER JOIN dss.DimPhysicianGroupAffiliation pga on p.PhysicianGroupAffiliationID = pga.PhysicianGroupAffiliationID
+INNER JOIN fw.DimPatientType pt ON pt.PatientTypeID = obj.PatientTypeID
+INNER JOIN fw.dimpatienttyperollup ptr ON ptr.PatientTypeRollupID = pt.PatientTypeRollupID
+--{4}
+INNER JOIN fw.DimDepartment department ON OBJ.HighestVariableCostDepartmentID = department.DepartmentID 
+    --AND department.{2} IN (@EntityIDs)
+--{1}
+LEFT OUTER JOIN dss.FactPatientEncounterQVILineItem fe ON OBJ.EncounterId = fe.EncounterId AND fe.IsPrimary = 1
+LEFT OUTER JOIN dss.DimCPT cpt on OBJ.PrimaryCPTID = cpt.CPTID
+LEFT OUTER JOIN EncounterUnitOfService uos ON OBJ.EncounterId = uos.EncounterId
+WHERE OBJ.DischargeDateTime >= @StartDate 
+  AND OBJ.DischargeDateTime < @EndDate
diff --git a/src/Strata.DecisionSupport.Biz/Queries/EncounterInfoEntityQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/EncounterInfoEntityQuery.sql
new file mode 100644
index 0000000..469c13c
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/EncounterInfoEntityQuery.sql
@@ -0,0 +1,36 @@
+SELECT
+    OBJ.EncounterId
+    ,OBJ.EncounterRecordNumber
+    --,{3}
+    ,OBJ.AgeCohortID
+    ,p.PhysicianID
+    ,p.FullName AS PhysicianName
+    ,p.MemberGUID AS PhysicianGUID
+    ,p.PhysicianGroupAffiliationID
+    ,pga.Name PhysicianGroupAffiliation
+    ,pga.MemberGuid PhysicianGroupAffiliationGuid
+    ,ps.Name AS PhysicianSpecialty
+    ,ps.PhysicianSpecialtyID
+    ,ps.MemberGUID AS PhysicianSpecialtyGUID
+    ,ptr.PatientTypeRollupID
+    ,ptr.Type AS PatientTypeRollupType
+    ,de.FWEntityId AS EntityID
+    ,CASE WHEN fe.EncounterId IS NULL THEN 0 ELSE 1 END AS IsQVIEncounter
+    --,{0} AS ServiceLineID
+    ,COALESCE(cpt.CPTCode, '0') AS CPTCode
+    ,OBJ.DischargeDateTime
+    ,COALESCE(uos.LengthOfStay, 0) LengthOfStay
+FROM  clientdss.factpatientencountersummary OBJ
+INNER JOIN dss.DimPhysician p ON obj.PrimaryPhysicianID = p.PhysicianID
+INNER JOIN dss.DimPhysicianSpecialty ps ON p.PhysicianSpecialtyID = ps.PhysicianSpecialtyID
+INNER JOIN dss.DimPhysicianGroupAffiliation pga on p.PhysicianGroupAffiliationID = pga.PhysicianGroupAffiliationID
+INNER JOIN fw.DimPatientType pt ON pt.PatientTypeID = obj.PatientTypeID
+INNER JOIN fw.dimpatienttyperollup ptr ON ptr.PatientTypeRollupID = pt.PatientTypeRollupID
+--{4}
+INNER join clientdss.DimEntity de on OBJ.EntityID = de.EntityID AND de.FwEntityID IN (@EntityIDs)
+--{1}
+LEFT OUTER JOIN dss.FactPatientEncounterQVILineItem fe ON OBJ.EncounterId = fe.EncounterId AND fe.IsPrimary = 1
+LEFT OUTER JOIN dss.DimCPT cpt on OBJ.PrimaryCPTID = cpt.CPTID
+LEFT OUTER JOIN EncounterUnitOfService uos ON OBJ.EncounterId = uos.EncounterId
+WHERE OBJ.DischargeDateTime >= @StartDate 
+  AND OBJ.DischargeDateTime < @EndDate
diff --git a/src/Strata.DecisionSupport.Biz/Queries/EncounterInfoLocationQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/EncounterInfoLocationQuery.sql
new file mode 100644
index 0000000..d5779e5
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/EncounterInfoLocationQuery.sql
@@ -0,0 +1,36 @@
+SELECT
+    OBJ.EncounterId
+    ,OBJ.EncounterRecordNumber
+    --,{3}
+    ,OBJ.AgeCohortID
+    ,p.PhysicianID
+    ,p.FullName AS PhysicianName
+    ,p.MemberGUID AS PhysicianGUID
+    ,p.PhysicianGroupAffiliationID
+    ,pga.Name PhysicianGroupAffiliation
+    ,pga.MemberGuid PhysicianGroupAffiliationGuid
+    ,ps.Name AS PhysicianSpecialty
+    ,ps.PhysicianSpecialtyID
+    ,ps.MemberGUID AS PhysicianSpecialtyGUID
+    ,ptr.PatientTypeRollupID
+    ,ptr.Type AS PatientTypeRollupType
+    ,OBJ.LocationID AS EntityID
+    ,CASE WHEN fe.EncounterId IS NULL THEN 0 ELSE 1 END AS IsQVIEncounter
+    --,{0} AS ServiceLineID
+    ,COALESCE(cpt.CPTCode, '0') AS CPTCode
+    ,OBJ.DischargeDateTime
+    ,COALESCE(uos.LengthOfStay, 0) LengthOfStay
+FROM  clientdss.factpatientencountersummary OBJ
+INNER JOIN dss.DimPhysician p ON obj.PrimaryPhysicianID = p.PhysicianID
+INNER JOIN dss.DimPhysicianSpecialty ps ON p.PhysicianSpecialtyID = ps.PhysicianSpecialtyID
+INNER JOIN dss.DimPhysicianGroupAffiliation pga on p.PhysicianGroupAffiliationID = pga.PhysicianGroupAffiliationID
+INNER JOIN fw.DimPatientType pt ON pt.PatientTypeID = obj.PatientTypeID
+INNER JOIN fw.dimpatienttyperollup ptr ON ptr.PatientTypeRollupID = pt.PatientTypeRollupID
+--{4}
+--{1}
+LEFT OUTER JOIN dss.FactPatientEncounterQVILineItem fe ON OBJ.EncounterId = fe.EncounterId AND fe.IsPrimary = 1
+LEFT OUTER JOIN dss.DimCPT cpt on OBJ.PrimaryCPTID = cpt.CPTID
+LEFT OUTER JOIN EncounterUnitOfService uos ON OBJ.EncounterId = uos.EncounterId
+WHERE OBJ.DischargeDateTime >= @StartDate 
+  AND OBJ.DischargeDateTime < @EndDate
+  AND OBJ.LocationID IN (@EntityIDs)
diff --git a/src/Strata.DecisionSupport.Biz/Queries/EncounterSpecificCostInfoDepartmentRollupQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/EncounterSpecificCostInfoDepartmentRollupQuery.sql
new file mode 100644
index 0000000..0dd2a76
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/EncounterSpecificCostInfoDepartmentRollupQuery.sql
@@ -0,0 +1,35 @@
+SELECT
+    OBJ.EncounterId,
+    --department.{0} As EntityID,
+    cc.ChargeCodeId, 
+    cc.CostDriver,		 
+    cc.IsPatientSpecific
+
+    ,SUM(costs.UnitsOfService) UnitsOfService
+ 
+    ,CAST(SUM(costs.FixedDirectCost) AS FLOAT) FixedDirectUnitCost 
+    ,CAST(SUM(costs.FixedIndirectCost) AS FLOAT) FixedIndirectUnitCost 
+    ,CAST(SUM(costs.VariableDirectCost) AS FLOAT) VariableDirectUnitCost 
+    ,CAST(SUM(costs.VariableIndirectCost) AS FLOAT) VariableIndirectUnitCost 
+
+    ,CAST(sum(costs.VariableDirectCost) AS FLOAT) VariableDirectCost 
+    ,CAST(sum(costs.VariableIndirectCost) AS FLOAT) VariableIndirectCost 
+    ,CAST(sum(costs.FixedDirectCost) AS FLOAT) FixedDirectCost 
+    ,CAST(sum(costs.FixedIndirectCost) AS FLOAT) FixedIndirectCost 
+
+FROM clientdss.FactPatientEncounterSummary OBJ
+INNER JOIN cci.EncounterChargeCodeCosts costs on costs.EncounterId = OBJ.EncounterId
+INNER JOIN fw.DimDepartment department on OBJ.HighestVariableCostDepartmentID = department.DepartmentID
+INNER JOIN fw.DimChargeCode cc ON costs.ChargeCodeId = cc.ChargeCodeId
+WHERE 
+    1=1
+    --{1}
+    and cc.IsPatientSpecific = 1
+    and OBJ.encounterid in (@EncounterIds)
+GROUP BY 
+    OBJ.EncounterId,
+    --department.{0},
+    cc.chargecodeid,
+    cc.costdriver,
+    cc.ispatientspecific
+having sum(costs.UnitsOfService) <> 0
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Queries/EncounterSpecificCostInfoEntityQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/EncounterSpecificCostInfoEntityQuery.sql
new file mode 100644
index 0000000..4661ff1
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/EncounterSpecificCostInfoEntityQuery.sql
@@ -0,0 +1,35 @@
+SELECT
+    OBJ.EncounterId,
+    de.fwEntityId EntityId,
+    cc.ChargeCodeId, 
+    cc.CostDriver,		 
+    cc.IsPatientSpecific
+
+    ,SUM(costs.UnitsOfService) UnitsOfService
+    
+    ,CAST(SUM(costs.FixedDirectCost) AS FLOAT) FixedDirectUnitCost 
+    ,CAST(SUM(costs.FixedIndirectCost) AS FLOAT) FixedIndirectUnitCost 
+    ,CAST(SUM(costs.VariableDirectCost) AS FLOAT) VariableDirectUnitCost 
+    ,CAST(SUM(costs.VariableIndirectCost) AS FLOAT) VariableIndirectUnitCost 
+
+    ,CAST(SUM(costs.VariableDirectCost) AS FLOAT) VariableDirectCost 
+    ,CAST(SUM(costs.VariableIndirectCost) AS FLOAT) VariableIndirectCost 
+    ,CAST(SUM(costs.FixedDirectCost) AS FLOAT) FixedDirectCost 
+    ,CAST(SUM(costs.FixedIndirectCost) AS FLOAT) FixedIndirectCost
+
+FROM clientdss.FactPatientEncounterSummary OBJ
+INNER JOIN cci.EncounterChargeCodeCosts costs ON costs.EncounterId = OBJ.EncounterId
+INNER JOIN clientdss.dimentity de ON OBJ.EntityId = de.EntityId
+INNER JOIN fw.DimChargeCode cc ON costs.ChargeCodeId = cc.ChargeCodeId
+WHERE 
+    1=1
+    --{1}
+    AND cc.IsPatientSpecific = 1
+    and OBJ.encounterid in (@EncounterIds)
+GROUP BY 
+    OBJ.EncounterId,
+    de.fwEntityId,
+    cc.chargecodeid,
+    cc.costdriver,
+    cc.ispatientspecific
+having sum(costs.UnitsOfService) <> 0
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Queries/EncounterSpecificCostInfoLocationQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/EncounterSpecificCostInfoLocationQuery.sql
new file mode 100644
index 0000000..1e331af
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/EncounterSpecificCostInfoLocationQuery.sql
@@ -0,0 +1,34 @@
+SELECT
+    OBJ.EncounterId,
+    OBJ.LocationId EntityId,
+    cc.ChargeCodeId, 
+    cc.CostDriver,		 
+    cc.IsPatientSpecific
+
+    ,SUM(costs.UnitsOfService) UnitsOfService
+ 
+    ,CAST(SUM(costs.FixedDirectCost) AS FLOAT) FixedDirectUnitCost 
+    ,CAST(SUM(costs.FixedIndirectCost) AS FLOAT) FixedIndirectUnitCost 
+    ,CAST(SUM(costs.VariableDirectCost) AS FLOAT) VariableDirectUnitCost 
+    ,CAST(SUM(costs.VariableIndirectCost) AS FLOAT) VariableIndirectUnitCost 
+
+    ,CAST(SUM(costs.VariableDirectCost) AS FLOAT) VariableDirectCost 
+    ,CAST(SUM(costs.VariableIndirectCost) AS FLOAT) VariableIndirectCost 
+    ,CAST(SUM(costs.FixedDirectCost) AS FLOAT) FixedDirectCost 
+    ,CAST(SUM(costs.FixedIndirectCost) AS FLOAT) FixedIndirectCost 
+
+FROM clientdss.FactPatientEncounterSummary OBJ
+INNER JOIN cci.EncounterChargeCodeCosts costs ON OBJ.EncounterId = costs.EncounterId
+INNER JOIN fw.DimChargeCode cc ON costs.ChargeCodeId = cc.ChargeCodeId
+WHERE 
+    1=1
+    --{1}
+    AND cc.IsPatientSpecific = 1
+    AND OBJ.EncounterId IN (@EncounterIds)
+GROUP BY 
+    OBJ.EncounterId,
+    OBJ.LocationId,
+    cc.ChargeCodeId,
+    cc.costdriver,
+    cc.ispatientspecific
+having sum(costs.UnitsOfService) <> 0
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Queries/EncounterStaticCostInfoDepartmentRollupQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/EncounterStaticCostInfoDepartmentRollupQuery.sql
new file mode 100644
index 0000000..d0daca8
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/EncounterStaticCostInfoDepartmentRollupQuery.sql
@@ -0,0 +1,36 @@
+SELECT
+    OBJ.EncounterId,
+    --department.{0} As EntityID,
+    cc.ChargeCodeId, 
+    cc.CostDriver,		 
+    cc.IsPatientSpecific
+
+    ,SUM(billing.UnitsOfService) UnitsOfService
+ 
+    ,CAST(SUM(billing.FixedDirectUnitCost) AS FLOAT) FixedDirectUnitCost 
+    ,CAST(SUM(billing.FixedIndirectUnitCost) AS FLOAT) FixedIndirectUnitCost 
+    ,CAST(SUM(billing.VariableDirectUnitCost) AS FLOAT) VariableDirectUnitCost 
+    ,CAST(SUM(billing.VariableIndirectUnitCost) AS FLOAT) VariableIndirectUnitCost 
+
+    ,CAST(sum(billing.VariableDirectCost) AS FLOAT) VariableDirectCost 
+    ,CAST(sum(billing.VariableIndirectCost) AS FLOAT) VariableIndirectCost 
+    ,CAST(sum(billing.FixedDirectCost) AS FLOAT) FixedDirectCost 
+    ,CAST(sum(billing.FixedIndirectCost) AS FLOAT) FixedIndirectCost 
+
+FROM clientdss.FactPatientEncounterSummary OBJ
+INNER JOIN billing ON OBJ.encounterid = billing.ENCOUNTERID
+INNER JOIN fw.DimDepartment department on OBJ.HighestVariableCostDepartmentID = department.DepartmentID 
+INNER JOIN fw.DimChargeCode cc on billing.ChargeCodeId = cc.ChargeCodeId 
+INNER JOIN fw.DimDepartment dept on billing.DepartmentID = dept.DepartmentID
+WHERE 
+    1=1
+    --{1}
+    and cc.IsPatientSpecific = 0
+    and OBJ.encounterid in (@EncounterIds)
+GROUP BY 
+    OBJ.EncounterId,
+    --department.{0},
+    cc.chargecodeid,
+    cc.costdriver,
+    cc.ispatientspecific
+having sum(billing.UnitsOfService) <> 0
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Queries/EncounterStaticCostInfoEntityQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/EncounterStaticCostInfoEntityQuery.sql
new file mode 100644
index 0000000..2a59c42
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/EncounterStaticCostInfoEntityQuery.sql
@@ -0,0 +1,35 @@
+SELECT
+    OBJ.EncounterId,
+    de.fwEntityId EntityId,
+    cc.ChargeCodeId, 
+    cc.CostDriver,		 
+    cc.IsPatientSpecific
+
+    ,SUM(costs.UnitsOfService) UnitsOfService
+    
+    ,CAST(SUM(costs.FixedDirectUnitCost) AS FLOAT) FixedDirectUnitCost 
+    ,CAST(SUM(costs.FixedIndirectUnitCost) AS FLOAT) FixedIndirectUnitCost 
+    ,CAST(SUM(costs.VariableDirectUnitCost) AS FLOAT) VariableDirectUnitCost 
+    ,CAST(SUM(costs.VariableIndirectUnitCost) AS FLOAT) VariableIndirectUnitCost 
+
+    ,CAST(SUM(costs.VariableDirectCost) AS FLOAT) VariableDirectCost 
+    ,CAST(SUM(costs.VariableIndirectCost) AS FLOAT) VariableIndirectCost 
+    ,CAST(SUM(costs.FixedDirectCost) AS FLOAT) FixedDirectCost 
+    ,CAST(SUM(costs.FixedIndirectCost) AS FLOAT) FixedIndirectCost
+
+FROM clientdss.FactPatientEncounterSummary OBJ
+INNER JOIN cci.EncounterChargeCodeCosts costs ON OBJ.encounterid = costs.EncounterId
+INNER JOIN clientdss.dimentity de ON OBJ.EntityId = de.EntityId
+INNER JOIN fw.DimChargeCode cc ON costs.ChargeCodeId = cc.ChargeCodeId
+WHERE 
+    1=1
+    --{1}
+    AND cc.IsPatientSpecific = 0
+    and OBJ.encounterid in (@EncounterIds)
+GROUP BY 
+    OBJ.EncounterId,
+    de.fwEntityId,
+    cc.chargecodeid,
+    cc.costdriver,
+    cc.ispatientspecific
+having sum(costs.UnitsOfService) <> 0
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Queries/EncounterStaticCostInfoLocationQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/EncounterStaticCostInfoLocationQuery.sql
new file mode 100644
index 0000000..3047691
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/EncounterStaticCostInfoLocationQuery.sql
@@ -0,0 +1,34 @@
+SELECT
+    OBJ.EncounterId,
+    OBJ.LocationId EntityId,
+    cc.ChargeCodeId, 
+    cc.CostDriver,		 
+    cc.IsPatientSpecific
+
+    ,SUM(costs.UnitsOfService) UnitsOfService
+ 
+    ,CAST(SUM(costs.FixedDirectUnitCost) AS FLOAT) FixedDirectUnitCost 
+    ,CAST(SUM(costs.FixedIndirectUnitCost) AS FLOAT) FixedIndirectUnitCost 
+    ,CAST(SUM(costs.VariableDirectUnitCost) AS FLOAT) VariableDirectUnitCost 
+    ,CAST(SUM(costs.VariableIndirectUnitCost) AS FLOAT) VariableIndirectUnitCost 
+
+    ,CAST(SUM(costs.VariableDirectCost) AS FLOAT) VariableDirectCost 
+    ,CAST(SUM(costs.VariableIndirectCost) AS FLOAT) VariableIndirectCost 
+    ,CAST(SUM(costs.FixedDirectCost) AS FLOAT) FixedDirectCost 
+    ,CAST(SUM(costs.FixedIndirectCost) AS FLOAT) FixedIndirectCost 
+
+FROM clientdss.FactPatientEncounterSummary OBJ
+INNER JOIN cci.EncounterChargeCodeCosts costs ON OBJ.encounterid = costs.EncounterId
+INNER JOIN fw.DimChargeCode cc ON costs.ChargeCodeId = cc.ChargeCodeId
+WHERE 
+    1=1
+    --{1}
+    AND cc.IsPatientSpecific = 0
+    AND OBJ.encounterid IN (@EncounterIds)
+GROUP BY 
+    OBJ.EncounterId,
+    OBJ.LocationId,
+    cc.chargecodeid,
+    cc.costdriver,
+    cc.ispatientspecific
+having sum(costs.UnitsOfService) <> 0
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Queries/EncounterUnitOfServiceQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/EncounterUnitOfServiceQuery.sql
new file mode 100644
index 0000000..39ba457
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/EncounterUnitOfServiceQuery.sql
@@ -0,0 +1,14 @@
+SELECT 
+     obj.EncounterId 
+    , SUM(CAST(( CASE WHEN rev.LOSType = 'Observation' 
+        THEN CAST(obj.UnitsOfService As Float) / @ObservationUnitsDivisor
+        ELSE obj.UnitsOfService END ) AS FLOAT)) AS Uos
+    , SUM(CASE WHEN rev.LOSType = 'Observation' THEN OBJ.UnitsOfService ELSE 0 END) AS ObservationUnitsOfService
+    , SUM(CASE WHEN rev.LOSType <> 'Observation' THEN OBJ.UnitsOfService ELSE 0 END) AS NonObservationUnitsOfService
+FROM dss.FactPatientBillingLineItemDetail obj
+INNER JOIN dss.DimUBRevenueCode rev on rev.UBRevenueCodeID = obj.UBRevenueCodeID
+INNER JOIN fw.DimChargeCode cc ON obj.ChargeCodeId = cc.ChargeCodeId and cc.costdriver = 'LOS'
+INNER JOIN fw.DimDepartment d on obj.DepartmentID = d.DepartmentID and d.IsDepartmentRollup = 0
+INNER JOIN clientdss.FactPatientEncounterSummary pes on obj.EncounterId = pes.EncounterId
+WHERE obj.encounterid in (@EncounterIds)
+GROUP BY OBJ.EncounterId
diff --git a/src/Strata.DecisionSupport.Biz/Queries/LOSOpportunityInfoQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/LOSOpportunityInfoQuery.sql
new file mode 100644
index 0000000..11f3f94
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/LOSOpportunityInfoQuery.sql
@@ -0,0 +1,59 @@
+SELECT
+    pblid.EncounterId,
+    pblid.EncounterRecordNumber,
+    pes.AdmitDateTime,
+    pes.DischargeDateTime,
+    pes.DischargeStatusID,
+    pes.PrimaryPhysicianID,
+    case
+        when dds.DischargeStatusGroup = '' then 'Not Specified'
+        else dds.DischargeStatusGroup
+    end as DischargeStatusGroup,
+    case
+        when cc.Rollup = '' then 'Not Specified'
+        else cc.Rollup
+    end as UnitType,
+    CAST(
+        (
+            CASE
+                WHEN rev.LOSType = 'Observation' THEN CAST(pblid.UnitsOfService As Float) / @ObservationUnitsDivisor
+                ELSE pblid.UnitsOfService
+            END
+        ) AS FLOAT
+    ) AS UOS,
+    cast(apr.APRROM as int) as ROM,
+    cast(apr.APRSOI as int) as SOI,
+    ves.OpportunityGUID,
+    CASE
+        WHEN ct.PhysicianGroupingType = 0 THEN p.MemberGUID
+        WHEN ct.PhysicianGroupingType = 1 THEN ps.MemberGUID
+        WHEN ct.PhysicianGroupingType = 2 THEN ga.MemberGUID
+    END AS PhysicianGroupingGUID,
+    CASE
+        WHEN ct.PhysicianGroupingType = 0 THEN p.PhysicianID
+        WHEN ct.PhysicianGroupingType = 1 THEN ps.PhysicianSpecialtyID
+        WHEN ct.PhysicianGroupingType = 2 THEN ga.PhysicianGroupAffiliationID
+    END AS PhysicianGroupingId,
+    CASE
+        WHEN ct.PhysicianGroupingType = 0 THEN p.FullName
+        WHEN ct.PhysicianGroupingType = 1 THEN ps.Description
+        WHEN ct.PhysicianGroupingType = 2 THEN ga.Description
+    END AS PhysicianGroupingName
+FROM
+    BILLING pblid
+    inner join clientdss.FactPatientEncounterSummary pes on pblid.EncounterId = pes.EncounterId
+    inner join dss.DimUBRevenueCode rev on rev.UBRevenueCodeID = pblid.UBRevenueCodeID
+    inner join clientdss.DimDischargeStatus dds on dds.DischargeStatusID = pes.DischargeStatusID
+    INNER JOIN fw.DimChargeCode cc ON cc.ChargeCodeId = pblid.ChargeCodeId
+    inner join dss.DimAPRDRG apr on apr.APRDRGID = pes.ReportingAPRDRGID
+    inner join cci.VariationEncounterSaving ves on pblid.EncounterId = ves.EncounterId
+    inner join cci.variationopportunity vo on ves.opportunityguid = vo.opportunityguid
+    inner join dss.DimPhysician p ON pes.PrimaryPhysicianID = p.PhysicianID
+    inner join dss.DimPhysicianSpecialty ps ON p.PhysicianSpecialtyID = ps.PhysicianSpecialtyID
+    inner join dss.DimPhysicianGroupAffiliation ga ON p.PhysicianGroupAffiliationID = ga.PhysicianGroupAffiliationID
+    inner join dss.DimCaseType ct ON vo.CaseTypeId = ct.CaseTypeId
+WHERE
+    cc.CostDriver = 'LOS'
+    AND ves.OpportunityGUID = @OpportunityGuid
+    AND ves.IsBaseline = 1
+    AND ct.CaseTypeId = @CaseTypeId
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Queries/VariationEncounterChargeQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/VariationEncounterChargeQuery.sql
new file mode 100644
index 0000000..a7aae92
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/VariationEncounterChargeQuery.sql
@@ -0,0 +1,54 @@
+SELECT 
+      saving.OpportunityGUID
+    , OBJ.EncounterId
+    , OBJ.EncounterRecordNumber
+    , OBJ.ChargeCodeId
+    , cc.ChargeCode
+    , OBJ.Charge
+    , OBJ.ServiceDateTime
+    , CAST(OBJ.UnitsOfService AS FLOAT) AS UnitsOfService
+    , cc.Name
+    , cc.Description
+    , saving.IsBaseline
+    , cc.CostDriver
+    , cc.Rollup
+    , saving.PhysicianGroupingId
+    , saving.PhysicianGroupingName
+    , cc.IsPatientSpecific--{1}{3}
+    , OBJ.FixedDirectCost / OBJ.UnitsOfService AS PatientSpecificFixedDirectCost
+    , OBJ.FixedIndirectCost / OBJ.UnitsOfService AS PatientSpecificFixedIndirectCost
+    , OBJ.VariableDirectCost / OBJ.UnitsOfService AS PatientSpecificVariableDirectCost
+    , OBJ.VariableIndirectCost / OBJ.UnitsOfService AS PatientSpecificVariableIndirectCost
+    , COALESCE(cd.AvgFixedDirectCost, 0) AS AvgFixedDirectCost
+    , COALESCE(cd.AvgFixedIndirectCost, 0) AS AvgFixedIndirectCost
+    , COALESCE(cd.AvgVariableDirectCost, 0) AS AvgVariableDirectCost
+    , COALESCE(cd.AvgVariableIndirectCost, 0) AS AvgVariableIndirectCost
+FROM 
+    billing OBJ
+    INNER JOIN fw.DimChargeCode cc ON OBJ.ChargeCodeId = cc.ChargeCodeId
+    INNER JOIN cci.VariationEncounterSavingInfo saving ON saving.EncounterId = OBJ.EncounterId
+        AND (saving.CostDriver = cc.CostDriver--{4}
+        )
+    INNER JOIN cci.VariationOpportunity opp ON saving.OpportunityGUID = opp.OpportunityGUID
+    INNER JOIN cci.Configuration c ON opp.ConfigurationGuid = c.ConfigurationGuid
+    INNER JOIN dss.DimCaseType ct ON ct.CaseTypeId = opp.CaseTypeId
+    LEFT JOIN cci.ChargeCodeCostDetail cd ON OBJ.ChargeCodeId = cd.ChargeCodeId
+        AND cd.EntityID = CASE c.DepartmentRollupGlobalID
+            WHEN 'Department Rollup 1' THEN opp.DepartmentRollup1Id
+            WHEN 'Department Rollup 2' THEN opp.DepartmentRollup2Id
+            WHEN 'Department Rollup 3' THEN opp.DepartmentRollup3Id
+            WHEN 'Department Rollup 4' THEN opp.DepartmentRollup4Id
+            WHEN 'Department Rollup 5' THEN opp.DepartmentRollup5Id
+            WHEN 'Department Rollup 6' THEN opp.DepartmentRollup6Id
+            WHEN 'Location' THEN opp.LocationId
+            ELSE opp.EntityId
+            END
+        AND cd.ConfigurationGUID = opp.ConfigurationGUID
+    INNER JOIN dss.DimSupply supply ON supply.SupplyID = OBJ.SupplyID--{0}{2}
+WHERE 
+     OBJ.UnitsOfService <> 0
+     AND saving.IsBaseline = @IsBaseline
+     AND opp.OpportunityGuid in (@OpportunityGuids)
+ORDER BY 
+      OBJ.EncounterID, OBJ.EncounterRecordNumber, OBJ.ChargeCodeId,
+      OBJ.ServiceDateTime DESC
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Queries/WithEncounterUnitOfServiceQuery.sql b/src/Strata.DecisionSupport.Biz/Queries/WithEncounterUnitOfServiceQuery.sql
new file mode 100644
index 0000000..b951321
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Queries/WithEncounterUnitOfServiceQuery.sql
@@ -0,0 +1,15 @@
+WITH EncounterUnitOfService AS (
+    SELECT 
+         obj.EncounterId 
+        , SUM(CAST(( CASE WHEN rev.LOSType = 'Observation' 
+            THEN CAST(obj.UnitsOfService As Float) / @ObservationUnitsDivisor
+            ELSE obj.UnitsOfService END ) AS FLOAT)) AS LengthOfStay
+        , SUM(CASE WHEN rev.LOSType = 'Observation' THEN OBJ.UnitsOfService ELSE 0 END) AS ObservationUnitsOfService
+        , SUM(CASE WHEN rev.LOSType <> 'Observation' THEN OBJ.UnitsOfService ELSE 0 END) AS NonObservationUnitsOfService
+    FROM dss.FactPatientBillingLineItemDetail obj
+    INNER JOIN dss.DimUBRevenueCode rev on rev.UBRevenueCodeID = obj.UBRevenueCodeID
+    INNER JOIN fw.DimChargeCode cc ON obj.ChargeCodeId = cc.ChargeCodeId and cc.costdriver = 'LOS'
+    INNER JOIN fw.DimDepartment d on obj.DepartmentID = d.DepartmentID and d.IsDepartmentRollup = 0
+    INNER JOIN clientdss.FactPatientEncounterSummary pes on obj.EncounterId = pes.EncounterId
+    GROUP BY OBJ.EncounterId
+)
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Services/EncounterQueries.cs b/src/Strata.DecisionSupport.Biz/Services/EncounterQueries.cs
new file mode 100644
index 0000000..29b681b
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Services/EncounterQueries.cs
@@ -0,0 +1,145 @@
+using Strata.DecisionSupport.Biz.Utilities;
+using System;
+using System.Reflection;
+using System.Text.RegularExpressions;
+
+namespace Strata.DecisionSupport.Biz.Services
+{
+    public static class EncounterQueries
+    {
+        public static string EncounterCostInfoQuery(this string departmentRollupGlobalId, bool isPatientSpecific, params object[] args)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            
+            if (!isPatientSpecific)
+            {
+                var query =
+                    (departmentRollupGlobalId ?? "") switch
+                    {
+                        "" => assembly.ReadResource($"EncounterStaticCostInfoEntityQuery.sql"),
+                        "Location" => assembly.ReadResource($"EncounterStaticCostInfoLocationQuery.sql"),
+                        _ => assembly.WithBilling($"EncounterStaticCostInfoDepartmentRollupQuery.sql")
+                    };
+                return FormatStr(query, args);
+            }
+            else
+            {
+                var query =
+                (departmentRollupGlobalId ?? "") switch
+                {
+                    "" => assembly.ReadResource($"EncounterSpecificCostInfoEntityQuery.sql"),
+                    "Location" => assembly.ReadResource($"EncounterSpecificCostInfoLocationQuery.sql"),
+                    _ => assembly.ReadResource($"EncounterSpecificCostInfoDepartmentRollupQuery.sql")
+                };
+                return FormatStr(query, args);
+            }
+        }
+
+        public static string EncounterInfoQuery(this string departmentRollupGlobalId, params object[] args)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var uosQuery = assembly.ReadResource("WithEncounterUnitOfServiceQuery.sql");
+            var query = (departmentRollupGlobalId ?? "") switch
+            {
+                "" => assembly.ReadResource("EncounterInfoEntityQuery.sql"),
+                "Location" => assembly.ReadResource("EncounterInfoLocationQuery.sql"),
+                _ => assembly.ReadResource("EncounterInfoDepartmentRollupQuery.sql")
+            };
+            query = $@"
+{uosQuery}
+
+{query}";
+            return FormatStr(query, args);
+        }
+
+        public static string DepartmentEncounterUnitOfServiceQuery(this string departmentRollupGlobalId, params object[] args)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var query = (departmentRollupGlobalId ?? "") switch
+            {
+                "" => assembly.ReadResource("DepartmentEncounterUnitOfServiceEntityQuery.sql"),
+                "Location" => assembly.ReadResource("DepartmentEncounterUnitOfServiceLocationQuery.sql"),
+                _ => assembly.ReadResource("DepartmentEncounterUnitOfServiceDepartmentRollupQuery.sql")
+            };
+            return FormatStr(query, args);
+        }
+
+        public static string EncounterUnitOfServiceQuery(params object[] args)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var query = SnowflakeSyntax(assembly.ReadResource("EncounterUnitOfServiceQuery.sql"));
+            return FormatStr(query, args);
+        }
+
+        public static string VariationEncounterChargeQuery(int first = 0, int rows = 0, params object[] args)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var query = assembly.WithBilling("VariationEncounterChargeQuery.sql");
+            return FormatStr(query.WithSnowflakePagination(rows, first), args);
+        }
+
+        public static string LOSOpportunityInfoQuery(params object[] args)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var query = assembly.UseSnowflakeSyntax("LOSOpportunityInfoQuery.sql");
+            query = $"{assembly.WithBilling()}{query}";
+            return FormatStr(query, args);
+        }
+
+        public static string AllChargeInfoQuery(params object[] args)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var query = assembly.ReadResource("AllChargeInfoQuery.sql");
+            return FormatStr(query, args);
+        }
+
+        public static string ChargeInfoQuery(params object[] args)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var query = assembly.UseSnowflakeSyntax("ChargeInfoQuery.sql");
+            return FormatStr(query, args);
+        }
+
+        public static string EncounterChargeQuery(int first = 0, int rows = 0, params object[] args)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var query = assembly.WithBilling("EncounterChargeQuery.sql");
+            return FormatStr(query.WithSnowflakePagination(rows, first), args);
+        }
+
+        #region Helper Methods
+
+        private static readonly Func<object[], bool> IsEmpty = (args) => args == null || args.Length <= 0;
+        public static string SnowflakeSyntax(string sql)
+        {
+            var result = Regex.Replace(sql.Replace("@", ":").Replace("--", ""),
+                @"IN \((:[^)]*)\)", "IN $1",
+                RegexOptions.IgnoreCase | RegexOptions.Multiline);
+            return result;
+        }
+
+        public static string FormatStr(this string query, object[] args, int page = 0, int pageSize = 0)
+        {
+            if (IsEmpty(args)) return SnowflakeSyntax(query);
+            if (page <= 0) return SnowflakeSyntax(string.Format(query, args));
+            return SnowflakeSyntax(string.Format(query + $"\r\nLIMIT {pageSize} OFFSET {(page - 1) * pageSize}"));
+        }
+
+        internal static string UseSnowflakeSyntax(this Assembly assembly, string sql)
+            => SnowflakeSyntax(assembly.ReadResource(sql));
+
+        internal static string WithBilling(this Assembly assembly)
+            => $"With Billing As (\r\n{assembly.ReadResource("Billing.sql")}\r\n)\r\n";
+
+        internal static string WithBilling(this Assembly assembly, string sqlName)
+            => $"{assembly.WithBilling()}{assembly.UseSnowflakeSyntax(sqlName)}";
+
+        internal static string WithPagination(this string sql, int rows, int first)
+            => first >= 0 ? $"{sql}\r\nOFFSET {first} ROWS\r\nFETCH NEXT {rows} ROWS ONLY" : sql;
+
+        internal static string WithSnowflakePagination(this string sql, int rows, int first)
+            => first >= 0 ? $"{sql}\r\nLIMIT {rows} OFFSET {first}" : sql;
+
+        #endregion
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Services/EncounterQueryService.cs b/src/Strata.DecisionSupport.Biz/Services/EncounterQueryService.cs
new file mode 100644
index 0000000..6d07f15
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Services/EncounterQueryService.cs
@@ -0,0 +1,119 @@
+using Strata.DecisionSupport.Biz.Encounters;
+using Strata.DecisionSupport.Biz.Mapperly;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Snowflake;
+using Strata.DecisionSupport.Models.Encounters;
+using Strata.Schema.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Jazz = Strata.DecisionSupport.Models.Jazz;
+using LOSOpportunityInfo = Strata.DecisionSupport.Biz.Encounters.LOSOpportunityInfo;
+using VariationEncounterChargeInfo = Strata.DecisionSupport.Biz.Encounters.VariationEncounterChargeInfo;
+
+namespace Strata.DecisionSupport.Biz.Services
+{
+    public class EncounterQueryService : IEncounterQueryService
+    {
+        private readonly ISnowflakeDatabaseContext _databaseContext;
+        private readonly ISchemaServiceClient _schemaServiceClient;
+
+        public EncounterQueryService(
+            ISnowflakeDatabaseContext databaseContext,
+            ISchemaServiceClient schemaServiceClient)
+        {
+            _databaseContext = databaseContext;
+            _schemaServiceClient = schemaServiceClient;
+        }
+
+        public async Task<IEnumerable<IJazzEncounterInfo>> RunEncounterInfoQuery(EncounterQueryInfo queryInfo,
+            CancellationToken cancellationToken)
+        {
+            var serviceLineJoin = string.Empty;
+            var serviceLineColumn = "OBJ.ServiceLineId";
+
+            var serviceLineDimension = await _schemaServiceClient.GetGMDimensionAsync(queryInfo.ServiceLineGuid, cancellationToken);
+            var serviceLineAttribute = serviceLineDimension.Attributes
+                .SingleOrDefault(attr => attr.AttributeGuid == serviceLineDimension.DefaultKeyGuid);
+            var serviceLineLookupAttribute = serviceLineDimension.Attributes
+                .SingleOrDefault(attr => attr.AttributeGuid == serviceLineDimension.DefaultLookupKeyGuid);
+
+            var serviceLineTableName = $"{serviceLineDimension.SourceTableSchema}.{serviceLineDimension.SourceTableName}";
+            var serviceLineIdAttribute = serviceLineAttribute?.SqlColumnName;
+            var serviceLineNameAttribute = serviceLineLookupAttribute?.SqlColumnName ?? serviceLineIdAttribute ?? "Name";
+            if (serviceLineDimension.FriendlyName.Equals("Sg2 Service Line Crosswalk", StringComparison.InvariantCultureIgnoreCase))
+            {
+                serviceLineJoin = $"INNER JOIN dss.DimSg2CareFamily cf ON cf.Sg2CAREFamilyID = OBJ.Sg2CAREFamilyID"
+                    + "\r\nINNER JOIN dss.DimSg2ServiceLineCrosswalk sl ON sl.Sg2ServiceLine = cf.ServiceLine";
+            }
+            else
+            {
+                serviceLineJoin = $"INNER JOIN {serviceLineTableName} sl on sl.{serviceLineIdAttribute} = OBJ.{serviceLineIdAttribute}";
+            }
+            serviceLineColumn = $"sl.{serviceLineIdAttribute}";
+
+            var query = queryInfo.DepartmentRollupGlobalId.EncounterInfoQuery(queryInfo.Args(serviceLineColumn, serviceLineJoin));
+            var parameters = queryInfo.Parameters();
+            IEnumerable<SnowflakeEncounterInfo> encounters = await _databaseContext.QueryAsync<SnowflakeEncounterInfo>(query, nameof(RunEncounterInfoQuery), parameters);
+            return queryInfo.CaseTypeCategory switch
+            {
+                Models.Queries.CaseTypeCategory.MSDRG => encounters.Select(encounter => encounter.MapFromSnowflake().MapMsdrgEncounterInfo()),
+                Models.Queries.CaseTypeCategory.APRDRG => encounters.Select(encounter => encounter.MapFromSnowflake().MapAprdrgEncounterInfo()),
+                Models.Queries.CaseTypeCategory.CPTCode => encounters.Select(encounter => encounter.MapFromSnowflake().MapCptCodeEncounterInfo()),
+                Models.Queries.CaseTypeCategory.PatientPopulation => encounters.Select(encounter => encounter.MapFromSnowflake().MapPatientPopulationEncounterInfo()),
+                _ => Enumerable.Empty<IJazzEncounterInfo>()
+            };
+        }
+
+        public async Task<IEnumerable<EncounterCostInfo>> RunEncounterCostInfoQuery(EncounterCostQueryInfo queryInfo,
+            CancellationToken cancellationToken)
+        {
+            var query = queryInfo.DepartmentRollupGlobalId.EncounterCostInfoQuery(queryInfo.IsPatientSpecific, queryInfo.Args());
+            return await _databaseContext.QueryAsync<EncounterCostInfo>(query, nameof(RunEncounterCostInfoQuery), queryInfo.Parameters());
+        }
+
+        public async Task<IEnumerable<DepartmentEncounterUnitOfService>> RunDepartmentEncounterUnitOfServiceQuery(DepartmentEncounterUnitOfServiceQueryInfo queryInfo, CancellationToken cancellationToken)
+        {
+            var query = queryInfo.DepartmentRollupGlobalId.DepartmentEncounterUnitOfServiceQuery(queryInfo.Args());
+            return await _databaseContext.QueryAsync<DepartmentEncounterUnitOfService>(query, nameof(RunDepartmentEncounterUnitOfServiceQuery), queryInfo.Parameters());
+        }
+
+        public async Task<IEnumerable<EncounterUnitOfService>> RunEncounterUnitOfServiceQuery(EncounterUnitOfServiceQueryInfo queryInfo,
+            CancellationToken cancellationToken)
+        {
+            var query = EncounterQueries.EncounterUnitOfServiceQuery();
+            return (IEnumerable<EncounterUnitOfService>)await _databaseContext
+                .QueryAsync<EncounterUnitOfService>(query, nameof(RunEncounterUnitOfServiceQuery), queryInfo.Parameters());
+        }
+
+        public async Task<IEnumerable<Jazz.VariationEncounterChargeInfo>> RunVariationEncounterChargeQuery(VariationEncounterChargeQueryInfo queryInfo,
+            CancellationToken cancellationToken)
+        {
+            var query = EncounterQueries.VariationEncounterChargeQuery(queryInfo.First, queryInfo.Rows, queryInfo.Args());
+            var result = (IEnumerable<VariationEncounterChargeInfo>)await _databaseContext
+                .QueryAsync<VariationEncounterChargeInfo>(query, nameof(RunVariationEncounterChargeQuery), queryInfo.Parameters());
+            return result.Select(info => info.MapToJazz());
+        }
+
+        public async Task<IEnumerable<Jazz.LOSOpportunityInfo>> RunLOSOpportunityInfoQuery(LOSOpportunityQueryInfo queryInfo,
+            CancellationToken cancellationToken)
+        {
+            var query = EncounterQueries.LOSOpportunityInfoQuery();
+            var result = (IEnumerable<LOSOpportunityInfo>)await _databaseContext
+                .QueryAsync<LOSOpportunityInfo>(query, nameof(RunLOSOpportunityInfoQuery), queryInfo.Parameters());
+            return result.Select(info => info.MapToJazz());
+        }
+
+        public async Task<IEnumerable<EncounterChargeInfo>> RunEncounterChargeQuery(EncounterChargeQueryInfo queryInfo,
+            CancellationToken cancellationToken)
+        {
+            var query = EncounterQueries.EncounterChargeQuery(queryInfo.First, queryInfo.Rows, queryInfo.Args());
+            return (IEnumerable<EncounterChargeInfo>)await _databaseContext
+                .QueryAsync<EncounterChargeInfo>(query, nameof(RunEncounterChargeQuery), queryInfo.Parameters());
+        }
+
+    }
+
+}
diff --git a/src/Strata.DecisionSupport.Biz/Services/IEncounterQueryService.cs b/src/Strata.DecisionSupport.Biz/Services/IEncounterQueryService.cs
new file mode 100644
index 0000000..75fade4
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Services/IEncounterQueryService.cs
@@ -0,0 +1,28 @@
+using Strata.DecisionSupport.Biz.Encounters;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Models.Encounters;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Jazz = Strata.DecisionSupport.Models.Jazz;
+
+namespace Strata.DecisionSupport.Biz.Services
+{
+    public interface IEncounterQueryService
+    {
+        Task<IEnumerable<IJazzEncounterInfo>> RunEncounterInfoQuery(EncounterQueryInfo queryInfo, CancellationToken cancellationToken);
+
+        Task<IEnumerable<EncounterCostInfo>> RunEncounterCostInfoQuery(EncounterCostQueryInfo queryInfo, CancellationToken cancellationToken);
+
+        Task<IEnumerable<DepartmentEncounterUnitOfService>> RunDepartmentEncounterUnitOfServiceQuery(DepartmentEncounterUnitOfServiceQueryInfo queryInfo, CancellationToken cancellationToken);
+
+        Task<IEnumerable<EncounterUnitOfService>> RunEncounterUnitOfServiceQuery(EncounterUnitOfServiceQueryInfo queryInfo, CancellationToken cancellationToken);
+
+        Task<IEnumerable<Jazz.VariationEncounterChargeInfo>> RunVariationEncounterChargeQuery(VariationEncounterChargeQueryInfo queryInfo, CancellationToken cancellationToken);
+
+        Task<IEnumerable<Jazz.LOSOpportunityInfo>> RunLOSOpportunityInfoQuery(LOSOpportunityQueryInfo queryInfo, CancellationToken cancellationToken);
+
+        Task<IEnumerable<EncounterChargeInfo>> RunEncounterChargeQuery(EncounterChargeQueryInfo queryInfo, CancellationToken cancellationToken);
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Services/IUtilizationVariationService.cs b/src/Strata.DecisionSupport.Biz/Services/IUtilizationVariationService.cs
new file mode 100644
index 0000000..c95cd60
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Services/IUtilizationVariationService.cs
@@ -0,0 +1,14 @@
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Models.Jazz;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.DecisionSupport.Biz.Services
+{
+    public interface IUtilizationVariationService
+    {
+        Task<IEnumerable<AllChargeInfo>> RunAllChargeInfoQuery(AllChargeQueryInfo queryInfo, CancellationToken cancellationToken);
+        Task<IEnumerable<ChargeInfo>> RunChargeInfoQuery(ChargeQueryInfo queryInfo, CancellationToken cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Biz/Services/UtilizationVariationService.cs b/src/Strata.DecisionSupport.Biz/Services/UtilizationVariationService.cs
new file mode 100644
index 0000000..36132f2
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Services/UtilizationVariationService.cs
@@ -0,0 +1,95 @@
+using Microsoft.Extensions.Logging;
+using Strata.DecisionSupport.Biz.Encounters;
+using Strata.DecisionSupport.Biz.Mapperly;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Snowflake;
+using Strata.DecisionSupport.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Jazz = Strata.DecisionSupport.Models.Jazz;
+
+namespace Strata.DecisionSupport.Biz.Services
+{
+    public class UtilizationVariationService : IUtilizationVariationService
+    {
+        private readonly ISnowflakeDatabaseContext _databaseContext;
+        private readonly ILogger<UtilizationVariationService> _logger;
+
+        public UtilizationVariationService() { }
+
+        public UtilizationVariationService(
+            ISnowflakeDatabaseContext databaseContext,
+            ILogger<UtilizationVariationService> logger)
+        {
+            _databaseContext = databaseContext;
+            _logger = logger;
+        }
+
+        public async Task<IEnumerable<Jazz.ChargeInfo>> RunChargeInfoQuery(ChargeQueryInfo queryInfo, CancellationToken cancellationToken)
+        {
+            if (queryInfo.ChargeCodeIds.IsEmpty()) { return Enumerable.Empty<Jazz.ChargeInfo>(); }
+            var query = EncounterQueries.ChargeInfoQuery();
+            try
+            {
+                var result = (IEnumerable<ChargeInfo>)await _databaseContext
+                    .QueryAsync<ChargeInfo>(query, nameof(RunChargeInfoQuery), queryInfo.Parameters());
+
+                var chargesNotFound = result
+                    .Where(chargeInfo => chargeInfo.GetCCIUnitCost(true) == 0)
+                    .Select(ci => ci.ChargeCodeId).ToList();
+                if (chargesNotFound.IsEmpty() || queryInfo.OpportunityGuid == Guid.Empty)
+                {
+                    return result.Select(info => info.MapToJazz());
+                }
+
+                var allChargeQueryInfo = new AllChargeQueryInfo(queryInfo.OpportunityGuid, chargesNotFound);
+                var encounterInfos = await RunAllChargeInfoQuery(allChargeQueryInfo, cancellationToken);
+
+                foreach (var chargeInfo in result.Where(c => c.ChargeCodeId.In(chargesNotFound)))
+                {
+                    var encounterChargeInfos = encounterInfos
+                        .Where(e => e.ChargeCodeId == chargeInfo.ChargeCodeId && e.IsBaseline);
+
+                    chargeInfo.AvgFixedDirectCost = encounterChargeInfos
+                        .WeightedAverage(c => c.AvgFixedDirectCost, c => c.Quantity);
+                    chargeInfo.AvgFixedIndirectCost = encounterChargeInfos
+                        .WeightedAverage(c => c.AvgFixedIndirectCost, c => c.Quantity);
+                    chargeInfo.AvgVariableDirectCost = encounterChargeInfos
+                        .WeightedAverage(c => c.AvgVariableDirectCost, c => c.Quantity);
+                    chargeInfo.AvgVariableIndirectCost = encounterChargeInfos
+                        .WeightedAverage(c => c.AvgVariableIndirectCost, c => c.Quantity);
+
+                    chargeInfo.CCICostOverride = true;
+                }
+
+                return result.Select(info => info.MapToJazz());
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, ex.Message, queryInfo.Dictionary());
+            }
+            return Enumerable.Empty<Jazz.ChargeInfo>();
+        }
+
+        public async Task<IEnumerable<Jazz.AllChargeInfo>> RunAllChargeInfoQuery(AllChargeQueryInfo queryInfo, CancellationToken cancellationToken)
+        {
+            var query = EncounterQueries.AllChargeInfoQuery();
+            try
+            {
+                var result = (IEnumerable<AllChargeInfo>)await _databaseContext
+                    .QueryAsync<AllChargeInfo>(query, nameof(RunAllChargeInfoQuery), queryInfo.Parameters());
+                return result.Select(info => info.MapToJazz());
+            }
+            catch (Exception ex)
+            {
+                _logger.LogServiceError(ex, ex.Message, queryInfo.Dictionary());
+            }
+            return Enumerable.Empty<Jazz.AllChargeInfo>();
+        }
+
+    }
+
+}
diff --git a/src/Strata.DecisionSupport.Biz/Snowflake/ISnowflakeDatabaseContext.cs b/src/Strata.DecisionSupport.Biz/Snowflake/ISnowflakeDatabaseContext.cs
new file mode 100644
index 0000000..544761a
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Snowflake/ISnowflakeDatabaseContext.cs
@@ -0,0 +1,16 @@
+using Strata.SnowflakeLib;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Strata.DecisionSupport.Biz.Snowflake
+{
+    public interface ISnowflakeDatabaseContext
+    {
+        Task<SnowflakeConnectionStringBuilder> GetSnowflakeConnectionStringBuilderAsync();
+
+        Task<IEnumerable<T>> QueryAsync<T>(string query, string requestType, object parameters = null, TimeSpan timeSpan = default) where T : class;
+
+        Task<T> ExecuteScalarAsync<T>(string query);
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Snowflake/ISnowflakeDatabaseContextFactory.cs b/src/Strata.DecisionSupport.Biz/Snowflake/ISnowflakeDatabaseContextFactory.cs
new file mode 100644
index 0000000..b30a629
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Snowflake/ISnowflakeDatabaseContextFactory.cs
@@ -0,0 +1,7 @@
+namespace Strata.DecisionSupport.Biz.Snowflake
+{
+    public interface ISnowflakeDatabaseContextFactory
+    {
+        public SnowflakeDatabaseContext Create(string databaseGuid);
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Snowflake/SnowflakeDatabaseContext.cs b/src/Strata.DecisionSupport.Biz/Snowflake/SnowflakeDatabaseContext.cs
new file mode 100644
index 0000000..2568d13
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Snowflake/SnowflakeDatabaseContext.cs
@@ -0,0 +1,66 @@
+using Dapper;
+using Strata.ContinuousImprovement.Biz.ClientWarehouses;
+using Strata.SnowflakeLib;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.DecisionSupport.Biz.Snowflake
+{
+    [ExcludeFromCodeCoverage]
+    public class SnowflakeDatabaseContext : ISnowflakeDatabaseContext
+    {
+        private string _databaseGuid { get; }
+
+        private readonly SnowflakeClientDbConnectionStringBuilderFactory _snowflakeClientDbConnectionStringBuilderFactory;
+        private readonly IClientWarehouseService _clientWarehouseService;
+
+        public SnowflakeDatabaseContext(string databaseGuid, SnowflakeClientDbConnectionStringBuilderFactory snowflakeClientDbConnectionStringBuilderFactory, IClientWarehouseService clientWarehouseService)
+        {
+            _databaseGuid = databaseGuid;
+            _snowflakeClientDbConnectionStringBuilderFactory = snowflakeClientDbConnectionStringBuilderFactory;
+            _clientWarehouseService = clientWarehouseService;
+        }
+
+        public async Task<SnowflakeConnectionStringBuilder> GetSnowflakeConnectionStringBuilderAsync()
+        {
+            var connection = await _snowflakeClientDbConnectionStringBuilderFactory.CreateAsync(_databaseGuid);
+
+            if (Guid.TryParse(_databaseGuid, out Guid databaseGuid))
+            {
+                var clientWarehouse = await _clientWarehouseService.GetByDatabaseGuid(databaseGuid, CancellationToken.None);
+                connection.Warehouse = clientWarehouse == null ?
+                "APP_CI_EXPLORATION_XS_WH" : $"APP_CI_EXPLORATION_{clientWarehouse.WarehouseSize}_WH";
+            }
+            return connection;
+        }
+
+        public async Task<IEnumerable<T>> QueryAsync<T>(string query, string requestType, object parameters = null, TimeSpan timeSpan = default)
+            where T : class
+        {
+            SnowflakeConnectionStringBuilder connectionBuilder = await GetSnowflakeConnectionStringBuilderAsync();
+            if (!timeSpan.Equals(default(TimeSpan))) connectionBuilder.Timeout = (int)timeSpan.TotalSeconds;
+
+            await using (StrataSnowflakeConnection connection = connectionBuilder.CreateConnection())
+            {
+                connection.AddCustomQueryTags(new Dictionary<string, string>(new[] { GetRequestTypeQueryTag(requestType) }));
+                return await connection.QueryAsync<T>(query, parameters);
+            }
+        }
+
+        public async Task<T> ExecuteScalarAsync<T>(string query)
+        {
+            SnowflakeConnectionStringBuilder connectionBuilder = await GetSnowflakeConnectionStringBuilderAsync();
+            await using (StrataSnowflakeConnection connection = connectionBuilder.CreateConnection())
+            {
+                return await connection.ExecuteScalarAsync<T>(query);
+            }
+
+        }
+
+        private KeyValuePair<string, string> GetRequestTypeQueryTag(string requestType) => new("Request_Type", requestType);
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Snowflake/SnowflakeDatabaseContextFactory.cs b/src/Strata.DecisionSupport.Biz/Snowflake/SnowflakeDatabaseContextFactory.cs
new file mode 100644
index 0000000..57d26cc
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Snowflake/SnowflakeDatabaseContextFactory.cs
@@ -0,0 +1,24 @@
+using Strata.ContinuousImprovement.Biz.ClientWarehouses;
+using Strata.SnowflakeLib;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.DecisionSupport.Biz.Snowflake
+{
+    [ExcludeFromCodeCoverage]
+    public class SnowflakeDatabaseContextFactory : ISnowflakeDatabaseContextFactory
+    {
+        private readonly SnowflakeClientDbConnectionStringBuilderFactory _snowflakeClientDbConnectionStringBuilderFactory;
+        private readonly IClientWarehouseService _clientWarehouseService;
+
+        public SnowflakeDatabaseContextFactory(SnowflakeClientDbConnectionStringBuilderFactory snowflakeClientDbConnectionStringBuilderFactory, IClientWarehouseService clientWarehouseService)
+        {
+            _snowflakeClientDbConnectionStringBuilderFactory = snowflakeClientDbConnectionStringBuilderFactory;
+            _clientWarehouseService = clientWarehouseService;
+        }
+
+        public SnowflakeDatabaseContext Create(string databaseGuid)
+        {
+            return new SnowflakeDatabaseContext(databaseGuid, _snowflakeClientDbConnectionStringBuilderFactory, _clientWarehouseService);
+        }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Strata.DecisionSupport.Biz.csproj b/src/Strata.DecisionSupport.Biz/Strata.DecisionSupport.Biz.csproj
new file mode 100644
index 0000000..60842c6
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Strata.DecisionSupport.Biz.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <CodeAnalysisRuleSet></CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>1701;1702</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Queries\**\*.sql" />
+    <EmbeddedResource Include="Queries\**\*.sql" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Riok.Mapperly" Version="4.3.0" />
+    <PackageReference Include="Strata.DataSchema.Client" Version="3.120.0" />
+    <PackageReference Include="Strata.DataSchema.Models" Version="3.120.0" />
+    <PackageReference Include="Strata.Schema.Client" Version="5.0.5" />
+    <PackageReference Include="Strata.SnowflakeLib" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Strata.ContinuousImprovement.Biz\Strata.ContinuousImprovement.Biz.csproj" />
+    <ProjectReference Include="..\Strata.DecisionSupport.Models\Strata.DecisionSupport.Models.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Strata.DecisionSupport.Biz/Utilities/ListExtensions.cs b/src/Strata.DecisionSupport.Biz/Utilities/ListExtensions.cs
new file mode 100644
index 0000000..156eb74
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Utilities/ListExtensions.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+namespace Strata.DecisionSupport.Biz.Utilities
+{
+    [ExcludeFromCodeCoverage]
+    public static class ListExtensions
+    {
+        public static bool IsEmpty<T>(this IEnumerable<T> items)
+            => items == null || !items.Any();
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Utilities/LoggerExtensions.cs b/src/Strata.DecisionSupport.Biz/Utilities/LoggerExtensions.cs
new file mode 100644
index 0000000..42bd391
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Utilities/LoggerExtensions.cs
@@ -0,0 +1,44 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.DecisionSupport.Biz.Utilities
+{
+    [ExcludeFromCodeCoverage]
+    public static class LoggerExtensions
+    {
+        internal static readonly string Microservice = "strata-continuousimprovement-";
+
+        public static void LogServiceError<T>(this ILogger<T> logger, Exception exception, string message = null, Dictionary<string, object> info = null)
+        {
+            if (logger == null) { return; }
+            if (exception.InnerException != null)
+            {
+                logger.LogServiceError(exception.InnerException, message, info);
+                return;
+            }
+            var dictionary = new Dictionary<string, object> {
+                { "service", $"{Microservice}{typeof(T).Name}" }
+                };
+            if (info != null)
+            {
+                dictionary.Add("information", info);
+            }
+            var msg = !string.IsNullOrEmpty(message)
+                ? message
+                : exception.InnerException?.Message ?? exception.Message;
+            using (logger.BeginScope(dictionary))
+                logger.LogError(exception.InnerException ?? exception, msg);
+        }
+
+        public static void LogServiceInformation<T>(this ILogger<T> logger, string message, Dictionary<string, object> dictionary)
+        {
+            if (logger == null) { return; }
+            dictionary.Add("service", $"{Microservice}{typeof(T).Name}");
+            using (logger.BeginScope(dictionary))
+                logger.LogInformation(message);
+        }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Utilities/MathExtensions.cs b/src/Strata.DecisionSupport.Biz/Utilities/MathExtensions.cs
new file mode 100644
index 0000000..480eca9
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Utilities/MathExtensions.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.DecisionSupport.Biz.Utilities
+{
+    public static class MathExtensions
+    {
+        /// <summary>
+        /// Calculate weighted average.  Will NOT throw dividebyzero exception.
+        /// </summary>
+        public static double WeightedAverage<T>(this IEnumerable<T> records, Func<T, double> value, Func<T, double> weight)
+        {
+            // http://stackoverflow.com/questions/2714639/weighted-average-with-linq
+            records = records as IList<T> ?? records.ToList();
+
+            var weightSum = records.Sum(weight);
+
+            // ReSharper disable once CompareOfFloatsByEqualityOperator
+            // we will return 0 instead of throwing divide by zero
+            if (weightSum == 0) return 0;
+
+            var weightedValueSum = records.Sum(x => value(x) * weight(x));
+            return weightedValueSum / weightSum;
+        }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Utilities/ObjectExtensions.cs b/src/Strata.DecisionSupport.Biz/Utilities/ObjectExtensions.cs
new file mode 100644
index 0000000..9d06a9c
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Utilities/ObjectExtensions.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.DecisionSupport.Biz.Utilities
+{
+    public static class ObjectExtensions
+    {
+        public static bool In<TValue>(this TValue compareToValue, IEnumerable<TValue> compareValues)
+        {
+            if (compareToValue == null)
+            {
+                throw new ArgumentNullException("compareToValue");
+            }
+
+            if (compareValues == null)
+            {
+                throw new ArgumentNullException("compareValues");
+            }
+
+            return compareValues.Contains(compareToValue);
+        }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/Utilities/ResourceExtensions.cs b/src/Strata.DecisionSupport.Biz/Utilities/ResourceExtensions.cs
new file mode 100644
index 0000000..98e3886
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/Utilities/ResourceExtensions.cs
@@ -0,0 +1,45 @@
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace Strata.DecisionSupport.Biz.Utilities
+{
+    public static class ResourceExtensions
+    {
+        public static string ReadResource(this Assembly assembly, string resourceName)
+        {
+            // Determine path
+            string resourcePath = resourceName;
+            // Format: "{Namespace}.{Folder}.{filename}.{Extension}"
+            if (!resourceName.StartsWith("Strata.DecisionSupport.Biz"))
+            {
+                var regex = new Regex(@"Strata\.DecisionSupport\.Biz\..*\." + resourceName, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+                resourcePath = assembly.GetManifestResourceNames()
+                    .SingleOrDefault(str => regex.IsMatch(str));
+            }
+            if (resourcePath is null) return null;
+            using Stream stream = assembly.GetManifestResourceStream(resourcePath)!;
+            using StreamReader reader = new(stream);
+            return reader.ReadToEnd();
+        }
+
+        public static async Task<string> ReadResourceAsync(this Assembly assembly, string resourceName)
+        {
+            // Determine path
+            string resourcePath = resourceName;
+            // Format: "{ Namespace}.{Folder}.{filename}.{Extension}"
+            if (!resourceName.StartsWith("Strata.DecisionSupport.Biz"))
+            {
+                resourcePath = assembly.GetManifestResourceNames()
+                    .SingleOrDefault(str => str.EndsWith(resourceName));
+            }
+            if (resourcePath is null) return null;
+            using Stream stream = assembly.GetManifestResourceStream(resourcePath)!;
+            using StreamReader reader = new(stream);
+            return await reader.ReadToEndAsync();
+        }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Biz/runtimeconfig.template.json b/src/Strata.DecisionSupport.Biz/runtimeconfig.template.json
new file mode 100644
index 0000000..9cbaf60
--- /dev/null
+++ b/src/Strata.DecisionSupport.Biz/runtimeconfig.template.json
@@ -0,0 +1,5 @@
+{
+  "configProperties": {
+    "System.Drawing.EnableUnixSupport":  true
+  }
+}
diff --git a/src/Strata.DecisionSupport.Models/Encounters/DepartmentEncounterUnitOfService.cs b/src/Strata.DecisionSupport.Models/Encounters/DepartmentEncounterUnitOfService.cs
new file mode 100644
index 0000000..471f3b1
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Encounters/DepartmentEncounterUnitOfService.cs
@@ -0,0 +1,11 @@
+namespace Strata.DecisionSupport.Models.Encounters
+{
+    public class DepartmentEncounterUnitOfService
+    {
+        public int DepartmentId { get; set; }
+        public long EncounterId { get; set; }
+        public string CostDriver { get; set; }
+        public int EntityId { get; set; }
+        public double Uos { get; set; }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Encounters/EncounterCostInfo.cs b/src/Strata.DecisionSupport.Models/Encounters/EncounterCostInfo.cs
new file mode 100644
index 0000000..fde3723
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Encounters/EncounterCostInfo.cs
@@ -0,0 +1,31 @@
+namespace Strata.DecisionSupport.Models.Encounters
+{
+    public class EncounterCostInfo
+    {
+        public long EncounterId { get; set; }
+        public int EntityId { get; set; }
+        public int ChargeCodeId { get; set; }
+        public string CostDriver { get; set; }
+
+        public double UnitsOfService { get; set; }
+
+        public double VariableDirectUnitCost { get; set; }
+        public double VariableIndirectUnitCost { get; set; }
+        public double FixedDirectUnitCost { get; set; }
+        public double FixedIndirectUnitCost { get; set; }
+
+        public double VariableDirectCost { get; set; }
+        public double VariableIndirectCost { get; set; }
+        public double FixedDirectCost { get; set; }
+        public double FixedIndirectCost { get; set; }
+
+        public double VariableUnitCost => VariableDirectUnitCost + VariableIndirectUnitCost;
+        public double FixedUnitCost => FixedDirectUnitCost + FixedIndirectUnitCost;
+        public double TotalUnitCost => VariableUnitCost + FixedUnitCost;
+
+        public double VariableCost => VariableDirectCost + VariableIndirectCost;
+        public double FixedCost => FixedDirectCost + FixedIndirectCost;
+        public double TotalCost => VariableCost + FixedCost;
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Encounters/EncounterInfo.cs b/src/Strata.DecisionSupport.Models/Encounters/EncounterInfo.cs
new file mode 100644
index 0000000..8c50bc2
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Encounters/EncounterInfo.cs
@@ -0,0 +1,40 @@
+namespace Strata.DecisionSupport.Models.Encounters
+{
+    public class EncounterInfo : IEncounterInfo
+    {
+        public string EncounterRecordNumber { get; set; }
+        public long EncounterId { get; set; }
+        public int PhysicianId { get; set; }
+        public string PhysicianName { get; set; }
+        public Guid PhysicianGuid { get; set; }
+        public int PhysicianGroupAffiliationId { get; set; }
+        public string PhysicianGroupAffiliation { get; set; }
+        public Guid PhysicianGroupAffiliationGuid { get; set; }
+        public string PhysicianSpecialty { get; set; }
+        public int PhysicianSpecialtyId { get; set; }
+        public Guid PhysicianSpecialtyGuid { get; set; }
+        public int? CaseTypeFamilyId { get; set; }
+        public int? ClinicalIndicatorId { get; set; }
+        public int PatientTypeRollupId { get; set; }
+        public string PatientTypeRollupType { get; set; }
+        public double LengthOfStay { get; set; }
+        public int EntityId { get; set; }
+        public bool IsQVIEncounter { get; set; }
+        public string CCMCCCategory { get; set; }
+        public string ROM { get; set; }
+        public string SOI { get; set; }
+        public string CPTCode { get; set; }
+        public int AgeCohortId { get; set; }
+        public int ServiceLineId { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+
+        public EncounterInfo()
+        {
+            EncounterRecordNumber = string.Empty;
+            PhysicianName = string.Empty;
+            PhysicianGroupAffiliation = string.Empty;
+            PhysicianSpecialty = string.Empty;
+            PatientTypeRollupType = string.Empty;
+        }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Encounters/EncounterUnitOfService.cs b/src/Strata.DecisionSupport.Models/Encounters/EncounterUnitOfService.cs
new file mode 100644
index 0000000..b60c44a
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Encounters/EncounterUnitOfService.cs
@@ -0,0 +1,10 @@
+namespace Strata.DecisionSupport.Models.Encounters
+{
+    public class EncounterUnitOfService
+    {
+        public long EncounterId { get; set; }
+        public double Uos { get; set; }
+        public double ObservationUnitsOfService { get; set; }
+        public double NonObservationUnitsOfService { get; set; }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Encounters/IEncounterInfo.cs b/src/Strata.DecisionSupport.Models/Encounters/IEncounterInfo.cs
new file mode 100644
index 0000000..2923161
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Encounters/IEncounterInfo.cs
@@ -0,0 +1,32 @@
+
+namespace Strata.DecisionSupport.Models.Encounters
+{
+    public interface IEncounterInfo
+    {
+        int AgeCohortId { get; set; }
+        int? CaseTypeFamilyId { get; set; }
+        string CCMCCCategory { get; set; }
+        int? ClinicalIndicatorId { get; set; }
+        string CPTCode { get; set; }
+        DateTime DischargeDateTime { get; set; }
+        long EncounterId { get; set; }
+        string EncounterRecordNumber { get; set; }
+        int EntityId { get; set; }
+        bool IsQVIEncounter { get; set; }
+        double LengthOfStay { get; set; }
+        int PatientTypeRollupId { get; set; }
+        string PatientTypeRollupType { get; set; }
+        string PhysicianGroupAffiliation { get; set; }
+        Guid PhysicianGroupAffiliationGuid { get; set; }
+        int PhysicianGroupAffiliationId { get; set; }
+        Guid PhysicianGuid { get; set; }
+        int PhysicianId { get; set; }
+        string PhysicianName { get; set; }
+        string PhysicianSpecialty { get; set; }
+        Guid PhysicianSpecialtyGuid { get; set; }
+        int PhysicianSpecialtyId { get; set; }
+        string ROM { get; set; }
+        string SOI { get; set; }
+        int ServiceLineId { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Models/Jazz/APRDRGEncounterInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/APRDRGEncounterInfo.cs
new file mode 100644
index 0000000..14f79f5
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/APRDRGEncounterInfo.cs
@@ -0,0 +1,48 @@
+using Strata.DecisionSupport.Models.Encounters;
+
+namespace Strata.DecisionSupport.Models.Jazz
+{
+#pragma warning disable S101 // Types should be named in PascalCase
+    public class APRDRGEncounterInfo : IJazzAPRDRGEncounterInfo
+#pragma warning restore S101 // Types should be named in PascalCase
+    {
+        // ReSharper disable UnusedAutoPropertyAccessor.Local
+        public string EncounterRecordNumber { get; set; }
+        public long EncounterId { get; set; }
+        public int PhysicianID { get; set; }
+        public string PhysicianName { get; set; }
+        public Guid PhysicianGUID { get; set; }
+        public string PhysicianGroupAffiliation { get; set; }
+        public int PhysicianGroupAffiliationID { get; set; }
+        public Guid PhysicianGroupAffiliationGUID { get; set; }
+        public string PhysicianSpecialty { get; set; }
+        public int PhysicianSpecialtyID { get; set; }
+        public Guid PhysicianSpecialtyGUID { get; set; }
+        public int CaseTypeFamilyID { get; set; }
+        public int PatientTypeRollupID { get; set; }
+        public string PatientTypeRollupType { get; set; }
+        public double LengthOfStay { get; set; }
+        public int EntityID { get; set; }
+        public bool IsQVIEncounter { get; set; }
+        public string ROM { get; set; }
+        public string SOI { get; set; }
+        public string CPTCode { get; set; }
+        public int AgeCohortID { get; set; }
+        public int ServiceLineID { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+        // ReSharper restore UnusedAutoPropertyAccessor.Local
+
+        public APRDRGEncounterInfo()
+        {
+            ROM = string.Empty;
+            SOI = string.Empty;
+            EncounterRecordNumber = string.Empty;
+            PhysicianName = string.Empty;
+            PhysicianGroupAffiliation = string.Empty;
+            PhysicianSpecialty = string.Empty;
+            PatientTypeRollupType = string.Empty;
+            CPTCode = string.Empty;
+        }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/AllChargeInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/AllChargeInfo.cs
new file mode 100644
index 0000000..336ab6f
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/AllChargeInfo.cs
@@ -0,0 +1,20 @@
+namespace Strata.DecisionSupport.Models.Jazz
+{
+    public class AllChargeInfo
+    {
+        public int RowID { get; set; }
+        public int ChargeCodeId { get; set; }
+        public string Name { get; set; }
+        public string ChargeCode { get; set; }
+        public string Description { get; set; }
+        public bool IsPatientSpecific { get; set; }
+        public string CostDriver { get; set; }
+        public string Rollup { get; set; }
+        public bool IsBaseline { get; set; }
+        public double Quantity { get; set; }
+        public double AvgVariableDirectCost { get; set; }
+        public double AvgVariableIndirectCost { get; set; }
+        public double AvgFixedDirectCost { get; set; }
+        public double AvgFixedIndirectCost { get; set; }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/CPTCodeEncounterInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/CPTCodeEncounterInfo.cs
new file mode 100644
index 0000000..1478aed
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/CPTCodeEncounterInfo.cs
@@ -0,0 +1,40 @@
+using Strata.DecisionSupport.Models.Encounters;
+
+namespace Strata.DecisionSupport.Models.Jazz
+{
+#pragma warning disable S101 // Types should be named in PascalCase
+    public class CPTCodeEncounterInfo : IJazzEncounterInfo
+#pragma warning restore S101 // Types should be named in PascalCase
+    {
+        // ReSharper disable UnusedAutoPropertyAccessor.Local
+        public string EncounterRecordNumber { get; set; }
+        public long EncounterId { get; set; }
+        public int PhysicianID { get; set; }
+        public string PhysicianName { get; set; }
+        public Guid PhysicianGUID { get; set; }
+        public string PhysicianGroupAffiliation { get; set; }
+        public int PhysicianGroupAffiliationID { get; set; }
+        public Guid PhysicianGroupAffiliationGUID { get; set; }
+        public string PhysicianSpecialty { get; set; }
+        public int PhysicianSpecialtyID { get; set; }
+        public Guid PhysicianSpecialtyGUID { get; set; }
+        public int CaseTypeFamilyID { get; set; }
+        public int PatientTypeRollupID { get; set; }
+        public string PatientTypeRollupType { get; set; }
+        public double LengthOfStay { get; set; }
+        public int EntityID { get; set; }
+        public bool IsQVIEncounter { get; set; }
+        public string CPTCode { get; set; }
+        public int AgeCohortID { get; set; }
+        public int ServiceLineID { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+        // ReSharper restore UnusedAutoPropertyAccessor.Local
+
+        public CPTCodeEncounterInfo()
+        {
+            EncounterRecordNumber = string.Empty;
+            PhysicianName = string.Empty;
+        }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/ChargeInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/ChargeInfo.cs
new file mode 100644
index 0000000..0127eb9
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/ChargeInfo.cs
@@ -0,0 +1,20 @@
+namespace Strata.DecisionSupport.Models.Jazz
+{
+    public class ChargeInfo
+    {
+        public int RowID { get; set; }
+        public int ChargeCodeId { get; set; }
+        public string Name { get; set; }
+        public string ChargeCode { get; set; }
+        public string Description { get; set; }
+        public bool IsPatientSpecific { get; set; }
+        public string CostDriver { get; set; }
+        public string Rollup { get; set; }
+        public bool IsBaseline { get; set; }
+        public double AvgVariableDirectCost { get; set; }
+        public double AvgVariableIndirectCost { get; set; }
+        public double AvgFixedDirectCost { get; set; }
+        public double AvgFixedIndirectCost { get; set; }
+        public bool CCICostOverride { get; set; } = false;
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/EncounterChargeInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/EncounterChargeInfo.cs
new file mode 100644
index 0000000..d63dce8
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/EncounterChargeInfo.cs
@@ -0,0 +1,47 @@
+namespace Strata.DecisionSupport.Models.Jazz
+{
+    public class EncounterChargeInfo
+    {
+        public Guid OpportunityGuid { get; set; }
+        public long EncounterId { get; set; }
+        public string EncounterRecordNumber { get; set; }
+        public int ChargeCodeId { get; set; }
+        public decimal Charge { get; set; }
+        public DateTime AdmitDateTime { get; set; }
+        public DateTime ServiceDateTime { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+
+        public int DischargeStatusId { get; set; }
+        public string DischargeStatusGroup { get; set; }
+        public string UnitType { get; set; }
+        public int PrimaryPhysicianId { get; set; }
+        public double UOS { get; set; }
+
+        public string Name { get; set; }
+        public string ChargeCode { get; set; }
+        public string Description { get; set; }
+        public string Manufacturer { get; set; }
+        public string Vendor { get; set; }
+        public string Rollup { get; set; }
+        public double? UnitsOfService { get; set; }
+        public string CostDriver { get; set; }
+
+        public double PatientSpecificVariableIndirectCost { get; set; }
+        public double PatientSpecificVariableDirectCost { get; set; }
+        public double PatientSpecificFixedIndirectCost { get; set; }
+        public double PatientSpecificFixedDirectCost { get; set; }
+
+        public double AvgVariableIndirectCost { get; set; }
+        public double AvgVariableDirectCost { get; set; }
+        public double AvgFixedIndirectCost { get; set; }
+        public double AvgFixedDirectCost { get; set; }
+
+        public Guid PhysicianGroupingGuid { get; set; }
+        public int PhysicianGroupingId { get; set; }
+        public string PhysicianGroupingName { get; set; }
+        public bool IsPatientSpecific { get; set; }
+
+        public bool IsBaseline { get; set; }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/ExplorationEncounterInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/ExplorationEncounterInfo.cs
new file mode 100644
index 0000000..c593a22
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/ExplorationEncounterInfo.cs
@@ -0,0 +1,26 @@
+using Strata.DecisionSupport.Models.Encounters;
+
+namespace Strata.DecisionSupport.Models.Jazz
+{
+    public class ExplorationEncounterInfo : IJazzExplorationEncounterInfo
+    {
+        public string EncounterRecordNumber { get; set; }
+        public long EncounterId { get; set; }
+        public int PhysicianID { get; set; }
+        public string PhysicianName { get; set; }
+        public Guid PhysicianGUID { get; set; }
+        public string PhysicianGroupAffiliation { get; set; }
+        public int PhysicianGroupAffiliationID { get; set; }
+        public Guid PhysicianGroupAffiliationGUID { get; set; }
+        public string PhysicianSpecialty { get; set; }
+        public int PhysicianSpecialtyID { get; set; }
+        public Guid PhysicianSpecialtyGUID { get; set; }
+        public double LengthOfStay { get; set; }
+        public int EntityID { get; set; }
+        public bool IsQVIEncounter { get; set; }
+        public int ServiceLineID { get; set; }
+        public int AgeCohortID { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/ExplorationPopulationInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/ExplorationPopulationInfo.cs
new file mode 100644
index 0000000..298cd73
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/ExplorationPopulationInfo.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.DecisionSupport.Models.Jazz
+{
+    public class ExplorationPopulationInfo : IExplorationPopulationInfo
+    {
+        public long ExplorationPopulationId { get; set; }
+        public string Name { get; set; }
+        public int CaseTypeFamilyId { get; set; }
+        public string CostDriver { get; set; }
+        public short LosExclusionType { get; set; }
+        public decimal LosExclusionValue { get; set; }
+        public short CostExclusionType { get; set; }
+        public decimal CostExclusionValue { get; set; }
+        public string FiltersJSON { get; set; }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/IExplorationPopulationInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/IExplorationPopulationInfo.cs
new file mode 100644
index 0000000..00bfb6a
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/IExplorationPopulationInfo.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.DecisionSupport.Models.Jazz
+{
+    public interface IExplorationPopulationInfo
+    {
+        long ExplorationPopulationId { get; }
+        string Name { get; }
+        int CaseTypeFamilyId { get; }
+        string CostDriver { get; }
+        short LosExclusionType { get; }
+        decimal LosExclusionValue { get; }
+        short CostExclusionType { get; }
+        decimal CostExclusionValue { get; }
+        string FiltersJSON { get; }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/IJazzEncounterInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/IJazzEncounterInfo.cs
new file mode 100644
index 0000000..a6d517c
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/IJazzEncounterInfo.cs
@@ -0,0 +1,52 @@
+
+namespace Strata.DecisionSupport.Models.Encounters
+{
+    public interface IJazzEncounterInfo
+    {
+        int AgeCohortID { get; set; }
+        DateTime DischargeDateTime { get; set; }
+        long EncounterId { get; set; }
+        string EncounterRecordNumber { get; set; }
+        int EntityID { get; set; }
+        bool IsQVIEncounter { get; set; }
+        double LengthOfStay { get; set; }
+        string PhysicianGroupAffiliation { get; set; }
+        Guid PhysicianGroupAffiliationGUID { get; set; }
+        int PhysicianGroupAffiliationID { get; set; }
+        Guid PhysicianGUID { get; set; }
+        int PhysicianID { get; set; }
+        string PhysicianName { get; set; }
+        string PhysicianSpecialty { get; set; }
+        Guid PhysicianSpecialtyGUID { get; set; }
+        int PhysicianSpecialtyID { get; set; }
+        int ServiceLineID { get; set; }
+    }
+
+    public interface IJazzDRGEncounterInfo : IJazzEncounterInfo
+    {
+        int CaseTypeFamilyID { get; set; }
+        string CPTCode { get; set; }
+        int PatientTypeRollupID { get; set; }
+        string PatientTypeRollupType { get; set; }
+    }
+
+    public interface IJazzMSDRGEncounterInfo : IJazzDRGEncounterInfo
+    {
+        string CCMCCCategory { get; set; }
+    }
+
+    public interface IJazzAPRDRGEncounterInfo : IJazzDRGEncounterInfo
+    {
+        string ROM { get; set; }
+        string SOI { get; set; }
+    }
+
+    public interface IJazzPatientPopulationEncounterInfo : IJazzEncounterInfo
+    {
+        int ClinicalIndicatorID { get; set; }
+    }
+
+    public interface IJazzExplorationEncounterInfo : IJazzEncounterInfo
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Models/Jazz/LOSOpportunityInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/LOSOpportunityInfo.cs
new file mode 100644
index 0000000..54a5043
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/LOSOpportunityInfo.cs
@@ -0,0 +1,24 @@
+
+namespace Strata.DecisionSupport.Models.Jazz
+{
+#pragma warning disable S101 // Types should be named in PascalCase
+    public class LOSOpportunityInfo
+#pragma warning restore S101 // Types should be named in PascalCase
+    {
+        public long EncounterId { get; set; }
+        public string EncounterRecordNumber { get; set; }
+        public DateTime AdmitDateTime { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+        public int DischargeStatusId { get; set; }
+        public int PrimaryPhysicianId { get; set; }
+        public string DischargeStatusGroup { get; set; }
+        public string UnitType { get; set; }
+        public double UOS { get; set; }
+        public int ROM { get; set; }
+        public int SOI { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        public Guid PhysicianGroupingGuid { get; set; }
+        public int PhysicianGroupingId { get; set; }
+        public string PhysicianGroupingName { get; set; }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/MSDRGEncounterInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/MSDRGEncounterInfo.cs
new file mode 100644
index 0000000..a3407aa
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/MSDRGEncounterInfo.cs
@@ -0,0 +1,45 @@
+using Strata.DecisionSupport.Models.Encounters;
+
+namespace Strata.DecisionSupport.Models.Jazz
+{
+#pragma warning disable S101 // Types should be named in PascalCase
+    public class MSDRGEncounterInfo : IJazzMSDRGEncounterInfo
+#pragma warning restore S101 // Types should be named in PascalCase
+    {
+        // ReSharper disable UnusedAutoPropertyAccessor.Local
+        public string EncounterRecordNumber { get; set; }
+        public long EncounterId { get; set; }
+        public int PhysicianID { get; set; }
+        public string PhysicianName { get; set; }
+        public Guid PhysicianGUID { get; set; }
+        public string PhysicianGroupAffiliation { get; set; }
+        public int PhysicianGroupAffiliationID { get; set; }
+        public Guid PhysicianGroupAffiliationGUID { get; set; }
+        public string PhysicianSpecialty { get; set; }
+        public int PhysicianSpecialtyID { get; set; }
+        public Guid PhysicianSpecialtyGUID { get; set; }
+        public int CaseTypeFamilyID { get; set; }
+        public int PatientTypeRollupID { get; set; }
+        public string PatientTypeRollupType { get; set; }
+        public double LengthOfStay { get; set; }
+        public int EntityID { get; set; }
+        public bool IsQVIEncounter { get; set; }
+        public string CCMCCCategory { get; set; }
+        public string CPTCode { get; set; }
+        public int AgeCohortID { get; set; }
+        public int ServiceLineID { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+        // ReSharper restore UnusedAutoPropertyAccessor.Local
+
+        public MSDRGEncounterInfo()
+        {
+            EncounterRecordNumber = string.Empty;
+            PhysicianName = string.Empty;
+            PhysicianGroupAffiliation = string.Empty;
+            PhysicianSpecialty = string.Empty;
+            PatientTypeRollupType = string.Empty;
+            CCMCCCategory = string.Empty;
+            CPTCode = string.Empty;
+        }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/OpportunityTypeWorkbookClientInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/OpportunityTypeWorkbookClientInfo.cs
new file mode 100644
index 0000000..edcae41
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/OpportunityTypeWorkbookClientInfo.cs
@@ -0,0 +1,10 @@
+namespace Strata.DecisionSupport.Models.Jazz
+{
+    public class OpportunityTypeWorkbookClientInfo
+    {
+        public int StrataId { get; set; }
+        public int OpportunityType { get; set; }
+        public int WorkbookId { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/OpportunityWorkbookClientInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/OpportunityWorkbookClientInfo.cs
new file mode 100644
index 0000000..241b6dc
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/OpportunityWorkbookClientInfo.cs
@@ -0,0 +1,10 @@
+namespace Strata.DecisionSupport.Models.Jazz
+{
+    public class OpportunityWorkbookClientInfo
+    {
+        public int StrataId { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        public int WorkbookId { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/PatientPopulationEncounterInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/PatientPopulationEncounterInfo.cs
new file mode 100644
index 0000000..e871a79
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/PatientPopulationEncounterInfo.cs
@@ -0,0 +1,27 @@
+using Strata.DecisionSupport.Models.Encounters;
+
+namespace Strata.DecisionSupport.Models.Jazz
+{
+    public class PatientPopulationEncounterInfo : IJazzPatientPopulationEncounterInfo
+    {
+        public string EncounterRecordNumber { get; set; }
+        public long EncounterId { get; set; }
+        public int PhysicianID { get; set; }
+        public string PhysicianName { get; set; }
+        public Guid PhysicianGUID { get; set; }
+        public string PhysicianGroupAffiliation { get; set; }
+        public int PhysicianGroupAffiliationID { get; set; }
+        public Guid PhysicianGroupAffiliationGUID { get; set; }
+        public string PhysicianSpecialty { get; set; }
+        public int PhysicianSpecialtyID { get; set; }
+        public Guid PhysicianSpecialtyGUID { get; set; }
+        public double LengthOfStay { get; set; }
+        public int EntityID { get; set; }
+        public bool IsQVIEncounter { get; set; }
+        public int ServiceLineID { get; set; }
+        public int AgeCohortID { get; set; }
+        public int ClinicalIndicatorID { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/VariationEncounterChargeInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/VariationEncounterChargeInfo.cs
new file mode 100644
index 0000000..9151ab0
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/VariationEncounterChargeInfo.cs
@@ -0,0 +1,47 @@
+namespace Strata.DecisionSupport.Models.Jazz
+{
+    public class VariationEncounterChargeInfo
+    {
+        public Guid OpportunityGuid { get; set; }
+        public long EncounterId { get; set; }
+        public string EncounterRecordNumber { get; set; }
+        public int ChargeCodeId { get; set; }
+        public decimal Charge { get; set; }
+        public DateTime AdmitDateTime { get; set; }
+        public DateTime ServiceDateTime { get; set; }
+        public DateTime DischargeDateTime { get; set; }
+
+        public int DischargeStatusId { get; set; }
+        public string DischargeStatusGroup { get; set; }
+        public string UnitType { get; set; }
+        public int PrimaryPhysicianId { get; set; }
+        public double UOS { get; set; }
+
+        public string Name { get; set; }
+        public string ChargeCode { get; set; }
+        public string Description { get; set; }
+        public string Manufacturer { get; set; }
+        public string Vendor { get; set; }
+        public string Rollup { get; set; }
+        public double? UnitsOfService { get; set; }
+        public string CostDriver { get; set; }
+
+        public double PatientSpecificVariableIndirectCost { get; set; }
+        public double PatientSpecificVariableDirectCost { get; set; }
+        public double PatientSpecificFixedIndirectCost { get; set; }
+        public double PatientSpecificFixedDirectCost { get; set; }
+
+        public double AvgVariableIndirectCost { get; set; }
+        public double AvgVariableDirectCost { get; set; }
+        public double AvgFixedIndirectCost { get; set; }
+        public double AvgFixedDirectCost { get; set; }
+
+        public Guid PhysicianGroupingGuid { get; set; }
+        public int PhysicianGroupingId { get; set; }
+        public string PhysicianGroupingName { get; set; }
+        public bool IsPatientSpecific { get; set; }
+
+        public bool IsBaseline { get; set; }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Jazz/WorkbookClientInfo.cs b/src/Strata.DecisionSupport.Models/Jazz/WorkbookClientInfo.cs
new file mode 100644
index 0000000..b5566be
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Jazz/WorkbookClientInfo.cs
@@ -0,0 +1,26 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Runtime.Serialization;
+
+namespace Strata.DecisionSupport.Models.Jazz
+{
+    public class WorkbookClientInfo
+    {
+        public int StrataId { get; set; }
+        public int WorkbookId { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public int DefaultDataSourceId { get; set; }
+        public DateTimeOffset CreatedDate { get; set; }
+        public DateTimeOffset UpdatedDate { get; set; }
+        public DateTimeOffset? LastOpenedDate { get; set; }
+        public Guid CreatedByUserGuid { get; set; }
+        [IgnoreDataMember]
+        public string CreatedByUserName { get; set; }
+        public Guid UpdatedByUserGuid { get; set; }
+        [IgnoreDataMember]
+        public string UpdatedByUserName { get; set; }
+        public int FolderId { get; set; }
+        public bool IsHidden { get; set; }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Queries/AllChargeQueryInfo.cs b/src/Strata.DecisionSupport.Models/Queries/AllChargeQueryInfo.cs
new file mode 100644
index 0000000..1062a1c
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Queries/AllChargeQueryInfo.cs
@@ -0,0 +1,22 @@
+namespace Strata.DecisionSupport.Models.Queries
+{
+    public class AllChargeQueryInfo
+    {
+        public Guid OpportunityGuid { get; set; }
+        public IList<int> ChargeCodeIds { get; set; }
+
+        public AllChargeQueryInfo()
+        {
+            OpportunityGuid = Guid.Empty;
+            ChargeCodeIds = new List<int>();
+        }
+
+        public AllChargeQueryInfo(Guid opportunityGuid, IList<int> chargeCodeIds)
+        {
+            OpportunityGuid = opportunityGuid;
+            ChargeCodeIds = chargeCodeIds;
+        }
+
+    }
+}
+
diff --git a/src/Strata.DecisionSupport.Models/Queries/ChargeQueryInfo.cs b/src/Strata.DecisionSupport.Models/Queries/ChargeQueryInfo.cs
new file mode 100644
index 0000000..6a9db27
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Queries/ChargeQueryInfo.cs
@@ -0,0 +1,27 @@
+namespace Strata.DecisionSupport.Models.Queries
+{
+    public class ChargeQueryInfo
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public int EntityId { get; set; }
+        public IEnumerable<int> ChargeCodeIds { get; set; }
+
+        public Guid OpportunityGuid { get; set; }
+
+        public ChargeQueryInfo()
+        {
+            ConfigurationGuid = Guid.Empty;
+            ChargeCodeIds = new List<int>();
+            OpportunityGuid = Guid.Empty;
+        }
+
+        public ChargeQueryInfo(Guid configurationGuid, int entityId, IEnumerable<int> chargeCodeIds, Guid opportunityGuid)
+        {
+            ConfigurationGuid = configurationGuid;
+            EntityId = entityId;
+            ChargeCodeIds = chargeCodeIds;
+            OpportunityGuid = opportunityGuid;
+        }
+    }
+}
+
diff --git a/src/Strata.DecisionSupport.Models/Queries/DepartmentEncounterUnitOfServiceQueryInfo.cs b/src/Strata.DecisionSupport.Models/Queries/DepartmentEncounterUnitOfServiceQueryInfo.cs
new file mode 100644
index 0000000..2933cb7
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Queries/DepartmentEncounterUnitOfServiceQueryInfo.cs
@@ -0,0 +1,24 @@
+namespace Strata.DecisionSupport.Models.Queries
+{
+    public class DepartmentEncounterUnitOfServiceQueryInfo
+    {
+        public string DepartmentRollupGlobalId { get; set; }
+        public double ObservationUnitsDivisor { get; set; }
+        public IEnumerable<long> EncounterIds { get; set; }
+
+        public DepartmentEncounterUnitOfServiceQueryInfo()
+        {
+            DepartmentRollupGlobalId = "";
+            ObservationUnitsDivisor = 0d;
+            EncounterIds = Enumerable.Empty<long>();
+        }
+
+        public DepartmentEncounterUnitOfServiceQueryInfo(string departmentRollupGlobalId, double observationUnitsDivisor, IEnumerable<long> encounterIds)
+        {
+            DepartmentRollupGlobalId = departmentRollupGlobalId;
+            ObservationUnitsDivisor = observationUnitsDivisor;
+            EncounterIds = encounterIds;
+        }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Queries/EncounterChargeQueryInfo.cs b/src/Strata.DecisionSupport.Models/Queries/EncounterChargeQueryInfo.cs
new file mode 100644
index 0000000..dba4b67
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Queries/EncounterChargeQueryInfo.cs
@@ -0,0 +1,51 @@
+namespace Strata.DecisionSupport.Models.Queries
+{
+    public class EncounterChargeQueryInfo : Paginated
+    {
+        public bool HasManufacturerClientDSS { get; set; }
+        public bool IsManufacturerInferred { get; set; }
+        public bool HasSupplyClientDSS { get; set; }
+        public bool IsSupplyInferred { get; set; }
+        public bool IsUsingCustomEntityDimension { get; set; }
+        public bool? IsBaseline { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        public IList<int> ChargeCodeIds { get; set; }
+
+        internal bool[] HasIsBaseline => IsBaseline.HasValue ? new[] { IsBaseline.Value } : new[] { true, false };
+
+        public EncounterChargeQueryInfo()
+            : base()
+        {
+            HasManufacturerClientDSS = true;
+            IsManufacturerInferred = true;
+            HasSupplyClientDSS = true;
+            IsSupplyInferred = true;
+            IsUsingCustomEntityDimension = false;
+            IsBaseline = true;
+            OpportunityGuid = Guid.Empty;
+            ChargeCodeIds = new List<int>();
+        }
+
+#pragma warning disable S107 // Methods should not have too many parameters
+        public EncounterChargeQueryInfo(bool hasManufacturerClientDSS, bool isManufacturerInferred,
+            bool hasSupplyClientDSS, bool isSupplyInferred, bool isUsingCustomEntityDimension,
+            bool? isBaseline,
+            Guid opportunityGuid,
+            IList<int> chargeCodeIds,
+            int first = 1, int rows = 1000)
+            : base(first, rows)
+#pragma warning restore S107 // Methods should not have too many parameters
+        {
+            HasManufacturerClientDSS = hasManufacturerClientDSS;
+            IsManufacturerInferred = isManufacturerInferred;
+            HasSupplyClientDSS = hasSupplyClientDSS;
+            IsSupplyInferred = isSupplyInferred;
+            IsUsingCustomEntityDimension = isUsingCustomEntityDimension;
+            IsBaseline = isBaseline;
+            OpportunityGuid = opportunityGuid;
+            ChargeCodeIds = chargeCodeIds;
+        }
+
+    }
+}
+
diff --git a/src/Strata.DecisionSupport.Models/Queries/EncounterCostQueryInfo.cs b/src/Strata.DecisionSupport.Models/Queries/EncounterCostQueryInfo.cs
new file mode 100644
index 0000000..0d5ec35
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Queries/EncounterCostQueryInfo.cs
@@ -0,0 +1,31 @@
+namespace Strata.DecisionSupport.Models.Queries
+{
+    public class EncounterCostQueryInfo
+    {
+        public bool IsPatientSpecific { get; set; }
+        public string CostDriver { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public string DepartmentRollupGlobalId { get; set; }
+        public IEnumerable<long> EncounterIds { get; set; }
+
+        public EncounterCostQueryInfo()
+        {
+            IsPatientSpecific = false;
+            ConfigurationGuid = Guid.Empty;
+            CostDriver = string.Empty;
+            DepartmentRollupGlobalId = "";
+            EncounterIds = Enumerable.Empty<long>();
+        }
+
+        public EncounterCostQueryInfo(bool isPatientSpecific, Guid configurationGuid, string costDriver,
+            string departmentRollupGlobalId, IEnumerable<long> encounterIds)
+        {
+            IsPatientSpecific = isPatientSpecific;
+            ConfigurationGuid = configurationGuid;
+            CostDriver = costDriver;
+            DepartmentRollupGlobalId = departmentRollupGlobalId;
+            EncounterIds = encounterIds;
+        }
+    }
+
+}
diff --git a/src/Strata.DecisionSupport.Models/Queries/EncounterQueryInfo.cs b/src/Strata.DecisionSupport.Models/Queries/EncounterQueryInfo.cs
new file mode 100644
index 0000000..3810761
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Queries/EncounterQueryInfo.cs
@@ -0,0 +1,66 @@
+namespace Strata.DecisionSupport.Models.Queries
+{
+    public class EncounterQueryInfo
+    {
+        public CaseTypeCategory CaseTypeCategory { get; set; }
+        public int CaseTypeFamilyId { get; set; }
+        public DateTime StartDate { get; set; }
+        public DateTime EndDate { get; set; }
+        public string DepartmentRollupGlobalId { get; set; }
+        public Guid ServiceLineGuid { get; set; }
+        public IEnumerable<int> EntityIDs { get; set; }
+        public double ObservationUnitsDivisor { get; set; }
+
+        public EncounterQueryInfo()
+        {
+            CaseTypeCategory = CaseTypeCategory.MSDRG;
+            CaseTypeFamilyId = 0;
+            StartDate = DateTime.MinValue;
+            EndDate = DateTime.MinValue;
+            DepartmentRollupGlobalId = "";
+            ServiceLineGuid = Guid.Empty;
+            EntityIDs = Enumerable.Empty<int>();
+            ObservationUnitsDivisor = 0.0;
+        }
+
+        /// <summary>
+        /// Request encounter information by casetype and date range
+        /// </summary>
+        /// <param name="caseTypeCategory"></param>
+        /// <param name="caseTypeFamilyId"></param>
+        /// <param name="startDate"></param>
+        /// <param name="endDate"></param>
+        /// <param name="departmentRollupGlobalId"></param>
+        /// <param name="serviceLineGuid"></param>
+        /// <param name="observationUnitsDivisor"></param>
+        /// <param name="entityIds"></param>
+#pragma warning disable S107
+        public EncounterQueryInfo(
+            CaseTypeCategory caseTypeCategory,
+            int caseTypeFamilyId, DateTime startDate, DateTime endDate,
+            string departmentRollupGlobalId, Guid serviceLineGuid,
+            double observationUnitsDivisor,
+            IEnumerable<int> entityIds)
+#pragma warning restore S107
+        {
+            CaseTypeCategory = caseTypeCategory;
+            CaseTypeFamilyId = caseTypeFamilyId;
+            StartDate = startDate;
+            EndDate = endDate;
+            DepartmentRollupGlobalId = departmentRollupGlobalId;
+            ServiceLineGuid = serviceLineGuid;
+            ObservationUnitsDivisor = observationUnitsDivisor;
+            EntityIDs = entityIds;
+        }
+
+    }
+
+    public enum CaseTypeCategory
+    {
+        MSDRG = 0,
+        APRDRG = 1,
+        PatientPopulation = 2,
+        CPTCode = 3,
+        ExplorationPopulation = 4
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Queries/EncounterUnitOfServiceQueryInfo.cs b/src/Strata.DecisionSupport.Models/Queries/EncounterUnitOfServiceQueryInfo.cs
new file mode 100644
index 0000000..852f10f
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Queries/EncounterUnitOfServiceQueryInfo.cs
@@ -0,0 +1,21 @@
+namespace Strata.DecisionSupport.Models.Queries
+{
+    public class EncounterUnitOfServiceQueryInfo
+    {
+        public double ObservationUnitsDivisor { get; set; }
+        public IEnumerable<long> EncounterIds { get; set; }
+
+        public EncounterUnitOfServiceQueryInfo()
+        {
+            ObservationUnitsDivisor = 0.0;
+            EncounterIds = Enumerable.Empty<long>();
+        }
+
+        public EncounterUnitOfServiceQueryInfo(double observationUnitsDivisor, IEnumerable<long> encounterIds)
+        {
+            ObservationUnitsDivisor = observationUnitsDivisor;
+            EncounterIds = encounterIds;
+        }
+
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Queries/FromSelect.cs b/src/Strata.DecisionSupport.Models/Queries/FromSelect.cs
new file mode 100644
index 0000000..a741109
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Queries/FromSelect.cs
@@ -0,0 +1,18 @@
+namespace Strata.DecisionSupport.Models.Queries
+{
+    internal class FromSelect
+    {
+        public string From { get; set; }
+        public string Select { get; set; }
+        public FromSelect(string select)
+        {
+            From = "";
+            Select = select;
+        }
+        public FromSelect(string from, string select)
+            : this(select)
+        {
+            From = from;
+        }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Queries/IPaginated.cs b/src/Strata.DecisionSupport.Models/Queries/IPaginated.cs
new file mode 100644
index 0000000..f428606
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Queries/IPaginated.cs
@@ -0,0 +1,8 @@
+namespace Strata.DecisionSupport.Models.Queries
+{
+    public interface IPaginated
+    {
+        int First { get; set; }
+        int Rows { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Strata.DecisionSupport.Models/Queries/LOSOpportunityQueryInfo.cs b/src/Strata.DecisionSupport.Models/Queries/LOSOpportunityQueryInfo.cs
new file mode 100644
index 0000000..3542b50
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Queries/LOSOpportunityQueryInfo.cs
@@ -0,0 +1,34 @@
+
+namespace Strata.DecisionSupport.Models.Queries
+{
+    public class LOSOpportunityQueryInfo
+    {
+        public Guid OpportunityGuid { get; set; }
+        public double ObservationUnitsDivisor { get; set; }
+        public int CaseTypeId { get; set; }
+
+        public LOSOpportunityQueryInfo() { }
+
+        public LOSOpportunityQueryInfo(Guid opportunityGuid, double observationUnitsDivisor, int caseTypeId)
+            : this()
+        {
+            OpportunityGuid = opportunityGuid;
+            ObservationUnitsDivisor = observationUnitsDivisor;
+            CaseTypeId = caseTypeId;
+        }
+
+        public Dictionary<string, object> Dictionary() => new Dictionary<string, object>
+        {
+            { nameof(OpportunityGuid), OpportunityGuid },
+            { nameof(ObservationUnitsDivisor), ObservationUnitsDivisor },
+            { nameof(CaseTypeId), CaseTypeId }
+        };
+
+        public dynamic Parameters() => new
+        {
+            OpportunityGuid,
+            ObservationUnitsDivisor,
+            CaseTypeId
+        };
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Queries/Paginated.cs b/src/Strata.DecisionSupport.Models/Queries/Paginated.cs
new file mode 100644
index 0000000..c05cfcc
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Queries/Paginated.cs
@@ -0,0 +1,16 @@
+namespace Strata.DecisionSupport.Models.Queries
+{
+    public class Paginated : IPaginated
+    {
+        public int First { get; set; }
+        public int Rows { get; set; }
+
+        public Paginated(int first = 1, int rows = 1000)
+        {
+            if (first <= 0)
+                throw new ArgumentOutOfRangeException(nameof(first), $"{nameof(first)} must be greater than 0");
+            First = first - 1;
+            Rows = rows;
+        }
+    }
+}
diff --git a/src/Strata.DecisionSupport.Models/Queries/VariationEncounterChargeQueryInfo.cs b/src/Strata.DecisionSupport.Models/Queries/VariationEncounterChargeQueryInfo.cs
new file mode 100644
index 0000000..cc68fe9
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Queries/VariationEncounterChargeQueryInfo.cs
@@ -0,0 +1,48 @@
+namespace Strata.DecisionSupport.Models.Queries
+{
+    public class VariationEncounterChargeQueryInfo : Paginated
+    {
+        public bool HasManufacturerClientDSS { get; set; }
+        public bool IsManufacturerInferred { get; set; }
+        public bool HasSupplyClientDSS { get; set; }
+        public bool IsSupplyInferred { get; set; }
+        public bool IsUsingCustomEntityDimension { get; set; }
+        public bool? IsBaseline { get; set; }
+        public IEnumerable<Guid> OpportunityGuids { get; set; }
+        public IList<int> ChargeCodeIds { get; set; }
+
+        public VariationEncounterChargeQueryInfo()
+            : base()
+        {
+            HasManufacturerClientDSS = true;
+            IsManufacturerInferred = true;
+            HasSupplyClientDSS = true;
+            IsSupplyInferred = true;
+            IsUsingCustomEntityDimension = false;
+            IsBaseline = true;
+            OpportunityGuids = new HashSet<Guid>();
+            ChargeCodeIds = new List<int>();
+        }
+
+#pragma warning disable S107 // Methods should not have too many parameters
+        public VariationEncounterChargeQueryInfo(bool hasManufacturerClientDSS, bool isManufacturerInferred,
+            bool hasSupplyClientDSS, bool isSupplyInferred, bool isUsingCustomEntityDimension,
+            bool? isBaseline,
+            IEnumerable<Guid> opportunityGuids,
+            IList<int> chargeCodeIds,
+            int first = 1, int rows = 1000)
+            : base(first, rows)
+#pragma warning restore S107 // Methods should not have too many parameters
+        {
+            HasManufacturerClientDSS = hasManufacturerClientDSS;
+            IsManufacturerInferred = isManufacturerInferred;
+            HasSupplyClientDSS = hasSupplyClientDSS;
+            IsSupplyInferred = isSupplyInferred;
+            IsUsingCustomEntityDimension = isUsingCustomEntityDimension;
+            IsBaseline = isBaseline;
+            OpportunityGuids = opportunityGuids;
+            ChargeCodeIds = chargeCodeIds;
+        }
+    }
+}
+
diff --git a/src/Strata.DecisionSupport.Models/Strata.DecisionSupport.Models.csproj b/src/Strata.DecisionSupport.Models/Strata.DecisionSupport.Models.csproj
new file mode 100644
index 0000000..257859b
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/Strata.DecisionSupport.Models.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>10.0</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Opportunities\" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Strata.DecisionSupport.Models/runtimeconfig.template.json b/src/Strata.DecisionSupport.Models/runtimeconfig.template.json
new file mode 100644
index 0000000..9cbaf60
--- /dev/null
+++ b/src/Strata.DecisionSupport.Models/runtimeconfig.template.json
@@ -0,0 +1,5 @@
+{
+  "configProperties": {
+    "System.Drawing.EnableUnixSupport":  true
+  }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/AddressInfo.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/AddressInfo.cs
new file mode 100644
index 0000000..781766b
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/AddressInfo.cs
@@ -0,0 +1,7 @@
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    internal class AddressInfo
+    {
+        public string BaseAddress { get; set; }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/AllOpportunityInfo.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/AllOpportunityInfo.cs
new file mode 100644
index 0000000..f9a44a1
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/AllOpportunityInfo.cs
@@ -0,0 +1,23 @@
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    public class AllOpportunityInfo
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public string CostDriver { get; set; }
+
+        public bool HasInitiative { get; set; }
+
+        public double IdentifiedSavings { get; set; }
+        public string Initiative { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public bool IsHidden { get; set; }
+        public string Name { get; set; }
+        public string Note { get; set; }
+        public Guid OpportunityGuid { get; set; }
+        public long OpportunityId { get; set; }
+        public string OpportunityKey { get; set; }
+        public int OpportunityType { get; set; }
+        public string OpportunityTypeName { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/CaseTypeFamilyInfo.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/CaseTypeFamilyInfo.cs
new file mode 100644
index 0000000..6426ea9
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/CaseTypeFamilyInfo.cs
@@ -0,0 +1,10 @@
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    public class CaseTypeFamilyInfo
+    {
+        public int CaseTypeFamilyId { get; set; }
+        public Guid CaseTypeFamilyGuid { get; set; }
+        public string Name { get; set; }
+        public string CaseTypeFamilyGlobalId { get; set; }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/ConfigurationInfo.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/ConfigurationInfo.cs
new file mode 100644
index 0000000..4e87137
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/ConfigurationInfo.cs
@@ -0,0 +1,56 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    [ExcludeFromCodeCoverage]
+    public class ConfigurationInfo
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public string Name { get; set; }
+        public byte DisplayOrder { get; set; }
+        public Guid ServiceLineDimensionGuid { get; set; }
+        [JsonPropertyName("entityIdsCSV")]
+        public string EntityIdsCsv { get; set; }
+        public bool IsUsingIndirectCost { get; set; }
+        public string DepartmentRollupGlobalId { get; set; }
+        public bool IsUsingCustomEntityDimension => !string.IsNullOrEmpty(DepartmentRollupGlobalId);
+        [JsonPropertyName("customEntityIdsCSV")]
+        public string CustomEntityIdsCsv { get; set; }
+        [JsonPropertyName("fiscalYearID")]
+        public short FiscalYearId { get; set; }
+        public DateTime OrgDefinedEndDate { get; set; }
+        public DateTime OrgDefinedTrackingCurrentMonth { get; set; }
+
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class EntityIdInfo
+    {
+        [JsonPropertyName("id")]
+        public int EntityId { get; set; }
+        [JsonPropertyName("name")]
+        public string EntityName { get; set; } = string.Empty;
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class EntityInfo
+    {
+        public string EntityTitle { get; set; }
+        public string EntityLabel { get; set; }
+        public string EntityText { get; set; }
+        public string DepartmentRollupGlobalId { get; set; }
+        public string HierarchicalGuid { get; set; }
+    }
+
+    [ExcludeFromCodeCoverage]
+    public class ServiceLineInfo
+    {
+        public string ServiceLineGlobalId { get; set; }
+        public string ServiceLineTitle { get; set; }
+        public string ServiceLineName { get; set; }
+        public string ServiceLineDimensionGuid { get; set; }
+        public string ServiceLineHierarchicalGuid { get; set; }
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/CostDriver.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/CostDriver.cs
new file mode 100644
index 0000000..0c5126c
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/CostDriver.cs
@@ -0,0 +1,10 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    public class CostDriver
+    {
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeDefaultColumnInfo.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeDefaultColumnInfo.cs
new file mode 100644
index 0000000..59d7738
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeDefaultColumnInfo.cs
@@ -0,0 +1,25 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    public class InitiativeDefaultColumnInfo
+    {
+        [JsonPropertyName("index")]
+        public int Index { get; set; }
+
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        [JsonPropertyName("heading")]
+        public string Heading { get; set; }
+
+        [JsonPropertyName("isLocked")]
+        public bool IsLocked { get; set; }
+
+        [JsonPropertyName("isHidden")]
+        public bool IsHidden { get; set; }
+
+        [JsonPropertyName("initiativeRollupColumnId")]
+        public int? InitiativeRollupColumnId { get; set; }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeDetailColumnInfo.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeDetailColumnInfo.cs
new file mode 100644
index 0000000..d6e7c0f
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeDetailColumnInfo.cs
@@ -0,0 +1,25 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    public class InitiativeDetailColumnInfo
+    {
+        [JsonPropertyName("index")]
+        public int Index { get; set; }
+
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        [JsonPropertyName("heading")]
+        public string Heading { get; set; }
+
+        [JsonPropertyName("isLocked")]
+        public bool IsLocked { get; set; }
+
+        [JsonPropertyName("isHidden")]
+        public bool IsHidden { get; set; }
+
+        [JsonPropertyName("initiativeRollupColumnId")]
+        public int? InitiativeRollupColumnId { get; set; }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeFilterOptionsInfo.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeFilterOptionsInfo.cs
new file mode 100644
index 0000000..eb3aa7a
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeFilterOptionsInfo.cs
@@ -0,0 +1,31 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    public class InitiativeFilterOptionsInfo
+    {
+        [JsonPropertyName("costDrivers")]
+        public List<CostDriver> CostDrivers { get; set; }
+
+        [JsonPropertyName("costLeaders")]
+        public List<CostLeader> CostLeaders { get; set; }
+
+        [JsonPropertyName("owners")]
+        public List<Owner> Owners { get; set; }
+
+        [JsonPropertyName("executiveSponsors")]
+        public List<ExecutiveSponsor> ExecutiveSponsors { get; set; }
+
+        [JsonPropertyName("workstreams")]
+        public List<Workstream> Workstreams { get; set; }
+
+        [JsonPropertyName("rollupColumn1Values")]
+        public object RollupColumn1Values { get; set; }
+
+        [JsonPropertyName("rollupColumn2Values")]
+        public object RollupColumn2Values { get; set; }
+
+        [JsonPropertyName("rollupColumn3Values")]
+        public object RollupColumn3Values { get; set; }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeFilterSettingsInfo.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeFilterSettingsInfo.cs
new file mode 100644
index 0000000..05a6f10
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeFilterSettingsInfo.cs
@@ -0,0 +1,43 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    public class InitiativeFilterSettingsInfo
+    {
+        [JsonPropertyName("configurationGuid")]
+        public string ConfigurationGuid { get; set; }
+
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        [JsonPropertyName("status")]
+        public int Status { get; set; }
+
+        [JsonPropertyName("costDrivers")]
+        public List<string> CostDrivers { get; set; }
+
+        [JsonPropertyName("costLeaders")]
+        public List<string> CostLeaders { get; set; }
+
+        [JsonPropertyName("owners")]
+        public List<string> Owners { get; set; }
+
+        [JsonPropertyName("executiveSponsors")]
+        public List<string> ExecutiveSponsors { get; set; }
+
+        [JsonPropertyName("workstreams")]
+        public List<string> Workstreams { get; set; }
+
+        [JsonPropertyName("rollupColumn1Values")]
+        public List<string> RollupColumn1Values { get; set; }
+
+        [JsonPropertyName("rollupColumn2Values")]
+        public List<string> RollupColumn2Values { get; set; }
+
+        [JsonPropertyName("rollupColumn3Values")]
+        public List<string> RollupColumn3Values { get; set; }
+
+        [JsonPropertyName("groupByCategory")]
+        public string GroupByCategory { get; set; }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeRollupColumnInfo.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeRollupColumnInfo.cs
new file mode 100644
index 0000000..24eb2a0
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeRollupColumnInfo.cs
@@ -0,0 +1,16 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    public class InitiativeRollupColumnInfo
+    {
+        [JsonPropertyName("initiativeRollupColumnId")]
+        public int InitiativeRollupColumnId { get; set; }
+
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        [JsonPropertyName("initiativeRollupValues")]
+        public List<InitiativeRollupValue> InitiativeRollupValues { get; set; }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeRollupValue.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeRollupValue.cs
new file mode 100644
index 0000000..b807dd9
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/InitiativeRollupValue.cs
@@ -0,0 +1,16 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    public class InitiativeRollupValue
+    {
+        [JsonPropertyName("initiativeRollupValueId")]
+        public int InitiativeRollupValueId { get; set; }
+
+        [JsonPropertyName("initiativeRollupColumnId")]
+        public int InitiativeRollupColumnId { get; set; }
+
+        [JsonPropertyName("value")]
+        public string Value { get; set; }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/SecurityInfo.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/SecurityInfo.cs
new file mode 100644
index 0000000..008f742
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/SecurityInfo.cs
@@ -0,0 +1,10 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    public class SecurityInfo()
+    {
+        [JsonPropertyName("title")]
+        public string Title { get; set; } = string.Empty;
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/User.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/User.cs
new file mode 100644
index 0000000..5b4788e
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/User.cs
@@ -0,0 +1,26 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    public class User
+    {
+        [JsonPropertyName("userGuid")]
+        public string UserGuid { get; set; }
+
+        [JsonPropertyName("nameFull")]
+        public string NameFull { get; set; }
+    }
+
+    public class CostLeader : User
+    {
+    }
+
+    public class ExecutiveSponsor : User
+    {
+    }
+
+    public class Owner : User
+    {
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/Workstream.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/Workstream.cs
new file mode 100644
index 0000000..1c1dc68
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Info/Workstream.cs
@@ -0,0 +1,10 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Info
+{
+    public class Workstream
+    {
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Mapperly/OpportunityMetricBaseMap.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Mapperly/OpportunityMetricBaseMap.cs
new file mode 100644
index 0000000..2d272dc
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Mapperly/OpportunityMetricBaseMap.cs
@@ -0,0 +1,86 @@
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.OrgDefined.Queries;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Mapperly
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class OpportunityMetricBaseMap
+    {
+        public static OpportunityMetricBase Map(this ENOpportunityDataModel dataModel)
+        {
+            var enOpportunityBase = JsonSerializer.Deserialize<ENOpportunityBaseFilters>(dataModel.EncounterOpportunityJSON);
+            OpportunityMetricBase target = new OpportunityMetricBase();
+            if (enOpportunityBase != null)
+            {
+                target = enOpportunityBase.Map();
+                target.CaseTypeIds = enOpportunityBase
+                    .CaseTypes.Select(fh => int.TryParse(fh.Id, out var id) ? id : -1).Where(id => id >= 0).ToList();
+                switch (enOpportunityBase.EncounterOpportunityLevel)
+                {
+                    case OpportunityLevel.Entity:
+                        target.OpportunityLevelIds = enOpportunityBase
+                            .Entities.Select(fh => int.TryParse(fh.Id, out var id) ? id : -1).Where(id => id >= 0).ToList();
+                        break;
+                    case OpportunityLevel.ServiceLine:
+                        target.OpportunityLevelIds = enOpportunityBase
+                            .ServiceLines.Select(fh => int.TryParse(fh.Id, out var id) ? id : -1).Where(id => id >= 0).ToList();
+                        break;
+                    case OpportunityLevel.Specialty:
+                        target.OpportunityLevelIds = enOpportunityBase
+                            .Specialties.Select(fh => int.TryParse(fh.Id, out var id) ? id : -1).Where(id => id >= 0).ToList();
+                        break;
+                    case OpportunityLevel.Provider:
+                        target.OpportunityLevelIds = enOpportunityBase
+                            .Providers.Select(fh => int.TryParse(fh.Id, out var id) ? id : -1).Where(id => id >= 0).ToList();
+                        break;
+                }
+            }
+            return target;
+        }
+
+        public static OpportunityMetricBase Map(this ENOpportunityDto source)
+        {
+            var target = source.MapTo();
+            var enOpportunityBase = JsonSerializer.Deserialize<ENOpportunityBaseFilters>(source.EncounterOpportunityJSON);
+            var regexp = new Regex(@"[^\d]*\|([\d]+)", RegexOptions.Compiled);
+            if (enOpportunityBase != null)
+            {
+                target = enOpportunityBase.Map();
+                target.CaseTypeIds = enOpportunityBase
+                    .CaseTypes.Select(fh => int.TryParse(regexp.Replace(fh.Id, "$1"), out var id) ? id : -1).Where(id => id >= 0).ToList();
+                switch (enOpportunityBase.EncounterOpportunityLevel)
+                {
+                    case OpportunityLevel.Entity:
+                        target.OpportunityLevelIds = enOpportunityBase
+                            .Entities.Select(fh => int.TryParse(regexp.Replace(fh.Id, "$1"), out var id) ? id : -1).Where(id => id >= 0).ToList();
+                        break;
+                    case OpportunityLevel.ServiceLine:
+                        target.OpportunityLevelIds = enOpportunityBase
+                            .ServiceLines.Select(fh => int.TryParse(regexp.Replace(fh.Id, "$1"), out var id) ? id : -1).Where(id => id >= 0).ToList();
+                        break;
+                    case OpportunityLevel.Specialty:
+                        target.OpportunityLevelIds = enOpportunityBase
+                            .Specialties.Select(fh => int.TryParse(regexp.Replace(fh.Id, "$1"), out var id) ? id : -1).Where(id => id >= 0).ToList();
+                        break;
+                    case OpportunityLevel.Provider:
+                        target.OpportunityLevelIds = enOpportunityBase
+                            .Providers.Select(fh => int.TryParse(regexp.Replace(fh.Id, "$1"), out var id) ? id : -1).Where(id => id >= 0).ToList();
+                        break;
+                }
+                target.OpportunityLevelIdAsCSV = string.Join(",", target.OpportunityLevelIds);
+            }
+            return target;
+        }
+
+        public static partial OpportunityMetricBase Map(this ENOpportunityBaseFilters enOpportunityBase);
+
+        [MapperIgnoreSource(nameof(ENOpportunityDto.OpportunityLevelIds))]
+        private static partial OpportunityMetricBase MapTo(this ENOpportunityDto source);
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Setup/ClientIntegrationTestFixture.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Setup/ClientIntegrationTestFixture.cs
new file mode 100644
index 0000000..63157b9
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Setup/ClientIntegrationTestFixture.cs
@@ -0,0 +1,38 @@
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Api.Test.Integration.Setup;
+using Strata.ContinuousImprovement.Api.Test.Integration.Tests;
+using System.Diagnostics.CodeAnalysis;
+
+[ExcludeFromCodeCoverage]
+[SetUpFixture]
+public class ClientIntegrationTestFixture
+{
+    [OneTimeSetUp]
+    public virtual async Task SetDbContextAndServices()
+    {
+#if DEBUG
+        //When running locally sets the profile to the CI profile so you have access to resources
+        Environment.SetEnvironmentVariable("AWS_Profile", "sdt-continuous-improvement-service-role");
+#endif
+        var clientService = new ApiTestBase();
+        await clientService.ClientValidation();
+        var services = ServiceCollectionFactory.Create();
+        await services.SetupServiceProperties(clientService.StrataId);
+    }
+
+    [OneTimeTearDown]
+    public async Task TearDown()
+    {
+        try
+        {
+            var centralDbContext = ServiceProperties.CentralDbContext as CentralDbContext;
+            if (centralDbContext == null) { return; }
+            _ = await centralDbContext.Database.EnsureDeletedAsync(CancellationToken.None);
+        }
+        catch (Exception ex)
+        {
+            throw;
+        }
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Setup/ServiceCollectionFactory.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Setup/ServiceCollectionFactory.cs
new file mode 100644
index 0000000..2ab2f37
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Setup/ServiceCollectionFactory.cs
@@ -0,0 +1,46 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Strata.ApiLib.Core.Cors.Extensions;
+using Strata.ApiLib.Core.StrataAuthentication.Bootstrappers;
+using Strata.Configuration.Client.DependencyInjection.ConsoleApps;
+using Strata.ContinuousImprovement.Biz.Configurations;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Setup
+{
+    [ExcludeFromCodeCoverage]
+    public static class ServiceCollectionFactory
+    {
+        // dev master
+        private static readonly Guid DatabaseGuid = new("54409f55-5ddf-4748-8222-9ccfb04fb4f5");
+        private static readonly string IntegrationTesting = $"ci_api_{DateTime.Now:yyyyMMdd}_{Guid.NewGuid():N}";
+
+        public static IServiceCollection Create()
+        {
+            var services = new ServiceCollection();
+            try
+            {
+                var configuration = StrataConfigurationFactory.GetConfiguration();
+                services.AddSingleton(configuration);
+                services.AddStrataAuthentication(configuration);
+                services.AddStrataCors(configuration);
+                services.AddContinuousImprovementServices(configuration, IntegrationTesting);
+                services.AddAsyncDbContextFactory<JazzDbContext>(options =>
+                {
+                    options
+                        .WithConnectionString((provider, token) => provider.GetConnectionStringFromSmc(DatabaseGuid, token))
+                        .WithDbContextOptions((connectionString, provider, builder) =>
+                            builder.UseSqlServer(connectionString, options => { options.CommandTimeout(300); }));
+                });
+                services.AddLogging();
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+            return services;
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Setup/ServiceProperties.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Setup/ServiceProperties.cs
new file mode 100644
index 0000000..c35a80b
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Setup/ServiceProperties.cs
@@ -0,0 +1,165 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Moq;
+using Strata.Analytics.Client;
+using Strata.Analytics.Models.Workbooks;
+using Strata.ContinuousImprovement.Api.Test.Integration.Info;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Setup
+{
+    public static class ServiceProperties
+    {
+        // dev master
+        internal static readonly Guid DatabaseGuid = new("54409f55-5ddf-4748-8222-9ccfb04fb4f5");
+
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+        public static ICentralDbContext CentralDbContext { get; set; }
+        public static JazzEntityFrameworkFactory JazzConnBuilderFactory { get; set; }
+        public static IJazzDbContext JazzDbContext { get; set; }
+        public static Biz.DbContexts.Snowflake.ISnowflakeDatabaseContext SnowflakeDatabaseContext { get; set; }
+        public static IServiceCollection Services { get; set; }
+        public static IServiceProvider ServiceProvider { get; set; }
+        public static IAnalyticsService AnalyticsService { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+
+        public static string BaseAddress { get; set; } = string.Empty;
+
+        private static int WorkbookId = 9;
+
+        public static async Task SetupServiceProperties(this IServiceCollection services, int strataId = 0)
+        {
+#if DEBUG
+            Environment.SetEnvironmentVariable("AWS_Profile", "sdt-continuous-improvement-service-role");
+#endif
+            services.AddOptions<AddressInfo>().BindConfiguration("address").ValidateDataAnnotations(); //bind the options for aws and validates for missing values 
+
+            Services = services;
+            var serviceProvider = services.BuildServiceProvider();
+            ServiceProvider = serviceProvider;
+
+            try
+            {
+                var sfConnBuilderFactory = serviceProvider.GetRequiredService<Biz.DbContexts.Snowflake.ISnowflakeDatabaseContextFactory>();
+                SnowflakeDatabaseContext = sfConnBuilderFactory.Create($"{DatabaseGuid:N}");
+            }
+            catch (Exception)
+            {
+                // ILB
+            }
+            var sectionAccessor = serviceProvider.GetRequiredService<IOptions<AddressInfo>>();
+            var addressInfo = sectionAccessor.Value;
+            if (addressInfo != null && !string.IsNullOrEmpty(addressInfo.BaseAddress))
+            {
+                BaseAddress = addressInfo.BaseAddress;
+            }
+            try
+            {
+                var jazzConnBuilderFactory = serviceProvider.GetRequiredService<IAsyncDbContextFactory<JazzDbContext>>();
+                JazzDbContext = await jazzConnBuilderFactory.CreateDbContextAsync(CancellationToken.None);
+            }
+            catch (Exception)
+            {
+                // ILB
+            }
+
+            await BuildPostgresDb(strataId);
+
+            BuildAnalyticsService(strataId);
+        }
+
+        private static async Task BuildPostgresDb(int strataId)
+        {
+            try
+            {
+                CentralDbContext = ServiceProvider.GetService<CentralDbContext>() as CentralDbContext
+                    ?? throw new NullReferenceException(nameof(CentralDbContext));
+                var centralDbContext = CentralDbContext as CentralDbContext;
+                if (centralDbContext == null) { throw new NullReferenceException(nameof(centralDbContext)); }
+
+                await centralDbContext.Database.MigrateAsync(CancellationToken.None);
+                Assert.That(centralDbContext, Is.Not.Null);
+
+                JazzConnBuilderFactory = new JazzEntityFrameworkFactory();
+                await JazzConnBuilderFactory.EnsureCreatedAsync(centralDbContext, JazzDbContext, CancellationToken.None);
+                var workbook = new OpportunityWorkbook
+                {
+                    StrataId = strataId,
+                    WorkbookId = WorkbookId,
+                    OpportunityGuid = Guid.NewGuid(),
+                    Name = "Test",
+                };
+                if (!centralDbContext.OpportunityWorkbooks.Any(ow => ow.StrataId == workbook.StrataId
+                    && ow.WorkbookId == workbook.WorkbookId))
+                {
+                    await centralDbContext.OpportunityWorkbooks.AddAsync(workbook, CancellationToken.None);
+                }
+                var oppTypeWorkbook = new OpportunityTypeWorkbook
+                {
+                    StrataId = strataId,
+                    WorkbookId = WorkbookId,
+                    OpportunityType = (int)OpportunityTypes.ChargeCode,
+                    Name = "Test",
+                };
+                if (!centralDbContext.OpportunityTypeWorkbooks.Any(otw => otw.StrataId == oppTypeWorkbook.StrataId
+                    && otw.WorkbookId == oppTypeWorkbook.WorkbookId))
+                {
+                    await centralDbContext.OpportunityTypeWorkbooks.AddAsync(oppTypeWorkbook, CancellationToken.None);
+                }
+
+                await centralDbContext.SaveChangesAsync(CancellationToken.None);
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+        }
+
+        private static void BuildAnalyticsService(int strataId)
+        {
+            try
+            {
+                var analyticsService = Mock.Of<IAnalyticsService>();
+                var workbook = new Workbook
+                {
+                    Name = "Test",
+                    WorkbookId = WorkbookId,
+                    IsHidden = false,
+                    StrataId = strataId,
+                };
+                var workbooks = new List<Workbook> { workbook };
+                workbooks.AddRange(Enumerable.Range(1, 1000).Where(i => i != WorkbookId).Select(i => new Workbook
+                {
+                    Name = $"Test {i}",
+                    WorkbookId = i,
+                    IsHidden = (i % 2 == 0),
+                    StrataId = (i % 3 == 0) ? 9 : strataId,
+                }));
+                //GetWorkbooksAsync
+                Mock.Get(analyticsService)
+                    .Setup(s => s.GetWorkbookAsync(It.IsAny<int>(), It.IsAny<CancellationToken>()))
+                    .Returns<int, CancellationToken>((id, token)
+                        => Task.FromResult(id == WorkbookId ? workbook : null));
+                Mock.Get(analyticsService)
+                    .Setup(s => s.GetWorkbooksAsync(It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                    .Returns<bool, CancellationToken>((isHidden, token)
+                        => Task.FromResult(workbooks.Where(w => w.IsHidden == isHidden)));
+                AnalyticsService = analyticsService;
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+        }
+
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Setup/VaultResponse.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Setup/VaultResponse.cs
new file mode 100644
index 0000000..f7ef7ed
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Setup/VaultResponse.cs
@@ -0,0 +1,9 @@
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Setup
+{
+    public class VaultResponse
+    {
+        public string UserName { get; set; }
+        public string Password { get; set; }
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Strata.ContinuousImprovement.Api.Test.Integration.csproj b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Strata.ContinuousImprovement.Api.Test.Integration.csproj
new file mode 100644
index 0000000..f8f036d
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Strata.ContinuousImprovement.Api.Test.Integration.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.7.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageReference Include="Strata.ApiLib.Core" Version="8.4.1" />
+    <PackageReference Include="Strata.Configuration.Client" Version="9.15.1" />
+    <PackageReference Include="Strata.SnowflakeLib" Version="4.3.0" />
+    <PackageReference Include="Strata.SqlTools.EntityFramework" Version="6.0.3" />
+    <PackageReference Include="Verify.NUnit" Version="29.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Strata.ContinuousImprovement.Api\Strata.ContinuousImprovement.Api.csproj" />
+    <ProjectReference Include="..\..\src\Strata.ContinuousImprovement.Biz\Strata.ContinuousImprovement.Biz.csproj" />
+    <ProjectReference Include="..\Strata.ContinuousImprovement.JazzEntityFrameworkStub\Strata.ContinuousImprovement.JazzEntityFrameworkStub.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/ApiTestBase.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/ApiTestBase.cs
new file mode 100644
index 0000000..2b344e1
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/ApiTestBase.cs
@@ -0,0 +1,222 @@
+using Microsoft.AspNetCore.Http;
+using Moq;
+using Strata.ContinuousImprovement.Api.Test.Integration.Setup;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using System.IdentityModel.Tokens.Jwt;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using System.Security.Claims;
+using System.Text.Json;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    public class ApiTestBase
+    {
+        protected StrataTokenInfo StrataTokenInfo { get; set; }
+        protected string AccessToken { get; set; }
+        protected IEnumerable<Claim> Claims { get; set; }
+        protected long Expires_in { get; set; }
+        protected ClaimsIdentity ClaimsIdentity { get; set; }
+        protected ClaimsPrincipal ClaimsPrincipal { get; set; }
+        protected Dictionary<string, ClaimsPrincipal> ClaimsPrincipals { get; set; } = new Dictionary<string, ClaimsPrincipal>();
+        internal IClaimsPrincipalAccessor ClaimsPrincipalAccessor { get; set; }
+        internal int StrataId { get; set; }
+        internal Guid DatabaseGuid { get; set; }
+
+        protected readonly string BaseAddress = "https://continuousimprovement-api.dev.stratanetwork.net";
+        public IConfigurationService ConfigurationService { get; set; }
+        public CentralDbContext CentralDbContext { get; set; }
+        public IOpportunityWorkbookService OpportunityWorkbookService { get; set; }
+#pragma warning disable NUnit1032 // An IDisposable field/property should be Disposed in a TearDown method
+        public IServiceProvider ServiceProvider { get; set; }
+#pragma warning restore NUnit1032 // An IDisposable field/property should be Disposed in a TearDown method
+
+        public OpportunityWorkbook OpportunityWorkbook { get; set; }
+        public OpportunityTypeWorkbook OpportunityTypeWorkbook { get; set; }
+
+        [OneTimeSetUp]
+        public async Task TestSetup()
+        {
+#if DEBUG
+            //When running locally sets the profile to the CI profile so you have access to resources
+            Environment.SetEnvironmentVariable("AWS_Profile", "sdt-continuous-improvement-service-role");
+#endif
+            var strataBearer = await StrataValidation();
+            await ClientValidation();
+            var services = ServiceCollectionFactory.Create();
+            await services.SetupServiceProperties(StrataId);
+            ServiceProvider = ServiceProperties.ServiceProvider;
+            var httpClient = new HttpClient
+            {
+                BaseAddress = new Uri(BaseAddress)
+            };
+            httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+            httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken);
+            CentralDbContext = (CentralDbContext)ServiceProperties.CentralDbContext;
+        }
+
+        protected HttpClient HttpClient;
+
+        [SetUp]
+        public void SetupHttpClient()
+        {
+            HttpClient = new HttpClient
+            {
+                BaseAddress = new Uri(BaseAddress)
+            };
+            HttpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+            HttpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken);
+        }
+
+        [TearDown]
+        public void TearDownHttpClient()
+        {
+            HttpClient.Dispose();
+        }
+
+        #region Client Claims Validation
+
+        public async Task<string> ClientValidation()
+        {
+            var userInfo = new VaultUserInfo
+            {
+                vaultTitle = "ccicostleader", // vault ccicostleader is same as jazz ccicostleader
+                vaultUserName = "ccicostleader",
+                userName = "ccicostleader",
+                fullName = "Administrator, CCI"
+            };
+            return await ClientValidation(userInfo);
+        }
+
+        public async Task<string> StrataValidation()
+        {
+            var userInfo = new VaultUserInfo
+            {
+                vaultTitle = "IDTestUser", // vault ccicostleader is same as jazz ccicostleader
+                vaultUserName = "sdt\\IDTestUser", // vault ccicostleader is same as jazz ccicostleader
+                userName = "sdt\\IDTestUser",
+                fullName = "Administrator, CCI"
+            };
+            return await ClientValidation(userInfo);
+        }
+
+        public async Task<string> ClientValidation(VaultUserInfo userInfo)
+        {
+            var vaultInfo = await GetUserPassword(userInfo.vaultTitle);
+            var bearerToken = await GetBearerToken(vaultInfo.Item1, vaultInfo.Item2);
+            ClaimsIdentity = new ClaimsIdentity(Claims);
+            ClaimsPrincipal = new ClaimsPrincipal(ClaimsIdentity);
+            ClaimsPrincipals.Add(userInfo.vaultTitle, ClaimsPrincipal);
+            StrataId = ClaimsPrincipal.GetStrataId();
+            DatabaseGuid = ClaimsPrincipal.GetDatabaseGuid();
+            BuildClaimsPrincipalAccessor();
+            return bearerToken;
+        }
+
+        internal async Task<Tuple<string, string>> GetUserPassword(string vaultTitle)
+        {
+            var client = new HttpClient
+            {
+                BaseAddress = new Uri("https://vault.sdt.local/")
+            };
+            client.DefaultRequestHeaders.Add("apiKey", "a69d2e478c3f5b395b687ecdf34a3239");
+            client.DefaultRequestHeaders.Add("ignoreHTTPSErrors", "true");
+            var vaultResponse = await client.GetAsync($"api/searchpasswords/122?title={vaultTitle}");
+            vaultResponse.EnsureSuccessStatusCode();
+            string responseString = await vaultResponse.Content.ReadAsStringAsync();
+            if (string.IsNullOrEmpty(responseString)) { return new Tuple<string, string>(string.Empty, string.Empty); }
+            var jsonResponse = JsonSerializer.Deserialize<IEnumerable<VaultResponse>>(responseString);
+            if (jsonResponse == null) { return new Tuple<string, string>(string.Empty, string.Empty); }
+            var vaultUserInfo = jsonResponse.First();
+            client.Dispose();
+            return new Tuple<string, string>(vaultUserInfo.UserName, vaultUserInfo.Password);
+        }
+
+        internal async Task<string> GetBearerToken(string userName, string password)
+        {
+            var form = BuildTokenRequest(userName, password);
+            var client = new HttpClient();
+            var response = await client.PostAsync("https://identity.dev.stratanetwork.net/connect/token", form);
+            response.EnsureSuccessStatusCode();
+            var responseString = await response.Content.ReadAsStringAsync();
+            if (string.IsNullOrEmpty(responseString)) { return string.Empty; }
+            var strataTokenInfo = JsonSerializer.Deserialize<StrataTokenInfo>(responseString);
+            if (strataTokenInfo == null) { return string.Empty; }
+            StrataTokenInfo = strataTokenInfo;
+            AccessToken = strataTokenInfo.AccessToken;
+            Expires_in = strataTokenInfo.ExpiresIn;
+            var handler = new JwtSecurityTokenHandler();
+            var jwtToken = handler.ReadJwtToken(AccessToken);
+            Claims = jwtToken.Claims;
+            client.Dispose();
+            return AccessToken;
+        }
+
+        internal FormUrlEncodedContent BuildTokenRequest(string userName, string password)
+        {
+            var form = new FormUrlEncodedContent(
+            [
+                new KeyValuePair<string, string>("database_guid", ServiceProperties.DatabaseGuid.ToString()),
+                new KeyValuePair<string, string>("grant_type", "password"),
+                new KeyValuePair<string, string>("username", userName),
+                new KeyValuePair<string, string>("password", password),
+                new KeyValuePair<string, string>("scope", "strata.api.external offline_access"),
+                new KeyValuePair<string, string>("client_id", "IntegrationTest"),
+                new KeyValuePair<string, string>("client_secret", "UhAEQsGByTCrwPdHPLmaet_DmLEfcJVbZqGBxArdeRup_TPLrYKNpUNRHejjdnhd")
+            ]);
+            return form;
+        }
+
+        internal void BuildClaimsPrincipalAccessor()
+        {
+            try
+            {
+                var claimsAccessor = Mock.Of<IClaimsPrincipalAccessor>();
+                Mock.Get(claimsAccessor)
+                            .Setup(s => s.GetCurrentClaimsPrincipal())
+                            .Returns(ClaimsPrincipal);
+                ClaimsPrincipalAccessor = claimsAccessor;
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+        }
+
+        #endregion
+
+        #region Helper Methods
+
+        protected async Task<IEnumerable<Info.ConfigurationInfo>> GetConfigurations()
+        {
+            string ConfigurationsEndpoint = "api/v1/configurations";
+            var request = new HttpRequestMessage(HttpMethod.Get, ConfigurationsEndpoint);
+            var response = await HttpClient.SendAsync(request, CancellationToken.None);
+            response.EnsureSuccessStatusCode();
+            var configurations = await response.Content.ReadFromJsonAsync<IEnumerable<Info.ConfigurationInfo>>();
+#pragma warning disable S3928 // Parameter names used into ArgumentException constructors should match an existing one 
+            configurations = configurations?.OrderBy(x => x.DisplayOrder)
+                ?? throw new ArgumentNullException(nameof(configurations));
+#pragma warning restore S3928 // Parameter names used into ArgumentException constructors should match an existing one 
+            return configurations;
+        }
+
+        #endregion
+
+    }
+
+    public class VaultUserInfo
+    {
+        public string vaultTitle { get; set; }
+        public string vaultUserName { get; set; }
+        public string userName { get; set; }
+        public string fullName { get; set; }
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/HttpMessageResponseExtensions.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/HttpMessageResponseExtensions.cs
new file mode 100644
index 0000000..e66a187
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/HttpMessageResponseExtensions.cs
@@ -0,0 +1,30 @@
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    public static class HttpMessageResponseExtensions
+    {
+        public static void AssertIsValid(this HttpResponseMessage response, bool exportable = false, string version = "1.0")
+        {
+            Assert.Multiple(() =>
+            {
+                Assert.That(response.IsSuccessStatusCode, Is.True);
+                var headers = response.Headers.Where(x => x.Value != null)
+                    .ToDictionary(k => k.Key, v => v.Value);
+                Assert.That(headers, Is.Not.Null.And.Not.Empty);
+                Assert.That(headers.ContainsKey("Api-Supported-Versions"), Is.True);
+                var apiVersion = headers["Api-Supported-Versions"].ToList();
+                Assert.That(apiVersion.Contains(version), Is.True);
+                if (exportable)
+                {
+                    var content = response.Content;
+                    Assert.That(content, Is.Not.Null);
+                    headers = response.Content.Headers.Where(x => x.Value != null)
+                        .ToDictionary(k => k.Key, v => v.Value);
+                    Assert.That(headers.ContainsKey("Content-Type"), Is.True);
+                    var contentType = headers["Content-Type"].ToList();
+                    Assert.That(contentType.Contains("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"), Is.True);
+                }
+            });
+        }
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/StrataTokenInfo.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/StrataTokenInfo.cs
new file mode 100644
index 0000000..380af0b
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/StrataTokenInfo.cs
@@ -0,0 +1,16 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    public class StrataTokenInfo
+    {
+        [JsonPropertyName("access_token")]
+        public required string AccessToken { get; set; }
+        [JsonPropertyName("token_type")]
+        public required string TokenType { get; set; }
+        [JsonPropertyName("expires_in")]
+        public required long ExpiresIn { get; set; }
+        [JsonPropertyName("refresh_token")]
+        public required string RefreshToken { get; set; }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestAllOpportunitiesController.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestAllOpportunitiesController.cs
new file mode 100644
index 0000000..d054a4a
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestAllOpportunitiesController.cs
@@ -0,0 +1,69 @@
+using Strata.ApiCommunication.Http;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.Generics;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http.Json;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture(Category = "Integration")]
+
+    public class TestAllOpportunitiesController : ApiTestBase
+    {
+        protected const string AllOpportunitiesEndpoint = "api/v1/all-opportunities";
+
+        [Test]
+        public async Task TestGetAllOportunitiesFromApi()
+        {
+            // arrange
+            var configurations = await GetConfigurations();
+            var configuration = configurations.First();
+            var loadOptions = new Controllers.AllOpportunityLoadOptions
+            {
+                Filters = new Biz.All.Opportunities.Filters.AllFilters
+                {
+                    ConfigurationGuid = configuration.ConfigurationGuid,
+                    OpportunityTypes =
+                    [
+                        $"{(int)OpportunityTypes.Encounter}",
+                        $"{(int) OpportunityTypes.QualityVariation}",
+                        $"{(int) OpportunityTypes.Variation}",
+                    ],
+                    ViewVisible = true
+                },
+                PagingOptions = new Biz.Pagination.PagingOptions
+                {
+                    First = 0,
+                    Rows = 100,
+                    SortOrder = Biz.Pagination.SortOrder.Desc,
+                    SortField = "IdentifiedSavings"
+                }
+            };
+            var request = new HttpRequestMessage(HttpMethod.Post, AllOpportunitiesEndpoint);
+
+            // act
+            await request.SetContentAsJsonAsync(loadOptions);
+            var response = await HttpClient.SendAsync(request, CancellationToken.None);
+            response.EnsureSuccessStatusCode();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                var opportunitiesPage = new PagedApiResponse<Info.AllOpportunityInfo>();
+                Assert.DoesNotThrowAsync(async () =>
+                    opportunitiesPage = await response.Content.ReadFromJsonAsync<PagedApiResponse<Info.AllOpportunityInfo>>());
+                response.AssertIsValid();
+                Assert.That(opportunitiesPage.Data, Is.Not.Empty);
+                Assert.That(opportunitiesPage.Data.Count, Is.LessThanOrEqualTo(loadOptions.PagingOptions.Rows));
+                Assert.That(opportunitiesPage.Data.Any(opp =>
+                    opp.OpportunityType == (int)OpportunityTypes.Encounter
+                    || opp.OpportunityType == (int)OpportunityTypes.QualityVariation
+                    || opp.OpportunityType == (int)OpportunityTypes.Variation), Is.True);
+                Assert.That(opportunitiesPage.PagingInfo.ResultsPerPage, Is.LessThanOrEqualTo(loadOptions.PagingOptions.Rows));
+            });
+        }
+
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestClientOpportunityWorkbooksController.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestClientOpportunityWorkbooksController.cs
new file mode 100644
index 0000000..827c36a
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestClientOpportunityWorkbooksController.cs
@@ -0,0 +1,34 @@
+using Strata.DecisionSupport.Models.Jazz;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http.Json;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture(Category = "Integration")]
+
+    public class TestClientOpportunityWorkbooksController : ApiTestBase
+    {
+        protected const string ClientOpportunityWorkbooksEndpoint = "api/v1/client-opportunity-workbooks";
+
+        [Test]
+        public async Task TestGetAllWorkbooksFromApi()
+        {
+            // arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, $"{ClientOpportunityWorkbooksEndpoint}/workbooks");
+
+            // act
+            var response = await HttpClient.SendAsync(request, CancellationToken.None);
+            response.EnsureSuccessStatusCode();
+            var workbooks = await response.Content.ReadFromJsonAsync<IEnumerable<WorkbookClientInfo>>(CancellationToken.None);
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+                Assert.That(workbooks, Is.AssignableTo<IEnumerable<WorkbookClientInfo>>());
+                Assert.That(workbooks, Is.Not.Null.And.Not.Empty);
+            });
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestConfigurationsController.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestConfigurationsController.cs
new file mode 100644
index 0000000..d2113d8
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestConfigurationsController.cs
@@ -0,0 +1,170 @@
+using Microsoft.AspNetCore.Http;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http.Json;
+using System.Text.RegularExpressions;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("API")]
+
+    public partial class TestConfigurationsController : ApiTestBase
+    {
+        protected const string ConfigurationsEndpoint = "api/v1/configurations";
+
+        [Test]
+        public async Task TestConfigurations()
+        {
+            //arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, ConfigurationsEndpoint);
+
+            // act
+            var response = await HttpClient.SendAsync(request, CancellationToken.None);
+
+            // assert
+            response.EnsureSuccessStatusCode();
+            response.AssertIsValid();
+        }
+
+        [Test]
+        [Ignore("Test database needs to be rolled over to the new year")]
+        public async Task TestDfltConfiguration()
+        {
+            //arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, ConfigurationsEndpoint);
+
+            // act
+            var response = await HttpClient.SendAsync(request, CancellationToken.None);
+            response.EnsureSuccessStatusCode();
+            var configurations = await response.Content.ReadFromJsonAsync<IEnumerable<Info.ConfigurationInfo>>();
+            configurations = configurations?.OrderBy(x => x.DisplayOrder);
+            var configuration = configurations?.FirstOrDefault();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+
+                Assert.That(configurations, Is.Not.Null.And.Not.Empty);
+                Assert.That(configuration, Is.Not.Null);
+                var expectedFiscalYearId = DateTime.Now.Year;
+                Assert.That(configuration.FiscalYearId, Is.InRange(expectedFiscalYearId - 1, expectedFiscalYearId), "Test database fiscal year configuration must be updated for the current year.");
+            });
+        }
+
+        [Test]
+        public async Task TestEntityConfiguration()
+        {
+            //arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, ConfigurationsEndpoint);
+
+            // act
+            var response = await HttpClient.SendAsync(request, CancellationToken.None);
+            response.EnsureSuccessStatusCode();
+            var configurations = await response.Content.ReadFromJsonAsync<IEnumerable<Info.ConfigurationInfo>>();
+            configurations = configurations?.OrderBy(x => x.DisplayOrder);
+            var configuration = configurations?.FirstOrDefault(c => c.EntityIdsCsv != "" && !c.IsUsingCustomEntityDimension);
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+
+                Assert.That(configurations, Is.Not.Null.And.Not.Empty);
+                Assert.That(configuration, Is.Not.Null);
+                Assert.That(configuration.IsUsingCustomEntityDimension, Is.False);
+                Assert.That(configuration.EntityIdsCsv, Is.Not.Empty);
+            });
+        }
+
+        [Test]
+        public async Task TestConfigurationEntities()
+        {
+            //arrange
+            var configurations = await GetConfigurations();
+            var configurationGuid = configurations?.FirstOrDefault(c => c.EntityIdsCsv != "" && !c.IsUsingCustomEntityDimension)?.ConfigurationGuid ?? Guid.Empty;
+            var configurationsEndpoint = ConfigurationsEndpoint + $"/{configurationGuid}/configuration-entities";
+            var request = new HttpRequestMessage(HttpMethod.Get, configurationsEndpoint);
+
+            // act
+            var response = await HttpClient.SendAsync(request, CancellationToken.None);
+            response.EnsureSuccessStatusCode();
+            var configurationEntities = await response.Content.ReadFromJsonAsync<IEnumerable<Info.EntityIdInfo>>();
+            configurationEntities = configurationEntities?.OrderBy(x => x.EntityName);
+            var configurationEntity = configurationEntities?.FirstOrDefault();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+
+                Assert.That(configurationEntities, Is.Not.Null.And.Not.Empty);
+                Assert.That(configurationEntity, Is.Not.Null);
+            });
+        }
+
+        [Test]
+        public async Task TestConfigurationServiceLineInfo()
+        {
+            //arrange
+            var configurations = await GetConfigurations();
+            var configurationGuid = configurations?.FirstOrDefault()?.ConfigurationGuid ?? Guid.Empty;
+            var configurationsEndpoint = ConfigurationsEndpoint + $"/{configurationGuid}/configuration-service-line-info";
+            var request = new HttpRequestMessage(HttpMethod.Get, configurationsEndpoint);
+            var guidRegex = GuidRegex();
+            var serviceLineRegex = new Regex("w*Service Lines?");
+
+            // act
+            var response = await HttpClient.SendAsync(request, CancellationToken.None);
+            response.EnsureSuccessStatusCode();
+            var configurationServiceLine = await response.Content.ReadFromJsonAsync<Info.ServiceLineInfo>();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+
+                Assert.That(configurationServiceLine, Is.Not.Null);
+                Assert.That(configurationServiceLine.ServiceLineGlobalId, Is.Not.Null);
+                Assert.That(configurationServiceLine.ServiceLineTitle, Is.Not.Null.And.Not.Empty);
+                Assert.That(configurationServiceLine.ServiceLineName, Is.Not.Null.And.Not.Empty);
+                Assert.That(guidRegex.IsMatch(configurationServiceLine.ServiceLineDimensionGuid), Is.True);
+                Assert.That(guidRegex.IsMatch(configurationServiceLine.ServiceLineHierarchicalGuid), Is.True);
+                Assert.That(serviceLineRegex.IsMatch(configurationServiceLine.ServiceLineTitle), Is.True);
+                Assert.That(serviceLineRegex.IsMatch(configurationServiceLine.ServiceLineName), Is.True);
+            });
+        }
+
+        [Test]
+        public async Task TestConfigurationEntityInfo()
+        {
+            //arrange
+            var configurations = await GetConfigurations();
+            var configurationGuid = configurations?.FirstOrDefault()?.ConfigurationGuid ?? Guid.Empty;
+            var configurationsEndpoint = ConfigurationsEndpoint + $"/{configurationGuid}/configuration-entity-info";
+            var request = new HttpRequestMessage(HttpMethod.Get, configurationsEndpoint);
+            var guidRegex = GuidRegex();
+
+            // act
+            var response = await HttpClient.SendAsync(request, CancellationToken.None);
+            response.EnsureSuccessStatusCode();
+            var configurationServiceLine = await response.Content.ReadFromJsonAsync<Info.EntityInfo>();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+
+                Assert.That(configurationServiceLine, Is.Not.Null);
+                Assert.That(configurationServiceLine.DepartmentRollupGlobalId, Is.Not.Null.And.Not.Empty);
+                Assert.That(configurationServiceLine.EntityTitle, Is.Not.Null.And.Not.Empty);
+                Assert.That(configurationServiceLine.EntityLabel, Is.Not.Null.And.Not.Empty);
+                Assert.That(configurationServiceLine.EntityText, Is.Not.Null.And.Not.Empty);
+                Assert.That(guidRegex.IsMatch(configurationServiceLine.HierarchicalGuid), Is.True);
+            });
+        }
+
+        [GeneratedRegex("[({]?[a-fA-F0-9]{8}[\\-]?([a-fA-F0-9]{4}[\\-]?){3}[a-fA-F0-9]{12}[})]?")]
+        private static partial Regex GuidRegex();
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestEncounterOpportunitiesController.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestEncounterOpportunitiesController.cs
new file mode 100644
index 0000000..ceb266f
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestEncounterOpportunitiesController.cs
@@ -0,0 +1,147 @@
+using Strata.ApiCommunication.Http;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Test.Integration.Mapperly;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.OrgDefined.Queries;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System.Net.Http.Json;
+using System.Text.Json;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    [TestFixture, Category("Integration"), Category("API")]
+
+    public class TestEncounterOpportunitiesController : ApiTestBase
+    {
+        private const string EncounterOpportunitiesEndpoint = "api/v1/encounter-opportunities";
+
+        [Test]
+        public async Task OpportunityMetricCohortDataTest()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "api/v1/configurations");
+            var response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+            var options = new JsonSerializerOptions
+            {
+                PropertyNameCaseInsensitive = true,
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+            };
+            var configurations = await response.Content
+                .ReadFromJsonAsync<List<ConfigurationInfo>>(options, CancellationToken.None);
+            var configuration = configurations.SingleOrDefault(c => c.DisplayOrder == 0);
+            if (configuration == null) Assert.Inconclusive("Unable to obtain configuration");
+            request = new HttpRequestMessage(HttpMethod.Post, EncounterOpportunitiesEndpoint);
+            await request.SetContentAsJsonAsync(
+                new
+                {
+                    pagingOptions = new
+                    {
+                        sortField = "IdentifiedSavings",
+                        sortOrder = "Asc",
+                        first = 0,
+                        rows = 1
+                    },
+                    filters = new
+                    {
+                        configurationGuid = configuration.ConfigurationGuid,
+                        identifiedSavings = 0,
+                        viewVisible = true,
+                        excludeInitiaves = false,
+                        opportunitySearch = "",
+                        cases = 0,
+                        opportunityLevels = Array.Empty<string>(),
+                        encounterGroups = "CaseType",
+                        seasonality = "Without"
+                    }
+                });
+            response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+            var opportunityPage =
+                await response.Content.ReadFromJsonAsync<PagedApiResponse<ENOpportunity>>(options, CancellationToken.None);
+            var opportunity = opportunityPage?.Data.FirstOrDefault(opp => opp.OpportunityLevel == nameof(OpportunityLevel.Entity));
+            if (opportunity == null) Assert.Ignore("No Encounter Opportunity found to work with");
+            request = new HttpRequestMessage(HttpMethod.Get, EncounterOpportunitiesEndpoint + $"/{opportunity.OpportunityGuid}");
+            response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+            var opportunityDto = await response.Content.ReadFromJsonAsync<ENOpportunityDto>(options, CancellationToken.None);
+            if (opportunityDto == null) Assert.Ignore("Unable to retrieve opportunity data");
+            var data = opportunityDto.Map();
+            var caseTypeCategorySql = string.Empty;
+            /*
+            var CaseTypeCategories = await jazzDbContext.DimCaseTypes
+                .GroupBy(ct => ct.CaseTypeCategory, (g, d) => new
+                {
+                    CaseTypeCategory = g,
+                    CaseTypeIds = d.Select(x => x.CaseTypeId).ToList()
+                }).ToListAsync(CancellationToken.None);
+            var CaseTypeCategorySql = CaseTypeCategories
+                .Select(ct => string.Format(CaseTypeFamilyIdExists.Exists[ct.CaseTypeCategory], string.Join(",", ct.CaseTypeIds)))
+                .Aggregate("", (x, y) => $"{x}\r\nOR\r\n{y}");
+            */
+            var requestInfo = new OpportunityMetricCohortOptions
+            {
+                ConfigurationGuid = configuration.ConfigurationGuid,
+                Data = data,
+                InnerJoin = caseTypeCategorySql
+            };
+            request = new HttpRequestMessage(HttpMethod.Post, $"{EncounterOpportunitiesEndpoint}/opportunity-metric-cohort-data");
+            await request.SetContentAsJsonAsync(requestInfo, CancellationToken.None);
+
+            // Act
+            response = await HttpClient.SendAsync(request);
+
+            // Assert
+            response.EnsureSuccessStatusCode();
+        }
+    }
+
+    public class ConfigurationInfo
+    {
+        public string Name { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public int DisplayOrder { get; set; }
+        public int FiscalYearId { get; set; }
+    }
+
+    public class ENOpportunityInfo
+    {
+        public Guid OpportunityGuid { get; set; }
+        public Guid ConfigurationGuid { get; set; }
+        public string OpportunityKey { get; set; }
+        public double IdentifiedSavings { get; set; }
+        public Guid InitiativeGuid { get; set; }
+        public bool HasInitiative => InitiativeGuid != Guid.Empty;
+        public string Initiative { get; set; }
+        public bool IsHidden { get; set; }
+        public string Note { get; set; } = String.Empty;
+        public string Name { get; set; }
+        public double Cases { get; set; }
+        public string EncounterGroup { get; set; }
+        public string EncounterGroupValue { get; set; }
+        public string OpportunityLevel { get; set; }
+        public bool IsSeasonal { get; set; }
+        public long OpportunityId { get; set; }
+    }
+
+    public static class CaseTypeFamilyIdExists
+    {
+        public static string[] Exists => new[]
+        {
+            @"    EXISTS(SELECT 1 FROM dss.CaseTypeFamilyMappingICD10 msdrg
+    INNER JOIN dss.DimCaseType dct ON dct.CaseTypeFamilyID = msdrg.CaseTypeFamilyID AND dct.CaseTypeId in ({0}) AND dct.CaseTypeCategory = 0
+    WHERE msdrg.CaseTypeFamilyID = fpes.MSDRGCaseTypeFamilyID)",
+            @"    EXISTS(SELECT 1 FROM dss.CaseTypeFamilyMappingAPRDRG aprdrg
+    INNER JOIN dss.DimCaseType dct ON dct.CaseTypeFamilyID = aprdrg.CaseTypeFamilyID AND dct.CaseTypeId in ({0}) AND dct.CaseTypeCategory = 1
+    WHERE aprdrg.CaseTypeFamilyID = fpes.APRDRGCaseTypeFamilyID)",
+            @"AND EXISTS(SELECT 1 FROM dss.FactPatientEncounterClinicalIndicator ci 
+WHERE ci.EncounterID = fpes.EncounterID AND ci.ClinicalIndicatorID in ({0}) and ci.IsDeleted = 0)",
+            @"    EXISTS(SELECT 1 FROM dss.CaseTypeFamilyMappingCPT cpt
+    INNER JOIN dss.DimCaseType dct ON dct.CaseTypeFamilyID = cpt.CaseTypeFamilyID AND dct.CaseTypeId in ({0}) AND dct.CaseTypeCategory = 3
+    WHERE cpt.CaseTypeFamilyID = fpes.CPTCodeCaseTypeFamilyID)"
+        };
+
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestFixtureSetup.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestFixtureSetup.cs
new file mode 100644
index 0000000..4b16639
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestFixtureSetup.cs
@@ -0,0 +1,26 @@
+using Strata.ContinuousImprovement.Api.Test.Integration.Setup;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture(Category = "Integration")]
+    public class TestFixtureSetup : ApiTestBase
+    {
+        [Test]
+        public async Task TestBearerToken()
+        {
+            var bearerToken = AccessToken;
+            Assert.That(bearerToken, Is.Not.Null.And.Not.Empty);
+        }
+
+        [Test]
+        public async Task TestCentralDbContext()
+        {
+            var centralDbContext = ServiceProperties.CentralDbContext as CentralDbContext;
+            Assert.That(centralDbContext, Is.Not.Null);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestInitiativesController.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestInitiativesController.cs
new file mode 100644
index 0000000..772edf0
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestInitiativesController.cs
@@ -0,0 +1,188 @@
+using Strata.ApiCommunication.Http;
+using System.Net.Http.Json;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    [TestFixture(Category = "Integration")]
+    public class TestInitiativesController : ApiTestBase
+    {
+        protected const string InitiativesEndpoint = "api/v1/initiatives";
+        protected const string InitiativesDetailColumnsEndpoint = "api/v1/initiative-detail-columns";
+
+        [Test]
+        public async Task TestInitiatives()
+        {
+            // arrange
+            var configurations = await GetConfigurations();
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).First();
+            var configurationGuid = configuration.ConfigurationGuid;
+            var data = new
+            {
+                configurationGuid,
+                name = "",
+                status = 0,
+                costDrivers = Array.Empty<string>(),
+                costLeaders = Array.Empty<string>(),
+                owners = Array.Empty<string>(),
+                executiveSponsors = Array.Empty<string>(),
+                workstreams = Array.Empty<string>(),
+                rollupColumn1Values = Array.Empty<string>(),
+                rollupColumn2Values = Array.Empty<string>(),
+                rollupColumn3Values = Array.Empty<string>(),
+                groupByCategory = "CostDriver"
+            };
+            var request = new HttpRequestMessage(HttpMethod.Post, InitiativesEndpoint);
+            await request.SetContentAsJsonAsync(data);
+
+            // act
+            var response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+            var initiatives = await response.Content.ReadFromJsonAsync<IEnumerable<dynamic>>();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+                Assert.That(initiatives, Is.Not.Null.And.Not.Empty);
+            });
+
+        }
+
+        [Test]
+        public async Task TestInitiativesCriteria()
+        {
+            // arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, InitiativesEndpoint + "/criteria");
+
+            // act
+            var response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+            var initiativesCriteria = await response.Content.ReadFromJsonAsync<IEnumerable<dynamic>>();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+                Assert.That(initiativesCriteria, Is.Not.Null.And.Not.Empty);
+            });
+
+        }
+
+        [Test]
+        public async Task TestInitiativesDetailColumnList()
+        {
+            // arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "api/v1/initiative-detail-columns/column-list");
+
+            // act
+            var response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+            var detailColumns = await response.Content.ReadFromJsonAsync<IEnumerable<dynamic>>();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+                Assert.That(detailColumns, Is.Not.Null.And.Not.Empty);
+            });
+
+        }
+
+        [Test]
+        public async Task TestInitiativesDefaultColumnList()
+        {
+            // arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "api/v1/initiative-detail-columns/default-column-list");
+
+            // act
+            var response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+            var detailColumns = await response.Content.ReadFromJsonAsync<IEnumerable<dynamic>>();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+                Assert.That(detailColumns, Is.Not.Null.And.Not.Empty);
+            });
+
+        }
+
+        [Test]
+        public async Task TestInitiativesFilterOptions()
+        {
+            // arrange
+            var configurations = await GetConfigurations();
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).First();
+            var configurationGuid = configuration.ConfigurationGuid;
+            var request = new HttpRequestMessage(HttpMethod.Get, InitiativesEndpoint + $"/{configurationGuid}/filter-options");
+
+            // act
+            var response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+            var filterOptions = await response.Content.ReadAsStringAsync();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+                Assert.That(filterOptions, Is.Not.Null.And.Not.Empty);
+            });
+
+        }
+        [Test]
+        public async Task TestInitiativesFilterSettings()
+        {
+            // arrange
+            var configurations = await GetConfigurations();
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).First();
+            var configurationGuid = configuration.ConfigurationGuid;
+            var request = new HttpRequestMessage(HttpMethod.Get, InitiativesEndpoint + $"/filter-settings");
+
+            // act
+            var response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+            var filterSettings = await response.Content.ReadAsStringAsync();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+                Assert.That(filterSettings, Is.Not.Null.And.Not.Empty);
+            });
+
+        }
+
+        [Test]
+        public async Task TestInitiativesExport()
+        {
+            // arrange
+            var configurations = await GetConfigurations();
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).First();
+            var configurationGuid = configuration.ConfigurationGuid;
+            var data = new
+            {
+                sortOptions = new
+                {
+                    sortField = "name",
+                    sortOrder = "Asc"
+                },
+                filters = new
+                {
+                    configurationGuid,
+                    groupByCategory = "CostDriver"
+                }
+            };
+            var request = new HttpRequestMessage(HttpMethod.Post, InitiativesEndpoint + "/export?exportAll=true");
+            await request.SetContentAsJsonAsync(data);
+
+            // act
+            var response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+
+            // assert
+            response.AssertIsValid(true);
+        }
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestInitiativesController_Export.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestInitiativesController_Export.cs
new file mode 100644
index 0000000..d8e37c4
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestInitiativesController_Export.cs
@@ -0,0 +1,135 @@
+using Strata.ApiCommunication.Http;
+using Strata.ContinuousImprovement.Api.Test.Integration.Info;
+using System.Net.Http.Json;
+using System.Text.RegularExpressions;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    [TestFixture(), Category("Integration"), Category("API")]
+    public class TestInitiativesController_Export : ApiTestBase
+    {
+        protected const string InitiativesEndpoint = "api/v1/initiatives";
+        private Guid ConfigurationGuid { get; set; } = Guid.Empty;
+        private string Workstream { get; set; } = string.Empty;
+        private object FilterSettings { get; set; }
+
+        [Test, Order(1)]
+        public async Task TestInitiativesExport_Step1()
+        {
+            // arrange
+
+            // act
+            var configurations = await GetConfigurations();
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).First();
+            var configurationGuid = configuration.ConfigurationGuid;
+            ConfigurationGuid = configurationGuid;
+
+            // assert
+            Assert.That(ConfigurationGuid, Is.Not.EqualTo(Guid.Empty));
+        }
+
+        [Test, Order(2)]
+        public async Task TestInitiativesExport_Step2()
+        {
+            // arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, InitiativesEndpoint + $"/{ConfigurationGuid}/filter-options");
+            var response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+            var filterOptions = await response.Content.ReadFromJsonAsync<InitiativeFilterOptionsInfo>();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                Assert.That(filterOptions, Is.Not.Null);
+                Assert.That(filterOptions.Workstreams, Is.Not.Null.And.Not.Empty);
+            });
+            var workstream = filterOptions.Workstreams.First().Name;
+            Workstream = workstream;
+        }
+
+        [Test, Order(3)]
+        public async Task TestInitiativesExport_Step3()
+        {
+            // arrange
+            FilterSettings = new
+            {
+                ConfigurationGuid,
+                name = "",
+                status = 0,
+                costDrivers = Array.Empty<string>(),
+                costLeaders = Array.Empty<string>(),
+                owners = Array.Empty<string>(),
+                executiveSponsors = Array.Empty<string>(),
+                workstreams = new string[] { Workstream },
+                rollupColumn1Values = Array.Empty<string>(),
+                rollupColumn2Values = Array.Empty<string>(),
+                rollupColumn3Values = Array.Empty<string>(),
+                groupByCategory = "CostDriver"
+            };
+
+            // act
+            var request = new HttpRequestMessage(HttpMethod.Post, InitiativesEndpoint + "/set-filter-settings");
+            await request.SetContentAsJsonAsync(FilterSettings);
+            var response = await HttpClient.SendAsync(request);
+
+            // assert
+            response.EnsureSuccessStatusCode();
+        }
+
+        [Test, Order(4)]
+        public async Task TestInitiativesExport_Step4()
+        {
+            // arrange
+            var request = new HttpRequestMessage(HttpMethod.Post, InitiativesEndpoint);
+            await request.SetContentAsJsonAsync(FilterSettings);
+            var response = await HttpClient.SendAsync(request);
+
+            // act
+            response.EnsureSuccessStatusCode();
+        }
+
+        [Test, Order(5)]
+        public async Task TestInitiativesExport_Step5()
+        {
+            // arrange
+            var data = new
+            {
+                sortOptions = new
+                {
+                    sortField = "name",
+                    sortOrder = "Asc"
+                },
+                filters = new
+                {
+                    ConfigurationGuid,
+                    name = "",
+                    status = 0,
+                    costDrivers = Array.Empty<string>(),
+                    costLeaders = Array.Empty<string>(),
+                    owners = Array.Empty<string>(),
+                    executiveSponsors = Array.Empty<string>(),
+                    workstreams = new string[] { Workstream },
+                    rollupColumn1Values = Array.Empty<string>(),
+                    rollupColumn2Values = Array.Empty<string>(),
+                    rollupColumn3Values = Array.Empty<string>(),
+                    groupByCategory = "CostDriver"
+                }
+            };
+            var request = new HttpRequestMessage(HttpMethod.Post, InitiativesEndpoint + "/export");
+            await request.SetContentAsJsonAsync(data);
+
+            // act
+            var response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+
+            // assert
+            var headers = response.Content.Headers.Where(x => x.Value != null)
+                .ToDictionary(k => k.Key, v => v.Value);
+            var disposition = headers["Content-Disposition"].First();
+            var regex = new Regex("attachment; filename=Initiatives_[\\d]{2}-[\\d]{2}-[\\d]{4}\\.xlsx; filename\\*=UTF-8''Initiatives_[\\d]{2}-[\\d]{2}-[\\d]{4}\\.xlsx",
+                RegexOptions.IgnoreCase);
+            Assert.That(regex.IsMatch(disposition));
+        }
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestOpportunityControllers.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestOpportunityControllers.cs
new file mode 100644
index 0000000..ef2482b
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestOpportunityControllers.cs
@@ -0,0 +1,167 @@
+using Strata.ApiCommunication.Http;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    [TestFixture(Category = "Integration")]
+    public class TestOpportunityController : ApiTestBase
+    {
+        [TestCaseSource(nameof(OpportunityControllerTestCases))]
+        public async Task OpportunityControllerTest(string testName, string url, string sortField, object? filters, bool exportable)
+        {
+            // arrange
+            var configurations = await GetConfigurations();
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).First();
+            var configurationGuid = configuration.ConfigurationGuid;
+            sortField = sortField ?? "identifiedSavings";
+            filters = filters ?? new
+            {
+                configurationGuid,
+                opportunityTypes = Array.Empty<string>(),
+                identifiedSavings = null as object,
+                viewVisible = true,
+                excludeInitiatives = false,
+                opportunitySearch = ""
+            };
+
+            var data = new
+            {
+                pagingOptions = new
+                {
+                    sortField,
+                    sortOrder = "Desc",
+                    first = 0,
+                    rows = 25
+                },
+                filters,
+            };
+            var request = new HttpRequestMessage(HttpMethod.Post, url);
+            await request.SetContentAsJsonAsync(data);
+
+            // act
+            var response = await HttpClient.SendAsync(request, CancellationToken.None);
+            response.EnsureSuccessStatusCode();
+
+            // asert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+            });
+        }
+
+        [TestCaseSource(nameof(OpportunityControllerTestCases))]
+        public async Task OpportunityControllerFilterTest(string testName, string url, string sortField, object? filters, bool exportable)
+        {
+            // arrange
+            var configurations = await GetConfigurations();
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).First();
+            var configurationGuid = configuration.ConfigurationGuid;
+            var request = new HttpRequestMessage(HttpMethod.Get, url + $"/{configurationGuid}/filter-options");
+
+            // act
+            var response = await HttpClient.SendAsync(request, CancellationToken.None);
+            response.EnsureSuccessStatusCode();
+
+            // asert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+            });
+        }
+
+        [TestCaseSource(nameof(OpportunityControllerTestCases))]
+        public async Task OpportunityControllerFilteExportTest(string testName, string url, string sortField, object? filters, bool exportable)
+        {
+            if (!exportable) { Assert.Ignore(); return; }
+            // arrange
+            var configurations = await GetConfigurations();
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).First();
+            var configurationGuid = configuration.ConfigurationGuid;
+            sortField = sortField ?? "identifiedSavings";
+            filters = filters ?? new
+            {
+                configurationGuid,
+                opportunityTypes = Array.Empty<string>(),
+                identifiedSavings = null as object,
+                viewVisible = true,
+                excludeInitiatives = false,
+                opportunitySearch = ""
+            };
+
+            var data = new
+            {
+                pagingOptions = new
+                {
+                    sortField,
+                    sortOrder = "Desc",
+                    first = 0,
+                    rows = 25
+                },
+                filters,
+            };
+            var request = new HttpRequestMessage(HttpMethod.Post, url + $"/export");
+            await request.SetContentAsJsonAsync(data);
+
+            // act
+            var response = await HttpClient.SendAsync(request, CancellationToken.None);
+            response.EnsureSuccessStatusCode();
+
+            // asert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid(exportable);
+            });
+        }
+
+        public static IEnumerable<TestCaseData> OpportunityControllerTestCases()
+        {
+            yield return new TestCaseData("all opportunities", "/api/v1/all-opportunities", null, new
+            {
+                configurationGuid = "aa4cba4f-2506-462c-8e34-c45b21653988"
+            }, true).SetName("{m} {0}");
+
+            yield return new TestCaseData("charge code opportunities", "/api/v1/charge-code-opps", null, new
+            {
+                configurationGuid = "aa4cba4f-2506-462c-8e34-c45b21653988",
+                opportunityTypes = Array.Empty<string>(),
+                identifiedSavings = null as object,
+                viewVisible = true,
+                excludeInitiatives = false,
+                opportunitySearch = ""
+            }, true).SetName("{m} {0}");
+
+            yield return new TestCaseData("encounter opportunities", "/api/v1/encounter-opportunities", null, null, true)
+                .SetName("{m} {0}");
+
+            yield return new TestCaseData("free form opportunities", "/api/v1/free-form-opportunities", null, null, true)
+                .SetName("{m} {0}");
+
+            yield return new TestCaseData("general ledger opportunities", "/api/v1/general-ledger-opportunities", null, null, true)
+                .SetName("{m} {0}");
+
+            yield return new TestCaseData("payroll opportunities", "/api/v1/payroll-opportunities", null, null, true)
+                .SetName("{m} {0}");
+
+            yield return new TestCaseData("qvi opportunities", "/api/v1/quality-variation-item-opportunities", null, null, true)
+                .SetName("{m} {0}");
+
+            yield return new TestCaseData("qvi breakdowns", "/api/v1/quality-variation-item-breakdowns", "identifiedSavingsTotal", new
+            {
+                exportFiltered = false,
+                configurationGuid = "aa4cba4f-2506-462c-8e34-c45b21653988",
+                identifiedSavings = 0,
+                breakdownIds = Array.Empty<string>(),
+                qualityVariationCases = 0
+            }, false).SetName("{m} {0}");
+
+            yield return new TestCaseData("qvi events", "/api/v1/quality-variation-item-events", "identifiedSavingsTotal", new
+            {
+                configurationGuid = "aa4cba4f-2506-462c-8e34-c45b21653988"
+            }, false).SetName("{m} {0}");
+
+            yield return new TestCaseData("variation opportunities", "/api/v1/variation-opportunities", null, new
+            {
+                configurationGuid = "aa4cba4f-2506-462c-8e34-c45b21653988"
+            }, true).SetName("{m} {0}");
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestSecuirtyController.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestSecuirtyController.cs
new file mode 100644
index 0000000..e871e18
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestSecuirtyController.cs
@@ -0,0 +1,30 @@
+using Strata.ContinuousImprovement.Api.Test.Integration.Info;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http.Json;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture(Category = "Integration")]
+    public class TestSecuirtyController : ApiTestBase
+    {
+        [Test]
+        public async Task TestSecurityIdenties()
+        {
+            // arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "/api/v1/security/identities");
+
+            // act
+            var response = await HttpClient.SendAsync(request);
+            var securityInfos = await response.Content.ReadFromJsonAsync<IEnumerable<SecurityInfo>>();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+                Assert.That(securityInfos, Is.Not.Null.And.Not.Empty);
+                Assert.That(securityInfos.Any(s => s.Title == "Administrator, CCI"), Is.True);
+            });
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestUsersController.cs b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestUsersController.cs
new file mode 100644
index 0000000..2702728
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Integration/Tests/TestUsersController.cs
@@ -0,0 +1,42 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Api.Test.Integration.Tests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture(Category = "Integration")]
+    public class TestUsersController : ApiTestBase
+    {
+        protected const string UsersEndpoint = "api/v1/users";
+
+        [TestCaseSource(nameof(TestUserCases))]
+        public async Task TestUsers(string testName, string url, bool hasCostLeader, bool hasAaronHooper)
+        {
+            // arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, UsersEndpoint + $"/{url}");
+
+            // act
+            var response = await HttpClient.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                response.AssertIsValid();
+            });
+        }
+
+        public static IEnumerable<TestCaseData> TestUserCases()
+        {
+            yield return new TestCaseData("administrators", "administrators", true, false)
+                .SetName("{m} - {0}");
+            yield return new TestCaseData("cost leaders", "cost-leaders", true, false)
+                .SetName("{m} - {0}");
+            yield return new TestCaseData("executive sponsors", "executive-sponsors", true, false)
+                .SetName("{m} - {0}");
+            yield return new TestCaseData("owners", "owners", true, true)
+                .SetName("{m} - {0}");
+            yield return new TestCaseData("users", "users", true, true)
+                .SetName("{m} - {0}");
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/ActionResults/ExcelContentResultTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/ActionResults/ExcelContentResultTests.cs
new file mode 100644
index 0000000..6c44d47
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/ActionResults/ExcelContentResultTests.cs
@@ -0,0 +1,52 @@
+using ClosedXML.Excel;
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using NUnit.Framework;
+using System;
+using System.Threading.Tasks;
+using NUnitSetup = NUnit.Framework.SetUpAttribute;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.ActionResults
+{
+    [TestFixture, Category("Unit"), Category("ContentResult")]
+    public class ExcelContentResultTests
+    {
+        public ExcelContentResult ExcelContentResult { get; set; }
+        public IXLWorkbook Workbook { get; set; }
+
+        [NUnitSetup]
+        public void Setup()
+        {
+            Workbook = new XLWorkbook();
+            Workbook.AddWorksheet();
+            ExcelContentResult = new ExcelContentResult(Workbook, "Export");
+        }
+
+        [Test()]
+        public void ExcelContentResultTest()
+        {
+            // Assert
+            ExcelContentResult.Should().NotBeNull();
+            ExcelContentResult.Workbook.Should().NotBeNull();
+            ExcelContentResult.FileName.Should().NotBeNullOrEmpty();
+        }
+
+        [Test()]
+        public void ExecuteResultTest()
+        {
+            // Arange
+            var actionConext = new ActionContext();
+            Action executeResult = () => ExcelContentResult.ExecuteResult(actionConext);
+
+            executeResult.Should().NotThrow();
+        }
+
+        [Test(), Ignore("We don't currently use this implementation method")]
+        public async Task ExecuteResultAsyncTest()
+        {
+            // Arange
+            var actionConext = new ActionContext();
+            Assert.DoesNotThrowAsync(async () => await ExcelContentResult.ExecuteResultAsync(actionConext));
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/AllOpportunityControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/AllOpportunityControllerTests.cs
new file mode 100644
index 0000000..fd07b15
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/AllOpportunityControllerTests.cs
@@ -0,0 +1,221 @@
+using ClosedXML.Excel;
+using Microsoft.Extensions.Logging;
+using Moq;
+using MoreLinq;
+using NUnit.Framework;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.All;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.All.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Export;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class AllOpportunityControllerTests
+    {
+        public const string ConfigurationGuid = "aa4cba4f-2506-462c-8e34-c45b21653988";
+
+        [TestCaseSource(nameof(GetOpportunityTestCases))]
+        public async Task GetOpportunityTest(bool featureFlagSet, bool featureFlagIsOn, bool isSdtEmployee = true)
+        {
+            var result = await GetPagedApiResponse(featureFlagSet);
+            var service = await GetAllOpportunityService(result);
+            var claimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor(isSdtEmployee: isSdtEmployee);
+            var featureFlagServiceClient = featureFlagSet
+                ? TestUtilities.GetFeatureFlagServiceClient("ciflexibleexplorationenabled", featureFlagIsOn)
+                : Mock.Of<IFeatureFlagServiceClient>();
+            var controller = new AllOpportunitiesController(service, claimsPrincipalAccessor,
+                featureFlagServiceClient,
+                Mock.Of<ILogger<AllOpportunitiesController>>());
+            var pagedResponse = await controller.GetOpportunities(new AllOpportunityLoadOptions
+            {
+                PagingOptions = new PagingOptions { First = 0, Rows = 20, SortField = "IdentifiedSavings", SortOrder = SortOrder.Desc },
+                Filters = new AllFilters
+                {
+                    ConfigurationGuid = new Guid(ConfigurationGuid)
+                }
+            }, CancellationToken.None);
+            Assert.That(result, Is.SameAs(pagedResponse));
+        }
+
+        public static IEnumerable<TestCaseData> GetOpportunityTestCases()
+        {
+            yield return new TestCaseData(true, false, true)
+                .SetName(nameof(GetOpportunityTest) + " FeatureFlag Off SdtEmployee");
+            yield return new TestCaseData(true, true, true)
+                .SetName(nameof(GetOpportunityTest) + " FeatureFlag On SdtEmployee");
+            yield return new TestCaseData(true, false, false)
+                .SetName(nameof(GetOpportunityTest) + " FeatureFlag Off Not SdtEmployee");
+            yield return new TestCaseData(true, true, false)
+                .SetName(nameof(GetOpportunityTest) + " FeatureFlag On Not SdtEmployee");
+            yield return new TestCaseData(false, false, true)
+                .SetName(nameof(GetOpportunityTest) + " No FeatureFlag Off SdtEmployee");
+            yield return new TestCaseData(false, true, true)
+                .SetName(nameof(GetOpportunityTest) + " No FeatureFlag On SdtEmployee");
+            yield return new TestCaseData(false, false, false)
+                .SetName(nameof(GetOpportunityTest) + " No FeatureFlag Off Not SdtEmployee");
+            yield return new TestCaseData(false, true, false)
+                .SetName(nameof(GetOpportunityTest) + " No FeatureFlag On Not SdtEmployee");
+        }
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public async Task GetNameIsValidTest(bool isValid)
+        {
+            var result = await GetPagedApiResponse();
+            var service = await GetAllOpportunityService(result);
+            var claimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor();
+            var firstRow = result.Data.First();
+            var validateName = new ValidateName
+            {
+                ConfigurationGuid = firstRow.ConfigurationGuid,
+                OpportunityGuid = isValid ? Guid.NewGuid() : firstRow.OpportunityGuid,
+                Name = firstRow.Name,
+                OpportunityType = firstRow.OpportunityType
+            };
+            var controller = new AllOpportunitiesController(service, claimsPrincipalAccessor,
+                Mock.Of<IFeatureFlagServiceClient>(),
+                Mock.Of<ILogger<AllOpportunitiesController>>());
+            var isNameValid = await controller.IsNameValid(validateName, CancellationToken.None);
+            Assert.That(isValid, Is.EqualTo(isNameValid));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public async Task GetFilterOptionsTest(bool isSdtEmployee)
+        {
+            var result = await GetPagedApiResponse();
+            var service = await GetAllOpportunityService(result);
+            var claimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor(isSdtEmployee: isSdtEmployee);
+            var controller = new AllOpportunitiesController(service, claimsPrincipalAccessor,
+                Mock.Of<IFeatureFlagServiceClient>(),
+                Mock.Of<ILogger<AllOpportunitiesController>>());
+            var filterOptions = new AllFilterOptions
+            {
+                OpportunityTypes = Enum.GetValues<OpportunityTypes>()
+                .Where(ot => isSdtEmployee || ot != OpportunityTypes.Blank)
+                .Select(ot => new FilterMember { Id = $"{(int)ot}", Text = ot.OpportunityTypeName() })
+            };
+            var options = await controller.GetFilterOptionsAsync(result.Data.First().ConfigurationGuid, CancellationToken.None);
+            filterOptions.OpportunityTypes
+                .ForEach(ot => Assert.That(options.OpportunityTypes.Any(x => x.Id == ot.Id && x.Text == ot.Text), Is.True));
+        }
+
+        [Test, Ignore("Ignoring because we don't have generic GetById endpoint to use here.")]
+        public async Task SetHiddenAsyncTest()
+        {
+            var result = await GetPagedApiResponse();
+            var service = await GetAllOpportunityService(result);
+            var claimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor();
+            var controller = new AllOpportunitiesController(service, claimsPrincipalAccessor,
+                Mock.Of<IFeatureFlagServiceClient>(),
+                Mock.Of<ILogger<AllOpportunitiesController>>());
+            var firstRow = result.Data.First(row => row.OpportunityType == (int)OpportunityTypes.Variation);
+            await controller.SetHiddenAsync(firstRow.OpportunityGuid, !firstRow.IsHidden, CancellationToken.None);
+        }
+
+        public async Task ExcelExportText()
+        {
+            var result = await GetPagedApiResponse();
+            var service = await GetAllOpportunityService(result);
+            var claimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor();
+            var controller = new AllOpportunitiesController(service, claimsPrincipalAccessor,
+                Mock.Of<IFeatureFlagServiceClient>(),
+                Mock.Of<ILogger<AllOpportunitiesController>>());
+            var export = await controller.Export(new AllOpportunityExportOptions
+            {
+                SortOptions = new SortOptions(),
+                Filters = new AllFilters()
+            }, CancellationToken.None);
+            Assert.That(export, Is.AssignableFrom<ExcelContentResult>());
+            var workbook = ((ExcelContentResult)export).Workbook;
+            var filename = ((ExcelContentResult)export).FileName;
+            Assert.Multiple(() =>
+            {
+                Assert.That(workbook.Worksheets.First().Rows().Count(), Is.GreaterThan(result.Data.Count()));
+                Assert.That(filename, Is.Not.Null);
+                Assert.That(filename, Is.Not.Empty);
+            });
+        }
+
+        private async Task<PagedApiResponse<AllOpportunity>> GetPagedApiResponse(bool withExplorationOpportunities = true)
+        {
+            var jeff = new JazzEntityFrameworkFactory();
+            var dbContext = await jeff.CreateDbContextAsync(nameof(AllOpportunityControllerTests), CancellationToken.None);
+            var result = new PagedApiResponse<AllOpportunity>
+            {
+                Data = withExplorationOpportunities
+                    ? dbContext.AllOpportunities
+                    : dbContext.AllOpportunities.Where(opp => opp.OpportunityType != (int)OpportunityTypes.Blank),
+                PagingInfo = new PagingInfo
+                {
+                    ResultsPerPage = 20,
+                    TotalNumberOfResults = dbContext.AllOpportunities.Count(),
+                    TotalPages = dbContext.AllOpportunities.Count() / 20,
+                    PageNumber = 1
+                }
+            };
+            return result;
+        }
+
+        private async Task<IAllOpportunityService> GetAllOpportunityService(PagedApiResponse<AllOpportunity> pagedApiResponse = null)
+        {
+            var jeff = new JazzEntityFrameworkFactory();
+            var dbContext = await jeff.CreateDbContextAsync(nameof(AllOpportunityControllerTests), CancellationToken.None);
+            var service = Mock.Of<IAllOpportunityService>();
+            Mock.Get(service)
+                    .Setup(s => s.GetPagedAsync(It.IsAny<PagingOptions>(), It.IsAny<IFilters<AllOpportunity>>(), It.IsAny<CancellationToken>()))
+                    .Returns(Task.FromResult(pagedApiResponse ?? await GetPagedApiResponse()));
+            Mock.Get(service)
+                .Setup(s => s.NameIsValid(It.IsAny<Guid>(), It.IsAny<int>(), It.IsAny<string>(), It.IsAny<Guid?>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, int, string, Guid?, CancellationToken>((config, oppType, name, oppGuid, token)
+                    => Task.FromResult(!dbContext.AllOpportunities.Any(opp
+                        => opp.ConfigurationGuid == config
+                        && opp.OpportunityType == oppType
+                        && opp.OpportunityGuid == oppGuid
+                        && opp.Name.Equals(name, StringComparison.CurrentCultureIgnoreCase))));
+            var filterOptions = new AllFilterOptions
+            {
+                OpportunityTypes = Enum.GetValues<OpportunityTypes>()
+                .Select(ot => new FilterMember { Id = $"{(int)ot}", Text = ot.OpportunityTypeName() })
+            };
+            Mock.Get(service)
+                .Setup(s => s.GetFilterOptionsAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, CancellationToken>((config, token) => Task.FromResult(filterOptions));
+
+            var exportOptions = new ExportOptions() { EmptyMessage = "No Opportunities" };
+            // configure column formats
+            exportOptions.AddColumnOptions("Identified Savings", "Currency2Dec");
+            exportOptions.AddColumnOptions("Is Hidden", "\"Yes\";-;\"No\"");
+            var xlWorkbook = (IXLWorkbook)ExportUtils.CreateExcelWorkbook(dbContext.AllOpportunities, exportOptions);
+            Mock.Get(service)
+                .Setup(s => s.ExportAsync(It.IsAny<SortOptions>(), It.IsAny<AllFilters>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(xlWorkbook));
+            Mock.Get(service)
+                .Setup(s => s.SetHiddenAsync(It.IsAny<Guid>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.CompletedTask);
+            Mock.Get(service)
+                .Setup(s => s.SetNoteAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.CompletedTask);
+            Mock.Get(service)
+                .Setup(s => s.GetById(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, CancellationToken>((oppGuid, token) => Task.FromResult(dbContext.AllOpportunities.FirstOrDefault(opp => opp.OpportunityGuid == oppGuid)));
+            return service;
+        }
+
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ChargeCodeInitiativesControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ChargeCodeInitiativesControllerTests.cs
new file mode 100644
index 0000000..9de8621
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ChargeCodeInitiativesControllerTests.cs
@@ -0,0 +1,85 @@
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class ChargeCodeInitiativesControllerTests
+    {
+
+        [TestCaseSource(nameof(DevDbTestCases1))]
+        [TestCaseSource(nameof(TestCases))]
+        public async Task Test(ChargeCodeInitiativesController controller, Guid opportunityGuid, Guid expected)
+        {
+            var dto = new InitiativeDto
+            {
+                OpportunityGuid = opportunityGuid,
+                TrackingStart = DateTime.Now.ToString("yyyy/MM/dd")
+            };
+            var result = await controller.Create(dto, CancellationToken.None);
+            var actual = result.Value;
+            actual.Should().Be(expected);
+        }
+
+
+        public static IEnumerable<TestCaseData> DevDbTestCases1()
+        {
+            var foundOpportunityGuid = Guid.NewGuid();
+            var notFoundOpportunityGuid = Guid.NewGuid();
+            var newInitiative = Guid.NewGuid();
+            var stakeholderUsers = Mock.Of<IStakeholderUser>();
+            var clientClaimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor();
+            var service = Mock.Of<ICCInitiativeService>();
+            Mock.Get(service)
+                .Setup(s => s.CreateChargeCodeInitiative(It.IsAny<Guid>(), It.IsAny<Initiative>(),
+                    It.IsIn(new[] { foundOpportunityGuid }.AsEnumerable()), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(newInitiative));
+            var controller = new ChargeCodeInitiativesController(clientClaimsPrincipalAccessor, service, stakeholderUsers);
+
+            var notFoundService = Mock.Of<ICCInitiativeService>();
+            Mock.Get(notFoundService)
+                .Setup(s => s.CreateChargeCodeInitiative(It.IsAny<Guid>(), It.IsAny<Initiative>(),
+                    It.IsNotIn(new[] { foundOpportunityGuid }.AsEnumerable()), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(Guid.Empty));
+            var notFoundController = new ChargeCodeInitiativesController(clientClaimsPrincipalAccessor, notFoundService, stakeholderUsers);
+
+            yield return new TestCaseData(controller, foundOpportunityGuid, newInitiative)
+                .SetName("Dev Db Opportunity Found");
+            yield return new TestCaseData(controller, notFoundOpportunityGuid, Guid.Empty)
+                .SetName("Dev Db Opportunity Not Found");
+            yield return new TestCaseData(notFoundController, notFoundOpportunityGuid, Guid.Empty)
+                .SetName("Dev Db Opportunity Not Found 1");
+        }
+
+        public static IEnumerable<TestCaseData> TestCases()
+        {
+            var foundOpportunityGuid = Guid.NewGuid();
+            var notFoundOpportunityGuid = Guid.NewGuid();
+            var stakeholderUsers = Mock.Of<IStakeholderUser>();
+            var service = Mock.Of<ICCInitiativeService>();
+            Mock.Get(service)
+                .Setup(s => s.CreateChargeCodeInitiative(It.IsIn(new[] { new Guid(TestUtilities.ClientDbGuid) }.AsEnumerable()),
+                    It.IsAny<Initiative>(), It.IsIn(new[] { foundOpportunityGuid }.AsEnumerable()), It.IsAny<CancellationToken>()))
+                .Throws<Exception>();
+            var clientClaimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor(isClientDatabase: true);
+            var controller = new ChargeCodeInitiativesController(clientClaimsPrincipalAccessor, service, stakeholderUsers);
+
+            yield return new TestCaseData(controller, foundOpportunityGuid, Guid.Empty)
+                .SetName("Client Db Opportunity Found");
+            yield return new TestCaseData(controller, notFoundOpportunityGuid, Guid.Empty)
+                .SetName("Client Db Opportunity Not Found");
+        }
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ChargeCodeOpportunitiesControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ChargeCodeOpportunitiesControllerTests.cs
new file mode 100644
index 0000000..f966234
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ChargeCodeOpportunitiesControllerTests.cs
@@ -0,0 +1,374 @@
+using ClosedXML.Excel;
+using DocumentFormat.OpenXml.Drawing.Diagrams;
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.OrgDefined;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub.Generics;
+using Strata.CoreLib.Claims;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnitSetup = NUnit.Framework.SetUpAttribute;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class ChargeCodeOpportunitiesControllerTests
+    {
+        public JazzDbContext DbContext { get; set; }
+        public ChargeCodeOpportunitiesController Controller { get; set; }
+        public IEnumerable<Biz.Configuration.Configuration> Configurations { get; set; }
+        public IClaimsPrincipalAccessor ClaimsPrincipalAccessor { get; set; }
+        public IConfigurationService ConfigurationService { get; set; }
+        public ICCOpportunityService OpportunityService;
+        public ICCInitiativeService InitiativeService;
+        public IOpportunityMetricCohortService OpportunityMetricCohortService;
+        public IFeatureFlagServiceClient FeatureFlagServiceClient;
+        public IAllOpportunityService AllOpportunityService;
+
+        [OneTimeSetUp]
+        public async Task ConfigurationsControllerTestSetup()
+        {
+            // Arrange
+            var jeff = new JazzEntityFrameworkFactory();
+            DbContext = await jeff.CreateDbContextAsync(nameof(ConfigurationsControllerTests), CancellationToken.None);
+            Configurations = jeff.Configurations.ToList();
+            var configuration = jeff.Configurations.First(c => c.ConfigurationGuid == JazzEntityFrameworkFactory.CurrentConfigurationGuid);
+            var ccOpportunityDataModel = jeff.CCOpportunities[0].MapToDataModel(configuration);
+            var workbook = new XLWorkbook();
+
+            // Act
+            ClaimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor();
+            FeatureFlagServiceClient = TestUtilities.GetFeatureFlagServiceClient("chargecodebeta", true);
+            ConfigurationService = Mock.Of<IConfigurationService>();
+            Mock.Get(ConfigurationService)
+                .Setup(s => s.GetConfigurationsAsync(It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(Configurations.AsEnumerable()));
+            Mock.Get(ConfigurationService)
+                .Setup(s => s.GetConfigurationAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(configuration));
+            AllOpportunityService = Mock.Of<IAllOpportunityService>();
+            Mock.Get(AllOpportunityService)
+                .Setup(s => s.NameIsValid(It.IsAny<Guid>(), It.IsAny<int>(), It.IsAny<string>(), It.IsAny<Guid?>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            OpportunityService = Mock.Of<ICCOpportunityService>();
+            Mock.Get(OpportunityService)
+                .Setup(s => s.UpdateAsync(It.IsAny<Guid>(), It.IsAny<CCOpportunityDataModel>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(Guid.NewGuid().ToString()));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.ValidateChargeCodesAsync(It.IsAny<List<string>>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.ValidateOpportunityLevelsAsync(It.IsAny<OpportunityLevel>(), It.IsAny<List<string>>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.DeleteAsync<CCOpportunityDataModel>(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.GetById(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, CancellationToken>((oppGuid, token)
+                    => oppGuid == ccOpportunityDataModel.OpportunityGuid
+                        ? Task.FromResult(ccOpportunityDataModel)
+                        : Task.FromResult((CCOpportunityDataModel)null));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.ExportAsync(It.IsAny<Guid>(), It.IsAny<IEnumerable<string>>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, IEnumerable<string>, string, CancellationToken>((oppGuid, chargeCodes, userName, token)
+                    => oppGuid == ccOpportunityDataModel.OpportunityGuid
+                        ? Task.FromResult(((IXLWorkbook)workbook))
+                        : Task.FromResult(((IXLWorkbook)null)));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.UpdateGoalTotalUnitsOfServiceAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<double>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, string, double, CancellationToken>((oppGuid, key, value, token)
+                    => oppGuid == ccOpportunityDataModel.OpportunityGuid
+                        ? Task.FromResult(true)
+                        : Task.FromResult(false));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.UpdateGoalCostPerUnitAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<double>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, string, double, CancellationToken>((oppGuid, key, goalValue, token)
+                    => oppGuid == ccOpportunityDataModel.OpportunityGuid
+                        ? Task.FromResult(true)
+                        : Task.FromResult(false));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.GetInitiativeInfoAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(new InitiativeInfo()));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.RefreshOpportunityTrackingData(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, Guid, CancellationToken>((dbGuid, oppGuid, token)
+                    => dbGuid.ToString() == TestUtilities.DbGuid && oppGuid == ccOpportunityDataModel.OpportunityGuid
+                        ? Task.FromResult("Good")
+                        : Task.FromResult(""));
+            InitiativeService = Mock.Of<ICCInitiativeService>();
+            Mock.Get(InitiativeService)
+                .Setup(s => s.UpdateSavings(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            OpportunityMetricCohortService = Mock.Of<IOpportunityMetricCohortService>();
+        }
+
+        [NUnitSetup]
+        public void TestSetup()
+        {
+            // Arrange
+            Controller = new ChargeCodeOpportunitiesController(ClaimsPrincipalAccessor, ConfigurationService, OpportunityService, InitiativeService, OpportunityMetricCohortService, FeatureFlagServiceClient, AllOpportunityService);
+        }
+
+        [Test()]
+        public void ChargeCodeOpportunitiesControllerTest()
+        {
+            // Act
+            var controller = new ChargeCodeOpportunitiesController(ClaimsPrincipalAccessor, ConfigurationService, OpportunityService, InitiativeService, OpportunityMetricCohortService, FeatureFlagServiceClient, AllOpportunityService);
+
+            // Assert
+            controller.Should().NotBeNull();
+        }
+
+        [Test()]
+        public async Task UpdateOpportunityTest()
+        {
+            // Arrange
+            var opp = await DbContext.ChargeCodeOpportunities.FirstOrDefaultAsync(CancellationToken.None);
+            var opportunity = opp.MapToSaveModel();
+
+            // Act
+            var result = await Controller.UpdateOpportunity(opportunity.OpportunityGuid, opportunity, CancellationToken.None);
+
+            // Assert
+            var actual = result.Result;
+            result.Result.Should().BeOfType<OkObjectResult>();
+            var okResult = (OkObjectResult)result.Result;
+            okResult.Value.Should().BeOfType<string>();
+            var value = new Guid(okResult.Value as string);
+            value.Should().NotBeEmpty();
+        }
+
+        [Test()]
+        public async Task ValidateChargeCodesAsyncTest()
+        {
+            // Arrange
+            var chargeCodes = new List<string>();
+
+            // Act
+            var result = await Controller.ValidateChargeCodesAsync(new ChargeCodeOpportunitiesController.ValidateChargeCodeDto() { ChargeCodes = chargeCodes }, CancellationToken.None);
+
+            // Assert
+            result.Result.Should().BeOfType<OkObjectResult>();
+            var okResult = (OkObjectResult)result.Result;
+            okResult.Value.Should().BeOfType<bool>();
+            var value = (bool)okResult.Value;
+            value.Should().BeTrue();
+        }
+
+        [Test()]
+        public async Task GetCustomPickerChargeCodesAsyncTest()
+        {
+            // Arrange
+            var chargeCodes = new List<string>();
+
+            // Act
+            var result = await Controller.GetChargeCodeMembers(chargeCodes, CancellationToken.None);
+
+            // Assert
+            result.Result.Should().BeOfType<OkObjectResult>();
+            var okResult = (OkObjectResult)result.Result;
+            okResult.Value.Should().BeOfType<ChargeCodePickerModel[]>();
+            var value = (ChargeCodePickerModel[])okResult.Value;
+            value.Should().NotBeNull();
+        }
+
+        [Test()]
+        public async Task ValidateOpportunityLevelsAsyncTest()
+        {
+            // Arrange
+            var info = new ChargeCodeOpportunitiesController.OpportunityLevelSelectionInfo
+            {
+                Configuration = Configurations.First().ConfigurationGuid,
+                OpportunityLevel = OpportunityLevel.Entity,
+                OpportunityLevels = new List<string>()
+            };
+
+            // Act
+            var result = await Controller.ValidateOpportunityLevelsAsync(info, CancellationToken.None);
+
+            // Assert
+            result.Result.Should().BeOfType<OkObjectResult>();
+            var okResult = (OkObjectResult)result.Result;
+            okResult.Value.Should().BeOfType<bool>();
+            var value = (bool)okResult.Value;
+            value.Should().BeTrue();
+        }
+
+        [Test()]
+        public async Task DeleteTest()
+        {
+            // Act
+            var result = await Controller.Delete(Guid.NewGuid(), CancellationToken.None);
+
+            // Assert
+            result.Should().BeTrue();
+        }
+
+        [TestCase(true, TestName = "GetByIdTest - true")]
+        [TestCase(false, TestName = "GetByIdTest - false")]
+        public async Task GetByIdTest(bool withOpp)
+        {
+            // Arrange
+            var opp = await DbContext.ChargeCodeOpportunities.FirstAsync(CancellationToken.None);
+
+            // Act
+            var result = await Controller.GetById(withOpp ? opp.OpportunityGuid : Guid.NewGuid(), CancellationToken.None);
+
+            // Assert
+            if (withOpp)
+            {
+                result.Result.Should().BeOfType<OkObjectResult>();
+                var okResult = (OkObjectResult)result.Result;
+                okResult.Value.Should().BeOfType<CCOpportunityDto>()
+                    .And.NotBeOfType<CCOpportunityDataModel>();
+            }
+            else
+            {
+                result.Result.Should().BeOfType<NotFoundResult>();
+            }
+        }
+
+        [TestCase(true, TestName = "GetEditModelTest - true")]
+        [TestCase(false, TestName = "GetEditModelTest - false")]
+        public async Task GetEditModelTest(bool withOpp)
+        {
+            // Arrange
+            var opp = await DbContext.ChargeCodeOpportunities.FirstAsync(CancellationToken.None);
+
+            // Act
+            var result = await Controller.GetEditModel(withOpp ? opp.OpportunityGuid : Guid.NewGuid(), CancellationToken.None);
+
+            // Assert
+            if (withOpp)
+            {
+                result.Should().BeOfType<CCOpportunitySaveModel>();
+            }
+            else
+            {
+                result.Should().BeNull();
+            }
+        }
+
+        [TestCase(true, TestName = "UpdateGoalTotalUnitsOfServiceTest - true")]
+        [TestCase(false, TestName = "UpdateGoalTotalUnitsOfServiceTest - false")]
+        public async Task UpdateGoalTotalUnitsOfServiceTest(bool withOpp)
+        {
+            // Arrange
+            var opp = await DbContext.ChargeCodeOpportunities.FirstAsync(CancellationToken.None);
+
+            // Act
+            var result = await Controller.UpdateGoalTotalUnitsOfService(withOpp ? opp.OpportunityGuid : Guid.NewGuid(), new ChargeCodeOpportunitiesController.GoalSetDto(), CancellationToken.None);
+
+            // Assert
+            result.Should().Be(withOpp);
+        }
+
+        [TestCase(true, TestName = "UpdateGoalCostPerUnitTest - true")]
+        [TestCase(false, TestName = "UpdateGoalCostPerUnitTest - false")]
+        public async Task UpdateGoalCostPerUnitTest(bool withOpp)
+        {
+            // Arrange
+            var opp = await DbContext.ChargeCodeOpportunities.FirstAsync(CancellationToken.None);
+
+            // Act
+            var result = await Controller.UpdateGoalCostPerUnit(withOpp ? opp.OpportunityGuid : Guid.NewGuid(), new ChargeCodeOpportunitiesController.GoalSetDto(), CancellationToken.None);
+
+            // Assert
+            result.Should().Be(withOpp);
+        }
+
+        [TestCase(true, TestName = "ExportTest - true")]
+        [TestCase(false, TestName = "ExportTest - false")]
+        public async Task ExportTest(bool withOpp)
+        {
+            // Arrange
+            var opp = await DbContext.ChargeCodeOpportunities.FirstAsync(CancellationToken.None);
+            var chargeCodeItems = new ChargeCodeOpportunitiesController.ChargeCodeItems
+            {
+                ChargeCodes = new List<string>()
+            };
+
+            // Act
+            var result = await Controller.Export(withOpp ? opp.OpportunityGuid : Guid.NewGuid(), chargeCodeItems, CancellationToken.None);
+
+            // Assert
+            result.Should().BeOfType<ExcelContentResult>();
+            var excelContentResult = (ExcelContentResult)result;
+            if (withOpp)
+            {
+                excelContentResult.Workbook.Should().NotBeNull();
+            }
+            else
+            {
+                excelContentResult.Workbook.Should().BeNull();
+            }
+        }
+
+        [Test()]
+        public async Task OpportunityCreateEnabledTest()
+        {
+            // Act
+            var result = await Controller.OpportunityCreateEnabled(CancellationToken.None);
+
+            // Assert
+            result.Should().BeTrue();
+        }
+
+        [Test()]
+        public async Task GetInitiativeInfoTest()
+        {
+            // Act
+            var result = await Controller.GetInitiativeInfo(Guid.NewGuid(), CancellationToken.None);
+
+            // Assert
+            result.Should().BeOfType<InitiativeInfo>()
+                .And.NotBeNull();
+        }
+
+        [TestCase(true, TestName = "RefreshTest - true")]
+        [TestCase(false, TestName = "RefreshTest - false")]
+        public async Task RefreshTest(bool withOpp)
+        {
+            // Arrange
+            var opp = await DbContext.ChargeCodeOpportunities.FirstAsync(CancellationToken.None);
+
+            // Act
+            var result = await Controller.Refresh(new ChargeCodeOpportunitiesController.RefreshData
+            {
+                DatabaseGuid = new Guid(TestUtilities.DbGuid),
+                Guid = withOpp ? opp.OpportunityGuid : Guid.NewGuid()
+            }, CancellationToken.None);
+
+            // Assert
+            result.Should().BeOfType<string>();
+            if (withOpp)
+            {
+                result.Should().NotBeNullOrEmpty();
+            }
+            else
+            {
+                result.Should().BeNullOrEmpty();
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ChargeCodeOpportunityDetailsControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ChargeCodeOpportunityDetailsControllerTests.cs
new file mode 100644
index 0000000..f1c6bc0
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ChargeCodeOpportunityDetailsControllerTests.cs
@@ -0,0 +1,127 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Api.Test.Unit.Generics;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Jobs;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class ChargeCodeOpportunityDetailsControllerTests
+    {
+        public ChargeCodeOpportunityDetailsController Controller { get; set; }
+        public FakeBackgroundJobClient BackgroundJobClient { get; set; }
+        private Mock<ICCOpportunityClientJob> _mockClientJob;
+        private ILogger<ChargeCodeOpportunityDetailsController> _logger;
+
+        [OneTimeSetUp]
+        public void TestSetup()
+        {
+            // Arrange
+            BackgroundJobClient ??= new FakeBackgroundJobClient();
+            _mockClientJob = new Mock<ICCOpportunityClientJob>();
+            _logger = Mock.Of<ILogger<ChargeCodeOpportunityDetailsController>>();
+
+            _mockClientJob
+                .Setup(j => j.RefreshClientOpportunityBaselineDetails(It.IsAny<int>(), It.Is<Guid>(g => g != Guid.Empty), It.IsAny<CancellationToken>()))
+                .ReturnsAsync("baseline-job-123");
+            _mockClientJob
+                .Setup(j => j.RefreshClientOpportunityTrackingDetails(It.IsAny<int>(), It.Is<Guid>(g => g != Guid.Empty), It.IsAny<CancellationToken>()))
+                .ReturnsAsync("tracking-job-456");
+            _mockClientJob
+                .Setup(j => j.RefreshClientOpportunityBaselineDetails(It.IsAny<int>(), Guid.Empty, It.IsAny<CancellationToken>()))
+                .ThrowsAsync(new InvalidOperationException("Opportunity missing"));
+            _mockClientJob
+                .Setup(j => j.RefreshClientOpportunityTrackingDetails(It.IsAny<int>(), Guid.Empty, It.IsAny<CancellationToken>()))
+                .ThrowsAsync(new InvalidOperationException("Initiative missing"));
+
+            Controller = new ChargeCodeOpportunityDetailsController(BackgroundJobClient, _mockClientJob.Object, _logger);
+        }
+
+        [Test]
+        public void ChargeCodeOpportunityDetailsControllerTest()
+        {
+            // Arrange
+            var controller = new ChargeCodeOpportunityDetailsController(BackgroundJobClient, _mockClientJob.Object, _logger);
+
+            // Assert
+            controller.Should().NotBeNull();
+        }
+
+        [Test]
+        public void CreateTest()
+        {
+            // Arrange
+            Action create = () => Controller.Create(new ChargeCodeOpportunityDetailsController.ChargeCodeDetailInfo
+            {
+                StrataId = 9,
+                OpportunityGuid = Guid.NewGuid(),
+                IsBaseline = true,
+                IsUpdate = true
+            }, CancellationToken.None);
+
+            // Assert
+            create.Should().NotThrow();
+        }
+
+        [Test]
+        public async Task RefreshBaselineDetails_ReturnsOk_OnSuccess()
+        {
+            var request = new ChargeCodeOpportunityDetailsController.ChargeCodeOpportunityJobRequestInfo
+            {
+                StrataId = 9,
+                OpportunityGuid = Guid.NewGuid()
+            };
+
+            var result = await Controller.RefreshBaselineDetails(request, CancellationToken.None);
+            var ok = result.Should().BeOfType<OkObjectResult>().Subject;
+            ok.Value.Should().Be("baseline-job-123");
+        }
+
+        [Test]
+        public async Task RefreshTrackingDetails_ReturnsOk_OnSuccess()
+        {
+            var request = new ChargeCodeOpportunityDetailsController.ChargeCodeOpportunityJobRequestInfo
+            {
+                StrataId = 9,
+                OpportunityGuid = Guid.NewGuid()
+            };
+
+            var result = await Controller.RefreshTrackingDetails(request, CancellationToken.None);
+            var ok = result.Should().BeOfType<OkObjectResult>().Subject;
+            ok.Value.Should().Be("tracking-job-456");
+        }
+
+        [Test]
+        public async Task RefreshBaselineDetails_ReturnsBadRequest_OnException()
+        {
+            var request = new ChargeCodeOpportunityDetailsController.ChargeCodeOpportunityJobRequestInfo
+            {
+                StrataId = 9,
+                OpportunityGuid = Guid.Empty
+            };
+
+            var result = await Controller.RefreshBaselineDetails(request, CancellationToken.None);
+            result.Should().BeOfType<BadRequestResult>();
+        }
+
+        [Test]
+        public async Task RefreshTrackingDetails_ReturnsBadRequest_OnException()
+        {
+            var request = new ChargeCodeOpportunityDetailsController.ChargeCodeOpportunityJobRequestInfo
+            {
+                StrataId = 9,
+                OpportunityGuid = Guid.Empty
+            };
+
+            var result = await Controller.RefreshTrackingDetails(request, CancellationToken.None);
+            result.Should().BeOfType<BadRequestResult>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ChargeCodeOppsControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ChargeCodeOppsControllerTests.cs
new file mode 100644
index 0000000..9481d22
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ChargeCodeOppsControllerTests.cs
@@ -0,0 +1,218 @@
+using ClosedXML.Excel;
+using FluentAssertions;
+using Microsoft.EntityFrameworkCore;
+using Moq;
+using NUnit.Framework;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Initiatives;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnitSetup = NUnit.Framework.SetUpAttribute;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class ChargeCodeOppsControllerTests
+    {
+        public JazzDbContext DbContext { get; set; }
+        public ChargeCodeOppsController Controller { get; set; }
+        public ICommentService CommentService { get; set; }
+        public ICCOpportunityViewService OpportunityService { get; set; }
+        public ICCInitiativeService InitiativeService { get; set; }
+
+        [OneTimeSetUp]
+        public async Task ConfigurationsControllerTestSetup()
+        {
+            // Arrange
+            var jeff = new JazzEntityFrameworkFactory();
+            DbContext = await jeff.CreateDbContextAsync(nameof(ChargeCodeOppsControllerTests), CancellationToken.None);
+            var expectedData = jeff.CCOpportunities;
+            var expected = expectedData[0];
+            var expectedage = new PagedApiResponse<CCOpportunity>
+            {
+                Data = expectedData,
+                PagingInfo = new PagingInfo
+                {
+                    TotalNumberOfResults = expectedData.Count,
+                    TotalPages = 1,
+                    ResultsPerPage = expectedData.Count,
+                    PageNumber = 1
+                }
+            };
+            var workbook = new XLWorkbook();
+            workbook.AddWorksheet("ChargeCodeOpps");
+            CommentService = Mock.Of<ICommentService>();
+            OpportunityService = Mock.Of<ICCOpportunityViewService>();
+            Mock.Get(OpportunityService)
+                .Setup(s => s.GetPagedAsync(It.IsAny<PagingOptions>(), It.IsAny<IFilters<CCOpportunity>>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(expectedage));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.ExportAsync(It.IsAny<SortOptions>(), It.IsAny<CCFilters>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult((IXLWorkbook)workbook));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.GetFilterOptionsAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(new CCFilterOptions()));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.GetById(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, CancellationToken>((oppGuid, token)
+                    => oppGuid == expected.OpportunityGuid
+                        ? Task.FromResult(expected)
+                        : Task.FromResult((CCOpportunity)null));
+            var hiddenExpected = expected.IsHidden = !expectedData[0].IsHidden;
+            Mock.Get(OpportunityService)
+                .Setup(s => s.SetHiddenAsync(It.IsAny<Guid>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, bool, CancellationToken>((oppGuid, isHidden, token)
+                    => oppGuid == expected.OpportunityGuid
+                        ? Task.CompletedTask
+                        : Task.FromResult((CCOpportunity)null));
+            Mock.Get(OpportunityService)
+                .Setup(s => s.SetNoteAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, string, CancellationToken>((oppGuid, note, token)
+                    => oppGuid == expected.OpportunityGuid
+                        ? Task.CompletedTask
+                        : Task.FromResult((CCOpportunity)null));
+            InitiativeService = Mock.Of<ICCInitiativeService>();
+        }
+
+        [NUnitSetup]
+        public void TestSetup()
+        {
+            // Arrange
+            Controller = new ChargeCodeOppsController(OpportunityService);
+        }
+
+        [Test()]
+        public void ChargeCodeOppsControllerTest()
+        {
+            Controller.Should().NotBeNull();
+        }
+
+        [Test()]
+        public async Task GetOpportunitiesTest()
+        {
+            // Arrange
+            var loadOptions = new ChargeCodeOppsController.CCOpportunityLoadOptions
+            {
+                PagingOptions = new PagingOptions
+                {
+                    First = 1,
+                    Rows = int.MaxValue,
+                    SortField = "IdentifiedSavings",
+                    SortOrder = SortOrder.Desc
+                },
+                Filters = new CCFilters
+                {
+                    ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid
+                }
+            };
+
+            // Act
+            var result = await Controller.GetOpportunities(loadOptions, CancellationToken.None);
+
+            // Assert
+            result.Should().BeOfType<PagedApiResponse<CCOpportunity>>();
+            result.PagingInfo.Should().NotBeNull();
+            result.Data.Should().NotBeNull();
+            result.Data.Count().Should().Be(result.PagingInfo.TotalNumberOfResults);
+        }
+
+        [Test()]
+        public async Task ExportTest()
+        {
+            // Arrange
+            var exportOptions = new ChargeCodeOppsController.CCOpportunityExportOptions
+            {
+                Filters = new CCFilters
+                {
+                    ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid
+                }
+            };
+
+            // Act
+            var result = await Controller.Export(exportOptions, CancellationToken.None);
+
+            // Assert
+            result.Should().NotBeNull();
+            result.Should().BeOfType<ExcelContentResult>();
+            var excelContentResult = result as ExcelContentResult;
+            excelContentResult.Should().NotBeNull();
+            excelContentResult.FileName.Should().NotBeNullOrEmpty();
+            excelContentResult.Workbook.Should().NotBeNull();
+        }
+
+        [Test()]
+        public async Task GetFilterOptionsAsyncTest()
+        {
+            // Act
+            var result = await Controller.GetFilterOptionsAsync(JazzEntityFrameworkFactory.CurrentConfigurationGuid, CancellationToken.None);
+
+            // Assert
+            result.Should().NotBeNull();
+            result.Should().BeOfType<CCFilterOptions>();
+        }
+
+        // commenting out because we don't have getById endpoint test should be redone
+        [TestCase(true, TestName = "GetByIdTest - true", Ignore = "When I debug it passes, otherwise it doesn't")]
+        [TestCase(false, TestName = "GetByIdTest - false")]
+        public async Task GetByIdTest(bool withOpp)
+        {
+            //// Arrange
+            //var opp = await DbContext.ChargeCodeOpps.FirstOrDefaultAsync(CancellationToken.None);
+
+            //// Act
+
+            ////var result = await Controller.GetById(withOpp ? opp.OpportunityGuid : Guid.NewGuid(), CancellationToken.None);
+
+            //// Assert
+            //if (withOpp)
+            //{
+            //    result.Should().NotBeNull();
+            //}
+            //else
+            //{
+            //    result.Should().BeNull();
+            //}
+        }
+
+        [TestCase(true, true, TestName = "SetHiddenAsyncTest - true - isHidden")]
+        [TestCase(true, false, TestName = "SetHiddenAsyncTest - true - not isHidden")]
+        [TestCase(false, true, TestName = "SetHiddenAsyncTest - false - isHidden")]
+        [TestCase(false, false, TestName = "SetHiddenAsyncTest - false - not isHidden")]
+        public async Task SetHiddenAsyncTest(bool withOpp, bool isHidden)
+        {
+            // Arrange
+            var opp = await DbContext.ChargeCodeOpps.FirstOrDefaultAsync(CancellationToken.None);
+            var opportunityGuid = withOpp ? opp.OpportunityGuid : Guid.NewGuid();
+
+            // Assert
+            Assert.DoesNotThrowAsync(async () => // Act
+                await Controller.SetHiddenAsync(opportunityGuid, isHidden, CancellationToken.None));
+        }
+
+        [TestCase(true, "", TestName = "SetNoteAsyncTest - true - note")]
+        [TestCase(true, null, TestName = "SetNoteAsyncTest - true - null")]
+        [TestCase(false, "", TestName = "SetNoteAsyncTest - false - not")]
+        [TestCase(false, null, TestName = "SetNoteAsyncTest - false - null")]
+        public async Task SetNoteAsyncTest(bool withOpp, string note)
+        {
+            // Arrange
+            var opp = await DbContext.ChargeCodeOpps.FirstOrDefaultAsync(CancellationToken.None);
+            var opportunityGuid = withOpp ? opp.OpportunityGuid : Guid.NewGuid();
+
+            // Assert
+            Assert.DoesNotThrowAsync(async () => // Act
+                await Controller.SetNoteAsync(opportunityGuid, note, CancellationToken.None));
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ClientNetworkOpportunitiesControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ClientNetworkOpportunitiesControllerTests.cs
new file mode 100644
index 0000000..c61983f
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ClientNetworkOpportunitiesControllerTests.cs
@@ -0,0 +1,377 @@
+using DocumentFormat.OpenXml.Drawing.Diagrams;
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Api.Test.Unit.Generics;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.CoreLib.Claims;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnitSetup = NUnit.Framework.SetUpAttribute;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class ClientNetworkOpportunitiesControllerTests
+    {
+        public CentralDbContext DbContext { get; set; }
+        public ClientNetworkOpportunitiesController Controller { get; set; }
+        public ClientNetworkOpportunitiesController EmptyDbController { get; set; }
+        public ClientNetworkOpportunitiesController ControllerExceptions { get; set; }
+        public IClaimsPrincipalAccessor ClaimsPrincipalAccessor { get; set; }
+        public IClaimsPrincipalAccessor EnptyDbClaimsPrincipalAccessor { get; set; }
+        public IClientNetworkOpportunityService ClientNetworkOpportunityService { get; set; }
+        public IClientNetworkOpportunityService ClientNetworkOpportunityServiceException { get; set; }
+        public ILogger<ClientNetworkOpportunitiesController> Logger { get; set; }
+
+        [OneTimeSetUp]
+        public async Task ClientNetworkOpportunitiesControllerTestsSetup()
+        {
+            // Arrange
+            var jeff = new JazzEntityFrameworkFactory();
+            DbContext = await jeff.CreateCentralDbContextAsync(nameof(ClientNetworkOpportunitiesControllerTests), CancellationToken.None);
+            var expectedData = jeff.ClientNetworkOpportunities;
+            var opportunity = expectedData[0];
+            var expected = new PagedApiResponse<NetworkOpportunitySummary>
+            {
+                Data = expectedData.Select(d => new NetworkOpportunitySummary
+                {
+                    NetworkOpportunityId = d.NetworkOpportunityId,
+                    Name = d.NetworkOpportunity.Name,
+                    AnalyticsWorkbookId = d.AnalyticsWorkbookId,
+                    CostDriver = d.NetworkOpportunity.CostDriver,
+                    Description = d.NetworkOpportunity.Description,
+                    IsPublished = d.IsPublished
+                }),
+                PagingInfo = new PagingInfo
+                {
+                    PageNumber = 1,
+                    TotalNumberOfResults = expectedData.Count,
+                    TotalPages = 1,
+                    ResultsPerPage = expectedData.Count
+                }
+            };
+
+            // Act
+            ClaimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor();
+            EnptyDbClaimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor(isEmptyDatabase: true);
+            ClientNetworkOpportunityService = Mock.Of<IClientNetworkOpportunityService>();
+            Mock.Get(ClientNetworkOpportunityService)
+                .Setup(s => s.GetOpportunitiesAsync(It.IsAny<Guid>(), It.IsAny<PagingOptions>(), It.IsAny<NetworkOpportunityFilters>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(expected));
+            Mock.Get(ClientNetworkOpportunityService)
+                .Setup(s => s.GetByIdAsync(It.IsAny<Guid>(), It.IsAny<int>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, int, CancellationToken>((dbGuid, networkOpportunityId, token) =>
+                    networkOpportunityId == opportunity.NetworkOpportunityId
+                        ? Task.FromResult(opportunity)
+                        : Task.FromResult((ClientNetworkOpportunity)null));
+            Mock.Get(ClientNetworkOpportunityService)
+                .Setup(s => s.ConfigureAsync(It.IsAny<Guid>(), It.IsAny<int>(), It.IsAny<ClientNetworkOpportunity>(), It.IsAny<NetworkOpportunitySaveModel>(), It.IsAny<CancellationToken>()));
+            ClientNetworkOpportunityServiceException = Mock.Of<IClientNetworkOpportunityService>();
+            Mock.Get(ClientNetworkOpportunityServiceException)
+                .Setup(s => s.GetByIdAsync(It.IsAny<Guid>(), It.IsAny<int>(), It.IsAny<CancellationToken>()))
+                .Throws(new CreateWorkbookFromTemplateException());
+            Logger = Mock.Of<ILogger<ClientNetworkOpportunitiesController>>();
+        }
+
+        [NUnitSetup]
+        public void TestSetup()
+        {
+            Controller = new ClientNetworkOpportunitiesController(ClaimsPrincipalAccessor, ClientNetworkOpportunityService, Logger);
+            EmptyDbController = new ClientNetworkOpportunitiesController(EnptyDbClaimsPrincipalAccessor, ClientNetworkOpportunityService, Logger);
+            ControllerExceptions = new ClientNetworkOpportunitiesController(ClaimsPrincipalAccessor, ClientNetworkOpportunityServiceException, Logger);
+        }
+
+        [Test()]
+        public async Task ClientNetworkOpportunitiesControllerTest()
+        {
+            // Assert
+            Controller.Should().NotBeNull();
+        }
+
+        [Test()]
+        public async Task GetOpportunitiesTest()
+        {
+            // Arrange
+            var loadOptions = new NetworkOpportunityLoadOptions
+            {
+                Filters = new NetworkOpportunityFilters
+                {
+
+                },
+                PagingOptions = new Biz.Pagination.PagingOptions
+                {
+                    First = 0,
+                    Rows = 24
+                }
+            };
+
+            // Act
+            var result = await Controller.GetOpportunities(loadOptions, CancellationToken.None);
+
+            result.Should().NotBeNull();
+            result.Value.Should().NotBeNull()
+                .And.BeOfType<PagedApiResponse<NetworkOpportunitySummary>>();
+        }
+
+        [TestCase(true, TestName = "GetByIdTest w/ Exception")]
+        [TestCase(false, TestName = "GetByIdTest w/o Exception")]
+        public async Task GetByIdTest(bool withException)
+        {
+            // Arrange
+            var opportunity = DbContext.NetworkOpportunities.FirstOrDefault();
+            var clientNetworkOpportunity = DbContext.ClientNetworkOpportunities.FirstOrDefault(cno => cno.NetworkOpportunityId == opportunity.NetworkOpportunityId);
+            var dto = clientNetworkOpportunity.MapToDto();
+            ActionResult<ClientNetworkOpportunityDto> result;
+
+            // Act
+            if (withException)
+            {
+                result = await ControllerExceptions.GetById(opportunity.NetworkOpportunityId, CancellationToken.None);
+
+            }
+            else
+            {
+                result = await Controller.GetById(opportunity.NetworkOpportunityId, CancellationToken.None);
+            }
+
+            // Assert
+            if (withException)
+            {
+                result.Value.Should().BeNull();
+                result.Result.Should().BeOfType<ObjectResult>();
+                var objectResult = (ObjectResult)result.Result;
+                objectResult.StatusCode.Should().Be(500);
+            }
+            else
+            {
+                result.Value.Should().NotBeNull()
+                    .And.BeOfType<ClientNetworkOpportunityDto>()
+                    .And.BeEquivalentTo(dto);
+            }
+        }
+
+        [TestCase(true, TestName = "SaveTest w/ Exception")]
+        [TestCase(false, TestName = "SaveTest w/o Exception")]
+        public async Task SaveTest(bool withException)
+        {
+            // Arrange
+            var opportunity = DbContext.NetworkOpportunities.FirstOrDefault();
+            var clientNetworkOpportunity = DbContext.ClientNetworkOpportunities.FirstOrDefault(cno => cno.NetworkOpportunityId == opportunity.NetworkOpportunityId);
+            var dto = clientNetworkOpportunity.MapToDto();
+
+            // Act
+            IActionResult result;
+            if (withException)
+            {
+                result = await ControllerExceptions.Save(-1, dto, CancellationToken.None);
+            }
+            else
+            {
+                result = await Controller.Save(opportunity.NetworkOpportunityId, dto, CancellationToken.None);
+            }
+
+            // Assert
+            if (withException)
+            {
+                result.Should().NotBeNull()
+                    .And.BeOfType<BadRequestResult>();
+            }
+            else
+            {
+                result.Should().NotBeNull()
+                    .And.BeOfType<NoContentResult>();
+            }
+        }
+
+        [Test()]
+        public async Task DeleteTest()
+        {
+            // Arrange
+            var opportunity = DbContext.NetworkOpportunities.FirstOrDefault();
+
+            // Act
+            IActionResult result;
+            result = await Controller.Delete(opportunity.NetworkOpportunityId, CancellationToken.None);
+
+            // Assert
+            result.Should().NotBeNull()
+                .And.BeOfType<NoContentResult>();
+        }
+
+        [TestCase(true, true, TestName = "PublishTest w/ Exception on EmptyDb")]
+        [TestCase(false, true, TestName = "PublishTest w/o Exception on EmptyDb")]
+        [TestCase(true, false, TestName = "PublishTest w/ Exception")]
+        [TestCase(false, false, TestName = "PublishTest w/o Exception")]
+        public async Task PublishTest(bool withException, bool withEmptyDb)
+        {
+            // Arrange
+            var opportunity = DbContext.NetworkOpportunities.FirstOrDefault();
+            var clientNetworkOpportunity = DbContext.ClientNetworkOpportunities.FirstOrDefault(cno => cno.NetworkOpportunityId == opportunity.NetworkOpportunityId);
+            var dto = clientNetworkOpportunity.MapToDto();
+            ActionResult<bool> result;
+
+            // Act
+            if (withEmptyDb)
+            {
+                if (withException)
+                {
+                    result = await EmptyDbController.Publish(-1, true, CancellationToken.None);
+
+                }
+                else
+                {
+                    result = await EmptyDbController.Publish(opportunity.NetworkOpportunityId, true, CancellationToken.None);
+                }
+            }
+            else
+            {
+                if (withException)
+                {
+                    result = await Controller.Publish(-1, true, CancellationToken.None);
+
+                }
+                else
+                {
+                    result = await Controller.Publish(opportunity.NetworkOpportunityId, true, CancellationToken.None);
+                }
+            }
+
+            // Assert
+            if (withEmptyDb)
+            {
+                if (withException)
+                {
+                    result.Should().NotBeNull();
+                    result.Should().BeOfType<ActionResult<bool>>();
+                    result.Result.Should().BeOfType<BadRequestResult>();
+                    result.Value.Should().BeFalse();
+                }
+                else
+                {
+                    result.Should().NotBeNull();
+                    result.Should().BeOfType<ActionResult<bool>>();
+                    result.Result.Should().BeOfType<BadRequestResult>();
+                }
+            }
+            else
+            {
+                if (withException)
+                {
+                    result.Should().NotBeNull();
+                    result.Should().BeOfType<ActionResult<bool>>();
+                    result.Result.Should().BeOfType<BadRequestResult>();
+                    result.Value.Should().BeFalse();
+                }
+                else
+                {
+                    result.Should().NotBeNull();
+                    result.Should().BeOfType<ActionResult<bool>>();
+                    result.Result.Should().BeOfType<OkObjectResult>();
+                }
+            }
+
+        }
+
+        [Test()]
+        public async Task UpdateInitiativeStatusTest()
+        {
+            // Arrange
+            var opportunity = DbContext.NetworkOpportunities.FirstOrDefault();
+            var clientNetworkOpportunity = DbContext.ClientNetworkOpportunities.FirstOrDefault(cno => cno.NetworkOpportunityId == opportunity.NetworkOpportunityId);
+            var dto = clientNetworkOpportunity.MapToDto();
+
+            // Act
+            var result = await Controller.UpdateInitiativeStatus(opportunity.NetworkOpportunityId, Biz.Shared.InitiativeStatuses.Completed, CancellationToken.None);
+
+            // Assert
+            result.Should().NotBeNull()
+                .And.BeOfType<NoContentResult>();
+        }
+
+        [TestCase(true, true, TestName = "RevertWorkbookToTemplateTest w/ Exception on EmptyDb")]
+        [TestCase(false, true, TestName = "RevertWorkbookToTemplateTest w/o Exception on EmptyDb")]
+        [TestCase(true, false, TestName = "RevertWorkbookToTemplateTest w/ Exception")]
+        [TestCase(false, false, TestName = "RevertWorkbookToTemplateTest w/o Exception")]
+        public async Task RevertWorkbookToTemplateTest(bool withException, bool withEmptyDb)
+        {
+            // Arrange
+            var opportunity = DbContext.NetworkOpportunities.FirstOrDefault();
+            var clientNetworkOpportunity = DbContext.ClientNetworkOpportunities.FirstOrDefault(cno => cno.NetworkOpportunityId == opportunity.NetworkOpportunityId);
+            var dto = clientNetworkOpportunity.MapToDto();
+            ActionResult<bool> result;
+
+            // Act
+            if (withEmptyDb)
+            {
+                if (withException)
+                {
+                    result = await EmptyDbController.RevertWorkbookToTemplate(-1, CancellationToken.None);
+
+                }
+                else
+                {
+                    result = await EmptyDbController.RevertWorkbookToTemplate(opportunity.NetworkOpportunityId, CancellationToken.None);
+                }
+            }
+            else
+            {
+                if (withException)
+                {
+                    result = await Controller.RevertWorkbookToTemplate(-1, CancellationToken.None);
+
+                }
+                else
+                {
+                    result = await Controller.RevertWorkbookToTemplate(opportunity.NetworkOpportunityId, CancellationToken.None);
+                }
+            }
+
+            // Assert
+            if (withEmptyDb)
+            {
+                if (withException)
+                {
+                    result.Should().NotBeNull();
+                    result.Should().BeOfType<ActionResult<bool>>();
+                    result.Result.Should().BeOfType<BadRequestResult>();
+                    result.Value.Should().BeFalse();
+                }
+                else
+                {
+                    result.Should().NotBeNull();
+                    result.Should().BeOfType<ActionResult<bool>>();
+                    result.Result.Should().BeOfType<BadRequestResult>();
+                }
+            }
+            else
+            {
+                if (withException)
+                {
+                    result.Should().NotBeNull();
+                    result.Should().BeOfType<ActionResult<bool>>();
+                    result.Result.Should().BeOfType<BadRequestResult>();
+                    result.Value.Should().BeFalse();
+                }
+                else
+                {
+                    result.Should().NotBeNull();
+                    result.Should().BeOfType<ActionResult<bool>>();
+                    result.Result.Should().BeOfType<OkObjectResult>();
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ClientNetworkOpportunityLinkControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ClientNetworkOpportunityLinkControllerTests.cs
new file mode 100644
index 0000000..cb9934c
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ClientNetworkOpportunityLinkControllerTests.cs
@@ -0,0 +1,289 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.CoreLib.Claims;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnitSetup = NUnit.Framework.SetUpAttribute;
+
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class ClientNetworkOpportunityLinkControllerTests
+    {
+        public ClientNetworkOpportunityLinkController Controller { get; set; }
+        public ClientNetworkOpportunityLinkController EmptyDbController { get; set; }
+        public IClaimsPrincipalAccessor ClaimsPrincipalAccessor { get; set; }
+        public IClaimsPrincipalAccessor EmptyDbClaimsPrincipalAccessor { get; set; }
+        public IClientNetworkOpportunityService clientNetworkOpportunityService;
+        public IClientNetworkOpportunityLinkService clientNetworkOpportunityLinkService;
+        public IAllOpportunityService allOpportunityService;
+        public IInitiativeService initiativeService;
+        public ILogger<ClientNetworkOpportunityLinkController> logger;
+
+        [OneTimeSetUp]
+        public void ClientNetworkOpportunityLinkControllerTestsSetup()
+        {
+            // Arrange
+            clientNetworkOpportunityService = Mock.Of<IClientNetworkOpportunityService>();
+            clientNetworkOpportunityLinkService = Mock.Of<IClientNetworkOpportunityLinkService>();
+            allOpportunityService = Mock.Of<IAllOpportunityService>();
+            initiativeService = Mock.Of<IInitiativeService>();
+            logger = Mock.Of<ILogger<ClientNetworkOpportunityLinkController>>();
+
+            // Act
+            ClaimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor();
+            EmptyDbClaimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor(isEmptyDatabase: true);
+            var expected = new ClientNetworkOpportunityLink
+            {
+                OpportunityGuid = Guid.NewGuid(),
+                ConfigurationGuid = Guid.NewGuid(),
+                ClientNetworkOpportunityLinkId = 1,
+                InitiativeGuid = Guid.NewGuid(),
+                ClientNetworkOpportunity = new ClientNetworkOpportunity
+                {
+                    NetworkOpportunityId = 1,
+                }
+            };
+            Mock.Get(clientNetworkOpportunityLinkService)
+                .Setup(s => s.RolloverOpportunityLinkAsync(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<Guid>(),
+                    It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, Guid, Guid, Guid, Guid, Guid, CancellationToken>(
+                    (dbGuid, SrcConfigGuid, SrcOppGuid, RollConfigGuid, RollOppGuid, RollInitGuid, token) =>
+                        dbGuid == Guid.Empty || SrcOppGuid == Guid.Empty
+                            ? Task.FromResult(default(ClientNetworkOpportunityLink))
+                            : Task.FromResult(expected));
+            Mock.Get(clientNetworkOpportunityLinkService)
+                .Setup(s => s.DeleteOpportunityLinkAsync(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<Guid>(),
+                    It.IsAny<CancellationToken>()));
+        }
+
+        [NUnitSetup]
+        public void TestSetup()
+        {
+            // Act
+            Controller = new ClientNetworkOpportunityLinkController(
+                ClaimsPrincipalAccessor,
+                clientNetworkOpportunityService,
+                clientNetworkOpportunityLinkService,
+                allOpportunityService,
+                initiativeService,
+                logger);
+
+            EmptyDbController = new ClientNetworkOpportunityLinkController(
+                EmptyDbClaimsPrincipalAccessor,
+                clientNetworkOpportunityService,
+                clientNetworkOpportunityLinkService,
+                allOpportunityService,
+                initiativeService,
+                logger);
+        }
+
+        [Test()]
+        public async Task ClientNetworkOpportunityLinkControllerTest()
+        {
+            // Assert
+            Controller.Should().NotBeNull();
+            EmptyDbController.Should().NotBeNull();
+        }
+
+        [TestCaseSource(nameof(AddOpportunityLinkTestCases))]
+        public async Task AddOpportunityLinkTest(Guid opportunityGuid)
+        {
+            var result = await Controller.AddOpportunityLink(new ClientNetworkOpportunityLinkController.CreateNetworkOpportunityLinkDto
+            {
+                OpportunityGuid = opportunityGuid
+            }, CancellationToken.None);
+
+            result.Should().NotBeNull();
+            result.Should().BeOfType<ActionResult<ClientNetworkOpportunityLinkController.ClientNetworkOpportunityResultDto>>();
+            result.Result.Should().NotBeNull();
+            if (opportunityGuid == Guid.Empty)
+            {
+                result.Result.Should().BeOfType<BadRequestResult>();
+            }
+            else
+            {
+                result.Should().NotBeOfType<BadRequestResult>();
+            }
+        }
+
+        public static IEnumerable<TestCaseData> AddOpportunityLinkTestCases()
+        {
+            yield return new TestCaseData(Guid.Empty)
+                .SetName(nameof(AddOpportunityLinkTestCases) + " w/Empty Opp Guid");
+            yield return new TestCaseData(Guid.NewGuid())
+                .SetName(nameof(AddOpportunityLinkTestCases) + " w/Opp Guid");
+        }
+
+        [TestCaseSource(nameof(RolloverOpportunityLinkTestCases))]
+        public async Task RolloverOpportunityLinkTest(Guid srcOppGuid, bool useEmptyController)
+        {
+            // Arrange
+            var rolloverOpportunityInfo = new ClientNetworkOpportunityLinkController.RolloverOpportunityDto
+            {
+                SourceOpportunityGuid = srcOppGuid,
+                SourceConfigurationGuid = Guid.Empty,
+                DatabaseGuid = useEmptyController ? Guid.Empty : new Guid(TestUtilities.DbGuid),
+            };
+
+            // Act
+            var result = await Controller.RolloverOpportunityLink(rolloverOpportunityInfo, CancellationToken.None);
+
+            // Assert
+            result.Should().NotBeNull();
+            if (useEmptyController)
+            {
+                result.Result.Should().BeOfType<BadRequestResult>();
+            }
+            else
+            {
+                result.Result.Should().BeOfType<OkObjectResult>();
+            }
+        }
+
+        public static IEnumerable<TestCaseData> RolloverOpportunityLinkTestCases()
+        {
+            yield return new TestCaseData(Guid.Empty, true)
+                .SetName(nameof(RolloverOpportunityLinkTest) + " w/Empty Opp Guid, Empty Db Guid");
+            yield return new TestCaseData(Guid.Empty, false)
+                .SetName(nameof(RolloverOpportunityLinkTest) + " w/Empty Opp Guid");
+            yield return new TestCaseData(Guid.NewGuid(), true)
+                .SetName(nameof(RolloverOpportunityLinkTest) + " w/Opp Guid, Empty Db Guid");
+            yield return new TestCaseData(Guid.NewGuid(), false)
+                .SetName(nameof(RolloverOpportunityLinkTest) + " w/Opp Guid");
+        }
+
+        [TestCaseSource(nameof(DeleteOpportunityLinkTestCases))]
+        public async Task DeleteOpportunityLinkTest(Guid srcOppGuid, Guid configurationGuid, Guid databaseGuid, bool useEmptyController)
+        {
+            // Arrange
+            Mock.Get(clientNetworkOpportunityLinkService)
+                .Setup(s => s.ContainsOpportunityLinkAsync(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<Guid>(),
+                    It.IsAny<CancellationToken>()))
+                .Returns<Guid, Guid, Guid, CancellationToken>(
+                    (dbGuid, configurationGuid, oppGuid, token) =>
+                        oppGuid == Guid.Empty || dbGuid == Guid.Empty
+                            ? Task.FromResult(false)
+                            : Task.FromResult(true));
+            var opportunity = new ClientNetworkOpportunityLinkController.ClientNetworkOpportunityLinkDto
+            {
+                ConfigurationGuid = configurationGuid,
+                DatabaseGuid = databaseGuid,
+                Id = srcOppGuid
+            };
+
+            // Act
+            ActionResult<bool> result;
+            if (useEmptyController)
+            {
+                result = await EmptyDbController.DeleteOpportunityLink(opportunity, CancellationToken.None);
+            }
+            else
+            {
+                result = await Controller.DeleteOpportunityLink(opportunity, CancellationToken.None);
+            }
+
+            // Assert
+            result.Should().NotBeNull();
+            if (useEmptyController)
+            {
+                result.Result.Should().BeOfType<BadRequestResult>();
+            }
+        }
+
+        public static IEnumerable<TestCaseData> DeleteOpportunityLinkTestCases()
+        {
+            var configurationGuid = JazzEntityFrameworkStub.JazzEntityFrameworkFactory.CurrentConfigurationGuid;
+            var databaseGuid = JazzEntityFrameworkStub.JazzEntityFrameworkFactory.DatabaseGuid;
+
+            yield return new TestCaseData(Guid.Empty, configurationGuid, Guid.Empty, true)
+                .SetName(nameof(DeleteOpportunityLinkTest) + " w/Empty Opp Guid, Empty Db Guid");
+            yield return new TestCaseData(Guid.Empty, configurationGuid, null, true)
+                .SetName(nameof(DeleteOpportunityLinkTest) + " w/Empty Opp Guid, Null Db Guid");
+            yield return new TestCaseData(Guid.Empty, configurationGuid, databaseGuid, false)
+                .SetName(nameof(DeleteOpportunityLinkTest) + " w/Empty Opp Guid");
+
+            yield return new TestCaseData(Guid.NewGuid(), configurationGuid, Guid.Empty, true)
+                .SetName(nameof(DeleteOpportunityLinkTest) + " w/Opp Guid, Empty Db Guid");
+            yield return new TestCaseData(Guid.NewGuid(), configurationGuid, null, true)
+                .SetName(nameof(DeleteOpportunityLinkTest) + " w/Opp Guid, Null Db Guid");
+            yield return new TestCaseData(Guid.NewGuid(), configurationGuid, databaseGuid, false)
+                .SetName(nameof(DeleteOpportunityLinkTest) + " w/Opp Guid");
+        }
+
+        [TestCaseSource(nameof(DeleteOpportunityLinkIfExistsTestCases))]
+        public async Task DeleteOpportunityLinkIfExistsTest(Guid opportunityGuid, Guid configurationGuid, bool useEmptyController)
+        {
+            // Arrange
+            Mock.Get(clientNetworkOpportunityLinkService)
+                .Setup(s => s.ContainsOpportunityLinkAsync(It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<Guid>(),
+                    It.IsAny<CancellationToken>()))
+                .Returns<Guid, Guid, Guid, CancellationToken>(
+                    (dbGuid, configurationGuid, oppGuid, token) =>
+                        oppGuid == Guid.Empty || dbGuid == Guid.Empty
+                            ? Task.FromResult(false)
+                            : Task.FromResult(true));
+
+            // Act
+            ActionResult<bool> result;
+            if (useEmptyController)
+            {
+                result = await EmptyDbController.DeleteOpportunityLinkIfExists(opportunityGuid, configurationGuid, CancellationToken.None);
+            }
+            else
+            {
+                result = await Controller.DeleteOpportunityLinkIfExists(opportunityGuid, configurationGuid, CancellationToken.None);
+            }
+
+            // Assert
+            result.Should().NotBeNull();
+            if (useEmptyController)
+            {
+                result.Result.Should().BeOfType<BadRequestResult>();
+            }
+        }
+
+        public static IEnumerable<TestCaseData> DeleteOpportunityLinkIfExistsTestCases()
+        {
+            var configurationGuid = JazzEntityFrameworkStub.JazzEntityFrameworkFactory.CurrentConfigurationGuid;
+            var databaseGuid = JazzEntityFrameworkStub.JazzEntityFrameworkFactory.DatabaseGuid;
+
+            yield return new TestCaseData(Guid.Empty, configurationGuid, true)
+                .SetName(nameof(DeleteOpportunityLinkIfExistsTest) + " w/Empty Opp Guid, Empty Db Guid");
+            yield return new TestCaseData(Guid.Empty, configurationGuid, true)
+                .SetName(nameof(DeleteOpportunityLinkIfExistsTest) + " w/Empty Opp Guid, Null Db Guid");
+            yield return new TestCaseData(Guid.Empty, configurationGuid, false)
+                .SetName(nameof(DeleteOpportunityLinkIfExistsTest) + " w/Empty Opp Guid");
+
+            yield return new TestCaseData(Guid.NewGuid(), configurationGuid, true)
+                .SetName(nameof(DeleteOpportunityLinkIfExistsTest) + " w/Opp Guid, Empty Db Guid");
+            yield return new TestCaseData(Guid.NewGuid(), configurationGuid, true)
+                .SetName(nameof(DeleteOpportunityLinkIfExistsTest) + " w/Opp Guid, Null Db Guid");
+            yield return new TestCaseData(Guid.NewGuid(), configurationGuid, false)
+                .SetName(nameof(DeleteOpportunityLinkIfExistsTest) + " w/Opp Guid");
+        }
+
+        [Test()]
+        public async Task DeleteInitiativeLinkTest()
+        {
+            Assert.Inconclusive();
+        }
+
+        [Test()]
+        public async Task DeleteInitiativeLinkTest1()
+        {
+            Assert.Inconclusive();
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ClientWarehousesControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ClientWarehousesControllerTests.cs
new file mode 100644
index 0000000..a5e5e8f
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ClientWarehousesControllerTests.cs
@@ -0,0 +1,98 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.ClientWarehouses;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class ClientWarehousesControllerTests
+    {
+        private readonly ClientWarehousesController _clientWarehouseController;
+        private readonly Mock<IClientWarehouseService> _mockClientWarehouseService;
+
+        public ClientWarehousesControllerTests()
+        {
+            _mockClientWarehouseService = new Mock<IClientWarehouseService>();
+            _clientWarehouseController = new ClientWarehousesController(_mockClientWarehouseService.Object);
+        }
+
+        [Test]
+        public async Task GetAll_ReturnsAllClientWarehouses()
+        {
+            // Arrange
+            var warehouses = new List<ClientWarehouse>
+            {
+                new ClientWarehouse { DatabaseGuid = Guid.NewGuid() },
+                new ClientWarehouse { DatabaseGuid = Guid.NewGuid() }
+            };
+
+            _mockClientWarehouseService
+                .Setup(x => x.GetAll(It.IsAny<CancellationToken>()))
+                .ReturnsAsync(warehouses);
+
+            // Act
+            var result = await _clientWarehouseController.GetClientWarehouses(CancellationToken.None);
+
+            // Assert
+            var okResult = result.Result.Should().BeOfType<OkObjectResult>().Subject;
+            okResult.Value.Should().BeEquivalentTo(warehouses);
+        }
+
+        [Test]
+        public async Task GetAll_ReturnsNoContent_IfNoneExists()
+        {
+            // Arrange
+            var warehouses = new List<ClientWarehouse>();
+
+            _mockClientWarehouseService
+                .Setup(x => x.GetAll(It.IsAny<CancellationToken>()))
+                .ReturnsAsync(warehouses);
+
+            // Act
+            var result = await _clientWarehouseController.GetClientWarehouses(CancellationToken.None);
+
+            // Assert
+            var okResult = result.Result.Should().BeOfType<NoContentResult>();
+        }
+
+        [Test]
+        public async Task Add_ShouldReturnNewId()
+        {
+            // Arrange
+            var clientWarehouse = new ClientWarehouse();
+            _mockClientWarehouseService
+                .Setup(s => s.Add(clientWarehouse, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(123);
+
+            // Act
+            var result = await _clientWarehouseController.AddClientWarehouse(clientWarehouse, CancellationToken.None);
+
+            // Assert
+            var okResult = result.Result.Should().BeOfType<CreatedAtActionResult>().Subject;
+            okResult.Value.Should().Be(123);
+        }
+
+        [Test]
+        public async Task Delete_ShouldReturn_NoContent()
+        {
+            // Arrange
+            var clientId = Guid.NewGuid();
+
+            _mockClientWarehouseService
+                .Setup(s => s.Delete(clientId, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _clientWarehouseController.DeleteClientWarehouse(clientId, CancellationToken.None);
+            // Assert
+            result.Should().BeOfType<NoContentResult>();
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/CommentsControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/CommentsControllerTests.cs
new file mode 100644
index 0000000..4c80a0d
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/CommentsControllerTests.cs
@@ -0,0 +1,87 @@
+using FluentAssertions;
+using Microsoft.EntityFrameworkCore;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Api.Test.Unit.Api.Generics;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.CoreLib.Claims.Extensions;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using static Strata.ContinuousImprovement.Api.Controllers.CommentsController;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class CommentsControllerTests
+    {
+        [TestCase(true, TestName = "Get Comments Global")]
+        [TestCase(false, TestName = "Get Comments Not Global")]
+        public async Task TestGetComments(bool isGlobal)
+        {
+            var jeff = new JazzEntityFrameworkFactory();
+            var dbContext = await jeff.CreateCentralDbContextAsync(nameof(CommentsControllerTests), CancellationToken.None);
+            var comments = await dbContext.Comments.ToListAsync(CancellationToken.None);
+            var clientClaimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor();
+            var service = Mock.Of<ICommentService>();
+            Mock.Get(service)
+                .Setup(s => s.GetCommentsAsync(It.IsAny<Guid>(), It.IsAny<int>(), It.IsAny<long>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(comments.Where(c => c.OpportunityId == 1).AsEnumerable()));
+            var controller = new CommentsController(service, clientClaimsPrincipalAccessor);
+
+            var options = new CommentOptions
+            {
+                IsGlobal = isGlobal,
+                OpportunityId = 1L,
+                OpportunityType = $"{(int)OpportunityTypes.ChargeCode}"
+            };
+            var result = await controller.GetComments(options, CancellationToken.None);
+            result.Should().NotBeEmpty();
+        }
+
+        [TestCase(true, true, TestName = "Add Comment Global")]
+        [TestCase(false, true, TestName = "Add Comment Not Global")]
+        [TestCase(true, false, TestName = "Add No Comment Global")]
+        [TestCase(false, false, TestName = "Add No Comment Not Global")]
+        public async Task TestAddComments(bool isGlobal, bool hasComment)
+        {
+            var jeff = new JazzEntityFrameworkFactory();
+            var dbContext = await jeff.CreateCentralDbContextAsync(nameof(CommentsControllerTests), CancellationToken.None);
+            var comments = await dbContext.Comments.ToListAsync(CancellationToken.None);
+            var newComment = new NewComment
+            {
+                IsGlobal = isGlobal,
+                OpportunityId = 1L,
+                OpportunityType = $"{(int)OpportunityTypes.ChargeCode}",
+                CommentDate = DateTimeOffset.Now,
+                Comment = hasComment ? "This is a new comment" : ""
+            };
+            var expected = newComment.Map();
+            var clientClaimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor();
+            var user = clientClaimsPrincipalAccessor.GetCurrentClaimsPrincipal();
+            var name = user.GetUserFirstName();
+            var service = Mock.Of<ICommentService>();
+            Mock.Get(service)
+                .Setup(s => s.AddCommentAsync(It.IsAny<Guid>(), It.IsAny<int>(), It.IsAny<long>(),
+                    It.IsAny<string>(), It.IsAny<DateTimeOffset?>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(expected));
+            var controller = new CommentsController(service, clientClaimsPrincipalAccessor);
+
+            var result = await controller.Create(newComment, CancellationToken.None);
+            if (!hasComment)
+            {
+                result.Should().Be(default);
+            }
+            else
+            {
+                result.Should().BeEquivalentTo(expected);
+            }
+        }
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ConfigurationsControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ConfigurationsControllerTests.cs
new file mode 100644
index 0000000..94b9a89
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ConfigurationsControllerTests.cs
@@ -0,0 +1,128 @@
+using FluentAssertions;
+using Microsoft.EntityFrameworkCore;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.Schema.Client;
+using Strata.Schema.Client.Dtos.Info;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture(), Category("Unit"), Category("Controller")]
+    public class ConfigurationsControllerTests
+    {
+        public JazzDbContext DbContext { get; set; }
+        public IEnumerable<Biz.Configuration.Configuration> Configurations { get; set; }
+        public ISchemaServiceClient SchemaService { get; set; }
+        public IConfigurationService ConfigurationService { get; set; }
+
+        [OneTimeSetUp]
+        public async Task ConfigurationsControllerTestSetup()
+        {
+            var jeff = new JazzEntityFrameworkFactory();
+            DbContext = await jeff.CreateDbContextAsync(nameof(ConfigurationsControllerTests), CancellationToken.None);
+            Configurations = await DbContext.Configurations.ToListAsync();
+            var configuration = Configurations.First();
+            var entities = new HashSet<int>(configuration.ConfiguredEntityIds);
+            var expected = entities.Select(e => new Member
+            {
+                Id = e,
+                Name = $"Entity {e}"
+            });
+            var dimensionInfo = new ScoreDimensionInfoDto
+            {
+                FriendlyName = "Entity",
+                DefaultHierarchyGuid = Guid.NewGuid(),
+                DimensionGuid = Guid.NewGuid(),
+                ParentDimensionGuid = Guid.NewGuid()
+            };
+
+            ConfigurationService = Mock.Of<IConfigurationService>();
+            Mock.Get(ConfigurationService)
+                .Setup(s => s.GetConfigurationsAsync(It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(Configurations.AsEnumerable()));
+            Mock.Get(ConfigurationService)
+                .Setup(s => s.GetConfigurationAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(configuration));
+            SchemaService = Mock.Of<ISchemaServiceClient>();
+            Mock.Get(SchemaService)
+                .Setup(s => s.GetDimensionMembersByGlobalIdAsync<Member>(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(expected));
+            Mock.Get(SchemaService)
+                .Setup(s => s.GetDimensionByGlobalIdAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(dimensionInfo));
+            Mock.Get(SchemaService)
+                .Setup(s => s.GetDimensionByIdAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(dimensionInfo));
+        }
+
+        [Test()]
+        public void ConfigurationsControllerTest()
+        {
+            var controller = new ConfigurationsController(ConfigurationService, SchemaService);
+            controller.Should().NotBeNull();
+        }
+
+        [Test()]
+        public async Task GetAllConfigurationsTest()
+        {
+            var controller = new ConfigurationsController(ConfigurationService, SchemaService);
+            controller.Should().NotBeNull();
+            var result = await controller.GetAllConfigurations(CancellationToken.None);
+            result.Should().BeEquivalentTo(Configurations);
+        }
+
+        [Test()]
+        public async Task GetConfigurationEntitiesTest()
+        {
+            var configuration = Configurations.First();
+            var entities = new HashSet<int>(configuration.ConfiguredEntityIds);
+            var expected = entities.Select(e => new Member
+            {
+                Id = e,
+                Name = $"Entity {e}"
+            });
+            var controller = new ConfigurationsController(ConfigurationService, SchemaService);
+            var result = await controller.GetConfigurationEntities(configuration.ConfigurationGuid, CancellationToken.None);
+            result.Should().BeEquivalentTo(expected);
+        }
+
+        [Test()]
+        public async Task GetConfigurationEntityInfoTest()
+        {
+            var configuration = Configurations.First();
+            var entities = new HashSet<int>(configuration.ConfiguredEntityIds);
+            var controller = new ConfigurationsController(ConfigurationService, SchemaService);
+            var result = await controller.GetConfigurationEntityInfo(configuration.ConfigurationGuid, CancellationToken.None);
+            result.Should().NotBeNull()
+                .And.BeOfType<EntityInfo>();
+            result.EntityTitle.Should().NotBeNullOrEmpty();
+            result.EntityTitle.Should().Be("Entities");
+            result.EntityText.Should().Be("Entity");
+            result.DepartmentRollupGlobalId.Should().Be("Entity");
+            result.HierarchicalGuid.Should().NotBeEmpty();
+        }
+
+        [Test()]
+        public async Task GetConfigurationServiceLineInfoTest()
+        {
+            var configuration = Configurations.First();
+            var controller = new ConfigurationsController(ConfigurationService, SchemaService);
+            var result = await controller.GetConfigurationServiceLineInfo(configuration.ConfigurationGuid, CancellationToken.None);
+            result.Should().NotBeNull()
+                .And.BeOfType<ServiceLineInfo>();
+            result.ServiceLineName.Should().NotBeNullOrEmpty();
+            result.ServiceLineName.Should().Be("Entity");
+            result.ServiceLineTitle.Should().Be("Entities");
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/DatabaseControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/DatabaseControllerTests.cs
new file mode 100644
index 0000000..e56280f
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/DatabaseControllerTests.cs
@@ -0,0 +1,66 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.Databases;
+using Strata.ContinuousImprovement.Biz.Replication;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class DatabaseControllerTests
+    {
+        private readonly DatabasesController _databaseController;
+        private readonly Mock<IDatabaseService> _mockDatabaseService;
+
+        public DatabaseControllerTests()
+        {
+            _mockDatabaseService = new Mock<IDatabaseService>();
+            _databaseController = new DatabasesController(_mockDatabaseService.Object);
+        }
+
+        [Test]
+        public async Task Get_ReturnsAllDatabases()
+        {
+            // Arrange
+            var databases = new List<Database>
+            {
+                new Database { DatabaseGuid = Guid.NewGuid() },
+                new Database { DatabaseGuid = Guid.NewGuid() }
+            };
+
+            _mockDatabaseService
+                .Setup(x => x.GetDatabasesAsync(It.IsAny<CancellationToken>()))
+                .ReturnsAsync(databases);
+
+            // Act
+            var result = await _databaseController.Get(CancellationToken.None);
+
+            // Assert
+            var okResult = result.Result.Should().BeOfType<OkObjectResult>().Subject;
+            okResult.Value.Should().BeEquivalentTo(databases);
+        }
+
+        [Test]
+        public async Task Get_ReturnsNoContent_IfNoneExists()
+        {
+            // Arrange
+            var databases = new List<Database>();
+
+            _mockDatabaseService
+                .Setup(x => x.GetDatabasesAsync(It.IsAny<CancellationToken>()))
+                .ReturnsAsync(databases);
+
+            // Act
+            var result = await _databaseController.Get(CancellationToken.None);
+
+            // Assert
+            var okResult = result.Result.Should().BeOfType<NoContentResult>();
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ExplorationControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ExplorationControllerTests.cs
new file mode 100644
index 0000000..ec9d001
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ExplorationControllerTests.cs
@@ -0,0 +1,225 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class ExplorationControllerTests
+    {
+        public JazzEntityFrameworkFactory JazzEntityFrameworkFactory { get; set; }
+        public JazzDbContext JazzDbContext { get; set; }
+        public ExplorationController ExplorationController { get; set; }
+        public IConfigurationService ConfigurationService { get; set; }
+        public IExplorationService ExplorationService { get; set; }
+        public IFeatureFlagServiceClient FeatureFlagServiceClient { get; set; }
+
+        [OneTimeSetUp]
+        public async Task ClientNetworkOpportunityLinkControllerTestsSetup()
+        {
+            // Arrange
+            JazzEntityFrameworkFactory = new JazzEntityFrameworkFactory();
+            JazzDbContext = await JazzEntityFrameworkFactory.CreateDbContextAsync(nameof(ConfigurationsControllerTests), CancellationToken.None);
+            ConfigurationService = Mock.Of<IConfigurationService>();
+            ExplorationService = Mock.Of<IExplorationService>();
+            FeatureFlagServiceClient = Mock.Of<IFeatureFlagServiceClient>();
+
+            // Act
+        }
+
+        [SetUp]
+        public async Task Setup()
+        {
+            // Arrange
+            ExplorationController = new ExplorationController(ExplorationService, ConfigurationService, FeatureFlagServiceClient, Mock.Of<ILogger<ExplorationController>>());
+
+            // Act
+        }
+
+        [Test]
+        public async Task ExplorationControllerTest()
+        {
+            // Assert
+            ExplorationController.Should().NotBeNull();
+        }
+
+        [TestCaseSource(nameof(GetCaseTypeFamilySummariesTestCases))]
+        public async Task GetCaseTypeFamilySummariesTest(Guid configurationGuid)
+        {
+            // Arrange
+            var configuration = JazzDbContext.Configurations.First();
+            var explorationInfo = new ExplorationInfo
+            {
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid,
+                ExclusionCriteria = new Biz.Exploration.Filters.ExclusionCriteria(),
+                Filters = new Biz.Exploration.Filters.Filter
+                {
+                    DischargeDateStart = new System.DateTime(2024, 1, 1),
+                    DischargeDateEnd = new System.DateTime(2024, 12, 31),
+                    FilterChipItems = new List<FilterChipItem>()
+                }
+            };
+            var result = new List<CaseTypeFamilySummaryData>();
+            if (configuration.ConfigurationGuid == configurationGuid)
+            {
+                Mock.Get(ConfigurationService)
+                    .Setup(s => s.GetById(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                    .Returns<Guid, CancellationToken>(
+                        (configurationGuid, token) => Task.FromResult(JazzDbContext.Configurations.First()));
+                Mock.Get(ConfigurationService)
+                    .Setup(s => s.Contains(It.IsAny<Biz.Configuration.Configuration>(), It.IsAny<CancellationToken>()))
+                    .Returns<Biz.Configuration.Configuration, CancellationToken>(
+                        (configuration, token) => Task.FromResult(true));
+                Mock.Get(ConfigurationService)
+                    .Setup(s => s.IsConfigurationValid(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                    .Returns<Guid, CancellationToken>(
+                        (configurationGuid, token) => Task.FromResult(true));
+            }
+            else
+            {
+                Mock.Get(ConfigurationService)
+                    .Setup(s => s.GetById(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                    .Returns<Guid, CancellationToken>(
+                        (configurationGuid, token) => Task.FromResult(default(Strata.ContinuousImprovement.Biz.Configuration.Configuration)));
+                Mock.Get(ConfigurationService)
+                    .Setup(s => s.Contains(It.IsAny<Biz.Configuration.Configuration>(), It.IsAny<CancellationToken>()))
+                    .Returns<Biz.Configuration.Configuration, CancellationToken>(
+                        (configuration, token) => Task.FromResult(false));
+                Mock.Get(ConfigurationService)
+                    .Setup(s => s.IsConfigurationValid(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                    .Returns<Guid, CancellationToken>(
+                        (configurationGuid, token) => Task.FromResult(false));
+            }
+
+            Mock.Get(ExplorationService)
+                .Setup(s => s.GetCaseTypeFamilySummariesAsync(It.IsAny<ExplorationInfo>(), It.IsAny<CancellationToken>()))
+                .Returns<ExplorationInfo, CancellationToken>(
+                    (explorationInfo, token) => Task.FromResult(result.AsEnumerable()));
+
+            // Act
+            var controllerResponse = await ExplorationController.GetCaseTypeFamilySummaries(explorationInfo, CancellationToken.None);
+
+            // Assert
+            controllerResponse.Should().NotBeNull();
+            if (controllerResponse.Result is OkObjectResult okResult)
+            {
+                okResult.Should().NotBeNull();
+                var value = okResult.Value as IEnumerable<CaseTypeFamilySummaryData>;
+                value.Should().NotBeNull();
+            }
+            else
+            {
+                controllerResponse.Result.Should().BeOfType<BadRequestResult>();
+            }
+        }
+
+        [TestCaseSource(nameof(GetCaseTypeFamilyDetailsTestCases))]
+        public async Task GetCaseTypeFamilyDetailsTest(Guid configurationGuid)
+        {
+            // Arrange
+            var configuration = JazzDbContext.Configurations.First();
+            var explorationInfo = new ExplorationDetailInfo
+            {
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid,
+                CaseTypeFamilyId = 0,
+                ExclusionCriteria = new Biz.Exploration.Filters.ExclusionCriteria(),
+                Filters = new Biz.Exploration.Filters.Filter
+                {
+                    DischargeDateStart = new System.DateTime(2024, 1, 1),
+                    DischargeDateEnd = new System.DateTime(2024, 12, 31),
+                    FilterChipItems = new List<FilterChipItem>()
+                }
+            };
+            var result = new CaseTypeFamilyDetailInfo
+            {
+                Metrics = new CaseTypeFamilyMetric(),
+                CaseTypeFamilyDetails = Enumerable.Empty<CaseTypeFamilyDetailData>()
+            };
+            if (configuration.ConfigurationGuid == configurationGuid)
+            {
+                Mock.Get(ConfigurationService)
+                    .Setup(s => s.GetById(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                    .Returns<Guid, CancellationToken>(
+                        (configurationGuid, token) => Task.FromResult(JazzDbContext.Configurations.First()));
+                Mock.Get(ConfigurationService)
+                    .Setup(s => s.Contains(It.IsAny<Biz.Configuration.Configuration>(), It.IsAny<CancellationToken>()))
+                    .Returns<Biz.Configuration.Configuration, CancellationToken>(
+                        (configuration, token) => Task.FromResult(true));
+                Mock.Get(ConfigurationService)
+                    .Setup(s => s.IsConfigurationValid(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                    .Returns<Guid, CancellationToken>(
+                        (configurationGuid, token) => Task.FromResult(true));
+            }
+            else
+            {
+                Mock.Get(ConfigurationService)
+                    .Setup(s => s.GetById(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                    .Returns<Guid, CancellationToken>(
+                        (configurationGuid, token) => Task.FromResult(default(Strata.ContinuousImprovement.Biz.Configuration.Configuration)));
+                Mock.Get(ConfigurationService)
+                    .Setup(s => s.Contains(It.IsAny<Biz.Configuration.Configuration>(), It.IsAny<CancellationToken>()))
+                    .Returns<Biz.Configuration.Configuration, CancellationToken>(
+                        (configuration, token) => Task.FromResult(false));
+                Mock.Get(ConfigurationService)
+                    .Setup(s => s.IsConfigurationValid(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                    .Returns<Guid, CancellationToken>(
+                        (configurationGuid, token) => Task.FromResult(false));
+            }
+            Mock.Get(ExplorationService)
+                .Setup(s => s.GetCaseTypeFamilyDetailsAsync(It.IsAny<ExplorationDetailInfo>(), It.IsAny<CancellationToken>()))
+                .Returns<ExplorationDetailInfo, CancellationToken>(
+                    (exploration, token) => Task.FromResult(result));
+
+            // Act
+            var controllerResponse = await ExplorationController.GetCaseTypeFamilyDetails(explorationInfo, CancellationToken.None);
+
+            // Assert
+            controllerResponse.Should().NotBeNull();
+            if (controllerResponse.Result is OkObjectResult okResult)
+            {
+                okResult.Should().NotBeNull();
+                okResult.Value.Should().BeOfType<CaseTypeFamilyDetailInfo>();
+                configuration.ConfigurationGuid.Should().Be(configurationGuid);
+            }
+            else if (controllerResponse.Result is BadRequestResult badRequestResult)
+            {
+                badRequestResult.Should().NotBeNull();
+            }
+        }
+
+        public static IEnumerable<TestCaseData> GetCaseTypeFamilySummariesTestCases()
+        {
+            var configurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid;
+
+            yield return new TestCaseData(configurationGuid)
+                .SetName("summaries valid configuration");
+            yield return new TestCaseData(Guid.NewGuid())
+                .SetName("summaries invalid configuration");
+        }
+
+        public static IEnumerable<TestCaseData> GetCaseTypeFamilyDetailsTestCases()
+        {
+            var configurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid;
+
+            yield return new TestCaseData(configurationGuid)
+                .SetName("details valid configuration");
+            yield return new TestCaseData(Guid.NewGuid())
+                .SetName("details invalid configuration");
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ExplorationPopulationsControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ExplorationPopulationsControllerTests.cs
new file mode 100644
index 0000000..54025c4
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/ExplorationPopulationsControllerTests.cs
@@ -0,0 +1,92 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Population;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using Strata.DecisionSupport.Models.Encounters;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class ExplorationPopulationsControllerTests
+    {
+        public ExplorationPopulationsController Controller { get; set; }
+        public IUserSettingService UserSettingService { get; set; }
+        public IExplorationPopulationService PopulationService { get; set; }
+        public IExplorationService ExplorationService { get; set; }
+
+        [OneTimeSetUp]
+        public async Task ExplorationPopulationsControllerTests_OneTimeSetUp()
+        {
+            UserSettingService = Mock.Of<IUserSettingService>();
+            PopulationService = Mock.Of<IExplorationPopulationService>();
+            ExplorationService = Mock.Of<IExplorationService>();
+        }
+
+        [SetUp]
+        public void ExplorationPopulationsControllerTests_Setup()
+        {
+            Controller = new ExplorationPopulationsController(UserSettingService, PopulationService, ExplorationService, Mock.Of<ILogger<ExplorationPopulationsController>>());
+        }
+
+        [TestCaseSource(nameof(GetEncountersTestCases))]
+        public async Task GetEncountersTest(ExplorationPopulationDto population, IEnumerable<EncounterPhysicianInfo> encounterPhysicians)
+        {
+            // Arrange
+            long populationId = 0;
+            Guid configurationGuid = new Guid();
+
+            Mock.Get(PopulationService)
+                    .Setup(s => s.GetPopulationDataAsync(It.IsAny<long>(), It.IsAny<CancellationToken>()))
+                    .Returns<long, CancellationToken>((populationId, token) => Task.FromResult(population));
+            Mock.Get(ExplorationService)
+                    .Setup(s => s.GetEncountersAsync(It.IsAny<ExplorationDetailInfo>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                    .Returns<ExplorationDetailInfo, Guid, CancellationToken>((exploration, configurationGuid, token) => Task.FromResult(encounterPhysicians));
+
+            // Act
+            var response = await Controller.GetEncounters(populationId, configurationGuid, CancellationToken.None);
+
+            // Assert
+            response.Should().NotBeNull();
+            if (population == null || encounterPhysicians == null)
+            {
+                response.Result.Should().BeOfType<BadRequestResult>();
+            }
+            else
+            {
+                response.Result.Should().BeOfType<OkObjectResult>();
+                var okResult = (OkObjectResult)response.Result;
+                okResult.Value.Should().BeAssignableTo<IEnumerable<IJazzExplorationEncounterInfo>>();
+                okResult.Value.Should().NotBeNull();
+            }
+        }
+
+        public static IEnumerable<TestCaseData> GetEncountersTestCases()
+        {
+            var population = new ExplorationPopulationDto()
+            {
+                FiltersJSON = string.Empty
+            };
+            var encounterPhysicians = Enumerable.Empty<EncounterPhysicianInfo>();
+
+            yield return new TestCaseData(population, encounterPhysicians)
+                .SetName("Population and Encounters are not null");
+            yield return new TestCaseData(population, null)
+                .SetName("Encounters is null");
+            yield return new TestCaseData(null, encounterPhysicians)
+                .SetName("Population is null");
+            yield return new TestCaseData(null, null)
+                .SetName("Population and Encounters are null");
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/FreeFormOpportunitiesControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/FreeFormOpportunitiesControllerTests.cs
new file mode 100644
index 0000000..d61ab98
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/FreeFormOpportunitiesControllerTests.cs
@@ -0,0 +1,180 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using NUnit.Framework;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.FreeForm.Initiatives;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class FreeFormOpportunitiesControllerTests
+    {
+        public JazzEntityFrameworkFactory jazzEntityFrameworkFactory { get; set; }
+        public JazzDbContext DbContext { get; set; }
+        public IFFOpportunityService FFOpportunityService { get; set; }
+        public IFFInitiativeService FFInitiativeService { get; set; }
+        public IInitiativeService InitiativeService { get; set; }
+        public FreeFormOpportunitiesController Controller { get; set; }
+
+
+        [OneTimeSetUp]
+        public async Task FreeFormOpportunitiesControllerTestSetup()
+        {
+            jazzEntityFrameworkFactory = new JazzEntityFrameworkFactory();
+            DbContext = await jazzEntityFrameworkFactory.CreateDbContextAsync(nameof(ConfigurationsControllerTests), CancellationToken.None);
+            FFOpportunityService = Mock.Of<IFFOpportunityService>();
+            InitiativeService = Mock.Of<IInitiativeService>();
+        }
+
+        [SetUp]
+        public async Task Setup()
+        {
+            // Arrange
+            Controller = new FreeFormOpportunitiesController(FFOpportunityService, InitiativeService);
+        }
+
+        [Test()]
+        public async Task FreeFormOpportunitiesControllerTest()
+        {
+            // Act
+
+            // Assert
+            Controller.Should().NotBeNull();
+        }
+
+        [Test()]
+        public async Task GetOpportunitiesTest()
+        {
+            // Arrange
+            var opportunities = DbContext.FFOpportunities.Take(25).ToList();
+            var pagingOptions = new PagingOptions
+            {
+                First = 1,
+                Rows = 25,
+                SortField = nameof(FFOpportunity.IdentifiedSavings),
+                SortOrder = SortOrder.Asc
+            };
+            var loadOptions = new FFOpportunityLoadOptions
+            {
+                Filters = new FFFilters { ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid },
+                PagingOptions = pagingOptions,
+            };
+            var response = new PagedApiResponse<FFOpportunity>
+            {
+                PagingInfo = new PagingInfo
+                {
+                    PageNumber = 1,
+                    TotalNumberOfResults = opportunities.Count,
+                    TotalPages = opportunities.Count / pagingOptions.Rows,
+                    ResultsPerPage = pagingOptions.Rows
+                },
+                Data = opportunities
+            };
+            Mock.Get(FFOpportunityService)
+                .Setup(x => x.GetPagedAsync(It.IsAny<PagingOptions>(), It.IsAny<FFFilters>(), It.IsAny<CancellationToken>()))
+                .Returns<PagingOptions, FFFilters, CancellationToken>(
+                    (pagingOptions, filters, token) =>
+                        Task.FromResult(response)
+                );
+
+            // Act
+            var controllerResponse = await Controller.GetOpportunities(loadOptions, CancellationToken.None);
+
+
+            // Assert
+            controllerResponse.Should().NotBeNull();
+        }
+
+        [Test()]
+        public async Task GetByIdTest()
+        {
+            // Arrange
+            var opportunities = DbContext.FreeFormOpportunities.ToList();
+            var firstOpportunity = opportunities.First();
+            if (firstOpportunity.Configuration == null)
+            {
+                var configuration = DbContext.Configurations.First();
+                if (configuration.FiscalMonthResolver == null)
+                {
+                    var fmr = jazzEntityFrameworkFactory.FiscalMonthResolver;
+                    configuration.FiscalMonthResolver = fmr;
+                }
+                firstOpportunity.Configuration = configuration;
+            }
+            var dfltOpportunity = default(FFOpportunityDataModel);
+            var fmResolver = jazzEntityFrameworkFactory.FiscalMonthResolver;
+            Mock.Get(FFOpportunityService)
+                .Setup(x => x.GetDataModelById(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, CancellationToken>(
+                    (opportunityGuid, token) =>
+                        opportunityGuid != firstOpportunity.OpportunityGuid
+                            ? Task.FromResult(dfltOpportunity)
+                            : Task.FromResult(firstOpportunity)
+                );
+            var detailModel = firstOpportunity.MapToDetailModel(fmResolver);
+
+            // Act
+            var controllerResponse = await Controller.GetById(firstOpportunity.OpportunityGuid, CancellationToken.None);
+
+            // Assert
+            controllerResponse.Should().NotBeNull();
+            controllerResponse.Result.Should().NotBeNull();
+            controllerResponse.Result.Should().BeOfType<OkObjectResult>();
+            var result = (OkObjectResult)controllerResponse.Result;
+            result.Should().NotBeNull();
+            result.Should().BeOfType<OkObjectResult>();
+            result.Value.Should().NotBeNull();
+            result.Value.Should().BeOfType<FFOpportunityDetailModel>();
+            var detail = (FFOpportunityDetailModel)result.Value;
+            detail.Should().BeEquivalentTo(detailModel);
+        }
+
+        [Test()]
+        public async Task CreateTest()
+        {
+            Assert.Inconclusive();
+        }
+
+        [Test()]
+        public async Task DeleteTest()
+        {
+            Assert.Inconclusive();
+        }
+
+        [Test()]
+        public async Task GetInitiativeTest()
+        {
+            Assert.Inconclusive();
+        }
+
+        [Test()]
+        public async Task SetGoalsAsyncTest()
+        {
+            Assert.Inconclusive();
+        }
+
+        [Test()]
+        public async Task ExportTest()
+        {
+            Assert.Inconclusive();
+        }
+
+        [Test()]
+        public async Task GetFilterOptionsAsyncTest()
+        {
+            Assert.Inconclusive();
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/NonQviSavingsControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/NonQviSavingsControllerTests.cs
new file mode 100644
index 0000000..ea57b0a
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/NonQviSavingsControllerTests.cs
@@ -0,0 +1,83 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers.JazzQvi;
+using Strata.ContinuousImprovement.Biz.QualityVariation.QVI;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+	[TestFixture, Category("Unit"), Category("Controller")]
+	public class NonQviSavingsControllerTests
+	{
+		private Mock<INonQviSavingsService> _serviceMock;
+		private NonQviSavingsController _controller;
+
+		[SetUp]
+		public void SetUp()
+		{
+			_serviceMock = new Mock<INonQviSavingsService>();
+			_controller = new NonQviSavingsController(_serviceMock.Object);
+		}
+
+		[Test]
+		public async Task GetCaseTypeFamilies_WhenConfigurationGuidIsEmpty_ReturnsBadRequest()
+		{
+			var result = await _controller.GetCaseTypeFamilies(Guid.Empty, false, CancellationToken.None);
+
+			result.Result.Should().BeOfType<BadRequestObjectResult>();
+			_serviceMock.Verify(s => s.GetCaseTypeFamilyInfoAsync(It.IsAny<Guid>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()), Times.Never);
+		}
+
+		[Test]
+		public async Task GetCaseTypeFamilies_WhenConfigurationGuidIsValid_ReturnsOk()
+		{
+			var configurationGuid = Guid.NewGuid();
+			var expected = new[] { new NonQviCaseTypeFamilyInfo { CaseTypeFamilyId = 1, CaseCount = 5 } };
+			_serviceMock
+				.Setup(s => s.GetCaseTypeFamilyInfoAsync(configurationGuid, true, It.IsAny<CancellationToken>()))
+				.ReturnsAsync(expected);
+
+			var result = await _controller.GetCaseTypeFamilies(configurationGuid, true, CancellationToken.None);
+
+			result.Result.Should().BeOfType<OkObjectResult>();
+			var okResult = result.Result as OkObjectResult;
+			var value = okResult?.Value as System.Collections.Generic.IEnumerable<NonQviCaseTypeFamilyInfo>;
+			value.Should().NotBeNull();
+			value!.Single().CaseTypeFamilyId.Should().Be(1);
+			_serviceMock.Verify(s => s.GetCaseTypeFamilyInfoAsync(configurationGuid, true, It.IsAny<CancellationToken>()), Times.Once);
+		}
+
+		[Test]
+		public async Task GetDrgTypes_WhenConfigurationGuidIsEmpty_ReturnsBadRequest()
+		{
+			var result = await _controller.GetDrgTypes(Guid.Empty, false, CancellationToken.None);
+
+			result.Result.Should().BeOfType<BadRequestObjectResult>();
+			_serviceMock.Verify(s => s.GetDrgTypeInfoAsync(It.IsAny<Guid>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()), Times.Never);
+		}
+
+		[Test]
+		public async Task GetDrgTypes_WhenConfigurationGuidIsValid_ReturnsOk()
+		{
+			var configurationGuid = Guid.NewGuid();
+			var expected = new[] { new NonQviDrgTypeInfo { DrgType = "MS" } };
+			_serviceMock
+				.Setup(s => s.GetDrgTypeInfoAsync(configurationGuid, true, It.IsAny<CancellationToken>()))
+				.ReturnsAsync(expected);
+
+			var result = await _controller.GetDrgTypes(configurationGuid, true, CancellationToken.None);
+
+			result.Result.Should().BeOfType<OkObjectResult>();
+			var okResult = result.Result as OkObjectResult;
+			var value = okResult?.Value as System.Collections.Generic.IEnumerable<NonQviDrgTypeInfo>;
+			value.Should().NotBeNull();
+			value!.Single().DrgType.Should().Be("MS");
+			_serviceMock.Verify(s => s.GetDrgTypeInfoAsync(configurationGuid, true, It.IsAny<CancellationToken>()), Times.Once);
+		}
+	}
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/QviEncountersControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/QviEncountersControllerTests.cs
new file mode 100644
index 0000000..1fec82d
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/QviEncountersControllerTests.cs
@@ -0,0 +1,57 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers.JazzQvi;
+using Strata.ContinuousImprovement.Biz.QualityVariation.QVI;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+	[TestFixture, Category("Unit"), Category("Controller")]
+	public class QviEncountersControllerTests
+	{
+		private Mock<IQviEncounterService> _serviceMock;
+		private QviEncountersController _controller;
+
+		[SetUp]
+		public void SetUp()
+		{
+			_serviceMock = new Mock<IQviEncounterService>();
+			_controller = new QviEncountersController(_serviceMock.Object);
+		}
+
+		[Test]
+		public async Task Get_WhenConfigurationGuidIsEmpty_ReturnsBadRequest()
+		{
+			var result = await _controller.Get(Guid.Empty, DateTime.UtcNow, DateTime.UtcNow, CancellationToken.None);
+
+			result.Result.Should().BeOfType<BadRequestObjectResult>();
+			_serviceMock.Verify(s => s.GetEncounterInfoAsync(It.IsAny<Guid>(), It.IsAny<DateTime>(), It.IsAny<DateTime>(), It.IsAny<CancellationToken>()), Times.Never);
+		}
+
+		[Test]
+		public async Task Get_WhenConfigurationGuidIsValid_ReturnsOk()
+		{
+			var configurationGuid = Guid.NewGuid();
+			var startDate = new DateTime(2024, 1, 1);
+			var endDate = new DateTime(2024, 12, 31);
+			var expected = new[] { new EncounterInfo { EncounterId = 11, EncounterRecordNumber = "enc-11" } };
+			_serviceMock
+				.Setup(s => s.GetEncounterInfoAsync(configurationGuid, startDate, endDate, It.IsAny<CancellationToken>()))
+				.ReturnsAsync(expected);
+
+			var result = await _controller.Get(configurationGuid, startDate, endDate, CancellationToken.None);
+
+			result.Result.Should().BeOfType<OkObjectResult>();
+			var okResult = result.Result as OkObjectResult;
+			var value = okResult?.Value as System.Collections.Generic.IEnumerable<EncounterInfo>;
+			value.Should().NotBeNull();
+			value!.Single().EncounterId.Should().Be(11);
+			_serviceMock.Verify(s => s.GetEncounterInfoAsync(configurationGuid, startDate, endDate, It.IsAny<CancellationToken>()), Times.Once);
+		}
+	}
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/QviLineItemSavingsControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/QviLineItemSavingsControllerTests.cs
new file mode 100644
index 0000000..ff1556d
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/QviLineItemSavingsControllerTests.cs
@@ -0,0 +1,111 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers.JazzQvi;
+using Strata.ContinuousImprovement.Biz.QualityVariation.QVI;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+	[TestFixture, Category("Unit"), Category("Controller")]
+	public class QviLineItemSavingsControllerTests
+	{
+		private Mock<IQviLineItemSavingsService> _serviceMock;
+		private QviLineItemSavingsController _controller;
+
+		[SetUp]
+		public void SetUp()
+		{
+			_serviceMock = new Mock<IQviLineItemSavingsService>();
+			_controller = new QviLineItemSavingsController(_serviceMock.Object);
+		}
+
+		[Test]
+		public async Task GetCaseTypeFamilies_WhenConfigurationGuidIsEmpty_ReturnsBadRequest()
+		{
+			var result = await _controller.GetCaseTypeFamilies(Guid.Empty, false, CancellationToken.None);
+
+			result.Result.Should().BeOfType<BadRequestObjectResult>();
+			_serviceMock.Verify(s => s.GetCaseTypeFamilyInfoAsync(It.IsAny<Guid>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()), Times.Never);
+		}
+
+		[Test]
+		public async Task GetCaseTypeFamilies_WhenConfigurationGuidIsValid_ReturnsOk()
+		{
+			var configurationGuid = Guid.NewGuid();
+			var expected = new[] { new QviLineItemCaseTypeFamilyInfo { QualityVariationEventId = 1, CaseTypeFamilyId = 2 } };
+			_serviceMock
+				.Setup(s => s.GetCaseTypeFamilyInfoAsync(configurationGuid, true, It.IsAny<CancellationToken>()))
+				.ReturnsAsync(expected);
+
+			var result = await _controller.GetCaseTypeFamilies(configurationGuid, true, CancellationToken.None);
+
+			result.Result.Should().BeOfType<OkObjectResult>();
+			var okResult = result.Result as OkObjectResult;
+			var value = okResult?.Value as System.Collections.Generic.IEnumerable<QviLineItemCaseTypeFamilyInfo>;
+			value.Should().NotBeNull();
+			value!.Single().CaseTypeFamilyId.Should().Be(2);
+			_serviceMock.Verify(s => s.GetCaseTypeFamilyInfoAsync(configurationGuid, true, It.IsAny<CancellationToken>()), Times.Once);
+		}
+
+		[Test]
+		public async Task GetDrgTypes_WhenConfigurationGuidIsEmpty_ReturnsBadRequest()
+		{
+			var result = await _controller.GetDrgTypes(Guid.Empty, false, CancellationToken.None);
+
+			result.Result.Should().BeOfType<BadRequestObjectResult>();
+			_serviceMock.Verify(s => s.GetDrgTypeInfoAsync(It.IsAny<Guid>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()), Times.Never);
+		}
+
+		[Test]
+		public async Task GetDrgTypes_WhenConfigurationGuidIsValid_ReturnsOk()
+		{
+			var configurationGuid = Guid.NewGuid();
+			var expected = new[] { new QviLineItemDrgTypeInfo { DrgType = "APR" } };
+			_serviceMock
+				.Setup(s => s.GetDrgTypeInfoAsync(configurationGuid, true, It.IsAny<CancellationToken>()))
+				.ReturnsAsync(expected);
+
+			var result = await _controller.GetDrgTypes(configurationGuid, true, CancellationToken.None);
+
+			result.Result.Should().BeOfType<OkObjectResult>();
+			var okResult = result.Result as OkObjectResult;
+			var value = okResult?.Value as System.Collections.Generic.IEnumerable<QviLineItemDrgTypeInfo>;
+			value.Should().NotBeNull();
+			value!.Single().DrgType.Should().Be("APR");
+			_serviceMock.Verify(s => s.GetDrgTypeInfoAsync(configurationGuid, true, It.IsAny<CancellationToken>()), Times.Once);
+		}
+
+		[Test]
+		public async Task GetEncounterSavings_WhenConfigurationGuidIsEmpty_ReturnsBadRequest()
+		{
+			var result = await _controller.GetEncounterSavings(Guid.Empty, cancellationToken: CancellationToken.None);
+
+			result.Result.Should().BeOfType<BadRequestObjectResult>();
+			_serviceMock.Verify(s => s.GetEncounterSavingInfoAsync(It.IsAny<Guid>(), It.IsAny<Guid?>(), It.IsAny<bool?>(), It.IsAny<CancellationToken>()), Times.Never);
+		}
+
+		[Test]
+		public async Task GetEncounterSavings_WhenConfigurationGuidIsValid_ReturnsOk()
+		{
+			var configurationGuid = Guid.NewGuid();
+			var expected = new[] { new QviLineItemEncounterSavingInfo { EncounterRecordNumber = "enc-1" } };
+			_serviceMock
+				.Setup(s => s.GetEncounterSavingInfoAsync(configurationGuid, It.IsAny<Guid?>(), It.IsAny<bool?>(), It.IsAny<CancellationToken>()))
+				.ReturnsAsync(expected);
+
+			var result = await _controller.GetEncounterSavings(configurationGuid, cancellationToken: CancellationToken.None);
+
+			result.Result.Should().BeOfType<OkObjectResult>();
+			var okResult = result.Result as OkObjectResult;
+			var value = okResult?.Value as System.Collections.Generic.IEnumerable<QviLineItemEncounterSavingInfo>;
+			value.Should().NotBeNull();
+			value!.Single().EncounterRecordNumber.Should().Be("enc-1");
+			_serviceMock.Verify(s => s.GetEncounterSavingInfoAsync(configurationGuid, null, null, It.IsAny<CancellationToken>()), Times.Once);
+		}
+	}
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/StrategicChargeCodeControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/StrategicChargeCodeControllerTests.cs
new file mode 100644
index 0000000..811f628
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/StrategicChargeCodeControllerTests.cs
@@ -0,0 +1,337 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class StrategicChargeCodeControllerTests
+    {
+        private StrategicChargeCodeController _controller;
+        private Mock<IStrategicOpportunityService> _mockOpportunityService;
+        private Mock<IStrategicChargeCodeOpportunityDetailService> _mockDetailService;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _mockOpportunityService = new Mock<IStrategicOpportunityService>();
+            _mockDetailService = new Mock<IStrategicChargeCodeOpportunityDetailService>();
+            _controller = new StrategicChargeCodeController(_mockOpportunityService.Object, _mockDetailService.Object);
+        }
+
+        // --- GetOpportunityChargeCode ---
+
+        [Test]
+        public async Task GetOpportunityChargeCode_ReturnsOk_WhenFound()
+        {
+            const long opportunityId = 1;
+            var data = new StrategicOpportunityChargeCodeEditData();
+            _mockOpportunityService
+                .Setup(s => s.GetStrategicOpportunityChargeCode(opportunityId, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(data);
+
+            var result = await _controller.GetOpportunityChargeCode(opportunityId, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>()
+                .Which.Value.Should().Be(data);
+        }
+
+        [Test]
+        public async Task GetOpportunityChargeCode_ReturnsNotFound_WhenMissing()
+        {
+            _mockOpportunityService
+                .Setup(s => s.GetStrategicOpportunityChargeCode(It.IsAny<long>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((StrategicOpportunityChargeCodeEditData)null);
+
+            var result = await _controller.GetOpportunityChargeCode(99, CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        // --- CreateOpportunityChargeCode ---
+
+        [Test]
+        public async Task CreateOpportunityChargeCode_ReturnsOk_WithNewId_WhenSuccessful()
+        {
+            const long newId = 42;
+            var dto = new StrategicOpportunityChargeCodeDto();
+            _mockOpportunityService
+                .Setup(s => s.CreateOpportunityChargeCodeAsync(dto, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(newId);
+
+            var result = await _controller.CreateOpportunityChargeCode(dto, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>()
+                .Which.Value.Should().Be(newId);
+        }
+
+        [Test]
+        public async Task CreateOpportunityChargeCode_ReturnsBadRequest_WhenServiceReturnsZero()
+        {
+            _mockOpportunityService
+                .Setup(s => s.CreateOpportunityChargeCodeAsync(It.IsAny<StrategicOpportunityChargeCodeDto>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(0L);
+
+            var result = await _controller.CreateOpportunityChargeCode(new StrategicOpportunityChargeCodeDto(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<BadRequestResult>();
+        }
+
+        // --- UpdateOpportunityChargeCode ---
+
+        [Test]
+        public async Task UpdateOpportunityChargeCode_ReturnsOk_WhenSuccessful()
+        {
+            const long opportunityId = 5;
+            _mockOpportunityService
+                .Setup(s => s.UpdateOpportunityChargeCode(opportunityId, It.IsAny<StrategicOpportunityChargeCodeUpdateDto>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(opportunityId);
+
+            var result = await _controller.UpdateOpportunityChargeCode(opportunityId, new StrategicOpportunityChargeCodeUpdateDto(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>();
+        }
+
+        [Test]
+        public async Task UpdateOpportunityChargeCode_ReturnsNotFound_WhenServiceReturnsZero()
+        {
+            _mockOpportunityService
+                .Setup(s => s.UpdateOpportunityChargeCode(It.IsAny<long>(), It.IsAny<StrategicOpportunityChargeCodeUpdateDto>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(0L);
+
+            var result = await _controller.UpdateOpportunityChargeCode(99, new StrategicOpportunityChargeCodeUpdateDto(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        // --- DeleteOpportunityChargeCode ---
+
+        [Test]
+        public async Task DeleteOpportunityChargeCode_ReturnsNotFound_WhenOpportunityDoesNotExist()
+        {
+            _mockOpportunityService
+                .Setup(s => s.ContainsAsync(It.IsAny<long>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            var result = await _controller.DeleteOpportunityChargeCode(99, CancellationToken.None);
+
+            result.Should().BeOfType<NotFoundResult>();
+            _mockOpportunityService.Verify(s => s.DeleteChargeCodeOpportunityAsync(It.IsAny<long>(), It.IsAny<CancellationToken>()), Times.Never);
+        }
+
+        [Test]
+        public async Task DeleteOpportunityChargeCode_ReturnsNoContent_WhenDeleted()
+        {
+            const long opportunityId = 7;
+            _mockOpportunityService.Setup(s => s.ContainsAsync(opportunityId, It.IsAny<CancellationToken>())).ReturnsAsync(true);
+            _mockOpportunityService.Setup(s => s.DeleteChargeCodeOpportunityAsync(opportunityId, It.IsAny<CancellationToken>())).ReturnsAsync(true);
+
+            var result = await _controller.DeleteOpportunityChargeCode(opportunityId, CancellationToken.None);
+
+            result.Should().BeOfType<NoContentResult>();
+        }
+
+        [Test]
+        public async Task DeleteOpportunityChargeCode_ReturnsBadRequest_WhenDeleteFails()
+        {
+            const long opportunityId = 7;
+            _mockOpportunityService.Setup(s => s.ContainsAsync(opportunityId, It.IsAny<CancellationToken>())).ReturnsAsync(true);
+            _mockOpportunityService.Setup(s => s.DeleteChargeCodeOpportunityAsync(opportunityId, It.IsAny<CancellationToken>())).ReturnsAsync(false);
+
+            var result = await _controller.DeleteOpportunityChargeCode(opportunityId, CancellationToken.None);
+
+            result.Should().BeOfType<BadRequestResult>();
+        }
+
+        // --- GetGoalDetail ---
+
+        [Test]
+        public async Task GetGoalDetail_ReturnsOk_WhenFound()
+        {
+            const long opportunityId = 3;
+            var getData = new StrategicOpportunityGetDetailData();
+            var data = new StrategicOpportunityDetailData();
+            _mockDetailService
+                .Setup(s => s.GetStrategicOpportunityDetailData(opportunityId, false, getData, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(data);
+
+            var result = await _controller.GetGoalDetail(opportunityId, getData, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>()
+                .Which.Value.Should().Be(data);
+        }
+
+        [Test]
+        public async Task GetGoalDetail_ReturnsNotFound_WhenMissing()
+        {
+            _mockDetailService
+                .Setup(s => s.GetStrategicOpportunityDetailData(It.IsAny<long>(), false, It.IsAny<StrategicOpportunityGetDetailData>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((StrategicOpportunityDetailData)null);
+
+            var result = await _controller.GetGoalDetail(99, new StrategicOpportunityGetDetailData(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        [Test]
+        public async Task GetGoalDetail_PassesIsTrackingFalse_ToService()
+        {
+            const long opportunityId = 3;
+            var getData = new StrategicOpportunityGetDetailData();
+            _mockDetailService
+                .Setup(s => s.GetStrategicOpportunityDetailData(opportunityId, false, getData, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new StrategicOpportunityDetailData());
+
+            await _controller.GetGoalDetail(opportunityId, getData, CancellationToken.None);
+
+            _mockDetailService.Verify(s => s.GetStrategicOpportunityDetailData(opportunityId, false, getData, CancellationToken.None), Times.Once);
+        }
+
+        // --- GetTrackingDetail ---
+
+        [Test]
+        public async Task GetTrackingDetail_ReturnsOk_WhenFound()
+        {
+            const long opportunityId = 4;
+            var getData = new StrategicOpportunityGetDetailData();
+            var data = new StrategicOpportunityDetailData();
+            _mockDetailService
+                .Setup(s => s.GetStrategicOpportunityDetailData(opportunityId, true, getData, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(data);
+
+            var result = await _controller.GetTrackingDetail(opportunityId, getData, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>()
+                .Which.Value.Should().Be(data);
+        }
+
+        [Test]
+        public async Task GetTrackingDetail_ReturnsNotFound_WhenMissing()
+        {
+            _mockDetailService
+                .Setup(s => s.GetStrategicOpportunityDetailData(It.IsAny<long>(), true, It.IsAny<StrategicOpportunityGetDetailData>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((StrategicOpportunityDetailData)null);
+
+            var result = await _controller.GetTrackingDetail(99, new StrategicOpportunityGetDetailData(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        [Test]
+        public async Task GetTrackingDetail_PassesIsTrackingTrue_ToService()
+        {
+            const long opportunityId = 4;
+            var getData = new StrategicOpportunityGetDetailData();
+            _mockDetailService
+                .Setup(s => s.GetStrategicOpportunityDetailData(opportunityId, true, getData, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new StrategicOpportunityDetailData());
+
+            await _controller.GetTrackingDetail(opportunityId, getData, CancellationToken.None);
+
+            _mockDetailService.Verify(s => s.GetStrategicOpportunityDetailData(opportunityId, true, getData, CancellationToken.None), Times.Once);
+        }
+
+        // --- UpdateDetails ---
+
+        [Test]
+        public async Task UpdateDetails_ReturnsBadRequest_WhenDtoIsNull()
+        {
+            var result = await _controller.UpdateDetails(1, null, CancellationToken.None);
+
+            result.Should().BeOfType<BadRequestResult>();
+            _mockDetailService.Verify(s => s.UpdateStrategicOpportunityDetailsData(
+                It.IsAny<long>(), It.IsAny<IEnumerable<StrategicOpportunityChargeCodeAdjustment>>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()), Times.Never);
+        }
+
+        [Test]
+        public async Task UpdateDetails_ReturnsBadRequest_WhenAdjustmentsIsEmpty()
+        {
+            var dto = new StrategicChargeCodeController.UpdateDetailsDto
+            {
+                Adjustments = new List<StrategicOpportunityChargeCodeAdjustment>(),
+                Rows = new List<string> { "system", "entity" }
+            };
+
+            var result = await _controller.UpdateDetails(1, dto, CancellationToken.None);
+
+            result.Should().BeOfType<BadRequestResult>();
+            _mockDetailService.Verify(s => s.UpdateStrategicOpportunityDetailsData(
+                It.IsAny<long>(), It.IsAny<IEnumerable<StrategicOpportunityChargeCodeAdjustment>>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()), Times.Never);
+        }
+
+        [Test]
+        public async Task UpdateDetails_ReturnsBadRequest_WhenRowsIsEmpty()
+        {
+            var dto = new StrategicChargeCodeController.UpdateDetailsDto
+            {
+                Adjustments = new List<StrategicOpportunityChargeCodeAdjustment> { new() { NodeKey = "101", CostsValue = 5000m } },
+                Rows = new List<string>()
+            };
+
+            var result = await _controller.UpdateDetails(1, dto, CancellationToken.None);
+
+            result.Should().BeOfType<BadRequestResult>();
+            _mockDetailService.Verify(s => s.UpdateStrategicOpportunityDetailsData(
+                It.IsAny<long>(), It.IsAny<IEnumerable<StrategicOpportunityChargeCodeAdjustment>>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()), Times.Never);
+        }
+
+        [Test]
+        public async Task UpdateDetails_ReturnsOk_AndCallsService_WhenDtoIsValid()
+        {
+            const long opportunityId = 42;
+            var dto = new StrategicChargeCodeController.UpdateDetailsDto
+            {
+                Adjustments = new List<StrategicOpportunityChargeCodeAdjustment> { new() { NodeKey = "101", CostsValue = 5000m } },
+                Rows = new List<string> { "system", "entity", "chargeCode" }
+            };
+
+            var result = await _controller.UpdateDetails(opportunityId, dto, CancellationToken.None);
+
+            result.Should().BeOfType<OkResult>();
+            _mockDetailService.Verify(s => s.UpdateStrategicOpportunityDetailsData(
+                opportunityId, dto.Adjustments, dto.Rows, CancellationToken.None), Times.Once);
+        }
+
+        // --- Route attribute assertions ---
+
+        [Test]
+        public void Controller_HasExpectedRouteTemplate()
+        {
+            var routeAttr = typeof(StrategicChargeCodeController).GetCustomAttribute<RouteAttribute>();
+
+            routeAttr.Should().NotBeNull();
+            routeAttr.Template.Should().Be("api/v{api-version:apiVersion}/[controller]");
+        }
+
+        [TestCase(nameof(StrategicChargeCodeController.GetOpportunityChargeCode),  typeof(HttpGetAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicChargeCodeController.CreateOpportunityChargeCode), typeof(HttpPostAttribute),  null)]
+        [TestCase(nameof(StrategicChargeCodeController.UpdateOpportunityChargeCode), typeof(HttpPutAttribute),   "{opportunityId}")]
+        [TestCase(nameof(StrategicChargeCodeController.DeleteOpportunityChargeCode), typeof(HttpDeleteAttribute), "{opportunityId}")]
+        [TestCase(nameof(StrategicChargeCodeController.GetGoalDetail),              typeof(HttpPostAttribute),   "{opportunityId}/goal-detail")]
+        [TestCase(nameof(StrategicChargeCodeController.ExportInitiative),           typeof(HttpPostAttribute),   "{opportunityId}/export")]
+        [TestCase(nameof(StrategicChargeCodeController.ExportOpportunity),         typeof(HttpPostAttribute),   "{opportunityId}/export-opportunity")]
+        [TestCase(nameof(StrategicChargeCodeController.GetTrackingDetail),          typeof(HttpPostAttribute),   "{opportunityId}/tracking-detail")]
+        [TestCase(nameof(StrategicChargeCodeController.UpdateDetails),              typeof(HttpPutAttribute),    "{opportunityId}/details")]
+        public void ActionRoute_HasExpectedHttpMethodAndTemplate(string methodName, Type httpAttrType, string expectedTemplate)
+        {
+            var method = typeof(StrategicChargeCodeController).GetMethod(methodName);
+            method.Should().NotBeNull($"method '{methodName}' should exist on {nameof(StrategicChargeCodeController)}");
+
+            var attr = method.GetCustomAttribute(httpAttrType);
+            attr.Should().NotBeNull($"{methodName} should be decorated with [{httpAttrType.Name}]");
+            var template = (string)attr.GetType().GetProperty("Template").GetValue(attr);
+            template.Should().Be(expectedTemplate);
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/StrategicGeneralLedgerControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/StrategicGeneralLedgerControllerTests.cs
new file mode 100644
index 0000000..0b7dcb4
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/StrategicGeneralLedgerControllerTests.cs
@@ -0,0 +1,335 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class StrategicGeneralLedgerControllerTests
+    {
+        private StrategicGeneralLedgerController _controller;
+        private Mock<IStrategicOpportunityService> _mockOpportunityService;
+        private Mock<IStrategicGLOpportunityDetailService> _mockDetailService;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _mockOpportunityService = new Mock<IStrategicOpportunityService>();
+            _mockDetailService = new Mock<IStrategicGLOpportunityDetailService>();
+            _controller = new StrategicGeneralLedgerController(_mockOpportunityService.Object, _mockDetailService.Object);
+        }
+
+        // --- GetOpportunityGL ---
+
+        [Test]
+        public async Task GetOpportunityGL_ReturnsOk_WhenFound()
+        {
+            const long opportunityId = 1;
+            var data = new StrategicOpportunityGLEditData();
+            _mockOpportunityService
+                .Setup(s => s.GetStrategicOpportunityGL(opportunityId, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(data);
+
+            var result = await _controller.GetOpportunityGL(opportunityId, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>()
+                .Which.Value.Should().Be(data);
+        }
+
+        [Test]
+        public async Task GetOpportunityGL_ReturnsNotFound_WhenMissing()
+        {
+            _mockOpportunityService
+                .Setup(s => s.GetStrategicOpportunityGL(It.IsAny<long>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((StrategicOpportunityGLEditData)null);
+
+            var result = await _controller.GetOpportunityGL(99, CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        // --- CreateOpportunityGeneralLedger ---
+
+        [Test]
+        public async Task CreateOpportunityGeneralLedger_ReturnsOk_WithNewId_WhenSuccessful()
+        {
+            const long newId = 42;
+            var dto = new StrategicOpportunityGLDto();
+            _mockOpportunityService
+                .Setup(s => s.CreateOpportunityGeneralLedgerAsync(dto, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(newId);
+
+            var result = await _controller.CreateOpportunityGeneralLedger(dto, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>()
+                .Which.Value.Should().Be(newId);
+        }
+
+        [Test]
+        public async Task CreateOpportunityGeneralLedger_ReturnsBadRequest_WhenServiceReturnsZero()
+        {
+            _mockOpportunityService
+                .Setup(s => s.CreateOpportunityGeneralLedgerAsync(It.IsAny<StrategicOpportunityGLDto>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(0L);
+
+            var result = await _controller.CreateOpportunityGeneralLedger(new StrategicOpportunityGLDto(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<BadRequestResult>();
+        }
+
+        // --- UpdateOpportunityGeneralLedger ---
+
+        [Test]
+        public async Task UpdateOpportunityGeneralLedger_ReturnsOk_WhenSuccessful()
+        {
+            const long opportunityId = 5;
+            _mockOpportunityService
+                .Setup(s => s.UpdateOpportunityGeneralLedger(opportunityId, It.IsAny<StrategicOpportunityGLUpdateDto>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(opportunityId);
+
+            var result = await _controller.UpdateOpportunityGeneralLedger(opportunityId, new StrategicOpportunityGLUpdateDto(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>();
+        }
+
+        [Test]
+        public async Task UpdateOpportunityGeneralLedger_ReturnsNotFound_WhenServiceReturnsZero()
+        {
+            _mockOpportunityService
+                .Setup(s => s.UpdateOpportunityGeneralLedger(It.IsAny<long>(), It.IsAny<StrategicOpportunityGLUpdateDto>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(0L);
+
+            var result = await _controller.UpdateOpportunityGeneralLedger(99, new StrategicOpportunityGLUpdateDto(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        // --- DeleteOpportunityGeneralLedger ---
+
+        [Test]
+        public async Task DeleteOpportunityGeneralLedger_ReturnsNotFound_WhenOpportunityDoesNotExist()
+        {
+            _mockOpportunityService
+                .Setup(s => s.ContainsGLAsync(It.IsAny<long>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            var result = await _controller.DeleteOpportunityGeneralLedger(99, CancellationToken.None);
+
+            result.Should().BeOfType<NotFoundResult>();
+            _mockOpportunityService.Verify(s => s.DeleteGeneralLedgerOpportunityAsync(It.IsAny<long>(), It.IsAny<CancellationToken>()), Times.Never);
+        }
+
+        [Test]
+        public async Task DeleteOpportunityGeneralLedger_ReturnsNoContent_WhenDeleted()
+        {
+            const long opportunityId = 7;
+            _mockOpportunityService.Setup(s => s.ContainsGLAsync(opportunityId, It.IsAny<CancellationToken>())).ReturnsAsync(true);
+            _mockOpportunityService.Setup(s => s.DeleteGeneralLedgerOpportunityAsync(opportunityId, It.IsAny<CancellationToken>())).ReturnsAsync(true);
+
+            var result = await _controller.DeleteOpportunityGeneralLedger(opportunityId, CancellationToken.None);
+
+            result.Should().BeOfType<NoContentResult>();
+        }
+
+        [Test]
+        public async Task DeleteOpportunityGeneralLedger_ReturnsBadRequest_WhenDeleteFails()
+        {
+            const long opportunityId = 7;
+            _mockOpportunityService.Setup(s => s.ContainsGLAsync(opportunityId, It.IsAny<CancellationToken>())).ReturnsAsync(true);
+            _mockOpportunityService.Setup(s => s.DeleteGeneralLedgerOpportunityAsync(opportunityId, It.IsAny<CancellationToken>())).ReturnsAsync(false);
+
+            var result = await _controller.DeleteOpportunityGeneralLedger(opportunityId, CancellationToken.None);
+
+            result.Should().BeOfType<BadRequestResult>();
+        }
+
+        // --- GetGLDetail ---
+
+        [Test]
+        public async Task GetGLDetail_ReturnsOk_WhenFound()
+        {
+            const long opportunityId = 3;
+            var dimensions = new[] { "system", "entity" };
+            var data = new StrategicOpportunityGLDetailData();
+            _mockDetailService
+                .Setup(s => s.GetStrategicOpportunityGLDetailData(opportunityId, false, dimensions, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(data);
+
+            var result = await _controller.GetGLDetail(opportunityId, dimensions, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>()
+                .Which.Value.Should().Be(data);
+        }
+
+        [Test]
+        public async Task GetGLDetail_ReturnsNotFound_WhenMissing()
+        {
+            _mockDetailService
+                .Setup(s => s.GetStrategicOpportunityGLDetailData(It.IsAny<long>(), false, It.IsAny<string[]>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((StrategicOpportunityGLDetailData)null);
+
+            var result = await _controller.GetGLDetail(99, Array.Empty<string>(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        [Test]
+        public async Task GetGLDetail_PassesIsTrackingFalse_ToService()
+        {
+            const long opportunityId = 3;
+            var dimensions = new[] { "system" };
+            _mockDetailService
+                .Setup(s => s.GetStrategicOpportunityGLDetailData(opportunityId, false, dimensions, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new StrategicOpportunityGLDetailData());
+
+            await _controller.GetGLDetail(opportunityId, dimensions, CancellationToken.None);
+
+            _mockDetailService.Verify(s => s.GetStrategicOpportunityGLDetailData(opportunityId, false, dimensions, CancellationToken.None), Times.Once);
+        }
+
+        // --- GetGLTrackingDetail ---
+
+        [Test]
+        public async Task GetGLTrackingDetail_ReturnsOk_WhenFound()
+        {
+            const long opportunityId = 4;
+            var dimensions = new[] { "system", "glAccount" };
+            var data = new StrategicOpportunityGLDetailData();
+            _mockDetailService
+                .Setup(s => s.GetStrategicOpportunityGLDetailData(opportunityId, true, dimensions, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(data);
+
+            var result = await _controller.GetGLTrackingDetail(opportunityId, dimensions, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>()
+                .Which.Value.Should().Be(data);
+        }
+
+        [Test]
+        public async Task GetGLTrackingDetail_ReturnsNotFound_WhenMissing()
+        {
+            _mockDetailService
+                .Setup(s => s.GetStrategicOpportunityGLDetailData(It.IsAny<long>(), true, It.IsAny<string[]>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((StrategicOpportunityGLDetailData)null);
+
+            var result = await _controller.GetGLTrackingDetail(99, Array.Empty<string>(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        [Test]
+        public async Task GetGLTrackingDetail_PassesIsTrackingTrue_ToService()
+        {
+            const long opportunityId = 4;
+            var dimensions = new[] { "system" };
+            _mockDetailService
+                .Setup(s => s.GetStrategicOpportunityGLDetailData(opportunityId, true, dimensions, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new StrategicOpportunityGLDetailData());
+
+            await _controller.GetGLTrackingDetail(opportunityId, dimensions, CancellationToken.None);
+
+            _mockDetailService.Verify(s => s.GetStrategicOpportunityGLDetailData(opportunityId, true, dimensions, CancellationToken.None), Times.Once);
+        }
+
+        // --- UpdateGLDetails ---
+
+        [Test]
+        public async Task UpdateGLDetails_ReturnsBadRequest_WhenDtoIsNull()
+        {
+            var result = await _controller.UpdateGLDetails(1, null, CancellationToken.None);
+
+            result.Should().BeOfType<BadRequestResult>();
+            _mockDetailService.Verify(s => s.UpdateStrategicOpportunityGLDetailsData(
+                It.IsAny<long>(), It.IsAny<IEnumerable<StrategicOpportunityGLAdjustment>>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()), Times.Never);
+        }
+
+        [Test]
+        public async Task UpdateGLDetails_ReturnsBadRequest_WhenAdjustmentsIsEmpty()
+        {
+            var dto = new UpdateGLDetailsDto
+            {
+                Adjustments = new List<StrategicOpportunityGLAdjustment>(),
+                Rows = new List<string> { "system", "entity" }
+            };
+
+            var result = await _controller.UpdateGLDetails(1, dto, CancellationToken.None);
+
+            result.Should().BeOfType<BadRequestResult>();
+            _mockDetailService.Verify(s => s.UpdateStrategicOpportunityGLDetailsData(
+                It.IsAny<long>(), It.IsAny<IEnumerable<StrategicOpportunityGLAdjustment>>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()), Times.Never);
+        }
+
+        [Test]
+        public async Task UpdateGLDetails_ReturnsBadRequest_WhenRowsIsEmpty()
+        {
+            var dto = new UpdateGLDetailsDto
+            {
+                Adjustments = new List<StrategicOpportunityGLAdjustment> { new() { NodeKey = "101", GoalAmountValue = 5000m } },
+                Rows = new List<string>()
+            };
+
+            var result = await _controller.UpdateGLDetails(1, dto, CancellationToken.None);
+
+            result.Should().BeOfType<BadRequestResult>();
+            _mockDetailService.Verify(s => s.UpdateStrategicOpportunityGLDetailsData(
+                It.IsAny<long>(), It.IsAny<IEnumerable<StrategicOpportunityGLAdjustment>>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()), Times.Never);
+        }
+
+        [Test]
+        public async Task UpdateGLDetails_ReturnsOk_AndCallsService_WhenDtoIsValid()
+        {
+            const long opportunityId = 42;
+            var dto = new UpdateGLDetailsDto
+            {
+                Adjustments = new List<StrategicOpportunityGLAdjustment> { new() { NodeKey = "101", GoalAmountValue = 5000m } },
+                Rows = new List<string> { "system", "entity", "glAccount" }
+            };
+
+            var result = await _controller.UpdateGLDetails(opportunityId, dto, CancellationToken.None);
+
+            result.Should().BeOfType<OkResult>();
+            _mockDetailService.Verify(s => s.UpdateStrategicOpportunityGLDetailsData(
+                opportunityId, dto.Adjustments, dto.Rows, CancellationToken.None), Times.Once);
+        }
+
+        // --- Route attribute assertions ---
+
+        [Test]
+        public void Controller_HasExpectedRouteTemplate()
+        {
+            var routeAttr = typeof(StrategicGeneralLedgerController).GetCustomAttribute<RouteAttribute>();
+
+            routeAttr.Should().NotBeNull();
+            routeAttr.Template.Should().Be("api/v{api-version:apiVersion}/[controller]");
+        }
+
+        [TestCase(nameof(StrategicGeneralLedgerController.GetOpportunityGL),              typeof(HttpGetAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicGeneralLedgerController.CreateOpportunityGeneralLedger), typeof(HttpPostAttribute),   null)]
+        [TestCase(nameof(StrategicGeneralLedgerController.UpdateOpportunityGeneralLedger), typeof(HttpPutAttribute),    "{opportunityId}")]
+        [TestCase(nameof(StrategicGeneralLedgerController.DeleteOpportunityGeneralLedger), typeof(HttpDeleteAttribute), "{opportunityId}")]
+        [TestCase(nameof(StrategicGeneralLedgerController.GetGLDetail),                   typeof(HttpPostAttribute),   "{opportunityId}/detail")]
+        [TestCase(nameof(StrategicGeneralLedgerController.GetGLTrackingDetail),           typeof(HttpPostAttribute),   "{opportunityId}/tracking-detail")]
+        [TestCase(nameof(StrategicGeneralLedgerController.UpdateGLDetails),               typeof(HttpPutAttribute),    "{opportunityId}/details")]
+        public void ActionRoute_HasExpectedHttpMethodAndTemplate(string methodName, Type httpAttrType, string expectedTemplate)
+        {
+            var method = typeof(StrategicGeneralLedgerController).GetMethod(methodName);
+            method.Should().NotBeNull($"method '{methodName}' should exist on {nameof(StrategicGeneralLedgerController)}");
+
+            var attr = method.GetCustomAttribute(httpAttrType);
+            attr.Should().NotBeNull($"{methodName} should be decorated with [{httpAttrType.Name}]");
+            var template = (string)attr.GetType().GetProperty("Template").GetValue(attr);
+            template.Should().Be(expectedTemplate);
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/StrategicOpportunityControllerTests.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/StrategicOpportunityControllerTests.cs
new file mode 100644
index 0000000..86dfaca
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Controllers/StrategicOpportunityControllerTests.cs
@@ -0,0 +1,326 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.Controllers;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Controllers
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class StrategicOpportunityControllerTests
+    {
+        private StrategicOpportunityController _controller;
+        private Mock<IStrategicOpportunityService> _mockOpportunityService;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _mockOpportunityService = new Mock<IStrategicOpportunityService>();
+            _controller = new StrategicOpportunityController(_mockOpportunityService.Object);
+        }
+
+        // --- GetGeneralInfo ---
+
+        [Test]
+        public async Task GetGeneralInfo_ReturnsOk_WhenOpportunityExists()
+        {
+            const long opportunityId = 1;
+            var info = new StrategicOpportunityGeneralInfo();
+            _mockOpportunityService
+                .Setup(s => s.GetStrategicOpportunityGeneralInfo(opportunityId, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(info);
+
+            var result = await _controller.GetGeneralInfo(opportunityId, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>()
+                .Which.Value.Should().Be(info);
+        }
+
+        [Test]
+        public async Task GetGeneralInfo_ReturnsNotFound_WhenOpportunityMissing()
+        {
+            _mockOpportunityService
+                .Setup(s => s.GetStrategicOpportunityGeneralInfo(It.IsAny<long>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((StrategicOpportunityGeneralInfo)null);
+
+            var result = await _controller.GetGeneralInfo(99, CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        // --- GetDrawerDetails ---
+
+        [Test]
+        public async Task GetDrawerDetails_ReturnsOk_WhenOpportunityExists()
+        {
+            const long opportunityId = 5;
+            var details = new StrategicOpportunityDrawerDetails();
+            _mockOpportunityService
+                .Setup(s => s.GetStrategicOpportunityDrawerDetails(opportunityId, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(details);
+
+            var result = await _controller.GetDrawerDetails(opportunityId, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>()
+                .Which.Value.Should().Be(details);
+        }
+
+        [Test]
+        public async Task GetDrawerDetails_ReturnsNotFound_WhenOpportunityMissing()
+        {
+            _mockOpportunityService
+                .Setup(s => s.GetStrategicOpportunityDrawerDetails(It.IsAny<long>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((StrategicOpportunityDrawerDetails)null);
+
+            var result = await _controller.GetDrawerDetails(99, CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        // --- Copy ---
+
+        [Test]
+        public async Task Copy_ReturnsOk_WithNewId_WhenSuccessful()
+        {
+            const long opportunityId = 10;
+            const long newId = 42;
+            _mockOpportunityService
+                .Setup(s => s.CopyStrategicOpportunity(opportunityId, It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(newId);
+
+            var result = await _controller.Copy(opportunityId, "Copy of Opp", CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>()
+                .Which.Value.Should().Be(newId);
+        }
+
+        [Test]
+        public async Task Copy_ReturnsBadRequest_WhenServiceReturnsZero()
+        {
+            _mockOpportunityService
+                .Setup(s => s.CopyStrategicOpportunity(It.IsAny<long>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(0L);
+
+            var result = await _controller.Copy(10, "Copy of Opp", CancellationToken.None);
+
+            result.Result.Should().BeOfType<BadRequestResult>();
+        }
+
+        // --- SetStatus ---
+
+        [Test]
+        public async Task SetStatus_ReturnsOk_WhenUpdateSucceeds()
+        {
+            const long opportunityId = 3;
+            var dto = new StrategicOpportunityUpdateStatusDto();
+            _mockOpportunityService
+                .Setup(s => s.UpdateStrategicOpportunityStatus(opportunityId, dto, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            var result = await _controller.SetStatus(opportunityId, dto, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>();
+        }
+
+        [Test]
+        public async Task SetStatus_ReturnsNotFound_WhenUpdateFails()
+        {
+            _mockOpportunityService
+                .Setup(s => s.UpdateStrategicOpportunityStatus(It.IsAny<long>(), It.IsAny<StrategicOpportunityUpdateStatusDto>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            var result = await _controller.SetStatus(99, new StrategicOpportunityUpdateStatusDto(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        // --- UpdateLayout ---
+
+        [Test]
+        public async Task UpdateLayout_ReturnsOk_WhenUpdateSucceeds()
+        {
+            const long opportunityId = 7;
+            var layout = new StrategicOpportunityLayout();
+            _mockOpportunityService
+                .Setup(s => s.UpdateStrategicOpportunityLayout(opportunityId, layout, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            var result = await _controller.UpdateLayout(opportunityId, layout, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>();
+        }
+
+        [Test]
+        public async Task UpdateLayout_ReturnsNotFound_WhenUpdateFails()
+        {
+            _mockOpportunityService
+                .Setup(s => s.UpdateStrategicOpportunityLayout(It.IsAny<long>(), It.IsAny<StrategicOpportunityLayout>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            var result = await _controller.UpdateLayout(99, new StrategicOpportunityLayout(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        // --- UpdateRoles ---
+
+        [Test]
+        public async Task UpdateRoles_ReturnsOk_WhenUpdateSucceeds()
+        {
+            const long opportunityId = 4;
+            var dto = new StrategicRolesUpdate();
+            _mockOpportunityService
+                .Setup(s => s.UpdateRoles(opportunityId, dto, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            var result = await _controller.UpdateRoles(opportunityId, dto, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>();
+        }
+
+        [Test]
+        public async Task UpdateRoles_ReturnsNotFound_WhenUpdateFails()
+        {
+            _mockOpportunityService
+                .Setup(s => s.UpdateRoles(It.IsAny<long>(), It.IsAny<StrategicRolesUpdate>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            var result = await _controller.UpdateRoles(99, new StrategicRolesUpdate(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        // --- RunTrackingTask ---
+
+        [Test]
+        public async Task RunTrackingTask_ReturnsOk_WhenSuccessful()
+        {
+            const long opportunityId = 8;
+            _mockOpportunityService
+                .Setup(s => s.RunTrackingTask(opportunityId, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            var result = await _controller.RunTrackingTask(opportunityId, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>();
+        }
+
+        [Test]
+        public async Task RunTrackingTask_ReturnsNotFound_WhenOpportunityMissing()
+        {
+            _mockOpportunityService
+                .Setup(s => s.RunTrackingTask(It.IsAny<long>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            var result = await _controller.RunTrackingTask(99, CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        // --- GetMeasures ---
+
+        [Test]
+        public async Task GetMeasures_ReturnsOk_WhenMeasuresExist()
+        {
+            const long opportunityId = 2;
+            var measures = new List<StrategicOpportunityMeasureDto> { new() };
+            _mockOpportunityService
+                .Setup(s => s.GetStrategicOpportunityMeasures(opportunityId, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(measures);
+
+            var result = await _controller.GetMeasures(opportunityId, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>()
+                .Which.Value.Should().Be(measures);
+        }
+
+        [Test]
+        public async Task GetMeasures_ReturnsNotFound_WhenNoMeasures()
+        {
+            _mockOpportunityService
+                .Setup(s => s.GetStrategicOpportunityMeasures(It.IsAny<long>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new List<StrategicOpportunityMeasureDto>());
+
+            var result = await _controller.GetMeasures(99, CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        // --- CompleteInitiative ---
+
+        [Test]
+        public async Task CompleteInitiative_ReturnsOk_WhenSuccessful()
+        {
+            const long opportunityId = 6;
+            var data = new StrategicOpportunityCompleteInitiativeData();
+            _mockOpportunityService
+                .Setup(s => s.CompleteInitiative(opportunityId, data, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            var result = await _controller.CompleteInitiative(opportunityId, data, CancellationToken.None);
+
+            result.Result.Should().BeOfType<OkObjectResult>();
+        }
+
+        [Test]
+        public async Task CompleteInitiative_ReturnsNotFound_WhenOpportunityMissing()
+        {
+            _mockOpportunityService
+                .Setup(s => s.CompleteInitiative(It.IsAny<long>(), It.IsAny<StrategicOpportunityCompleteInitiativeData>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            var result = await _controller.CompleteInitiative(99, new StrategicOpportunityCompleteInitiativeData(), CancellationToken.None);
+
+            result.Result.Should().BeOfType<NotFoundResult>();
+        }
+
+        // --- Route attribute assertions ---
+
+        [Test]
+        public void Controller_HasExpectedRouteTemplate()
+        {
+            var routeAttr = typeof(StrategicOpportunityController).GetCustomAttribute<RouteAttribute>();
+
+            routeAttr.Should().NotBeNull();
+            routeAttr.Template.Should().Be("api/v{api-version:apiVersion}/[controller]");
+        }
+
+        [TestCase(nameof(StrategicOpportunityController.GetOpportunities),   typeof(HttpGetAttribute),    "")]
+        [TestCase(nameof(StrategicOpportunityController.GetGeneralInfo),      typeof(HttpGetAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicOpportunityController.IsNameValid),         typeof(HttpPostAttribute),   "[action]")]
+        [TestCase(nameof(StrategicOpportunityController.GetLayout),           typeof(HttpGetAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicOpportunityController.UpdateLayout),        typeof(HttpPutAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicOpportunityController.SetStatus),           typeof(HttpPutAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicOpportunityController.GetInitiatives),      typeof(HttpGetAttribute),    "[action]")]
+        [TestCase(nameof(StrategicOpportunityController.UpdateInitiative),    typeof(HttpPutAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicOpportunityController.UpdateRoles),         typeof(HttpPutAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicOpportunityController.UpdateRampUps),       typeof(HttpPutAttribute),    "{opportunityId}/ramp-ups")]
+        [TestCase(nameof(StrategicOpportunityController.GetRampUps),          typeof(HttpGetAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicOpportunityController.RunTrackingTask),     typeof(HttpGetAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicOpportunityController.CompleteInitiative),  typeof(HttpPutAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicOpportunityController.GetMeasures),         typeof(HttpGetAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicOpportunityController.GetPrimaryMeasure),   typeof(HttpGetAttribute),    "{opportunityId}/[action]")]
+        [TestCase(nameof(StrategicOpportunityController.GetMeasureDetails),   typeof(HttpGetAttribute),    "{measureId}/[action]")]
+        [TestCase(nameof(StrategicOpportunityController.GetDrawerDetails),    typeof(HttpGetAttribute),    "{opportunityId}")]
+        [TestCase(nameof(StrategicOpportunityController.Copy),                typeof(HttpPostAttribute),   "{opportunityId}/copy")]
+        public void ActionRoute_HasExpectedHttpMethodAndTemplate(string methodName, Type httpAttrType, string expectedTemplate)
+        {
+            var method = typeof(StrategicOpportunityController).GetMethod(methodName);
+            method.Should().NotBeNull($"method '{methodName}' should exist on {nameof(StrategicOpportunityController)}");
+
+            var attr = method.GetCustomAttribute(httpAttrType);
+            attr.Should().NotBeNull($"{methodName} should be decorated with [{httpAttrType.Name}]");
+            var template = (string)attr.GetType().GetProperty("Template").GetValue(attr);
+            template.Should().Be(expectedTemplate);
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Generics/ClientNetworkOpportunityMapper.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Generics/ClientNetworkOpportunityMapper.cs
new file mode 100644
index 0000000..e0790bb
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Generics/ClientNetworkOpportunityMapper.cs
@@ -0,0 +1,20 @@
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Network;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Generics
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class ClientNetworkOpportunityMapper
+    {
+
+        public static ClientNetworkOpportunityDto MapToDto(this ClientNetworkOpportunity src)
+        {
+            var mapped = src.Mapped();
+            return mapped;
+        }
+
+        private static partial ClientNetworkOpportunityDto Mapped(this ClientNetworkOpportunity src);
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Generics/CommentMapper.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Generics/CommentMapper.cs
new file mode 100644
index 0000000..04a3b94
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Generics/CommentMapper.cs
@@ -0,0 +1,13 @@
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using static Strata.ContinuousImprovement.Api.Controllers.CommentsController;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Api.Generics
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class CommentMapper
+    {
+        public static partial Comment Map(this NewComment src);
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Generics/FakeBackgroundJobClient.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Generics/FakeBackgroundJobClient.cs
new file mode 100644
index 0000000..4685eae
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Generics/FakeBackgroundJobClient.cs
@@ -0,0 +1,24 @@
+using Hangfire;
+using Hangfire.Common;
+using Hangfire.States;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.Generics
+{
+    public class FakeBackgroundJobClient : IBackgroundJobClient
+    {
+        public Queue<Job> Jobs { get; } = new Queue<Job>();
+
+        public string Create(Job job, IState state)
+        {
+            Jobs.Enqueue(job);
+            return Jobs.Count.ToString();
+        }
+
+        public bool ChangeState(string jobId, IState state, string expectedState)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/SnowflakeControllers/UtilizationVariationControllerTest.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/SnowflakeControllers/UtilizationVariationControllerTest.cs
new file mode 100644
index 0000000..eb97e61
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/SnowflakeControllers/UtilizationVariationControllerTest.cs
@@ -0,0 +1,76 @@
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Api.SnowflakeControllers;
+using Strata.DecisionSupport.Biz.Mapperly;
+using Strata.DecisionSupport.Biz.Services;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyNUnit;
+using VerifyTests;
+using Encounters = Strata.DecisionSupport.Biz.Encounters;
+using Parameters = Strata.DecisionSupport.Biz.Parameters;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit.SnowflakeControllers
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Unit"), Category("Controller")]
+    public class UtilizationVariationControllerTest
+    {
+        public VerifySettings verifySettings;
+
+        private UtilizationVariationController controller;
+
+        [SetUp]
+        public void SetUp()
+        {
+            var charges = new List<Encounters.ChargeInfo> {
+                new Encounters.ChargeInfo()
+            };
+            var jazzCharges = charges.Select(c => JazzEncounterInfoMapper.MapToJazz(c));
+            var service = Mock.Of<UtilizationVariationService>();
+
+            controller = new UtilizationVariationController(service);
+            verifySettings = TestExtensions.TestSettings();
+        }
+
+        [Test]
+        public async Task TestController()
+        {
+            var controllerExists = controller != null;
+            await Verifier.Verify(controllerExists, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [TestCaseSource(nameof(GetChargeInfoTestCases))]
+        public async Task TestGetChargeInfo(Guid opportunityGuid, IEnumerable<int> chargeCodeIds)
+        {
+            var queryInfo = new Parameters.ChargeQueryInfo(Guid.NewGuid(), 10, chargeCodeIds.ToList(), opportunityGuid);
+            var response = await controller.GetChargeInfoAsync(queryInfo, CancellationToken.None);
+            await Verifier.Verify(response, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [TestCaseSource(nameof(GetChargeInfoTestCases))]
+        public async Task TestGetAllChargeInfo(Guid opportunityGuid, IEnumerable<int> chargeCodeIds)
+        {
+            var queryInfo = new Parameters.AllChargeQueryInfo(opportunityGuid, chargeCodeIds.ToList());
+            var response = await controller.GetAllChargeInfoAsync(queryInfo, CancellationToken.None);
+            await Verifier.Verify(response, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        public static IEnumerable<TestCaseData> GetChargeInfoTestCases()
+        {
+            yield return new TestCaseData(Guid.Empty, Enumerable.Empty<int>())
+                .SetName("{m} Empty OpportunityGuid");
+            yield return new TestCaseData(Guid.Empty, new[] { 1 })
+                .SetName("{m} with ChargeCodes");
+            yield return new TestCaseData(Guid.NewGuid(), new[] { 1 })
+                .SetName("{m} with Opportunity and ChargeCodes");
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/Strata.ContinuousImprovement.Api.Test.Unit.csproj b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Strata.ContinuousImprovement.Api.Test.Unit.csproj
new file mode 100644
index 0000000..07cf304
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/Strata.ContinuousImprovement.Api.Test.Unit.csproj
@@ -0,0 +1,78 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Configuration\**" />
+    <Compile Remove="Resource\Examples\AllOpportunity\**" />
+    <Compile Remove="Utilities\**" />
+    <EmbeddedResource Remove="Configuration\**" />
+    <EmbeddedResource Remove="Resource\Examples\AllOpportunity\**" />
+    <EmbeddedResource Remove="Utilities\**" />
+    <None Remove="Configuration\**" />
+    <None Remove="Resource\Examples\AllOpportunity\**" />
+    <None Remove="Utilities\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="Biz\All\OpportunityType.cs" />
+    <Compile Remove="Biz\Generics\ConfigurationServiceTest.cs" />
+    <Compile Remove="Biz\Generics\DbSetExtensions.cs" />
+    <Compile Remove="Biz\Generics\VariationOpportunityServiceTest.cs" />
+    <Compile Remove="Biz\SlugifyParameterTransformerTest.cs" />
+    <Compile Remove="Biz\StaffingToDemand\Opportunities\StaffingToDemandOpportunityServiceTest.cs" />
+    <Compile Remove="Biz\UtilizationVariation\Opportunities\VariationOpportunityFilter.cs" />
+    <Compile Remove="Generics\OpportunityTypeExtensions.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="Resource\Examples\ExcelFilter.xlsx" />
+    <None Remove="Resource\PRExcelFilter.xlsx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Strata - Backup.ContinuousImprovement.Test.Unit.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ClosedXML.Signed" Version="0.95.4" />
+    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Remotion.Linq.Development" Version="2.2.0" />
+    <PackageReference Include="Talentsoft.Moq.SetupAsync" Version="1.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Strata.ContinuousImprovement.Biz\Strata.ContinuousImprovement.Biz.csproj" />
+    <ProjectReference Include="..\..\src\Strata.ContinuousImprovement.Api\Strata.ContinuousImprovement.Api.csproj" />
+    <ProjectReference Include="..\Strata.ContinuousImprovement.Biz.Test.Unit\Strata.ContinuousImprovement.Biz.Test.Unit.csproj" />
+    <ProjectReference Include="..\Strata.ContinuousImprovement.Biz.Test.Unit\Strata.ContinuousImprovement.Biz.Test.Unit.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Resource\Examples\AllOpportunity\" />
+    <Folder Include="Resource\Examples\EncounterOpportunity\" />
+    <Folder Include="Resource\Examples\FreeFormOpportunity\" />
+    <Folder Include="Resource\Examples\GeneralLedgerOpportunity\" />
+    <Folder Include="Resource\Examples\PayrollOpportunity\" />
+    <Folder Include="Resource\Examples\QualityVariationItemOpportunity\" />
+    <Folder Include="Resource\Examples\StaffingToDemandOpportunity\" />
+    <Folder Include="Resource\Examples\VariationOpportunity\" />
+    <Folder Include="SnowflakeControllers\snapshots\" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/TestExtensions.cs b/tests/Strata.ContinuousImprovement.Api.Test.Unit/TestExtensions.cs
new file mode 100644
index 0000000..73d3f9e
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/TestExtensions.cs
@@ -0,0 +1,47 @@
+using NUnit.Framework;
+using System;
+using System.Text.RegularExpressions;
+using VerifyTests;
+
+namespace Strata.ContinuousImprovement.Api.Test.Unit
+{
+    public static class TestExtensions
+    {
+        /// <summary>
+        /// The test name
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns>
+        /// The name of the test split by camel case for a max length of 200 characters.
+        /// </returns>
+        public static string TestName(this TestContext context)
+        {
+            var testName = context.Test.Name.SplitCamelCase();
+            testName = testName[..Math.Min(200, testName.Length)];
+            return testName;
+        }
+
+        public static string SplitCamelCase(this string input)
+        {
+            if (string.IsNullOrEmpty(input)) { return input; }
+
+            const string pattern = "([a-z](?=[A-Z])|[A-Z](?=[A-Z][a-r + t-z])|[A-Z](?=[A-Z][s][a-z]))";
+
+            if (input.StartsWith("FY", StringComparison.Ordinal))
+            {   // hack for FY2012, etc
+                return "FY " + Regex.Replace(input.Remove(0, 2), pattern, "$1 ");
+            }
+            input = Regex.Replace(input, @"\{|\}|:|,|\)|\(", "", RegexOptions.Singleline | RegexOptions.IgnoreCase);
+            return Regex.Replace(input, pattern, "$1 ");
+        }
+
+        public static VerifySettings TestSettings()
+        {
+            var settings = new VerifySettings();
+            settings.UseDirectory("snapshots");
+            settings.ScrubInlineGuids();
+            return settings;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Api.Test.Unit/runtimeconfig.template.json b/tests/Strata.ContinuousImprovement.Api.Test.Unit/runtimeconfig.template.json
new file mode 100644
index 0000000..9cbaf60
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Api.Test.Unit/runtimeconfig.template.json
@@ -0,0 +1,5 @@
+{
+  "configProperties": {
+    "System.Drawing.EnableUnixSupport":  true
+  }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/CentralDbIntegrationTests/TestCentralDbOrm.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/CentralDbIntegrationTests/TestCentralDbOrm.cs
new file mode 100644
index 0000000..da0178d
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/CentralDbIntegrationTests/TestCentralDbOrm.cs
@@ -0,0 +1,365 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.ClientWarehouses;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.GMDN;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Biz.Population;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.CentralDbIntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    public class TestCentralDbOrm : IntegrationTestBase
+    {
+        public async Task TestGeneric<T>(TestContext testContext) where T : class
+        {
+            try
+            {
+                var testName = testContext.TestName(typeof(T).Name);
+                var dbSet = ((DbContext)CentralDbContext).Set<T>();
+                var count = await dbSet.CountAsync(CancellationToken.None);
+                Assert.That(count, Is.GreaterThanOrEqualTo(0));
+                if (count == 0)
+                {
+                    if (Activator.CreateInstance(typeof(T)) is T obj)
+                    {
+                        await dbSet.AddAsync(obj, CancellationToken.None);
+                        await ((DbContext)CentralDbContext).SaveChangesAsync(CancellationToken.None);
+                    }
+                }
+                var result = await dbSet.FirstOrDefaultAsync(CancellationToken.None);
+                Assert.That(result, Is.Not.Null.And.InstanceOf<T>());
+            }
+            catch
+            {
+                // ILB
+            }
+        }
+
+        public async Task TestFirst<T>(TestContext testContext) where T : class
+        {
+            try
+            {
+                var testName = testContext.TestName(typeof(T).Name) + " First";
+                var dbSet = ((DbContext)CentralDbContext).Set<T>();
+                var any = await dbSet.AnyAsync(CancellationToken.None);
+                if (!any)
+                {
+                    if (Activator.CreateInstance(typeof(T)) is T obj)
+                    {
+                        await dbSet.AddAsync(obj, CancellationToken.None);
+                        await ((DbContext)CentralDbContext).SaveChangesAsync(CancellationToken.None);
+                    }
+                }
+                var result = await dbSet.FirstOrDefaultAsync(CancellationToken.None);
+                Assert.That(result, Is.Not.Null.And.InstanceOf<T>());
+            }
+            catch
+            {
+                // ILB
+            }
+        }
+
+        public async Task TestCount<T>(TestContext testContext) where T : class
+        {
+            try
+            {
+                var testName = testContext.TestName(typeof(T).Name) + " Count";
+                var dbSet = ((DbContext)CentralDbContext).Set<T>();
+                var count = await dbSet.CountAsync(CancellationToken.None);
+                Assert.That(count, Is.GreaterThanOrEqualTo(0));
+            }
+            catch
+            {
+                // ILB
+            }
+        }
+
+        [TestCaseSource(nameof(TestCaseSources))]
+        public async Task TestOrmCases(string typeName, bool first)
+        {
+            var entityType = ((DbContext)CentralDbContext).Model.GetEntityTypes()
+                .SingleOrDefault(et => et.ClrType.Name == typeName);
+            if (entityType == null) { return; }
+            if (first) { FirstCaseTests(typeName); }
+            CountCaseTests(typeName);
+        }
+
+        public async Task FirstCaseTests(string typeName)
+        {
+            switch (typeName)
+            {
+                case nameof(ClientNetworkOpportunity):
+                    await TestFirst<ClientNetworkOpportunity>(TestContext.CurrentContext);
+                    break;
+                case nameof(ClientNetworkOpportunityLink):
+                    await TestFirst<ClientNetworkOpportunityLink>(TestContext.CurrentContext);
+                    break;
+                case nameof(ClientWarehouse):
+                    await TestFirst<ClientWarehouse>(TestContext.CurrentContext);
+                    break;
+                case nameof(Comment):
+                    await TestFirst<Comment>(TestContext.CurrentContext);
+                    break;
+                case nameof(DeviceIdentifierDimension):
+                    await TestFirst<DeviceIdentifierDimension>(TestContext.CurrentContext);
+                    break;
+                case nameof(DeviceIdentifierTerm):
+                    await TestFirst<DeviceIdentifierTerm>(TestContext.CurrentContext);
+                    break;
+                case nameof(GMDNCategory):
+                    await TestFirst<GMDNCategory>(TestContext.CurrentContext);
+                    break;
+                case nameof(GMDNTerm):
+                    await TestFirst<GMDNTerm>(TestContext.CurrentContext);
+                    break;
+                case nameof(GMDNTermCategory):
+                    await TestFirst<GMDNTermCategory>(TestContext.CurrentContext);
+                    break;
+                case nameof(GUDIDDevice):
+                    await TestFirst<GUDIDDevice>(TestContext.CurrentContext);
+                    break;
+                case nameof(GUDIDIdentifier):
+                    await TestFirst<GUDIDIdentifier>(TestContext.CurrentContext);
+                    break;
+                case nameof(GUDIDTerm):
+                    await TestFirst<GUDIDTerm>(TestContext.CurrentContext);
+                    break;
+                case nameof(NetworkOpportunity):
+                    await TestFirst<NetworkOpportunity>(TestContext.CurrentContext);
+                    break;
+                case nameof(OpportunityTypeWorkbook):
+                    await TestFirst<OpportunityTypeWorkbook>(TestContext.CurrentContext);
+                    break;
+                case nameof(OpportunityWorkbook):
+                    await TestFirst<OpportunityWorkbook>(TestContext.CurrentContext);
+                    break;
+                case nameof(TmpGUDIDIdentifier):
+                    await TestFirst<TmpGUDIDIdentifier>(TestContext.CurrentContext);
+                    break;
+                default:
+                    throw new NotImplementedException(typeName);
+            }
+        }
+
+        public async Task CountCaseTests(string typeName)
+        {
+            switch (typeName)
+            {
+                case nameof(ClientNetworkOpportunity):
+                    await TestCount<ClientNetworkOpportunity>(TestContext.CurrentContext);
+                    break;
+                case nameof(ClientNetworkOpportunityLink):
+                    await TestCount<ClientNetworkOpportunityLink>(TestContext.CurrentContext);
+                    break;
+                case nameof(ClientWarehouse):
+                    await TestCount<ClientWarehouse>(TestContext.CurrentContext);
+                    break;
+                case nameof(Comment):
+                    await TestCount<Comment>(TestContext.CurrentContext);
+                    break;
+                case nameof(DeviceIdentifierDimension):
+                    await TestCount<DeviceIdentifierDimension>(TestContext.CurrentContext);
+                    break;
+                case nameof(DeviceIdentifierTerm):
+                    await TestCount<DeviceIdentifierTerm>(TestContext.CurrentContext);
+                    break;
+                case nameof(GMDNCategory):
+                    await TestCount<GMDNCategory>(TestContext.CurrentContext);
+                    break;
+                case nameof(GMDNTerm):
+                    await TestCount<GMDNTerm>(TestContext.CurrentContext);
+                    break;
+                case nameof(GMDNTermCategory):
+                    await TestCount<GMDNTermCategory>(TestContext.CurrentContext);
+                    break;
+                case nameof(GUDIDDevice):
+                    await TestCount<GUDIDDevice>(TestContext.CurrentContext);
+                    break;
+                case nameof(GUDIDIdentifier):
+                    await TestCount<GUDIDIdentifier>(TestContext.CurrentContext);
+                    break;
+                case nameof(GUDIDTerm):
+                    await TestCount<GUDIDTerm>(TestContext.CurrentContext);
+                    break;
+                case nameof(NetworkOpportunity):
+                    await TestCount<NetworkOpportunity>(TestContext.CurrentContext);
+                    break;
+                case nameof(OpportunityTypeWorkbook):
+                    await TestCount<OpportunityTypeWorkbook>(TestContext.CurrentContext);
+                    break;
+                case nameof(OpportunityWorkbook):
+                    await TestCount<OpportunityWorkbook>(TestContext.CurrentContext);
+                    break;
+                case nameof(TmpGUDIDIdentifier):
+                    await TestCount<TmpGUDIDIdentifier>(TestContext.CurrentContext);
+                    break;
+                default:
+                    throw new NotImplementedException(typeName);
+            }
+        }
+
+        [Test]
+        public async Task MissingCentralDbContextTestCases()
+        {
+            var types = ((DbContext)CentralDbContext).Model.GetEntityTypes()
+                .Select(e => e.ClrType).OrderBy(c => c.Name).ToList();
+            var missingTests = TestCaseSources()
+                .Select(tc => tc.Arguments.First().ToString())
+                .Where(tc => !types.Select(t => t.Name).Contains(tc));
+            foreach (var test in missingTests)
+            {
+                try
+                {
+                    throw new NotImplementedException(test);
+                }
+                catch (Exception)
+                {
+                    // ILB
+                    throw;
+                }
+            }
+        }
+
+        [Test]
+        public async Task CentralDbContextTestCases()
+        {
+            var types = ((DbContext)CentralDbContext).Model.GetEntityTypes()
+                .Select(e => e.ClrType).OrderBy(c => c.Name).ToList();
+
+            foreach (var type in types)
+            {
+                switch (type.Name)
+                {
+                    case nameof(ClientNetworkOpportunity):
+                        await TestGeneric<ClientNetworkOpportunity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ClientNetworkOpportunityLink):
+                        await TestGeneric<ClientNetworkOpportunityLink>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ClientWarehouse):
+                        await TestGeneric<ClientWarehouse>(TestContext.CurrentContext);
+                        break;
+                    case nameof(Comment):
+                        await TestGeneric<Comment>(TestContext.CurrentContext);
+                        break;
+                    case nameof(DeviceIdentifierDimension):
+                        await TestGeneric<DeviceIdentifierDimension>(TestContext.CurrentContext);
+                        break;
+                    case nameof(DeviceIdentifierTerm):
+                        await TestGeneric<DeviceIdentifierTerm>(TestContext.CurrentContext);
+                        break;
+                    case nameof(GMDNCategory):
+                        await TestGeneric<GMDNCategory>(TestContext.CurrentContext);
+                        break;
+                    case nameof(GMDNTerm):
+                        await TestGeneric<GMDNTerm>(TestContext.CurrentContext);
+                        break;
+                    case nameof(GMDNTermCategory):
+                        await TestGeneric<GMDNTermCategory>(TestContext.CurrentContext);
+                        break;
+                    case nameof(GUDIDDevice):
+                        await TestGeneric<GUDIDDevice>(TestContext.CurrentContext);
+                        break;
+                    case nameof(GUDIDIdentifier):
+                        await TestGeneric<GUDIDIdentifier>(TestContext.CurrentContext);
+                        break;
+                    case nameof(GUDIDTerm):
+                        await TestGeneric<GUDIDTerm>(TestContext.CurrentContext);
+                        break;
+                    case nameof(NetworkOpportunity):
+                        await TestGeneric<NetworkOpportunity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(OpportunityTypeWorkbook):
+                        await TestGeneric<OpportunityTypeWorkbook>(TestContext.CurrentContext);
+                        break;
+                    case nameof(OpportunityWorkbook):
+                        await TestGeneric<OpportunityWorkbook>(TestContext.CurrentContext);
+                        break;
+                    case nameof(TmpGUDIDIdentifier):
+                        await TestGeneric<TmpGUDIDIdentifier>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ExplorationInclusionExclusion):
+                        await TestGeneric<ExplorationInclusionExclusion>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ExplorationPopulation):
+                        await TestGeneric<ExplorationPopulation>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ExplorationPopulationEncounter):
+                        await TestGeneric<ExplorationPopulationEncounter>(TestContext.CurrentContext);
+                        break;
+                    case nameof(StrategicOpportunity):
+                        await TestGeneric<StrategicOpportunity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(StrategicOpportunityChargeCode):
+                        await TestGeneric<StrategicOpportunityChargeCode>(TestContext.CurrentContext);
+                        break;
+                    case nameof(StrategicOpportunityGL):
+                        await TestGeneric<StrategicOpportunityGL>(TestContext.CurrentContext);
+                        break;
+                    case nameof(StrategicStakeholdersLink):
+                        await TestGeneric<StrategicStakeholdersLink>(TestContext.CurrentContext);
+                        break;
+                    case nameof(StrategicOpportunityMeasure):
+                        await TestGeneric<StrategicOpportunityMeasure>(TestContext.CurrentContext);
+                        break;
+                    case nameof(StrategicOpportunityWorkbook):
+                        await TestGeneric<StrategicOpportunityWorkbook>(TestContext.CurrentContext);
+                        break;
+                    case nameof(StrategicOpportunityRampUp):
+                        await TestGeneric<StrategicOpportunityRampUp>(TestContext.CurrentContext);
+                        break;
+                    case nameof(OpportunityRoleAssignment.OpportunityRoleAssignment):
+                        await TestGeneric<OpportunityRoleAssignment.OpportunityRoleAssignment>(TestContext.CurrentContext);
+                        break;
+                    default:
+                        var pathArr = TestContext.CurrentContext.TestDirectory.Split(Path.DirectorySeparatorChar);
+                        var path = string.Join(Path.DirectorySeparatorChar, pathArr[..(pathArr.Length - 3)].Append("CentralDbIntegrationTests"));
+                        var fileName = Path.Combine(path, $"{nameof(TestCentralDbOrm)}_{type.Name}.cs");
+                        if (File.Exists(fileName)) break;
+                        var testFile = @"
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.CentralDbIntegrationTests
+{
+    [TestFixture, Category(""Integration""), Category(""CCI"")]
+    public partial class TestCentralDbContext : IntegrationTestBase
+    {
+        [Test]
+        public async Task TestCentralDb" + type.Name + @"()
+        {
+            await TestGeneric<" + type.Name + @">(TestContext.CurrentContext);
+        }
+    }
+}
+";
+                        File.WriteAllText(fileName, testFile);
+                        break;
+                }
+            }
+        }
+
+        [Test]
+        public async Task ClientNetworkOpportunityTest()
+        {
+            var opp = await CentralDbContext.ClientNetworkOpportunities.FirstOrDefaultAsync(CancellationToken.None);
+            opp ??= new ClientNetworkOpportunity();
+            opp.NetworkOpportunity ??= new NetworkOpportunity
+            {
+                Name = nameof(ClientNetworkOpportunityTest),
+                Description = nameof(ClientNetworkOpportunityTest),
+                WorkbookTemplateId = 0
+            };
+            var result = new ClientNetworkOpportunityDto(opp);
+            Assert.That(result, Is.Not.Null.And.InstanceOf<ClientNetworkOpportunityDto>()
+                .And.Property(nameof(ClientNetworkOpportunityDto.Name)).Not.Null
+                .And.Property(nameof(ClientNetworkOpportunityDto.Description)).Not.Null
+                .And.Property(nameof(ClientNetworkOpportunityDto.WorkbookTemplateId)).Not.Null);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/ContinuousImprovementServiceTests/ClientWarehouses/TestClientWarehouseService.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/ContinuousImprovementServiceTests/ClientWarehouses/TestClientWarehouseService.cs
new file mode 100644
index 0000000..01487c6
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/ContinuousImprovementServiceTests/ClientWarehouses/TestClientWarehouseService.cs
@@ -0,0 +1,91 @@
+using DocumentFormat.OpenXml.Wordprocessing;
+using Strata.ContinuousImprovement.Biz.ClientWarehouses;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.ContinuousImprovementServiceTests.ClientWarehouses
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    public class TestClientWarehouseService : IntegrationTestBase
+    {
+        private IClientWarehouseService _clientWarehouseService;
+        private List<ClientWarehouse> _clientWarehouses;
+        private ClientWarehouse _clientWarehouse = new ClientWarehouse
+        {
+            DatabaseGuid = Guid.NewGuid(),
+            ClientName = "client",
+            WarehouseSize = WarehouseSize.S
+        };
+
+        [OneTimeSetUp]
+        public async Task SetupServices()
+        {
+            _clientWarehouseService = new ClientWarehouseService((CentralDbContext)CentralDbContext);
+            _clientWarehouses = new List<ClientWarehouse>();
+            for (var i = 1; i <= 10; i++)
+            {
+                var warehouse = new ClientWarehouse
+                {
+                    DatabaseGuid = Guid.NewGuid(),
+                    ClientName = $"client_{i}",
+                    WarehouseSize = WarehouseSize.S
+                };
+                warehouse.ClientWarehouseId = await _clientWarehouseService.Add(warehouse, CancellationToken.None);
+                _clientWarehouses.Add(warehouse);
+            }
+        }
+
+        [Test]
+        public async Task TestAdd()
+        {
+            var id = await _clientWarehouseService.Add(_clientWarehouse, CancellationToken.None);
+            var warehousesExists = await _clientWarehouseService.Exists(_clientWarehouse.DatabaseGuid, CancellationToken.None);
+            Assert.That(warehousesExists, Is.True);
+        }
+
+        [Test]
+        public async Task TestGetByDatabaseGuid()
+        {
+            var warehouseClient = new ClientWarehouse
+            {
+                DatabaseGuid = Guid.NewGuid(),
+                ClientName = "client",
+                WarehouseSize = WarehouseSize.S
+            };
+            var id = await _clientWarehouseService.Add(warehouseClient, CancellationToken.None);
+            var warehouse = await _clientWarehouseService.GetByDatabaseGuid(warehouseClient.DatabaseGuid, CancellationToken.None);
+            Assert.That(warehouse, Is.Not.Null.And.InstanceOf<ClientWarehouse>()
+                .And.Property(nameof(ClientWarehouse.ClientName)).EqualTo(warehouseClient.ClientName));
+        }
+
+        [Test]
+        public async Task TestGetAll()
+        {
+            var testName = TestContext.CurrentContext.TestName();
+            var warehouses = await _clientWarehouseService.GetAll(CancellationToken.None);
+            var intersect = _clientWarehouses.Intersect(warehouses);
+            Assert.That(intersect, Is.Not.Null.And.Not.Empty);
+        }
+
+        [Test]
+        public async Task TestDelete()
+        {
+            var testName = TestContext.CurrentContext.TestName();
+            var warehouse = new ClientWarehouse
+            {
+                DatabaseGuid = Guid.NewGuid(),
+                ClientName = "client",
+                WarehouseSize = WarehouseSize.S
+            };
+            var id = await _clientWarehouseService.Add(warehouse, CancellationToken.None);
+            var warehousesExists = await _clientWarehouseService.Exists(warehouse.DatabaseGuid, CancellationToken.None);
+            Assert.That(warehousesExists, Is.True);
+            var warehouseDeleted = await _clientWarehouseService.Delete(warehouse.DatabaseGuid, CancellationToken.None);
+            warehousesExists = await _clientWarehouseService.Exists(warehouse.DatabaseGuid, CancellationToken.None);
+            Assert.That(!warehousesExists, Is.EqualTo(warehouseDeleted));
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/ContinuousImprovementServiceTests/TestClientService.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/ContinuousImprovementServiceTests/TestClientService.cs
new file mode 100644
index 0000000..a771606
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/ContinuousImprovementServiceTests/TestClientService.cs
@@ -0,0 +1,25 @@
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.DecisionSupport.Models.Queries;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.ContinuousImprovementServiceTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    internal class TestClientService : IntegrationTestBase
+    {
+
+        [Test, Ignore("Client is not authorized. Need to revisit when we can auth the user performing tests.")]
+        public async Task ServiceTest()
+        {
+            var queryInfoStr = @"{""HasManufacturerClientDSS"":false,""IsManufacturerInferred"":true,""HasSupplyClientDSS"":false,""IsSupplyInferred"":true,""IsUsingCustomEntityDimension"":false,""IsBaseline"":true,""OpportunityGuid"":""72ff5c93-f9a8-444c-a4a0-cd61c19334fa"",""ChargeCodeIds"":[],""First"":0,""Rows"":10000}";
+            var queryInfo = JsonSerializer.Deserialize<EncounterChargeQueryInfo>(queryInfoStr);
+            var result = await ContinuousImprovementService.DecisionSupportEncounterChargeInfo(queryInfo, CancellationToken.None);
+
+            await Verifier.Verify(result, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/ExplorationFilterServiceIntegrationTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/ExplorationFilterServiceIntegrationTests.cs
new file mode 100644
index 0000000..1bc2294
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/ExplorationFilterServiceIntegrationTests.cs
@@ -0,0 +1,128 @@
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+using System.Diagnostics.CodeAnalysis;
+using static Strata.ContinuousImprovement.Biz.Exploration.ExplorationService;
+using ExplorationFilter = Strata.ContinuousImprovement.Biz.Exploration.Filters.Filter;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration")]
+    public class ExplorationFilterServiceIntegrationTests : IntegrationTestBase
+    {
+        /// <summary>
+        /// Integration test for BuildDataFiltersAsync with real database context.
+        /// 
+        /// POTENTIAL FAILURE REASON: Database connection issues or missing test data.
+        /// 
+        /// TO FIX:
+        /// 1. Ensure test database is properly configured and accessible
+        /// 2. Verify test data exists in the database
+        /// 3. Check connection strings in test configuration
+        /// 4. Consider using test data seeding for consistent results
+        /// </summary>
+        [Test, Category("Integration")]
+        public async Task BuildDataFiltersAsync_WithRealDatabaseContext_HandlesFilterChipProcessing()
+        {
+            // Arrange
+            var filter = new ExplorationFilter
+            {
+                FilterChipItems = new List<FilterChipItem>
+                {
+                    new FilterChipItem
+                    {
+                        ChipType = ChipType.CostDriver,
+                        Key = ChipKey.CostDriver,
+                        Operator = OperatorType.In,
+                        Filters = new List<TreeNode>
+                        {
+                            new TreeNode { Id = "LOS", DisplayText = "LOS" },
+                            new TreeNode { Id = "Pharmacy", DisplayText = "Pharmacy" }
+                        }
+                    }
+                }
+            };
+
+            // Act
+            var result = await ExplorationFilterService.BuildDataFiltersAsync(
+                null, null, filter, false, false, false, CancellationToken.None);
+
+            // Assert
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.SphChargeCodeCostDriver, Contains.Item("LOS"));
+            Assert.That(result.SphChargeCodeCostDriver, Contains.Item("Pharmacy"));
+        }
+
+        /// <summary>
+        /// Integration test for GetFilterStringsAsync with real database context.
+        /// 
+        /// POTENTIAL FAILURE REASON: Database schema changes or missing stored procedures.
+        /// 
+        /// TO FIX:
+        /// 1. Verify database schema matches expected structure
+        /// 2. Ensure all required stored procedures exist
+        /// 3. Check for recent database migrations
+        /// 4. Update test expectations to match current schema
+        /// </summary>
+        [Test, Category("Integration")]
+        public async Task GetFilterStringsAsync_WithRealDatabaseContext_GeneratesValidSqlFilters()
+        {
+            // Arrange
+            var filters = new List<FilterChipItem>
+            {
+                new FilterChipItem
+                {
+                    ChipType = ChipType.Boolean,
+                    Key = ChipKey.IsGreaterThanZeroCharges,
+                    IsSelected = true,
+                    Operator = OperatorType.In
+                },
+                new FilterChipItem
+                {
+                    ChipType = ChipType.DateRange,
+                    Key = ChipKey.DischargeDateID,
+                    DateRange = new List<DateTime>
+                    {
+                        new DateTime(2024, 1, 1),
+                        new DateTime(2024, 12, 31)
+                    }
+                }
+            };
+            var queryParams = new QueryParams { CodeType = CaseTypeCategories.MSDRG };
+
+            // Act
+            var result = await ExplorationFilterService.GetFilterStringsAsync(filters, queryParams, CancellationToken.None);
+
+            // Assert
+            Assert.That(result.QueryFilters, Does.StartWith("WHERE"));
+            Assert.That(result.QueryFilters, Does.Contain("el.Charges > 0"));
+            Assert.That(queryParams.DischargeDateStart, Is.EqualTo("2024-01-01"));
+            Assert.That(queryParams.DischargeDateEnd, Is.EqualTo("2025-01-01"));
+        }
+
+        [Test, Category("Integration")]
+        public void CreateCostDriverFilter_GeneratesCompleteFilterList()
+        {
+            // Act
+            var filter = ExplorationFilterService.CreateCostDriverFilter();
+
+            // Assert
+            Assert.That(filter, Is.Not.Null);
+            Assert.That(filter.ChipType, Is.EqualTo(ChipType.CostDriver));
+            Assert.That(filter.Filters.Count(), Is.EqualTo(7)); // Should have all 7 valid SPH cost drivers
+
+            var expectedCostDrivers = new[]
+            {
+                "Anesthesia and Recovery", "Imaging", "Laboratory",
+                "LOS", "OR Time", "Pharmacy", "Supplies"
+            };
+
+            foreach (var expectedDriver in expectedCostDrivers)
+            {
+                Assert.That(filter.Filters.Any(f => f.Id == expectedDriver),
+                    Is.True, $"Missing expected cost driver: {expectedDriver}");
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/IntegrationTestBase.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/IntegrationTestBase.cs
new file mode 100644
index 0000000..80add4a
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/IntegrationTestBase.cs
@@ -0,0 +1,252 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Snowflake.Data.Client;
+using Strata.ContinuousImprovement.Biz.ClientWarehouses;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.GMDN;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.ContinuousImprovement.Client;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.CoreLib.Claims;
+using Strata.Schema.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using Strata.StrataSphereCompare.Client;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration
+{
+    [ExcludeFromCodeCoverage]
+    [SetUpFixture]
+    public class IntegrationTestBase
+    {
+        protected VerifySettings verifyScrubbedSettings;
+        protected VerifySettings verifySettings;
+        protected VerifySettings verifySqlSettings;
+        protected VerifySettings verifyErrorSettings;
+
+        public const string Quick = "quick";
+        public const string ContinuousImprovementEndpoint = "https://continuousimprovement-api.dev.stratanetwork.net";
+
+        protected readonly Guid GmAutomationDatabase = new("cda90beb-6c2e-41af-9083-857a09fe8183"); // GM Automation (Refreshed)
+
+        protected Guid VariationOpportunityGuid { get; set; }
+        protected Guid LOSOpportunityGuid { get; set; }
+        protected ICentralDbContext CentralDbContext { get; set; }
+        protected JazzEntityFrameworkFactory JazzConnBuilderFactory { get; set; }
+#pragma warning disable NUnit1032
+        protected IJazzDbContext JazzDbContext { get; set; }
+        protected ISnowflakeDatabaseContext SnowflakeDatabaseContext;
+        protected IServiceProvider ServiceProvider; //used to grab any necessary DI objects
+#pragma warning restore NUnit1032
+        protected ILogger<IntegrationTestBase>? logger;
+        protected IContinuousImprovementService ContinuousImprovementService;
+        protected IExplorationService ExplorationService;
+        protected ISchemaServiceClient SchemaServiceClient;
+        protected IExplorationFilterService ExplorationFilterService; // ADD THIS LINE
+        protected ILogger<ContinuousImprovementService> ServiceLogger;
+        internal IClaimsPrincipalAccessor ClaimsPrincipalAccessor { get; set; }
+
+        [OneTimeSetUp]
+        public virtual async Task SetDbContextAndServices()
+        {
+#if DEBUG
+            //When running locally sets the profile to the CI profile so you have access to resources
+            Environment.SetEnvironmentVariable("AWS_Profile", "sdt-continuous-improvement-service-role");
+#endif
+            var services = ServiceCollectionFactory.Create();            
+            services.AddScoped<ISnowflakeDatabaseContext, SnowflakeDatabaseContext>(provider =>
+            {
+                ISnowflakeDatabaseContextFactory snowflakeDatabaseContextFactory = provider.GetRequiredService<ISnowflakeDatabaseContextFactory>();
+                return snowflakeDatabaseContextFactory.Create($"{GmAutomationDatabase:N}");
+            });
+            ServiceProvider = services.BuildServiceProvider();
+            var sfConnBuilderFactory = ServiceProvider.GetRequiredService<ISnowflakeDatabaseContextFactory>();
+            SnowflakeDatabaseContext = sfConnBuilderFactory.Create($"{GmAutomationDatabase:N}");
+
+            try
+            {
+                var jazzConnBuilderFactory = ServiceProvider.GetRequiredService<IAsyncDbContextFactory<JazzDbContext>>();
+                JazzDbContext = await jazzConnBuilderFactory.CreateDbContextAsync(CancellationToken.None);
+            }
+            catch (Exception)
+            {
+                // ILB
+            }
+
+            try
+            {
+                CentralDbContext = ServiceProvider.GetService<CentralDbContext>()
+                    ?? throw new NullReferenceException(nameof(DbContexts.CentralDbContext));
+                await ((CentralDbContext)CentralDbContext).Database.MigrateAsync(CancellationToken.None);
+                JazzConnBuilderFactory = new JazzEntityFrameworkFactory();
+                await JazzConnBuilderFactory.EnsureCreatedAsync(CentralDbContext, JazzDbContext, CancellationToken.None);
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+            #region Verifier Settings
+
+            verifySettings = TestExtensions.TestSettings();
+            verifySqlSettings = TestExtensions.TestSettings();
+            verifySqlSettings
+                .ScrubLinesWithReplace(_ =>
+                {
+                    var regex = new Regex(@"(.*)\s+in\s+\([\d,]*\)(.*)", RegexOptions.IgnoreCase);
+                    if (regex.IsMatch(_))
+                    {
+                        return regex.Replace(_, "$1 IN (...)$2");
+                    }
+                    var regexDate = new Regex(@"(.*)'[\d]{1,2}/[\d]{1,2}/[\d]{4}'(.*)");
+                    if (regexDate.IsMatch(_))
+                    {
+                        var line = _;
+                        while (regexDate.IsMatch(line))
+                        {
+                            line = regexDate.Replace(line, "$1'mm/dd/yyyy'$2");
+                        }
+                        return line;
+                    }
+                    return _;
+                });
+            verifyScrubbedSettings = TestExtensions.TestSettings();
+            verifyScrubbedSettings
+                .ScrubLinesWithReplace(replaceLine: _ => $"'{"".PadLeft(_.Length, '~')}'");
+            verifyScrubbedSettings
+                .ScrubMembersWithType<bool>();
+            verifyScrubbedSettings
+                .ScrubMembersWithType<short>();
+            verifyScrubbedSettings
+                .ScrubMembersWithType<int>();
+            verifyScrubbedSettings
+                .ScrubMembersWithType<long>();
+            verifyScrubbedSettings
+                .ScrubMembersWithType<byte>();
+            verifyScrubbedSettings
+                .ScrubMembersWithType<decimal>();
+            verifyScrubbedSettings
+                .ScrubMembersWithType<double>();
+            verifyErrorSettings = TestExtensions.TestSettings();
+            verifyErrorSettings.UseDirectory("errorSnapshots");
+            #endregion
+
+            SchemaServiceClient = Mock.Of<ISchemaServiceClient>();
+            ExplorationFilterService = new ExplorationFilterService(
+                ServiceProvider.GetRequiredService<IAsyncDbContextFactory<JazzDbContext>>(),
+                SchemaServiceClient,
+                Mock.Of<ILogger<ExplorationFilterService>>());
+
+            var httpClientFactory = ServiceProvider.GetRequiredService<IHttpClientFactory>();
+            var httpClient = httpClientFactory.CreateClient(Quick);
+            httpClient.BaseAddress = new Uri(ContinuousImprovementEndpoint);
+            ContinuousImprovementService = new ContinuousImprovementService(httpClient);
+
+            var featureFlagWrapper = Mock.Of<IFeatureFlagWrapper>();
+            Mock.Get(featureFlagWrapper)
+                .Setup(f => f.IsCiBenchmarkingEnabled(It.IsAny<bool>()))
+                .ReturnsAsync(true);
+
+            var strataSphereCompareService = Mock.Of<IStrataSphereCompareService>();
+
+            ExplorationService = new ExplorationService(
+                JazzConnBuilderFactory,
+                SnowflakeDatabaseContext,
+                Mock.Of<IFiscalMonthResolver>(),
+                featureFlagWrapper,
+                strataSphereCompareService,
+                ExplorationFilterService,
+                Mock.Of<ILogger<ExplorationService>>());
+        }
+
+        public static IEnumerable<TestCaseData> TestCaseSources()
+        {
+            foreach (bool value in new[] { false, true })
+            {
+                yield return new TestCaseData(nameof(ClientNetworkOpportunity), value)
+                    .SetName(nameof(ClientNetworkOpportunity) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(ClientNetworkOpportunityLink), value)
+                    .SetName(nameof(ClientNetworkOpportunityLink) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(ClientWarehouse), value)
+                    .SetName(nameof(ClientWarehouse) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(Comment), value)
+                    .SetName(nameof(Comment) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(DeviceIdentifierDimension), value)
+                    .SetName(nameof(DeviceIdentifierDimension) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(DeviceIdentifierTerm), value)
+                    .SetName(nameof(DeviceIdentifierTerm) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(GMDNCategory), value)
+                    .SetName(nameof(GMDNCategory) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(GMDNTerm), value)
+                    .SetName(nameof(GMDNTerm) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(GMDNTermCategory), value)
+                    .SetName(nameof(GMDNTermCategory) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(GUDIDDevice), value)
+                    .SetName(nameof(GUDIDDevice) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(GUDIDIdentifier), value)
+                    .SetName(nameof(GUDIDIdentifier) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(GUDIDTerm), value)
+                    .SetName(nameof(GUDIDTerm) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(NetworkOpportunity), value)
+                    .SetName(nameof(NetworkOpportunity) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(OpportunityTypeWorkbook), value)
+                    .SetName(nameof(OpportunityTypeWorkbook) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(OpportunityWorkbook), value)
+                    .SetName(nameof(OpportunityWorkbook) + $" {(value ? "First" : "Count")}");
+                yield return new TestCaseData(nameof(TmpGUDIDIdentifier), value)
+                    .SetName(nameof(TmpGUDIDIdentifier) + $" {(value ? "First" : "Count")}");
+            }
+        }
+
+        protected virtual async Task QueryTest<T, TI>(TI queryInfo)
+            where TI : class
+            where T : class
+        {
+            var query = Query(queryInfo);
+            if (string.IsNullOrEmpty(query)) { return; }
+            try
+            {
+                var result = await SnowflakeDatabaseContext
+                    .QueryAsync<T>(query, nameof(QueryTest), CancellationToken.None);
+                await Verify(result, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName(nameof(result)));
+            }
+            catch (SnowflakeDbException dbex)
+            {
+                // ILB
+            }
+            catch (Exception ex)
+            {
+                throw;
+            }
+        }
+
+        protected virtual string Query<T>(T queryInfo)
+            where T : class
+            => "";
+
+        [OneTimeTearDown]
+        public async Task TearDown()
+        {
+            try
+            {
+                await ((CentralDbContext)CentralDbContext).Database.EnsureDeletedAsync(CancellationToken.None);
+            }
+            catch (Exception ex)
+            {
+                throw;
+            }
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/JazzIntegrationTests/TestCCOpportunityDetailService.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/JazzIntegrationTests/TestCCOpportunityDetailService.cs
new file mode 100644
index 0000000..6b4626c
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/JazzIntegrationTests/TestCCOpportunityDetailService.cs
@@ -0,0 +1,117 @@
+using FluentAssertions;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.CoreLib.Claims;
+using Strata.FeatureFlags.Client;
+using Strata.Schema.Client;
+using System.Diagnostics.CodeAnalysis;
+using System.Security.Claims;
+
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.JazzIntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    internal class TestCCOpportunityDetailService : IntegrationTestBase
+    {
+        protected ICCOpportunityDetailService _ccOpportunityDetailService;
+
+        [OneTimeSetUp]
+        public void SetupChargeCodeDetailService()
+        {
+            var claims = new List<Claim>
+            {
+                new Claim("database_guid", GmAutomationDatabase.ToString())
+            };
+
+            var principal = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
+
+            var claimsPrincipalMock = Mock.Of<IClaimsPrincipalAccessor>();
+            Mock.Get(claimsPrincipalMock)
+                .Setup(x => x.GetCurrentClaimsPrincipal())
+                .Returns(principal);
+
+            var featureFlagServiceMock = Mock.Of<IFeatureFlagServiceClient>();
+            Mock.Get(featureFlagServiceMock)
+                .Setup(x => x.IsEnabledAsync("is-decision-support-queries-enabled", It.IsAny<Guid>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            _ccOpportunityDetailService = new CCOpportunityDetailService(
+                JazzConnBuilderFactory,
+                Mock.Of<ISchemaServiceClient>(),
+                SnowflakeDatabaseContext,
+                featureFlagServiceMock,
+                Mock.Of<ILogger<CCOpportunityDetailService>>(),
+                claimsPrincipalMock);
+        }
+
+        [TestCaseSource(nameof(OpportunityCases))]
+        public async Task OpportunityDetailQueryTest_Returns_Data(bool isBaseline, CCOpportunityDataModel opportunity)
+        {
+            // arrange
+            var configuration = CreateConfiguration();
+
+            // act
+            var results = await _ccOpportunityDetailService.GetCCOpportunityDetailQueryResult(
+                opportunity,
+                configuration,
+                CancellationToken.None,
+                isBaseline: true);
+
+            // assert
+            results.Should().NotBeNullOrEmpty();
+        }
+
+        [TestCaseSource(nameof(OpportunityCases))]
+        public async Task OpportunityDetailLevelCasesQueryTest_Returns_Data(bool isBaseline, CCOpportunityDataModel opportunity)
+        {
+            // arrange
+            var configuration = CreateConfiguration();
+
+            // act
+            var results = await _ccOpportunityDetailService.CCOpportunityLevelCasesQuery(
+                opportunity,
+                configuration,
+                CancellationToken.None,
+                isBaseline: true);
+
+            // assert
+            results.Should().NotBeNullOrEmpty();
+        }
+
+        private Configuration.Configuration CreateConfiguration()
+        {
+            return new Configuration.Configuration
+            {
+                OrgDefinedEndDate = new DateTime(2024, 1, 1)
+            };
+        }
+
+        private static IEnumerable<TestCaseData> OpportunityCases()
+        {
+            yield return new TestCaseData(true, GetSystemLevelData()).SetName("System");
+        }
+
+        private static CCOpportunityDataModel GetSystemLevelData()
+        {
+            return new CCOpportunityDataModel
+            {
+                OpportunityLevel = OpportunityLevel.Organization.ToString(),
+                ChargeCodeJson =
+                    @"{""HierarchyPaths"":[""CC|CCRU|Blood""],""Members"":[
+                        {""MemberGuid"":""4041e269-34c4-4a1d-bebf-c6e0a0799539"",""Name"":""10002765 - HB RBC LEUKOREDUCED EA UNIT"",""Id"":""3540""}]}",
+
+                ClinicalIndicatorJson =
+                    @"{""HierarchyPaths"":[""CLINICALINDICATOR|CLINICALINDI|188""],""Members"":[{""MemberGuid"":""d1e38321-5e37-4dad-9a54-ca8599763e7a"",""Name"":""All Readmissions"",""Id"":""188""}]}",
+
+                OpportunityLevelJson =
+                    @"{""HierarchyPaths"":[""SYS|SYSTEM""],
+                       ""Members"":[{""MemberGuid"":""00000000-0000-0000-0000-000000000000"",
+                                     ""Id"":""1"",
+                                     ""Name"":""System""}]}"
+            };
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/JazzIntegrationTests/TestGetENOpportunityDetailQuery.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/JazzIntegrationTests/TestGetENOpportunityDetailQuery.cs
new file mode 100644
index 0000000..2f15b68
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/JazzIntegrationTests/TestGetENOpportunityDetailQuery.cs
@@ -0,0 +1,61 @@
+using FluentAssertions;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Strata.ContinuousImprovement.Biz.Encounter;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.Schema.Client;
+using Strata.Schema.Client.Dtos;
+using Strata.Schema.Client.Dtos.Info;
+using System.Diagnostics.CodeAnalysis;
+
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.JazzIntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    internal class TestGetENOpportunityDetailQuery : IntegrationTestBase
+    {
+        [Test]
+        public async Task TestGetENOpportunityDetailQuery_Returns_Data()
+        {
+            // arrange
+            var config = CreateConfiguration();
+            var opportunity = CreateOpportunity();
+            var schemaService = new Mock<ISchemaServiceClient>().Object;
+            Mock.Get(schemaService)
+                .Setup(x => x.GetDimensionMembersFromHierarchyPathsAsync(It.IsAny<Guid>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new List<MemberDto> { new() { Id = "188", } });
+            Mock.Get(schemaService)
+                .Setup(x => x.GetDimensionByGlobalIdAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new ScoreDimensionInfoDto { DimensionGuid = new Guid("3465fcd8-9149-4d96-8456-3ecaa3ffdadd") });
+            var logger = Mock.Of<ILogger<ENOpportunityDetailJob>>();
+
+            // act
+            var results = await JazzDbContext.GetENOpportunityDetailQuery(opportunity, config, schemaService, logger, GmAutomationDatabase);
+
+            // assert
+            results.Should().NotBeNullOrEmpty();
+        }
+
+        private ENOpportunityDataModel CreateOpportunity()
+        {
+            return new ENOpportunityDataModel()
+            {
+                EncounterOpportunityJSON = @"{
+                    ""EncounterGroup"":1,""IsSeasonal"":false, ""CaseTypes"":[],
+                    ""PatientPopulations"":[{""Text"":""All Readmissions"",""Id"":""CLINICALINDICATOR|CLINICALINDI|188""}],
+                    ""OpportunityLevel"":""Organization"",
+                    ""EncounterOpportunityLevel"":0,
+                    ""Entities"":[],""ServiceLines"":[],""Specialties"":[],""Providers"":[],""IsBaseline"":true}"
+            };
+        }
+
+        private Configuration.Configuration CreateConfiguration()
+        {
+            return new Configuration.Configuration
+            {
+                OrgDefinedEndDate = new DateTime(2024, 1, 1)
+            };
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/JazzIntegrationTests/TestJazzDbContext.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/JazzIntegrationTests/TestJazzDbContext.cs
new file mode 100644
index 0000000..9b5e9dd
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/JazzIntegrationTests/TestJazzDbContext.cs
@@ -0,0 +1,330 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Cube;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Jazz.Dimensions;
+using Strata.ContinuousImprovement.Biz.DbContexts.Reports;
+using Strata.ContinuousImprovement.Biz.DbContexts.Security;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Exploration.Opportunities;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.FreeForm.Initiatives;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Details;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities;
+using Strata.ContinuousImprovement.Biz.GMDN;
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Network;
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities;
+using Strata.ContinuousImprovement.Biz.PeerGroups;
+using Strata.ContinuousImprovement.Biz.Population;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Events;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Metrics;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities;
+using Strata.ContinuousImprovement.Biz.Score;
+using Strata.ContinuousImprovement.Biz.Security;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.Biz.UserProfiles;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+using Strata.Stratasphere.Biz.DbContexts;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.JazzIntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    public partial class TestJazzDbContext : IntegrationTestBase
+    {
+
+        public async Task TestGeneric<T>(TestContext testContext) where T : class
+        {
+            try
+            {
+                var count = await ((DbContext)JazzDbContext).Set<T>().CountAsync(CancellationToken.None);
+                Assert.That(count, Is.GreaterThanOrEqualTo(0));
+                if (count == 0) { return; }
+                var result = await ((DbContext)JazzDbContext).Set<T>().FirstOrDefaultAsync(CancellationToken.None);
+                Assert.That(result, Is.Not.Null.And.InstanceOf<T>());
+            }
+            catch
+            {
+                // ILB
+            }
+        }
+
+        [Test]
+        public async Task JazzDbTestCases()
+        {
+            var types = ((DbContext)JazzDbContext).Model.GetEntityTypes()
+                .Select(e => e.ClrType).OrderBy(c => c.Name).ToList();
+            foreach (var type in types)
+            {
+                switch (type.Name)
+                {
+                    case nameof(AllOpportunity):
+                        TestGeneric<AllOpportunity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(CaseTypeFamily):
+                        TestGeneric<CaseTypeFamily>(TestContext.CurrentContext);
+                        break;
+                    case nameof(CciUserSetting):
+                        TestGeneric<CciUserSetting>(TestContext.CurrentContext);
+                        break;
+                    case nameof(CCOpportunity):
+                        TestGeneric<CCOpportunity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(CCOpportunityDataModel):
+                        TestGeneric<CCOpportunityDataModel>(TestContext.CurrentContext);
+                        break;
+                    case nameof(CCOpportunityDetailQueryResult):
+                        TestGeneric<CCOpportunityDetailQueryResult>(TestContext.CurrentContext);
+                        break;
+                    case nameof(CCOpportunityLevelCaseQueryResult):
+                        TestGeneric<CCOpportunityLevelCaseQueryResult>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ChargeCode.ChargeCode):
+                        TestGeneric<ChargeCode.ChargeCode>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ChargeCodeOpportunityDetail):
+                        TestGeneric<ChargeCodeOpportunityDetail>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ChargeCodeOpportunityLevelCase):
+                        TestGeneric<ChargeCodeOpportunityLevelCase>(TestContext.CurrentContext);
+                        break;
+                    case nameof(Configuration.Configuration):
+                        TestGeneric<Configuration.Configuration>(TestContext.CurrentContext);
+                        break;

+                    case nameof(CostComponentRollup):
+                        TestGeneric<CostComponentRollup>(TestContext.CurrentContext);
+                        break;
+                    case nameof(DboUserSetting):
+                        TestGeneric<DboUserSetting>(TestContext.CurrentContext);
+                        break;
+                    case nameof(DimCaseType):
+                        TestGeneric<DimCaseType>(TestContext.CurrentContext);
+                        break;

+                    case nameof(DimCostComponent):
+                        TestGeneric<DimCostComponent>(TestContext.CurrentContext);
+                        break;
+                    case nameof(DimDeviceIdentifier):
+                        TestGeneric<DimDeviceIdentifier>(TestContext.CurrentContext);
+                        break;
+                    case nameof(DimSupply):
+                        TestGeneric<DimSupply>(TestContext.CurrentContext);
+                        break;
                    case nameof(DimEntity):
+                        TestGeneric<DimEntity>(TestContext.CurrentContext);
+                        break;
                    case nameof(StringValue):
+                        TestGeneric<StringValue>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ENOpportunity):
+                        TestGeneric<ENOpportunity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ENOpportunityDataModel):
+                        TestGeneric<ENOpportunityDataModel>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ENOpportunityMetricData):
+                        TestGeneric<ENOpportunityMetricData>(TestContext.CurrentContext);
+                        break;
+                    case nameof(EXOpportunity):
+                        TestGeneric<EXOpportunity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(FactGL):
+                        TestGeneric<FactGL>(TestContext.CurrentContext);
+                        break;
+                    case nameof(FactGLSampled):
+                        TestGeneric<FactGLSampled>(TestContext.CurrentContext);
+                        break;
+                    case nameof(FactStatistic):
+                        TestGeneric<FactStatistic>(TestContext.CurrentContext);
+                        break;
+                    case nameof(FactStatisticSampledMonthly):
+                        TestGeneric<FactStatisticSampledMonthly>(TestContext.CurrentContext);
+                        break;
+                    case nameof(FFFInitiativeTrackingData):
+                        TestGeneric<FFFInitiativeTrackingData>(TestContext.CurrentContext);
+                        break;
+                    case nameof(FFInitiativeTrackingData):
+                        TestGeneric<FFInitiativeTrackingData>(TestContext.CurrentContext);
+                        break;
+                    case nameof(FFOpportunity):
+                        TestGeneric<FFOpportunity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(FFOpportunityDataModel):
+                        TestGeneric<FFOpportunityDataModel>(TestContext.CurrentContext);
+                        break;
+                    case nameof(Folder):
+                        TestGeneric<Folder>(TestContext.CurrentContext);
+                        break;
+                    case nameof(GLOpportunity):
+                        TestGeneric<GLOpportunity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(GLOpportunityDataModel):
+                        TestGeneric<GLOpportunityDataModel>(TestContext.CurrentContext);
+                        break;
+                    case nameof(Identity):
+                        TestGeneric<Identity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(Initiative):
+                        TestGeneric<Initiative>(TestContext.CurrentContext);
+                        break;
+                    case nameof(InitiativeComment):
+                        TestGeneric<InitiativeComment>(TestContext.CurrentContext);
+                        break;
+                    case nameof(InitiativeCriteria):
+                        TestGeneric<InitiativeCriteria>(TestContext.CurrentContext);
+                        break;
+                    case nameof(InitiativeCriteriaQueryResult):
+                        TestGeneric<InitiativeCriteriaQueryResult>(TestContext.CurrentContext);
+                        break;
+                    case nameof(InitiativeRollupColumn):
+                        TestGeneric<InitiativeRollupColumn>(TestContext.CurrentContext);
+                        break;
+                    case nameof(InitiativeRollupValue):
+                        TestGeneric<InitiativeRollupValue>(TestContext.CurrentContext);
+                        break;
+                    case nameof(InitiativeScore):
+                        TestGeneric<InitiativeScore>(TestContext.CurrentContext);
+                        break;
+                    case nameof(Lock):
+                        // Lock is inaccessible due to its protection level
+                        break;
+                    case nameof(NetworkOpportunityLink):
+                        TestGeneric<NetworkOpportunityLink>(TestContext.CurrentContext);
+                        break;
+                    case nameof(OpportunityMetricCohortData):
+                        TestGeneric<OpportunityMetricCohortData>(TestContext.CurrentContext);
+                        break;
+                    case nameof(OpportunityReport):
+                        TestGeneric<OpportunityReport>(TestContext.CurrentContext);
+                        break;
+                    case nameof(PeerGroup):
+                        TestGeneric<PeerGroup>(TestContext.CurrentContext);
+                        break;
+                    case nameof(PeerGroupCriteriaMapping):
+                        TestGeneric<PeerGroupCriteriaMapping>(TestContext.CurrentContext);
+                        break;
+                    case nameof(PROpportunity):
+                        TestGeneric<PROpportunity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(PROpportunityDataModel):
+                        TestGeneric<PROpportunityDataModel>(TestContext.CurrentContext);
+                        break;
+                    case nameof(QVIBreakdown):
+                        TestGeneric<QVIBreakdown>(TestContext.CurrentContext);
+                        break;
+                    case nameof(QVIEvent):
+                        TestGeneric<QVIEvent>(TestContext.CurrentContext);
+                        break;
+                    case nameof(QVIOpportunity):
+                        TestGeneric<QVIOpportunity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(REReport):
+                        TestGeneric<REReport>(TestContext.CurrentContext);
+                        break;
+                    case nameof(RESQLReportRegisteredAttribute):
+                        TestGeneric<RESQLReportRegisteredAttribute>(TestContext.CurrentContext);
+                        break;
+                    case nameof(S3ACLSimple):
+                        TestGeneric<S3ACLSimple>(TestContext.CurrentContext);
+                        break;
+                    case nameof(S3SimplePermission):
+                        TestGeneric<S3SimplePermission>(TestContext.CurrentContext);
+                        break;
+                    case nameof(S3SimplePermissionDefault):
+                        TestGeneric<S3SimplePermissionDefault>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ScoreAttribute):
+                        TestGeneric<ScoreAttribute>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ScoreDimension):
+                        TestGeneric<ScoreDimension>(TestContext.CurrentContext);
+                        break;
+                    case nameof(SimplePermission):
+                        TestGeneric<SimplePermission>(TestContext.CurrentContext);
+                        break;
+                    case nameof(SourceOfSavingsReport):
+                        TestGeneric<SourceOfSavingsReport>(TestContext.CurrentContext);
+                        break;
+                    case nameof(SystemSetting):
+                        TestGeneric<SystemSetting>(TestContext.CurrentContext);
+                        break;
+                    case nameof(UserGroup):
+                        TestGeneric<UserGroup>(TestContext.CurrentContext);
+                        break;
+                    case nameof(UserProfile):
+                        TestGeneric<UserProfile>(TestContext.CurrentContext);
+                        break;
+                    case nameof(UVCaseType):
+                        TestGeneric<UVCaseType>(TestContext.CurrentContext);
+                        break;
+                    case nameof(UVOpportunity):
+                        TestGeneric<UVOpportunity>(TestContext.CurrentContext);
+                        break;
+                    case nameof(VariationOpportunityDataModel):
+                        TestGeneric<VariationOpportunityDataModel>(TestContext.CurrentContext);
+                        break;

+                    case nameof(ExplorationVariationOpportunityDataModel):
+                        TestGeneric<ExplorationVariationOpportunityDataModel>(TestContext.CurrentContext);
+                        break;
+                    case nameof(ViewScoreAttribute):
+                        TestGeneric<ViewScoreAttribute>(TestContext.CurrentContext);
+                        break;
+                    case nameof(DimAprdrg):
+                        TestGeneric<DimAprdrg>(TestContext.CurrentContext);
+                        break;
+                    case nameof(DimCpt):
+                        TestGeneric<DimCpt>(TestContext.CurrentContext);
+                        break;
+                    case nameof(DimIcd10Dx):
+                        TestGeneric<DimIcd10Dx>(TestContext.CurrentContext);
+                        break;
+                    case nameof(DimIcd10Px):
+                        TestGeneric<DimIcd10Px>(TestContext.CurrentContext);
+                        break;
+                    case nameof(DimMsdrg):
+                        TestGeneric<DimMsdrg>(TestContext.CurrentContext);
+                        break;
+                    case nameof(DimMsdrgRollup):
+                        TestGeneric<DimMsdrgRollup>(TestContext.CurrentContext);
+                        break;
+                    case nameof(QviMetrics):
+                        TestGeneric<QviMetrics>(TestContext.CurrentContext);
+                        break;
+                    default:
+                        var pathArr = TestContext.CurrentContext.TestDirectory.Split(Path.DirectorySeparatorChar);
+                        var path = string.Join(Path.DirectorySeparatorChar, pathArr[..^3].Append("JazzIntegrationTests"));
+                        var fileName = Path.Combine(path, $"{nameof(TestJazzDbContext)}_{type.Name}.cs");
+                        if (File.Exists(fileName)) break;
+                        var testFile = @"
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.ContinuousImprovementServiceTests
+{
+    [TestFixture, Category(""Integration""), Category(""CCI"")]
+    public partial class TestJazzDbContext : IntegrationTestBase
+    {
+        [Test]
+        public async Task Test" + type.Name + @"()
+        {
+            TestGeneric<" + type.Name + @">(TestContext.CurrentContext);
+        }
+    }
+}
+";
+                        File.WriteAllText(fileName, testFile);
+                        break;
+                }
+
+            }
+            await Verify(types, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/ServiceCollectionFactory.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/ServiceCollectionFactory.cs
new file mode 100644
index 0000000..846cdf6
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/ServiceCollectionFactory.cs
@@ -0,0 +1,53 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Strata.ApiLib.Core.Cors.Extensions;
+using Strata.ApiLib.Core.StrataAuthentication.Bootstrappers;
+using Strata.Configuration.Client.DependencyInjection.ConsoleApps;
+using Strata.ContinuousImprovement.Biz.Configurations;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration
+{
+    [ExcludeFromCodeCoverage]
+    public static class ServiceCollectionFactory
+    {
+        private static readonly Guid DevMaster = new("54409f55-5ddf-4748-8222-9ccfb04fb4f5");
+        private static readonly Guid SeleniumAutomationDatabase = new("6bcd9090-3446-4cc1-b1aa-38afae76a1c6");
+        private static readonly Guid SeleniumAutomationRefreshed4Master = new("feb7a099-8b2a-436c-9aba-0f853c8c60c9");
+        private static readonly string IntegrationTesting = $"ci_{DateTime.Now:yyyyMMdd}_{Guid.NewGuid():N}";
+
+        public static IServiceCollection Create()
+        {
+            var services = new ServiceCollection();
+            var jazzDbGuid = Debugger.IsAttached ? SeleniumAutomationRefreshed4Master : SeleniumAutomationDatabase;
+            try
+            {
+                var configuration = StrataConfigurationFactory.GetConfiguration();
+                services.AddSingleton(configuration);
+                services.AddStrataAuthentication(configuration);
+                services.AddStrataCors(configuration);
+                services.AddContinuousImprovementServices(configuration, IntegrationTesting);
+                services.AddAsyncDbContextFactory<JazzDbContext>(options =>
+                {
+                    options
+                        .WithConnectionString((provider, token) => provider.GetConnectionStringFromSmc(jazzDbGuid, token))
+                        .WithDbContextOptions((connectionString, provider, builder) =>
+                            builder.UseSqlServer(connectionString, options => { options.CommandTimeout(300); }));
+                });
+                services.AddScoped<IStrategicOpportunityService, StrategicOpportunityService>();
+
+                services.AddLogging();
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+
+            return services;
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/DistributionProcess/DistributionProcessChargeCodeTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/DistributionProcess/DistributionProcessChargeCodeTests.cs
new file mode 100644
index 0000000..13c5649
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/DistributionProcess/DistributionProcessChargeCodeTests.cs
@@ -0,0 +1,410 @@
+using CsvHelper;
+using CsvHelper.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.ChargeCode;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.SnowflakeIntegrationTests.DistributionProcess
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    public class DistributionProcessChargeCodeTests : IntegrationTestBase
+    {
+        private const string SourceFilePath = @"SnowflakeIntegrationTests/DistributionProcess/TestData/ChargeCode";
+
+        private static readonly ImmutableDictionary<string, (Period<DateOnly> Source, Period<DateOnly> Target)> _dataPeriod = new Dictionary<string, (Period<DateOnly> Source, Period<DateOnly> Target)>()
+        {
+            { "AllMonthsAreCross", (new Period<DateOnly>(new DateOnly(2022, 12, 1), new DateOnly(2023, 12, 31)), new Period<DateOnly>(new DateOnly(2024, 1, 1), new DateOnly(2024, 12, 31))) },
+            { "AllMonthsAreNotCross", (new Period<DateOnly>(new DateOnly(2023, 1, 1), new DateOnly(2023, 5, 30)), new Period<DateOnly>(new DateOnly(2023, 6, 1), new DateOnly(2023, 12, 31))) },
+            { "MixedMonths", (new Period<DateOnly>(new DateOnly(2022, 12, 1), new DateOnly(2023, 8, 31)), new Period<DateOnly>(new DateOnly(2023, 5, 1), new DateOnly(2023, 12, 31))) }
+        }.ToImmutableDictionary();
+
+        private IDistributionProcessFactory _distributionProcessFactory;
+        private const long TestOpportunityId = 1;
+        private Period<DateOnly> _baselinePeriod;
+        private Period<DateOnly> _goalPeriod;
+        private Period<DateOnly> _trackingPeriod;
+        private double[] _rampUps;
+
+        [OneTimeSetUp]
+        public async Task Setup()
+        {
+            await CleanData();
+            await SeedDataFromCsv("BaselineData.csv");
+            _distributionProcessFactory = ServiceProvider.GetRequiredService<IDistributionProcessFactory>();
+            _baselinePeriod = new Period<DateOnly>(new DateOnly(2023, 1, 1), new DateOnly(2023, 12, 31));
+            _goalPeriod = new Period<DateOnly>(new DateOnly(2024, 1, 1), new DateOnly(2024, 12, 31));
+            _trackingPeriod = new Period<DateOnly>(new DateOnly(2024, 1, 1), new DateOnly(2024, 12, 31));
+            _rampUps = new double[] { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.0, 1.0 };
+        }
+
+        [OneTimeTearDown]
+        public async Task Cleanup()
+        {
+            await CleanData();
+        }
+
+        [TearDown]
+        public async Task CleanupTestData()
+        {
+            await CleanData(false);
+        }
+
+        [TestCaseSource(nameof(DistributeAsync_FromSourceToOpportunity_TestCases))]
+        public async Task DistributeAsync_FromSourceToOpportunity
+        (
+            DistributionMethod distributionMethod,
+            Period<DateOnly> sourcePeriod,
+            Period<DateOnly> targetPeriod,
+            double[] rampUps
+        )
+        {
+            // Arrange
+            var distributionProcess = _distributionProcessFactory.CreateDistributionProcessChargeCode(
+                TestOpportunityId,
+                sourcePeriod ?? _baselinePeriod,
+                targetPeriod ?? _goalPeriod,
+                _trackingPeriod,
+                []);
+
+            // Act
+            var summary = await distributionProcess.DistributeAsync(distributionMethod, DistributionStage.FromSourceToOpportunity);
+
+            // Assert
+            var sbResult = new StringBuilder();
+            var details = await GetDetailRecords(isBaseline: false);
+            sbResult.AppendLine(ConvertListDetailToCsvString(details));
+            sbResult.AppendLine(ConvertSummaryToCsvString(summary));
+            await Verifier.Verify(sbResult.ToString(), verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [TestCaseSource(nameof(DistributeAsync_FromOpportunityToInitiative_TestCases))]
+        public async Task DistributeAsync_FromOpportunityToInitiative
+        (
+            DistributionMethod distributionMethod,
+            Period<DateOnly> sourcePeriod,
+            Period<DateOnly> targetPeriod,
+            double[] rampUps
+        )
+        {
+            // Arrange
+            await SeedDataFromCsv("GoalData.csv");
+            var distributionProcess = _distributionProcessFactory.CreateDistributionProcessChargeCode(
+                TestOpportunityId,
+                _baselinePeriod,
+                sourcePeriod ?? _goalPeriod,
+                targetPeriod ?? _trackingPeriod,
+                rampUps ?? _rampUps);
+
+            // Act
+            var summary = await distributionProcess.DistributeAsync(distributionMethod, DistributionStage.FromOpportunityToInitiative);
+
+            // Assert
+            var sbResult = new StringBuilder();
+            var details = await GetDetailRecords(isBaseline: false);
+            sbResult.AppendLine(ConvertListDetailToCsvString(details));
+            sbResult.AppendLine(ConvertSummaryToCsvString(summary));
+            await Verifier.Verify(sbResult.ToString(), verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [TestCaseSource(nameof(DistributeAsync_FromInitiativeToOpportunity_TestCases))]
+        public async Task DistributeAsync_FromInitiativeToOpportunity
+        (
+            DistributionMethod distributionMethod,
+            Period<DateOnly> sourcePeriod,
+            Period<DateOnly> targetPeriod,
+            double[] rampUps
+        )
+        {
+            // Arrange
+            await SeedDataFromCsv("GoalData.csv");
+            var distributionProcess = _distributionProcessFactory.CreateDistributionProcessChargeCode(
+                TestOpportunityId,
+                _baselinePeriod,
+                sourcePeriod ?? _goalPeriod,
+                targetPeriod ?? _trackingPeriod,
+                rampUps ?? _rampUps);
+
+            // Act
+            var summary = await distributionProcess.DistributeAsync(distributionMethod, DistributionStage.FromInitiativeToOpportunity);
+
+            // Assert
+            var sbResult = new StringBuilder();
+            var details = await GetDetailRecords(isBaseline: false);
+            sbResult.AppendLine(ConvertListDetailToCsvString(details));
+            sbResult.AppendLine(ConvertSummaryToCsvString(summary));
+            await Verifier.Verify(sbResult.ToString(), verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [TestCaseSource(nameof(UpdateDetailCommittedByRampUp_TestCases))]
+        public async Task UpdateDetailCommittedByRampUp
+        (
+            double[] oldRampUps,
+            double[] newRampUps
+        )
+        {
+            // Arrange
+            await SeedDataFromCsv("GoalData.csv");
+            var distributionProcess = _distributionProcessFactory.CreateDistributionProcessChargeCode(
+                TestOpportunityId,
+                _baselinePeriod,
+                _goalPeriod,
+                _trackingPeriod,
+                newRampUps ?? _rampUps);
+
+            // Act
+            var summary = await distributionProcess.UpdateDetailCommittedByRampUp(oldRampUps);
+
+            // Assert
+            var sbResult = new StringBuilder();
+            var details = await GetDetailRecords(isBaseline: false);
+            sbResult.AppendLine(ConvertListDetailToCsvString(details));
+            sbResult.AppendLine(ConvertSummaryToCsvString(summary));
+            await Verifier.Verify(sbResult.ToString(), verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [TestCaseSource(nameof(GetDistributionSummary_TestCases))]
+        public async Task GetDistributionSummary
+        (
+            bool isInitiative,
+            double[] rampUps
+        )
+        {
+            // Arrange
+            await SeedDataFromCsv("GoalData.csv");
+            var distributionProcess = _distributionProcessFactory.CreateDistributionProcessChargeCode(
+                TestOpportunityId,
+                _baselinePeriod,
+                _goalPeriod,
+                _trackingPeriod,
+                rampUps ?? _rampUps);
+
+            // Act
+            var summary = await distributionProcess.GetDistributionSummaryAsync(isInitiative);
+
+            // Assert
+            var sbResult = new StringBuilder();
+            sbResult.AppendLine(ConvertSummaryToCsvString(summary));
+            await Verifier.Verify(sbResult.ToString(), verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        #region Test Case Sources
+
+        private static IEnumerable<TestCaseData> DistributeAsync_FromSourceToOpportunity_TestCases()
+        {
+            var distributionStageName = DistributionStage.FromSourceToOpportunity.ToString();
+            return DistributeAsync_TestCases(distributionStageName);
+        }
+
+        private static IEnumerable<TestCaseData> DistributeAsync_FromOpportunityToInitiative_TestCases()
+        {
+            var distributionStageName = DistributionStage.FromOpportunityToInitiative.ToString();
+            foreach (var x in DistributeAsync_TestCases(distributionStageName))
+                yield return x;
+
+            if (_dataPeriod.TryGetValue("AllMonthsAreCross", out var periods))
+            {
+                yield return new TestCaseData(
+                   DistributionMethod.Average,
+                   periods.Source,
+                   periods.Target,
+                   Array.Empty<double>()
+               ).SetName($"DistributeAsync_{distributionStageName}_Average_AllMonthsAreCross_WithoutRampups");
+            }
+        }
+
+        private static IEnumerable<TestCaseData> DistributeAsync_FromInitiativeToOpportunity_TestCases()
+        {
+            var distributionStageName = DistributionStage.FromInitiativeToOpportunity.ToString();
+            foreach (var x in DistributeAsync_TestCases(distributionStageName))
+                yield return x;
+
+            if (_dataPeriod.TryGetValue("AllMonthsAreCross", out var periods))
+            {
+                yield return new TestCaseData(
+                   DistributionMethod.Average,
+                   periods.Source,
+                   periods.Target,
+                   Array.Empty<double>()
+               ).SetName($"DistributeAsync_{distributionStageName}_Average_AllMonthsAreCross_WithoutRampups");
+            }
+        }
+
+        private static IEnumerable<TestCaseData> DistributeAsync_TestCases(string distributionStageName)
+        {
+
+            if (_dataPeriod.TryGetValue("AllMonthsAreCross", out var periods))
+            {                
+                yield return new TestCaseData(
+                   DistributionMethod.Average,
+                   periods.Source,
+                   periods.Target,
+                   null
+               ).SetName($"DistributeAsync_{distributionStageName}_Average_AllMonthsAreCross");
+            }
+
+            foreach (var x in _dataPeriod)
+            {
+                yield return new TestCaseData(
+                    DistributionMethod.Monthly,
+                    x.Value.Source,
+                    x.Value.Target,
+                    null
+                ).SetName($"DistributeAsync_{distributionStageName}_Monthly_{x.Key}");
+            }
+        }
+
+        private static IEnumerable<TestCaseData> UpdateDetailCommittedByRampUp_TestCases()
+        {
+            var rampUp = new double[] { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.0, 1.0 };
+            yield return new TestCaseData(
+                rampUp,
+                rampUp.Reverse().ToArray()
+            ).SetName($"UpdateDetailCommittedByRampUp_RampUpToRampUp");
+            yield return new TestCaseData(
+                rampUp,
+                Array.Empty<double>()
+            ).SetName($"UpdateDetailCommittedByRampUp_RampUpToNoRampUp");
+            yield return new TestCaseData(
+                Array.Empty<double>(),
+                rampUp
+            ).SetName($"UpdateDetailCommittedByRampUp_NoRampUpToRampUp");
+            yield return new TestCaseData(
+                Array.Empty<double>(),
+                Array.Empty<double>()
+            ).SetName($"UpdateDetailCommittedByRampUp_NoRampUpToNoRampUp");
+            yield return new TestCaseData(
+                rampUp,
+                rampUp
+            ).SetName($"UpdateDetailCommittedByRampUp_NoChangeRampUp");
+        }
+
+        private static IEnumerable<TestCaseData> GetDistributionSummary_TestCases()
+        {
+            yield return new TestCaseData(
+                true,
+                null
+            ).SetName($"GetDistributionSummary_Initiative");
+            yield return new TestCaseData(
+                true,
+                Array.Empty<double>()
+            ).SetName($"GetDistributionSummary_Initiative_NoRampUp");
+            yield return new TestCaseData(
+                false,
+                null
+            ).SetName($"GetDistributionSummary_Opportunity");
+            yield return new TestCaseData(
+                false,
+                Array.Empty<double>()
+            ).SetName($"GetDistributionSummary_Opportunity_NoRampUp");            
+        }
+
+        #endregion
+
+        #region Helper Methods
+
+        private async Task SeedDataFromCsv(string fileName)
+        {
+            var filePath = Path.IsPathRooted(fileName)
+                 ? fileName
+                 : Path.Combine(AppContext.BaseDirectory, SourceFilePath, fileName);
+
+            var insertSql = await GetSqlInsertFromCsv(filePath, StrategicOpportunityService.StrategicOpportunityDetailTableName);
+
+            await SnowflakeDatabaseContext.ExecuteCommandAsync(insertSql);
+        }
+
+        private async Task<string> GetSqlInsertFromCsv(string filePath, string tableName)
+        {
+            if (!File.Exists(filePath))
+            {
+                throw new FileNotFoundException($"Test data file not found: {filePath}");
+            }
+
+            var lines = await File.ReadAllLinesAsync(filePath);
+            if (lines.Length < 2)
+            {
+                throw new InvalidOperationException($"CSV file {filePath} must contain a header and at least one data row");
+            }
+
+            var values = lines.Skip(1).Select(x => $"({x})").ToList();
+
+            var insertSql = $@"
+                INSERT INTO {tableName} ({lines[0]})
+                VALUES {string.Join(",\n", values)}
+            ";
+
+            return insertSql;
+        }
+
+        private string ConvertListDetailToCsvString(IEnumerable<StrategicOpportunityDetail> records)
+        {
+            using (var writer = new StringWriter())
+            using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
+            {
+                csv.Context.RegisterClassMap<StrategicOpportunityDetailCsvMap>();
+                csv.WriteRecords(records);
+                return writer.ToString();
+            }
+        }
+
+        private string ConvertSummaryToCsvString(DistributionChargeCodeSummary summary)
+        {
+            using (var writer = new StringWriter())
+            using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
+            {
+                csv.WriteRecords([summary]);
+                return writer.ToString();
+            }
+        }
+
+        private async Task<IEnumerable<StrategicOpportunityDetail>> GetDetailRecords(bool? isBaseline = null)
+        {
+            var sql = $@"
+                SELECT * FROM {StrategicOpportunityService.StrategicOpportunityDetailTableName}
+                WHERE OpportunityId = {TestOpportunityId} {(isBaseline.HasValue ? $"AND IsBaseline = {isBaseline}" : "")}
+                ORDER BY DischargeFiscalYearId, DischargeFiscalMonthId, EntityId
+            ";
+            var records = await SnowflakeDatabaseContext.QueryAsync<StrategicOpportunityDetail>(sql, nameof(GetDetailRecords));
+            return records;
+        }
+
+        private async Task CleanData(bool? isBaseline = null)
+        {
+            await SnowflakeDatabaseContext.ExecuteCommandAsync($@"
+                DELETE FROM {StrategicOpportunityService.StrategicOpportunityDetailTableName}
+                WHERE OpportunityId = {TestOpportunityId} {(isBaseline.HasValue ? $"AND IsBaseline = {isBaseline}" : "")}
+            ");
+        }
+
+        #endregion
+    }
+
+    public class StrategicOpportunityDetailCsvMap : ClassMap<StrategicOpportunityDetail>
+    {
+        public StrategicOpportunityDetailCsvMap()
+        {
+            AutoMap(CultureInfo.InvariantCulture);
+            Map(m => m.RowId).Ignore();
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/FlexibleExplorationBaselineTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/FlexibleExplorationBaselineTest.cs
new file mode 100644
index 0000000..dd3e025
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/FlexibleExplorationBaselineTest.cs
@@ -0,0 +1,302 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Schema.Client;
+using Strata.Schema.Client.Dtos;
+using Strata.Schema.Client.Dtos.Info;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using Strata.StrataSphereCompare.Client;
+using System.Diagnostics.CodeAnalysis;
+using VerifyNUnit;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.SnowflakeIntegrationTests
+{
+    /// <summary>
+    /// Baseline regression tests for the exploration query refactor.
+    ///
+    /// WORKFLOW:
+    ///   1. On main (or a branch from main): run these tests to generate golden snapshots.
+    ///      Commit the resulting *.verified.txt files.
+    ///   2. On the refactor branch: run the same tests.
+    ///      Verify diffs output against the golden snapshots — any divergence fails.
+    /// </summary>
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    public class FlexibleExplorationBaselineTest : IntegrationTestBase
+    {
+        private static readonly Guid _configurationGuid = Guid.Parse("aa4cba4f-2506-462c-8e34-c45b21653988");
+
+        private ExplorationDetailInfo _detailInfo;
+
+        [OneTimeSetUp]
+        public async Task SetupDetailInfo()
+        {
+            var summaryInfo = CreateSummaryInfo();
+            var summaries = await ExplorationService.GetCaseTypeFamilySummariesAsync(summaryInfo, CancellationToken.None);
+
+            if (!summaries.Any())
+                throw new InvalidOperationException("No Case Type Family summaries returned — cannot run baseline tests.");
+
+            // Configure the schema service mock so the Gender ScoreMember filter resolves to
+            // a real SQL fragment (fpes.GenderID IN (1)) rather than being silently skipped.
+            // GenderID 1 = Male in the GM Automation test database.
+            var genderDimensionGuid = Guid.NewGuid();
+            Mock.Get(SchemaServiceClient)
+                .Setup(s => s.GetDimensionByGlobalIdAsync("Gender", It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new ScoreDimensionInfoDto { DimensionGuid = genderDimensionGuid });
+            Mock.Get(SchemaServiceClient)
+                .Setup(s => s.GetDimensionMembersFromHierarchyPathsAsync(genderDimensionGuid, It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new[] { new MemberDto { Id = "1" } });
+
+            // Rebuild ExplorationFilterService and ExplorationService with the configured mock
+            // so the gender filter is active for all tests in this fixture.
+            var filterService = new ExplorationFilterService(
+                ServiceProvider.GetRequiredService<IAsyncDbContextFactory<JazzDbContext>>(),
+                SchemaServiceClient,
+                Mock.Of<ILogger<ExplorationFilterService>>());
+            var featureFlagWrapper = Mock.Of<IFeatureFlagWrapper>();
+            Mock.Get(featureFlagWrapper)
+                .Setup(f => f.IsCiBenchmarkingEnabled(It.IsAny<bool>()))
+                .ReturnsAsync(true);
+            ExplorationService = new ExplorationService(
+                JazzConnBuilderFactory,
+                SnowflakeDatabaseContext,
+                Mock.Of<IFiscalMonthResolver>(),
+                featureFlagWrapper,
+                Mock.Of<IStrataSphereCompareService>(),
+                filterService,
+                Mock.Of<ILogger<ExplorationService>>());
+
+            // Always pick the same CTF (highest encounter count) so snapshots are deterministic.
+            var busiest = summaries.OrderByDescending(s => s.Data.TotalEncounters).First();
+
+            // Derive a real cost driver from the CTF's detail breakdown so the
+            // encounter query (which filters on cc.costdriver = @CostDriver) returns data.
+            var costDriverInfo = CreateSummaryInfo();
+            costDriverInfo.CaseTypeFamilyId = busiest.Data.Id;
+            var costDriverDetails = await ExplorationService.GetCaseTypeFamilySummaryDetailsAsync(costDriverInfo, CancellationToken.None);
+            var costDriver = costDriverDetails
+                .SelectMany(d => d.Children ?? [])
+                .OrderByDescending(c => c.Data.TotalEncounters)
+                .FirstOrDefault()?.Name
+                ?? throw new InvalidOperationException("No cost driver children found for the busiest CTF.");
+
+            _detailInfo = new ExplorationDetailInfo
+            {
+                ConfigurationGuid = _configurationGuid,
+                CaseTypeFamilyId = busiest.Data.Id,
+                CostDriver = costDriver,
+                ExclusionCriteria = new ExclusionCriteria(),
+                ExcludedEncounters = new List<long>(),
+                IncludedEncounters = new List<long>(),
+                Filters = new Biz.Exploration.Filters.Filter
+                {
+                    DischargeDateStart = new DateTime(2024, 1, 1),
+                    DischargeDateEnd = new DateTime(2025, 1, 1),
+                    FilterChipItems = new List<FilterChipItem>
+                    {
+                        new FilterChipItem
+                        {
+                            ChipType = ChipType.DateRange,
+                            Key = ChipKey.DischargeDateID,
+                            Filters = [],
+                            DateRange = [new DateTime(2024, 1, 1), new DateTime(2025, 1, 1)]
+                        }
+                    }
+                }
+            };
+        }
+
+        // ── No filters ──────────────────────────────────────────────────────────
+
+        [Test]
+        public async Task GetCaseTypeFamilyDetailsAsync_MatchesBaseline()
+        {
+            var result = await ExplorationService.GetCaseTypeFamilyDetailsAsync(_detailInfo, CancellationToken.None);
+
+            await Verifier.Verify(result, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test]
+        public async Task GetEncountersAsync_MatchesBaseline()
+        {
+            var result = await ExplorationService.GetEncountersAsync(_detailInfo, _configurationGuid, CancellationToken.None);
+
+            await Verifier.Verify(result.OrderBy(e => e.EncounterId), verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        // ── Boolean filter (charges > 0) ─────────────────────────────────────
+        // IsGreaterThanZeroCharges hits the queryFilter path and reliably
+        // produces a meaningful subset without risking empty results.
+
+        [Test]
+        public async Task GetCaseTypeFamilyDetailsAsync_WithChargesFilter_MatchesBaseline()
+        {
+            var info = CreateDetailInfo(extraFilter: CreateChargesFilter());
+
+            var result = await ExplorationService.GetCaseTypeFamilyDetailsAsync(info, CancellationToken.None);
+
+            await Verifier.Verify(result, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test]
+        public async Task GetEncountersAsync_WithChargesFilter_MatchesBaseline()
+        {
+            var info = CreateDetailInfo(extraFilter: CreateChargesFilter());
+
+            var result = await ExplorationService.GetEncountersAsync(info, _configurationGuid, CancellationToken.None);
+
+            await Verifier.Verify(result.OrderBy(e => e.EncounterId), verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        // ── FPES ScoreMember filter (gender) ────────────────────────────────
+        // Gender is an FPES-level filter — it resolves to fpes.GenderID IN (...)
+        // via the schema service and lands in the encounterSummaryFilter placeholder.
+
+        [Test]
+        public async Task GetCaseTypeFamilyDetailsAsync_WithGenderFilter_MatchesBaseline()
+        {
+            var info = CreateDetailInfo(extraFilter: CreateGenderFilter());
+
+            var result = await ExplorationService.GetCaseTypeFamilyDetailsAsync(info, CancellationToken.None);
+
+            await Verifier.Verify(result, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test]
+        public async Task GetEncountersAsync_WithGenderFilter_MatchesBaseline()
+        {
+            var info = CreateDetailInfo(extraFilter: CreateGenderFilter());
+
+            var result = await ExplorationService.GetEncountersAsync(info, _configurationGuid, CancellationToken.None);
+
+            await Verifier.Verify(result.OrderBy(e => e.EncounterId), verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        // ── IQR exclusions ───────────────────────────────────────────────────
+
+        [Test]
+        public async Task GetCaseTypeFamilyDetailsAsync_WithIqrExclusions_MatchesBaseline()
+        {
+            var info = CreateDetailInfo(exclusion: new ExclusionCriteria
+            {
+                CostExclusionType = ExclusionCriteriaType.Iqr,
+                CostExclusionValue = 1.5,
+                LosExclusionType = ExclusionCriteriaType.Iqr,
+                LosExclusionValue = 1.5
+            });
+
+            var result = await ExplorationService.GetCaseTypeFamilyDetailsAsync(info, CancellationToken.None);
+
+            await Verifier.Verify(result, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test]
+        public async Task GetEncountersAsync_WithIqrExclusions_MatchesBaseline()
+        {
+            var info = CreateDetailInfo(exclusion: new ExclusionCriteria
+            {
+                CostExclusionType = ExclusionCriteriaType.Iqr,
+                CostExclusionValue = 1.5,
+                LosExclusionType = ExclusionCriteriaType.Iqr,
+                LosExclusionValue = 1.5
+            });
+
+            var result = await ExplorationService.GetEncountersAsync(info, _configurationGuid, CancellationToken.None);
+
+            await Verifier.Verify(result.OrderBy(e => e.EncounterId), verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        // ── Helpers ──────────────────────────────────────────────────────────
+
+        private ExplorationDetailInfo CreateDetailInfo(
+            FilterChipItem extraFilter = null,
+            ExclusionCriteria exclusion = null)
+        {
+            var dateFilter = new FilterChipItem
+            {
+                ChipType = ChipType.DateRange,
+                Key = ChipKey.DischargeDateID,
+                Filters = [],
+                DateRange = [new DateTime(2024, 1, 1), new DateTime(2025, 1, 1)]
+            };
+
+            var chips = extraFilter != null
+                ? new List<FilterChipItem> { dateFilter, extraFilter }
+                : new List<FilterChipItem> { dateFilter };
+
+            return new ExplorationDetailInfo
+            {
+                ConfigurationGuid = _detailInfo.ConfigurationGuid,
+                CaseTypeFamilyId = _detailInfo.CaseTypeFamilyId,
+                CostDriver = _detailInfo.CostDriver,
+                ExclusionCriteria = exclusion ?? new ExclusionCriteria(),
+                ExcludedEncounters = new List<long>(),
+                IncludedEncounters = new List<long>(),
+                Filters = new Biz.Exploration.Filters.Filter
+                {
+                    DischargeDateStart = new DateTime(2024, 1, 1),
+                    DischargeDateEnd = new DateTime(2025, 1, 1),
+                    FilterChipItems = chips
+                }
+            };
+        }
+
+        // Gender filter — FPES-level (encounterSummaryFilter placeholder).
+        // GlobalId "Gender" maps to the Gender dimension in the schema service.
+        // The Filters list contains the hierarchy path ID for "Male" as resolved
+        // by the schema service; adjust the Id if needed for your test database.
+        private static FilterChipItem CreateGenderFilter() => new()
+        {
+            ChipType = ChipType.ScoreMember,
+            GlobalId = "Gender",
+            Key = ChipKey.GenderID,
+            Operator = OperatorType.In,
+            Filters = new List<TreeNode> { new() { Id = "Male", DisplayText = "Male" } }
+        };
+
+        private static FilterChipItem CreateChargesFilter() => new()
+        {
+            ChipType = ChipType.Boolean,
+            Key = ChipKey.IsGreaterThanZeroCharges,
+            IsSelected = true,
+            Operator = OperatorType.In,
+            Filters = new List<TreeNode>()
+        };
+
+        private ExplorationCostDriverInfo CreateSummaryInfo() => new()
+        {
+            ConfigurationGuid = _configurationGuid,
+            ExclusionCriteria = new ExclusionCriteria(),
+            Filters = new Biz.Exploration.Filters.Filter
+            {
+                DischargeDateStart = new DateTime(2024, 1, 1),
+                DischargeDateEnd = new DateTime(2025, 1, 1),
+                FilterChipItems = new List<FilterChipItem>
+                {
+                    new FilterChipItem
+                    {
+                        ChipType = ChipType.DateRange,
+                        Key = ChipKey.DischargeDateID,
+                        Filters = [],
+                        DateRange = [new DateTime(2024, 1, 1), new DateTime(2025, 1, 1)]
+                    }
+                }
+            }
+        };
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/FlexibleExplorationSummaryDetailTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/FlexibleExplorationSummaryDetailTest.cs
new file mode 100644
index 0000000..fb7731d
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/FlexibleExplorationSummaryDetailTest.cs
@@ -0,0 +1,193 @@
+using FluentAssertions;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.SnowflakeIntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    public class FlexibleExplorationSummaryDetailTest : IntegrationTestBase
+    {
+        private static readonly Guid _configurationGuid = Guid.Parse("aa4cba4f-2506-462c-8e34-c45b21653988");
+
+        [OneTimeSetUp]
+        public async Task SetupExploration()
+        {
+            var explorationInfo = CreateExplorationInfo();
+            var summaries = await ExplorationService.GetCaseTypeFamilySummariesAsync(explorationInfo, CancellationToken.None);
+
+            if (!summaries.Any())
+                throw new InvalidOperationException("No Case Type Family summaries returned for setup.");
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilySummaryDetails_WhenNoFilters_IsEquivalent()
+        {
+            //  arrange
+            var explorationInfo = CreateExplorationInfo();
+
+            // act
+            var summaries = await ExplorationService.GetCaseTypeFamilySummariesAsync(explorationInfo, CancellationToken.None);
+            var testSummary = summaries.OrderByDescending(x => x.Data.TotalEncounters).First();
+            explorationInfo.CaseTypeFamilyId = testSummary.Data.Id;
+
+            var testDetails = await ExplorationService.GetCaseTypeFamilySummaryDetailsAsync(explorationInfo, CancellationToken.None);
+            var testDetail = testDetails.First();
+            // assert
+            testDetail.Data.Should().BeEquivalentTo(testSummary.Data, 
+                options => options
+                    .Using<double>(ctx => ctx.Subject.Should().BeApproximately(ctx.Expectation, 0.001))
+                    .WhenTypeIs<double>());
+        }
+
+        [TestCaseSource(nameof(ExclusionCriteriaTestCases))]
+        public async Task GetCaseTypeFamilySummaries_WithExclusions(ExclusionCriteria exclusions)
+        {
+            await RunExclusionSummaryTests(exclusions);
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilySummaryDetails_WithFilters_IsEquivalent()
+        {
+            // arrange - filtering on mortality (IsSelected = true => MortalityRate = 1)
+            var booleanFilter = CreateBooleanFilter(ChipKey.Mortality);
+            var explorationInfo = CreateExplorationInfo(booleanFilter);
+
+            // act
+            var summaries = await ExplorationService.GetCaseTypeFamilySummariesAsync(explorationInfo, CancellationToken.None);
+            var testSummary = summaries.OrderByDescending(x => x.Data.TotalEncounters).First();
+            explorationInfo.CaseTypeFamilyId = testSummary.Data.Id;
+
+            var testDetails = await ExplorationService.GetCaseTypeFamilySummaryDetailsAsync(explorationInfo, CancellationToken.None);
+            var testDetail = testDetails.First();
+            // assert
+            testDetail.Data.Should().BeEquivalentTo(testSummary.Data,
+                options => options
+                    .Using<double>(ctx => ctx.Subject.Should().BeApproximately(ctx.Expectation, 0.001))
+                    .WhenTypeIs<double>());
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilySummaryDetails_WithFiltersAndExclusions_IsEquivalent()
+        {
+            // arrange - iqr + mad exclusion combo with a boolean filter
+            var booleanFilter = CreateBooleanFilter(ChipKey.Mortality);
+            var exclusions = new ExclusionCriteria
+            {
+                CostExclusionType = ExclusionCriteriaType.Iqr,
+                CostExclusionValue = 1.5,
+                LosExclusionType = ExclusionCriteriaType.Mad,
+                LosExclusionValue = 2
+            };
+            var explorationInfo = CreateExplorationInfo(booleanFilter, exclusions);
+
+            // act
+            var summaries = await ExplorationService.GetCaseTypeFamilySummariesAsync(explorationInfo, CancellationToken.None);
+            var testSummary = summaries.OrderByDescending(x => x.Data.TotalEncounters).First();
+            explorationInfo.CaseTypeFamilyId = testSummary.Data.Id;
+
+            var testDetails = await ExplorationService.GetCaseTypeFamilySummaryDetailsAsync(explorationInfo, CancellationToken.None);
+            var testDetail = testDetails.First();
+            // assert
+            testDetail.Data.Should().BeEquivalentTo(testSummary.Data,
+                options => options
+                    .Using<double>(ctx => ctx.Subject.Should().BeApproximately(ctx.Expectation, 0.001))
+                    .WhenTypeIs<double>());
+        }
+
+        private FilterChipItem CreateDischargeDateFilter() => new()
+        {
+            ChipType = ChipType.DateRange,
+            Filters = [],
+            DateRange = [new DateTime(2024, 1, 1), new DateTime(2025, 1, 1)]
+        };
+
+        private FilterChipItem CreateBooleanFilter(ChipKey key)
+        {
+            if (key is ChipKey.Mortality)
+            {
+                return new FilterChipItem
+                {
+                    ChipType = ChipType.Boolean,
+                    GlobalId = "Mortality",
+                    IsSelected = true, // determines true/false of filter
+                    Key = ChipKey.Mortality,
+                    Operator = OperatorType.In,
+                    Filters = new List<TreeNode>()
+                {
+                    new TreeNode
+                    {
+                         DisplayText = "Yes"
+                    }},
+                };
+            }
+
+            throw new ArgumentException($"Unsupported boolean filter: {key}", nameof(key));
+        }
+
+        private ExplorationCostDriverInfo CreateExplorationInfo(FilterChipItem? additionalFilter = null, ExclusionCriteria? exclusion = null)
+        {
+            var dischargeDateFilter = CreateDischargeDateFilter();
+            var filterChipItems = additionalFilter != null ?
+                new List<FilterChipItem> { dischargeDateFilter, additionalFilter }
+                : new List<FilterChipItem> { dischargeDateFilter };
+
+            return new ExplorationCostDriverInfo
+            {
+                ConfigurationGuid = _configurationGuid,
+                ExclusionCriteria = exclusion ?? new ExclusionCriteria(),
+                Filters = new Biz.Exploration.Filters.Filter
+                {
+                    DischargeDateStart = dischargeDateFilter.DateRange.First(),
+                    DischargeDateEnd = dischargeDateFilter.DateRange.Last(),
+                    FilterChipItems = filterChipItems
+                }
+            };
+        }
+
+        private async Task RunExclusionSummaryTests(ExclusionCriteria exclusions)
+        {
+            // arrange
+            var explorationInfo = CreateExplorationInfo(null, exclusions);
+            
+            // act
+            var summaries = await ExplorationService.GetCaseTypeFamilySummariesAsync(explorationInfo, CancellationToken.None);
+            var testSummary = summaries.OrderByDescending(x => x.Data.TotalEncounters).First();
+            explorationInfo.CaseTypeFamilyId = testSummary.Data.Id;
+
+            var testDetails = await ExplorationService.GetCaseTypeFamilySummaryDetailsAsync(explorationInfo, CancellationToken.None);
+            var testDetail = testDetails.First();
+            // assert
+            testDetail.Data.Should().BeEquivalentTo(testSummary.Data,
+                options => options
+                    .Using<double>(ctx => ctx.Subject.Should().BeApproximately(ctx.Expectation, 0.001))
+                    .WhenTypeIs<double>());
+        }
+
+        private static IEnumerable<TestCaseData> ExclusionCriteriaTestCases()
+        {
+            yield return new TestCaseData(
+                 new ExclusionCriteria
+                 {
+                     CostExclusionType = ExclusionCriteriaType.Mad,
+                     CostExclusionValue = 2,
+                     LosExclusionType = ExclusionCriteriaType.Mad,
+                     LosExclusionValue = 2
+                 }
+            ).SetName("GetCaseTypeFamilySummaryDetails_WithMADExclusions_IsEquivalent");
+
+            yield return new TestCaseData(
+                new ExclusionCriteria
+                {
+                    CostExclusionType = ExclusionCriteriaType.Iqr,
+                    CostExclusionValue = 1.5,
+                    LosExclusionType = ExclusionCriteriaType.Iqr,
+                    LosExclusionValue = 1.5
+                }
+            ).SetName("GetCaseTypeFamilySummaryDetails_WithIQRExclusions_IsEquivalent");
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/FlexibleExplorationSummaryTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/FlexibleExplorationSummaryTest.cs
new file mode 100644
index 0000000..df70259
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/FlexibleExplorationSummaryTest.cs
@@ -0,0 +1,207 @@
+using FluentAssertions;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.SnowflakeIntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    public class FlexibleExplorationSummaryTest : IntegrationTestBase
+    {
+        private static readonly Guid _configurationGuid = Guid.Parse("aa4cba4f-2506-462c-8e34-c45b21653988");
+        private static int _totalCaseTypeFamilyCount;
+
+        [OneTimeSetUp]
+        public async Task SetupExploration()
+        {
+            var explorationInfo = CreateExplorationInfo();
+            var summaries = await ExplorationService.GetCaseTypeFamilySummariesAsync(explorationInfo, CancellationToken.None);
+
+            if (!summaries.Any())
+                throw new InvalidOperationException("No Case Type Family summaries returned for setup.");
+
+            _totalCaseTypeFamilyCount = summaries.Count();
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilySummaries_WhenNoFilters_ReturnsAll()
+        {
+            //  arrange
+            var explorationInfo = CreateExplorationInfo();
+
+            // act
+            var summaries = await ExplorationService.GetCaseTypeFamilySummariesAsync(explorationInfo, CancellationToken.None);
+
+            // assert
+            summaries.Should().HaveCount(_totalCaseTypeFamilyCount);
+            await VerifySummaries(summaries);
+        }
+
+        [TestCaseSource(nameof(ExclusionCriteriaTestCases))]
+        public async Task GetCaseTypeFamilySummaries_WithExclusions(ExclusionCriteria exclusions)
+        {
+            await RunExclusionSummaryTests(exclusions);
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilySummaries_WithFilters_ReturnsFiltered()
+        {
+            // arrange - filtering on mortality (IsSelected = true => MortalityRate = 1)
+            var booleanFilter = CreateBooleanFilter(ChipKey.Mortality);
+            var explorationInfo = CreateExplorationInfo(booleanFilter);
+
+            // act
+            var summaries = await ExplorationService.GetCaseTypeFamilySummariesAsync(explorationInfo, CancellationToken.None);
+
+            // assert
+            summaries.Should().HaveCountGreaterThan(0);
+            summaries.Should().HaveCountLessThan(_totalCaseTypeFamilyCount, "Filters should reduce data returned");
+            // mortality rate only applies to included encounters
+            summaries.Where(x => x.Data.IncludedEncounterCount > 0).Should().OnlyContain(s => s.Data.MortalityRate == 1);
+            await VerifySummaries(summaries);
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilySummaries_WithFiltersAndExclusions_ReturnsFilteredAndExcluded()
+        {
+            // arrange - iqr + mad exclusion combo with a boolean filter
+            var booleanFilter = CreateBooleanFilter(ChipKey.Mortality);
+            var exclusions = new ExclusionCriteria
+            {
+                CostExclusionType = ExclusionCriteriaType.Iqr,
+                CostExclusionValue = 1.5,
+                LosExclusionType = ExclusionCriteriaType.Mad,
+                LosExclusionValue = 2
+            };
+            var explorationInfo = CreateExplorationInfo(booleanFilter, exclusions);
+
+            // act
+            var summaries = await ExplorationService.GetCaseTypeFamilySummariesAsync(explorationInfo, CancellationToken.None);
+
+            // assert
+            summaries.Should().HaveCountGreaterThan(0);
+            summaries.Should().HaveCountLessThan(_totalCaseTypeFamilyCount);
+            // mortality rate only applies to included encounters
+            summaries.Where(x => x.Data.IncludedEncounterCount > 0).Should().OnlyContain(s => s.Data.MortalityRate == 1);
+            summaries.Should().Contain(s => s.Data.ExcludedEncountersAboveMedian > 0);
+            await VerifySummaries(summaries);
+        }
+
+        private FilterChipItem CreateDischargeDateFilter() => new()
+        {
+            ChipType = ChipType.DateRange,
+            Filters = [],
+            DateRange = [new DateTime(2024, 1, 1), new DateTime(2025, 1, 1)]
+        };
+
+        private FilterChipItem CreateBooleanFilter(ChipKey key)
+        {
+            if (key is ChipKey.Mortality)
+            {
+                return new FilterChipItem
+                {
+                    ChipType = ChipType.Boolean,
+                    GlobalId = "Mortality",
+                    IsSelected = true, // determines true/false of filter
+                    Key = ChipKey.Mortality,
+                    Operator = OperatorType.In,
+                    Filters = new List<TreeNode>()
+                {
+                    new TreeNode
+                    {
+                         DisplayText = "Yes"
+                    }},
+                };
+            }
+
+            throw new ArgumentException($"Unsupported boolean filter: {key}", nameof(key));
+        }
+
+        private ExplorationInfo CreateExplorationInfo(FilterChipItem? additionalFilter = null, ExclusionCriteria? exclusion = null)
+        {
+            var dischargeDateFilter = CreateDischargeDateFilter();
+            var filterChipItems = additionalFilter != null ?
+                new List<FilterChipItem> { dischargeDateFilter, additionalFilter }
+                : new List<FilterChipItem> { dischargeDateFilter };
+
+            return new ExplorationInfo
+            {
+                ConfigurationGuid = _configurationGuid,
+                ExclusionCriteria = exclusion ?? new ExclusionCriteria(),
+                Filters = new Biz.Exploration.Filters.Filter
+                {
+                    DischargeDateStart = dischargeDateFilter.DateRange.First(),
+                    DischargeDateEnd = dischargeDateFilter.DateRange.Last(),
+                    FilterChipItems = filterChipItems
+                }
+            };
+        }
+
+        private async Task AssertExclusionsWereApplied(IEnumerable<CaseTypeFamilySummaryData> summaries)
+        {
+            summaries.Should().HaveCount(_totalCaseTypeFamilyCount);
+            summaries.Should().Contain(s => s.Data.ExcludedEncountersAboveMedian > 0);
+        }
+
+        private Task VerifySummaries(IEnumerable<CaseTypeFamilySummaryData> summaries)
+        {
+            summaries.Should().NotBeNull().And.NotBeEmpty();
+            summaries.Should().OnlyContain(s => !string.IsNullOrWhiteSpace(s.Key));
+            summaries.Should().OnlyContain(s => !string.IsNullOrWhiteSpace(s.Name));
+            summaries.Should().AllSatisfy(s => s.Key.Should().MatchRegex(@"^\d+-\d+$", "Key should follow format 'level-id'"));
+            summaries.Should().AllSatisfy(s => s.Data.Should().NotBeNull("Each summary should have data"));
+            summaries.Should().AllSatisfy(s => s.Data.Key.Should().MatchRegex(@"^\d+-\d+$", "Key should follow format 'level-id'"));
+            summaries.Should().AllSatisfy(s => s.Data.Id.Should().BeGreaterThan(0, "Each summary data should have a valid ID"));
+            summaries.Should().AllSatisfy(s => s.Data.TotalEncounters.Should().BeGreaterThanOrEqualTo(0, "Each summary data should have a valid TotalEncounters"));
+            summaries.Should().AllSatisfy(s => s.Data.TotalVariationEncounters.Should().BeGreaterThanOrEqualTo(0, "Each summary data should have a valid TotalVariationEncounters"));
+            summaries.Should().AllSatisfy(s => s.Data.IncludedEncounterCount.Should().BeGreaterThanOrEqualTo(0, "Each summary data should have a valid IncludedEncounterCount"));
+            summaries.Should().AllSatisfy(s => s.Data.IdentifiedVariation.Should().BeGreaterThanOrEqualTo(0, "Each summary data should have a valid IdentifiedVariation"));
+            summaries.Should().AllSatisfy(s => s.Data.MortalityRate.Should().BeInRange(0, 1, "MortalityRate should be between 0 and 1"));
+            summaries.Should().AllSatisfy(s => s.Data.MedianLos.Should().BeGreaterOrEqualTo(0, "MedianLos should be non-negative"));
+            summaries.Should().AllSatisfy(s => s.Data.MedianCost.Should().BeGreaterOrEqualTo(0, "MedianCost should be non-negative"));
+            summaries.Should().AllSatisfy(s => s.Data.IncludedEncountersBelowMedian.Should().BeGreaterOrEqualTo(0, "IncludedEncountersBelowMedian should be non-negative"));
+            summaries.Should().AllSatisfy(s => s.Data.IncludedEncountersAboveMedian.Should().BeGreaterOrEqualTo(0, "IncludedEncountersAboveMedian should be non-negative"));
+            summaries.Should().AllSatisfy(s => s.Data.IncludedVariation.Should().BeGreaterOrEqualTo(0, "IncludedVariation should be non-negative"));
+            return Verify(summaries, verifySettings)
+               .UseDirectory("Exploration")
+               .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        private async Task RunExclusionSummaryTests(ExclusionCriteria exclusions)
+        {
+            // act
+            var explorationInfo = CreateExplorationInfo(null, exclusions);
+            var summaries = await ExplorationService.GetCaseTypeFamilySummariesAsync(explorationInfo, CancellationToken.None);
+
+            // assert
+            await AssertExclusionsWereApplied(summaries);
+            await VerifySummaries(summaries);
+        }
+
+        private static IEnumerable<TestCaseData> ExclusionCriteriaTestCases()
+        {
+            yield return new TestCaseData(
+                 new ExclusionCriteria
+                 {
+                     CostExclusionType = ExclusionCriteriaType.Mad,
+                     CostExclusionValue = 2,
+                     LosExclusionType = ExclusionCriteriaType.Mad,
+                     LosExclusionValue = 2
+                 }
+            ).SetName("GetCaseTypeFamilySummaries_WithMADExclusions_ReturnsWithExclusions");
+
+            yield return new TestCaseData(
+                new ExclusionCriteria
+                {
+                    CostExclusionType = ExclusionCriteriaType.Iqr,
+                    CostExclusionValue = 1.5,
+                    LosExclusionType = ExclusionCriteriaType.Iqr,
+                    LosExclusionValue = 1.5
+                }
+            ).SetName("GetCaseTypeFamilySummaries_WithIQRExclusions_ReturnsWithExclusions");
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/StrategicChargeCodeOpportunityDetailServiceTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/StrategicChargeCodeOpportunityDetailServiceTests.cs
new file mode 100644
index 0000000..0c388bc
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/StrategicChargeCodeOpportunityDetailServiceTests.cs
@@ -0,0 +1,457 @@
+using FluentAssertions;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Moq;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.DataSchema.Client;
+using Strata.DataSchema.Models.Query;
+using Strata.DataSchema.Models.Schema;
+using Strata.Schema.Client;
+using Strata.Schema.Client.Dtos;
+using System.Diagnostics.CodeAnalysis;
+using static Strata.ContinuousImprovement.Biz.Exploration.ExplorationService;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.SnowflakeIntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    public class StrategicChargeCodeOpportunityDetailServiceTests : IntegrationTestBase
+    {
+        private IStrategicChargeCodeOpportunityDetailService _strategicOpportunityDetailService;
+        private Mock<IDataSchemaService> _mockDataSchemaService = new Mock<IDataSchemaService>();
+        private Mock<ISchemaServiceClient> _mockSchemaServiceClient = new Mock<ISchemaServiceClient>();
+        private Mock<IExplorationFilterService> _mockExplorationService = new Mock<IExplorationFilterService>();
+        private Mock<IStrategicItemDimensionSyncService> _mockStrategicItemDimensionSyncService = new Mock<IStrategicItemDimensionSyncService>();
+        private IStrategicOpportunityDetailQueryBuilder _strategicOpportunityDetailQueryBuilder;
+
+        private const long TestOpportunityId = 999_000_001;
+        private const long TestMeasureId = TestOpportunityId * 10 + 2;
+        private const string MeasureFiltersJSON = "[17993, 17995, 18001]";
+        private static readonly Guid ChargeCodeDimensionGuid = new("aaaaaaaa-0000-0000-0000-000000000001");
+        private static readonly Guid ClinicalIndicatorDimensionGuid = new("bbbbbbbb-0000-0000-0000-000000000002");
+        private const long TestExplorationPopulationId = 999_000_002;
+        private const long TestOpportunityId_Exploration = 999_000_002;
+        private const long TestMeasureId_Exploration = TestOpportunityId_Exploration * 10 + 2;
+
+        [OneTimeSetUp]
+        public void Setup()
+        {
+            var notificationHubClient = new Mock<IHubContext<NotificationHub, INotificationHub>>();
+            var mockNotificationClients = new Mock<IHubClients<INotificationHub>>();
+            var mockNotificationGroup = new Mock<INotificationHub>();
+            var distributionProcessFactory = new Mock<IDistributionProcessFactory>();
+
+            notificationHubClient.Setup(h => h.Clients).Returns(mockNotificationClients.Object);
+            mockNotificationClients.Setup(c => c.Group(It.IsAny<string>())).Returns(mockNotificationGroup.Object);
+            mockNotificationGroup
+                .Setup(g => g.SendStrategicInitiativeTrackerSuccess(It.IsAny<string>(), It.IsAny<byte>(), It.IsAny<DateTime?>()))
+                .Returns(Task.CompletedTask);
+            mockNotificationGroup
+                .Setup(g => g.SendStrategicInitiativeTrackerError(It.IsAny<string>(), It.IsAny<byte>(), It.IsAny<DateTime?>()))
+                .Returns(Task.CompletedTask);
+
+            _mockDataSchemaService.Setup(x =>
+                x.GetDataTableBySqlFullNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((string tableName, CancellationToken _) => new DataTable
+                {
+                    SqlAlias = tableName.Split('.').Last()
+                });
+
+            _mockDataSchemaService.Setup(x =>
+                x.GetDataColumnsBySqlColumnNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync([]);
+
+            _mockSchemaServiceClient
+                .Setup(x => x.GetDimensionByGlobalIdAsync("Charge Code", It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new Schema.Client.Dtos.Info.ScoreDimensionInfoDto { DimensionGuid = ChargeCodeDimensionGuid });
+
+            _mockSchemaServiceClient
+                .Setup(x => x.GetDimensionByGlobalIdAsync(It.Is<string>(s => s != "Charge Code"), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new Schema.Client.Dtos.Info.ScoreDimensionInfoDto { DimensionGuid = ClinicalIndicatorDimensionGuid });
+
+            _mockSchemaServiceClient
+                .Setup(x => x.GetDimensionMembersFromHierarchyPathsAsync(
+                    ChargeCodeDimensionGuid,
+                    It.IsAny<IEnumerable<string>>(),
+                    It.IsAny<CancellationToken>()))
+                .ReturnsAsync([
+                    new MemberDto { Id = "17993", Name = "39017762 - LAB CAB FEE(FROM BBACCA)*ARC" },
+                    new MemberDto { Id = "17995", Name = "39022140 - LAB FROZEN POOLED CRYO PRODUCT(5)*ARC" },
+                    new MemberDto { Id = "18001", Name = "39022185 - LAB LEUKOFILTERED CELLS 1 UNIT *ARC" },
+                ]);
+
+            _mockSchemaServiceClient
+                .Setup(x => x.GetDimensionMembersFromHierarchyPathsAsync(
+                    ClinicalIndicatorDimensionGuid,
+                    It.IsAny<IEnumerable<string>>(),
+                    It.IsAny<CancellationToken>()))
+                .ReturnsAsync([new MemberDto { Id = "188", Name = "All Readmissions" }]);
+
+            _mockSchemaServiceClient.Setup(x =>
+                x.GetHierarchyNodesFromHierarchyPathsAsync(It.IsAny<Guid>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync([]);
+
+            _strategicOpportunityDetailQueryBuilder = new StrategicOpportunityDetailQueryBuilder();
+
+            _strategicOpportunityDetailService = new StrategicChargeCodeOpportunityDetailService(
+                JazzConnBuilderFactory,
+                (CentralDbContext)CentralDbContext,
+                TestUtilities.GetClaimsPrincipalAccessor(),
+                _mockDataSchemaService.Object,
+                _mockSchemaServiceClient.Object,
+                SnowflakeDatabaseContext,
+                _mockExplorationService.Object,
+                distributionProcessFactory.Object,
+                _strategicOpportunityDetailQueryBuilder,
+                notificationHubClient.Object,
+                _mockStrategicItemDimensionSyncService.Object,
+                (Microsoft.Extensions.Logging.ILogger<StrategicChargeCodeOpportunityDetailService>)logger);
+        }
+
+        [TearDown]
+        public async Task CleanupData()
+        {
+            await SnowflakeDatabaseContext.ExecuteCommandAsync(
+                $"DELETE FROM cci.FactStrategicChargeCodeDetail WHERE OpportunityId IN ({TestOpportunityId}, {TestOpportunityId_Exploration})");
+
+            await SnowflakeDatabaseContext.ExecuteCommandAsync(
+                $"DELETE FROM cci.StrategicOpportunityMeasureDetail WHERE MeasureId IN " +
+                $"(SELECT MeasureId FROM cci.StrategicOpportunityMeasureDetail WHERE MeasureId >= {TestOpportunityId * 10})");
+
+            var centralDb = (CentralDbContext)CentralDbContext;
+            var measures = centralDb.StrategicOpportunityMeasures
+                .Where(m => m.OpportunityId == TestOpportunityId || m.OpportunityId == TestOpportunityId_Exploration);
+            centralDb.StrategicOpportunityMeasures.RemoveRange(measures);
+
+            var opportunity = await centralDb.StrategicOpportunityChargeCodes
+                .FirstOrDefaultAsync(o => o.OpportunityId == TestOpportunityId || o.OpportunityId == TestOpportunityId_Exploration);
+            if (opportunity != null)
+                centralDb.StrategicOpportunityChargeCodes.Remove(opportunity);
+
+            var explorationPopulation = await centralDb.ExplorationPopulations
+                .FirstOrDefaultAsync(p => p.ExplorationPopulationId == TestExplorationPopulationId);
+            if (explorationPopulation != null)
+                centralDb.ExplorationPopulations.Remove(explorationPopulation);
+
+            await centralDb.SaveChangesAsync();
+        }
+
+        // Tests for standard Tracking opportunity (patient population)
+        [Test, Ignore("Test database needs DS Encounter Cost datasource")]
+        public async Task PopulateTrackingDetails_WithMeasures_PopulatesMeasureDetailRows()
+        {
+            // Arrange
+            var opportunity = CreateTrackingOpportunity(patientPopulationHPath: "CLINICALINDICATOR|CLINICALINDI|188");
+            opportunity.Measures =
+            [
+                new StrategicOpportunityMeasure
+                {
+                    MeasureId     = TestMeasureId,
+                    OpportunityId = TestOpportunityId,
+                    MeasureType   = MeasureType.DirectVariableCost,
+                    MeasureGroup  = MeasureGroup.Primary,
+                    FiltersJSON   = MeasureFiltersJSON,
+                    StrataId      = 1
+                }
+            ];
+            await SeedOpportunityInCentralDb(opportunity);
+
+            SetupBuildSqlQueryForTracking();
+
+            // Act
+            await _strategicOpportunityDetailService.PopulateTrackingDetails(opportunity, CancellationToken.None);
+
+            // Assert - measure detail rows written
+            var measureRows = await SnowflakeDatabaseContext.QueryAsync<StrategicOpportunityMeasureDetail>(
+                $"SELECT * FROM cci.StrategicOpportunityMeasureDetail WHERE MeasureId = {opportunity.Measures.First().MeasureId}",
+                nameof(PopulateTrackingDetails_WithMeasures_PopulatesMeasureDetailRows));
+            // Assert - verify rows were written to Snowflake
+            var rows = await SnowflakeDatabaseContext.QueryAsync<StrategicOpportunityDetail>(
+                $"SELECT * FROM cci.FactStrategicChargeCodeDetail WHERE OpportunityId = {TestOpportunityId} AND IsBaseline = FALSE",
+                nameof(PopulateTrackingDetails_WithMeasures_PopulatesMeasureDetailRows));
+
+            measureRows.Should().NotBeNullOrEmpty();
+            rows.Should().NotBeNullOrEmpty();
+
+            // Assert - AverageValue is written back to CentralDb
+            var savedMeasure = await ((CentralDbContext)CentralDbContext)
+                .StrategicOpportunityMeasures
+                .FirstOrDefaultAsync(m => m.MeasureId == opportunity.Measures.First().MeasureId);
+
+            savedMeasure.Should().NotBeNull();
+        }
+
+        [Test, Ignore("Test database needs DS Encounter Cost datasource")]
+        public async Task PopulateTrackingDetails_WhenStatusIsNotTracking_SkipsDetailPopulationAndSucceeds()
+        {
+            // Arrange
+            var opportunity = CreateTrackingOpportunity(patientPopulationHPath: "CLINICALINDICATOR|CLINICALINDI|188");
+            opportunity.Status = (byte)StrategicOpportunityStatus.CompleteMonitoring;
+            opportunity.Measures =
+            [
+                new StrategicOpportunityMeasure
+                {
+                    MeasureId     = TestMeasureId,
+                    OpportunityId = TestOpportunityId,
+                    MeasureType   = MeasureType.DirectVariableCost,
+                    MeasureGroup  = MeasureGroup.Primary,
+                    FiltersJSON   = MeasureFiltersJSON,
+                    StrataId      = 1
+                }
+            ];
+            await SeedOpportunityInCentralDb(opportunity);
+
+            SetupBuildSqlQueryForMonitoring();
+
+            // Act
+            await _strategicOpportunityDetailService.PopulateTrackingDetails(opportunity, CancellationToken.None);
+
+            // Assert - no detail rows written for non-Tracking status
+            var rows = await SnowflakeDatabaseContext.QueryAsync<StrategicOpportunityDetail>(
+                $"SELECT * FROM cci.FactStrategicChargeCodeDetail WHERE OpportunityId = {TestOpportunityId} AND IsBaseline = FALSE",
+                nameof(PopulateTrackingDetails_WhenStatusIsNotTracking_SkipsDetailPopulationAndSucceeds));
+
+            rows.Should().BeEmpty("detail rows should not be populated when status is not Tracking");
+
+            // Assert - tracking is still updated
+            var savedOpportunity = await ((CentralDbContext)CentralDbContext)
+                .StrategicOpportunityChargeCodes
+                .FirstOrDefaultAsync(o => o.OpportunityId == TestOpportunityId);
+
+            savedOpportunity.LastRunTrackingStatus.Should().Be(RunTrackingStatus.Success);
+        }
+
+        [Test, Ignore("Test database needs DS Encounter Cost datasource")]
+        public async Task PopulateTrackingDetails_WithMeasures_PopulatesMeasureDetailRows_Exploration()
+        {
+            // Arrange
+            await SeedExplorationPopulationInCentralDb();
+            var opportunity = CreateExplorationOpportunity();
+            opportunity.Measures =
+            [
+                new StrategicOpportunityMeasure
+                {
+                    MeasureId     = TestMeasureId_Exploration,
+                    OpportunityId = opportunity.OpportunityId,
+                    MeasureType   = MeasureType.DirectVariableCost,
+                    MeasureGroup  = MeasureGroup.Primary,
+                    FiltersJSON   = MeasureFiltersJSON,
+                    StrataId      = 1
+                }
+            ];
+            await SeedOpportunityInCentralDb(opportunity);
+            _mockExplorationService
+            .Setup(x => x.GetFilterStringsAsync(
+                It.IsAny<IEnumerable<FilterChipItem>>(),
+                It.IsAny<IQueryParamBase>(),
+                It.IsAny<CancellationToken>()))
+            .Callback<IEnumerable<FilterChipItem>, IQueryParamBase, CancellationToken>(
+                (_, queryParams, _) =>
+                {
+                    queryParams.DischargeDateStart = "2024-01-01";
+                    queryParams.DischargeDateEnd = "2024-12-31";
+                })
+            .ReturnsAsync((
+                string.Empty,
+                string.Empty));
+            SetupBuildSqlQueryForTrackingExploration();
+
+            // Act
+            await _strategicOpportunityDetailService.PopulateTrackingDetails(opportunity, CancellationToken.None);
+
+            // Assert - measure detail rows written
+            var measureRows = await SnowflakeDatabaseContext.QueryAsync<StrategicOpportunityMeasureDetail>(
+                $"SELECT * FROM cci.StrategicOpportunityMeasureDetail WHERE MeasureId = {opportunity.Measures.First().MeasureId}",
+                nameof(PopulateTrackingDetails_WithMeasures_PopulatesMeasureDetailRows));
+            // Assert - verify rows were written to Snowflake
+            var rows = await SnowflakeDatabaseContext.QueryAsync<StrategicOpportunityDetail>(
+                $"SELECT * FROM cci.FactStrategicChargeCodeDetail WHERE OpportunityId = {opportunity.OpportunityId} AND IsBaseline = FALSE",
+                nameof(PopulateTrackingDetails_WithMeasures_PopulatesMeasureDetailRows));
+
+            measureRows.Should().NotBeNullOrEmpty();
+            rows.Should().NotBeNullOrEmpty();
+
+            // Assert - AverageValue is written back to CentralDb
+            var savedMeasure = await ((CentralDbContext)CentralDbContext)
+                .StrategicOpportunityMeasures
+                .FirstOrDefaultAsync(m => m.MeasureId == opportunity.Measures.First().MeasureId);
+
+            savedMeasure.Should().NotBeNull();
+        }
+
+        private StrategicOpportunityChargeCode CreateTrackingOpportunity(
+            string patientPopulationHPath,
+            DateOnly? trackingStart = null,
+            DateOnly? trackingEnd = null) =>
+            new()
+            {
+                OpportunityId = TestOpportunityId,
+                PatientPopulationHPath = patientPopulationHPath,
+                ExplorationPopulationId = 0,
+                ChargeCodeHPath = "CC|CCRU|Blood",
+                OpportunityFiltersJSON = "[]",
+                Status = (byte)StrategicOpportunityStatus.Tracking,
+                TrackingStartDate = trackingStart ?? new DateOnly(2024, 1, 1),
+                TrackingEndDate = trackingEnd ?? new DateOnly(2024, 12, 31),
+                BaselineStartDate = new DateOnly(2023, 1, 1),
+                BaselineEndDate = new DateOnly(2023, 12, 31),
+                LastRunTrackingDate = new DateTime(2024, 1, 1, 0, 0, 0, DateTimeKind.Utc),
+                EstimatedTrackingDuration = 12,
+                StrataId = 1,
+                Measures = []
+            };
+
+        private StrategicOpportunityChargeCode CreateExplorationOpportunity(
+            DateOnly? trackingStart = null,
+            DateOnly? trackingEnd = null) =>
+            new()
+            {
+                OpportunityId = TestOpportunityId_Exploration,
+                PatientPopulationHPath = null,
+                ExplorationPopulationId = TestExplorationPopulationId,
+                ChargeCodeHPath = "CC|CCRU|Blood",
+                OpportunityFiltersJSON = "[]",
+                Status = (byte)StrategicOpportunityStatus.Tracking,
+                TrackingStartDate = trackingStart ?? new DateOnly(2024, 1, 1),
+                TrackingEndDate = trackingEnd ?? new DateOnly(2024, 12, 31),
+                BaselineStartDate = new DateOnly(2023, 1, 1),
+                BaselineEndDate = new DateOnly(2023, 12, 31),
+                LastRunTrackingDate = new DateTime(2024, 1, 1, 0, 0, 0, DateTimeKind.Utc),
+                EstimatedTrackingDuration = 12,
+                StrataId = 1,
+                Measures = []
+            };
+
+        private async Task SeedOpportunityInCentralDb(StrategicOpportunityChargeCode opportunity)
+        {
+            var centralDb = (CentralDbContext)CentralDbContext;
+
+            // Detach any already-tracked instance with the same key to avoid tracking conflicts
+            var tracked = centralDb.ChangeTracker.Entries<StrategicOpportunityChargeCode>()
+                .FirstOrDefault(e => e.Entity.OpportunityId == opportunity.OpportunityId);
+            if (tracked != null)
+                tracked.State = Microsoft.EntityFrameworkCore.EntityState.Detached;
+
+            var existing = await centralDb.StrategicOpportunityChargeCodes
+                .AsNoTracking()
+                .FirstOrDefaultAsync(o => o.OpportunityId == opportunity.OpportunityId);
+
+            if (existing != null)
+            {
+                centralDb.StrategicOpportunityChargeCodes.Remove(existing);
+                await centralDb.SaveChangesAsync();
+            }
+
+            centralDb.StrategicOpportunityChargeCodes.Add(opportunity);
+            await centralDb.SaveChangesAsync();
+        }
+
+        private async Task SeedExplorationPopulationInCentralDb()
+        {
+            var centralDb = (CentralDbContext)CentralDbContext;
+
+            var existing = await centralDb.ExplorationPopulations
+                .AsNoTracking()
+                .FirstOrDefaultAsync(p => p.ExplorationPopulationId == TestExplorationPopulationId);
+
+            if (existing != null) return;
+
+            centralDb.ExplorationPopulations.Add(new Population.ExplorationPopulation
+            {
+                ExplorationPopulationId = TestExplorationPopulationId,
+                Name = "Test Exploration Population",
+                CaseTypeFamilyId = 8016,
+                FiltersJSON = $@"[{{
+                    ""key"": 25,
+                    ""chipType"": {(byte)ChipType.DateRange},
+                    ""operator"": 0,
+                    ""dateRange"": [""{new DateTime(2024, 1, 1):yyyy-MM-dd}"", ""{new DateTime(2024, 12, 31):yyyy-MM-dd}""],
+                    ""filters"": [],
+                    ""isSelected"": null
+                }}]",
+                StrataId = 1
+            });
+            await centralDb.SaveChangesAsync();
+        }
+
+        private void SetupBuildSqlQueryForTracking()
+        {
+            _mockDataSchemaService.SetupSequence(x =>
+                x.BuildSqlQuery(It.IsAny<QueryConfig>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new SqlResponse
+                {
+                    SqlQuery = StrategicOpportunityQueryConstants.TrackingSelectSql,
+                    Parameters =
+                    [
+                        new(":dischargedatetime_Start_0", new DateTime(2024, 1, 1)),
+                        new(":dischargedatetime_End_1", new DateTime(2024, 12, 31)),
+                        new(":clinicalindicatorid_2", 188),
+                        new(":dischargedatetime_Start_3", new DateTime(2024, 1, 1)),
+                        new(":dischargedatetime_End_4", new DateTime(2024, 12, 31)),
+                        new(":clinicalindicatorid_5", 188),
+                    ]
+                })
+                .ReturnsAsync(new SqlResponse
+                {
+                    SqlQuery = StrategicOpportunityQueryConstants.MeasureSelectSql,
+                    Parameters =
+                    [
+                        new(":dischargedatetime_Start_0", new DateTime(2024, 1, 1)),
+                        new(":dischargedatetime_End_1", new DateTime(2024, 12, 31)),
+                    ]
+                });
+        }
+
+        private void SetupBuildSqlQueryForTrackingExploration()
+        {
+            _mockDataSchemaService.SetupSequence(x =>
+                x.BuildSqlQuery(It.IsAny<QueryConfig>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new SqlResponse
+                {
+                    SqlQuery = StrategicOpportunityQueryConstants.ExplorationTrackingSelectSql,
+                    Parameters =
+                    [
+                        new(":dischargedatetime_Start_0", new DateTime(2024, 1, 1)),
+                        new(":dischargedatetime_End_1", new DateTime(2024, 12, 31)),
+                        new(":explorationpopulationid_2", TestExplorationPopulationId),
+                        new(":dischargedatetime_Start_3", new DateTime(2024, 1, 1)),
+                        new(":dischargedatetime_End_4", new DateTime(2024, 12, 31)),
+                        new(":explorationpopulationid_5", TestExplorationPopulationId),
+                    ]
+                })
+                .ReturnsAsync(new SqlResponse
+                {
+                    SqlQuery = StrategicOpportunityQueryConstants.ExplorationMeasureSelectSql,
+                    Parameters =
+                    [
+                        new(":dischargedatetime_Start_0", new DateTime(2024, 1, 1)),
+                        new(":dischargedatetime_End_1", new DateTime(2024, 12, 31)),
+                        new(":explorationpopulationid_2", TestExplorationPopulationId),
+                    ]
+                });
+        }
+
+        private void SetupBuildSqlQueryForMonitoring()
+        {
+            _mockDataSchemaService.Setup(x =>
+                x.BuildSqlQuery(It.IsAny<QueryConfig>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new SqlResponse
+                {
+                    SqlQuery = StrategicOpportunityQueryConstants.MeasureSelectSql,
+                    Parameters =
+                    [
+                        new(":dischargedatetime_Start_0", new DateTime(2024, 1, 1)),
+                        new(":dischargedatetime_End_1", new DateTime(2024, 12, 31)),
+                    ]
+                });
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/StrategicOpportunityGLQueryBuilderIntegrationTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/StrategicOpportunityGLQueryBuilderIntegrationTests.cs
new file mode 100644
index 0000000..b6865ea
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/StrategicOpportunityGLQueryBuilderIntegrationTests.cs
@@ -0,0 +1,94 @@
+using FluentAssertions;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.SnowflakeIntegrationTests
+{
+    /// <summary>
+    /// Validates that the SQL generated by StrategicOpportunityGLDetailQueryBuilder
+    /// is syntactically correct and references valid objects in Snowflake.
+    /// Uses EXPLAIN to parse and plan each statement without executing DML.
+    /// </summary>
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    public class StrategicOpportunityGLQueryBuilderIntegrationTests : IntegrationTestBase
+    {
+        private StrategicOpportunityGLDetailQueryBuilder _queryBuilder;
+
+        private static readonly List<int> DepartmentIds = [1];
+        private static readonly List<int> RevenueAccountIds = [1];
+        private static readonly List<int> ExpenseAccountIds = [2];
+        private static readonly List<int> StatisticAccountIds = [3];
+        private static readonly DateOnly BaselineStart = new(2024, 1, 1);
+        private static readonly DateOnly BaselineEnd = new(2024, 12, 31);
+
+        [OneTimeSetUp]
+        public void Setup()
+        {
+            _queryBuilder = new StrategicOpportunityGLDetailQueryBuilder();
+        }
+
+        [Test]
+        public async Task BuildInsertQuery_FwTable_IsValidSnowflakeSql()
+        {
+            var query = _queryBuilder.BuildInsertQuery(
+                opportunityId: 0,
+                sourceTable: "fw.factglsampled",
+                departmentIds: DepartmentIds,
+                revenueAccountIds: RevenueAccountIds,
+                expenseAccountIds: ExpenseAccountIds,
+                statisticAccountIds: StatisticAccountIds,
+                baselineStart: BaselineStart,
+                baselineEnd: BaselineEnd);
+
+            var act = async () => await SnowflakeDatabaseContext.QueryAsync<dynamic>($"EXPLAIN {query}", nameof(BuildInsertQuery_FwTable_IsValidSnowflakeSql));
+            await act.Should().NotThrowAsync("the generated INSERT SQL should be valid Snowflake syntax");
+        }
+
+        [Test]
+        public async Task BuildInsertQuery_IntTable_IsValidSnowflakeSql()
+        {
+            var query = _queryBuilder.BuildInsertQuery(
+                opportunityId: 0,
+                sourceTable: "int.factgl",
+                departmentIds: DepartmentIds,
+                revenueAccountIds: RevenueAccountIds,
+                expenseAccountIds: ExpenseAccountIds,
+                statisticAccountIds: StatisticAccountIds,
+                baselineStart: BaselineStart,
+                baselineEnd: BaselineEnd);
+
+            var act = async () => await SnowflakeDatabaseContext.QueryAsync<dynamic>($"EXPLAIN {query}", nameof(BuildInsertQuery_IntTable_IsValidSnowflakeSql));
+            await act.Should().NotThrowAsync("the generated INSERT SQL should be valid Snowflake syntax");
+        }
+
+        [Test]
+        public async Task BuildMergeQuery_FwTable_IsValidSnowflakeSql()
+        {
+            var query = _queryBuilder.BuildMergeQuery(
+                opportunityId: 0,
+                sourceTable: "fw.factglsampled",
+                departmentIds: DepartmentIds,
+                revenueAccountIds: RevenueAccountIds,
+                expenseAccountIds: ExpenseAccountIds,
+                statisticAccountIds: StatisticAccountIds,
+                trackingStart: new DateOnly(2025, 1, 1),
+                trackingEnd: new DateOnly(2025, 12, 31));
+
+            var act = async () => await SnowflakeDatabaseContext.QueryAsync<dynamic>($"EXPLAIN {query}", nameof(BuildMergeQuery_FwTable_IsValidSnowflakeSql));
+            await act.Should().NotThrowAsync("the generated MERGE SQL should be valid Snowflake syntax");
+        }
+
+        [Test]
+        public async Task BuildDeleteQuery_WithOpportunityId_IsValidSnowflakeSql()
+        {
+            var query = _queryBuilder.BuildDeleteQuery(opportunityId: 0);
+
+            var act = async () => await SnowflakeDatabaseContext.QueryAsync<dynamic>($"EXPLAIN {query}", nameof(BuildDeleteQuery_WithOpportunityId_IsValidSnowflakeSql));
+            await act.Should().NotThrowAsync("the generated DELETE SQL should be valid Snowflake syntax");
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/StrategicOpportunityQueryConstants.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/StrategicOpportunityQueryConstants.cs
new file mode 100644
index 0000000..b825477
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/StrategicOpportunityQueryConstants.cs
@@ -0,0 +1,411 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.SnowflakeIntegrationTests
+{
+    public static class StrategicOpportunityQueryConstants
+    {
+        public static readonly string TrackingSelectSql = @"SELECT
+""dsspesEncounterId"",
+""dsspesDischargeDateTime"",
+""dsspesEntityID"",
+""dsspesPhysicianId"",
+""dsspesPrimaryServiceLineId"",
+""dsspesCPTCodeCaseTypeFamilyId"",
+""dsspesMSDRGCaseTypeFamilyId"",
+""dsspesAPRDRGCaseTypeFamilyId"",
+""pblidDepartmentId"",
+""physPrimaryPhysicianSpecialtyId"",
+""ccChargeCodeID"",
+""ccCostDriver"",
+""encounterPatientTypeRollupPatientTypeRollup"",
+ZEROIFNULL(""Units"") AS ""Units"",
+ZEROIFNULL(""Cost"") AS ""Cost""
+
+FROM (
+SELECT
+""dsspesEncounterId"",
+""dsspesDischargeDateTime"",
+""dsspesEntityID"",
+""dsspesPhysicianId"",
+""dsspesPrimaryServiceLineId"",
+""dsspesCPTCodeCaseTypeFamilyId"",
+""dsspesMSDRGCaseTypeFamilyId"",
+""dsspesAPRDRGCaseTypeFamilyId"",
+""pblidDepartmentId"",
+""physPrimaryPhysicianSpecialtyId"",
+""ccChargeCodeID"",
+""ccCostDriver"",
+""encounterPatientTypeRollupPatientTypeRollup"",
+SUM(""Units"") AS ""Units"",
+SUM(""Cost"") AS ""Cost""
+
+FROM (
+SELECT
+DSSPES.encounterid AS ""dsspesEncounterId"",
+DSSPES.dischargedatetime AS ""dsspesDischargeDateTime"",
+DSSPES.entityid AS ""dsspesEntityID"",
+DSSPES.primaryphysicianid AS ""dsspesPhysicianId"",
+DSSPES.servicelineid AS ""dsspesPrimaryServiceLineId"",
+DSSPES.cptcodecasetypefamilyid AS ""dsspesCPTCodeCaseTypeFamilyId"",
+DSSPES.msdrgcasetypefamilyid AS ""dsspesMSDRGCaseTypeFamilyId"",
+DSSPES.aprdrgcasetypefamilyid AS ""dsspesAPRDRGCaseTypeFamilyId"",
+PBLID.departmentid AS ""pblidDepartmentId"",
+PHYSPRIMARY.physicianspecialtyid AS ""physPrimaryPhysicianSpecialtyId"",
+CC.chargecodeid AS ""ccChargeCodeID"",
+IFNULL(CC.costdriver::TEXT, '') AS ""ccCostDriver"",
+IFNULL(ENCOUNTERPATIENTTYPEROLLUP.patienttyperollup::TEXT, '') AS ""encounterPatientTypeRollupPatientTypeRollup"",
+NULL AS ""Cost"",
+SUM(PBLID.unitsofservice) AS ""Units""
+
+FROM dss.FactPatientBillingLineItemDetail AS PBLID
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+LEFT JOIN dss.FactPatientEncounterClinicalIndicator AS DSSPECI ON DSSPECI.encounterid = PBLID.encounterid
+LEFT JOIN CCI.VIEWENCOUNTERPATIENTTYPEROLLUP AS ENCOUNTERPATIENTTYPEROLLUP ON ENCOUNTERPATIENTTYPEROLLUP.encounterid = PBLID.encounterid
+INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid
+INNER JOIN DSS.DIMPHYSICIAN AS PHYSPRIMARY ON PHYSPRIMARY.physicianid = DSSPES.primaryphysicianid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_0 AND DSSPES.dischargedatetime <= :dischargedatetime_End_1) AND DSSPECI.clinicalindicatorid = :clinicalindicatorid_2)
+
+GROUP BY
+	""dsspesEncounterId"",
+	""dsspesDischargeDateTime"",
+	""dsspesEntityID"",
+	""dsspesPhysicianId"",
+	""dsspesPrimaryServiceLineId"",
+	""dsspesCPTCodeCaseTypeFamilyId"",
+	""dsspesMSDRGCaseTypeFamilyId"",
+	""dsspesAPRDRGCaseTypeFamilyId"",
+	""pblidDepartmentId"",
+	""physPrimaryPhysicianSpecialtyId"",
+	""ccChargeCodeID"",
+	""ccCostDriver"",
+	""encounterPatientTypeRollupPatientTypeRollup""
+
+UNION ALL
+
+SELECT
+DSSPES.encounterid AS ""dsspesEncounterId"",
+DSSPES.dischargedatetime AS ""dsspesDischargeDateTime"",
+DSSPES.entityid AS ""dsspesEntityID"",
+DSSPES.primaryphysicianid AS ""dsspesPhysicianId"",
+DSSPES.servicelineid AS ""dsspesPrimaryServiceLineId"",
+DSSPES.cptcodecasetypefamilyid AS ""dsspesCPTCodeCaseTypeFamilyId"",
+DSSPES.msdrgcasetypefamilyid AS ""dsspesMSDRGCaseTypeFamilyId"",
+DSSPES.aprdrgcasetypefamilyid AS ""dsspesAPRDRGCaseTypeFamilyId"",
+PBLID.departmentid AS ""pblidDepartmentId"",
+PHYSPRIMARY.physicianspecialtyid AS ""physPrimaryPhysicianSpecialtyId"",
+CC.chargecodeid AS ""ccChargeCodeID"",
+IFNULL(CC.costdriver::TEXT, '') AS ""ccCostDriver"",
+IFNULL(ENCOUNTERPATIENTTYPEROLLUP.patienttyperollup::TEXT, '') AS ""encounterPatientTypeRollupPatientTypeRollup"",
+SUM(COSTDETAIL.variabledirectcost) AS ""Cost"",
+NULL AS ""Units""
+
+FROM dss.FactPatientCostDetail AS COSTDETAIL
+RIGHT JOIN dss.FactPatientBillingLineItemDetail AS PBLID ON PBLID.rowid = COSTDETAIL.pblidrowid
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+LEFT JOIN dss.FactPatientEncounterClinicalIndicator AS DSSPECI ON DSSPECI.encounterid = PBLID.encounterid
+LEFT JOIN CCI.VIEWENCOUNTERPATIENTTYPEROLLUP AS ENCOUNTERPATIENTTYPEROLLUP ON ENCOUNTERPATIENTTYPEROLLUP.encounterid = PBLID.encounterid
+INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid
+INNER JOIN DSS.DIMPHYSICIAN AS PHYSPRIMARY ON PHYSPRIMARY.physicianid = DSSPES.primaryphysicianid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_3 AND DSSPES.dischargedatetime <= :dischargedatetime_End_4) AND DSSPECI.clinicalindicatorid = :clinicalindicatorid_5)
+
+GROUP BY
+	""dsspesEncounterId"",
+	""dsspesDischargeDateTime"",
+	""dsspesEntityID"",
+	""dsspesPhysicianId"",
+	""dsspesPrimaryServiceLineId"",
+	""dsspesCPTCodeCaseTypeFamilyId"",
+	""dsspesMSDRGCaseTypeFamilyId"",
+	""dsspesAPRDRGCaseTypeFamilyId"",
+	""pblidDepartmentId"",
+	""physPrimaryPhysicianSpecialtyId"",
+	""ccChargeCodeID"",
+	""ccCostDriver"",
+	""encounterPatientTypeRollupPatientTypeRollup""
+
+
+)
+
+GROUP BY
+	""dsspesEncounterId"",
+	""dsspesDischargeDateTime"",
+	""dsspesEntityID"",
+	""dsspesPhysicianId"",
+	""dsspesPrimaryServiceLineId"",
+	""dsspesCPTCodeCaseTypeFamilyId"",
+	""dsspesMSDRGCaseTypeFamilyId"",
+	""dsspesAPRDRGCaseTypeFamilyId"",
+	""pblidDepartmentId"",
+	""physPrimaryPhysicianSpecialtyId"",
+	""ccChargeCodeID"",
+	""ccCostDriver"",
+	""encounterPatientTypeRollupPatientTypeRollup""
+
+
+)
+
+ORDER BY
+	""dsspesEncounterId"" ASC NULLS FIRST,
+	""dsspesDischargeDateTime"" ASC NULLS FIRST,
+	""dsspesEntityID"" ASC NULLS FIRST,
+	""dsspesPhysicianId"" ASC NULLS FIRST,
+	""dsspesPrimaryServiceLineId"" ASC NULLS FIRST,
+	""dsspesCPTCodeCaseTypeFamilyId"" ASC NULLS FIRST,
+	""dsspesMSDRGCaseTypeFamilyId"" ASC NULLS FIRST,
+	""dsspesAPRDRGCaseTypeFamilyId"" ASC NULLS FIRST,
+	""pblidDepartmentId"" ASC NULLS FIRST,
+	""physPrimaryPhysicianSpecialtyId"" ASC NULLS FIRST,
+	""ccChargeCodeID"" ASC NULLS FIRST,
+	""ccCostDriver"" ASC NULLS FIRST,
+	""encounterPatientTypeRollupPatientTypeRollup"" ASC NULLS FIRST
+";
+
+        // SQL returned by BuildSqlQuery for the measure detail query (PopulateMeasureDetails, line 215).
+        // Uses real column names from clientdss.FactPatientEncounterSummary and dss.FactPatientBillingLineItemDetail
+        // that exist in the test client's Snowflake database.
+        public static readonly string MeasureSelectSql = @"SELECT
+""DischargeDateTime"",
+ZEROIFNULL(""Value"") AS ""Value""
+
+FROM (
+SELECT
+""DischargeDateTime"",
+SUM(""Value"") AS ""Value""
+
+FROM (
+SELECT
+DSSPES.dischargedatetime AS ""DischargeDateTime"",
+SUM(PBLID.unitsofservice) AS ""Value""
+
+FROM dss.FactPatientBillingLineItemDetail AS PBLID
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+
+WHERE
+(DSSPES.dischargedatetime >= :dischargedatetime_Start_0 AND DSSPES.dischargedatetime <= :dischargedatetime_End_1)
+
+GROUP BY
+	""DischargeDateTime""
+
+
+)
+
+GROUP BY
+	""DischargeDateTime""
+
+
+)
+
+ORDER BY
+	""DischargeDateTime"" ASC NULLS FIRST
+";
+
+        // SQL for the tracking merge when opportunity uses an ExplorationPopulation instead of PatientPopulationHPath.
+        // Contains LEFT JOIN CCI.FACTEXPLORATIONPOPULATIONENCOUNTER which ApplyExplorationFilters replaces
+        // with an INNER JOIN subquery at runtime.
+        public static readonly string ExplorationTrackingSelectSql = @"SELECT
+""dsspesEncounterId"",
+""dsspesDischargeDateTime"",
+""dsspesEntityID"",
+""dsspesPhysicianId"",
+""dsspesPrimaryServiceLineId"",
+""dsspesCPTCodeCaseTypeFamilyId"",
+""dsspesMSDRGCaseTypeFamilyId"",
+""dsspesAPRDRGCaseTypeFamilyId"",
+""pblidDepartmentId"",
+""physPrimaryPhysicianSpecialtyId"",
+""ccChargeCodeID"",
+""ccCostDriver"",
+""encounterPatientTypeRollupPatientTypeRollup"",
+ZEROIFNULL(""Units"") AS ""Units"",
+ZEROIFNULL(""Cost"") AS ""Cost""
+
+FROM (
+SELECT
+""dsspesEncounterId"",
+""dsspesDischargeDateTime"",
+""dsspesEntityID"",
+""dsspesPhysicianId"",
+""dsspesPrimaryServiceLineId"",
+""dsspesCPTCodeCaseTypeFamilyId"",
+""dsspesMSDRGCaseTypeFamilyId"",
+""dsspesAPRDRGCaseTypeFamilyId"",
+""pblidDepartmentId"",
+""physPrimaryPhysicianSpecialtyId"",
+""ccChargeCodeID"",
+""ccCostDriver"",
+""encounterPatientTypeRollupPatientTypeRollup"",
+SUM(""Units"") AS ""Units"",
+SUM(""Cost"") AS ""Cost""
+
+FROM (
+SELECT
+DSSPES.encounterid AS ""dsspesEncounterId"",
+DSSPES.dischargedatetime AS ""dsspesDischargeDateTime"",
+DSSPES.entityid AS ""dsspesEntityID"",
+DSSPES.primaryphysicianid AS ""dsspesPhysicianId"",
+DSSPES.servicelineid AS ""dsspesPrimaryServiceLineId"",
+DSSPES.cptcodecasetypefamilyid AS ""dsspesCPTCodeCaseTypeFamilyId"",
+DSSPES.msdrgcasetypefamilyid AS ""dsspesMSDRGCaseTypeFamilyId"",
+DSSPES.aprdrgcasetypefamilyid AS ""dsspesAPRDRGCaseTypeFamilyId"",
+PBLID.departmentid AS ""pblidDepartmentId"",
+PHYSPRIMARY.physicianspecialtyid AS ""physPrimaryPhysicianSpecialtyId"",
+CC.chargecodeid AS ""ccChargeCodeID"",
+IFNULL(CC.costdriver::TEXT, '') AS ""ccCostDriver"",
+IFNULL(ENCOUNTERPATIENTTYPEROLLUP.patienttyperollup::TEXT, '') AS ""encounterPatientTypeRollupPatientTypeRollup"",
+NULL AS ""Cost"",
+SUM(PBLID.unitsofservice) AS ""Units""
+
+FROM dss.FactPatientBillingLineItemDetail AS PBLID
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+LEFT JOIN CCI.FACTEXPLORATIONPOPULATIONENCOUNTER AS EXPLORATIONPOPULATIONENCOUNTER ON EXPLORATIONPOPULATIONENCOUNTER.encounterid = PBLID.encounterid
+LEFT JOIN CCI.VIEWENCOUNTERPATIENTTYPEROLLUP AS ENCOUNTERPATIENTTYPEROLLUP ON ENCOUNTERPATIENTTYPEROLLUP.encounterid = PBLID.encounterid
+INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid
+INNER JOIN DSS.DIMPHYSICIAN AS PHYSPRIMARY ON PHYSPRIMARY.physicianid = DSSPES.primaryphysicianid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_0 AND DSSPES.dischargedatetime <= :dischargedatetime_End_1) AND EXPLORATIONPOPULATIONENCOUNTER.explorationpopulationid = :explorationpopulationid_2)
+
+GROUP BY
+	""dsspesEncounterId"",
+	""dsspesDischargeDateTime"",
+	""dsspesEntityID"",
+	""dsspesPhysicianId"",
+	""dsspesPrimaryServiceLineId"",
+	""dsspesCPTCodeCaseTypeFamilyId"",
+	""dsspesMSDRGCaseTypeFamilyId"",
+	""dsspesAPRDRGCaseTypeFamilyId"",
+	""pblidDepartmentId"",
+	""physPrimaryPhysicianSpecialtyId"",
+	""ccChargeCodeID"",
+	""ccCostDriver"",
+	""encounterPatientTypeRollupPatientTypeRollup""
+
+UNION ALL
+
+SELECT
+DSSPES.encounterid AS ""dsspesEncounterId"",
+DSSPES.dischargedatetime AS ""dsspesDischargeDateTime"",
+DSSPES.entityid AS ""dsspesEntityID"",
+DSSPES.primaryphysicianid AS ""dsspesPhysicianId"",
+DSSPES.servicelineid AS ""dsspesPrimaryServiceLineId"",
+DSSPES.cptcodecasetypefamilyid AS ""dsspesCPTCodeCaseTypeFamilyId"",
+DSSPES.msdrgcasetypefamilyid AS ""dsspesMSDRGCaseTypeFamilyId"",
+DSSPES.aprdrgcasetypefamilyid AS ""dsspesAPRDRGCaseTypeFamilyId"",
+PBLID.departmentid AS ""pblidDepartmentId"",
+PHYSPRIMARY.physicianspecialtyid AS ""physPrimaryPhysicianSpecialtyId"",
+CC.chargecodeid AS ""ccChargeCodeID"",
+IFNULL(CC.costdriver::TEXT, '') AS ""ccCostDriver"",
+IFNULL(ENCOUNTERPATIENTTYPEROLLUP.patienttyperollup::TEXT, '') AS ""encounterPatientTypeRollupPatientTypeRollup"",
+SUM(COSTDETAIL.variabledirectcost) AS ""Cost"",
+NULL AS ""Units""
+
+FROM dss.FactPatientCostDetail AS COSTDETAIL
+RIGHT JOIN dss.FactPatientBillingLineItemDetail AS PBLID ON PBLID.rowid = COSTDETAIL.pblidrowid
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+LEFT JOIN CCI.FACTEXPLORATIONPOPULATIONENCOUNTER AS EXPLORATIONPOPULATIONENCOUNTER ON EXPLORATIONPOPULATIONENCOUNTER.encounterid = PBLID.encounterid
+LEFT JOIN CCI.VIEWENCOUNTERPATIENTTYPEROLLUP AS ENCOUNTERPATIENTTYPEROLLUP ON ENCOUNTERPATIENTTYPEROLLUP.encounterid = PBLID.encounterid
+INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid
+INNER JOIN DSS.DIMPHYSICIAN AS PHYSPRIMARY ON PHYSPRIMARY.physicianid = DSSPES.primaryphysicianid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_3 AND DSSPES.dischargedatetime <= :dischargedatetime_End_4) AND EXPLORATIONPOPULATIONENCOUNTER.explorationpopulationid = :explorationpopulationid_5)
+
+GROUP BY
+	""dsspesEncounterId"",
+	""dsspesDischargeDateTime"",
+	""dsspesEntityID"",
+	""dsspesPhysicianId"",
+	""dsspesPrimaryServiceLineId"",
+	""dsspesCPTCodeCaseTypeFamilyId"",
+	""dsspesMSDRGCaseTypeFamilyId"",
+	""dsspesAPRDRGCaseTypeFamilyId"",
+	""pblidDepartmentId"",
+	""physPrimaryPhysicianSpecialtyId"",
+	""ccChargeCodeID"",
+	""ccCostDriver"",
+	""encounterPatientTypeRollupPatientTypeRollup""
+
+
+)
+
+GROUP BY
+	""dsspesEncounterId"",
+	""dsspesDischargeDateTime"",
+	""dsspesEntityID"",
+	""dsspesPhysicianId"",
+	""dsspesPrimaryServiceLineId"",
+	""dsspesCPTCodeCaseTypeFamilyId"",
+	""dsspesMSDRGCaseTypeFamilyId"",
+	""dsspesAPRDRGCaseTypeFamilyId"",
+	""pblidDepartmentId"",
+	""physPrimaryPhysicianSpecialtyId"",
+	""ccChargeCodeID"",
+	""ccCostDriver"",
+	""encounterPatientTypeRollupPatientTypeRollup""
+
+
+)
+
+ORDER BY
+	""dsspesEncounterId"" ASC NULLS FIRST,
+	""dsspesDischargeDateTime"" ASC NULLS FIRST,
+	""dsspesEntityID"" ASC NULLS FIRST,
+	""dsspesPhysicianId"" ASC NULLS FIRST,
+	""dsspesPrimaryServiceLineId"" ASC NULLS FIRST,
+	""dsspesCPTCodeCaseTypeFamilyId"" ASC NULLS FIRST,
+	""dsspesMSDRGCaseTypeFamilyId"" ASC NULLS FIRST,
+	""dsspesAPRDRGCaseTypeFamilyId"" ASC NULLS FIRST,
+	""pblidDepartmentId"" ASC NULLS FIRST,
+	""physPrimaryPhysicianSpecialtyId"" ASC NULLS FIRST,
+	""ccChargeCodeID"" ASC NULLS FIRST,
+	""ccCostDriver"" ASC NULLS FIRST,
+	""encounterPatientTypeRollupPatientTypeRollup"" ASC NULLS FIRST
+";
+
+        // SQL for exploration-path tests (instead of clinical indicator)
+        public static readonly string ExplorationMeasureSelectSql = @"SELECT
+""DischargeDateTime"",
+ZEROIFNULL(""Value"") AS ""Value""
+
+FROM (
+SELECT
+""DischargeDateTime"",
+SUM(""Value"") AS ""Value""
+
+FROM (
+SELECT
+DSSPES.dischargedatetime AS ""DischargeDateTime"",
+SUM(PBLID.unitsofservice) AS ""Value""
+
+FROM dss.FactPatientBillingLineItemDetail AS PBLID
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+LEFT JOIN CCI.FACTEXPLORATIONPOPULATIONENCOUNTER AS EXPLORATIONPOPULATIONENCOUNTER ON EXPLORATIONPOPULATIONENCOUNTER.encounterid = PBLID.encounterid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_0 AND DSSPES.dischargedatetime <= :dischargedatetime_End_1) AND EXPLORATIONPOPULATIONENCOUNTER.explorationpopulationid = :explorationpopulationid_2)
+
+GROUP BY
+	""DischargeDateTime""
+
+
+)
+
+GROUP BY
+	""DischargeDateTime""
+
+
+)
+
+ORDER BY
+	""DischargeDateTime"" ASC NULLS FIRST
+";
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/StrategicOpportunityServiceTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/StrategicOpportunityServiceTests.cs
new file mode 100644
index 0000000..a10a066
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/StrategicOpportunityServiceTests.cs
@@ -0,0 +1,653 @@
+using FluentAssertions;
+using Hangfire;
+using Microsoft.EntityFrameworkCore;
+using Moq;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.InitiativeRollupColumns;
+using Strata.ContinuousImprovement.Biz.OpportunityRoleAssignment;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Biz.Security;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.CoreLib.Claims.Extensions;
+using Strata.DataSchema.Client;
+using Strata.DataSchema.Models.Query;
+using Strata.DataSchema.Models.Schema;
+using Strata.Id.Client;
+using Strata.Schema.Client;
+using Strata.Schema.Client.Dtos;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.SnowflakeIntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [Ignore("temporarily ignoring because schema is out of sync")]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    public class StrategicOpportunityServiceTests : IntegrationTestBase
+    {
+        private const string POPULATION_NAME = "Mocked Population Name";
+        private IStrategicOpportunityService _strategicOpportunityService;
+        private IOpportunityRoleAssignmentService _opportunityRoleAssignmentService;
+
+        [OneTimeSetUp]
+        public void Setup()
+        {
+            // Arrange mocks
+            var mockSchemaServiceClient = new Mock<ISchemaServiceClient>();
+            var mockDataSchemaService = new Mock<IDataSchemaService>();
+            var mockIdServiceClient = new Mock<IIdServiceClient>();
+            var mockIdRollupColumn = new Mock<IInitiativeRollupColumnService>();
+            var mockOpportunityWorkbookService = new Mock<IOpportunityWorkbookService>();
+            var mockStrategicOpportunityDetailService = new Mock<IStrategicChargeCodeOpportunityDetailService>();
+            var mockStrategicGLOpportunityDetailService = new Mock<IStrategicGLOpportunityDetailService>();
+            var mockSimpleSecurityServiceClient = new Mock<ISimpleSecurityService>();
+            var mockOpportunityRoleAssignmentServiceClient = new Mock<IOpportunityRoleAssignmentService>();
+            var mockBackgroundJobClient = new Mock<IBackgroundJobClient>();
+            var mockDistributionProcessFactory = new Mock<IDistributionProcessFactory>();
+
+            // Add mock responses
+            mockDataSchemaService.Setup(x =>
+                x.GetDataTableBySqlFullNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new DataTable());
+
+            mockDataSchemaService.Setup(x =>
+                x.GetDataColumnsBySqlColumnNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync([]);
+                        
+            mockDataSchemaService.Setup(x =>
+                x.BuildSqlQuery(It.IsAny<QueryConfig>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new SqlResponse
+                {
+                    SqlQuery = DataSchemaServiceSelectSql,
+                    Parameters = new List<KeyValuePair<string, object>>
+                    {
+                        new(":dischargedatetime_Start_0", new DateTime(2024, 1, 1)),
+                        new(":dischargedatetime_End_1", new DateTime(2024, 12, 31)),
+                        new(":chargecodeid_2", 3541)
+                    }
+                });
+
+            mockSchemaServiceClient.Setup(x =>
+                x.GetDimensionByGlobalIdAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new Schema.Client.Dtos.Info.ScoreDimensionInfoDto());
+
+            var list = new List<HierarchyNodeDto>();
+            list.Add(new HierarchyNodeDto
+            {
+                Path = "CLINICALINDICATOR|CLINICALINDI|188",
+                Name = POPULATION_NAME
+            });
+
+            mockSchemaServiceClient.Setup(x =>
+                x.GetHierarchyNodesFromHierarchyPathsAsync(It.IsAny<Guid>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(list);
+
+            mockSchemaServiceClient.Setup(x =>
+                x.GetDimensionMembersFromHierarchyPathsAsync(It.IsAny<Guid>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new List<MemberDto> {
+                new  MemberDto
+                {
+                    Id = "188",
+                    Name = "All Readmissions"
+                }});
+
+            var claimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor();
+            _opportunityRoleAssignmentService = new OpportunityRoleAssignmentService(
+                (DbContexts.CentralDbContext)CentralDbContext,
+                mockIdServiceClient.Object,
+                mockSimpleSecurityServiceClient.Object,
+                claimsPrincipalAccessor
+             );
+
+            _strategicOpportunityService = new StrategicOpportunityService(
+                JazzConnBuilderFactory,
+                (DbContexts.CentralDbContext)CentralDbContext,
+                claimsPrincipalAccessor,
+                mockSchemaServiceClient.Object,
+                SnowflakeDatabaseContext,
+                mockIdServiceClient.Object,
+                _opportunityRoleAssignmentService,
+                mockIdRollupColumn.Object,
+                mockOpportunityWorkbookService.Object,
+                mockBackgroundJobClient.Object,
+                mockStrategicOpportunityDetailService.Object,
+                new StrategicItemDimensionSyncService(JazzConnBuilderFactory, (DbContexts.CentralDbContext)CentralDbContext, SnowflakeDatabaseContext),
+                mockStrategicGLOpportunityDetailService.Object,
+                (Microsoft.Extensions.Logging.ILogger<StrategicOpportunityService>)logger);
+        }
+
+        [Test, Ignore("temporarily ignoring because schema is out of sync")]
+        public async Task CreatingOpportunityShouldAlsoCreateDetails()
+        {
+            //arrange
+            var opportunity = CreateOpportunityDto();
+
+            //act
+            var result = await _strategicOpportunityService.CreateOpportunityChargeCodeAsync(opportunity, CancellationToken.None);
+
+            //assert
+            result.Should().Be(1, "On success should return opportunity id.");
+        }
+
+        private static StrategicOpportunityChargeCodeDto CreateOpportunityDto()
+        {
+            var opportunity = new StrategicOpportunityChargeCodeDto()
+            {
+                Name = "Integration-StrategicOpportunityChargeCode",
+                OpportunityType = StrategicOpportunityTypes.ChargeCode,
+                OpportunityFiltersJSON = "[]",
+                Rollup1Id = 0,
+                Rollup2Id = 0,
+                Rollup3Id = 0,
+                BaselineType = BaselineType.MonthRange,
+                BaselineDistribution = DistributionMethod.Average,
+                BaselineStartDate = new DateOnly(2024, 1, 1),
+                BaselineEndDate = new DateOnly(2024, 12, 31),
+                EstimatedTrackingDuration = 12,
+
+                // Assume empty or test collections for these
+                Measures = Enumerable.Empty<StrategicOpportunityMeasureDto>(),
+                WorkbookIds = Enumerable.Empty<int>(),
+
+                // ChargeCode-specific properties
+                PatientPopulationHPath = "CLINICALINDICATOR|CLINICALINDI|188",
+                ExplorationPopulationId = 0,
+                ChargeCodeHPath = "CC|CCRU|Blood"
+            };
+            return opportunity;
+        }
+
+        [Test]
+        public async Task UpdateStrategicOpportunityRampUpsAsync_ShouldUpdateRampUps()
+        {
+            // Arrange
+            var opportunity = CreateOpportunityDto();
+            var opportunityId = await _strategicOpportunityService.CreateOpportunityChargeCodeAsync(opportunity, CancellationToken.None);
+
+            var rampUps = new List<StrategicOpportunityRampUpDto>
+            {
+                new() { OpportunityId = opportunityId, MonthNumber = 1, Percentage = 0.1 },
+                new() { OpportunityId = opportunityId, MonthNumber = 2, Percentage = 0.2 }
+            };
+
+            // Act
+            var updateResult = await _strategicOpportunityService.UpdateStrategicOpportunityRampUpsAsync(opportunityId, rampUps, CancellationToken.None);
+
+            // Assert
+            updateResult.Should().BeTrue();
+
+            // Verify persisted values
+            var retrieved = await _strategicOpportunityService.GetStrategicOpportunityRampUpsAsync(opportunityId, CancellationToken.None);
+            retrieved.Should().HaveCount(rampUps.Count);
+            retrieved[0].MonthNumber.Should().Be(rampUps[0].MonthNumber);
+            retrieved[0].Percentage.Should().Be(rampUps[0].Percentage);
+            retrieved[1].MonthNumber.Should().Be(rampUps[1].MonthNumber);
+            retrieved[1].Percentage.Should().Be(rampUps[1].Percentage);
+        }
+
+        [Test]
+        public async Task ResetStrategicOpportunityRampUps_ShouldResetRampUps()
+        {
+            // Arrange
+            var opportunity = CreateOpportunityDto();
+            var opportunityId = await _strategicOpportunityService.CreateOpportunityChargeCodeAsync(opportunity, CancellationToken.None);
+
+            var rampUps = new List<StrategicOpportunityRampUpDto>
+            {
+                new() { OpportunityId = opportunityId, MonthNumber = 1, Percentage = 0.1 },
+                new() { OpportunityId = opportunityId, MonthNumber = 2, Percentage = 0.2 }
+            };
+
+            await _strategicOpportunityService.UpdateStrategicOpportunityRampUpsAsync(opportunityId, rampUps, CancellationToken.None);
+
+            // Act
+            var resetResult = await _strategicOpportunityService.ResetStrategicOpportunityRampUps(opportunityId, CancellationToken.None);
+
+            // Assert
+            resetResult.Should().BeTrue();
+            var retrieved = await _strategicOpportunityService.GetStrategicOpportunityRampUpsAsync(opportunityId, CancellationToken.None);
+
+            // Verify persisted values
+            retrieved.Should().HaveCount(rampUps.Count);
+            retrieved[0].Percentage.Should().Be(1);
+            retrieved[1].Percentage.Should().Be(1);
+        }
+
+        [Test]
+        public async Task ResetStrategicOpportunityRampUps_ShouldNotResetRampUps()
+        {
+            // Arrange
+            var opportunity = CreateOpportunityDto();
+            var opportunityId = await _strategicOpportunityService.CreateOpportunityChargeCodeAsync(opportunity, CancellationToken.None);
+
+            // Act
+            var resetResult = await _strategicOpportunityService.ResetStrategicOpportunityRampUps(opportunityId, CancellationToken.None);
+
+            // Assert
+            resetResult.Should().BeFalse();
+        }
+
+        [Test]
+        public async Task UpdateStrategicOpportunityRoleAssignment_ShouldUpdateRoleAssignments()
+        {
+            // Arrange
+            var opportunity = CreateOpportunityDto();
+            var opportunityId = await _strategicOpportunityService.CreateOpportunityChargeCodeAsync(opportunity, CancellationToken.None);
+
+            var roleAssignments = new List<OpportunityRoleAssignmentView>()
+            {
+                new OpportunityRoleAssignmentView() { LootId = opportunityId, IdentityGuid = Guid.NewGuid(), IdentityName = "Test", CanRead = true, CanWrite = true, CanSecure = false }
+            };
+
+            // Act
+            var saveResult = await _opportunityRoleAssignmentService.SaveRoleAssignmentsAsync(opportunityId, roleAssignments, CancellationToken.None);
+
+            // Assert
+            saveResult.Should().BeTrue();
+
+            // Verify persisted values
+            var retrieved = await _opportunityRoleAssignmentService.GetRoleAssignmentsAsync(opportunityId, CancellationToken.None);
+            var userPermission = await _opportunityRoleAssignmentService.GetUserRoleAssignmentsAsync(opportunityId, CancellationToken.None);
+
+            retrieved.Should().HaveCount(roleAssignments.Count);
+            var item = retrieved.FirstOrDefault();
+            item.LootId.Should().Be(opportunityId);
+            item.IdentityGuid.Should().Be(roleAssignments[0].IdentityGuid);
+            item.IdentityName.Should().Be(roleAssignments[0].IdentityName);
+            item.CanRead.Should().Be(roleAssignments[0].CanRead);
+            item.CanWrite.Should().Be(roleAssignments[0].CanWrite);
+            item.CanSecure.Should().Be(roleAssignments[0].CanSecure);
+
+        }
+
+        [Test]
+        public async Task GetStrategicOpportunityRampUpsAsync_ShouldReturnEmptyListIfNoneExist()
+        {
+            // Arrange
+            var nonExistentOpportunityId = long.MaxValue;
+
+            // Act
+            var rampUps = await _strategicOpportunityService.GetStrategicOpportunityRampUpsAsync(nonExistentOpportunityId, CancellationToken.None);
+
+            // Assert
+            rampUps.Should().NotBeNull();
+            rampUps.Should().BeEmpty();
+        }
+
+        [Test]
+        public async Task GetStrategicOpportunitiesAsync_ShouldReturnOpportunitiesWithRollupsAndPopulation()
+        {
+            // Arrange
+            var opportunity = CreateOpportunityDto();
+            var opportunityId = await _strategicOpportunityService.CreateOpportunityChargeCodeAsync(opportunity, CancellationToken.None);
+
+            // Act
+            var results = await _strategicOpportunityService.GetStrategicOpportunitiesAsync(CancellationToken.None);
+
+            // Assert
+            results.Should().NotBeEmpty("At least one opportunity should be returned");
+            var createdOpportunity = results.FirstOrDefault(o => o.OpportunityId == opportunityId);
+            createdOpportunity.Should().NotBeNull("Created opportunity should be found in results");
+
+            createdOpportunity.OpportunityId.Should().Be(opportunityId);
+            createdOpportunity.Name.Should().Be(opportunity.Name);
+            createdOpportunity.OpportunityTypeName.Should().Be("Charge Code");
+            createdOpportunity.EncounterGroupName.Should().Be("Patient Population", "When PatientPopulationHPath is set, it should be Patient Population");
+            createdOpportunity.AdditionalFilters.Should().Be("No");
+            createdOpportunity.BaselinePeriod.Should()
+                .Be($"{opportunity.BaselineStartDate:MMM d, yyyy} - {opportunity.BaselineEndDate:MMM d, yyyy}");
+            createdOpportunity.EstimatedTrackDurationMonths.Should().Be(opportunity.EstimatedTrackingDuration);
+
+            createdOpportunity.Rollup1.Should().BeEmpty("When rollup1Id is 0, rollup should be empty");
+            createdOpportunity.Rollup2.Should().BeEmpty("When rollup2Id is 0, rollup should be empty");
+            createdOpportunity.Rollup3.Should().BeEmpty("When rollup3Id is 0, rollup should be empty");
+
+            createdOpportunity.PatientPopulationHPath.Should().Be(opportunity.PatientPopulationHPath);
+            createdOpportunity.ExplorationPopulationId.Should().Be(opportunity.ExplorationPopulationId);
+            createdOpportunity.Population.Should().Be(POPULATION_NAME);
+        }
+
+        [Test]
+        public async Task UpdateStrategicOpportunityStatus_WhenNewInitiative_ShouldUpdateStatusAndDates()
+        {
+            // Arrange
+            var opportunity = CreateOpportunityDto();
+            var opportunityId = await _strategicOpportunityService.CreateOpportunityChargeCodeAsync(opportunity, CancellationToken.None);
+
+            var updateStatusDto = new StrategicOpportunityUpdateStatusDto
+            {
+                Status = (byte)StrategicOpportunityStatus.NewInitiative,
+                TrackingStartDate = new DateOnly(2024, 1, 1),
+                TrackingEndDate = new DateOnly(2024, 12, 31)
+            };
+
+            // Act
+            var updateResult = await _strategicOpportunityService.UpdateStrategicOpportunityStatus(opportunityId, updateStatusDto, CancellationToken.None);
+
+            // Assert
+            updateResult.Should().BeTrue("Update should be successful");
+
+            var strataId = TestUtilities.GetClaimsPrincipalAccessor()?.GetCurrentClaimsPrincipal().GetStrataId();
+            var opportunityAfterUpdate = await CentralDbContext.StrategicOpportunities
+                .FirstOrDefaultAsync(x => x.OpportunityId == opportunityId && x.StrataId == strataId, CancellationToken.None);
+
+            opportunityAfterUpdate.Should().NotBeNull("Updated opportunity should exist");
+            opportunityAfterUpdate.Status.Should().Be(updateStatusDto.Status, "Status should be updated to NewInitiative");
+            opportunityAfterUpdate.TrackingStartDate.Should().Be(updateStatusDto.TrackingStartDate, "TrackingStartDate should be updated");
+            opportunityAfterUpdate.TrackingEndDate.Should().Be(updateStatusDto.TrackingEndDate, "TrackingEndDate should be updated");
+        }
+
+        [Test]
+        public async Task UpdateStrategicOpportunityStatus_WhenNewOpportunity_ShouldResetTrackingData()
+        {
+            // Arrange
+            var opportunity = CreateOpportunityDto();
+            var opportunityId = await _strategicOpportunityService.CreateOpportunityChargeCodeAsync(opportunity, CancellationToken.None);
+
+            var toInitiativeDto = new StrategicOpportunityUpdateStatusDto
+            {
+                Status = (byte)StrategicOpportunityStatus.NewInitiative,
+                TrackingStartDate = new DateOnly(2024, 1, 1),
+                TrackingEndDate = new DateOnly(2024, 12, 31)
+            };
+            await _strategicOpportunityService.UpdateStrategicOpportunityStatus(opportunityId, toInitiativeDto, CancellationToken.None);
+
+            var toOpportunityDto = new StrategicOpportunityUpdateStatusDto
+            {
+                Status = (byte)StrategicOpportunityStatus.NewOpportunity
+            };
+
+            // Act
+            var updateResult = await _strategicOpportunityService.UpdateStrategicOpportunityStatus(opportunityId, toOpportunityDto, CancellationToken.None);
+
+            // Assert
+            updateResult.Should().BeTrue("Update should be successful");
+
+            var strataId = TestUtilities.GetClaimsPrincipalAccessor()?.GetCurrentClaimsPrincipal().GetStrataId();
+            var opportunityAfterUpdate = await CentralDbContext.StrategicOpportunityChargeCodes
+                .FirstOrDefaultAsync(x => x.OpportunityId == opportunityId && x.StrataId == strataId, CancellationToken.None);
+
+            opportunityAfterUpdate.Should().NotBeNull("Updated opportunity should exist");
+            opportunityAfterUpdate.Status.Should().Be((byte)StrategicOpportunityStatus.NewOpportunity, "Status should be reset to NewOpportunity");
+            opportunityAfterUpdate.TrackingStartDate.Should().Be(default(DateOnly), "TrackingStartDate should be reset to default");
+            opportunityAfterUpdate.TrackingEndDate.Should().Be(default(DateOnly), "TrackingEndDate should be reset to default");
+            opportunityAfterUpdate.LastRunTrackingDate.Should().BeNull("LastRunTrackingDate should be cleared");
+            opportunityAfterUpdate.LastRunTrackingStatus.Should().Be(RunTrackingStatus.None, "LastRunTrackingStatus should be reset to None");
+            opportunityAfterUpdate.ProgressToDateActual.Should().Be(0, "ProgressToDateActual should be reset to 0");
+            opportunityAfterUpdate.ProgressToDateCommitted.Should().Be(0, "ProgressToDateCommitted should be reset to 0");
+        }
+
+        [Test]
+        public async Task UpdateStrategicOpportunityStatus_WhenOtherStatus_ShouldOnlyUpdateStatus()
+        {
+            // Arrange
+            var opportunity = CreateOpportunityDto();
+            var opportunityId = await _strategicOpportunityService.CreateOpportunityChargeCodeAsync(opportunity, CancellationToken.None);
+
+            var toInitiativeDto = new StrategicOpportunityUpdateStatusDto
+            {
+                Status = (byte)StrategicOpportunityStatus.NewInitiative,
+                TrackingStartDate = new DateOnly(2024, 1, 1),
+                TrackingEndDate = new DateOnly(2024, 12, 31)
+            };
+            await _strategicOpportunityService.UpdateStrategicOpportunityStatus(opportunityId, toInitiativeDto, CancellationToken.None);
+
+            var toInValidationDto = new StrategicOpportunityUpdateStatusDto
+            {
+                Status = (byte)StrategicOpportunityStatus.InValidation
+            };
+
+            // Act
+            var updateResult = await _strategicOpportunityService.UpdateStrategicOpportunityStatus(opportunityId, toInValidationDto, CancellationToken.None);
+
+            // Assert
+            updateResult.Should().BeTrue("Update should be successful");
+
+            var strataId = TestUtilities.GetClaimsPrincipalAccessor()?.GetCurrentClaimsPrincipal().GetStrataId();
+            var opportunityAfterUpdate = await CentralDbContext.StrategicOpportunityChargeCodes
+                .FirstOrDefaultAsync(x => x.OpportunityId == opportunityId && x.StrataId == strataId, CancellationToken.None);
+
+            opportunityAfterUpdate.Should().NotBeNull("Updated opportunity should exist");
+            opportunityAfterUpdate.Status.Should().Be((byte)StrategicOpportunityStatus.InValidation, "Status should be updated to InValidation");
+            opportunityAfterUpdate.TrackingStartDate.Should().Be(toInitiativeDto.TrackingStartDate, "TrackingStartDate should be unchanged");
+            opportunityAfterUpdate.TrackingEndDate.Should().Be(toInitiativeDto.TrackingEndDate, "TrackingEndDate should be unchanged");
+        }
+
+        [Test]
+        public async Task UpdateStrategicOpportunityStatus_WhenOpportunityNotFound_ShouldReturnFalse()
+        {
+            // Arrange
+            var nonExistentOpportunityId = long.MaxValue;
+            var updateStatusDto = new StrategicOpportunityUpdateStatusDto
+            {
+                Status = (byte)StrategicOpportunityStatus.NewOpportunity
+            };
+
+            // Act
+            var result = await _strategicOpportunityService.UpdateStrategicOpportunityStatus(nonExistentOpportunityId, updateStatusDto, CancellationToken.None);
+
+            // Assert
+            result.Should().BeFalse("Update should return false when the opportunity does not exist");
+        }
+
+        [Test]
+        public async Task CopyStrategicOpportunityRoleAssignments_ShouldReturnEmptyList()
+        {
+            // Arrange
+            var opportunity = CreateOpportunityDto();
+            var opportunityId = await _strategicOpportunityService.CreateOpportunityChargeCodeAsync(opportunity, CancellationToken.None);
+
+            // Act
+            var newOpportunityId = opportunityId + 1;
+            await _opportunityRoleAssignmentService.CopyTo(opportunityId, newOpportunityId, CancellationToken.None);
+
+            // Assert
+            var newRoles = await _opportunityRoleAssignmentService.GetRoleAssignmentsAsync(newOpportunityId, CancellationToken.None);
+
+            newRoles.Should().BeEmpty();
+        }
+
+        [Test]
+        public async Task CopyStrategicOpportunityRoleAssignments_ShouldReturnRoleAssignments()
+        {
+            // Arrange
+            var opportunity = CreateOpportunityDto();
+            var opportunityId = await _strategicOpportunityService.CreateOpportunityChargeCodeAsync(opportunity, CancellationToken.None);
+
+            var roleAssignments = new List<OpportunityRoleAssignmentView>()
+            {
+                new() { LootId = opportunityId, IdentityGuid = Guid.NewGuid(), IdentityName = "Test1", CanRead = true, CanWrite = false, CanSecure = true },
+                new() { LootId = opportunityId, IdentityGuid = Guid.NewGuid(), IdentityName = "Test2", CanRead = false, CanWrite = true, CanSecure = false },
+            };
+
+            await _opportunityRoleAssignmentService.SaveRoleAssignmentsAsync(opportunityId, roleAssignments, CancellationToken.None);
+
+            // Act
+            var newOpportunityId = opportunityId + 1;
+            await _opportunityRoleAssignmentService.CopyTo(opportunityId, newOpportunityId, CancellationToken.None);
+
+            // Assert
+            var newRoles = await _opportunityRoleAssignmentService.GetRoleAssignmentsAsync(newOpportunityId, CancellationToken.None);
+
+            // Verify persisted values
+            var retrieved = newRoles.ToList();
+
+            retrieved.Should().HaveCount(roleAssignments.Count);
+            CompareRoleAssignments(retrieved[0], roleAssignments[0]);
+            CompareRoleAssignments(retrieved[1], roleAssignments[1]);
+        }
+
+        private static void CompareRoleAssignments(OpportunityRoleAssignmentView item1, OpportunityRoleAssignmentView item2)
+        {
+            item1.IdentityGuid.Should().Be(item2.IdentityGuid);
+            item1.IdentityName.Should().Be(item2.IdentityName);
+            item1.CanRead.Should().Be(item2.CanRead);
+            item1.CanWrite.Should().Be(item2.CanWrite);
+            item1.CanSecure.Should().Be(item2.CanSecure);
+        }
+
+        public string DataSchemaServiceSelectSql = @"SELECT
+""EncounterId"",
+""DischargeDateTime"",
+""EntityID"",
+""PhysicianId"",
+""PrimaryServiceLineId"",
+""CPTCodeCaseTypeFamilyId"",
+""MSDRGCaseTypeFamilyId"",
+""APRDRGCaseTypeFamilyId"",
+""DepartmentId"",
+""PhysicianSpecialtyId"",
+""ChargeCodeID"",
+""CostDriver"",
+""PatientTypeRollup"",
+ZEROIFNULL(""Units"") AS ""Units"",
+ZEROIFNULL(""Cost"") AS ""Cost""
+
+FROM (
+SELECT
+""EncounterId"",
+""DischargeDateTime"",
+""EntityID"",
+""PhysicianId"",
+""PrimaryServiceLineId"",
+""CPTCodeCaseTypeFamilyId"",
+""MSDRGCaseTypeFamilyId"",
+""APRDRGCaseTypeFamilyId"",
+""DepartmentId"",
+""PhysicianSpecialtyId"",
+""ChargeCodeID"",
+""CostDriver"",
+""PatientTypeRollup"",
+SUM(""Units"") AS ""Units"",
+SUM(""Cost"") AS ""Cost""
+
+FROM (
+SELECT
+DSSPES.encounterid AS ""EncounterId"",
+DSSPES.dischargedatetime AS ""DischargeDateTime"",
+DSSPES.entityid AS ""EntityID"",
+DSSPES.primaryphysicianid AS ""PhysicianId"",
+DSSPES.servicelineid AS ""PrimaryServiceLineId"",
+DSSPES.cptcodecasetypefamilyid AS ""CPTCodeCaseTypeFamilyId"",
+DSSPES.msdrgcasetypefamilyid AS ""MSDRGCaseTypeFamilyId"",
+DSSPES.aprdrgcasetypefamilyid AS ""APRDRGCaseTypeFamilyId"",
+PBLID.departmentid AS ""DepartmentId"",
+PHYSPRIMARY.physicianspecialtyid AS ""PhysicianSpecialtyId"",
+CC.chargecodeid AS ""ChargeCodeID"",
+IFNULL(CC.costdriver::TEXT, '') AS ""CostDriver"",
+IFNULL(EncounterPatientTypeRollup.patienttyperollup::TEXT, '') AS ""PatientTypeRollup"",
+NULL AS ""Cost"",
+SUM(PBLID.unitsofservice) AS ""Units""
+
+FROM dss.FactPatientBillingLineItemDetail AS PBLID
+INNER JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterrecordnumber = PBLID.encounterrecordnumber
+LEFT JOIN dss.FactPatientEncounterClinicalIndicator AS DSSPECI ON DSSPECI.encounterid = PBLID.encounterid
+LEFT JOIN CCI.VIEWENCOUNTERPATIENTTYPEROLLUP AS EncounterPatientTypeRollup ON EncounterPatientTypeRollup.encounterid = PBLID.encounterid
+INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid
+INNER JOIN DSS.DIMPHYSICIAN AS PHYSPRIMARY ON PHYSPRIMARY.physicianid = DSSPES.primaryphysicianid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_0 AND DSSPES.dischargedatetime <= :dischargedatetime_End_1) AND CC.chargecodeid IN (:chargecodeid_2))
+
+GROUP BY
+	""EncounterId"",
+	""DischargeDateTime"",
+	""EntityID"",
+	""PhysicianId"",
+	""PrimaryServiceLineId"",
+	""CPTCodeCaseTypeFamilyId"",
+	""MSDRGCaseTypeFamilyId"",
+	""APRDRGCaseTypeFamilyId"",
+	""DepartmentId"",
+	""PhysicianSpecialtyId"",
+	""ChargeCodeID"",
+	""CostDriver"",
+	""PatientTypeRollup""
+
+UNION ALL
+
+SELECT
+DSSPES.encounterid AS ""EncounterId"",
+DSSPES.dischargedatetime AS ""DischargeDateTime"",
+DSSPES.entityid AS ""EntityID"",
+DSSPES.primaryphysicianid AS ""PhysicianId"",
+DSSPES.servicelineid AS ""PrimaryServiceLineId"",
+DSSPES.cptcodecasetypefamilyid AS ""CPTCodeCaseTypeFamilyId"",
+DSSPES.msdrgcasetypefamilyid AS ""MSDRGCaseTypeFamilyId"",
+DSSPES.aprdrgcasetypefamilyid AS ""APRDRGCaseTypeFamilyId"",
+PBLID.departmentid AS ""DepartmentId"",
+PHYSPRIMARY.physicianspecialtyid AS ""PhysicianSpecialtyId"",
+CC.chargecodeid AS ""ChargeCodeID"",
+IFNULL(CC.costdriver::TEXT, '') AS ""CostDriver"",
+IFNULL(EncounterPatientTypeRollup.patienttyperollup::TEXT, '') AS ""PatientTypeRollup"",
+SUM(COSTDETAIL.variabledirectcost) AS ""Cost"",
+NULL AS ""Units""
+
+FROM dss.FactPatientCostDetail AS COSTDETAIL
+RIGHT JOIN dss.FactPatientBillingLineItemDetail AS PBLID ON PBLID.rowid = COSTDETAIL.pblidrowid
+INNER JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterrecordnumber = PBLID.encounterrecordnumber
+LEFT JOIN dss.FactPatientEncounterClinicalIndicator AS DSSPECI ON DSSPECI.encounterid = PBLID.encounterid
+LEFT JOIN CCI.VIEWENCOUNTERPATIENTTYPEROLLUP AS EncounterPatientTypeRollup ON EncounterPatientTypeRollup.encounterid = PBLID.encounterid
+INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid
+INNER JOIN DSS.DIMPHYSICIAN AS PHYSPRIMARY ON PHYSPRIMARY.physicianid = DSSPES.primaryphysicianid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_0 AND DSSPES.dischargedatetime <= :dischargedatetime_End_1) AND CC.chargecodeid IN (:chargecodeid_2))
+
+GROUP BY
+	""EncounterId"",
+	""DischargeDateTime"",
+	""EntityID"",
+	""PhysicianId"",
+	""PrimaryServiceLineId"",
+	""CPTCodeCaseTypeFamilyId"",
+	""MSDRGCaseTypeFamilyId"",
+	""APRDRGCaseTypeFamilyId"",
+	""DepartmentId"",
+	""PhysicianSpecialtyId"",
+	""ChargeCodeID"",
+	""CostDriver"",
+	""PatientTypeRollup""
+
+
+)
+
+GROUP BY
+	""EncounterId"",
+	""DischargeDateTime"",
+	""EntityID"",
+	""PhysicianId"",
+	""PrimaryServiceLineId"",
+	""CPTCodeCaseTypeFamilyId"",
+	""MSDRGCaseTypeFamilyId"",
+	""APRDRGCaseTypeFamilyId"",
+	""DepartmentId"",
+	""PhysicianSpecialtyId"",
+	""ChargeCodeID"",
+	""CostDriver"",
+	""PatientTypeRollup""
+
+
+)
+
+ORDER BY
+	""EncounterId"" ASC NULLS FIRST,
+	""DischargeDateTime"" ASC NULLS FIRST,
+	""EntityID"" ASC NULLS FIRST,
+	""PhysicianId"" ASC NULLS FIRST,
+	""PrimaryServiceLineId"" ASC NULLS FIRST,
+	""CPTCodeCaseTypeFamilyId"" ASC NULLS FIRST,
+	""MSDRGCaseTypeFamilyId"" ASC NULLS FIRST,
+	""APRDRGCaseTypeFamilyId"" ASC NULLS FIRST,
+	""DepartmentId"" ASC NULLS FIRST,
+	""PhysicianSpecialtyId"" ASC NULLS FIRST,
+	""ChargeCodeID"" ASC NULLS FIRST,
+	""CostDriver"" ASC NULLS FIRST,
+	""PatientTypeRollup"" ASC NULLS FIRST
+
+";
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/TestSnowflakeDatabaseContext.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/TestSnowflakeDatabaseContext.cs
new file mode 100644
index 0000000..d5afa8d
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/SnowflakeIntegrationTests/TestSnowflakeDatabaseContext.cs
@@ -0,0 +1,46 @@
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using System.Diagnostics.CodeAnalysis;
+using static Strata.ContinuousImprovement.Biz.Exploration.ExplorationService;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.SnowflakeIntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    public class TestSnowflakeDatabaseContext : IntegrationTestBase
+    {
+        [Test, Ignore("Test database needs to be rolled over to the new year")]
+        public async Task BuildCaseTypeFamilySummaryQueryTest()
+        {
+            var queryParams = new QueryParams
+            {
+                CodeType = UtilizationVariation.VariationCaseTypes.CaseTypeCategories.MSDRG
+            };
+
+            int year = DateTime.Now.Year;
+            var dischargeDate = new FilterChipItem
+            {
+                ChipType = ChipType.DateRange,
+                Filters = [],
+                DateRange = [new DateTime(year, 1, 1), new DateTime(year + 1, 1, 1).AddTicks(-1)]
+            };
+
+            var filters = new Exploration.Filters.Filter
+            {
+                DischargeDateStart = dischargeDate.DateRange.First(),
+                DischargeDateEnd = dischargeDate.DateRange.Last(),
+                FilterChipItems = [dischargeDate]
+            };
+
+            var filterStrings = await ExplorationFilterService.GetFilterStringsAsync(filters.FilterChipItems, queryParams, CancellationToken.None);
+            var ctfSummaryQuery = ExplorationServiceQuery.BuildCaseTypeFamilySummaryQuery(filterStrings.QueryFilters, filterStrings.EncounterSummaryFilters);
+
+            var ctfCostDriverInfos = await SnowflakeDatabaseContext
+                .QueryAsync<CaseTypeFamilyEncounterInfo>(ctfSummaryQuery, "CaseTypeFamily CostDriver Summary", queryParams);
+            Assert.That(ctfCostDriverInfos, Is.Not.Null.And.Not.Empty
+                .And.All.InstanceOf<CaseTypeFamilyEncounterInfo>());
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/Strata.ContinuousImprovement.Biz.Test.Integration.csproj b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/Strata.ContinuousImprovement.Biz.Test.Integration.csproj
new file mode 100644
index 0000000..4446826
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/Strata.ContinuousImprovement.Biz.Test.Integration.csproj
@@ -0,0 +1,59 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="OpportunityMetricCohortQueryTests\**" />
+    <EmbeddedResource Remove="OpportunityMetricCohortQueryTests\**" />
+    <None Remove="OpportunityMetricCohortQueryTests\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="SnowflakeIntegrationTests\DistributionProcess\TestData\**\*.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="Strata.ApiLib.Core" Version="8.4.1" />
+    <PackageReference Include="Strata.Configuration.Client" Version="9.15.1" />
+    <PackageReference Include="Strata.SnowflakeLib" Version="4.3.0" />
+    <PackageReference Include="Strata.SqlTools.EntityFramework" Version="6.0.3" />
+    <PackageReference Include="Verify.NUnit" Version="29.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Strata.ContinuousImprovement.Biz\Strata.ContinuousImprovement.Biz.csproj" />
+    <ProjectReference Include="..\Strata.ContinuousImprovement.Biz.Test.Unit\Strata.ContinuousImprovement.Biz.Test.Unit.csproj" />
+    <ProjectReference Include="..\Strata.ContinuousImprovement.JazzEntityFrameworkStub\Strata.ContinuousImprovement.JazzEntityFrameworkStub.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="SnowflakeIntegrationTests\DistributionProcess\snapshots\" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/StrategicItems/StrategicItemDimensionSyncTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/StrategicItems/StrategicItemDimensionSyncTests.cs
new file mode 100644
index 0000000..a702113
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/StrategicItems/StrategicItemDimensionSyncTests.cs
@@ -0,0 +1,533 @@
+using FluentAssertions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.Id.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration.StrategicItems
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture]
+    public class StrategicItemDimensionSyncTests : IntegrationTestBase
+    {
+        private StrategicItemDimensionSyncService _syncService;
+        private int _testStrataId;
+        private List<long> _testOpportunityIds;
+        private List<Guid> _testUserGuids;
+
+        [OneTimeSetUp]
+        public async Task TestFixtureSetup()
+        {
+            await SetDbContextAndServices();
+
+            // Get real StrataId from the test database
+            var idServiceClient = ServiceProvider.GetRequiredService<IIdServiceClient>();
+            _testStrataId = await idServiceClient.GetStrataId(GmAutomationDatabase, CancellationToken.None);
+
+            _testOpportunityIds = new List<long>();
+            _testUserGuids = new List<Guid>();
+
+            try
+            {
+                _testUserGuids = await CreateTestUserProfiles();
+
+                _syncService = new StrategicItemDimensionSyncService(
+                    ServiceProvider.GetRequiredService<IAsyncDbContextFactory<JazzDbContext>>(),
+                    (CentralDbContext)CentralDbContext,
+                    SnowflakeDatabaseContext
+                );
+            }
+            catch
+            {
+                // If setup fails, clean up any partial data
+                await CleanupTestUserProfiles();
+                throw;
+            }
+        }
+
+        [TearDown]
+        public async Task TestCleanup()
+        {
+            // Clean up Snowflake dimension records
+            foreach (var opportunityId in _testOpportunityIds)
+            {
+                try
+                {
+                    var deleteSql = "DELETE FROM cci.dimstrategicitem WHERE strategic_item_id = :StrategicItemId";
+                    await SnowflakeDatabaseContext.ExecuteCommandAsync(deleteSql, new { StrategicItemId = opportunityId });
+                }
+                catch
+                {
+                    // Ignore cleanup errors
+                }
+            }
+
+            // Clean up CentralDbContext records
+            var opportunities = await ((CentralDbContext)CentralDbContext).StrategicOpportunities
+                .Where(o => _testOpportunityIds.Contains(o.OpportunityId))
+                .ToListAsync();
+
+            ((CentralDbContext)CentralDbContext).StrategicOpportunities.RemoveRange(opportunities);
+
+            var glOpportunities = await ((CentralDbContext)CentralDbContext).StrategicOpportunityGLs
+                .Where(o => _testOpportunityIds.Contains(o.OpportunityId))
+                .ToListAsync();
+
+            ((CentralDbContext)CentralDbContext).StrategicOpportunityGLs.RemoveRange(glOpportunities);
+
+            // Clean up stakeholder links
+            var stakeholders = await ((CentralDbContext)CentralDbContext).StakeholdersLinks
+                .Where(s => _testOpportunityIds.Contains(s.StrategicOpportunityId))
+                .ToListAsync();
+            ((CentralDbContext)CentralDbContext).StakeholdersLinks.RemoveRange(stakeholders);
+
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+
+            _testOpportunityIds.Clear();
+        }
+
+        [OneTimeTearDown]
+        public async Task TestFixtureTearDown()
+        {
+            await CleanupTestUserProfiles();
+            
+            // Ensure base class cleanup runs to delete CentralDbContext database
+            await base.TearDown();
+        }
+
+        [Test]
+        public async Task UpsertStrategicItemDimension_NewOpportunity_ShouldInsertDimensionRecord()
+        {
+            // Arrange
+            var opportunity = CreateTestOpportunity(_testUserGuids);
+
+            ((CentralDbContext)CentralDbContext).StrategicOpportunityChargeCodes.Add(opportunity);
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+            _testOpportunityIds.Add(opportunity.OpportunityId);
+
+            // Act
+            await _syncService.UpsertAsync(opportunity, CancellationToken.None);
+
+            // Assert
+            var dimensionRecord = await GetDimensionRecord(opportunity.OpportunityId);
+
+            dimensionRecord.Should().NotBeNull();
+            dimensionRecord.Name.Should().Be(opportunity.Name);
+            dimensionRecord.StrategicItemType.Should().Be("Opportunity");
+            dimensionRecord.OpportunityType.Should().Be("Charge Code");
+            dimensionRecord.Status.Should().Be("New Opportunity");
+            dimensionRecord.BaselineType.Should().Be(opportunity.BaselineType.ToString().SplitCamelCase());
+            dimensionRecord.BaselineDistribution.Should().Be(opportunity.BaselineDistribution.ToString());
+            dimensionRecord.RollupOneId.Should().Be(opportunity.Rollup1Id);
+            dimensionRecord.RollupTwoId.Should().Be(opportunity.Rollup2Id);
+            dimensionRecord.RollupThreeId.Should().Be(opportunity.Rollup3Id);
+            dimensionRecord.BaselineStartDate.Should().Be(opportunity.BaselineStartDate);
+            dimensionRecord.BaselineEndDate.Should().Be(opportunity.BaselineEndDate);
+            dimensionRecord.EstimatedTrackingDuration.Should().Be(opportunity.EstimatedTrackingDuration);
+            dimensionRecord.TeamMembers.Should().Be(opportunity.TeamMembers);
+            dimensionRecord.Owner.Should().NotBeNullOrEmpty();
+            dimensionRecord.CostLeader.Should().NotBeNullOrEmpty();
+            dimensionRecord.ExecutiveSponsor.Should().NotBeNullOrEmpty();
+        }
+
+        [Test]
+        public async Task UpsertStrategicItemDimension_ExistingOpportunity_ShouldUpdateDimensionRecord()
+        {
+            // Arrange
+            var opportunity = CreateTestOpportunity(_testUserGuids);
+
+            ((CentralDbContext)CentralDbContext).StrategicOpportunityChargeCodes.Add(opportunity);
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+            _testOpportunityIds.Add(opportunity.OpportunityId);
+
+            // Insert initial dimension record
+            await _syncService.UpsertAsync(opportunity, CancellationToken.None);
+
+            // Modify opportunity
+            opportunity.Name = "Updated Test Opportunity";
+            opportunity.Status = (byte)StrategicOpportunityStatus.InValidation;
+            opportunity.EstimatedGoal = 50000;
+            opportunity.TotalImprovement = 25000;
+            opportunity.LastRunTrackingDate = DateTime.SpecifyKind(new DateTime(2024, 3, 15), DateTimeKind.Utc);
+            opportunity.LastRunTrackingStatus = RunTrackingStatus.Success;
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+
+            // Act
+            await _syncService.UpsertAsync(opportunity, CancellationToken.None);
+
+            // Assert
+            var dimensionRecord = await GetDimensionRecord(opportunity.OpportunityId);
+
+            dimensionRecord.Should().NotBeNull();
+            dimensionRecord.Name.Should().Be("Updated Test Opportunity");
+            dimensionRecord.Status.Should().Be("In Validation");
+            dimensionRecord.EstimatedGoal.Should().Be(50000);
+            dimensionRecord.TotalImprovement.Should().Be(25000);
+            dimensionRecord.LastRunTrackingDate.Should().Be(new DateOnly(2024, 3, 15));
+            dimensionRecord.LastRunTrackingStatus.Should().Be(RunTrackingStatus.Success.ToString());
+        }
+
+        [Test]
+        public async Task UpsertStrategicItemDimension_WithStakeholders_ShouldSyncStakeholderNames()
+        {
+            // Arrange
+            var opportunity = CreateTestOpportunity(_testUserGuids);
+
+            ((CentralDbContext)CentralDbContext).StrategicOpportunityChargeCodes.Add(opportunity);
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+            _testOpportunityIds.Add(opportunity.OpportunityId);
+
+            // Add stakeholders
+            var stakeholder1 = new StrategicStakeholdersLink(opportunity.OpportunityId, _testUserGuids[3]);
+            var stakeholder2 = new StrategicStakeholdersLink(opportunity.OpportunityId, _testUserGuids[4]);
+
+            ((CentralDbContext)CentralDbContext).StakeholdersLinks.AddRange(stakeholder1, stakeholder2);
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+
+            // Act
+            await _syncService.UpsertAsync(opportunity, CancellationToken.None);
+
+            // Assert
+            var dimensionRecord = await GetDimensionRecord(opportunity.OpportunityId);
+
+            dimensionRecord.Should().NotBeNull();
+            dimensionRecord.Stakeholders.Should().NotBeNullOrEmpty();
+            dimensionRecord.Stakeholders.Should().Contain("Stakeholder1, Test");
+            dimensionRecord.Stakeholders.Should().Contain("Stakeholder2, Test");
+        }
+
+        [Test]
+        public async Task UpsertStrategicItemDimension_StatusChange_ShouldUpdateStrategicItemType()
+        {
+            // Arrange
+            var opportunity = CreateTestOpportunity(_testUserGuids);
+            opportunity.Status = (byte)StrategicOpportunityStatus.NewOpportunity;
+
+            ((CentralDbContext)CentralDbContext).StrategicOpportunityChargeCodes.Add(opportunity);
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+            _testOpportunityIds.Add(opportunity.OpportunityId);
+
+            await _syncService.UpsertAsync(opportunity, CancellationToken.None);
+
+            var initialRecord = await GetDimensionRecord(opportunity.OpportunityId);
+            initialRecord.StrategicItemType.Should().Be("Opportunity");
+
+            // Change to Initiative
+            opportunity.Status = (byte)StrategicOpportunityStatus.NewInitiative;
+            opportunity.TrackingStartDate = new DateOnly(2024, 1, 1);
+            opportunity.TrackingEndDate = new DateOnly(2024, 12, 31);
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+
+            // Act
+            await _syncService.UpsertAsync(opportunity, CancellationToken.None);
+
+            // Assert
+            var updatedRecord = await GetDimensionRecord(opportunity.OpportunityId);
+            updatedRecord.StrategicItemType.Should().Be("Initiative");
+            updatedRecord.Status.Should().Be("New Initiative");
+            updatedRecord.TrackingStartDate.Should().Be(new DateOnly(2024, 1, 1));
+            updatedRecord.TrackingEndDate.Should().Be(new DateOnly(2024, 12, 31));
+        }
+
+        [Test]
+        public async Task UpsertStrategicItemDimension_GLOpportunity_ShouldSetOpportunityTypeToGeneralLedger()
+        {
+            // Arrange
+            var opportunity = CreateTestGLOpportunity(_testUserGuids);
+
+            ((CentralDbContext)CentralDbContext).StrategicOpportunityGLs.Add(opportunity);
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+            _testOpportunityIds.Add(opportunity.OpportunityId);
+
+            // Act
+            await _syncService.UpsertAsync(opportunity, CancellationToken.None);
+
+            // Assert
+            var dimensionRecord = await GetDimensionRecord(opportunity.OpportunityId);
+
+            dimensionRecord.Should().NotBeNull();
+            dimensionRecord.OpportunityType.Should().Be("General Ledger");
+            dimensionRecord.Name.Should().Be(opportunity.Name);
+            dimensionRecord.StrategicItemType.Should().Be("Opportunity");
+            dimensionRecord.Status.Should().Be("New Opportunity");
+        }
+
+        [Test]
+        public async Task UpsertStrategicItemDimension_GLOpportunityTrackingStatus_ShouldSyncLastRunTracking()
+        {
+            // Arrange
+            var opportunity = CreateTestGLOpportunity(_testUserGuids);
+
+            ((CentralDbContext)CentralDbContext).StrategicOpportunityGLs.Add(opportunity);
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+            _testOpportunityIds.Add(opportunity.OpportunityId);
+
+            await _syncService.UpsertAsync(opportunity, CancellationToken.None);
+
+            // Simulate tracking run completing
+            opportunity.LastRunTrackingDate = DateTime.SpecifyKind(new DateTime(2024, 5, 1), DateTimeKind.Utc);
+            opportunity.LastRunTrackingStatus = RunTrackingStatus.Success;
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+
+            // Act
+            await _syncService.UpsertAsync(opportunity, CancellationToken.None);
+
+            // Assert
+            var dimensionRecord = await GetDimensionRecord(opportunity.OpportunityId);
+
+            dimensionRecord.Should().NotBeNull();
+            dimensionRecord.LastRunTrackingDate.Should().Be(new DateOnly(2024, 5, 1));
+            dimensionRecord.LastRunTrackingStatus.Should().Be(RunTrackingStatus.Success.ToString());
+        }
+
+        [Test]
+        public async Task DeleteStrategicItemDimension_ShouldRemoveDimensionRecord()
+        {
+            // Arrange
+            var opportunity = CreateTestOpportunity(_testUserGuids);
+
+            ((CentralDbContext)CentralDbContext).StrategicOpportunityChargeCodes.Add(opportunity);
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+            _testOpportunityIds.Add(opportunity.OpportunityId);
+
+            await _syncService.UpsertAsync(opportunity, CancellationToken.None);
+
+            var recordBeforeDelete = await GetDimensionRecord(opportunity.OpportunityId);
+            recordBeforeDelete.Should().NotBeNull();
+
+            // Act
+            await _syncService.DeleteAsync(opportunity.OpportunityId);
+
+            // Assert
+            var recordAfterDelete = await GetDimensionRecord(opportunity.OpportunityId);
+            recordAfterDelete.Should().BeNull();
+        }
+
+        [Test]
+        public async Task UpsertStrategicItemDimension_WithNullDates_ShouldHandleNullsCorrectly()
+        {
+            // Arrange
+            var opportunity = CreateTestOpportunity(_testUserGuids);
+            opportunity.TrackingStartDate = default;
+            opportunity.TrackingEndDate = default;
+            opportunity.LastRunTrackingDate = null;
+
+            ((CentralDbContext)CentralDbContext).StrategicOpportunityChargeCodes.Add(opportunity);
+            await ((CentralDbContext)CentralDbContext).SaveChangesAsync();
+            _testOpportunityIds.Add(opportunity.OpportunityId);
+
+            // Act
+            await _syncService.UpsertAsync(opportunity, CancellationToken.None);
+
+            // Assert
+            var dimensionRecord = await GetDimensionRecord(opportunity.OpportunityId);
+
+            dimensionRecord.Should().NotBeNull();
+            dimensionRecord.TrackingStartDate.Should().BeNull();
+            dimensionRecord.TrackingEndDate.Should().BeNull();
+            dimensionRecord.LastRunTrackingDate.Should().BeNull();
+            dimensionRecord.BaselineStartDate.Should().NotBeNull(); // Required field
+        }
+
+        #region Helper Methods
+
+        private async Task CleanupTestUserProfiles()
+        {
+            if (_testUserGuids == null || _testUserGuids.Count == 0) return;
+
+            var jazzContextFactory = ServiceProvider.GetRequiredService<IAsyncDbContextFactory<JazzDbContext>>();
+            await using var jazzContext = await jazzContextFactory.CreateDbContextAsync(CancellationToken.None);
+
+            var guidParams = _testUserGuids
+                .Select((g, i) => new Microsoft.Data.SqlClient.SqlParameter($"@g{i}", g))
+                .ToArray();
+
+            var paramNames = string.Join(", ", guidParams.Select(p => p.ParameterName));
+            await jazzContext.Database.ExecuteSqlRawAsync(
+                $"DELETE FROM dbo.UserProfile WHERE UserGuid IN ({paramNames})",
+                guidParams.Cast<object>().ToArray());
+        }
+
+        private async Task<List<Guid>> CreateTestUserProfiles()
+        {
+            var runId = Guid.NewGuid().ToString("N")[..8];
+
+            var userGuids = new List<Guid>
+            {
+                Guid.NewGuid(), // Owner
+                Guid.NewGuid(), // Cost Leader
+                Guid.NewGuid(), // Executive Sponsor
+                Guid.NewGuid(), // Stakeholder 1
+                Guid.NewGuid()  // Stakeholder 2
+            };
+
+            var jazzContextFactory = ServiceProvider.GetRequiredService<IAsyncDbContextFactory<JazzDbContext>>();
+            await using var jazzContext = await jazzContextFactory.CreateDbContextAsync(CancellationToken.None);
+
+            var insertSql = @"
+                INSERT INTO dbo.UserProfile (UserGuid, UserName, NameFirst, NameLast)
+                VALUES (@UserGuid, @UserName, @NameFirst, @NameLast)";
+
+            var profiles = new[]
+            {
+                new { UserGuid = userGuids[0], UserName = $"owner_{runId}", NameFirst = "Test", NameLast = "Owner" },
+                new { UserGuid = userGuids[1], UserName = $"costleader_{runId}", NameFirst = "Test", NameLast = "CostLeader" },
+                new { UserGuid = userGuids[2], UserName = $"executivesponsor_{runId}", NameFirst = "Test", NameLast = "ExecutiveSponsor" },
+                new { UserGuid = userGuids[3], UserName = $"stakeholder1_{runId}", NameFirst = "Test", NameLast = "Stakeholder1" },
+                new { UserGuid = userGuids[4], UserName = $"stakeholder2_{runId}", NameFirst = "Test", NameLast = "Stakeholder2" }
+            };
+
+            foreach (var profile in profiles)
+            {
+                await jazzContext.Database.ExecuteSqlRawAsync(insertSql,
+                    new Microsoft.Data.SqlClient.SqlParameter("@UserGuid", profile.UserGuid),
+                    new Microsoft.Data.SqlClient.SqlParameter("@UserName", profile.UserName),
+                    new Microsoft.Data.SqlClient.SqlParameter("@NameFirst", profile.NameFirst),
+                    new Microsoft.Data.SqlClient.SqlParameter("@NameLast", profile.NameLast));
+            }
+
+            return userGuids;
+        }
+
+        private StrategicOpportunityChargeCode CreateTestOpportunity(List<Guid> userGuids)
+        {
+            return new StrategicOpportunityChargeCode
+            {
+                Name = $"Test Opportunity {Guid.NewGuid()}",
+                StrataId = _testStrataId,
+                OpportunityType = StrategicOpportunityTypes.ChargeCode,
+                Status = (byte)StrategicOpportunityStatus.NewOpportunity,
+                BaselineType = BaselineType.MonthRange,
+                BaselineDistribution = DistributionMethod.Monthly,
+                BaselineStartDate = new DateOnly(2024, 1, 1),
+                BaselineEndDate = new DateOnly(2024, 6, 30),
+                EstimatedTrackingDuration = 12,
+                EstimatedGoal = 100000,
+                TotalImprovement = 0,
+                Rollup1Id = 1,
+                Rollup2Id = 1,
+                Rollup3Id = 1,
+                OwnerGuid = userGuids[0],
+                CostLeaderGuid = userGuids[1],
+                ExecutiveSponsorGuid = userGuids[2],
+                TeamMembers = "Team Member 1, Team Member 2",
+                ChargeCodeHPath = "test/path",
+                PatientPopulationHPath = string.Empty,
+                OpportunityFiltersJSON = "[]",
+                LayoutJSON = "{}",
+                LastRunTrackingStatus = RunTrackingStatus.None
+            };
+        }
+
+        private StrategicOpportunityGL CreateTestGLOpportunity(List<Guid> userGuids)
+        {
+            return new StrategicOpportunityGL
+            {
+                Name = $"Test GL Opportunity {Guid.NewGuid()}",
+                StrataId = _testStrataId,
+                OpportunityType = StrategicOpportunityTypes.GeneralLedger,
+                Status = (byte)StrategicOpportunityStatus.NewOpportunity,
+                BaselineType = BaselineType.MonthRange,
+                BaselineDistribution = DistributionMethod.Monthly,
+                BaselineStartDate = new DateOnly(2024, 1, 1),
+                BaselineEndDate = new DateOnly(2024, 6, 30),
+                EstimatedTrackingDuration = 12,
+                EstimatedGoal = 100000,
+                TotalImprovement = 0,
+                Rollup1Id = 1,
+                Rollup2Id = 1,
+                Rollup3Id = 1,
+                OwnerGuid = userGuids[0],
+                CostLeaderGuid = userGuids[1],
+                ExecutiveSponsorGuid = userGuids[2],
+                TeamMembers = "Team Member 1, Team Member 2",
+                DepartmentHPath = string.Empty,
+                OpportunityFiltersJSON = "[]",
+                LayoutJSON = "{}",
+                LastRunTrackingStatus = RunTrackingStatus.None
+            };
+        }
+
+        private async Task<DimensionRecord> GetDimensionRecord(long opportunityId)
+        {
+            var query = @"
+        SELECT 
+            strategic_item_id AS StrategicItemId,
+            name AS Name,
+            rollup_one_id AS RollupOneId,
+            rollup_two_id AS RollupTwoId,
+            rollup_three_id AS RollupThreeId,
+            baseline_type AS BaselineType,
+            strategic_item_type AS StrategicItemType,
+            opportunity_type AS OpportunityType,
+            status AS Status,
+            baseline_distribution AS BaselineDistribution,
+            baseline_start_date AS BaselineStartDate,
+            baseline_end_date AS BaselineEndDate,
+            estimated_tracking_duration AS EstimatedTrackingDuration,
+            tracking_start_date AS TrackingStartDate,
+            tracking_end_date AS TrackingEndDate,
+            estimated_goal AS EstimatedGoal,
+            total_improvement AS TotalImprovement,
+            cost_leader AS CostLeader,
+            executive_sponsor AS ExecutiveSponsor,
+            owner AS Owner,
+            stakeholders AS Stakeholders,
+            team_members AS TeamMembers,
+            last_run_tracking_date AS LastRunTrackingDate,
+            last_run_tracking_status AS LastRunTrackingStatus
+        FROM cci.dimstrategicitem 
+        WHERE strategic_item_id = :StrategicItemId";
+    
+            var parameters = new { StrategicItemId = opportunityId };
+
+            var results = await SnowflakeDatabaseContext.QueryAsync<DimensionRecord>(
+                query,
+                "GetDimensionRecord",
+                parameters
+            );
+
+            return results.FirstOrDefault();
+        }
+
+        #endregion
+
+        #region Test DTO
+
+        private class DimensionRecord
+        {
+            public long StrategicItemId { get; set; }
+            public string Name { get; set; }
+            public int RollupOneId { get; set; }
+            public int RollupTwoId { get; set; }
+            public int RollupThreeId { get; set; }
+            public string BaselineType { get; set; }
+            public string StrategicItemType { get; set; }
+            public string OpportunityType { get; set; }
+            public string Status { get; set; }
+            public string BaselineDistribution { get; set; }
+            public DateOnly? BaselineStartDate { get; set; }
+            public DateOnly? BaselineEndDate { get; set; }
+            public int EstimatedTrackingDuration { get; set; }
+            public DateOnly? TrackingStartDate { get; set; }
+            public DateOnly? TrackingEndDate { get; set; }
+            public decimal EstimatedGoal { get; set; }
+            public decimal TotalImprovement { get; set; }
+            public string CostLeader { get; set; }
+            public string ExecutiveSponsor { get; set; }
+            public string Owner { get; set; }
+            public string Stakeholders { get; set; }
+            public string TeamMembers { get; set; }
+            public DateOnly? LastRunTrackingDate { get; set; }
+            public string LastRunTrackingStatus { get; set; }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/TestCIIntegration.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/TestCIIntegration.cs
new file mode 100644
index 0000000..ca87849
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/TestCIIntegration.cs
@@ -0,0 +1,27 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Integration
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("CCI")]
+    public class TestCIIntegration : IntegrationTestBase
+    {
+        [Test]
+        public async Task VariationOpportunityTest()
+        {
+            var query = @"select OpportunityGuid from cci.VariationOpportunity where CostDriver = 'Pharmacy' order by Savings DESC limit 1";
+            var opportunityGuid = await SnowflakeDatabaseContext.ExecuteScalarAsync<string>(query);
+            VariationOpportunityGuid = new Guid(opportunityGuid ?? Guid.NewGuid().ToString());
+            Assert.That(opportunityGuid, Is.Not.Null.And.EqualTo(VariationOpportunityGuid.ToString()));
+        }
+
+        [Test]
+        public async Task LosVariationOpportunityTest()
+        {
+            var query = @"select OpportunityGuid from cci.VariationOpportunity where CostDriver = 'LOS' order by Savings DESC limit 1";
+            var opportunityGuid = await SnowflakeDatabaseContext.ExecuteScalarAsync<string>(query);
+            LOSOpportunityGuid = new Guid(opportunityGuid ?? Guid.NewGuid().ToString());
+            Assert.That(opportunityGuid, Is.Not.Null.And.EqualTo(LOSOpportunityGuid.ToString()));
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Integration/appsettings.json b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/appsettings.json
new file mode 100644
index 0000000..b4d02ff
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Integration/appsettings.json
@@ -0,0 +1,55 @@
+{
+  "AllowedHosts": "*",
+  "Version": "0.0.0",
+  "configuration": {
+    "basicAuthUsername": "BkQsRDdmdjkFNhKVuTI.TpujQJXuKhGDcV.F_hjADMRTaEUWMJnviaesoOrhhfnz",
+    "basicAuthPassword": "GWPIIWECDqh.hjDNdpxVEfeFe-bYFwPSx-oBGFD_od_SUQVk-QqTIkZY_NXMeqeo"
+  },
+  "endPoints": {
+    "dataschema": "https://dataschema-api.dev.stratanetwork.net/",
+    "schema": "https://schema-api.dev.stratanetwork.net",
+    "analytics": "https://analytics-api.dev.stratanetwork.net"
+  },
+  "StrataConfigServerBaseUrl": "https://configuration.dev.stratanetwork.net",
+  "NetworkOpportunity": {
+    "Creators": [ "" ]
+  },
+  "HealthCheck": {
+    "StrataJazz": true,
+    "Snowflake": true
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  },
+  "hangfire": {
+    "url": "https://localhost:44369",
+    "redis": {
+      "prefix": "continuousimprovement-jobs-service",
+      "configOptions": "ddenredisc01.sdt.local:6379,ddenredisc02.sdt.local:6379,ddenredisc03.sdt.local:6379,ddenredisc04.sdt.local:6379,ddenredisc05.sdt.local:6379,ddenredisc06.sdt.local:6379"
+    }
+  },
+  "accessGudid": {
+    "url": "https://accessgudid.nlm.nih.gov/download/delimited"
+  },
+  "datadog": {
+    "seedgmdnjob": "https://app.datadoghq.com/logs/livetail?query=service%3ASeedGMDNTermDataJob%20env%3Adev&cols=status%2Cenv%2C%40db.strata_id%2C%40db.org_pin%2C%40db.name%2C%40db.instance%2C%40process.name%2Cservice&index=%2A&messageDisplay=inline&stream_sort=desc&viz=stream&from_ts=1692207497147&to_ts=1692293897147&live=true"
+  },
+  "aws": {
+    "snowflakeAdminSecretName": "stratareplication/snowflake/automation/connectionstring"
+  },
+  "strataApi": {
+    "clientSecret": "V_okTrkWYBs-PqMP.inbJShIvMGWcpdqCDq_ZjntVF.ydgRCoYaDVJYEWEIdsjJ_"
+  },
+  "ChargeCodeOpportunityValidation": {
+    "maxChargeCodeSelections": 100,
+    "maxOpportunityLevelSelections": 10
+  },
+  "Snowflake": {
+    "Url": "https://stratadev.us-east-1.privatelink.snowflakecomputing.com",
+    "Account": "stratadev"
+  }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/All/Opportunities/AllOpportunityServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/All/Opportunities/AllOpportunityServiceTest.cs
new file mode 100644
index 0000000..e0b08f3
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/All/Opportunities/AllOpportunityServiceTest.cs
@@ -0,0 +1,642 @@
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.All.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Encounter;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Hangfire.Jazz.Client.Models;
+using Strata.Schema.Client;
+using Strata.Schema.Client.Dtos;
+using Strata.Schema.Client.Dtos.Info;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.All.Opportunities
+{
+    [TestFixture, Category("Unit")]
+    public class AllOpportunityServiceTest
+    {
+        private IAllOpportunityService _allOpportunityService;
+        private Mock<IAsyncDbContextFactory<JazzDbContext>> _dbContextFactoryMock;
+        private Mock<IJazzDbContext> _jazzDbContextMock;
+        private Mock<ISchemaServiceClient> _schemaServiceMock;
+        private Mock<IJazzHangfireServiceClient> _hangfireServiceMock;
+        private Mock<IConfigurationService> _configurationMock;
+        private IInitiativeService _initiativeService;
+        private IUpdateFactOpportunitySavingsService _updateFactOpportunitySavingsService;
+        private static readonly ResourceFileExtractor _extractor = new ResourceFileExtractor(".Resource.");
+        private List<Biz.Configuration.Configuration> _configurations;
+        internal static List<Guid> ConfigGuids = new() { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
+        internal static List<string> ConfigNames = new() { "FY2021", "FY2022", "FY2023", "FY2024" };
+        private ScoreDimensionInfoDto _dimension;
+        private List<ScoreHierarchyDto> _hierarchies;
+        private List<HierarchyNodeDto> _hierarchyNodes;
+        private List<FilterHelper> _filterHelpers;
+        private JobEnqueuedResponse _jobResponse;
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _dbContextFactoryMock = new Mock<IAsyncDbContextFactory<JazzDbContext>>();
+            _jazzDbContextMock = new Mock<IJazzDbContext>();
+            _schemaServiceMock = new Mock<ISchemaServiceClient>();
+            _hangfireServiceMock = new Mock<IJazzHangfireServiceClient>();
+            _configurationMock = new Mock<IConfigurationService>();
+            _initiativeService = Mock.Of<IInitiativeService>();
+            _updateFactOpportunitySavingsService = Mock.Of<IUpdateFactOpportunitySavingsService>();
+            Mock.Get(_initiativeService)
+                .Setup(s => s.DeleteAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            Mock.Get(_updateFactOpportunitySavingsService)
+                .Setup(s => s.UpdateFactOpportunitySavings(It.IsAny<CancellationToken>()));
+            _allOpportunityService = new AllOpportunityService(_dbContextFactoryMock.Object, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            _configurations = new List<Biz.Configuration.Configuration>
+            {
+                new()
+                {
+                    ConfigurationGuid = ConfigGuids[0],
+                    Name = ConfigNames.First(),
+                    DepartmentRollupGlobalId = string.Empty,
+                    ServiceLineDimensionGuid = Guid.NewGuid()
+                },
+                new()
+                {
+                    ConfigurationGuid = ConfigGuids[1],
+                    Name = ConfigNames[1],
+                    DepartmentRollupGlobalId = "Department",
+                    ServiceLineDimensionGuid = Guid.NewGuid()
+                },
+                new()
+                {
+                    ConfigurationGuid = ConfigGuids[2],
+                    Name = ConfigNames[2],
+                    DepartmentRollupGlobalId = string.Empty,
+                    ServiceLineDimensionGuid = Guid.NewGuid()
+                },
+                new()
+                {
+                    ConfigurationGuid = ConfigGuids[3],
+                    Name = ConfigNames.Last(),
+                    DepartmentRollupGlobalId = string.Empty,
+                    ServiceLineDimensionGuid = Guid.NewGuid()
+                }
+            };
+            _dimension = new ScoreDimensionInfoDto
+            {
+                FriendlyName = "test",
+                DimensionGuid = Guid.NewGuid(),
+                DefaultHierarchyGuid = Guid.NewGuid()
+            };
+            _hierarchies = new List<ScoreHierarchyDto>
+            {
+                new ScoreHierarchyDto
+                {
+                    FriendlyName = "test",
+                    HierarchyGuid = _dimension.DefaultHierarchyGuid
+                }
+            };
+            _hierarchyNodes = new List<HierarchyNodeDto>
+            {
+                new HierarchyNodeDto
+                {
+                    Name = "Case Type",
+                    Path = "CaseType|CaseType|1"
+                }
+            };
+            _jobResponse = new JobEnqueuedResponse
+            {
+                JobId = Guid.NewGuid()
+            };
+            _filterHelpers = new List<FilterHelper>
+            {
+                new FilterHelper
+                {
+                    Text = "Case Type",
+                    Id = "CaseType|CaseType|1"
+                }
+            };
+
+            _hangfireServiceMock.Setup(moq =>
+                    moq.EnqueueJobAsync(It.IsAny<EnqueueJobDto>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_jobResponse));
+
+            _configurationMock.Setup(moq => moq.GetConfigurationAsync(It.Is<Guid>(c => c == ConfigGuids[0]), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_configurations[0]));
+            _configurationMock.Setup(moq => moq.GetConfigurationAsync(It.Is<Guid>(c => c == ConfigGuids[1]), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_configurations[1]));
+            _configurationMock.Setup(moq => moq.GetConfigurationAsync(It.Is<Guid>(c => c == ConfigGuids[2]), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_configurations[2]));
+            _configurationMock.Setup(moq => moq.GetConfigurationAsync(It.Is<Guid>(c => c == _configurations.Last().ConfigurationGuid), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_configurations.Last()));
+
+            _schemaServiceMock.Setup(moq => moq.GetDimensionByGlobalIdAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_dimension));
+            _schemaServiceMock.Setup(moq => moq.GetDimensionByIdAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_dimension));
+            _schemaServiceMock.Setup(moq => moq.GetScoreHierarchiesByGlobalIdAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_hierarchies.AsEnumerable()));
+            _schemaServiceMock.Setup(moq => moq.GetHierarchyNodesByHierarchyGuidAsync(It.IsAny<Guid>(),
+                    It.IsAny<HierarchyNodeParametersDto>(), It.IsAny<List<ExtraFilterDto>>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_hierarchyNodes.AsEnumerable()));
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Asc()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var allOpportunityService = new AllOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            var filters = new AllFilters()
+            {
+                OpportunityTypes = new List<string>(),
+                IdentifiedSavings = 0,
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid
+            };
+
+            var pagingOptions = new PagingOptions("IdentifiedSavings", SortOrder.Asc);
+
+            // act
+            var taskResult = await allOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<AllOpportunity>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().IdentifiedSavings
+                .Should().BeLessThan(taskResult.Data.Last().IdentifiedSavings);
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Desc()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var allOpportunityService = new AllOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            var filters = new AllFilters()
+            {
+                OpportunityTypes = new List<string>(),
+                IdentifiedSavings = 0,
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid
+            };
+
+            var pagingOptions = new PagingOptions("IdentifiedSavings", SortOrder.Desc);
+
+            // act
+            var taskResult = await allOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<AllOpportunity>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().IdentifiedSavings
+                .Should().BeGreaterThan(taskResult.Data.Last().IdentifiedSavings);
+        }
+
+        [TestCaseSource(nameof(GetFilterData))]
+        public void TestValidateFilters(AllFilters filters)
+        {
+            if (filters == null) return;
+            if (filters.OpportunityTypes.Any())
+                filters.OpportunityTypes.Should()
+                    .AllBeOfType<string>()
+                    .And.NotBeNullOrEmpty();
+        }
+
+        [Test]
+        public async Task TestGetExcelWorkbook()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opp = framework.ENOpportunities.First();
+            var filters = new AllFilters()
+            {
+                ConfigurationGuid = framework.Configurations.First().ConfigurationGuid,
+                OpportunityTypes = new[] {$"{(int)OpportunityTypes.Variation}",
+                $"{(int)OpportunityTypes.QualityVariation}",
+                $"{(int)OpportunityTypes.FreeForm}",
+                $"{(int)OpportunityTypes.GeneralLedger}",
+                $"{(int)OpportunityTypes.Payroll}",
+                $"{(int)OpportunityTypes.Encounter}" },
+            };
+            var service = new AllOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var wb = await service.ExportAsync(new SortOptions(), filters, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\Git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "AllExcelFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            wb.Worksheets.Should().HaveCount(1);
+            var ws = wb.Worksheet(1);
+            ws.Should().NotBeNull();
+
+            var expected = @"Examples.AllOpportunity.ExcelFilter.xlsx";
+            using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+            using (var actualStream = new MemoryStream())
+            {
+                wb.SaveAs(actualStream);
+                actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+            }
+        }
+
+        [Test]
+        public async Task TestGetExcelWorkbookNullFilter()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var service = new AllOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var wb = await service.ExportAsync(null, null, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\Git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "AllExcelNullFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            wb.Worksheets.Should().HaveCount(1);
+            var ws = wb.Worksheet(1);
+            ws.Should().NotBeNull();
+
+            var expected = @"Examples.AllOpportunity.ExcelNullFilter.xlsx";
+            using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+            using (var actualStream = new MemoryStream())
+            {
+                wb.SaveAs(actualStream);
+                actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetFilterOptionsAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunityService = new AllOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                var taskResult = await opportunityService
+                    .GetFilterOptionsAsync(new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                    return;
+                }
+                taskResult.Should()
+                    .BeOfType<AllFilterOptions>()
+                    .And.NotBeNull();
+                taskResult.OpportunityTypes.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty()
+                    .And.NotContain(cd => string.IsNullOrEmpty(cd.Id))
+                    .And.NotContain(cd => string.IsNullOrEmpty(cd.Text));
+            }
+            catch (NotImplementedException nie)
+            {
+                nie.Should().BeOfType<NotImplementedException>();
+            }
+            catch (AssertionException ae)
+            {
+                ae.Should().BeOfType<AssertionException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [Test, Ignore("Handled by the other services")]
+        public async Task TestSetHidden()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunities = framework.ENOpportunities;
+            var opportunity = opportunities.First(vo => !vo.IsHidden);
+            var isHidden = opportunity.IsHidden;
+            var service = new AllOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            await service.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden, CancellationToken.None);
+
+            // assert
+            var result = await service.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            result.IsHidden.Should().Be(!isHidden);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var allOpportunityService = new AllOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            try
+            {
+                var opportunities = allOpportunityService.GetAllAsync(cancellationToken).Result;
+                var opportunity = opportunities.FirstOrDefault(o => o.IsHidden);
+                if (opportunity == null) return;
+                var isHidden = opportunity.IsHidden;
+
+                //act
+                await allOpportunityService.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden,
+
+                    cancellationToken);
+
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;
+
+                var result = allOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;
+
+                result.IsHidden.Should().Be(!isHidden);
+            }
+            catch (Exception e)
+            {
+                switch (e.GetType().Name)
+                {
+                    case "AggregateException":
+                    case "OperationCanceledException":
+                        return;
+                }
+                e.Should().NotBeOfType<Exception>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.ENOpportunities.FirstOrDefault(o => o.IsHidden);
+            if (opportunity == null) return;
+            var isHidden = opportunity.IsHidden;
+            var allOpportunityService = new AllOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                await allOpportunityService.SetHiddenAsync(Guid.Empty, !isHidden,
+                    cancellationToken);
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var allOpportunityService = new AllOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            try
+            {
+                var opportunities = allOpportunityService.GetAllAsync(cancellationToken).Result;
+
+                var opportunity = opportunities.FirstOrDefault(o => o.Note == string.Empty);
+
+                if (opportunity == null) return;
+
+                var note = "new test note";
+                // act
+                await allOpportunityService.SetNoteAsync(opportunity.OpportunityGuid, note,
+                    CancellationToken.None);
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;
+                var result = allOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;
+                result.Note.Should().Be(note);
+
+                // assert
+            }
+            catch (Exception e)
+            {
+                switch (e.GetType().Name)
+                {
+                    case "AggregateException":
+                    case "OperationCanceledException":
+                        return;
+                }
+                e.Should().NotBeOfType<Exception>();
+            }
+        }
+
+        [Test, Ignore("Handled by the other services")]
+        public async Task TestSetNote()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunities = framework.ENOpportunities;
+            var opportunity = opportunities.First(vo => string.IsNullOrEmpty(vo.Note));
+            var note = opportunity.Note;
+            var expected = "Now is the time for all good engineers to write great code!";
+            var service = new AllOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            await service.SetNoteAsync(opportunity.OpportunityGuid, expected, CancellationToken.None);
+
+            // assert
+            var result = await service.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            result.Note.Should().NotBeNullOrEmpty()
+                .And.NotBe(note)
+                .And.Be(expected);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.ENOpportunities.FirstOrDefault(o => o.Note == string.Empty);
+            if (opportunity == null) return;
+            var note = "new test note";
+            var allOpportunityService = new AllOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                await allOpportunityService.SetNoteAsync(Guid.Empty, note, cancellationToken);
+
+                // assert
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetAllAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var allOpportunityService = new AllOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var taskResult = await allOpportunityService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetById(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var allOpportunityService = new AllOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var tempResult = await allOpportunityService.GetAllAsync(CancellationToken.None);
+            var taskResult =
+                await allOpportunityService.GetById(tempResult.FirstOrDefault()?.OpportunityGuid ?? Guid.Empty, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNull();
+            }
+            else
+            {
+                taskResult.Should().NotBeNull()
+                    .And.BeOfType<AllOpportunity>();
+            }
+
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetByIds(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var allOpportunityService = new AllOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var tempResult = await allOpportunityService.GetAllAsync(CancellationToken.None);
+            var ids = tempResult.Select(o => o.OpportunityGuid);
+            var taskResult = await allOpportunityService.GetByIds(ids, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty()
+                    .And.AllBeOfType<AllOpportunity>()
+                    .And.HaveCount(ids.Count());
+            }
+
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            // Method intentionally left empty.
+        }
+
+        #region TestCaseData
+
+        public static IEnumerable<TestCaseData> GetFilterData()
+        {
+            yield return new TestCaseData(new AllFilters { ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("No Filters");
+            yield return new TestCaseData(new AllFilters { ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("View Visible");
+            yield return new TestCaseData(new AllFilters { ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Not View Visible");
+            yield return new TestCaseData(new AllFilters { IdentifiedSavings = 1999, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings");
+            yield return new TestCaseData(new AllFilters { IdentifiedSavings = 999, ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings Not ViewVisible");
+            yield return new TestCaseData(new AllFilters { OpportunityTypes = new[] { "Entity" }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By OpportunityTypes");
+            yield return new TestCaseData(new AllFilters { OpportunityTypes = new[] { "Provider" }, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), ViewVisible = false })
+                .SetName("By OpportunityTypes Not ViewVisible");
+            yield return new TestCaseData(new AllFilters { OpportunitySearch = "EN - 101", ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Search By Id");
+            yield return new TestCaseData(new AllFilters { ExcludeInitiatives = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Exclude Opportunities with Initiatives");
+        }
+
+        //public static IEnumerable<TestCaseData> GetAllOpportunityDataModel()
+        //{
+        //    return from configGuid in ConfigGuids
+        //           from EncounterGroup encounterGroup in Enum.GetValues(typeof(EncounterGroup))
+        //           where encounterGroup != EncounterGroup.Both
+        //           from EncounterOpportunityLevel encounterOpportunityLevel in Enum.GetValues(typeof(EncounterOpportunityLevel))
+        //           from encounterGroups in new[] { true, false }
+        //           from OpportunityTypes in new[] { true, false }
+        //           select new TestCaseData(new AllOpportunityDataModel
+        //           {
+        //               ConfigurationGuid = configGuid,
+        //               EncounterGroup = (int)encounterGroup,
+        //               EncounterOpportunityLevel = encounterOpportunityLevel,
+        //               HasAllEncounterGroups = encounterGroups,
+        //               CaseTypes = encounterGroup == EncounterGroup.CaseType
+        //               ? new List<FilterHelper>
+        //               {
+        //                new() {Text = $"{encounterGroup}", Id = "Id"}
+        //               }
+        //               : new List<FilterHelper>(),
+        //               PatientPopulations = encounterGroup == EncounterGroup.PatientPopulation
+        //               ? new List<FilterHelper>
+        //               {
+        //                new () {Text = $"{encounterGroup}", Id = "Id"}
+        //               }
+        //               : new List<FilterHelper>(),
+        //               HasAllOpportunityTypes = OpportunityTypes,
+        //               Entities = encounterOpportunityLevel == EncounterOpportunityLevel.Entity
+        //               ? new List<FilterHelper>
+        //               {
+        //                new () {Text = $"{encounterOpportunityLevel}", Id = "Id"}
+        //               }
+        //               : new List<FilterHelper>(),
+        //               ServiceLines = encounterOpportunityLevel == EncounterOpportunityLevel.ServiceLine
+        //               ? new List<FilterHelper>
+        //               {
+        //                new () {Text = $"{encounterOpportunityLevel}", Id = "Id"}
+        //               }
+        //               : new List<FilterHelper>(),
+        //               Specialties = encounterOpportunityLevel == EncounterOpportunityLevel.Specialty
+        //               ? new List<FilterHelper>
+        //               {
+        //                new () {Text = $"{encounterOpportunityLevel}", Id = "Id"}
+        //               }
+        //               : new List<FilterHelper>(),
+        //               Providers = encounterOpportunityLevel == EncounterOpportunityLevel.Provider
+        //               ? new List<FilterHelper>
+        //               {
+        //                new () {Text = $"{encounterOpportunityLevel}", Id = "Id"}
+        //               }
+        //               : new List<FilterHelper>()
+        //           }).SetName($"{nameof(TestCreateAsync)} {ConfigNames[ConfigGuids.IndexOf(configGuid)]} IsUsingCustomEntityDim: {(ConfigGuids.IndexOf(configGuid) == 1)}  IsUsingSg2: {(ConfigGuids.IndexOf(configGuid) == 3)} {encounterGroup} {encounterOpportunityLevel}");
+        //}
+
+        #endregion
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/All/OpportunityTypesExtensions.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/All/OpportunityTypesExtensions.cs
new file mode 100644
index 0000000..5381458
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/All/OpportunityTypesExtensions.cs
@@ -0,0 +1,30 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+
+namespace Strata.ContinuousImprovement.Test.Unit.Biz.All
+{
+    public static class OpportunityTypesExtensions
+    {
+        public static string OpportunityTypeName(this OpportunityTypes opportunityType)
+        {
+            switch (opportunityType)
+            {
+                case OpportunityTypes.Variation:
+                    return "Utilization Variation";
+                case OpportunityTypes.StaffingToDemand:
+                    return "Staffing To Demand";
+                case OpportunityTypes.QualityVariation:
+                    return "Quality Variation";
+                case OpportunityTypes.FreeForm:
+                    return "Free Form";
+                case OpportunityTypes.GeneralLedger:
+                    return "General Ledger";
+                case OpportunityTypes.Payroll:
+                    return "Payroll";
+                case OpportunityTypes.Encounter:
+                    return "Encounter";
+                default:
+                    return "";
+            }
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/ChargeCode/Opportunities/CCOpportunityServiceTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/ChargeCode/Opportunities/CCOpportunityServiceTests.cs
new file mode 100644
index 0000000..c9d2dbf
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/ChargeCode/Opportunities/CCOpportunityServiceTests.cs
@@ -0,0 +1,253 @@
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.ChargeCode;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.Schema.Client.Dtos;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.ChargeCode.Opportunities
+{
+    [TestFixture()]
+    public class CCOpportunityServiceTests : OpportunityServiceTests
+    {
+        public IJazzDbContext DbContext { get; set; }
+        private IAsyncDbContextFactory<JazzDbContext> _dbContextFactory { get; set; }
+        public ICCOpportunityService CCOpportunityService { get; set; }
+        public IOptions<ChargeCodeOpportunityValidationSection> SectionAccessor { get; set; }
+        public ILogger<CCOpportunityService> Logger { get; set; }
+
+        [SetUp]
+        public void TestSetup()
+        {
+            var chargeCodeDimensionGuid = Guid.NewGuid();
+            var caseTypeDimensionGuid = Guid.NewGuid();
+            Mock.Get(SchemaServiceClient)
+                .Setup(s => s.GetDimensionByGlobalIdAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .Returns<string, CancellationToken>((globalId, token) =>
+                    globalId switch
+                    {
+                        "Charge Code" => Task.FromResult(new Schema.Client.Dtos.Info.ScoreDimensionInfoDto { DimensionGuid = chargeCodeDimensionGuid }),
+                        "Case Type" => Task.FromResult(new Schema.Client.Dtos.Info.ScoreDimensionInfoDto { DimensionGuid = caseTypeDimensionGuid }),
+                        _ => Task.FromResult(new Schema.Client.Dtos.Info.ScoreDimensionInfoDto { DimensionGuid = Guid.NewGuid() })
+                    });
+            Mock.Get(SchemaServiceClient)
+                .Setup(x => x.GetHierarchyNodesFromHierarchyPathsAsync(It.IsAny<Guid>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, IEnumerable<string>, CancellationToken>((dimensionGuid, codeHpaths, token)
+                    => Task.FromResult(new List<HierarchyNodeDto> {
+                        new HierarchyNodeDto{
+                            Path = "Path",
+                            PathDisplay = "PathDisplay",
+                            Name = "Name",
+                            Count = 10,
+                            IsLeaf= false
+                        }
+                    }.AsEnumerable()));
+            Mock.Get(SchemaServiceClient)
+                .Setup(x => x.GetDimensionMembersFromHierarchyPathsAsync(It.IsAny<Guid>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, IEnumerable<string>, CancellationToken>((dimensionGuid, codeHpaths, token)
+                    => Task.FromResult(new List<MemberDto> {
+                        new MemberDto
+                        {
+                            Name ="Name",
+                            Id = "02"
+                        }
+                    }.AsEnumerable()));
+            Mock.Get(SchemaServiceClient)
+                .Setup(x => x.GetFilteredDimensionMembersByGlobalIdAsync<ChargeCodePickerModel>(It.IsAny<string>(), It.IsAny<List<int>>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(new List<ChargeCodePickerModel> {
+                        new ChargeCodePickerModel(){
+                            ChargeCodeId = 99,
+                            Name = "TestName",
+                            CostDriver = "TestCostDriver",
+                            Rollup = "TestRollup"
+                        }
+                    }.AsEnumerable()));
+            var principal = TestUtilities.GetClaimsPrincipalAccessor();
+            var defaultUser = principal.GetCurrentClaimsPrincipal();
+            Mock.Get(ClaimsPrincipalAccessor)
+                .Setup(x => x.GetCurrentClaimsPrincipal())
+                .Returns(defaultUser);
+
+            SectionAccessor = Mock.Of<IOptions<ChargeCodeOpportunityValidationSection>>();
+            Mock.Get(SectionAccessor)
+                .Setup(x => x.Value)
+                .Returns(new ChargeCodeOpportunityValidationSection
+                {
+                    MaxChargeCodeSelections = 10,
+                    MaxOpportunityLevelSelections = 10,
+                });
+            Logger = Mock.Of<ILogger<CCOpportunityService>>();
+
+            CCOpportunityService = new CCOpportunityService(DbContextFactory,
+                null, // CentralDbContext,
+                ClaimsPrincipalAccessor,
+                ConfigurationService,
+                AuthorizationServiceClient,
+                IdServiceClient,
+                FiscalMonthResolver,
+                SchemaServiceClient,
+                BackgroundJobClient,
+                NotificationHubContext,
+                SectionAccessor,
+                InitiativeService,
+                SnowflakeDatabaseContext,
+                UpdateFactOpportunitySavingsService,
+                Logger);
+        }
+
+        [Test()]
+        public async Task CCOpportunityServiceTest()
+        {
+            await Verifier.Verify(CCOpportunityService, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test()]
+        public async Task GetDbContextAsyncTest()
+        {
+            var dbContext = await CCOpportunityService.GetDbContext(CancellationToken.None);
+            var names = dbContext.AllOpportunities.Select(opp => $"All - {opp.Name} {opp.OpportunityId}").ToList();
+            names.AddRange(dbContext.ChargeCodeOpportunities.Select(opp => opp.Name ?? ""));
+            names.AddRange(dbContext.EncounterOpportunities.Select(opp => opp.Name ?? ""));
+            names.AddRange(dbContext.FFOpportunities.Select(opp => opp.Name ?? ""));
+            names.AddRange(dbContext.GeneralLedgerOpportunities.Select(opp => opp.Name ?? ""));
+            names.AddRange(dbContext.Initiatives.Select(opp => $"Initiative - {opp.Name} {opp.OpportunityId}"));
+            names.AddRange(dbContext.PayrollOpportunities.Select(opp => opp.Name ?? ""));
+            names.AddRange(dbContext.VariationOpportunities.Where(opp => opp.OpportunityKey.StartsWith("UV"))
+                .Select(opp => $"{opp.CostDriver ?? ""} {opp.ServiceLineName ?? ""} {opp.EntityName ?? ""} {opp.OpportunityId}"));
+            await Verifier.Verify(new
+            {
+                names = names.Distinct().OrderBy(x => x),
+                counts = new[] {
+                    dbContext.Configurations.Count(),
+                    dbContext.AllOpportunities.Count(opp => !opp.OpportunityKey.StartsWith("FE")),
+                    dbContext.ChargeCodeOpportunities.Count(),
+                    dbContext.EncounterOpportunities.Count(),
+                    dbContext.FFOpportunities.Count(),
+                    dbContext.GeneralLedgerOpportunities.Count(),
+                    dbContext.Initiatives.Count(),
+                    dbContext.PayrollOpportunities.Count(),
+                    dbContext.VariationOpportunities.Count(opp => opp.OpportunityKey.StartsWith("UV"))
+                }
+            }, VerifySettings)
+                .IgnoreInstance<Guid>((x) => true)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test()]
+        public async Task GetChargeCodeCustomPickerMembersAsyncTest()
+        {
+            var result = await CCOpportunityService.GetChargeCodePickerModelMembers(new List<string>
+            {
+                "CC 1"
+            }, CancellationToken.None);
+            await Verifier.Verify(result, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test()]
+        public async Task ValidateOpportunityLevelsAsyncTest()
+        {
+            Assert.Inconclusive();
+        }
+
+        [Test()]
+        public async Task CreateAsyncTest()
+        {
+            Assert.Inconclusive();
+        }
+
+        [Test(), Ignore("Still working on this")]
+        public async Task UpdateAsyncTest()
+        {
+            var dbGuid = JazzEntityFrameworkFactory.DatabaseGuid;
+            var opportunities = JAZZ_Framework.ChargeCodeOpportunities;
+            var opportunity = opportunities.FirstOrDefault();
+            opportunity.Name += " Updated";
+
+            var result = await CCOpportunityService.UpdateAsync(dbGuid, opportunity, CancellationToken.None);
+            await Verifier.Verify(result, VerifySettings)
+                .DontScrubGuids()
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test()]
+        public async Task GetByIdTest()
+        {
+            var opportunities = JAZZ_Framework.CCOpportunities;
+            var opportunity = opportunities.FirstOrDefault();
+
+            var result = await CCOpportunityService.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            result.Configuration = null;
+            await Verifier.Verify(result, VerifySettings)
+                .DontScrubGuids()
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test()]
+        public async Task DeleteAsyncTest()
+        {
+            Assert.Inconclusive();
+        }
+
+        [Test()]
+        public async Task GetInitiativeInfoAsyncTest()
+        {
+            var opportunities = JAZZ_Framework.CCOpportunities;
+            var opportunity = opportunities.FirstOrDefault();
+
+            var result = await CCOpportunityService.GetInitiativeInfoAsync(opportunity.OpportunityGuid, CancellationToken.None);
+            await Verifier.Verify(result, VerifySettings)
+                .DontScrubGuids()
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test()]
+        public async Task RefreshOpportunityTrackingDataTest()
+        {
+            Assert.Inconclusive();
+        }
+
+        [Test(), Ignore("Still working on this")]
+        public async Task ExportAsyncTest()
+        {
+            var opportunities = JAZZ_Framework.CCOpportunities;
+            var opportunity = opportunities.FirstOrDefault();
+
+            var export = await CCOpportunityService.ExportAsync(opportunity.OpportunityGuid, new string[] { "CC 1" }, "", CancellationToken.None);
+            var result = export.GetDataTables();
+            await Verifier.Verify(result, VerifySettings)
+                .DontScrubGuids()
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test()]
+        public async Task UpdateGoalTotalUnitsOfServiceAsyncTest()
+        {
+            var opportunities = JAZZ_Framework.CCOpportunities;
+            var opportunity = opportunities.FirstOrDefault();
+
+            var result = await CCOpportunityService.UpdateGoalTotalUnitsOfServiceAsync(opportunity.OpportunityGuid, "|CC 1|", 100, CancellationToken.None);
+            //await Verifier.Verify(result, VerifySettings)
+            //    .DontScrubGuids()
+            //    .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test()]
+        public async Task UpdateGoalCostPerUnitAsyncTest()
+        {
+            Assert.Inconclusive();
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/ChargeCode/Opportunities/OpportunityDetailLevelQueryTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/ChargeCode/Opportunities/OpportunityDetailLevelQueryTests.cs
new file mode 100644
index 0000000..44c63bb
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/ChargeCode/Opportunities/OpportunityDetailLevelQueryTests.cs
@@ -0,0 +1,78 @@
+using Microsoft.Data.SqlClient;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using VerifyNUnit;
+using VerifyTests;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.ChargeCode.Opportunities
+{
+    [TestFixture, Category("Unit")]
+    public class OpportunityDetailLevelQueryTests
+    {
+        private VerifySettings _verifySettings;
+
+        [SetUp]
+        public void TestSetup()
+        {
+            _verifySettings = TestExtensions.TestSettings();
+        }
+
+        [TestCaseSource(nameof(OpportunityDetailLevelQueryTestCases))]
+        public async Task OpportunityDetailLevelQueryTest(OpportunityLevel opportunityLevel, QueryHelper encounterQueryHelper,
+            QueryHelper opportunityLevelQueryHelper)
+        {
+            var query = new OpportunityDetailLevelQuery(opportunityLevel, encounterQueryHelper, opportunityLevelQueryHelper);
+            var result = query.GetQuery();
+            await Verifier.Verify(result, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        public static IEnumerable<TestCaseData> OpportunityDetailLevelQueryTestCases()
+        {
+            var configuration = Mock.Of<Biz.Configuration.Configuration>();
+            configuration.DepartmentRollupGlobalId = "";
+            var sqlParameters = new SqlParameter[] {
+                new SqlParameter("@chargeCodeIds", new List<int> { 1, 2, 3 }),
+                new SqlParameter("@caseTypeIds", new List<int> { 1, 2, 3 }),
+                new SqlParameter("@startDate", new DateTime(2023,1,1)),
+                new SqlParameter("@endDate", new DateTime(2024,1,1)),
+                new SqlParameter("@isBaseline", true)
+            };
+
+            foreach (var parameterName in new[] { "@caseTypeIds", "@indicatorIds" })
+            {
+                sqlParameters[1].ParameterName = parameterName;
+                foreach (var isUsingSnowflake in new[] { true, false })
+                {
+                    foreach (var oppLevel in Enum.GetValues<OpportunityLevel>())
+                    {
+                        switch (oppLevel)
+                        {
+                            case OpportunityLevel.ServiceLine:
+                                foreach (var serviceLine in new[] { "Sg2 Service Line Crosswalk", "Service Line" })
+                                {
+                                    yield return new TestCaseData(oppLevel,
+                                        new EncounterGroupQueryHelper(sqlParameters),
+                                        new OpportunityLevelQueryHelper(oppLevel, configuration, serviceLine, $"{(serviceLine.Replace(" ", ""))}Id"))
+                                        .SetName($"{{m}} {Enum.GetName<OpportunityLevel>(oppLevel)} {parameterName.Substring(1)} {serviceLine} {(isUsingSnowflake ? "Snowflake" : "")}");
+                                }
+                                break;
+                            default:
+                                yield return new TestCaseData(oppLevel,
+                                    new EncounterGroupQueryHelper(sqlParameters),
+                                    new OpportunityLevelQueryHelper(oppLevel, configuration, "", ""))
+                                    .SetName($"{{m}} {Enum.GetName<OpportunityLevel>(oppLevel)} {parameterName.Substring(1)} Default {(isUsingSnowflake ? "Snowflake" : "")}");
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/ChargeCode/Opportunities/OpportunityDetailQueryTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/ChargeCode/Opportunities/OpportunityDetailQueryTests.cs
new file mode 100644
index 0000000..6a52639
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/ChargeCode/Opportunities/OpportunityDetailQueryTests.cs
@@ -0,0 +1,85 @@
+using Microsoft.Data.SqlClient;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using VerifyNUnit;
+using VerifyTests;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.ChargeCode.Opportunities
+{
+    [TestFixture, Category("Unit")]
+    public class OpportunityDetailQueryTests
+    {
+        private VerifySettings _verifySettings;
+        private Biz.Configuration.Configuration _configuration;
+
+        [SetUp]
+        public void TestSetup()
+        {
+            _configuration = Mock.Of<Biz.Configuration.Configuration>();
+            _verifySettings = TestExtensions.TestSettings();
+        }
+
+        [TestCaseSource(nameof(OpportunityDetailQueryTestCases))]
+        public async Task OpportunityDetailQueryTest(OpportunityLevel opportunityLevel, IEnumerable<SqlParameter> sqlParameters, QueryHelper encounterQueryHelper, QueryHelper opportunityLevelQueryHelper, bool isUsingSnowflake)
+        {
+            var query = new OpportunityDetailQuery(opportunityLevel, encounterQueryHelper, opportunityLevelQueryHelper, isUsingSnowflake);
+            var result = isUsingSnowflake
+                ? query.GetQuery().ConvertSqlToSnowflakeParameterSyntax()
+                : query.GetQuery().InterpolateQueryArrayValues(ref sqlParameters);
+            await Verifier.Verify(result, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        public static IEnumerable<TestCaseData> OpportunityDetailQueryTestCases()
+        {
+            var configuration = Mock.Of<Biz.Configuration.Configuration>();
+            configuration.DepartmentRollupGlobalId = "";
+            var sqlParameters = new SqlParameter[] {
+                new SqlParameter("@chargeCodeIds", new List<int> { 1, 2, 3 }),
+                new SqlParameter("@caseTypeIds", new List<int> { 7, 8, 9 }),
+                new SqlParameter("@oppLevelIds", new List<int>{ 4, 5, 6 }),
+                new SqlParameter("@startDate", new DateTime(2023,1,1)),
+                new SqlParameter("@endDate", new DateTime(2024,1,1)),
+                new SqlParameter("@isBaseline", true)
+            };
+
+            foreach (var parameterName in new[] { "@caseTypeIds", "@indicatorIds" })
+            {
+                sqlParameters[1].ParameterName = parameterName;
+                foreach (var isUsingSnowflake in new[] { true, false })
+                {
+                    foreach (var oppLevel in Enum.GetValues<OpportunityLevel>())
+                    {
+                        switch (oppLevel)
+                        {
+                            case OpportunityLevel.ServiceLine:
+                                foreach (var serviceLine in new[] { "Sg2 Service Line Crosswalk", "Service Line" })
+                                {
+                                    yield return new TestCaseData(oppLevel, sqlParameters,
+                                        new EncounterGroupQueryHelper(sqlParameters),
+                                        new OpportunityLevelQueryHelper(oppLevel, configuration, serviceLine, $"{(serviceLine.Replace(" ", ""))}Id"), isUsingSnowflake)
+                                        .SetName($"{{m}} {Enum.GetName<OpportunityLevel>(oppLevel)} {parameterName.Substring(1)} {serviceLine} {(isUsingSnowflake ? "Snowflake" : "")}");
+                                }
+                                break;
+                            default:
+                                yield return new TestCaseData(oppLevel, sqlParameters,
+                                    new EncounterGroupQueryHelper(sqlParameters),
+                                    new OpportunityLevelQueryHelper(oppLevel, configuration, "", ""), isUsingSnowflake)
+                                    .SetName($"{{m}} {Enum.GetName<OpportunityLevel>(oppLevel)} {parameterName.Substring(1)} Default {(isUsingSnowflake ? "Snowflake" : "")}");
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Configuration/ConfigurationServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Configuration/ConfigurationServiceTest.cs
new file mode 100644
index 0000000..74df6f5
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Configuration/ConfigurationServiceTest.cs
@@ -0,0 +1,124 @@
+using FluentAssertions;
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Configuration
+{
+    [TestFixture, Category("Unit")]
+    public class ConfigurationServiceTest
+    {
+
+        private Mock<IConfigurationService> _configurationServiceMock;
+        private Mock<IAsyncDbContextFactory<JazzDbContext>> _dbContextFactoryMock;
+        private Mock<IJazzDbContext> _jazzDbContextMock;
+        private Mock<IFiscalMonthResolver> _fiscalMonthResolverMock;
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _configurationServiceMock = new Mock<IConfigurationService>();
+            _dbContextFactoryMock = new Mock<IAsyncDbContextFactory<JazzDbContext>>();
+            _jazzDbContextMock = new Mock<IJazzDbContext>();
+            _fiscalMonthResolverMock = new Mock<IFiscalMonthResolver>();
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetDefaultConfigurationMock(JazzEntityFrameworkFactory framework, CancellationToken cancellationToken)
+        {
+            // arrange
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var dfltConfiguration = framework.Configurations.OrderBy(c => c.DisplayOrder).First();
+            _configurationServiceMock
+                .Setup(vos => vos
+                    .GetDefaultConfigurationAsync(It.IsAny<CancellationToken>()))
+                .ReturnsAsync(dfltConfiguration);
+            var logger = Mock.Of<ILogger<ConfigurationService>>();
+            var _configurationService = new ConfigurationService(framework, null, null, logger, _fiscalMonthResolverMock.Object);
+            try
+            {
+                // act
+                var taskResult = await _configurationService.GetDefaultConfigurationAsync(cancellationToken);
+
+                // assert
+                if (taskResult == null)
+                {
+                    framework.JazzDbContext.Should().BeNull();
+                    return;
+                }
+                taskResult.Should().BeOfType<Biz.Configuration.Configuration>();
+                taskResult.Name.Should().Be(dfltConfiguration.Name);
+                taskResult.DisplayOrder.Should().Be(dfltConfiguration.DisplayOrder);
+            }
+            catch (OperationCanceledException)
+            {
+                cancellationToken.Should().NotBe(CancellationToken.None);
+            }
+            catch (Exception)
+            {
+                // Intentionally left empty
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetDefaultConfiguration(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            try
+            {
+                // arrange
+                var logger = Mock.Of<ILogger<ConfigurationService>>();
+                await jazzEntityFrameworkFactory.CreateDbContextAsync(CancellationToken.None);
+                var configurationService = new ConfigurationService(jazzEntityFrameworkFactory, null, null, logger, _fiscalMonthResolverMock.Object);
+
+                // act
+                var taskResult = await configurationService.GetDefaultConfigurationAsync(cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                }
+                else
+                {
+                    taskResult.Should().NotBeNull()
+                        .And.BeOfType<Biz.Configuration.Configuration>();
+                    taskResult.QVIOpportunityBreakdownName.Should().NotBeNullOrEmpty();
+                    taskResult.QVIOpportunityBreakdownNamePlural.Should().NotBeNullOrEmpty();
+                    taskResult.QVIOpportunityBreakdownEnum.Should()
+                        .Be((int)taskResult.QVIOpportunityBreakdown);
+                }
+            }
+            catch (AggregateException ae)
+            {
+                ae.Should().NotBeOfType<AggregateException>();
+            }
+            catch (InvalidOperationException ioe)
+            {
+                ioe.Should().NotBeOfType<InvalidOperationException>();
+            }
+            catch (OperationCanceledException)
+            {
+                cancellationToken.Should().NotBe(CancellationToken.None);
+            }
+            catch (Exception)
+            {
+                // Intentionally left blank
+            }
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            // Method intentionally left empty.
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Configuration/ConfigurationTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Configuration/ConfigurationTest.cs
new file mode 100644
index 0000000..c68f358
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Configuration/ConfigurationTest.cs
@@ -0,0 +1,244 @@
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Generics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using config = Strata.ContinuousImprovement.Biz.Configuration;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Configuration
+{
+
+    [TestFixture, Category("Unit")]
+    public class ConfigurationTest
+    {
+        private IEnumerable<OpportunityTypes> excludedOpportTypes = new List<OpportunityTypes>()
+        {
+            OpportunityTypes.Blank,
+            OpportunityTypes.Network
+        };
+        private IEnumerable<OpportunityTypes> OpportTypes { get; set; }
+
+        [OneTimeSetUp]
+        public void OneTimeSetup()
+        {
+            OpportTypes = Enum.GetValues(typeof(OpportunityTypes))
+                .Cast<OpportunityTypes>()
+                .Where(x => !excludedOpportTypes.Contains(x));
+        }
+
+        [TestCaseSource(nameof(ConfigTestCases))]
+        public void TestConfiguration(string rollup, string ids, int breakdown,
+            IEnumerable<int> configuredIds, string name, string plural)
+        {
+            var config = new config.Configuration
+            {
+                DepartmentRollupGlobalId = rollup,
+                EntityIdsCSV = string.IsNullOrEmpty(rollup) ? "" : ids,
+                CustomEntityIdsCSV = string.IsNullOrEmpty(rollup) ? ids : "",
+                QVIOpportunityBreakdown = (Biz.Configuration.Configuration.QVIOpportunityBreakdowns)breakdown
+            };
+            config.ConfiguredEntityIds.Should().AllBeEquivalentTo(configuredIds);
+            config.QVIOpportunityBreakdownEnum.Should().Be(breakdown);
+            config.QVIOpportunityBreakdownName.Should().Be(name);
+            config.QVIOpportunityBreakdownNamePlural.Should().Be(plural);
+            config.ServiceLineDimensionGuid.Should().BeEmpty();
+        }
+
+        [TestCaseSource(nameof(StartEndDateTestCases))]
+        public void TestGetBaselineStartDate(DateTime expectedStartDate, DateTime endDate)
+        {
+            var configuration = GetConfigurationByDate(endDate);
+            var opportunityTypeIds = Enum.GetValues<OpportunityTypes>().Cast<byte>().ToList();
+            foreach (var opType in OpportTypes.Where(t => opportunityTypeIds.Contains((byte)t)))
+            {
+                var actualStartDate = configuration.GetBaselineStartDate(opType);
+                actualStartDate.Should().Be(expectedStartDate);
+            }
+        }
+
+        [TestCaseSource(nameof(StartEndDateTestCases))]
+        public void TestGetLastFiscalYearStartDate(DateTime expectedStartDate, DateTime endDate)
+        {
+            var configuration = GetConfigurationByDate(endDate, true);
+
+            var actualStartDate = configuration.GetLastFiscalYearStartDate();
+            expectedStartDate = expectedStartDate.AddYears(-1);
+            actualStartDate.Should().Be(expectedStartDate);
+        }
+
+        [TestCaseSource(nameof(StartEndDateTestCases))]
+        public void TestGetFiscalYearStartDate(DateTime expectedStartDate, DateTime endDate)
+        {
+            var configuration = GetConfigurationByDate(endDate, true);
+
+            var actualStartDate = configuration.GetFiscalYearStartDate();
+            actualStartDate.Should().Be(expectedStartDate);
+        }
+
+        [TestCaseSource(nameof(TrackingCurrentMonthEndDateTestCases))]
+        public void TestTrackingCurrentMonthEndDate(
+            OpportunityTypes opportunityType,
+            DateTime trackingCurrentMonth,
+            DateTime expectedEndDate)
+        {
+            var configuration = GetConfigurationWithTrackingMonth(trackingCurrentMonth, opportunityType);
+
+            var actualEndDate = configuration.TrackingCurrentMonthEndDate(opportunityType);
+
+            actualEndDate.Should().Be(expectedEndDate);
+            actualEndDate.Hour.Should().Be(0);
+            actualEndDate.Minute.Should().Be(0);
+            actualEndDate.Second.Should().Be(0);
+        }
+
+        [TestCaseSource(nameof(TrackingCurrentMonthEndDateTestCases))]
+        public void TestGetTrackingCurrentMonthEndDate(
+            OpportunityTypes opportunityType,
+            DateTime trackingCurrentMonth,
+            DateTime expectedEndDate)
+        {
+            var configuration = GetConfigurationWithTrackingMonth(trackingCurrentMonth, opportunityType);
+
+            var actualEndDate = configuration.GetTrackingCurrentMonthEndDate(opportunityType);
+
+            actualEndDate.Should().Be(expectedEndDate.AddDays(-1));
+        }
+
+        #region Configuration Test Cases
+
+        private static IEnumerable<TestCaseData> ConfigTestCases()
+        {
+            yield return new TestCaseData("Rollup", "1,2,3,4", 4,
+                    new[] { 1, 2, 3, 4 }, "Breakdown", "Breakdowns")
+                .SetName("Default With Rollup");
+            yield return new TestCaseData("", "1,2,3,4", 4,
+                    new[] { 1, 2, 3, 4 }, "Breakdown", "Breakdowns")
+                .SetName("Default w/o Rollup");
+            yield return new TestCaseData("Rollup", "1,2,3,4",
+                    (int)config.Configuration.QVIOpportunityBreakdowns.Entity,
+                    new[] { 1, 2, 3, 4 }, "Entity", "Entities")
+                .SetName("Entity With Rollup");
+            yield return new TestCaseData("", "1,2,3,4",
+                    (int)config.Configuration.QVIOpportunityBreakdowns.Entity,
+                    new[] { 1, 2, 3, 4 }, "Entity", "Entities")
+                .SetName("Entity w/o Rollup");
+            yield return new TestCaseData("Rollup", "1,2,3,4",
+                    (int)config.Configuration.QVIOpportunityBreakdowns.ServiceLine,
+                    new[] { 1, 2, 3, 4 }, "Service Line", "Service Lines")
+                .SetName("Service Line With Rollup");
+            yield return new TestCaseData("", "1,2,3,4",
+                    (int)config.Configuration.QVIOpportunityBreakdowns.ServiceLine,
+                    new[] { 1, 2, 3, 4 }, "Service Line", "Service Lines")
+                .SetName("Service Line w/o Rollup");
+            yield return new TestCaseData("Rollup", "1,2,3,4",
+                    (int)config.Configuration.QVIOpportunityBreakdowns.PhysicianSpecialty,
+                    new[] { 1, 2, 3, 4 }, "Physician Specialty", "Physician Specialties")
+                .SetName("Physician Specialty With Rollup");
+            yield return new TestCaseData("", "1,2,3,4",
+                    (int)config.Configuration.QVIOpportunityBreakdowns.PhysicianSpecialty,
+                    new[] { 1, 2, 3, 4 }, "Physician Specialty", "Physician Specialties")
+                .SetName("Physician Specialty w/o Rollup");
+        }
+
+        private static IEnumerable<TestCaseData> StartEndDateTestCases()
+        {
+            yield return new TestCaseData(new DateTime(2023, 3, 1), new DateTime(2024, 2, 29));
+            yield return new TestCaseData(new DateTime(2024, 3, 1), new DateTime(2025, 2, 28));
+        }
+
+        private static IEnumerable<TestCaseData> TrackingCurrentMonthEndDateTestCases()
+        {
+            yield return new TestCaseData(
+                OpportunityTypes.ChargeCode,
+                new DateTime(2024, 3, 15),
+                new DateTime(2024, 4, 1))
+                .SetName("ChargeCode - March 2024");
+
+            yield return new TestCaseData(
+                OpportunityTypes.QualityVariation,
+                new DateTime(2024, 6, 20),
+                new DateTime(2024, 7, 1))
+                .SetName("QualityVariation - June 2024");
+
+            yield return new TestCaseData(
+                OpportunityTypes.Variation,
+                new DateTime(2024, 12, 5),
+                new DateTime(2025, 1, 1))
+                .SetName("Variation - December 2024");
+
+            yield return new TestCaseData(
+                OpportunityTypes.OrgDefined,
+                new DateTime(2024, 2, 10),
+                new DateTime(2024, 3, 1))
+                .SetName("OrgDefined - February 2024");
+
+            yield return new TestCaseData(
+                OpportunityTypes.Exploration,
+                new DateTime(2024, 1, 31),
+                new DateTime(2024, 2, 1))
+                .SetName("Exploration - January 2024");
+
+            yield return new TestCaseData(
+                OpportunityTypes.ChargeCode,
+                new DateTime(2024, 2, 29),
+                new DateTime(2024, 3, 1))
+                .SetName("ChargeCode - Leap Year February");
+        }
+
+        #endregion
+
+        #region Utils
+
+        private static config.Configuration GetConfigurationByDate(DateTime date, bool isFiscalMonthResolver = false)
+        {
+            var configuration = new config.Configuration
+            {
+                FiscalYearID = (short)date.Year,
+                OrgDefinedEndDate = date,
+                VariationEndDate = date,
+                QualityVariationEndDate = date
+            };
+
+            if (isFiscalMonthResolver)
+            {
+                var lastFiscalMonth = new FiscalMonth
+                {
+                    FiscalMonthId = (byte)date.Month
+                };
+                var fmr = Mock.Of<IFiscalMonthResolver>();
+                Mock.Get(fmr)
+                    .Setup(s => s.LastFiscalMonth())
+                    .Returns(() => lastFiscalMonth);
+                configuration.FiscalMonthResolver = fmr;
+            }
+            return configuration;
+        }
+
+        private static config.Configuration GetConfigurationWithTrackingMonth(
+            DateTime trackingCurrentMonth,
+            OpportunityTypes opportunityType)
+        {
+            var configuration = new config.Configuration();
+
+            switch (opportunityType)
+            {
+                case OpportunityTypes.ChargeCode:
+                    configuration.OrgDefinedTrackingCurrentMonth = trackingCurrentMonth;
+                    break;
+                case OpportunityTypes.QualityVariation:
+                    configuration.QualityVariationTrackingCurrentMonth = trackingCurrentMonth;
+                    break;
+                default:
+                    configuration.VariationTrackingCurrentMonth = trackingCurrentMonth;
+                    break;
+            }
+
+            return configuration;
+        }
+
+        #endregion
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/DbContexts/DbSetExtensions.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/DbContexts/DbSetExtensions.cs
new file mode 100644
index 0000000..0394f3d
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/DbContexts/DbSetExtensions.cs
@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore;
+using Moq;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.DbContexts
+{
+    [ExcludeFromCodeCoverage]
+    public static class DbSetExtensions
+    {
+        public static DbSet<T> GetQueryableMockDbSet<T>(List<T> sourceList) where T : class
+        {
+            var queryable = sourceList.AsQueryable();
+            var dbSet = new Mock<DbSet<T>>();
+            dbSet.As<IQueryable<T>>().Setup(m => m.Provider).Returns(queryable.Provider);
+            dbSet.As<IQueryable<T>>().Setup(m => m.Expression).Returns(queryable.Expression);
+            dbSet.As<IQueryable<T>>().Setup(m => m.ElementType).Returns(queryable.ElementType);
+            dbSet.As<IQueryable<T>>().Setup(m => m.GetEnumerator()).Returns(() => queryable.GetEnumerator());
+            dbSet.Setup(d => d.Add(It.IsAny<T>())).Callback<T>((s) => sourceList.Add(s));
+            return dbSet.Object;
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/DbContexts/JazzDbContextTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/DbContexts/JazzDbContextTests.cs
new file mode 100644
index 0000000..5afca43
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/DbContexts/JazzDbContextTests.cs
@@ -0,0 +1,247 @@
+using FluentAssertions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Metadata;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.DbContexts
+{
+    [TestFixture, Category("Unit")]
+    public class JazzDbContextTests
+    {
+        private JazzDbContext _context;
+        private DbContextOptions<JazzDbContext> _options;
+
+        [OneTimeSetUp]
+        public void OneTimeSetUp()
+        {
+            _options = new DbContextOptionsBuilder<JazzDbContext>()
+                .UseInMemoryDatabase($"TestDb_{Guid.NewGuid()}")
+                .ConfigureWarnings(x => x.Ignore(InMemoryEventId.TransactionIgnoredWarning))
+                .Options;
+        }
+
+        [SetUp]
+        public void SetUp()
+        {
+            _context = new JazzDbContext(_options);
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            _context?.Dispose();
+        }
+
+        [Test]
+        public void ConfigureConventions_ShouldSetDecimalPrecision_ForAllDecimalProperties()
+        {
+            // Act
+            var model = _context.Model;
+
+            // Assert - Get all decimal properties from all entities
+            var decimalProperties = model.GetEntityTypes()
+                .SelectMany(e => e.GetProperties())
+                .Where(p => p.ClrType == typeof(decimal) || p.ClrType == typeof(decimal?))
+                .ToList();
+
+            // Verify that we have decimal properties to test
+            decimalProperties.Should().NotBeEmpty("There should be decimal properties in the model to test");
+
+            // Check that all decimal properties have the expected precision and scale
+            var foregroundColor = Console.ForegroundColor;
+            foreach (var property in decimalProperties)
+            {
+                var className = ((IEntityType)property.DeclaringType).ClrType.Name;
+                var propertyName = property.Name;
+                var precision = property.GetPrecision();
+                var scale = property.GetScale();
+
+                if (precision == null || scale == null)
+                {
+                    Console.ForegroundColor = ConsoleColor.Yellow;
+                    Console.WriteLine($"Property {className}.{propertyName} does not have precision/scale configured.");
+                }
+                else if (className == "QVIOpportunity" && propertyName == "QVIRate")
+                {
+                    precision.Should().Be(19, $"Property {className}.{propertyName} should have precision 19");
+                    scale.Should().Be(4, $"Property {className}.{propertyName} should have scale 4");
+                }
+                else if (propertyName.StartsWith("Month"))
+                {
+                    precision.Should().Be(15, $"Property {className}.{propertyName} should have precision 15");
+                    scale.Should().Be(4, $"Property {className}.{propertyName} should have scale 4");
+                }
+                else if (propertyName.StartsWith("QVI"))
+                {
+                    precision.Should().Be(29, $"Property {className}.{propertyName} should have precision 29");
+                    scale.Should().Be(11, $"Property {className}.{propertyName} should have scale 11");
+                }
+            }
+            Console.ForegroundColor = foregroundColor;
+        }
+
+        [Test]
+        public void ConfigureConventions_ShouldNotAffectNonDecimalProperties()
+        {
+            // Act
+            var model = _context.Model;
+
+            // Assert - Check that non-decimal properties are not affected
+            var nonDecimalProperties = model.GetEntityTypes()
+                .SelectMany(e => e.GetProperties())
+                .Where(p => p.ClrType != typeof(decimal) && p.ClrType != typeof(decimal?))
+                .ToList();
+
+            nonDecimalProperties.Should().NotBeEmpty("There should be non-decimal properties to verify they're not affected");
+
+            foreach (var property in nonDecimalProperties)
+            {
+                var precision = property.GetPrecision();
+                var scale = property.GetScale();
+
+                if (property.ClrType == typeof(string))
+                {
+                    precision.Should().BeNull($"String property {((IEntityType)property.DeclaringType).ClrType.Name}.{property.Name} should not have precision");
+                    scale.Should().BeNull($"String property {((IEntityType)property.DeclaringType).ClrType.Name}.{property.Name} should not have scale");
+                }
+            }
+        }
+
+        [Test]
+        public async Task DatabaseCreation_ShouldSucceed_WithDecimalPrecisionConfiguration()
+        {
+            // Act & Assert
+            var canConnect = await _context.Database.CanConnectAsync();
+            canConnect.Should().BeTrue("Database should be accessible with decimal precision configuration");
+
+            await _context.Database.EnsureCreatedAsync();
+            var created = await _context.Database.CanConnectAsync();
+            created.Should().BeTrue("Database should be created successfully with decimal precision configuration");
+        }
+
+        [Test]
+        public void ModelValidation_ShouldPass_WithDecimalPrecisionConfiguration()
+        {
+            // Arrange & Act
+            Action validateModel = () =>
+            {
+                // Accessing the model is enough to trigger validation in EF Core.
+                // No explicit FinalizeModel method exists on IModel.
+                var _ = _context.Model.GetEntityTypes().ToList();
+            };
+
+            // Assert
+            validateModel.Should().NotThrow("Model should validate successfully with decimal precision configuration");
+        }
+
+        public static IEnumerable<TestCaseData> OpportunityTestCases()
+        {
+            yield return new TestCaseData(new QVIOpportunity
+            {
+                OpportunityGuid = Guid.NewGuid(),
+                ConfigurationGuid = Guid.NewGuid(),
+                IdentifiedSavings = (double)98765.432102m,
+                QVIRate = (decimal)98765.432102d,
+                OpportunityKey = "TEST-004"
+            }, (double)98765.4321m, (decimal)98765.4321d);
+        }
+
+        private void AddOpportunityToContext(Opportunity opportunity)
+        {
+            switch (opportunity)
+            {
+                case QVIOpportunity qviOpportunity:
+                    _context.QualityVariationItemOpportunities.Add(qviOpportunity);
+                    break;
+                default:
+                    throw new ArgumentException($"Unsupported opportunity type: {opportunity.GetType().Name}");
+            }
+        }
+
+        private async Task<object> GetSavedOpportunityAsync(Opportunity opportunity)
+        {
+            return opportunity switch
+            {
+                QVIOpportunity qviOpportunity => await _context.QualityVariationItemOpportunities
+                    .FirstOrDefaultAsync(o => o.OpportunityGuid == qviOpportunity.OpportunityGuid),
+                _ => throw new ArgumentException($"Unsupported opportunity type: {opportunity.GetType().Name}")
+            };
+        }
+
+        [Test, TestCaseSource(nameof(OpportunityTestCases))]
+        public async Task DecimalProperty_ShouldHandlePrecisionCorrectly_InDatabase(Opportunity testOpportunity, double expectedIdentifiedSavings, decimal? expectedQVIRate = null)
+        {
+            // This test verifies that the precision works in practice with the InMemory provider
+            // Note: InMemory provider doesn't enforce precision/scale, but this tests the configuration doesn't break anything
+
+            // Arrange
+            await _context.Database.EnsureCreatedAsync();
+
+            // Act
+            if (testOpportunity == null)
+            {
+                throw new ArgumentNullException(nameof(testOpportunity), "Test opportunity cannot be null");
+            }
+
+            AddOpportunityToContext(testOpportunity);
+
+            // Assert
+            Func<Task> saveAction = async () => await _context.SaveChangesAsync();
+            await saveAction.Should().NotThrowAsync("Saving with configured decimal precision should work");
+
+            var savedOpportunity = await GetSavedOpportunityAsync(testOpportunity);
+
+            savedOpportunity.Should().NotBeNull();
+            const double ToleranceForDecimalComparison = 19d;
+
+            if (savedOpportunity is FFOpportunityDataModel ffOppTest)
+            {
+                ffOppTest.IdentifiedSavings.Should().BeApproximately(expectedIdentifiedSavings, ToleranceForDecimalComparison);
+            }
+            else
+            {
+                ((Opportunity)savedOpportunity).IdentifiedSavings.Should().BeApproximately(expectedIdentifiedSavings, ToleranceForDecimalComparison);
+                if (savedOpportunity is QVIOpportunity qviOppTest && expectedQVIRate.HasValue)
+                {
+                    qviOppTest.QVIRate.Should().BeApproximately(expectedQVIRate.Value, (decimal)ToleranceForDecimalComparison);
+                }
+            }
+        }
+
+        [Test]
+        public void BaseMethod_ShouldBeCalled_InConfigureConventions()
+        {
+            // This test ensures that base.ConfigureConventions() is still called
+            // We can't directly test this, but we can verify that EF Core's base conventions are applied
+
+            var model = _context.Model;
+
+            // Verify that base EF Core conventions are still working
+            var stringProperties = model.GetEntityTypes()
+                .SelectMany(e => e.GetProperties())
+                .Where(p => p.ClrType == typeof(string))
+                .ToList();
+
+            stringProperties.Should().NotBeEmpty("Should have string properties to verify base conventions work");
+
+            // EF Core base conventions should still work for string properties
+            foreach (var property in stringProperties.Take(5)) // Just check a few
+            {
+                // Base conventions should still be applied (this varies by property, so we just ensure no exceptions)
+                Action getAnnotations = () => { var _ = property.GetAnnotations(); };
+                getAnnotations.Should().NotThrow($"Base conventions should work for {((IEntityType)property.DeclaringType).ClrType.Name}.{property.Name}");
+            }
+        }
+    }
+
+}
+
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Encounter/EncounterOpportunityMetricTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Encounter/EncounterOpportunityMetricTest.cs
new file mode 100644
index 0000000..5ac0fd7
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Encounter/EncounterOpportunityMetricTest.cs
@@ -0,0 +1,185 @@
+using FluentAssertions;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Dtos;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Mappers;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Encounter
+{
+    [TestFixture, Category("Unit")]
+    public class EncounterOpportunityMetricTest
+    {
+        private ENOpportunityDto opportunity;
+        private ENOpportunityDataModelWithFilters model;
+
+        [SetUp]
+        public void TestSetup()
+        {
+            opportunity = new ENOpportunityDto
+            {
+                ConfigurationGuid = Guid.NewGuid(),
+                Name = "Test Encounter Opportunity",
+                EncounterGroup = 0,
+                OpportunityLevel = 1,
+                EncounterGroups = new List<string>
+                {
+                    "CaseType|CaseType|1"
+                },
+                OpportunityLevels = new List<string>()
+                {
+                    "ENT|ENT|1"
+                },
+                IsBaseline = true
+            };
+            model = opportunity.MapToDataModel(null);
+            model.OpportunityGuid = Guid.NewGuid();
+            model.AuthorGuid = Guid.NewGuid();
+            model.AuthorName = "Someones Name";
+            model.DateCreated = DateTime.Today;
+        }
+
+        [Test]
+        public void TestENOpportunityDataModel()
+        {
+            var data = opportunity.MapToDataModel(null);
+            data.ConfigurationGuid.Should().NotBe(Guid.Empty)
+                .And.Be(opportunity.ConfigurationGuid);
+            data.EncounterGroup.Should().Be(opportunity.EncounterGroup);
+            data.OpportunityLevel.Should().Be(Enum.GetName(typeof(OpportunityLevel), opportunity.OpportunityLevel));
+            data.EncounterOpportunityLevel.Should().Be((OpportunityLevel)opportunity.OpportunityLevel);
+            data.CaseTypes.Should().NotBeEmpty()
+                .And.Contain(ct => opportunity.EncounterGroups.Select(x => x).Contains(ct.Id));
+            data.IsSeasonal.Should().Be(opportunity.IsSeasonal);
+            data.IsBaseline.Should().Be(opportunity.IsBaseline);
+        }
+
+        [Test]
+        public void TestEncounterOpportunityMetric()
+        {
+            var metric = model.MapFromDataModel();
+            metric.OpportunityGuid.Should().Be(model.OpportunityGuid);
+            metric.ConfigurationGuid.Should().Be(model.ConfigurationGuid);
+            metric.AuthorName.Should().Be(model.AuthorName);
+            metric.AuthorGuid.Should().Be(model.AuthorGuid);
+            metric.Name.Should().Be(model.Name);
+            metric.EncounterOpportunityLevel.Should().Be(model.EncounterOpportunityLevel);
+            metric.EncounterGroup.Should().Be(model.EncounterGroup);
+            metric.CaseTypes.Should().NotBeEmpty()
+                .And.Contain(ct => opportunity.EncounterGroups.Select(x => x).Contains(ct.Id));
+            var filter = opportunity.EncounterGroups.First().MapToFilterHelper();
+            metric.CaseTypes.First().GetHashCode().Equals(filter.GetHashCode());
+            metric.PatientPopulations.Should().BeEmpty();
+            metric.Entities.Should().NotBeEmpty()
+                .And.Contain(ct => opportunity.OpportunityLevels.Select(x => x).Contains(ct.Id));
+            metric.ServiceLines.Should().BeEmpty();
+            metric.Specialties.Should().BeEmpty();
+            metric.Providers.Should().BeEmpty();
+            metric.IsBaseline.Should().Be(opportunity.IsBaseline);
+            metric.ConfigurationGuid.Should().NotBe(Guid.Empty);
+            metric.IsSeasonal.Should().Be(opportunity.IsSeasonal);
+            metric.IsBaseline.Should().Be(opportunity.IsBaseline);
+        }
+
+        [TestCaseSource(nameof(GetEncounterOpportunityMetricTests))]
+        public void TestEncounterOpportunityMetric(ENOpportunityDto enOpportunity)
+        {
+            var dataModel = opportunity.MapToDataModel(null);
+            var metric = dataModel.MapFromDataModel();
+            metric.OpportunityGuid.Should().Be(dataModel.OpportunityGuid);
+            metric.ConfigurationGuid.Should().Be(dataModel.ConfigurationGuid);
+            metric.AuthorName.Should().Be(dataModel.AuthorName);
+            metric.AuthorGuid.Should().Be(dataModel.AuthorGuid);
+            metric.Name.Should().Be(dataModel.Name);
+            metric.EncounterOpportunityLevel.Should().Be(dataModel.EncounterOpportunityLevel);
+            metric.EncounterGroup.Should().Be(dataModel.EncounterGroup);
+            switch ((EncounterGroup)metric.EncounterGroup)
+            {
+                case EncounterGroup.CaseType:
+                    metric.CaseTypes.Should().NotBeEmpty()
+                        .And.Contain(ct => opportunity.EncounterGroups.Select(x => x).Contains(ct.Id));
+                    var filter = opportunity.EncounterGroups.First().MapToFilterHelper();
+                    metric.CaseTypes.First().GetHashCode().Equals(filter.GetHashCode());
+                    break;
+                case EncounterGroup.PatientPopulation:
+                    metric.PatientPopulations.Should().NotBeEmpty()
+                        .And.Contain(ct => opportunity.EncounterGroups.Select(x => x).Contains(ct.Id));
+                    var filter1 = opportunity.EncounterGroups.First().MapToFilterHelper();
+                    metric.PatientPopulations.First().GetHashCode().Equals(filter1.GetHashCode());
+                    break;
+            }
+            metric.PatientPopulations.Should().BeEmpty();
+            switch (metric.EncounterOpportunityLevel)
+            {
+                case OpportunityLevel.Organization:
+                    metric.Entities.Should().BeEmpty();
+                    metric.ServiceLines.Should().BeEmpty();
+                    metric.Specialties.Should().BeEmpty();
+                    metric.Providers.Should().BeEmpty();
+                    break;
+                case OpportunityLevel.Entity:
+                    metric.Entities.Should().NotBeEmpty()
+                        .And.Contain(ct => opportunity.OpportunityLevels.Select(x => x).Contains(ct.Id));
+                    metric.ServiceLines.Should().BeEmpty();
+                    metric.Specialties.Should().BeEmpty();
+                    metric.Providers.Should().BeEmpty();
+                    break;
+                case OpportunityLevel.ServiceLine:
+                    metric.ServiceLines.Should().NotBeEmpty()
+                        .And.Contain(ct => opportunity.OpportunityLevels.Select(x => x).Contains(ct.Id));
+                    metric.Entities.Should().BeEmpty();
+                    metric.Specialties.Should().BeEmpty();
+                    metric.Providers.Should().BeEmpty();
+                    break;
+                case OpportunityLevel.Specialty:
+                    metric.Specialties.Should().NotBeEmpty()
+                        .And.Contain(ct => opportunity.OpportunityLevels.Select(x => x).Contains(ct.Id));
+                    metric.Entities.Should().BeEmpty();
+                    metric.ServiceLines.Should().BeEmpty();
+                    metric.Providers.Should().BeEmpty();
+                    break;
+                case OpportunityLevel.Provider:
+                    metric.Providers.Should().NotBeEmpty()
+                        .And.Contain(ct => opportunity.OpportunityLevels.Select(x => x).Contains(ct.Id));
+                    metric.Entities.Should().BeEmpty();
+                    metric.ServiceLines.Should().BeEmpty();
+                    metric.Specialties.Should().BeEmpty();
+                    break;
+            }
+            metric.IsBaseline.Should().Be(opportunity.IsBaseline);
+            metric.ConfigurationGuid.Should().NotBe(Guid.Empty);
+            metric.IsSeasonal.Should().Be(opportunity.IsSeasonal);
+            metric.IsBaseline.Should().Be(opportunity.IsBaseline);
+        }
+        public static IEnumerable<TestCaseData> GetEncounterOpportunityMetricTests()
+        {
+            foreach (EncounterGroup encounterGroup in Enum.GetValues(typeof(EncounterGroup)))
+            {
+                if (encounterGroup == EncounterGroup.Both) continue;
+                foreach (OpportunityLevel oppLevel in Enum.GetValues(typeof(OpportunityLevel)))
+                {
+                    yield return new TestCaseData(new ENOpportunityDto
+                    {
+                        ConfigurationGuid = Guid.NewGuid(),
+                        Name = "Test Encounter Opportunity",
+                        EncounterGroup = (int)encounterGroup,
+                        OpportunityLevel = (int)oppLevel,
+                        EncounterGroups = new List<string>
+                        {
+                            "CaseType|CaseType|1"
+                        },
+                        OpportunityLevels = new List<string>()
+                        {
+                            "ENT|ENT|1"
+                        },
+                        IsBaseline = true
+                    }).SetName($"TestEncounterOpportunityMetric {encounterGroup} {oppLevel}");
+                }
+            }
+        }
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Encounter/Opportunities/ENOpportunityServiceTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Encounter/Opportunities/ENOpportunityServiceTests.cs
new file mode 100644
index 0000000..0457e69
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Encounter/Opportunities/ENOpportunityServiceTests.cs
@@ -0,0 +1,813 @@
+using FluentAssertions;
+using Hangfire;
+using Hangfire.Common;
+using Hangfire.States;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Moq;
+using NUnit.Framework;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Encounter;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Hangfire.Jazz.Client.Models;
+using Strata.Id.Client;
+using Strata.Schema.Client;
+using Strata.Schema.Client.Dtos;
+using Strata.Schema.Client.Dtos.Info;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Encounter.Opportunities
+{
+    [TestFixture, Category("Unit")]
+    public class ENOpportunityServiceTests
+    {
+
+        private IENOpportunityService _encounterOpportunityService;
+        private Mock<IAsyncDbContextFactory<JazzDbContext>> _dbContextFactoryMock;
+        private Mock<IJazzDbContext> _jazzDbContextMock;
+        private Mock<ISchemaServiceClient> _schemaServiceMock;
+        private Mock<IJazzHangfireServiceClient> _hangfireServiceMock;
+        private Mock<IConfigurationService> _configurationMock;
+        private Mock<IFiscalMonthResolver> _fiscalMonthResolverMock;
+        private Mock<IBackgroundJobClient> _backgroundJobClient;
+        private Mock<IIdServiceClient> _idServiceClient;
+        private Mock<IAuthorizationServiceClient> _authorizationServiceClient;
+        private Mock<IHubContext<NotificationHub, INotificationHub>> _notificationHubContext;
+        private IInitiativeService _initiativeService;
+        private IUpdateFactOpportunitySavingsService _updateFactOpportunitySavingsService;
+        private static readonly ResourceFileExtractor _extractor = new ResourceFileExtractor(".Resource.");
+        private List<Biz.Configuration.Configuration> _configurations;
+        internal static List<Guid> ConfigGuids = new() { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
+        internal static List<string> ConfigNames = new() { "FY2021", "FY2022", "FY2023", "FY2024" };
+        private ScoreDimensionInfoDto _dimension;
+        private List<ScoreHierarchyDto> _hierarchies;
+        private List<HierarchyNodeDto> _hierarchyNodes;
+        private List<FilterHelper> _filterHelpers;
+        private JobEnqueuedResponse _jobResponse;
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _dbContextFactoryMock = new Mock<IAsyncDbContextFactory<JazzDbContext>>();
+            _jazzDbContextMock = new Mock<IJazzDbContext>();
+            _schemaServiceMock = new Mock<ISchemaServiceClient>();
+            _hangfireServiceMock = new Mock<IJazzHangfireServiceClient>();
+            _configurationMock = new Mock<IConfigurationService>();
+            _fiscalMonthResolverMock = new Mock<IFiscalMonthResolver>();
+            _updateFactOpportunitySavingsService = Mock.Of<IUpdateFactOpportunitySavingsService>();
+            _initiativeService = Mock.Of<IInitiativeService>();
+            _authorizationServiceClient = new Mock<IAuthorizationServiceClient>();
+            _notificationHubContext = new Mock<IHubContext<NotificationHub, INotificationHub>>();   
+            _notificationHubContext.Setup(s => s.Clients)
+                .Returns(new Mock<IHubClients<INotificationHub>>().Object);
+            Mock.Get(_updateFactOpportunitySavingsService)
+                .Setup(s => s.UpdateFactOpportunitySavings(It.IsAny<CancellationToken>()));
+            Mock.Get(_initiativeService)
+                .Setup(s => s.DeleteAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            _backgroundJobClient = new Mock<IBackgroundJobClient>();
+            _idServiceClient = new Mock<IIdServiceClient>();
+            _encounterOpportunityService = new ENOpportunityService(_dbContextFactoryMock.Object, null, null,
+                _schemaServiceMock.Object, _hangfireServiceMock.Object, _configurationMock.Object, _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService, _backgroundJobClient.Object, _idServiceClient.Object, _notificationHubContext.Object, _authorizationServiceClient.Object);
+
+            _configurations = new List<Biz.Configuration.Configuration>
+            {
+                new()
+                {
+                    ConfigurationGuid = ConfigGuids[0],
+                    Name = ConfigNames.First(),
+                    DepartmentRollupGlobalId = string.Empty,
+                    ServiceLineDimensionGuid = Guid.NewGuid()
+                },
+                new()
+                {
+                    ConfigurationGuid = ConfigGuids[1],
+                    Name = ConfigNames[1],
+                    DepartmentRollupGlobalId = "Department",
+                    ServiceLineDimensionGuid = Guid.NewGuid()
+                },
+                new()
+                {
+                    ConfigurationGuid = ConfigGuids[2],
+                    Name = ConfigNames[2],
+                    DepartmentRollupGlobalId = string.Empty,
+                    ServiceLineDimensionGuid = Guid.NewGuid()
+                },
+                new()
+                {
+                    ConfigurationGuid = ConfigGuids[3],
+                    Name = ConfigNames.Last(),
+                    DepartmentRollupGlobalId = string.Empty,
+                    ServiceLineDimensionGuid = Guid.NewGuid()
+                }
+            };
+            _dimension = new ScoreDimensionInfoDto
+            {
+                FriendlyName = "test",
+                DimensionGuid = Guid.NewGuid(),
+                DefaultHierarchyGuid = Guid.NewGuid()
+            };
+            _hierarchies = new List<ScoreHierarchyDto>
+            {
+                new ScoreHierarchyDto
+                {
+                    FriendlyName = "test",
+                    HierarchyGuid = _dimension.DefaultHierarchyGuid
+                }
+            };
+            _hierarchyNodes = new List<HierarchyNodeDto>
+            {
+                new HierarchyNodeDto
+                {
+                    Name = "Case Type",
+                    Path = "CaseType|CaseType|1"
+                }
+            };
+            _jobResponse = new JobEnqueuedResponse
+            {
+                JobId = Guid.NewGuid()
+            };
+            _filterHelpers = new List<FilterHelper>
+            {
+                new FilterHelper
+                {
+                    Id = "CaseType|CaseType|1"
+                }
+            };
+
+            _hangfireServiceMock.Setup(moq =>
+                    moq.EnqueueJobAsync(It.IsAny<EnqueueJobDto>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_jobResponse));
+
+            _configurationMock.Setup(moq => moq.GetConfigurationAsync(It.Is<Guid>(c => c == ConfigGuids[0]), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_configurations[0]));
+            _configurationMock.Setup(moq => moq.GetConfigurationAsync(It.Is<Guid>(c => c == ConfigGuids[1]), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_configurations[1]));
+            _configurationMock.Setup(moq => moq.GetConfigurationAsync(It.Is<Guid>(c => c == ConfigGuids[2]), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_configurations[2]));
+            _configurationMock.Setup(moq => moq.GetConfigurationAsync(It.Is<Guid>(c => c == _configurations.Last().ConfigurationGuid), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_configurations.Last()));
+
+            _schemaServiceMock.Setup(moq => moq.GetDimensionByGlobalIdAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_dimension));
+            _schemaServiceMock.Setup(moq => moq.GetDimensionByIdAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_dimension));
+            _schemaServiceMock.Setup(moq => moq.GetScoreHierarchiesByGlobalIdAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_hierarchies.AsEnumerable()));
+            _schemaServiceMock.Setup(moq => moq.GetHierarchyNodesByHierarchyGuidAsync(It.IsAny<Guid>(),
+                    It.IsAny<HierarchyNodeParametersDto>(), It.IsAny<List<ExtraFilterDto>>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_hierarchyNodes.AsEnumerable()));
+            _schemaServiceMock.Setup(moq => moq.GetHierarchyNodesFromHierarchyPathsAsync(It.IsAny<Guid>(),
+                    It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(_hierarchyNodes.AsEnumerable()));
+
+            _backgroundJobClient.Setup(moq => moq.Create(It.IsAny<Job>(), It.IsAny<IState>()))
+                .Returns(Guid.NewGuid().ToString());
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Asc()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var encounterOpportunityService = new ENOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            var filters = new ENFilters()
+            {
+                Cases = 0,
+                OpportunityLevels = new List<string>(),
+                EncounterGroups = EncounterGroup.Both,
+                Seasonality = SeasonalityType.WithAndWithout,
+                IdentifiedSavings = 0,
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid
+            };
+
+            var pagingOptions = new PagingOptions("IdentifiedSavings", SortOrder.Asc);
+
+            // act
+            var taskResult = await encounterOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<ENOpportunity>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().IdentifiedSavings
+                .Should().BeLessThan(taskResult.Data.Last().IdentifiedSavings);
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Desc()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var encounterOpportunityService = new ENOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            var filters = new ENFilters()
+            {
+                Cases = 0,
+                OpportunityLevels = new List<string>(),
+                EncounterGroups = EncounterGroup.Both,
+                Seasonality = SeasonalityType.WithAndWithout,
+                IdentifiedSavings = 0,
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid
+            };
+
+            var pagingOptions = new PagingOptions("IdentifiedSavings", SortOrder.Desc);
+
+            // act
+            var taskResult = await encounterOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<ENOpportunity>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().IdentifiedSavings
+                .Should().BeGreaterThan(taskResult.Data.Last().IdentifiedSavings);
+        }
+
+        [TestCaseSource(nameof(GetFilterData))]
+        public void TestValidateFilters(ENFilters filters)
+        {
+            if (filters == null) return;
+            if (filters.OpportunityLevels.Any())
+                filters.OpportunityLevels.Should()
+                    .AllBeOfType<string>()
+                    .And.NotBeNullOrEmpty();
+        }
+
+        [Test]
+        public async Task TestGetExcelWorkbook()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opp = framework.ENOpportunities.First();
+            var filters = new ENFilters()
+            {
+                ConfigurationGuid = framework.Configurations.First().ConfigurationGuid,
+                OpportunityLevels = new[] { opp.OpportunityLevel },
+            };
+            var service = new ENOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var wb = await service.ExportAsync(new SortOptions(), filters, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\Git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "ExcelFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            wb.Worksheets.Should().HaveCount(1);
+            var ws = wb.Worksheet(1);
+            ws.Should().NotBeNull();
+
+            var expected = @"Examples.EncounterOpportunity.ExcelFilter.xlsx";
+            using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+            using (var actualStream = new MemoryStream())
+            {
+                wb.SaveAs(actualStream);
+                actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+            }
+        }
+
+        [Test]
+        public async Task TestGetExcelWorkbookNullFilter()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var service = new ENOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var wb = await service.ExportAsync(null, null, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\Git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "ExcelNullFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            wb.Worksheets.Should().HaveCount(1);
+            var ws = wb.Worksheet(1);
+            ws.Should().NotBeNull();
+
+            var expected = @"Examples.EncounterOpportunity.ExcelNullFilter.xlsx";
+            using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+            using (var actualStream = new MemoryStream())
+            {
+                wb.SaveAs(actualStream);
+                actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+            }
+        }
+
+        [Test]
+        public async Task TestCreateAsyncCaseTypesOrganization()
+        {
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunity = new ENOpportunityDataModelWithFilters
+            {
+                EncounterGroup = 0,
+                CaseTypes = new List<FilterHelper>
+                {
+                    new FilterHelper
+                    {
+                        Id = "CaseType|CaseType|1"
+                    }
+                },
+                EncounterOpportunityLevel = OpportunityLevel.Organization
+            };
+            opportunity.ConfigurationGuid = framework.Configurations.FirstOrDefault().ConfigurationGuid;
+            var service = new ENOpportunityService(framework, null, null,
+                _schemaServiceMock.Object, _hangfireServiceMock.Object, _configurationMock.Object, _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService, _backgroundJobClient.Object, _idServiceClient.Object, _notificationHubContext.Object, _authorizationServiceClient.Object);
+
+            var results = await service.CreateAsync(opportunity.MapToDataModel(null), Guid.Empty, true, CancellationToken.None);
+            results.Should().NotBe(Guid.Empty);
+        }
+
+        [Test]
+        public async Task TestCreateAsyncAllCaseTypesOrganization()
+        {
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunity = new ENOpportunityDataModelWithFilters
+            {
+                EncounterGroup = 0,
+                EncounterOpportunityLevel = OpportunityLevel.Organization
+            };
+            opportunity.ConfigurationGuid = framework.Configurations.FirstOrDefault().ConfigurationGuid;
+            var service = new ENOpportunityService(framework, null, null,
+                _schemaServiceMock.Object, _hangfireServiceMock.Object, _configurationMock.Object, _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService, _backgroundJobClient.Object, _idServiceClient.Object, _notificationHubContext.Object, _authorizationServiceClient.Object);
+            var results = await service.CreateAsync(opportunity.MapToDataModel(null), Guid.Empty, true, CancellationToken.None);
+            results.Should().NotBe(Guid.Empty);
+        }
+
+        [TestCaseSource(nameof(GetENOpportunityDataModel))]
+        public async Task TestCreateAsync(ENOpportunityDataModelWithFilters opportunity)
+        {
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            opportunity.ConfigurationGuid = framework.Configurations.FirstOrDefault().ConfigurationGuid;
+            var service = new ENOpportunityService(framework, null, null,
+                _schemaServiceMock.Object, _hangfireServiceMock.Object, _configurationMock.Object, _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService, _backgroundJobClient.Object, _idServiceClient.Object, _notificationHubContext.Object, _authorizationServiceClient.Object);
+            var results = await service.CreateAsync(opportunity.MapToDataModel(null), Guid.Empty, true, CancellationToken.None);
+            results.Should().NotBe(Guid.Empty);
+        }
+
+        [Test, Ignore("Problem moq'ing GetEntityNodes")]
+        public async Task TestCreateAsyncAllCaseTypesAllEntities()
+        {
+            var serviceMock = new Mock<ENOpportunityService>(_dbContextFactoryMock.Object, null, null,
+                _schemaServiceMock.Object, _hangfireServiceMock.Object, _configurationMock.Object, _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService, _backgroundJobClient.Object, _idServiceClient.Object, _notificationHubContext.Object, _authorizationServiceClient.Object);
+            var service = serviceMock.Object;
+            var opportunity = new ENOpportunityDataModelWithFilters
+            {
+                EncounterGroup = 0,
+                EncounterOpportunityLevel = OpportunityLevel.Entity
+            };
+            var results = await service.CreateAsync(opportunity.MapToDataModel(null), Guid.Empty, true, CancellationToken.None);
+            results.Should().NotBe(Guid.Empty);
+        }
+
+        [Test]
+        public async Task TestGetEntityNodes()
+        {
+            var service = new ENOpportunityService(_dbContextFactoryMock.Object, null, null,
+                _schemaServiceMock.Object, _hangfireServiceMock.Object, _configurationMock.Object, _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService, _backgroundJobClient.Object, _idServiceClient.Object, _notificationHubContext.Object, _authorizationServiceClient.Object);
+            var configuration = new Biz.Configuration.Configuration
+            {
+                DepartmentRollupGlobalId = ""
+            };
+
+            var results = await service.GetEntityNodes(configuration, CancellationToken.None);
+            results.Should().NotBeEmpty();
+        }
+
+        [Test]
+        public async Task TestGetServiceLineNodesBySg2()
+        {
+            var service = new ENOpportunityService(_dbContextFactoryMock.Object, null, null,
+                _schemaServiceMock.Object, _hangfireServiceMock.Object, _configurationMock.Object, _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService, _backgroundJobClient.Object, _idServiceClient.Object, _notificationHubContext.Object, _authorizationServiceClient.Object);
+            var configuration = new Biz.Configuration.Configuration
+            {
+                ServiceLineDimensionGuid = Guid.Empty
+            };
+
+            var results = await service.GetServiceLineNodes(configuration, new List<string>(), CancellationToken.None);
+            results.Should().NotBeEmpty();
+        }
+
+        [Test]
+        public async Task TestGetServiceLineNodes()
+        {
+            var service = new ENOpportunityService(_dbContextFactoryMock.Object, null, null,
+                _schemaServiceMock.Object, _hangfireServiceMock.Object, _configurationMock.Object, _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService, _backgroundJobClient.Object, _idServiceClient.Object, _notificationHubContext.Object, _authorizationServiceClient.Object);
+            var configuration = new Biz.Configuration.Configuration
+            {
+                ServiceLineDimensionGuid = Guid.NewGuid()
+            };
+
+            var results = await service.GetServiceLineNodes(configuration, new List<string>(), CancellationToken.None);
+            results.Should().NotBeEmpty();
+        }
+
+        [Test]
+        public async Task TestGetNodesByGlobalId()
+        {
+            var service = new ENOpportunityService(_dbContextFactoryMock.Object, null, null,
+                _schemaServiceMock.Object, _hangfireServiceMock.Object, _configurationMock.Object, _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService, _backgroundJobClient.Object, _idServiceClient.Object, _notificationHubContext.Object, _authorizationServiceClient.Object);
+            var results = await service.GetNodesByGlobalId("entity", CancellationToken.None);
+            results.Should().NotBeEmpty();
+        }
+
+        [Test]
+        public async Task TestGetNodesByHierarchyGuid()
+        {
+            var service = new ENOpportunityService(_dbContextFactoryMock.Object, null, null,
+                _schemaServiceMock.Object, _hangfireServiceMock.Object, _configurationMock.Object, _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService, _backgroundJobClient.Object, _idServiceClient.Object, _notificationHubContext.Object, _authorizationServiceClient.Object);
+            var results = await service.GetNodesByHierarchyGuid(Guid.NewGuid(), CancellationToken.None);
+            results.Should().NotBeEmpty();
+        }
+
+        [Test]
+        public async Task TestSetHidden()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunities = framework.ENOpportunities;
+            var opportunity = opportunities.First(vo => !vo.IsHidden);
+            var isHidden = opportunity.IsHidden;
+            var service = new ENOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            await service.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden, CancellationToken.None);
+
+            // assert
+            var result = await service.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            result.IsHidden.Should().Be(!isHidden);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetFilterOptionsAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunityService = new ENOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                var taskResult = await opportunityService
+                    .GetFilterOptionsAsync(new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                    return;
+                }
+                taskResult.Should()
+                    .BeOfType<ENFilterOptions>()
+                    .And.NotBeNull();
+                taskResult.OpportunityLevels.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty()
+                    .And.NotContain(cd => string.IsNullOrEmpty(cd.Id))
+                    .And.NotContain(cd => string.IsNullOrEmpty(cd.Text));
+            }
+            catch (NotImplementedException nie)
+            {
+                nie.Should().BeOfType<NotImplementedException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var encounterOpportunityService = new ENOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            try
+            {
+                var opportunities = encounterOpportunityService.GetAllAsync(cancellationToken).Result;
+                var opportunity = opportunities.FirstOrDefault(o => o.IsHidden);
+                if (opportunity == null) return;
+                var isHidden = opportunity.IsHidden;
+
+                //act
+                await encounterOpportunityService.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden,
+
+                    cancellationToken);
+
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;
+
+                var result = encounterOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;
+
+                result.IsHidden.Should().Be(!isHidden);
+            }
+            catch (Exception e)
+            {
+                switch (e.GetType().Name)
+                {
+                    case "AggregateException":
+                    case "OperationCanceledException":
+                        return;
+                }
+                e.Should().NotBeOfType<Exception>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.ENOpportunities.FirstOrDefault(o => o.IsHidden);
+            if (opportunity == null) return;
+            var isHidden = opportunity.IsHidden;
+            var encounterOpportunityService = new ENOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                await encounterOpportunityService.SetHiddenAsync(Guid.Empty, !isHidden,
+                    cancellationToken);
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var encounterOpportunityService = new ENOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            try
+            {
+                var opportunities = encounterOpportunityService.GetAllAsync(cancellationToken).Result;
+
+                var opportunity = opportunities.FirstOrDefault(o => o.Note == string.Empty);
+
+                if (opportunity == null) return;
+
+                var note = "new test note";
+                // act
+                await encounterOpportunityService.SetNoteAsync(opportunity.OpportunityGuid, note,
+                    CancellationToken.None);
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;
+                var result = encounterOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;
+                result.Note.Should().Be(note);
+
+                // assert
+            }
+            catch (Exception e)
+            {
+                switch (e.GetType().Name)
+                {
+                    case "AggregateException":
+                    case "OperationCanceledException":
+                        return;
+                }
+                e.Should().NotBeOfType<Exception>();
+            }
+        }
+
+        [Test]
+        public async Task TestSetNote()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunities = framework.ENOpportunities;
+            var opportunity = opportunities.First(vo => string.IsNullOrEmpty(vo.Note));
+            var note = opportunity.Note;
+            var expected = "Now is the time for all good engineers to write great code!";
+            var service = new ENOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            await service.SetNoteAsync(opportunity.OpportunityGuid, expected, CancellationToken.None);
+
+            // assert
+            var result = await service.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            result.Note.Should().NotBeNullOrEmpty()
+                .And.NotBe(note)
+                .And.Be(expected);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.ENOpportunities.FirstOrDefault(o => o.Note == string.Empty);
+            if (opportunity == null) return;
+            var note = "new test note";
+            var encounterOpportunityService = new ENOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                await encounterOpportunityService.SetNoteAsync(Guid.Empty, note, cancellationToken);
+
+                // assert
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetAllAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var encounterOpportunityService = new ENOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var taskResult = await encounterOpportunityService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetById(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var encounterOpportunityService = new ENOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var tempResult = await encounterOpportunityService.GetAllAsync(CancellationToken.None);
+            var taskResult =
+                await encounterOpportunityService.GetById(tempResult.FirstOrDefault()?.OpportunityGuid ?? Guid.Empty, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNull();
+            }
+            else
+            {
+                taskResult.Should().NotBeNull()
+                    .And.BeOfType<ENOpportunity>();
+            }
+
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetByIds(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var encounterOpportunityService = new ENOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var tempResult = await encounterOpportunityService.GetAllAsync(CancellationToken.None);
+            var ids = tempResult.Select(o => o.OpportunityGuid);
+            var taskResult = await encounterOpportunityService.GetByIds(ids, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty()
+                    .And.AllBeOfType<ENOpportunity>()
+                    .And.HaveCount(ids.Count());
+            }
+
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            // Method intentionally left empty.
+        }
+
+        #region TestCaseData
+
+        public static IEnumerable<TestCaseData> GetFilterData()
+        {
+            yield return new TestCaseData(new ENFilters { ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("No Filters");
+            yield return new TestCaseData(new ENFilters { ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("View Visible");
+            yield return new TestCaseData(new ENFilters { ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Not View Visible");
+            yield return new TestCaseData(new ENFilters { IdentifiedSavings = 1999, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings");
+            yield return new TestCaseData(new ENFilters { IdentifiedSavings = 999, ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings Not ViewVisible");
+            yield return new TestCaseData(new ENFilters { OpportunityLevels = new[] { "Entity" }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By OpportunityLevels");
+            yield return new TestCaseData(new ENFilters { OpportunityLevels = new[] { "Provider" }, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), ViewVisible = false })
+                .SetName("By OpportunityLevels Not ViewVisible");
+            yield return new TestCaseData(new ENFilters { EncounterGroups = EncounterGroup.CaseType, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By EncounterGroups");
+            yield return new TestCaseData(new ENFilters { EncounterGroups = EncounterGroup.PatientPopulation, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), ViewVisible = false })
+                .SetName("By EncounterGroups Not ViewVisible");
+            yield return new TestCaseData(new ENFilters { Seasonality = SeasonalityType.With, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By Seaonality");
+            yield return new TestCaseData(new ENFilters { OpportunitySearch = "EN - 101", ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Search By Id");
+            yield return new TestCaseData(new ENFilters { ExcludeInitiatives = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Exclude Opportunities with Initiatives");
+        }
+
+        public static IEnumerable<TestCaseData> GetENOpportunityDataModel()
+        {
+            return from configGuid in ConfigGuids
+                   from EncounterGroup encounterGroup in Enum.GetValues(typeof(EncounterGroup))
+                   where encounterGroup != EncounterGroup.Both
+                   from OpportunityLevel encounterOpportunityLevel in Enum.GetValues(typeof(OpportunityLevel))
+                   from encounterGroups in new[] { true, false }
+                   from opportunityLevels in new[] { true, false }
+                   select new TestCaseData(new ENOpportunityDataModelWithFilters
+                   {
+                       ConfigurationGuid = configGuid,
+                       EncounterGroup = (int)encounterGroup,
+                       EncounterOpportunityLevel = encounterOpportunityLevel,
+                       CaseTypes = encounterGroup == EncounterGroup.CaseType
+                       ? new List<FilterHelper>
+                       {
+                        new() {Id = "Id"}
+                       }
+                       : new List<FilterHelper>(),
+                       PatientPopulations = encounterGroup == EncounterGroup.PatientPopulation
+                       ? new List<FilterHelper>
+                       {
+                        new () {Id = "Id"}
+                       }
+                       : new List<FilterHelper>(),
+                       Entities = encounterOpportunityLevel == OpportunityLevel.Entity
+                       ? new List<FilterHelper>
+                       {
+                        new () {Id = "Id"}
+                       }
+                       : new List<FilterHelper>(),
+                       ServiceLines = encounterOpportunityLevel == OpportunityLevel.ServiceLine
+                       ? new List<FilterHelper>
+                       {
+                        new () {Id = "Id"}
+                       }
+                       : new List<FilterHelper>(),
+                       Specialties = encounterOpportunityLevel == OpportunityLevel.Specialty
+                       ? new List<FilterHelper>
+                       {
+                        new () {Id = "Id"}
+                       }
+                       : new List<FilterHelper>(),
+                       Providers = encounterOpportunityLevel == OpportunityLevel.Provider
+                       ? new List<FilterHelper>
+                       {
+                        new () {Id = "Id"}
+                       }
+                       : new List<FilterHelper>()
+                   }).SetName($"{nameof(TestCreateAsync)} {ConfigNames[ConfigGuids.IndexOf(configGuid)]} IsUsingCustomEntityDim: {ConfigGuids.IndexOf(configGuid) == 1}  IsUsingSg2: {ConfigGuids.IndexOf(configGuid) == 3} {encounterGroup} {encounterOpportunityLevel}");
+        }
+
+        #endregion
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/ExplorationServiceBenchmarkingUnitTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/ExplorationServiceBenchmarkingUnitTests.cs
new file mode 100644
index 0000000..856c631
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/ExplorationServiceBenchmarkingUnitTests.cs
@@ -0,0 +1,297 @@
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.CoreLib.Claims;
+using Strata.StrataSphereCompare.Client;
+using Strata.StrataSphereCompare.Client.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using static Strata.ContinuousImprovement.Biz.Exploration.ExplorationService;
+using ExplorationFilter = Strata.ContinuousImprovement.Biz.Exploration.Filters.Filter;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Exploration
+{
+    [TestFixture, Category("Unit")]
+    public class ExplorationServiceBenchmarkingUnitTests
+    {
+        private const string FeatureFlagKey = "cibenchmarkingenabled";
+        private const string CaseTypeFamilyName = "Sample CTF";
+
+        private Mock<ISnowflakeDatabaseContext> _snowflakeDatabaseContextMock;
+        private Mock<IFiscalMonthResolver> _fiscalMonthResolverMock;
+        private Mock<IClaimsPrincipalAccessor> _claimsPrincipalAccessorMock;
+        private Mock<IStrataSphereCompareService> _strataSphereCompareServiceMock;
+        private Mock<ILogger<ExplorationService>> _explorationServiceLoggerMock;
+        private Mock<IExplorationFilterService> _explorationFilterServiceMock;
+
+        private ExplorationInfo _explorationInfo;
+
+        [OneTimeSetUp]
+        public void OneTimeSetUp()
+        {
+            _snowflakeDatabaseContextMock = new Mock<ISnowflakeDatabaseContext>();
+            _fiscalMonthResolverMock = new Mock<IFiscalMonthResolver>();
+            _explorationServiceLoggerMock = new Mock<ILogger<ExplorationService>>();
+
+            var principal = TestUtilities.GetClaimsPrincipalAccessor();
+            var defaultUser = principal.GetCurrentClaimsPrincipal();
+            _claimsPrincipalAccessorMock = new Mock<IClaimsPrincipalAccessor>();
+            _claimsPrincipalAccessorMock.Setup(a => a.GetCurrentClaimsPrincipal()).Returns(defaultUser);
+
+            _strataSphereCompareServiceMock = new Mock<IStrataSphereCompareService>();
+            _explorationFilterServiceMock = new Mock<IExplorationFilterService>();
+
+            // Setup ExplorationFilterService mock
+            _explorationFilterServiceMock
+                .Setup(s => s.GetFilterStringsAsync(It.IsAny<IEnumerable<FilterChipItem>>(), It.IsAny<IQueryParamBase>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(("", ""));
+            _explorationFilterServiceMock
+                .Setup(s => s.BuildDataFiltersAsync(It.IsAny<CaseTypeFamily>(), It.IsAny<string>(), It.IsAny<ExplorationFilter>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CostDetailsFilterDto());
+
+            // Setup 1: For GetCaseTypeFamilySummariesAsync (no drill down filter)
+            _strataSphereCompareServiceMock
+                .Setup(s => s.GetCostDetailsAsync(
+                    It.IsAny<BaseComparisonParams>(),
+                    It.Is<CostDetailsFilterDto>(filter => filter.CostDetailsFilterDrillDown == null),
+                    It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new[]
+                {
+                    new CostDetailsDto
+                    {
+                        AprDrgCaseTypeFamilyName = CaseTypeFamilyName,
+                        P50th_VariableDirectCost = 250.75m,
+                        P50th_Alos = 5.2m
+                    }
+                });
+
+            // Setup 2: For GetCaseTypeFamilySummaryDetailsAsync (with drill down filter)
+            _strataSphereCompareServiceMock
+                .Setup(s => s.GetCostDetailsAsync(
+                    It.IsAny<BaseComparisonParams>(),
+                    It.Is<CostDetailsFilterDto>(filter => filter.CostDetailsFilterDrillDown != null),
+                    It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new[]
+                {
+                    new CostDetailsDto
+                    {
+                        SphChargeCodeCostDriver = "LOS",
+                        P50th_VariableDirectCost = 150.50m,
+                        P50th_Alos = 3.2m
+                    },
+                    new CostDetailsDto
+                    {
+                        SphChargeCodeCostDriver = "Surgery",
+                        P50th_VariableDirectCost = 300.25m,
+                        P50th_Alos = 4.8m
+                    }
+                });
+
+            // Summary Mock Data
+            _snowflakeDatabaseContextMock
+                .Setup(s => s.QueryAsync<CaseTypeFamilySummaryInfo>(
+                    It.IsAny<string>(), It.IsAny<string>(), It.IsAny<object>(), It.IsAny<TimeSpan>()))
+                .ReturnsAsync(new[]
+                {
+                    new CaseTypeFamilySummaryInfo { CaseTypeFamilyName = CaseTypeFamilyName }
+                });
+
+            // Summary Detail Mock Data - for GetCaseTypeFamilySummaryDetailsAsync
+            _snowflakeDatabaseContextMock
+                .Setup(s => s.QueryAsync<CaseTypeFamilyEncounterInfo>(
+                    It.IsAny<string>(), It.IsAny<string>(), It.IsAny<object>(), It.IsAny<TimeSpan>()))
+                .ReturnsAsync(new[]
+                {
+                    new CaseTypeFamilyEncounterInfo
+                    {
+                        CaseTypeFamilyName = CaseTypeFamilyName,
+                        CostDriver = "LOS"
+                    },
+                    new CaseTypeFamilyEncounterInfo
+                    {
+                        CaseTypeFamilyName = CaseTypeFamilyName,
+                        CostDriver = "Surgery"
+                    }
+                });
+
+            _explorationInfo = new ExplorationCostDriverInfo
+            {
+                CaseTypeFamilyId = 1,
+                PeerGroupId = 1,
+                ExclusionCriteria = new ExclusionCriteria
+                {
+                    LosExclusionType = ExclusionCriteriaType.None,
+                    CostExclusionType = ExclusionCriteriaType.None
+                },
+                Filters = new ExplorationFilter // Use the alias
+                {
+                    FilterChipItems = new List<FilterChipItem>
+                    {
+                        new FilterChipItem
+                        {
+                            ChipType = ChipType.DateRange,
+                            Key = ChipKey.DischargeDateID,
+                            DateRange = new List<DateTime>
+                            {
+                                new DateTime(2024, 1, 1),
+                                new DateTime(2024, 12, 31)
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilySummariesAsync_FeatureFlagOn_PopulatesPeerMetrics()
+        {
+            // Arrange
+            var jazzFactory = new JazzEntityFrameworkFactory();
+            await jazzFactory.CreateDbContextAsync(CancellationToken.None);
+
+            var featureFlagWrapper = Mock.Of<IFeatureFlagWrapper>();
+            Mock.Get(featureFlagWrapper)
+                .Setup(f => f.IsCiBenchmarkingEnabled(It.IsAny<bool>()))
+                .ReturnsAsync(true);
+
+            var service = new ExplorationService(
+                jazzFactory,
+                _snowflakeDatabaseContextMock.Object,
+                _fiscalMonthResolverMock.Object,
+                featureFlagWrapper,
+                _strataSphereCompareServiceMock.Object,
+                _explorationFilterServiceMock.Object,
+                _explorationServiceLoggerMock.Object);
+
+            // Act
+            var summaries = await service.GetCaseTypeFamilySummariesAsync(_explorationInfo, CancellationToken.None);
+            var summary = summaries.Single(s => s.Name == CaseTypeFamilyName);
+
+            // Assert
+            Assert.That(summary.Data.PeerMedianCost, Is.EqualTo(250.75d));
+            Assert.That(summary.Data.PeerMedianALos, Is.EqualTo(5.2d));
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilySummariesAsync_FeatureFlagOff_DefaultPeerMetrics()
+        {
+            // Arrange
+            var jazzFactory = new JazzEntityFrameworkFactory();
+            await jazzFactory.CreateDbContextAsync(CancellationToken.None);
+
+            var featureFlagWrapper = Mock.Of<IFeatureFlagWrapper>();
+            Mock.Get(featureFlagWrapper)
+                .Setup(f => f.IsCiBenchmarkingEnabled(It.IsAny<bool>()))
+                .ReturnsAsync(false);
+
+            var service = new ExplorationService(
+                jazzFactory,
+                _snowflakeDatabaseContextMock.Object,
+                _fiscalMonthResolverMock.Object,
+                featureFlagWrapper,
+                _strataSphereCompareServiceMock.Object,
+                _explorationFilterServiceMock.Object,
+                _explorationServiceLoggerMock.Object);
+
+            // Act
+            var summaries = await service.GetCaseTypeFamilySummariesAsync(_explorationInfo, CancellationToken.None);
+            var summary = summaries.Single(s => s.Name == CaseTypeFamilyName);
+
+            // Assert
+            Assert.That(summary.Data.PeerMedianCost, Is.EqualTo(0d));
+            Assert.That(summary.Data.PeerMedianALos, Is.EqualTo(0d));
+        }
+
+        [Test, Ignore("Feature flag is not enabled, this might need additional refactoring")]
+        public async Task GetCaseTypeFamilySummaryDetailsAsync_FeatureFlagOn_PopulatesPeerMetrics()
+        {
+            // Arrange
+            var jazzFactory = new JazzEntityFrameworkFactory();
+            await jazzFactory.CreateDbContextAsync(CancellationToken.None);
+
+            var featureFlagWrapper = Mock.Of<IFeatureFlagWrapper>();
+            Mock.Get(featureFlagWrapper)
+                .Setup(f => f.IsCiBenchmarkingEnabled(It.IsAny<bool>()))
+                .ReturnsAsync(true);
+
+            var service = new ExplorationService(
+                jazzFactory,
+                _snowflakeDatabaseContextMock.Object,
+                _fiscalMonthResolverMock.Object,
+                featureFlagWrapper,
+                _strataSphereCompareServiceMock.Object,
+                _explorationFilterServiceMock.Object,
+                _explorationServiceLoggerMock.Object);
+
+            // Act
+            var summaries = await service.GetCaseTypeFamilySummaryDetailsAsync(_explorationInfo, CancellationToken.None);
+            var summary = summaries.Single();
+
+            // Assert
+            Assert.That(summary, Is.Not.Null);
+            Assert.That(summary.Name, Is.EqualTo(CaseTypeFamilyName));
+            Assert.That(summary.Children, Is.Not.Null.And.Not.Empty);
+
+            var losChild = summary.Children.FirstOrDefault(c => c.Name == "LOS");
+            if (losChild != null)
+            {
+                Assert.That(losChild.Data.PeerMedianCost, Is.EqualTo(150.50d));
+            }
+
+            var surgeryChild = summary.Children.FirstOrDefault(c => c.Name == "Surgery");
+            if (surgeryChild != null)
+            {
+                Assert.That(surgeryChild.Data.PeerMedianCost, Is.EqualTo(300.25d));
+            }
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilySummaryDetailsAsync_FeatureFlagOff_DefaultPeerMetrics()
+        {
+            // Arrange
+            var jazzFactory = new JazzEntityFrameworkFactory();
+            await jazzFactory.CreateDbContextAsync(CancellationToken.None);
+
+            var featureFlagWrapper = Mock.Of<IFeatureFlagWrapper>();
+            Mock.Get(featureFlagWrapper)
+                .Setup(f => f.IsCiBenchmarkingEnabled(It.IsAny<bool>()))
+                .ReturnsAsync(false);
+
+            var service = new ExplorationService(
+                jazzFactory,
+                _snowflakeDatabaseContextMock.Object,
+                _fiscalMonthResolverMock.Object,
+                featureFlagWrapper,
+                _strataSphereCompareServiceMock.Object,
+                _explorationFilterServiceMock.Object,
+                _explorationServiceLoggerMock.Object);
+
+            // Act
+            var summaries = await service.GetCaseTypeFamilySummaryDetailsAsync(_explorationInfo as ExplorationCostDriverInfo, CancellationToken.None);
+            var summary = summaries.Single();
+
+            // Assert
+            Assert.That(summary, Is.Not.Null);
+            Assert.That(summary.Name, Is.EqualTo(CaseTypeFamilyName));
+            if (summary.Children != null && summary.Children.Any())
+            {
+                foreach (var child in summary.Children)
+                {
+                    Assert.That(child.Data.PeerMedianCost, Is.EqualTo(0d));
+                    Assert.That(child.Data.PeerMedianALos, Is.EqualTo(0d));
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/ExplorationServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/ExplorationServiceTest.cs
new file mode 100644
index 0000000..0e9af08
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/ExplorationServiceTest.cs
@@ -0,0 +1,316 @@
+using DocumentFormat.OpenXml.Wordprocessing;
+using Microsoft.Extensions.Logging;
+using Moq;
+using MoreLinq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using Strata.StrataSphereCompare.Client;
+using Strata.StrataSphereCompare.Client.Models;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyNUnit;
+using VerifyTests;
+using static Strata.ContinuousImprovement.Biz.Exploration.ExplorationService;
+using ExplorationFilter = Strata.ContinuousImprovement.Biz.Exploration.Filters.Filter;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Exploration
+{
+    [TestFixture, Category("Unit")]
+    public class ExplorationServiceTest
+    {
+        private const string SourceFilePath = @"Exploration/source/";
+
+        public IAsyncDbContextFactory<JazzDbContext> DbContextFactory { get; set; }
+        public JazzEntityFrameworkFactory JAZZ_Framework { get; set; }
+        public JazzDbContext JazzDbContext { get; set; }
+        public ISqlGridReaderWrapper SqlGridReader { get; set; }
+        public ISnowflakeDatabaseContext SnowflakeDatabaseContext { get; set; }
+        public IConfigurationService ConfigurationService { get; set; }
+        public IFiscalMonthResolver FiscalMonthResolver { get; set; }
+        public ILogger<ExplorationService> Logger { get; set; }
+        public VerifySettings VerifySettings { get; set; }
+        public IFeatureFlagWrapper FeatureFlagWrapper { get; set; }
+        public IStrataSphereCompareService StrataSphereCompareService { get; set; }
+        public IExplorationFilterService ExplorationFilterService { get; set; }
+
+        [OneTimeSetUp]
+        public void ExplorationServiceTestOneTimeSetUp()
+        {
+            DbContextFactory = Mock.Of<IAsyncDbContextFactory<JazzDbContext>>();
+            JAZZ_Framework = new JazzEntityFrameworkFactory();
+
+            Mock.Get(DbContextFactory)
+                .Setup(s => s.CreateDbContextAsync(It.IsAny<CancellationToken>()))
+                .Returns(async () =>
+                {
+                    JazzDbContext = await JAZZ_Framework.CreateDbContextAsync(CancellationToken.None);
+                    return JazzDbContext;
+                });
+
+            SqlGridReader = Mock.Of<ISqlGridReaderWrapper>();
+            Mock.Get(SqlGridReader)
+                .Setup(s => s.Read(It.IsAny<bool>()))
+                .Returns(Enumerable.Empty<dynamic>());
+            SnowflakeDatabaseContext = Mock.Of<ISnowflakeDatabaseContext>();
+            Mock.Get(SnowflakeDatabaseContext)
+                .Setup(s => s.QueryMultipleAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<object>(), It.IsAny<TimeSpan>()))
+                .Returns(Task.FromResult(SqlGridReader));
+
+            ConfigurationService = Mock.Of<IConfigurationService>();
+            FiscalMonthResolver = Mock.Of<IFiscalMonthResolver>();
+            Logger = Mock.Of<ILogger<ExplorationService>>();
+            VerifySettings = TestExtensions.TestSettings();
+            FeatureFlagWrapper = Mock.Of<IFeatureFlagWrapper>();
+            StrataSphereCompareService = Mock.Of<IStrataSphereCompareService>();
+            ExplorationFilterService = Mock.Of<IExplorationFilterService>();
+
+            // Setup the mock to return empty results
+            Mock.Get(ExplorationFilterService)
+                .Setup(s => s.GetFilterStringsAsync(It.IsAny<IEnumerable<FilterChipItem>>(), It.IsAny<IQueryParamBase>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(("", ""));
+            Mock.Get(ExplorationFilterService)
+                .Setup(s => s.BuildDataFiltersAsync(It.IsAny<CaseTypeFamily>(), It.IsAny<string>(), It.IsAny<ExplorationFilter>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CostDetailsFilterDto());
+            Mock.Get(ExplorationFilterService)
+                .Setup(s => s.CreateCostDriverFilter())
+                .Returns(new FilterChipItem());
+            Mock.Get(FeatureFlagWrapper)
+                .Setup(f => f.IsCiBenchmarkingEnabled(It.IsAny<bool>()))
+                .ReturnsAsync(true);
+
+
+        }
+
+        [TestCaseSource(nameof(GetCaseTypeFamilyDetailsTestCases))]
+        public async Task GetCaseTypeFamilyDetailsTest(GetCaseTypeFamilyDetailsTestData data)
+        {
+            // arrange
+            Mock.Get(SqlGridReader)
+                .Setup(s => s.Read<CTFGroupCalcs>(It.IsAny<bool>()))
+                .Returns(data.CTFGroupCalcsList);
+            Mock.Get(SqlGridReader)
+                .Setup(s => s.Read<EntityGroupCalcs>(It.IsAny<bool>()))
+                .Returns(data.EntityGroupCalcsList);
+            Mock.Get(SqlGridReader)
+                .Setup(s => s.Read<EntityCodeGroupCalcs>(It.IsAny<bool>()))
+                .Returns(data.EntityCodeGroupCalcsList);
+            Mock.Get(SqlGridReader)
+                .Setup(s => s.Read<EntityCodePhysicianGroupCalcs>(It.IsAny<bool>()))
+                .Returns(data.EntityCodePhysicianGroupCalcsList);
+            Mock.Get(SqlGridReader)
+                .Setup(s => s.Read<CTFEncounterDetail>(It.IsAny<bool>()))
+                .Returns(data.CTFEncounterDetailList);
+
+            var explorationService = new ExplorationService(
+                DbContextFactory,
+                SnowflakeDatabaseContext,
+                FiscalMonthResolver,
+                FeatureFlagWrapper,
+                StrataSphereCompareService,
+                ExplorationFilterService,
+                Logger);
+
+            // act
+            var taskResult = await explorationService.GetCaseTypeFamilyDetailsAsync(data.ExplorationDetailInfoData, CancellationToken.None);
+
+            // assert
+            await Verifier.Verify(taskResult, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [TestCaseSource(nameof(GetEncountersTestCases))]
+        public async Task GetEncountersTest(GetEncountersTestData data)
+        {
+            // arrange
+            Mock.Get(SqlGridReader)
+                .Setup(s => s.Read<PhysicianInfo>(It.IsAny<bool>()))
+                .Returns(data.PhysicianInfoList);
+            Mock.Get(SqlGridReader)
+                .Setup(s => s.Read<EncounterInfoBase>(It.IsAny<bool>()))
+                .Returns(data.EncounterInfoBaseList);
+            var configurationGuid = Guid.Empty;
+
+            var explorationService = new ExplorationService(
+                DbContextFactory,
+                SnowflakeDatabaseContext,
+                FiscalMonthResolver,
+                FeatureFlagWrapper,
+                StrataSphereCompareService,
+                ExplorationFilterService,
+                Logger);
+
+            // act
+            var taskResult = await explorationService.GetEncountersAsync(data.ExplorationDetailInfoData, configurationGuid, CancellationToken.None);
+
+            // assert
+            await Verifier.Verify(taskResult, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        private static IEnumerable<TestCaseData> GetCaseTypeFamilyDetailsTestCases()
+        {
+            var testName = "GetCaseTypeFamilyDetailsTest";
+
+            var explorationDetailInfoDataJson = GetSourceFile("ExplorationDetailInfo.txt");
+            var ctfGroupCalcsListJson = GetSourceFile("CTFGroupCalcs.txt");
+            var entityGroupCalcsListJson = GetSourceFile("EntityGroupCalcs.txt");
+            var entityCodeGroupCalcsListJson = GetSourceFile("EntityCodeGroupCalcs.txt");
+            var entityCodePhysicianGroupCalcsListJson = GetSourceFile("EntityCodePhysicianGroupCalcs.txt");
+            var ctfEncounterDetailListJson = GetSourceFile("CTFEncounterDetail.txt");
+
+            var dataAllMatch = new GetCaseTypeFamilyDetailsTestData()
+            {
+                ExplorationDetailInfoData = JsonSerializer.Deserialize<ExplorationDetailInfo>(explorationDetailInfoDataJson),
+                CTFGroupCalcsList = JsonSerializer.Deserialize<IEnumerable<CTFGroupCalcs>>(ctfGroupCalcsListJson),
+                EntityGroupCalcsList = JsonSerializer.Deserialize<IEnumerable<EntityGroupCalcs>>(entityGroupCalcsListJson),
+                EntityCodeGroupCalcsList = JsonSerializer.Deserialize<IEnumerable<EntityCodeGroupCalcs>>(entityCodeGroupCalcsListJson),
+                EntityCodePhysicianGroupCalcsList = JsonSerializer.Deserialize<IEnumerable<EntityCodePhysicianGroupCalcs>>(entityCodePhysicianGroupCalcsListJson),
+                CTFEncounterDetailList = JsonSerializer.Deserialize<IEnumerable<CTFEncounterDetail>>(ctfEncounterDetailListJson)
+            };
+            dataAllMatch.ExplorationDetailInfoData.Filters = new ExplorationFilter() // FIXED: Changed from Biz.Exploration.Filters.Filter to ExplorationFilter
+            {
+                FilterChipItems = new List<FilterChipItem>()
+                {
+                    new FilterChipItem {
+                        ChipType = ChipType.DateRange, Key = ChipKey.DischargeDateID,
+                        DateRange = new List<DateTime>()
+                        {
+                            new DateTime(2024, 1, 1),
+                            new DateTime(2024, 12, 31)
+                        }
+                    }
+                }
+            };
+            yield return new TestCaseData(dataAllMatch)
+                .SetName($"{testName} All Match");
+
+            var dataPhysicianIdNotMatch = new GetCaseTypeFamilyDetailsTestData()
+            {
+                ExplorationDetailInfoData = dataAllMatch.ExplorationDetailInfoData,
+                CTFGroupCalcsList = dataAllMatch.CTFGroupCalcsList,
+                EntityGroupCalcsList = dataAllMatch.EntityGroupCalcsList,
+                EntityCodeGroupCalcsList = dataAllMatch.EntityCodeGroupCalcsList,
+                EntityCodePhysicianGroupCalcsList = JsonSerializer.Deserialize<IEnumerable<EntityCodePhysicianGroupCalcs>>(entityCodePhysicianGroupCalcsListJson),
+                CTFEncounterDetailList = dataAllMatch.CTFEncounterDetailList
+            };
+            dataPhysicianIdNotMatch.EntityCodePhysicianGroupCalcsList.First().PhysicianId = 0;
+            yield return new TestCaseData(dataPhysicianIdNotMatch)
+                .SetName($"{testName} PhysicianId Not Match");
+
+            var dataCodeNotMatch = new GetCaseTypeFamilyDetailsTestData()
+            {
+                ExplorationDetailInfoData = dataAllMatch.ExplorationDetailInfoData,
+                CTFGroupCalcsList = dataAllMatch.CTFGroupCalcsList,
+                EntityGroupCalcsList = dataAllMatch.EntityGroupCalcsList,
+                EntityCodeGroupCalcsList = JsonSerializer.Deserialize<IEnumerable<EntityCodeGroupCalcs>>(entityCodeGroupCalcsListJson),
+                EntityCodePhysicianGroupCalcsList = dataAllMatch.EntityCodePhysicianGroupCalcsList,
+                CTFEncounterDetailList = dataAllMatch.CTFEncounterDetailList
+            };
+            dataCodeNotMatch.EntityCodeGroupCalcsList.First().Code = "";
+            yield return new TestCaseData(dataCodeNotMatch)
+                .SetName($"{testName} Code Not Match");
+
+            var dataEntityNotMatch = new GetCaseTypeFamilyDetailsTestData()
+            {
+                ExplorationDetailInfoData = dataAllMatch.ExplorationDetailInfoData,
+                CTFGroupCalcsList = dataAllMatch.CTFGroupCalcsList,
+                EntityGroupCalcsList = JsonSerializer.Deserialize<IEnumerable<EntityGroupCalcs>>(entityGroupCalcsListJson),
+                EntityCodeGroupCalcsList = dataAllMatch.EntityCodeGroupCalcsList,
+                EntityCodePhysicianGroupCalcsList = dataAllMatch.EntityCodePhysicianGroupCalcsList,
+                CTFEncounterDetailList = dataAllMatch.CTFEncounterDetailList
+            };
+            dataEntityNotMatch.EntityGroupCalcsList.First().EntityId = 0;
+            yield return new TestCaseData(dataEntityNotMatch)
+                .SetName($"{testName} Entity Not Match");
+        }
+
+        private static IEnumerable<TestCaseData> GetEncountersTestCases()
+        {
+            var testName = "GetEncountersTest";
+
+            var explorationDetailInfoDataJson = GetSourceFile("ExplorationDetailInfo.txt");
+            var physicianInfoJson = GetSourceFile("PhysicianInfo.txt");
+            var encounterInfoBaseJson = GetSourceFile("EncounterInfoBase.txt");
+
+            var dataAllMatch = new GetEncountersTestData()
+            {
+                ExplorationDetailInfoData = JsonSerializer.Deserialize<ExplorationDetailInfo>(explorationDetailInfoDataJson),
+                PhysicianInfoList = JsonSerializer.Deserialize<IEnumerable<PhysicianInfo>>(physicianInfoJson),
+                EncounterInfoBaseList = JsonSerializer.Deserialize<IEnumerable<EncounterInfoBase>>(encounterInfoBaseJson)
+            };
+
+            dataAllMatch.ExplorationDetailInfoData.Filters = new ExplorationFilter() // FIXED: Changed from Biz.Exploration.Filters.Filter to ExplorationFilter
+            {
+                FilterChipItems = new List<FilterChipItem>()
+                {
+                    new FilterChipItem {
+                        ChipType = ChipType.DateRange, Key = ChipKey.DischargeDateID,
+                        DateRange = new List<DateTime>()
+                        {
+                            new DateTime(2024, 1, 1),
+                            new DateTime(2024, 12, 31)
+                        }
+                    }
+                }
+            };
+            yield return new TestCaseData(dataAllMatch)
+                .SetName($"{testName} All Match");
+
+            var dataPhysicianIdNotMatch = new GetEncountersTestData()
+            {
+                ExplorationDetailInfoData = dataAllMatch.ExplorationDetailInfoData,
+                PhysicianInfoList = JsonSerializer.Deserialize<IEnumerable<PhysicianInfo>>(physicianInfoJson),
+                EncounterInfoBaseList = dataAllMatch.EncounterInfoBaseList,
+            };
+            dataPhysicianIdNotMatch.PhysicianInfoList.First().PhysicianID = 0;
+            yield return new TestCaseData(dataPhysicianIdNotMatch)
+                .SetName($"{testName} PhysicianId Not Match");
+        }
+
+        private static string GetSourceFile(string file)
+        {
+            string filePath = Path.Combine(TestHelper.TestsRootDirectory, SourceFilePath, file);
+            string jsonData = File.ReadAllText(filePath);
+            return jsonData;
+        }
+
+        public class GetCaseTypeFamilySummariesTestData
+        {
+            public ExplorationInfo ExplorationInfoData { get; set; }
+            public IEnumerable<CaseTypeFamilyEncounterInfo> CaseTypeFamilyEncounterInfoList { get; set; }
+
+        }
+
+        public class GetCaseTypeFamilyDetailsTestData
+        {
+            public ExplorationDetailInfo ExplorationDetailInfoData { get; set; }
+            public IEnumerable<CTFGroupCalcs> CTFGroupCalcsList { get; set; }
+            public IEnumerable<EntityGroupCalcs> EntityGroupCalcsList { get; set; }
+            public IEnumerable<EntityCodeGroupCalcs> EntityCodeGroupCalcsList { get; set; }
+            public IEnumerable<EntityCodePhysicianGroupCalcs> EntityCodePhysicianGroupCalcsList { get; set; }
+            public IEnumerable<CTFEncounterDetail> CTFEncounterDetailList { get; set; }
+        }
+
+        public class GetEncountersTestData
+        {
+            public ExplorationDetailInfo ExplorationDetailInfoData { get; set; }
+            public IEnumerable<PhysicianInfo> PhysicianInfoList { get; set; }
+            public IEnumerable<EncounterInfoBase> EncounterInfoBaseList { get; set; }
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/CTFEncounterDetail.txt b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/CTFEncounterDetail.txt
new file mode 100644
index 0000000..c6d0c11
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/CTFEncounterDetail.txt
@@ -0,0 +1,66 @@
+[
+  {
+    "EncounterId": 24375411,
+    "EncounterRecordNumber": "1024375411",
+    "CTFType": 0,
+    "EntityId": 93,
+    "Code": "880",
+    "PhysicianId": 3339,
+    "LengthOfStay": 5,
+    "VariableDirectCost": 208.1365,
+    "IdentifiedVariation": 148.89435,
+    "Charges": 4045.0814,
+    "IsExpired": 0,
+    "IsExcluded": false,
+    "DischargeStatusCode": "06",
+    "DischargeStatusDescription": "Discharged/transferred to home under care of an organized home health service organization in anticipation of covered skilled care"
+  },
+  {
+    "EncounterId": 26713064,
+    "EncounterRecordNumber": "1026713064",
+    "CTFType": 0,
+    "EntityId": 93,
+    "Code": "880",
+    "PhysicianId": 3474,
+    "LengthOfStay": 3,
+    "VariableDirectCost": 71.8018,
+    "IdentifiedVariation": 12.559649999999998,
+    "Charges": 985.8658,
+    "IsExpired": 0,
+    "IsExcluded": false,
+    "DischargeStatusCode": "01",
+    "DischargeStatusDescription": "Discharged to home or self care (routine discharge)"
+  },
+  {
+    "EncounterId": 27090900,
+    "EncounterRecordNumber": "1027090900",
+    "CTFType": 0,
+    "EntityId": 93,
+    "Code": "880",
+    "PhysicianId": 794,
+    "LengthOfStay": 15,
+    "VariableDirectCost": 5.0037,
+    "IdentifiedVariation": -54.23845,
+    "Charges": 384.65,
+    "IsExpired": 0,
+    "IsExcluded": true,
+    "DischargeStatusCode": "03",
+    "DischargeStatusDescription": "Discharged/transferred to Skilled Nursing Facility (SNF) with Medicare certification"
+  },
+  {
+    "EncounterId": 28432227,
+    "EncounterRecordNumber": "1028432227",
+    "CTFType": 0,
+    "EntityId": 93,
+    "Code": "880",
+    "PhysicianId": 3896,
+    "LengthOfStay": 7,
+    "VariableDirectCost": 46.6825,
+    "IdentifiedVariation": -12.559650000000005,
+    "Charges": 996.8704,
+    "IsExpired": 0,
+    "IsExcluded": true,
+    "DischargeStatusCode": "03",
+    "DischargeStatusDescription": "Discharged/transferred to Skilled Nursing Facility (SNF) with Medicare certification"
+  }
+]
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/CTFGroupCalcs.txt b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/CTFGroupCalcs.txt
new file mode 100644
index 0000000..e2d6256
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/CTFGroupCalcs.txt
@@ -0,0 +1,7 @@
+[
+	{
+	  "CTFId": 206,
+	  "CTFName": "Acute Adjustment Reaction And Psychosocial Dysfunction",
+	  "MedianVDC": 59.24215
+	}
+]
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/CaseTypeFamilyEncounterInfo.txt b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/CaseTypeFamilyEncounterInfo.txt
new file mode 100644
index 0000000..26756e0
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/CaseTypeFamilyEncounterInfo.txt
@@ -0,0 +1,596 @@
+[
+  {
+    "CaseTypeFamilyId": 6654,
+    "CaseTypeFamilyName": "Endoscopy Procedures on the Mediastinum",
+    "Vdc": 2038.5242,
+    "MedianVdc": 1931.0259,
+    "TwentyFivePercentileVdc": 1877.27675,
+    "SeventyFivePercentileVdc": 1984.77505,
+    "TwentyFivePercentileLos": 0,
+    "SeventyFivePercentileLos": 0,
+    "CostDriver": "Laboratory",
+    "EncounterId": 2562780,
+    "DischargeDateTime": "2023-01-17T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": 270.5061,
+    "IsExpired": 0,
+    "LengthOfStay": 0,
+    "MedianLengthOfStay": 0,
+    "MedianVariableDirectCost": 283.5443,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 554.0504,
+    "Charges": 11265.2698,
+    "IsExcluded": false,
+    "IqrLos": 0,
+    "IqrVdc": 107.4983,
+    "MadLos": 0,
+    "MadVdc": 159.37698,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 6654,
+    "CaseTypeFamilyName": "Endoscopy Procedures on the Mediastinum",
+    "Vdc": 2038.5242,
+    "MedianVdc": 1931.0259,
+    "TwentyFivePercentileVdc": 1877.27675,
+    "SeventyFivePercentileVdc": 1984.77505,
+    "TwentyFivePercentileLos": 0,
+    "SeventyFivePercentileLos": 0,
+    "CostDriver": "Excluded",
+    "EncounterId": 2562780,
+    "DischargeDateTime": "2023-01-17T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": 0,
+    "IsExpired": 0,
+    "LengthOfStay": 0,
+    "MedianLengthOfStay": 0,
+    "MedianVariableDirectCost": 0.2644,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 0.2644,
+    "Charges": 49.0752,
+    "IsExcluded": false,
+    "IqrLos": 0,
+    "IqrVdc": 107.4983,
+    "MadLos": 0,
+    "MadVdc": 159.37698,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 6654,
+    "CaseTypeFamilyName": "Endoscopy Procedures on the Mediastinum",
+    "Vdc": 2038.5242,
+    "MedianVdc": 1931.0259,
+    "TwentyFivePercentileVdc": 1877.27675,
+    "SeventyFivePercentileVdc": 1984.77505,
+    "TwentyFivePercentileLos": 0,
+    "SeventyFivePercentileLos": 0,
+    "CostDriver": "OR Time",
+    "EncounterId": 2562780,
+    "DischargeDateTime": "2023-01-17T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": -15.31945,
+    "IsExpired": 0,
+    "LengthOfStay": 0,
+    "MedianLengthOfStay": 0,
+    "MedianVariableDirectCost": 1066.93575,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 1051.6163,
+    "Charges": 17348.9676,
+    "IsExcluded": false,
+    "IqrLos": 0,
+    "IqrVdc": 107.4983,
+    "MadLos": 0,
+    "MadVdc": 159.37698,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 6654,
+    "CaseTypeFamilyName": "Endoscopy Procedures on the Mediastinum",
+    "Vdc": 2038.5242,
+    "MedianVdc": 1931.0259,
+    "TwentyFivePercentileVdc": 1877.27675,
+    "SeventyFivePercentileVdc": 1984.77505,
+    "TwentyFivePercentileLos": 0,
+    "SeventyFivePercentileLos": 0,
+    "CostDriver": "Supplies",
+    "EncounterId": 2562780,
+    "DischargeDateTime": "2023-01-17T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": -74.0283,
+    "IsExpired": 0,
+    "LengthOfStay": 0,
+    "MedianLengthOfStay": 0,
+    "MedianVariableDirectCost": 275.0648,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 201.0365,
+    "Charges": 908.8934,
+    "IsExcluded": false,
+    "IqrLos": 0,
+    "IqrVdc": 107.4983,
+    "MadLos": 0,
+    "MadVdc": 159.37698,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 6654,
+    "CaseTypeFamilyName": "Endoscopy Procedures on the Mediastinum",
+    "Vdc": 2038.5242,
+    "MedianVdc": 1931.0259,
+    "TwentyFivePercentileVdc": 1877.27675,
+    "SeventyFivePercentileVdc": 1984.77505,
+    "TwentyFivePercentileLos": 0,
+    "SeventyFivePercentileLos": 0,
+    "CostDriver": "Pharmacy",
+    "EncounterId": 2562780,
+    "DischargeDateTime": "2023-01-17T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": -15.66025,
+    "IsExpired": 0,
+    "LengthOfStay": 0,
+    "MedianLengthOfStay": 0,
+    "MedianVariableDirectCost": 120.94545,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 105.2852,
+    "Charges": 1801.1414,
+    "IsExcluded": false,
+    "IqrLos": 0,
+    "IqrVdc": 107.4983,
+    "MadLos": 0,
+    "MadVdc": 159.37698,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 6654,
+    "CaseTypeFamilyName": "Endoscopy Procedures on the Mediastinum",
+    "Vdc": 2038.5242,
+    "MedianVdc": 1931.0259,
+    "TwentyFivePercentileVdc": 1877.27675,
+    "SeventyFivePercentileVdc": 1984.77505,
+    "TwentyFivePercentileLos": 0,
+    "SeventyFivePercentileLos": 0,
+    "CostDriver": "",
+    "EncounterId": 2562780,
+    "DischargeDateTime": "2023-01-17T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": 0,
+    "IsExpired": 0,
+    "LengthOfStay": 0,
+    "MedianLengthOfStay": 0,
+    "MedianVariableDirectCost": 0,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 0,
+    "Charges": 0,
+    "IsExcluded": false,
+    "IqrLos": 0,
+    "IqrVdc": 107.4983,
+    "MadLos": 0,
+    "MadVdc": 159.37698,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 6654,
+    "CaseTypeFamilyName": "Endoscopy Procedures on the Mediastinum",
+    "Vdc": 2038.5242,
+    "MedianVdc": 1931.0259,
+    "TwentyFivePercentileVdc": 1877.27675,
+    "SeventyFivePercentileVdc": 1984.77505,
+    "TwentyFivePercentileLos": 0,
+    "SeventyFivePercentileLos": 0,
+    "CostDriver": "Cardiovascular",
+    "EncounterId": 2562780,
+    "DischargeDateTime": "2023-01-17T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": 0,
+    "IsExpired": 0,
+    "LengthOfStay": 0,
+    "MedianLengthOfStay": 0,
+    "MedianVariableDirectCost": 5.0037,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 5.0037,
+    "Charges": 393.3321,
+    "IsExcluded": false,
+    "IqrLos": 0,
+    "IqrVdc": 107.4983,
+    "MadLos": 0,
+    "MadVdc": 159.37698,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 6654,
+    "CaseTypeFamilyName": "Endoscopy Procedures on the Mediastinum",
+    "Vdc": 2038.5242,
+    "MedianVdc": 1931.0259,
+    "TwentyFivePercentileVdc": 1877.27675,
+    "SeventyFivePercentileVdc": 1984.77505,
+    "TwentyFivePercentileLos": 0,
+    "SeventyFivePercentileLos": 0,
+    "CostDriver": "Therapeutic Services",
+    "EncounterId": 2562780,
+    "DischargeDateTime": "2023-01-17T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": -60.63385,
+    "IsExpired": 0,
+    "LengthOfStay": 0,
+    "MedianLengthOfStay": 0,
+    "MedianVariableDirectCost": 181.90155,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 121.2677,
+    "Charges": 320.4913,
+    "IsExcluded": false,
+    "IqrLos": 0,
+    "IqrVdc": 107.4983,
+    "MadLos": 0,
+    "MadVdc": 159.37698,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 592,
+    "CaseTypeFamilyName": "Skin Debridement",
+    "Vdc": 4353.6024,
+    "MedianVdc": 4353.6024,
+    "TwentyFivePercentileVdc": 2983.74705,
+    "SeventyFivePercentileVdc": 4525.49485,
+    "TwentyFivePercentileLos": 4.5,
+    "SeventyFivePercentileLos": 9.5,
+    "CostDriver": "Pharmacy",
+    "EncounterId": 2565425,
+    "DischargeDateTime": "2023-02-02T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": 0,
+    "IsExpired": 0,
+    "LengthOfStay": 12,
+    "MedianLengthOfStay": 7,
+    "MedianVariableDirectCost": 373.0302,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 373.0302,
+    "Charges": 11782.8149,
+    "IsExcluded": false,
+    "IqrLos": 5,
+    "IqrVdc": 1541.7478,
+    "MadLos": 7.413,
+    "MadVdc": 509.6955,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 592,
+    "CaseTypeFamilyName": "Skin Debridement",
+    "Vdc": 4353.6024,
+    "MedianVdc": 4353.6024,
+    "TwentyFivePercentileVdc": 2983.74705,
+    "SeventyFivePercentileVdc": 4525.49485,
+    "TwentyFivePercentileLos": 4.5,
+    "SeventyFivePercentileLos": 9.5,
+    "CostDriver": "Supplies",
+    "EncounterId": 2565425,
+    "DischargeDateTime": "2023-02-02T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": -19.7357,
+    "IsExpired": 0,
+    "LengthOfStay": 12,
+    "MedianLengthOfStay": 7,
+    "MedianVariableDirectCost": 87.3104,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 67.5747,
+    "Charges": 254.2575,
+    "IsExcluded": false,
+    "IqrLos": 5,
+    "IqrVdc": 1541.7478,
+    "MadLos": 7.413,
+    "MadVdc": 509.6955,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 592,
+    "CaseTypeFamilyName": "Skin Debridement",
+    "Vdc": 4353.6024,
+    "MedianVdc": 4353.6024,
+    "TwentyFivePercentileVdc": 2983.74705,
+    "SeventyFivePercentileVdc": 4525.49485,
+    "TwentyFivePercentileLos": 4.5,
+    "SeventyFivePercentileLos": 9.5,
+    "CostDriver": "OR Time",
+    "EncounterId": 2565425,
+    "DischargeDateTime": "2023-02-02T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": 0,
+    "IsExpired": 0,
+    "LengthOfStay": 12,
+    "MedianLengthOfStay": 7,
+    "MedianVariableDirectCost": 680.5711,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 680.5711,
+    "Charges": 12771.463,
+    "IsExcluded": false,
+    "IqrLos": 5,
+    "IqrVdc": 1541.7478,
+    "MadLos": 7.413,
+    "MadVdc": 509.6955,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 592,
+    "CaseTypeFamilyName": "Skin Debridement",
+    "Vdc": 4353.6024,
+    "MedianVdc": 4353.6024,
+    "TwentyFivePercentileVdc": 2983.74705,
+    "SeventyFivePercentileVdc": 4525.49485,
+    "TwentyFivePercentileLos": 4.5,
+    "SeventyFivePercentileLos": 9.5,
+    "CostDriver": "LOS",
+    "EncounterId": 2565425,
+    "DischargeDateTime": "2023-02-02T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": 357.1267,
+    "IsExpired": 0,
+    "LengthOfStay": 12,
+    "MedianLengthOfStay": 7,
+    "MedianVariableDirectCost": 1747.5269,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 2104.6536,
+    "Charges": 29186.0674,
+    "IsExcluded": false,
+    "IqrLos": 5,
+    "IqrVdc": 1541.7478,
+    "MadLos": 7.413,
+    "MadVdc": 509.6955,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 592,
+    "CaseTypeFamilyName": "Skin Debridement",
+    "Vdc": 4353.6024,
+    "MedianVdc": 4353.6024,
+    "TwentyFivePercentileVdc": 2983.74705,
+    "SeventyFivePercentileVdc": 4525.49485,
+    "TwentyFivePercentileLos": 4.5,
+    "SeventyFivePercentileLos": 9.5,
+    "CostDriver": "Other Diagnostic Services",
+    "EncounterId": 2565425,
+    "DischargeDateTime": "2023-02-02T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": 37.18375,
+    "IsExpired": 0,
+    "LengthOfStay": 12,
+    "MedianLengthOfStay": 7,
+    "MedianVariableDirectCost": 113.54845,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 150.7322,
+    "Charges": 3224.1159,
+    "IsExcluded": false,
+    "IqrLos": 5,
+    "IqrVdc": 1541.7478,
+    "MadLos": 7.413,
+    "MadVdc": 509.6955,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 592,
+    "CaseTypeFamilyName": "Skin Debridement",
+    "Vdc": 4353.6024,
+    "MedianVdc": 4353.6024,
+    "TwentyFivePercentileVdc": 2983.74705,
+    "SeventyFivePercentileVdc": 4525.49485,
+    "TwentyFivePercentileLos": 4.5,
+    "SeventyFivePercentileLos": 9.5,
+    "CostDriver": "",
+    "EncounterId": 2565425,
+    "DischargeDateTime": "2023-02-02T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": 0,
+    "IsExpired": 0,
+    "LengthOfStay": 12,
+    "MedianLengthOfStay": 7,
+    "MedianVariableDirectCost": 0,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 0,
+    "Charges": 0,
+    "IsExcluded": false,
+    "IqrLos": 5,
+    "IqrVdc": 1541.7478,
+    "MadLos": 7.413,
+    "MadVdc": 509.6955,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 592,
+    "CaseTypeFamilyName": "Skin Debridement",
+    "Vdc": 4353.6024,
+    "MedianVdc": 4353.6024,
+    "TwentyFivePercentileVdc": 2983.74705,
+    "SeventyFivePercentileVdc": 4525.49485,
+    "TwentyFivePercentileLos": 4.5,
+    "SeventyFivePercentileLos": 9.5,
+    "CostDriver": "Laboratory",
+    "EncounterId": 2565425,
+    "DischargeDateTime": "2023-02-02T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": 0,
+    "IsExpired": 0,
+    "LengthOfStay": 12,
+    "MedianLengthOfStay": 7,
+    "MedianVariableDirectCost": 123.2207,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 123.2207,
+    "Charges": 5503.8051,
+    "IsExcluded": false,
+    "IqrLos": 5,
+    "IqrVdc": 1541.7478,
+    "MadLos": 7.413,
+    "MadVdc": 509.6955,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 592,
+    "CaseTypeFamilyName": "Skin Debridement",
+    "Vdc": 4353.6024,
+    "MedianVdc": 4353.6024,
+    "TwentyFivePercentileVdc": 2983.74705,
+    "SeventyFivePercentileVdc": 4525.49485,
+    "TwentyFivePercentileLos": 4.5,
+    "SeventyFivePercentileLos": 9.5,
+    "CostDriver": "Therapeutic Services",
+    "EncounterId": 2565425,
+    "DischargeDateTime": "2023-02-02T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": 245.3111,
+    "IsExpired": 0,
+    "LengthOfStay": 12,
+    "MedianLengthOfStay": 7,
+    "MedianVariableDirectCost": 473.0037,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 718.3148,
+    "Charges": 7026.8907,
+    "IsExcluded": false,
+    "IqrLos": 5,
+    "IqrVdc": 1541.7478,
+    "MadLos": 7.413,
+    "MadVdc": 509.6955,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 592,
+    "CaseTypeFamilyName": "Skin Debridement",
+    "Vdc": 4353.6024,
+    "MedianVdc": 4353.6024,
+    "TwentyFivePercentileVdc": 2983.74705,
+    "SeventyFivePercentileVdc": 4525.49485,
+    "TwentyFivePercentileLos": 4.5,
+    "SeventyFivePercentileLos": 9.5,
+    "CostDriver": "Imaging",
+    "EncounterId": 2565425,
+    "DischargeDateTime": "2023-02-02T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": 0,
+    "IsExpired": 0,
+    "LengthOfStay": 12,
+    "MedianLengthOfStay": 7,
+    "MedianVariableDirectCost": 37.5413,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 37.5413,
+    "Charges": 690.5777,
+    "IsExcluded": false,
+    "IqrLos": 5,
+    "IqrVdc": 1541.7478,
+    "MadLos": 7.413,
+    "MadVdc": 509.6955,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  },
+  {
+    "CaseTypeFamilyId": 592,
+    "CaseTypeFamilyName": "Skin Debridement",
+    "Vdc": 4353.6024,
+    "MedianVdc": 4353.6024,
+    "TwentyFivePercentileVdc": 2983.74705,
+    "SeventyFivePercentileVdc": 4525.49485,
+    "TwentyFivePercentileLos": 4.5,
+    "SeventyFivePercentileLos": 9.5,
+    "CostDriver": "Excluded",
+    "EncounterId": 2565425,
+    "DischargeDateTime": "2023-02-02T00:00:00Z",
+    "EncounterRecordNumber": null,
+    "EntityId": 0,
+    "IdentifiedVariation": -49.1141,
+    "IsExpired": 0,
+    "LengthOfStay": 12,
+    "MedianLengthOfStay": 7,
+    "MedianVariableDirectCost": 147.0779,
+    "MedianGrossCharges": 0,
+    "VariableDirectCost": 97.9638,
+    "Charges": 1718.5171,
+    "IsExcluded": false,
+    "IqrLos": 5,
+    "IqrVdc": 1541.7478,
+    "MadLos": 7.413,
+    "MadVdc": 509.6955,
+    "DischargeStatusCode": null,
+    "DischargeStatusDescription": null,
+    "MortalityRate": 0,
+    "ROM": 0,
+    "SOI": 0
+  }
+]
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/EncounterInfoBase.txt b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/EncounterInfoBase.txt
new file mode 100644
index 0000000..aaa748e
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/EncounterInfoBase.txt
@@ -0,0 +1,170 @@
+[
+  {
+    "EncounterId": 3490618,
+    "EncounterRecordNumber": "1003490618",
+    "PhysicianID": 3845,
+    "AgeCohortID": 3,
+    "EntityID": 2,
+    "ServiceLineID": 13,
+    "LengthOfStay": 15,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-02-18T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 21268418,
+    "EncounterRecordNumber": "1021268418",
+    "PhysicianID": 3939,
+    "AgeCohortID": 4,
+    "EntityID": 2,
+    "ServiceLineID": 13,
+    "LengthOfStay": 2,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-04-07T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 21269053,
+    "EncounterRecordNumber": "1021269053",
+    "PhysicianID": 2986,
+    "AgeCohortID": 3,
+    "EntityID": 2,
+    "ServiceLineID": 13,
+    "LengthOfStay": 14,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-01-28T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 21366384,
+    "EncounterRecordNumber": "1021366384",
+    "PhysicianID": 1370,
+    "AgeCohortID": 4,
+    "EntityID": 2,
+    "ServiceLineID": 13,
+    "LengthOfStay": 12,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-03-01T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 21549774,
+    "EncounterRecordNumber": "1021549774",
+    "PhysicianID": 3153,
+    "AgeCohortID": 3,
+    "EntityID": 13,
+    "ServiceLineID": 13,
+    "LengthOfStay": 1,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-02-15T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 22931559,
+    "EncounterRecordNumber": "1022931559",
+    "PhysicianID": 4446,
+    "AgeCohortID": 4,
+    "EntityID": 2,
+    "ServiceLineID": 13,
+    "LengthOfStay": 11,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-05-21T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 23497650,
+    "EncounterRecordNumber": "1023497650",
+    "PhysicianID": 842,
+    "AgeCohortID": 4,
+    "EntityID": 2,
+    "ServiceLineID": 13,
+    "LengthOfStay": 8,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-05-14T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 24240851,
+    "EncounterRecordNumber": "1024240851",
+    "PhysicianID": 720,
+    "AgeCohortID": 3,
+    "EntityID": 2,
+    "ServiceLineID": 13,
+    "LengthOfStay": 3,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-06-24T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 25272685,
+    "EncounterRecordNumber": "1025272685",
+    "PhysicianID": 3481,
+    "AgeCohortID": 4,
+    "EntityID": 2,
+    "ServiceLineID": 13,
+    "LengthOfStay": 3,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-07-13T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 25954564,
+    "EncounterRecordNumber": "1025954564",
+    "PhysicianID": 842,
+    "AgeCohortID": 3,
+    "EntityID": 2,
+    "ServiceLineID": 13,
+    "LengthOfStay": 2,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-08-04T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 25971328,
+    "EncounterRecordNumber": "1025971328",
+    "PhysicianID": 3343,
+    "AgeCohortID": 3,
+    "EntityID": 2,
+    "ServiceLineID": 13,
+    "LengthOfStay": 2,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-07-25T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 27006329,
+    "EncounterRecordNumber": "1027006329",
+    "PhysicianID": 4269,
+    "AgeCohortID": 3,
+    "EntityID": 2,
+    "ServiceLineID": 13,
+    "LengthOfStay": 2,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-10-01T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 29625457,
+    "EncounterRecordNumber": "1029625457",
+    "PhysicianID": 842,
+    "AgeCohortID": 4,
+    "EntityID": 2,
+    "ServiceLineID": 13,
+    "LengthOfStay": 9,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-11-24T00:00:00Z",
+    "IsExcluded": false
+  },
+  {
+    "EncounterId": 30059663,
+    "EncounterRecordNumber": "1030059663",
+    "PhysicianID": 24764,
+    "AgeCohortID": 4,
+    "EntityID": 13,
+    "ServiceLineID": 13,
+    "LengthOfStay": 6,
+    "IsQVIEncounter": false,
+    "DischargeDateTime": "2023-11-19T00:00:00Z",
+    "IsExcluded": false
+  }
+]
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/EntityCodeGroupCalcs.txt b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/EntityCodeGroupCalcs.txt
new file mode 100644
index 0000000..9bc1a36
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/EntityCodeGroupCalcs.txt
@@ -0,0 +1,12 @@
+[
+  {
+    "EntityId": 93,
+    "Code": "880",
+    "CodeName": "880 - ACUTE ADJUSTMENT REACTION AND PSYCHOSOCIAL DYSFUNCTION",
+    "MedianVDC": 59.24215,
+    "MedianLOS": 6,
+    "MedianCharges": 991.3681,
+    "Id": "880",
+    "Name": "880 - ACUTE ADJUSTMENT REACTION AND PSYCHOSOCIAL DYSFUNCTION"
+  }
+]
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/EntityCodePhysicianGroupCalcs.txt b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/EntityCodePhysicianGroupCalcs.txt
new file mode 100644
index 0000000..5703470
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/EntityCodePhysicianGroupCalcs.txt
@@ -0,0 +1,46 @@
+[
+  {
+    "EntityId": 93,
+    "Code": "880",
+    "PhysicianId": 3474,
+    "PhysicianName": "KLAPPERICH CORDELL",
+    "MedianVDC": 71.8018,
+    "MedianLOS": 3,
+    "MedianCharges": 985.8658,
+    "Id": "3474",
+    "Name": "KLAPPERICH CORDELL"
+  },
+  {
+    "EntityId": 93,
+    "Code": "880",
+    "PhysicianId": 3896,
+    "PhysicianName": "HARTSE FRANKIE",
+    "MedianVDC": 46.6825,
+    "MedianLOS": 7,
+    "MedianCharges": 996.8704,
+    "Id": "3896",
+    "Name": "HARTSE FRANKIE"
+  },
+  {
+    "EntityId": 93,
+    "Code": "880",
+    "PhysicianId": 794,
+    "PhysicianName": "DIAZDELEON HIPOLITO",
+    "MedianVDC": 5.0037,
+    "MedianLOS": 15,
+    "MedianCharges": 384.65,
+    "Id": "794",
+    "Name": "DIAZDELEON HIPOLITO"
+  },
+  {
+    "EntityId": 93,
+    "Code": "880",
+    "PhysicianId": 3339,
+    "PhysicianName": "HATZENBUHLER SCOTTY",
+    "MedianVDC": 208.1365,
+    "MedianLOS": 5,
+    "MedianCharges": 4045.0814,
+    "Id": "3339",
+    "Name": "HATZENBUHLER SCOTTY"
+  }
+]
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/EntityGroupCalcs.txt b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/EntityGroupCalcs.txt
new file mode 100644
index 0000000..79333e6
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/EntityGroupCalcs.txt
@@ -0,0 +1,11 @@
+[
+  {
+    "EntityId": 93,
+    "EntityName": "10 - Northern Valley Medical Center",
+    "MedianVDC": 59.24215,
+    "MedianLOS": 6,
+    "MedianCharges": 991.3681,
+    "Id": "93",
+    "Name": "10 - Northern Valley Medical Center"
+  }
+]
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/ExplorationDetailInfo.txt b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/ExplorationDetailInfo.txt
new file mode 100644
index 0000000..1583b4a
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/ExplorationDetailInfo.txt
@@ -0,0 +1,19 @@
+{
+  "CaseTypeFamilyId": 206,
+  "CostDriver": "Cardiovascular",
+  "CodeType": null,
+  "ExcludedEncounters": [],
+  "IncludedEncounters": [],
+  "ConfigurationGuid": "aa4cba4f-2506-462c-8e34-c45b21653988",
+  "ExclusionCriteria": {
+    "LosExclusionType": 0,
+    "LosExclusionValue": 0,
+    "CostExclusionType": 0,
+    "CostExclusionValue": 0
+  },
+  "Filters": {
+    "DischargeDateStart": "2023-01-01T00:00:00",
+    "DischargeDateEnd": "2023-12-31T00:00:00",
+    "FilterChipItems": []
+  }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/ExplorationInfo.txt b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/ExplorationInfo.txt
new file mode 100644
index 0000000..e0a2e8c
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/ExplorationInfo.txt
@@ -0,0 +1,14 @@
+{
+  "ConfigurationGuid": "aa4cba4f-2506-462c-8e34-c45b21653988",
+  "ExclusionCriteria": {
+    "LosExclusionType": 0,
+    "LosExclusionValue": 0,
+    "CostExclusionType": 0,
+    "CostExclusionValue": 0
+  },
+  "Filters": {
+    "DischargeDateStart": "2023-01-01T00:00:00",
+    "DischargeDateEnd": "2023-12-31T00:00:00",
+    "FilterChipItems": []
+  }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/PhysicianInfo.txt b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/PhysicianInfo.txt
new file mode 100644
index 0000000..44d0d51
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Exploration/source/PhysicianInfo.txt
@@ -0,0 +1,134 @@
+[
+  {
+    "PhysicianID": 3153,
+    "PhysicianName": "TOZIER BOBBY",
+    "PhysicianGUID": "d3d281ce-c255-45f0-8334-88e15ffe48cd",
+    "PhysicianGroupAffiliationID": 0,
+    "PhysicianGroupAffiliation": "Not Specified",
+    "PhysicianGroupAffiliationGUID": "1c3af86f-a7b7-4484-935c-bad5b93627e7",
+    "PhysicianSpecialtyID": 208,
+    "PhysicianSpecialty": "123 - Hospitalist",
+    "PhysicianSpecialtyGUID": "3a3e27d9-3454-4fc3-83a9-e86b6fe3bd61"
+  },
+  {
+    "PhysicianID": 3845,
+    "PhysicianName": "KEITHLEY CHRISTOPHER",
+    "PhysicianGUID": "9dc822af-5b79-4063-b75a-72cc4cca6040",
+    "PhysicianGroupAffiliationID": 0,
+    "PhysicianGroupAffiliation": "Not Specified",
+    "PhysicianGroupAffiliationGUID": "1c3af86f-a7b7-4484-935c-bad5b93627e7",
+    "PhysicianSpecialtyID": 208,
+    "PhysicianSpecialty": "123 - Hospitalist",
+    "PhysicianSpecialtyGUID": "3a3e27d9-3454-4fc3-83a9-e86b6fe3bd61"
+  },
+  {
+    "PhysicianID": 1370,
+    "PhysicianName": "BONELLO HUONG",
+    "PhysicianGUID": "1fbc3e74-e32e-4a31-a55a-2ba2a581bf68",
+    "PhysicianGroupAffiliationID": 0,
+    "PhysicianGroupAffiliation": "Not Specified",
+    "PhysicianGroupAffiliationGUID": "1c3af86f-a7b7-4484-935c-bad5b93627e7",
+    "PhysicianSpecialtyID": 221,
+    "PhysicianSpecialty": "17 - Internal Medicine",
+    "PhysicianSpecialtyGUID": "02db369d-885a-474a-acaf-81363e490534"
+  },
+  {
+    "PhysicianID": 24764,
+    "PhysicianName": "FLUETSCH CARY",
+    "PhysicianGUID": "723d834b-d4da-4885-9efb-4c9de59cb982",
+    "PhysicianGroupAffiliationID": 0,
+    "PhysicianGroupAffiliation": "Not Specified",
+    "PhysicianGroupAffiliationGUID": "1c3af86f-a7b7-4484-935c-bad5b93627e7",
+    "PhysicianSpecialtyID": 221,
+    "PhysicianSpecialty": "17 - Internal Medicine",
+    "PhysicianSpecialtyGUID": "02db369d-885a-474a-acaf-81363e490534"
+  },
+  {
+    "PhysicianID": 4446,
+    "PhysicianName": "DEMAS CHARLEY",
+    "PhysicianGUID": "acefb0de-25b1-4cda-9eae-2b5799155816",
+    "PhysicianGroupAffiliationID": 0,
+    "PhysicianGroupAffiliation": "Not Specified",
+    "PhysicianGroupAffiliationGUID": "1c3af86f-a7b7-4484-935c-bad5b93627e7",
+    "PhysicianSpecialtyID": 271,
+    "PhysicianSpecialty": "62 - Critical Care Medicine",
+    "PhysicianSpecialtyGUID": "32c0a064-a015-472a-b1a1-3ee9ada450f2"
+  },
+  {
+    "PhysicianID": 3343,
+    "PhysicianName": "BLINKA GRAIG",
+    "PhysicianGUID": "a96d6d2c-029f-4689-8f31-51870150ac1c",
+    "PhysicianGroupAffiliationID": 0,
+    "PhysicianGroupAffiliation": "Not Specified",
+    "PhysicianGroupAffiliationGUID": "1c3af86f-a7b7-4484-935c-bad5b93627e7",
+    "PhysicianSpecialtyID": 208,
+    "PhysicianSpecialty": "123 - Hospitalist",
+    "PhysicianSpecialtyGUID": "3a3e27d9-3454-4fc3-83a9-e86b6fe3bd61"
+  },
+  {
+    "PhysicianID": 720,
+    "PhysicianName": "TOMASSI RUSS",
+    "PhysicianGUID": "3802cc8a-5ad5-48e0-864e-9acfe0e4d324",
+    "PhysicianGroupAffiliationID": 0,
+    "PhysicianGroupAffiliation": "Not Specified",
+    "PhysicianGroupAffiliationGUID": "1c3af86f-a7b7-4484-935c-bad5b93627e7",
+    "PhysicianSpecialtyID": 221,
+    "PhysicianSpecialty": "17 - Internal Medicine",
+    "PhysicianSpecialtyGUID": "02db369d-885a-474a-acaf-81363e490534"
+  },
+  {
+    "PhysicianID": 3481,
+    "PhysicianName": "TREVIZO DIRK",
+    "PhysicianGUID": "55639862-736c-4e9b-afcc-16673445c181",
+    "PhysicianGroupAffiliationID": 0,
+    "PhysicianGroupAffiliation": "Not Specified",
+    "PhysicianGroupAffiliationGUID": "1c3af86f-a7b7-4484-935c-bad5b93627e7",
+    "PhysicianSpecialtyID": 221,
+    "PhysicianSpecialty": "17 - Internal Medicine",
+    "PhysicianSpecialtyGUID": "02db369d-885a-474a-acaf-81363e490534"
+  },
+  {
+    "PhysicianID": 2986,
+    "PhysicianName": "COAXUM RUDY",
+    "PhysicianGUID": "3cd87422-3164-4c2c-9f42-dafa6c927353",
+    "PhysicianGroupAffiliationID": 0,
+    "PhysicianGroupAffiliation": "Not Specified",
+    "PhysicianGroupAffiliationGUID": "1c3af86f-a7b7-4484-935c-bad5b93627e7",
+    "PhysicianSpecialtyID": 221,
+    "PhysicianSpecialty": "17 - Internal Medicine",
+    "PhysicianSpecialtyGUID": "02db369d-885a-474a-acaf-81363e490534"
+  },
+  {
+    "PhysicianID": 842,
+    "PhysicianName": "CLENDENON RENDA",
+    "PhysicianGUID": "edb778e5-c677-4800-a1bc-153331e52f48",
+    "PhysicianGroupAffiliationID": 0,
+    "PhysicianGroupAffiliation": "Not Specified",
+    "PhysicianGroupAffiliationGUID": "1c3af86f-a7b7-4484-935c-bad5b93627e7",
+    "PhysicianSpecialtyID": 221,
+    "PhysicianSpecialty": "17 - Internal Medicine",
+    "PhysicianSpecialtyGUID": "02db369d-885a-474a-acaf-81363e490534"
+  },
+  {
+    "PhysicianID": 4269,
+    "PhysicianName": "CROUTHAMEL SUNNY",
+    "PhysicianGUID": "5c889c75-adab-4c08-9ccb-347ce13b9e70",
+    "PhysicianGroupAffiliationID": 0,
+    "PhysicianGroupAffiliation": "Not Specified",
+    "PhysicianGroupAffiliationGUID": "1c3af86f-a7b7-4484-935c-bad5b93627e7",
+    "PhysicianSpecialtyID": 221,
+    "PhysicianSpecialty": "17 - Internal Medicine",
+    "PhysicianSpecialtyGUID": "02db369d-885a-474a-acaf-81363e490534"
+  },
+  {
+    "PhysicianID": 3939,
+    "PhysicianName": "LANMAN JOVAN",
+    "PhysicianGUID": "5b68c9cf-beaa-4267-9bc7-05cddba3de4c",
+    "PhysicianGroupAffiliationID": 0,
+    "PhysicianGroupAffiliation": "Not Specified",
+    "PhysicianGroupAffiliationGUID": "1c3af86f-a7b7-4484-935c-bad5b93627e7",
+    "PhysicianSpecialtyID": 221,
+    "PhysicianSpecialty": "17 - Internal Medicine",
+    "PhysicianSpecialtyGUID": "02db369d-885a-474a-acaf-81363e490534"
+  }
+]
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/FreeForm/Opportunities/FFOpportunityServiceTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/FreeForm/Opportunities/FFOpportunityServiceTests.cs
new file mode 100644
index 0000000..0d4cd2b
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/FreeForm/Opportunities/FFOpportunityServiceTests.cs
@@ -0,0 +1,612 @@
+using DocumentFormat.OpenXml.Wordprocessing;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Hangfire.Jazz.Client.Models;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyNUnit;
+using VerifyTests;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.FreeForm.Opportunities
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Unit")]
+    public class FFOpportunityServiceTests
+    {
+
+        private Mock<IFFOpportunityService> _freeformOpportunityServiceMock;
+        private Mock<IAsyncDbContextFactory<JazzDbContext>> _dbContextFactoryMock;
+        private Mock<IJazzDbContext> _jazzDbContextMock;
+        private Mock<IJazzHangfireServiceClient> _hangfireServiceMock;
+        private Mock<IAuthorizationServiceClient> _authorizationServiceMock;
+        private Mock<IFiscalMonthResolver> _fiscalMonthResolverMock;
+        private IInitiativeService _initiativeService;
+        private IUpdateFactOpportunitySavingsService _updateFactOpportunitySavingsService;
+        private VerifySettings _verifySettings;
+
+        private static readonly ResourceFileExtractor _extractor = new ResourceFileExtractor(".Resource.");
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _freeformOpportunityServiceMock = new Mock<IFFOpportunityService>();
+            _dbContextFactoryMock = new Mock<IAsyncDbContextFactory<JazzDbContext>>();
+            _jazzDbContextMock = new Mock<IJazzDbContext>();
+            _hangfireServiceMock = new Mock<IJazzHangfireServiceClient>();
+            _fiscalMonthResolverMock = new Mock<IFiscalMonthResolver>();
+            _updateFactOpportunitySavingsService = Mock.Of<IUpdateFactOpportunitySavingsService>();
+            _initiativeService = Mock.Of<IInitiativeService>();
+            Mock.Get(_updateFactOpportunitySavingsService)
+                .Setup(s => s.UpdateFactOpportunitySavings(It.IsAny<CancellationToken>()));
+            Mock.Get(_initiativeService)
+                .Setup(s => s.DeleteAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            _authorizationServiceMock = new Mock<IAuthorizationServiceClient>();
+            _authorizationServiceMock
+                .Setup(o => o.AddPermissionsFromDefaultsAsync(It.IsAny<Guid>(), It.IsAny<SecurableEntityType>(), It.IsAny<CancellationToken>()));
+            _verifySettings = new VerifySettings();
+            _verifySettings.UseDirectory("snapshots");
+            _verifySettings.AddNamedGuid(JazzEntityFrameworkFactory.CurrentConfigurationGuid, "ConfigurationGuid");
+            _verifySettings.ScrubInlineGuids();
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Asc()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var freeformOpportunityService = new FFOpportunityService(framework, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+            var filters = new FFFilters()
+            {
+                FinancialImprovementTypes = new List<string>(),
+                MetricTypes = new List<string>(),
+                IdentifiedSavings = 0,
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid
+            };
+
+            var pagingOptions = new PagingOptions("IdentifiedSavings", SortOrder.Asc);
+
+            // act
+            var taskResult = await freeformOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            await Verifier.Verify(taskResult, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Desc()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var freeformOpportunityService = new FFOpportunityService(framework, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+            var filters = new FFFilters()
+            {
+                FinancialImprovementTypes = new List<string>(),
+                MetricTypes = new List<string>(),
+                IdentifiedSavings = 0,
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid
+            };
+
+            var pagingOptions = new PagingOptions("IdentifiedSavings", SortOrder.Desc);
+
+            // act
+            var taskResult = await freeformOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            await Verifier.Verify(taskResult, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [TestCaseSource(nameof(GetFilterData))]
+        public async Task TestValidateFilters(FFFilters filters)
+        {
+            if (filters == null) return;
+            await Verifier.Verify(filters, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [TestCaseSource(nameof(TestGetExcelWorkbookNullFilterCases))]
+        public async Task TestGetExcelWorkbook(FFFilters filters)
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            //var opp = framework.FFOpportunities.First();
+            var service = new FFOpportunityService(framework, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+
+            // act
+            var wb = await service.ExportAsync(new SortOptions(), filters, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\Git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "ExcelFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            try
+            {
+                await Verifier.Verify(wb.GetDataTables(), _verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName());
+            }
+            catch (Exception ex)
+            {
+                Console.Write("Verifier.VerifyFile failed. Using back up verification method");
+                wb.Worksheets.Should().HaveCount(1);
+                var ws = wb.Worksheet(1);
+                ws.Should().NotBeNull();
+
+                var expected = filters == null
+                    ? @"Examples.FreeFormOpportunity.ExcelNullFilter.xlsx"
+                    : @"Examples.FreeFormOpportunity.ExcelFilter.xlsx";
+                using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+                using (var actualStream = new MemoryStream())
+                {
+                    wb.SaveAs(actualStream);
+                    actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+                }
+            }
+        }
+
+        public static IEnumerable<TestCaseData> TestGetExcelWorkbookNullFilterCases()
+        {
+            yield return new TestCaseData(new FFFilters()
+            {
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid,
+                FinancialImprovementTypes = new[] { ((int)FinancialImprovementType.Revenue).ToString() },
+                MetricTypes = new[] { ((int)MetricType.FinancialPerUnit).ToString() },
+            }).SetName("{m} Filtered");
+            yield return new TestCaseData(null).SetName("{m} Null Filters");
+        }
+
+        [Test]
+        public async Task TestSetHidden()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunities = framework.FFOpportunities;
+            var opportunity = opportunities.First(vo => !vo.IsHidden);
+            var isHidden = opportunity.IsHidden;
+            var service = new FFOpportunityService(framework, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+
+            // act
+            await service.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden, CancellationToken.None);
+
+            // assert
+            var result = await service.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            await Verifier.Verify(result, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+            result.IsHidden.Should().Be(!isHidden);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetFilterOptionsAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunityService = new FFOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+            var configurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid;
+
+            try
+            {
+                // act
+                var task = await opportunityService
+                    .GetFilterOptionsAsync(configurationGuid, cancellationToken);
+
+                // assert
+                await Verifier.Verify(task, _verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName());
+            }
+            catch (OperationCanceledException e)
+            {
+                await Verifier.Verify(e, _verifySettings)
+                    .ScrubMember("StackTrace")
+                    .UseFileName($"{TestContext.CurrentContext.TestName()} {e.GetType().Name}");
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var freeformOpportunityService = new FFOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+            try
+            {
+                var opportunities = freeformOpportunityService.GetAllAsync(cancellationToken).Result;
+                var opportunity = opportunities.FirstOrDefault(o => o.IsHidden);
+                if (opportunity == null) return;
+                var isHidden = opportunity.IsHidden;
+
+                //act
+                await freeformOpportunityService.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden,
+
+                    cancellationToken);
+
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;
+
+                var result = freeformOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;
+                await Verifier.Verify(result.IsHidden, _verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName());
+            }
+            catch (AggregateException e)
+            {
+                await Verifier.Verify(e.InnerException, _verifySettings)
+                    .ScrubMember("StackTrace")
+                    .UseFileName($"{TestContext.CurrentContext.TestName()} {e.InnerException.GetType().Name}");
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.FFOpportunities.FirstOrDefault(o => o.IsHidden);
+            if (opportunity == null) return;
+            var isHidden = opportunity.IsHidden;
+            var freeformOpportunityService = new FFOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+
+            try
+            {
+                // act
+                await freeformOpportunityService.SetHiddenAsync(Guid.Empty, !isHidden,
+                    cancellationToken);
+            }
+            catch (OperationCanceledException e)
+            {
+                await Verifier.Verify(e, _verifySettings)
+                    .ScrubMember("StackTrace")
+                    .UseFileName(TestContext.CurrentContext.TestName());
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var freeformOpportunityService = new FFOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+            try
+            {
+                var opportunities = freeformOpportunityService.GetAllAsync(cancellationToken).Result;
+
+                var opportunity = opportunities.FirstOrDefault(o => o.Note == string.Empty);
+
+                if (opportunity == null) return;
+
+                var note = "new test note";
+                // act
+                await freeformOpportunityService.SetNoteAsync(opportunity.OpportunityGuid, note, CancellationToken.None);
+                if (cancellationToken.IsCancellationRequested || jazzEntityFrameworkFactory.JazzDbContext == null)
+                {
+                    var result = async () => await freeformOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken);
+
+                    // assert
+                    await Verifier.ThrowsTask(result, _verifySettings)
+                        .ScrubMember("StackTrace")
+                        .UseFileName(TestContext.CurrentContext.TestName());
+                }
+                else
+                {
+                    var result = await freeformOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken);
+
+                    // assert
+                    await Verifier.Verify(result.Note, _verifySettings)
+                        .UseFileName(TestContext.CurrentContext.TestName());
+                }
+            }
+            catch (AggregateException e)
+            {
+                await Verifier.Verify(e.InnerException, _verifySettings)
+                    .ScrubMember("StackTrace")
+                    .UseFileName($"{TestContext.CurrentContext.TestName()} {e.InnerException.GetType().Name}");
+            }
+        }
+
+        [Test]
+        public async Task TestSetNote()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunities = framework.UVOpportunities;
+            var opportunity = opportunities.First(vo => string.IsNullOrEmpty(vo.Note));
+            var note = opportunity.Note;
+            var expected = "Now is the time for all good engineers to write great code!";
+            var service = new FFOpportunityService(framework, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+
+            // act
+            await service.SetNoteAsync(opportunity.OpportunityGuid, expected, CancellationToken.None);
+
+            // assert
+            var result = await service.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            await Verifier.Verify(result.Note, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+            result.Note.Should().NotBeNullOrEmpty()
+                .And.NotBe(note)
+                .And.Be(expected);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.FFOpportunities.FirstOrDefault(o => o.Note == string.Empty);
+            if (opportunity == null) return;
+            var note = "new test note";
+            var freeformOpportunityService = new FFOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+
+            try
+            {
+                // act
+                await freeformOpportunityService.SetNoteAsync(Guid.Empty, note, cancellationToken);
+
+                // assert
+            }
+            catch (OperationCanceledException e)
+            {
+                await Verifier.Verify(e, _verifySettings)
+                    .ScrubMember("StackTrace")
+                    .UseFileName(TestContext.CurrentContext.TestName());
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetAllAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var freeformOpportunityService = new FFOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+
+            // act
+            var taskResult = await freeformOpportunityService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            await Verifier.Verify(taskResult, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetById(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var freeformOpportunityService = new FFOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+
+            // act
+            var tempResult = await freeformOpportunityService.GetAllAsync(CancellationToken.None);
+            var taskResult =
+                await freeformOpportunityService.GetById(tempResult.FirstOrDefault()?.OpportunityGuid ?? Guid.Empty, CancellationToken.None);
+
+            // assert
+            await Verifier.Verify(taskResult, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNull();
+            }
+            else
+            {
+                taskResult.Should().NotBeNull()
+                    .And.BeOfType<FFOpportunity>();
+            }
+
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetByIds(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var freeformOpportunityService = new FFOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+
+            // act
+            var tempResult = await freeformOpportunityService.GetAllAsync(CancellationToken.None);
+            var ids = tempResult.Select(o => o.OpportunityGuid);
+            var taskResult = await freeformOpportunityService.GetByIds(ids, CancellationToken.None);
+
+            // assert
+            await Verifier.Verify(taskResult, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty()
+                    .And.AllBeOfType<FFOpportunity>();
+            }
+
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestCreateFreeFormOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var freeformOpportunityService = new FFOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+
+            var authorGuid = Guid.NewGuid();
+            var configurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345");
+            var newOpportunity = new FFOpportunityDataModel()
+            {
+                AuthorName = "TestAuthor",
+                AuthorGuid = authorGuid,
+                ConfigurationGuid = configurationGuid,
+                Denominator = "Patient Days",
+                Numerator = "Imaging Procedure",
+                FinancialImprovementType = FinancialImprovementType.Cost,
+                MetricType = MetricType.Financial,
+                Name = "Test"
+            };
+
+            _hangfireServiceMock.Setup(x => x.EnqueueJobAsync(It.IsAny<EnqueueJobDto>(), It.IsAny<CancellationToken>())).ReturnsAsync(new JobEnqueuedResponse() { JobId = Guid.Parse("d47bea06-37bb-440e-82d9-cec74e523e01") });
+
+            try
+            {
+                // act
+                var result = await freeformOpportunityService.CreateAsync(newOpportunity, CancellationToken.None);
+
+                // assert
+                await Verifier.Verify(result, _verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName());
+            }
+            catch (NullReferenceException e)
+            {
+                await Verifier.Verify(e, _verifySettings)
+                    .ScrubMember("StackTrace")
+                    .UseFileName($"{TestContext.CurrentContext.TestName()} {e.GetType().Name}");
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestCreateFreeFormOpportunityPreventsDuplicateNames(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var freeformOpportunityService = new FFOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object,
+                _fiscalMonthResolverMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _authorizationServiceMock.Object);
+
+            var newOpportunity = new FFOpportunityDataModel()
+            {
+                Name = "Free Form Opportunity 1",
+                AuthorName = "TestAuthor",
+                AuthorGuid = Guid.NewGuid(),
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"),
+                FinancialImprovementType = FinancialImprovementType.Cost,
+                MetricType = MetricType.Financial,
+            };
+
+            _hangfireServiceMock.Setup(x => x.EnqueueJobAsync(It.IsAny<EnqueueJobDto>(), It.IsAny<CancellationToken>())).ReturnsAsync(new JobEnqueuedResponse() { JobId = Guid.Parse("d47bea06-37bb-440e-82d9-cec74e523e01") });
+
+            if (!TestContext.CurrentContext.Test.Name.Contains("With Framework"))
+            {
+                // act
+                var result = async () => await freeformOpportunityService.CreateAsync(newOpportunity, CancellationToken.None);
+
+                // assert
+                await Verifier.ThrowsTask(result, _verifySettings)
+                    .ScrubMember("StackTrace")
+                    .UseFileName(TestContext.CurrentContext.TestName());
+
+            }
+            else
+            {
+                // act
+                var result = await freeformOpportunityService.CreateAsync(newOpportunity, CancellationToken.None);
+
+                // assert
+                await Verifier.Verify(result, _verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName());
+            }
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            // Method intentionally left empty.
+        }
+
+        #region TestCaseData
+
+        public static IEnumerable<TestCaseData> GetFilterData()
+        {
+            yield return new TestCaseData(new FFFilters { ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("{m} No Filters");
+            yield return new TestCaseData(new FFFilters { ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("{m} View Visible");
+            yield return new TestCaseData(new FFFilters { ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("{m} Not View Visible");
+            yield return new TestCaseData(new FFFilters { IdentifiedSavings = 1999, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("{m} By Identified Savings");
+            yield return new TestCaseData(new FFFilters { IdentifiedSavings = 999, ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("{m} By Identified Savings Not ViewVisible");
+            yield return new TestCaseData(new FFFilters { FinancialImprovementTypes = new[] { "1" }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("{m} By FinancialImprovementType");
+            yield return new TestCaseData(new FFFilters { FinancialImprovementTypes = new[] { "2" }, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), ViewVisible = false })
+                .SetName("{m} By FinancialImprovementType Not ViewVisible");
+            yield return new TestCaseData(new FFFilters { MetricTypes = new[] { "1" }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("{m} By MetricType");
+            yield return new TestCaseData(new FFFilters { MetricTypes = new[] { "2" }, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), ViewVisible = false })
+                .SetName("{m} By MetricType Not ViewVisible");
+            yield return new TestCaseData(new FFFilters { OpportunitySearch = "QV - 123", ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("{m} Search By Id");
+            yield return new TestCaseData(new FFFilters { ExcludeInitiatives = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("{m} Exclude Opportunities with Initiatives");
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/GeneralLedger/Opportunities/GLOpportunityServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/GeneralLedger/Opportunities/GLOpportunityServiceTest.cs
new file mode 100644
index 0000000..2872666
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/GeneralLedger/Opportunities/GLOpportunityServiceTest.cs
@@ -0,0 +1,506 @@
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Details;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities;
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.Hangfire.Jazz.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.GeneralLedger.Opportunities
+{
+    [TestFixture, Category("Unit")]
+    public class GLOpportunityServiceTests
+    {
+
+        private Mock<IGLDetailService> _glOpportunityServiceMock;
+        private Mock<IAsyncDbContextFactory<JazzDbContext>> _dbContextFactoryMock;
+        private Mock<IJazzDbContext> _jazzDbContextMock;
+        private Mock<IJazzHangfireServiceClient> _hangfireServiceMock;
+        private Mock<IAuthorizationServiceClient> _authorizationServiceMock;
+        private IUpdateFactOpportunitySavingsService _updateFactOpportunitySavingsService;
+        private IInitiativeService _initiativeService;
+
+        private static readonly ResourceFileExtractor _extractor = new ResourceFileExtractor(".Resource.");
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _glOpportunityServiceMock = new Mock<IGLDetailService>();
+            _dbContextFactoryMock = new Mock<IAsyncDbContextFactory<JazzDbContext>>();
+            _jazzDbContextMock = new Mock<IJazzDbContext>();
+            _hangfireServiceMock = new Mock<IJazzHangfireServiceClient>();
+            _updateFactOpportunitySavingsService = Mock.Of<IUpdateFactOpportunitySavingsService>();
+            _initiativeService = Mock.Of<IInitiativeService>();
+            Mock.Get(_updateFactOpportunitySavingsService)
+                .Setup(s => s.UpdateFactOpportunitySavings(It.IsAny<CancellationToken>()));
+            Mock.Get(_initiativeService)
+                .Setup(s => s.DeleteAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            _authorizationServiceMock = new Mock<IAuthorizationServiceClient>();
+            _authorizationServiceMock
+                .Setup(o => o.AddPermissionsFromDefaultsAsync(It.IsAny<Guid>(), It.IsAny<SecurableEntityType>(), It.IsAny<CancellationToken>()));
+        }
+
+        [Test, Ignore("new filtering broke these tests")]
+        public async Task TestFirstPage_Sorted_Asc()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var glOpportunityService = new GLOpportunityService(framework, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+            var filters = new GLFilters()
+            {
+                Types = new List<string>(),
+                Levels = new List<string>(),
+                IdentifiedSavings = 0,
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+                Seasonality = SeasonalityType.WithAndWithout,
+
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid
+            };
+
+            var pagingOptions = new PagingOptions("IdentifiedSavings", SortOrder.Asc);
+
+            // act
+            var taskResult = await glOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<GLOpportunity>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().IdentifiedSavings
+                .Should().BeLessThan(taskResult.Data.Last().IdentifiedSavings);
+        }
+
+        [Test, Ignore("new filtering broke these tests")]
+        public async Task TestFirstPage_Sorted_Desc()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var glOpportunityService = new GLOpportunityService(framework, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+            var filters = new GLFilters()
+            {
+                Types = new List<string>(),
+                Levels = new List<string>(),
+                IdentifiedSavings = 0,
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid
+            };
+
+            var pagingOptions = new PagingOptions("IdentifiedSavings", SortOrder.Desc);
+
+            // act
+            var taskResult = await glOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<GLOpportunity>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().IdentifiedSavings
+                .Should().BeGreaterThan(taskResult.Data.Last().IdentifiedSavings);
+        }
+
+        [TestCaseSource(nameof(GetFilterData))]
+        public void TestValidateFilters(GLFilters filters)
+        {
+            if (filters == null) return;
+            if (filters.Types.Any())
+                filters.Types.Should()
+                    .AllBeOfType<string>()
+                    .And.NotBeNullOrEmpty();
+            if (filters.Levels.Any())
+                filters.Levels.Should()
+                    .AllBeOfType<string>()
+                    .And.NotBeNullOrEmpty();
+        }
+
+        [Test, Ignore("new filtering broke these tests")]
+        public async Task TestGetExcelWorkbook()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opp = framework.GLOpportunities.First();
+            var filters = new GLFilters()
+            {
+                ConfigurationGuid = framework.Configurations.First().ConfigurationGuid,
+                Types = new[] { opp.Type },
+                Levels = new[] { opp.Level }
+            };
+            var service = new GLOpportunityService(framework, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var wb = await service.ExportAsync(new SortOptions(), filters, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "ExcelFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            wb.Worksheets.Should().HaveCount(1);
+            var ws = wb.Worksheet(1);
+            ws.Should().NotBeNull();
+
+            var expected = @"Examples.GeneralLedgerOpportunity.ExcelFilter.xlsx";
+            using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+            using (var actualStream = new MemoryStream())
+            {
+                wb.SaveAs(actualStream);
+                actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+            }
+        }
+
+        [Test]
+        public async Task TestGetExcelWorkbookNullFilter()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var service = new GLOpportunityService(framework, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var wb = await service.ExportAsync(null, null, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "ExcelNullFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            wb.Worksheets.Should().HaveCount(1);
+            var ws = wb.Worksheet(1);
+            ws.Should().NotBeNull();
+
+            var expected = @"Examples.GeneralLedgerOpportunity.ExcelNullFilter.xlsx";
+            using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+            using (var actualStream = new MemoryStream())
+            {
+                wb.SaveAs(actualStream);
+                actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+            }
+        }
+
+        [Test]
+        public async Task TestSetHidden()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunities = framework.GLOpportunities;
+            var opportunity = opportunities.First(vo => !vo.IsHidden);
+            var isHidden = opportunity.IsHidden;
+            var service = new GLOpportunityService(framework, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            await service.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden, CancellationToken.None);
+
+            // assert
+            var result = await service.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            result.IsHidden.Should().Be(!isHidden);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetFilterOptionsAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunityService = new GLOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                var taskResult = await opportunityService
+                    .GetFilterOptionsAsync(new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                    return;
+                }
+                taskResult.Should()
+                    .BeOfType<GLFilterOptions>()
+                    .And.NotBeNull();
+                taskResult.Types.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty()
+                    .And.NotContain(t => string.IsNullOrEmpty(t.Id))
+                    .And.NotContain(t => string.IsNullOrEmpty(t.Text));
+                taskResult.Levels.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty()
+                    .And.NotContain(l => string.IsNullOrEmpty(l.Id))
+                    .And.NotContain(l => string.IsNullOrEmpty(l.Text));
+            }
+            catch (NotImplementedException nie)
+            {
+                nie.Should().BeOfType<NotImplementedException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var glOpportunityService = new GLOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+            try
+            {
+                var opportunities = glOpportunityService.GetAllAsync(cancellationToken).Result;
+                var opportunity = opportunities.FirstOrDefault(o => o.IsHidden);
+                if (opportunity == null) return;
+                var isHidden = opportunity.IsHidden;
+
+                //act
+                await glOpportunityService.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden,
+
+                    cancellationToken);
+
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;
+
+                var result = glOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;
+
+                result.IsHidden.Should().Be(!isHidden);
+            }
+            catch (Exception e)
+            {
+                switch (e.GetType().Name)
+                {
+                    case "AggregateException":
+                    case "OperationCanceledException":
+                        return;
+                }
+                e.Should().NotBeOfType<Exception>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.GLOpportunities.FirstOrDefault(o => o.IsHidden);
+            if (opportunity == null) return;
+            var isHidden = opportunity.IsHidden;
+            var glOpportunityService = new GLOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                await glOpportunityService.SetHiddenAsync(Guid.Empty, !isHidden,
+                    cancellationToken);
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var glOpportunityService = new GLOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+            try
+            {
+                var opportunities = glOpportunityService.GetAllAsync(cancellationToken).Result;
+
+                var opportunity = opportunities.FirstOrDefault(o => o.Note == string.Empty);
+
+                if (opportunity == null) return;
+
+                var note = "new test note";
+                // act
+                await glOpportunityService.SetNoteAsync(opportunity.OpportunityGuid, note,
+                    CancellationToken.None);
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;
+                var result = glOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;
+                result.Note.Should().Be(note);
+
+                // assert
+            }
+            catch (Exception e)
+            {
+                switch (e.GetType().Name)
+                {
+                    case "AggregateException":
+                    case "OperationCanceledException":
+                        return;
+                }
+                e.Should().NotBeOfType<Exception>();
+            }
+        }
+
+        [Test]
+        public async Task TestSetNote()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunities = framework.GLOpportunities;
+            var opportunity = opportunities.First(vo => string.IsNullOrEmpty(vo.Note));
+            var note = opportunity.Note;
+            var expected = "Now is the time for all good engineers to write great code!";
+            var service = new GLOpportunityService(framework, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            await service.SetNoteAsync(opportunity.OpportunityGuid, expected, CancellationToken.None);
+
+            // assert
+            var result = await service.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            result.Note.Should().NotBeNullOrEmpty()
+                .And.NotBe(note)
+                .And.Be(expected);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.GLOpportunities.FirstOrDefault(o => o.Note == string.Empty);
+            if (opportunity == null) return;
+            var note = "new test note";
+            var glOpportunityService = new GLOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                await glOpportunityService.SetNoteAsync(Guid.Empty, note, cancellationToken);
+
+                // assert
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetAllAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var glOpportunityService = new GLOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var taskResult = await glOpportunityService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetById(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var glOpportunityService = new GLOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var tempResult = await glOpportunityService.GetAllAsync(CancellationToken.None);
+            var taskResult =
+                await glOpportunityService.GetById(tempResult.FirstOrDefault()?.OpportunityGuid ?? Guid.Empty, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNull();
+            }
+            else
+            {
+                taskResult.Should().NotBeNull()
+                    .And.BeOfType<GLOpportunity>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetByIds(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var glOpportunityService = new GLOpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var tempResult = await glOpportunityService.GetAllAsync(CancellationToken.None);
+            var ids = tempResult.Select(o => o.OpportunityGuid);
+            var taskResult = await glOpportunityService.GetByIds(ids, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty()
+                    .And.AllBeOfType<GLOpportunity>();
+            }
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            // Method intentionally left empty.
+        }
+
+        #region TestCaseData
+
+        public static IEnumerable<TestCaseData> GetFilterData()
+        {
+            yield return new TestCaseData(new GLFilters { ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("No Filters");
+            yield return new TestCaseData(new GLFilters { ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("View Visible");
+            yield return new TestCaseData(new GLFilters { ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Not View Visible");
+            yield return new TestCaseData(new GLFilters { IdentifiedSavings = 1999, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings");
+            yield return new TestCaseData(new GLFilters { IdentifiedSavings = 999, ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings Not ViewVisible");
+            yield return new TestCaseData(new GLFilters { Levels = new[] { "Overall" }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By Level");
+            yield return new TestCaseData(new GLFilters { Levels = new[] { "Department" }, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), ViewVisible = false })
+                .SetName("By Level Not ViewVisible");
+            yield return new TestCaseData(new GLFilters { Types = new[] { "Revenue" }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By Type");
+            yield return new TestCaseData(new GLFilters { Types = new[] { "Expense" }, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), ViewVisible = false })
+                .SetName("By Type Not ViewVisible");
+            yield return new TestCaseData(new GLFilters { OpportunitySearch = "GL - 101", ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Search By Id");
+            yield return new TestCaseData(new GLFilters { ExcludeInitiatives = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Exclude Opportunities with Initiatives");
+        }
+        #endregion
+    }
+}
+
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Generics/UserSettingServieTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Generics/UserSettingServieTest.cs
new file mode 100644
index 0000000..1bfcf68
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Generics/UserSettingServieTest.cs
@@ -0,0 +1,96 @@
+using FluentAssertions;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Generics
+{
+    [TestFixture, Category("Unit")]
+    public class UserSettingServieTest
+    {
+        [SetUp]
+        public void TestSetUp()
+        {
+            // Method intentionally left empty.
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetUserSetting(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var userSettingService = new UserSettingService(jazzEntityFrameworkFactory, null, null, null);
+            var userGuid = jazzEntityFrameworkFactory.UserSettings?.First().UserGuid ?? Guid.Empty;
+
+            try
+            {
+                // act
+                var taskResult = await userSettingService.GetById(userGuid, cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                }
+                else
+                {
+                    taskResult.Should().NotBeNull()
+                        .And.BeOfType<UserSetting.CciUserSetting>();
+                }
+            }
+            catch (AssertionException ae)
+            {
+                ae.Should().BeOfType<AssertionException>();
+            }
+            catch (NullReferenceException nre)
+            {
+                nre.Should().BeOfType<NullReferenceException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetUserSetting(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var userSettingService = new UserSettingService(jazzEntityFrameworkFactory, null, null, null);
+            var userSetting = jazzEntityFrameworkFactory.UserSettings?.First();
+
+            try
+            {
+                // act
+                var taskResult = await userSettingService.SetUserSetting(userSetting, cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                }
+                else
+                {
+                    taskResult.Should().NotBeNull()
+                        .And.BeOfType<UserSetting.CciUserSetting>();
+                }
+            }
+            catch (NullReferenceException nre)
+            {
+                nre.Should().BeOfType<NullReferenceException>();
+            }
+            catch (TaskCanceledException tce)
+            {
+                tce.Should().BeOfType<TaskCanceledException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/OpportunityServiceTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/OpportunityServiceTests.cs
new file mode 100644
index 0000000..52f5af0
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/OpportunityServiceTests.cs
@@ -0,0 +1,115 @@
+using Hangfire;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Moq;
+using NUnit.Framework;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.CoreLib.Claims;
+using Strata.Hangfire.Jazz.Client;
+using Strata.Id.Client;
+using Strata.Schema.Client;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyTests;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture]
+    public class OpportunityServiceTests
+    {
+        public VerifySettings VerifySettings { get; set; }
+        public CentralDbContext CentralDbContext { get; set; }
+        public IClaimsPrincipalAccessor ClaimsPrincipalAccessor { get; set; }
+        public IAsyncDbContextFactory<JazzDbContext> DbContextFactory { get; set; }
+        public IJazzDbContext JazzDbContext { get; set; }
+        public IJazzHangfireServiceClient JazzHangfireServiceClient { get; set; }
+        public IAuthorizationServiceClient AuthorizationServiceClient { get; set; }
+        public IIdServiceClient IdServiceClient { get; set; }
+        public IConfigurationService ConfigurationService { get; set; }
+
+        public IFiscalMonthResolver FiscalMonthResolver { get; set; }
+        public ISchemaServiceClient SchemaServiceClient { get; set; }
+        public IBackgroundJobClient BackgroundJobClient { get; set; }
+        public INotificationHub NotificationHub { get; set; }
+        public IHubClients<INotificationHub> HubClients { get; set; }
+        public IHubContext<NotificationHub, INotificationHub> NotificationHubContext { get; set; }
+        public IInitiativeService InitiativeService { get; set; }
+        public ISnowflakeDatabaseContext SnowflakeDatabaseContext { get; set; }
+        public IUpdateFactOpportunitySavingsService UpdateFactOpportunitySavingsService { get; set; }
+
+        public JazzEntityFrameworkFactory JAZZ_Framework { get; set; }
+
+        [OneTimeSetUp]
+        public async Task TestFixtureSetup()
+        {
+            VerifySettings = TestExtensions.TestSettings();
+            var dbContextOptions = new DbContextOptions<CentralDbContext>();
+            CentralDbContext = new CentralDbContext(dbContextOptions);
+            ClaimsPrincipalAccessor = Mock.Of<IClaimsPrincipalAccessor>();
+            DbContextFactory = Mock.Of<IAsyncDbContextFactory<JazzDbContext>>();
+            JazzHangfireServiceClient = Mock.Of<IJazzHangfireServiceClient>();
+            AuthorizationServiceClient = Mock.Of<IAuthorizationServiceClient>();
+            IdServiceClient = Mock.Of<IIdServiceClient>();
+            ConfigurationService = Mock.Of<IConfigurationService>();
+            FiscalMonthResolver = Mock.Of<IFiscalMonthResolver>();
+            SchemaServiceClient = Mock.Of<ISchemaServiceClient>();
+            BackgroundJobClient = Mock.Of<IBackgroundJobClient>();
+            NotificationHub = Mock.Of<INotificationHub>();
+            HubClients = Mock.Of<IHubClients<INotificationHub>>();
+            NotificationHubContext = Mock.Of<IHubContext<NotificationHub, INotificationHub>>();
+            InitiativeService = Mock.Of<IInitiativeService>();
+            SnowflakeDatabaseContext = Mock.Of<ISnowflakeDatabaseContext>();
+            UpdateFactOpportunitySavingsService = Mock.Of<IUpdateFactOpportunitySavingsService>();
+
+            JAZZ_Framework = new JazzEntityFrameworkFactory();
+            JazzDbContext = await JAZZ_Framework.CreateDbContextAsync(CancellationToken.None);
+            var configurations = JazzDbContext.Configurations;
+
+            Mock.Get(AuthorizationServiceClient)
+                .Setup(o => o.AddPermissionsFromDefaultsAsync(It.IsAny<Guid>(), It.IsAny<SecurableEntityType>(), It.IsAny<CancellationToken>()));
+            Mock.Get(ConfigurationService)
+                .Setup(s => s.GetConfigurationAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, CancellationToken>((configurationGuid, token) =>
+                    Task.FromResult(configurations.SingleOrDefault(c => c.ConfigurationGuid == configurationGuid)));
+
+            Mock.Get(IdServiceClient)
+                .Setup(s => s.GetStrataId(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(9));
+
+            Mock.Get(NotificationHub)
+                .Setup(s => s.SendOpportunityUpdate(It.IsAny<string>()));
+            Mock.Get(NotificationHub)
+                .Setup(s => s.SendOpportunityUpdateError(It.IsAny<string>(), It.IsAny<string>()));
+            Mock.Get(HubClients)
+                .Setup(s => s.Group(It.IsAny<string>()))
+                .Returns(NotificationHub);
+            Mock.Get(NotificationHubContext)
+                .Setup(s => s.Clients)
+                .Returns(HubClients);
+
+            Mock.Get(InitiativeService)
+                .Setup(s => s.DeleteAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            Mock.Get(UpdateFactOpportunitySavingsService)
+                .Setup(s => s.UpdateFactOpportunitySavings(It.IsAny<CancellationToken>()));
+
+            Mock.Get(DbContextFactory)
+                .Setup(s => s.CreateDbContextAsync(It.IsAny<CancellationToken>()))
+                .Returns(() => Task.FromResult((JazzDbContext)JazzDbContext));
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Pagination/IQueryableExtensionsTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Pagination/IQueryableExtensionsTest.cs
new file mode 100644
index 0000000..e7ca920
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Pagination/IQueryableExtensionsTest.cs
@@ -0,0 +1,53 @@
+using FluentAssertions;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Pagination
+{
+    [TestFixture, Category("Unit")]
+    public class IQueryableExtensionsTest
+    {
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            // Method intentionally left empty.
+        }
+
+        [Test]
+        public void TestIQueryableOrderBy()
+        {
+            // arrange
+            var jeff = new JazzEntityFrameworkFactory();
+            var _opportunities = jeff.UVOpportunities.OrderByDescending(o => o.OpportunityKey);
+            var list = _opportunities.AsQueryable()
+                    .OrderBy("OpportunityKey");
+            // act
+
+            // assert
+            list.First().OpportunityKey.Should().Be(_opportunities.Last().OpportunityKey);
+        }
+
+        [Test]
+        public void TestIQueryableOrderByDescending()
+        {
+            // arrange
+            var jeff = new JazzEntityFrameworkFactory();
+            var _opportunities = jeff.UVOpportunities.OrderBy(o => o.OpportunityKey);
+            var list = _opportunities.AsQueryable()
+                    .OrderByDescending("OpportunityKey");
+            // act
+
+            // assert
+            list.First().OpportunityKey.Should().Be(_opportunities.Last().OpportunityKey);
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            // Method intentionally left empty.
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Pagination/PaginatedListTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Pagination/PaginatedListTest.cs
new file mode 100644
index 0000000..8a6ba72
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Pagination/PaginatedListTest.cs
@@ -0,0 +1,46 @@
+using FluentAssertions;
+using NUnit.Framework;
+using Strata.ApiLib.Standard.Models;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Pagination
+{
+    [TestFixture, Category("Unit")]
+    public class PaginatedListTest
+    {
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            // Method intentionally left empty.
+        }
+
+        [Test]
+        public void TestPaginatedList()
+        {
+            // arrange
+            var jeff = new JazzEntityFrameworkFactory();
+            var _opportunities = jeff.UVOpportunities;
+            var pagingInfo = new PagingInfo() { ResultsPerPage = 25, PageNumber = 1, TotalNumberOfResults = 2 };
+            var paginatedList = new PagedApiResponse<UVOpportunity>() { Data = _opportunities, PagingInfo = pagingInfo };
+
+            // act
+
+            // assert
+            paginatedList.PagingInfo.PageNumber.Should().Be(1);
+            paginatedList.PagingInfo.TotalPages.Should().Be(1);
+            paginatedList.PagingInfo.TotalNumberOfResults.Should().Be(2);
+            paginatedList.PagingInfo.ResultsPerPage.Should().Be(25);
+            paginatedList.Data.Should()
+                .AllBeOfType<UVOpportunity>()
+                .And.HaveCount(_opportunities.Count);
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            // Method intentionally left empty.
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Payroll/Opportunities/PROpportunityServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Payroll/Opportunities/PROpportunityServiceTest.cs
new file mode 100644
index 0000000..b4f0784
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Payroll/Opportunities/PROpportunityServiceTest.cs
@@ -0,0 +1,498 @@
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using Strata.Authorization;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities;
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.Hangfire.Jazz.Client;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Payroll.Opportunities
+{
+    class PROpportunityServiceTest
+    {
+        private Mock<IJazzHangfireServiceClient> _hangfireServiceMock;
+        private static readonly ResourceFileExtractor _extractor = new ResourceFileExtractor(".Resource.");
+        private Mock<IAuthorizationServiceClient> _authorizationServiceMock;
+        private IUpdateFactOpportunitySavingsService _updateFactOpportunitySavingsService;
+        private IInitiativeService _initiativeService;
+        private Mock<IConfigurationService> _configurationServiceMock;
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _hangfireServiceMock = new Mock<IJazzHangfireServiceClient>();
+            _authorizationServiceMock = new Mock<IAuthorizationServiceClient>();
+            _updateFactOpportunitySavingsService = Mock.Of<IUpdateFactOpportunitySavingsService>();
+            _initiativeService = Mock.Of<IInitiativeService>();
+            Mock.Get(_updateFactOpportunitySavingsService)
+                .Setup(s => s.UpdateFactOpportunitySavings(It.IsAny<CancellationToken>()));
+            Mock.Get(_initiativeService)
+                .Setup(s => s.DeleteAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            _configurationServiceMock = new Mock<IConfigurationService>();
+            _authorizationServiceMock
+                .Setup(o => o.AddPermissionsFromDefaultsAsync(It.IsAny<Guid>(), It.IsAny<SecurableEntityType>(), It.IsAny<CancellationToken>()));
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Asc()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var prOpportunityService = new PROpportunityService(framework, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+            var filters = new PRFilters()
+            {
+                PayrollGoalTypes = new List<string>(),
+                IdentifiedSavings = 0,
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid
+            };
+
+            var pagingOptions = new PagingOptions("IdentifiedSavings", SortOrder.Asc);
+
+            // act
+            var taskResult = await prOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<PROpportunity>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().IdentifiedSavings
+                .Should().BeLessThan(taskResult.Data.Last().IdentifiedSavings);
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Desc()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var prOpportunityService = new PROpportunityService(framework, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+            var filters = new PRFilters()
+            {
+                PayrollGoalTypes = new List<string>(),
+                IdentifiedSavings = 0,
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+
+                ConfigurationGuid = JazzEntityFrameworkFactory.CurrentConfigurationGuid
+            };
+
+            var pagingOptions = new PagingOptions("IdentifiedSavings", SortOrder.Desc);
+
+            // act
+            var taskResult = await prOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<PROpportunity>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().IdentifiedSavings
+                .Should().BeGreaterThan(taskResult.Data.Last().IdentifiedSavings);
+        }
+
+        [TestCaseSource(nameof(GetFilterData))]
+        public void TestValidateFilters(PRFilters filters)
+        {
+            if (filters == null) return;
+            if (filters.PayrollGoalTypes.Any())
+                filters.PayrollGoalTypes.Should()
+                    .AllBeOfType<string>()
+                    .And.NotBeNullOrEmpty();
+        }
+
+        [Test]
+        public async Task TestGetExcelWorkbook()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opp = framework.PROpportunities.First();
+            var filters = new PRFilters()
+            {
+                ConfigurationGuid = framework.Configurations.First().ConfigurationGuid,
+                PayrollGoalTypes = new[] { opp.PayrollGoal },
+            };
+            var service = new PROpportunityService(framework, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+
+            // act
+            var wb = await service.ExportAsync(new SortOptions(), filters, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "ExcelFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            wb.Worksheets.Should().HaveCount(1);
+            var ws = wb.Worksheet(1);
+            ws.Should().NotBeNull();
+
+            var expected = @"Examples.PayrollOpportunity.ExcelFilter.xlsx";
+            using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+            using (var actualStream = new MemoryStream())
+            {
+                wb.SaveAs(actualStream);
+                actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+            }
+        }
+
+        [Test]
+        public async Task TestGetExcelWorkbookNullFilter()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var service = new PROpportunityService(framework, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+
+            // act
+            var wb = await service.ExportAsync(null, null, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "ExcelNullFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            wb.Worksheets.Should().HaveCount(1);
+            var ws = wb.Worksheet(1);
+            ws.Should().NotBeNull();
+
+            var expected = @"Examples.PayrollOpportunity.ExcelNullFilter.xlsx";
+            using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+            using (var actualStream = new MemoryStream())
+            {
+                wb.SaveAs(actualStream);
+                actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+            }
+        }
+
+        [Test]
+        public async Task TestSetHidden()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunities = framework.PROpportunities;
+            var opportunity = opportunities.First(vo => !vo.IsHidden);
+            var isHidden = opportunity.IsHidden;
+            var service = new PROpportunityService(framework, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+
+            // act
+            await service.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden, CancellationToken.None);
+
+            // assert
+            var result = await service.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            result.IsHidden.Should().Be(!isHidden);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetFilterOptionsAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunityService = new PROpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+
+            try
+            {
+                // act
+                var taskResult = await opportunityService
+                    .GetFilterOptionsAsync(new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                    return;
+                }
+                taskResult.Should()
+                    .BeOfType<PRFilterOptions>()
+                    .And.NotBeNull();
+                taskResult.PayrollGoalTypes.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty()
+                    .And.NotContain(t => string.IsNullOrEmpty(t.Id))
+                    .And.NotContain(t => string.IsNullOrEmpty(t.Text));
+            }
+            catch (NotImplementedException nie)
+            {
+                nie.Should().BeOfType<NotImplementedException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var prOpportunityService = new PROpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+            try
+            {
+                var opportunities = prOpportunityService.GetAllAsync(cancellationToken).Result;
+                var opportunity = opportunities.FirstOrDefault(o => o.IsHidden);
+                if (opportunity == null) return;
+                var isHidden = opportunity.IsHidden;
+
+                //act
+                await prOpportunityService.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden,
+
+                    cancellationToken);
+
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;
+
+                var result = prOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;
+
+                result.IsHidden.Should().Be(!isHidden);
+            }
+            catch (Exception e)
+            {
+                switch (e.GetType().Name)
+                {
+                    case "AggregateException":
+                    case "OperationCanceledException":
+                        return;
+                }
+                e.Should().NotBeOfType<Exception>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.PROpportunities.FirstOrDefault(o => o.IsHidden);
+            if (opportunity == null) return;
+            var isHidden = opportunity.IsHidden;
+            var prOpportunityService = new PROpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+
+            try
+            {
+                // act
+                await prOpportunityService.SetHiddenAsync(Guid.Empty, !isHidden,
+                    cancellationToken);
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var prOpportunityService = new PROpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+            try
+            {
+                var opportunities = prOpportunityService.GetAllAsync(cancellationToken).Result;
+
+                var opportunity = opportunities.FirstOrDefault(o => o.Note == string.Empty);
+
+                if (opportunity == null) return;
+
+                var note = "new test note";
+                // act
+                await prOpportunityService.SetNoteAsync(opportunity.OpportunityGuid, note,
+                    CancellationToken.None);
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;
+                var result = prOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;
+                result.Note.Should().Be(note);
+
+                // assert
+            }
+            catch (Exception e)
+            {
+                switch (e.GetType().Name)
+                {
+                    case "AggregateException":
+                    case "OperationCanceledException":
+                        return;
+                }
+                e.Should().NotBeOfType<Exception>();
+            }
+        }
+
+        [Test]
+        public async Task TestSetNote()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunities = framework.PROpportunities;
+            var opportunity = opportunities.First(vo => string.IsNullOrEmpty(vo.Note));
+            var note = opportunity.Note;
+            var expected = "Now is the time for all good engineers to write great code!";
+            var service = new PROpportunityService(framework, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+
+            // act
+            await service.SetNoteAsync(opportunity.OpportunityGuid, expected, CancellationToken.None);
+
+            // assert
+            var result = await service.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            result.Note.Should().NotBeNullOrEmpty()
+                .And.NotBe(note)
+                .And.Be(expected);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.PROpportunities.FirstOrDefault(o => o.Note == string.Empty);
+            if (opportunity == null) return;
+            var note = "new test note";
+            var prOpportunityService = new PROpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+
+            try
+            {
+                // act
+                await prOpportunityService.SetNoteAsync(Guid.Empty, note, cancellationToken);
+
+                // assert
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetAllAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var prOpportunityService = new PROpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+
+            // act
+            var taskResult = await prOpportunityService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetById(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var prOpportunityService = new PROpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+
+            // act
+            var tempResult = await prOpportunityService.GetAllAsync(CancellationToken.None);
+            var taskResult =
+                await prOpportunityService.GetById(tempResult.FirstOrDefault()?.OpportunityGuid ?? Guid.Empty, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNull();
+            }
+            else
+            {
+                taskResult.Should().NotBeNull()
+                    .And.BeOfType<PROpportunity>();
+            }
+
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetByIds(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var prOpportunityService = new PROpportunityService(jazzEntityFrameworkFactory, null, null, _hangfireServiceMock.Object, _authorizationServiceMock.Object,
+                _initiativeService, _updateFactOpportunitySavingsService,
+                _configurationServiceMock.Object);
+
+            // act
+            var tempResult = await prOpportunityService.GetAllAsync(CancellationToken.None);
+            var ids = tempResult.Select(o => o.OpportunityGuid);
+            var taskResult = await prOpportunityService.GetByIds(ids, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty()
+                    .And.AllBeOfType<PROpportunity>();
+            }
+
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            // Method intentionally left empty.
+        }
+
+        #region TestCaseData
+
+        public static IEnumerable<TestCaseData> GetFilterData()
+        {
+            yield return new TestCaseData(new PRFilters { ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("No Filters");
+            yield return new TestCaseData(new PRFilters { ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("View Visible");
+            yield return new TestCaseData(new PRFilters { ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Not View Visible");
+            yield return new TestCaseData(new PRFilters { IdentifiedSavings = 1999, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings");
+            yield return new TestCaseData(new PRFilters { IdentifiedSavings = 999, ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings Not ViewVisible");
+            yield return new TestCaseData(new PRFilters { PayrollGoalTypes = new[] { "Both" }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By Variability");
+            yield return new TestCaseData(new PRFilters { PayrollGoalTypes = new[] { "Fixed" }, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), ViewVisible = false })
+                .SetName("By Variability Not ViewVisible");
+            yield return new TestCaseData(new PRFilters { OpportunitySearch = "GL - 101", ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Search By Id");
+            yield return new TestCaseData(new PRFilters { ExcludeInitiatives = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Exclude Opportunities with Initiatives");
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/PeerGroup/PeerGroupServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/PeerGroup/PeerGroupServiceTest.cs
new file mode 100644
index 0000000..6853a95
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/PeerGroup/PeerGroupServiceTest.cs
@@ -0,0 +1,182 @@
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.PeerGroups;
+using Strata.ContinuousImprovement.Biz.PeerGroups.Enums;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.StrataSphereCompare.Client.Models.Enums;
+using Superpower.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyNUnit;
+using VerifyTests;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.PeerGroup
+{
+    public class PeerGroupServiceTest
+    {
+        private readonly string _duplicateName = "Test Name";
+        private readonly int _existingGroupId = 1;
+        private ILogger<PeerGroupService> _logger { get; set; }
+        private VerifySettings _verifySettings { get; set; }
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _verifySettings = TestExtensions.TestSettings();
+            _logger = Mock.Of<ILogger<PeerGroupService>>();
+        }
+
+        [Test]
+        public async Task TestValidDropdownItems()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var peerGroupService = new PeerGroupService(framework, _logger);
+
+            // act
+            var dropdownItems = peerGroupService.GetDropdownItems();
+
+            // assert
+            await Verifier.Verify(dropdownItems, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test]
+        public async Task TestTooLongNameThrowsAnError()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var peerGroupService = new PeerGroupService(framework, _logger);
+
+            // act
+            var exception = Assert.ThrowsAsync<Exception>(() => peerGroupService.CreateAsync(new PeerGroupDto() { Name = new string('a', 101) }, default));
+
+            // assert
+            Assert.That(exception, Is.Not.Null);
+            Assert.That("Rollup column exceeds maximum number of characters", Is.EqualTo(exception.Message));
+        }
+
+        [Test]
+        public async Task TestDuplicateNameThrowsAnError()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var peerGroupService = new PeerGroupService(framework, _logger);
+
+            // act
+            var exception = Assert.ThrowsAsync<Exception>(() => peerGroupService.CreateAsync(new PeerGroupDto() { Name = _duplicateName }, default));
+
+            // assert
+            Assert.That(exception, Is.Not.Null);
+            Assert.That("Rollup column name already exists.", Is.EqualTo(exception.Message));
+        }
+
+        [Test]
+        public async Task TestGetGroupByIdReturnsCorrectGroup()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var peerGroupService = new PeerGroupService(framework, _logger);
+
+            // act
+            var group = await peerGroupService.GetByIdAsync(_existingGroupId, default);
+
+            // assert
+            Assert.That(group, Is.Not.Null);
+            Assert.That(_duplicateName, Is.EqualTo(group.Name));
+        }
+
+        [Test]
+        public async Task TestCreateSavesAnItem()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var peerGroupService = new PeerGroupService(framework, _logger);
+            var dto = new PeerGroupDto()
+            {
+                Name = "New Item",
+                AmcTypes = new List<byte>() { (byte)IsAmc.NonAcademicMedicalCenters, (byte)IsAmc.AcademicMedicalCenters },
+                EntityTypes = new List<byte>() { (byte)HospitalType.ShortTermAcuteCareHospital, (byte)HospitalType.CancerCenter },
+                CensusRegions = new List<byte>() { (byte)CensusRegion.Midwest, (byte)CensusRegion.Northeast },
+                OperatingExpenses = new List<byte>() { (byte)OperatingExpense._250MTo500M, (byte)OperatingExpense._100MTo250M },
+                BedSize = new List<byte>() { (byte)BedSize._0_250, (byte)BedSize._251_500 },
+                UrbanRural = new List<byte>() { (byte)UrbanRural.Urban, (byte)UrbanRural.Rural }
+            };
+
+            // act
+            var result = await peerGroupService.CreateAsync(dto, default);
+
+            // assert
+            Assert.That(result, Is.EqualTo(true));
+            var itemsFromDB = await peerGroupService.GetAllAsync(default);
+            var savedItem = itemsFromDB.FirstOrDefault(i => i.Name == dto.Name);
+            AssertPeerGroups(dto, savedItem);
+        }
+
+        [Test]
+        public async Task TestUpdateRewritesMappings()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var peerGroupService = new PeerGroupService(framework, _logger);
+            var dto = new PeerGroupDto()
+            {
+                PeerGroupId = 1,
+                Name = "Changed Item",
+                AmcTypes = new List<byte>() { (byte)IsAmc.AcademicMedicalCenters },
+                EntityTypes = new List<byte>() { (byte)HospitalType.CancerCenter, (byte)HospitalType.RehabLTACOther },
+                CensusRegions = new List<byte>() { (byte)CensusRegion.West, (byte)CensusRegion.Midwest },
+                OperatingExpenses = new List<byte>() { (byte)OperatingExpense.GreaterThan1B, (byte)OperatingExpense._100MTo250M },
+                BedSize = new List<byte>() { (byte)BedSize._251_500, (byte)BedSize._501_750 },
+                UrbanRural = new List<byte>() { (byte)UrbanRural.Rural }
+            };
+
+            // act
+            var result = await peerGroupService.UpdateAsync(dto.PeerGroupId, dto, default);
+
+            // assert
+            Assert.That(result, Is.EqualTo(true));
+            var itemsFromDB = await peerGroupService.GetAllAsync(default);
+            var savedItem = itemsFromDB.FirstOrDefault(i => i.Name == dto.Name);
+            AssertPeerGroups(dto, savedItem);
+        }
+
+        [Test]
+        public async Task TestDeleteWorksCorrectly()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var peerGroupService = new PeerGroupService(framework, _logger);
+            // act
+            await peerGroupService.DeleteAsync(_existingGroupId, default);
+
+            // assert
+            var itemsFromDB = await peerGroupService.GetAllAsync(default);
+            var savedItem = itemsFromDB.FirstOrDefault(i => i.Name == _duplicateName || i.PeerGroupId == _existingGroupId);
+            Assert.That(savedItem, Is.Null);
+        }
+
+        private void AssertPeerGroups(PeerGroupDto expected, PeerGroupDto actual)
+        {
+            Assert.That(actual, Is.Not.Null);
+            Assert.That(actual.AmcTypes, Is.EqualTo(expected.AmcTypes));
+            Assert.That(actual.EntityTypes, Is.EqualTo(expected.EntityTypes));
+            Assert.That(actual.CensusRegions, Is.EqualTo(expected.CensusRegions));
+            Assert.That(actual.OperatingExpenses, Is.EqualTo(expected.OperatingExpenses));
+            Assert.That(actual.BedSize, Is.EqualTo(expected.BedSize));
+            Assert.That(actual.UrbanRural, Is.EqualTo(expected.UrbanRural));
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/PerformanceEngine/PerformanceEngineTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/PerformanceEngine/PerformanceEngineTests.cs
new file mode 100644
index 0000000..4abaa67
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/PerformanceEngine/PerformanceEngineTests.cs
@@ -0,0 +1,302 @@
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.PerformanceEngine;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using VerifyNUnit;
+using VerifyTests;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.PerformanceEngine
+{
+    [TestFixture, Category("Unit"), Category("CCI")]
+    public class PerformanceEngineTests
+    {
+        private VerifySettings _verifySettings;
+        [OneTimeSetUp]
+        public void FixtureSetup()
+        {
+            _verifySettings = TestExtensions.TestSettings();
+#pragma warning disable S3878 // Arrays should not be created for params parameters
+            _verifySettings
+                .ScrubMembers(["FiscalYear", "FiscalYearID", "CalendarYear"]);
+#pragma warning restore S3878 // Arrays should not be created for params parameters
+        }
+
+        [Test]
+        public async Task TestCalculateUVSavings()
+        {
+            //ORG 0222 | Demo 1 | ADLT Total Knee Replacement W/O - Supplies - 10 - Northern Valley Medical Center - FY2017 | Hetzer Adriane (no seasonality)
+            var currentYear = DateTime.Now.Year;
+            MonthlyRampUp[] rampUps =
+            {
+                new MonthlyRampUp(1, currentYear, 100), new MonthlyRampUp(2, currentYear, 100), new MonthlyRampUp(3, currentYear, 100), new MonthlyRampUp(4, currentYear, 100),
+                new MonthlyRampUp(5, currentYear, 100),new MonthlyRampUp(6, currentYear, 100),new MonthlyRampUp(7, currentYear, 100),new MonthlyRampUp(8, currentYear, 100),
+                new MonthlyRampUp(9, currentYear, 100),new MonthlyRampUp(10, currentYear, 100),new MonthlyRampUp(11, currentYear, 100),new MonthlyRampUp(12, currentYear, 100)
+            };
+            const bool isInverse = true;
+            const bool isSeasonal = false;
+            double[] goalUnits = { 13221, 17628, 22035, 22035, 8814, 26442, 8814, 13221, 22035, 17628, 30849, 44070 };
+            double[] baselineUnits = { 12231, 16788, 21605, 21305, 8430, 24648, 8172, 11847, 24535, 16704, 26159, 45000 };
+            double[] baselineStats = { 3, 4, 5, 5, 2, 6, 2, 3, 5, 4, 7, 10 };
+            double[] trackingUnits = { 54314, 8798, 31680, 21415, 25895, 0, 0, 0, 0, 0, 0, 0 };
+            double[] trackingStats = { 13, 2, 8, 5, 5, 0, 0, 0, 0, 0, 0, 0 };
+
+            var trackingYearMonths = GetTrackingYearMonths(currentYear).ToList();
+
+            var performanceBaselineData = PerformanceComparisonData.SetupBaselineDataList(baselineUnits, baselineStats, currentYear - 1);
+            var performanceTrackingData = PerformanceComparisonData.SetupTrackingDataList(goalUnits, trackingUnits, trackingStats, currentYear);
+
+            var group = new PerformanceGroup(1, "testItem");
+            var options = new PerformanceOptions(isSeasonal, isInverse, true);
+
+            var testGroup = new PerformanceTrackingItem(group, rampUps, options, performanceBaselineData, performanceTrackingData, trackingYearMonths);
+
+            await Verifier.Verify(testGroup.MonthlyTrackingData, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test(Description = "Dev Major PerformanceAGain - FY2019 (test for seasonality)")]
+        public async Task TestSavingsFreeForm()
+        {
+            var currentYear = DateTime.Now.Year;
+            MonthlyRampUp[] rampUps =
+            {
+                new MonthlyRampUp(1, currentYear, 100), new MonthlyRampUp(2, currentYear, 100), new MonthlyRampUp(3, currentYear, 100), new MonthlyRampUp(4, currentYear, 100),
+                new MonthlyRampUp(5, currentYear, 100),new MonthlyRampUp(6, currentYear, 100),new MonthlyRampUp(7, currentYear, 100),new MonthlyRampUp(8, currentYear, 100),
+                new MonthlyRampUp(9, currentYear, 100),new MonthlyRampUp(10, currentYear, 100),new MonthlyRampUp(11, currentYear, 100),new MonthlyRampUp(12, currentYear, 100)
+            };
+            const bool isInverse = true;
+            const bool isSeasonal = true;
+            double[] goalUnits = { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };
+            double[] baselineUnits = { 200, 150, 100, 150, 200, 100, 100, 100, 150, 200, 500, 320 };
+            double[] baselineStats = { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10 };
+            double[] trackingUnits = { 100, 100, 100, 100, 200, 0, 0, 0, 0, 0, 0, 0 };
+            double[] trackingStats = { 10, 10, 10, 10, 5, 0, 0, 0, 0, 0, 0, 0 };
+
+            var trackingYearMonths = GetTrackingYearMonths(currentYear).ToList();
+
+            var performanceBaselineData = PerformanceComparisonData.SetupBaselineDataList(baselineUnits, baselineStats, currentYear - 1);
+            var performanceTrackingData = PerformanceComparisonData.SetupTrackingDataList(goalUnits, trackingUnits, trackingStats, currentYear);
+
+            var group = new PerformanceGroup(1, "testItem");
+            var options = new PerformanceOptions(isSeasonal, isInverse, true);
+
+            var testGroup = new PerformanceTrackingItem(group, rampUps, options, performanceBaselineData, performanceTrackingData, trackingYearMonths);
+
+            await Verifier.Verify(testGroup.MonthlyTrackingData, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test(Description = "Dev Major TestNotInverse - FY2019 (test for seasonality, NotInverse)")]
+        public async Task TestSavingsFreeFormRevenue()
+        {
+            var currentYear = DateTime.Now.Year;
+            MonthlyRampUp[] rampUps =
+            {
+                new MonthlyRampUp(1, currentYear, 100), new MonthlyRampUp(2, currentYear, 100), new MonthlyRampUp(3, currentYear, 100), new MonthlyRampUp(4, currentYear, 100),
+                new MonthlyRampUp(5, currentYear, 100),new MonthlyRampUp(6, currentYear, 100),new MonthlyRampUp(7, currentYear, 100),new MonthlyRampUp(8, currentYear, 100),
+                new MonthlyRampUp(9, currentYear, 100),new MonthlyRampUp(10, currentYear, 100),new MonthlyRampUp(11, currentYear, 100),new MonthlyRampUp(12, currentYear, 100)
+            };
+            const bool isInverse = false;
+            const bool isSeasonal = true;
+            double[] goalUnits = { 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000 };
+            double[] baselineUnits = { 200, 150, 100, 150, 200, 100, 100, 100, 150, 200, 500, 320 };
+            double[] baselineStats = { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10 };
+            double[] trackingUnits = { 100, 100, 100, 100, 200, 0, 0, 0, 0, 0, 0, 0 };
+            double[] trackingStats = { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 };
+
+            var trackingYearMonths = GetTrackingYearMonths(currentYear).ToList();
+
+            var performanceBaselineData = PerformanceComparisonData.SetupBaselineDataList(baselineUnits, baselineStats, currentYear - 1);
+            var performanceTrackingData = PerformanceComparisonData.SetupTrackingDataList(goalUnits, trackingUnits, trackingStats, currentYear);
+
+            var group = new PerformanceGroup(1, "testItem");
+            var options = new PerformanceOptions(isSeasonal, isInverse, true);
+
+            var testGroup = new PerformanceTrackingItem(group, rampUps, options, performanceBaselineData, performanceTrackingData, trackingYearMonths);
+
+            await Verifier.Verify(testGroup.MonthlyTrackingData, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test(Description = "ORG 0222 | Demo 1 | Respiratory Failure - Respiratory Failure - Cardiac Surgery - FY2017 | Entity 20")]
+        [Ignore("Test database needs to be rolled over to the new year")]
+        public async Task TestSavingsQV()
+        {
+            var currentYear = DateTime.Now.Year;
+            MonthlyRampUp[] rampUps =
+            {
+                new MonthlyRampUp(1, currentYear, 100), new MonthlyRampUp(2, currentYear, 100), new MonthlyRampUp(3, currentYear, 100), new MonthlyRampUp(4, currentYear, 100),
+                new MonthlyRampUp(5, currentYear, 100),new MonthlyRampUp(6, currentYear, 100),new MonthlyRampUp(7, currentYear, 100),new MonthlyRampUp(8, currentYear, 100),
+                new MonthlyRampUp(9, currentYear, 100),new MonthlyRampUp(10, currentYear, 100),new MonthlyRampUp(11, currentYear, 100),new MonthlyRampUp(12, currentYear, 100)
+            };
+            const bool isInverse = true;
+            const bool isSeasonal = false;
+            double[] goalUnits = { 1.249525, 1.249525, 1.249525, 1.249525, 1.249525, 1.249525, 1.249525, 1.249525, 1.249525, 1.249525, 1.249525, 1.249525 };
+            double[] baselineUnits = { 5, 3, 3, 2, 2, 0, 2, 3, 2, 3, 2, 3 };
+            double[] baselineStats = { 9, 14, 12, 11, 8, 13, 12, 17, 13, 10, 14, 18 };
+            double[] trackingUnits = { 2, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 };
+            double[] trackingStats = { 13, 13, 15, 16, 11, 0, 0, 0, 0, 0, 0, 0 };
+
+            var trackingYearMonths = GetTrackingYearMonths(currentYear).ToList();
+
+            var performanceBaselineData = PerformanceComparisonData.SetupBaselineDataList(baselineUnits, baselineStats, currentYear - 1);
+            var performanceTrackingData = PerformanceComparisonData.SetupTrackingDataList(goalUnits, trackingUnits, trackingStats, currentYear);
+
+            var group = new PerformanceGroup(1, "testItem");
+            var options = new PerformanceOptions(isSeasonal, isInverse, true);
+
+            var testGroup = new PerformanceTrackingItem(group, rampUps, options, performanceBaselineData, performanceTrackingData, trackingYearMonths);
+
+            await Verifier.Verify(testGroup.MonthlyTrackingData, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test(Description = "ORG 0222 | Demo 1 | Purchased Services Reduction - FY2017")]
+        [Ignore("Test database needs to be rolled over to the new year")]
+        public async Task TestSavingsGL()
+        {
+            var currentYear = DateTime.Now.Year;
+            MonthlyRampUp[] rampUps =
+            {
+                new MonthlyRampUp(1, currentYear, 100), new MonthlyRampUp(2, currentYear, 100), new MonthlyRampUp(3, currentYear, 100), new MonthlyRampUp(4, currentYear, 100),
+                new MonthlyRampUp(5, currentYear, 100),new MonthlyRampUp(6, currentYear, 100),new MonthlyRampUp(7, currentYear, 100),new MonthlyRampUp(8, currentYear, 100),
+                new MonthlyRampUp(9, currentYear, 100),new MonthlyRampUp(10, currentYear, 100),new MonthlyRampUp(11, currentYear, 100),new MonthlyRampUp(12, currentYear, 100)
+            };
+            const bool isInverse = true;
+            const bool isSeasonal = true;
+            double[] goalUnits = { 244588.94, 308260.21, 522852.42, 242258.14, 429804.75, 298079.59, 291399.34, 303184.35, 423257, 296446.05, 267084.76, 338172.85 };
+            double[] baselineUnits = { 305736.17, 385325.27, 653565.52, 302822.67, 537255.94, 372599.49, 364249.17, 378980.44, 529071.25, 370557.56, 333855.95, 422716.06 };
+            double[] baselineStats = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
+            double[] trackingUnits = { 308148.44, 263286.57, 300898.51, 283803.3, 496369.18, 0, 0, 0, 0, 0, 0, 0 };
+            double[] trackingStats = { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
+
+            var trackingYearMonths = GetTrackingYearMonths(currentYear).ToList();
+
+            var performanceBaselineData = PerformanceComparisonData.SetupBaselineDataList(baselineUnits, baselineStats, currentYear - 1);
+            var performanceTrackingData = PerformanceComparisonData.SetupTrackingDataList(goalUnits, trackingUnits, trackingStats, currentYear);
+
+            var group = new PerformanceGroup(1, "testItem");
+            var options = new PerformanceOptions(isSeasonal, isInverse, true);
+
+            var testGroup = new PerformanceTrackingItem(group, rampUps, options, performanceBaselineData, performanceTrackingData, trackingYearMonths);
+
+            await Verifier.Verify(testGroup.MonthlyTrackingData, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test(Description = "Dev Major | TestStartDate - FY2019")]
+        [Ignore("Test database needs to be rolled over to the new year")]
+        public async Task TestSavingsLateStartDate()
+        {
+            var currentYear = DateTime.Now.Year;
+            MonthlyRampUp[] rampUps =
+            {
+                new MonthlyRampUp(1, currentYear, 0), new MonthlyRampUp(2, currentYear, 0), new MonthlyRampUp(3, currentYear, 0), new MonthlyRampUp(4, currentYear, 100),
+                new MonthlyRampUp(5, currentYear, 100),new MonthlyRampUp(6, currentYear, 100),new MonthlyRampUp(7, currentYear, 100),new MonthlyRampUp(8, currentYear, 100),
+                new MonthlyRampUp(9, currentYear, 100),new MonthlyRampUp(10, currentYear, 100),new MonthlyRampUp(11, currentYear, 100),new MonthlyRampUp(12, currentYear, 100)
+            };
+            const bool isInverse = true;
+            const bool isSeasonal = true;
+            double[] goalUnits = { 460.165, 368.132, 607.4178, 312.9122, 276.099, 239.2858, 294.5056, 257.6924, 184.066, 18.4066, 1601.3742, 404.9452 };
+            double[] baselineUnits = { 500, 500, 500, 500, 400, 500, 500, 600, 500, 500, 700, 1000 };
+            double[] baselineStats = { 25, 20, 33, 17, 15, 13, 16, 14, 10, 1, 87, 22 };
+            double[] trackingUnits = { 0, 0, 0, 200, 350, 400, 800, 700, 650, 9000, 130, 500 };
+            double[] trackingStats = { 0, 0, 0, 20, 20, 20, 20, 20, 20, 20, 20, 20 };
+
+            var trackingYearMonths = GetTrackingYearMonths(currentYear).ToList();
+
+            var performanceBaselineData = PerformanceComparisonData.SetupBaselineDataList(baselineUnits, baselineStats, currentYear - 1);
+            var performanceTrackingData = PerformanceComparisonData.SetupTrackingDataList(goalUnits, trackingUnits, trackingStats, currentYear);
+
+            var group = new PerformanceGroup(1, "testItem");
+            var options = new PerformanceOptions(isSeasonal, isInverse, true);
+
+            var testGroup = new PerformanceTrackingItem(group, rampUps, options, performanceBaselineData, performanceTrackingData, trackingYearMonths);
+
+            await Verifier.Verify(testGroup.MonthlyTrackingData, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test(Description = "Dave Mulka 10% reduction non-seasonal")]
+        public async Task TestMisalignedTrackingPeriodsReduction()
+        {
+            var currentYear = DateTime.Now.Year;
+            MonthlyRampUp[] rampUps =
+            {
+                new MonthlyRampUp(1, currentYear, 50), new MonthlyRampUp(2, currentYear, 75), new MonthlyRampUp(3, currentYear, 100), 
+                new MonthlyRampUp(4, currentYear, 100), new MonthlyRampUp(5, currentYear, 100),new MonthlyRampUp(6, currentYear, 100)
+            };
+            const bool isInverse = true;
+            const bool isSeasonal = false;
+            double[] baselineUnits = { 16, 21, 15, 22, 18, 29, 16, 26, 9 };
+            double[] baselineStats = { 9, 14, 10, 12, 11, 17, 10, 14, 7 };
+            double[] trackingUnits = { 7, 6, 8, 12, 7, 11 };
+            //seasonality = false, so we spread the goal across the tracking months
+            var baselineUnitAverageGoal = baselineUnits.Average() * 0.9;
+            double[] goalUnits = { baselineUnitAverageGoal, baselineUnitAverageGoal, baselineUnitAverageGoal, baselineUnitAverageGoal, baselineUnitAverageGoal, baselineUnitAverageGoal };
+            double[] trackingStats = { 4, 3, 5, 6, 4, 7 };
+
+            var trackingYearMonths = GetTrackingYearMonths(currentYear, 6).ToList();
+
+            var performanceBaselineData = PerformanceComparisonData.SetupBaselineDataList(baselineUnits, baselineStats, currentYear - 1, 4);
+            var performanceTrackingData = PerformanceComparisonData.SetupTrackingDataList(goalUnits, trackingUnits, trackingStats, currentYear);
+
+            var group = new PerformanceGroup(1, "testItem");
+            var options = new PerformanceOptions(isSeasonal, isInverse, true);
+
+            var testGroup = new PerformanceTrackingItem(group, rampUps, options, performanceBaselineData, performanceTrackingData, trackingYearMonths);
+
+            await Verifier.Verify(testGroup.MonthlyTrackingData, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test(Description = "Dave Mulka 10% reduction seasonal")]
+        public async Task TestMisalignedTrackingPeriodsReductionSeasonal()
+        {
+            var currentYear = DateTime.Now.Year;
+            MonthlyRampUp[] rampUps =
+            {
+                new MonthlyRampUp(1, currentYear, 50), new MonthlyRampUp(2, currentYear, 75), new MonthlyRampUp(3, currentYear, 100),
+                new MonthlyRampUp(4, currentYear, 100), new MonthlyRampUp(5, currentYear, 100),new MonthlyRampUp(6, currentYear, 100)
+            };
+            const bool isInverse = true;
+            const bool isSeasonal = true;
+            double[] baselineUnits = { 16, 21, 15, 22, 18, 29, 16, 26, 9 };
+            double[] baselineStats = { 9, 14, 10, 12, 11, 17, 10, 14, 7 };
+            double[] trackingUnits = { 7, 6, 8, 12, 7, 11 };
+            //no month match for the first three months, so we use the baseline average to calculate our monthly goal
+            var baselineUnitAverageGoal = baselineUnits.Average() * 0.9;
+            double[] goalUnits = { baselineUnitAverageGoal, baselineUnitAverageGoal, baselineUnitAverageGoal, 14.4, 18.9, 13.5 };
+            double[] trackingStats = { 4, 3, 5, 6, 4, 7 };
+
+            var trackingYearMonths = GetTrackingYearMonths(currentYear, 6).ToList();
+
+            var performanceBaselineData = PerformanceComparisonData.SetupBaselineDataList(baselineUnits, baselineStats, currentYear - 1, 4);
+            var performanceTrackingData = PerformanceComparisonData.SetupTrackingDataList(goalUnits, trackingUnits, trackingStats, currentYear);
+
+            var group = new PerformanceGroup(1, "testItem");
+            var options = new PerformanceOptions(isSeasonal, isInverse, true);
+
+            var testGroup = new PerformanceTrackingItem(group, rampUps, options, performanceBaselineData, performanceTrackingData, trackingYearMonths);
+
+            await Verifier.Verify(testGroup.MonthlyTrackingData, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        internal static IEnumerable<TrackingYearMonth> GetTrackingYearMonths(int year, int count = 12)
+        {
+            return Enumerable.Range(1, count).ToList()
+                .ConvertAll(i =>
+                {
+                    var ym = new TrackingYearMonth(year, year,
+                        new FiscalMonth(Guid.NewGuid(), (byte)i, (byte)i, $"{i}", "", "", 0, 0, $"Month{i:00}", 0, 0), true, true, true);
+                    return ym;
+                });
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/Breakdowns/QVIBreakdownServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/Breakdowns/QVIBreakdownServiceTest.cs
new file mode 100644
index 0000000..8efdac8
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/Breakdowns/QVIBreakdownServiceTest.cs
@@ -0,0 +1,295 @@
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns.Filters;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.QualityVariation.Breakdowns
+{
+    [TestFixture, Category("Unit")]
+    public class QVIBreakdownServiceTest
+    {
+        private Mock<IQVIBreakdownService> _qviBreakdownServiceMock;
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _qviBreakdownServiceMock = new Mock<IQVIBreakdownService>();
+        }
+
+        [TestCaseSource(nameof(GetFrameworkWithFilterData))]
+        public async Task TestGetPagedAsyncWithFramework(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, QVIBreakdownFilters filters, CancellationToken cancellationToken)
+        {
+            // arrange
+            var qviBreakdownService = new QVIBreakdownService(jazzEntityFrameworkFactory, null, null);
+
+            try
+            {
+                // act
+                var taskResult = await qviBreakdownService
+                    .GetPagedAsync(new PagingOptions(), filters, cancellationToken);
+
+                // assert
+                var result = taskResult.Data;
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    result.Should().BeNullOrEmpty();
+                    return;
+                }
+
+                result.Should()
+                    .NotBeNullOrEmpty()
+                    .And.AllBeOfType<QVIBreakdown>();
+
+                if (filters.BreakdownIds.Any())
+                    result.Should()
+                        .Contain(vo => filters.BreakdownIds.Contains(vo.BreakdownId.ToString()));
+            }
+            catch (AssertionException)
+            {
+                // Intentionally left empty
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Asc()
+        {
+            // arrange
+            var qviBreakdownService = new QVIBreakdownService(new JazzEntityFrameworkFactory(), null, null);
+            var filters = new QVIBreakdownFilters()
+            {
+                IdentifiedSavings = 0,
+                BreakdownIds = new List<string>(),
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            };
+
+            var pagingOptions = new PagingOptions() { SortField = "QVICasesTotal", SortOrder = SortOrder.Asc };
+
+            // act
+            var taskResult = await qviBreakdownService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<QVIBreakdown>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().QVICasesTotal
+                .Should().BeLessThan(taskResult.Data.Last().QVICasesTotal);
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Desc()
+        {
+            // arrange
+            var qviBreakdownService = new QVIBreakdownService(new JazzEntityFrameworkFactory(), null, null);
+            var filters = new QVIBreakdownFilters()
+            {
+                IdentifiedSavings = 0,
+                BreakdownIds = new List<string>(),
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            };
+
+            var pagingOptions = new PagingOptions() { SortField = "QVICasesTotal", SortOrder = SortOrder.Desc };
+
+            // act
+            var taskResult = await qviBreakdownService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<QVIBreakdown>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().QVICasesTotal
+                .Should().BeGreaterThan(taskResult.Data.Last().QVICasesTotal);
+        }
+
+        [TestCaseSource(nameof(GetFilterData))]
+        public void TestValidateFilters(QVIBreakdownFilters filters)
+        {
+            if (filters == null) return;
+            if (filters.BreakdownIds.Any())
+                filters.BreakdownIds.Should()
+                    .AllBeOfType<string>()
+                    .And.NotBeNullOrEmpty();
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetFilterOptionsAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var qviBreakdownService = new QVIBreakdownService(jazzEntityFrameworkFactory, null, null);
+
+            try
+            {
+                // act
+                var taskResult = await qviBreakdownService
+                    .GetFilterOptionsAsync(new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                    return;
+                }
+                taskResult.Should()
+                    .BeOfType<QVIBreakdownFilterOptions>()
+                    .And.NotBeNull();
+                taskResult.Breakdowns.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty()
+                    .And.NotContain(cd => string.IsNullOrEmpty(cd.Id))
+                    .And.NotContain(cd => string.IsNullOrEmpty(cd.Text));
+            }
+            catch (NotImplementedException nie)
+            {
+                nie.Should().BeOfType<NotImplementedException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        #region JazzDbService Tests
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetAllAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var qviBreakdownService = new QVIBreakdownService(jazzEntityFrameworkFactory, null, null);
+
+            // act
+            var taskResult = await qviBreakdownService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty();
+            }
+        }
+
+        [Test, Ignore("Broken due to removal of Key from VariationCaseType")]
+        public async Task TestGetAllAsync_Filtered()
+        {
+            // arrange
+            var factory = new JazzEntityFrameworkFactory();
+            var filters = factory.QVIOpportunities;
+            var qviBreakdownService = new QVIBreakdownService(factory, null, null);
+
+            // act
+            var taskResult = await qviBreakdownService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            taskResult.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<QVIBreakdown>()
+                .And.HaveCountGreaterThan(0)
+                .And.NotContain(o => string.IsNullOrEmpty(o.ToString()))
+                .And.Contain(o => filters.Select(f => f.BreakdownName).Contains(o.BreakdownName))
+                .And.Contain(o => filters.Select(f => f.ConfigurationGuid).Contains(o.ConfigurationGuid));
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks)), Ignore("Complex key issue")]
+        public async Task TestGetById(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var qviBreakdownService = new QVIBreakdownService(jazzEntityFrameworkFactory, null, null);
+            var tempResult = await qviBreakdownService.GetAllAsync(CancellationToken.None);
+
+            // act
+            var taskResult =
+                await qviBreakdownService.GetById(tempResult.FirstOrDefault()?.BreakdownId ?? 1, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNull();
+            }
+            else
+            {
+                taskResult.Should().NotBeNull()
+                    .And.BeOfType<QVIBreakdown>();
+            }
+
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks)), Ignore("Complex key issue")]
+        public async Task TestGetByIds(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var qviBreakdownService = new QVIBreakdownService(jazzEntityFrameworkFactory, null, null);
+            var tempResult = await qviBreakdownService.GetAllAsync(CancellationToken.None);
+            var ids = tempResult.Select(o => o.BreakdownId);
+
+            // act
+            var taskResult = await qviBreakdownService.GetByIds(ids, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty()
+                    .And.AllBeOfType<QVIBreakdown>();
+            }
+
+        }
+
+        #endregion
+
+        [TearDown]
+        public void TestTearDown()
+        {
+
+            // Method intentionally left empty.
+
+        }
+
+        #region TestCaseData
+
+        public static IEnumerable<TestCaseData> GetFilterData()
+        {
+            yield return new TestCaseData(new QVIBreakdownFilters { ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("No Filters");
+            yield return new TestCaseData(new QVIBreakdownFilters { IdentifiedSavings = 1999, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings");
+            yield return new TestCaseData(new QVIBreakdownFilters { BreakdownIds = new[] { "1" }, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By Breakdown");
+        }
+
+        public static IEnumerable<TestCaseData> GetFrameworkWithFilterData()
+        {
+            var testCases = GetFilterData().ToList();
+            var jeffs = JazzEntityFrameworkFactory.GetFrameworksWithCancellation()
+                .Select(tcd => tcd.Arguments);
+            foreach (var tcd in jeffs)
+            {
+                var jeff = (JazzEntityFrameworkFactory)tcd[0];
+                var ct = (CancellationToken)tcd[1];
+                foreach (var testCase in testCases)
+                {
+                    yield return new TestCaseData(jeff, testCase.Arguments.GetValue(0), ct)
+                        .SetName($"{testCase.TestName} {(string.IsNullOrEmpty(jeff.TestName) ? "w/o Jeff" : "w/Jeff")}")
+                        .SetCategory(jeff.TestName);
+                }
+
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/Events/QVIEventServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/Events/QVIEventServiceTest.cs
new file mode 100644
index 0000000..de3f0ff
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/Events/QVIEventServiceTest.cs
@@ -0,0 +1,291 @@
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Events;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Events.Filters;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.QualityVariation.Events
+{
+    [TestFixture, Category("Unit")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Standard abbreviation")]
+    public class QVIEventServiceTest
+    {
+        private Mock<IQVIEventService> _qviEventSeriveMock;
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _qviEventSeriveMock = new Mock<IQVIEventService>();
+        }
+
+
+        [TestCaseSource(nameof(GetFrameworkWithFilterData))]
+        public async Task TestGetPagedAsyncWithFramework(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, QVIEventFilters filters, CancellationToken cancellationToken)
+        {
+            // arrange
+            var qviEventService = new QVIEventService(jazzEntityFrameworkFactory, null, null);
+
+            try
+            {
+                // act
+                var taskResult = await qviEventService.GetPagedAsync(new PagingOptions(), filters, cancellationToken);
+
+                // assert
+                var result = taskResult.Data;
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    result.Should().BeNullOrEmpty();
+                    return;
+                }
+
+                result.Should().NotBeNullOrEmpty().And.AllBeOfType<QVIEvent>();
+
+                if (filters.QualityVariationEventIds.Any())
+                    result.Should()
+                        .Contain(vo => filters.QualityVariationEventIds.Contains(vo.QualityVariationEventName.ToString()));
+            }
+            catch (AssertionException)
+            {
+                // Intentionally left empty
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Asc()
+        {
+            // arrange
+            var qviEventService = new QVIEventService(new JazzEntityFrameworkFactory(), null, null);
+            var filters = new QVIEventFilters()
+            {
+                QualityVariationEventIds = new List<string>(),
+                IdentifiedSavings = 0,
+                QVICases = 0,
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            };
+
+            var pagingOptions = new PagingOptions() { SortField = "QVICasesTotal", SortOrder = SortOrder.Asc };
+
+            // act
+            var taskResult = await qviEventService.GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<QVIEvent>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().QVICasesTotal.Should().BeLessThan(taskResult.Data.Last().QVICasesTotal);
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Desc()
+        {
+            // arrange
+            var qviEventService = new QVIEventService(new JazzEntityFrameworkFactory(), null, null);
+            var filters = new QVIEventFilters()
+            {
+                QualityVariationEventIds = new List<string>(),
+                IdentifiedSavings = 0,
+                QVICases = 0,
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            };
+
+            var pagingOptions = new PagingOptions() { SortField = "QVICasesTotal", SortOrder = SortOrder.Desc };
+
+            // act
+            var taskResult = await qviEventService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<QVIEvent>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().QVICasesTotal.Should().BeGreaterThan(taskResult.Data.Last().QVICasesTotal);
+        }
+
+        [TestCaseSource(nameof(GetFilterData))]
+        public void TestValidateFilters(QVIEventFilters filters)
+        {
+            if (filters == null) return;
+            if (filters.QualityVariationEventIds.Any())
+                filters.QualityVariationEventIds.Should()
+                    .AllBeOfType<string>()
+                    .And.NotBeNullOrEmpty();
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetFilterOptionsAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var qviEventService = new QVIEventService(jazzEntityFrameworkFactory, null, null);
+
+            try
+            {
+                // act
+                var taskResult = await qviEventService
+                    .GetFilterOptionsAsync(new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                    return;
+                }
+                taskResult.Should().BeOfType<QVIEventFilterOptions>().And.NotBeNull();
+                taskResult.QualityVariationEvents.Should().AllBeOfType<FilterMember>()
+                    .And.NotBeNullOrEmpty()
+                    .And.NotContain(cd => string.IsNullOrEmpty(cd.Id))
+                    .And.NotContain(cd => string.IsNullOrEmpty(cd.Text));
+            }
+            catch (NotImplementedException nie)
+            {
+                nie.Should().BeOfType<NotImplementedException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        #region JazzDbService Tests
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetAllAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var qviEventService = new QVIEventService(jazzEntityFrameworkFactory, null, null);
+
+            // act
+            var taskResult = await qviEventService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty();
+            }
+        }
+
+        [Test, Ignore("Broken due to removal of Key from VariationCaseType")]
+        public async Task TestGetAllAsync_Filtered()
+        {
+            // arrange
+            var factory = new JazzEntityFrameworkFactory();
+            var filters = factory.QVIOpportunities;
+            var qviEventService = new QVIEventService(factory, null, null);
+
+            // act
+            var taskResult = await qviEventService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            taskResult.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<QVIEvent>()
+                .And.HaveCountGreaterThan(0)
+                .And.NotContain(o => string.IsNullOrEmpty(o.ToString()))
+                .And.Contain(o => filters.Select(f => f.QualityVariationEventName).Contains(o.QualityVariationEventName))
+                .And.Contain(o => filters.Select(f => f.ConfigurationGuid).Contains(o.ConfigurationGuid));
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks)), Ignore("Complex key issue")]
+        public async Task TestGetById(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var qviEventService = new QVIEventService(jazzEntityFrameworkFactory, null, null);
+            var tempResult = await qviEventService.GetAllAsync(CancellationToken.None);
+
+            // act
+            var taskResult =
+                await qviEventService.GetById(tempResult.FirstOrDefault()?.QualityVariationEventId ?? 1, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNull();
+            }
+            else
+            {
+                taskResult.Should().NotBeNull()
+                    .And.BeOfType<QVIEvent>();
+            }
+
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks)), Ignore("Complex key issue")]
+        public async Task TestGetByIds(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var qviEventService = new QVIEventService(jazzEntityFrameworkFactory, null, null);
+            var tempResult = await qviEventService.GetAllAsync(CancellationToken.None);
+            var ids = tempResult.Select(o => o.QualityVariationEventId);
+
+            // act
+            var taskResult = await qviEventService.GetByIds(ids, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty()
+                    .And.AllBeOfType<QVIEvent>();
+            }
+
+        }
+
+        #endregion
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            // Method intentionally left empty.
+
+        }
+
+        #region TestCaseData
+
+        public static IEnumerable<TestCaseData> GetFilterData()
+        {
+            yield return new TestCaseData(new QVIEventFilters { ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("No Filters");
+            yield return new TestCaseData(new QVIEventFilters { IdentifiedSavings = 1999, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings");
+            yield return new TestCaseData(new QVIEventFilters { QualityVariationEventIds = new[] { "1" }, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By Event ID");
+        }
+
+        public static IEnumerable<TestCaseData> GetFrameworkWithFilterData()
+        {
+            var testCases = GetFilterData().ToList();
+            var jeffs = JazzEntityFrameworkFactory.GetFrameworksWithCancellation()
+                .Select(tcd => tcd.Arguments);
+            foreach (var tcd in jeffs)
+            {
+                var jeff = (JazzEntityFrameworkFactory)tcd[0];
+                var ct = (CancellationToken)tcd[1];
+                foreach (var testCase in testCases)
+                {
+                    yield return new TestCaseData(jeff, testCase.Arguments.GetValue(0), ct)
+                        .SetName($"{testCase.TestName} {(string.IsNullOrEmpty(jeff.TestName) ? "w/o Jeff" : "w/Jeff")}")
+                        .SetCategory(jeff.TestName);
+                }
+
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/Opportunities/QVIOpportunityServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/Opportunities/QVIOpportunityServiceTest.cs
new file mode 100644
index 0000000..c34fdfc
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/Opportunities/QVIOpportunityServiceTest.cs
@@ -0,0 +1,642 @@
+using ClosedXML.Excel;
+using FluentAssertions;
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.QualityVariation.Opportunities
+{
+    [TestFixture, Category("Unit")]
+    public class QVIOpportunityServiceTest
+    {
+
+        private Mock<IQVIOpportunityService> _qualityVariationItemOpportunityServiceMock;
+        private Mock<IAsyncDbContextFactory<JazzDbContext>> _dbContextFactoryMock;
+        private Mock<IJazzDbContext> _jazzDbContextMock;
+        private IInitiativeService _initiativeService;
+        private IUpdateFactOpportunitySavingsService _updateFactOpportunitySavingsService;
+        private IConfigurationService _configurationService;
+        private ILogger<QVIOpportunityService> _logger;
+        private static readonly ResourceFileExtractor _extractor = new ResourceFileExtractor(".Resource.");
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _qualityVariationItemOpportunityServiceMock = new Mock<IQVIOpportunityService>();
+            _dbContextFactoryMock = new Mock<IAsyncDbContextFactory<JazzDbContext>>();
+            _jazzDbContextMock = new Mock<IJazzDbContext>();
+            _initiativeService = Mock.Of<IInitiativeService>();
+            _updateFactOpportunitySavingsService = Mock.Of<IUpdateFactOpportunitySavingsService>();
+            _configurationService = Mock.Of<IConfigurationService>();
+            _logger = Mock.Of<ILogger<QVIOpportunityService>>();
+            Mock.Get(_initiativeService)
+                .Setup(s => s.DeleteAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            Mock.Get(_updateFactOpportunitySavingsService)
+                .Setup(s => s.UpdateFactOpportunitySavings(It.IsAny<CancellationToken>()));
+            Mock.Get(_configurationService)
+                .Setup(s => s.GetConfigurationAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((Guid guid, CancellationToken ct) => new Biz.Configuration.Configuration { ConfigurationGuid = guid });
+        }
+
+        [TestCaseSource(nameof(GetFrameworkWithFilterData))]
+        public async Task TestGetPagedAsyncWithFramework(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, QVIFilters filters, CancellationToken cancellationToken)
+        {
+            // arrange
+            var qualityVariationItemOpportunityService = new QVIOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+
+            try
+            {
+                // act
+                var taskResult = await qualityVariationItemOpportunityService
+                    .GetPagedAsync(new PagingOptions(), filters, cancellationToken);
+
+                // assert
+                var result = taskResult.Data;
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    result.Should().BeNullOrEmpty();
+                    return;
+                }
+
+                result.Should()
+                    .NotBeNullOrEmpty()
+                    .And.AllBeOfType<QVIOpportunity>();
+
+                if (filters.BreakdownIds.Any())
+                    result.Should()
+                        .Contain(vo => filters.BreakdownIds.Contains(vo.BreakdownId.ToString()));
+                if (filters.ExcludeInitiatives)
+                {
+                    result.ToList().ForEach(opportunity => opportunity.HasInitiative.Should().Be(false));
+                }
+
+                if (!string.IsNullOrEmpty(filters.OpportunitySearch))
+                    result.Should()
+                        .Contain(vo => vo.OpportunityKey.Contains(filters.OpportunitySearch));
+            }
+            catch (AssertionException)
+            {
+                // Intentionally left empty
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Asc()
+        {
+            // arrange
+            var qualityVariationItemOpportunityService = new QVIOpportunityService(new JazzEntityFrameworkFactory(), null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+            var filters = new QVIFilters()
+            {
+                QualityVariationEventIds = new List<string>(),
+                IdentifiedSavings = 0,
+                BreakdownIds = new List<string>(),
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            };
+
+            var pagingOptions = new PagingOptions() { SortField = "QVICases", SortOrder = SortOrder.Asc };
+
+            // act
+            var taskResult = await qualityVariationItemOpportunityService
+                .GetPagedAsync(new PagingOptions(), filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<QVIOpportunity>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().QVICases
+                .Should().BeLessThan(taskResult.Data.Last().QVICases);
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Desc()
+        {
+            // arrange
+            var qualityVariationItemOpportunityService = new QVIOpportunityService(new JazzEntityFrameworkFactory(), null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+            var filters = new QVIFilters()
+            {
+                QualityVariationEventIds = new List<string>(),
+                IdentifiedSavings = 0,
+                BreakdownIds = new List<string>(),
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            };
+
+            var pagingOptions = new PagingOptions() { SortField = "QVICases", SortOrder = SortOrder.Desc };
+
+            // act
+            var taskResult = await qualityVariationItemOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<QVIOpportunity>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().QVICases
+                .Should().BeGreaterThan(taskResult.Data.Last().QVICases);
+        }
+
+        [TestCaseSource(nameof(GetFilterData))]
+        public void TestValidateFilters(QVIFilters filters)
+        {
+            if (filters == null) return;
+            if (filters.QualityVariationEventIds.Any())
+                filters.QualityVariationEventIds.Should()
+                    .AllBeOfType<string>()
+                    .And.NotBeNullOrEmpty();
+            if (filters.BreakdownIds.Any())
+                filters.BreakdownIds.Should()
+                    .AllBeOfType<string>()
+                    .And.NotBeNullOrEmpty();
+        }
+
+        [Test]
+        public async Task TestGetExcelWorkbook()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var filters = new QVIFilters()
+            {
+                ConfigurationGuid = framework.Configurations.First().ConfigurationGuid,
+                BreakdownIds = new[] { framework.QVIOpportunities.First().BreakdownId.ToString() },
+                QualityVariationEventIds = new[]
+                        {framework.QVIOpportunities.First().QualityVariationEventId.ToString()},
+            };
+            var service = new QVIOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+
+            // act
+            var wb = await service.ExportAsync(new SortOptions(), filters, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\Git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "ExcelFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            wb.Worksheets.Should().HaveCount(1);
+            var ws = wb.Worksheet(1);
+            ws.Should().NotBeNull();
+
+            var expected = @"Examples.QualityVariationItemOpportunity.ExcelFilter.xlsx";
+            using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+            using (var actualStream = new MemoryStream())
+            {
+                wb.SaveAs(actualStream);
+                actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+            }
+        }
+
+        [Test]
+        public async Task TestGetExcelWorkbookNullFilter()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+
+            var service = new QVIOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+
+            // act
+            var wb = await service.ExportAsync(null, null, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\Git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "ExcelNullFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            wb.Worksheets.Should().HaveCount(1);
+            var ws = wb.Worksheet(1);
+            ws.Should().NotBeNull();
+
+            var expected = @"Examples.QualityVariationItemOpportunity.ExcelNullFilter.xlsx";
+            using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+            using (var actualStream = new MemoryStream())
+            {
+                wb.SaveAs(actualStream);
+                actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetExcelWorkbookWithFramework(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var variationOpportunityService = new QVIOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+            var filters = new QVIFilters
+            {
+                IdentifiedSavings = 0,
+                QVICases = 0,
+                BreakdownIds = new List<string>(),
+                QualityVariationEventIds = new List<string>(),
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            };
+
+            try
+            {
+                // act
+                var taskResult =
+                    await variationOpportunityService.ExportAsync(new SortOptions(), filters, cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                }
+                else
+                {
+                    taskResult.Should().NotBeNull()
+                        .And.BeOfType<XLWorkbook>();
+                    var wb = taskResult;
+                    wb.Worksheets.Should().HaveCountGreaterThan(0);
+                    var ws = wb.Worksheet("Sheet1");
+                    ws.ColumnCount().Should().BeGreaterThan(0);
+                    ws.RowCount().Should().BeGreaterThan(0);
+                }
+            }
+            catch (TypeInitializationException tie)
+            {
+                tie.Should().BeOfType<TypeInitializationException>();
+            }
+            catch (AssertionException ae)
+            {
+                ae.Should().BeOfType<AssertionException>();
+            }
+            catch (ArgumentNullException arg)
+            {
+                arg.Should().BeOfType<ArgumentNullException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [Test]
+        public async Task TestSetHidden()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunities = framework.QVIOpportunities;
+            var opportunity = opportunities.First(vo => !vo.IsHidden);
+            var isHidden = opportunity.IsHidden;
+            var service = new QVIOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+
+            // act
+            await service.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden, CancellationToken.None);
+
+            // assert
+            var result = await service.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            result.IsHidden.Should().Be(!isHidden);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetFilterOptionsAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var qualityVariationItemOpportunityService = new QVIOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+
+            try
+            {
+                // act
+                var taskResult = await qualityVariationItemOpportunityService
+                    .GetFilterOptionsAsync(new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                    return;
+                }
+                taskResult.Should()
+                    .BeOfType<QVIFilterOptions>()
+                    .And.NotBeNull();
+                taskResult.Breakdowns.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty()
+                    .And.NotContain(cd => string.IsNullOrEmpty(cd.Id))
+                    .And.NotContain(cd => string.IsNullOrEmpty(cd.Text));
+            }
+            catch (NotImplementedException nie)
+            {
+                nie.Should().BeOfType<NotImplementedException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var qualityVariationItemOpportunityService = new QVIOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+            try
+            {
+                var opportunities = qualityVariationItemOpportunityService.GetAllAsync(cancellationToken).Result;
+                var opportunity = opportunities.FirstOrDefault(o => o.IsHidden);
+                if (opportunity == null) return;
+                var isHidden = opportunity.IsHidden;
+
+                //act
+                await qualityVariationItemOpportunityService.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden,
+                    cancellationToken);
+
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;
+                var result = qualityVariationItemOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;
+                result.IsHidden.Should().Be(!isHidden);
+            }
+            catch (Exception e)
+            {
+                switch (e.GetType().Name)
+                {
+                    case "AggregateException":
+                    case "OperationCanceledException":
+                        return;
+                }
+                e.Should().NotBeOfType<Exception>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.QVIOpportunities.FirstOrDefault(o => o.IsHidden);
+            if (opportunity == null) return;
+            var isHidden = opportunity.IsHidden;
+            var qualityVariationItemOpportunityService = new QVIOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+
+            try
+            {
+                // act
+                await qualityVariationItemOpportunityService.SetHiddenAsync(Guid.Empty, !isHidden,
+                    cancellationToken);
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [Test]
+        public async Task TestSetNote()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var opportunities = framework.QVIOpportunities;
+            var opportunity = opportunities.First(vo => string.IsNullOrEmpty(vo.Note));
+            var note = opportunity.Note;
+            var expected = "Now is the time for all good engineers to write great code!";
+            var service = new QVIOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+
+            // act
+            await service.SetNoteAsync(opportunity.OpportunityGuid, expected, CancellationToken.None);
+
+            // assert
+            var result = await service.GetById(opportunity.OpportunityGuid, CancellationToken.None);
+            result.Note.Should().NotBeNullOrEmpty()
+                .And.NotBe(note)
+                .And.Be(expected);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var qualityVariationItemOpportunityService = new QVIOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+            try
+            {
+                var opportunities = qualityVariationItemOpportunityService.GetAllAsync(cancellationToken).Result;
+                var opportunity = opportunities.FirstOrDefault(o => o.Note == string.Empty);
+                if (opportunity == null) return;
+                var note = "new test note";
+                // act
+                await qualityVariationItemOpportunityService.SetNoteAsync(opportunity.OpportunityGuid, note,
+                    CancellationToken.None);
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;
+                var result = qualityVariationItemOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;
+                result.Note.Should().Be(note);
+
+                // assert
+            }
+            catch (Exception e)
+            {
+                switch (e.GetType().Name)
+                {
+                    case "AggregateException":
+                    case "OperationCanceledException":
+                        return;
+                }
+                e.Should().NotBeOfType<Exception>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.QVIOpportunities.FirstOrDefault(o => o.Note == string.Empty);
+            if (opportunity == null) return;
+            var note = "new test note";
+            var qualityVariationItemOpportunityService = new QVIOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+
+            try
+            {
+                // act
+                await qualityVariationItemOpportunityService.SetNoteAsync(Guid.Empty, note, cancellationToken);
+
+                // assert
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+
+
+        #region JazzDbService Tests
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetAllAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var qualityVariationItemOpportunityService = new QVIOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+
+            // act
+            var taskResult = await qualityVariationItemOpportunityService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty();
+            }
+        }
+
+        [Test, Ignore("Broken due to removal of Key from VariationCaseType")]
+        public async Task TestGetAllAsync_Filtered()
+        {
+            // arrange
+            var factory = new JazzEntityFrameworkFactory();
+            var filters = factory.QVIOpportunities;
+            var qualityVariationItemOpportunityService = new QVIOpportunityService(factory, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+
+            // act
+            var taskResult = await qualityVariationItemOpportunityService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            taskResult.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<QVIOpportunity>()
+                .And.HaveCountGreaterThan(0)
+                .And.NotContain(o => string.IsNullOrEmpty(o.ToString()))
+                .And.Contain(o => filters.Select(f => f.OpportunityGuid).Contains(o.OpportunityGuid))
+                .And.Contain(o => filters.Select(f => f.BreakdownName).Contains(o.BreakdownName))
+                .And.Contain(o => filters.Select(f => f.ConfigurationGuid).Contains(o.ConfigurationGuid));
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetById(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var qualityVariationItemOpportunityService = new QVIOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+
+            // act
+            var tempResult = await qualityVariationItemOpportunityService.GetAllAsync(CancellationToken.None);
+            var taskResult =
+                await qualityVariationItemOpportunityService.GetById(tempResult.FirstOrDefault()?.OpportunityGuid ?? Guid.Empty, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNull();
+            }
+            else
+            {
+                taskResult.Should().NotBeNull()
+                    .And.BeOfType<QVIOpportunity>();
+            }
+
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetByIds(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var qualityVariationItemOpportunityService = new QVIOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService, _configurationService, _logger);
+
+            // act
+            var tempResult = await qualityVariationItemOpportunityService.GetAllAsync(CancellationToken.None);
+            var ids = tempResult.Select(o => o.OpportunityGuid);
+            var taskResult = await qualityVariationItemOpportunityService.GetByIds(ids, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty()
+                    .And.AllBeOfType<QVIOpportunity>();
+            }
+
+        }
+
+        #endregion
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            // Method intentionally left empty.
+        }
+
+        #region TestCaseData
+
+        public static IEnumerable<TestCaseData> GetFilterData()
+        {
+            yield return new TestCaseData(new QVIFilters { ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("No Filters");
+            yield return new TestCaseData(new QVIFilters { ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("View Visible");
+            yield return new TestCaseData(new QVIFilters { ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Not View Visible");
+            yield return new TestCaseData(new QVIFilters { IdentifiedSavings = 1999, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings");
+            yield return new TestCaseData(new QVIFilters { IdentifiedSavings = 999, ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings Not ViewVisible");
+            yield return new TestCaseData(new QVIFilters { BreakdownIds = new[] { "1" }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By Breakdown");
+            yield return new TestCaseData(new QVIFilters { BreakdownIds = new[] { "2" }, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), ViewVisible = false })
+                .SetName("By Breakdown Not ViewVisible");
+            yield return new TestCaseData(new QVIFilters { QualityVariationEventIds = new[] { "1" }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By QualityVariationEvent");
+            yield return new TestCaseData(new QVIFilters { QualityVariationEventIds = new[] { "2" }, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), ViewVisible = false })
+                .SetName("By QualityVariationEvent Not ViewVisible");
+            yield return new TestCaseData(new QVIFilters { OpportunitySearch = "QV - 123", ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Search By Id");
+            yield return new TestCaseData(new QVIFilters { ExcludeInitiatives = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Exclude Opportunities with Initiatives");
+        }
+
+        public static IEnumerable<TestCaseData> GetFrameworkWithFilterData()
+        {
+            var testCases = GetFilterData().ToList();
+            var jeffs = JazzEntityFrameworkFactory.GetFrameworksWithCancellation()
+                .Select(tcd => tcd.Arguments);
+            foreach (var tcd in jeffs)
+            {
+                var jeff = (JazzEntityFrameworkFactory)tcd[0];
+                var ct = (CancellationToken)tcd[1];
+                foreach (var testCase in testCases)
+                {
+                    yield return new TestCaseData(jeff, testCase.Arguments.GetValue(0), ct)
+                        .SetName($"{testCase.TestName} {(string.IsNullOrEmpty(jeff.TestName) ? "w/o Jeff" : "w/Jeff")}")
+                        .SetCategory(jeff.TestName);
+                }
+
+                var serviceLineId = jeff.QVIOpportunities.FirstOrDefault(o => !o.IsHidden)?.BreakdownId ?? 0;
+                if (string.IsNullOrEmpty(jeff.TestName))
+                {
+                    yield return new TestCaseData(jeff,
+                            new QVIFilters { BreakdownIds = new[] { serviceLineId.ToString() }, ViewVisible = false }, ct)
+                        .SetName("By Service Line Not ViewVisible w/o Jeff");
+                }
+                else
+                {
+                    yield return new TestCaseData(jeff, ct, new QVIFilters { BreakdownIds = new[] { serviceLineId.ToString() }, ViewVisible = false })
+                        .SetName("By Service Line Not ViewVisible w/Jeff")
+                        .Ignore("This test is broken");
+                }
+            }
+        }
+
+        #endregion
+    }
+}
+
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/QVI/NonQviSavingsServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/QVI/NonQviSavingsServiceTest.cs
new file mode 100644
index 0000000..a63fb8a
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/QVI/NonQviSavingsServiceTest.cs
@@ -0,0 +1,201 @@
+using FluentAssertions;
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.QualityVariation.QVI;
+using CIConfiguration = Strata.ContinuousImprovement.Biz.Configuration.Configuration;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.QualityVariation.QVI
+{
+    [TestFixture, Category("Unit")]
+    public class NonQviSavingsServiceTest
+    {
+        private Mock<ISnowflakeDatabaseContext> _snowflakeDatabaseContextMock;
+        private Mock<IConfigurationService> _configurationServiceMock;
+        private Mock<ILogger<NonQviSavingsService>> _loggerMock;
+        private NonQviSavingsService _service;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _snowflakeDatabaseContextMock = new Mock<ISnowflakeDatabaseContext>();
+            _configurationServiceMock = new Mock<IConfigurationService>();
+            _loggerMock = new Mock<ILogger<NonQviSavingsService>>();
+
+            _service = new NonQviSavingsService(
+                _snowflakeDatabaseContextMock.Object,
+                _configurationServiceMock.Object,
+                _loggerMock.Object);
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilyInfoAsync_WhenNoEntityIds_ReturnsEmpty()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration { EntityIdsCSV = string.Empty, SourceSystemIdsCSV = "1" });
+
+            var result = await _service.GetCaseTypeFamilyInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            result.Should().BeEmpty();
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<NonQviCaseTypeFamilyInfo>(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Never);
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilyInfoAsync_WhenNoSourceSystemIds_ReturnsEmpty()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration { EntityIdsCSV = "1", SourceSystemIdsCSV = string.Empty });
+
+            var result = await _service.GetCaseTypeFamilyInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            result.Should().BeEmpty();
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<NonQviCaseTypeFamilyInfo>(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Never);
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilyInfoAsync_WhenEntitiesExist_QueriesSnowflake()
+        {
+            var configurationGuid = Guid.NewGuid();
+            var expected = new[] { new NonQviCaseTypeFamilyInfo { CaseTypeFamilyId = 10, CaseCount = 3 } };
+
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration
+                {
+                    EntityIdsCSV = "1",
+                    SourceSystemIdsCSV = "1",
+                    DepartmentRollupGlobalId = string.Empty,
+                    QualityVariationEndDate = new DateTime(2024, 12, 31)
+                });
+
+            _snowflakeDatabaseContextMock
+                .Setup(s => s.QueryAsync<NonQviCaseTypeFamilyInfo>(
+                    It.IsAny<string>(),
+                    nameof(NonQviSavingsService.GetCaseTypeFamilyInfoAsync),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()))
+                .ReturnsAsync(expected);
+
+            var result = await _service.GetCaseTypeFamilyInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            result.Should().BeEquivalentTo(expected);
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<NonQviCaseTypeFamilyInfo>(
+                    It.IsAny<string>(),
+                    nameof(NonQviSavingsService.GetCaseTypeFamilyInfoAsync),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Once);
+        }
+
+        [Test]
+        public async Task GetDrgTypeInfoAsync_WhenNoEntityIds_ReturnsEmpty()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration { EntityIdsCSV = string.Empty, SourceSystemIdsCSV = "1" });
+
+            var result = await _service.GetDrgTypeInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            result.Should().BeEmpty();
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<NonQviDrgTypeInfo>(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Never);
+        }
+
+        [Test]
+        public async Task GetDrgTypeInfoAsync_WhenNoSourceSystemIds_ReturnsEmpty()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration { EntityIdsCSV = "1", SourceSystemIdsCSV = string.Empty });
+
+            var result = await _service.GetDrgTypeInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            result.Should().BeEmpty();
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<NonQviDrgTypeInfo>(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Never);
+        }
+
+        [Test]
+        public async Task GetDrgTypeInfoAsync_WhenEntitiesExist_QueriesSnowflake()
+        {
+            var configurationGuid = Guid.NewGuid();
+            var expected = new[] { new NonQviDrgTypeInfo { DrgType = "MS" } };
+
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration
+                {
+                    EntityIdsCSV = "1",
+                    SourceSystemIdsCSV = "1",
+                    DepartmentRollupGlobalId = string.Empty,
+                    QualityVariationEndDate = new DateTime(2024, 12, 31)
+                });
+
+            _snowflakeDatabaseContextMock
+                .Setup(s => s.QueryAsync<NonQviDrgTypeInfo>(
+                    It.IsAny<string>(),
+                    nameof(NonQviSavingsService.GetDrgTypeInfoAsync),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()))
+                .ReturnsAsync(expected);
+
+            var result = await _service.GetDrgTypeInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            result.Should().BeEquivalentTo(expected);
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<NonQviDrgTypeInfo>(
+                    It.IsAny<string>(),
+                    nameof(NonQviSavingsService.GetDrgTypeInfoAsync),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Once);
+        }
+
+        [Test]
+        public async Task GetDrgTypeInfoAsync_WhenConfigurationThrows_Rethrows()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ThrowsAsync(new InvalidOperationException("boom"));
+
+            var action = async () => await _service.GetDrgTypeInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            await action.Should().ThrowAsync<InvalidOperationException>();
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/QVI/QviEncounterServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/QVI/QviEncounterServiceTest.cs
new file mode 100644
index 0000000..6810441
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/QVI/QviEncounterServiceTest.cs
@@ -0,0 +1,96 @@
+using FluentAssertions;
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.QualityVariation.QVI;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using CIConfiguration = Strata.ContinuousImprovement.Biz.Configuration.Configuration;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.QualityVariation.QVI
+{
+    [TestFixture, Category("Unit")]
+    public class QviEncounterServiceTest
+    {
+        private Mock<ISnowflakeDatabaseContext> _snowflakeDatabaseContextMock;
+        private Mock<IConfigurationService> _configurationServiceMock;
+        private Mock<IAsyncDbContextFactory<JazzDbContext>> _dbContextFactoryMock;
+        private Mock<ILogger<QviEncounterService>> _loggerMock;
+        private QviEncounterService _service;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _snowflakeDatabaseContextMock = new Mock<ISnowflakeDatabaseContext>();
+            _configurationServiceMock = new Mock<IConfigurationService>();
+            _dbContextFactoryMock = new Mock<IAsyncDbContextFactory<JazzDbContext>>();
+            _loggerMock = new Mock<ILogger<QviEncounterService>>();
+
+            _service = new QviEncounterService(
+                _snowflakeDatabaseContextMock.Object,
+                _configurationServiceMock.Object,
+                _dbContextFactoryMock.Object,
+                _loggerMock.Object);
+        }
+
+        [Test]
+        public async Task GetEncounterInfoAsync_WhenNoEntityIds_ReturnsEmptyAndSkipsDatabase()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration { EntityIdsCSV = string.Empty, SourceSystemIdsCSV = "1" });
+
+            var result = await _service.GetEncounterInfoAsync(configurationGuid, DateTime.UtcNow, DateTime.UtcNow, CancellationToken.None);
+
+            result.Should().BeEmpty();
+            _dbContextFactoryMock.Verify(f => f.CreateDbContextAsync(It.IsAny<CancellationToken>()), Times.Never);
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<EncounterInfo>(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Never);
+        }
+
+        [Test]
+        public async Task GetEncounterInfoAsync_WhenNoSourceSystemIds_ReturnsEmptyAndSkipsDatabase()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration { EntityIdsCSV = "1", SourceSystemIdsCSV = string.Empty });
+
+            var result = await _service.GetEncounterInfoAsync(configurationGuid, DateTime.UtcNow, DateTime.UtcNow, CancellationToken.None);
+
+            result.Should().BeEmpty();
+            _dbContextFactoryMock.Verify(f => f.CreateDbContextAsync(It.IsAny<CancellationToken>()), Times.Never);
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<EncounterInfo>(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Never);
+        }
+
+        [Test]
+        public async Task GetEncounterInfoAsync_WhenConfigurationThrows_Rethrows()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ThrowsAsync(new InvalidOperationException("boom"));
+
+            var action = async () => await _service.GetEncounterInfoAsync(configurationGuid, DateTime.UtcNow, DateTime.UtcNow, CancellationToken.None);
+
+            await action.Should().ThrowAsync<InvalidOperationException>();
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/QVI/QviLineItemSavingsServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/QVI/QviLineItemSavingsServiceTest.cs
new file mode 100644
index 0000000..b42b30f
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/QualityVariation/QVI/QviLineItemSavingsServiceTest.cs
@@ -0,0 +1,265 @@
+using FluentAssertions;
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.QualityVariation.QVI;
+using CIConfiguration = Strata.ContinuousImprovement.Biz.Configuration.Configuration;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.QualityVariation.QVI
+{
+    [TestFixture, Category("Unit")]
+    public class QviLineItemSavingsServiceTest
+    {
+        private Mock<ISnowflakeDatabaseContext> _snowflakeDatabaseContextMock;
+        private Mock<IConfigurationService> _configurationServiceMock;
+        private Mock<ILogger<QviLineItemSavingsService>> _loggerMock;
+        private QviLineItemSavingsService _service;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _snowflakeDatabaseContextMock = new Mock<ISnowflakeDatabaseContext>();
+            _configurationServiceMock = new Mock<IConfigurationService>();
+            _loggerMock = new Mock<ILogger<QviLineItemSavingsService>>();
+
+            _service = new QviLineItemSavingsService(
+                _snowflakeDatabaseContextMock.Object,
+                _configurationServiceMock.Object,
+                _loggerMock.Object);
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilyInfoAsync_WhenNoEntityIds_ReturnsEmpty()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration { EntityIdsCSV = string.Empty, SourceSystemIdsCSV = "1" });
+
+            var result = await _service.GetCaseTypeFamilyInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            result.Should().BeEmpty();
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<QviLineItemCaseTypeFamilyInfo>(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Never);
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilyInfoAsync_WhenNoSourceSystemIds_ReturnsEmpty()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration { EntityIdsCSV = "1", SourceSystemIdsCSV = string.Empty });
+
+            var result = await _service.GetCaseTypeFamilyInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            result.Should().BeEmpty();
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<QviLineItemCaseTypeFamilyInfo>(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Never);
+        }
+
+        [Test]
+        public async Task GetCaseTypeFamilyInfoAsync_WhenEntitiesExist_QueriesSnowflake()
+        {
+            var configurationGuid = Guid.NewGuid();
+            var expected = new[] { new QviLineItemCaseTypeFamilyInfo { QualityVariationEventId = 42, CaseTypeFamilyId = 7 } };
+
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration
+                {
+                    EntityIdsCSV = "1",
+                    SourceSystemIdsCSV = "1",
+                    DepartmentRollupGlobalId = string.Empty,
+                    QualityVariationEndDate = new DateTime(2024, 12, 31)
+                });
+
+            _snowflakeDatabaseContextMock
+                .Setup(s => s.QueryAsync<QviLineItemCaseTypeFamilyInfo>(
+                    It.IsAny<string>(),
+                    nameof(QviLineItemSavingsService.GetCaseTypeFamilyInfoAsync),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()))
+                .ReturnsAsync(expected);
+
+            var result = await _service.GetCaseTypeFamilyInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            result.Should().BeEquivalentTo(expected);
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<QviLineItemCaseTypeFamilyInfo>(
+                    It.IsAny<string>(),
+                    nameof(QviLineItemSavingsService.GetCaseTypeFamilyInfoAsync),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Once);
+        }
+
+        [Test]
+        public async Task GetDrgTypeInfoAsync_WhenNoEntityIds_ReturnsEmpty()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration { EntityIdsCSV = string.Empty, SourceSystemIdsCSV = "1" });
+
+            var result = await _service.GetDrgTypeInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            result.Should().BeEmpty();
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<QviLineItemDrgTypeInfo>(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Never);
+        }
+
+        [Test]
+        public async Task GetDrgTypeInfoAsync_WhenNoSourceSystemIds_ReturnsEmpty()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration { EntityIdsCSV = "1", SourceSystemIdsCSV = string.Empty });
+
+            var result = await _service.GetDrgTypeInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            result.Should().BeEmpty();
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<QviLineItemDrgTypeInfo>(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Never);
+        }
+
+        [Test]
+        public async Task GetDrgTypeInfoAsync_WhenEntitiesExist_QueriesSnowflake()
+        {
+            var configurationGuid = Guid.NewGuid();
+            var expected = new[] { new QviLineItemDrgTypeInfo { DrgType = "APR" } };
+
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration
+                {
+                    EntityIdsCSV = "1",
+                    SourceSystemIdsCSV = "1",
+                    DepartmentRollupGlobalId = string.Empty,
+                    QualityVariationEndDate = new DateTime(2024, 12, 31)
+                });
+
+            _snowflakeDatabaseContextMock
+                .Setup(s => s.QueryAsync<QviLineItemDrgTypeInfo>(
+                    It.IsAny<string>(),
+                    nameof(QviLineItemSavingsService.GetDrgTypeInfoAsync),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()))
+                .ReturnsAsync(expected);
+
+            var result = await _service.GetDrgTypeInfoAsync(configurationGuid, true, CancellationToken.None);
+
+            result.Should().BeEquivalentTo(expected);
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<QviLineItemDrgTypeInfo>(
+                    It.IsAny<string>(),
+                    nameof(QviLineItemSavingsService.GetDrgTypeInfoAsync),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()),
+                Times.Once);
+        }
+
+        [Test]
+        public async Task GetEncounterSavingInfoAsync_UsesConfigurationGuidParameter()
+        {
+            var configurationGuid = Guid.NewGuid();
+            var expected = new[] { new QviLineItemEncounterSavingInfo { EncounterRecordNumber = "enc-1" } };
+
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration());
+
+            _snowflakeDatabaseContextMock
+                .Setup(s => s.QueryAsync<QviLineItemEncounterSavingInfo>(
+                    It.IsAny<string>(),
+                    nameof(QviLineItemSavingsService.GetEncounterSavingInfoAsync),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()))
+                .ReturnsAsync(expected);
+
+            var result = await _service.GetEncounterSavingInfoAsync(configurationGuid, null, null, CancellationToken.None);
+
+            result.Should().BeEquivalentTo(expected);
+            _snowflakeDatabaseContextMock.Verify(
+                s => s.QueryAsync<QviLineItemEncounterSavingInfo>(
+                    It.IsAny<string>(),
+                    nameof(QviLineItemSavingsService.GetEncounterSavingInfoAsync),
+                    It.Is<object>(o =>
+                        o.GetType().GetProperty("ConfigurationGUID") != null &&
+                        (Guid)o.GetType().GetProperty("ConfigurationGUID").GetValue(o)! == configurationGuid),
+                    It.IsAny<TimeSpan>()),
+                Times.Once);
+        }
+
+        [Test]
+        public async Task GetEncounterSavingInfoAsync_WhenOpportunityGuidAndIsBaselineProvided_FiltersQuery()
+        {
+            var configurationGuid = Guid.NewGuid();
+            var opportunityGuid = Guid.NewGuid();
+            var expected = new[] { new QviLineItemEncounterSavingInfo { EncounterRecordNumber = "enc-1" } };
+
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration());
+
+            _snowflakeDatabaseContextMock
+                .Setup(s => s.QueryAsync<QviLineItemEncounterSavingInfo>(
+                    It.Is<string>(q => q.Contains(":OpportunityGUID") && q.Contains(":IsBaseline")),
+                    nameof(QviLineItemSavingsService.GetEncounterSavingInfoAsync),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()))
+                .ReturnsAsync(expected);
+
+            var result = await _service.GetEncounterSavingInfoAsync(configurationGuid, opportunityGuid, true, CancellationToken.None);
+
+            result.Should().BeEquivalentTo(expected);
+        }
+
+        [Test]
+        public async Task GetEncounterSavingInfoAsync_WhenSnowflakeThrows_Rethrows()
+        {
+            var configurationGuid = Guid.NewGuid();
+            _configurationServiceMock
+                .Setup(s => s.GetConfigurationAsync(configurationGuid, It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new CIConfiguration());
+
+            _snowflakeDatabaseContextMock
+                .Setup(s => s.QueryAsync<QviLineItemEncounterSavingInfo>(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<TimeSpan>()))
+                .ThrowsAsync(new InvalidOperationException("boom"));
+
+            var action = async () => await _service.GetEncounterSavingInfoAsync(configurationGuid, null, null, CancellationToken.None);
+
+            await action.Should().ThrowAsync<InvalidOperationException>();
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/AllOpportunity/ExcelFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/AllOpportunity/ExcelFilter.xlsx
new file mode 100644
index 0000000..131937a
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/AllOpportunity/ExcelFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/AllOpportunity/ExcelNullFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/AllOpportunity/ExcelNullFilter.xlsx
new file mode 100644
index 0000000..ab7e446
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/AllOpportunity/ExcelNullFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/EncounterOpportunity/ExcelFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/EncounterOpportunity/ExcelFilter.xlsx
new file mode 100644
index 0000000..90f8950
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/EncounterOpportunity/ExcelFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/EncounterOpportunity/ExcelNullFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/EncounterOpportunity/ExcelNullFilter.xlsx
new file mode 100644
index 0000000..11a8d23
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/EncounterOpportunity/ExcelNullFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/FreeFormOpportunity/ExcelFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/FreeFormOpportunity/ExcelFilter.xlsx
new file mode 100644
index 0000000..ca98633
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/FreeFormOpportunity/ExcelFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/FreeFormOpportunity/ExcelNullFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/FreeFormOpportunity/ExcelNullFilter.xlsx
new file mode 100644
index 0000000..11a8d23
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/FreeFormOpportunity/ExcelNullFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/GeneralLedgerOpportunity/ExcelFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/GeneralLedgerOpportunity/ExcelFilter.xlsx
new file mode 100644
index 0000000..ef21b85
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/GeneralLedgerOpportunity/ExcelFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/GeneralLedgerOpportunity/ExcelNullFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/GeneralLedgerOpportunity/ExcelNullFilter.xlsx
new file mode 100644
index 0000000..631baad
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/GeneralLedgerOpportunity/ExcelNullFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/PayrollOpportunity/ExcelFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/PayrollOpportunity/ExcelFilter.xlsx
new file mode 100644
index 0000000..bba370c
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/PayrollOpportunity/ExcelFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/PayrollOpportunity/ExcelNullFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/PayrollOpportunity/ExcelNullFilter.xlsx
new file mode 100644
index 0000000..1b5f97f
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/PayrollOpportunity/ExcelNullFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/QualityVariationItemOpportunity/ExcelFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/QualityVariationItemOpportunity/ExcelFilter.xlsx
new file mode 100644
index 0000000..a22aa36
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/QualityVariationItemOpportunity/ExcelFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/QualityVariationItemOpportunity/ExcelNullFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/QualityVariationItemOpportunity/ExcelNullFilter.xlsx
new file mode 100644
index 0000000..11a8d23
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/QualityVariationItemOpportunity/ExcelNullFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/StaffingToDemandOpportunity/ExcelFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/StaffingToDemandOpportunity/ExcelFilter.xlsx
new file mode 100644
index 0000000..2ed5009
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/StaffingToDemandOpportunity/ExcelFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/StaffingToDemandOpportunity/ExcelNullFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/StaffingToDemandOpportunity/ExcelNullFilter.xlsx
new file mode 100644
index 0000000..11a8d23
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/StaffingToDemandOpportunity/ExcelNullFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/VariationOpportunity/ExcelFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/VariationOpportunity/ExcelFilter.xlsx
new file mode 100644
index 0000000..6caf1e3
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/VariationOpportunity/ExcelFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/VariationOpportunity/ExcelNullFilter.xlsx b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/VariationOpportunity/ExcelNullFilter.xlsx
new file mode 100644
index 0000000..11a8d23
Binary files /dev/null and b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Resource/Examples/VariationOpportunity/ExcelNullFilter.xlsx differ
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Strata.ContinuousImprovement.Biz.Test.Unit.csproj b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Strata.ContinuousImprovement.Biz.Test.Unit.csproj
new file mode 100644
index 0000000..a9e7857
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Strata.ContinuousImprovement.Biz.Test.Unit.csproj
@@ -0,0 +1,118 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Resource\Examples\AllOpportunity\**" />
+    <Compile Remove="StaffingToDemand\**" />
+    <Compile Remove="Stubs\**" />
+    <EmbeddedResource Remove="Resource\Examples\AllOpportunity\**" />
+    <EmbeddedResource Remove="StaffingToDemand\**" />
+    <None Remove="Api\**" />
+    <EmbeddedResource Remove="Stubs\**" />
+    <None Remove="Resource\Examples\AllOpportunity\**" />
+    <None Remove="StaffingToDemand\**" />
+    <None Remove="Stubs\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="All\OpportunityType.cs" />
+    <Compile Remove="All\OpportunityTypesExtensions.cs" />
+    <Compile Remove="Generics\ConfigurationServiceTest.cs" />
+    <Compile Remove="Generics\DbSetExtensions.cs" />
+    <Compile Remove="Generics\VariationOpportunityServiceTest.cs" />
+    <Compile Remove="UtilizationVariation\Opportunities\VariationOpportunityFilter.cs" />
+    <Compile Remove="Utilities\StringUtilsTest.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="Resource\Examples\AllOpportunity\ExcelNullFilter.xlsx" />
+    <None Remove="Resource\Examples\EncounterOpportunity\ExcelFilter.xlsx" />
+    <None Remove="Resource\Examples\EncounterOpportunity\ExcelNullFilter.xlsx" />
+    <None Remove="Resource\Examples\ExcelFilter.xlsx" />
+    <None Remove="Resource\Examples\FreeFormOpportunity\ExcelFilter.xlsx" />
+    <None Remove="Resource\Examples\FreeFormOpportunity\ExcelNullFilter.xlsx" />
+    <None Remove="Resource\Examples\GeneralLedgerOpportunity\ExcelFilter.xlsx" />
+    <None Remove="Resource\Examples\GeneralLedgerOpportunity\ExcelNullFilter.xlsx" />
+    <None Remove="Resource\Examples\PayrollOpportunity\ExcelFilter.xlsx" />
+    <None Remove="Resource\Examples\PayrollOpportunity\ExcelNullFilter.xlsx" />
+    <None Remove="Resource\Examples\QualityVariationItemOpportunity\ExcelFilter.xlsx" />
+    <None Remove="Resource\Examples\QualityVariationItemOpportunity\ExcelNullFilter.xlsx" />
+    <None Remove="Resource\Examples\StaffingToDemandOpportunity\ExcelFilter.xlsx" />
+    <None Remove="Resource\Examples\StaffingToDemandOpportunity\ExcelNullFilter.xlsx" />
+    <None Remove="Resource\Examples\VariationOpportunity\ExcelFilter.xlsx" />
+    <None Remove="Resource\Examples\VariationOpportunity\ExcelNullFilter.xlsx" />
+    <None Remove="Resource\PRExcelFilter.xlsx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resource\Examples\AllOpportunity\ExcelFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\AllOpportunity\ExcelNullFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\EncounterOpportunity\ExcelFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\EncounterOpportunity\ExcelNullFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\GeneralLedgerOpportunity\ExcelFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\GeneralLedgerOpportunity\ExcelNullFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\PayrollOpportunity\ExcelFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\PayrollOpportunity\ExcelNullFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\FreeFormOpportunity\ExcelFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\FreeFormOpportunity\ExcelNullFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\QualityVariationItemOpportunity\ExcelFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\QualityVariationItemOpportunity\ExcelNullFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\StaffingToDemandOpportunity\ExcelFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\StaffingToDemandOpportunity\ExcelNullFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\VariationOpportunity\ExcelFilter.xlsx" />
+    <EmbeddedResource Include="Resource\Examples\VariationOpportunity\ExcelNullFilter.xlsx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Strata - Backup.ContinuousImprovement.Test.Unit.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ClosedXML.Signed" Version="0.95.4" />
+    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Remotion.Linq.Development" Version="2.2.0" />
+    <PackageReference Include="Talentsoft.Moq.SetupAsync" Version="1.0.0" />
+    <PackageReference Include="Verify.NUnit" Version="29.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Strata.ContinuousImprovement.Biz\Strata.ContinuousImprovement.Biz.csproj" />
+    <ProjectReference Include="..\..\src\Strata.ContinuousImprovement.Api\Strata.ContinuousImprovement.Api.csproj" />
+    <ProjectReference Include="..\Strata.ContinuousImprovement.JazzEntityFrameworkStub\Strata.ContinuousImprovement.JazzEntityFrameworkStub.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.Api.Test.Unit</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.JazzEntityFrameworkStub</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="ChargeCode\Opportunities\snapshots\" />
+    <Folder Include="Exploration\snapshots\" />
+    <Folder Include="Exploration\source\" />
+    <Folder Include="PeerGroup\snapshots\" />
+    <Folder Include="StrategicOpportunities\DistributionProcess\snapshots\" />
+  </ItemGroup>
+
+
+</Project>
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/DistributionProcess/DistributionProcessChargeCodeSqlBuilderTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/DistributionProcess/DistributionProcessChargeCodeSqlBuilderTests.cs
new file mode 100644
index 0000000..78d5b3c
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/DistributionProcess/DistributionProcessChargeCodeSqlBuilderTests.cs
@@ -0,0 +1,114 @@
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.ChargeCode;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyNUnit;
+using VerifyTests;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.StrategicOpportunities.DistributionProcess
+{
+    public class DistributionProcessChargeCodeSqlBuilderTests : StrategicOpportunityTestsBase
+    {
+        private readonly long _testOpportunityId = 0;
+        private readonly Period<DateOnly> _baselinePeriod;
+        private readonly Period<DateOnly> _goalPeriod;
+        private readonly Period<DateOnly> _trackingPeriod;
+        private readonly double[] _rampUps;
+
+        public DistributionProcessChargeCodeSqlBuilderTests()
+        {
+            _baselinePeriod = new Period<DateOnly>(new DateOnly(2024, 1, 1), new DateOnly(2024, 12, 31));
+            _goalPeriod = new Period<DateOnly>(new DateOnly(2025, 1, 1), new DateOnly(2025, 12, 31));
+            _trackingPeriod = new Period<DateOnly>(new DateOnly(2026, 1, 1), new DateOnly(2026, 12, 31));
+            _rampUps = [0.1, 0.2, 0.3, 0.4];
+        }
+
+        [TestCaseSource(nameof(BuildInsertDistributedSqlTestCases))]
+        public async Task BuildInsertDistributedSqlTest(DistributionMethod methodType, DistributionStage stage)
+        {
+            // Arrange
+            var builder = new DistributionProcessChargeCodeSqlBuilder(
+                _testOpportunityId,
+                _baselinePeriod,
+                _goalPeriod,
+                _trackingPeriod,
+                _rampUps);
+
+            // Act
+            var result = builder.BuildInsertDistributedSql(methodType, stage);
+
+            // Assert
+            await Verifier.Verify(result.Sql, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public async Task BuildDistributionSummarySqlTest(bool isInitiative)
+        {
+            // Arrange
+            var builder = new DistributionProcessChargeCodeSqlBuilder(
+                _testOpportunityId,
+                _baselinePeriod,
+                _goalPeriod,
+                _trackingPeriod,
+                _rampUps);
+
+            // Act
+            var result = builder.BuildDistributionSummarySql(isInitiative);
+
+            // Assert
+            await Verifier.Verify(result.Sql, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test]
+        public async Task BuildUpdateDetailCommittedByRampUpSqlTest()
+        {
+            // Arrange
+            var builder = new DistributionProcessChargeCodeSqlBuilder(
+                _testOpportunityId,
+                _baselinePeriod,
+                _goalPeriod,
+                _trackingPeriod,
+                _rampUps);
+
+            // Act
+            var result = builder.BuildUpdateDetailCommittedByRampUpSql(_rampUps.Reverse().ToArray());
+
+            // Assert
+            await Verifier.Verify(result.Sql, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        public static IEnumerable<TestCaseData> BuildInsertDistributedSqlTestCases()
+        {
+            var distributionMethods = new[]
+            {
+                DistributionMethod.Average,
+                DistributionMethod.Monthly
+            };
+            var distributionStages = new[]
+            {
+                DistributionStage.FromSourceToOpportunity,
+                DistributionStage.OpportunityChangeGoalPeriod,
+                DistributionStage.FromInitiativeToOpportunity,
+                DistributionStage.FromOpportunityToInitiative,
+                DistributionStage.InitiativeChangeTrackingPeriod
+            };
+            foreach (var method in distributionMethods)
+            {
+                foreach (var stage in distributionStages)
+                {
+                    yield return new TestCaseData(method, stage);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/DistributionProcess/DistributionProcessGLSqlBuilderTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/DistributionProcess/DistributionProcessGLSqlBuilderTests.cs
new file mode 100644
index 0000000..d107a4d
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/DistributionProcess/DistributionProcessGLSqlBuilderTests.cs
@@ -0,0 +1,115 @@
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess.GL;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.StrategicOpportunities.DistributionProcess
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Unit"), Category("CCI")]
+    public class DistributionProcessGLSqlBuilderTests : StrategicOpportunityTestsBase
+    {
+        private readonly long _testOpportunityId = 0;
+        private readonly Period<DateOnly> _baselinePeriod;
+        private readonly Period<DateOnly> _goalPeriod;
+        private readonly Period<DateOnly> _trackingPeriod;
+        private readonly double[] _rampUps;
+
+        public DistributionProcessGLSqlBuilderTests()
+        {
+            _baselinePeriod = new Period<DateOnly>(new DateOnly(2024, 1, 1), new DateOnly(2024, 12, 31));
+            _goalPeriod = new Period<DateOnly>(new DateOnly(2025, 1, 1), new DateOnly(2025, 12, 31));
+            _trackingPeriod = new Period<DateOnly>(new DateOnly(2026, 1, 1), new DateOnly(2026, 12, 31));
+            _rampUps = [0.1, 0.2, 0.3, 0.4];
+        }
+
+        [TestCaseSource(nameof(BuildInsertDistributedSqlTestCases))]
+        public async Task BuildInsertDistributedSqlTest(DistributionMethod methodType, DistributionStage stage)
+        {
+            // Arrange
+            var builder = new DistributionProcessGLSqlBuilder(
+                _testOpportunityId,
+                _baselinePeriod,
+                _goalPeriod,
+                _trackingPeriod,
+                _rampUps);
+
+            // Act
+            var result = builder.BuildInsertDistributedSql(methodType, stage);
+
+            // Assert
+            await Verifier.Verify(result.Sql, VerifySettings)
+                .UseFileName("GL " + TestContext.CurrentContext.TestName());
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public async Task BuildDistributionSummarySqlTest(bool isInitiative)
+        {
+            // Arrange
+            var builder = new DistributionProcessGLSqlBuilder(
+                _testOpportunityId,
+                _baselinePeriod,
+                _goalPeriod,
+                _trackingPeriod,
+                _rampUps);
+
+            // Act
+            var result = builder.BuildDistributionSummarySql(isInitiative);
+
+            // Assert
+            await Verifier.Verify(result.Sql, VerifySettings)
+                .UseFileName("GL " + TestContext.CurrentContext.TestName());
+        }
+
+        [Test]
+        public async Task BuildUpdateDetailCommittedByRampUpSqlTest()
+        {
+            // Arrange
+            var builder = new DistributionProcessGLSqlBuilder(
+                _testOpportunityId,
+                _baselinePeriod,
+                _goalPeriod,
+                _trackingPeriod,
+                _rampUps);
+
+            // Act
+            var result = builder.BuildUpdateDetailCommittedByRampUpSql(_rampUps.Reverse().ToArray());
+
+            // Assert
+            await Verifier.Verify(result.Sql, VerifySettings)
+                .UseFileName("GL " + TestContext.CurrentContext.TestName());
+        }
+
+        public static IEnumerable<TestCaseData> BuildInsertDistributedSqlTestCases()
+        {
+            var distributionMethods = new[]
+            {
+                DistributionMethod.Average,
+                DistributionMethod.Monthly
+            };
+            var distributionStages = new[]
+            {
+                DistributionStage.FromSourceToOpportunity,
+                DistributionStage.OpportunityChangeGoalPeriod,
+                DistributionStage.FromInitiativeToOpportunity,
+                DistributionStage.FromOpportunityToInitiative,
+                DistributionStage.InitiativeChangeTrackingPeriod
+            };
+            foreach (var method in distributionMethods)
+            {
+                foreach (var stage in distributionStages)
+                {
+                    yield return new TestCaseData(method, stage);
+                }
+            }
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/Queries/StrategicOpportunityDetailQueryBuilderTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/Queries/StrategicOpportunityDetailQueryBuilderTests.cs
new file mode 100644
index 0000000..1da304b
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/Queries/StrategicOpportunityDetailQueryBuilderTests.cs
@@ -0,0 +1,295 @@
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.DataSchema.Models.Query;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.StrategicOpportunities.Queries
+{
+    [TestFixture]
+    public class StrategicOpportunityDetailQueryBuilderTests : StrategicOpportunityTestsBase
+    {
+        private IStrategicOpportunityDetailQueryBuilder _builder;
+        private const long TestOpportunityId = 123;
+        private const long TestMeasureId = 456;
+        private const string TestStartDate = "2024-01-01";
+        private const int TestTrackingMonths = 12;
+        private const string SelectQuery = "SELECT * FROM TestTable";
+        private const string InvalidSelectQuery = "UPDATE TestTable SET Column1 = 'Value'";
+        private const string ComplexSelectQuery = @"
+            SELECT 
+                *
+            FROM dss.FactPatientCostDetail AS COSTDETAIL
+            RIGHT JOIN dss.FactPatientBillingLineItemDetail AS PBLID ON PBLID.rowid = COSTDETAIL.pblidrowid
+            RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+            LEFT JOIN CCI.FACTEXPLORATIONPOPULATIONENCOUNTER AS EXPLORATIONPOPULATIONENCOUNTER ON EXPLORATIONPOPULATIONENCOUNTER.encounterid = PBLID.encounterid
+            LEFT JOIN CCI.VIEWENCOUNTERPATIENTTYPEROLLUP AS ENCOUNTERPATIENTTYPEROLLUP ON ENCOUNTERPATIENTTYPEROLLUP.encounterid = PBLID.encounterid
+            INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid
+            INNER JOIN DSS.DIMPHYSICIAN AS PHYSPRIMARY ON PHYSPRIMARY.physicianid = DSSPES.primaryphysicianid
+        ";
+
+        [SetUp]
+        public void Setup()
+        {
+            _builder = new StrategicOpportunityDetailQueryBuilder();
+        }
+
+        #region BuildInsertQuery Tests
+
+        [TestCase(true, TestName = "BuildInsertQuery with APRDRG")]
+        [TestCase(false, TestName = "BuildInsertQuery without APRDRG")]
+        public async Task BuildInsertQuery_ShouldGenerateValidSql(bool isUsingAprdrg)
+        {
+            // Arrange
+            var opportunity = new StrategicOpportunityChargeCode { OpportunityId = TestOpportunityId };
+
+            // Act
+            var result = _builder.BuildInsertQuery(opportunity, SelectQuery, isUsingAprdrg);
+
+            // Assert
+            await Verifier.Verify(result, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test]
+        public void BuildInsertQuery_WithInvalidSelectQuery_ShouldThrowException()
+        {
+            // Arrange
+            var opportunity = new StrategicOpportunityChargeCode { OpportunityId = TestOpportunityId };
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => 
+                _builder.BuildInsertQuery(opportunity, InvalidSelectQuery, true));
+            Assert.That(ex.Message, Does.Contain("Unexpected SQL syntax. SELECT should be first word."));
+        }
+
+        #endregion
+
+        #region BuildDeleteQuery Tests
+
+        [Test]
+        public async Task BuildDeleteQuery_WithOpportunityId_ShouldGenerateValidSql()
+        {
+            // Act
+            var result = _builder.BuildDeleteQuery(TestOpportunityId);
+
+            // Assert
+            await Verifier.Verify(result, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test]
+        public async Task BuildDeleteQuery_WithoutOpportunityId_ShouldGenerateParameterizedSql()
+        {
+            // Act
+            var result = _builder.BuildDeleteQuery();
+
+            // Assert
+            await Verifier.Verify(result, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        #endregion
+
+        #region BuildMergeQuery Tests
+
+        [TestCase(true, TestName = "BuildMergeQuery with APRDRG")]
+        [TestCase(false, TestName = "BuildMergeQuery without APRDRG")]
+        public async Task BuildMergeQuery_ShouldGenerateValidSql(bool isUsingAprdrg)
+        {
+            // Act
+            var result = _builder.BuildMergeQuery(TestOpportunityId, SelectQuery, isUsingAprdrg);
+
+            // Assert
+            await Verifier.Verify(result, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test]
+        public void BuildMergeQuery_WithInvalidSelectQuery_ShouldThrowException()
+        {
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => 
+                _builder.BuildMergeQuery(TestOpportunityId, InvalidSelectQuery, true));
+            Assert.That(ex.Message, Does.Contain("Unexpected SQL syntax. SELECT should be first word."));
+        }
+
+        #endregion
+
+        #region BuildGetDistinctEncounterCountQuery Tests
+
+        [TestCase(true, TestName = "BuildGetDistinctEncounterCountQuery with APRDRG")]
+        [TestCase(false, TestName = "BuildGetDistinctEncounterCountQuery without APRDRG")]
+        public async Task BuildGetDistinctEncounterCountQuery_ShouldGenerateValidSql(bool isUsingAprdrg)
+        {
+            // Arrange
+            var getData = new StrategicOpportunityGetDetailData
+            {
+                Dimensions = new[] { "entity", "chargeCode", "costDriver" }
+            };
+
+            // Act
+            var result = _builder.BuildGetDistinctEncounterCountQuery(TestOpportunityId, SelectQuery, isUsingAprdrg, getData);
+
+            // Assert
+            await Verifier.Verify(result, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [Test]
+        public void BuildGetDistinctEncounterCountQuery_ShouldThrowException()
+        {
+            // Arrange
+            var getData = new StrategicOpportunityGetDetailData
+            {
+                Dimensions = new[] { "entity", "chargeCode", "costDriver" }
+            };
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => 
+                _builder.BuildGetDistinctEncounterCountQuery(TestOpportunityId, InvalidSelectQuery, true, getData));
+            Assert.That(ex.Message, Does.Contain("Unexpected SQL syntax. SELECT should be first word."));
+        }
+
+        #endregion
+
+        #region BuildMergeSystemMeasureMergeQuery Tests
+
+        [TestCaseSource(nameof(GetMeasureTypeTestCases))]
+        public async Task BuildMergeSystemMeasureMergeQuery_WithDifferentMeasureTypes_ShouldGenerateValidSql(MeasureType measureType)
+        {
+            // Act
+            var result = _builder.BuildMergeSystemMeasureMergeQuery(TestOpportunityId, TestMeasureId, measureType, TestStartDate, TestTrackingMonths);
+
+            // Assert
+            await Verifier.Verify(result, VerifySettings)
+                .UseFileName($"{TestContext.CurrentContext.Test.Name}_{measureType}");
+        }
+
+        private static IEnumerable<TestCaseData> GetMeasureTypeTestCases()
+        {
+            yield return new TestCaseData(MeasureType.CommittedCost).SetName("BuildMergeSystemMeasureMergeQuery with CommittedCost");
+            yield return new TestCaseData(MeasureType.ActualCost).SetName("BuildMergeSystemMeasureMergeQuery with ActualCost");
+        }
+
+        #endregion
+
+        #region GetSelectMeasureSql Tests
+                
+        [TestCaseSource(nameof(GetSelectMeasureSql_TestCases))]
+        public async Task GetSelectMeasureSql_ShouldGenerateValidSql(MeasureType measureType)
+        {
+            // Arrange
+            var marginFilters = new Dictionary<string, FilterCondition>
+            {
+                { "DepartmentId", new FilterCondition { Operator = FilterOperator.In, Values = new List<string> { "1", "2", "3", "4", "5" } } },
+                { "ChargeCodeId", new FilterCondition { Operator = FilterOperator.NotIn, Values = new List<string> { "100", "200", "300" } } },
+                { "EntityId", new FilterCondition { Operator = FilterOperator.In, Values = new List<string> { "999" } } }
+            };
+
+            // Act
+            var result = _builder.GetSelectMeasureSql(TestOpportunityId, measureType, ComplexSelectQuery, marginFilters);
+
+            // Assert
+            await Verifier.Verify(result, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+        
+        [Test]
+        public async Task GetSelectMeasureSql_EncountersCases()
+        {
+            // Arrange
+            var marginFilters = new Dictionary<string, FilterCondition>();
+            var complexSelectQuery = ComplexSelectQuery.Replace(
+                "RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid",
+                "INNER JOIN (SELECT * FROM clientdss.FactPatientEncounterSummary AS DSSPES) AS DSSPES ON DSSPES.encounterid = PBLID.encounterid"
+            );
+
+            // Act
+            var result = _builder.GetSelectMeasureSql(TestOpportunityId, MeasureType.EncountersCases, complexSelectQuery, marginFilters);
+
+            // Assert
+            await Verifier.Verify(result, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        private static IEnumerable<TestCaseData> GetSelectMeasureSql_TestCases()
+        {
+            foreach (var x in Enum.GetValues<MeasureType>().Where(x => x < MeasureType.CommittedCost))
+            {
+                yield return new TestCaseData(x)
+                    .SetName($"GetSelectMeasureSql with {x}");
+            }            
+        }
+
+        #endregion
+
+        #region WrapIntoMeasureMergeQuery Tests
+
+        [Test]
+        public async Task WrapIntoMeasureMergeQuery_ShouldWrapSelectQueryCorrectly()
+        {
+            // Act
+            var result = _builder.WrapIntoMeasureMergeQuery(SelectQuery);
+
+            // Assert
+            await Verifier.Verify(result, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        #endregion
+
+        #region WrapIntoMeasureAverageQuery Tests
+
+        [Test]
+        public async Task WrapIntoMeasureAverageQuery_ShouldWrapSelectQueryCorrectly()
+        {
+            // Act
+            var result = _builder.WrapIntoMeasureAverageQuery(SelectQuery);
+
+            // Assert
+            await Verifier.Verify(result, VerifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        #endregion
+
+        #region GetDeleteAllMeasuresSql Tests
+
+        [TestCaseSource(nameof(GetDeleteAllMeasuresSql_TestCases))]
+        public async Task GetDeleteAllMeasuresSql_ShouldGenerateValidSql(long[] measureIds)
+        {
+            // Act
+            var result = _builder.GetDeleteAllMeasuresSql(measureIds);
+
+            // Assert
+            if (measureIds == null || measureIds.Length == 0)
+            {
+                Assert.That(result, Is.Empty);
+            }            
+            else
+            {
+                await Verifier.Verify(result, VerifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName());
+            }
+            
+        }
+        private static IEnumerable<TestCaseData> GetDeleteAllMeasuresSql_TestCases()
+        {
+            yield return new TestCaseData(new long[] { 1, 2, 3, 4, 5 })
+                .SetName("GetDeleteAllMeasuresSql with MeasureIds");
+            yield return new TestCaseData(new long[] { })
+                .SetName("GetDeleteAllMeasuresSql with empty MeasureIds");
+            yield return new TestCaseData(null)
+                .SetName("GetDeleteAllMeasuresSql with null MeasureIds");
+        }
+        #endregion
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicChargeCodeOpportunityDetailServiceTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicChargeCodeOpportunityDetailServiceTests.cs
new file mode 100644
index 0000000..3098319
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicChargeCodeOpportunityDetailServiceTests.cs
@@ -0,0 +1,703 @@
+using Hangfire;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Exploration;
+using Strata.ContinuousImprovement.Biz.Exploration.Filters;
+using Strata.ContinuousImprovement.Biz.Notification;
+using Strata.ContinuousImprovement.Biz.Population;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.DistributionProcess;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Enums;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries;
+using Strata.ContinuousImprovement.Biz.Test.Unit.DbContexts;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.DataSchema.Client;
+using Strata.DataSchema.Models.Query;
+using Strata.DataSchema.Models.Schema;
+using Strata.Schema.Client;
+using Strata.Schema.Client.Dtos;
+using Strata.Schema.Client.Dtos.Info;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyNUnit;
+using static Strata.ContinuousImprovement.Biz.Exploration.ExplorationService;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.StrategicOpportunities
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Unit"), Category("CCI")]
+    public class StrategicChargeCodeOpportunityDetailServiceTests : StrategicOpportunityTestsBase
+    {
+        private IStrategicChargeCodeOpportunityDetailService _strategicOpportunityDetailService;
+        private Mock<IDataSchemaService> _mockDataSchemaService;
+        private Mock<ISchemaServiceClient> _mockSchemaServiceClient;
+        private Mock<ISnowflakeDatabaseContext> _mockSnowflakeContext;
+        private Mock<IAsyncDbContextFactory<JazzDbContext>> _mockJazzDbContext;
+        private Mock<IExplorationFilterService> _mockExplorationService;
+        private Mock<IDistributionProcessFactory> _mockDistributionProcessFactory;
+        private Mock<IStrategicOpportunityDetailQueryBuilder> _mockStrategicOpportunityDetailQueryBuilder;
+        private Mock<IHubContext<NotificationHub, INotificationHub>> _mockNotificationHubClient;
+        private Mock<ILogger<StrategicChargeCodeOpportunityDetailService>> _mockLogger;
+        private Mock<IStrategicItemDimensionSyncService> _mockDimensionSyncService;
+        private CentralDbContext _centralDbContext;
+
+        [OneTimeSetUp]
+        public void Setup()
+        {
+            // Create in-memory database
+            var options = new DbContextOptionsBuilder<CentralDbContext>()
+                .UseInMemoryDatabase(databaseName: "TestCentralDb_" + Guid.NewGuid())
+                .Options;
+
+            _centralDbContext = new CentralDbContext(options);
+
+            // Arrange mocks
+            _mockSchemaServiceClient = new Mock<ISchemaServiceClient>();
+            _mockJazzDbContext = new Mock<IAsyncDbContextFactory<JazzDbContext>>();
+            _mockSnowflakeContext = new Mock<ISnowflakeDatabaseContext>();
+            _mockDataSchemaService = new Mock<IDataSchemaService>();
+            _mockExplorationService = new Mock<IExplorationFilterService>();            
+            _mockNotificationHubClient = new Mock<IHubContext<NotificationHub, INotificationHub>>();
+            _mockLogger = new Mock<ILogger<StrategicChargeCodeOpportunityDetailService>>();
+            _mockDistributionProcessFactory = new Mock<IDistributionProcessFactory>();
+            _mockStrategicOpportunityDetailQueryBuilder = new Mock<IStrategicOpportunityDetailQueryBuilder>();
+            _mockDimensionSyncService = new Mock<IStrategicItemDimensionSyncService>();
+            _mockDimensionSyncService.Setup(x => x.UpsertAsync(It.IsAny<StrategicOpportunity>(), It.IsAny<CancellationToken>())).Returns(Task.CompletedTask);
+            _mockDimensionSyncService.Setup(x => x.DeleteAsync(It.IsAny<long>())).Returns(Task.CompletedTask);
+
+            // Seed ExplorationPopulation data for exploration test cases
+            _centralDbContext.ExplorationPopulations.Add(new ExplorationPopulation
+            {
+                ExplorationPopulationId = 100,
+                Name = "Test Exploration Population",
+                CaseTypeFamilyId = 123,
+                StrataId = 1,
+                FiltersJSON = @"[{""ChipType"":4,""Key"":1,""DateRange"":[""2024-01-01T00:00:00"",""2024-12-31T00:00:00""]}]"
+            });
+            _centralDbContext.SaveChanges();
+
+            // Create in-memory JazzDbContext options that will be reused
+            var jazzOptions = new DbContextOptionsBuilder<JazzDbContext>()
+                .UseInMemoryDatabase(databaseName: "TestJazzDb_" + Guid.NewGuid())
+                .Options;
+
+            // Seed the JazzDb with initial data
+            using (var jazzDbContext = new JazzDbContext(jazzOptions))
+            {
+                jazzDbContext.SystemSettings.Add(new SystemSetting
+                {
+                    SystemSettingId = 1,
+                    Name = "Flexible Exploration Inpatient Case Type Family",
+                    Value = "0"
+                });
+                jazzDbContext.SaveChanges();
+            }
+
+            // Mock JazzDbContext factory to return a NEW context instance each time
+            _mockJazzDbContext.Setup(x => x.CreateDbContextAsync(It.IsAny<CancellationToken>()))
+                .ReturnsAsync(() => new JazzDbContext(jazzOptions));
+
+            // Mock ExplorationFilterService
+            _mockExplorationService.Setup(x =>
+                x.GetFilterStringsAsync(It.IsAny<IEnumerable<FilterChipItem>>(), It.IsAny<IQueryParamBase>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(("WHERE DSSPES.dischargedatetime >= :DischargeDateStart AND DSSPES.dischargedatetime < :DischargeDateEnd\r\n", 
+                               "AND fpes.EntityId = 1\r\n"));
+
+            // Mock DataSchemaService
+            var dataTableId = 12345;
+            var dataColumnId = 67890;
+            var testDataSourceId = 999;
+
+            _mockDataSchemaService.Setup(x =>
+                x.GetDataSourcesAsync(It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new List<Strata.DataSchema.Models.DataSourceManagement.DataSource>
+                {
+                    new Strata.DataSchema.Models.DataSourceManagement.DataSource
+                    {
+                        DataSourceId = testDataSourceId,
+                        Name = "DS Strata Encounter Cost Detail"
+                    }
+                });
+
+            _mockDataSchemaService.Setup(x =>
+                x.GetDataTablesByDataSourceId(It.Is<int>(dataSourceId => dataSourceId == testDataSourceId), It.IsAny<bool>(), It.IsAny<DataTableType?>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((int dsId, bool includeChildren, DataTableType? tableType, CancellationToken ct) =>
+                {
+                    var tableAliases = new[] { "dsspes", "pblid", "costdetail", "cc", "PATIENTTYPE", "physPrimary", "dsspeci", "explorationPopulationEncounter", "msdrg" };
+                    return tableAliases.Select(alias => new DataTable
+                    {
+                        DataTableId = dataTableId,
+                        SqlAlias = alias
+                    }).ToList();
+                });
+
+            _mockDataSchemaService.Setup(x =>
+                x.GetDataColumnsBySqlColumnNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync((string columnName, CancellationToken ct) => new List<DataColumn>
+                {
+                    new DataColumn
+                    {
+                        DataColumnId = dataColumnId,
+                        DataTableId = dataTableId
+                    }
+                });
+
+            _mockDataSchemaService.Setup(x =>
+                x.BuildSqlQuery(It.IsAny<QueryConfig>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new SqlResponse
+                {
+                    SqlQuery = _unitsOfServicePatPopQuery,
+                    Parameters = new List<KeyValuePair<string, object>>
+                    {
+                        new(":dischargedatetime_Start_0", new DateTime(2024, 1, 1)),
+                        new(":dischargedatetime_End_1", new DateTime(2024, 12, 31)),
+                        new(":chargecodeid_2", 3541)
+                    }
+                });
+
+            // Mock SchemaServiceClient
+            _mockSchemaServiceClient.Setup(x =>
+                x.GetDimensionByGlobalIdAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new ScoreDimensionInfoDto { DimensionGuid = Guid.NewGuid() });
+
+            _mockSchemaServiceClient.Setup(x =>
+                x.GetDimensionMembersFromHierarchyPathsAsync(It.IsAny<Guid>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new List<MemberDto>
+                {
+                    new MemberDto
+                    {
+                        Id = "777",
+                        Name = "Charge Code Stub"
+                    }
+                });
+
+            _mockSchemaServiceClient.Setup(x =>
+                x.GetHierarchyNodesFromHierarchyPathsAsync(It.IsAny<Guid>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(new List<HierarchyNodeDto>());
+
+            // Mock Snowflake context
+            _mockSnowflakeContext.Setup(x =>
+                x.QueryAsync<StrategicOpportunityDetail>(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<object>(), It.IsAny<TimeSpan>()))
+                .ReturnsAsync(new List<StrategicOpportunityDetail>());
+
+            _mockSnowflakeContext.Setup(x =>
+                x.ExecuteScalarAsync<double>(It.IsAny<string>(), It.IsAny<object>()))
+                .ReturnsAsync(123.45);
+
+            _mockSnowflakeContext.Setup(x =>
+                x.ExecuteCommandAsync(It.IsAny<string>(), It.IsAny<object>(), It.IsAny<TimeSpan>()))
+                .ReturnsAsync(1);
+
+            var claimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor();
+
+            _strategicOpportunityDetailService = new StrategicChargeCodeOpportunityDetailService(
+                _mockJazzDbContext.Object,
+                _centralDbContext,
+                claimsPrincipalAccessor,
+                _mockDataSchemaService.Object,
+                _mockSchemaServiceClient.Object,
+                _mockSnowflakeContext.Object,
+                _mockExplorationService.Object,
+                _mockDistributionProcessFactory.Object,
+                _mockStrategicOpportunityDetailQueryBuilder.Object,
+                _mockNotificationHubClient.Object,
+                _mockDimensionSyncService.Object,
+                _mockLogger.Object);
+        }
+
+        [SetUp]
+        public void TestSetup()
+        {
+            _centralDbContext.StrategicOpportunityMeasures.RemoveRange(_centralDbContext.StrategicOpportunityMeasures);
+            _centralDbContext.StrategicOpportunityChargeCodes.RemoveRange(_centralDbContext.StrategicOpportunityChargeCodes);
+            _centralDbContext.SaveChanges();
+        }
+
+        private const string _unitsOfServicePatPopQuery = @"SELECT
+""DischargeDateTime"",
+ZEROIFNULL(""Value"") AS ""Value""
+
+FROM (
+SELECT
+""DischargeDateTime"",
+SUM(""Value"") AS ""Value""
+
+FROM (
+SELECT
+DSSPES.dischargedatetime AS ""DischargeDateTime"",
+SUM(PBLID.unitsofservice) AS ""Value""
+
+FROM dss.FactPatientBillingLineItemDetail AS PBLID
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+
+WHERE
+(((DSSPES.dischargedatetime >= :dischargedatetime_Start_0 AND DSSPES.dischargedatetime <= :dischargedatetime_End_1) AND PBLID.departmentid = :departmentid_2) AND DSSPES.primaryphysicianid = :primaryphysicianid_3)
+
+GROUP BY
+	""DischargeDateTime""
+
+
+)
+
+GROUP BY
+	""DischargeDateTime""
+
+
+)
+
+ORDER BY
+	""DischargeDateTime"" ASC NULLS FIRST";
+
+        private const string _unitsOfServiceFlexPopQuery = @"SELECT
+""DischargeDateTime"",
+ZEROIFNULL(""Value"") AS ""Value""
+
+FROM (
+SELECT
+""DischargeDateTime"",
+SUM(""Value"") AS ""Value""
+
+FROM (
+SELECT
+DSSPES.dischargedatetime AS ""DischargeDateTime"",
+SUM(PBLID.unitsofservice) AS ""Value""
+
+FROM dss.FactPatientBillingLineItemDetail AS PBLID
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+LEFT JOIN CCI.FACTEXPLORATIONPOPULATIONENCOUNTER AS EXPLORATIONPOPULATIONENCOUNTER ON EXPLORATIONPOPULATIONENCOUNTER.encounterid = PBLID.encounterid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_0 AND DSSPES.dischargedatetime <= :dischargedatetime_End_1) AND EXPLORATIONPOPULATIONENCOUNTER.explorationpopulationid = :explorationpopulationid_2)
+
+GROUP BY
+	""DischargeDateTime""
+
+
+)
+
+GROUP BY
+	""DischargeDateTime""
+
+
+)
+
+ORDER BY
+	""DischargeDateTime"" ASC NULLS FIRST";
+
+        private const string _contributionMarginPatPopQuery = @"SELECT
+""DischargeDateTime"",
+""dsspesNetRevenue"",
+ZEROIFNULL(""Value"") AS ""Value""
+
+FROM (
+SELECT
+""DischargeDateTime"",
+""dsspesNetRevenue"",
+SUM(""Value"") AS ""Value""
+
+FROM (
+SELECT
+DSSPES.dischargedatetime AS ""DischargeDateTime"",
+DSSPES.netrevenue AS ""dsspesNetRevenue"",
+SUM(COSTDETAIL.variabledirectcost) AS ""Value""
+
+FROM dss.FactPatientCostDetail AS COSTDETAIL
+RIGHT JOIN dss.FactPatientBillingLineItemDetail AS PBLID ON PBLID.rowid = COSTDETAIL.pblidrowid
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_0 AND DSSPES.dischargedatetime <= :dischargedatetime_End_1))
+
+GROUP BY
+	""DischargeDateTime"",
+	""dsspesNetRevenue""
+
+
+)
+
+GROUP BY
+	""DischargeDateTime"",
+	""dsspesNetRevenue""
+
+
+)
+
+ORDER BY
+	""DischargeDateTime"" ASC NULLS FIRST,
+	""dsspesNetRevenue"" ASC NULLS FIRST";
+
+        private const string _contributionMarginFlexPopQuery = @"SELECT
+""DischargeDateTime"",
+""dsspesNetRevenue"",
+ZEROIFNULL(""Value"") AS ""Value""
+
+FROM (
+SELECT
+""DischargeDateTime"",
+""dsspesNetRevenue"",
+SUM(""Value"") AS ""Value""
+
+FROM (
+SELECT
+DSSPES.dischargedatetime AS ""DischargeDateTime"",
+DSSPES.netrevenue AS ""dsspesNetRevenue"",
+SUM(COSTDETAIL.variabledirectcost) AS ""Value""
+
+FROM dss.FactPatientCostDetail AS COSTDETAIL
+RIGHT JOIN dss.FactPatientBillingLineItemDetail AS PBLID ON PBLID.rowid = COSTDETAIL.pblidrowid
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+LEFT JOIN CCI.FACTEXPLORATIONPOPULATIONENCOUNTER AS EXPLORATIONPOPULATIONENCOUNTER ON EXPLORATIONPOPULATIONENCOUNTER.encounterid = PBLID.encounterid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_0 AND DSSPES.dischargedatetime <= :dischargedatetime_End_1) AND EXPLORATIONPOPULATIONENCOUNTER.explorationpopulationid = :explorationpopulationid_2)
+
+GROUP BY
+	""DischargeDateTime"",
+	""dsspesNetRevenue""
+
+
+)
+
+GROUP BY
+	""DischargeDateTime"",
+	""dsspesNetRevenue""
+
+
+)
+
+ORDER BY
+	""DischargeDateTime"" ASC NULLS FIRST,
+	""dsspesNetRevenue"" ASC NULLS FIRST";
+
+        // SQL returned by BuildSqlQuery for the tracking merge path with clinical indicator population
+        private const string _trackingPatPopQuery = @"SELECT
+""dsspesEncounterId"",
+""dsspesDischargeDateTime"",
+""dsspesEntityID"",
+""dsspesPhysicianId"",
+""dsspesPrimaryServiceLineId"",
+""dsspesCPTCodeCaseTypeFamilyId"",
+""dsspesMSDRGCaseTypeFamilyId"",
+""dsspesAPRDRGCaseTypeFamilyId"",
+""pblidDepartmentId"",
+""physPrimaryPhysicianSpecialtyId"",
+""ccChargeCodeID"",
+""ccCostDriver"",
+""encounterPatientTypeRollupPatientTypeRollup"",
+ZEROIFNULL(""Units"") AS ""Units"",
+ZEROIFNULL(""Cost"") AS ""Cost""
+
+FROM (
+SELECT
+""dsspesEncounterId"",
+""dsspesDischargeDateTime"",
+""dsspesEntityID"",
+""dsspesPhysicianId"",
+""dsspesPrimaryServiceLineId"",
+""dsspesCPTCodeCaseTypeFamilyId"",
+""dsspesMSDRGCaseTypeFamilyId"",
+""dsspesAPRDRGCaseTypeFamilyId"",
+""pblidDepartmentId"",
+""physPrimaryPhysicianSpecialtyId"",
+""ccChargeCodeID"",
+""ccCostDriver"",
+""encounterPatientTypeRollupPatientTypeRollup"",
+SUM(""Units"") AS ""Units"",
+SUM(""Cost"") AS ""Cost""
+
+FROM (
+SELECT
+DSSPES.encounterid AS ""dsspesEncounterId"",
+DSSPES.dischargedatetime AS ""dsspesDischargeDateTime"",
+DSSPES.entityid AS ""dsspesEntityID"",
+DSSPES.primaryphysicianid AS ""dsspesPhysicianId"",
+DSSPES.servicelineid AS ""dsspesPrimaryServiceLineId"",
+DSSPES.cptcodecasetypefamilyid AS ""dsspesCPTCodeCaseTypeFamilyId"",
+DSSPES.msdrgcasetypefamilyid AS ""dsspesMSDRGCaseTypeFamilyId"",
+DSSPES.aprdrgcasetypefamilyid AS ""dsspesAPRDRGCaseTypeFamilyId"",
+PBLID.departmentid AS ""pblidDepartmentId"",
+PHYSPRIMARY.physicianspecialtyid AS ""physPrimaryPhysicianSpecialtyId"",
+CC.chargecodeid AS ""ccChargeCodeID"",
+IFNULL(CC.costdriver::TEXT, '') AS ""ccCostDriver"",
+IFNULL(ENCOUNTERPATIENTTYPEROLLUP.patienttyperollup::TEXT, '') AS ""encounterPatientTypeRollupPatientTypeRollup"",
+NULL AS ""Cost"",
+SUM(PBLID.unitsofservice) AS ""Units""
+
+FROM dss.FactPatientBillingLineItemDetail AS PBLID
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+LEFT JOIN dss.FactPatientEncounterClinicalIndicator AS DSSPECI ON DSSPECI.encounterid = PBLID.encounterid
+LEFT JOIN CCI.VIEWENCOUNTERPATIENTTYPEROLLUP AS ENCOUNTERPATIENTTYPEROLLUP ON ENCOUNTERPATIENTTYPEROLLUP.encounterid = PBLID.encounterid
+INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid
+INNER JOIN DSS.DIMPHYSICIAN AS PHYSPRIMARY ON PHYSPRIMARY.physicianid = DSSPES.primaryphysicianid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_0 AND DSSPES.dischargedatetime <= :dischargedatetime_End_1) AND DSSPECI.clinicalindicatorid = :clinicalindicatorid_2)
+
+GROUP BY
+	""dsspesEncounterId"",
+	""dsspesDischargeDateTime"",
+	""dsspesEntityID"",
+	""dsspesPhysicianId"",
+	""dsspesPrimaryServiceLineId"",
+	""dsspesCPTCodeCaseTypeFamilyId"",
+	""dsspesMSDRGCaseTypeFamilyId"",
+	""dsspesAPRDRGCaseTypeFamilyId"",
+	""pblidDepartmentId"",
+	""physPrimaryPhysicianSpecialtyId"",
+	""ccChargeCodeID"",
+	""ccCostDriver"",
+	""encounterPatientTypeRollupPatientTypeRollup""
+
+UNION ALL
+
+SELECT
+DSSPES.encounterid AS ""dsspesEncounterId"",
+DSSPES.dischargedatetime AS ""dsspesDischargeDateTime"",
+DSSPES.entityid AS ""dsspesEntityID"",
+DSSPES.primaryphysicianid AS ""dsspesPhysicianId"",
+DSSPES.servicelineid AS ""dsspesPrimaryServiceLineId"",
+DSSPES.cptcodecasetypefamilyid AS ""dsspesCPTCodeCaseTypeFamilyId"",
+DSSPES.msdrgcasetypefamilyid AS ""dsspesMSDRGCaseTypeFamilyId"",
+DSSPES.aprdrgcasetypefamilyid AS ""dsspesAPRDRGCaseTypeFamilyId"",
+PBLID.departmentid AS ""pblidDepartmentId"",
+PHYSPRIMARY.physicianspecialtyid AS ""physPrimaryPhysicianSpecialtyId"",
+CC.chargecodeid AS ""ccChargeCodeID"",
+IFNULL(CC.costdriver::TEXT, '') AS ""ccCostDriver"",
+IFNULL(ENCOUNTERPATIENTTYPEROLLUP.patienttyperollup::TEXT, '') AS ""encounterPatientTypeRollupPatientTypeRollup"",
+SUM(COSTDETAIL.variabledirectcost) AS ""Cost"",
+NULL AS ""Units""
+
+FROM dss.FactPatientCostDetail AS COSTDETAIL
+RIGHT JOIN dss.FactPatientBillingLineItemDetail AS PBLID ON PBLID.rowid = COSTDETAIL.pblidrowid
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+LEFT JOIN dss.FactPatientEncounterClinicalIndicator AS DSSPECI ON DSSPECI.encounterid = PBLID.encounterid
+LEFT JOIN CCI.VIEWENCOUNTERPATIENTTYPEROLLUP AS ENCOUNTERPATIENTTYPEROLLUP ON ENCOUNTERPATIENTTYPEROLLUP.encounterid = PBLID.encounterid
+INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid
+INNER JOIN DSS.DIMPHYSICIAN AS PHYSPRIMARY ON PHYSPRIMARY.physicianid = DSSPES.primaryphysicianid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_3 AND DSSPES.dischargedatetime <= :dischargedatetime_End_4) AND DSSPECI.clinicalindicatorid = :clinicalindicatorid_5)
+
+GROUP BY
+	""dsspesEncounterId"",
+	""dsspesDischargeDateTime"",
+	""dsspesEntityID"",
+	""dsspesPhysicianId"",
+	""dsspesPrimaryServiceLineId"",
+	""dsspesCPTCodeCaseTypeFamilyId"",
+	""dsspesMSDRGCaseTypeFamilyId"",
+	""dsspesAPRDRGCaseTypeFamilyId"",
+	""pblidDepartmentId"",
+	""physPrimaryPhysicianSpecialtyId"",
+	""ccChargeCodeID"",
+	""ccCostDriver"",
+	""encounterPatientTypeRollupPatientTypeRollup""
+
+
+)
+
+GROUP BY
+	""dsspesEncounterId"",
+	""dsspesDischargeDateTime"",
+	""dsspesEntityID"",
+	""dsspesPhysicianId"",
+	""dsspesPrimaryServiceLineId"",
+	""dsspesCPTCodeCaseTypeFamilyId"",
+	""dsspesMSDRGCaseTypeFamilyId"",
+	""dsspesAPRDRGCaseTypeFamilyId"",
+	""pblidDepartmentId"",
+	""physPrimaryPhysicianSpecialtyId"",
+	""ccChargeCodeID"",
+	""ccCostDriver"",
+	""encounterPatientTypeRollupPatientTypeRollup""
+
+
+)
+
+ORDER BY
+	""dsspesEncounterId"" ASC NULLS FIRST,
+	""dsspesDischargeDateTime"" ASC NULLS FIRST,
+	""dsspesEntityID"" ASC NULLS FIRST,
+	""dsspesPhysicianId"" ASC NULLS FIRST,
+	""dsspesPrimaryServiceLineId"" ASC NULLS FIRST,
+	""dsspesCPTCodeCaseTypeFamilyId"" ASC NULLS FIRST,
+	""dsspesMSDRGCaseTypeFamilyId"" ASC NULLS FIRST,
+	""dsspesAPRDRGCaseTypeFamilyId"" ASC NULLS FIRST,
+	""pblidDepartmentId"" ASC NULLS FIRST,
+	""physPrimaryPhysicianSpecialtyId"" ASC NULLS FIRST,
+	""ccChargeCodeID"" ASC NULLS FIRST,
+	""ccCostDriver"" ASC NULLS FIRST,
+	""encounterPatientTypeRollupPatientTypeRollup"" ASC NULLS FIRST";
+
+        // SQL returned by BuildSqlQuery for the tracking merge path with exploration population
+        private const string _trackingFlexPopQuery = @"SELECT
+""dsspesEncounterId"",
+""dsspesDischargeDateTime"",
+""dsspesEntityID"",
+""dsspesPhysicianId"",
+""dsspesPrimaryServiceLineId"",
+""dsspesCPTCodeCaseTypeFamilyId"",
+""dsspesMSDRGCaseTypeFamilyId"",
+""dsspesAPRDRGCaseTypeFamilyId"",
+""pblidDepartmentId"",
+""physPrimaryPhysicianSpecialtyId"",
+""ccChargeCodeID"",
+""ccCostDriver"",
+""encounterPatientTypeRollupPatientTypeRollup"",
+ZEROIFNULL(""Units"") AS ""Units"",
+ZEROIFNULL(""Cost"") AS ""Cost""
+
+FROM (
+SELECT
+""dsspesEncounterId"",
+""dsspesDischargeDateTime"",
+""dsspesEntityID"",
+""dsspesPhysicianId"",
+""dsspesPrimaryServiceLineId"",
+""dsspesCPTCodeCaseTypeFamilyId"",
+""dsspesMSDRGCaseTypeFamilyId"",
+""dsspesAPRDRGCaseTypeFamilyId"",
+""pblidDepartmentId"",
+""physPrimaryPhysicianSpecialtyId"",
+""ccChargeCodeID"",
+""ccCostDriver"",
+""encounterPatientTypeRollupPatientTypeRollup"",
+SUM(""Units"") AS ""Units"",
+SUM(""Cost"") AS ""Cost""
+
+FROM (
+SELECT
+DSSPES.encounterid AS ""dsspesEncounterId"",
+DSSPES.dischargedatetime AS ""dsspesDischargeDateTime"",
+DSSPES.entityid AS ""dsspesEntityID"",
+DSSPES.primaryphysicianid AS ""dsspesPhysicianId"",
+DSSPES.servicelineid AS ""dsspesPrimaryServiceLineId"",
+DSSPES.cptcodecasetypefamilyid AS ""dsspesCPTCodeCaseTypeFamilyId"",
+DSSPES.msdrgcasetypefamilyid AS ""dsspesMSDRGCaseTypeFamilyId"",
+DSSPES.aprdrgcasetypefamilyid AS ""dsspesAPRDRGCaseTypeFamilyId"",
+PBLID.departmentid AS ""pblidDepartmentId"",
+PHYSPRIMARY.physicianspecialtyid AS ""physPrimaryPhysicianSpecialtyId"",
+CC.chargecodeid AS ""ccChargeCodeID"",
+IFNULL(CC.costdriver::TEXT, '') AS ""ccCostDriver"",
+IFNULL(ENCOUNTERPATIENTTYPEROLLUP.patienttyperollup::TEXT, '') AS ""encounterPatientTypeRollupPatientTypeRollup"",
+NULL AS ""Cost"",
+SUM(PBLID.unitsofservice) AS ""Units""
+
+FROM dss.FactPatientBillingLineItemDetail AS PBLID
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+LEFT JOIN CCI.FACTEXPLORATIONPOPULATIONENCOUNTER AS EXPLORATIONPOPULATIONENCOUNTER ON EXPLORATIONPOPULATIONENCOUNTER.encounterid = PBLID.encounterid
+LEFT JOIN CCI.VIEWENCOUNTERPATIENTTYPEROLLUP AS ENCOUNTERPATIENTTYPEROLLUP ON ENCOUNTERPATIENTTYPEROLLUP.encounterid = PBLID.encounterid
+INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid
+INNER JOIN DSS.DIMPHYSICIAN AS PHYSPRIMARY ON PHYSPRIMARY.physicianid = DSSPES.primaryphysicianid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_0 AND DSSPES.dischargedatetime <= :dischargedatetime_End_1) AND EXPLORATIONPOPULATIONENCOUNTER.explorationpopulationid = :explorationpopulationid_2)
+
+GROUP BY
+	""dsspesEncounterId"",
+	""dsspesDischargeDateTime"",
+	""dsspesEntityID"",
+	""dsspesPhysicianId"",
+	""dsspesPrimaryServiceLineId"",
+	""dsspesCPTCodeCaseTypeFamilyId"",
+	""dsspesMSDRGCaseTypeFamilyId"",
+	""dsspesAPRDRGCaseTypeFamilyId"",
+	""pblidDepartmentId"",
+	""physPrimaryPhysicianSpecialtyId"",
+	""ccChargeCodeID"",
+	""ccCostDriver"",
+	""encounterPatientTypeRollupPatientTypeRollup""
+
+UNION ALL
+
+SELECT
+DSSPES.encounterid AS ""dsspesEncounterId"",
+DSSPES.dischargedatetime AS ""dsspesDischargeDateTime"",
+DSSPES.entityid AS ""dsspesEntityID"",
+DSSPES.primaryphysicianid AS ""dsspesPhysicianId"",
+DSSPES.servicelineid AS ""dsspesPrimaryServiceLineId"",
+DSSPES.cptcodecasetypefamilyid AS ""dsspesCPTCodeCaseTypeFamilyId"",
+DSSPES.msdrgcasetypefamilyid AS ""dsspesMSDRGCaseTypeFamilyId"",
+DSSPES.aprdrgcasetypefamilyid AS ""dsspesAPRDRGCaseTypeFamilyId"",
+PBLID.departmentid AS ""pblidDepartmentId"",
+PHYSPRIMARY.physicianspecialtyid AS ""physPrimaryPhysicianSpecialtyId"",
+CC.chargecodeid AS ""ccChargeCodeID"",
+IFNULL(CC.costdriver::TEXT, '') AS ""ccCostDriver"",
+IFNULL(ENCOUNTERPATIENTTYPEROLLUP.patienttyperollup::TEXT, '') AS ""encounterPatientTypeRollupPatientTypeRollup"",
+SUM(COSTDETAIL.variabledirectcost) AS ""Cost"",
+NULL AS ""Units""
+
+FROM dss.FactPatientCostDetail AS COSTDETAIL
+RIGHT JOIN dss.FactPatientBillingLineItemDetail AS PBLID ON PBLID.rowid = COSTDETAIL.pblidrowid
+RIGHT JOIN clientdss.FactPatientEncounterSummary AS DSSPES ON DSSPES.encounterid = PBLID.encounterid
+LEFT JOIN CCI.FACTEXPLORATIONPOPULATIONENCOUNTER AS EXPLORATIONPOPULATIONENCOUNTER ON EXPLORATIONPOPULATIONENCOUNTER.encounterid = PBLID.encounterid
+LEFT JOIN CCI.VIEWENCOUNTERPATIENTTYPEROLLUP AS ENCOUNTERPATIENTTYPEROLLUP ON ENCOUNTERPATIENTTYPEROLLUP.encounterid = PBLID.encounterid
+INNER JOIN FW.DIMCHARGECODE AS CC ON CC.chargecodeid = PBLID.chargecodeid
+INNER JOIN DSS.DIMPHYSICIAN AS PHYSPRIMARY ON PHYSPRIMARY.physicianid = DSSPES.primaryphysicianid
+
+WHERE
+((DSSPES.dischargedatetime >= :dischargedatetime_Start_3 AND DSSPES.dischargedatetime <= :dischargedatetime_End_4) AND EXPLORATIONPOPULATIONENCOUNTER.explorationpopulationid = :explorationpopulationid_5)
+
+GROUP BY
+	""dsspesEncounterId"",
+	""dsspesDischargeDateTime"",
+	""dsspesEntityID"",
+	""dsspesPhysicianId"",
+	""dsspesPrimaryServiceLineId"",
+	""dsspesCPTCodeCaseTypeFamilyId"",
+	""dsspesMSDRGCaseTypeFamilyId"",
+	""dsspesAPRDRGCaseTypeFamilyId"",
+	""pblidDepartmentId"",
+	""physPrimaryPhysicianSpecialtyId"",
+	""ccChargeCodeID"",
+	""ccCostDriver"",
+	""encounterPatientTypeRollupPatientTypeRollup""
+
+
+)
+
+GROUP BY
+	""dsspesEncounterId"",
+	""dsspesDischargeDateTime"",
+	""dsspesEntityID"",
+	""dsspesPhysicianId"",
+	""dsspesPrimaryServiceLineId"",
+	""dsspesCPTCodeCaseTypeFamilyId"",
+	""dsspesMSDRGCaseTypeFamilyId"",
+	""dsspesAPRDRGCaseTypeFamilyId"",
+	""pblidDepartmentId"",
+	""physPrimaryPhysicianSpecialtyId"",
+	""ccChargeCodeID"",
+	""ccCostDriver"",
+	""encounterPatientTypeRollupPatientTypeRollup""
+
+
+)
+
+ORDER BY
+	""dsspesEncounterId"" ASC NULLS FIRST,
+	""dsspesDischargeDateTime"" ASC NULLS FIRST,
+	""dsspesEntityID"" ASC NULLS FIRST,
+	""dsspesPhysicianId"" ASC NULLS FIRST,
+	""dsspesPrimaryServiceLineId"" ASC NULLS FIRST,
+	""dsspesCPTCodeCaseTypeFamilyId"" ASC NULLS FIRST,
+	""dsspesMSDRGCaseTypeFamilyId"" ASC NULLS FIRST,
+	""dsspesAPRDRGCaseTypeFamilyId"" ASC NULLS FIRST,
+	""pblidDepartmentId"" ASC NULLS FIRST,
+	""physPrimaryPhysicianSpecialtyId"" ASC NULLS FIRST,
+	""ccChargeCodeID"" ASC NULLS FIRST,
+	""ccCostDriver"" ASC NULLS FIRST,
+	""encounterPatientTypeRollupPatientTypeRollup"" ASC NULLS FIRST";
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicOpportunityGLDetailQueryBuilderTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicOpportunityGLDetailQueryBuilderTest.cs
new file mode 100644
index 0000000..23b3b2e
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicOpportunityGLDetailQueryBuilderTest.cs
@@ -0,0 +1,102 @@
+using FluentAssertions;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.StrategicOpportunities
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Unit"), Category("CCI")]
+    internal class StrategicOpportunityGLDetailQueryBuilderTest
+    {
+        private StrategicOpportunityGLDetailQueryBuilder _queryBuilder;
+
+        [SetUp]
+        public void Setup()
+        {
+            _queryBuilder = new StrategicOpportunityGLDetailQueryBuilder();
+        }
+
+        [Test]
+        public void BuildDeleteQuery_WithOpportunityId_EmbedsIdDirectly()
+        {
+            var result = _queryBuilder.BuildDeleteQuery(42);
+
+            result.Should().Contain("OpportunityId = 42");
+            result.Should().NotContain(":opportunityId");
+        }
+
+        [Test]
+        public void BuildDeleteQuery_WithoutOpportunityId_UsesParameterWithoutTrailingSemicolon()
+        {
+            var result = _queryBuilder.BuildDeleteQuery(null);
+
+            result.Should().Contain(":opportunityId");
+            result.Should().NotContain(":opportunityId;");
+        }
+
+        [Test]
+        public void BuildInsertQuery_WithTypedAccountIds_GeneratesAccountTypeMapCte()
+        {
+            var revenueIds = new List<int> { 100, 101 };
+            var expenseIds = new List<int> { 200 };
+            var statisticIds = new List<int> { 300 };
+
+            var result = _queryBuilder.BuildInsertQuery(
+                opportunityId: 42,
+                sourceTable: "fw.factglsampled",
+                departmentIds: new List<int> { 1, 2 },
+                revenueAccountIds: revenueIds,
+                expenseAccountIds: expenseIds,
+                statisticAccountIds: statisticIds,
+                baselineStart: new DateOnly(2024, 1, 1),
+                baselineEnd: new DateOnly(2024, 12, 31));
+
+            result.Should().Contain("(100, 0)");
+            result.Should().Contain("(101, 0)");
+            result.Should().Contain("(200, 1)");
+            result.Should().Contain("(300, 2)");
+        }
+
+        [Test]
+        public void BuildInsertQuery_WithTypedAccountIds_IncludesAccountTypeInInsertAndSelect()
+        {
+            var result = _queryBuilder.BuildInsertQuery(
+                opportunityId: 42,
+                sourceTable: "fw.factglsampled",
+                departmentIds: new List<int> { 1 },
+                revenueAccountIds: new List<int> { 100 },
+                expenseAccountIds: new List<int> { 200 },
+                statisticAccountIds: new List<int> { 300 },
+                baselineStart: new DateOnly(2024, 1, 1),
+                baselineEnd: new DateOnly(2024, 12, 31));
+
+            result.Should().Contain("AccountType,");
+            result.Should().Contain("at.AccountType,");
+            result.Should().Contain("at.AccountType;");
+            result.Should().Contain("JOIN (SELECT AccountId, AccountType FROM (VALUES");
+        }
+
+        [Test]
+        public void BuildMergeQuery_WithTypedAccountIds_IncludesAccountTypeInMergeConditionAndInsert()
+        {
+            var result = _queryBuilder.BuildMergeQuery(
+                opportunityId: 42,
+                sourceTable: "fw.factglsampled",
+                departmentIds: new List<int> { 1 },
+                revenueAccountIds: new List<int> { 100 },
+                expenseAccountIds: new List<int> { 200 },
+                statisticAccountIds: new List<int> { 300 },
+                trackingStart: new DateOnly(2025, 1, 1),
+                trackingEnd: new DateOnly(2025, 12, 31));
+
+            result.Should().Contain("AND t.AccountType = s.AccountType");
+            result.Should().Contain("AccountId, AccountType, Amount");
+            result.Should().Contain("s.AccountType, s.Amount");
+            result.Should().Contain("at.AccountType,");
+            result.Should().Contain("JOIN (SELECT AccountId, AccountType FROM (VALUES");
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicOpportunityGLUpdateQueryBuilderTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicOpportunityGLUpdateQueryBuilderTest.cs
new file mode 100644
index 0000000..3ba7a41
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicOpportunityGLUpdateQueryBuilderTest.cs
@@ -0,0 +1,121 @@
+using FluentAssertions;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.StrategicOpportunities
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Unit"), Category("CCI")]
+    internal class StrategicOpportunityGLUpdateQueryBuilderTest : StrategicOpportunityTestsBase
+    {
+        private StrategicOpportunityGLUpdateQueryBuilder _queryBuilder;
+
+        private static readonly IEnumerable<string> Rows =
+        [
+            StrategicOpportunityDetailDimension.System.Value,
+            StrategicOpportunityDetailDimension.Entity.Value,
+            StrategicOpportunityDetailDimension.Department.Value,
+            StrategicOpportunityDetailDimension.GLAccount.Value,
+        ];
+
+        [SetUp]
+        public void Setup()
+        {
+            _queryBuilder = new StrategicOpportunityGLUpdateQueryBuilder();
+        }
+
+        [Test]
+        public async Task BuildUpdateQuery_WithFourAdjustments_GeneratesCorrectSql()
+        {
+            // Arrange
+            const long opportunityId = 42;
+
+            var adjustments = new List<StrategicOpportunityGLAdjustment>
+            {
+                // Root-level adjustment
+                new() { NodeKey = "root",           GoalAmountValue = 50000 },
+                // Entity-level adjustment
+                new() { NodeKey = "101",            GoalAmountValue = 20000 },
+                // Entity + Department level: null (passthrough)
+                new() { NodeKey = "101|201",        GoalAmountValue = null  },
+                // Entity + Department + GLAccount (lowest level)
+                new() { NodeKey = "101|201|3001",   GoalAmountValue = 15000 },
+            };
+
+            // Act
+            var result = _queryBuilder.BuildUpdateQuery(adjustments, opportunityId, Rows).Query;
+
+            // Assert
+            await Verifier.Verify(result, VerifySettings);
+        }
+
+        [Test]
+        public void BuildUpdateQuery_WithAccountTypeOnSecondAdjustment_IncludesAccountTypeFilterInSubquery()
+        {
+            // AccountType filters are embedded in the inner SELECT WHERE for non-first adjustments
+            // (the first adjustment uses an outer WHERE clause that filters by hierarchy only)
+            const long opportunityId = 42;
+
+            var adjustments = new List<StrategicOpportunityGLAdjustment>
+            {
+                new() { NodeKey = "root",         GoalAmountValue = 50000 },
+                new() { NodeKey = "101|201|3001", GoalAmountValue = 15000, AccountType = 0 },
+            };
+
+            var (query, parameters) = _queryBuilder.BuildUpdateQuery(adjustments, opportunityId, Rows);
+
+            query.Should().Contain("AccountType = :AccountType_1");
+            parameters.Should().ContainKey("AccountType_1");
+            parameters["AccountType_1"].Should().Be((byte)0);
+        }
+
+        [Test]
+        public void BuildUpdateQuery_WithNullAccountType_OmitsAccountTypeFilter()
+        {
+            const long opportunityId = 42;
+
+            var adjustments = new List<StrategicOpportunityGLAdjustment>
+            {
+                new() { NodeKey = "root",         GoalAmountValue = 50000 },
+                new() { NodeKey = "101|201|3001", GoalAmountValue = 15000, AccountType = null },
+            };
+
+            var (query, parameters) = _queryBuilder.BuildUpdateQuery(adjustments, opportunityId, Rows);
+
+            query.Should().NotContain("AccountType = :");
+            parameters.Should().NotContainKey("AccountType_1");
+        }
+
+        [Test]
+        public void BuildUpdateQuery_WithInvalidOpportunityId_ThrowsArgumentException()
+        {
+            var adjustments = new List<StrategicOpportunityGLAdjustment>
+            {
+                new() { NodeKey = "101", GoalAmountValue = 1000 },
+            };
+
+            var act = () => _queryBuilder.BuildUpdateQuery(adjustments, opportunityId: 0, Rows);
+
+            act.Should().Throw<ArgumentException>().WithParameterName("opportunityId");
+        }
+
+        [Test]
+        public void BuildUpdateQuery_WithEmptyNodeKey_ThrowsArgumentException()
+        {
+            var adjustments = new List<StrategicOpportunityGLAdjustment>
+            {
+                new() { NodeKey = "", GoalAmountValue = 1000 },
+            };
+
+            var act = () => _queryBuilder.BuildUpdateQuery(adjustments, opportunityId: 42, Rows);
+
+            act.Should().Throw<ArgumentException>().WithParameterName("nodeKey");
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicOpportunityTestsBase.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicOpportunityTestsBase.cs
new file mode 100644
index 0000000..569fc46
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicOpportunityTestsBase.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using System.Diagnostics.CodeAnalysis;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyTests;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.StrategicOpportunities
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture]
+    public class StrategicOpportunityTestsBase
+    {
+        protected VerifySettings VerifySettings { get; set; }
+
+        [OneTimeSetUp]
+        public void TestFixtureSetup()
+        {
+            VerifySettings = TestExtensions.TestSettings();            
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicOpportunityUpdateQueryBuilderTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicOpportunityUpdateQueryBuilderTest.cs
new file mode 100644
index 0000000..70c0f89
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/StrategicOpportunities/StrategicOpportunityUpdateQueryBuilderTest.cs
@@ -0,0 +1,56 @@
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Dtos;
+using Strata.ContinuousImprovement.Biz.StrategicOpportunities.Queries;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.StrategicOpportunities
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Unit"), Category("CCI")]
+    internal class StrategicOpportunityUpdateQueryBuilderTest : StrategicOpportunityTestsBase
+    {
+        private StrategicOpportunityUpdateQueryBuilder _queryBuilder;
+
+        private static readonly IEnumerable<string> Rows =
+        [
+            StrategicOpportunityDetailDimension.System.Value,
+            StrategicOpportunityDetailDimension.Entity.Value,
+            StrategicOpportunityDetailDimension.Department.Value,
+            StrategicOpportunityDetailDimension.ChargeCode.Value,
+        ];
+
+        [SetUp]
+        public void Setup()
+        {
+            _queryBuilder = new StrategicOpportunityUpdateQueryBuilder();
+        }
+
+        [Test]
+        public async Task BuildUpdateQuery_WithFourAdjustments_GeneratesCorrectSql()
+        {
+            // Arrange
+            const long opportunityId = 42;
+
+            var adjustments = new List<StrategicOpportunityChargeCodeAdjustment>
+            {
+                // Root-level adjustment: both units and costs
+                new() { NodeKey = "root",           UnitsValue = 1000m,  CostsValue = 50000m },
+                // Entity-level adjustment: costs only
+                new() { NodeKey = "101",            UnitsValue = null,   CostsValue = 20000m },
+                // Entity + Department level: units only
+                new() { NodeKey = "101|201",        UnitsValue = 300m,   CostsValue = null   },
+                // Entity + Department + ChargeCode (lowest level): both units and costs
+                new() { NodeKey = "101|201|3001",   UnitsValue = 75m,    CostsValue = 5000m  },
+            };
+
+            // Act
+            var result = _queryBuilder.BuildUpdateQuery(adjustments, opportunityId, Rows).Query;
+
+            // Assert
+            await Verifier.Verify(result, VerifySettings);
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Stubs/Jeff_EXOpportunities.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Stubs/Jeff_EXOpportunities.cs
new file mode 100644
index 0000000..4a655f5
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Stubs/Jeff_EXOpportunities.cs
@@ -0,0 +1,41 @@
+using Strata.ContinuousImprovement.Biz.Exploration.Opportunities;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Stubs
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region Opportunities
+
+        public List<EXOpportunity> EXOpportunities =
+            new List<EXOpportunity>
+            {
+                new EXOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "EX - 101",
+                    Name = "Exploration Name 1",
+                    IdentifiedSavings = 1000d,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = ConfigurationGuid
+                },
+                new EXOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "EX - 102",
+                    Name = "Exploration Name 2",
+                    IdentifiedSavings = 2000d,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = ConfigurationGuid
+                }
+            };
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/ExcelDocsComparer.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/ExcelDocsComparer.cs
new file mode 100644
index 0000000..34f03ed
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/ExcelDocsComparer.cs
@@ -0,0 +1,115 @@
+using ClosedXML.Excel;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.IO.Packaging;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Utilities
+{
+    [ExcludeFromCodeCoverage]
+    internal static class ExcelDocsComparer
+    {
+        public static bool Compare(string left, string right, out string message)
+        {
+            using (FileStream leftStream = File.OpenRead(left))
+            using (FileStream rightStream = File.OpenRead(right))
+            {
+                return Compare(leftStream, rightStream, out message);
+            }
+        }
+
+        public static bool Compare(this Stream result, Stream expected, out string message)
+        {
+            using (Package leftPackage = Package.Open(result, FileMode.Open, FileAccess.Read))
+            using (Package rightPackage = Package.Open(expected, FileMode.Open, FileAccess.Read))
+            {
+                return PackageHelper.Compare(leftPackage, rightPackage, false, ExcludeMethod, out message);
+            }
+        }
+
+        public static bool Compare(this IXLWorkbook result, IXLWorkbook expected, out string message)
+        {
+            using (var resultStream = new MemoryStream())
+            using (var wbStream = new MemoryStream())
+            {
+                expected.SaveAs(wbStream);
+                result.SaveAs(resultStream);
+                return wbStream.Compare(resultStream, out message);
+            }
+        }
+
+        private static bool ExcludeMethod(Uri uri)
+        {
+            //Exclude service data
+            if (uri.OriginalString.EndsWith(".rels") ||
+                uri.OriginalString.EndsWith(".psmdcp"))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public static Dictionary<string, DataTable> GetDataTables(this IXLWorkbook workbook)
+        {
+            var dataTables = new Dictionary<string, DataTable>();
+            foreach (var ws in workbook.Worksheets)
+            {
+                var name = ws.Name;
+                DataTable dt = new DataTable();
+                foreach (var cell in ws.RowsUsed().First().CellsUsed())
+                {
+                    var columnName = "_" + cell.Value.ToString().ToAlphaNumericOnly();
+                    dt.Columns.Add(columnName);
+                }
+                foreach (var row in ws.RowsUsed().Where(x => x.RowNumber() > 1))
+                {
+                    DataRow temprow = dt.NewRow();
+
+                    for (int i = 0; i < dt.Columns.Count; i++)
+                    {
+                        try
+                        {
+                            var cellValue = row.Cells().ElementAt(i).Value.ToString();
+                            temprow[i] = cellValue.TrimWhiteSpaces().RemoveLineBreaks();
+                        }
+                        catch (Exception)
+                        {
+                            // Empty Cell
+                        }
+                    }
+
+                    dt.Rows.Add(temprow);
+                }
+                dataTables.Add(name, dt);
+            }
+            return dataTables;
+        }
+        private static string ToAlphaNumericOnly(this string input)
+        {
+            Regex rgx = new Regex("[^a-zA-Z0-9]");
+            return rgx.Replace(input, "");
+        }
+
+        public static string TrimWhiteSpaces(this string text)
+        {
+            text = text.TrimStart(' ');
+            text = text.TrimEnd(' ');
+            text = text.Trim();
+
+            return text;
+        }
+
+        public static string RemoveLineBreaks(this string text)
+        {
+            string replaceWith = "";
+            string removedBreaks = text.Replace("\r\n", replaceWith).Replace("\n", replaceWith).Replace("\r", replaceWith);
+
+            return text;
+        }
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/FeatureFlagWrapperTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/FeatureFlagWrapperTests.cs
new file mode 100644
index 0000000..0cca886
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/FeatureFlagWrapperTests.cs
@@ -0,0 +1,644 @@
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.CoreLib.Claims;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Utilities
+{
+    [TestFixture, Category("Unit")]
+    public class FeatureFlagWrapperTests
+    {
+        private IFeatureFlagServiceClient _mockFeatureFlagServiceClient;
+        private IClaimsPrincipalAccessor _mockClaimsPrincipalAccessor;
+        private FeatureFlagWrapper _featureFlagWrapper;
+        private readonly Guid _testClientId = Guid.Parse(TestUtilities.DbGuid);
+        private readonly Guid _alternateClientId = Guid.NewGuid();
+
+        [SetUp]
+        public void SetUp()
+        {
+            _mockFeatureFlagServiceClient = Mock.Of<IFeatureFlagServiceClient>();
+            _mockClaimsPrincipalAccessor = TestUtilities.GetClaimsPrincipalAccessor();
+
+            _featureFlagWrapper = new FeatureFlagWrapper(
+                _mockFeatureFlagServiceClient,
+                _mockClaimsPrincipalAccessor);
+        }
+
+        #region Test Case Sources
+
+        public static IEnumerable<TestCaseData> FeatureFlagTestCases()
+        {
+            foreach (FeatureFlag featureFlag in Enum.GetValues<FeatureFlag>())
+            {
+                var expectedKey = FeatureFlagLookup.Values[featureFlag];
+                yield return new TestCaseData(featureFlag, expectedKey)
+                    .SetName("IsFeatureFlagOn_{0}_ReturnsTrue");
+            }
+        }
+
+        public static IEnumerable<TestCaseData> FeatureFlagDisabledTestCases()
+        {
+            foreach (FeatureFlag featureFlag in Enum.GetValues<FeatureFlag>().Take(3))
+            {
+                yield return new TestCaseData(featureFlag)
+                    .SetName("IsFeatureFlagOn_{0}_ReturnsFalse");
+            }
+        }
+
+        public static IEnumerable<TestCaseData> FeatureFlagConsistencyTestCases()
+        {
+            yield return new TestCaseData(true, false)
+                .SetName("FeatureFlagConsistency_EnabledFlag_DefaultFalse");
+            yield return new TestCaseData(true, true)
+                .SetName("FeatureFlagConsistency_EnabledFlag_DefaultTrue");
+            yield return new TestCaseData(false, false)
+                .SetName("FeatureFlagConsistency_DisabledFlag_DefaultFalse");
+            yield return new TestCaseData(false, true)
+                .SetName("FeatureFlagConsistency_DisabledFlag_DefaultTrue");
+        }
+
+        #endregion
+
+        #region IsFeatureFlagOn Tests
+
+        [Test]
+        [TestCaseSource(nameof(FeatureFlagTestCases))]
+        public async Task IsFeatureFlagOn_WhenFeatureFlagEnabled_ReturnsTrue(FeatureFlag featureFlag, string expectedKey)
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync(expectedKey, _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsFeatureFlagOn(featureFlag, _testClientId);
+
+            // Assert
+            Assert.That(result, Is.True);
+            Mock.Get(_mockFeatureFlagServiceClient).Verify(
+                x => x.IsEnabledAsync(expectedKey, _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()),
+                Times.Once);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(FeatureFlagDisabledTestCases))]
+        public async Task IsFeatureFlagOn_WhenFeatureFlagDisabled_ReturnsFalse(FeatureFlag featureFlag)
+        {
+            // Arrange
+            var expectedKey = FeatureFlagLookup.Values[featureFlag];
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync(expectedKey, _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsFeatureFlagOn(featureFlag, _testClientId);
+
+            // Assert
+            Assert.That(result, Is.False);
+        }
+
+        [Test]
+        public async Task IsFeatureFlagOn_WithCustomDefaultValue_UsesProvidedDefault()
+        {
+            // Arrange
+            const bool customDefaultValue = true;
+            var featureFlag = FeatureFlag.ChargeCodeBeta;
+            var expectedKey = FeatureFlagLookup.Values[featureFlag];
+
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync(expectedKey, _testClientId, customDefaultValue, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(customDefaultValue);
+
+            // Act
+            var result = await _featureFlagWrapper.IsFeatureFlagOn(featureFlag, _testClientId, customDefaultValue);
+
+            // Assert
+            Assert.That(result, Is.EqualTo(customDefaultValue));
+            Mock.Get(_mockFeatureFlagServiceClient).Verify(
+                x => x.IsEnabledAsync(expectedKey, _testClientId, customDefaultValue, It.IsAny<bool>(), It.IsAny<CancellationToken>()),
+                Times.Once);
+        }
+
+        [Test]
+        public async Task IsFeatureFlagOn_WithDifferentClientIds_CallsServiceWithCorrectClientId()
+        {
+            // Arrange
+            var featureFlag = FeatureFlag.ChargeCodeBeta;
+            var expectedKey = FeatureFlagLookup.Values[featureFlag];
+
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync(expectedKey, _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsFeatureFlagOn(featureFlag, _alternateClientId);
+
+            // Assert
+            Assert.That(result, Is.True);
+            Mock.Get(_mockFeatureFlagServiceClient).Verify(
+                x => x.IsEnabledAsync(expectedKey, _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()),
+                Times.Once);
+        }
+
+        #endregion
+
+        #region ChargeCodeBeta Tests
+
+        [Test]
+        public async Task IsChargeCodeBetaEnabled_WithoutClientId_UsesCurrentUserDatabaseGuid()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("chargecodebeta", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsChargeCodeBetaEnabled();
+
+            // Assert
+            Assert.That(result, Is.True);
+            Mock.Get(_mockFeatureFlagServiceClient).Verify(
+                x => x.IsEnabledAsync("chargecodebeta", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()),
+                Times.Once);
+        }
+
+        [Test]
+        public async Task IsChargeCodeBetaEnabled_WithClientId_UsesProvidedClientId()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("chargecodebeta", _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsChargeCodeBetaEnabled(_alternateClientId);
+
+            // Assert
+            Assert.That(result, Is.False);
+        }
+
+        [Test]
+        public async Task IsChargeCodeBetaEnabled_WithDefaultValue_UsesCustomDefault()
+        {
+            // Arrange
+            const bool customDefault = true;
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("chargecodebeta", _testClientId, customDefault, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(customDefault);
+
+            // Act
+            var result = await _featureFlagWrapper.IsChargeCodeBetaEnabled(customDefault);
+
+            // Assert
+            Assert.That(result, Is.EqualTo(customDefault));
+        }
+
+        #endregion
+
+        #region CiBenchmarkingEnabled Tests
+
+        [Test]
+        public async Task IsCiBenchmarkingEnabled_WithoutClientId_UsesCurrentUserDatabaseGuid()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("cibenchmarkingenabled", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsCiBenchmarkingEnabled();
+
+            // Assert
+            Assert.That(result, Is.True);
+        }
+
+        [Test]
+        public async Task IsCiBenchmarkingEnabled_WithClientId_UsesProvidedClientId()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("cibenchmarkingenabled", _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsCiBenchmarkingEnabled(_alternateClientId);
+
+            // Assert
+            Assert.That(result, Is.False);
+        }
+
+        #endregion
+
+        #region CiExplorationPopulationStrategicOpportunityWizard Tests
+
+        [Test]
+        public async Task IsCiExplorationPopulationStrategicOpportunityWizardEnabled_WithoutClientId_UsesCurrentUserDatabaseGuid()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("ciexplorationpopulationstrategicopportunitywizard", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsCiExplorationPopulationStrategicOpportunityWizardEnabled();
+
+            // Assert
+            Assert.That(result, Is.True);
+        }
+
+        [Test]
+        public async Task IsCiExplorationPopulationStrategicOpportunityWizardEnabled_WithClientId_UsesProvidedClientId()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("ciexplorationpopulationstrategicopportunitywizard", _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsCiExplorationPopulationStrategicOpportunityWizardEnabled(_alternateClientId);
+
+            // Assert
+            Assert.That(result, Is.False);
+        }
+
+        #endregion
+
+        #region CiFlexibleExplorationEnabled Tests
+
+        [Test]
+        public async Task IsCiFlexibleExplorationEnabled_WithoutClientId_UsesCurrentUserDatabaseGuid()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("ciflexibleexplorationenabled", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsCiFlexibleExplorationEnabled();
+
+            // Assert
+            Assert.That(result, Is.True);
+        }
+
+        [Test]
+        public async Task IsCiFlexibleExplorationEnabled_WithClientId_UsesProvidedClientId()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("ciflexibleexplorationenabled", _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsCiFlexibleExplorationEnabled(_alternateClientId);
+
+            // Assert
+            Assert.That(result, Is.False);
+        }
+
+        #endregion
+
+        #region CiFlexibleExplorationPage3Enabled Tests
+
+        [Test]
+        public async Task IsCiFlexibleExplorationPage3Enabled_WithoutClientId_UsesCurrentUserDatabaseGuid()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("ciflexibleexplorationpage3enabled", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsCiFlexibleExplorationPage3Enabled();
+
+            // Assert
+            Assert.That(result, Is.True);
+        }
+
+        [Test]
+        public async Task IsCiFlexibleExplorationPage3Enabled_WithClientId_UsesProvidedClientId()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("ciflexibleexplorationpage3enabled", _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsCiFlexibleExplorationPage3Enabled(_alternateClientId);
+
+            // Assert
+            Assert.That(result, Is.False);
+        }
+
+        #endregion
+
+        #region CiOpportunityWorkbooks Tests
+
+        [Test]
+        public async Task IsCiOpportunityWorkbooksEnabled_WithoutClientId_UsesCurrentUserDatabaseGuid()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("ciopportunityworkbooks", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsCiOpportunityWorkbooksEnabled();
+
+            // Assert
+            Assert.That(result, Is.True);
+        }
+
+        [Test]
+        public async Task IsCiOpportunityWorkbooksEnabled_WithClientId_UsesProvidedClientId()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("ciopportunityworkbooks", _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsCiOpportunityWorkbooksEnabled(_alternateClientId);
+
+            // Assert
+            Assert.That(result, Is.False);
+        }
+
+        #endregion
+
+        #region DecisionSupportQueries Tests
+
+        [Test]
+        public async Task IsDecisionSupportQueriesEnabled_WithoutClientId_UsesCurrentUserDatabaseGuid()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("is-decision-support-queries-enabled", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsDecisionSupportQueriesEnabled();
+
+            // Assert
+            Assert.That(result, Is.True);
+        }
+
+        [Test]
+        public async Task IsDecisionSupportQueriesEnabled_WithClientId_UsesProvidedClientId()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("is-decision-support-queries-enabled", _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsDecisionSupportQueriesEnabled(_alternateClientId);
+
+            // Assert
+            Assert.That(result, Is.False);
+        }
+
+        #endregion
+
+        #region EnableEncounterOpportunityInTempo Tests
+
+        [Test]
+        public async Task IsEnableEncounterOpportunityInTempoEnabled_WithoutClientId_UsesCurrentUserDatabaseGuid()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("enableencounteropportunityintempo", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsEnableEncounterOpportunityInTempoEnabled();
+
+            // Assert
+            Assert.That(result, Is.True);
+        }
+
+        [Test]
+        public async Task IsEnableEncounterOpportunityInTempoEnabled_WithClientId_UsesProvidedClientId()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("enableencounteropportunityintempo", _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsEnableEncounterOpportunityInTempoEnabled(_alternateClientId);
+
+            // Assert
+            Assert.That(result, Is.False);
+        }
+
+        #endregion
+
+        #region EnablePayrollOpportunityInTempo Tests
+
+        [Test]
+        public async Task IsEnablePayrollOpportunityInTempoEnabled_WithoutClientId_UsesCurrentUserDatabaseGuid()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("enablepayrollopportunityintempo", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsEnablePayrollOpportunityInTempoEnabled();
+
+            // Assert
+            Assert.That(result, Is.True);
+        }
+
+        [Test]
+        public async Task IsEnablePayrollOpportunityInTempoEnabled_WithClientId_UsesProvidedClientId()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("enablepayrollopportunityintempo", _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsEnablePayrollOpportunityInTempoEnabled(_alternateClientId);
+
+            // Assert
+            Assert.That(result, Is.False);
+        }
+
+        #endregion
+
+        #region LoadExplorationPopulationDataFromPostgres Tests
+
+        [Test]
+        public async Task IsLoadExplorationPopulationDataFromPostgresEnabled_WithoutClientId_UsesCurrentUserDatabaseGuid()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("loadexplorationpopulationdatafrompostgres", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsLoadExplorationPopulationDataFromPostgresEnabled();
+
+            // Assert
+            Assert.That(result, Is.True);
+        }
+
+        [Test]
+        public async Task IsLoadExplorationPopulationDataFromPostgresEnabled_WithClientId_UsesProvidedClientId()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("loadexplorationpopulationdatafrompostgres", _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsLoadExplorationPopulationDataFromPostgresEnabled(_alternateClientId);
+
+            // Assert
+            Assert.That(result, Is.False);
+        }
+
+        #endregion
+
+        #region StrategicOpportunityEnabled Tests
+
+        [Test]
+        public async Task IsStrategicOpportunityEnabled_WithoutClientId_UsesCurrentUserDatabaseGuid()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("strategic-opportunity-enabled", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+
+            // Act
+            var result = await _featureFlagWrapper.IsStrategicOpportunityEnabled();
+
+            // Assert
+            Assert.That(result, Is.True);
+        }
+
+        [Test]
+        public async Task IsStrategicOpportunityEnabled_WithClientId_UsesProvidedClientId()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("strategic-opportunity-enabled", _alternateClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsStrategicOpportunityEnabled(_alternateClientId);
+
+            // Assert
+            Assert.That(result, Is.False);
+        }
+
+        #endregion
+
+        #region Exception Handling Tests
+
+        [Test]
+        public void IsFeatureFlagOn_WithInvalidFeatureFlag_ThrowsArgumentException()
+        {
+            // Arrange
+            const FeatureFlag invalidFeatureFlag = (FeatureFlag)999;
+
+            // Act & Assert
+            Assert.ThrowsAsync<KeyNotFoundException>(
+                async () => await _featureFlagWrapper.IsFeatureFlagOn(invalidFeatureFlag, _testClientId));
+        }
+
+        #endregion
+
+        #region Edge Case Tests
+
+        [Test]
+        public async Task AllFeatureFlagMethods_WithServiceException_PropagatesException()
+        {
+            // Arrange
+            var expectedException = new InvalidOperationException("Service unavailable");
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync(It.IsAny<string>(), It.IsAny<Guid>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ThrowsAsync(expectedException);
+
+            // Act & Assert
+            var ex = Assert.ThrowsAsync<InvalidOperationException>(
+                async () => await _featureFlagWrapper.IsChargeCodeBetaEnabled());
+
+            Assert.That(ex.Message, Is.EqualTo("Service unavailable"));
+        }
+
+        [Test]
+        public async Task AllFeatureFlagMethods_WithEmptyGuid_HandlesGracefully()
+        {
+            // Arrange
+            var emptyGuid = Guid.Empty;
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("chargecodebeta", emptyGuid, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var result = await _featureFlagWrapper.IsChargeCodeBetaEnabled(emptyGuid);
+
+            // Assert
+            Assert.That(result, Is.False);
+            Mock.Get(_mockFeatureFlagServiceClient).Verify(
+                x => x.IsEnabledAsync("chargecodebeta", emptyGuid, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()),
+                Times.Once);
+        }
+
+        #endregion
+
+        #region Integration Tests with Realistic Scenarios
+
+        [Test]
+        public async Task MultipleConcurrentFeatureFlagCalls_HandlesCorrectly()
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("chargecodebeta", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(true);
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("cibenchmarkingenabled", _testClientId, false, It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(false);
+
+            // Act
+            var task1 = _featureFlagWrapper.IsChargeCodeBetaEnabled();
+            var task2 = _featureFlagWrapper.IsCiBenchmarkingEnabled();
+
+            await Task.WhenAll(task1, task2);
+
+            // Assert
+            Assert.That(task1.Result, Is.True);
+            Assert.That(task2.Result, Is.False);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(FeatureFlagConsistencyTestCases))]
+        public async Task FeatureFlagConsistency_BetweenOverloads_ReturnsExpectedResults(bool enabledFlag, bool customDefault)
+        {
+            // Arrange
+            Mock.Get(_mockFeatureFlagServiceClient)
+                .Setup(x => x.IsEnabledAsync("chargecodebeta", _testClientId, It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(enabledFlag);
+
+            // Act
+            var resultWithoutClientId = await _featureFlagWrapper.IsChargeCodeBetaEnabled(customDefault);
+            var resultWithClientId = await _featureFlagWrapper.IsChargeCodeBetaEnabled(_testClientId, customDefault);
+
+            // Assert
+            Assert.That(resultWithoutClientId, Is.EqualTo(enabledFlag));
+            Assert.That(resultWithClientId, Is.EqualTo(enabledFlag));
+            Assert.That(resultWithoutClientId, Is.EqualTo(resultWithClientId));
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/IXLExample.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/IXLExample.cs
new file mode 100644
index 0000000..17bfd7e
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/IXLExample.cs
@@ -0,0 +1,7 @@
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Utilities
+{
+    public interface IXLExample
+    {
+        void Create(string filePath);
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/PackageHelper.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/PackageHelper.cs
new file mode 100644
index 0000000..5ae54d8
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/PackageHelper.cs
@@ -0,0 +1,533 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.IO.Packaging;
+using System.Linq;
+using System.Net.Mime;
+using System.Text;
+using System.Xml.Serialization;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Utilities
+{
+    [ExcludeFromCodeCoverage]
+    public static class PackageHelper
+    {
+        public static void WriteXmlPart(Package package, Uri uri, object content, XmlSerializer serializer)
+        {
+            if (package.PartExists(uri))
+            {
+                package.DeletePart(uri);
+            }
+            PackagePart part = package.CreatePart(uri, MediaTypeNames.Text.Xml, CompressionOption.Fast);
+            using (Stream stream = part.GetStream())
+            {
+                serializer.Serialize(stream, content);
+            }
+        }
+
+        public static object ReadXmlPart(Package package, Uri uri, XmlSerializer serializer)
+        {
+            if (!package.PartExists(uri))
+            {
+                throw new ApplicationException($"Package part '{uri.OriginalString}' doesn't exists!");
+            }
+            PackagePart part = package.GetPart(uri);
+            using (Stream stream = part.GetStream())
+            {
+                return serializer.Deserialize(stream);
+            }
+        }
+
+        public static void WriteBinaryPart(Package package, Uri uri, Stream content)
+        {
+            if (package.PartExists(uri))
+            {
+                package.DeletePart(uri);
+            }
+            PackagePart part = package.CreatePart(uri, MediaTypeNames.Application.Octet, CompressionOption.Fast);
+            using (Stream stream = part.GetStream())
+            {
+                StreamHelper.StreamToStreamAppend(content, stream);
+            }
+        }
+
+        /// <summary>
+        ///     Returns part's stream
+        /// </summary>
+        /// <param name="package"></param>
+        /// <param name="uri"></param>
+        /// <returns></returns>
+        public static Stream ReadBinaryPart(Package package, Uri uri)
+        {
+            if (!package.PartExists(uri))
+            {
+                throw new ApplicationException("Package part doesn't exists!");
+            }
+            PackagePart part = package.GetPart(uri);
+            return part.GetStream();
+        }
+
+        public static void CopyPart(Uri uri, Package source, Package dest)
+        {
+            CopyPart(uri, source, dest, true);
+        }
+
+        public static void CopyPart(Uri uri, Package source, Package dest, bool overwrite)
+        {
+            #region Check
+
+            if (ReferenceEquals(uri, null))
+            {
+                throw new ArgumentNullException(nameof(uri));
+            }
+            if (ReferenceEquals(source, null))
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+            if (ReferenceEquals(dest, null))
+            {
+                throw new ArgumentNullException(nameof(dest));
+            }
+
+            #endregion Check
+
+            if (dest.PartExists(uri))
+            {
+                if (!overwrite)
+                {
+                    throw new ArgumentException("Specified part already exists", nameof(uri));
+                }
+                dest.DeletePart(uri);
+            }
+
+            PackagePart sourcePart = source.GetPart(uri);
+            PackagePart destPart = dest.CreatePart(uri, sourcePart.ContentType, sourcePart.CompressionOption);
+
+            using (Stream sourceStream = sourcePart.GetStream())
+            {
+                using (Stream destStream = destPart.GetStream())
+                {
+                    StreamHelper.StreamToStreamAppend(sourceStream, destStream);
+                }
+            }
+        }
+
+        public static void WritePart<T>(Package package, PackagePartDescriptor descriptor, T content,
+            Action<Stream, T> serializeAction)
+        {
+            #region Check
+
+            if (ReferenceEquals(package, null))
+            {
+                throw new ArgumentNullException(nameof(package));
+            }
+            if (ReferenceEquals(descriptor, null))
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+            if (ReferenceEquals(serializeAction, null))
+            {
+                throw new ArgumentNullException(nameof(serializeAction));
+            }
+
+            #endregion Check
+
+            if (package.PartExists(descriptor.Uri))
+            {
+                package.DeletePart(descriptor.Uri);
+            }
+            PackagePart part = package.CreatePart(descriptor.Uri, descriptor.ContentType, descriptor.CompressOption);
+            using (Stream stream = part.GetStream())
+            {
+                serializeAction(stream, content);
+            }
+        }
+
+        public static void WritePart(Package package, PackagePartDescriptor descriptor, Action<Stream> serializeAction)
+        {
+            #region Check
+
+            if (ReferenceEquals(package, null))
+            {
+                throw new ArgumentNullException(nameof(package));
+            }
+            if (ReferenceEquals(descriptor, null))
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+            if (ReferenceEquals(serializeAction, null))
+            {
+                throw new ArgumentNullException(nameof(serializeAction));
+            }
+
+            #endregion Check
+
+            if (package.PartExists(descriptor.Uri))
+            {
+                package.DeletePart(descriptor.Uri);
+            }
+            PackagePart part = package.CreatePart(descriptor.Uri, descriptor.ContentType, descriptor.CompressOption);
+            using (Stream stream = part.GetStream())
+            {
+                serializeAction(stream);
+            }
+        }
+
+        public static T ReadPart<T>(Package package, Uri uri, Func<Stream, T> deserializeFunc)
+        {
+            #region Check
+
+            if (ReferenceEquals(package, null))
+            {
+                throw new ArgumentNullException(nameof(package));
+            }
+            if (ReferenceEquals(uri, null))
+            {
+                throw new ArgumentNullException(nameof(uri));
+            }
+            if (ReferenceEquals(deserializeFunc, null))
+            {
+                throw new ArgumentNullException(nameof(deserializeFunc));
+            }
+
+            #endregion Check
+
+            if (!package.PartExists(uri))
+            {
+                throw new ApplicationException($"Package part '{uri.OriginalString}' doesn't exists!");
+            }
+            PackagePart part = package.GetPart(uri);
+            using (Stream stream = part.GetStream())
+            {
+                return deserializeFunc(stream);
+            }
+        }
+
+        public static void ReadPart(Package package, Uri uri, Action<Stream> deserializeAction)
+        {
+            #region Check
+
+            if (ReferenceEquals(package, null))
+            {
+                throw new ArgumentNullException(nameof(package));
+            }
+            if (ReferenceEquals(uri, null))
+            {
+                throw new ArgumentNullException(nameof(uri));
+            }
+            if (ReferenceEquals(deserializeAction, null))
+            {
+                throw new ArgumentNullException(nameof(deserializeAction));
+            }
+
+            #endregion Check
+
+            if (!package.PartExists(uri))
+            {
+                throw new ApplicationException($"Package part '{uri.OriginalString}' doesn't exists!");
+            }
+            PackagePart part = package.GetPart(uri);
+            using (Stream stream = part.GetStream())
+            {
+                deserializeAction(stream);
+            }
+        }
+
+        public static bool TryReadPart(Package package, Uri uri, Action<Stream> deserializeAction)
+        {
+            #region Check
+
+            if (ReferenceEquals(package, null))
+            {
+                throw new ArgumentNullException(nameof(package));
+            }
+            if (ReferenceEquals(uri, null))
+            {
+                throw new ArgumentNullException(nameof(uri));
+            }
+            if (ReferenceEquals(deserializeAction, null))
+            {
+                throw new ArgumentNullException(nameof(deserializeAction));
+            }
+
+            #endregion Check
+
+            if (!package.PartExists(uri))
+            {
+                return false;
+            }
+            PackagePart part = package.GetPart(uri);
+            using (Stream stream = part.GetStream())
+            {
+                deserializeAction(stream);
+            }
+            return true;
+        }
+
+        /// <summary>
+        ///     Compare to packages by parts like streams
+        /// </summary>
+        /// <param name="left"></param>
+        /// <param name="right"></param>
+        /// <param name="compareToFirstDifference"></param>
+        /// <param name="excludeMethod"></param>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        public static bool Compare(Package left, Package right, bool compareToFirstDifference, out string message)
+        {
+            return Compare(left, right, compareToFirstDifference, null, out message);
+        }
+
+        /// <summary>
+        ///     Compare to packages by parts like streams
+        /// </summary>
+        /// <param name="left"></param>
+        /// <param name="right"></param>
+        /// <param name="compareToFirstDifference"></param>
+        /// <param name="excludeMethod"></param>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        public static bool Compare(Package left, Package right, bool compareToFirstDifference,
+            Func<Uri, bool> excludeMethod, out string message)
+        {
+            #region Check
+
+            if (left == null)
+            {
+                throw new ArgumentNullException(nameof(left));
+            }
+            if (right == null)
+            {
+                throw new ArgumentNullException(nameof(right));
+            }
+
+            #endregion Check
+
+            excludeMethod = excludeMethod ?? (uri => false);
+            PackagePartCollection leftParts = left.GetParts();
+            PackagePartCollection rightParts = right.GetParts();
+
+            var pairs = new Dictionary<Uri, PartPair>();
+            foreach (PackagePart part in leftParts)
+            {
+                if (excludeMethod(part.Uri))
+                {
+                    continue;
+                }
+                pairs.Add(part.Uri, new PartPair(part.Uri, CompareStatus.OnlyOnLeft));
+            }
+            foreach (PackagePart part in rightParts)
+            {
+                if (excludeMethod(part.Uri))
+                {
+                    continue;
+                }
+                if (pairs.TryGetValue(part.Uri, out PartPair pair))
+                {
+                    pair.Status = CompareStatus.Equal;
+                }
+                else
+                {
+                    pairs.Add(part.Uri, new PartPair(part.Uri, CompareStatus.OnlyOnRight));
+                }
+            }
+
+            if (compareToFirstDifference && pairs.Any(pair => pair.Value.Status != CompareStatus.Equal))
+            {
+                goto EXIT;
+            }
+
+            foreach (PartPair pair in pairs.Values)
+            {
+                if (pair.Status != CompareStatus.Equal)
+                {
+                    continue;
+                }
+                var leftPart = left.GetPart(pair.Uri);
+                var rightPart = right.GetPart(pair.Uri);
+                using (Stream leftPackagePartStream = leftPart.GetStream(FileMode.Open, FileAccess.Read))
+                using (Stream rightPackagePartStream = rightPart.GetStream(FileMode.Open, FileAccess.Read))
+                using (var leftMemoryStream = new MemoryStream())
+                using (var rightMemoryStream = new MemoryStream())
+                {
+                    leftPackagePartStream.CopyTo(leftMemoryStream);
+                    rightPackagePartStream.CopyTo(rightMemoryStream);
+
+                    leftMemoryStream.Seek(0, SeekOrigin.Begin);
+                    rightMemoryStream.Seek(0, SeekOrigin.Begin);
+
+                    bool stripColumnWidthsFromSheet = TestHelper.StripColumnWidths &&
+                        leftPart.ContentType == @"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml" &&
+                        rightPart.ContentType == @"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml";
+
+                    var tuple1 = new Tuple<Uri, Stream>(pair.Uri, leftMemoryStream);
+                    var tuple2 = new Tuple<Uri, Stream>(pair.Uri, rightMemoryStream);
+
+                    if (!StreamHelper.Compare(tuple1, tuple2, stripColumnWidthsFromSheet))
+                    {
+                        pair.Status = CompareStatus.NonEqual;
+                        if (compareToFirstDifference)
+                        {
+                            goto EXIT;
+                        }
+                    }
+                }
+            }
+
+        EXIT:
+            List<PartPair> sortedPairs = pairs.Values.ToList();
+            sortedPairs.Sort((one, other) => one.Uri.OriginalString.CompareTo(other.Uri.OriginalString));
+            var sbuilder = new StringBuilder();
+            foreach (PartPair pair in sortedPairs)
+            {
+                if (pair.Status == CompareStatus.Equal)
+                {
+                    continue;
+                }
+                sbuilder.AppendFormat("{0} :{1}", pair.Uri, pair.Status);
+                sbuilder.AppendLine();
+            }
+            message = sbuilder.ToString();
+            return message.Length == 0;
+        }
+
+        #region Nested type: PackagePartDescriptor
+
+        public sealed class PackagePartDescriptor
+        {
+            #region Private fields
+
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+            private readonly CompressionOption _compressOption;
+
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+            private readonly string _contentType;
+
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+            private readonly Uri _uri;
+
+            #endregion Private fields
+
+            #region Constructor
+
+            /// <summary>
+            ///     Instance constructor
+            /// </summary>
+            /// <param name=nameof(uri)>Part uri</param>
+            /// <param name="contentType">Content type from <see cref="MediaTypeNames" /></param>
+            /// <param name="compressOption"></param>
+            public PackagePartDescriptor(Uri uri, string contentType, CompressionOption compressOption)
+            {
+                #region Check
+
+                if (ReferenceEquals(uri, null))
+                {
+                    throw new ArgumentNullException(nameof(uri));
+                }
+                if (string.IsNullOrEmpty(contentType))
+                {
+                    throw new ArgumentNullException(nameof(contentType));
+                }
+
+                #endregion Check
+
+                _uri = uri;
+                _contentType = contentType;
+                _compressOption = compressOption;
+            }
+
+            #endregion Constructor
+
+            #region Public properties
+
+            public Uri Uri
+            {
+                [DebuggerStepThrough]
+                get => _uri;
+            }
+
+            public string ContentType
+            {
+                [DebuggerStepThrough]
+                get => _contentType;
+            }
+
+            public CompressionOption CompressOption
+            {
+                [DebuggerStepThrough]
+                get { return _compressOption; }
+            }
+
+            #endregion Public properties
+
+            #region Public methods
+
+            public override string ToString() => $"Uri:{_uri} ContentType: {_contentType}, Compression: {_compressOption}";
+
+            #endregion Public methods
+        }
+
+        #endregion Nested type: PackagePartDescriptor
+
+        #region Nested type: CompareStatus
+
+        private enum CompareStatus
+        {
+            OnlyOnLeft,
+            OnlyOnRight,
+            Equal,
+            NonEqual
+        }
+
+        #endregion Nested type: CompareStatus
+
+        #region Nested type: PartPair
+
+        private sealed class PartPair
+        {
+            #region Private fields
+
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+            private readonly Uri _uri;
+
+            [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+            private CompareStatus _status;
+
+            #endregion Private fields
+
+            #region Constructor
+
+            public PartPair(Uri uri, CompareStatus status)
+            {
+                _uri = uri;
+                _status = status;
+            }
+
+            #endregion Constructor
+
+            #region Public properties
+
+            public Uri Uri
+            {
+                [DebuggerStepThrough]
+                get { return _uri; }
+            }
+
+            public CompareStatus Status
+            {
+                [DebuggerStepThrough]
+                get { return _status; }
+                [DebuggerStepThrough]
+                set { _status = value; }
+            }
+
+            #endregion Public properties
+        }
+
+        #endregion Nested type: PartPair
+
+        //--
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/ResourceFileExtractor.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/ResourceFileExtractor.cs
new file mode 100644
index 0000000..f7370e7
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/ResourceFileExtractor.cs
@@ -0,0 +1,253 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Reflection;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Utilities
+{
+    /// <summary>
+    /// Summary description for ResourceFileExtractor.
+    /// </summary>
+    [ExcludeFromCodeCoverage]
+    public sealed class ResourceFileExtractor
+    {
+        #region Static
+
+        #region Private fields
+
+        private static readonly IDictionary<string, ResourceFileExtractor> extractors = new ConcurrentDictionary<string, ResourceFileExtractor>();
+
+        #endregion Private fields
+
+        #region Public properties
+
+        /// <summary>Instance of resource extractor for executing assembly </summary>
+        public static ResourceFileExtractor Instance
+        {
+            get
+            {
+                var _assembly = Assembly.GetCallingAssembly();
+                var _key = _assembly.GetName().FullName;
+                if (extractors.TryGetValue(_key, out var extractor) ||
+                    extractors.TryGetValue(_key, out extractor)) return extractor;
+
+                extractor = new ResourceFileExtractor(_assembly, true, null);
+                extractors.Add(_key, extractor);
+
+                return extractor;
+            }
+        }
+
+        #endregion Public properties
+
+        #endregion Static
+
+        #region Private fields
+
+        //private readonly Assembly m_assembly;
+        private readonly ResourceFileExtractor m_baseExtractor;
+
+        //private bool m_isStatic;
+        //private string ResourceFilePath { get; }
+
+        #endregion Private fields
+
+        #region Constructors
+
+        /// <summary>
+        /// Create instance
+        /// </summary>
+        /// <param name="resourceFilePath"><c>ResourceFilePath</c> in assembly. Example: .Properties.Scripts.</param>
+        /// <param name="baseExtractor"></param>
+        public ResourceFileExtractor(string resourceFilePath, ResourceFileExtractor baseExtractor)
+                : this(Assembly.GetCallingAssembly(), baseExtractor)
+        {
+            ResourceFilePath = resourceFilePath;
+        }
+
+        /// <summary>
+        /// Create instance
+        /// </summary>
+        /// <param name="baseExtractor"></param>
+        public ResourceFileExtractor(ResourceFileExtractor baseExtractor)
+                : this(Assembly.GetCallingAssembly(), baseExtractor)
+        {
+        }
+
+        /// <summary>
+        /// Create instance
+        /// </summary>
+        /// <param name="resourcePath"><c>ResourceFilePath</c> in assembly. Example: .Properties.Scripts.</param>
+        public ResourceFileExtractor(string resourcePath)
+                : this(Assembly.GetCallingAssembly(), resourcePath)
+        {
+        }
+
+        /// <summary>
+        /// Instance constructor
+        /// </summary>
+        /// <param name="assembly"></param>
+        /// <param name="resourcePath"></param>
+        public ResourceFileExtractor(Assembly assembly, string resourcePath)
+                : this(assembly ?? Assembly.GetCallingAssembly())
+        {
+            ResourceFilePath = resourcePath;
+        }
+
+        /// <summary>
+        /// Instance constructor
+        /// </summary>
+        public ResourceFileExtractor()
+                : this(Assembly.GetCallingAssembly())
+        {
+        }
+
+        /// <summary>
+        /// Instance constructor
+        /// </summary>
+        /// <param name="assembly"></param>
+        public ResourceFileExtractor(Assembly assembly)
+                : this(assembly ?? Assembly.GetCallingAssembly(), (ResourceFileExtractor)null)
+        {
+        }
+
+        /// <summary>
+        /// Instance constructor
+        /// </summary>
+        /// <param name="assembly"></param>
+        /// <param name="baseExtractor"></param>
+        public ResourceFileExtractor(Assembly assembly, ResourceFileExtractor baseExtractor)
+                : this(assembly ?? Assembly.GetCallingAssembly(), false, baseExtractor)
+        {
+        }
+
+        /// <summary>
+        /// Instance constructor
+        /// </summary>
+        /// <param name="assembly"></param>
+        /// <param name="isStatic"></param>
+        /// <param name="baseExtractor"></param>
+        /// <exception cref="ArgumentNullException">Argument is null.</exception>
+        private ResourceFileExtractor(Assembly assembly, bool isStatic, ResourceFileExtractor baseExtractor)
+        {
+            #region Check
+
+            if (assembly is null)
+            {
+                throw new ArgumentNullException(nameof(assembly));
+            }
+
+            #endregion Check
+
+            Assembly = assembly;
+            m_baseExtractor = baseExtractor;
+            AssemblyName = Assembly.GetName().Name;
+            IsStatic = isStatic;
+            ResourceFilePath = ".Resources.";
+        }
+
+        #endregion Constructors
+
+        #region Public properties
+
+        /// <summary> Work assembly </summary>
+        public Assembly Assembly { get; }
+
+        /// <summary> Work assembly name </summary>
+        public string AssemblyName { get; }
+
+        /// <summary>
+        /// Path to read resource files. Example: .Resources.Upgrades.
+        /// </summary>
+        public string ResourceFilePath { get; }
+
+        public bool IsStatic { get; set; }
+
+        public IEnumerable<string> GetFileNames(Func<String, Boolean> predicate = null)
+        {
+            predicate = predicate ?? (s => true);
+
+            var _path = AssemblyName + ResourceFilePath;
+            foreach (string _resourceName in Assembly.GetManifestResourceNames())
+            {
+                if (_resourceName.StartsWith(_path) && predicate(_resourceName))
+                {
+                    yield return _resourceName.Replace(_path, string.Empty);
+                }
+            }
+        }
+
+        #endregion Public properties
+
+        #region Public methods
+
+        public string ReadFileFromResource(string fileName)
+        {
+            var _stream = ReadFileFromResourceToStream(fileName);
+            string _result;
+            var sr = new StreamReader(_stream);
+            try
+            {
+                _result = sr.ReadToEnd();
+            }
+            finally
+            {
+                sr.Close();
+            }
+            return _result;
+        }
+
+        public string ReadFileFromResourceFormat(string fileName, params object[] formatArgs)
+        {
+            return string.Format(ReadFileFromResource(fileName), formatArgs);
+        }
+
+        /// <summary>
+        /// Read file in current assembly by specific path
+        /// </summary>
+        /// <param name="specificPath">Specific path</param>
+        /// <param name="fileName">Read file name</param>
+        /// <returns></returns>
+        public string ReadSpecificFileFromResource(string specificPath, string fileName)
+        {
+            ResourceFileExtractor _ext = new ResourceFileExtractor(Assembly, specificPath);
+            return _ext.ReadFileFromResource(fileName);
+        }
+
+        /// <summary>
+        /// Read file in current assembly by specific file name
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <returns></returns>
+        /// <exception cref="ApplicationException"><c>ApplicationException</c>.</exception>
+        public Stream ReadFileFromResourceToStream(string fileName)
+        {
+            var _nameResFile = AssemblyName + ResourceFilePath + fileName;
+            var _stream = Assembly.GetManifestResourceStream(_nameResFile);
+
+            #region Not found
+
+            if (_stream is null)
+            {
+                #region Get from base extractor
+
+                if (!(m_baseExtractor is null))
+                {
+                    return m_baseExtractor.ReadFileFromResourceToStream(fileName);
+                }
+
+                #endregion Get from base extractor
+
+                throw new ArgumentException("Can't find resource file " + _nameResFile, nameof(fileName));
+            }
+
+            #endregion Not found
+
+            return _stream;
+        }
+
+        #endregion Public methods
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/StreamHelper.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/StreamHelper.cs
new file mode 100644
index 0000000..a1faaae
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/StreamHelper.cs
@@ -0,0 +1,191 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Utilities
+{
+    /// <summary>
+    ///     Help methods for work with streams
+    /// </summary>
+    [ExcludeFromCodeCoverage]
+    public static class StreamHelper
+    {
+        /// <summary>
+        ///     Convert stream to byte array
+        /// </summary>
+        /// <param name="pStream">Stream</param>
+        /// <returns>Byte array</returns>
+        public static byte[] StreamToArray(Stream pStream)
+        {
+            long iLength = pStream.Length;
+            var bytes = new byte[iLength];
+            for (int i = 0; i < iLength; i++)
+            {
+                bytes[i] = (byte)pStream.ReadByte();
+            }
+            pStream.Close();
+            return bytes;
+        }
+
+        /// <summary>
+        ///     Convert byte array to stream
+        /// </summary>
+        /// <param name="pBynaryArray">Byte array</param>
+        /// <param name="pStream">Open stream</param>
+        /// <returns></returns>
+        public static Stream ArrayToStreamAppend(byte[] pBynaryArray, Stream pStream)
+        {
+            #region Check params
+
+            if (ReferenceEquals(pBynaryArray, null))
+            {
+                throw new ArgumentNullException(nameof(pBynaryArray));
+            }
+            if (ReferenceEquals(pStream, null))
+            {
+                throw new ArgumentNullException(nameof(pStream));
+            }
+            if (!pStream.CanWrite)
+            {
+                throw new ArgumentException("Can't write to stream", nameof(pStream));
+            }
+
+            #endregion Check params
+
+            foreach (byte b in pBynaryArray)
+            {
+                pStream.WriteByte(b);
+            }
+            return pStream;
+        }
+
+        public static void StreamToStreamAppend(Stream streamIn, Stream streamToWrite)
+        {
+            StreamToStreamAppend(streamIn, streamToWrite, 0);
+        }
+
+        public static void StreamToStreamAppend(Stream streamIn, Stream streamToWrite, long dataLength)
+        {
+            #region Check params
+
+            if (ReferenceEquals(streamIn, null))
+            {
+                throw new ArgumentNullException(nameof(streamIn));
+            }
+            if (ReferenceEquals(streamToWrite, null))
+            {
+                throw new ArgumentNullException(nameof(streamToWrite));
+            }
+            if (!streamIn.CanRead)
+            {
+                throw new ArgumentException("Can't read from stream", nameof(streamIn));
+            }
+            if (!streamToWrite.CanWrite)
+            {
+                throw new ArgumentException("Can't write to stream", nameof(streamToWrite));
+            }
+
+            #endregion Check params
+
+            var buf = new byte[512];
+            long length;
+            if (dataLength == 0)
+            {
+                length = streamIn.Length - streamIn.Position;
+            }
+            else
+            {
+                length = dataLength;
+            }
+            long rest = length;
+            while (rest > 0)
+            {
+                int len1 = streamIn.Read(buf, 0, rest >= 512 ? 512 : (int)rest);
+                streamToWrite.Write(buf, 0, len1);
+                rest -= len1;
+            }
+        }
+
+        /// <summary>
+        ///     Compare two streams by converting them to strings and comparing the strings
+        /// </summary>
+        /// <param name="one"></param>
+        /// <param name="other"></param>
+        /// /// <param name="stripColumnWidths"></param>
+        /// <returns></returns>
+        public static bool Compare(Tuple<Uri, Stream> tuple1, Tuple<Uri, Stream> tuple2, bool stripColumnWidths)
+        {
+            #region Check
+
+            if (tuple1 == null || tuple1.Item1 == null || tuple1.Item2 == null)
+            {
+                throw new ArgumentNullException(nameof(tuple1));
+            }
+            if (tuple2 == null || tuple2.Item1 == null || tuple2.Item2 == null)
+            {
+                throw new ArgumentNullException(nameof(tuple2));
+            }
+            if (tuple1.Item2.Position != 0)
+            {
+                throw new ArgumentException("Must be in position 0", nameof(tuple1));
+            }
+            if (tuple2.Item2.Position != 0)
+            {
+                throw new ArgumentException("Must be in position 0", nameof(tuple2));
+            }
+
+            #endregion Check
+
+            var stringOne = new StreamReader(tuple1.Item2).ReadToEnd().RemoveIgnoredParts(tuple1.Item1, stripColumnWidths, ignoreGuids: true);
+            var stringOther = new StreamReader(tuple2.Item2).ReadToEnd().RemoveIgnoredParts(tuple2.Item1, stripColumnWidths, ignoreGuids: true);
+            return stringOne == stringOther;
+        }
+
+        private static string RemoveIgnoredParts(this string s, Uri uri, bool ignoreColumnWidths, bool ignoreGuids)
+        {
+            s = uriSpecificIgnores.Where(p => p.Key.Equals(uri.OriginalString)).Aggregate(s, (current, pair) => pair.Value.Replace(current, ""));
+
+            // Collapse empty xml elements
+            s = emptyXmlElementRegex.Replace(s, "<$1 />");
+
+            if (ignoreColumnWidths)
+                s = RemoveColumnWidths(s);
+
+            if (ignoreGuids)
+                s = RemoveGuids(s);
+
+            return s;
+        }
+
+        private static IEnumerable<KeyValuePair<string, Regex>> uriSpecificIgnores = new List<KeyValuePair<string, Regex>>()
+        {
+            // Remove dcterms elements
+            new KeyValuePair<string, Regex>("/docProps/core.xml", new Regex(@"<dcterms:(\w+).*?<\/dcterms:\1>", RegexOptions.Compiled))
+        };
+
+        private static Regex emptyXmlElementRegex = new Regex(@"<([\w:]+)><\/\1>", RegexOptions.Compiled);
+        private static Regex columnRegex = new Regex("<x:col.*?width=\"\\d+(\\.\\d+)?\".*?\\/>", RegexOptions.Compiled);
+        private static Regex widthRegex = new Regex("width=\"\\d+(\\.\\d+)?\"\\s+", RegexOptions.Compiled);
+
+        private static string RemoveColumnWidths(string s)
+        {
+            var replacements = new Dictionary<string, string>();
+
+            foreach (var m in columnRegex.Matches(s).OfType<Match>())
+            {
+                var original = m.Groups[0].Value;
+                var replacement = widthRegex.Replace(original, "");
+                replacements.Add(original, replacement);
+            }
+
+            return replacements.Aggregate(s, (current, r) => current.Replace(r.Key, r.Value));
+        }
+
+        private static Regex guidRegex = new Regex(@"{[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}}", RegexOptions.Compiled | RegexOptions.Multiline);
+
+        private static string RemoveGuids(string s) => guidRegex.Replace(s, m => string.Empty);
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/TestExtensions.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/TestExtensions.cs
new file mode 100644
index 0000000..945c6bb
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/TestExtensions.cs
@@ -0,0 +1,49 @@
+using NUnit.Framework;
+using System;
+using System.Text.RegularExpressions;
+using VerifyTests;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Utilities
+{
+    public static class TestExtensions
+    {
+        /// <summary>
+        /// The test name
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns>
+        /// The name of the test split by camel case for a max length of 200 characters.
+        /// </returns>
+        public static string TestName(this TestContext context, string suffix = "")
+        {
+            var testName = suffix == string.Empty
+                ? $"{context.Test.Name}".SplitCamelCase()
+                : $"{context.Test.Name} - {suffix}".SplitCamelCase();
+            testName = testName[..Math.Min(200, testName.Length)];
+            return testName;
+        }
+
+        public static string SplitCamelCase(this string input)
+        {
+            if (string.IsNullOrEmpty(input)) { return input; }
+
+            const string pattern = "([a-z](?=[A-Z])|[A-Z](?=[A-Z][a-r + t-z])|[A-Z](?=[A-Z][s][a-z]))";
+
+            if (input.StartsWith("FY", StringComparison.Ordinal))
+            {   // hack for FY2012, etc
+                return "FY " + Regex.Replace(input.Remove(0, 2), pattern, "$1 ");
+            }
+            input = Regex.Replace(input, @"\{|\}|:|,|\)|\(", "", RegexOptions.Singleline | RegexOptions.IgnoreCase);
+            return Regex.Replace(input, pattern, "$1 ");
+        }
+
+        public static VerifySettings TestSettings()
+        {
+            var settings = new VerifySettings();
+            settings.UseDirectory("snapshots");
+            settings.ScrubInlineGuids();
+            return settings;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/TestHelper.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/TestHelper.cs
new file mode 100644
index 0000000..935ee27
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/TestHelper.cs
@@ -0,0 +1,147 @@
+using ClosedXML.Excel;
+using FluentAssertions;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Utilities
+{
+    [ExcludeFromCodeCoverage]
+    internal static class TestHelper
+    {
+        public static string CurrencySymbol => Thread.CurrentThread.CurrentCulture.NumberFormat.CurrencySymbol;
+
+        public static string TestsRunDirectory => System.Reflection.Assembly.GetExecutingAssembly().Location;
+        public static string TestsRootDirectory => Path.GetFullPath(Path.Combine(TestsRunDirectory, @"../../../../"));
+        //Note: Run example tests parameters
+        public static string TestsOutputDirectory => Path.Combine(Path.GetDirectoryName(TestsRunDirectory), "Generated");
+
+        public const string ActualTestResultPostFix = "";
+        public static readonly string ExampleTestsOutputDirectory = Path.Combine(TestsOutputDirectory, "Examples");
+
+        private const bool CompareWithResources = true;
+
+        private static readonly ResourceFileExtractor _extractor = new ResourceFileExtractor(".Resource.");
+
+        public static void SaveWorkbook(XLWorkbook workbook, params string[] fileNameParts)
+        {
+            workbook.SaveAs(Path.Combine(new string[] { TestsOutputDirectory }.Concat(fileNameParts).ToArray()), true);
+        }
+
+        // Because different fonts are installed on Unix,
+        // the columns widths after AdjustToContents() will
+        // cause the tests to fail.
+        // Therefore we ignore the width attribute when running on Unix
+        public static bool StripColumnWidths => IsRunningOnUnix;
+
+        public static bool IsRunningOnUnix
+        {
+            get
+            {
+                var p = (int)Environment.OSVersion.Platform;
+                return ((p == 4) || (p == 6) || (p == 128));
+            }
+        }
+
+        public static void RunTestExample<T>(string filePartName, bool evaluateFormulae = false)
+                where T : IXLExample, new()
+        {
+            // Make sure tests run on a deterministic culture
+            Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US");
+
+            var example = new T();
+            var pathParts = filePartName.Split(new char[] { '\\' });
+            var filePath1 = Path.Combine(new List<string>() { ExampleTestsOutputDirectory }.Concat(pathParts).ToArray());
+
+            var extension = Path.GetExtension(filePath1);
+            var directory = Path.GetDirectoryName(filePath1);
+
+            var fileName = Path.GetFileNameWithoutExtension(filePath1);
+            fileName += ActualTestResultPostFix;
+            fileName = Path.ChangeExtension(fileName, extension);
+
+            filePath1 = Path.Combine(directory, "z" + fileName);
+            var filePath2 = Path.Combine(directory, fileName);
+
+            //Run test
+            example.Create(filePath1);
+            using (var wb = new XLWorkbook(filePath1))
+                wb.SaveAs(filePath2, validate: true, evaluateFormulae);
+
+            // Also load from template and save it again - but not necessary to test against reference file
+            // We're just testing that it can save.
+            using (var ms = new MemoryStream())
+            using (var wb = XLWorkbook.OpenFromTemplate(filePath1))
+                wb.SaveAs(ms, validate: true, evaluateFormulae);
+
+            var resourcePath = "Examples." + filePartName.Replace('\\', '.').TrimStart('.');
+            using (var streamExpected = _extractor.ReadFileFromResourceToStream(resourcePath))
+            using (var streamActual = File.OpenRead(filePath2))
+            {
+                var success = ExcelDocsComparer.Compare(streamActual, streamExpected, out string message);
+                var formattedMessage =
+                    $"Actual file '{filePath2}' is different than the expected file '{resourcePath}'. The difference is: '{message}'";
+                success.Should().BeTrue(formattedMessage);
+            }
+        }
+
+        public static void CreateAndCompare(Func<IXLWorkbook> workbookGenerator, string referenceResource, bool evaluateFormulae = false)
+        {
+            Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US");
+
+            var pathParts = referenceResource.Split(new char[] { '\\' });
+            var filePath1 = Path.Combine(new List<string>() { TestsOutputDirectory }.Concat(pathParts).ToArray());
+
+            var extension = Path.GetExtension(filePath1);
+            var directory = Path.GetDirectoryName(filePath1);
+
+            var fileName = Path.GetFileNameWithoutExtension(filePath1);
+            fileName += ActualTestResultPostFix;
+            fileName = Path.ChangeExtension(fileName, extension);
+
+            var filePath2 = Path.Combine(directory, fileName);
+
+            using (var wb = workbookGenerator.Invoke())
+                wb.SaveAs(filePath2, true, evaluateFormulae);
+
+            var resourcePath = referenceResource.Replace('\\', '.').TrimStart('.');
+            using (var streamExpected = _extractor.ReadFileFromResourceToStream(resourcePath))
+            using (var streamActual = File.OpenRead(filePath2))
+            {
+                var success = ExcelDocsComparer.Compare(streamActual, streamExpected, out string message);
+                var formattedMessage =
+                    $"Actual file '{filePath2}' is different than the expected file '{resourcePath}'. The difference is: '{message}'";
+                success.Should().BeTrue(formattedMessage);
+            }
+        }
+
+        public static string GetResourcePath(string filePartName)
+        {
+            return filePartName.Replace('\\', '.').TrimStart('.');
+        }
+
+        public static Stream GetStreamFromResource(string resourcePath)
+        {
+            return _extractor.ReadFileFromResourceToStream(resourcePath);
+        }
+
+        public static void LoadFile(string filePartName)
+        {
+            IXLWorkbook wb;
+            using var stream = GetStreamFromResource(GetResourcePath(filePartName));
+            Action action = () =>
+            {
+                wb = new XLWorkbook(stream);
+            };
+            action.Should().NotThrow($"Unable to load resource {filePartName}");
+        }
+
+        public static IEnumerable<String> ListResourceFiles(Func<String, Boolean> predicate = null)
+        {
+            return _extractor.GetFileNames(predicate);
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/TestUtilities.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/TestUtilities.cs
new file mode 100644
index 0000000..93e49ae
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/Utilities/TestUtilities.cs
@@ -0,0 +1,59 @@
+using Moq;
+using Strata.CoreLib.Claims;
+using Strata.FeatureFlags.Client;
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.Utilities
+{
+    public static class TestUtilities
+    {
+        public const string UserGuid = "eb7e4993-c65a-493a-9614-986a55dd0744";
+        public const string DbGuid = "54409f55-5ddf-4748-8222-9ccfb04fb4f5";
+        public const string ClientDbGuid = "1742934B-C508-402B-B8B5-D18C506474CB";
+        public const string Username = "a";
+        public const string Key = UserGuid + Username;
+        public const string DbVersion = "202133";
+
+        public static IClaimsPrincipalAccessor GetClaimsPrincipalAccessor(string userGuid = null, string userName = null,
+            bool isSdtEmployee = true, bool isClientDatabase = false, bool isEmptyDatabase = false, int strataId = 0)
+        {
+            var dbGuid = DbGuid;
+            if (isClientDatabase) { dbGuid = ClientDbGuid; }
+            if (isEmptyDatabase) { dbGuid = Guid.Empty.ToString(); }
+
+            var claims = new List<Claim>
+            {
+                new Claim(ClaimTypes.Name, "Name"),
+                new Claim(StrataClaims.UserGuid, userGuid ?? UserGuid),
+                new Claim(StrataClaims.Username, userName ?? Username),
+                new Claim("given_name", "Firstname"),
+                new Claim("family_name", "Lastname"),
+                new Claim(StrataClaims.FirstName, "Firstname"),
+                new Claim(StrataClaims.LastName, "Lastname"),
+                new Claim(StrataClaims.DatabaseVersion, DbVersion),
+                new Claim("strata_id", strataId.ToString()),
+                new Claim(StrataClaims.DatabaseGuid, dbGuid),
+                new Claim(StrataClaims.IsSdtEmployee, isSdtEmployee.ToString())
+            };
+            var claimIdentity = new ClaimsIdentity(claims, "mock");
+            var claimsPrincipal = new ClaimsPrincipal(new[] { claimIdentity });
+            var claimsPrincipalAccessorMock = new Mock<IClaimsPrincipalAccessor>();
+            claimsPrincipalAccessorMock.Setup(s => s.GetCurrentClaimsPrincipal()).Returns(claimsPrincipal);
+
+            return claimsPrincipalAccessorMock.Object;
+        }
+
+        internal static IFeatureFlagServiceClient GetFeatureFlagServiceClient(string featureFlag, bool isOn = true)
+        {
+            var featureFlagServiceClient = Mock.Of<IFeatureFlagServiceClient>();
+            Mock.Get(featureFlagServiceClient)
+                .Setup(s => s.IsEnabledAsync(It.IsAny<string>(), It.IsAny<Guid>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .Returns<string, Guid, bool, bool, CancellationToken>((flag, dbGuid, defaultValue, returnDefaultValue, token) => Task.FromResult(flag == featureFlag && dbGuid.ToString() == DbGuid ? isOn : !isOn));
+            return featureFlagServiceClient;
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/UtilitiesTests/DateExtensionsTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/UtilitiesTests/DateExtensionsTest.cs
new file mode 100644
index 0000000..16c5f19
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/UtilitiesTests/DateExtensionsTest.cs
@@ -0,0 +1,31 @@
+using FluentAssertions;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static Org.BouncyCastle.Math.EC.ECCurve;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.UtilitiesTests
+{
+    [TestFixture, Category("Unit")]
+    public  class DateExtensionsTest
+    {
+        [TestCaseSource(nameof(GetStartOrEndDateOfYearPeriodCases))]
+        public void TestGetStartOrEndDateOfYearPeriod(DateTime dateSource, DateTime dateExpected, int yearDiff)
+        {
+            var dateActual = dateSource.GetStartOrEndDateOfYearPeriod(yearDiff);
+            dateActual.Should().Be(dateExpected);
+        }
+
+        public static IEnumerable<TestCaseData> GetStartOrEndDateOfYearPeriodCases()
+        {
+            yield return new TestCaseData(new DateTime(2024, 2, 29), new DateTime(2023, 3, 1), -1);
+            yield return new TestCaseData(new DateTime(2025, 2, 28), new DateTime(2024, 3, 1), -1);
+            yield return new TestCaseData(new DateTime(2023, 3, 1), new DateTime(2024, 2, 29), 1);
+            yield return new TestCaseData(new DateTime(2024, 3, 1), new DateTime(2025, 2, 28), 1);
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/UtilizationVariation/Opportunities/UVOpportunityServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/UtilizationVariation/Opportunities/UVOpportunityServiceTest.cs
new file mode 100644
index 0000000..ee80f5a
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/UtilizationVariation/Opportunities/UVOpportunityServiceTest.cs
@@ -0,0 +1,672 @@
+using ClosedXML.Excel;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.Initiatives;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.Test.Unit.Utilities;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities.Filters;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.UtilizationVariation.Opportunities
+{
+    [TestFixture, Category("Unit")]
+    public class UVOpportunityServiceTest
+    {
+
+        private Mock<IUVOpportunityService> _variationOpportunityServiceMock;
+        private Mock<IAsyncDbContextFactory<JazzDbContext>> _dbContextFactoryMock;
+        private Mock<IJazzDbContext> _jazzDbContextMock;
+        private IInitiativeService _initiativeService;
+        private IUpdateFactOpportunitySavingsService _updateFactOpportunitySavingsService;
+        private static readonly ResourceFileExtractor _extractor = new ResourceFileExtractor(".Resource.");
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _variationOpportunityServiceMock = new Mock<IUVOpportunityService>();
+            _dbContextFactoryMock = new Mock<IAsyncDbContextFactory<JazzDbContext>>();
+            _jazzDbContextMock = new Mock<IJazzDbContext>();
+            _initiativeService = Mock.Of<IInitiativeService>();
+            _updateFactOpportunitySavingsService = Mock.Of<IUpdateFactOpportunitySavingsService>();
+            Mock.Get(_initiativeService)
+                .Setup(s => s.DeleteAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(true));
+            Mock.Get(_updateFactOpportunitySavingsService)
+                .Setup(s => s.UpdateFactOpportunitySavings(It.IsAny<CancellationToken>()));
+        }
+
+        [TestCaseSource(nameof(GetFrameworkWithFilterData))]
+        public async Task TestGetPagedAsyncWithFramework(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, UVFilters filters, CancellationToken cancellationToken)
+        {
+            // arrange
+            var variationOpportunityService = new UVOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                var taskResult = await variationOpportunityService
+                    .GetPagedAsync(new PagingOptions(), filters, cancellationToken);
+
+                // assert
+                var result = taskResult.Data;
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    result.Should().BeNullOrEmpty();
+                    return;
+                }
+                result.Should()
+                    .NotBeNullOrEmpty()
+                    .And.AllBeOfType<UVOpportunity>();
+
+                if (filters.CaseTypeGuids.Any())
+                    result.Should()
+                        .Contain(vo => filters.CaseTypeGuids.Contains(vo.CaseTypeGuid));
+                if (filters.EntityIds.Any())
+                    result.Should()
+                        .Contain(vo => filters.EntityIds.Contains(vo.EntityId.ToString()));
+                if (filters.ServiceLineIds.Any())
+                    result.Should()
+                        .Contain(vo => filters.ServiceLineIds.Contains(vo.ServiceLineId.ToString()));
+                if (filters.CostDrivers.Any())
+                    result.Should()
+                        .Contain(vo => filters.CostDrivers.Contains(vo.CostDriver));
+                if (filters.ExcludeInitiatives)

+                {
+                    result.ToList().ForEach(opportunity => opportunity.HasInitiative.Should().Be(false));

+                }
+                if (!string.IsNullOrEmpty(filters.OpportunitySearch))
+                    result.Should()
+                        .Contain(vo => vo.OpportunityKey.Contains(filters.OpportunitySearch));
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Asc()
+        {
+            // arrange
+            var variationOpportunityService = new UVOpportunityService(new JazzEntityFrameworkFactory(), null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            var filters = new UVFilters()
+            {
+                CaseTypeGuids = new List<Guid>(),
+                CostDrivers = new List<string>(),
+                EntityIds = new List<string>(),
+                IdentifiedSavings = 0,
+                ServiceLineIds = new List<string>(),
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",

+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            };
+
+            var pagingOptions = new PagingOptions() { SortField = "Cases", SortOrder = SortOrder.Asc };
+
+            // act
+            var taskResult = await variationOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<UVOpportunity>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().Cases
+                .Should().BeLessThan(taskResult.Data.Last().Cases);
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Desc()
+        {
+            // arrange
+            var variationOpportunityService = new UVOpportunityService(new JazzEntityFrameworkFactory(), null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            var filters = new UVFilters()
+            {
+                CaseTypeGuids = new List<Guid>(),
+                CostDrivers = new List<string>(),
+                EntityIds = new List<string>(),
+                IdentifiedSavings = 0,
+                ServiceLineIds = new List<string>(),
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",

+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            };
+
+            var pagingOptions = new PagingOptions() { SortField = "Cases", SortOrder = SortOrder.Desc };
+
+            // act
+            var taskResult = await variationOpportunityService
+                .GetPagedAsync(pagingOptions, filters, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<UVOpportunity>()
+                .And.HaveCountGreaterThan(1);
+            taskResult.Data.First().Cases
+                .Should().BeGreaterThan(taskResult.Data.Last().Cases);
+        }
+
+        [TestCaseSource(nameof(GetFilterData))]
+        public void TestValidateFilters(UVFilters filters)
+        {
+            if (filters == null) return;
+            if (filters.CaseTypeGuids.Any())
+                filters.CaseTypeGuids.Should()
+                    .AllBeOfType<Guid>()
+                    .And.NotBeEmpty();
+            if (filters.EntityIds.Any())
+                filters.EntityIds.Should()
+                    .AllBeOfType<string>();
+            if (filters.ServiceLineIds.Any())
+                filters.ServiceLineIds.Should()
+                    .AllBeOfType<string>();
+            if (filters.CostDrivers.Any())
+                filters.CostDrivers.Should()
+                    .AllBeOfType<string>();
+        }
+
+        [Test]
+        public async Task TestGetExcelWorkbook()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var caseTypeGuid = framework.UVOpportunities.First().CaseTypeGuid;
+            var costDriver = framework.UVOpportunities.First().CostDriver;
+            var entityId = framework.UVOpportunities[1].EntityId;
+            var filters = new UVFilters()
+            {
+                ConfigurationGuid = framework.Configurations.First().ConfigurationGuid,
+                CaseTypeGuids = new[] { caseTypeGuid },
+                CostDrivers = new[] { costDriver },
+                EntityIds = entityId.Split(',', StringSplitOptions.TrimEntries).ToList()
+            };
+            var service = new UVOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var wb = await service.ExportAsync(new SortOptions(), filters, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\Git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "ExcelFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            wb.Worksheets.Should().HaveCount(1);
+            var ws = wb.Worksheet(1);
+            ws.Should().NotBeNull();
+
+            var expected = @"Examples.VariationOpportunity.ExcelFilter.xlsx";
+            using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+            using (var actualStream = new MemoryStream())
+            {
+                wb.SaveAs(actualStream);
+                actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+            }
+        }
+
+        [Test]
+        public async Task TestGetExcelWorkbookNullFilter()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+
+            var service = new UVOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var wb = await service.ExportAsync(null, null, CancellationToken.None);
+#pragma warning disable S125 // Sections of code should not be commented out
+            //wb.SaveAs(System.IO.Path.Combine(@"C:\Git\continuousimprovement\tests\Strata.ContinuousImprovement.Biz.Test.Unit\Resource", "ExcelNullFilter.xlsx"));
+#pragma warning restore S125 // Sections of code should not be commented out
+
+            // assert
+            wb.Worksheets.Should().HaveCount(1);
+            var ws = wb.Worksheet(1);
+            ws.Should().NotBeNull();
+
+            var expected = @"Examples.VariationOpportunity.ExcelNullFilter.xlsx";
+            using (var expectedStream = _extractor.ReadFileFromResourceToStream(expected))
+            using (var actualStream = new MemoryStream())
+            {
+                wb.SaveAs(actualStream);
+                actualStream.Compare(expectedStream, out var message).Should().BeTrue(message);
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetExcelWorkbookWithFramework(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var variationOpportunityService = new UVOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            var filters = new UVFilters()
+            {
+                CaseTypeGuids = new List<Guid>(),
+                CostDrivers = new List<string>(),
+                EntityIds = new List<string>(),
+                IdentifiedSavings = 0,
+                ServiceLineIds = new List<string>(),
+                ViewVisible = true,
+                ExcludeInitiatives = false,
+                OpportunitySearch = "",
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            };
+
+            try
+            {
+                // act
+                var taskResult =
+                    await variationOpportunityService.ExportAsync(new SortOptions(), filters, cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                }
+                else
+                {
+                    taskResult.Should().NotBeNull()
+                        .And.BeOfType<XLWorkbook>();
+                    var wb = taskResult;
+                    wb.Worksheets.Should().HaveCountGreaterThan(0);
+                    var ws = wb.Worksheet("Sheet1");
+                    ws.ColumnCount().Should().BeGreaterThan(0);
+                    ws.RowCount().Should().BeGreaterThan(0);
+                }
+            }
+            catch (TypeInitializationException tie)
+            {
+                tie.Should().BeOfType<TypeInitializationException>();
+            }
+            catch (AssertionException ae)
+            {
+                ae.Should().BeOfType<AssertionException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetFilterOptionsAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var variationOpportunityService = new UVOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                var taskResult = await variationOpportunityService
+                    .GetFilterOptionsAsync(new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                    return;
+                }
+                taskResult.Should()
+                    .BeOfType<UVFilterOptions>()
+                    .And.NotBeNull();
+                taskResult.CostDrivers.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty()
+                    .And.NotContain(cd => string.IsNullOrEmpty(cd.Id))
+                    .And.NotContain(cd => string.IsNullOrEmpty(cd.Text));
+                taskResult.CaseTypes.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty();
+                taskResult.Entities.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty();
+                taskResult.ServiceLines.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [Test]
+        public async Task TestSetHidden()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var variationOpportunity = framework.UVOpportunities.First(vo => !vo.IsHidden);
+            var explorationOpportunity = framework.UVOpportunities.Last();
+            var isVariationHidden = variationOpportunity.IsHidden;
+            var isExplorationHidden = explorationOpportunity.IsHidden;
+            var service = new UVOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            await service.SetHiddenAsync(variationOpportunity.OpportunityGuid, !isVariationHidden, CancellationToken.None);
+            await service.SetHiddenAsync(explorationOpportunity.OpportunityGuid, !isExplorationHidden, CancellationToken.None);
+
+            // assert
+            var dbContextUpdated = await framework.CreateDbContextAsync(CancellationToken.None);
+            var resultUV = dbContextUpdated.UtilizationVariationOpportunitiesData.SingleOrDefault(opp => opp.OpportunityGuid == variationOpportunity.OpportunityGuid);
+            var resultFE = dbContextUpdated.ExplorationVariationOpportunitiesData.SingleOrDefault(opp => opp.OpportunityGuid == explorationOpportunity.OpportunityGuid);
+            resultUV.IsHidden.Should().Be(!isVariationHidden);
+            resultFE.IsHidden.Should().Be(!isExplorationHidden);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var variationOpportunityService = new UVOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            try
+            {
+                var opportunities = variationOpportunityService.GetAllAsync(cancellationToken).Result;
+                var opportunity = opportunities.FirstOrDefault(o => o.IsHidden);
+                if (opportunity == null) return;
+                var isHidden = opportunity.IsHidden;

+

+                //act

+                await variationOpportunityService.SetHiddenAsync(opportunity.OpportunityGuid, !isHidden,

+                    cancellationToken);

+

+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;

+                var result = variationOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;

+                result.IsHidden.Should().Be(!isHidden);
+            }
+            catch (Exception e)
+            {
+                switch (e.GetType().Name)
+                {
+                    case "AggregateException":
+                    case "OperationCanceledException":
+                        return;
+                }
+                e.Should().NotBeOfType<Exception>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetHiddenAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.UVOpportunities.FirstOrDefault(o => o.IsHidden);
+            if (opportunity == null) return;
+            var isHidden = opportunity.IsHidden;
+            var variationOpportunityService = new UVOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                await variationOpportunityService.SetHiddenAsync(Guid.Empty, !isHidden,
+                    cancellationToken);
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var variationOpportunityService = new UVOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+            try
+            {
+                var opportunities = variationOpportunityService.GetAllAsync(cancellationToken).Result;
+
+                var opportunity = opportunities.FirstOrDefault(o => o.Note == string.Empty);
+
+                if (opportunity == null) return;
+
+                var note = "new test note";
+                // act
+                await variationOpportunityService.SetNoteAsync(opportunity.OpportunityGuid, note,
+                    CancellationToken.None);
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName)) return;
+                var result = variationOpportunityService.GetById(opportunity.OpportunityGuid, cancellationToken).Result;
+                result.Note.Should().Be(note);
+
+                // assert
+            }
+            catch (Exception e)
+            {
+                switch (e.GetType().Name)
+                {
+                    case "AggregateException":
+                    case "OperationCanceledException":
+                        return;
+                }
+                e.Should().NotBeOfType<Exception>();
+            }
+        }
+
+        [Test]
+        public async Task TestSetNote()
+        {
+            // arrange
+            var framework = new JazzEntityFrameworkFactory();
+            await framework.CreateDbContextAsync(CancellationToken.None);
+            var variationOpportunity = framework.UVOpportunities.First(vo => string.IsNullOrEmpty(vo.Note));
+            var explorationOpportunity = framework.UVOpportunities[5];
+            var variationNote = variationOpportunity.Note;
+            var explorationNote = explorationOpportunity.Note;
+            var expected = "Now is the time for all good engineers to write great code!";
+            var service = new UVOpportunityService(framework, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            await service.SetNoteAsync(variationOpportunity.OpportunityGuid, expected, CancellationToken.None);
+            await service.SetNoteAsync(explorationOpportunity.OpportunityGuid, expected, CancellationToken.None);
+
+            // assert
+            var dbContextUpdated = await framework.CreateDbContextAsync(CancellationToken.None);
+
+            var resultUV = dbContextUpdated.UtilizationVariationOpportunitiesData.SingleOrDefault(opp => opp.OpportunityGuid == variationOpportunity.OpportunityGuid);
+            var resultFE = dbContextUpdated.ExplorationVariationOpportunitiesData.SingleOrDefault(opp => opp.OpportunityGuid == explorationOpportunity.OpportunityGuid);
+
+
+            resultUV.Note.Should().NotBeNullOrEmpty()
+                .And.NotBe(variationNote)
+                .And.Be(expected);
+            resultFE.Note.Should().NotBeNullOrEmpty()
+                .And.NotBe(explorationNote)
+                .And.Be(expected);
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestSetNoteAsync_NoOpportunity(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var opportunity = jazzEntityFrameworkFactory.UVOpportunities.FirstOrDefault(o => o.Note == string.Empty);
+            if (opportunity == null) return;
+            var note = "new test note";
+            var variationOpportunityService = new UVOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            try
+            {
+                // act
+                await variationOpportunityService.SetNoteAsync(Guid.Empty, note, cancellationToken);
+
+                // assert
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        #region JazzDbService Tests
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetAllAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var variationOpportunityService = new UVOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var taskResult = await variationOpportunityService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty();
+            }
+        }
+
+        [Test]
+        public async Task TestGetAllAsync_Filtered()
+        {
+            // arrange
+            var factory = new JazzEntityFrameworkFactory();
+            var filters = factory.UVOpportunities;
+            var variationOpportunityService = new UVOpportunityService(factory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var taskResult = await variationOpportunityService.GetAllAsync(CancellationToken.None);
+
+            // assert
+            taskResult.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<UVOpportunity>()
+                .And.HaveCountGreaterThan(0)
+                .And.NotContain(o => string.IsNullOrEmpty(o.ToString()))
+                .And.Contain(o => filters.Select(f => f.OpportunityGuid).Contains(o.OpportunityGuid))
+                .And.Contain(o => filters.Select(f => f.CostDriver).Contains(o.CostDriver))
+                .And.Contain(o => filters.Select(f => f.ServiceLineName).Contains(o.ServiceLineName))
+                .And.Contain(o => filters.Select(f => f.ConfigurationGuid).Contains(o.ConfigurationGuid));
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetById(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var variationOpportunityService = new UVOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var tempResult = await variationOpportunityService.GetAllAsync(CancellationToken.None);
+            var taskResult =
+                await variationOpportunityService.GetById(tempResult.FirstOrDefault()?.OpportunityGuid ?? Guid.Empty, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNull();
+            }
+            else
+            {
+                taskResult.Should().NotBeNull()
+                    .And.BeOfType<UVOpportunity>();
+            }
+
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworks))]
+        public async Task TestGetByIds(JazzEntityFrameworkFactory jazzEntityFrameworkFactory)
+        {
+            // arrange
+            var variationOpportunityService = new UVOpportunityService(jazzEntityFrameworkFactory, null, null, _initiativeService, _updateFactOpportunitySavingsService);
+
+            // act
+            var tempResult = await variationOpportunityService.GetAllAsync(CancellationToken.None);
+            var ids = tempResult.Select(o => o.OpportunityGuid);
+            var taskResult = await variationOpportunityService.GetByIds(ids, CancellationToken.None);
+
+            // assert
+            if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+            {
+                taskResult.Should().BeNullOrEmpty();
+            }
+            else
+            {
+                taskResult.Should().NotBeNullOrEmpty()
+                    .And.AllBeOfType<UVOpportunity>();
+            }
+
+        }
+
+        #endregion
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            // Method intentionally left empty.
+        }
+
+        #region TestCaseData
+
+        public static IEnumerable<TestCaseData> GetFilterData()
+        {
+            yield return new TestCaseData(new UVFilters { ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("No Filters");
+            yield return new TestCaseData(new UVFilters { ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("View Visible");
+            yield return new TestCaseData(new UVFilters { ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Not View Visible");
+            yield return new TestCaseData(new UVFilters
+            { CaseTypeGuids = new[] { new Guid("c7838982-b2c6-4e93-a571-c1fd5cedc961") }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By Case Type GUID");
+            yield return new TestCaseData(new UVFilters { CostDrivers = new[] { "Cost Driver" }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By Cost Driver");
+            yield return new TestCaseData(new UVFilters { EntityIds = new[] { "1" }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Entity ID");
+            yield return new TestCaseData(new UVFilters { IdentifiedSavings = 1999, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings");
+            yield return new TestCaseData(new UVFilters { ServiceLineIds = new[] { "1" }, ViewVisible = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By Service Line");
+            yield return new TestCaseData(new UVFilters
+            { CaseTypeGuids = new[] { new Guid("c7838982-b2c6-4e93-a571-c1fd5cedc961") }, ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By Case Type GUID Not ViewVisible");
+            yield return new TestCaseData(
+                    new UVFilters { CostDrivers = new[] { "Cost Driver" }, ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") })
+                .SetName("By Cost Driver Not ViewVisible");
+            yield return new TestCaseData(new UVFilters { EntityIds = new[] { "1" }, ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Entity ID Not ViewVisible");
+            yield return new TestCaseData(new UVFilters { IdentifiedSavings = 999, ViewVisible = false, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName(
+                "By Identified Savings Not ViewVisible");
+            yield return new TestCaseData(new UVFilters { ServiceLineIds = new[] { "2" }, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345"), ViewVisible = false })
+                .SetName("By Service Line Not ViewVisible");
+            yield return new TestCaseData(new UVFilters { OpportunitySearch = "UV - 123", ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Search By Id");
+            yield return new TestCaseData(new UVFilters { ExcludeInitiatives = true, ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") }).SetName("Exclude Opportunities with Initiatives");
+        }
+
+        public static IEnumerable<TestCaseData> GetFrameworkWithFilterData()
+        {
+            var testCases = GetFilterData().ToList();
+            var jeffs = JazzEntityFrameworkFactory.GetFrameworksWithCancellation()
+                .Select(tcd => tcd.Arguments);
+            foreach (var tcd in jeffs)
+            {
+                var jeff = (JazzEntityFrameworkFactory)tcd[0];
+                var ct = (CancellationToken)tcd[1];
+                foreach (var testCase in testCases)
+                {
+                    yield return new TestCaseData(jeff, testCase.Arguments.GetValue(0), ct)
+                        .SetName($"{testCase.TestName} {(string.IsNullOrEmpty(jeff.TestName) ? "w/o Jeff" : "w/Jeff")}")
+                        .SetCategory(jeff.TestName);
+                }
+
+                var serviceLineId = jeff.UVOpportunities.FirstOrDefault(o => !o.IsHidden)?.ServiceLineId ?? 0;
+                if (string.IsNullOrEmpty(jeff.TestName))
+                {
+                    yield return new TestCaseData(jeff,
+                            new UVFilters { ServiceLineIds = new[] { serviceLineId.ToString() }, ViewVisible = false }, ct)
+                        .SetName("By Service Line Not ViewVisible w/o Jeff");
+                }
+                else
+                {
+                    yield return new TestCaseData(jeff,
+                            new UVFilters { ServiceLineIds = new[] { serviceLineId.ToString() }, ViewVisible = false }, ct)
+                        .SetName("By Service Line Not ViewVisible w/Jeff")
+                        .Ignore("This test is broken");
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/UtilizationVariation/UVCaseType/UVCaseTypeServiceTest.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/UtilizationVariation/UVCaseType/UVCaseTypeServiceTest.cs
new file mode 100644
index 0000000..f93342c
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/UtilizationVariation/UVCaseType/UVCaseTypeServiceTest.cs
@@ -0,0 +1,364 @@
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.Filter;
+using Strata.ContinuousImprovement.Biz.Pagination;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.Opportunities.Filters;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes.Filters;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit.UtilizationVariation.UVCaseType
+{
+    [TestFixture, Category("Unit")]
+    public class UVCaseTypeServiceTest
+    {
+
+        private Mock<IUVCaseTypeService> _variationCaseTypeServiceMock;
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _variationCaseTypeServiceMock = new Mock<IUVCaseTypeService>();
+        }
+
+        [TestCaseSource(nameof(GetFrameworkWithFilterCaseTypeData))]
+        public async Task TestGetPagedAsyncWithFramework(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, UVCaseTypeFilters filters, CancellationToken cancellationToken)
+        {
+            // arrange
+            var VariationCaseTypeService = new UVCaseTypeService(jazzEntityFrameworkFactory, null, null);
+
+            try
+            {
+                // act
+                var taskResult = await VariationCaseTypeService
+                    .GetPagedAsync(new PagingOptions(), filters, cancellationToken);
+
+                // assert
+                var result = taskResult.Data;
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    result.Should().BeNullOrEmpty();
+                    return;
+                }
+                result.Should()
+                    .NotBeNullOrEmpty()
+                    .And.AllBeOfType<Biz.UtilizationVariation.VariationCaseTypes.UVCaseType>();
+            }
+            catch (Exception e)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                    e.Should().BeOfType<OperationCanceledException>();
+            }
+
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Asc()
+        {
+            // arrange
+            var VariationCaseTypeService = new UVCaseTypeService(new JazzEntityFrameworkFactory(), null, null);

+            var filtersData = new UVCaseTypeFilters() { ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") };
+            var pagingOptions = new PagingOptions() { SortField = "CaseTypeName", SortOrder = SortOrder.Asc };
+
+            // act
+            var taskResult = await VariationCaseTypeService
+                .GetPagedAsync(pagingOptions, filtersData, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<Biz.UtilizationVariation.VariationCaseTypes.UVCaseType>()
+                .And.HaveCountGreaterThan(1);
+            //taskResult.Data.First().Cases
+            //    .Should().BeLessThan(taskResult.Data.Last().Cases);
+        }
+
+        [Test]
+        public async Task TestFirstPage_Sorted_Desc()
+        {
+            // arrange
+            var VariationCaseTypeService = new UVCaseTypeService(new JazzEntityFrameworkFactory(), null, null);
+
+            var filtersData = new UVCaseTypeFilters() { ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345") };
+            var pagingOptions = new PagingOptions() { SortField = "CaseTypeName", SortOrder = SortOrder.Desc };
+
+            // act
+            var taskResult = await VariationCaseTypeService
+                .GetPagedAsync(pagingOptions, filtersData, CancellationToken.None);
+
+            // assert
+            taskResult.Data.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<Biz.UtilizationVariation.VariationCaseTypes.UVCaseType>()
+                .And.HaveCountGreaterThan(1);
+            //taskResult.Data.First().Cases
+            //    .Should().BeGreaterThan(taskResult.Data.Last().Cases);
+        }
+
+        [TestCaseSource(nameof(GetFilterData))]
+        public void TestValidateFilters(UVFilters filters)
+        {
+            if (filters == null) return;
+            if (filters.CaseTypeGuids.Any())
+                filters.CaseTypeGuids.Should()
+                    .AllBeOfType<Guid>()
+                    .And.NotBeEmpty();
+            if (filters.EntityIds.Any())
+                filters.EntityIds.Should()
+                    .AllBeOfType<string>();
+            if (filters.ServiceLineIds.Any())
+                filters.ServiceLineIds.Should()
+                    .AllBeOfType<string>();
+            if (filters.CostDrivers.Any())
+                filters.CostDrivers.Should()
+                    .AllBeOfType<string>();
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetFilterOptionsAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var variationOpportunityService = new UVCaseTypeService(jazzEntityFrameworkFactory, null, null);
+
+            try
+            {
+                // act
+                var taskResult = await variationOpportunityService
+                    .GetFilterOptionsAsync(jazzEntityFrameworkFactory.UVCaseTypes.First().ConfigurationGuid, cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                    return;
+                }
+                taskResult.Should()
+                    .BeOfType<UVFilterOptions>()
+                    .And.NotBeNull();
+                taskResult.CaseTypes.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty();
+                taskResult.ServiceLines.Should().AllBeOfType<FilterMember>().And.NotBeNullOrEmpty();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        #region JazzDbService Tests
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetAllAsync(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var VariationCaseTypeService = new UVCaseTypeService(jazzEntityFrameworkFactory, null, null);
+
+            try
+            {
+                // act
+                var taskResult = await VariationCaseTypeService.GetAllAsync(cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNullOrEmpty();
+                }
+                else
+                {
+                    taskResult.Should().NotBeNullOrEmpty()
+                        .And.AllBeOfType<Biz.UtilizationVariation.VariationCaseTypes.UVCaseType>()
+                        .And.HaveCountGreaterThan(0)
+                        .And.NotContain(o => string.IsNullOrEmpty(o.ToString()));
+                }
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetById(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var VariationCaseTypeService = new UVCaseTypeService(jazzEntityFrameworkFactory, null, null);
+            var tempResult = await VariationCaseTypeService.GetAllAsync(CancellationToken.None);
+
+            try
+            {
+                // act
+                var taskResult =
+                    await VariationCaseTypeService.GetById(tempResult.FirstOrDefault()?.CaseTypeId ?? 0, cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNull();
+                }
+                else
+                {
+                    taskResult.Should().NotBeNull()
+                        .And.BeOfType<Biz.UtilizationVariation.VariationCaseTypes.UVCaseType>();
+                }
+            }
+            catch (InvalidOperationException ioe)
+            {
+                ioe.Should().BeOfType<InvalidOperationException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        [TestCaseSource(typeof(JazzEntityFrameworkFactory), nameof(JazzEntityFrameworkFactory.GetFrameworksWithCancellation))]
+        public async Task TestGetByIds(JazzEntityFrameworkFactory jazzEntityFrameworkFactory, CancellationToken cancellationToken)
+        {
+            // arrange
+            var VariationCaseTypeService = new UVCaseTypeService(jazzEntityFrameworkFactory, null, null);
+            var tempResult = await VariationCaseTypeService.GetAllAsync(CancellationToken.None);
+            var ids = tempResult.Select(o => o.CaseTypeId);
+
+            try
+            {
+                // act
+                var taskResult = await VariationCaseTypeService.GetByIds(ids, cancellationToken);
+
+                // assert
+                if (string.IsNullOrEmpty(jazzEntityFrameworkFactory.TestName))
+                {
+                    taskResult.Should().BeNullOrEmpty();
+                }
+                else
+                {
+                    taskResult.Should().NotBeNullOrEmpty()
+                        .And.AllBeOfType<Biz.UtilizationVariation.VariationCaseTypes.UVCaseType>();
+                }
+            }
+            catch (InvalidOperationException ioe)
+            {
+                ioe.Should().BeOfType<InvalidOperationException>();
+            }
+            catch (Exception e)
+            {
+                e.Should().BeOfType<OperationCanceledException>();
+            }
+        }
+
+        #endregion
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            // Method intentionally left empty.
+        }
+
+        #region TestCaseData
+
+        public static IEnumerable<TestCaseData> GetFilterData()
+        {
+            yield return new TestCaseData(new UVFilters
+            {
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            }).SetName("No Filters");
+            yield return new TestCaseData(new UVFilters
+            {
+                CaseTypeGuids = new[] { new Guid("c7838982-b2c6-4e93-a571-c1fd5cedc961") },
+                ViewVisible = true,
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            }).SetName("By Case Type GUID");
+            yield return new TestCaseData(new UVFilters
+            {
+                IdentifiedSavings = 1999,
+                ViewVisible = true,
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            }).SetName("By Identified Savings");
+            yield return new TestCaseData(new UVFilters
+            {
+                ServiceLineIds = new[] { "1" },
+                ViewVisible = true,
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            }).SetName("By Service Line");
+        }
+
+        public static IEnumerable<TestCaseData> GetFilterCaseTypeData()
+        {
+            yield return new TestCaseData(new UVCaseTypeFilters
+            {
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            }).SetName("No Filters");
+            yield return new TestCaseData(new UVCaseTypeFilters
+            {
+                CaseTypeGuids = new[] { new Guid("c7838982-b2c6-4e93-a571-c1fd5cedc961") },
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            }).SetName("By Case Type GUID");
+            yield return new TestCaseData(new UVCaseTypeFilters
+            {
+                IdentifiedSavings = 1999,
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            }).SetName("By Identified Savings");
+            yield return new TestCaseData(new UVCaseTypeFilters
+            {
+                ServiceLineIds = new[] { "1" },
+                ConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345")
+            }).SetName("By Service Line");
+        }
+
+        public static IEnumerable<TestCaseData> GetFrameworkWithFilterData()
+        {
+            var testCases = GetFilterData().ToList();
+            var jeffs = JazzEntityFrameworkFactory.GetFrameworksWithCancellation()
+                .Select(tcd => tcd.Arguments);
+            foreach (var tcd in jeffs)
+            {
+                var jeff = (JazzEntityFrameworkFactory)tcd[0];
+                var ct = (CancellationToken)tcd[1];
+                foreach (var testCase in testCases)
+                {
+                    yield return new TestCaseData(jeff, testCase.Arguments.GetValue(0), ct)
+                        .SetName($"{testCase.TestName} {(string.IsNullOrEmpty(jeff.TestName) ? "w/o Jeff" : "w/Jeff")}")
+                        .SetCategory(jeff.TestName);
+                }
+
+                var serviceLineId = jeff.UVOpportunities.FirstOrDefault(o => !o.IsHidden)?.ServiceLineId ?? 0;
+                if (string.IsNullOrEmpty(jeff.TestName))
+                {
+                    yield return new TestCaseData(jeff,
+                            new UVFilters { ServiceLineIds = new[] { serviceLineId.ToString() }, ViewVisible = false }, ct)
+                        .SetName("By Service Line Not ViewVisible w/o Jeff");
+                }
+                else
+                {
+                    yield return new TestCaseData(jeff,
+                            new UVFilters { ServiceLineIds = new[] { serviceLineId.ToString() }, ViewVisible = false }, ct)
+                        .SetName("By Service Line Not ViewVisible w/Jeff")
+                        .Ignore("This test is broken");
+                }
+            }
+        }
+
+        public static IEnumerable<TestCaseData> GetFrameworkWithFilterCaseTypeData()
+        {
+            var testCases = GetFilterCaseTypeData().ToList();
+            var jeffs = JazzEntityFrameworkFactory.GetFrameworksWithCancellation()
+                .Select(tcd => tcd.Arguments);
+            foreach (var tcd in jeffs)
+            {
+                var jeff = (JazzEntityFrameworkFactory)tcd[0];
+                var ct = (CancellationToken)tcd[1];
+                foreach (var testCase in testCases)
+                {
+                    yield return new TestCaseData(jeff, testCase.Arguments.GetValue(0), ct)
+                        .SetName($"{testCase.TestName} {(string.IsNullOrEmpty(jeff.TestName) ? "w/o Jeff" : "w/Jeff")}")
+                        .SetCategory(jeff.TestName);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/VerifyChecksTests.cs b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/VerifyChecksTests.cs
new file mode 100644
index 0000000..988911a
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/VerifyChecksTests.cs
@@ -0,0 +1,14 @@
+using NUnit.Framework;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.ContinuousImprovement.Biz.Test.Unit
+{
+    [TestFixture]
+    public class VerifyChecksTests
+    {
+        [Test]
+        public Task Run() =>
+            VerifyChecks.Run();
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Biz.Test.Unit/runtimeconfig.template.json b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/runtimeconfig.template.json
new file mode 100644
index 0000000..9cbaf60
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Biz.Test.Unit/runtimeconfig.template.json
@@ -0,0 +1,5 @@
+{
+  "configProperties": {
+    "System.Drawing.EnableUnixSupport":  true
+  }
+}
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Integration/Models/ConfigurationInfo.cs b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Models/ConfigurationInfo.cs
new file mode 100644
index 0000000..dc88b1c
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Models/ConfigurationInfo.cs
@@ -0,0 +1,24 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Client.Test.Integration.Models
+{
+    public class ConfigurationInfo
+    {
+        public Guid ConfigurationGuid { get; set; }
+        public string Name { get; set; }
+        public byte DisplayOrder { get; set; }
+        public Guid ServiceLineDimensionGuid { get; set; }
+        [JsonPropertyName("entityIdsCSV")]
+        public string EntityIdsCsv { get; set; }
+        public bool IsUsingIndirectCost { get; set; }
+        public string DepartmentRollupGlobalId { get; set; }
+        public bool IsUsingCustomEntityDimension => !string.IsNullOrEmpty(DepartmentRollupGlobalId);
+        [JsonPropertyName("customEntityIdsCSV")]
+        public string CustomEntityIdsCsv { get; set; }
+        [JsonPropertyName("fiscalYearID")]
+        public short FiscalYearId { get; set; }
+        public DateTime OrgDefinedEndDate { get; set; }
+        public DateTime OrgDefinedTrackingCurrentMonth { get; set; }
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Integration/Models/Mappers/MapperlyConfigurationInfo.cs b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Models/Mappers/MapperlyConfigurationInfo.cs
new file mode 100644
index 0000000..dce87c8
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Models/Mappers/MapperlyConfigurationInfo.cs
@@ -0,0 +1,27 @@
+using Riok.Mapperly.Abstractions;
+
+namespace Strata.ContinuousImprovement.Client.Test.Integration.Models
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class MapperlyConfigurationInfo
+    {
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.ConfiguredEntityIds))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.FiscalMonthResolver))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.LastFiscalYearEndDate))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.LastFiscalYearStartDate))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.OrgDefinedTrackingEndDate))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.OrgDefinedTrackingStartDate))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.QualityVariationEndDate))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.QualityVariationIsUsingAPRDRG))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.QVIOpportunityBreakdown))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.QVIOpportunityBreakdownEnum))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.QVIOpportunityBreakdownName))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.QVIOpportunityBreakdownNamePlural))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.VariationEndDate))]
+        [MapperIgnoreSource(nameof(Biz.Configuration.Configuration.VariationTrackingCurrentMonth))]
+        [MapProperty(nameof(Biz.Configuration.Configuration.EntityIdsCSV), nameof(ConfigurationInfo.EntityIdsCsv))]
+        [MapProperty(nameof(Biz.Configuration.Configuration.CustomEntityIdsCSV), nameof(ConfigurationInfo.CustomEntityIdsCsv))]
+        [MapProperty(nameof(Biz.Configuration.Configuration.FiscalYearID), nameof(ConfigurationInfo.FiscalYearId))]
+        public static partial ConfigurationInfo Mapped(this Biz.Configuration.Configuration src);
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Integration/Setup/ClientIntegrationTestFixture.cs b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Setup/ClientIntegrationTestFixture.cs
new file mode 100644
index 0000000..2dae7b1
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Setup/ClientIntegrationTestFixture.cs
@@ -0,0 +1,38 @@
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Client.Test.Integration.Setup;
+using Strata.ContinuousImprovement.Client.Test.Integration.Tests;
+using System.Diagnostics.CodeAnalysis;
+
+[ExcludeFromCodeCoverage]
+[SetUpFixture]
+public class ClientIntegrationTestFixture
+{
+    [OneTimeSetUp]
+    public virtual async Task SetDbContextAndServices()
+    {
+#if DEBUG
+        //When running locally sets the profile to the CI profile so you have access to resources
+        Environment.SetEnvironmentVariable("AWS_Profile", "sdt-continuous-improvement-service-role");
+#endif
+        var clientService = new ClientServiceBase();
+        await clientService.ClientValidation();
+        var services = ServiceCollectionFactory.Create();
+        await services.SetupServiceProperties(clientService.StrataId);
+    }
+
+    [OneTimeTearDown]
+    public async Task TearDown()
+    {
+        try
+        {
+            var centralDbContext = ServiceProperties.CentralDbContext as CentralDbContext;
+            if (centralDbContext == null) { return; }
+            _ = await centralDbContext.Database.EnsureDeletedAsync(CancellationToken.None);
+        }
+        catch (Exception ex)
+        {
+            throw;
+        }
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Integration/Setup/ServiceCollectionFactory.cs b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Setup/ServiceCollectionFactory.cs
new file mode 100644
index 0000000..c6f6047
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Setup/ServiceCollectionFactory.cs
@@ -0,0 +1,52 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Strata.ApiLib.Core.Cors.Extensions;
+using Strata.ApiLib.Core.StrataAuthentication.Bootstrappers;
+using Strata.Configuration.Client.DependencyInjection.ConsoleApps;
+using Strata.ContinuousImprovement.Biz.Configurations;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Client.Test.Integration.Setup
+{
+    [ExcludeFromCodeCoverage]
+    public static class ServiceCollectionFactory
+    {
+        // dev master
+        private static readonly Guid DevMasterDatabase = new("54409f55-5ddf-4748-8222-9ccfb04fb4f5");
+        private static readonly Guid SeleniumAutomationDatabase = new("6bcd9090-3446-4cc1-b1aa-38afae76a1c6");
+        private static readonly Guid SeleniumAutomationRefreshed4Master = new("feb7a099-8b2a-436c-9aba-0f853c8c60c9");
+        private static readonly string IntegrationTesting = $"ci_client_{DateTime.Now:yyyyMMdd}_{Guid.NewGuid():N}";
+
+        public static IServiceCollection Create()
+        {
+            var services = new ServiceCollection();
+            var jazzDbGuid = Debugger.IsAttached ? SeleniumAutomationRefreshed4Master : SeleniumAutomationDatabase;
+            // for now, though
+            jazzDbGuid = DevMasterDatabase;
+            try
+            {
+                var configuration = StrataConfigurationFactory.GetConfiguration();
+                services.AddSingleton(configuration);
+                services.AddStrataAuthentication(configuration);
+                services.AddStrataCors(configuration);
+                services.AddContinuousImprovementServices(configuration, IntegrationTesting);
+                services.AddAsyncDbContextFactory<JazzDbContext>(options =>
+                {
+                    options
+                        .WithConnectionString((provider, token) => provider.GetConnectionStringFromSmc(jazzDbGuid, token))
+                        .WithDbContextOptions((connectionString, provider, builder) =>
+                            builder.UseSqlServer(connectionString, options => { options.CommandTimeout(300); }));
+                });
+                services.AddLogging();
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+            return services;
+        }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Integration/Setup/ServiceProperties.cs b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Setup/ServiceProperties.cs
new file mode 100644
index 0000000..9348288
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Setup/ServiceProperties.cs
@@ -0,0 +1,138 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Strata.Analytics.Client;
+using Strata.Analytics.Models.Workbooks;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+
+namespace Strata.ContinuousImprovement.Client.Test.Integration.Setup
+{
+    public static class ServiceProperties
+    {
+        // dev master
+        internal static readonly Guid DatabaseGuid = new("54409f55-5ddf-4748-8222-9ccfb04fb4f5");
+
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+        public static IContinuousImprovementService ContinuousImprovementService { get; set; }
+        public static ICentralDbContext CentralDbContext { get; set; }
+        public static JazzEntityFrameworkFactory JazzConnBuilderFactory { get; set; }
+        public static IJazzDbContext JazzDbContext { get; set; }
+        public static ISnowflakeDatabaseContext SnowflakeDatabaseContext { get; set; }
+        public static IServiceCollection Services { get; set; }
+        public static IServiceProvider ServiceProvider { get; set; }
+        public static IAnalyticsService AnalyticsService { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+
+        private static int WorkbookId = 9;
+
+        public static async Task SetupServiceProperties(this IServiceCollection services, int strataId = 0)
+        {
+            Services = services;
+            var serviceProvider = services.BuildServiceProvider();
+            ServiceProvider = serviceProvider;
+
+            try
+            {
+                var sfConnBuilderFactory = serviceProvider.GetRequiredService<ISnowflakeDatabaseContextFactory>();
+                SnowflakeDatabaseContext = sfConnBuilderFactory.Create($"{DatabaseGuid:N}");
+            }
+            catch (Exception)
+            {
+                // ILB
+            }
+
+            try
+            {
+                var jazzConnBuilderFactory = serviceProvider.GetRequiredService<IAsyncDbContextFactory<JazzDbContext>>();
+                JazzDbContext = await jazzConnBuilderFactory.CreateDbContextAsync(CancellationToken.None);
+            }
+            catch (Exception)
+            {
+                // ILB
+            }
+
+            await BuildPostgresDb(strataId);
+
+            BuildAnalyticsService(strataId);
+        }
+
+        private static async Task BuildPostgresDb(int strataId)
+        {
+            try
+            {
+                CentralDbContext = ServiceProvider.GetService<CentralDbContext>() as CentralDbContext
+                    ?? throw new NullReferenceException(nameof(CentralDbContext));
+                var centralDbContext = CentralDbContext as CentralDbContext;
+                if (centralDbContext == null) { throw new NullReferenceException(nameof(centralDbContext)); }
+
+                await centralDbContext.Database.MigrateAsync(CancellationToken.None);
+                JazzConnBuilderFactory = new JazzEntityFrameworkFactory();
+                await JazzConnBuilderFactory.EnsureCreatedAsync(centralDbContext, JazzDbContext, CancellationToken.None);
+                var workbook = new OpportunityWorkbook
+                {
+                    StrataId = strataId,
+                    WorkbookId = WorkbookId,
+                    OpportunityGuid = Guid.NewGuid(),
+                    Name = "Test",
+                };
+                Assert.That(centralDbContext, Is.Not.Null);
+                await centralDbContext.OpportunityWorkbooks.AddAsync(workbook, CancellationToken.None);
+
+                var oppTypeWorkbook = new OpportunityTypeWorkbook
+                {
+                    StrataId = strataId,
+                    WorkbookId = WorkbookId,
+                    OpportunityType = (int)OpportunityTypes.ChargeCode,
+                    Name = "Test",
+                };
+                Assert.That(centralDbContext, Is.Not.Null);
+                await centralDbContext.OpportunityTypeWorkbooks.AddAsync(oppTypeWorkbook, CancellationToken.None);
+
+                await centralDbContext.SaveChangesAsync(CancellationToken.None);
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+        }
+
+        private static void BuildAnalyticsService(int strataId)
+        {
+            var analyticsService = Mock.Of<IAnalyticsService>();
+            var workbook = new Workbook
+            {
+                Name = "Test",
+                WorkbookId = WorkbookId,
+                IsHidden = false,
+                StrataId = strataId,
+            };
+            var workbooks = new List<Workbook> { workbook };
+            workbooks.AddRange(Enumerable.Range(1, 1000).Where(i => i != WorkbookId).Select(i => new Workbook
+            {
+                Name = $"Test {i}",
+                WorkbookId = i,
+                IsHidden = (i % 2 == 0),
+                StrataId = (i % 3 == 0) ? 9 : strataId,
+            }));
+            //GetWorkbooksAsync
+            Mock.Get(analyticsService)
+                .Setup(s => s.GetWorkbookAsync(It.IsAny<int>(), It.IsAny<CancellationToken>()))
+                .Returns<int, CancellationToken>((id, token)
+                    => Task.FromResult(id == WorkbookId ? workbook : null));
+            Mock.Get(analyticsService)
+                .Setup(s => s.GetWorkbooksAsync(It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                .Returns<bool, CancellationToken>((isHidden, token)
+                    => Task.FromResult(workbooks.Where(w => w.IsHidden == isHidden)));
+            AnalyticsService = analyticsService;
+        }
+
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Integration/Setup/VaultResponse.cs b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Setup/VaultResponse.cs
new file mode 100644
index 0000000..710e6ca
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Setup/VaultResponse.cs
@@ -0,0 +1,8 @@
+namespace Strata.ContinuousImprovement.Client.Test.Integration.Setup
+{
+    public class VaultResponse
+    {
+        public string Password { get; set; }
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Integration/Strata.ContinuousImprovement.Client.Test.Integration.csproj b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Strata.ContinuousImprovement.Client.Test.Integration.csproj
new file mode 100644
index 0000000..ef8ae8e
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Strata.ContinuousImprovement.Client.Test.Integration.csproj
@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.7.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageReference Include="Strata.ApiLib.Core" Version="8.4.1" />
+    <PackageReference Include="Strata.Configuration.Client" Version="9.15.1" />
+    <PackageReference Include="Strata.SnowflakeLib" Version="4.3.0" />
+    <PackageReference Include="Strata.SqlTools.EntityFramework" Version="6.0.3" />
+    <PackageReference Include="Verify.NUnit" Version="29.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Strata.ContinuousImprovement.Biz\Strata.ContinuousImprovement.Biz.csproj" />
+    <ProjectReference Include="..\..\src\Strata.DecisionSupport.Models\Strata.DecisionSupport.Models.csproj" />
+    <ProjectReference Include="..\Strata.DecisionSupport.Biz.Test.Integration\Strata.DecisionSupport.Biz.Test.Integration.csproj" />
+    <ProjectReference Include="..\Strata.ContinuousImprovement.JazzEntityFrameworkStub\Strata.ContinuousImprovement.JazzEntityFrameworkStub.csproj" />
+    <ProjectReference Include="..\..\src\Strata.ContinuousImprovement.Client\Strata.ContinuousImprovement.Client.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/ClientServiceBase.cs b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/ClientServiceBase.cs
new file mode 100644
index 0000000..2f555ac
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/ClientServiceBase.cs
@@ -0,0 +1,183 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.OpportunityTypeWorkbooks;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Client.Test.Integration.Models;
+using Strata.ContinuousImprovement.Client.Test.Integration.Setup;
+using Strata.CoreLib.Claims;
+using Strata.CoreLib.Claims.Extensions;
+using System.IdentityModel.Tokens.Jwt;
+using System.Net.Http.Headers;
+using System.Security.Claims;
+using System.Text.Json;
+
+namespace Strata.ContinuousImprovement.Client.Test.Integration.Tests
+{
+    public class ClientServiceBase
+    {
+        protected StrataTokenInfo StrataTokenInfo { get; set; }
+        protected string AccessToken { get; set; }
+        protected IEnumerable<Claim> Claims { get; set; }
+        protected long ExpiresIn { get; set; }
+        protected ClaimsIdentity ClaimsIdentity { get; set; }
+        protected ClaimsPrincipal ClaimsPrincipal { get; set; }
+        internal IClaimsPrincipalAccessor ClaimsPrincipalAccessor { get; set; }
+        internal int StrataId { get; set; }
+        internal Guid DatabaseGuid { get; set; }
+
+        protected readonly string BaseAddress = "https://continuousimprovement-api.dev.stratanetwork.net/";
+        public IContinuousImprovementService ContinuousImprovementService { get; set; }
+        public JazzDbContext JazzDbContext { get; set; }
+        public CentralDbContext CentralDbContext { get; set; }
+        public IOpportunityWorkbookService OpportunityWorkbookService { get; set; }
+#pragma warning disable NUnit1032 // An IDisposable field/property should be Disposed in a TearDown method
+        public IServiceProvider ServiceProvider { get; set; }
+#pragma warning restore NUnit1032 // An IDisposable field/property should be Disposed in a TearDown method
+
+        public OpportunityWorkbook OpportunityWorkbook { get; set; }
+        public OpportunityTypeWorkbook OpportunityTypeWorkbook { get; set; }
+
+        [OneTimeSetUp]
+        public async Task TestSetup()
+        {
+            ServiceProvider = ServiceProperties.ServiceProvider;
+            await ClientValidation();
+            var httpClient = new HttpClient
+            {
+                BaseAddress = new Uri(BaseAddress)
+            };
+            httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+            httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken);
+            ContinuousImprovementService = new ContinuousImprovementService(httpClient);
+            ServiceProperties.ContinuousImprovementService = ContinuousImprovementService;
+            CentralDbContext = (CentralDbContext)ServiceProperties.CentralDbContext;
+            JazzDbContext = (JazzDbContext)ServiceProperties.JazzDbContext;
+            await ReplaceOpportunitWorkbookService();
+        }
+
+        [OneTimeTearDown]
+        public async Task TestTearDown()
+        {
+            ((ServiceProvider)ServiceProvider).Dispose();
+        }
+
+        private async Task ReplaceOpportunitWorkbookService()
+        {
+            var claimsAccessor = Mock.Of<IClaimsPrincipalAccessor>();
+            Mock.Get(claimsAccessor)
+                .Setup(s => s.GetCurrentClaimsPrincipal())
+                .Returns(ClaimsPrincipal);
+            var analyticsService = ServiceProperties.AnalyticsService;
+            OpportunityWorkbookService = new OpportunityWorkbookService(CentralDbContext, analyticsService, claimsAccessor, Mock.Of<ILogger<OpportunityWorkbookService>>());
+            var services = ServiceProperties.Services;
+            var descriptor = services.FirstOrDefault(d => d.ServiceType == typeof(IOpportunityWorkbookService));
+            if (descriptor != null)
+            {
+                services.Remove(descriptor);
+                services.AddScoped<IOpportunityWorkbookService, OpportunityWorkbookService>();
+                ServiceProvider = services.BuildServiceProvider();
+            }
+            OpportunityWorkbook = await CentralDbContext.OpportunityWorkbooks.FirstOrDefaultAsync(CancellationToken.None);
+            OpportunityTypeWorkbook = await CentralDbContext.OpportunityTypeWorkbooks.FirstOrDefaultAsync(CancellationToken.None);
+        }
+
+        #region Client Claims Validation
+
+        public async Task<string> ClientValidation()
+        {
+            var UserInfo = new
+            {
+                vaultUserName = "ccicostleader", // vault ccicostleader is same as jazz ccicostleader
+                userName = "ccicostleader",
+                fullName = "Administrator, CCI"
+            };
+            var vaultPassword = await GetUserPassword(UserInfo.vaultUserName);
+            var bearerToken = await GetBearerToken(UserInfo.userName, vaultPassword);
+            ClaimsIdentity = new ClaimsIdentity(Claims);
+            ClaimsPrincipal = new ClaimsPrincipal(ClaimsIdentity);
+            StrataId = ClaimsPrincipal.GetStrataId();
+            DatabaseGuid = ClaimsPrincipal.GetDatabaseGuid();
+            BuildClaimsPrincipalAccessor();
+            return bearerToken;
+        }
+
+        internal async Task<string> GetUserPassword(string vaultUserName)
+        {
+            var client = new HttpClient
+            {
+                BaseAddress = new Uri("https://vault.sdt.local/")
+            };
+            client.DefaultRequestHeaders.Add("apiKey", "a69d2e478c3f5b395b687ecdf34a3239");
+            client.DefaultRequestHeaders.Add("ignoreHTTPSErrors", "true");
+            var vaultResponse = await client.GetAsync($"api/searchpasswords/122?title={vaultUserName}");
+            vaultResponse.EnsureSuccessStatusCode();
+            string responseString = await vaultResponse.Content.ReadAsStringAsync();
+            if (string.IsNullOrEmpty(responseString)) { return string.Empty; }
+            var jsonResponse = JsonSerializer.Deserialize<IEnumerable<VaultResponse>>(responseString);
+            if (jsonResponse == null) { return string.Empty; }
+            var vaultUserInfo = jsonResponse.First();
+            client.Dispose();
+            return vaultUserInfo.Password;
+        }
+
+        internal async Task<string> GetBearerToken(string userName, string password)
+        {
+            var form = BuildTokenRequest(userName, password);
+            var client = new HttpClient();
+            var response = await client.PostAsync("https://identity.dev.stratanetwork.net/connect/token", form);
+            response.EnsureSuccessStatusCode();
+            var responseString = await response.Content.ReadAsStringAsync();
+            if (string.IsNullOrEmpty(responseString)) { return string.Empty; }
+            var strataTokenInfo = JsonSerializer.Deserialize<StrataTokenInfo>(responseString);
+            if (strataTokenInfo == null) { return string.Empty; }
+            StrataTokenInfo = strataTokenInfo;
+            AccessToken = strataTokenInfo.AccessToken;
+            ExpiresIn = strataTokenInfo.ExpiresIn;
+            var handler = new JwtSecurityTokenHandler();
+            var jwtToken = handler.ReadJwtToken(AccessToken);
+            Claims = jwtToken.Claims;
+            client.Dispose();
+            return AccessToken;
+        }
+
+        internal FormUrlEncodedContent BuildTokenRequest(string userName, string password)
+        {
+            var form = new FormUrlEncodedContent(
+            [
+                new KeyValuePair<string, string>("database_guid", ServiceProperties.DatabaseGuid.ToString()),
+                new KeyValuePair<string, string>("grant_type", "password"),
+                new KeyValuePair<string, string>("username", userName),
+                new KeyValuePair<string, string>("password", password),
+                new KeyValuePair<string, string>("scope", "strata.api.external offline_access"),
+                new KeyValuePair<string, string>("client_id", "IntegrationTest"),
+                new KeyValuePair<string, string>("client_secret", "UhAEQsGByTCrwPdHPLmaet_DmLEfcJVbZqGBxArdeRup_TPLrYKNpUNRHejjdnhd")
+            ]);
+            return form;
+        }
+
+        internal void BuildClaimsPrincipalAccessor()
+        {
+            var claimsAccessor = Mock.Of<IClaimsPrincipalAccessor>();
+            Mock.Get(claimsAccessor)
+                        .Setup(s => s.GetCurrentClaimsPrincipal())
+                        .Returns(ClaimsPrincipal);
+            ClaimsPrincipalAccessor = claimsAccessor;
+        }
+
+        #endregion
+
+        #region Helper Methods
+
+        protected async Task<IEnumerable<ConfigurationInfo>> GetConfigurationsAsync(CancellationToken cancellationToken)
+        {
+            var configurations = await JazzDbContext.Configurations.ToListAsync(cancellationToken);
+            return configurations.Select(c => c.Mapped());
+        }
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/StrataTokenInfo.cs b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/StrataTokenInfo.cs
new file mode 100644
index 0000000..37ee245
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/StrataTokenInfo.cs
@@ -0,0 +1,16 @@
+using System.Text.Json.Serialization;
+
+namespace Strata.ContinuousImprovement.Client.Test.Integration.Tests
+{
+    public class StrataTokenInfo
+    {
+        [JsonPropertyName("access_token")]
+        public required string AccessToken { get; set; }
+        [JsonPropertyName("token_type")]
+        public required string TokenType { get; set; }
+        [JsonPropertyName("expires_in")]
+        public required long ExpiresIn { get; set; }
+        [JsonPropertyName("refresh_token")]
+        public required string RefreshToken { get; set; }
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/TestContinuousImprovementClient.cs b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/TestContinuousImprovementClient.cs
new file mode 100644
index 0000000..50e4c28
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/TestContinuousImprovementClient.cs
@@ -0,0 +1,334 @@
+using Microsoft.EntityFrameworkCore;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Client.Test.Integration.Models;
+using Strata.ContinuousImprovement.Client.Test.Integration.Setup;
+using Strata.DecisionSupport.Biz.Utilities;
+using Strata.DecisionSupport.Models.Jazz;
+using Strata.DecisionSupport.Models.Queries;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Client.Test.Integration.Tests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture(Category = "Integration")]
+    public class TestContinuousImprovementClient : ClientServiceBase
+    {
+        private const string MSDRGCaseTypeFamilyIdQuery = @"select ctf.casetypefamilyid Value
+FROM dss.CaseTypeFamily ctf
+WHERE ctf.Name = 'Acute Kidney Failure'
+ AND EXISTS (SELECT TOP (1) 1 FROM dss.CaseTypeFamilyMappingICD10 msdrg WHERE msdrg.CaseTypeFamilyID = ctf.CaseTypeFamilyID)";
+        private const string APRDRGCaseTypeFamilyIdQuery = @"SELECT ctf.CaseTypeFamilyID Value
+FROM dss.CaseTypeFamily ctf
+WHERE ctf.Name = 'Acute Kidney Injury'
+  AND EXISTS(SELECT TOP (1) 1 FROM dss.CaseTypeFamilyMappingAPRDRG aprdrg WHERE aprdrg.CaseTypeFamilyID = ctf.CaseTypeFamilyID)";
+        private const string CptCodeCaseTypeFamilyIdQuery = @"SELECT ctf.CaseTypeFamilyID Value
+FROM dss.CaseTypeFamily ctf
+WHERE ctf.Name = 'Acupuncture Procedures'
+  AND EXISTS(SELECT TOP (1) 1 FROM dss.CaseTypeFamilyMappingCPT cpt WHERE cpt.CaseTypeFamilyID = ctf.CaseTypeFamilyID)";
+        private const string PatientPopClinicalIndicatorIdQuery = @"SELECT ci.ClinicalIndicatorID Value
+FROM dss.CaseTypeFamily ctf
+INNER JOIN dss.DimCaseType ct ON ct.CaseTypeFamilyID = ctf.CaseTypeFamilyID
+INNER JOIN dss.DimClinicalIndicator ci ON ci.ClinicalIndicatorID = ct.ClinicalIndicatorID
+WHERE ct.CaseTypeCategory = 2
+  AND ci.Name = 'BPCI Major Joint Replacement - Knee'";
+
+        [Test, Order(1)]
+        public async Task TestGetConfigurations()
+        {
+            // arrange
+
+            // act
+            var configurations = await GetConfigurationsAsync(CancellationToken.None);
+
+            // assert
+            Assert.That(configurations, Is.Not.Empty);
+        }
+
+        [Test, Order(1)]
+        [Ignore("Test database needs to be rolled over to the new year")]
+        public async Task TestGetDfltConfiguration()
+        {
+            // arrange
+
+            // act
+            var configurations = await GetConfigurationsAsync(CancellationToken.None);
+            var dftlConfiguration = configurations.OrderBy(c => c.DisplayOrder).FirstOrDefault();
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                Assert.That(configurations, Is.Not.Empty);
+                Assert.That(dftlConfiguration, Is.Not.Null);
+                var expectedFiscalYearId = DateTime.Now.Year;
+                Assert.That(dftlConfiguration.FiscalYearId, Is.InRange(expectedFiscalYearId - 1, expectedFiscalYearId), "Fiscal year configuration needs to be updated for the current year.");
+                Assert.That(dftlConfiguration.OrgDefinedEndDate, Is.EqualTo(new DateTime(dftlConfiguration.FiscalYearId, 1, 1).AddDays(-1)));
+            });
+        }
+
+        [Test, Order(1)]
+        public async Task TestGetEntityConfiguration()
+        {
+            // arrange
+
+            // act
+            var configurations = await GetConfigurationsAsync(CancellationToken.None);
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).FirstOrDefault(c => c.EntityIdsCsv != "" && !c.IsUsingCustomEntityDimension);
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                Assert.That(configurations, Is.Not.Empty);
+                Assert.That(configuration, Is.Not.Null);
+                Assert.That(configuration.IsUsingCustomEntityDimension, Is.False);
+                Assert.That(configuration.EntityIdsCsv, Is.Not.Empty);
+            });
+        }
+
+        [Test]
+        public async Task TestDecisionSupportMsdrgEncounterInfo()
+        {
+            // arrange
+            var configurations = await GetConfigurationsAsync(CancellationToken.None);
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).First(c => c.EntityIdsCsv != "" && !c.IsUsingCustomEntityDimension);
+            var entityIdValues = configuration.EntityIdsCsv?.Split(',') ?? [];
+            if (entityIdValues.IsEmpty())
+            {
+                entityIdValues = configuration.CustomEntityIdsCsv?.Split(',') ?? ["2"];
+            }
+            var entityIds = entityIdValues.Select(entityId => int.TryParse(entityId, out var r) ? r : 0).Distinct();
+            var caseTypeFamilyId = await GetCaseTypeFamilyId(MSDRGCaseTypeFamilyIdQuery, CancellationToken.None);
+            var encounterInfo = EncounterInfo(CaseTypeCategory.MSDRG, caseTypeFamilyId, configuration, entityIds);
+
+            // act
+            var result = Enumerable.Empty<MSDRGEncounterInfo>();
+            Assert.DoesNotThrowAsync(async () =>
+                result = await ContinuousImprovementService.DecisionSupportMsdrgEncounterInfo(encounterInfo, CancellationToken.None));
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                Assert.That(result, Is.AssignableTo<IEnumerable<MSDRGEncounterInfo>>());
+                Assert.That(result, Is.Not.Null.And.Not.Empty);
+            });
+        }
+
+        [Test]
+        public async Task TestDecisionSupportAprdrgEncounterInfo()
+        {
+            // arrange
+            var configurations = await GetConfigurationsAsync(CancellationToken.None);
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).First(c => c.EntityIdsCsv != "" && !c.IsUsingCustomEntityDimension);
+            var entityIdValues = configuration.EntityIdsCsv?.Split(',') ?? [];
+            if (entityIdValues.IsEmpty())
+            {
+                entityIdValues = configuration.CustomEntityIdsCsv?.Split(',') ?? ["2"];
+            }
+            var entityIds = entityIdValues.Select(entityId => int.TryParse(entityId, out var r) ? r : 0).Distinct();
+            var caseTypeFamilyId = await GetCaseTypeFamilyId(APRDRGCaseTypeFamilyIdQuery, CancellationToken.None);
+            var encounterInfo = EncounterInfo(CaseTypeCategory.APRDRG, caseTypeFamilyId, configuration, entityIds);
+
+            // act
+            var result = Enumerable.Empty<APRDRGEncounterInfo>();
+            Assert.DoesNotThrowAsync(async () =>
+                result = await ContinuousImprovementService.DecisionSupportAprdrgEncounterInfo(encounterInfo, CancellationToken.None));
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                Assert.That(result, Is.AssignableTo<IEnumerable<APRDRGEncounterInfo>>());
+                Assert.That(result, Is.Not.Null.And.Not.Empty);
+            });
+        }
+
+        [Test]
+        public async Task TestDecisionSupportCptCodeDrgEncounterInfo()
+        {
+            // arrange
+            var configurations = await GetConfigurationsAsync(CancellationToken.None);
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).First(c => c.EntityIdsCsv != "" && !c.IsUsingCustomEntityDimension);
+            var entityIdValues = configuration.EntityIdsCsv?.Split(',') ?? [];
+            if (entityIdValues.IsEmpty())
+            {
+                entityIdValues = configuration.CustomEntityIdsCsv?.Split(',') ?? ["2"];
+            }
+            var entityIds = entityIdValues.Select(entityId => int.TryParse(entityId, out var r) ? r : 0).Distinct();
+            var caseTypeFamilyId = await GetCaseTypeFamilyId(CptCodeCaseTypeFamilyIdQuery, CancellationToken.None);
+            var encounterInfo = EncounterInfo(CaseTypeCategory.CPTCode, caseTypeFamilyId, configuration, entityIds);
+
+            // act
+            var result = Enumerable.Empty<CPTCodeEncounterInfo>();
+            Assert.DoesNotThrowAsync(async () =>
+                result = await ContinuousImprovementService.DecisionSupportCptCodeEncounterInfo(encounterInfo, CancellationToken.None));
+
+            // assert
+            Assert.That(result, Is.AssignableTo<IEnumerable<CPTCodeEncounterInfo>>());
+        }
+
+        [Test]
+        public async Task TestDecisionSupportPatientPopulationEncounterInfo()
+        {
+            // arrange
+            var configurations = await GetConfigurationsAsync(CancellationToken.None);
+            var configuration = configurations.OrderBy(c => c.DisplayOrder).First(c => c.EntityIdsCsv != "" && !c.IsUsingCustomEntityDimension);
+            var entityIdValues = configuration.EntityIdsCsv?.Split(',') ?? [];
+            if (entityIdValues.IsEmpty())
+            {
+                entityIdValues = configuration.CustomEntityIdsCsv?.Split(',') ?? ["2"];
+            }
+            var entityIds = entityIdValues.Select(entityId => int.TryParse(entityId, out var r) ? r : 0).Distinct();
+            var clinicalIndicatorId = await GetCaseTypeFamilyId(PatientPopClinicalIndicatorIdQuery, CancellationToken.None);
+            var encounterInfo = EncounterInfo(CaseTypeCategory.PatientPopulation, clinicalIndicatorId, configuration, entityIds);
+
+            // act
+            var result = Enumerable.Empty<PatientPopulationEncounterInfo>();
+            Assert.DoesNotThrowAsync(async () =>
+                result = await ContinuousImprovementService.DecisionSupportPatientPopulationEncounterInfo(encounterInfo, CancellationToken.None));
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                Assert.That(result, Is.AssignableTo<IEnumerable<PatientPopulationEncounterInfo>>());
+                Assert.That(result, Is.Not.Null.And.Not.Empty);
+            });
+        }
+
+        [Test]
+        public async Task TestGetAllWorkbooks()
+        {
+            // arrange
+
+            // act
+            var workbooks = await ContinuousImprovementService.GetAllWorkbooks(CancellationToken.None);
+
+            // assert
+            Assert.Multiple(() =>
+            {
+
+                Assert.That(workbooks, Is.AssignableTo<IEnumerable<WorkbookClientInfo>>());
+                Assert.That(workbooks.Count, Is.GreaterThanOrEqualTo(1));
+                var workbook = workbooks.FirstOrDefault();
+                if (workbook == null) { return; }
+                Assert.Multiple(() =>
+                {
+                    Assert.That(OpportunityWorkbook.WorkbookId, Is.GreaterThan(0));
+                    Assert.That(OpportunityWorkbook.StrataId, Is.EqualTo(workbook.StrataId));
+                });
+            });
+        }
+
+        [Test]
+        public async Task TestGetOpportunityWorkbooks()
+        {
+            // arrange
+
+            // act
+            var workbooks = await ContinuousImprovementService.GetOpportunityWorkbooks(Guid.NewGuid(), CancellationToken.None);
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                Assert.That(workbooks, Is.AssignableTo<IEnumerable<OpportunityWorkbookClientInfo>>());
+                Assert.That(workbooks.Count, Is.GreaterThanOrEqualTo(0));
+                var workbook = workbooks.FirstOrDefault();
+                if (workbook == null) { return; }
+                Assert.Multiple(() =>
+                {
+                    Assert.That(OpportunityWorkbook.WorkbookId, Is.GreaterThan(0));
+                    Assert.That(OpportunityWorkbook.StrataId, Is.EqualTo(workbook.StrataId));
+                });
+            });
+        }
+
+        [Test]
+        public async Task TestGetOpportunityTypeWorkbooks()
+        {
+            // arrange
+
+            // act
+            var workbooks = await ContinuousImprovementService.GetOpportunityTypeWorkbooks((int)OpportunityTypes.Encounter, CancellationToken.None);
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                Assert.That(workbooks, Is.AssignableTo<IEnumerable<OpportunityTypeWorkbookClientInfo>>());
+                Assert.That(workbooks.Count, Is.GreaterThanOrEqualTo(0));
+                var workbook = workbooks.FirstOrDefault();
+                if (workbook == null) { return; }
+                Assert.Multiple(() =>
+                {
+                    Assert.That(OpportunityWorkbook.WorkbookId, Is.GreaterThan(0));
+                    Assert.That(OpportunityWorkbook.StrataId, Is.EqualTo(workbook.StrataId));
+                });
+            });
+        }
+
+        [Test, Ignore("WIP")]
+        public async Task TestCreateAndDeleteOpportunityWorkbooks()
+        {
+            // arrange
+            var jazzDbContext = (JazzDbContext)ServiceProperties.JazzDbContext;
+            var uvOpps = jazzDbContext.VariationOpportunities.Take(10).ToList();
+            var opportunityWorkbooks = uvOpps.Select(uv => new OpportunityWorkbookClientInfo
+            {
+                Name = uv.OpportunityKey,
+                OpportunityGuid = uv.OpportunityGuid,
+                StrataId = StrataId,
+            });
+
+            // act
+            var workbooks = await ContinuousImprovementService.CreateOpportunityWorkbooks(opportunityWorkbooks, CancellationToken.None);
+
+            // assert
+            Assert.Multiple(() =>
+            {
+                Assert.That(workbooks, Is.AssignableTo<IEnumerable<OpportunityWorkbookClientInfo>>());
+                Assert.That(workbooks.Count, Is.GreaterThanOrEqualTo(0));
+                var workbook = workbooks.FirstOrDefault();
+                if (workbook == null) { return; }
+                Assert.Multiple(() =>
+                {
+                    Assert.That(OpportunityWorkbook.WorkbookId, Is.GreaterThan(0));
+                    Assert.That(OpportunityWorkbook.StrataId, Is.EqualTo(workbook.StrataId));
+                });
+            });
+
+            foreach (var workbook in workbooks)
+            {
+                // act
+                var response = await ContinuousImprovementService.DeleteOpportunityWorkbook(workbook.OpportunityGuid, workbook.WorkbookId, CancellationToken.None);
+
+                //assert
+                response.EnsureSuccessStatusCode();
+            }
+        }
+
+
+        #region Helper Methods
+
+        private async Task<int> GetCaseTypeFamilyId(string query, CancellationToken cancellationToken)
+            => await ((JazzDbContext)ServiceProperties.JazzDbContext).Database
+                .SqlQueryRaw<int>(query)
+                .SingleOrDefaultAsync(CancellationToken.None);
+
+        private EncounterQueryInfo EncounterInfo(CaseTypeCategory caseTypeCategory, int caseTypeFamilyId,
+            ConfigurationInfo configuration,
+            IEnumerable<int> entityIds)
+            => new EncounterQueryInfo
+            {
+                CaseTypeCategory = caseTypeCategory,
+                CaseTypeFamilyId = caseTypeFamilyId,
+                StartDate = configuration.OrgDefinedEndDate.AddDays(1).AddYears(-1),
+                EndDate = configuration.OrgDefinedEndDate,
+                DepartmentRollupGlobalId = "",
+                ServiceLineGuid = configuration.ServiceLineDimensionGuid,
+                EntityIDs = entityIds,
+                ObservationUnitsDivisor = 0.5
+            };
+
+
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/TestFixtureSetup.cs b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/TestFixtureSetup.cs
new file mode 100644
index 0000000..95a6881
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/TestFixtureSetup.cs
@@ -0,0 +1,48 @@
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.DbContexts.Snowflake;
+using Strata.ContinuousImprovement.Client.Test.Integration.Setup;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Client.Test.Integration.Tests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture(Category = "Integration")]
+    public class TestFixtureSetup : ClientServiceBase
+    {
+        [Test]
+        public async Task TestBearerToken()
+        {
+            var bearerToken = AccessToken;
+            Assert.That(bearerToken, Is.Not.Null.And.Not.Empty);
+        }
+
+        [Test]
+        public async Task TestCentralDbContext()
+        {
+            var centralDbContext = ServiceProperties.CentralDbContext as CentralDbContext;
+            Assert.That(centralDbContext, Is.Not.Null);
+        }
+
+        [Test]
+        public async Task TestJazzDbContext()
+        {
+            var jazzDbContext = ServiceProperties.JazzDbContext as JazzDbContext;
+            Assert.That(jazzDbContext, Is.Not.Null);
+        }
+
+        [Test]
+        public async Task TestSnowflakeDbContext()
+        {
+            var snowflakeDbContext = ServiceProperties.SnowflakeDatabaseContext as SnowflakeDatabaseContext;
+            Assert.That(snowflakeDbContext, Is.Not.Null);
+        }
+
+        [Test]
+        public async Task TestClientService()
+        {
+            var clientService = ContinuousImprovementService;
+            Assert.That(clientService, Is.Not.Null);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/TestValidateServiceConnection.cs b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/TestValidateServiceConnection.cs
new file mode 100644
index 0000000..d8fd53f
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Integration/Tests/TestValidateServiceConnection.cs
@@ -0,0 +1,37 @@
+using Microsoft.Extensions.Logging;
+using Moq;
+using Strata.ContinuousImprovement.Biz.OpportunityWorkbooks;
+using Strata.ContinuousImprovement.Client.Test.Integration.Setup;
+using Strata.CoreLib.Claims;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.ContinuousImprovement.Client.Test.Integration.Tests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture(Category = "Integration")]
+    public class TestValidateServiceConnection : ClientServiceBase
+    {
+        [Test]
+        public async Task TestGetOpportunityWorkbooksAsync()
+        {
+            // arrange
+            var claimsAccessor = Mock.Of<IClaimsPrincipalAccessor>();
+            Mock.Get(claimsAccessor)
+                .Setup(s => s.GetCurrentClaimsPrincipal())
+                .Returns(ClaimsPrincipal);
+            var analyticsService = ServiceProperties.AnalyticsService;
+            var opportunityWorkbookService = new OpportunityWorkbookService(CentralDbContext, analyticsService, claimsAccessor, Mock.Of<ILogger<OpportunityWorkbookService>>());
+
+            // act
+            var workbooks = await opportunityWorkbookService.GetOpportunityWorkbooksAsync(OpportunityWorkbook.OpportunityGuid, CancellationToken.None);
+
+            // assert
+            Assert.That(workbooks.Count, Is.GreaterThanOrEqualTo(1));
+            var workbook = workbooks.First();
+
+            Assert.That(OpportunityWorkbook.WorkbookId, Is.EqualTo(workbook.WorkbookId));
+            Assert.That(OpportunityWorkbook.StrataId, Is.EqualTo(workbook.StrataId));
+        }
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Unit/ClientTests.cs b/tests/Strata.ContinuousImprovement.Client.Test.Unit/ClientTests.cs
new file mode 100644
index 0000000..446efd3
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Unit/ClientTests.cs
@@ -0,0 +1,151 @@
+using FluentAssertions;
+using RichardSzalay.MockHttp;
+using Strata.DecisionSupport.Models.Encounters;
+using Strata.DecisionSupport.Models.Jazz;
+using Strata.DecisionSupport.Models.Queries;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.Client.Test.Unit
+{
+    [TestFixture, Category("Unit"), Category("Client"), Ignore("needs attention")]
+    public class ClientTests
+    {
+        public Uri HtpUrl { get; set; }
+        public Uri Url { get; set; }
+
+        [SetUp]
+        public void TestSetup()
+        {
+            HtpUrl = new Uri("https://continuousimprovement/");
+            Url = new Uri(HtpUrl, "api/v1/encounters");
+        }
+
+        [TestCaseSource(nameof(TestClientCases))]
+        public async Task TestClient(EncounterQueryInfo queryInfo, List<IJazzEncounterInfo> response)
+        {
+            var httpHandler = new MockHttpMessageHandler();
+            httpHandler.When(HttpMethod.Post, Url.ToString())
+                .WithContent(JsonSerializer.Serialize(queryInfo,
+                    options: new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase }))
+                .Respond(HttpStatusCode.OK, JsonContent.Create(response));
+            var httpClient = new HttpClient(httpHandler)
+            {
+                BaseAddress = HtpUrl
+            };
+
+            var ciService = new ContinuousImprovementService(httpClient);
+            var result = await ciService.DecisionSupportMsdrgEncounterInfo(queryInfo, CancellationToken.None);
+
+            Assert.That(result, Is.Not.Null.And.Not.Empty);
+        }
+
+        public static IEnumerable<TestCaseData> TestClientCases()
+        {
+            yield return new TestCaseData(
+                new EncounterQueryInfo(Strata.DecisionSupport.Models.Queries.CaseTypeCategory.MSDRG, 207, DateTime.Now, DateTime.Now, "", Guid.NewGuid(), 24, new List<int> { 2 }),
+                new List<IJazzEncounterInfo> { new MSDRGEncounterInfo() })
+                .SetName("TestClient - EncounterQueryInfo constructor Request");
+            yield return new TestCaseData(new EncounterQueryInfo
+            {
+                CaseTypeCategory = CaseTypeCategory.MSDRG,
+                CaseTypeFamilyId = 207,
+                DepartmentRollupGlobalId = "",
+                ServiceLineGuid = Guid.NewGuid(),
+                StartDate = DateTime.Now,
+                EndDate = DateTime.Now,
+                EntityIDs = new List<int> { 2 }
+            },
+                new List<IJazzEncounterInfo> { new MSDRGEncounterInfo() })
+                .SetName("TestClient - MSDRG Request");
+            yield return new TestCaseData(new EncounterQueryInfo
+            {
+                CaseTypeCategory = CaseTypeCategory.MSDRG,
+                CaseTypeFamilyId = 207,
+                DepartmentRollupGlobalId = "Location",
+                ServiceLineGuid = Guid.NewGuid(),
+                StartDate = DateTime.Now,
+                EndDate = DateTime.Now,
+                EntityIDs = new List<int> { 2 }
+            },
+                new List<IJazzEncounterInfo> { new MSDRGEncounterInfo() })
+                .SetName("TestClient - MSDRG Location Request");
+            yield return new TestCaseData(new EncounterQueryInfo
+            {
+                CaseTypeCategory = CaseTypeCategory.MSDRG,
+                CaseTypeFamilyId = 207,
+                DepartmentRollupGlobalId = "Department Rollup 1",
+                ServiceLineGuid = Guid.NewGuid(),
+                StartDate = DateTime.Now,
+                EndDate = DateTime.Now,
+                EntityIDs = new List<int> { 2 }
+            },
+                new List<IJazzEncounterInfo> { new MSDRGEncounterInfo() })
+                .SetName("TestClient - MSDRG Department Request");
+            yield return new TestCaseData(new EncounterQueryInfo
+            {
+                CaseTypeCategory = CaseTypeCategory.APRDRG,
+                CaseTypeFamilyId = 207,
+                DepartmentRollupGlobalId = "",
+                ServiceLineGuid = Guid.NewGuid(),
+                StartDate = DateTime.Now,
+                EndDate = DateTime.Now,
+                EntityIDs = new List<int> { 2 }
+            },
+                new List<IJazzEncounterInfo> { new APRDRGEncounterInfo() })
+                .SetName("TestClient - APRDRG Request");
+            yield return new TestCaseData(new EncounterQueryInfo
+            {
+                CaseTypeCategory = CaseTypeCategory.CPTCode,
+                CaseTypeFamilyId = 207,
+                DepartmentRollupGlobalId = "",
+                ServiceLineGuid = Guid.NewGuid(),
+                StartDate = DateTime.Now,
+                EndDate = DateTime.Now,
+                EntityIDs = new List<int> { 2 }
+            },
+                new List<IJazzEncounterInfo> { new CPTCodeEncounterInfo() })
+                .SetName("TestClient - CPTCode Request");
+            yield return new TestCaseData(new EncounterQueryInfo
+            {
+                CaseTypeCategory = CaseTypeCategory.PatientPopulation,
+                CaseTypeFamilyId = 207,
+                DepartmentRollupGlobalId = "",
+                ServiceLineGuid = Guid.NewGuid(),
+                StartDate = DateTime.Now,
+                EndDate = DateTime.Now,
+                EntityIDs = new List<int> { 2 }
+            },
+                new List<IJazzEncounterInfo> { new PatientPopulationEncounterInfo() })
+                .SetName("TestClient - Patient Population Request");
+        }
+
+        [Test]
+        public async Task TestClientError()
+        {
+            var httpHandler = new MockHttpMessageHandler();
+            var queryInfo = new Strata.DecisionSupport.Biz.Parameters.EncounterQueryInfo(Strata.DecisionSupport.Models.Queries.CaseTypeCategory.MSDRG, 207, DateTime.Now, DateTime.Now, "", Guid.NewGuid(), 24, new List<int>());
+            httpHandler.When(HttpMethod.Post, Url.ToString())
+                .WithContent(JsonSerializer.Serialize(queryInfo,
+                    options: new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase }))
+                .Respond(HttpStatusCode.InternalServerError);
+            var httpClient = new HttpClient(httpHandler)
+            {
+                BaseAddress = HtpUrl
+            };
+
+            var ciService = new ContinuousImprovementService(httpClient);
+            Func<Task> action = ciService.Awaiting(x => x.DecisionSupportMsdrgEncounterInfo(queryInfo, CancellationToken.None));
+            await action.Should()
+                .ThrowAsync<ArgumentNullException>()
+                .WithMessage("Value cannot be null. (Parameter 'encounterInfo')");
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.Client.Test.Unit/Strata.ContinuousImprovement.Client.Test.Unit.csproj b/tests/Strata.ContinuousImprovement.Client.Test.Unit/Strata.ContinuousImprovement.Client.Test.Unit.csproj
new file mode 100644
index 0000000..e3a8bb4
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.Client.Test.Unit/Strata.ContinuousImprovement.Client.Test.Unit.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.7.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
+    <ProjectReference Include="..\..\src\Strata.ContinuousImprovement.Client\Strata.ContinuousImprovement.Client.csproj" />
+    <ProjectReference Include="..\..\src\Strata.DecisionSupport.Biz\Strata.DecisionSupport.Biz.csproj" />
+    <ProjectReference Include="..\..\src\Strata.DecisionSupport.Models\Strata.DecisionSupport.Models.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Generics/CCOpportunityMapper.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Generics/CCOpportunityMapper.cs
new file mode 100644
index 0000000..8b89edf
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Generics/CCOpportunityMapper.cs
@@ -0,0 +1,71 @@
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.Configuration;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.Schema.Client.Dtos;
+using System.Collections.Generic;
+using System.Text.Json;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub.Generics
+{
+
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class CCOpportunityMapper
+    {
+        public static CCOpportunityDataModel MapToDataModel(this CCOpportunity src, Configuration configuration)
+        {
+            var mapped = src.MapToDataModel();
+            mapped.Configuration = configuration;
+            return mapped;
+        }
+
+        public static CCOpportunityDataModel MapToDataModel(this CCOpportunity src)
+        {
+            var mapped = Mapped(src);
+            if (mapped == null) { return default; }
+            mapped.EncounterGroup = (int)EncounterGroup.CaseType;
+            mapped.CaseTypeJson = JsonSerializer.Serialize(new HierarchyPathsAndMembers
+            {
+                HierarchyPaths = new List<string>(),
+                Members = new List<MemberDto>()
+            });
+            mapped.ClinicalIndicatorJson = JsonSerializer.Serialize(new HierarchyPathsAndMembers
+            {
+                HierarchyPaths = new List<string>(),
+                Members = new List<MemberDto>()
+            });
+            mapped.ChargeCodeJson = JsonSerializer.Serialize(new HierarchyPathsAndMembers
+            {
+                HierarchyPaths = new List<string>(),
+                Members = new List<MemberDto>()
+            });
+            mapped.OpportunityLevelJson = JsonSerializer.Serialize(new HierarchyPathsAndMembers
+            {
+                HierarchyPaths = new List<string>(),
+                Members = new List<MemberDto>()
+            });
+            return mapped;
+        }
+
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.CaseTypeJson))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.CaseTypes))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.ChargeCodeJson))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.ChargeCodes))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.ClinicalIndicatorJson))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.Configuration))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.DateCreated))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.Details))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.EncounterGroup))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.LevelCases))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.OpportunityLevelJson))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.OpportunityLevels))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.OpportunityId))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.OpportunityLevelJson))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.OpportunityId))]
+        [MapperIgnoreTarget(nameof(CCOpportunityDataModel.PatientPopulations))]
+        [MapperIgnoreSource(nameof(CCOpportunity.ChargeCodeGroup))]
+        [MapperIgnoreSource(nameof(CCOpportunity.ChargeCodeGroupValue))]
+        private static partial CCOpportunityDataModel Mapped(CCOpportunity src);
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Generics/FFOpportunityMapper.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Generics/FFOpportunityMapper.cs
new file mode 100644
index 0000000..802bf84
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Generics/FFOpportunityMapper.cs
@@ -0,0 +1,11 @@
+using Riok.Mapperly.Abstractions;
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub.Generics
+{
+    [Mapper(UseDeepCloning = true, EnumMappingStrategy = EnumMappingStrategy.ByName, EnumMappingIgnoreCase = true)]
+    public static partial class FFOpportunityMapper
+    {
+        public static partial FFOpportunityDetailModel MapToDataModel(FFOpportunity src);
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/JazzEntityFrameworkFactory.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/JazzEntityFrameworkFactory.cs
new file mode 100644
index 0000000..91313b3
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/JazzEntityFrameworkFactory.cs
@@ -0,0 +1,520 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
+using Moq;
+using MoreLinq;
+using MoreLinq.Extensions;
+using NUnit.Framework;
+using Strata.ContinuousImprovement.Biz.All;
+using Strata.ContinuousImprovement.Biz.All.Opportunities;
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using Strata.ContinuousImprovement.Biz.DbContexts;
+using Strata.ContinuousImprovement.Biz.FiscalMonths;
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using Strata.ContinuousImprovement.Biz.PeerGroups;
+using Strata.ContinuousImprovement.Biz.PeerGroups.Enums;
+using Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns;
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.Utilities;
+using Strata.ContinuousImprovement.Biz.UtilizationVariation;
+using Strata.ContinuousImprovement.JazzEntityFrameworkStub.Generics;
+using Strata.SqlTools.Configuration.Common.AsyncFactory;
+using Strata.StrataSphereCompare.Client.Models.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory : IAsyncDbContextFactory<JazzDbContext>
+    {
+        public static List<Guid> OpportunityGuids = new List<Guid>
+        {
+            Guid.NewGuid(),
+            Guid.NewGuid(),
+            Guid.NewGuid(),
+            Guid.NewGuid()
+        };
+
+        public static Guid CurrentConfigurationGuid = new Guid("e96abe3e-1526-43ca-815e-ee30c5b34345");
+        public static Guid CaseTypeGuid = new Guid("c7838982-b2c6-4e93-a571-c1fd5cedc961");
+        public static Guid DatabaseGuid = new Guid("21E97CAF-F37D-4F22-9777-0C6A36210FF9");
+
+        public string TestName { get; set; } = TestContext.CurrentContext?.Test.FullName ??
+                                               throw new InvalidOperationException("TestContext.CurrentContext cannot be null");
+
+        public JazzDbContext JazzDbContext;
+        public CentralDbContext CentralDbContext;
+
+        public IFiscalMonthResolver FiscalMonthResolver = Mock.Of<IFiscalMonthResolver>();
+        public IDatabaseFunctionService DbFunctionService = Mock.Of<IDatabaseFunctionService>();
+
+        public async Task<JazzDbContext> CreateDbContextAsync(CancellationToken cancellationToken)
+            => await CreateDbContextAsync(TestName, cancellationToken);
+
+        public async Task<JazzDbContext> CreateDbContextAsync(string dbName, CancellationToken cancellationToken)
+        {
+            if (string.IsNullOrEmpty(dbName))
+            {
+                return await Task.FromResult((JazzDbContext)null);
+            }
+
+            var options = new DbContextOptionsBuilder<JazzDbContext>()
+                .UseInMemoryDatabase(dbName)
+                // don't raise the error warning us that the in memory db doesn't support transactions
+                .ConfigureWarnings(x => x.Ignore(InMemoryEventId.TransactionIgnoredWarning))
+                .Options;
+
+            JazzDbContext = new JazzDbContext(options);
+
+            Mock.Get(DbFunctionService)
+                .Setup(x => x.SplitString(It.IsAny<IEnumerable<string>>()))
+                .Returns<IEnumerable<string>>(x => (y => y.EntityId.Split(',', StringSplitOptions.TrimEntries).Intersect(x).Count() > 0));
+
+            await JazzDbContext.Database.EnsureCreatedAsync(cancellationToken);
+
+            JazzDbContext.DatabaseFunctionService = DbFunctionService;
+
+            if (FiscalMonthResolver != null)
+            {
+                Mock.Get(FiscalMonthResolver)
+                    .Setup(s => s.AllFiscalMonths)
+                    .Returns(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }
+                        .Select(m => new FiscalMonth
+                        {
+                            MemberGuid = Guid.NewGuid(),
+                            FiscalMonthId = (byte)m,
+                            FiscalMonthCode = $"{m}",
+                            SortOrder = (byte)m,
+                            DaysInMonth = m switch
+                            {
+                                2 => 28,
+                                4 => 30,
+                                6 => 30,
+                                9 => 30,
+                                11 => 30,
+                                _ => 31
+                            },
+                            MonthColumnName = $"Month{m:00}",
+                            Abbreviation = new DateTime(2024, m, 1).ToString("MMM"),
+                            IsReal = true
+                        }).ToList().AsReadOnly());
+                Mock.Get(FiscalMonthResolver)
+                    .Setup(s => s.FirstFiscalMonth())
+                    .Returns(new FiscalMonth
+                    {
+                        MemberGuid = Guid.NewGuid(),
+                        FiscalMonthId = 1,
+                        FiscalMonthCode = "1",
+                        SortOrder = 1,
+                        DaysInMonth = 31,
+                        MonthColumnName = "Month01",
+                        Abbreviation = "Jan",
+                        IsReal = true,
+                    });
+                Mock.Get(FiscalMonthResolver)
+                    .Setup(s => s.LastFiscalMonth())
+                    .Returns(new FiscalMonth
+                    {
+                        MemberGuid = Guid.NewGuid(),
+                        FiscalMonthId = 12,
+                        FiscalMonthCode = "12",
+                        SortOrder = 12,
+                        DaysInMonth = 31,
+                        MonthColumnName = "Month12",
+                        Abbreviation = "Dec",
+                        IsReal = true,
+                    });
+
+            }
+
+            if (!JazzDbContext.SystemSettings.Any())
+            {
+                await JazzDbContext.SystemSettings.AddRangeAsync(SystemSettings, cancellationToken);
+            }
+            if (!JazzDbContext.Configurations.Any())
+            {
+                Configurations.ForEach(c =>
+                {
+                    c.FiscalMonthResolver = FiscalMonthResolver;
+                });
+                await JazzDbContext.Configurations.AddRangeAsync(Configurations, cancellationToken);
+            }
+            if (!JazzDbContext.UserSettings.Any())
+            {
+                await JazzDbContext.UserSettings.AddRangeAsync(UserSettings, cancellationToken);
+            }
+
+            if (!JazzDbContext.CaseTypeFamilies.Any())
+            {
+                await JazzDbContext.CaseTypeFamilies.AddRangeAsync(CaseTypeFamilies, cancellationToken);
+            }
+
+            if (!JazzDbContext.FFOpportunities.Any())
+            {
+                FFOpportunities.First().ConfigurationGuid = Configurations.First().ConfigurationGuid;
+                await JazzDbContext.FFOpportunities.AddRangeAsync(FFOpportunities, cancellationToken);
+            }
+
+            if (!JazzDbContext.FreeFormOpportunities.Any())
+            {
+                var configuration = Configurations[0];
+                configuration.FiscalMonthResolver = FiscalMonthResolver;
+                FFOpportunitiesDataModel.ForEach(ff =>
+                {
+                    ff.ConfigurationGuid = configuration.ConfigurationGuid;
+                    ff.Configuration = configuration;
+                });
+                await JazzDbContext.FreeFormOpportunities.AddRangeAsync(FFOpportunitiesDataModel, cancellationToken);
+            }
+
+            if (!JazzDbContext.GeneralLedgerOpportunities.Any())
+            {
+                GLOpportunities.First().ConfigurationGuid = Configurations.First().ConfigurationGuid;
+                await JazzDbContext.GeneralLedgerOpportunities.AddRangeAsync(GLOpportunities, cancellationToken);
+            }
+
+            if (!JazzDbContext.PayrollOpportunities.Any())
+            {
+                PROpportunities.First().ConfigurationGuid = Configurations.First().ConfigurationGuid;
+                await JazzDbContext.PayrollOpportunities.AddRangeAsync(PROpportunities, cancellationToken);
+            }
+
+            if (!JazzDbContext.VariationOpportunities.Any())
+            {
+                UVOpportunities.First().ConfigurationGuid = Configurations.First().ConfigurationGuid;
+                await JazzDbContext.VariationOpportunities.AddRangeAsync(UVOpportunities, cancellationToken);
+            }
+
+            if (!JazzDbContext.UtilizationVariationOpportunitiesData.Any())
+            {
+                UtilizationVariationOpportunities.First().ConfigurationGuid = Configurations.First().ConfigurationGuid;
+                await JazzDbContext.UtilizationVariationOpportunitiesData.AddRangeAsync(UtilizationVariationOpportunities, cancellationToken);
+            }
+
+            if (!JazzDbContext.ExplorationVariationOpportunitiesData.Any())
+            {
+                ExplorationVariationOpportunities.First().ConfigurationGuid = Configurations.First().ConfigurationGuid;
+                await JazzDbContext.ExplorationVariationOpportunitiesData.AddRangeAsync(ExplorationVariationOpportunities, cancellationToken);
+            }
+
+            if (!JazzDbContext.ChargeCodeOpportunities.Any())
+            {
+                CCOpportunities.First().ConfigurationGuid = Configurations.First().ConfigurationGuid;
+                await JazzDbContext.ChargeCodeOpps.AddRangeAsync(CCOpportunities, cancellationToken);
+
+                var ccDataModels = CCOpportunities.Select(cc => cc.MapToDataModel()).ToList();
+                foreach (var cc in ccDataModels)
+                {
+                    if (cc.ConfigurationGuid == Configurations.First().ConfigurationGuid)
+                    {
+                        cc.Configuration = Configurations.First();
+                    }
+                    cc.EncounterGroup = (int)EncounterGroup.CaseType;
+                    cc.CaseTypes = new List<string>
+                    {
+                        "CaseType 1",
+                        "CaseType 2",
+                        "CaseType 3"
+                    };
+                    cc.ChargeCodes = new List<string>
+                    {
+                        "CC 1",
+                        "CC 2",
+                        "CC 3",
+                    };
+                    var details = new List<ChargeCodeOpportunityDetail>();
+                    details.AddRange(
+                        Enumerable.Range(1, 12).Select(month => new ChargeCodeOpportunityDetail
+                        {
+                            OpportunityGUID = cc.OpportunityGuid,
+                            OpportunityLevelId = 0,
+                            OpportunityLevelName = "Organization",
+                            ChargeCodeId = 0,
+                            ChargeCodeName = "",
+                            ChargeCodeRollupName = "CC 1",
+                            TotalCases = 10,
+                            TotalCost = 10,
+                            TotalUnitsOfService = 10,
+                            GoalTotalUnitsOfService = 10,
+                            IsBaseline = true,
+                            Month = month,
+                            GoalCostPerUnit = 10
+                        }));
+                    cc.Details = details;
+                }
+                ChargeCodeOpportunities.AddRange(ccDataModels);
+                ChargeCodeDetails.AddRange(ccDataModels.SelectMany(dm => dm.Details));
+                await JazzDbContext.ChargeCodeOpportunities.AddRangeAsync(ccDataModels, cancellationToken);
+                await JazzDbContext.ChargeCodeDetails.AddRangeAsync(ccDataModels.SelectMany(dm => dm.Details), cancellationToken);
+            }
+            if (!JazzDbContext.EncounterOpportunities.Any())
+            {
+                FFOpportunities.First().ConfigurationGuid = Configurations.First().ConfigurationGuid;
+                await JazzDbContext.EncounterOpportunities.AddRangeAsync(ENOpportunities, cancellationToken);
+            }
+
+            if (!JazzDbContext.DimEntities.Any())
+            {
+                await JazzDbContext.DimEntities.AddRangeAsync(DimEntities, cancellationToken);
+            }
+
+            if (!JazzDbContext.VariationCaseTypes.Any())
+            {
+                await JazzDbContext.VariationCaseTypes.AddRangeAsync(UVCaseTypes, cancellationToken);
+            }
+            if (!JazzDbContext.QualityVariationItemOpportunities.Any())
+            {
+                QVIOpportunities.First().ConfigurationGuid = Configurations.First().ConfigurationGuid;
+                await JazzDbContext.QualityVariationItemOpportunities.AddRangeAsync(QVIOpportunities, cancellationToken);
+            }
+            if (!JazzDbContext.QualityVariationItemEvents.Any())
+            {
+                QVIEvents.First().ConfigurationGuid = Configurations.First().ConfigurationGuid;
+                await JazzDbContext.QualityVariationItemEvents.AddRangeAsync(QVIEvents, cancellationToken);
+            }
+            if (!JazzDbContext.QualityVariationItemBreakdowns.Any())
+            {
+                qviBreakdowns.AddRange(
+                    QVIOpportunities.GroupBy(
+                        opp => new { opp.ConfigurationGuid, opp.BreakdownId },
+                        (g, d) => new QVIBreakdown
+                        {
+                            BreakdownId = g.BreakdownId,
+                            BreakdownName = d.First().BreakdownName,
+                            IdentifiedSavingsTotal = d.Sum(b => b.IdentifiedSavings),
+                            QVICasesTotal = d.Sum(b => b.QVICases),
+                            CasesTotal = d.Sum(b => b.Cases),
+                            OpportunitiesCount = d.Count(),
+                            QVIRate = (decimal)d.Sum(b => b.QVICases).DivideBy(d.Sum(b => b.Cases)),
+                            ConfigurationGuid = g.ConfigurationGuid
+                        }));
+                await JazzDbContext.QualityVariationItemBreakdowns.AddRangeAsync(qviBreakdowns, cancellationToken);
+            }
+            if (!JazzDbContext.AllOpportunities.Any())
+            {
+                var configurationGuid = Configurations.First().ConfigurationGuid;
+                await JazzDbContext.AllOpportunities.AddRangeAsync(UVOpportunities
+                    .ConvertAll(uv => new AllOpportunity
+                    {
+                        ConfigurationGuid = configurationGuid,
+                        OpportunityGuid = uv.OpportunityGuid,
+                        OpportunityKey = uv.OpportunityKey,
+                        OpportunityType = (int)OpportunityTypes.Variation,
+                        OpportunityTypeName = OpportunityTypes.Variation.OpportunityTypeName(),
+                        Name = $"{uv.CaseTypeName} - {uv.EntityName}",
+                        IdentifiedSavings = uv.IdentifiedSavings,
+                        Initiative = uv.Initiative,
+                        InitiativeGuid = uv.InitiativeGuid,
+                        IsHidden = uv.IsHidden,
+                        CostDriver = uv.CostDriver,
+                        Note = uv.Note
+                    }), cancellationToken);
+
+                await JazzDbContext.AllOpportunities.AddRangeAsync(CCOpportunities
+                    .ConvertAll(opp => new AllOpportunity
+                    {
+                        ConfigurationGuid = configurationGuid,
+                        OpportunityGuid = opp.OpportunityGuid,
+                        OpportunityKey = opp.OpportunityKey,
+                        OpportunityType = (int)OpportunityTypes.Encounter,
+                        OpportunityTypeName = OpportunityTypes.Encounter.OpportunityTypeName(),
+                        Name = opp.Name,
+                        IdentifiedSavings = opp.IdentifiedSavings,
+                        Initiative = opp.Initiative,
+                        InitiativeGuid = opp.InitiativeGuid,
+                        IsHidden = opp.IsHidden,
+                        CostDriver = "Encounter",
+                        Note = opp.Note
+                    }), cancellationToken);
+
+                await JazzDbContext.AllOpportunities.AddRangeAsync(ENOpportunities
+                    .ConvertAll(en => new AllOpportunity
+                    {
+                        ConfigurationGuid = configurationGuid,
+                        OpportunityGuid = en.OpportunityGuid,
+                        OpportunityKey = en.OpportunityKey,
+                        OpportunityType = (int)OpportunityTypes.Encounter,
+                        OpportunityTypeName = OpportunityTypes.Encounter.OpportunityTypeName(),
+                        Name = en.Name,
+                        IdentifiedSavings = en.IdentifiedSavings,
+                        Initiative = en.Initiative,
+                        InitiativeGuid = en.InitiativeGuid,
+                        IsHidden = en.IsHidden,
+                        CostDriver = "Encounter",
+                        Note = en.Note
+                    }), cancellationToken);
+
+                await JazzDbContext.AllOpportunities.AddRangeAsync(GLOpportunities
+                    .ConvertAll(gl => new AllOpportunity
+                    {
+                        ConfigurationGuid = configurationGuid,
+                        OpportunityGuid = gl.OpportunityGuid,
+                        OpportunityKey = gl.OpportunityKey,
+                        OpportunityType = (int)OpportunityTypes.FreeForm,
+                        OpportunityTypeName = OpportunityTypes.FreeForm.OpportunityTypeName(),
+                        Name = gl.Name,
+                        IdentifiedSavings = gl.IdentifiedSavings,
+                        Initiative = gl.Initiative,
+                        InitiativeGuid = gl.InitiativeGuid,
+                        IsHidden = gl.IsHidden,
+                        CostDriver = "",
+                        Note = gl.Note
+                    }), cancellationToken);
+
+                await JazzDbContext.AllOpportunities.AddRangeAsync(PROpportunities
+                    .ConvertAll(pr => new AllOpportunity
+                    {
+                        ConfigurationGuid = configurationGuid,
+                        OpportunityGuid = pr.OpportunityGuid,
+                        OpportunityKey = pr.OpportunityKey,
+                        OpportunityType = (int)OpportunityTypes.Payroll,
+                        OpportunityTypeName = OpportunityTypes.Payroll.OpportunityTypeName(),
+                        Name = pr.Name,
+                        IdentifiedSavings = pr.IdentifiedSavings,
+                        Initiative = pr.Initiative,
+                        InitiativeGuid = pr.InitiativeGuid,
+                        IsHidden = pr.IsHidden,
+                        CostDriver = "",
+                        Note = pr.Note
+                    }), cancellationToken);
+
+                await JazzDbContext.AllOpportunities.AddRangeAsync(QVIOpportunities
+                    .ConvertAll(qv => new AllOpportunity
+                    {
+                        ConfigurationGuid = configurationGuid,
+                        OpportunityGuid = qv.OpportunityGuid,
+                        OpportunityKey = qv.OpportunityKey,
+                        OpportunityType = (int)OpportunityTypes.QualityVariation,
+                        OpportunityTypeName = OpportunityTypes.QualityVariation.OpportunityTypeName(),
+                        Name = qv.BreakdownName,
+                        IdentifiedSavings = qv.IdentifiedSavings,
+                        Initiative = qv.Initiative,
+                        InitiativeGuid = qv.InitiativeGuid,
+                        IsHidden = qv.IsHidden,
+                        CostDriver = "",
+                        Note = qv.Note
+                    }), cancellationToken);
+
+                await JazzDbContext.AllOpportunities.AddRangeAsync(FFOpportunities
+                    .ConvertAll(ff => new AllOpportunity
+                    {
+                        ConfigurationGuid = configurationGuid,
+                        OpportunityGuid = Guid.NewGuid(),
+                        OpportunityKey = ff.OpportunityKey,
+                        OpportunityType = (int)OpportunityTypes.FreeForm,
+                        OpportunityTypeName = OpportunityTypes.FreeForm.OpportunityTypeName(),
+                        Name = ff.Name,
+                        IdentifiedSavings = ff.IdentifiedSavings,
+                        Initiative = ff.Initiative,
+                        InitiativeGuid = ff.InitiativeGuid,
+                        IsHidden = ff.IsHidden,
+                        CostDriver = ff.MetricType == ContinuousImprovement.Biz.FreeForm.Opportunities.MetricType.Financial
+                        ? "Financial Free Form" : "Free Form",
+                        Note = ff.Note
+                    }), cancellationToken);
+                if (!JazzDbContext.PeerGroups.Any())
+                {
+                    await JazzDbContext.PeerGroups.AddAsync(new PeerGroup() { PeerGroupId = 1, Name = "Test Name" }, cancellationToken);
+                }
+                if (!JazzDbContext.PeerGroupCriteriaMappings.Any())
+                {
+                    var mappings = new List<PeerGroupCriteriaMapping>()
+                    {
+                        new PeerGroupCriteriaMapping() { RowId = 1, PeerGroupId = 1, MappingType = (byte)PeerGroupCritetiaType.EntityTypes, MappingValue = (byte)HospitalType.RehabLTACOther },
+                        new PeerGroupCriteriaMapping() { RowId = 2, PeerGroupId = 1, MappingType = (byte)PeerGroupCritetiaType.UrbanRural, MappingValue = (byte)UrbanRural.Urban },
+                        new PeerGroupCriteriaMapping() { RowId = 3, PeerGroupId = 1, MappingType = (byte)PeerGroupCritetiaType.AMCTypes, MappingValue = (byte)IsAmc.AcademicMedicalCenters },
+                        new PeerGroupCriteriaMapping() { RowId = 4, PeerGroupId = 1, MappingType = (byte)PeerGroupCritetiaType.CensusRegions, MappingValue = (byte)CensusRegion.Midwest },
+                        new PeerGroupCriteriaMapping() { RowId = 5, PeerGroupId = 1, MappingType = (byte)PeerGroupCritetiaType.BedSize, MappingValue = (byte)BedSize._0_250 },
+                        new PeerGroupCriteriaMapping() { RowId = 6, PeerGroupId = 1, MappingType = (byte)PeerGroupCritetiaType.OperatingExpenses, MappingValue = (byte)OperatingExpense._250MTo500M },
+                    };
+
+                    await JazzDbContext.PeerGroupCriteriaMappings.AddRangeAsync(mappings, cancellationToken);
+                }
+            }
+
+            await JazzDbContext.SaveChangesAsync(cancellationToken);
+            return await Task.FromResult(JazzDbContext);
+        }
+
+        public Task<JazzDbContext> CreateDbContextAsync(Guid databaseGuid, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public async Task<CentralDbContext> CreateCentralDbContextAsync(CancellationToken cancellationToken)
+            => await CreateCentralDbContextAsync(TestName, cancellationToken);
+
+        public async Task<CentralDbContext> CreateCentralDbContextAsync(string dbName, CancellationToken cancellationToken)
+        {
+            if (string.IsNullOrEmpty(dbName))
+            {
+                return await Task.FromResult((CentralDbContext)null);
+            }
+            var centralOptions = new DbContextOptionsBuilder<CentralDbContext>()
+                .UseInMemoryDatabase(dbName)
+                .Options;
+
+            CentralDbContext = new CentralDbContext(centralOptions);
+            await EnsureCreatedAsync(CentralDbContext, JazzDbContext, cancellationToken);
+            return await Task.FromResult(CentralDbContext);
+        }
+
+        public async Task EnsureCreatedAsync(ICentralDbContext dbContext, CancellationToken cancellationToken)
+        {
+            var centralDbContext = (CentralDbContext)dbContext;
+            await centralDbContext.Database.EnsureCreatedAsync(cancellationToken);
+
+            if (!(await centralDbContext.NetworkOpportunities.AnyAsync(cancellationToken)))
+            {
+                await centralDbContext.NetworkOpportunities.AddRangeAsync(NetworkOpportunities, cancellationToken);
+            }
+
+            if (!(await centralDbContext.ClientNetworkOpportunities.AnyAsync(cancellationToken)))
+            {
+                await centralDbContext.ClientNetworkOpportunities.AddRangeAsync(ClientNetworkOpportunities, cancellationToken);
+            }
+
+            await centralDbContext.SaveChangesAsync(cancellationToken);
+
+        }
+
+        public async Task EnsureCreatedAsync(ICentralDbContext dbContext, IJazzDbContext jazzDbContext, CancellationToken cancellationToken)
+        {
+            await EnsureCreatedAsync(dbContext, cancellationToken);
+            var centralDbContext = (CentralDbContext)dbContext;
+            if (await centralDbContext.Comments.AnyAsync(cancellationToken)) { return; }
+
+            await centralDbContext.Comments.AddRangeAsync(Comments, cancellationToken);
+            if (jazzDbContext != null)
+            {
+                var allOpportunities = await jazzDbContext.AllOpportunities.ToListAsync(cancellationToken);
+                if (!allOpportunities.Any()) { return; }
+                var dateTime = new DateTimeOffset(DateTime.UtcNow, TimeSpan.Zero).UtcDateTime;
+                var comments = allOpportunities
+                    .Select((opp, idx) => new Comment
+                    {
+                        CommentDate = dateTime.AddHours(idx),
+                        CommentId = idx + 2,
+                        CommentText = $"Comment on {opp.Name}",
+                        Author = "Name, Author",
+                        SourceOfSavingsId = (int)opp.OpportunityType,
+                        StrataId = 9,
+                        OpportunityId = opp.OpportunityId
+                    }).ToList();
+                await centralDbContext.Comments.AddRangeAsync(comments, cancellationToken);
+            }
+            try
+            {
+                await centralDbContext.SaveChangesAsync(cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                // ILB
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_CCOpportunities.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_CCOpportunities.cs
new file mode 100644
index 0000000..c32101a
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_CCOpportunities.cs
@@ -0,0 +1,91 @@
+using Strata.ContinuousImprovement.Biz.ChargeCode.Opportunities;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region Opportunities
+
+        public List<CCOpportunityDataModel> ChargeCodeOpportunities = new List<CCOpportunityDataModel>();
+        public List<ChargeCodeOpportunityDetail> ChargeCodeDetails = new List<ChargeCodeOpportunityDetail>();
+
+        public List<CCOpportunity> CCOpportunities =
+            new List<CCOpportunity>
+            {
+                new CCOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "CC - 101",
+                    Name = "ChargeCode Name 1",
+                    IdentifiedSavings = 1000d,
+                    Cases = 99,
+                    OpportunityLevel = "Organization",
+                    IsSeasonal = true,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid,
+                },
+                new CCOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "CC - 102",
+                    Name = "ChargeCode Name 2",
+                    IdentifiedSavings = 2000d,
+                    Cases = 199,
+                    OpportunityLevel = "Entity",
+                    IsSeasonal = false,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new CCOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "CC - 103",
+                    Name = "ChargeCode Name 3",
+                    IdentifiedSavings = 1000d,
+                    Cases = 99,
+                    OpportunityLevel = "Specialty",
+                    IsSeasonal = true,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new CCOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "CC - 104",
+                    Name = "ChargeCode Name 4",
+                    IdentifiedSavings = 2000d,
+                    Cases = 299,
+                    OpportunityLevel = "Service Line",
+                    IsSeasonal = false,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new CCOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "CC - 105",
+                    Name = "ChargeCode Name 5",
+                    IdentifiedSavings = 3000d,
+                    Cases = 399,
+                    OpportunityLevel = "Provider",
+                    IsSeasonal = true,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+            };
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_CaseTypeFamilies.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_CaseTypeFamilies.cs
new file mode 100644
index 0000000..fed1def
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_CaseTypeFamilies.cs
@@ -0,0 +1,18 @@
+using Strata.ContinuousImprovement.Biz.Exploration.CaseTypeFamilies;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        public List<CaseTypeFamily> CaseTypeFamilies = new List<CaseTypeFamily>
+        {
+            new CaseTypeFamily
+            {
+                CaseTypeFamilyId = 1,
+                CaseTypeFamilyGlobalId = "A-1",
+                Name = "Sample CTF"
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_ClientNetworkOpportunities.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_ClientNetworkOpportunities.cs
new file mode 100644
index 0000000..a0d98c5
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_ClientNetworkOpportunities.cs
@@ -0,0 +1,21 @@
+using Strata.ContinuousImprovement.Biz.Network;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        public List<ClientNetworkOpportunity> ClientNetworkOpportunities =
+        new List<ClientNetworkOpportunity> {
+            new ClientNetworkOpportunity {
+                StrataId = 9,
+                IdentifiedSavings = 1000,
+                IdentifiedSavingsDescription = "IdentifiedSavingsDescription",
+                AnalyticsWorkbookId = 0,
+                NetworkOpportunityId = 1,
+                IsPublished = true
+            }
+        };
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_Comments.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_Comments.cs
new file mode 100644
index 0000000..47edb17
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_Comments.cs
@@ -0,0 +1,25 @@
+using Strata.ContinuousImprovement.Biz.Generics;
+using Strata.ContinuousImprovement.Biz.OpportunityComments;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        public List<Comment> Comments =
+            new List<Comment> {
+                new Comment
+                {
+                    CommentDate = new DateTimeOffset(DateTime.UtcNow, TimeSpan.Zero).UtcDateTime,
+                    CommentId = 1,
+                    CommentText = "This is a comment",
+                    Author ="Author Name",
+                    OpportunityId = 1,
+                    SourceOfSavingsId = (int) OpportunityTypes.ChargeCode,
+                    StrataId = 9
+                }
+            };
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_Contigurations.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_Contigurations.cs
new file mode 100644
index 0000000..ce0015e
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_Contigurations.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using Config = Strata.ContinuousImprovement.Biz.Configuration;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+
+        #region Configurations
+
+        public List<Config.Configuration> Configurations =
+            new List<Config.Configuration> {
+                new Config.Configuration
+                {
+                    ConfigurationGuid = CurrentConfigurationGuid,
+                    DisplayOrder = 0,
+                    Name = "Test1",
+                    CustomEntityIdsCSV = ",,0,1,2,2,2,2,3,5,a,b,c",
+                    EntityIdsCSV = ",,0,1,2,2,2,2,3,a,b,c",
+                    DepartmentRollupGlobalId = "Entity",
+                    ServiceLineDimensionGuid = Guid.NewGuid(),
+                    QVIOpportunityBreakdown = Config.Configuration.QVIOpportunityBreakdowns.ServiceLine,
+                    OrgDefinedEndDate = DateTime.Now.AddMonths(1 - DateTime.Now.Month),
+                    FiscalYearID = (short)DateTime.Now.Year
+                },
+                new Config.Configuration
+                {
+                    ConfigurationGuid = Guid.NewGuid(),
+                    DisplayOrder = 1,
+                    Name = "Test3",
+                    CustomEntityIdsCSV = ",,0,1,2,2,2,2,3,a,b,c",
+                    EntityIdsCSV = ",,0,1,2,2,2,2,3,4,a,b,c",
+                    DepartmentRollupGlobalId = string.Empty,
+                    ServiceLineDimensionGuid = Guid.Empty,
+                    QVIOpportunityBreakdown = Config.Configuration.QVIOpportunityBreakdowns.PhysicianSpecialty,
+                    OrgDefinedEndDate = DateTime.Now.AddYears(-1).AddMonths(1 - DateTime.Now.Month),
+                    FiscalYearID = (short)DateTime.Now.AddYears(-1).Year
+                },
+                new Config.Configuration
+                {
+                    ConfigurationGuid = Guid.NewGuid(),
+                    DisplayOrder = 2,
+                    Name = "Test2",
+                    CustomEntityIdsCSV = ",,0,1,2,2,2,2,3,a,b,c",
+                    EntityIdsCSV = ",,0,1,2,2,2,2,3,4,a,b,c",
+                    DepartmentRollupGlobalId = string.Empty,
+                    ServiceLineDimensionGuid = Guid.Empty,
+                    QVIOpportunityBreakdown = Config.Configuration.QVIOpportunityBreakdowns.Entity,
+                    OrgDefinedEndDate = DateTime.Now.AddYears(-2).AddMonths(1 - DateTime.Now.Month),
+                    FiscalYearID = (short)DateTime.Now.AddYears(-2).Year
+                },
+                new Config.Configuration
+                {
+                    ConfigurationGuid = Guid.NewGuid(),
+                    DisplayOrder = 3,
+                    Name = "Test4",
+                    CustomEntityIdsCSV = ",,0,1,2,2,2,2,3,a,b,c",
+                    EntityIdsCSV = ",,0,1,2,2,2,2,3,4,a,b,c",
+                    DepartmentRollupGlobalId = string.Empty,
+                    ServiceLineDimensionGuid = Guid.Empty,
+                    QVIOpportunityBreakdown = Config.Configuration.QVIOpportunityBreakdowns.Entity,
+                    OrgDefinedEndDate = DateTime.Now.AddYears(-3).AddMonths(1 - DateTime.Now.Month),
+                    FiscalYearID = (short)DateTime.Now.AddYears(-3).Year
+                }
+            };
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_DimEntities.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_DimEntities.cs
new file mode 100644
index 0000000..9afd4fb
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_DimEntities.cs
@@ -0,0 +1,41 @@
+using Strata.ContinuousImprovement.Biz.UtilizationVariation;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region Opportunities
+
+        public List<DimEntity> DimEntities =
+            new List<DimEntity>
+            {
+                new DimEntity
+                {
+                    EntityID = 1,
+                    MemberGUID = Guid.NewGuid(),
+                    Code = "1",
+                    Description = "Description",
+                    SortOrder = 1,
+                    EntityType = 0,
+                    IsActive = true,
+                    Name = "Name"
+                },
+                new DimEntity
+                {
+                    EntityID = 2,
+                    MemberGUID = Guid.NewGuid(),
+                    Code = "1",
+                    Description = "Description",
+                    SortOrder = 1,
+                    EntityType = 0,
+                    IsActive = true,
+                    Name = "Name"
+                }
+            };
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_ENOpportunities.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_ENOpportunities.cs
new file mode 100644
index 0000000..c2de857
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_ENOpportunities.cs
@@ -0,0 +1,99 @@
+using Strata.ContinuousImprovement.Biz.Encounter.Opportunities;
+using Strata.ContinuousImprovement.Biz.Shared;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region Opportunities
+
+        public List<ENOpportunity> ENOpportunities =
+            new List<ENOpportunity>
+            {
+                new ENOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "EN - 101",
+                    Name = "Encounter Name 1",
+                    IdentifiedSavings = 1000d,
+                    Cases = 99,
+                    EncounterGroup = EncounterGroup.CaseType,
+                    EncounterGroupValue = "Case Type",
+                    OpportunityLevel = "Organization",
+                    IsSeasonal = true,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new ENOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "EN - 102",
+                    Name = "Encounter Name 2",
+                    IdentifiedSavings = 2000d,
+                    Cases = 199,
+                    EncounterGroup = EncounterGroup.CaseType,
+                    EncounterGroupValue = "Case Type",
+                    OpportunityLevel = "Entity",
+                    IsSeasonal = false,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new ENOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "EN - 103",
+                    Name = "Encounter Name 3",
+                    IdentifiedSavings = 1000d,
+                    Cases = 99,
+                    EncounterGroup = EncounterGroup.PatientPopulation,
+                    EncounterGroupValue = "Patient Population",
+                    OpportunityLevel = "Specialty",
+                    IsSeasonal = true,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new ENOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "EN - 104",
+                    Name = "Encounter Name 4",
+                    IdentifiedSavings = 2000d,
+                    Cases = 299,
+                    EncounterGroup = EncounterGroup.PatientPopulation,
+                    EncounterGroupValue = "Patient Population",
+                    OpportunityLevel = "Service Line",
+                    IsSeasonal = false,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new ENOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "EN - 105",
+                    Name = "Encounter Name 5",
+                    IdentifiedSavings = 3000d,
+                    Cases = 399,
+                    EncounterGroup = EncounterGroup.CaseType,
+                    EncounterGroupValue = "Case Type",
+                    OpportunityLevel = "Provider",
+                    IsSeasonal = true,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+            };
+
+        #endregion
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_ExplorationVariationOpportunities.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_ExplorationVariationOpportunities.cs
new file mode 100644
index 0000000..7c91b2a
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_ExplorationVariationOpportunities.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region Opportunities
+
+        public List<Biz.Population.ExplorationVariationOpportunityDataModel> ExplorationVariationOpportunities =
+            new List<Biz.Population.ExplorationVariationOpportunityDataModel>
+            {
+                new Biz.Population.ExplorationVariationOpportunityDataModel
+                {
+                    OpportunityGuid = Guid.Parse("ecc29e51-e92b-467a-bae4-7f69e36af069"),
+                    InitiativeGuid = Guid.Empty,
+                    YearConsidered = 0,
+                    CostDriver = "Cost Driver",
+                    SavingsLevel = 0,
+                    Savings = 0d,
+                    SavingsMedian = 0d,
+                    SavingsTarget = 0d,
+                    TotalCases = 0,
+                    TotalCost = 0d,
+                    TotalVariableCost = 0d,
+                    CostMedian = 0d,
+                    CostMedicare = 0d,
+                    VariableCostMedian = 0d,
+                    VariableCostMedicare = 0d,
+                    Note = string.Empty,
+                    DateModified = new DateTime(),
+                    DateCreated = new DateTime(),
+                    ConfigurationGuid = CurrentConfigurationGuid,
+                    IsHidden = false,
+                }
+            };
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_FFOpportunities.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_FFOpportunities.cs
new file mode 100644
index 0000000..057de49
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_FFOpportunities.cs
@@ -0,0 +1,85 @@
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region Opportunities
+
+        public List<FFOpportunity> FFOpportunities =
+            new List<FFOpportunity>
+            {
+                new FFOpportunity
+                {
+                    OpportunityGuid = OpportunityGuids.First(),
+                    OpportunityKey = "FF - 123",
+                    IdentifiedSavings = 1000d,
+                    ImprovementType = FinancialImprovementType.Revenue,
+                    MetricTypeValue = "Financial per Unit",
+                    MetricType = MetricType.FinancialPerUnit,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new FFOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "FF - 122",
+                    IdentifiedSavings = 2000d,
+                    ImprovementType = FinancialImprovementType.Cost,
+                    MetricTypeValue = "Financial",
+                    MetricType = MetricType.Financial,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new FFOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "FF - 125",
+                    IdentifiedSavings = 1000d,
+                    ImprovementType = FinancialImprovementType.Cost,
+                    MetricTypeValue = "Operational",
+                    MetricType = MetricType.Operational,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = true,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new FFOpportunity
+                {
+                    OpportunityGuid = OpportunityGuids.Last(),
+                    OpportunityKey = "FF - 124",
+                    IdentifiedSavings = 2000d,
+                    ImprovementType = FinancialImprovementType.Cost,
+                    MetricTypeValue = "Financial",
+                    MetricType = MetricType.Financial,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = true,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new FFOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "FF - 126",
+                    IdentifiedSavings = 2000d,
+                    ImprovementType = FinancialImprovementType.Revenue,
+                    MetricTypeValue = "Financial per Unit",
+                    MetricType = MetricType.FinancialPerUnit,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = true,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                }
+            };
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_FFOpportunitiesDataModel.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_FFOpportunitiesDataModel.cs
new file mode 100644
index 0000000..26f8fdf
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_FFOpportunitiesDataModel.cs
@@ -0,0 +1,45 @@
+using Strata.ContinuousImprovement.Biz.FreeForm.Opportunities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region Opportunities
+
+        public List<FFOpportunityDataModel> FFOpportunitiesDataModel =
+            new List<FFOpportunityDataModel>
+            {
+                new FFOpportunityDataModel
+                {
+                    OpportunityId = 1,
+                    OpportunityGuid = OpportunityGuids.First(),
+                    ConfigurationGuid = CurrentConfigurationGuid,
+                    Name = "Free Form Opportunity 1",
+                    Numerator = "Imaging Procedures",
+                    Denominator = "PatientDays",
+                    FinancialImprovementType = FinancialImprovementType.Cost,
+                    AuthorGuid = Guid.NewGuid(),
+                    AuthorName = "",
+                    MetricType = MetricType.Financial
+
+                },
+                new FFOpportunityDataModel
+                {
+                    OpportunityId = 2,
+                    OpportunityGuid = Guid.NewGuid(),
+                    ConfigurationGuid = CurrentConfigurationGuid,
+                    Name = "Free Form Opportunity 2",
+                    FinancialImprovementType = FinancialImprovementType.Cost,
+                    AuthorGuid = Guid.NewGuid(),
+                    AuthorName = "",
+                    MetricType = MetricType.Financial
+                }
+            };
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_GLOpportunities.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_GLOpportunities.cs
new file mode 100644
index 0000000..e583889
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_GLOpportunities.cs
@@ -0,0 +1,57 @@
+using Strata.ContinuousImprovement.Biz.GeneralLedger.Opportunities;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region Opportunities
+
+        public List<GLOpportunity> GLOpportunities =
+            new List<GLOpportunity>()
+            {
+                new GLOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "GL - 101",
+                    Name = "GL Name 1",
+                    IdentifiedSavings = 1000d,
+                    Type = "Revenue",
+                    Level = "Overall",
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new GLOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "GL - 102",
+                    Name = "GL Name 2",
+                    IdentifiedSavings = 199,
+                    Type = "Expense",
+                    Level = "Department",
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new GLOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "GL - 103",
+                    Name = "GL Name 3",
+                    IdentifiedSavings = 2000d,
+                    Type = "Margin",
+                    Level = "Overall",
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+            };
+
+        #endregion
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_NetworkOpportunities.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_NetworkOpportunities.cs
new file mode 100644
index 0000000..3ccc6d2
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_NetworkOpportunities.cs
@@ -0,0 +1,21 @@
+using Strata.ContinuousImprovement.Biz.Network;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        public List<NetworkOpportunity> NetworkOpportunities =
+            new List<NetworkOpportunity>
+            {
+                new NetworkOpportunity
+                {
+                    NetworkOpportunityId =1,
+                    Name = "Network Opportunity",
+                    Description = "Network Opportunity",
+                    WorkbookTemplateId = 0
+                }
+            };
+    }
+
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_PROpportunities.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_PROpportunities.cs
new file mode 100644
index 0000000..d4f6da5
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_PROpportunities.cs
@@ -0,0 +1,54 @@
+using Strata.ContinuousImprovement.Biz.Payroll.Opportunities;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region Opportunities
+
+        public List<PROpportunity> PROpportunities =
+            new List<PROpportunity>()
+            {
+                new PROpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "PR - 101",
+                    Name = "PR Name 1",
+                    IdentifiedSavings = 1000d,
+                    PayrollGoal = "Both",
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new PROpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "PR - 102",
+                    Name = "PR Name 2",
+                    IdentifiedSavings = 199,
+                    PayrollGoal = "Fixed",
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new PROpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "PR - 103",
+                    Name = "PR Name 3",
+                    IdentifiedSavings = 2000d,
+                    PayrollGoal = "Variable",
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+            };
+
+        #endregion
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_QVIBreakdown.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_QVIBreakdown.cs
new file mode 100644
index 0000000..89ce4bd
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_QVIBreakdown.cs
@@ -0,0 +1,15 @@
+using Strata.ContinuousImprovement.Biz.QualityVariation.Breakdowns;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region QVIBreakdowns
+
+        public List<QVIBreakdown> qviBreakdowns = new List<QVIBreakdown>();
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_QVIEvents.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_QVIEvents.cs
new file mode 100644
index 0000000..28fea0b
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_QVIEvents.cs
@@ -0,0 +1,42 @@
+using Strata.ContinuousImprovement.Biz.QualityVariation.Events;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+
+        public List<QVIEvent> QVIEvents =
+         new List<QVIEvent>
+         {
+            new QVIEvent
+            {
+                QualityVariationEventId = 1,
+                QualityVariationEventName = "Event 1 - Everything is 1 in this event.",
+                IdentifiedSavingsTotal = 1,
+                CasesTotal = 1,
+                QVICasesTotal  = 1,
+                QVIPatientDaysTotal = 1,
+                QVICostToal = 1,
+                QVINetRevenueTotal  = 1,
+                Opportunities = 1,
+                ConfigurationGuid = CurrentConfigurationGuid,
+                QVIRate = 1
+            },
+            new QVIEvent
+            {
+                QualityVariationEventId = 2,
+                QualityVariationEventName = "Event 2",
+                IdentifiedSavingsTotal = 2,
+                CasesTotal = 2,
+                QVICasesTotal  = 2,
+                QVIPatientDaysTotal = 2,
+                QVICostToal = 2,
+                QVINetRevenueTotal  = 2,
+                Opportunities = 2,
+                ConfigurationGuid = CurrentConfigurationGuid,
+                QVIRate = 0.02m
+            }
+        };
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_QVIOpportunities.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_QVIOpportunities.cs
new file mode 100644
index 0000000..be4a825
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_QVIOpportunities.cs
@@ -0,0 +1,84 @@
+using Strata.ContinuousImprovement.Biz.QualityVariation.Opportunities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region QVIOpportunities
+
+        public List<QVIOpportunity> QVIOpportunities =
+            new List<QVIOpportunity>
+            {
+                new QVIOpportunity
+                {
+                    OpportunityGuid = OpportunityGuids.Skip(1).First(),
+                    OpportunityKey = "QV - 123",
+                    IdentifiedSavings = 1000d,
+                    QVICases = 99,
+                    Cases = 100,
+                    BreakdownName= "Service Line",
+                    BreakdownId = 1,
+                    QualityVariationEventName= "Quality Variation Event",
+                    QualityVariationEventId = 1,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new QVIOpportunity
+                {
+                    OpportunityGuid = OpportunityGuids.Skip(2).First(),
+                    OpportunityKey = "QV - 122",
+                    IdentifiedSavings = 2000d,
+                    QVICases = 199,
+                    Cases = 200,
+                    BreakdownName= "Service Line",
+                    BreakdownId = 2,
+                    QualityVariationEventName= "Quality Variation Event",
+                    QualityVariationEventId = 1,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new QVIOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "QV - 125",
+                    IdentifiedSavings = 1000d,
+                    QVICases = 99,
+                    Cases = 100,
+                    BreakdownName= "Service Line",
+                    BreakdownId = 1,
+                    QualityVariationEventName= "Quality Variation Event",
+                    QualityVariationEventId = 1,
+                    InitiativeGuid = Guid.NewGuid(),
+                    Note = string.Empty,
+                    IsHidden = true,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new QVIOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "QV - 126",
+                    IdentifiedSavings = 2000d,
+                    QVICases = 299,
+                    Cases = 100,
+                    BreakdownName= "Service Line",
+                    BreakdownId = 1,
+                    QualityVariationEventName= "Quality Variation Event",
+                    QualityVariationEventId = 1,
+                    InitiativeGuid = Guid.NewGuid(),
+                    Note = string.Empty,
+                    IsHidden = true,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                }
+            };
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_SystemSettings.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_SystemSettings.cs
new file mode 100644
index 0000000..eae3559
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_SystemSettings.cs
@@ -0,0 +1,21 @@
+using Strata.ContinuousImprovement.Biz.Shared;
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        public List<SystemSetting> SystemSettings =
+            new List<SystemSetting>
+            {
+                new SystemSetting
+                {
+                    Name = "Flexible Exploration Inpatient Case Type Family",
+                    Value = "1"
+                }                
+            };
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_TestCaseData.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_TestCaseData.cs
new file mode 100644
index 0000000..c92cd75
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_TestCaseData.cs
@@ -0,0 +1,46 @@
+using NUnit.Framework;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region TestCaseData
+
+        public static IEnumerable<TestCaseData> GetFrameworks()
+        {
+            yield return new TestCaseData(new JazzEntityFrameworkFactory())
+                .SetName("{m} With FrameworkFactory");
+
+            yield return new TestCaseData(new JazzEntityFrameworkFactory { TestName = string.Empty })
+                .SetName("{m} Without Context");
+        }
+
+        public static IEnumerable<TestCaseData> GetFrameworksWithCancellation()
+        {
+            yield return new TestCaseData(new JazzEntityFrameworkFactory(), CancellationToken.None)
+                .SetName("{m} With FrameworkFactory")
+                .Ignore("Under investigation");
+
+            yield return new TestCaseData(new JazzEntityFrameworkFactory { TestName = string.Empty }, CancellationToken.None)
+                .SetName("{m} Without Context");
+
+            yield return new TestCaseData(new JazzEntityFrameworkFactory(), new CancellationToken(true))
+                .SetName("{m} With FrameworkFactory Canceled");
+
+            yield return new TestCaseData(new JazzEntityFrameworkFactory { TestName = string.Empty }, new CancellationToken(true))
+                .SetName("{m} Without Context Canceled");
+
+            yield return new TestCaseData(new JazzEntityFrameworkFactory(), new CancellationToken(false))
+                .SetName("{m} With FrameworkFactory not Canceled");
+
+            yield return new TestCaseData(new JazzEntityFrameworkFactory { TestName = string.Empty }, new CancellationToken(false))
+                .SetName("{m} Without Context not Canceled");
+
+        }
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_UserSettings.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_UserSettings.cs
new file mode 100644
index 0000000..4d4a852
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_UserSettings.cs
@@ -0,0 +1,25 @@
+using Strata.ContinuousImprovement.Biz.UserSetting;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        public List<CciUserSetting> UserSettings =
+            new List<CciUserSetting>
+            {
+                new CciUserSetting
+                {
+                    ConfigurationGuid = CurrentConfigurationGuid,
+                    UserGuid = Guid.NewGuid()
+                },
+                new CciUserSetting
+                {
+                    ConfigurationGuid = CurrentConfigurationGuid,
+                    UserGuid = Guid.NewGuid()
+                }
+            };
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_UtilizationVariationOpportunities.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_UtilizationVariationOpportunities.cs
new file mode 100644
index 0000000..996760a
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_UtilizationVariationOpportunities.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region Opportunities
+
+        public List<Biz.UtilizationVariation.Opportunities.VariationOpportunityDataModel> UtilizationVariationOpportunities =
+            new List<Biz.UtilizationVariation.Opportunities.VariationOpportunityDataModel>
+            {
+                new Biz.UtilizationVariation.Opportunities.VariationOpportunityDataModel
+                {
+                    OpportunityGuid = OpportunityGuids.First(),
+                    InitiativeGuid = Guid.Empty,
+                    YearConsidered = 0,
+                    CostDriver = "Cost Driver",
+                    SavingsLevel = 0,
+                    Savings = 0d,
+                    SavingsMedian = 0d,
+                    SavingsTarget = 0d,
+                    TotalCases = 0,
+                    TotalCost = 0d,
+                    TotalVariableCost = 0d,
+                    CostMedian = 0d,
+                    CostMedicare = 0d,
+                    VariableCostMedian = 0d,
+                    VariableCostMedicare = 0d,
+                    Note = string.Empty,
+                    DateModified = new DateTime(),
+                    DateCreated = new DateTime(),
+                    ConfigurationGuid = CurrentConfigurationGuid,
+                    IsHidden = false,
+                }
+            };
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_VariationCaseTypes.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_VariationCaseTypes.cs
new file mode 100644
index 0000000..620486c
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_VariationCaseTypes.cs
@@ -0,0 +1,42 @@
+using Strata.ContinuousImprovement.Biz.UtilizationVariation.VariationCaseTypes;
+using System;
+using System.Collections.Generic;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region UVCaseTypes
+
+        public List<UVCaseType> UVCaseTypes =
+            new List<UVCaseType>
+            {
+                new UVCaseType
+                {
+                    CaseTypeId = 1,
+                    CaseTypeGuid = new Guid("c7838982-b2c6-4e93-a571-c1fd5cedc961"),
+                    CaseTypeName = "Case Type Name",
+                    ServiceLineId = 1,
+                    ServiceLineName = "Service Line",
+                    IdentifiedSavingsTotal = 5000,
+                    OpportunitiesCount = 1,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new UVCaseType
+                {
+                    CaseTypeId = 2,
+                    CaseTypeGuid = Guid.NewGuid(),
+                    CaseTypeName = "Case Type 2 Name",
+                    ServiceLineId = 2,
+                    ServiceLineName = "Service Line 2",
+                    IdentifiedSavingsTotal = 2000,
+                    OpportunitiesCount = 2,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                }
+            };
+
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_VariationOpportunities.cs b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_VariationOpportunities.cs
new file mode 100644
index 0000000..f7a249d
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Jeff_VariationOpportunities.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Strata.ContinuousImprovement.JazzEntityFrameworkStub
+{
+    public partial class JazzEntityFrameworkFactory
+    {
+        #region Opportunities
+
+        public List<Biz.UtilizationVariation.Opportunities.UVOpportunity> UVOpportunities =
+            new List<Biz.UtilizationVariation.Opportunities.UVOpportunity>
+            {
+                new Biz.UtilizationVariation.Opportunities.UVOpportunity
+                {
+                    OpportunityGuid = OpportunityGuids.First(),
+                    OpportunityKey = "UV - 123",
+                    IdentifiedSavings = 1000d,
+                    Cases = 99,
+                    CaseTypeGuid = CaseTypeGuid,
+                    CaseTypeName = "Case Type Name",
+                    CostDriver = "Cost Driver",
+                    EntityId = "1",
+                    EntityName = "Entity Name",
+                    ServiceLineName = "Service Line",
+                    ServiceLineId = 1,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new Biz.UtilizationVariation.Opportunities.UVOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "UV - 122",
+                    IdentifiedSavings = 2000d,
+                    Cases = 199,
+                    CaseTypeGuid = CaseTypeGuid,
+                    CaseTypeName = "Case Type Name",
+                    CostDriver = "Cost Driver",
+                    EntityId = "1,2",
+                    EntityName = "Entity Name",
+                    ServiceLineName = "Service Line",
+                    ServiceLineId = 2,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new Biz.UtilizationVariation.Opportunities.UVOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "UV - 125",
+                    IdentifiedSavings = 1000d,
+                    Cases = 99,
+                    CaseTypeGuid = CaseTypeGuid,
+                    CaseTypeName = "Case Type Name",
+                    CostDriver = "Cost Driver",
+                    EntityId = "1",
+                    EntityName = "Entity Name",
+                    ServiceLineName = "Service Line",
+                    ServiceLineId = 2,
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = true,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new Biz.UtilizationVariation.Opportunities.UVOpportunity
+                {
+                    OpportunityGuid = OpportunityGuids.Last(),
+                    OpportunityKey = "UV - 124",
+                    IdentifiedSavings = 2000d,
+                    Cases = 199,
+                    CaseTypeGuid = CaseTypeGuid,
+                    CaseTypeName = "Case Type Name",
+                    CostDriver = "Cost Driver",
+                    EntityId = "1",
+                    EntityName = "Entity Name",
+                    ServiceLineName = "Service Line",
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = true,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new Biz.UtilizationVariation.Opportunities.UVOpportunity
+                {
+                    OpportunityGuid = Guid.NewGuid(),
+                    OpportunityKey = "UV - 126",
+                    IdentifiedSavings = 2000d,
+                    Cases = 199,
+                    CaseTypeGuid = Guid.NewGuid(),
+                    CaseTypeName = "Case Type Name",
+                    CostDriver = "Cost Driver 2",
+                    EntityId = "1",
+                    EntityName = "Entity Name",
+                    ServiceLineName = "Service Line",
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = true,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                },
+                new Biz.UtilizationVariation.Opportunities.UVOpportunity
+                {
+                    OpportunityGuid = Guid.Parse("ecc29e51-e92b-467a-bae4-7f69e36af069"),
+                    OpportunityKey = "FE - 100",
+                    IdentifiedSavings = 2000d,
+                    Cases = 199,
+                    CaseTypeGuid = Guid.NewGuid(),
+                    CaseTypeName = "Case Type Name",
+                    CostDriver = "Cost Driver",
+                    EntityId = "1,3",
+                    EntityName = "Entity Name",
+                    ServiceLineName = "Service Line",
+                    InitiativeGuid = Guid.Empty,
+                    Note = string.Empty,
+                    IsHidden = false,
+                    ConfigurationGuid = CurrentConfigurationGuid
+                }
+            };
+
+        #endregion
+
+    }
+}
diff --git a/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Strata.ContinuousImprovement.JazzEntityFrameworkStub.csproj b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Strata.ContinuousImprovement.JazzEntityFrameworkStub.csproj
new file mode 100644
index 0000000..5b91bcd
--- /dev/null
+++ b/tests/Strata.ContinuousImprovement.JazzEntityFrameworkStub/Strata.ContinuousImprovement.JazzEntityFrameworkStub.csproj
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="JeffDbContext.cs" />
+    <Compile Remove="Jeff_SDOpportunities.cs" />
+    <Compile Remove="Jeff_StaffingToDemand.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Strata.ContinuousImprovement.Biz\Strata.ContinuousImprovement.Biz.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.Api.Test.Integration</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.Api.Test.Unit</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.Biz.Test.Unit</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.Client.Test.Integration</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Strata.ContinuousImprovement.Client.Test.Unit</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+</Project>
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/Configuration/AWSOptions.cs b/tests/Strata.DecisionSupport.Biz.Test.Integration/Configuration/AWSOptions.cs
new file mode 100644
index 0000000..d473ad2
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/Configuration/AWSOptions.cs
@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Strata.DecisionSupport.Biz.Test.Integration.Configuration
+{
+    public class AWSOptions
+    {
+        [Required(ErrorMessage = "Missing the Snowflake Admin Secret name")]
+        public string SnowflakeAdminSecretName { get; set; }
+    }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTestBase.cs b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTestBase.cs
new file mode 100644
index 0000000..e48ff6a
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTestBase.cs
@@ -0,0 +1,103 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Snowflake.Data.Client;
+using Strata.DecisionSupport.Biz.Services;
+using Strata.DecisionSupport.Biz.Snowflake;
+using Strata.Schema.Client;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.DecisionSupport.Biz.Test.Integration
+{
+    [ExcludeFromCodeCoverage]
+    [SetUpFixture]
+    public class IntegrationTestBase
+    {
+        protected VerifySettings verifySettings;
+        protected VerifySettings verifyErrorSettings;
+
+        protected readonly Guid GmAutomationDatabase = new("cda90beb-6c2e-41af-9083-857a09fe8183"); // GM Automation (Refreshed)
+        protected Guid VariationOpportunityGuid { get; set; }
+        protected Guid LOSOpportunityGuid { get; set; }
+        protected ISnowflakeDatabaseContext _databaseContext;
+        protected IEncounterQueryService _encounterQueryService;
+#pragma warning disable NUnit1032
+        protected IServiceProvider _serviceProvider; //used to grab any necessary DI objects
+#pragma warning restore NUnit1032
+        protected ILogger<IntegrationTestBase>? logger;
+
+
+        //When running locally sets the profile to the data wrangler profile so you have access to resources
+        [OneTimeSetUp]
+        public async Task SetDatabaseContext()
+        {
+#if DEBUG
+            Environment.SetEnvironmentVariable("AWS_Profile", "sdt-continuous-improvement-service-role");
+#endif
+            var services = ServiceCollectionFactory.Create();
+            _serviceProvider = services.BuildServiceProvider();
+            var sfConnBuilderFactory = _serviceProvider.GetRequiredService<ISnowflakeDatabaseContextFactory>();
+            _databaseContext = sfConnBuilderFactory.Create($"{GmAutomationDatabase:N}");
+            verifySettings = TestExtensions.TestSettings();
+            verifyErrorSettings = TestExtensions.TestSettings();
+            verifyErrorSettings.UseDirectory("errorSnapshots");
+            var schemaServiceClient = Mock.Of<ISchemaServiceClient>();
+            _encounterQueryService = new EncounterQueryService(_databaseContext, schemaServiceClient);
+            try
+            {
+                var query = @"select OpportunityGuid from cci.VariationOpportunity where CostDriver = 'Pharmacy' order by Savings DESC limit 1";
+                var opportunityGuid = await _databaseContext.ExecuteScalarAsync<string>(query);
+                VariationOpportunityGuid = new Guid(opportunityGuid ?? Guid.NewGuid().ToString());
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+            try
+            {
+                var query = @"select OpportunityGuid from cci.VariationOpportunity where CostDriver = 'LOS' order by Savings DESC limit 1";
+                var opportunityGuid = await _databaseContext.ExecuteScalarAsync<string>(query);
+                LOSOpportunityGuid = new Guid(opportunityGuid ?? Guid.NewGuid().ToString());
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+        }
+
+        protected virtual async Task QueryTest<T, TI>(TI queryInfo)
+            where TI : class
+            where T : class
+        {
+            var query = Query(queryInfo);
+            if (string.IsNullOrEmpty(query)) { return; }
+            try
+            {
+                var result = await _databaseContext
+                    .QueryAsync<T>(query, nameof(QueryTest), CancellationToken.None);
+                await Verifier.Verify(result, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName(nameof(result)));
+            }
+            catch (SnowflakeDbException dbex)
+            {
+                // ILB
+            }
+            catch (Exception ex)
+            {
+
+                throw;
+            }
+        }
+
+        protected virtual string Query<T>(T queryInfo)
+            where T : class
+            => "";
+
+        [OneTimeTearDown]
+        public void TearDown()
+        {
+            // _serviceProvider.Dispose();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestEncounterChargeQuery.cs b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestEncounterChargeQuery.cs
new file mode 100644
index 0000000..9704d5b
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestEncounterChargeQuery.cs
@@ -0,0 +1,93 @@
+using Snowflake.Data.Client;
+using Strata.DecisionSupport.Biz.Encounters;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Services;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.DecisionSupport.Biz.Test.Integration.IntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("DSS")]
+    public class TestEncounterChargeQuery : IntegrationTestBase
+    {
+
+        [TestCaseSource(nameof(EncounterChargeQueryTestCases))]
+        public async Task EncounterChargeQueryTest(EncounterChargeQueryInfo queryInfo)
+        {
+            var query = EncounterQueries.EncounterChargeQuery(queryInfo.First, queryInfo.Rows, queryInfo.Args());
+            try
+            {
+                var result = ((IEnumerable<EncounterChargeInfo>)(await _databaseContext
+                    .QueryAsync<EncounterChargeInfo>(query, nameof(EncounterChargeQueryTest), queryInfo.Parameters())));
+                await Verifier.Verify(query, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName(nameof(query)));
+                await Verifier.Verify(result, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName(nameof(result)));
+            }
+            catch (SnowflakeDbException dbex)
+            {
+                // ILB
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+        }
+
+        [TestCaseSource(nameof(EncounterChargeQueryTestCases))]
+        public async Task EncounterChargeQueryServiceTest(EncounterChargeQueryInfo queryInfo)
+        {
+            try
+            {
+                var result = await _encounterQueryService.RunEncounterChargeQuery(queryInfo, CancellationToken.None);
+                await Verifier.Verify(result, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName(nameof(result)));
+            }
+            catch (SnowflakeDbException dbex)
+            {
+                // ILB
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+        }
+
+        public static IEnumerable<TestCaseData> EncounterChargeQueryTestCases()
+        {
+            yield return new TestCaseData(new EncounterChargeQueryInfo(
+                false,
+                false,
+                false,
+                false,
+                false,
+                true,
+                Guid.NewGuid(),
+                [1]))
+                .SetName("{m}");
+            yield return new TestCaseData(new EncounterChargeQueryInfo(
+                true,
+                false,
+                true,
+                false,
+                true,
+                true,
+                Guid.NewGuid(),
+                [1]))
+                .SetName("{m} hasManufacturer hasSupply usingCustomDimension");
+            yield return new TestCaseData(new EncounterChargeQueryInfo(
+                true,
+                true,
+                true,
+                true,
+                true,
+                true,
+                Guid.NewGuid(),
+                [1]))
+                .SetName("{m} hasManufacturer Inferred hasSupply Inferred usingCustomDimension");
+
+        }
+    }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestEncounterUnitOfServiceQuery.cs b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestEncounterUnitOfServiceQuery.cs
new file mode 100644
index 0000000..becc4da
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestEncounterUnitOfServiceQuery.cs
@@ -0,0 +1,60 @@
+using Snowflake.Data.Client;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Services;
+using Strata.DecisionSupport.Models.Encounters;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.DecisionSupport.Biz.Test.Integration.IntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("DSS")]
+    public class TestEncounterUnitOfServiceQuery : IntegrationTestBase
+    {
+        [TestCaseSource(nameof(TestCases))]
+        public async Task QueryTest(EncounterUnitOfServiceQueryInfo queryInfo)
+            => await base.QueryTest<EncounterUnitOfService, EncounterUnitOfServiceQueryInfo>(queryInfo);
+
+        protected override string Query<EnounterUnitOfServiceQueryInfo>(EnounterUnitOfServiceQueryInfo queryInfo)
+            => (queryInfo is IWithArgs args)
+                ? EncounterQueries.EncounterUnitOfServiceQuery(args)
+                : EncounterQueries.EncounterUnitOfServiceQuery();
+
+        [TestCaseSource(nameof(ServiceTestCases))]
+        public async Task EncounterUnitOfServiceQueryServiceTest(EncounterUnitOfServiceQueryInfo queryInfo)
+        {
+            try
+            {
+                var result = await _encounterQueryService.RunEncounterUnitOfServiceQuery(queryInfo, CancellationToken.None);
+                await Verifier.Verify(result, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName(nameof(result)));
+            }
+            catch (SnowflakeDbException dbex)
+            {
+                // ILB
+            }
+            catch (Exception ex)
+            {
+
+                throw;
+            }
+        }
+
+        public static IEnumerable<TestCaseData> ServiceTestCases()
+        {
+            yield return new TestCaseData(new EncounterUnitOfServiceQueryInfo(
+                24,
+                [1L, 2L]
+                ))
+                .SetName("{m}");
+        }
+
+        public static IEnumerable<TestCaseData> TestCases()
+        {
+            yield return new TestCaseData(new EncounterUnitOfServiceQueryInfo(
+                24,
+                [1L, 2L]
+                ))
+                .SetName("{c} {m}");
+        }
+    }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestException.cs b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestException.cs
new file mode 100644
index 0000000..7b4c02a
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestException.cs
@@ -0,0 +1,38 @@
+using Snowflake.Data.Client;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.DecisionSupport.Biz.Test.Integration.IntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("DSS")]
+    public class TestException : IntegrationTestBase
+    {
+
+        [Test]
+        public async Task ExceptionTest()
+        {
+            var query = "select ISNULL(null, 0) id\r\n";
+            try
+            {
+                var result = await _databaseContext.QueryAsync<TestClass>(query, nameof(ExceptionTest));
+            }
+            catch (SnowflakeDbException dbex)
+            {
+                await Verifier.Verify(dbex.Message, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName());
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+        }
+
+        public class TestClass
+        {
+            public int Id { get; set; }
+        }
+
+    }
+
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestLOSOpportunityInfoQuery.cs b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestLOSOpportunityInfoQuery.cs
new file mode 100644
index 0000000..08b96d8
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestLOSOpportunityInfoQuery.cs
@@ -0,0 +1,63 @@
+using Snowflake.Data.Client;
+using Strata.DecisionSupport.Biz.Encounters;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Services;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.DecisionSupport.Biz.Test.Integration.IntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("DSS")]
+
+    public class TestLOSOpportunityInfoQuery : IntegrationTestBase
+    {
+        [TestCaseSource(nameof(LOSOpportunityInfoQueryTestCases))]
+        public async Task LOSOpportunityInfoQueryTest(LOSOpportunityQueryInfo queryInfo)
+        {
+            var query = EncounterQueries.LOSOpportunityInfoQuery(LOSOpportunityQueryInfo.Args());
+            try
+            {
+                var result = ((IEnumerable<LOSOpportunityInfo>)await _databaseContext
+                    .QueryAsync<LOSOpportunityInfo>(query, nameof(LOSOpportunityInfoQueryTest), queryInfo.Parameters()));
+                await Verifier.Verify(query, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName(nameof(query)));
+                await Verifier.Verify(result, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName(nameof(result)));
+            }
+            catch (SnowflakeDbException dbex)
+            {
+                // ILB
+            }
+            catch (Exception ex)
+            {
+
+                throw;
+            }
+        }
+
+        [TestCaseSource(nameof(LOSOpportunityInfoQueryTestCases))]
+        public async Task LOSOpportunityInfoQueryServiceTest(LOSOpportunityQueryInfo queryInfo)
+        {
+            try
+            {
+                var result = await _encounterQueryService.RunLOSOpportunityInfoQuery(queryInfo, CancellationToken.None);
+                await Verifier.Verify(result, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName(nameof(result)));
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+        }
+
+        public static IEnumerable<TestCaseData> LOSOpportunityInfoQueryTestCases()
+        {
+            yield return new TestCaseData(new LOSOpportunityQueryInfo(
+                Guid.NewGuid(),
+                24,
+                2))
+                .SetName("{m}");
+        }
+    }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestSnowflakeQueries.cs b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestSnowflakeQueries.cs
new file mode 100644
index 0000000..a9a0190
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestSnowflakeQueries.cs
@@ -0,0 +1,56 @@
+using Snowflake.Data.Client;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Test.Unit;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.DecisionSupport.Biz.Test.Integration.IntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("DSS")]
+    public class TestSnowflakeQueries : IntegrationTestBase
+    {
+        [TestCaseSource(typeof(SnowflakeTestCases), nameof(SnowflakeTestCases.TestCases))]
+        public async Task VerifyQuery<TI, T>(TI obj, T queryInfo, Func<IEnumerable<TI>, IEnumerable<TI>> orderby) where TI : class where T : class
+        {
+            var query = Query(queryInfo);
+            var lineReader = query.LineReader();
+            await Verifier.Verify(lineReader, verifySettings)
+                .UseDirectory("snapshotQueries")
+                .UseFileName(TestContext.CurrentContext.TestName());
+            var parameters = queryInfo is IWithParameters hasParameters ? hasParameters.Parameters() : null;
+            if (string.IsNullOrEmpty(query)) { return; }
+            try
+            {
+                IEnumerable<TI> result;
+                result = parameters != null
+                    ? await _databaseContext.QueryAsync<TI>(query, typeof(T).Name, parameters)
+                    : await _databaseContext.QueryAsync<TI>(query, typeof(T).Name);
+                if (orderby != null)
+                {
+                    result = orderby(result);
+                }
+                await Verify(result, verifySettings)
+                    .UseDirectory("snapshotResults")
+                    .UseFileName(TestContext.CurrentContext.TestName());
+            }
+            catch (SnowflakeDbException dbex)
+            {
+                var result = dbex.Message + Environment.NewLine + "".PadLeft(40, '-') + Environment.NewLine + lineReader;
+                await Verifier.Verify(query, verifySettings)
+                    .UseDirectory("errorQueries")
+                    .UseFileName(TestContext.CurrentContext.TestName());
+                await Verifier.Verify(result, verifyErrorSettings)
+                    .UseFileName(TestContext.CurrentContext.TestName());
+            }
+            catch (Exception ex)
+            {
+
+                throw;
+            }
+        }
+
+        protected override string Query<T>(T queryInfo) where T : class
+            => SnowflakeTestCases.Query(queryInfo);
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestVariationEncounterChargeQuery.cs b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestVariationEncounterChargeQuery.cs
new file mode 100644
index 0000000..10d6119
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/IntegrationTests/TestVariationEncounterChargeQuery.cs
@@ -0,0 +1,70 @@
+using Dapper;
+using Snowflake.Data.Client;
+using Strata.DecisionSupport.Biz.Encounters;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Services;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.DecisionSupport.Biz.Test.Integration.IntegrationTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Integration"), Category("DSS")]
+    public class TestVariationEncounterChargeQuery : IntegrationTestBase
+    {
+        [TestCaseSource(nameof(VariationEncounterChargeQueryTestCases))]
+        public async Task VariationEncounterChargeQueryTest(VariationEncounterChargeQueryInfo queryInfo)
+        {
+
+            var query = EncounterQueries.VariationEncounterChargeQuery(queryInfo.First, queryInfo.Rows, queryInfo.Args());
+
+            try
+            {
+                var result = ((IEnumerable<VariationEncounterChargeInfo>)(await _databaseContext
+                    .QueryAsync<VariationEncounterChargeInfo>(query, nameof(VariationEncounterChargeQueryTest), queryInfo.Parameters())));
+                await Verifier.Verify(query, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName(nameof(query)));
+                await Verifier.Verify(result, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName(nameof(result)));
+            }
+            catch (SnowflakeDbException dbex)
+            {
+                // ILB
+            }
+            catch (Exception ex)
+            {
+
+                throw;
+            }
+        }
+
+        [TestCaseSource(nameof(VariationEncounterChargeQueryTestCases))]
+        public async Task VariationEncounterChargeInfoServiceTest(VariationEncounterChargeQueryInfo queryInfo)
+        {
+            try
+            {
+                var result = await _encounterQueryService.RunVariationEncounterChargeQuery(queryInfo, CancellationToken.None);
+                await Verifier.Verify(result, verifySettings)
+                    .UseFileName(TestContext.CurrentContext.TestName(nameof(result)));
+            }
+            catch (SnowflakeDbException dbex)
+            {
+                // ILB
+            }
+            catch (Exception ex)
+            {
+                throw;
+            }
+        }
+
+        public static IEnumerable<TestCaseData> VariationEncounterChargeQueryTestCases()
+        {
+            yield return new TestCaseData(new VariationEncounterChargeQueryInfo(false, false, false, false, false, true,
+                new Guid[] { Guid.NewGuid() },
+                new int[] { 1, 2 }, 1, 1000))
+                .SetName("{m}");
+        }
+
+
+    }
+
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/ServiceCollectionFactory.cs b/tests/Strata.DecisionSupport.Biz.Test.Integration/ServiceCollectionFactory.cs
new file mode 100644
index 0000000..6d2b4df
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/ServiceCollectionFactory.cs
@@ -0,0 +1,36 @@
+using Microsoft.Extensions.DependencyInjection;
+using Strata.ApiLib.Core.Cors.Extensions;
+using Strata.ApiLib.Core.StrataAuthentication.Bootstrappers;
+using Strata.Configuration.Client.DependencyInjection.ConsoleApps;
+using Strata.ContinuousImprovement.Biz.Configurations;
+using Strata.DecisionSupport.Biz.Configurations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Strata.DecisionSupport.Biz.Test.Integration
+{
+    [ExcludeFromCodeCoverage]
+    public static class ServiceCollectionFactory
+    {
+        public static IServiceCollection Create()
+        {
+            var services = new ServiceCollection();
+            try
+            {
+                var configuration = StrataConfigurationFactory.GetConfiguration();
+                services.AddSingleton(configuration);
+                services.AddStrataAuthentication(configuration);
+                services.AddStrataCors(configuration);
+                services.AddContinuousImprovementServices(configuration);
+                services.AddDecisionSupportServices(configuration);
+                services.AddLogging();
+            }
+            catch (Exception ex)
+            {
+
+                throw;
+            }
+
+            return services;
+        }
+    }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/SnowflakeTestConnectionStringBuilderFactory.cs b/tests/Strata.DecisionSupport.Biz.Test.Integration/SnowflakeTestConnectionStringBuilderFactory.cs
new file mode 100644
index 0000000..02187f7
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/SnowflakeTestConnectionStringBuilderFactory.cs
@@ -0,0 +1,96 @@
+using Amazon.SecretsManager.Extensions.Caching;
+using Amazon.SecretsManager.Model;
+using Microsoft.Extensions.Options;
+using Strata.SnowflakeLib;
+using Strata.SnowflakeLib.Configuration;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.ExceptionServices;
+
+namespace Strata.DecisionSupport.Biz.Test.Integration
+{
+    public class SnowflakeTestConnectionStringBuilderFactory : ISnowflakeConnectionStringBuilderFactory
+    {
+        private readonly SecretsManagerCache _secretsManagerCache;
+        private readonly SnowflakeOptions _snowflakeOptions;
+
+        /// <summary>
+        /// Constructor that uses configuration values to generate the factory
+        /// </summary>
+        /// <param name="logger">logger to allow output of message to our centralized logging system</param>
+        /// <param name="secretsManagerCache">aws secrets manager cache injected during DI for faster lookup</param>
+        /// <param name="snowflakeOptions">The options class that holds configuration, forcing the consumer of the nuget to have certain settings</param>
+        /// <param name="claimsPrincipalAccessor">Claims accessor object to expose an interface to pull the identity and database information</param>
+        public SnowflakeTestConnectionStringBuilderFactory(
+            [NotNull] SecretsManagerCache secretsManagerCache,
+            //[NotNull] 
+            IOptions<SnowflakeOptions> snowflakeOptions)
+        {
+            try
+            {
+                _secretsManagerCache = secretsManagerCache ?? throw new ArgumentNullException(nameof(secretsManagerCache));
+                _snowflakeOptions = snowflakeOptions?.Value ?? throw new ArgumentNullException(nameof(snowflakeOptions));
+            }
+            catch (Exception ex)
+            {
+
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Method to get a snowflake connection string through secrets manager. 
+        /// </summary>
+        /// <param name="secretName">The aws secret name to lookup the snowflake connection string</param>
+        /// <returns>The connection string builder for the connection string stored at the awws secret name</returns>
+        public async Task<SnowflakeConnectionStringBuilder> CreateAsync(string secretName)
+        {
+            return await CreateAsync(secretName, Guid.Empty);
+        }
+
+        /// <summary>
+        /// Method to get a snowflake connection string through secrets manager. 
+        /// </summary>
+        /// <param name="secretName">The aws secret name to lookup the snowflake connection string</param>
+        /// <param name="databaseGuid">The database guid used to make the connection</param>
+        /// <returns>The connection string builder for the connection string stored at the awws secret name</returns>
+        public async Task<SnowflakeConnectionStringBuilder> CreateAsync(string secretName, Guid databaseGuid)
+        {
+            SnowflakeConnectionStringBuilder builder = null;
+
+            try
+            {
+                var snowflakeConnectionString = await _secretsManagerCache.GetSecretString(secretName);
+
+                builder = new SnowflakeConnectionStringBuilder(snowflakeConnectionString)
+                {
+
+                    URL = _snowflakeOptions.Url,
+                    Account = _snowflakeOptions.Account,
+                    // IgnoreCase = true,
+                    // QueryPassthrough = true,
+                    Timeout = (int)TimeSpan.FromHours(10).TotalSeconds,
+                    // Other = "RetryStatusCodes=500"
+                    DatabaseGuid = databaseGuid
+                };
+            }
+            catch (ResourceNotFoundException e)
+            {
+                ExceptionDispatchInfo.Capture(e).Throw();
+            }
+            catch (InvalidRequestException e)
+            {
+                ExceptionDispatchInfo.Capture(e).Throw();
+            }
+            catch (InvalidParameterException e)
+            {
+                ExceptionDispatchInfo.Capture(e).Throw();
+            }
+            catch (Exception e)
+            {
+                ExceptionDispatchInfo.Capture(e).Throw();
+            }
+
+            return builder;
+        }
+    }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/Strata.DecisionSupport.Biz.Test.Integration.csproj b/tests/Strata.DecisionSupport.Biz.Test.Integration/Strata.DecisionSupport.Biz.Test.Integration.csproj
new file mode 100644
index 0000000..c700518
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/Strata.DecisionSupport.Biz.Test.Integration.csproj
@@ -0,0 +1,55 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="SnowflakeTestConnectionStringBuilderFactory.cs" />
+    <Compile Remove="StrataSnowflakeConnectionExtensions.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageReference Include="Strata.ApiLib.Core" Version="8.4.1" />
+    <PackageReference Include="Strata.Configuration.Client" Version="9.15.1" />
+    <PackageReference Include="Strata.SnowflakeLib" Version="4.3.0" />
+    <PackageReference Include="Verify.NUnit" Version="29.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Strata.DecisionSupport.Biz\Strata.DecisionSupport.Biz.csproj" />
+    <ProjectReference Include="..\Strata.DecisionSupport.Biz.Test.Unit\Strata.DecisionSupport.Biz.Test.Unit.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="IntegrationTests\snapshotResults\" />
+    <Folder Include="IntegrationTests\snapshotQueries\" />
+    <Folder Include="IntegrationTests\snapshots\" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/TestExtensions.cs b/tests/Strata.DecisionSupport.Biz.Test.Integration/TestExtensions.cs
new file mode 100644
index 0000000..10547e9
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/TestExtensions.cs
@@ -0,0 +1,48 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
+
+namespace Strata.DecisionSupport.Biz.Test.Integration
+{
+    [ExcludeFromCodeCoverage]
+    public static class TestExtensions
+    {
+        /// <summary>
+        /// The test name
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns>
+        /// The name of the test split by camel case for a max length of 200 characters.
+        /// </returns>
+        public static string TestName(this TestContext context, string suffix = "")
+        {
+            var testName = suffix == string.Empty
+                ? $"{context.Test.Name}".SplitCamelCase()
+                : $"{context.Test.Name} - {suffix}".SplitCamelCase();
+            testName = testName[..Math.Min(200, testName.Length)];
+            return testName;
+        }
+
+        public static string SplitCamelCase(this string input)
+        {
+            if (string.IsNullOrEmpty(input)) { return input; }
+
+            const string pattern = "([a-z](?=[A-Z])|[A-Z](?=[A-Z][a-r + t-z])|[A-Z](?=[A-Z][s][a-z]))";
+
+            if (input.StartsWith("FY", StringComparison.Ordinal))
+            {   // hack for FY2012, etc
+                return "FY " + Regex.Replace(input.Remove(0, 2), pattern, "$1 ");
+            }
+            input = Regex.Replace(input, @"\{|\}|:|,|\)|\(", "", RegexOptions.Singleline | RegexOptions.IgnoreCase);
+            return Regex.Replace(input, pattern, "$1 ");
+        }
+
+        public static VerifySettings TestSettings()
+        {
+            var settings = new VerifySettings();
+            settings.UseDirectory("snapshots");
+            settings.ScrubInlineGuids();
+            return settings;
+        }
+
+    }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Integration/appsettings.json b/tests/Strata.DecisionSupport.Biz.Test.Integration/appsettings.json
new file mode 100644
index 0000000..4886b53
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Integration/appsettings.json
@@ -0,0 +1,55 @@
+{
+  "AllowedHosts": "*",
+  "Version": "0.0.0",
+  "configuration": {
+    "basicAuthUsername": "BkQsRDdmdjkFNhKVuTI.TpujQJXuKhGDcV.F_hjADMRTaEUWMJnviaesoOrhhfnz",
+    "basicAuthPassword": "GWPIIWECDqh.hjDNdpxVEfeFe-bYFwPSx-oBGFD_od_SUQVk-QqTIkZY_NXMeqeo"
+  },
+  "endpoints": {
+    "dataschema": "https://dataschema-api.dev.stratanetwork.net/",
+    "schema": "https://schema-api.dev.stratanetwork.net",
+    "analytics": "https://analytics-api.dev.stratanetwork.net"
+  },
+  "StrataConfigServerBaseUrl": "https://configuration.dev.stratanetwork.net",
+  "NetworkOpportunity": {
+    "Creators": [ "" ]
+  },
+  "HealthCheck": {
+    "StrataJazz": true,
+    "Snowflake": true
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  },
+  "hangfire": {
+    "url": "https://localhost:44369",
+    "redis": {
+      "prefix": "continuousimprovement-jobs-service",
+      "configOptions": "ddenredisc01.sdt.local:6379,ddenredisc02.sdt.local:6379,ddenredisc03.sdt.local:6379,ddenredisc04.sdt.local:6379,ddenredisc05.sdt.local:6379,ddenredisc06.sdt.local:6379"
+    }
+  },
+  "accessGudid": {
+    "url": "https://accessgudid.nlm.nih.gov/download/delimited"
+  },
+  "datadog": {
+    "seedgmdnjob": "https://app.datadoghq.com/logs/livetail?query=service%3ASeedGMDNTermDataJob%20env%3Adev&cols=status%2Cenv%2C%40db.strata_id%2C%40db.org_pin%2C%40db.name%2C%40db.instance%2C%40process.name%2Cservice&index=%2A&messageDisplay=inline&stream_sort=desc&viz=stream&from_ts=1692207497147&to_ts=1692293897147&live=true"
+  },
+  "aws": {
+    "snowflakeAdminSecretName": "stratareplication/snowflake/automation/connectionstring"
+  },
+  "strataApi": {
+    "clientSecret": "V_okTrkWYBs-PqMP.inbJShIvMGWcpdqCDq_ZjntVF.ydgRCoYaDVJYEWEIdsjJ_"
+  },
+  "ChargeCodeOpportunityValidation": {
+    "maxChargeCodeSelections": 100,
+    "maxOpportunityLevelSelections": 10
+  },
+  "Snowflake": {
+    "Url": "https://stratadev.us-east-1.privatelink.snowflakecomputing.com",
+    "Account": "stratadev"
+  }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/AllChargeInfoQueryTests.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/AllChargeInfoQueryTests.cs
new file mode 100644
index 0000000..f2d858e
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/AllChargeInfoQueryTests.cs
@@ -0,0 +1,27 @@
+using Strata.DecisionSupport.Biz.Services;
+using System.Threading.Tasks;
+using VerifyNUnit;
+using VerifyTests;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit.Services
+{
+    [TestFixture, Category("Unit"), Category("DSS")]
+    public class AllChargeInfoQueryTests //: EncounterQueryServiceTests
+    {
+        private VerifySettings _verifySettings;
+
+        [SetUp]
+        public void TestSetUp()
+        {
+            _verifySettings = TestExtensions.TestSettings();
+        }
+
+        [Test]
+        public async Task AllChargeInfoQueryTest()
+        {
+            var query = EncounterQueries.AllChargeInfoQuery();
+            await Verifier.Verify(query, _verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+    }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/ChargeInfoQueryTests.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/ChargeInfoQueryTests.cs
new file mode 100644
index 0000000..c0b2a7e
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/ChargeInfoQueryTests.cs
@@ -0,0 +1,18 @@
+using Strata.DecisionSupport.Biz.Services;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit.Services
+{
+    [TestFixture, Category("Unit"), Category("DSS")]
+    public class ChargeInfoQueryTests : EncounterQueryServiceTests
+    {
+        [Test]
+        public async Task ChargeInfoQueryTest()
+        {
+            var query = EncounterQueries.ChargeInfoQuery();
+            await Verifier.Verify(query, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+    }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/DepartmentEncounterUnitOfServiceQueryTests.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/DepartmentEncounterUnitOfServiceQueryTests.cs
new file mode 100644
index 0000000..1c983d2
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/DepartmentEncounterUnitOfServiceQueryTests.cs
@@ -0,0 +1,77 @@
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Services;
+using Strata.DecisionSupport.Models.Encounters;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit.Services
+{
+    [TestFixture, Category("Unit"), Category("DSS")]
+    public class DepartmentEncounterUnitOfServiceQueryTests : EncounterQueryServiceTests
+    {
+        [SetUp]
+        public void TestSetUp()
+        {
+            var uos = new List<DepartmentEncounterUnitOfService>
+            {
+                new DepartmentEncounterUnitOfService
+                {
+                    DepartmentId = 1,
+                    EncounterId = 2,
+                    CostDriver = "LOS",
+                    EntityId = 2,
+                    Uos = 19.2486d
+                }
+            };
+            //Mock.Get(snowflakeDbContext)
+            //    .Setup(x => x.QueryAsync<DepartmentEncounterUnitOfService>(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<object>(), It.IsAny<TimeSpan>()))
+            //    .Returns(() => Task.FromResult(uos));
+        }
+
+        [TestCaseSource(nameof(DepartmentEncounterUnitOfServiceQueryTestCases))]
+        public async Task DepartmentEncounterUnitOfServiceQueryTest(string globalId)
+        {
+            var query = globalId.DepartmentEncounterUnitOfServiceQuery("DepartmentRollup1Id");
+            await Verifier.Verify(query, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+            Console.WriteLine(query);
+        }
+
+        public static IEnumerable<TestCaseData> DepartmentEncounterUnitOfServiceQueryTestCases()
+        {
+            yield return new TestCaseData("")
+                .SetName("{m} Entity");
+            yield return new TestCaseData("Location")
+                .SetName("{m} Location");
+            yield return new TestCaseData("DepartmentRollup1Id")
+                .SetName("{m} Department Rollup");
+        }
+
+        [TestCaseSource(nameof(EncounterUnitOfServiceQueryTestCases))]
+        public async Task RunDepartmentEncounterUnitOfServiceQueryTest(string globalId, int observationUnitsDivisor, IEnumerable<long> encounterIds)
+        {
+            var queryInfo = new DepartmentEncounterUnitOfServiceQueryInfo(globalId, observationUnitsDivisor, encounterIds);
+            var result = await service.RunDepartmentEncounterUnitOfServiceQuery(queryInfo, CancellationToken.None);
+            await Verifier.Verify(result, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        public static IEnumerable<TestCaseData> EncounterUnitOfServiceQueryTestCases()
+        {
+            yield return new TestCaseData("", 24, new[] { 2L })
+                .SetName("{m} Entity 24 { 2 }")
+                .Ignore("System.ArgumentException : Invalid callback. Setup on method with return type 'Task<IEnumerable<DepartmentEncounterUnitOfService>>' cannot invoke callback with return type 'Task<List<DepartmentEncounterUnitOfService>>'");
+            yield return new TestCaseData("Location", 24, new[] { 2L })
+                .SetName("{m} Location 24 { 2 }")
+                .Ignore("System.ArgumentException : Invalid callback. Setup on method with return type 'Task<IEnumerable<DepartmentEncounterUnitOfService>>' cannot invoke callback with return type 'Task<List<DepartmentEncounterUnitOfService>>'");
+            yield return new TestCaseData("Department Rollup 1", 24, new[] { 2L })
+                .SetName("{m} Department Rollup 24 { 2 }")
+                .Ignore("System.ArgumentException : Invalid callback. Setup on method with return type 'Task<IEnumerable<DepartmentEncounterUnitOfService>>' cannot invoke callback with return type 'Task<List<DepartmentEncounterUnitOfService>>'");
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterChargeQueryTests.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterChargeQueryTests.cs
new file mode 100644
index 0000000..b0ceb23
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterChargeQueryTests.cs
@@ -0,0 +1,20 @@
+using Strata.DecisionSupport.Biz.Services;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit.Services
+{
+    [TestFixture, Category("Unit"), Category("DSS")]
+    public class EncounterChargeQueryTests : EncounterQueryServiceTests
+    {
+        [Test]
+        public async Task EncounterChargeQueryTest()
+        {
+            var query = EncounterQueries.EncounterChargeQuery();
+            await Verifier.Verify(query, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterCostInfoQueryTests.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterCostInfoQueryTests.cs
new file mode 100644
index 0000000..1d7bcc4
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterCostInfoQueryTests.cs
@@ -0,0 +1,70 @@
+using FluentAssertions;
+using Moq;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Services;
+using Strata.DecisionSupport.Models.Encounters;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit.Services
+{
+    [TestFixture, Category("Unit"), Category("DSS")]
+    public class EncounterCostInfoQueryTests : EncounterQueryServiceTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+            var encounterCost = new List<EncounterCostInfo>
+            {
+                new EncounterCostInfo
+                {
+                    EncounterId = 123456789,
+                    EntityId = 2,
+                    ChargeCodeId = 210,
+                    CostDriver = "LOS"
+
+                }
+            }.AsEnumerable();
+            Mock.Get(snowflakeDbContext)
+                .Setup(x => x.QueryAsync<EncounterCostInfo>(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<object>(), It.IsAny<TimeSpan>()))
+                .Returns(() => Task.FromResult(encounterCost));
+        }
+
+        [TestCase("", true, TestName = "{m} Specific Entity")]
+        [TestCase("Location", true, TestName = "{m} Specific Location")]
+        [TestCase("DepartmentRollup1Id", true, TestName = "{m} Specific Department Rollup")]
+        [TestCase("", false, TestName = "{m} Static Entity")]
+        [TestCase("Location", false, TestName = "{m} Static Location")]
+        [TestCase("DepartmentRollup1Id", false, TestName = "{m} Static Department Rollup")]
+        public async Task EncounterCostInfoQueryTest(string globalId, bool isPatientSpecific)
+        {
+            var query = globalId.EncounterCostInfoQuery(isPatientSpecific, "DepartmentRollup1Id", "AND cc.CostDriver <> ''  \r\n    AND cc.CostDriver <> 'Excluded' ");
+            await Verifier.Verify(query, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        [TestCaseSource(nameof(EncounterCostInfoQueryTestCases))]
+        public async Task RunEncounterCostInfoQueryTest(bool isPatientSpecific, string deptRollupId)
+        {
+            var queryInfo = new EncounterCostQueryInfo(isPatientSpecific, configurationGuid, string.Empty, deptRollupId, new[] { 2L });
+            var results = await service.RunEncounterCostInfoQuery(queryInfo, CancellationToken.None);
+            results.Should().NotBeNullOrEmpty()
+                .And.AllBeOfType<EncounterCostInfo>();
+        }
+
+        public static IEnumerable<TestCaseData> EncounterCostInfoQueryTestCases()
+        {
+            yield return new TestCaseData(true, "").SetName("{m} {p}");
+            yield return new TestCaseData(false, "").SetName("{m} {p}");
+            yield return new TestCaseData(true, "DepartmentRollup1ID").SetName("{m} {p}");
+            yield return new TestCaseData(false, "DepartmentRollup1ID").SetName("{m} {p}");
+            yield return new TestCaseData(true, "Location").SetName("{m} {p}");
+            yield return new TestCaseData(false, "Location").SetName("{m} {p}");
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterInfoQueryTests.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterInfoQueryTests.cs
new file mode 100644
index 0000000..228b8ef
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterInfoQueryTests.cs
@@ -0,0 +1,104 @@
+using Moq;
+using Strata.DecisionSupport.Biz.Encounters;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit.Services
+{
+    [TestFixture, Category("Unit"), Category("DSS")]
+    public class EncounterInfoQueryTests : EncounterQueryServiceTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+            var encounterInfo = new List<SnowflakeEncounterInfo> {
+                new SnowflakeEncounterInfo
+                {
+                    EncounterId = 123456789,
+                    EncounterRecordNumber = "123456789"
+                }
+            }.AsEnumerable();
+            Mock.Get(snowflakeDbContext)
+                .Setup(x => x.QueryAsync<SnowflakeEncounterInfo>(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<object>(), It.IsAny<TimeSpan>()))
+                .Returns(() => Task.FromResult(encounterInfo));
+        }
+
+        [TestCaseSource(nameof(EncounterInfoQueryTestCases))]
+        public async Task EncounterInfoQueryTest(string globalId, params object[] args)
+        {
+            var query = globalId.EncounterInfoQuery(args);
+            await Verifier.Verify(query, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        public static IEnumerable<TestCaseData> EncounterInfoQueryTestCases()
+        {
+            yield return new TestCaseData("", Array.Empty<object>())
+                .SetName("{m} with no args");
+            yield return new TestCaseData("Location", Array.Empty<object>())
+                .SetName("{m} Location with no args");
+            yield return new TestCaseData("DepartmentRollup1Id", Array.Empty<object>())
+                .SetName("{m} Department Rollup with no args");
+            yield return new TestCaseData("", new[] {
+                "PrimaryServiceLine",
+                "INNER JOIN serviceLineTableName sl on sl.serviceLineIdAttribute = OBJ.serviceLineIdAttribute",
+                "DepartmentRollup1Id",
+                "OBJ.MSDRGCaseTypeFamilyID AS CaseTypeFamilyId\r\n\t,msdrg.CCMCCCategory",
+                "INNER JOIN dss.dimMSDRG msdrg ON obj.ReportingDRGID = msdrg.MSDRGID \r\n       AND ((msdrg.Type IN ('MED', 'SURG') AND ptr.Type = 'Inpatient')\r\n                 OR ptr.Type <> 'Inpatient')"})
+                .SetName("{m} Entity");
+            yield return new TestCaseData("Location", new[] {
+                "PrimaryServiceLine",
+                "INNER JOIN serviceLineTableName sl on sl.serviceLineIdAttribute = OBJ.serviceLineIdAttribute",
+                "DepartmentRollup1Id",
+                "OBJ.MSDRGCaseTypeFamilyID AS CaseTypeFamilyId\r\n\t,msdrg.CCMCCCategory",
+                "INNER JOIN dss.dimMSDRG msdrg ON obj.ReportingDRGID = msdrg.MSDRGID\r\n       AND ((msdrg.Type IN ('MED', 'SURG') AND ptr.Type = 'Inpatient')\r\n             OR ptr.Type <> 'Inpatient')"})
+                .SetName("{m} Location");
+            yield return new TestCaseData("DepartmentRollup1Id", new[] {
+                "PrimaryServiceLine",
+                "INNER JOIN serviceLineTableName sl on sl.serviceLineIdAttribute = OBJ.serviceLineIdAttribute",
+                "DepartmentRollup1Id",
+                "OBJ.MSDRGCaseTypeFamilyID AS CaseTypeFamilyId\r\n\t,msdrg.CCMCCCategory",
+                "INNER JOIN dss.dimMSDRG msdrg ON obj.ReportingDRGID = msdrg.MSDRGID\r\n       AND ((msdrg.Type IN ('MED', 'SURG') AND ptr.Type = 'Inpatient')\r\n             OR ptr.Type <> 'Inpatient')"})
+                .SetName("{m} Department Rollup");
+
+        }
+        [TestCaseSource(nameof(EncounterInfoQueryTestCases1))]
+        public async Task RunEncounterInfoQueryTest(Models.Queries.CaseTypeCategory caseTypeCategory, Guid serviceLineGuid)
+        {
+            var queryInfo = new EncounterQueryInfo(caseTypeCategory, 210,
+                new DateTime(2023, 1, 1), new DateTime(2024, 1, 1), "",
+                serviceLineGuid, 24, new[] { 2 });
+            var results = await service.RunEncounterInfoQuery(queryInfo, CancellationToken.None);
+            await Verifier.Verify(results, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        public static IEnumerable<TestCaseData> EncounterInfoQueryTestCases1()
+        {
+            yield return new TestCaseData(Models.Queries.CaseTypeCategory.MSDRG, serviceLineDimensionGuid)
+                .SetName("RunEncounterInfoQuery Msdrg ServiceLine");
+            yield return new TestCaseData(Models.Queries.CaseTypeCategory.APRDRG, serviceLineDimensionGuid)
+                .SetName("RunEncounterInfoQuery Aprdrg ServiceLine");
+            yield return new TestCaseData(Models.Queries.CaseTypeCategory.CPTCode, serviceLineDimensionGuid)
+                .SetName("RunEncounterInfoQuery CptCode ServiceLine");
+            yield return new TestCaseData(Models.Queries.CaseTypeCategory.PatientPopulation, serviceLineDimensionGuid)
+                .SetName("RunEncounterInfoQuery PatientPop ServiceLine");
+
+            yield return new TestCaseData(Models.Queries.CaseTypeCategory.MSDRG, sg2DimensionGuid)
+                .SetName("RunEncounterInfoQuery Msdrg Sg2");
+            yield return new TestCaseData(Models.Queries.CaseTypeCategory.APRDRG, sg2DimensionGuid)
+                .SetName("RunEncounterInfoQuery Aprdrg Sg2");
+            yield return new TestCaseData(Models.Queries.CaseTypeCategory.CPTCode, sg2DimensionGuid)
+                .SetName("RunEncounterInfoQuery CptCode Sg2");
+            yield return new TestCaseData(Models.Queries.CaseTypeCategory.PatientPopulation, sg2DimensionGuid)
+                .SetName("RunEncounterInfoQuery PatientPop Sg2");
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterQueryServiceTests.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterQueryServiceTests.cs
new file mode 100644
index 0000000..c8d68c2
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterQueryServiceTests.cs
@@ -0,0 +1,122 @@
+using Moq;
+using Strata.CoreLib.Claims;
+using Strata.DecisionSupport.Biz.Services;
+using Strata.DecisionSupport.Biz.Snowflake;
+using Strata.Schema.Client;
+using Strata.Schema.Client.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using VerifyTests;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit.Services
+{
+    [TestFixture, Category("Unit"), Category("DSS")]
+    public class EncounterQueryServiceTests
+    {
+        public VerifySettings verifySettings;
+
+        public EncounterQueryService service { get; set; }
+        public ISnowflakeDatabaseContext snowflakeDbContext { get; set; }
+        public ISchemaServiceClient schemaServiceClient { get; set; }
+        public IClaimsPrincipalAccessor claimsPrincipalAccessor { get; set; }
+
+        internal static Guid configurationGuid { get; set; } = Guid.NewGuid();
+        internal static Guid serviceLineDimensionGuid { get; set; } = Guid.NewGuid();
+        internal static Guid sg2DimensionGuid { get; set; } = Guid.NewGuid();
+        internal static Guid defaultKeyGuid { get; set; } = Guid.NewGuid();
+        internal static Guid defaultLookupKeyGuid { get; set; } = Guid.NewGuid();
+
+        public const string UserGuid = "eb7e4993-c65a-493a-9614-986a55dd0744";
+        public const string DbGuid = "54409f55-5ddf-4748-8222-9ccfb04fb4f5";
+        public const string ClientDbGuid = "1742934B-C508-402B-B8B5-D18C506474CB";
+        public const string Username = "a";
+        public const string Key = UserGuid + Username;
+        public const string DbVersion = "202133";
+
+        [OneTimeSetUp]
+        public void Setup()
+        {
+            verifySettings = TestExtensions.TestSettings();
+            snowflakeDbContext = Mock.Of<ISnowflakeDatabaseContext>();
+
+            var scoreDimension = new ScoreDimensionDto
+            {
+                DimensionGuid = serviceLineDimensionGuid,
+                DefaultKeyGuid = defaultKeyGuid,
+                DefaultLookupKeyGuid = defaultLookupKeyGuid,
+                FriendlyName = "ServiceLine",
+                SourceTableSchema = "fw",
+                SourceTableName = "serviceLine",
+                Attributes = new List<ScoreAttributeDto>
+                {
+                    new ScoreAttributeDto
+                    {
+                        AttributeGuid = defaultKeyGuid,
+                        SqlColumnName = "Name"
+                    },
+                    new ScoreAttributeDto
+                    {
+                        AttributeGuid = defaultLookupKeyGuid,
+                        SqlColumnName = "Name"
+                    }
+                }
+            };
+            var sg2Dimension = new ScoreDimensionDto
+            {
+                DimensionGuid = serviceLineDimensionGuid,
+                DefaultKeyGuid = defaultKeyGuid,
+                DefaultLookupKeyGuid = defaultLookupKeyGuid,
+                FriendlyName = "Sg2 Service Line Crosswalk",
+                SourceTableSchema = "fw",
+                SourceTableName = "serviceLine",
+                Attributes = new List<ScoreAttributeDto>
+                {
+                    new ScoreAttributeDto
+                    {
+                        AttributeGuid = defaultKeyGuid,
+                        SqlColumnName = "Name"
+                    },
+                    new ScoreAttributeDto
+                    {
+                        AttributeGuid = defaultLookupKeyGuid,
+                        SqlColumnName = "Name"
+                    }
+                }
+            };
+            schemaServiceClient = Mock.Of<ISchemaServiceClient>();
+            Mock.Get(schemaServiceClient)
+                .Setup(x => x.GetGMDimensionAsync(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
+                .Returns<Guid, CancellationToken>((dimensionGuid, token) =>
+                    dimensionGuid.Equals(serviceLineDimensionGuid)
+                        ? Task.FromResult(scoreDimension)
+                        : Task.FromResult(sg2Dimension));
+
+            claimsPrincipalAccessor = Mock.Of<IClaimsPrincipalAccessor>();
+            var claims = new List<Claim>
+            {
+                new Claim(ClaimTypes.Name, "Name"),
+                new Claim(StrataClaims.UserGuid, UserGuid),
+                new Claim(StrataClaims.Username, Username),
+                new Claim("given_name", "Firstname"),
+                new Claim("family_name", "Lastname"),
+                new Claim(StrataClaims.FirstName, "Firstname"),
+                new Claim(StrataClaims.LastName, "Lastname"),
+                new Claim(StrataClaims.DatabaseVersion, DbVersion),
+                new Claim(StrataClaims.DatabaseGuid, ClientDbGuid),
+                new Claim(StrataClaims.IsSdtEmployee,true.ToString())
+            };
+            var claimIdentity = new ClaimsIdentity(claims, "mock");
+            var claimsPrincipal = new ClaimsPrincipal(new[] { claimIdentity });
+
+            Mock.Get(claimsPrincipalAccessor)
+                .Setup(x => x.GetCurrentClaimsPrincipal())
+                .Returns(claimsPrincipal);
+
+            service = new EncounterQueryService(snowflakeDbContext, schemaServiceClient);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterUnitOfServiceQueryTests.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterUnitOfServiceQueryTests.cs
new file mode 100644
index 0000000..5a12cf5
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/EncounterUnitOfServiceQueryTests.cs
@@ -0,0 +1,20 @@
+using Strata.DecisionSupport.Biz.Services;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit.Services
+{
+    [TestFixture, Category("Unit"), Category("DSS")]
+    public class EncounterUnitOfServiceQueryTests : EncounterQueryServiceTests
+    {
+        [Test]
+        public async Task EncounterUnitOfServiceQueryTest()
+        {
+            var query = EncounterQueries.EncounterUnitOfServiceQuery();
+            await Verifier.Verify(query, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/LOSOpportunityInfoQueryTests.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/LOSOpportunityInfoQueryTests.cs
new file mode 100644
index 0000000..5a57c7a
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/LOSOpportunityInfoQueryTests.cs
@@ -0,0 +1,18 @@
+using Strata.DecisionSupport.Biz.Services;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit.Services
+{
+    [TestFixture, Category("Unit"), Category("DSS")]
+    public class LOSOpportunityInfoQueryTests : EncounterQueryServiceTests
+    {
+        [Test]
+        public async Task LOSOpportunityInfoQueryTest()
+        {
+            var query = EncounterQueries.LOSOpportunityInfoQuery();
+            await Verifier.Verify(query, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/VariationEncounterChargeQueryTests.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/VariationEncounterChargeQueryTests.cs
new file mode 100644
index 0000000..e5cc8dd
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/Services/VariationEncounterChargeQueryTests.cs
@@ -0,0 +1,61 @@
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Services;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using VerifyNUnit;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit.Services
+{
+    [TestFixture, Category("Unit"), Category("DSS")]
+    public class VariationEncounterChargeQueryTests : EncounterQueryServiceTests
+    {
+
+        [TestCaseSource(nameof(VariationEncounterChargeQueryTestCaseDetails))]
+        public async Task VariationEncounterChargeQueryTest(bool hasManufacturerClientDSS, bool isManufacturerInferred,
+            bool hasSupplyClientDSS, bool isSupplyInferred, bool isUsingCustomEntityDimension,
+            bool hasChargeCodeIds)
+        {
+            var queryInfo = new VariationEncounterChargeQueryInfo(hasManufacturerClientDSS, isManufacturerInferred,
+                hasSupplyClientDSS, isSupplyInferred, isUsingCustomEntityDimension, true,
+                new Guid[] { },
+                hasChargeCodeIds ? new int[] { 1, 2 } : new int[] { },
+                1, 1000);
+            var query = EncounterQueries.VariationEncounterChargeQuery(queryInfo.First, queryInfo.Rows, queryInfo.Args());
+            await Verifier.Verify(query, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        public static IEnumerable<TestCaseData> VariationEncounterChargeQueryTestCaseDetails()
+        {
+            yield return new TestCaseData(true, true, true, true, true, true).SetName("{m} (1)");
+            yield return new TestCaseData(false, false, true, true, true, true).SetName("{m} (2)");
+            yield return new TestCaseData(true, true, false, false, true, true).SetName("{m} (3)");
+            yield return new TestCaseData(false, false, false, false, true, false).SetName("{m} (4)");
+        }
+
+        [TestCaseSource(nameof(VariationEncounterChargeQueryTestCases))]
+        public async Task VariationEncounterChargeQueryTestFromCases(VariationEncounterChargeQueryInfo queryInfo)
+        {
+            var query = EncounterQueries.VariationEncounterChargeQuery(queryInfo.First, queryInfo.Rows, queryInfo.Args());
+            await Verifier.Verify(query, verifySettings)
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        public static IEnumerable<TestCaseData> VariationEncounterChargeQueryTestCases()
+        {
+            yield return new TestCaseData(new VariationEncounterChargeQueryInfo(true, true, true, true, true, true,
+                new Guid[] { }, new int[] { },
+                1, 1000)).SetName("{m} (1)");
+            yield return new TestCaseData(new VariationEncounterChargeQueryInfo(false, false, false, false, false, false,
+                new Guid[] { }, new int[] { 1, 2 },
+                1, 1000)).SetName("{m} (2)");
+            yield return new TestCaseData(new VariationEncounterChargeQueryInfo(true, true, true, true, true, true,
+                new Guid[] { }, new int[] { },
+                1, 1000)).SetName("{m} (3)");
+            yield return new TestCaseData(new VariationEncounterChargeQueryInfo(false, false, false, false, false, false,
+                new Guid[] { }, new int[] { 1, 2 },
+                1, 1000)).SetName("{m} (4)");
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/SnowflakeTestCases.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/SnowflakeTestCases.cs
new file mode 100644
index 0000000..5fe6924
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/SnowflakeTestCases.cs
@@ -0,0 +1,185 @@
+using Strata.DecisionSupport.Biz.Encounters;
+using Strata.DecisionSupport.Biz.Parameters;
+using Strata.DecisionSupport.Biz.Services;
+using Strata.DecisionSupport.Models.Encounters;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit
+{
+    public static class SnowflakeTestCases
+    {
+        public static string LineReader(this string query)
+            => string.Join("", query.Split(Environment.NewLine)
+                .Select((l, i) => $"{i:G}".PadLeft(3, ' ') + ": " + l + Environment.NewLine));
+
+        public static string Query<T>(T queryInfo) where T : class
+        {
+            var args = queryInfo is IWithArgs hasArgs ? hasArgs.Args() : [];
+            var globalId = queryInfo is IWithGlobalId hasGlobalId ? hasGlobalId.GlobalId() : "";
+            var patientSpecific = queryInfo is IWithPatientSpecific hasPatientSpecific ? hasPatientSpecific.PatientSpecific() : false;
+            var first = 0; var rows = 1000;
+            if (queryInfo is EncounterQueryInfo encounterQueryInfo)
+            {
+                args = encounterQueryInfo.Args("sl.serviceLineid", "INNER JOIN fw.DimServiceLine sl on sl.ServiceLineId = OBJ.ServiceLineId");
+            }
+            else if (queryInfo is EncounterChargeQueryInfo encounterChargeQueryInfo)
+            {
+                first = encounterChargeQueryInfo.First;
+                rows = encounterChargeQueryInfo.Rows;
+            }
+            else if (queryInfo is VariationEncounterChargeQueryInfo variationEncounterChargeQueryInfo)
+            {
+                first = variationEncounterChargeQueryInfo.First;
+                rows = variationEncounterChargeQueryInfo.Rows;
+            }
+            return typeof(T).Name switch
+            {
+                nameof(AllChargeQueryInfo) => EncounterQueries.AllChargeInfoQuery(args),
+                nameof(ChargeQueryInfo) => EncounterQueries.ChargeInfoQuery(args),
+                nameof(DepartmentEncounterUnitOfServiceQueryInfo) => EncounterQueries.DepartmentEncounterUnitOfServiceQuery(globalId, args),
+                nameof(EncounterChargeQueryInfo) => EncounterQueries.EncounterChargeQuery(first, rows, args),
+                nameof(EncounterCostQueryInfo) => EncounterQueries.EncounterCostInfoQuery(globalId, patientSpecific, args),
+                nameof(EncounterQueryInfo) => EncounterQueries.EncounterInfoQuery(globalId, args),
+                nameof(EncounterUnitOfServiceQueryInfo) => EncounterQueries.EncounterUnitOfServiceQuery(args),
+                nameof(LOSOpportunityQueryInfo) => EncounterQueries.LOSOpportunityInfoQuery(args),
+                nameof(VariationEncounterChargeQueryInfo) => EncounterQueries.VariationEncounterChargeQuery(first, rows, args),
+                _ => $""
+            };
+        }
+
+        //Revisit these test cases for department rollups
+        //If we're validating the query text there shouldn't be any string manipulation in here
+        public static IEnumerable<TestCaseData> TestCases()
+        {
+            var assembly = AppDomain.CurrentDomain.GetAssemblies()
+                .SingleOrDefault(a => a.GetName().Name.Equals("Strata.DecisionSupport.Biz", StringComparison.OrdinalIgnoreCase));
+            var thisAssembly = Assembly.GetExecutingAssembly();
+            var resourceNames = assembly.GetManifestResourceNames()
+                .Where(r => r.EndsWith(".sql")).ToList();
+            var testCases = assembly.GetManifestResourceNames()
+                .Where(r => r.EndsWith(".json")).ToList();
+
+            foreach (var resource in resourceNames)
+            {
+                var name = resource.Split('.').TakeLast(2).First();
+                var globalId = string.Empty;
+                var testName = "{c}" + name;
+                switch (name)
+                {
+                    case "Billing":
+                    case "WithEncounterUnitOfServiceQuery":
+                        break;
+                    case "AllChargeInfoQuery":
+                        yield return new TestCaseData(new AllChargeInfo(), new AllChargeQueryInfo(
+                            Guid.NewGuid(),
+                            [1, 2]
+                            ), null).SetName(testName);
+                        break;
+                    case "ChargeInfoQuery":
+                        yield return new TestCaseData(new ChargeInfo(), new ChargeQueryInfo(
+                            Guid.NewGuid(),
+                            2,
+                            [1, 2],
+                            Guid.NewGuid()
+                            ), new Func<IEnumerable<ChargeInfo>, IEnumerable<ChargeInfo>>(x => x.OrderBy(y => y.ChargeCodeId)
+                            )).SetName(testName);
+                        break;
+                    case "DepartmentEncounterUnitOfServiceDepartmentRollupQuery":
+                        break;
+                    case "DepartmentEncounterUnitOfServiceEntityQuery":
+                    case "DepartmentEncounterUnitOfServiceLocationQuery":
+                        globalId = Regex.Replace(name, ".*UnitOfService(.*)Query", "$1")
+                            .Replace("DepartmentRollup", "DepartmentRollup1")
+                            .Replace("Entity", "");
+                        yield return new TestCaseData(new DepartmentEncounterUnitOfService(), new DepartmentEncounterUnitOfServiceQueryInfo
+                        (
+                            globalId,
+                            24,
+                            [2L]
+                        ), null).SetName(testName);
+                        break;
+                    case "EncounterChargeQuery":
+                        yield return new TestCaseData(new EncounterChargeInfo(), new EncounterChargeQueryInfo(
+                            false, false,
+                            false, false,
+                            false, true,
+                            Guid.NewGuid(), [1]), null)
+                            .SetName(testName);
+                        yield return new TestCaseData(new EncounterChargeInfo(), new EncounterChargeQueryInfo(
+                            true, false,
+                            true, false,
+                            true, true,
+                            Guid.NewGuid(), [1]), null)
+                            .SetName($"{testName} hasManufacturer hasSupply usingCustomDimension");
+                        yield return new TestCaseData(new EncounterChargeInfo(), new EncounterChargeQueryInfo(
+                            true, true,
+                            true, true,
+                            true, true,
+                            Guid.NewGuid(), [1]), null)
+                            .SetName($"{testName} hasManufacturer Inferred hasSupply Inferred usingCustomDimension")
+                            .Ignore("Temporarily ignored: investigate manufacturer/supply table logic. This test always fails due to table not found.");
+                        break;
+                    case "EncounterInfoDepartmentRollupQuery":
+                        break;
+                    case "EncounterInfoEntityQuery":
+                    case "EncounterInfoLocationQuery":
+                        globalId = Regex.Replace(name, ".*Info(.*)Query", "$1")
+                            .Replace("DepartmentRollup", "DepartmentRollup1")
+                            .Replace("Entity", "");
+                        var skipCaseTypeCategories = new Models.Queries.CaseTypeCategory[] { Models.Queries.CaseTypeCategory.ExplorationPopulation };
+                        foreach (var caseType in Enum.GetValues<Models.Queries.CaseTypeCategory>().Where(x => !skipCaseTypeCategories.Contains(x)))
+                        {
+                            yield return new TestCaseData(new EncounterInfo(), new EncounterQueryInfo(caseType, 1,
+                                new DateTime(2023, 1, 1), new DateTime(2024, 1, 1), globalId, Guid.NewGuid(), 24, [1]), null)
+                                .SetName($"{testName} {Enum.GetName(caseType).ToLower()}");
+                        }
+                        break;
+                    case "EncounterSpecificCostInfoDepartmentRollupQuery":
+                    case "EncounterStaticCostInfoDepartmentRollupQuery":
+                        break;
+                    case "EncounterSpecificCostInfoEntityQuery":
+                    case "EncounterSpecificCostInfoLocationQuery":
+                    case "EncounterStaticCostInfoEntityQuery":
+                    case "EncounterStaticCostInfoLocationQuery":
+                        var isPatientSpecific = name.Contains("Specific");
+                        globalId = Regex.Replace(name, ".*CostInfo(.*)Query", "$1")
+                            .Replace("DepartmentRollup", "DepartmentRollup1")
+                            .Replace("Entity", "");
+                        yield return new TestCaseData(new EncounterCostInfo(), new EncounterCostQueryInfo(isPatientSpecific, Guid.NewGuid(), string.Empty, globalId, [1L]), null)
+                            .SetName(testName);
+                        break;
+                    case "EncounterUnitOfServiceQuery":
+                        yield return new TestCaseData(new EncounterUnitOfService(), new EncounterUnitOfServiceQueryInfo(24, [1L, 2L]), null)
+                            .SetName(testName);
+                        break;
+                    case "LOSOpportunityInfoQuery":
+                        yield return new TestCaseData(new LOSOpportunityInfo(), new LOSOpportunityQueryInfo(Guid.NewGuid(), 24, 2), null)
+                            .SetName(testName);
+                        break;
+                    case "VariationEncounterChargeQuery":
+                        yield return new TestCaseData(new VariationEncounterChargeInfo(), new VariationEncounterChargeQueryInfo(false, false,
+                            false, false,
+                            false, true, [Guid.NewGuid(), Guid.NewGuid()], [1, 2], 1, 1000), null)
+                            .SetName(testName);
+                        yield return new TestCaseData(new VariationEncounterChargeInfo(), new VariationEncounterChargeQueryInfo(true, false,
+                            true, false,
+                            true, true, [Guid.NewGuid(), Guid.NewGuid()], [1, 2], 1, 1000), null)
+                            .SetName($"{testName} hasManufacturer hasSupply usingCustomDimension");
+                        yield return new TestCaseData(new VariationEncounterChargeInfo(), new VariationEncounterChargeQueryInfo(true, true,
+                            true, true,
+                            true, true, [Guid.NewGuid(), Guid.NewGuid()], [1, 2], 1, 1000), null)
+                            .SetName($"{testName} hasManufacturer Inferred hasSupply Inferred usingCustomDimension")
+                            .Ignore("Temporarily ignored: investigate manufacturer/supply table logic. This test always fails due to table not found."); ;
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/Strata.DecisionSupport.Biz.Test.Unit.csproj b/tests/Strata.DecisionSupport.Biz.Test.Unit/Strata.DecisionSupport.Biz.Test.Unit.csproj
new file mode 100644
index 0000000..1fb96d2
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/Strata.DecisionSupport.Biz.Test.Unit.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.7.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageReference Include="Verify.NUnit" Version="29.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Strata.DecisionSupport.Biz\Strata.DecisionSupport.Biz.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/TestExtensions.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/TestExtensions.cs
new file mode 100644
index 0000000..918bbc8
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/TestExtensions.cs
@@ -0,0 +1,48 @@
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using VerifyTests;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit
+{
+    public static class TestExtensions
+    {
+        /// <summary>
+        /// The test name
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns>
+        /// The name of the test split by camel case for a max length of 200 characters.
+        /// </returns>
+        public static string TestName(this TestContext context)
+        {
+            var regexSpecial = new Regex($"[{Regex.Escape(new string(Path.GetInvalidFileNameChars()) + "<>")}]");
+            var testName = regexSpecial.Replace(context.Test.Name, "").SplitCamelCase();
+            testName = testName[..Math.Min(200, testName.Length)];
+            return testName;
+        }
+
+        public static string SplitCamelCase(this string input)
+        {
+            if (string.IsNullOrEmpty(input)) { return input; }
+
+            const string pattern = "([a-z](?=[A-Z])|[A-Z](?=[A-Z][a-r + t-z])|[A-Z](?=[A-Z][s][a-z]))";
+
+            if (input.StartsWith("FY", StringComparison.Ordinal))
+            {   // hack for FY2012, etc
+                return "FY " + Regex.Replace(input.Remove(0, 2), pattern, "$1 ");
+            }
+            input = Regex.Replace(input, @"\{|\}|:|,|\)|\(", "", RegexOptions.Singleline | RegexOptions.IgnoreCase);
+            return Regex.Replace(input, pattern, "$1 ");
+        }
+
+        public static VerifySettings TestSettings()
+        {
+            var settings = new VerifySettings();
+            settings.UseDirectory("snapshots");
+            settings.ScrubInlineGuids();
+            return settings;
+        }
+
+    }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/UnitTestBase.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/UnitTestBase.cs
new file mode 100644
index 0000000..ad37bcd
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/UnitTestBase.cs
@@ -0,0 +1,62 @@
+using Strata.DecisionSupport.Biz.Parameters;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Threading.Tasks;
+using VerifyNUnit;
+using VerifyTests;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit
+{
+    [ExcludeFromCodeCoverage]
+    [SetUpFixture]
+    public class UnitTestBase
+    {
+        protected VerifySettings verifySettings;
+
+        [OneTimeSetUp]
+        public void Setup()
+        {
+            verifySettings = TestExtensions.TestSettings();
+        }
+        protected virtual async Task VerifyQuery<T>(T queryInfo)
+            where T : class
+        {
+            var query = Query(queryInfo);
+            await Verifier.Verify(query, verifySettings)
+                .UseDirectory("snapshotQueries")
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        protected virtual async Task VerifyDictionary<T>(T queryInfo) where T : class
+        {
+            if (!(queryInfo is IWithDictionary withDictionary)) { return; }
+            var dictionary = withDictionary.Dictionary();
+            await Verifier.Verify(JsonSerializer.Serialize(dictionary), verifySettings)
+                .UseDirectory("snapshotDictionary")
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        protected virtual async Task VerifyParameters<T>(T queryInfo) where T : class
+        {
+            if (!(queryInfo is IWithParameters withParameters)) { return; }
+            var parameters = withParameters.Parameters();
+            string json = JsonSerializer.Serialize(parameters);
+            await Verifier.Verify(json, verifySettings)
+                .UseDirectory("snapshotParameters")
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        protected virtual async Task VerifyArgs<T>(T queryInfo) where T : class
+        {
+            if (!(queryInfo is IWithArgs withArgs)) { return; }
+            var args = withArgs.Args();
+            await Verifier.Verify(args, verifySettings)
+                .UseDirectory("snapshotArgs")
+                .UseFileName(TestContext.CurrentContext.TestName());
+        }
+
+        protected virtual string Query<T>(T queryInfo)
+            where T : class => "";
+
+    }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/UnitTests/GenericQueryInfo.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/UnitTests/GenericQueryInfo.cs
new file mode 100644
index 0000000..b79f1e4
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/UnitTests/GenericQueryInfo.cs
@@ -0,0 +1,25 @@
+using Strata.DecisionSupport.Biz.Parameters;
+using System.Collections.Generic;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit.UnitTests
+{
+    public class GenericQueryInfo : IQueryInfo
+    {
+        public string Name { get; set; }
+
+        public GenericQueryInfo(string name)
+        {
+            Name = name;
+        }
+
+        public Dictionary<string, object> Dictionary() => new Dictionary<string, object>
+            {
+                { "name", Name }
+            };
+
+        public dynamic Parameters() => new
+        {
+            Name
+        };
+    }
+}
diff --git a/tests/Strata.DecisionSupport.Biz.Test.Unit/UnitTests/TestSqlQueries.cs b/tests/Strata.DecisionSupport.Biz.Test.Unit/UnitTests/TestSqlQueries.cs
new file mode 100644
index 0000000..7c04e93
--- /dev/null
+++ b/tests/Strata.DecisionSupport.Biz.Test.Unit/UnitTests/TestSqlQueries.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+
+namespace Strata.DecisionSupport.Biz.Test.Unit.UnitTests
+{
+    [ExcludeFromCodeCoverage]
+    [TestFixture, Category("Unit"), Category("DSS")]
+    public class TestSqlQueries : UnitTestBase
+    {
+        [TestCaseSource(typeof(SnowflakeTestCases), nameof(SnowflakeTestCases.TestCases))]
+        public async Task VerifyQuery<TI, T>(TI obj, T queryInfo, Func<IEnumerable<TI>, IEnumerable<TI>> orderby) where T : class
+            => await base.VerifyQuery(queryInfo);
+
+        [TestCaseSource(typeof(SnowflakeTestCases), nameof(SnowflakeTestCases.TestCases))]
+        public async Task VerifyDictionary<TI, T>(TI obj, T queryInfo, Func<IEnumerable<TI>, IEnumerable<TI>> orderby) where T : class
+            => await base.VerifyDictionary(queryInfo);
+
+        [TestCaseSource(typeof(SnowflakeTestCases), nameof(SnowflakeTestCases.TestCases))]
+        public async Task VerifyParameters<TI, T>(TI obj, T queryInfo, Func<IEnumerable<TI>, IEnumerable<TI>> orderby) where T : class
+            => await base.VerifyParameters(queryInfo);
+
+        [TestCaseSource(typeof(SnowflakeTestCases), nameof(SnowflakeTestCases.TestCases))]
+        public async Task VerifyArgs<TI, T>(TI obj, T queryInfo, Func<IEnumerable<TI>, IEnumerable<TI>> orderby) where T : class
+            => await base.VerifyArgs(queryInfo);
+
+        protected override string Query<T>(T queryInfo) where T : class
+            => SnowflakeTestCases.Query(queryInfo);
+
+    }
+}